From 717e3c67fe03f2282d8d75282db33bde4fabcec1 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 26 Oct 2024 21:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                 |  24 ++-
 components/config/PrivacyAgreementPoup.vue |   2 +-
 components/list/dynamic/dynamicItem.vue    |   2 +-
 components/user/certificationPopup.vue     | 251 +++++++++++++++++++++++++++++
 components/user/createDetailPopup.vue      |   4 +-
 pages.json                                 |  39 +++--
 pages/index/center.vue                     |   5 +-
 pages/index/index.vue                      | 169 ++++++++++++-------
 pages_order/auth/wxLogin.vue               |   8 +-
 pages_order/auth/wxUserInfo.vue            | 217 ++++++++++++++++++++++---
 static/image/logo.jpg                      | Bin 0 -> 34088 bytes
 static/logo.png                            | Bin 4023 -> 0 bytes
 store/store.js                             |  26 +--
 uni.scss                                   |   2 +-
 14 files changed, 639 insertions(+), 110 deletions(-)
 create mode 100644 components/user/certificationPopup.vue
 create mode 100644 static/image/logo.jpg
 delete mode 100644 static/logo.png

diff --git a/api/api.js b/api/api.js
index 1a6fd0b..00af5ed 100644
--- a/api/api.js
+++ b/api/api.js
@@ -23,12 +23,19 @@ const config = {
 	},
 	// 修改个人信息接口
 	updateInfo: {
-		url: '/info/updateInfo',
+		url: '/token/updateInfo',
 		method: 'POST',
 		auth: true, 
 		limit : 500,
 		showLoading : true,
 	},
+	// 获取个人信息接口
+	getInfo: {
+		url: '/token/getInfo',
+		method: 'GET',
+		auth: true,
+		limit : 500,
+	},
 	//隐私政策
 	getPrivacyPolicy: {
 		url: '/login/getPrivacyPolicy',
@@ -125,6 +132,21 @@ const config = {
 		url: '/token/publishPost',
 		method: 'POST',
 		limit : 1000,
+		auth : true,
+	},
+	//店铺认证
+	companyAuthentication: {
+		url: '/token/companyAuthentication',
+		method: 'POST',
+		limit : 1000,
+		auth : true,
+	},
+	//个人认证
+	personalAuthentication: {
+		url: '/token/personalAuthentication',
+		method: 'POST',
+		limit : 1000,
+		auth : true,
 	},
 }
 
diff --git a/components/config/PrivacyAgreementPoup.vue b/components/config/PrivacyAgreementPoup.vue
index 4367b5c..7d29952 100644
--- a/components/config/PrivacyAgreementPoup.vue
+++ b/components/config/PrivacyAgreementPoup.vue
@@ -2,7 +2,7 @@
 	<uv-popup ref="popup" z-index="99999" :closeOnClickOverlay="false" :customStyle="{ backgroundColor: 'transparent' }">
 		<view class="privacyPopup">
 			<view class="icon">
-				<image src="/static/image/PrivacyAgreementPoup/icon.png" 
+				<image src="/static/image/logo.jpg"
 				mode=""></image>
 			</view>
 			<view class="title">
diff --git a/components/list/dynamic/dynamicItem.vue b/components/list/dynamic/dynamicItem.vue
index 1e95743..048651b 100644
--- a/components/list/dynamic/dynamicItem.vue
+++ b/components/list/dynamic/dynamicItem.vue
@@ -38,7 +38,7 @@
 		</view>
 		<view class="Artworkimages">
 			<view class="wrokimg" :key="i" v-for="(img, i) in item.image && item.image.split(',')">
-				<image :src="img" mode=""></image>
+				<image :src="img" mode="aspectFill"></image>
 			</view>
 		</view>
 		<view class="bottom">
