改了一些bug

App.vue

@@ -1,42 +1,54 @@
 <script>
 	export default {
 		onLaunch: function() {
+			//#ifdef APP-PLUS
+			//获取已保存在本地的用户信息，该内容在登录页面登录成功之后，才保存到本地的
+			const userInfo = uni.getStorageSync('token');
+			if (userInfo) {
+				uni.reLaunch({
+					url: "/pages/index/index",
+				})
+			} else {
+				uni.navigateTo({
+					url: '/pages/login/login'
+				});
+			}
+			//#endif
 		},
 		onShow: function() {
 			//this.getAuth();
 		},
-		onHide: function() {
-		},
-		methods:{
-			
+		onHide: function() {},
+		methods: {
+
 		}
 	}
 </script>
 
 <style lang="scss">
 	/*每个页面公共css */
-	
+
 	/* uView基础样式 */
 	@import "uview-ui/index.scss";
-	
-	
+
+
 	//全局页面背景色
-	page{
+	page {
 		// background-color: #f7f7f7;
 	}
-	
+
 	// 点击时背景灰色
 	// .hover-class{
 	// 	background-color: #f7f7f7!important;
 	// }
 	//底部安全距离
-	.bottom-safety{
+	.bottom-safety {
 		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 	}
-	
+
 	//全局白色背景
-	.bgc-f{
+	.bgc-f {
 		background-color: #ffffff;
 	}
-</style>
+</style>

apis/api.js

@@ -1,15 +1,27 @@
 import ajax from '../utils/request.js'
 
-const netServe =  {
-	doLogin(data) { return ajax.postForm('/api/doLogin', data)}, 
-	// doRefister(data) { return ajax.postJson('/sp-home/AppUser/register', data) }
-	// doRefister: (params = {}) => ajax.postJson('/sp-home/AppUser/register', params),
-}
-
 
 export default {
-    doLogin(data) {
-        return ajax.postForm('/sp-admin/app/AppUser/login', data)
-    },
-	// netServe
-}
+	doLogin(data) {
+		return ajax.postForm('/sp-admin/app/AppUser/login', data)
+	},
+	doRefister(data) {
+		return ajax.postJson('/sp-admin/app/AppUser/register', data)
+	},
+	// 获取注册身份下拉框信息
+	getIdentifyList(data) {
+		return ajax.get('/sp-admin/app/AppRole/getList', data)
+	},
+	//服务协议
+	getAgreement(data) {
+		return ajax.get('/level-one-server/app/TbAgreement/getById',data)
+	},
+	// 轮播图
+	getBanner(data) {
+		return ajax.get('/level-one-server/app/TbBanner/getList',data)
+	},
+	// 首页菜单
+	getMenu(data) {
+		return ajax.get('/sp-admin/ReRoleMenu/getList',data)
+	}
+}

pages.json

@@ -3,65 +3,92 @@
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTitleText": ""
-				//登录
-				//"navigationStyle":"custom"
-			}
-		}, {
-			"path": "pages/login/chooseRole",
-			"style": {
-				"navigationBarTitleText": "选择角色",
-				"enablePullDownRefresh": false
-			}
+		"path": "pages/index/index",
+		"style": {
+			"navigationBarTitleText": "首页",
+			"enablePullDownRefresh": false
+		}
 
-		}, {
-			"path": "pages/login/register",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
+	}, {
+		"path": "pages/personal/personal",
+		"style": {
+			"navigationBarTitleText": "我的",
+			"enablePullDownRefresh": false
+		}
 
-		}, {
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
+	}, {
+		"path": "pages/message/message",
+		"style": {
+			"navigationBarTitleText": "消息",
+			"enablePullDownRefresh": false
+		}
 
+	}, {
+		"path": "pages/order/order",
+		"style": {
+			"navigationBarTitleText": "订单",
+			"enablePullDownRefresh": false
 		}
 
-	    ,{
-            "path" : "pages/personal/personal",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
+	}, {
+		"path": "pages/login/login",
+		"style": {
+			"navigationBarTitleText": ""
+			//登录
+			//"navigationStyle":"custom"
+		}
+	}, {
+		"path": "pages/login/chooseRole",
+		"style": {
+			"navigationBarTitleText": "选择角色",
+			"enablePullDownRefresh": false
+		}
+
+	}, {
+		"path": "pages/login/register",
+		"style": {
+			"navigationBarTitleText": "",
+			"enablePullDownRefresh": false
+		}
+
+	}, {
+		"path": "pages/login/userAgreement",
+		"style": {
+			"navigationBarTitleText": "",
+			"enablePullDownRefresh": false
+		}
+
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "uni-app",
+		// "navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
 		"color": "#7A7E83",
-		"selectedColor": "#3cc51f",
 		"borderStyle": "black",
+		"selectedColor": "#00BFFF",
 		"backgroundColor": "#ffffff",
 		"list": [{
 			"pagePath": "pages/index/index",
-			"iconPath": "static/image/icon_component.png",
-			"selectedIconPath": "static/image/icon_component_HL.png",
+			"iconPath": "static/images/tabbar/home.png",
+			"selectedIconPath": "static/images/tabbar/home-active.png",
 			"text": "首页"
 		}, {
+			"pagePath": "pages/order/order",
+			"iconPath": "static/images/tabbar/order.png",
+			"selectedIconPath": "static/images/tabbar/order-active.png",
+			"text": "订单"
+		}, {
+			"pagePath": "pages/message/message",
+			"iconPath": "static/images/tabbar/message.png",
+			"selectedIconPath": "static/images/tabbar/message-active.png",
+			"text": "消息"
+		}, {
 			"pagePath": "pages/personal/personal",
-			"iconPath": "static/image/icon_API.png",
-			"selectedIconPath": "static/image/icon_API_HL.png",
+			"iconPath": "static/images/tabbar/my.png",
+			"selectedIconPath": "static/images/tabbar/my-active.png",
 			"text": "我的"
 		}]
 	}

pages/index/index.vue

@@ -1,6 +1,17 @@
 <template>
 	<view>
-		
+		<navigation-bar title="首页" background-color="#fff" front-color="#000000" />
+		<view class="wrap">
+			<u-swiper :list="list"  keyName="image" indicator indicatorMode="line" height="200"></u-swiper>
+		</view>
+		<view class="grid">
+			<u-grid @click="click">
+				<u-grid-item v-for="(baseListItem,baseListIndex) in menuList" :key="baseListIndex">
+					<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="baseListItem.name" :size="50"></u-icon>
+					<text class="grid-text">{{baseListItem.title}}</text>
+				</u-grid-item>
+			</u-grid>
+		</view>
 	</view>
 </template>
 
@@ -8,15 +19,54 @@
 	export default {
 		data() {
 			return {
-				
+				// list: [
+				// 	require('@/static/images/swiper/20230728155923.jpg'),
+				// 	require('@/static/images/swiper/20230728160039.jpg'),
+				// 	require('@/static/images/swiper/20230728160045.jpg'),
+				// ],
+				list: [],
+				menuList: []
 			}
 		},
+		created() {
+			this.getBanner()
+			this.getMenu()
+		},
 		methods: {
-			
+			click(name) {
+				this.$refs.uToast.success(`点击了第${name}个`)
+			},
+			getBanner() {
+				this.$api.getBanner().then(res => {
+					this.list = res.data
+					// console.log(this.list)
+				})
+			},
+			getMenu() {
+				this.$api.getMenu().then(res => {
+					// this.menuList = res.data
+					console.log(res)
+				})
+			}
 		}
 	}
 </script>
 
 <style>
+	page {
+		padding: 10px;
+	}
 
-</style>
+	.grid {
+		margin: 10px 0;
+	}
+
+	.grid-text {
+		font-size: 18px;
+		color: #909399;
+		padding: 10rpx 0 20rpx 0rpx;
+		/* #ifndef APP-PLUS */
+		box-sizing: border-box;
+		/* #endif */
+	}
+</style>

pages/login/chooseRole.vue

@@ -1,22 +1,12 @@
 <template>
 	<view class="u-page">
 		<navigation-bar title="选择角色" background-color="#fff" front-color="#000000" />
-		<u-list>
+		<u-list :scrollable="false" height="500px">
 			<u-list-item v-for="(item, index) in roles" :key="index" >
-				<!-- #fff7f7 -->
-				<!-- <u-row customStyle="marginBottom:10px;backgroundColor: '#fff7f7';height: '200px'"> -->
-				<u-row @click="choose(item)" :class="index==current? 'active-custom-style':'custom-style'">
-					<u-col span="8">
-						<view class="r-role">
-							{{item.name}}
-						</view>
-					</u-col>
-					<u-col span="4">
-						<view class="l-role">
-							<u-image :showLoading="true" :src="item.src" width="110px" height="142px" radius="10px"></u-image>
-						</view>
-					</u-col>
-				</u-row>
+				<!-- <u-button class="custom-style" size="lager" type="primary" shape="circle" :text="`我是${item.roleName}`" @click="choose(item.id)"></u-button> -->
+				<u-button :class="index==current?'active-custom-style':'custom-style'" size="lager" type="primary" shape="circle" @click="choose(item)">
+					<text>我是{{item.roleName}}</text>
+				</u-button>
 			</u-list-item>
 		</u-list>
 		<u-button type="error" shape="circle" text="下一步" @click="next()"></u-button>
@@ -27,48 +17,33 @@
 	export default {
 		data() {
 			return {
-				roles: [{
-						id: 1,
-						name: "我是边民",
-						src: require("@/static/images/role/bm.png")
-					},
-					{
-						id: 2,
-						name: "我是经销商",
-						src: require("@/static/images/role/jxs.png")
-					},
-					{
-						id: 3,
-						name: "我是外籍商户",
-						src: require("@/static/images/role/wjsh.png")
-					},
-					{
-						id: 4,
-						name: "我是司机",
-						src: require("@/static/images/role/sj.png")
-					},
-				],
-				// customStyle: {
-				// 	marginBottom: '10px',
-				// 	backgroundColor: '#fff7f7',
-				// 	height: '200px'
-				// }
+				roles: [],
 				current: 1,
 			}
 		},
+		created() {
+			this.getList()
+		},
 		methods: {
 			choose(data) {
-				console.log("选择角色");
-				console.log(data);
-				for (let i = 0; i < this.roles.length; i++) {
-					if (this.roles[i].name === data.name) {
+				// console.log("选择角色");
+				// console.log(data);
+				for (let i = 1; i <= this.roles.length; i++) {
+					if (this.roles[i].roleName == data.roleName) {
 						this.current = i;
 					}
 				}
+				this.isNext = true
+			},
+			getList(){
+				this.$api.getIdentifyList().then(res => {
+					console.log(res)
+					this.roles = res.data
+				})
 			},
 			next(){
 				uni.navigateTo({
-					url:"/pages/index/index"
+					url:"/pages/login/register?type="+this.current
 				})
 			}
 		}
@@ -77,22 +52,26 @@
 
 <style lang="scss">
 	page {
-		padding: 0 30px;
+		padding: 30px;
 	}
 
 	.custom-style {
-		margin-bottom: 10px;
-		background-color: #fff7f7;
-		height: 145px;
-		border-radius: 10px;
+		margin-bottom: 20px;
+		width: 80%;
+		height: 70px;
+		font-size: 26px;
+		font-family: serif;
+		background-color: #87CEFA;
+		border: #87CEFA;
 	}
 	
 	.active-custom-style {
-		margin-bottom: 10px;
-		background-color: #fff7f7;
-		height: 145px;
-		border-radius: 10px;
-		border: #f83d3d 1px solid;
+		margin-bottom: 20px;
+		width: 80%;
+		height: 70px;
+		font-size: 28px;
+		background-color: #00BFFF;
+		border: #00BFFF;
 	}
 	
 

pages/login/login.vue

@@ -20,10 +20,11 @@
 			</u-form>
 			<view style="font-size: 13px;">忘记密码？</view>
 			<view class="btn">
-				<view style="margin-bottom: 10px;">
-					<u-radio-group v-model="value" :wrap="true">
+				<view style="margin-bottom: 15px; font-size: 17px;">
+					<!-- <u-radio-group v-model="value" :wrap="true">
 						<u-radio :label="radioLabel"></u-radio>
-					</u-radio-group>
+					</u-radio-group> -->
+					<radio>登录同意《<view class="txt" @click="toAgreement(1)">用户协议</view>》和《<view class="txt" @click="toAgreement(2)">隐私政策</view>》</radio>
 				</view>
 				<view>
 					<u-button type="error" shape="circle" text="登录" @click="submit()"></u-button>
@@ -68,7 +69,7 @@
 						trigger: 'blur,change'
 					}]
 				},
-				radioLabel: "登录同意《用户协议》和《隐私政策》",
+				// radioLabel: "登录同意《用户协议》和《隐私政策》",
 				value: '',
 			}
 		},
