Merge branch 'master' of http://139.9.50.163:3000/Project2024/menber-center

pages/dynamic/dynamic/dynamic.vue

@@ -1,5 +1,19 @@
 <template>
 	<view class="container">
+		<u-sticky>
+			<view class="search-box">
+				<u-search
+					v-model="searchForm.keyword"
+					:clearabled="true"
+					bg-color="#E5E5E5"
+					:input-style="searchInputStyle"
+					placeholder="请输入搜索内容"
+					@search="onSearchConfirm"
+					@custom="onSearchConfirm"
+					@clear="onSearchClear"
+				></u-search>
+			</view>
+		</u-sticky>
 		<view class="list-box">
 			<view class="list-item-box" v-for="item in list" :key="item.id" @click="onDynamicClick(item)">
 				<view class="main-box">

pages/login/login.vue

@@ -421,6 +421,7 @@
 						const openidRes = await wxLoginOpenid({code : wxcode})
 						if(openidRes?.data){
 							const { openid, sessionKey } = openidRes.data
+							this.useAuthStore.setOpenid(openid)
 							const phoneRes = await wxloginPhone({ openid, phoneCode: code})
 							const { phone, token, isNewUser } = phoneRes.data;
 							this.useAuthStore.setPhone(phone);

pages/notice/notice/notice.vue

@@ -1,14 +1,19 @@
 <template>
 	<view class="container">
-<!-- 		<view class="search-box">
-			<u-search
-				v-model="searchForm.keyword"
-				:clearabled="true"
-				bg-color="#E5E5E5"
-				:input-style="searchInputStyle"
-				placeholder="请输入搜索内容"
-			></u-search>
-		</view> -->
+		<u-sticky>
+			<view class="search-box">
+				<u-search
+					v-model="searchForm.keyword"
+					:clearabled="true"
+					bg-color="#E5E5E5"
+					:input-style="searchInputStyle"
+					placeholder="请输入搜索内容"
+					@search="onSearchConfirm"
+					@custom="onSearchConfirm"
+					@clear="onSearchClear"
+				></u-search>
+			</view>
+		</u-sticky>
 		<view class="list-box">
 			<view class="list-item-box" v-for="item in list" :key="item.id" @click="onNoticeClick(item)">
 				<view class="main-box">

pages/reportDetail/reportDetail.vue

@@ -91,7 +91,7 @@
 	})
 	const openid = computed(() => {
 		authStore.loadOpenid()
-		console.log(authStore.openid, 1111)
+		// console.log(authStore.openid, 1111)
 		return authStore.openid
 	})
 	const buyShow = ref(false)
@@ -132,8 +132,8 @@
 
 	// 是否登录
 	const isLogin = computed(() => {
-		return false
-		// return getToken() ? true : false
+		// return false
+		return getToken() ? true : false
 	})
 
 	// 是否购买/免费
@@ -354,7 +354,7 @@
 		return {
 			title: title.value,
 			path: `/pages/reportDetail/reportDetail?id=${id.value}&title=${title.value}`,
-			imageUrl: await cutShareImg(imgurl.value)
+			imageUrl: imgurl.value
 		};
 	})
 
@@ -363,7 +363,7 @@
 		return {
 			title: title.value,
 			query: `id=${id.value}&title=${title.value}`,
-			imageUrl: await cutShareImg(imgurl.value)
+			imageUrl: imgurl.value
 		};
 	})
 </script>