diff --git a/components/user/certificationPopup.vue b/components/user/certificationPopup.vue
new file mode 100644
index 0000000..09cb58e
--- /dev/null
+++ b/components/user/certificationPopup.vue
@@ -0,0 +1,251 @@
+<template>
+	<!-- 实名认证 -->
+	<uv-popup ref="popup" :round="30">
+		<view class="page">
+			<!-- <view class="info-tips">
+				完成认证，<text>您将获得《实名认证平台特权》</text>
+			</view> -->
+			
+			<uv-tabs :list="tags" @click="tagsClick"
+			:activeStyle="{color : '#5baaff', fontWeight : 900}"
+			lineHeight="0"
+			lineWidth="50rpx"></uv-tabs>
+			
+			<view class="form"
+				v-if="type == 0">
+				<view class="form-item">
+					<view class="label">
+						姓名
+					</view>
+					<input type="text" class="form-input" 
+					placeholder="请输入姓名"
+					v-model="form.name"/>
+				</view>
+				
+				<view class="form-item">
+					<view class="label">
+						身份证号码
+					</view>
+					<input type="text" class="form-input" 
+					placeholder="请输入身份证号码"
+					v-model="form.card"/>
+				</view>
+				
+			</view>
+			
+			<view class="form"
+				v-if="type == 1">
+				<view class="form-item">
+					<view class="label">
+						店铺名称
+					</view>
+					<input type="text" class="form-input" 
+					placeholder="请输入姓名"
+					v-model="form.name"/>
+				</view>
+				
+				<view class="form-item">
+					<view class="label">
+						联系方式
+					</view>
+					<input type="text" class="form-input" 
+					placeholder="请输入联系方式"
+					v-model="form.phone"/>
+				</view>
+				
+				<view class="form-item">
+					<view class="title">
+						请上传营业执照
+					</view>
+					<view class="tips">
+						信息仅用身份核实，上传后可增加曝光机会
+					</view>
+				</view>
+				
+				<view class="form-item">
+					<uv-upload 
+					:fileList="fileList" 
+					:maxCount="1" 
+					width="600rpx"
+					height="280rpx" 
+					multiple 
+					@afterRead="afterRead" 
+					@delete="deleteImage">
+						<view class="upload">
+							<image src="/static/image/home/cart.png"
+							mode="aspectFit"
+							style="width: 390rpx;height: 280rpx;" />
+							<view class="btn-add">
+								点击上传
+							</view>
+						</view>
+					</uv-upload>
+				</view>
+				<view class="form-item">
+					<view class="tips"
+					style="text-align: center;padding: 20rpx 0;">
+						(确保文字清晰、可辨、避免遮挡、不全、反光)
+					</view>
+				</view>
+			</view>
+			
+			<view class="uni-color-btn"
+			@click="submit">
+				认证
+			</view>
+			
+		</view>
+	</uv-popup>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				checkboxValue : [],
+				form : {},
+				fileList: [],
+				type : 0,
+				tags : [
+					{
+						name : '个人认证',
+					},
+					{
+						name : '店铺认证',
+					},
+				],
+			}
+		},
+		methods: {
+			deleteImage(e){
+				this.fileList.splice(e.index, 1)
+			},
+			afterRead(e){
+				let self = this
+				e.file.forEach(file => {
+					self.$Oss.ossUpload(file.url).then(url => {
+						self.fileList.push({
+							url
+						})
+					})
+				})
+			},
+			open(){
+				this.$refs.popup.open()
+			},
+			tagsClick({index}){
+				this.type = index
+			},
+			submit(){
+				
+				let data = {
+					...this.form,
+					image : this.fileList.map((item) => item.url).join(","),
+				}
+				
+				if(this.type == 0){
+					if (this.$utils.verificationAll(data, {
+							name: '说点什么吧',
+							card : '请输入身份证号',
+						})) {
+						return
+					}
+				}else{
+					if (this.$utils.verificationAll(data, {
+							name: '请输入店铺名称',
+							phone: '请输入联系方式',
+							image: '请上传营业执照',
+						})) {
+						return
+					}
+				}
+				
+				this.$api([
+					'personalAuthentication',
+					'companyAuthentication',
+				][this.type], data, res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '提交成功!',
+							icon: 'none'
+						})
+						this.$refs.popup.close()
+					}
+				})
+				
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page{
+	width: 700rpx;
+	.info-tips{
+		width: 100%;
+		padding: 30rpx 0;
+		background-color: #f3f3f3;
+		text-align: center;
+		text{
+			color: $uni-color;
+		}
+	}
+	
+	.form {
+		padding: 30rpx;
+		.form-item{
+			.label{
+				padding: 20rpx 0;
+			}
+			.form-input{
+				border: 1px solid $uni-color;
+				background: rgba($uni-color, 0.1);
+				padding: 10rpx 20rpx;
+				font-size: 28rpx;
+			}
+			.title{
+				font-weight: 900;
+				margin-top: 50rpx;
+				padding: 10rpx 0;
+			}
+			.tips{
+				font-size: 26rpx;
+				color: #777;
+				padding-bottom: 20rpx;
+			}
+		}
+		.upload{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 690rpx;
+			background-color: #f3f3f3;
+			border-radius: 10rpx;
+			.btn-add{
+				margin: auto;
+				padding: 10rpx 20rpx;
+				background-color: $uni-color;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+		}
+	}
+	
+	.config{
+		font-size: 26rpx;
+		line-height: 40rpx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		.content{
+			width: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+		}
+		text{
+			color: $uni-color;
+		}
+	}
+}
+</style>
diff --git a/components/user/createDetailPopup.vue b/components/user/createDetailPopup.vue
index 6e46a75..59e9e1a 100644
--- a/components/user/createDetailPopup.vue
+++ b/components/user/createDetailPopup.vue
@@ -55,11 +55,11 @@
 <style scoped lang="scss">
 	.createDetail {
 		position: fixed;
-		top: 50vh;
+		top: 70vh;
 		right: 50rpx;
 		width: 100rpx;
 		height: 100rpx;
-		background-color: $uni-color-primary;
+		background-color: $uni-color;
 		border-radius: 50rpx;
 		display: flex;
 		justify-content: center;
diff --git a/pages.json b/pages.json
index 3cc84a8..8ea147b 100644
--- a/pages.json
+++ b/pages.json
@@ -2,7 +2,7 @@
 	"pages": [{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": ""
+				"enablePullDownRefresh" : true
 			}
 		},
 		{
@@ -32,7 +32,7 @@
 		{
 			"path": "pages/index/center",
 			"style": {
-				"navigationBarTitleText": ""
+				"enablePullDownRefresh" : true
 			}
 		},
 		{
@@ -78,34 +78,55 @@
 				"path": "mine/help"
 			},
 			{
-				"path": "renting/rentingList"
+				"path": "renting/rentingList",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "renting/rentingDetail"
+				"path": "renting/rentingDetail",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
 				"path": "renting/addRenting"
 			},
 			{
-				"path": "work/workList"
+				"path": "work/workList",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
 				"path": "work/addWork"
 			},
 			{
-				"path": "work/workDetail"
+				"path": "work/workDetail",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "post/postDetail"
+				"path": "post/postDetail",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
 				"path": "post/addPost"
 			},
 			{
-				"path": "gourmet/gourmetList"
+				"path": "gourmet/gourmetList",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			},
 			{
-				"path": "activity/activityDetail"
+				"path": "activity/activityDetail",
+				"style": {
+					"enablePullDownRefresh" : true
+				}
 			}
 		]
 	}],
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 2b46dc3..b615e26 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -64,7 +64,7 @@
 		<view class="Content">
 			<uv-tabs :list="list" @click="click"
 			:activeStyle="{color : '#000', fontWeight : 900}"
