From b740ad1f46adbd2462d106f5c4fd084d89f88660 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 23 Nov 2023 17:15:07 +0800
Subject: [PATCH] user_id显示的游湖

---
 packageB/pages/luckactivity/luckinfo/luckinfo.js   |  9 ++++-----
 packageB/pages/luckactivity/luckinfo/luckinfo.json | 10 ++++++----
 packageB/pages/luckactivity/luckinfo/luckinfo.wxml |  3 +++
 pages/user/index/index.json                        |  6 ++++--
 pages/user/index/index.wxml                        |  2 ++
 5 files changed, 19 insertions(+), 11 deletions(-)

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 @@
 <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;"> -->
 	<!-- 中奖人员 -->
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 @@
 <!-- <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">
--
libgit2 0.21.4