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

pages/index/index.vue

@@ -269,7 +269,7 @@ import { msg, msgSuccess } from '../../utils/common'
 			id: 'pay',
 			isLogin: true,
 			title: '会费缴交',
-			icon: 'icon-jinqian-jiage',
+			icon: 'icon-shangchuanchenggong',
 			url: '/pages/huiFeiJiaoJiao/huiFeiJiaoJiao',
 			toOtherApp: false,
 			otherAppId: '其他小程序的appid'
@@ -302,17 +302,18 @@ import { msg, msgSuccess } from '../../utils/common'
 			}
 		}
 		if (data.id === 'index') {
-			// const src = encodeURIComponent(jlrzsUrl.value);
+			// jlrzsUrl.value = 'https://www.gzrea.cn:8089/start/534C6DA13FDBAD13479F099E9FC873DF/4D3433353936/'
+			const src = encodeURIComponent(jlrzsUrl.value);
 			
-			// uni.navigateTo({
-			// 	url: `/pages/webview/webview?url=${src}`
-			// });
-			uni.setClipboardData({
-				data: jlrzsUrl.value,
-				success: function () {
-					msg("链接已复制，请在浏览器中打开")
-				}
+			uni.navigateTo({
+				url: `/pages/webview/webview?url=${src}`
 			});
+			// uni.setClipboardData({
+			// 	data: jlrzsUrl.value,
+			// 	success: function () {
+			// 		msg("链接已复制，请在浏览器中打开")
+			// 	}
+			// });
 			return
 		}
 		uni.navigateTo({

pages/initial/initial.vue

@@ -23,11 +23,11 @@
 					其他手机号/账号登录
 				</view>
 			</view>
-			<view class="app-user-book  mb-30">
+			<!-- <view class="app-user-book  mb-30">
 				<u-checkbox-group style="display: flex;justify-content: center;">
 					<u-checkbox v-model="userBook" name="yes" shape="circle">我已阅读&#x300A;运营商一键登录服务协议&#x300B;</u-checkbox>
 				</u-checkbox-group>
-			</view>
+			</view> -->
 		</view>
 		<u-modal v-model="userBookModal" mask-close-able class="modal" show-cancel-button
 			:title-style="{fontWeight: 'bold'}" @confirm="confirmModal">
@@ -53,7 +53,7 @@
 		me
 	} from '@/api/user.js'
 	const authStore = useAuthStore()
-	const userBook = ref(false)
+	const userBook = ref(true)
 	const userBookModal = ref(false)
 	function toLogin() {
 		uni.navigateTo({

pages/swiperDetail/swiperDetail.vue

@@ -13,11 +13,13 @@
 		ref
 	} from 'vue'
 	import {
-		onLoad
+		onLoad, onShareAppMessage, onShareTimeline
 	} from '@dcloudio/uni-app'
 	import {
 		getSwiperDetail
 	} from '@/api/home.js'
+	const currentId = ref(null);
+	const currentTitle = ref(null);
 	const announcement = ref({
 		title: "",
 		content: "", // 假设这是后端返回的内容
@@ -37,6 +39,9 @@
 		getSwiperDetail(id).then(res => {
 			if (res?.data) {
 				announcement.value = res.data
+				uni.setNavigationBarTitle({
+					title: announcement.value.title
+				});
 			}
 		})
 	}
@@ -44,8 +49,24 @@
 		const {
 			id
 		} = option
+		currentId.value = id
 		init(id)
 	})
+	
+	onShareAppMessage(async (res) => {
+		return {
+			title: announcement.value.title,
+			path: `/pages/swiperDetail/swiperDetail?id=${currentId.value}`
+		};
+	})
+	
+	onShareTimeline(async () => {
+		// console.log(imgurl.value)&title=${currentTitle.value}
+		return {
+			title: announcement.value.title,
+			query: `id=${currentId.value}`
+		};
+	})
 </script>
 
 <style scoped>
@@ -94,7 +115,7 @@
 	.date {
 		font-size: 14px;
 		color: #999;
-		text-align: right;
+		text-align: center;
 		/* 时间右对齐 */
 		margin-top: 10px;
 		/* 与内容分离 */

static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4808041 */
-  src: url('iconfont.woff2?t=1747985648773') format('woff2'),
-       url('iconfont.woff?t=1747985648773') format('woff'),
-       url('iconfont.ttf?t=1747985648773') format('truetype');
+  src: url('iconfont.woff2?t=1748424242246') format('woff2'),
+       url('iconfont.woff?t=1748424242246') format('woff'),
+       url('iconfont.ttf?t=1748424242246') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shangchuanchenggong:before {
+  content: "\e6bc";
+}
+
+.icon-zhengchangshangbao:before {
+  content: "\e619";
+}
+
 .icon-nianjianmingxi:before {
   content: "\e643";
 }

static/fonts/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "18261848",
+      "name": "上传成功",
+      "font_class": "shangchuanchenggong",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+    {
+      "icon_id": "22850127",
+      "name": "正常上报",
+      "font_class": "zhengchangshangbao",
+      "unicode": "e619",
+      "unicode_decimal": 58905
+    },
+    {
       "icon_id": "32621192",
       "name": "年检",
       "font_class": "nianjianmingxi",