@@ -76,41 +77,22 @@
 			this.$refs.uForm.setRules(this.rules);
 		},
 		methods: {
-			loginFn() {
-				if (!this.form.key) {
-					this.$common.toast('请输入登录名');
-					return;
-				}
-				if (!this.form.password) {
-					this.$common.toast('请输入密码');
-					return;
-				}
-				let openid = uni.getStorageSync('openid');
-				if (!openid) {
-					openid = uni.getStorageSync('login_openid');
-				}
-				this.form.openid = openid
-				this.$api.doLogin(this.form).then(resp => {
-					let data = resp.data;
-				})
-			},
 			submit() {
-				
 				this.$refs.uForm.validate().then(res => {
 					this.$api.doLogin(this.form).then(resp => {
-						console.log(resp)
-						let data = resp.data;
 						if(resp.code==200){
 							let data = resp.data;
+							// uni.setStorageSync('userInfo', resp.data);
+							uni.setStorageSync('token',data.tokenInfo.tokenValue)
 							uni.$u.toast('登录成功，欢迎你'+data.appUser.name)
-							localStorage.setItem('token',data.tokenInfo.tokenValue)
-							uni.navigateTo({
-								url: '/pages/login/chooseRole'
+							uni.switchTab({
+								url: '/pages/index/index'
 							});
 						}
 					})
 				}).catch(errors => {
-					uni.$u.toast('校验失败')
+					console.log(errors)
+					// uni.$u.toast('校验失败')
 				})
 			},
 			radioChange() {
@@ -118,7 +100,12 @@
 			},
 			toRegister() {
 				uni.navigateTo({
-					url: '/pages/login/register'
+					url: '/pages/login/chooseRole'
+				});
+			},
+			toAgreement(id) {
+				uni.navigateTo({
+					url: '/pages/login/userAgreement?id='+id
 				});
 			}
 		}
@@ -132,7 +119,7 @@
 	}
 
 	.remain {
-		margin: 40px 50px 0;
+		// margin: 40px 10px 0;
 		text-align: center;
 	}
 
@@ -164,4 +151,7 @@
 		text-align: center;
 		font-size: 14px;
 	}
