Merge branch 'mall_dev_7.13.0' into 'mall_dev_7.13.1'

Mall dev 7.13.0

See merge request !201

src/app.json

@@ -154,10 +154,6 @@
     "chatGroupPlugin": {
       "version": "1.0.2",
       "provider": "wxaae6519cee98d824"
-    },
-    "live-player-plugin": {
-      "version": "1.0.11",
-      "provider": "wx2b03c6e691cd7370"
     }
   },
   "permission": {

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 有直播 //门户 wx833d5ece112fc3fd
@@ -27,7 +27,7 @@ const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门
 //2002 巴黎贝甜 wx21968cb3a486d4ab
 //2014 包小姐与鞋先生 wxa00302e2f53dd9c5
 
-const BRANCH_ID = 3001
+const BRANCH_ID = 1002
 const isMall = true
 
 // const needMock = '' //

src/project.config.json

@@ -22,12 +22,12 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",
-	"appid": "wx313ec36b710125d4",
+	"appid": "wxac09792264c49b5c",
 	"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
 	"debugOptions": {
 		"hidedInDevtools": []

src/shoppingGuid/page/pages/couponQrcode/couponQrcode.wxml

@@ -11,11 +11,11 @@
       </view>
       <view class='coupon-item-rg'>
         <view class='coupon-title'>{{couponInfo.title}}</view>
-        <!-- <view class='op'>
+        <view class='op'>
           <view class='text-btn'>
-            <text class='theme-text-color'>数量：{{couponInfo.stock}}</text>
+            <text class='theme-text-color'>剩余数量：{{couponInfo.leftStock}}</text>
           </view>
-        </view> -->
+        </view>
       </view>
     </view>
   </view>

src/subPackageMarketing/page/pages/sign/sign.js

@@ -25,7 +25,7 @@ wxService.page({
     }
     else{
       wx.showToast({
-        title: '请选登录！',
+        title: '请先登录！',
         icon : 'none'
       });
     }