修改bug

src/app.json

@@ -147,10 +147,6 @@
     "contactPlugin": {
       "version": "1.3.0",
       "provider": "wx104a1a20c3f81ec2"
-    },
-    "live-player-plugin": {
-      "version": "1.0.9",
-      "provider": "wx2b03c6e691cd7370"
     }
   },
   "permission": {

src/config/index.js

@@ -26,7 +26,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2002 巴黎贝甜 wx21968cb3a486d4ab
 //2014 包小姐与鞋先生 wxa00302e2f53dd9c5
 
-const BRANCH_ID = 3001
+const BRANCH_ID = 2010
 const isMall = true
 
 // const needMock = '' //

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx313ec36b710125d4",
+	"appid": "wxe6d270a3e399ade9",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []

src/subPackage/page/pages/couponCenter/couponCenter.js

@@ -64,24 +64,29 @@ wxService.page({
     },
     //立即兑换优惠券
     exchange(e) {
-        wx.showLoading({
-            title: '领取中..',
-        });
         let isStart = e.currentTarget.dataset.start;
         const { id } = e.currentTarget.dataset;
         let item = e.currentTarget.dataset.item;
         //先判断是不是老的活动
         if (!item.couponList) {
+            wx.showLoading({
+              title: '领取中..',
+            });
             this.getCoupon(id, item);
             return;
         }
 
         if (isStart) {
+            wx.showLoading({
+              title: '领取中..',
+            });
             this.getCoupon(id, item);
         }
         //预约
         else {
+          if (!item.isAppointMent){
             this.orderCouponActivity(id, item);
+          } 
         }
     },
     //立即领取
@@ -116,6 +121,7 @@ wxService.page({
     },
     //立即预约
     orderCouponActivity(id) {
+        let self = this;
         let baseUserInfo = wx.getStorageSync('_baseUserInfo');
         wxService.post(`${'/merchant/message/wxSubMsgMapping/getListByParams'}`, {
             scenarioIds: ['usernoticeappointment'],
@@ -145,7 +151,13 @@ wxService.page({
                     }
                 },
                 complete: (res) => {
-                    
+                  wx.showLoading({
+                    title: '加载中',
+                  })
+                  setTimeout(()=>{
+                    self.initIntegralCouponList();
+                    wx.hideLoading();
+                  },1000)
                 }
             })
         }).catch(err => {

src/subPackage/page/pages/couponCenter/couponCenter.wxml

@@ -32,7 +32,7 @@
 							data-id="{{item.acvivityId}}"
 							data-start="{{item.isStart}}"
 							data-item="{{item}}"
-							bindtap='exchange'>{{item.isStart ? '立即领取': '立即预约'}}</view>
+							bindtap='exchange'>{{item.isStart ? '立即领取': (item.isAppointMent?'已预约':'立即预约')}}</view>
 					</view>
 				</view>
 			</view>

src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.js

@@ -133,9 +133,13 @@ wxService.page({
           if (tempids.length > 0) {
             let status = res[tempids[0]];
             if (status == 'accept') {
-              this.getACtivityInfo();
-              wx.showToast({
-                title: '预约成功',
+              this.data.activityInfo.isAppointMent = true;
+              this.setData({
+                activityInfo: this.data.activityInfo
+              },()=>{
+                wx.showToast({
+                  title: '预约成功',
+                })
               })
             }
           }

src/subPackageA/page/pages/moneyBuyCouponInfo/moneyBuyCouponInfo.wxml

@@ -41,7 +41,7 @@ class='card-info' mode='widthFix'></image>
     <view class='rg-button positionRe {{checked ? "" : "disabled"}}' wx:if="{{!userHasBaseInfo}}">
       <button class="positionAbs clear-btn"
       bindgetuserinfo="_getUserInfo" open-type='getUserInfo'></button>
-      {{buyType == 1 ? "立即购买" : "立即兑换"}}
+      立即购买
     </view>
     <view class='rg-button {{checked ? "" : "disabled"}}' 
     wx:if="{{userHasBaseInfo}}" bindtap='onTapBuy'>立即购买</view>