app

xiaopenggithub · Aug 21, 2022 · ef477b4 · ef477b4
1 parent 5fc7cc4
commit ef477b4
Show file tree

Hide file tree

Showing 5 changed files with 177 additions and 70 deletions.
diff --git a/app/manifest.json b/app/manifest.json
@@ -61,6 +61,62 @@
 	"h5": {
 		"router": {
 			"base": ""
-		}		
+		}
+		/*
+		"devServer": {
+			"port": 8084,
+			"disableHostCheck": true,
+			"proxy": {
+				"/api/": {
+					"target": "http://127.0.0.1:8888", //请求的目标域名
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/api": "/"
+					}
+				},
+				"/api/book": {
+					"target": "http://127.0.0.1:8892", //请求的目标域名
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/api": "/"
+					}
+				},
+				"/api/reader": {
+					"target": "http://127.0.0.1:8892", //请求的目标域名
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/api": "/"
+					}
+				},
+				"/api/verifyCode": {
+					"target": "http://127.0.0.1:8892", //请求的目标域名
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/api": "/"
+					}
+				},
+				"/api/activity": {
+					"target": "http://127.0.0.1:8892", //请求的目标域名
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/api": "/"
+					}
+				},
+				"/api/activityOrders": {
+					"target": "http://127.0.0.1:8892", //请求的目标域名
+					"changeOrigin": true,
+					"secure": false,
+					"pathRewrite": {
+						"^/api": "/"
+					}
+				}
+			}
+		},
+		*/
 	}
 }
diff --git a/app/pages.json b/app/pages.json
@@ -48,6 +48,12 @@
 			"style": {
 				"navigationBarTitleText": "借阅详情"
 			}
