修改退单相关

src/config/index.js

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

src/pages/order/order.js

@@ -337,27 +337,30 @@ wxService.page({
     const params = {}
     wxService.post(`/sale/refund/buyer/history?pageNum=${pageNo}&pageSize=${pageSize}`, params).then(res => {
       if (res) {
-        const { result, data } = res.data
+        let { result, data } = res.data
         if (result == 0) {
           wx.hideLoading();
+          data = data ? data : [];
+          data.forEach(item => {
+            let skuList = item.skuList, tradeVOSku = item.tradeVO.skuVOList;
+            skuList.forEach(item => {
+              let filter = tradeVOSku.filter(c => c.skuId == item.skuId);
+              if (filter.length > 0) {
+                item.skuImgUrl = filter[0].skuImgUrl;
+                item.productName = filter[0].productName;
+                item.skuSpec = filter[0].skuSpec;
+                item.price = filter[0].price;
+                item.count = filter[0].count;
+              }
+            });
+          })
 
           this.setData({
             orderList: this.data.pageNo == 1 ? [...data] : [...this.data.orderList, ...data],
             noMoreFlag: data.length < pageSize ? true : false
           }, () => {
-            // console.log(this.data.orderList)
-            // let hasFilter = this.data.orderList.filter(item => item.status != 'C' && item.status != 'D');
-            // if (hasFilter.length > 0){
-            //   this.data.swiperItem[4].hasTips = true;
-            // }
-            // else{
-            //   this.data.swiperItem[4].hasTips = false;
-            // }
-
-            // console.log(hasFilter)
             this.setData({
               no_data: this.data.orderList.length ? true : false,
-              // swiperItem: this.data.swiperItem
             });
           })
         }

src/pages/order/order.wxml

@@ -64,7 +64,7 @@
 					>
 						<scroll-view scroll-x="true">
 							<view class="uploadWrap" scroll-x="true">
-								<block wx:for='{{item.tradeVO.skuVOList}}' wx:for-item="sub" wx:key="s">
+								<block wx:for='{{item.skuList}}' wx:for-item="sub" wx:key="s">
 									<view class="upload_Item">
 										<image
 										 class="upload_Item_img"

src/pages/orderDetail/orderDetail.js

@@ -357,7 +357,8 @@ wxService.page({
     wx.showLoading({
       title: '加载中',
       mask: true
-    })
+    });
+    
     wxService.post(`/sale/trade/buyer/confirm/${id}`).then(res => {
       if (res) {
         const { result, data } = res.data
@@ -368,7 +369,7 @@ wxService.page({
             icon: 'none'
           })
           setTimeout(() => {
-            this.initOrderList(this.data.pageNo, this.data.pageSize, this.data.trade)
+            this.getOrderDetail(this.data.id);
           }, 200)
         } else {
           wx.showToast({

src/pages/refundDetail/refundDetail.js

@@ -87,13 +87,29 @@ wxService.page({
     })
     wxService.post(`/sale/refund/buyer/${id}`).then(res => {
       if (res) {
-        const { result, data } = res.data
+        let { result, data } = res.data
         if (result == 0) {
-          wx.hideLoading()
+          wx.hideLoading();
+          data = data ? data : null;
+          if (data){
+            let skuList = data.skuList, tradeVOSku = data.tradeVO.skuVOList;
+            skuList.forEach(item => {
+              let filter = tradeVOSku.filter(c => c.skuId == item.skuId);
+              if(filter.length > 0){
+                item.skuImgUrl = filter[0].skuImgUrl;
+                item.productName = filter[0].productName;
+                item.skuSpec = filter[0].skuSpec;
+                item.price = filter[0].price;
+                item.count = filter[0].count;
+              }
+            });
+            console.log(skuList)
             this.setData({
               refundDetail: data
             })
           }
+          
+        }
       }
     })
   },

src/pages/refundDetail/refundDetail.wxml

@@ -56,7 +56,7 @@
 				<text class="total-price">￥{{refundDetail.amount? refundDetail.amount : refundDetail.previewAmount}}</text>
 			</view>
 		</view>
-		<block wx:for="{{refundDetail.tradeVO.skuVOList}}" wx:for-item="item" wx:key="{{item}}">
+		<block wx:for="{{refundDetail.skuList}}" wx:for-item="item" wx:key="{{item}}">
 			<view class="pro-list">
 				<image class="pro-img" src="{{item.skuImgUrl}}" />
 				<view class="pro-info">

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx313ec36b710125d4",
+	"appid": "wxac09792264c49b5c",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []
@@ -43,7 +43,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 85,
+			"current": 16,
 			"list": [
 				{
 					"id": -1,
@@ -149,7 +149,7 @@
 					"id": 16,
 					"name": "商品详情页",
 					"pathName": "pages/productDetail/productDetail",
-					"query": "id=647096699302580224",
+					"query": "id=693123742469066752",
 					"scene": null
 				},
 				{

src/subPackageA/page/pages/pointActicityGroup/pointActivityGroup.json

 {
-  "navigationBarTitleText": "积分活动中心",
+  "navigationBarTitleText": "积分商城",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "empty": "/component/empty/empty",

src/subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon.js

@@ -76,34 +76,6 @@ wxService.page({
     });
   },
  
-
-  //查询指定积分换物活动兑换数量
-  findExchangeNumByIds(integralGoodsList) {
-    //获取ids
-    let ids = integralGoodsList.map(g => {
-      return g.id;
-    });
-
-    wxService.post(`/member/pointsRedemptionProductSetting/getExchangeCount`, ids).then(res => {
-      if (res) {
-        let data = res.data.data ? res.data.data : null;
-        if (data) {
-          for (let k in data) {
-            let id = k, value = data[k];
-            for (let i = 0; i < integralGoodsList.length; i++) {
-              if (integralGoodsList[i].id == id) {
-                integralGoodsList[i].canExchange = integralGoodsList[i].stock > value;
-              }
-            }
-          }
-        }
-      }
-
-      this.setData({
-        integralGoodsList: integralGoodsList,
-      });
-    });
-  },
   //获取积分活动分组详情
   getActivityGroupInfo(){
     wxService.get(`/merchant/groupingActivities/findById?id=${this.data.activityId}`).then(res => {
@@ -131,7 +103,7 @@ wxService.page({
         if (result == 0) {
           wx.hideLoading()
           this.setData({
-            integralCouponList: data.reverse()
+            integralCouponList: data
           });
         }
       }

src/utils/Http.js

@@ -154,12 +154,8 @@ class Http {
   checkStatus (resp) {
     let status = resp.statusCode
     if (status >= 200 && status < 300) {
-      // return resp;
       return Promise.resolve(resp)
     } else {
-      // var error = new Error(`status: ${resp.statusCode}`)
-      // error.response = resp
-      // return Promise.reject(resp.statusCode)
       return Promise.reject({
         state: resp.data.result,
         msg: resp.data.desc
@@ -213,10 +209,6 @@ class Http {
   }
 
   getToken () {
-    // if (!this.token) {
-    //   const token = wx.getStorageSync('token')
-    //   this.token = token
-    // }
     return wx.getStorageSync('token')
   }
 

src/utils/wxService.js

@@ -62,28 +62,7 @@ class WXService extends Http {
       wx.hideLoading()
     }).catch(res => {
       if (res.msg && res.msg.indexOf('未登录') > -1) {
-        wx.removeStorageSync('_baseUserInfo')
-        //   if (!this.getUserInfoLimitCount) {
-        //     this.getUserInfoLimitCount = 1
-        //   } else {
-        //     this.getUserInfoLimitCount++
-        //   }
-        //   console.log('count', this.getUserInfoLimitCount)
-        //   if (this.getUserInfoLimitCount > 3) {
-        //     wx.showToast({
-        //       title: '会员系统异常,请联系管理员',
-        //       icon: 'none',
-        //       duration: 2000
-        //     })
-        //   } else {
-        //     // 重新登陆之前判断是否登陆过 重新登陆
-        //     const baseUserInfo = this.getBaseUserInfo()
-        //     if (baseUserInfo) {
-        //       // this.reLogin()
-        //       return false
-        //     }
-        //   }
-
+        wx.removeStorageSync('_baseUserInfo');
         this.reLogin();
       } else
         if (res.msg && res.msg.indexOf('请重新授权') > -1) {