修改限制

src/config/index.js

@@ -6,7 +6,7 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
+const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 ,  wx313ec36b710125d4 有直播
 //2006 泰华 , wx40fec8944623c8b3 有直播
@@ -25,7 +25,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2992 山东盛联微商城 wx53dedc202ae0d0c2
 //2002 巴黎贝甜 wx21968cb3a486d4ab
 
-const BRANCH_ID = 1002
+const BRANCH_ID = 3001
 const isMall = true
 
 // const needMock = '' //

src/pages/confirmOrder/confirmOrder.js

@@ -56,8 +56,32 @@ wxService.page({
     //积分抵扣
     pointDeductOpen : true,//是否开启积分抵扣
     deductCheckStatus : false,//是否勾选使用积分抵扣
-    pointDeductRuleShow : true,//是否显示积分抵扣规则
-    pointDeductRuleUrl : 'https://hwimagecdn.ihotwind.cn/hotwind-activity/home_get_coupon.png',//积分规则说明
+    pointDeductRuleShow : false,//是否显示积分抵扣规则
+    pointDeductRuleUrl : '',//积分规则说明
+    avaliablePoint : 0,//可用积分数
+    pointDeductMoney : 0.00,
+
+  },
+
+  //获取积分抵扣配置信息
+  getPointDeductConfig(){
+    wxService.get(`/merchant/integralPayRule/get`).then(res => {
+      if(res.data.result == 0){
+        let data = res.data.data ? res.data.data : null;
+        if(data){
+          let paySwitch = data.paySwitch == 1 ? true : false;
+          this.data.pointDeductOpen = paySwitch;
+          if(paySwitch){
+            this.data.pointDeductRuleUrl = data.imgUrl;
+          }
+
+          this.setData({
+            pointDeductOpen : this.data.pointDeductOpen,
+            pointDeductRuleUrl : this.data.pointDeductRuleUrl
+          });
+        }
+      }
+    });
   },
 
   /**
@@ -66,9 +90,18 @@ wxService.page({
   onLoad: function(options) {
     wx.hideShareMenu();
     this.getMyLocationInfo();
+    this.getPointDeductConfig();
   },
   //切换使用积分抵扣状态
   onTapChangeCheckPointDeductOpenStatus(){
+    //判断你是不是0可用积分
+    if(this.data.avaliablePoint <= 0){
+      wx.showToast({
+        title: '没有可用积分抵扣',
+        icon : 'none'
+      });
+    }
+
     this.data.deductCheckStatus = !this.data.deductCheckStatus;
     this.setData({
       deductCheckStatus : this.data.deductCheckStatus

src/pages/confirmOrder/confirmOrder.wxml

@@ -33,7 +33,7 @@
       <block wx:if="{{!goodsAddress}}">
         <view class="address-list" bindtap="selectAddress">
           <view class="address-info">
-            <view>
+            <view style="display:flex;align-items:center;">
               <image class="defalut-add-img" src="{{addressInfo.type == 1 ? 'https://img3.bigaka.com/prd/3001/202003/20200309/3001f7a6186d-6882-422c-a77c-61b8291c091a.png' : 'https://img3.bigaka.com/prd/3001/202003/20200309/300129705d0a-bf5c-4b2f-aedd-0c3fc9f78ba1.png'}}"
               />
               <text class="user-name">{{addressInfo.name}}</text>
@@ -153,7 +153,7 @@
             </view>
            </view>
            <view class="rg-item-info" bindtap="onTapChangeCheckPointDeductOpenStatus">
-            <view class="point-info">可用<label>400</label>积分,抵 <label>4.00</label>元 </view>
+            <view class="point-info">可用<label>{{avaliablePoint}}</label>积分,抵 <label>{{pointDeductMoney}}</label>元 </view>
             <icon color="rgb(203, 60, 60)" size="20" type="{{deductCheckStatus ? 'success' : 'circle'}}" role="img"></icon>
            </view>
         </view>
@@ -248,8 +248,8 @@
   </form>
 </view>
 <!--goHome-->
-<go-home/>
-<floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage" />
+<!-- <go-home/> -->
+<!-- <floatNav bind:getAuth="_getUserInfo" bind:updatePage="updatePage" /> -->
 <select-coupon show="{{showSelectCoupon}}" bind:updateCoupon="updateCoupon" coupon-list="{{couponDiscountPreviews}}" />
 <!-- 积分抵扣规则 -->
 <point-deduct-rule showDialog="{{pointDeductRuleShow}}" ruleImg="{{pointDeductRuleUrl}}"/>
\ No newline at end of file

src/subPackage/page/pages/valueCardInfo/valueCardInfo.js

@@ -123,6 +123,15 @@ wxService.page({
       return;
     }
 
+    if(!member.cardNoWeixin){
+      wx.showToast({
+        title: '请先开卡后购买',
+      });
+      
+      wxService.openCard()
+      return ;
+    }
+
     let memeberId = member.id,
       // storeId = member.storeId;
       storeId = '';