双12修改

pages/home/home.wxml

@@ -177,7 +177,7 @@
         </scroll-view>
       </view> -->
       <view>
-        <view class="seckill-teambuy" wx:if="{{false}}">
+        <!-- <view class="seckill-teambuy" wx:if="{{false}}">
           <view class="teambuy-top">
             <view class="teambuy-top-left">
               <image src="" class="teambuy-buyimg" />
@@ -209,14 +209,12 @@
             </view>
             <view class="clear"></view>
           </view>
-        </view>
+        </view> -->
         <view class="seckill-project" wx:if="{{killgoodslist.length > 0}}" wx:for="{{killgoodslist}}" wx:key="{{index}}" bindtap="toProject" data-val="{{item.id}}">
           <view class="seckill-project-left">
             <image class="seckill-project-img" src="{{item.cover}}" />
           </view>
           <view class="seckill-project-right">
-            <!--<view class="seckill-project-text">限时特价单品</view>-->
-            <!--<view class="seckill-project-text1">啦啦啦啦啦啦啦啦啦啦拉拉拉拉拉拉啊啦啦啊拉拉啊啦啦啦啦啦啦啦啦啦啦啦啦啦啦啦</view>-->
             <view class="seckill-project-text1">{{item.name}}</view>
             <view class="seckill-project-text2">已售出{{item.sold_count}}件</view>
             <view>

pages/pay/pay.js

@@ -229,7 +229,7 @@ Page({
 //      curPayway:val.data.total >= (that.data.total + that.data.yunfei)?'balance':'weixinpay'
 				curPayway:'weixinpay',
 				// useBalance:(val.data.total > 0 && that.data.payData.order_type == 0 && that.data.payData.pv >= that.data.payData.total_price)? true:false,
-				useBalance:(val.data.total > 0 && that.data.payData.order_type == 0)? true:false,
+				useBalance:(val.data.total > 0 && that.data.payData.order_type == 0) || !val.data.payData.shut_wechat ? true:false,
 				afterdec: afterdec
       });
     }
@@ -254,9 +254,9 @@ Page({
   },
   switchChange:function(e){
   	var that = this;
-  	that.setData({
-  		useBalance:e.detail.value
-  	})
+	that.setData({
+		useBalance:e.detail.value
+	})
   },
   getUserInfo: function () {
     var that = this
@@ -358,24 +358,24 @@ Page({
           that.pay()
 //      }
       } else if (that.data.curPayway === 'weixinpay') {
-      	if(that.data.useBalance && that.data.afterdec > 0){
-      		wx.showModal({
-		      title: '提示',
-		      content: '订单将抵扣 '+ (that.data.payData.coupon_price>0?that.data.payData.coupon_price/100:((that.data.total+that.data.yunfei)-that.data.afterdec) / 100)+' 元提货券，剩下 '+(that.data.afterdec / 100)+' 元将由微信支付，祝您购物愉快!' ,
-		      success: function (sm) {
-		        if (sm.confirm) {
-		            that.pay()
-		          } else if (sm.cancel) {
-		            console.log('用户点击取消')
-		            that.setData({
-			            payFlag: false
-			          })
-		          }
-		        }
-		      })
-      	}else{
+      	// if(that.data.useBalance && that.data.afterdec > 0){
+      	// 	wx.showModal({
+		     //  title: '提示',
+		     //  content: '订单将抵扣 '+ (that.data.payData.coupon_price>0?that.data.payData.coupon_price/100:((that.data.total+that.data.yunfei)-that.data.afterdec) / 100)+' 元提货券，剩下 '+(that.data.afterdec / 100)+' 元将由微信支付，祝您购物愉快!' ,
+		     //  success: function (sm) {
+		     //    if (sm.confirm) {
+		     //        that.pay()
+		     //      } else if (sm.cancel) {
+		     //        console.log('用户点击取消')
+		     //        that.setData({
+			    //         payFlag: false
+			    //       })
+		     //      }
+		     //    }
+		     //  })
+      	// }else{
       		that.pay()
-      	}
+      	// }
       }
       // if (!that.data.userInfo.user.has_trade_pwd) {
       //   that.setPwdDialog()

pages/pay/pay.wxml

@@ -116,7 +116,7 @@
     <text class="pay-title">支付方式</text>
     <view class="pay-payway">
 
-      <view class="pay-payway-item" bindtap="selectClick" data-payway="weixinpay" wx:if="{{payData.order_type != 3}}">
+      <view class="pay-payway-item" bindtap="selectClick" data-payway="weixinpay" wx:if="{{payData.order_type != 3 && !payData.shut_wechat}}">
         <view class="pay-payway-balance fl">
           <image class="pay-icon" src="http://fohow.oss-cn-shenzhen.aliyuncs.com/xcx/image/pay/wxpay.jpg" bindtap="selectClick" data-payway="weixinpay"></image>
           <text bindtap="selectClick" data-payway="weixinpay">微信支付</text>
@@ -148,9 +148,14 @@
           <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">提货券抵扣 （剩余：{{balanceInfo.total / 100}}）</text>
         </view>
-        <view class="fr pay-balance-cash">
+        <view class="fr pay-balance-cash" wx:if="{{!payData.shut_wechat}}">
           <switch checked bindchange="switchChange" color="#eab86a" style="zoom:0.75"/>
         </view>
+		<view class="fr pay-balance-cash" wx:else>
+		  <text class="pay-circle">
+		    <text class="pay-select"></text>
+		  </text>
+		</view>
 	</view>
 	
 	<view class="pay-payway-item" wx:if="{{payData.order_type == 0 && balanceInfo.total && payData.pay_way == '' && payData.pv < payData.total_price}}">

project.config.json

@@ -29,7 +29,8 @@
     "minifyWXSS": true,
     "disableUseStrict": false,
     "showES6CompileOption": false,
-    "useCompilerPlugins": false
+    "useCompilerPlugins": false,
+    "minifyWXML": true
   },
   "compileType": "miniprogram",
   "libVersion": "2.0.7",