Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents 0db5dca9 4a49c4ea
Showing 2 changed files with 55 additions and 35 deletions
packageG/pages/user/my_beauty_consultant/my_beauty_consultant.js
packageG/pages/user/my_beauty_consultant/my_beauty_consultant.wxml
@@ -84,47 +84,67 @@ Page({
         qrcode('qrcode', "1505955959595", 480, 480, this);
         //th.requestRecommend();
         /*--- 获取一下，会员要不要线上美顾 ---*/
-        rq.get("/api/weshop/users/getAndUpdateUser/" + os.stoid + "/" + getApp().globalData.user_id, {
-            success: async function (src) {
-                if (src.data.code == 0) {
-                    var u_data = src.data.data;
-                    if (!u_data.staffId) {
-                        getApp().confirmBox('该会员无专属导购');
-                        return false;
-                    }
-                    //-- 导购的临时变量 --
-                    let tp_guide = null;
-                    let tp_pick = null;
-                    //获取会员在手店后台的
-                    await getApp().get_guide_from_staff(u_data.staffId, function (guide) {
-                        if (!guide) {
-                            getApp().confirmBox('该会员的专属导购未在手店后台导购列表中');
+
+        getApp().getConfig(()=>{
+            rq.get("/api/weshop/users/getAndUpdateUser/" + os.stoid + "/" + getApp().globalData.user_id, {
+                success: async function (src) {
+                    if (src.data.code == 0) {
+                        var u_data = src.data.data;
+                        if (!u_data.staffId) {
+                            getApp().confirmBox('该会员无专属导购');
                             return false;
                         }
-                        tp_guide = guide;
-                    });
-                    tp_guide.staffName = u_data.staffName;
-                    tp_guide.staffId = u_data.staffId;
-                    tp_guide.staffTel = u_data.staffTel || tp_guide.mobile;
-                    if(!tp_guide.staffTel){
-                      tp_guide.staffTel=tp_guide.bind_user_mobile;
-                    }
-                    await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + tp_guide.pickup_id, {}).then(res => {
-                        if(res.data.code==0 && res.data.data){
-                            tp_pick=res.data.data;
+                        //-- 导购的临时变量 --
+                        let tp_guide = null;
+                        let tp_pick = null;
+                        //获取会员在手店后台的
+                        await getApp().get_guide_from_staff(u_data.staffId, function (guide) {
+                            if (!guide) {
+                                getApp().confirmBox('该会员的专属导购未在手店后台导购列表中');
+                                return false;
+                            }
+                            tp_guide = guide;
+                        });
+
+                        if(!tp_guide.weapp_codeimg){
+                            var code_rq={};
+                            code_rq['accdb'] = getApp().globalData.config.erpid;
+                            code_rq['staffId'] = encodeURIComponent(tp_guide['erp_staff_id']);
+                            await getApp().request.promiseGet("/api/weshop/MdUser/getStaffWeAppEwm", {
+                                data: code_rq,
+                            }).then(res => {
+                                if(res.data.code==0){
+                                    tp_guide.weapp_codeimg=res.data.data.weapp_codeimg;
+                                }
+                            })
+
+                        }
+
+                        tp_guide.staffName = u_data.staffName;
+                        tp_guide.staffId = u_data.staffId;
+                        tp_guide.staffTel = u_data.staffTel || tp_guide.mobile;
+                        if(!tp_guide.staffTel){
+                            tp_guide.staffTel=tp_guide.bind_user_mobile;
                         }
-                    })
-                    th.setData({
-                        guide: tp_guide,
-                        pick_up: tp_pick,
-                    })
+                        await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + tp_guide.pickup_id, {}).then(res => {
+                            if(res.data.code==0 && res.data.data){
+                                tp_pick=res.data.data;
+                            }
+                        })
+                        th.setData({
+                            guide: tp_guide,
+                            pick_up: tp_pick,
+                        })
-                    th.getopenuserid(tp_guide.id);
+                        th.getopenuserid(tp_guide.id);
+                    }
                 }
-            }
+            })
         })
+
+
     },
     //打电话
@@ -19,9 +19,9 @@
     <!-- 二维码 -->
     <view class="flex jc-center" style="margin-top: 60rpx;">
         <!-- 企业微信码 -->
-        <image wx:if="{{is_qy_wx}}" style="height: 338rpx;width: 338rpx;" src="{{qr_code?qr_code:err_img}}"  binderror="bind_bnerr2"  show-menu-by-longpress ></image>
+        <image referrerPolicy="no-referrer" wx:if="{{is_qy_wx}}" style="height: 338rpx;width: 338rpx;" src="{{qr_code?qr_code:err_img}}"  binderror="bind_bnerr2"  show-menu-by-longpress ></image>
         <!-- 小程序太阳码 -->
-        <image wx:else style="height: 338rpx;width: 338rpx;" src="{{guide.weapp_codeimg}}" show-menu-by-longpress ></image>
+        <image  referrerPolicy="no-referrer" wx:else style="height: 338rpx;width: 338rpx;" src="{{guide.weapp_codeimg}}" show-menu-by-longpress ></image>
     </view>
     <view class="flex jc-center" style="margin-top:20rpx">
         <text class="fs18 biaoqian_box flex-center">小福利TIPS</text>