Merge branch 'dev_7.2.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.2.0

src/app.js

@@ -112,7 +112,7 @@ App({
     systemInfo: wx.getSystemInfoSync(),
     ctx: envInfo.ctx,
     openCard: false,
-    appId: 'wxc3b64b09b1d3dfc2',
+    appId: 'wxac09792264c49b5c',
     userNo: null,
     storeId: '',
     storeName: '',

src/shoppingGuid/page/pages/couponQrcode/couponQrcode.js

@@ -44,25 +44,25 @@ wxService.page({
   //获取小程序码
   getMiniQrcode(id){
     // subPackage / page / pages / scanCoupon / scanCoupon
-    let currentUserInfo = wx.getStorageSync('guidBaseInfo');
+    let currentUserInfo = wx.getStorageSync('_guidCouponInfo');
     let memberId = currentUserInfo.memberId;
     let content = {
-      title: this.data.couponInfo.couponName,
-      id: this.data.couponInfo.couponId,
-      url: this.data.couponInfo.imageBg
+      title: currentUserInfo.title,
+      id: currentUserInfo.id,
+      url: currentUserInfo.imageBg
     }
     let tentacleInfo = {
       content: JSON.stringify(content),
-      contentId: this.data.couponInfo.couponId,
+      contentId: currentUserInfo.id,
       contentType: app.globalData.contants.SHARE_TYPE.PRODUCT_DETAIL, //内容类型 STAFF_RECOMMAND
-      title: this.data.couponInfo.couponName, //标题
+      title: currentUserInfo.title, //标题
       type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
     }
 
     wxService.getTentacleContent(tentacleInfo).then(res => {
       if (res && res.id) {
         let tentacleId = res.id;
-        let inner_id = Integer.digit(this.data.couponInfo.couponId, 10, 64);
+        let inner_id = Integer.digit(currentUserInfo.id, 10, 64);
         let inner_tentacleId = Integer.digit(tentacleId, 10, 64);
         //生成二维码
 

src/shoppingGuid/page/pages/welfare/welfare.js

@@ -97,16 +97,16 @@ wxService.page({
     let item = e.currentTarget.dataset.item;
     let id = item.id;
     let content = {
-      title: item.couponName,
-      id: item.couponId,
+      title: item.title,
+      id: item.id,
       url: item.imageBg
     }
 
     let tentacleInfo = {
       content: JSON.stringify(content),
-      contentId: item.couponId,
+      contentId: item.id,
       contentType: app.globalData.contants.SHARE_TYPE.PRODUCT_DETAIL, //内容类型 STAFF_RECOMMAND
-      title: item.couponName, //标题
+      title: item.title, //标题
       type: 3// 1:门店,2:员工(暂时不做),3:会员,4:第三方外部渠道,5:智能营销
     }