+	.txt{
+		color: 	#00BFFF;
+	}
 </style>

pages/login/register.vue

@@ -13,13 +13,13 @@
 							placeholder='请输入手机号码' :clearable='false' />
 					</view>
 				</u-form-item>
-				<u-form-item label="选择你的身份" prop="type">
+				<!-- <u-form-item label="选择你的身份" prop="type">
 					<view class="form-input" @click="show=true" >
 						<u-input v-model="form.type" type="text"
 							placeholder='请选择你的身份' :clearable='false' disabled />
 					<u-picker :show="show" :columns="columns" @confirm="confirm" @change="changeHandler"></u-picker>
 					</view>
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item label="验证码" prop="smsCode">
 					<view class="form-input">
 						<view class="u-demo-block__content">
@@ -117,6 +117,12 @@
 		onReady() {
 			this.$refs.uForm.setRules(this.rules);
 		},
+		onLoad(option) {
+			this.form.type=option.type
+		},
+		created() {
+			
+		},
 		methods: {
 			getCode() {
 				if (this.$refs.uCode.canGetCode) {
@@ -160,14 +166,14 @@
 					url: '/pages/login/login'
 				});
 			},
-			changeHandler(e){
-				console.log(e)
-				this.form.type=e.value[0]
-			},
-			confirm(e) {
-				// console.log(e)
-				this.show=false
-			}
+			// changeHandler(e){
+			// 	console.log(e)
+			// 	this.form.type=e.value[0]
+			// },
+			// confirm(e) {
+			// 	// console.log(e)
+			// 	this.show=false
+			// }
 		}
 	}
 </script>
