退单相关优化

src/config/index.js

@@ -6,14 +6,15 @@
 // 修改 BRANCH_ID 为对应的商户id
 // app.js 中brandId 修改为对应
 
-const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
+const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test, 预生产 pre
 //仅生产环境时 配置 ： 
 //3001 3001 , 
 //泰华 2006 , 
 //多多一上 2007 ，
 //雪岛书屋 2008
 //苏州邻里 2006
-const BRANCH_ID = 2007 
+const BRANCH_ID = 3001 
+const isMall = true
 
 const needMock = '' //
 // 舞象联系我 ：766c50920993bf9c41c6c3d2761a2df5
@@ -66,7 +67,7 @@ const needMock = '' //
  * contactUspluginId = a6ea55b56eb09ced8f9aeeaa14383b52 联系我插件id
  * 
  * 泰华 门户生产环境配置
- * appId = wx40fec8944623c8b3
+ * appId = wx833d5ece112fc3fd
  * tunnel-token = 8724303981a00b56869f3d26f7a6c643
  * brandId= 2006
  * contactUspluginId = a6ea55b56eb09ced8f9aeeaa14383b52 联系我插件id
@@ -108,19 +109,20 @@ const prod_brand_config = {
     contactUsIsOpen: true,//是否开启联系我
     contactUsPluginId: '766c50920993bf9c41c6c3d2761a2df5',//联系我们插件PluginID
     hasTrial: true, // 是否有体验账号
-    isMall: true,// 商城或门户 true 商城 false 门户
+    isMall: isMall,// 商城或门户 true 商城 false 门户
     orderingMustOpenCard : false, //下单是否必须卡开
   },
   //泰华配置
   2006: {
-    appId: 'wx40fec8944623c8b3',
+    appId: 'wx40fec8944623c8b3', //商城小程序appid
+    storeAppId: 'wx833d5ece112fc3fd',//门户小程序appid
     tunnelToken: '8724303981a00b56869f3d26f7a6c643',
     brandId: 2006,
     plusIsOpen: false,
-    contactUsIsOpen : true,
+    contactUsIsOpen: isMall ? true : false,
     contactUsPluginId: 'a6ea55b56eb09ced8f9aeeaa14383b52',
     hasTrial: false,
-    isMall: true,
+    isMall: isMall,
     orderingMustOpenCard: true,
   },
   //多多一上
@@ -132,7 +134,7 @@ const prod_brand_config = {
     contactUsIsOpen: true,
     contactUsPluginId: '64bf88d82b3f0d506bd00ed90d5706f1',
     hasTrial: false,
-    isMall: true,
+    isMall: isMall,
     orderingMustOpenCard: false,
   },
   //雪岛书屋 
@@ -144,7 +146,7 @@ const prod_brand_config = {
     contactUsIsOpen: false,
     contactUsPluginId: '',
     hasTrial: false,
-    isMall: true,
+    isMall: isMall,
     orderingMustOpenCard: false,
   },
   //苏州邻里
@@ -156,7 +158,7 @@ const prod_brand_config = {
     contactUsIsOpen: false,
     contactUsPluginId: '',
     hasTrial: false,
-    isMall: true,
+    isMall: isMall,
     orderingMustOpenCard: false,
   }
 }
@@ -223,13 +225,14 @@ const token = {
 
 //获取配置信息
 let brandId = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].brandId : (PROJECT_ENV == 'dev' ? 1001 : 1002);
-let fixed_appId = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].appId : appId[PROJECT_ENV];
+let fixed_appId = PROJECT_ENV == 'prod' ? 
+(isMall ? prod_brand_config[BRANCH_ID].appId : prod_brand_config[BRANCH_ID].storeAppId) : appId[PROJECT_ENV];
 let tunnelToken = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].tunnelToken : token[PROJECT_ENV];
 let plusIsOpen = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].plusIsOpen : true;
 let contactUsPluginId = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].contactUsPluginId : '766c50920993bf9c41c6c3d2761a2df5';
 let contactUsIsOpen = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].contactUsIsOpen : true;
 let hasTrial = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].hasTrial : true;
-let isMall = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].isMall : true;
+let fixed_IsMall = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].isMall : true;
 let orderingMustOpenCard = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].orderingMustOpenCard : false;
 
 //配置信息导出
@@ -245,7 +248,7 @@ const envInfo = (() => {
     contactUsPluginId: contactUsPluginId,
     contactUsIsOpen: contactUsIsOpen,//是否开启联系我
     hasTrial: hasTrial , //是否开启体验者功能
-    isMall: isMall,//商城和门户区分 门户时 false; 商城 true
+    isMall: fixed_IsMall,//商城和门户区分 门户时 false; 商城 true
     orderingMustOpenCard: orderingMustOpenCard,//下单时是否强校验必须开卡 true 必须开卡才可下单 false 不开卡可以下单
   }
 })()

src/pages/orderDetail/orderDetail.js

@@ -297,6 +297,7 @@ wxService.page({
     copyOrderInfo.skuVOList = copyOrderInfo.skuVOList.filter(item => item.canRefundNum > 0);
     //更新可退货数量
     copyOrderInfo.skuVOList.forEach(item => {
+      item.totalCount = item.count;
       item.count = item.canRefundNum;
     });
 

src/pages/refund/refund.js

@@ -256,8 +256,11 @@ wxService.page({
         returnPrice += cartList[i].paySkuPrice * (cartList[i].count ? cartList[i].count : 1)
       }
     }
+
+    let tempPrice = parseInt(returnPrice * 100);
+
     this.setData({
-      returnOrder:returnPrice
+      returnOrder: parseFloat(tempPrice/100).toFixed(2)
     })
   },
 
@@ -268,10 +271,11 @@ wxService.page({
     wx.hideShareMenu();
     const { params } = options;
     let detail = JSON.parse(params)
+    
     // item.checked
     detail.skuVOList.forEach(item => {
       item.checked = false;
-      let paySkuPrice = parseInt(item.amount * 100 / item.count);
+      let paySkuPrice = parseInt(item.amount * 100 / item.totalCount);
       item.paySkuPrice = (paySkuPrice/100).toFixed(2);
     });
 

src/pages/refundDetail/refundDetail.wxml

@@ -49,7 +49,7 @@
 
 	<view class="pro-wrap">
 		<view class="pro-header">
-			<text class="choose-pro">选择商品</text>
+			<text class="choose-pro">订单商品</text>
 			<view class="pro-total-price">
 				退款总金额
 				<text class="total-price">￥{{refundDetail.amount? refundDetail.amount : refundDetail.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": []