wxd / MShopWeApp

Commit 8c883096b6d7499dd64698b67fa669001b961f2a

Authored by WXD-SEASON\season
2 parents acd95190 ca672866

合并FU

Inline Side-by-side
Showing 12 changed files with 535 additions and 7 deletions
@@ -1738,7 +1738,38 @@ App({ @@ -1738,7 +1738,38 @@ App({
1738 break; 1738 break;
1739 } 1739 }
1740 } 1740 }
1741 - } 1741 + },
  1742 +
  1743 + //从staff_id获取线上导购列表
  1744 + async get_guide_from_staff(staff_id,func) {
  1745 + let guide=null;
  1746 + //获取导购
  1747 + await this.promiseGet("/api/weshop/shoppingGuide/getStaffIdInfo", {
  1748 + data: {
  1749 + store_id:this.globalData.setting.stoid,
  1750 + StaffId:staff_id
  1751 + },
  1752 + }).then(res => {
  1753 + if(res && res.data.code==0 && res.data.data && res.data.data.is_bind && res.data.data.bind_user_id){
  1754 + guide=res.data.data
  1755 + }
  1756 + })
  1757 +
  1758 + if(guide) {
  1759 + guide.beauty_strengths = "美妆小能手";
  1760 + //获取导购绑定的会员的信息
  1761 + await this.promiseGet("/api/weshop/users/get/" + this.globalData.setting.stoid + "/" + guide.bind_user_id, {
  1762 + data: {},
  1763 + }).then(res => {
  1764 + if (res && res.data.code == 0 && res.data.data) {
  1765 + guide.head_pic = res.data.data.head_pic;
  1766 + }
  1767 + })
  1768 + }
  1769 + if(func){
  1770 + func(guide);
  1771 + }
  1772 + },
