Commit 579a3e249d532b1bc16f6da3aadc385129013005

Authored by yvan.ni
1 parent b15c7062

商品加 ID

components/com_top_nav/com_top_nav.js
... ... @@ -25,6 +25,14 @@ Component({
25 25 this.setData({height,h1:menuInfo.top,h2:menuInfo.height,user_id:getApp().globalData.user_id});
26 26 },
27 27 methods: {
  28 + go_back(){
  29 + let pages = getCurrentPages();
  30 + if (pages[pages.length - 2]) {
  31 + wx.navigateBack();
  32 + } else {
  33 + getApp().goto('/pages/index/index/index')
  34 + }
  35 + }
28 36  
29 37 }
30 38  
... ...
components/com_top_nav/com_top_nav.wxml
1 1 <cover-view class="t_nav" style="height:{{height}}px;background-color:{{bcolor}};color:{{color}}">
2 2 <cover-view class="tab" style="height:{{h1}}px;">
3   - ID:{{user_id}}
4   - <cover-view class="contant" style="height:{{h2}}px">
5   - <cover-view class="title_set">{{title}}</cover-view>
  3 + <cover-view class="tb_con" >ID:{{user_id}}<cover-view style="width:20rpx"></cover-view></cover-view>
  4 + </cover-view>
  5 + <cover-view bindtap="go_back" class="contant" style="height:{{h2}}px">
  6 + <cover-view class="gback">
  7 + <cover-view class="rote_view" style="border: 3rpx solid {{color}};"></cover-view>
  8 + </cover-view>
  9 + <cover-view >{{title}}</cover-view>
6 10 </cover-view>
7 11  
8 12 </cover-view>
... ...
components/com_top_nav/com_top_nav.wxss
1   -.t_nav{ color: #313131; position:fixed;top:0;left:0; width:100%;z-index:9999; background-color: #fff;font-size: 30rpx }
2   -.title_set{ }
3   -.tab{ font-size:24rpx; display: flex;;align-items: flex-end;width: 100% }
4   -.contant{ display: flex; justify-content: center; align-items: center; width: 100%; }
  1 +.t_nav{position:fixed;top:0;left:0; width:100%;z-index:9999; background-color: #fff;font-size: 30rpx }
  2 +.tab{ font-size:24rpx; position: relative }
  3 +.tb_con{
  4 + position: absolute; bottom: 0; right: 10rpx; display: flex;
  5 +}
  6 +.contant{ display: flex; justify-content: center; align-items: center; width: 100%; position: relative }
  7 +.gback{
  8 + position: absolute; left: 24rpx; width: 17rpx; height: 37rpx;overflow: hidden;
  9 +}
  10 +
  11 +.rote_view{
  12 + width: 24rpx; height: 24rpx; margin-left: 6rpx; margin-top: 6rpx;
  13 + transform: rotate(45deg);
  14 +}
... ...
packageA/pages/checkin/checkin.json
1 1 {
2   - "usingComponents": {},
  2 + "usingComponents": {
  3 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  4 + },
3 5 "navigationBarTitleText": "签到领积分",
4   - "enablePullDownRefresh": false
  6 + "enablePullDownRefresh": false,
  7 + "navigationStyle": "custom"
5 8 }
6 9 \ No newline at end of file
... ...
packageA/pages/checkin/checkin.wxml
1 1 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
2 2 <wxs module="g_filter" src="g_filter.wxs"></wxs>
3 3 <wxs src="checkin.wxs" module="myUtil"></wxs>
  4 +
  5 +<com_top_nav title="签到领积分"></com_top_nav>
  6 +
4 7 <view class="checkin-container">
5 8 <view class="rule-container flex">
6 9 <view class="rule" bindtap="showRules">规则</view>
... ...
packageA/pages/goodsInfo/goodsInfo.json
... ... @@ -5,6 +5,8 @@
5 5 "nav_box": "/components/nav_box/nav_box",
6 6 "warn": "/components/long_warn/long_warn",
7 7 "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
8   - "privacy_pop": "/components/privacy_pop/privacy_pop"
9   - }
  8 + "privacy_pop": "/components/privacy_pop/privacy_pop",
  9 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  10 + },
  11 + "navigationStyle": "custom"
10 12 }
11 13 \ No newline at end of file
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
... ... @@ -3,6 +3,8 @@
3 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 4 <wxs module="tool" src="filter.wxs"></wxs>
5 5  
  6 +<com_top_nav title="{{data.goods_name}}"></com_top_nav>
  7 +
