From d929b6cd0b8d910ae2dc7fbe70a68d70b0e0a7d7 Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Mon, 1 Apr 2024 23:51:48 +0800
Subject: [PATCH] 1

---
 App.vue                               |  5 +++
 api/user.js                           |  4 ++
 components/Authorize.vue              |  6 +++
 pages.json                            | 12 ++++++
 pages/goods_details/index.vue         |  4 +-
 pages/goods_details/notice.vue        | 60 +++++++++++++++++++++++++++
 pages/goods_details/noticeItem.vue    | 33 +++++++++++++++
 pages/index/component/headerSerch.vue | 10 ++++-
 pages/index/index.vue                 |  1 +
 pages/user/index.vue                  |  9 ++--
 pages/users/user_integral/index.vue   |  2 +-
 11 files changed, 138 insertions(+), 8 deletions(-)
 create mode 100644 pages/goods_details/notice.vue
 create mode 100644 pages/goods_details/noticeItem.vue

diff --git a/App.vue b/App.vue
index 9f884c5..0143076 100644
--- a/App.vue
+++ b/App.vue
@@ -64,6 +64,7 @@
 			...uni.getStorageSync('GLOBAL_DATA') || {}
 		},
 		onLaunch: function(option) {
+			
 			this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 			this.globalData.uid = this.$store.state.app.uid
 			let that = this;
@@ -97,6 +98,10 @@
 						break;
 				}
 			}
