From 579a3e249d532b1bc16f6da3aadc385129013005 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Fri, 24 Nov 2023 09:16:28 +0800
Subject: [PATCH] 商品加 ID

---
 components/com_top_nav/com_top_nav.js                           |  8 ++++++++
 components/com_top_nav/com_top_nav.wxml                         | 10 +++++++---
 components/com_top_nav/com_top_nav.wxss                         | 18 ++++++++++++++----
 packageA/pages/checkin/checkin.json                             |  7 +++++--
 packageA/pages/checkin/checkin.wxml                             |  3 +++
 packageA/pages/goodsInfo/goodsInfo.json                         |  6 ++++--
 packageA/pages/goodsInfo/goodsInfo.wxml                         |  2 ++
 packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json          |  6 ++++--
 packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml          |  2 ++
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js   |  7 ++++---
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json |  6 ++++--
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml |  2 ++
 packageC/pages/presell/cardInfo/goodsInfo.json                  |  6 ++++--
 packageC/pages/presell/cardInfo/goodsInfo.wxml                  |  2 ++
 packageC/pages/presell/goodsInfo/goodsInfo.js                   |  8 +++++---
 packageC/pages/presell/goodsInfo/goodsInfo.json                 |  6 ++++--
 packageC/pages/presell/goodsInfo/goodsInfo.wxml                 |  1 +
 pages/giftpack/giftpacklist/giftpacklist.json                   |  6 ++++--
 pages/giftpack/giftpacklist/giftpacklist.wxml                   |  2 ++
 pages/goods/goodsInfo/goodsInfo.js                              | 11 +++++++----
 pages/goods/goodsInfo/goodsInfo.json                            |  6 ++++--
 pages/goods/goodsInfo/goodsInfo.wxml                            |  2 ++
 pages/user/my_service/i_service.json                            |  6 ++++--
 pages/user/my_service/i_service.wxml                            |  3 ++-
 pages/user/userqy/userqy.json                                   |  6 ++++--
 pages/user/userqy/userqy.wxml                                   |  1 +
 26 files changed, 105 insertions(+), 38 deletions(-)

diff --git a/components/com_top_nav/com_top_nav.js b/components/com_top_nav/com_top_nav.js
index 78030b0..e9133c1 100644
--- a/components/com_top_nav/com_top_nav.js
+++ b/components/com_top_nav/com_top_nav.js
@@ -25,6 +25,14 @@ Component({
       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')
+          }
+      }
 
   }
 
diff --git a/components/com_top_nav/com_top_nav.wxml b/components/com_top_nav/com_top_nav.wxml
index bed73bc..82f180b 100644
--- a/components/com_top_nav/com_top_nav.wxml
+++ b/components/com_top_nav/com_top_nav.wxml
@@ -1,8 +1,12 @@
 <cover-view class="t_nav" style="height:{{height}}px;background-color:{{bcolor}};color:{{color}}">
    <cover-view class="tab" style="height:{{h1}}px;">
-     ID:{{user_id}}
-   <cover-view class="contant" style="height:{{h2}}px">
-       <cover-view class="title_set">{{title}}</cover-view>
+       <cover-view  class="tb_con" >ID:{{user_id}}<cover-view style="width:20rpx"></cover-view></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>
diff --git a/components/com_top_nav/com_top_nav.wxss b/components/com_top_nav/com_top_nav.wxss
index 7e9eeec..8df33ce 100644
--- a/components/com_top_nav/com_top_nav.wxss
+++ b/components/com_top_nav/com_top_nav.wxss
@@ -1,4 +1,14 @@
-.t_nav{ color: #313131; position:fixed;top:0;left:0; width:100%;z-index:9999; background-color: #fff;font-size: 30rpx  }
-.title_set{ }
-.tab{ font-size:24rpx; display: flex;;align-items: flex-end;width: 100% }
-.contant{ display: flex; justify-content: center; align-items: center; width: 100%; }
+.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 @@
 <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>
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 @@
 <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>
 
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 @@
 <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>
 
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 58a5660..ab6f148 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 @@
 <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>
 
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 @@
 <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>
 
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 @@
+<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>
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 @@
 <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>
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 6e9b777..fda3043 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 @@
+<com_top_nav title="{{gtitle}}"></com_top_nav>
+
 <!-- 判断隐私是不是显示 -->
 <privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop>
 <!-- 促销弹出框 -->
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 @@
+<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>
 
 <!-- 预约内容 -->
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 @@
 <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'>
--
libgit2 0.21.4