Revert "Revert "update rechargead""

This reverts commit d651f6c7cc0b547e24802892c1e1daf8468d8a2e.

.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>fohow_xcx_git</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1597646016597</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

packageUser/pages/user/buy/buy.js

@@ -7,7 +7,8 @@ Page({
     orderId: '',
     path: '',
     luoboCount: '',
-    countMoney: '0.00'
+    countMoney: '0.00',
+    bannerList:[]
   },
   onLoad: function (options) {
     this.data.orderId = options.orderId
@@ -20,6 +21,7 @@ Page({
     //   countMoney: options.countMoney
     // })
     this.checkbalance()
+    this.getBanners()
   },
   bindKeyInput: function(e) {
     this.setData({
@@ -106,5 +108,20 @@ Page({
     return _request.share({
       sc: 'xcx_user_rabbitbuy'
     })
-  }
+  },
+  getBanners: function () {
+    var that = this
+    var url = 'v1/ad/recharge_ad/items'
+    var params = {
+      cache: false
+    }
+    var success = function (res) {
+      that.setData({
+        bannerList: res.data
+      })
+      
+      console.log('ad',res)
+    }
+    _request.$get(url, params, success)
+  },
 })

packageUser/pages/user/buy/buy.wxml

@@ -6,28 +6,17 @@
     </view>
   </navigator>
   <view class="buy-chong" wx:if="{{!invitemode}}">快捷购买</view>
-  
+  <!--
   <view class="buy-chong-park">
-  	<!--
-    <view class="chong" bindtap="{{!buttonClicked?'toWeixin':''}}" data-text="5000">
-      <view class="chong-luobo-count">5000代金券</view>
-      <view class="chong-luobo-money">￥50</view>
-    </view>
-    <view class="chong" bindtap="{{!buttonClicked?'toWeixin':''}}" data-text="7500">
-      <view class="chong-luobo-count">7500代金券</view>
-      <view class="chong-luobo-money">￥75</view>
-    </view>
-    <view class="chong" bindtap="{{!buttonClicked?'toWeixin':''}}" data-text="10000">
-      <view class="chong-luobo-count">10000代金券</view>
-      <view class="chong-luobo-money">￥100</view>
-    </view>
-    -->
     <view class="chong" bindtap="{{!buttonClicked?'toWeixin':''}}" data-text="3000" style="width:97%">
       <view class="chong-luobo-count">4200代金券</view>
       <view class="chong-luobo-money">￥3000</view>
     </view>
   </view>
-  
+  -->
+  <view class="chong" bindtap="{{!buttonClicked?'toWeixin':''}}" data-text="3000" style="width:100%">
+  	<image src="{{bannerList[0].img}}" mode="widthFix" style="width:100%"></image>
+  </view>
   <!--<view class="buy-other">购买其它数量</view>-->
   <!--
   <view class="other-part" wx:if="{{invitemode}}">

pages/pay/pay.wxml

@@ -104,7 +104,7 @@
         <view class="clean"></view>
       </view>
 -->
-      <view class="pay-payway-item" wx:if="{{balanceInfo.total}}" bindtap="selectClick" data-payway="balance">
+      <view class="pay-payway-item" wx:if="{{payData.order_type != 1 && balanceInfo.total}}" bindtap="selectClick" data-payway="balance">
         <view class="pay-payway-balance fl">
           <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/luobopay.jpg" bindtap="selectClick" data-payway="balance"></image>
           <text bindtap="selectClick" data-payway="balance">代金券支付</text>

project.config.json

@@ -14,15 +14,15 @@
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useIsolateContext": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"compileHotReLoad": false,
+		"useIsolateContext": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.0.7",