-			lineColor="#00f"
+			lineColor="#5baaff"
 			lineHeight="8rpx"
 			lineWidth="50rpx"></uv-tabs>
 
@@ -90,6 +90,9 @@
 				}]
 			}
 		},
+		onShow() {
+			this.$store.commit('getUserInfo')
+		},
 		methods: {
 			click(item) {
 				console.log('item', item);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dcc0942..39c6dbd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,5 +1,14 @@
 <template>
 	<view class="page">
+		
+		<view>
+			<uv-swiper
+			:list="bannerList" 
+			indicator
+			height="520rpx"
+			indicatorStyle="bottom: 100rpx;"
+			keyName="image"></uv-swiper>
+		</view>
 
 		<!-- 瑶都万能墙 -->
 		<view class="Headbackground">
@@ -8,7 +17,7 @@
 				size="30rpx"
 				color="#fff"
 				name="map"></uv-icon>
-				长沙
+				江华瑶族自治县
 			</view>
 			<view class="top">
 				<view class=" profilePicture">
@@ -16,7 +25,7 @@
 				</view>
 				<view class="UniversalWall">
 					<view class="dynamic">
-						{{headinfo.name}}
+						{{ headinfo.name }}
 					</view>
 
 					<view class="dynamics">
@@ -24,44 +33,49 @@
 					</view>
 				</view>
 
-				<view class="join">
+				<view class="join"
+				@click="$refs.certificationPopup.open()">
 					加入
 				</view>
 			</view>
 		</view>
 
-		<view class="life">
-			<view class="mouse" @click="menuClick(item.url)" 
-			:key="index" 
-			v-for="(item, index) in menu">
-				<view class="RentingAhouseimg">
-					<image 
-					:src="item.icon" 
-					style="width: 90rpx;height: 90rpx;" mode=""></image>
-				</view>
-				<view class="RentingAhouse">
-					{{ item.title }}
+		<view class="box">
+			<view class="life">
+				<view class="mouse" @click="menuClick(item.url)" 
+				:key="index" 
+				v-for="(item, index) in menu">
+					<view class="RentingAhouseimg">
+						<image 
+						:src="item.icon" 
+						style="width: 90rpx;height: 90rpx;" mode=""></image>
+					</view>
+					<view class="RentingAhouse">
+						{{ item.title }}
+					</view>
 				</view>
 			</view>
+			
+			<view class="LabelOptions">
+				<uv-tabs :list="category" 
+				:activeStyle="{color : '#000', fontWeight : 900}"
+				lineColor="#5baaff"
+				lineHeight="8rpx"
+				lineWidth="50rpx"
+				keyName="title"
+				@click="tabsClick"></uv-tabs>
+			</view>
+			
+			<dynamicItem
+			:key="index"
+			v-for="(item, index) in list"
+			:item="item"
+			/>
 		</view>
 
-		<view class="LabelOptions">
-			<uv-tabs :list="category" 
-			:activeStyle="{color : '#000', fontWeight : 900}"
-			lineColor="#00f"
-			lineHeight="8rpx"
-			lineWidth="50rpx"
-			keyName="title"
-			@click="tabsClick"></uv-tabs>
-		</view>
-		
-		<dynamicItem
-		:key="index"
-		v-for="(item, index) in list"
-		:item="item"
-		/>
-
 		<createDetailPopup/>
+		
+		<certificationPopup ref="certificationPopup"/>
 
 		<PrivacyAgreementPoup />
 		<tabber select="0" />
@@ -71,6 +85,7 @@
 <script>
 	import PrivacyAgreementPoup from '@/components/config/PrivacyAgreementPoup.vue'
 	import tabber from '@/components/base/tabbar.vue'
+	import certificationPopup from '@/components/user/certificationPopup.vue'
 	import createDetailPopup from '@/components/user/createDetailPopup.vue'
 	import dynamicItem from '@/components/list/dynamic/dynamicItem.vue'
 	import mixinsList from '@/mixins/list.js'
@@ -82,17 +97,26 @@
 			PrivacyAgreementPoup,
 			createDetailPopup,
 			dynamicItem,
+			certificationPopup,
 		},
 		data() {
 			return {
 				headinfo: {},
 				menu : [],
 				mixinsListApi : 'getPostPage',
+				bannerList : [],
 			}
 		},
 		onShow() {
 			this.getIndexHeaderInfo()
 			this.getClassifyList()
+			this.getBannerList()
+			this.$store.commit('getCategory')
+		},
+		onPullDownRefresh() {
+			this.getIndexHeaderInfo()
+			this.getClassifyList()
+			this.getBannerList()
 			this.$store.commit('getCategory')
 		},
 		computed: {
@@ -100,7 +124,12 @@
 		},
 		methods: {
 			tabsClick(item) {
-				console.log('item', item);
+				if(item.index){
+					this.queryParams.classId = item.id
+				}else{
+					delete this.queryParams.classId
+				}
+				this.getData()
 			},
 			menuClick(url) {
 				// 跳转页面
@@ -130,6 +159,22 @@
 					}
 				})
 			},