6 8 <!-- 判断隐私是不是显示 -->
7 9 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
8 10  
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
... ... @@ -6,6 +6,8 @@
6 6 "warn": "/components/long_warn/long_warn",
7 7 "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list",
8 8 "share": "/components/share/share",
9   - "privacy_pop": "/components/privacy_pop/privacy_pop"
10   - }
  9 + "privacy_pop": "/components/privacy_pop/privacy_pop",
  10 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  11 + },
  12 + "navigationStyle": "custom"
11 13 }
12 14 \ No newline at end of file
... ...
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
... ... @@ -3,6 +3,8 @@
3 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 4 <wxs module="tool" src="filter.wxs"></wxs>
5 5  
  6 +<com_top_nav title="{{data.goods_name}}"></com_top_nav>
  7 +
6 8 <!-- 判断隐私是不是显示 -->
7 9 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
8 10  
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
... ... @@ -1075,10 +1075,11 @@ Page({
1075 1075 }
1076 1076  
1077 1077 //动态获取商品名称
1078   - wx.setNavigationBarTitle({
1079   - title: t.data.data.goods_name,
1080   - });
  1078 + // wx.setNavigationBarTitle({
  1079 + // title: t.data.data.goods_name,
  1080 + // });
1081 1081  
  1082 + ee.setData({gtitle: t.data.data.goods_name })
1082 1083  
1083 1084  
1084 1085 //-- 把商品的赋值 --
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
... ... @@ -6,6 +6,8 @@
6 6 "warn": "/components/long_warn/long_warn",
7 7 "goods_recommend": "/components/goods_list/goods_list",
8 8 "share": "/components/share/share",
9   - "privacy_pop": "/components/privacy_pop/privacy_pop"
10   - }
  9 + "privacy_pop": "/components/privacy_pop/privacy_pop",
  10 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  11 + },
  12 + "navigationStyle": "custom"
11 13 }
12 14 \ No newline at end of file
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
... ... @@ -3,6 +3,8 @@
3 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 4 <wxs module="tool" src="filter.wxs"></wxs>
5 5  
  6 +<com_top_nav title="{{gtitle}}"></com_top_nav>
  7 +
6 8 <!-- 判断隐私是不是显示 -->
7 9 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
8 10  
... ...
packageC/pages/presell/cardInfo/goodsInfo.json
... ... @@ -6,6 +6,8 @@
6 6 "warn": "/components/long_warn/long_warn",
7 7 "goods_recommend": "/components/goods_list/goods_list",
8 8 "share": "/components/share/share",
9   - "privacy_pop": "/components/privacy_pop/privacy_pop"
10   - }
  9 + "privacy_pop": "/components/privacy_pop/privacy_pop",
  10 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  11 + },
  12 + "navigationStyle": "custom"
11 13 }
12 14 \ No newline at end of file
... ...
packageC/pages/presell/cardInfo/goodsInfo.wxml
... ... @@ -3,6 +3,8 @@
3 3 <wxs module="g_filters" src="g_filter.wxs"></wxs>
4 4 <wxs module="tool" src="filter.wxs"></wxs>
5 5  
  6 +<com_top_nav title="{{data.goods_name}}"></com_top_nav>
  7 +
6 8 <!-- 判断隐私是不是显示 -->
7 9 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
8 10  
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
... ... @@ -814,9 +814,11 @@ Page({
814 814 }
815 815 }
816 816 //动态获取商品名称
817   - wx.setNavigationBarTitle({
818   - title: t.data.data.goods_name,
819   - });
  817 + // wx.setNavigationBarTitle({
  818 + // title: t.data.data.goods_name,
  819 + // });
  820 +
  821 + ee.setData({gtitle:t.data.data.goods_name})
820 822  
821 823 t.data.data.prom_id= th.data.presell_id;
822 824 t.data.data.prom_type= 8;
... ...
packageC/pages/presell/goodsInfo/goodsInfo.json
... ... @@ -6,6 +6,8 @@
6 6 "warn": "/components/long_warn/long_warn",
7 7 "goods_recommend": "/components/goods_list/goods_list",
8 8 "share": "/components/share/share",
9   - "privacy_pop": "/components/privacy_pop/privacy_pop"
10   - }
  9 + "privacy_pop": "/components/privacy_pop/privacy_pop",
  10 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  11 + },
  12 + "navigationStyle": "custom"
