修改代码冲突

App.vue

@@ -33,14 +33,9 @@
 
 
 	//全局页面背景色
-<<<<<<< HEAD
-	page {
-		// background-color: #f7f7f7;
-=======
 	page{
 		background-color: #e2e2e2;
 		font-family: '宋体';
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 	}
 
 	// 点击时背景灰色

apis/api.js

@@ -2,29 +2,22 @@ import ajax from '../utils/request.js'
 
 
 export default {
-<<<<<<< HEAD
-	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)
+		return ajax.get('/level-one-server/app/TbAgreement/getById', data)
 	},
 	// 轮播图
 	getBanner(data) {
-		return ajax.get('/level-one-server/app/TbBanner/getList',data)
+		return ajax.get('/level-one-server/app/TbBanner/getList', data)
 	},
 	// 首页菜单
 	getMenu(data) {
-		return ajax.get('/sp-admin/ReRoleMenu/getList',data)
-=======
+		return ajax.get('/sp-admin/ReRoleMenu/getList', data)
+	},
 	//登录
 	doLogin(data) {
 		return ajax.postForm('/sp-admin/app/AppUser/login', data)
@@ -42,8 +35,7 @@ export default {
 		return ajax.get('/level-one-server/app/TbBanner/getList')
 	},
 	//获取最新资讯
-	getNewestList(data){
-		return ajax.get('/level-one-server/app/TbPortNews/getNewestList',data)
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
+	getNewestList(data) {
+		return ajax.get('/level-one-server/app/TbPortNews/getNewestList', data)
 	}
 }

pages.json

@@ -3,64 +3,6 @@
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [{
-<<<<<<< HEAD
-		"path": "pages/index/index",
-		"style": {
-			"navigationBarTitleText": "首页",
-			"enablePullDownRefresh": false
-		}
-
-	}, {
-		"path": "pages/personal/personal",
-		"style": {
-			"navigationBarTitleText": "我的",
-			"enablePullDownRefresh": false
-		}
-
-	}, {
-		"path": "pages/message/message",
-		"style": {
-			"navigationBarTitleText": "消息",
-			"enablePullDownRefresh": false
-		}
-
-	}, {
-		"path": "pages/order/order",
-		"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
-		}
-
-	}],
-=======
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": ""
@@ -133,43 +75,18 @@
 
 		}
 	],
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		// "navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
 		"color": "#7A7E83",
+		"selectedColor": "#3cc51f",
 		"borderStyle": "black",
-		"selectedColor": "#00BFFF",
 		"backgroundColor": "#ffffff",
-<<<<<<< HEAD
 		"list": [{
-			"pagePath": "pages/index/index",
-			"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/images/tabbar/my.png",
-			"selectedIconPath": "static/images/tabbar/my-active.png",
-			"text": "我的"
-		}]
-=======
-		"list": [
-			{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/icon/home-icon.png",
 				"selectedIconPath": "static/icon/home-icon-select.png",
@@ -194,6 +111,5 @@
 				"text": "个人中心"
 			}
 		]
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 	}
 }

pages/index/index.vue

@@ -1,18 +1,5 @@
 <template>
 	<view>
-<<<<<<< HEAD
-		<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 class="wrap">
 			<u-swiper :list="bannerList" keyName="image" img-mode="scaleToFill" :effect3d="true"></u-swiper>
 		</view>
@@ -83,7 +70,6 @@
 					</view>
 				</view>
 			</view>
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 		</view>
 	</view>
 </template>
@@ -92,37 +78,6 @@
 	export default {
 		data() {
 			return {
-<<<<<<< HEAD
-				// 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)
-				})
-			}
-=======
 				bannerList: [],
 				newsList: []
 			}
@@ -145,29 +100,9 @@
 				})
 			}
 
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 		}
 	}
 </script>
