diff --git a/app.js b/app.js index 2d5fe48..7d35cf9 100644 --- a/app.js +++ b/app.js @@ -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(); //获取加载的页面 diff --git a/components/com_top_nav/com_top_nav.js b/components/com_top_nav/com_top_nav.js new file mode 100644 index 0000000..de1770c --- /dev/null +++ b/components/com_top_nav/com_top_nav.js @@ -0,0 +1,55 @@ +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 diff --git a/components/com_top_nav/com_top_nav.json b/components/com_top_nav/com_top_nav.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/com_top_nav/com_top_nav.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/com_top_nav/com_top_nav.wxml b/components/com_top_nav/com_top_nav.wxml new file mode 100644 index 0000000..9efea58 --- /dev/null +++ b/components/com_top_nav/com_top_nav.wxml @@ -0,0 +1,15 @@ + + + ID:{{user_no}} + + + + + + + {{title}} + + + + + \ No newline at end of file diff --git a/components/com_top_nav/com_top_nav.wxss b/components/com_top_nav/com_top_nav.wxss new file mode 100644 index 0000000..a4de000 --- /dev/null +++ b/components/com_top_nav/com_top_nav.wxss @@ -0,0 +1,14 @@ +.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); +} diff --git a/packageA/pages/checkin/checkin.json b/packageA/pages/checkin/checkin.json index c387c73..ca3e409 100644 --- a/packageA/pages/checkin/checkin.json +++ b/packageA/pages/checkin/checkin.json @@ -1,5 +1,8 @@ { - "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 diff --git a/packageA/pages/checkin/checkin.wxml b/packageA/pages/checkin/checkin.wxml index 40dafdb..1bd64da 100644 --- a/packageA/pages/checkin/checkin.wxml +++ b/packageA/pages/checkin/checkin.wxml @@ -1,6 +1,9 @@ + + + 规则 diff --git a/packageA/pages/goodsInfo/goodsInfo.json b/packageA/pages/goodsInfo/goodsInfo.json index 4d70c35..95b96a3 100644 --- a/packageA/pages/goodsInfo/goodsInfo.json +++ b/packageA/pages/goodsInfo/goodsInfo.json @@ -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 diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index ab8265e..80b357c 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -3,6 +3,8 @@ + + diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js index 2f2658e..8113137 100644 --- a/packageA/pages/quan_pro/quan_pro.js +++ b/packageA/pages/quan_pro/quan_pro.js @@ -118,9 +118,11 @@ Page({ }, - + onUnload:function(){ + wx.offCopyUrl() + }, onHide: function() { - + wx.offCopyUrl() }, //--滚动到顶部-- doScrollTop: function() { diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json index b1f6157..bfe3050 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json @@ -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 diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml index 5c2e02c..c9a82ce 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml @@ -3,6 +3,8 @@ + + diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.js b/packageB/pages/luckactivity/luckinfo/luckinfo.js index a3962aa..8548579 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.js +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.js @@ -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({ diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.json b/packageB/pages/luckactivity/luckinfo/luckinfo.json index 4b755f6..f1aac9d 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.json +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.json @@ -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 diff --git a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml index 362ab9a..a62f8e0 100644 --- a/packageB/pages/luckactivity/luckinfo/luckinfo.wxml +++ b/packageB/pages/luckactivity/luckinfo/luckinfo.wxml @@ -1,5 +1,8 @@ + + + diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index ce71482..72ebbf9 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -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 }) //-- 把商品的赋值 -- diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json index 58bee0f..fe3d7a7 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json @@ -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 diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index dd5d90a..4c29b41 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -3,6 +3,8 @@ + + diff --git a/packageC/pages/presell/cardInfo/goodsInfo.json b/packageC/pages/presell/cardInfo/goodsInfo.json index 2bd588d..d18dcca 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.json +++ b/packageC/pages/presell/cardInfo/goodsInfo.json @@ -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 diff --git a/packageC/pages/presell/cardInfo/goodsInfo.wxml b/packageC/pages/presell/cardInfo/goodsInfo.wxml index 019b54c..a0390d7 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.wxml +++ b/packageC/pages/presell/cardInfo/goodsInfo.wxml @@ -3,6 +3,8 @@ + + diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 96e81f6..6d9994d 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -3018,7 +3018,7 @@ Page({ } }) - if(!presellList || !presellList.length){ + if(!presellList){ var content = good.goods_name + '未找到预售活动,请取消订单'; th.toast(content); th.setData({ paying: 0 }); diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 7c75c38..e504c71 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -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; diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.json b/packageC/pages/presell/goodsInfo/goodsInfo.json index 2bd588d..d18dcca 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.json +++ b/packageC/pages/presell/goodsInfo/goodsInfo.json @@ -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 diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index 616f29c..a1469bc 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -1,3 +1,4 @@ + diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index d3b5772..8d9504e 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -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; //券要把他补回去 diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index f9ff5e8..a41a257 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -687,7 +687,12 @@ Page({ }); }, - + onUnload:function(){ + wx.offCopyUrl() + }, + onHide: function() { + wx.offCopyUrl() + }, //显示核销码 code_show: function (e) { diff --git a/pages/giftpack/giftpacklist/giftpacklist.json b/pages/giftpack/giftpacklist/giftpacklist.json index 0841c16..dffdf6a 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.json +++ b/pages/giftpack/giftpacklist/giftpacklist.json @@ -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 diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml index 2a1f2f5..701c8be 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.wxml +++ b/pages/giftpack/giftpacklist/giftpacklist.wxml @@ -1,4 +1,6 @@ + + diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 925821f..235259d 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -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; } diff --git a/pages/goods/goodsInfo/goodsInfo.json b/pages/goods/goodsInfo/goodsInfo.json index 8be378d..264c308 100644 --- a/pages/goods/goodsInfo/goodsInfo.json +++ b/pages/goods/goodsInfo/goodsInfo.json @@ -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 diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 11c657e..0c1a6f4 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -1,3 +1,5 @@ + + diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index 4f5b0b5..d75dec2 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -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)) { //-- 获取 -- diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index d130efb..f08e5de 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -10,13 +10,14 @@ 包邮 打{{item.content.sale}}折 送{{item.content.int}}积分 - 送{{item.content.coupon}}元优惠券 + 送{{item.content.coupon_money}}元优惠券 送{{item.content.zp_mode==1?'多赠品':item.content.gift_name}} 送{{item.content.lb_name}} 送{{item.content.zxlb_name}} 送{{item.content.monthgift_name}} + 阶梯促销：{{jieti_prom}} diff --git a/pages/index/index/index.js b/pages/index/index/index.js index ca57a43..f016df5 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -91,7 +91,7 @@ Page({ onLoad: async function (tt) { - + wx.offCopyUrl() wx.showShareMenu({ withShareTicket:true, menus:['shareAppMessage','shareTimeline'] diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 364b626..7f7c037 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -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, { diff --git a/pages/user/index/index.json b/pages/user/index/index.json index 700c0bf..6b8a9e0 100644 --- a/pages/user/index/index.json +++ b/pages/user/index/index.json @@ -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 diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index 8c6f061..fb52e1a 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -3,6 +3,8 @@ + + diff --git a/pages/user/my_service/i_service.json b/pages/user/my_service/i_service.json index 6d98624..a3ba677 100644 --- a/pages/user/my_service/i_service.json +++ b/pages/user/my_service/i_service.json @@ -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 diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml index f0928ad..642b41e 100644 --- a/pages/user/my_service/i_service.wxml +++ b/pages/user/my_service/i_service.wxml @@ -1,3 +1,5 @@ + + @@ -5,7 +7,6 @@ 服务记录 历史预约 - diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index 2c8e0f8..93499df 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -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", { diff --git a/pages/user/userqy/userqy.json b/pages/user/userqy/userqy.json index b803934..1ef951b 100644 --- a/pages/user/userqy/userqy.json +++ b/pages/user/userqy/userqy.json @@ -1,6 +1,8 @@ { "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 diff --git a/pages/user/userqy/userqy.wxml b/pages/user/userqy/userqy.wxml index 6f582ea..edc82af 100644 --- a/pages/user/userqy/userqy.wxml +++ b/pages/user/userqy/userqy.wxml @@ -1,4 +1,5 @@ +