+			//获取菜单
+			getClassifyList(){
+				this.$api('getClassifyList',res =>{
+					if(res.code == 200){
+						this.menu = res.result
+					}
+				})
+			},
+			// 获取banner
+			getBannerList(){
+				this.$api('getBannerList', res =>{
+					if(res.code == 200){
+						this.bannerList = res.result
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -140,8 +185,12 @@
 		height: 100%;
 	}
 	.Headbackground {
+		position: absolute;
+		width: 100%;
+		top: 0;
+		left: 0;
 		padding-top: 150rpx;
-		background: linear-gradient(to bottom, rgb(85, 94, 123), rgb(45, 51, 73));
+		// background: linear-gradient(to bottom, rgb(85, 94, 123), rgb(45, 51, 73));
 		.Toggle{
 			margin: 10rpx 30rpx;
 			padding: 20rpx;
@@ -189,7 +238,7 @@
 			.join {
 				width: 125rpx;
 				height: 50rpx;
-				background-color: $uni-color-primary;
+				background-color: $uni-color;
 				margin-left: auto;
 				display: flex;
 				align-items: center;
@@ -199,32 +248,38 @@
 
 		}
 	}
-
-	.life {
-		margin-top: 20rpx;
-		display: flex;
-		justify-content: space-around;
-		text-align: center;
-		flex-wrap: wrap;
-
-		.mouse {
-			.RentingAhouseimg {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin: 15rpx;
-				width: 130rpx;
-				height: 100rpx;
-				background-color: #ffffff;
-				border-top-left-radius: 40rpx;
-				border-bottom-right-radius: 40rpx;
-				border-bottom-left-radius: 20rpx;
-				border-top-right-radius: 20rpx;
+	
+	.box{
+		margin-top: -60rpx;
+		background-color: #f7f7f7;
+		border-top-left-radius: 40rpx;
+		border-top-right-radius: 40rpx;
+		position: relative;
+		z-index: 9;
+		.life {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-around;
+			text-align: center;
+			flex-wrap: wrap;
+			
+			.mouse {
+				.RentingAhouseimg {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin: 15rpx;
+					width: 130rpx;
+					height: 100rpx;
+					background-color: #ffffff;
+					border-top-left-radius: 40rpx;
+					border-bottom-right-radius: 40rpx;
+					border-bottom-left-radius: 20rpx;
+					border-top-right-radius: 20rpx;
+				}
 			}
 		}
 	}
 
-	
-	
-	
+
 </style>
\ No newline at end of file
diff --git a/pages_order/auth/wxLogin.vue b/pages_order/auth/wxLogin.vue
index 0fe75d8..06288e2 100644
--- a/pages_order/auth/wxLogin.vue
+++ b/pages_order/auth/wxLogin.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="login">
 		<view class="logo">
-			<!-- <image src="/static/image/login/logo.png" mode=""></image> -->
+			<image src="/static/image/logo.jpg"
+			mode=""></image>
 		</view>
 		<view class="title">
 			欢迎使用瑶都万能墙
@@ -93,8 +94,9 @@
 		background-color: #ddd;
 		border-radius: 30rpx;
 		image{
-			width: 80rpx;
-			height: 80rpx;
+			width: 100%;
+			height: 100%;
+			border-radius: 30rpx;
 		}
 		margin-bottom: 20rpx;
 	}
diff --git a/pages_order/auth/wxUserInfo.vue b/pages_order/auth/wxUserInfo.vue
index bda1afb..5bd96da 100644
--- a/pages_order/auth/wxUserInfo.vue
+++ b/pages_order/auth/wxUserInfo.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="login">
-		<view class="title">
+		<!-- <view class="title">
 			瑶都万能墙
 		</view>
 		<view class="title">
 			申请获取你的头像、昵称
-		</view>
+		</view> -->
 
-		<button class="chooseAvatar" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+		<!-- <button class="chooseAvatar" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 			<view class="line">
 				<view class="">
 					头像
@@ -28,7 +28,63 @@
 				<input type="nickname" placeholder="请输入昵称" style="text-align: right;" id="nickName"
 					v-model="userInfo.nickName" />
 			</view>
+		</view> -->
+		
+		<view class="bg1"/>
+		
+		<view class="title">
+			定制自己的形象
 		</view>
+		
+		<button class="chooseAvatar" 
+		open-type="chooseAvatar" 
+		@chooseavatar="onChooseAvatar">
+			<image :src="userInfo.headImage"
+			mode="aspectFill"></image>
+		</button>
+		
+		<input type="nickname" 
+		placeholder="给自己起一个响亮的名字" 
+		class="nickname" id="nickName"
+		v-model="userInfo.nickName" />
+		
+		<view class="sexSelect">
+			<view 
+			@click="sexClick(item)"
+			v-for="(item, index) in sex"
+			:key="index"
+			:style="{color : userInfo.sex == item.value ? item.actColor : '#333'}">
+				<uv-icon
+				size="30rpx"
+				:color="userInfo.sex == item.value ? item.actColor : '#333'"
+				:name="item.icon"></uv-icon>
+				{{ item.value }}
+			</view>
+		</view>
+		
+		<view class="address"
+		@click="$refs.datetimePicker.open()">
+			您出生于{{ $dayjs(userInfo.yearDate).format("YYYY") }}年
+		</view>
+		
+		<view class="address"
+		@click="$refs.picker.open()">
+			{{ userInfo.address || '请选择居住地址'}}
+		</view>
+		
+		<uv-datetime-picker 
+		ref="datetimePicker" 
+		v-model="userInfo.yearDate" 
+		mode="year"
+		:minDate="minDate" 
+		:maxDate="maxDate">
+		</uv-datetime-picker>
+		
+		<uv-picker ref="picker" 
+		:columns="columns"
+		keyName="name"
+		@confirm="confirmAddress"></uv-picker>
+		
 		<view class="btn" @click="submit">
 			确认
 		</view>
@@ -36,24 +92,66 @@
 </template>
 
 <script>
+	import { mapState } from 'vuex'
 	export default {
 		data() {
 			return {
 				userInfo: {
-					headImage: '',
+					headImage: '/static/image/logo.jpg',
 					nickName: '',
-				}
+					sex : '男',
+					yearDate : this.$dayjs().add(-18, 'y').valueOf(),//默认满18岁
+					address : '',
+				},
+				maxDate : this.$dayjs().valueOf(),
+				minDate : this.$dayjs().add(-100, 'y').valueOf(),
+				sex : [
+					{
+						value : '男',
+						icon : 'man',
+						actColor : '#5baaff',
+					},
+					{
+						value : '女',
+						icon : 'woman',
+						actColor : '#ff50b3',
+					},
+				],
+				columns : [],
 			};
 		},
-		onShow() {},
+		computed: {
+			...mapState(['cityList']),
+		},
+		onLoad() {
+		},
+		onShow() {
+			this.getCityList()
+		},
 		computed: {},
 		methods: {
 			onChooseAvatar(res) {
 				let self = this
 				self.$Oss.ossUpload(res.target.avatarUrl)
-					.then(url => {
-						self.userInfo.headImage = url
-					})
+				.then(url => {
+					self.userInfo.headImage = url
+				})
+			},
+			sexClick(item){
+				this.userInfo.sex = item.value
+			},
+			confirmAddress(e){
+				this.userInfo.address = e.value[0].name
+			},
+			// 获取城市
+			getCityList(){
+				this.$api('getCityList', res => {
+					if(res.code == 200){
+						this.columns = [
+							res.result
+						]
+					}
+				})
 			},
 			submit() {
 				let self = this
@@ -70,13 +168,19 @@
 						if (self.$utils.verificationAll(self.userInfo, {
 								headImage: '请选择头像',
 								nickName: '请填写昵称',
+								address: '请选择居住地址',
 							})) {
 							return
 						}
 						
-						self.$api('infoUpdateInfo', self.userInfo, res => {
+						let data = {
+							...self.userInfo,
+							yearDate : this.$dayjs(self.userInfo.yearDate).format("YYYY")
+						}
+						
+						self.$api('updateInfo', data, res => {
 							if (res.code == 200) {
-								uni.switchTab({
+								uni.reLaunch({
 									url:'/pages/index/index'
 								})
 							}
@@ -94,29 +198,92 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		height: 80vh;
+		height: 100vh;
+		background-color: #fff;
+		overflow: hidden;
+		
+		.bg1{
+			width: 700rpx;
+			height: 700rpx;
+			border-radius: 50%;
+			background-color: #ffc0b333;
+			position: absolute;
+			right: -300rpx;
+			top: -300rpx;
+		}
 
 		.title {
 			line-height: 45rpx;
 			font-weight: 900;
-		}
-
-		.line {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			width: 80%;
-			border-bottom: 1px solid #00000023;
-			padding: 30rpx 0;
-			margin: 0 auto;
+			padding-bottom: 100rpx;
+			font-size: 40rpx;
 		}
 
 		.chooseAvatar {
 			width: 100%;
-			padding: 0;
-			margin: 0;
-			margin-top: 10vh;
+			padding: 0 !important;
+			margin: 0 !important;
+			border: none;
+			background-color: #fff !important;
+			width: 220rpx;
+			height: 220rpx;
+			border-radius: 50%;
+			image{
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 50%;
+				box-shadow: 0 0 10rpx 10rpx #00000012;
+				margin: 10rpx;
+			}
+		}
+		.chooseAvatar::after{
 			border: none;
+			padding: 0 !important;
+			margin: 0 !important;
+		}
+		
+		.nickname{
+			background-color: #f7f7f7;
+			width: 600rpx;
+			height: 80rpx;
+			text-align: center;
+			border-radius: 40rpx;
+			margin-top: 30rpx;
+		}
+		
+		.sexSelect{
+			background-color: #f7f7f7;
+			width: 600rpx;
+			height: 80rpx;
+			text-align: center;
+			border-radius: 40rpx;
+			margin-top: 30rpx;
+			display: flex;
+			align-items: center;
+			font-size: 26rpx;
+			line-height: 80rpx;
+			overflow: hidden;
+			&>view{
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-content: center;
+				height: 100%;
+			}
+			&>view:nth-child(1){
+				border-right: 1px solid #000;
+			}
+		}
+		
+		.address{
+			background-color: #f7f7f7;
+			width: 600rpx;
+			height: 80rpx;
+			text-align: center;
+			border-radius: 40rpx;
+			margin-top: 30rpx;
+			line-height: 80rpx;
+			color: #555;
 		}
 
 		.btn {
diff --git a/static/image/logo.jpg b/static/image/logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1689114632bf9e30daa1241d270723e9e67f3b3f
GIT binary patch
literal 34088
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
Q|7gBX$qrrp@x%E41N>46rvLx|

literal 0
HcmV?d00001

diff --git a/static/logo.png b/static/logo.png
deleted file mode 100644
index b5771e209bb677e2ebd5ff766ad5ee11790f305a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4023
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
SYs}WS&%*SCNx89m_<sQGK?UOg

diff --git a/store/store.js b/store/store.js
index a95a172..3414ff2 100644
--- a/store/store.js
+++ b/store/store.js
@@ -11,7 +11,8 @@ const store = new Vuex.Store({
 		configList: [], //配置列表
 		shop : false,
 		userInfo : {}, //用户信息
-		city : [],//城市列表
+		city : {},//城市列表
+		cityList : [],//城市列表
 		category : [],//动态分类
 	},
 	getters: {
@@ -61,21 +62,27 @@ const store = new Vuex.Store({
 						state.userInfo = res.result.userInfo
 						uni.setStorageSync('token', res.result.token)
 						
-						// if(!state.userInfo.nickName || !state.userInfo.headImage){
-						// 	uni.navigateTo({
-						// 		url: '/pages_order/auth/wxUserInfo'
-						// 	})
-						// }else{
+						if(!state.userInfo.nickName || !state.userInfo.headImage){
+							uni.navigateTo({
+								url: '/pages_order/auth/wxUserInfo'
+							})
+						}else{
 							uni.navigateBack(-1)
-						// }
+						}
 					})
 				}
 			})
 		},
 		getUserInfo(state){
-			api('infoGetInfo', res => {
+			api('getInfo', res => {
 				if(res.code == 200){
 					state.userInfo = res.result
+					
+					if(!state.userInfo.nickName || !state.userInfo.headImage){
+						uni.navigateTo({
+							url: '/pages_order/auth/wxUserInfo'
+						})
+					}
 				}
 			})
 		},
@@ -83,7 +90,8 @@ const store = new Vuex.Store({
 		getCityList(state){
 			api('getCityList', res => {
 				if(res.code == 200){
-					state.city = res.result
+					state.cityList = res.result
+					state.city = res.result[0] || {}
 				}
 			})
 		},
diff --git a/uni.scss b/uni.scss
index d541097..8397e52 100644
--- a/uni.scss
+++ b/uni.scss
@@ -12,7 +12,7 @@
  * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
  */
 /* 颜色变量 */
-$uni-color: #FD5100;
+$uni-color: #5baaff;
 
 /* 行为相关颜色 */
 $uni-color-primary: #1671ff;