11 13 }
12 14 \ No newline at end of file
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  1 +<com_top_nav title="{{gtitle}}"></com_top_nav>
1 2 <import src="../../../../utils/wxParse/wxParse.wxml"></import>
2 3 <wxs module="filters" src="../../../../utils/filter.wxs"></wxs>
3 4 <wxs module="g_filters" src="g_filter.wxs"></wxs>
... ...
pages/giftpack/giftpacklist/giftpacklist.json
... ... @@ -5,6 +5,8 @@
5 5 "my_confirm": "/components/my_confirm/my_confirm",
6 6 "qr_code": "/components/qr_code/qr_code",
7 7 "nav_b": "/components/nav_b/nav_b",
8   - "share": "/components/share/share"
9   - }
  8 + "share": "/components/share/share",
  9 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  10 + },
  11 + "navigationStyle": "custom"
10 12 }
11 13 \ No newline at end of file
... ...
pages/giftpack/giftpacklist/giftpacklist.wxml
1 1 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
  2 +<com_top_nav title="礼包详情"></com_top_nav>
  3 +
2 4 <view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}}">
3 5 <view class="box_top data-v-3a5b7e36">
4 6 <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
... ...
pages/goods/goodsInfo/goodsInfo.js
... ... @@ -1029,7 +1029,7 @@ Page({
1029 1029 title: '商品已经下架',
1030 1030 showCancel: !1,
1031 1031 complete: function () {
1032   - let pages = getCurrentPages();
  1032 + let pages = getCurrentPages();
1033 1033 if (pages[pages.length - 2]) {
1034 1034 wx.navigateBack();
1035 1035 } else {
... ... @@ -1079,9 +1079,12 @@ Page({
1079 1079  
1080 1080  
1081 1081 //动态获取商品名称
1082   - wx.setNavigationBarTitle({
1083   - title: t.data.data.goods_name,
1084   - });
  1082 + // wx.setNavigationBarTitle({
  1083 + // title: t.data.data.goods_name,
  1084 + // });
  1085 +
  1086 + ee.setData({gtitle:t.data.data.goods_name})
  1087 +
1085 1088  
1086 1089 var p_type = parseInt(ee.data.prom_type ? ee.data.prom_type : 0);
1087 1090  
... ...
pages/goods/goodsInfo/goodsInfo.json
... ... @@ -7,6 +7,8 @@
7 7 "goods_recommend": "/components/goods_list/goods_list",
8 8 "share": "/components/share/share",
9 9 "pro_pop": "/components/promate_pop/promate_pop",
10   - "privacy_pop": "/components/privacy_pop/privacy_pop"
11   - }
  10 + "privacy_pop": "/components/privacy_pop/privacy_pop",
  11 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  12 + },
  13 + "navigationStyle": "custom"
12 14 }
13 15 \ No newline at end of file
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  1 +<com_top_nav title="{{gtitle}}"></com_top_nav>
  2 +
1 3 <!-- 判断隐私是不是显示 -->
2 4 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
3 5 <!-- 促销弹出框 -->
... ...
pages/user/my_service/i_service.json
... ... @@ -5,6 +5,8 @@
5 5 "qr_code": "/components/qr_code/qr_code",
6 6 "warn": "/components/long_warn/long_warn",
7 7 "my_confirm": "/components/my_confirm/my_confirm",
8   - "nav_b": "/components/nav_b/nav_b"
9   - }
  8 + "nav_b": "/components/nav_b/nav_b",
  9 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  10 + },
  11 + "navigationStyle": "custom"
10 12 }
11 13 \ No newline at end of file
... ...
pages/user/my_service/i_service.wxml
  1 +<com_top_nav title="服务项目"></com_top_nav>
  2 +
1 3 <!-- 背景图片 -->
2 4 <view catchtap="close">
3 5 <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"/>
... ... @@ -5,7 +7,6 @@
5 7 <navigator class="fs26 white" url="/packageA/pages/service_record/service_record">服务记录</navigator>
6 8 <navigator class="fs26 white" url="/pages/user/my_service/hist_service">历史预约</navigator>
7 9 </view>
8   -
9 10 </view>
10 11  
11 12 <!-- 预约内容 -->
... ...
pages/user/userqy/userqy.json
1 1 {
2 2 "navigationBarTitleText": "会员权益",
3 3 "usingComponents": {
4   - "pop_txt": "/components/userqy_pop_up/userqy_pop_up"
5   - }
  4 + "pop_txt": "/components/userqy_pop_up/userqy_pop_up",
  5 + "com_top_nav": "/components/com_top_nav/com_top_nav"
  6 + },
  7 + "navigationStyle": "custom"
6 8 }
7 9 \ No newline at end of file
... ...
pages/user/userqy/userqy.wxml
1 1 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
  2 +<com_top_nav title="会员权益"></com_top_nav>
2 3 <view class="xc-userqy-frame">
3 4 <!-- 顶部 -->
4 5 <view class='user-frame rel'>
... ...