-
-<<<<<<< HEAD
-<style>
-	page {
-		padding: 10px;
-	}
-
-	.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 scoped lang="scss">
 	.wrap {
 		padding: 10rpx;
@@ -227,6 +162,7 @@
 		widows: 100vw;
 		padding-bottom: 20rpx;
 		border-bottom: 1px solid #e2e2e2;
+
 		.news-img image {
 			width: 140rpx;
 			height: 100%;
@@ -235,6 +171,7 @@
 		.news-item {
 			width: 100vw;
 			word-break: break-all;
+
 			.new-title {
 				font-size: 28rpx;
 				padding: 10rpx 20rpx;
@@ -248,6 +185,5 @@
 			}
 		}
 
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 	}
 </style>

pages/login/chooseRole.vue

@@ -26,7 +26,6 @@
 		},
 		methods: {
 			choose(data) {
-<<<<<<< HEAD
 				// console.log("选择角色");
 				// console.log(data);
 				for (let i = 1; i <= this.roles.length; i++) {
@@ -41,9 +40,7 @@
 					console.log(res)
 					this.roles = res.data
 				})
-=======
 				this.$common.to('/pages/login/register?type='+data.id);
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 			},
 			next(){
 				uni.navigateTo({

pages/login/login.vue

@@ -19,24 +19,17 @@
 			</u-form>
 			<view style="font-size: 13px;">忘记密码？</view>
 			<view class="btn">
-<<<<<<< HEAD
-				<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> -->
-					<radio>登录同意《<view class="txt" @click="toAgreement(1)">用户协议</view>》和《<view class="txt" @click="toAgreement(2)">隐私政策</view>》</radio>
-=======
 				<view style="margin-bottom: 20rpx;font-size: 28rpx;">
 					<u-checkbox-group v-model="value" :wrap="true">
 						<u-checkbox name="1"></u-checkbox>登录同意<text class="blue-class">《用户协议》</text>和<text
 							class="blue-class">《隐私政策》</text>
 					</u-checkbox-group>
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 				</view>
 				<view>
 					<u-button type="error" shape="circle" text="登录" @click="submit()"></u-button>
 				</view>
-				<view class="tip" @click="toRegister()">还没有账号？马上<text class="register_btn blue-class">注册</text></view>
+				<view class="tip" @click="toRegister()">还没有账号？马上<text class="register_btn blue-class">注册</text>
+				</view>
 			</view>
 
 		</view>
@@ -76,13 +69,8 @@
 						trigger: 'blur,change'
 					}]
 				},
-<<<<<<< HEAD
-				// radioLabel: "登录同意《用户协议》和《隐私政策》",
-				value: '',
-=======
 				radioLabel: "",
 				value: ["1"],
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 			}
 		},
 		onReady() {
@@ -97,42 +85,19 @@
 						return;
 					}
 					this.$api.doLogin(this.form).then(resp => {
-<<<<<<< HEAD
-						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)
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-=======
 						if (resp.code == 200) {
 							let data = resp.data;
 							uni.setStorageSync('token', data.tokenInfo.tokenValue);
-							uni.setStorageSync('info',data.appUser)
+							uni.setStorageSync('info', data.appUser)
 							this.$common.toBar('/pages/index/index')
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 						}
 					})
 				}).catch(errors => {
-					console.log(errors)
-					// uni.$u.toast('校验失败')
+					uni.$u.toast('校验失败')
 				})
 			},
 			toRegister() {
-<<<<<<< HEAD
-				uni.navigateTo({
-					url: '/pages/login/chooseRole'
-				});
-			},
-			toAgreement(id) {
-				uni.navigateTo({
-					url: '/pages/login/userAgreement?id='+id
-				});
-=======
 				this.$common.to('/pages/login/chooseRole')
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 			}
 		}
 	}
@@ -145,11 +110,7 @@
 	}
 
 	.remain {
-<<<<<<< HEAD
-		// margin: 40px 10px 0;
-=======
 		margin: 30rpx 150rpx 0;
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 		text-align: center;
 	}
 
@@ -182,10 +143,6 @@
 		text-align: center;
 		font-size: 14px;
 	}
-<<<<<<< HEAD
-	.txt{
-		color: 	#00BFFF;
-=======
 
 	.blue-class {
 		color: #55aaff;
@@ -196,6 +153,5 @@
 
 		text-decoration: underline;
 		margin-left: 0.5em;
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 	}
 </style>

pages/login/register.vue

@@ -12,7 +12,6 @@
 							placeholder='请输入手机号码' :clearable='false' />
 					</view>
 				</u-form-item>
-<<<<<<< HEAD
 				<!-- <u-form-item label="选择你的身份" prop="type">
 					<view class="form-input" @click="show=true" >
 						<u-input v-model="form.type" type="text"
@@ -20,8 +19,6 @@
 					<u-picker :show="show" :columns="columns" @confirm="confirm" @change="changeHandler"></u-picker>
 					</view>
 				</u-form-item> -->
-=======
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 				<u-form-item label="验证码" prop="smsCode">
 					<view class="form-input">
 						<u-input placeholder="请输入验证码" v-model="form.smsCode">
@@ -108,17 +105,10 @@
 		onReady() {
 			this.$refs.uForm.setRules(this.rules);
 		},
-<<<<<<< HEAD
 		onLoad(option) {
 			this.form.type=option.type
 		},
-		created() {
-			
-=======
-		onLoad(options) {
-			this.form.type = options.type;
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
-		},
+		created() {},
 		methods: {
 			startCount() {
 				setTimeout(() => {
@@ -172,7 +162,6 @@
 					url: '/pages/login/login'
 				});
 			},
-<<<<<<< HEAD
 			// changeHandler(e){
 			// 	console.log(e)
 			// 	this.form.type=e.value[0]
@@ -181,8 +170,6 @@
 			// 	// console.log(e)
 			// 	this.show=false
 			// }
-=======
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 		}
 	}
 </script>
@@ -194,11 +181,8 @@
 	}
 
 	.remain {
-<<<<<<< HEAD
 		margin: 10px;
-=======
 		margin: 30rpx 150rpx 0;
->>>>>>> 939670b5a63e4b587558d589c66b403ec7978dc8
 		text-align: center;
 	}