From cf70e64d14d1e84d87a315045a41fe3d3ae4044e Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 28 Nov 2024 14:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                | 28 +++++++--------
 pages.json                   |  6 ++++
 pages/index/index.vue        |  2 +-
 pages/login/login.vue        | 24 +++++++++----
 pages/user/user.vue          |  4 +--
 pages/verification/index.vue |  2 +-
 static/js/request.js         |  4 +--
 subPackages/user/myNews.vue  | 67 ++++++++++++++++++++++++++++++++++++
 8 files changed, 111 insertions(+), 26 deletions(-)
 create mode 100644 subPackages/user/myNews.vue

diff --git a/manifest.json b/manifest.json
index 7354e1a..bd19b67 100644
--- a/manifest.json
+++ b/manifest.json
@@ -76,20 +76,20 @@
     },
     "vueVersion" : "2",
     "h5" : {
-        "devServer" : {
-            "port" : 5173, //端口号
-            "disableHostCheck" : true,
-            "proxy" : {
-                "/api" : {
-                    "target" : "https://tlgz.sz-trip.com/", //目标接口域名
-                    "changeOrigin" : true, //是否跨域
-                    "secure" : true, // 设置支持https协议的代理
-                    "pathRewrite" : {
-                        "^/api" : "" //意思就是把devApi这个替换成空 ''
-                    }
-                }
-            }
-        },
+        // "devServer" : {
+        //     "port" : 5173, //端口号
+        //     "disableHostCheck" : true,
+        //     "proxy" : {
+        //         "/api" : {
+        //             "target" : "http://47.103.142.123:1010/", //目标接口域名
+        //             "changeOrigin" : true, //是否跨域
+        //             "secure" : true, // 设置支持https协议的代理
+        //             "pathRewrite" : {
+        //                 "^/api" : "" //意思就是把devApi这个替换成空 ''
+        //             }
+        //         }
+        //     }
+        // },
         "router" : {
             "mode" : "history"
         },
diff --git a/pages.json b/pages.json
index cefd1fd..94f464c 100644
--- a/pages.json
+++ b/pages.json
@@ -41,6 +41,12 @@
 					"navigationBarTitleText": "uni-app"
 				}
 			},
+			{
+				"path": "user/myNews",
+				"style": {
+					"navigationBarTitleText": "我的消息"
+				}
+			},
 			{
 				"path": "user/register",
 				"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 79aa48a..1ff6a6c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -26,7 +26,7 @@
 		</view>
 
 		<!-- 日历 -->
-		<view class="calendar">
+		<view class="calendar" v-if="typeIndex == 0">
 			<view class="calendar-top flex-between">
 				<view @click="preNextDate(0)">
 					<img src="https://static.ticket.sz-trip.com/tourGuide/images/index/leftIcon.png" class="iconfont"
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0662b69..cb3033a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -4,12 +4,12 @@
 		
 		<view class="item flex-between" style="margin-top: 83rpx;">
 			<image src="https://static.ticket.sz-trip.com/tourGuide/images/login/phone.png" mode="" class="icon"></image>
-			<input type="text" v-model="form.phone" placeholder="请输入手机号"/>
+			<input type="text" v-model="form.username" placeholder="请输入手机号"/>
 		</view>
 		
 		<view class="item flex-between">
 			<image src="https://static.ticket.sz-trip.com/tourGuide/images/login/code.png" mode="" class="icon"></image>
-			<input type="text" v-model="form.code" placeholder="请输入图形验证码"/>
+			<input type="text" v-model="form.captchaCodeId" placeholder="请输入图形验证码"/>
 			<image src="https://static.ticket.sz-trip.com/tourGuide/images/index/topImg.png" mode="" class="code-img"></image>
 		</view>
 		
@@ -20,7 +20,7 @@
 			<image src="https://static.ticket.sz-trip.com/tourGuide/images/login/closeEye.png" mode="" class="eye-img" @click="showPassword = true" v-else></image>
 		</view>
 		
-		<view class="btn">
+		<view class="btn" @click="login">
 			立即登录
 		</view>
 	</view>
@@ -31,12 +31,24 @@
 		data() {
 			return {
 				form: {
-					phone: '',
-					code: '',
-					password: ''
+					username: '17717512304',
+					captchaCodeId: '558092',
+					password: '512304'
 				},
 				showPassword: true
 			}
+		},
+		onShow() {
+			this.Post({},'/api/Merchants/get_graphic').then(res => {
+				console.log(res)
+			})
+		},
+		methods: {
+			login() {
+				this.Post(this.form,'/api/Merchants/login_member').then(res => {
+					console.log(res)
+				})
+			}
 		}
 	}
 </script>