+		},
+		{
+			"path": "pages/activities/activity",
+			"style": {
+				"navigationBarTitleText": "活动"
+			}
 		}		
 	],
 	"tabBar": {
@@ -56,7 +62,12 @@
 		"backgroundColor": "#ffffff",
 		"list": [{
 			"pagePath": "pages/bookstore/list",
-			"text": "首页",
+			"text": "图书",
+			"iconPath": "static/img/home.png",
+			"selectedIconPath": "static/img/homeHL.png"
+		},{
+			"pagePath": "pages/activities/activity",
+			"text": "活动",
 			"iconPath": "static/img/home.png",
 			"selectedIconPath": "static/img/homeHL.png"
 		}, {

diff --git a/app/pages/activities/activity.vue b/app/pages/activities/activity.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		welcome to activity
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/app/pages/login/login.vue b/app/pages/login/login.vue
@@ -30,10 +30,10 @@
 		mapMutations
 	} from 'vuex'
 	import mInput from '../../components/m-input.vue'
-	import {
-		univerifyLogin,
-		univerifyErrorHandler
-	} from '@/common/univerify.js'
+	// import {
+	// 	univerifyLogin,
+	// 	univerifyErrorHandler
+	// } from '@/common/univerify.js'
 	import {
 		getDeviceUUID
 	} from '@/common/utils.js'
@@ -76,61 +76,61 @@
 		},
 		methods: {
 			...mapMutations(['login']),
-			sendSmsCode() {
-				if (this.codeDuration) {
-					uni.showModal({
-						content: `请在${this.codeDuration}秒后重试`,
-						showCancel: false
-					})
-				}
-				if (!/^1\d{10}$/.test(this.mobile)) {
-					uni.showModal({
-						content: '手机号码填写错误',
-						showCancel: false
-					})
-					return
-				}
-				uniCloud.callFunction({
-					name: 'user-center',
-					data: {
-						action: 'sendSmsCode',
-						params: {
-							mobile: this.mobile,
-							type: 'login'
-						}
-					},
-					success: (e) => {
-						if (e.result.code == 0) {
-							uni.showModal({
-								content: '验证码发送成功，请注意查收',
-								showCancel: false
-							})
-							this.codeDuration = 60
-							this.codeInterVal = setInterval(() => {
-								this.codeDuration--
-								if (this.codeDuration === 0) {
-									if (this.codeInterVal) {
-										clearInterval(this.codeInterVal)
-										this.codeInterVal = null
-									}
-								}
-							}, 1000)
-						} else {
-							uni.showModal({
-								content: '验证码发送失败：' + e.result.msg,
-								showCancel: false
-							})
-						}
+			// sendSmsCode() {
+			// 	if (this.codeDuration) {
+			// 		uni.showModal({
+			// 			content: `请在${this.codeDuration}秒后重试`,
+			// 			showCancel: false
+			// 		})
+			// 	}
+			// 	if (!/^1\d{10}$/.test(this.mobile)) {
+			// 		uni.showModal({
+			// 			content: '手机号码填写错误',
+			// 			showCancel: false
+			// 		})
+			// 		return
+			// 	}
+			// 	uniCloud.callFunction({
+			// 		name: 'user-center',
+			// 		data: {
+			// 			action: 'sendSmsCode',
+			// 			params: {
+			// 				mobile: this.mobile,
+			// 				type: 'login'
+			// 			}
+			// 		},
+			// 		success: (e) => {
+			// 			if (e.result.code == 0) {
+			// 				uni.showModal({
+			// 					content: '验证码发送成功，请注意查收',
+			// 					showCancel: false
+			// 				})
+			// 				this.codeDuration = 60
+			// 				this.codeInterVal = setInterval(() => {
+			// 					this.codeDuration--
+			// 					if (this.codeDuration === 0) {
+			// 						if (this.codeInterVal) {
+			// 							clearInterval(this.codeInterVal)
+			// 							this.codeInterVal = null
+			// 						}
+			// 					}
+			// 				}, 1000)
+			// 			} else {
+			// 				uni.showModal({
+			// 					content: '验证码发送失败：' + e.result.msg,
+			// 					showCancel: false
+			// 				})
+			// 			}
 
-					},
-					fail(e) {
-						uni.showModal({
-							content: '验证码发送失败',
-							showCancel: false
-						})
-					}
-				})
-			},
+			// 		},
+			// 		fail(e) {
+			// 			uni.showModal({
+			// 				content: '验证码发送失败',
+			// 				showCancel: false
+			// 			})
+			// 		}
+			// 	})
+			// },
 			async loginByPwd() {
 				/**
 				 * 客户端对账号信息进行一些必要的校验。

diff --git a/app/pages/user/user.vue b/app/pages/user/user.vue
@@ -18,6 +18,16 @@
 					<text class="list-icon">&#xe639;</text>
 					<text class="list-text">借阅列表</text>
 					<text class="navigat-arrow">&#xe65e;</text>
+				</view>
+				<view class="center-list-item" @click="commingsoon">
+					<text class="list-icon">&#xe639;</text>
+					<text class="list-text">图书捐赠记录</text>
+					<text class="navigat-arrow">&#xe65e;</text>
+				</view>
+				<view class="center-list-item" @click="commingsoon">
+					<text class="list-icon">&#xe639;</text>
+					<text class="list-text">自习室预订记录</text>
+					<text class="navigat-arrow">&#xe65e;</text>
 				</view>
 			</view>
 			<view class="btn-row" v-if="token.length>0">
@@ -32,9 +42,9 @@
 		mapState,
 		mapMutations
 	} from 'vuex'
-	import {
-		univerifyLogin
-	} from '@/common/univerify.js'
+	// import {
+	// 	univerifyLogin
+	// } from '@/common/univerify.js'
 
 	export default {
 		data() {
@@ -56,16 +66,24 @@
 			//this.hasLogin=true;
 		},
 		methods: {
-			...mapMutations(['logout']),
+			...mapMutations(['logout']),
+			commingsoon(){
+				uni.showToast({
+					title:'Comming Soon!'
+				})
+			},
 			bindLogin() {
 				if (!this.hasLogin) {
-					univerifyLogin().catch(err => {
-						if (err === false) return;
+					// univerifyLogin().catch(err => {
+					// 	if (err === false) return;
 						
-						uni.navigateTo({
-							url: '../login/login',
-						});
-					})
+					// 	uni.navigateTo({
+					// 		url: '../login/login',
+					// 	});
+					// })
+					uni.navigateTo({
+						url: '../login/login',
+					});
 				}
 			},
 			bindLogout() {