@@ -179,7 +185,7 @@
 	}
 
 	.remain {
-		margin: 50px 100px 0;
+		margin: 10px;
 		text-align: center;
 	}
 

pages/login/userAgreement.vue

@@ -0,0 +1,50 @@
+<template>
+	<view>
+		<navigation-bar :title="title" background-color="#fff" front-color="#000000" />
+		<view style="margin-bottom: 15px;" v-html="content"></view>
+		<u-button type="primary" shape="circle" text="我已知晓并同意" @click="back()"></u-button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: 0,
+				content: '',
+				title: '',
+			}
+		},
+		onLoad(option) {
+			this.id = option.id
+		},
+		created() {
+			this.getAgreement()
+		},
+		methods: {
+			getAgreement() {
+				let params = {
+					id: this.id
+				}
+				this.$api.getAgreement(params).then(res => {
+					console.log(res)
+					this.title = res.data.type
+					this.content = res.data.content
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			back() {
+				uni.navigateBack({
+					delta: 1,
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		padding: 10px;
+	}
+</style>

pages/message/message.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/order/order.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

utils/request.js

@@ -43,7 +43,6 @@ function postForm(url, data) {
 			'satoken': uni.getStorageSync('token')
 		}
 	}).then(data => {
-		console.log(url)
 		common.hidingLoading();
 		var [err, res] = data
 		if (err) {