diff --git a/pages/user/user.vue b/pages/user/user.vue
index ffe237c..dcd8a70 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -15,7 +15,7 @@
 		</view>
 		
 		<view class="box">
-			<view v-for="(item,index) in list" :key="index" class="flex-between">
+			<view v-for="(item,index) in list" :key="index" class="flex-between" @click="gotoPath(item.path)">
 				<view class="title">{{item.title}}</view>
 				<image src="https://static.ticket.sz-trip.com/tourGuide/images/user/rightGray.png" mode=""></image>
 			</view>
@@ -30,7 +30,7 @@
 				list: [
 					{
 						title: '我的消息',
-						path: ''
+						path: '/subPackages/user/myNews'
 					},
 					{
 						title: '我的订单',
diff --git a/pages/verification/index.vue b/pages/verification/index.vue
index 3af5787..10f3ce3 100644
--- a/pages/verification/index.vue
+++ b/pages/verification/index.vue
@@ -132,7 +132,7 @@
 </template>
 
 <script>
-	import wxsdk from 'weixin-js-sdk'
+	// import wxsdk from 'weixin-js-sdk'
 	// todo扫码 微信内H5扫码
 	// https://ask.dcloud.net.cn/article/35380
 	export default {
diff --git a/static/js/request.js b/static/js/request.js
index 2f98f1f..6e2a1e4 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -1,10 +1,10 @@
 import Vue from 'vue'
 import store from '@/store'
 
-let NEWAPIURL = process.env.NODE_ENV == 'development' ? 'https://tlgz.sz-trip.com' : 'https://tlgz.sz-trip.com'
+let NEWAPIURL = process.env.NODE_ENV == 'development' ? 'http://47.103.142.123:1010' : 'http://47.103.142.123:1010'
 Vue.prototype.NEWAPIURL = NEWAPIURL
 // #ifdef H5
- NEWAPIURL = '/api'
+ // NEWAPIURL = '/api'
 // #endif
 
 Vue.prototype.Post = (params, apiurl) => {
diff --git a/subPackages/user/myNews.vue b/subPackages/user/myNews.vue
new file mode 100644
index 0000000..7937c74
--- /dev/null
+++ b/subPackages/user/myNews.vue
@@ -0,0 +1,67 @@
+<template>
+	<view class="bg">
+		<view class="item" v-for="(item,index) in list" :key="index">
+			<view class="title">
+				{{item.title}} <span v-if="!item.isRead"></span>
+			</view>
+			<view class="time">{{item.time}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [
+					{
+						title: '导游信息审核通知',
+						time: '2024-11-23',
+						isRead: false
+					},
+					{
+						title: '导游信息审核通知',
+						time: '2024-11-23',
+						isRead: true
+					}
+				]
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		min-height: 100vh;
+		background: #F5F5F5;
+		padding-top: 50rpx;
+	}
+	
+	.item {
+		padding: 26rpx 20rpx 20rpx;
+		background: #FFFFFF;
+		border-radius: 13rpx;
+		width: 697rpx;
+		margin: 0 auto 21rpx;
+		
+		.title {
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #000000;
+			
+			span {
+				width: 11rpx;
+				height: 11rpx;
+				background: #E5131B;
+				border-radius: 50%;
+			}
+		}
+		
+		.time {
+			font-weight: 500;
+			font-size: 25rpx;
+			color: #717171;
+			margin-top: 22rpx;
+		}
+	}
+</style>
\ No newline at end of file