1742 1773
1743 1774
1744 1775
components/diy_pingd_buy/diy_pingd_buy.wxml
  View file @8c88309
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <view class="sp2_p" wx:if="{{object.style==2}}"> 72 <view class="sp2_p" wx:if="{{object.style==2}}">
73 <block wx:for="{{goods_array}}"> 73 <block wx:for="{{goods_array}}">
74 <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> 74 <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
75 - <navigator url="{{!aitem.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?goods_id=' + aitem.goods_id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + aitem.goods_id + '&prom_id=' + aitem.id)}}" class="s1_gk_a1"> 75 + <navigator url="{{!aitem.goods_type ? ('/pages/goods/goodsInfo/goodsInfo?prom_type=6&goods_id=' + aitem.goods_id + '&prom_id=' + aitem.id):('/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo?prom_type=6&goods_id=' + aitem.goods_id + '&prom_id=' + aitem.id)}}" class="s1_gk_a1">
76 <view class='one1_p'> 76 <view class='one1_p'>
77 <block> 77 <block>
78 <view class="o1_img_p"> 78 <view class="o1_img_p">
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @8c88309
@@ -1511,7 +1511,7 @@ Page({ @@ -1511,7 +1511,7 @@ Page({
1511 1511
1512 //如果有参与非实收的订单促销，那么就相当于是普通购买 1512 //如果有参与非实收的订单促销，那么就相当于是普通购买
1513 if(th.data.can_use_ord_prom[th.data.bn_pick]){ 1513 if(th.data.can_use_ord_prom[th.data.bn_pick]){
1514 - goods.is_integral_normal=1; 1514 + goods.is_pd_normal=1;
1515 goods.prom_type=0; 1515 goods.prom_type=0;
1516 goods.prom_id=0; 1516 goods.prom_id=0;
1517 1517
packageC/pages/presell/cart/cart2.js
  View file @8c88309
@@ -1622,7 +1622,7 @@ Page({ @@ -1622,7 +1622,7 @@ Page({
1622 1622
1623 //如果有参与非实收的订单促销，那么就相当于是普通购买 1623 //如果有参与非实收的订单促销，那么就相当于是普通购买
1624 if(th.data.can_use_ord_prom[th.data.bn_pick]){ 1624 if(th.data.can_use_ord_prom[th.data.bn_pick]){
1625 - goods.is_integral_normal=1; 1625 + goods.is_pd_normal=1;
1626 //如果是指定门店，就要判断 1626 //如果是指定门店，就要判断
1627 if (th.data.bn_goods.pick_group_ids) { 1627 if (th.data.bn_goods.pick_group_ids) {
1628 var idx0 = th.data.bn_goods.pick_up_lists.findIndex(function (e) { 1628 var idx0 = th.data.bn_goods.pick_up_lists.findIndex(function (e) {
packageE/pages/cart/cart2/cart2.js
  View file @8c88309
@@ -390,6 +390,13 @@ Page({ @@ -390,6 +390,13 @@ Page({
390 } 390 }
391 } 391 }
392 392
  393 +
  394 +
  395 + this.setData({
  396 + show_ord_prom:{},
  397 + can_use_ord_prom:{}
  398 + })
  399 +
393 //先获取是否有关闭使用优惠券 400 //先获取是否有关闭使用优惠券
394 getApp().getConfig2(function (ee) { 401 getApp().getConfig2(function (ee) {
395 var json_d = JSON.parse(ee.switch_list); 402 var json_d = JSON.parse(ee.switch_list);
@@ -9178,6 +9185,8 @@ Page({ @@ -9178,6 +9185,8 @@ Page({
9178 using_quan:{} 9185 using_quan:{}
9179 }) 9186 })
9180 9187
  9188 + var ggy=th.data.old_bn_goods;
  9189 +
9181 }else{ 9190 }else{
9182 good=ut.deep_cp(th.data.old_bn_goods); 9191 good=ut.deep_cp(th.data.old_bn_goods);
9183 } 9192 }
packageE/pages/cart/cart2_inte/cart2_inte.js
  View file @8c88309
@@ -266,6 +266,11 @@ Page({ @@ -266,6 +266,11 @@ Page({
266 }); 266 });
267 } 267 }
268 268
  269 + this.setData({
  270 + show_ord_prom:{},
  271 + can_use_ord_prom:{}
  272 + })
  273 +
269 274
270 th.data.g_cart_q_time = null; 275 th.data.g_cart_q_time = null;
271 276
packageG/pages/user/my_beauty_consultant/my_beauty_consultant.js 0 → 100644
  View file @8c88309
  1 +var t = require("../../../../utils/util.js");
  2 +var os = getApp().globalData.setting;
  3 +const {
  4 + qrcode
  5 +} = require('../../../../utils/index.js');
  6 +const rq = require("../../../../utils/request.js");
  7 +Page({
  8 + data: {
  9 + imghots: os.imghost,
  10 + guide: null,
  11 + pick_up: null,
  12 + error_arr: {
  13 + '81012': '缺失可见范围',
  14 + '81013': 'UserID、部门ID、标签ID全部非法或无权限',
  15 + '40031': '不合法的UserID列表',
  16 + '0032': '不合法的UserID列表长度',
  17 + '40058': '不合法的参数',
  18 + '40063': '参数为空',
  19 + '40094': '不合法的URL',
  20 + '40096': '不合法的外部联系人userid',
  21 + '40099': '外部联系人的数量已达上限',
  22 + '40100': '此用户的外部联系人已经在转移流程中',
  23 + '40125': '无效的openuserid参数',
  24 + '41001': '缺少access_token参数',
  25 + '41009': '缺少userid参数',
  26 + '41010': '缺少url参数',
  27 + '41035': '缺少外部联系人userid参数',
  28 + "41037": '缺少「联系我」type参数',
  29 + "41038": '缺少「联系我」scene参数',
  30 + "41039": '无效的「联系我」type参数',
  31 + "41040": '无效的「联系我」scene参数',
  32 + "41041": '「联系我」使用人数超过限制',
  33 + "41042": '无效的「联系我」style参数',
  34 + "41043": '缺少「联系我」config_id参数',
  35 + "41044": '无效的「联系我」config_id参数',
  36 + "41045": 'API添加「联系我」达到数量上限',
  37 + "42001": 'access_token已过期',
  38 + '43009': '企业未验证主体',
  39 + '45009': '接口调用超过限制',
  40 + '45022': '应用name参数长度不符合系统限制',
  41 + '45024': '帐号数量超过上限',
  42 + '45034': 'url必须有协议头',
  43 + '46004': '指定的用户不存在',
  44 + '48001': 'API功能未授权',
  45 + '48002': 'API接口无权限调用',
  46 + '48003': '不合法的suite_id',
  47 + '48004': '授权关系无效',
  48 + '48005': 'API接口已废弃',
  49 + '48006': '接口权限被收回',
  50 + '60102': 'UserID已存在',
  51 + '670010': '负责人数量超出限制',
  52 + '81014': '标签添加成员，单次添加user或party过多',
  53 + '82001': ' 指定的成员/部门/标签全部为空',
  54 + '84072': '应用未配置客服',
  55 + '84073': '客服userid不在应用配置的客服列表中',
  56 + '84074': '没有外部联系人权限',
  57 + '84075': '不合法或过期的authcode',
  58 + '84076': '缺失authcode',
  59 + '84083': '非服务人员',
  60 + '84084': '非跟进用户',
  61 + '84085': '应用已下架',
  62 + '84144': '确认者的gid不在当前服务商的通讯录中',
  63 + '84145': '确认者gid所在的企业数不能超过5个',
  64 + '84146': '确认者gid最多只能在3个企业下确认合同',
  65 + '86001': '参数 chatid 不合法',
  66 + '86003': '参数 chatid 不存在',
  67 + '86004': '参数 群名不合法',
  68 + '86005': '参数 群主不合法',
  69 + '86006': '群成员数过多或过少',
  70 + '86007': '不合法的群成员',
  71 + },
  72 + skip_verify:1,
  73 +
  74 + is_qy_wx:1,
  75 + qr_code:'',
  76 + phone:'',
  77 +
  78 + err_img:os.imghots + "/miniapp/images/default_g_img.gif"
  79 + },
  80 +
  81 + onLoad: function (t) {
  82 + var th=this;
  83 + this.data.phone=getApp().globalData.userInfo.mobile;
  84 + qrcode('qrcode', "1505955959595", 480, 480, this);
  85 + //th.requestRecommend();
  86 + /*--- 获取一下，会员要不要线上美顾 ---*/
  87 + rq.get("/api/weshop/users/getAndUpdateUser/" + os.stoid + "/" + getApp().globalData.user_id, {
  88 + success: async function (src) {
  89 + if (src.data.code == 0) {
  90 + var u_data = src.data.data;
  91 + if (!u_data.staffId) {
  92 + getApp().confirmBox('该会员无专属导购');
  93 + return false;
  94 + }
  95 + //-- 导购的临时变量 --
  96 + let tp_guide = null;
  97 + let tp_pick = null;
  98 + //获取会员在手店后台的
  99 + await getApp().get_guide_from_staff(u_data.staffId, function (guide) {
  100 + if (!guide) {
  101 + getApp().confirmBox('该会员的专属导购未在手店后台导购列表中');
  102 + return false;
  103 + }
  104 + tp_guide = guide;
  105 + });
  106 + tp_guide.staffName = u_data.staffName;
  107 + tp_guide.staffId = u_data.staffId;
  108 + tp_guide.staffTel = u_data.staffTel || tp_guide.mobile;
  109 + if(!tp_guide.staffTel){
  110 + tp_guide.staffTel=tp_guide.bind_user_mobile;
  111 + }
  112 + await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + tp_guide.pickup_id, {}).then(res => {
  113 + if(res.data.code==0 && res.data.data){
  114 + tp_pick=res.data.data;
  115 + }
  116 + })
  117 + th.setData({
  118 + guide: tp_guide,
  119 + pick_up: tp_pick,
  120 + })
  121 +
  122 +
  123 + th.getopenuserid(tp_guide.id);
  124 +
  125 + }
  126 + }
  127 + })
  128 + },
  129 +
  130 + //打电话
  131 + call:function(e){
  132 + var type=e.currentTarget.dataset.type;
  133 + switch (type+''){
  134 + case "1":
  135 + wx.makePhoneCall({
  136 + phoneNumber: this.data.guide.staffTel,
  137 + })
  138 + break;
  139 + case "2":
  140 + wx.makePhoneCall({
  141 + phoneNumber: this.data.pick_up.pickup_phone,
  142 + })
  143 + break;
  144 + }
  145 + },
  146 +
  147 + change_code(){
  148 + let is_qy_wx=!this.data.is_qy_wx;
  149 + this.setData({
  150 + is_qy_wx
  151 + })
  152 + },
  153 +
  154 + //获取qywxStaffcode 的信息
  155 + getopenuserid(guide_id) {
  156 + let url = "/api/weshop/qyWeChat/qywxStaffcode/getStaffcode";
  157 + getApp().request.promisePost(url, {
  158 + is_json:1,
  159 + data: {
  160 + store_id:os.stoid,
  161 + guide_id:guide_id
  162 + }
  163 + }).then(async res => {
  164 + console.log(res);
  165 + if (res.data.code == 0) {
  166 + // let resdata=JSON.parse(res.data.data);
  167 + let openuserid = res.data.data.openuserid;
  168 + let skip_verify = res.data.data.skip_verify;
  169 + let guide_id =res.data.data.guide_id
  170 + getApp().globalData.guide_id=guide_id
  171 +
  172 + this.setData({
  173 + openuserid,
  174 + skip_verify
  175 + })
  176 +
  177 + this.befgetqy()
  178 +
  179 + }
  180 + })
  181 + },
  182 + async getqy() {
  183 + // wx.showLoading({
  184 + // title: '加载中',
  185 + // mask:true
  186 + // })
  187 + getApp().getConfig(async (e)=>{
  188 +
  189 + var conf=e;
  190 +
  191 + let openuserid = this.data.openuserid
  192 + let skip_verify = this.data.skip_verify ? true : false
  193 + let res = await getApp().request.promisePost(`/apib/weshop/admin/qyWeChat/qyWeChatCorpInfo/postAdminQyApi?accdb=${conf.erpid}&url=externalcontact/add_contact_way&qyid=4`, {
  194 + data: {
  195 + // accdb: getApp().globalData.config.erpid,
  196 + // ApiName: 'api.pos.shop.advancesum.seek',
  197 + // url:'externalcontact/add_contact_way',
  198 + user: openuserid,
  199 + type: 1,
  200 + scene: 2,
  201 + style: 1,
  202 + state: '手店_' + this.data.phone,
  203 + skip_verify
  204 + // is_temp:true,
  205 + // store_id: getApp().globalData.setting.stoid,
  206 + // usercode: "admin",
  207 + // vipid: this.data.userinfo.erpvipid,
  208 + // oddsum: "0",
  209 + // advancesum: cartList.order_amount,
  210 + // storageid: storageid,
  211 + // listform
  212 + },
  213 + is_json: 1
  214 + })
  215 + wx.hideLoading()
  216 + if (res.data && res.data.errcode == 0) {
  217 + this.setData({
  218 + qr_code: res.data.qr_code
  219 + })
  220 + this.saveqy(res.data.config_id, res.data.qr_code)
  221 + } else {
  222 + let errcode = res.data.errcode
  223 + let msg = errcode
  224 + if (this.data.error_arr[errcode]) {
  225 + msg += this.data.error_arr[errcode]
  226 + }
  227 + wx.showModal({
  228 + title: '提示',
  229 + content: '获取失败,错误码:' + msg,
  230 + showCancel: false,
  231 + success(res) {
  232 + if (res.confirm) {
  233 + console.log('用户点击确定')
  234 + } else if (res.cancel) {
  235 + console.log('用户点击取消')
  236 + }
  237 + }
  238 + })
  239 + }
  240 + console.log('获取企业二维码');
  241 + console.log(res);
  242 +
  243 + })
  244 +
  245 +
  246 + },
  247 +
  248 + async befgetqy() {
  249 + wx.showLoading({
  250 + title: '加载中',
  251 + mask: true
  252 + })
  253 + let openuserid = this.data.openuserid
  254 + let res = await getApp().request.promiseGet(`/api/weshop/qyWeChat/qywxConfigList/getMobileInfo/${os.stoid}/${openuserid}/${this.data.phone}`, { data: {} })
  255 + console.log('获取数据库表');
  256 + console.log(res);
  257 + if (res.data && res.data.code == 0) {
  258 + this.setData({
  259 + qr_code: res.data.data.qrcode
  260 + })
  261 + wx.hideLoading()
  262 + } else {
  263 + this.getqy()
  264 + }
  265 +
  266 + },
  267 +
  268 + async saveqy(config_id, qrcode) {
  269 + let openuserid = this.data.openuserid
  270 + let mobile = this.data.phone
  271 + let addtime = ((Date.now()) / 1000).toFixed(0)
  272 + let req_data = {
  273 + store_id: getApp().globalData.setting.stoid,
  274 + openuserid,
  275 + config_id,
  276 + qrcode,
  277 + mobile,
  278 + addtime
  279 + }
  280 + let res = await getApp().request.promisePost(`/api/weshop/qyWeChat/qywxConfigList/save`, {
  281 + data: req_data,
  282 + // is_json: 1
  283 + })
  284 + // wx.hideLoading()
  285 + },
  286 +
  287 + bind_bnerr2(e){
  288 + this.setData({
  289 + qr_code:this.data.imghots + "/miniapp/images/default_g_img.gif"
  290 + })
  291 + }
  292 +
  293 +
  294 +});
packageG/pages/user/my_beauty_consultant/my_beauty_consultant.json 0 → 100644
  View file @8c88309
  1 +{
  2 + "navigationBarTitleText": "我的美顾",
  3 + "enablePullDownRefresh": false
  4 +}
0 \ No newline at end of file 5 \ No newline at end of file
packageG/pages/user/my_beauty_consultant/my_beauty_consultant.wxml 0 → 100644
  View file @8c88309
  1 +
  2 +<view wx:if="{{guide}}" class="content" >
  3 + <view class="flex-center img_box">
  4 + <image wx:if="{{guide.head_pic}}" src="{{guide.head_pic}}" ></image>
  5 + <image wx:else src="{{imghots}}/miniapp/images/no-head.jpg" ></image>
  6 + </view>
  7 +
  8 + <view class="nei_cont">
  9 + <view class="flex ai_c" style="height:37rpx">
  10 + <text class="fs32 c31" style="font-weight: bolder;margin-right:16rpx">{{guide.staffName}}</text>
  11 + <text class="flex-center zs_box fs18">您的专属导购</text>
  12 + </view>
  13 + <view wx:if="{{guide.beauty_strengths}}" class="flex" style="margin-top:20rpx">
  14 + <text class="bq_box fs18 flex-center">{{guide.beauty_strengths}}</text>
  15 + </view>
  16 + </view>
  17 + <!-- 线 -->
  18 + <view class="line"></view>
  19 + <!-- 二维码 -->
  20 + <view class="flex jc-center" style="margin-top: 60rpx;">
  21 + <!-- 企业微信码 -->
  22 + <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>
  23 + <!-- 小程序太阳码 -->
  24 + <image wx:else style="height: 338rpx;width: 338rpx;" src="{{guide.weapp_codeimg}}" show-menu-by-longpress ></image>
  25 + </view>
  26 + <view class="flex jc-center" style="margin-top:20rpx">
  27 + <text class="fs18 biaoqian_box flex-center">小福利TIPS</text>
  28 + </view>
  29 + <view class="flex jc-center" style="font-weight: bolder;margin-top:20rpx">
  30 + <text class="fs28 c31">长按识别二维码，加入我们，好礼送不停！</text>
  31 + </view>
  32 + <!-- 底部内容 -->
  33 + <view wx:if="{{pick_up}}" class="nei_cont" style="margin-top:65rpx">
  34 + <view class="fs28 c31" style="font-weight: bolder;position:relative;">
  35 + {{pick_up.pickup_name}}
  36 + <text bindtap="call" data-type="1" class="mytel n-mytel"></text>
  37 + </view>
  38 + <view class="fs24 c89" style="margin-top:16rpx">营业时间：{{pick_up.trade_starttime}}-{{pick_up.trade_endtime}}</view>
  39 + <view class="fs24 c89" style="margin-top:16rpx;">门店地址：{{pick_up.fulladdress}}</view>
  40 + </view>
  41 +</view>
  42 +
  43 +<view wx:if="{{guide}}" class="flex jc-center" style="margin-top:67rpx">
  44 + <view bindtap="call" data-type="2" class="fs26 flex-center btn tel">电话联系</view>
  45 + <view bindtap="change_code" wx:if="{{is_qy_wx}}" class="fs26 flex-center btn qywx">注册会员</view>
  46 + <view bindtap="change_code" wx:else class="fs26 flex-center btn qywx">添加企业微信</view>
  47 +</view>
  48 +
  49 +<view style="height:127rpx"></view>
0 \ No newline at end of file 50 \ No newline at end of file
packageG/pages/user/my_beauty_consultant/my_beauty_consultant.wxss 0 → 100644
  View file @8c88309
  1 +page {
  2 + background-color: #f4eee9;
  3 +}
  4 +
  5 +.content {
  6 + width: 715rpx;
  7 + margin-top: 105rpx;
  8 + margin-left: 17.5rpx;
  9 + background-color: #fff;
  10 + border-radius: 30rpx;
  11 + padding-bottom: 58rpx;
  12 + position: relative;
  13 +}
  14 +
  15 +.nei_cont {
  16 + padding: 34rpx 58rpx 0 47rpx;
  17 +}
  18 +
  19 +.fs18 {
  20 + font-size: 18rpx;
  21 +}
  22 +
  23 +.c89 {
  24 + color: #898989;
  25 +}
  26 +
  27 +.c31 {
  28 + color: #313131;
  29 +}
  30 +
  31 +.bq_box {
  32 + width: 120rpx;
  33 + height: 34rpx;
  34 + border-radius: 34rpx;
  35 + border: 1rpx solid #ff0000;
  36 + color: #ff0000;
  37 + overflow: hidden;
  38 +}
  39 +
  40 +.zs_box {
  41 + width: 141rpx;
  42 + height: 37rpx;
  43 + color: #fff;
  44 + border-radius: 37rpx;
  45 + background-color: #fd3c47;
  46 +}
  47 +
  48 +.line {
  49 + width: 686rpx;
  50 + border-bottom: 1rpx solid #dcdcdc;
  51 + margin-top: 65rpx;
  52 + margin-left: 13rpx
  53 +}
  54 +
  55 +.g_img {
  56 + width: 480rpx;
  57 + height: 480rpx;
  58 +}
  59 +
  60 +.biaoqian_box {
  61 + width: 133rpx;
  62 + height: 35rpx;
  63 + background-color: #ffe5e5;
  64 + color: #ff0000;
  65 + border-radius: 35rpx;
  66 +}
  67 +
  68 +.btn {
  69 + width: 239rpx;
  70 + height: 70rpx;
  71 + color: #fff;
  72 + border-radius: 70rpx;
  73 +}
  74 +
  75 +.btn.tel {
  76 + background: linear-gradient(90deg, #f9b659 0%, #f8bb66 100%); margin-right: 67rpx;
  77 +}
  78 +
  79 +.btn.qywx {
  80 + background: linear-gradient(90deg, #fe3e4b 0%, #f72d1f 100%);
  81 +}
  82 +
  83 +.img_box{
  84 + position: absolute;top:-73rpx;right: 58rpx;
  85 + width:196rpx; height: 196rpx; border-radius: 50%; overflow: hidden;
  86 +}
  87 +
  88 +.img_box image{
  89 + width: 100%; height: 100%;
  90 +}
  91 +
  92 +@font-face {
  93 + font-family: 'mytel';
  94 + src: url('data:font/woff2;charset=utf-8;base64,d09GMgABAAAAAAOUAA0AAAAAB7AAAAM+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGh4GYACCQhEICoMcgncLCgABNgIkAxAEIAWFAgcyG5gGUVRQCsh+Jth0+BYaohjSis2ysUt6GAvfSnf6qN/FQ7Uf+vZug6hQsY5DF4cg2bhEYtvxMbquSiEa8f3/P/W+bivXPpayaVGHeOZ+yTmxcKkiFa9WpFSwMSHXHmQyHtyC1/8Jro325K2pK//1s+f/cnrTT2Tyd/l3uzYukLI9LR0TKKHep+ags3sepr0ssGLNuAG9TcQnlW9CwKfW+Qrg29zPNmd3oBujoAhVFRIFmeKNFsp9uQavgdfHf1rsKFoqLmfr8hLg+asDtVxvm5n6wYwAwBRChe0YQ2DJUmDMyhRIKfjV0VA/exgB0UoAoqCAfx4BuONooIAE7Ug84y0gAZBzskG+Fqfb7SFPP7e3hUY3hK+8+bTSaLO83qO7UHTDC7eDO+D3XAQLz1EOK5Fv4vlDvE5W5yZqeJvZwaS2tFAnImPjpsOGnepd8sSMouq3B3YQE0XOoBbXi1o7u8aoL7ZDDAf0oleRqS96RgJ0xS3tw6O0w1egPjTQUPwCOnXgQ6OAdYlAgoPeDcjiU55ZEDf4n0wzaLE5fmNBKCMB4pUc2qkFwdzpWeFZmSUSz4agWL/lbMckhX8iNe4fgypI8aL1JyNhXwCR2UHrIHr/jZ/ZZ2j8HThUjjM4kQkEQqBxjSfyAoeVtnb7cgo3p0wSKAoIEAdKH2h/gMiKSoLupUE+TLRveW24siK9uqUC6qCJ1Wq0EzMMzdj5QlCDMHQ6fiQThNY3TwAIBIsvean39r8dnYbXaWvNbt2rCaBdAcGQiD1LQEw9mwGZBohkDf2rZwkKOnWiATDojQBDjgiEdhsIFG2uEKja3QmQ2r0I0KLLOwFatXuPQKeFsEGgy1DcVZEdmAaSDf1stuh1yFb9ajzpG9ti1INt1e/FdjrwWdRlOhInnZCLOXFA8ExgylerRAMMF/3yhCsvCG2QwgjeiB2h2KDg6uBvbq0mbx0ED4Q6vbRcUEkUOAdOrkpKVnx9eiXU9dFKbxTTMBYRIp1aSbgWgQwVCjWhEf5MJuRjEjxESOzHWGOOTo7y+7LyBk7/s/D7gGuMNUwyWVRyWOLX6cHGXm6zvAOUV0Zj6u1EJxZJRApElLbzG7dKBhcAAA==') format('woff2'),
  95 + url('data:font/woff;charset=utf-8;base64,d09GRgABAAAAAAVYAA0AAAAAB7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAFPAAAABoAAAAcolnv50dERUYAAAUcAAAAHgAAAB4AKQAKT1MvMgAAAaAAAABGAAAAYDw+SNhjbWFwAAAB+AAAAD4AAAFCAA/ptGdhc3AAAAUUAAAACAAAAAj//wADZ2x5ZgAAAkQAAAFmAAABnNtvoipoZWFkAAABMAAAADAAAAA2J3IJdWhoZWEAAAFgAAAAHQAAACQHnQOFaG10eAAAAegAAAAPAAAAEAwAAEBsb2NhAAACOAAAAAoAAAAKAM4AAG1heHAAAAGAAAAAHgAAACABEgCZbmFtZQAAA6wAAAFGAAACgl6CAQJwb3N0AAAE9AAAACAAAAAy39V1z3jaY2BkYGAAYtc51wTi+W2+MnCzMIDAI81He+C0w/99zPuZnYBcDgYmkCgAQUkL2HjaY2BkYGBu+N/AEMPCAALM+xkYGVABCwBVIwMrAAAAeNpjYGRgYGBh6AViEGACYi4gZGD4D+YzAAAW1wGsAAB42mNgYWFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDAeecT7jZG7438DAwHyHAUgyMCIpUWBgBABkvAyRAAB42mNhgAAWCHYAAADAAE0AeNpjYGBgZoBgGQZGBhCwAfIYwXwWBgUgzQKEQP4zzv//IaTkL6hKBkY2BhiTgZEJSDAxoAJGhmEPAEYUB6kAAAAAAAAAAAAAAM4AAHjaPY27UsJQGITPmptERQVyIVEYziEJoxg0CSBE42VQG7WxQHC0E6FyLOUVtPN9tLPWZ9FecyycbXb+b/9dIpL9n1fhTTgkNdInT+SZEEdTqA8vSmZiBIbe8twGXM9N0A4D3UilyFzM09stLs/1fLAsDL2MEv4DNL27jMolhAELgzJoGktSHgb8K+KY8qRWMPQseEkz4iTgFYW/iS085GiHIUd9S6xVGld2JiOUgUqHivVjdRbIm93TQScSq/Xzo0BfAmSJ6bYDLELOCKYg+2XHXjVNUchpKwxOERAl6eXqYl5Vi/Mn5+NBP4yisD/4GKamq0iGpVTYbjwaf41H8S43jz2Adqi16Wjm0pQpGZH6LK5ie91m7e7Z2V19ZR9a9bp3EGzYeWMVrmUsQ5GFFCdruSzUGWHBjap4Z7JZVKVSFF4OP9O5ZjPsDyf3N3NWVp5rTfemk1GcJPFo8j253UnIL5BlQOcAAHjafZDNSsNAFIXP9E9tQcSC61kVQUh/lqW7Qt25cFHXbTpJW5JMmEwLXbp15QO49TF8AJ9BcOWDeBqvCBWakMs3595zZiYALvEJhZ+njWthhVPcCVdwgli4Sv1RuEZ+Ea6jhTfhBvUP4SZu1Ei4hbZ6ZoKqnXHVKdP2rHCBkXAF53gQrlK3wjXyk3AdV3gVblB/F25iii/hFjpqiTEcDGbwrAtozLFjXSFkboaorB4YOzPzZqHnO70KbRbZjOK/qb/WPeNibJAw2nFp4k0yc0ctR1pTpjkUHNm3NPoI0KNsXLGyme4HvaP2W9qzMuLwngW2POaAqqdR83O0p6SJxBheISFr5GVvTSWkHjDWZMb9/pViGw+8j3TkbKon3NYkidW5s2sTeg4vyz1yDNHlGx2kB+XhU455nw+73UgCgtCm+AYPanCHAAB42mNgYoAALjDJyIAOWMCiTIxM7CmZiXkZpYkADl4C+QAAAAH//wACAAEAAAAMAAAAFgAAAAIAAQADAAMAAQAEAAAAAgAAAAB42mNgYGBkAIJ7bFp5IPqR5qM9MBoAPo8G0AAA') format('woff');
  96 + font-weight: normal;
  97 + font-style: normal;
  98 + font-display: swap;
  99 +}
  100 +
  101 +.mytel {
  102 + font-family: "mytel" !important;
  103 + font-size: 40rpx;
  104 + font-style: normal;
  105 + -webkit-font-smoothing: antialiased;
  106 + -moz-osx-font-smoothing: grayscale;
  107 + position: absolute;right: 0; top:0;
  108 +}
  109 +
  110 +.n-mytel:before {
  111 + content: "\e609";
  112 +}
  113 +
  114 +
pages/user/index/index.js
  View file @8c88309
@@ -119,7 +119,7 @@ Page({ @@ -119,7 +119,7 @@ Page({
119 /** 119 /**
120 * 生命周期函数--监听页面显示 120 * 生命周期函数--监听页面显示
121 */ 121 */
122 - onShow: function () { 122 + onShow:function () {
123 123
124 124
125 var _that=this; 125 var _that=this;
@@ -545,8 +545,24 @@ Page({ @@ -545,8 +545,24 @@ Page({
545 } 545 }
546 }) 546 })
547 //th.requestRecommend(); 547 //th.requestRecommend();
  548 + /*--- 获取一下，会员要不要线上美顾 ---*/
  549 + rq.get("/api/weshop/users/getAndUpdateUser/" + os.stoid + "/" + getApp().globalData.user_id, {
  550 + success:function(src) {
  551 + if(src.data.code==0){
  552 + var u_data= src.data.data;
  553 + if(u_data.staffId){
  554 + getApp().get_guide_from_staff(u_data.staffId,function (guide){
  555 + if(guide){
  556 + th.setData({
  557 + sh_meigu:1
  558 + })
  559 + }
  560 + });
548 561
549 - 562 + }
  563 + }
  564 + }
  565 + })
550 566
551 } 567 }
552 } 568 }
pages/user/index/index.wxml
  View file @8c88309
@@ -350,7 +350,13 @@ @@ -350,7 +350,13 @@
350 <view class="fs26">{{item.name}}</view> 350 <view class="fs26">{{item.name}}</view>
351 </view> 351 </view>
352 </block> 352 </block>
353 - 353 + <!-- 线增我的美顾的显示 -->
  354 + <block wx:elif="{{item.name=='我的美顾'}}">
  355 + <view wx:if="{{sh_meigu}}" class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav">
  356 + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
  357 + <view class="fs26">{{item.name}}</view>
  358 + </view>
  359 + </block>
354 <block wx:else> 360 <block wx:else>
355 <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav"> 361 <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav">
356 <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> 362 <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>