diff --git a/app.js b/app.js index c91a560..5e8c6b0 100644 --- a/app.js +++ b/app.js @@ -197,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..e9133c1 --- /dev/null +++ b/components/com_top_nav/com_top_nav.js @@ -0,0 +1,39 @@ +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; + //-- 胶囊的高度 -- + this.setData({height,h1:menuInfo.top,h2:menuInfo.height,user_id:getApp().globalData.user_id}); + }, + 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..82f180b --- /dev/null +++ b/components/com_top_nav/com_top_nav.wxml @@ -0,0 +1,14 @@ + + + ID:{{user_id}} + + + + + + {{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..8df33ce --- /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:24rpx; 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/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/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/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..4a74e33 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); 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/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/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 @@ +