发布版本，修改部分bug

src/app.json

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

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
@@ -24,7 +24,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 = '' //
@@ -315,8 +315,8 @@ const prod_brand_config = {
     tunnelToken: '5b621e41ea6ed4ad302c5d07b8685c32',
     brandId: 2017,
     plusIsOpen: false,
-    contactUsIsOpen: true,
-    contactUsPluginId: 'fbe3bb6f88e7331ca719713910c164a2',
+    contactUsIsOpen: true,//是否显示联系我插件
+    contactUsPluginId: 'fbe3bb6f88e7331ca719713910c164a2',//联系我插件
     hasLiveVideo: false,//是否有直播功能
     hasTrial: false,
     canUseWechatAddress: false,//是否使用获取微信地址

src/pages/order/order.js

@@ -342,9 +342,11 @@ wxService.page({
           wx.hideLoading();
           data = data ? data : [];
           data.forEach(item => {
+            let refundCount = 0;
             let skuList = item.skuList, tradeVOSku = item.tradeVO.skuVOList;
             skuList.forEach(item => {
               let filter = tradeVOSku.filter(c => c.skuId == item.skuId);
+              refundCount = refundCount + item.count;
               if (filter.length > 0) {
                 item.skuImgUrl = filter[0].skuImgUrl;
                 item.productName = filter[0].productName;
@@ -353,7 +355,12 @@ wxService.page({
                 item.count = filter[0].count;
               }
             });
-          })
+
+            item.refundCount = refundCount;
+          });
+
+          //获取总的退款商品数量
+          
 
           this.setData({
             orderList: this.data.pageNo == 1 ? [...data] : [...this.data.orderList, ...data],

src/pages/order/order.wxml

@@ -80,7 +80,7 @@
 						</scroll-view>
 					</view>
 					<view class="pro-number">
-						<text class="total-pro">共{{item.tradeVO.skuCount}}件商品</text>
+						<text class="total-pro">共{{item.refundCount}}件商品</text>
 						<view class="total-price">
 							实付
 							<text class="price">￥{{item.amount? item.amount : item.previewAmount}}</text>

src/project.config.json

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

src/utils/currentLinkRouter.js

@@ -62,6 +62,9 @@ function currentLinkRouter(event, _this) {
     }
     else{
       let rowObj = typeof (curItemType.row) == "string" ? JSON.parse(curItemType.row) : curItemType.row
+      if (!rowObj){
+        rowObj = {};
+      }
       let currentClickRow = app.globalData.commonFunc.getLinkRow(rowObj.type, rowObj)
 
       if (rowObj.type == 1) { }