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

season
2 parents a68c9a69 72add201
Showing 42 changed files with 231 additions and 64 deletions
app.js
components/com_top_nav/com_top_nav.js
components/com_top_nav/com_top_nav.json
components/com_top_nav/com_top_nav.wxml
components/com_top_nav/com_top_nav.wxss
packageA/pages/checkin/checkin.json
packageA/pages/checkin/checkin.wxml
packageA/pages/goodsInfo/goodsInfo.json
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/quan_pro/quan_pro.js
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.json
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/cardInfo/goodsInfo.json
packageC/pages/presell/cardInfo/goodsInfo.wxml
@@ -135,6 +135,14 @@ App({
                     }
                 })
             }
+             else if(app.globalData.user_id){  //-- 启用默认的user_id --
+                app.promiseGet("/api/weshop/users/get/" + app.globalData.setting.stoid + "/" + app.globalData.user_id,{}).then(res=>{
+                    if(res.data.code==0){
+                        app.globalData.userInfo = res.data.data;
+                        wx.setStorageSync("userinfo",app.globalData.userInfo);
+                    }
+                })
+            }
             else {
                 //--拿下code--
                 wx.login({
@@ -179,14 +187,7 @@ App({
                 })
             }
  
-            // else if(app.globalData.user_id){  //-- 启用默认的user_id --
-            //     app.promiseGet("/api/weshop/users/get/" + app.globalData.setting.stoid + "/" + app.globalData.user_id,{}).then(res=>{
-            //         if(res.data.code==0){
-            //             app.globalData.userInfo = res.data.data;
-            //             wx.setStorageSync("userinfo",app.globalData.userInfo);
-            //         }
-            //     })
-            // }
+           
         }
         wx.getSystemInfo({
             success: (res) => {
@@ -196,8 +197,10 @@ App({
                 if (modelmes && modelmes.indexOf('iPhone X') != -1) {　　//XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
                     this.globalData.isIpx = true
                 }
+                this.globalData.navBarHeight = 44 + res.statusBarHeight
             },
         })
+        this.globalData.menuInfo = wx.getMenuButtonBoundingClientRect() || {}
  
         var th = this;
         var pages = getCurrentPages();             //获取加载的页面
+var t = getApp(),os = t.globalData.setting;
+Component({
+  properties: {
+      title:{
+          type: String,value: '你好'
+      },
+      bcolor:{
+          type: String,value: '#fff'
+      },
+      color:{
+          type: String,value: '#313131'
+      }
+  },
+  data: {
+    iurl: os.imghost,
+    height:0,
+    h1:0,
+    h2:0,
+    user_id:0
+  },
+  ready: function() {
+      let height= getApp().globalData.navBarHeight;
+      let menuInfo = getApp().globalData.menuInfo;
+      let user_no='';
+      if(getApp().globalData.userInfo){
+          user_no=getApp().globalData.userInfo.erpvipno
+      }
+      //-- 胶囊的高度 --
+      this.setData({height,h1:menuInfo.top,h2:menuInfo.height,user_no});
+  },
+  pageLifetimes: {
+        //要处理一下，游客登录后的界面的变化,主要还该是改变会员
+        show: function () {
+            let user_no='';
+            if(getApp().globalData.userInfo){
+                user_no=getApp().globalData.userInfo.erpvipno
+            }
+            //-- 胶囊的高度 --
+            this.setData({user_no});
+        }
+  },
+
+  methods: {
+      go_back(){
+          let pages = getCurrentPages();
+          if (pages[pages.length - 2]) {
+              wx.navigateBack();
+          } else {
+              getApp().goto('/pages/index/index/index')
+          }
+      }
+
+  }
+
+})
 \ No newline at end of file
+{
+  "component": true,
+  "usingComponents": {}
+}
 \ No newline at end of file
+<cover-view class="t_nav" style="height:{{height}}px;background-color:{{bcolor}};color:{{color}}">
+   <cover-view class="tab" style="height:{{h1}}px;">
+       <cover-view wx:if="{{user_no}}" class="tb_con" >ID:{{user_no}}<cover-view style="width:20rpx"></cover-view></cover-view>
+       <cover-view wx:else class="tb_con" ></cover-view>
+   </cover-view>
+   <cover-view bindtap="go_back" class="contant" style="height:{{h2}}px">
+       <cover-view  class="gback">
+            <cover-view class="rote_view" style="border: 3rpx solid {{color}};"></cover-view>
+       </cover-view>
+       <cover-view >{{title}}</cover-view>
+   </cover-view>
+
+</cover-view>
+<!-- 用于顶开层的高 -->
+<cover-view style="height:{{height}}px"></cover-view>
 \ No newline at end of file
+.t_nav{position:fixed;top:0;left:0; width:100%;z-index:9999; background-color: #fff;font-size: 30rpx  }
+.tab{ font-size:18rpx; position: relative }
+.tb_con{
+    position: absolute; bottom: 0; right: 10rpx; display: flex;
+}
+.contant{ display: flex; justify-content: center; align-items: center; width: 100%; position: relative }
+.gback{
+    position: absolute; left: 24rpx;  width: 17rpx; height: 37rpx;overflow: hidden;
+}
+
+.rote_view{
+    width: 24rpx; height: 24rpx; margin-left: 6rpx; margin-top: 6rpx;
+    transform: rotate(45deg);
+}
 {
-  "usingComponents": {},
+    "usingComponents": {
+	  "com_top_nav": "/components/com_top_nav/com_top_nav"
+    },
 	"navigationBarTitleText": "签到领积分",
-	"enablePullDownRefresh": false
+	"enablePullDownRefresh": false,
+	"navigationStyle": "custom"
 }
 \ No newline at end of file
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <wxs src="checkin.wxs" module="myUtil"></wxs>
+
+<com_top_nav title="签到领积分"></com_top_nav>
+
 <view class="checkin-container">
 	<view class="rule-container flex">
 		<view class="rule" bindtap="showRules">规则</view>
@@ -5,6 +5,8 @@
         "nav_box": "/components/nav_box/nav_box",
         "warn": "/components/long_warn/long_warn",
         "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
-        "privacy_pop": "/components/privacy_pop/privacy_pop"
-    }
+        "privacy_pop": "/components/privacy_pop/privacy_pop",
+        "com_top_nav": "/components/com_top_nav/com_top_nav"
+    },
+    "navigationStyle": "custom"
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
  
+<com_top_nav title="{{data.goods_name}}"></com_top_nav>
+
 <!-- 判断隐私是不是显示 -->
 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
  
@@ -118,9 +118,11 @@ Page({
  
  
   },
-
+  onUnload:function(){
+    wx.offCopyUrl()
+  },
   onHide: function() {
-    
+    wx.offCopyUrl()
   },
   //--滚动到顶部--
   doScrollTop: function() {
@@ -6,6 +6,8 @@
         "warn": "/components/long_warn/long_warn",
         "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
 		"share": "/components/share/share",
-        "privacy_pop": "/components/privacy_pop/privacy_pop"
-    }
+        "privacy_pop": "/components/privacy_pop/privacy_pop",
+        "com_top_nav": "/components/com_top_nav/com_top_nav"
+    },
+    "navigationStyle": "custom"
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
  
+<com_top_nav title="{{data.goods_name}}"></com_top_nav>
+
 <!-- 判断隐私是不是显示 -->
 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
  
@@ -262,11 +262,10 @@ Page({
     let first_leader = null;
     this.data.options = options;
  
-
-    wx.setNavigationBarTitle({
-      title: options.title,
-    });
-
+    // wx.setNavigationBarTitle({
+    //   title: options.title,
+    // });
+    this.setData({l_title:options.title})
  
     app.isLogin().then(function (data) {//进入页面前已经授权登录成功
       self.setData({
@@ -2,10 +2,12 @@
   "usingComponents": {
 		"lucky-wheel":"/packageB/miniprogram_npm/mini-luck-draw/lucky-wheel/index",
 		"qrcode": "/components/my-qrcode/my-qrcode",
-    "nodata": "/components/nodata/nodata",
-    "store_popup":"/components/store_popup/store_popup",
-		"painter": "/packageB/components/painter/painter"
+        "nodata": "/components/nodata/nodata",
+        "store_popup":"/components/store_popup/store_popup",
+		"painter": "/packageB/components/painter/painter",
+	    "com_top_nav": "/components/com_top_nav/com_top_nav"
 	},
 	"enablePullDownRefresh": false,
-	"navigationBarTitleText": "幸运大转盘"
+	"navigationBarTitleText": "幸运大转盘",
+	"navigationStyle": "custom"
 }
 \ No newline at end of file
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <wxs module="tool" src="./tool.wxs"></wxs>
+
+<com_top_nav title="{{l_title}}"></com_top_nav>
+
 <view class="luck-container {{!template&&custom ? 'on':''}}" style="{{luckStyle}}">
 <!-- <view class="luck-container {{!template&&custom ? 'on':''}}" style="background: {{template&&template.colorCode ? template.colorCode:(custom ? '#f0f0f0':'#da104b')}} url({{bannerUrl ? bannerUrl:''}}) no-repeat;"> -->
 	<!-- 中奖人员 -->
@@ -1075,10 +1075,11 @@ Page({
           }
  
           //动态获取商品名称
-          wx.setNavigationBarTitle({
-            title: t.data.data.goods_name,
-          });
+          // wx.setNavigationBarTitle({
+          //   title: t.data.data.goods_name,
+          // });
  
+          ee.setData({gtitle: t.data.data.goods_name })
  
  
           //-- 把商品的赋值 --
@@ -6,6 +6,8 @@
         "warn": "/components/long_warn/long_warn",
         "goods_recommend": "/components/goods_list/goods_list",
 		"share": "/components/share/share",
-        "privacy_pop": "/components/privacy_pop/privacy_pop"
-    }
+        "privacy_pop": "/components/privacy_pop/privacy_pop",
+        "com_top_nav": "/components/com_top_nav/com_top_nav"
+    },
+    "navigationStyle": "custom"
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
  
+<com_top_nav title="{{gtitle}}"></com_top_nav>
+
 <!-- 判断隐私是不是显示 -->
 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
  
@@ -6,6 +6,8 @@
         "warn": "/components/long_warn/long_warn",
         "goods_recommend": "/components/goods_list/goods_list",
 		"share": "/components/share/share",
-        "privacy_pop": "/components/privacy_pop/privacy_pop"
-    }
+        "privacy_pop": "/components/privacy_pop/privacy_pop",
+        "com_top_nav": "/components/com_top_nav/com_top_nav"
+    },
+    "navigationStyle": "custom"
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
  
+<com_top_nav title="{{data.goods_name}}"></com_top_nav>
+
 <!-- 判断隐私是不是显示 -->
 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
  
@@ -3018,7 +3018,7 @@ Page({
                 }
             })
  
-            if(!presellList || !presellList.length){
+            if(!presellList){
                 var content = good.goods_name + '未找到预售活动,请取消订单';
                 th.toast(content);
                 th.setData({ paying: 0 });
@@ -814,9 +814,11 @@ Page({
               }
             }
             //动态获取商品名称
-            wx.setNavigationBarTitle({
-              title: t.data.data.goods_name,
-            });
+            // wx.setNavigationBarTitle({
+            //   title: t.data.data.goods_name,
+            // });
+
+            ee.setData({gtitle:t.data.data.goods_name})
  
             t.data.data.prom_id=  th.data.presell_id;
             t.data.data.prom_type=  8;
@@ -6,6 +6,8 @@
         "warn": "/components/long_warn/long_warn",
         "goods_recommend": "/components/goods_list/goods_list",
 		"share": "/components/share/share",
-        "privacy_pop": "/components/privacy_pop/privacy_pop"
-    }
+        "privacy_pop": "/components/privacy_pop/privacy_pop",
+        "com_top_nav": "/components/com_top_nav/com_top_nav"
+    },
+    "navigationStyle": "custom"
 }
 \ No newline at end of file
+<com_top_nav title="{{gtitle}}"></com_top_nav>
 <import src="../../../../utils/wxParse/wxParse.wxml"></import>
 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
@@ -1437,17 +1437,17 @@ Page({
         item1.is_order_yh=1;
         item1.is_post_temp=1;
         //如果是秒杀,团购的时候,优惠促销和搭配购的时候
-        if([1,2,3,5,6,7].indexOf(item1.prom_type)>-1){
+        if([1,2,3,5,6,7,10].indexOf(item1.prom_type)>-1){
           var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
               + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
           await app.request.promiseGet(url,{}).then(res=>{
             if(res.data.code==0){
               console.log(res.data.data,"111");
               //组合促销有另外一个字段名is_orderyh，在控制订单促销的叠加
-              if(item1.prom_type!=7){
+
+              if(item1.prom_type!=7 && item1.prom_type!=10) {
                   item1.is_order_yh=res.data.data.is_order_yh;
-              }
-              else item1.is_order_yh=0;
+              }else item1.is_order_yh=0;
  
               item1.is_post_temp=res.data.data.is_post_temp;
             }
@@ -2956,12 +2956,14 @@ Page({
         o_price += item[jc].goods_price * item[jc].goods_num;
  
         //--- 秒杀, 团购的时候，判断有没有订单优惠和包邮模板的叠加 ---
-        if( [1,2,3,5,6,7].indexOf(item[jc].prom_type)>-1){
+        if( [1,2,3,5,6,7,10].indexOf(item[jc].prom_type)>-1){
  
           var gd_price=item[jc].goods_price;
           if(item[jc].account_fir) gd_price=item[jc].account_fir;
  
-          if(!item[jc].is_order_yh && !item[jc].whsle_id && item[jc].prom_type!=7){
+
+          //组合购和阶梯购是订单优惠是另外算的
+          if(!item[jc].is_order_yh && !item[jc].whsle_id && item[jc].prom_type!=7 && item[jc].prom_type!=10){
             no_order_yh+=gd_price * item[jc].goods_num;
             if(item[jc].quan_num) no_order_yh-=item[jc].quan_num;  //券要把他补回去
  
@@ -687,7 +687,12 @@ Page({
         });
  
     },
-
+    onUnload:function(){
+      wx.offCopyUrl()
+    },
+    onHide: function() {
+      wx.offCopyUrl()
+    },
  
     //显示核销码
     code_show: function (e) {
@@ -5,6 +5,8 @@
     "my_confirm": "/components/my_confirm/my_confirm",
       "qr_code": "/components/qr_code/qr_code",
       "nav_b": "/components/nav_b/nav_b",
-      "share": "/components/share/share"
-  }
+      "share": "/components/share/share",
+      "com_top_nav": "/components/com_top_nav/com_top_nav"
+  },
+  "navigationStyle": "custom"
 }
 \ No newline at end of file
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+<com_top_nav title="礼包详情"></com_top_nav>
+
 <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}}">
   <view class="box_top data-v-3a5b7e36">
     <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
@@ -1029,7 +1029,7 @@ Page({
                     title: '商品已经下架',
                     showCancel: !1,
                     complete: function () {
-                      let pages = getCurrentPages();
+                        let pages = getCurrentPages();
                         if (pages[pages.length - 2]) {
                           wx.navigateBack();
                         } else {
@@ -1079,9 +1079,12 @@ Page({
  
  
                 //动态获取商品名称
-                wx.setNavigationBarTitle({
-                  title: t.data.data.goods_name,
-                });
+                // wx.setNavigationBarTitle({
+                //   title: t.data.data.goods_name,
+                // });
+
+                ee.setData({gtitle:t.data.data.goods_name})
+
  
                 var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0);
  
@@ -3433,7 +3436,7 @@ Page({
               var req_d = {
                 "store_id": os.stoid,
                 "goods_id": that.data.gid,
-                "user_id": user_id,
+                "user_id": getApp().globalData.user_id,
               }
               getApp().request.get(url, {
                 data: req_d,
@@ -8487,7 +8490,7 @@ Page({
                                   }
                                   var url = "/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + item.act_id;
                                   await getApp().request.promiseGet(url, {}).then(rs => {
-                                    if (rs.data.code == 0) {
+                                    if (rs.data.code == 0 && rs.data.data) {
                                       f_more[i].price = rs.data.data.user_price;
  
                                     }
@@ -7,6 +7,8 @@
         "goods_recommend": "/components/goods_list/goods_list",
 		"share": "/components/share/share",
 		"pro_pop": "/components/promate_pop/promate_pop",
-        "privacy_pop": "/components/privacy_pop/privacy_pop"
-    }
+        "privacy_pop": "/components/privacy_pop/privacy_pop",
+         "com_top_nav": "/components/com_top_nav/com_top_nav"
+    },
+    "navigationStyle": "custom"
 }
 \ No newline at end of file
+<com_top_nav title="{{gtitle}}"></com_top_nav>
+
 <!-- 判断隐私是不是显示 -->
 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
 <!-- 促销弹出框 -->
@@ -280,6 +280,17 @@ Page({
             var content=JSON.parse(arr[i].preferential_type);
             arr[i].content=content;
  
+
+            //--送礼包--
+            if(parseInt(content.is_coupon)) {
+                //-- 获取 --
+                await getApp().request.promiseGet("/api/weshop/prom/coupon/get/"+content.coupon, {
+                }).then(res => {
+                    if(res.data.code==0 && res.data.data )
+                        arr[i].content.coupon_money=res.data.data.money;
+                })
+            }
+            
              //--送礼包--
              if(parseInt(content.is_libao)) {
                 //-- 获取 --
@@ -10,13 +10,14 @@
            <text space="{{true}}" wx:if="{{item.content.past && item.content.past!='0'}}">包邮 </text>
            <text space="{{true}}" wx:if="{{item.content.is_sale && item.content.is_sale!='0'}}">打{{item.content.sale}}折 </text>
            <text space="{{true}}" wx:if="{{item.content.is_int && item.content.is_int!='0'}}">送{{item.content.int}}积分 </text>
-           <text space="{{true}}" wx:if="{{item.content.is_coupon && item.content.is_coupon!='0'}}">送{{item.content.coupon}}元优惠券 </text>
+           <text space="{{true}}" wx:if="{{item.content.is_coupon && item.content.is_coupon!='0'}}">送{{item.content.coupon_money}}元优惠券 </text>
            <text space="{{true}}" wx:if="{{item.content.is_gift  && item.content.is_gift!='0'}}">送{{item.content.zp_mode==1?'多赠品':item.content.gift_name}} </text>
            <text space="{{true}}" wx:if="{{item.content.is_libao && item.content.is_libao!='0'}}">送{{item.content.lb_name}} </text>
            <text space="{{true}}" wx:if="{{item.content.is_zxlibao && item.content.is_zxlibao!='0'}}">送{{item.content.zxlb_name}} </text>
            <text space="{{true}}" wx:if="{{item.content.is_monthgiftbag && item.content.is_monthgiftbag!='0'}}">送{{item.content.monthgift_name}} </text>
          </view>
      </block>
+
      <!-- 新增 -->
 	 <view wx:if="{{jieti_prom}}" class="fs30 ellipsis-1" style="padding: 20rpx">阶梯促销：{{jieti_prom}}</view>
  
@@ -91,7 +91,7 @@ Page({
  
  
 	onLoad: async function (tt) {
-
+    wx.offCopyUrl()
 		wx.showShareMenu({
 			withShareTicket:true,
 			menus:['shareAppMessage','shareTimeline']
@@ -72,6 +72,7 @@ Page({
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function (options) {
+    wx.offCopyUrl()
 		self = this;
 		var th = this;
 		getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, {
@@ -2,7 +2,9 @@
   "usingComponents": {
     "pop_txt": "/components/userqy_pop_up/userqy_pop_up",
   	"goods_recommend": "/components/goods_list/goods_list",
-    "privacy_pop": "/components/privacy_pop/privacy_pop"
+    "privacy_pop": "/components/privacy_pop/privacy_pop",
+    "com_top_nav": "/components/com_top_nav/com_top_nav"
   },
-  "navigationBarTitleText": "会员中心"
+  "navigationBarTitleText": "会员中心",
+  "navigationStyle": "custom"
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@
 <!-- <import src="../../tabbar/tabbar.wxml" />
 <template is="tabBar" data="{{tabBar}}" /> -->
 <wxs src="filter.wxs" module="util"></wxs>
+<com_top_nav title="会员中心"></com_top_nav>
+
 <view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}">
   <view class="xc-user">
     <view class="xc-head rel">
@@ -5,6 +5,8 @@
     "qr_code": "/components/qr_code/qr_code",
     "warn": "/components/long_warn/long_warn",
     "my_confirm": "/components/my_confirm/my_confirm",
-    "nav_b": "/components/nav_b/nav_b"
-  }
+    "nav_b": "/components/nav_b/nav_b",
+    "com_top_nav": "/components/com_top_nav/com_top_nav"
+  },
+  "navigationStyle": "custom"
 }
 \ No newline at end of file
+<com_top_nav title="服务项目"></com_top_nav>
+
 <!-- 背景图片 -->
 <view catchtap="close">
   <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"/>
@@ -5,7 +7,6 @@
 		<navigator class="fs26 white" url="/packageA/pages/service_record/service_record">服务记录</navigator>
 		<navigator class="fs26 white" url="/pages/user/my_service/hist_service">历史预约</navigator>
 	</view>
-	
 </view>
  
 <!-- 预约内容 -->
@@ -1019,6 +1019,7 @@ Page({
     //往上提交美导的ID
     if(th.data.fir_guide_id!=th.data.user.staffId){
       datas.staffId=th.data.user.staffId;
+      datas.StaffName=th.data.user.staffName;
     }
  
     getApp().request.put("/api/weshop/users/updateUserInfo", {
 {
   "navigationBarTitleText": "会员权益",
   "usingComponents": {
-    "pop_txt": "/components/userqy_pop_up/userqy_pop_up"
-  }
+    "pop_txt": "/components/userqy_pop_up/userqy_pop_up",
+    "com_top_nav": "/components/com_top_nav/com_top_nav"
+  },
+  "navigationStyle": "custom"
 }
 \ No newline at end of file
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+<com_top_nav title="会员权益"></com_top_nav>
 <view class="xc-userqy-frame">
   <!-- 顶部 -->
   <view class='user-frame rel'>