+			if(option.query.hasOwnProperty('spread')){
+				that.globalData.spid = option.query.spread
+			}
+			console.log(that.globalData.spid,"分享者的uid")
 			// #endif
 			// 获取导航高度；
 			uni.getSystemInfo({
diff --git a/api/user.js b/api/user.js
index 66d4ff6..c6780ca 100644
--- a/api/user.js
+++ b/api/user.js
@@ -711,4 +711,8 @@ export function jifenToShare(data) {
 //
 export function getUserGroup(data) {
 	return request.get(`user/group`,data)
+}
+// 获取列表
+export function getNoticeList() {
+	return request.get(`notice/list`)
 }
\ No newline at end of file
diff --git a/components/Authorize.vue b/components/Authorize.vue
index c8557eb..b2285fd 100644
--- a/components/Authorize.vue
+++ b/components/Authorize.vue
@@ -191,6 +191,12 @@
 						userInfo.code = this.code;
 						userInfo.spread = app.globalData.spid; //获取推广人ID
 						userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
+						console.log({
+							auth: {
+							type:'routine',
+							auth: userInfo
+						}
+						},"参数")
 						commonAuth({
 							auth: {
 							type:'routine',
diff --git a/pages.json b/pages.json
index 6c1a155..8a4ae0e 100644
--- a/pages.json
+++ b/pages.json
@@ -104,6 +104,18 @@
 						"navigationBarBackgroundColor": "#F2F2F2"
 						// #endif
 					}
+				},
+				{
+					"path": "notice",
+					"style": {
+						"navigationBarTitleText": "公告列表"
+					}
+				},
+				{
+					"path": "noticeItem",
+					"style": {
+						"navigationBarTitleText": "公告详情"
+					}
 				}
 			]
 		},
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index e160806..8dc7888 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -341,10 +341,10 @@
 					<view class="iconfont icon-haibao"></view>
 					<view class="">生成海报</view>
 				</button>
-				<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
+			<!-- 	<button class="item" :class="weixinStatus ? 'item3' : ''" hover-class='none' @click="copyPwd">
 					<view class="iconfont icon-fuzhikouling1"></view>
 					<view>生成口令</view>
-				</button>
+				</button> -->
 			</view>
 			<view class="mask" v-if="posters" @click="listenerActionClose"></view>
 			<!--口令复制结果-->
diff --git a/pages/goods_details/notice.vue b/pages/goods_details/notice.vue
new file mode 100644
index 0000000..ae26fb0
--- /dev/null
+++ b/pages/goods_details/notice.vue
@@ -0,0 +1,60 @@
+<template>
+<div class="notice">
+	<div v-for="(item,index) in list" class="noticeItem" @click="getNoticeItem(item)">
+		<div class="noticeTitle">{{item.notice_title}}</div>
+		<div class="time">{{item.create_time}}</div>
+	</div>
+</div>
+</template>
+
+<script>
+import { getNoticeList } from '@/api/user.js';
+export default{
+	data(){
+		return{
+			list:[]
+		}
+	},
+	methods:{
+		getNoticeList(){
+			getNoticeList().then(res=>{
+				
+				this.list= res.data.list
+			})
+		},
+		getNoticeItem(item){
+			uni.navigateTo({
+				url:'/pages/goods_details/noticeItem?id='+item.notice_id
+			})
+		}
+	},
+	onLoad() {
+		this.getNoticeList()
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.notice{
+	min-height:calc(100vh);
+	.noticeItem{
+		padding:39rpx 29rpx;
+		background: #fff;
+		border-radius: 10px;
+		margin:24rpx;
+		.noticeTitle{
+		
+			font-weight: 400;
+			font-size: 30rpx;
+			color: #333333;
+		}
+		.time{
+			
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #999999;
+			margin-top: 26rpx;
+		}
+	}
+}
+</style>
\ No newline at end of file
diff --git a/pages/goods_details/noticeItem.vue b/pages/goods_details/noticeItem.vue
new file mode 100644
index 0000000..9aac707
--- /dev/null
+++ b/pages/goods_details/noticeItem.vue
@@ -0,0 +1,33 @@
+<template>
+<div>
+	<u-parse :content="content"></u-parse>
+</div>
+</template>
+
+<script>
+import { getNoticeList } from '@/api/user.js';
+export default{
+	data(){
+		return{
+			content:'',
+		}
+	},
+	onLoad(option) {
+		console.log(option);
+		getNoticeList().then(res=>{
+			
+			let list= res.data.list;
+			list.forEach(item=>{
+				if(item.notice_id==option.id){
+					this.content = item.notice_content
+				}
+			})
+			
+		})
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/pages/index/component/headerSerch.vue b/pages/index/component/headerSerch.vue
index 63e2824..142a893 100644
--- a/pages/index/component/headerSerch.vue
+++ b/pages/index/component/headerSerch.vue
@@ -34,7 +34,7 @@
 				<view class="indexTitle">
 					惠通商城
 				</view>
-				<image src="/static/images/xiaoxi.png" mode="" class="xiaoxi"></image>
+				<image src="/static/images/xiaoxi.png" mode="" @click="goChat" class="xiaoxi"></image>
 			</view>
 			<view class="serch-box skeleton-rect" style="height: 110rpx;">
 				<view class="serch-wrapper flex">
@@ -111,7 +111,13 @@
 			}, 300)
 			// #endif
 		},
-		methods: {}
+		methods: {
+			goChat(){
+				uni.navigateTo({
+					url:"/pages/goods_details/notice"
+				})
+			}
+		}
 	}
 </script>
 
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8329269..3ff51f7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -505,6 +505,7 @@ export default {
 	},
 	// #endif
 	onLoad(options) {
+		console.log(options,"liudan")
 		let that = this
 		this._options = options;
 		// #ifdef APP-PLUS
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 954a654..a5738f2 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -44,7 +44,10 @@
 								</view>
 								<!--#endif-->
 								<view class="name" v-if="userInfo.uid">
-									{{userInfo.nickname}}<text style="font-size: 24rpx;border-radius: 5px;background: #E53623;padding: 5rpx 10rpx;margin-left: 20rpx;" v-show="userInfo.group_name">{{userInfo.group_name?userInfo.group_name:''}}</text><image v-if="member_status" class="level_icon" :src="userInfo.member_icon" alt="">
+									{{userInfo.nickname}}
+									<text style="font-size: 24rpx;border-radius: 5px;border: 1px solid #fff;padding: 5rpx 10rpx;margin-left: 20rpx;" v-show="userInfo.group_name">{{userInfo.group_name?userInfo.group_name:''}}</text>
+									<text style="font-size: 24rpx;border-radius: 5px;border: 1px solid #fff;padding: 5rpx 10rpx;margin-left: 20rpx;" v-show="userInfo.agent_district_id">{{userInfo.agent_district_id?'区域经理':''}}</text>
+									<image v-if="member_status" class="level_icon" :src="userInfo.member_icon" alt="">
 									<view class="vip" v-if="userInfo.is_svip > 0 && svip_switch_status == 1">
 										<image src="/static/images/svip.png"></image>
 									</view>
@@ -445,11 +448,11 @@
 			}, 500)
 		},
 		onShareAppMessage(res) {
-			console.log(this.userInfo)
+			console.log(this.userInfo.uid,"999")
 		    //console.log('onShareAppMessage',res);
 		    return {
 		      title: '惠通商城',
-		      path: '/pages/index/index?spread=' + this.userInfo.uid
+		      path: '/pages/index/index?spread='+this.userInfo.uid
 		    }
 		},
 		methods: {
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index 8bb8e20..8a27dbc 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -36,7 +36,7 @@
 					 @click='nav(index)'><text class='iconfont' :class="item.icon"></text>{{item.name}}</view>
 				</view> -->
 				<view class="zhuanrang">
-					<text>惠通宝兑换消费积分</text>
+					<text>消费积分兑换分红点</text>
 					<view class="zhuanrangBtn" @click="show1 = true">
 						立即兑换
 					</view>