解决冲突

src/pages/category/category.js

@@ -73,7 +73,8 @@ wxService.page({
     wx.showLoading({
       title: '加载中'
     })
-    wxService.get(`/sale/product/mallCategory/buyer/findCategoryTree`).then(res => {
+    // wxService.get(`/sale/product/mallCategory/buyer/findCategoryTree`).then(res => {
+    wxService.get(`/sale/product/mallCategory/findCategoryTree`).then(res => {
       let { result, data } = res.data
       if (result == 0) {
         wx.hideLoading();

src/pages/confirmOrder/confirmOrder.js

@@ -1044,6 +1044,10 @@ wxService.page({
     }
 
     let _this = this;
+
+    params.needPayMoney = this.data.orderPrice*10*10;
+
+
     let url = isSelect ? '/sale/payment/merged/buyer/bill' : '/sale/trade/buyer/bill'
     wxService.post(`${url}`, params).then(res => {
       if (res) {

src/pages/orderDetail/orderDetail.js

@@ -84,14 +84,15 @@ wxService.page({
                         item.canRefundNum = (item.count - item.refundCount) >= 0 ? (item.count - item.refundCount) : 0;
                         sum = sum + item.price * item.count;
                     });
-
-                    if(data.order.wechatCouponPrice){
-                        data.order.wechatCouponPrice = data.order.wechatCouponPrice/10/10;
-                        data.payAmount = (data.payAmount *1) - (data.order.wechatCouponPrice*1)
+                    if(data.order){
+                      if (data.order.wechatCouponPrice) {
+                        data.order.wechatCouponPrice = data.order.wechatCouponPrice / 10 / 10;
+                        data.payAmount = (data.payAmount * 1) - (data.order.wechatCouponPrice * 1)
                       }
 
-                    if(data.order.postCouponDisCount){
-                        data.order.postCouponDisCount = data.order.postCouponDisCount/10/10;
+                      if (data.order.postCouponDisCount) {
+                        data.order.postCouponDisCount = data.order.postCouponDisCount / 10 / 10;
+                      }
                     }
 
 

src/project.config.json

@@ -690,9 +690,15 @@
 				},
 				{
 					"id": -1,
+<<<<<<< HEAD
 					"name": "签到",
 					"pathName": "subPackageMarketing/page/pages/sign/sign",
 					"query": "",
+=======
+					"name": "支付券信息",
+					"pathName": "subPackageA/page/pages/payCardInfo/payCardInfo",
+					"query": "id=710195552385654784",
+>>>>>>> mall_dev_7.12.0
 					"scene": null
 				}
 			]

src/subPackage/page/pages/categoryPro/categoryPro.js

@@ -144,7 +144,7 @@ wxService.page({
     let pageNo = this.data.pageNo,
       pageSize = this.data.pageSize;
       // wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
-      wxService.post(`/sale/product/buyer/findCategoryTreeIdByProductList?pageNo=${pageNo}&pageSize=${pageSize}&id=${this.data.form.mallCategoryId}`).then(res => {
+    wxService.post(`/sale/product/mallCategory/listPageProductByMallCategoryIdAndItsSons?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
       const { result, data } = res.data
       if (result == 0 && data.content) {
         wx.hideLoading()

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

@@ -64,25 +64,30 @@ 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);
           } 
+        }
     },
     //立即领取
     getCoupon(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,10 +133,14 @@ wxService.page({
           if (tempids.length > 0) {
             let status = res[tempids[0]];
             if (status == 'accept') {
-              this.getACtivityInfo();
+              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>