修改账号设置

App.vue

@@ -161,12 +161,14 @@
 		--f85Color: #858585;
 		--f69Color: #696969;
 		--f80Color: #808080;
+		--fFB1Color: #7A7E83;
 		--fDCColor: #DCDCDC;
 		--fcColor: #cccccc;
 		--f00Color: #000000;
 		--fffColor: #ffffff;
 		--f3CColor: #007AFF;
-		--fFB1Color: #7A7E83;
 		--fF0Color: #FF0000;
+		--f08Color: #008000;
+		--f35BColor: #35BD7B;
 	}
 </style>

common/api.js

@@ -1,87 +1,88 @@
-import config from '../config.js';
-const getDomain = (uri, method, type) => {
-	let wx_env = config.wx_miniProgram;
-	let system = config.system;
-	let url = config.serverUrl;
-	let Fileurl = config.serverFile;
-	if (type && type == 'file') return Fileurl + `/files` + uri;
-	else return url + `/travel/v1/api` + uri;
-};
-// 获取token
-export const getToken = async (uri, method = 'GET', data, type) => {
-	let baseUrl = getDomain(uri, method, type);
-	let header = {
-		token: data.token
-	};
-	return new Promise((resolve, reject) => {
-		uni.request({
-			url: baseUrl,
-			method: method || 'GET',
-			data: data || {},
-			header,
-			success: (res) => {
-				resolve(res.data);
-			},
-			fail: (err) => {
-				uni.showToast({
-					title: '请求接口失败',
-					icon: 'fail',
-				});
-				reject(err.data);
-			},
-		});
-	});
-};
-export const requestBase = async (uri, method = 'GET', data, type) => {
-	let baseUrl = getDomain(uri, method, type);
-	let header = {};
-	const token = uni.getStorageSync('token');
-	if (token) header.token = token;
-	return new Promise((resolve, reject) => {
-		uni.request({
-			url: baseUrl,
-			method: method || 'GET',
-			data: data || {},
-			header,
-			success: (res) => {
-				resolve(res.data);
-			},
-			fail: (err) => {
-				uni.showToast({
-					title: '请求接口失败',
-					icon: 'fail',
-				});
-				reject(err.data);
-			},
-		});
-	});
-};
-export const requestFile = (uri, method, data, type) => {
-	let baseUrl = getDomain(uri, method, type);
-	return new Promise((resolve, reject) => {
-		uni.uploadFile({
-			url: baseUrl,
-			filePath: data,
-			name: method || 'file',
-			formData: {},
-			success: (res) => {
-				let data = JSON.parse(res.data);
-				if (data.errcode != '0') {
-					return uni.showToast({
-						title: data.errmsg,
-						icon: 'error',
-					});
-				}
-				resolve(data);
-			},
-			fail: (err) => {
-				let data = JSON.parse(err.data);
-				uni.showToast({
-					title: '请求接口失败',
-					icon: 'fail',
-				});
-				reject(data);
-			},
-		});
-	});
-};
+import config from '../config.js';
+const getDomain = (uri, method, type) => {
+	let wx_env = config.wx_miniProgram;
+	let system = config.system;
+	let url = config.serverUrl;
+	let Fileurl = config.serverFile;
+	if (type && type == 'file') return Fileurl + `/files` + uri;
+	if (uri.startsWith('/wechat/api')) return 'https://broadcast.waityou24.cn' + uri;
+	else return url + `/travel/v1/api` + uri;
+};
+// 获取token
+export const getToken = async (uri, method = 'GET', data, type) => {
+	let baseUrl = getDomain(uri, method, type);
+	let header = {
+		token: data.token
+	};
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url: baseUrl,
+			method: method || 'GET',
+			data: data || {},
+			header,
+			success: (res) => {
+				resolve(res.data);
+			},
+			fail: (err) => {
+				uni.showToast({
+					title: '请求接口失败',
+					icon: 'fail',
+				});
+				reject(err.data);
+			},
+		});
+	});
+};
+export const requestBase = async (uri, method = 'GET', data, type) => {
+	let baseUrl = getDomain(uri, method, type);
+	let header = {};
+	const token = uni.getStorageSync('token');
+	if (token) header.token = token;
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url: baseUrl,
+			method: method || 'GET',
+			data: data || {},
+			header,
+			success: (res) => {
+				resolve(res.data);
+			},
+			fail: (err) => {
+				uni.showToast({
+					title: '请求接口失败',
+					icon: 'fail',
+				});
+				reject(err.data);
+			},
+		});
+	});
+};
+export const requestFile = (uri, method, data, type) => {
+	let baseUrl = getDomain(uri, method, type);
+	return new Promise((resolve, reject) => {
+		uni.uploadFile({
+			url: baseUrl,
+			filePath: data,
+			name: method || 'file',
+			formData: {},
+			success: (res) => {
+				let data = JSON.parse(res.data);
+				if (data.errcode != '0') {
+					return uni.showToast({
+						title: data.errmsg,
+						icon: 'error',
+					});
+				}
+				resolve(data);
+			},
+			fail: (err) => {
+				let data = JSON.parse(err.data);
+				uni.showToast({
+					title: '请求接口失败',
+					icon: 'fail',
+				});
+				reject(data);
+			},
+		});
+	});
+};

common/css/font-icon.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4241853 */
-  src: url('//at.alicdn.com/t/c/font_4241853_4dqwiv9sdn3.woff2?t=1694418817815') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4241853_4dqwiv9sdn3.woff?t=1694418817815') format('woff'),
-       url('//at.alicdn.com/t/c/font_4241853_4dqwiv9sdn3.ttf?t=1694418817815') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_4241853_1c99vjt3wel.woff2?t=1694419891836') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4241853_1c99vjt3wel.woff?t=1694419891836') format('woff'),
+       url('//at.alicdn.com/t/c/font_4241853_1c99vjt3wel.ttf?t=1694419891836') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-weixin:before {
+  content: "\e73b";
+}
+
 .icon-pinglun:before {
   content: "\e8b4";
 }

components/upload/index.vue

@@ -1,120 +1,119 @@
-<template>
-	<view class="upload">
-		<view class="upload_1">
-			<view class="list" v-for="(item,index) in list" :key="index">
-				<image class="image" :src="item.url" @click="toView(index,item)"></image>
-				<uni-icons class="del" type="close" size="30" color="#007AFF" @click="uplDel(index,item)"></uni-icons>
-			</view>
-			<view class="list" v-if="list&&list.length<count" @tap="uplSuc()">
-				<uni-icons class="add" type="plusempty" size="55" color="#007AFF"></uni-icons>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		props: {
-			list: {
-				type: Array,
-			},
-			name: {
-				type: String,
-			},
-			count: {
-				type: Number,
-				default: 1
-			}
-		},
-		data() {
-			return {
-
-			};
-		},
-		methods: {
-			uplSuc() {
-				const that = this;
-				let serverFile = that.$config.serverFile;
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['original', 'compressed'],
-					sourceType: ['album', 'camera'],
-					success: async function(res) {
-						let tempFile = JSON.parse(JSON.stringify(res.tempFilePaths));
-						const arr = await that.$apifile(`/material/applet/upload`, 'file', tempFile[0], 'file');
-						that.$emit('uplSuc', {
-							data: {
-								name: arr.name,
-								uri: arr.uri,
-								url: serverFile + arr.uri
-							},
-							name: that.name
-						})
-					}
-				});
-			},
-			// 删除图片
-			uplDel(index, e) {
-				const that = this;
-				that.$emit('uplDel', {
-					data: {
-						file: e,
-						index: index
-					},
-					name: that.name
-				})
-			},
-			// 图片预览
-			toView(index, e) {
-				const that = this;
-				uni.previewImage({
-					current: index,
-					urls: [e.url]
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.upload {
-		padding: 0 2vw;
-
-		.upload_1 {
-			display: flex;
-			flex-direction: row;
-			flex-wrap: wrap;
-
-			.list {
-				position: relative;
-				width: 30vw;
-				height: 28vw;
-				text-align: center;
-				margin: 0 3vw 2vw 0;
-				border-radius: 5px;
-				box-shadow: 0 0 2px var(--f85Color);
-
-				.image {
-					width: 100%;
-					height: 100%;
-					border-radius: 5px;
-				}
-
-				.add {
-					position: relative;
-					top: 20px;
-				}
-
-				.del {
-					position: absolute;
-					right: 0;
-					top: 0;
-				}
-			}
-
-			.list:nth-child(3n) {
-				margin: 0 0 2vw 0;
-			}
-		}
-	}
-</style>
+<template>
+	<view class="upload">
+		<view class="upload_1">
+			<view class="list" v-for="(item,index) in list" :key="index">
+				<image class="image" :src="item.url" @click="toView(index,item)"></image>
+				<uni-icons class="del" type="close" size="30" color="#007AFF" @click="uplDel(index,item)"></uni-icons>
+			</view>
+			<view class="list" v-if="list&&list.length<count" @tap="uplSuc()">
+				<uni-icons class="add" type="plusempty" size="55" color="#007AFF"></uni-icons>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			list: {
+				type: Array,
+			},
+			name: {
+				type: String,
+			},
+			count: {
+				type: Number,
+				default: 1
+			}
+		},
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			uplSuc() {
+				const that = this;
+				let serverFile = that.$config.serverFile;
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						let tempFile = JSON.parse(JSON.stringify(res.tempFilePaths));
+						const arr = await that.$apifile(`/travel/applet/upload`, 'file', tempFile[0],
+						'file');
+						that.$emit('uplSuc', {
+							data: {
+								name: arr.name,
+								uri: arr.uri,
+								url: serverFile + arr.uri
+							},
+							name: that.name
+						})
+					}
+				});
+			},
+			// 删除图片
+			uplDel(index, e) {
+				const that = this;
+				that.$emit('uplDel', {
+					data: {
+						file: e,
+						index: index
+					},
+					name: that.name
+				})
+			},
+			// 图片预览
+			toView(index, e) {
+				const that = this;
+				uni.previewImage({
+					current: index,
+					urls: [e.url]
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.upload {
+		padding: 0 2vw;
+
+		.upload_1 {
+			display: flex;
+			justify-content: center;
+
+			.list {
+				position: relative;
+				width: 25vw;
+				height: 25vw;
+				text-align: center;
+				border-radius: 25vw;
+				border: 1px solid var(--f9Color);
+
+				.image {
+					width: 100%;
+					height: 100%;
+					border-radius: 25vw;
+				}
+
+				.add {
+					position: relative;
+					top: 20px;
+				}
+
+				.del {
+					position: absolute;
+					right: 0;
+					top: 0;
+				}
+			}
+
+			.list:nth-child(3n) {
+				margin: 0 0 2vw 0;
+			}
+		}
+	}
+</style>

manifest.json

@@ -16,7 +16,9 @@
             "autoclose" : true,
             "delay" : 0
         },
-        "modules" : {},
+        "modules" : {
+            "OAuth" : {}
+        },
         /* 模块配置 */
         "distribute" : {
             /* 应用发布信息 */
@@ -42,7 +44,14 @@
             },
             "ios" : {},
             /* ios打包配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx23c71bee5876d1b9",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
         }
     },
     /* SDK配置 */
@@ -57,11 +66,11 @@
             "es6" : true,
             "postcss" : true
         },
-        "optimization": {
-        	"subPackages": true
-        },
-        "lazyCodeLoading": "requiredComponents",
-        "usingComponents": true
+        "optimization" : {
+            "subPackages" : true
+        },
+        "lazyCodeLoading" : "requiredComponents",
+        "usingComponents" : true
     },
     "vueVersion" : "2"
 }

pages/my/index.vue

@@ -3,8 +3,8 @@
 		<view class="one">
 			<view class="one_1">
 				<view v-if="user._id" class="top">
-					<image class="image" :src="user.icon&&item.icon.length>0?item.icon[0].url:'../../static/my.png'"
-						mode="widthFix"></image>
+					<image class="image" :src="user.logo&&user.logo.length>0?user.logo[0].url:'../../static/my.png'"
+						mode=""></image>
 					<text>{{user.nick_name||'微信用户'}}</text>
 				</view>
 				<view v-else class="top" @tap="toLogin">
@@ -84,12 +84,12 @@
 		},
 		onLoad: async function() {
 			const that = this;
-			that.searchToken();
 			await that.searchOther();
 			await that.search();
 		},
 		onShow: async function(e) {
 			const that = this;
+			that.searchToken();
 		},
 		methods: {
 			searchToken() {
@@ -108,12 +108,13 @@
 			// 查询
 			async search() {
 				const that = this;
-				
+
 			},
 			// 登录或注册
 			async toLogin() {
-				const that = this;
-				console.log('登录');
+				uni.navigateTo({
+					url: `/pagesIndex/login/index`
+				})
 			},
 			// 点赞或收藏
 			toLike(item) {
@@ -170,7 +171,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.main {
 		display: flex;
 		flex-direction: column;
@@ -183,17 +184,18 @@
 			height: 45vw;
 
 			.one_1 {
-				padding: 5vw;
+				padding: 4vw;
 
 				.top {
 					display: flex;
 					align-items: center;
-					font-size: var(--font20Szie);
+					font-size: var(--font18Szie);
 
 					.image {
 						width: 15vw;
 						height: 15vw;
 						border-radius: 15vw;
+						margin: 0 2vw;
 					}
 
 					.iconfont {

pagesHome/article/index.vue

@@ -193,7 +193,13 @@
 			},
 			// 发送
 			async toSend(item) {
-				console.log(item);
+				if (that.user && that.user._id) {
+					console.log(item);
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
+				}
 			},
 			// 分页
 			toPage(e) {
@@ -244,7 +250,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.main {
 		display: flex;
 		flex-direction: column;
@@ -319,11 +325,11 @@
 					.right_1 {
 						display: flex;
 						align-items: center;
-						font-size: var(--font18Szie);
+						font-size: var(--font17Szie);
 
 						.iconfont {
 							padding: 0 1vw;
-							font-size: 22px;
+							font-size: 21px;
 						}
 					}
 				}

pagesIndex/login/index.vue

@@ -1,20 +1,295 @@
 <template>
 	<view class="main">
-		系统首页
+		<view class="wx">
+			<view class="wx_1">
+				<text class="iconfont icon-weixin"></text>
+			</view>
+			<view class="wx_2">
+				<button size="mini" @tap="otherLogin()">微信信任登录</button>
+			</view>
+			<view class="wx_3">
+				<checkbox-group @change="changeAgree">
+					<label>
+						<checkbox :checked="agree" />
+						<text @tap.stop="toAgree()">我已阅读并同意“用户协议”和“隐私政策”</text>
+					</label>
+				</checkbox-group>
+			</view>
+		</view>
+		<!-- <uni-popup ref="dialogShow" type="center" :mask-click="false" background-color="#ffffff">
+			<view class="popup">
+				<view class="title">
+					<text>绑定手机号</text>
+				</view>
+				<view class="wx_1">
+					<text>确定获取微信绑定手机号吗？</text>
+				</view>
+				<view class="wx_2">
+					<button size="mini" @tap="diaClose">取消</button>
+					<button size="mini" open-type="getPhoneNumber" @getphonenumber="getUserPhone">确定</button>
+				</view>
+			</view>
+		</uni-popup> -->
 	</view>
 </template>
-
 <script>
 	export default {
 		data() {
-			return {}
+			return {
+				openid: '',
+				form: {},
+				// 用戶协议
+				agree: true,
+				// 注册账号信息
+				user: {},
+				// 弹框
+				dialog: {
+					title: '绑定手机号'
+				},
+			};
+		},
+		onShow: function() {
+			const that = this;
+			// 查询平台信息
+			that.searchOpenids();
 		},
 		methods: {
+			async searchOpenids() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('openid');
+					if (res) that.$set(that, `openid`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
 
-		}
+			// 其他登录方式
+			async otherLogin() {
+				const that = this;
+				let agree = that.agree;
+				let openid = that.openid;
+				if (agree) {
+					if (openid) {
+						const res = await that.$api(`/user/login`, 'GET', {
+							openid: openid
+						})
+						if (res.errcode == '0') {
+							const token = await that.$token(`/tool/token`, 'GET', {
+								token: res.data
+							});
+							if (token.errcode == '0') {
+								that.$set(that, `user`, token.data);
+								// 登录成功
+								uni.getUserInfo({
+									provider: 'weixin',
+									success: function(info) {
+										// 修改用户信息
+										that.updatePhone({
+											nick_name: info.userInfo.nickName,
+											logo: [{
+												url: info.userInfo.avatarUrl
+											}],
+										})
+									}
+								})
+							}
+						} else {
+							uni.showToast({
+								title: res.errmsg || '信息错误',
+								icon: 'none'
+							})
+						}
+					} else {
+						uni.showToast({
+							title: '系统更新中，请稍后再试!',
+							icon: 'none'
+						})
+					}
+				} else {
+					uni.showToast({
+						title: '请阅读并同意用户协议和隐私政策',
+						icon: 'none'
+					})
+				}
+			},
+			// 获取手机号
+			getUserPhone(e) {
+				console.log(e);
+				const that = this;
+				uni.login({
+					provider: 'weixin',
+					success: async function(data) {
+						let res = await that.$api(`/wechat/api/login/getPhone`, 'GET', {
+							config: that.$config.wx_projectkey,
+							code: data.code
+						})
+						if (res.errcode == '0') {
+							// 登录成功
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: function(info) {
+									const phone = res.data && res.data.phone_info && res.data
+										.phone_info
+										.purePhoneNumber || '';
+									// 修改用户信息
+									that.updatePhone({
+										phone,
+										nick_name: info.userInfo.nickName,
+										logo: [{
+											url: info.userInfo.avatarUrl
+										}],
+									})
+								}
+							})
+						} else {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none'
+							})
+						}
+					},
+					fail: function(err) {
+						// 登录授权失败  
+						// err.code是错误码
+					}
+				});
+			},
+			async updatePhone(form) {
+				const that = this;
+				let user = that.user;
+				let openid = that.openid;
+				let arr = await that.$api(`/user/${user._id}`, 'POST', {
+					openid,
+					...form
+				})
+				if (arr.errcode == '0') {
+					let res = await that.$api(`/user/${user._id}`, 'GET', {})
+					uni.setStorage({
+						key: 'token',
+						data: res.data,
+						success: function(res) {
+							uni.navigateBack({
+								delta: 1
+							})
+						},
+						fail: function(err) {
+							console.log(err);
+						}
+					})
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					})
+				}
+			},
+			// 弹框关闭
+			diaClose() {
+				const that = this;
+				that.$refs.dialogShow.close();
+			},
+			// 同意隐私协议
+			changeAgree() {
+				const that = this;
+				let agree = true;
+				if (that.agree) agree = false;
+				that.$set(that, `agree`, agree);
+			},
+			// 查看隐私协议
+			toAgree() {
+				const that = this;
+				uni.navigateTo({
+					url: `/pagesOther/other/agree`
+				})
+			},
+		},
 	}
 </script>
 
-<style>
-	.main {}
+<style lang="scss" scoped>
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.wx {
+			text-align: center;
+			margin: 25vw 0 0 0;
+
+			.wx_1 {
+				margin: 0 0 5vw 0;
+
+				.iconfont {
+					color: var(--f35BColor);
+				}
+
+				text {
+					font-size: 50px;
+				}
+			}
+
+			.wx_2 {
+				button {
+					background: var(--f35BColor);
+					color: var(--fffColor);
+					font-size: var(--font16Size);
+				}
+			}
+
+			.wx_3 {
+				position: absolute;
+				bottom: 10vw;
+				width: 100vw;
+				text-align: center;
+				font-size: 12px;
+			}
+
+		}
+
+		.popup {
+			width: 86vw;
+			padding: 2vw;
+
+			.title {
+				text-align: center;
+				margin: 0 0 2vw 0;
+
+				text {
+					color: var(--fFB1Color);
+					font-size: var(--font16Size);
+				}
+			}
+
+			.wx_1 {
+				text-align: center;
+				margin: 9vw 0;
+
+				text {
+					font-size: var(--font18Size);
+				}
+			}
+
+			.wx_2 {
+				text-align: center;
+
+				button {
+					margin: 0 2vw;
+					font-size: var(--font16Size);
+					padding: 0 10vw;
+					color: var(--fffColor);
+					background-color: var(--f35BColor);
+				}
+
+				button:nth-child(1) {
+					background-color: var(--fFB1Color);
+				}
+			}
+		}
+	}
 </style>

pagesMy/account/index.vue

@@ -1,20 +1,230 @@
 <template>
 	<view class="main">
-		系统首页
+		<view class="one">
+			<upload class='upload' :list="user.logo" name="logo" :count="1" @uplSuc="uplSuc" @uplDel="uplDel">
+			</upload>
+		</view>
+		<view class="two">
+			<view class="two_1">
+				<view class="left">真实姓名</view>
+				<view class="right">
+					<input v-model="user.name" placeholder="请输入真实姓名" />
+					<text class="iconfont icon-dayuhao"></text>
+				</view>
+			</view>
+			<view class="two_1">
+				<view class="left">昵称</view>
+				<view class="right">
+					<input v-model="user.nick_name" placeholder="请输入昵称" />
+					<text class="iconfont icon-dayuhao"></text>
+				</view>
+			</view>
+			<view class="two_1">
+				<view class="left">性别</view>
+				<view class="right">
+					<picker class="picker" mode="selector" :range="genderList" @change="genderChange" range-key="label">
+						<view>{{gender_name||'请选择性别'}}</view>
+					</picker>
+					<text class="iconfont icon-dayuhao"></text>
+				</view>
+			</view>
+			<view class="two_1">
+				<view class="left">手机号</view>
+				<view class="right">
+					<input v-model="user.phone" placeholder="请输入手机号" />
+					<text class="iconfont icon-dayuhao"></text>
+				</view>
+			</view>
+			<view class="two_1">
+				<view class="left">生日</view>
+				<view class="right">
+					<picker mode="date" :value="user.birthday" :start="startDate" :end="endDate"
+						@change="bindDateChange">
+						<view>{{user.birthday||'请选择生日'}}</view>
+					</picker>
+					<text class="iconfont icon-dayuhao"></text>
+				</view>
+			</view>
+			<view class="two_1">
+				<view class="left">所在城市</view>
+				<view class="right">
+					<picker class="picker" :value="user.city" mode="selector" :range="cityList" @change="cityChange"
+						range-key="name">
+						<view>{{user.city||'请选择所在城市'}}</view>
+					</picker>
+					<text class="iconfont icon-dayuhao"></text>
+				</view>
+			</view>
+		</view>
+		<view class="thr">
+			<button class="button" type="primary" size="mini" @click="onSubmit()">保存</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import upload from '../../components/upload/index.vue';
 	export default {
+		components: {
+			upload
+		},
 		data() {
-			return {}
+			return {
+				user: {},
+				gender_name: '',
+				// 字典表
+				genderList: [],
+				cityList: [],
+			}
+		},
+		onLoad: async function() {
+			const that = this;
+			await that.searchOther();
+			await that.search();
+		},
+		onShow: async function(e) {
+			const that = this;
+			that.searchToken();
 		},
 		methods: {
-
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						res.gender_name
+						that.$set(that, `user`, res);
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			// 查询
+			async search() {
+				const that = this;
+				let data = that.genderList.find(i => i.value == that.user.gender);
+				if (data) that.$set(that, `gender_name`, data.label)
+			},
+			// 图片上传
+			uplSuc(e) {
+				const that = this;
+				that.$set(that.user, `logo`, [e.data]);
+			},
+			// 图片删除
+			uplDel(e) {
+				const that = this;
+				that.$set(that.user, `logo`, [])
+			},
+			// 性别选择
+			genderChange(e) {
+				const that = this;
+				let data = that.genderList.find(i => i.value == e.detail.value);
+				if (data) {
+					that.$set(that.user, `gender`, data.value)
+					that.$set(that, `gender_name`, data.label)
+				}
+			},
+			// 生日选择
+			bindDateChange: function(e) {
+				const that = this;
+				that.$set(that.user, `birthday`, e.detail.value)
+			},
+			// 城市选择
+			cityChange(e) {
+				const that = this;
+				let data = that.cityList[e.detail.value];
+				that.$set(that.user, `city`, data.name)
+			},
+			// 保存
+			async onSubmit() {
+				const that = this;
+				const form = that.user;
+				delete form.gender_name
+				const res = await that.$api(`/user/${form._id}`, 'POST', form);
+				if (res.errcode == '0') {
+					uni.showToast({
+						title: '维护信息成功',
+						icon: 'none'
+					})
+					let arr = await that.$api(`/user/${form._id}`, 'GET', {})
+					uni.setStorage({
+						key: 'token',
+						data: arr.data,
+						success: function(res) {
+							uni.navigateBack({
+								delta: 1
+							})
+						},
+						fail: function(err) {
+							console.log(err);
+						}
+					})
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+						icon: 'none'
+					})
+				}
+			},
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询类型
+				res = await that.$api(`/dictData`, 'GET', {
+					type: 'gender',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `genderList`, res.data);
+				let config = that.$config;
+				that.$set(that, `cityList`, config.china);
+			}
 		}
 	}
 </script>
 
-<style>
-	.main {}
+<style lang="scss" scoped>
+	.main {
+		.one {
+			padding: 2vw;
+			text-align: center;
+		}
+
+		.two {
+			padding: 2vw;
+
+			.two_1 {
+				display: flex;
+				justify-content: space-between;
+				padding: 4vw;
+				border-bottom: 1px solid var(--f9Color);
+				font-size: var(--font14Size);
+				color: var(--f69Color);
+
+				.right {
+					display: flex;
+					align-items: center;
+
+					input {
+						text-align: right;
+						padding: 0 1vw;
+					}
+				}
+			}
+		}
+
+		.thr {
+			text-align: center;
+
+			.button {
+				margin: 2vw 0 0 0;
+				background-color: var(--f3CColor);
+				color: var(--mainColor);
+				font-size: var(--font14Size);
+			}
+		}
+	}
 </style>

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -5,9 +5,9 @@
 /* 水平间距 */
 @font-face {
   font-family: "iconfont"; /* Project id 4241853 */
-  src: url('//at.alicdn.com/t/c/font_4241853_4dqwiv9sdn3.woff2?t=1694418817815') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4241853_4dqwiv9sdn3.woff?t=1694418817815') format('woff'),
-       url('//at.alicdn.com/t/c/font_4241853_4dqwiv9sdn3.ttf?t=1694418817815') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_4241853_1c99vjt3wel.woff2?t=1694419891836') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4241853_1c99vjt3wel.woff?t=1694419891836') format('woff'),
+       url('//at.alicdn.com/t/c/font_4241853_1c99vjt3wel.ttf?t=1694419891836') format('truetype');
 }
 .iconfont {
   font-family: "iconfont" !important;
@@ -16,6 +16,9 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-weixin:before {
+  content: "\e73b";
+}
 .icon-pinglun:before {
   content: "\e8b4";
 }
@@ -2465,12 +2468,14 @@ page {
   --f85Color: #858585;
   --f69Color: #696969;
   --f80Color: #808080;
+  --fFB1Color: #7A7E83;
   --fDCColor: #DCDCDC;
   --fcColor: #cccccc;
   --f00Color: #000000;
   --fffColor: #ffffff;
   --f3CColor: #007AFF;
-  --fFB1Color: #7A7E83;
   --fF0Color: #FF0000;
+  --f08Color: #008000;
+  --f35BColor: #35BD7B;
 }
 

unpackage/dist/dev/mp-weixin/components/upload/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/upload/index.wxss

@@ -0,0 +1,36 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.upload {
+  padding: 0 2vw;
+}
+.upload .upload_1 {
+  display: flex;
+  justify-content: center;
+}
+.upload .upload_1 .list {
+  position: relative;
+  width: 25vw;
+  height: 25vw;
+  text-align: center;
+  border-radius: 25vw;
+  border: 1px solid var(--f9Color);
+}
+.upload .upload_1 .list .image {
+  width: 100%;
+  height: 100%;
+  border-radius: 25vw;
+}
+.upload .upload_1 .list .add {
+  position: relative;
+  top: 20px;
+}
+.upload .upload_1 .list .del {
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+.upload .upload_1 .list:nth-child(3n) {
+  margin: 0 0 2vw 0;
+}
+

unpackage/dist/dev/mp-weixin/pages/my/index.wxss

@@ -1,48 +1,49 @@
 @charset "UTF-8";
 /* 水平间距 */
 /* 水平间距 */
-.main {
+.main.data-v-4dcceeb0 {
   display: flex;
   flex-direction: column;
   width: 100vw;
   height: 100vh;
   background-color: var(--footColor);
 }
-.main .one {
+.main .one.data-v-4dcceeb0 {
   background-image: linear-gradient(181.2deg, #FEFEFE 10.5%, #87CEFA 86.8%);
   height: 45vw;
 }
-.main .one .one_1 {
-  padding: 5vw;
+.main .one .one_1.data-v-4dcceeb0 {
+  padding: 4vw;
 }
-.main .one .one_1 .top {
+.main .one .one_1 .top.data-v-4dcceeb0 {
   display: flex;
   align-items: center;
-  font-size: var(--font20Szie);
+  font-size: var(--font18Szie);
 }
-.main .one .one_1 .top .image {
+.main .one .one_1 .top .image.data-v-4dcceeb0 {
   width: 15vw;
   height: 15vw;
   border-radius: 15vw;
+  margin: 0 2vw;
 }
-.main .one .one_1 .top .iconfont {
+.main .one .one_1 .top .iconfont.data-v-4dcceeb0 {
   font-size: 40px;
   color: var(--f85Color);
   padding: 2vw;
 }
-.main .one .one_2 {
+.main .one .one_2.data-v-4dcceeb0 {
   padding: 5vw;
 }
-.main .one .one_2 .bottom {
+.main .one .one_2 .bottom.data-v-4dcceeb0 {
   display: flex;
   justify-content: space-around;
 }
-.main .one .one_2 .bottom .list {
+.main .one .one_2 .bottom .list.data-v-4dcceeb0 {
   display: flex;
   flex-direction: column;
   align-items: center;
 }
-.main .two {
+.main .two.data-v-4dcceeb0 {
   display: flex;
   flex-direction: column;
   padding: 2vw;
@@ -50,43 +51,43 @@
   border-radius: 10px;
   background-color: var(--mainColor);
 }
-.main .two .two_1 {
+.main .two .two_1.data-v-4dcceeb0 {
   display: flex;
   justify-content: space-between;
   padding: 2vw;
   border-bottom: 1px solid var(--f9Color);
 }
-.main .two .two_1 .left {
+.main .two .two_1 .left.data-v-4dcceeb0 {
   font-weight: 600;
   font-size: var(--font14Size);
 }
-.main .two .two_1 .right {
+.main .two .two_1 .right.data-v-4dcceeb0 {
   display: flex;
   align-items: center;
   font-size: var(--font12Size);
   color: var(--f99Color);
 }
-.main .two .two_2 {
+.main .two .two_2.data-v-4dcceeb0 {
   display: flex;
   justify-content: space-between;
   padding: 3vw 4vw;
 }
-.main .two .two_2 .list {
+.main .two .two_2 .list.data-v-4dcceeb0 {
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
   text-align: center;
 }
-.main .two .two_2 .list .icon .iconfont {
+.main .two .two_2 .list .icon .iconfont.data-v-4dcceeb0 {
   font-size: 25px;
 }
-.main .two .two_2 .list .title {
+.main .two .two_2 .list .title.data-v-4dcceeb0 {
   display: inline-block;
   margin: 1vw 0 0 0;
   font-size: var(--font12Size);
 }
-.main .thr {
+.main .thr.data-v-4dcceeb0 {
   display: flex;
   flex-direction: column;
   padding: 2vw;
@@ -94,29 +95,29 @@
   border-radius: 10px;
   background-color: var(--mainColor);
 }
-.main .thr .list {
+.main .thr .list.data-v-4dcceeb0 {
   display: flex;
   justify-content: space-between;
   padding: 2vw;
   border-bottom: 1px solid var(--f9Color);
 }
-.main .thr .list .left {
+.main .thr .list .left.data-v-4dcceeb0 {
   display: flex;
   align-items: center;
   font-size: var(--font12Size);
 }
-.main .thr .list .left .icon {
+.main .thr .list .left .icon.data-v-4dcceeb0 {
   padding: 0 1vw 0 0;
 }
-.main .thr .list .left .icon .iconfont {
+.main .thr .list .left .icon .iconfont.data-v-4dcceeb0 {
   color: var(--f3CColor);
   font-size: var(--font18Szie);
 }
-.main .thr .list .left .title {
+.main .thr .list .left .title.data-v-4dcceeb0 {
   display: inline-block;
   font-size: var(--font12Size);
 }
-.main .thr .list .right {
+.main .thr .list .right.data-v-4dcceeb0 {
   display: flex;
   align-items: center;
   font-size: var(--font12Size);

unpackage/dist/dev/mp-weixin/pagesHome/article/index.wxss

@@ -1,87 +1,87 @@
 @charset "UTF-8";
 /* 水平间距 */
 /* 水平间距 */
-.main {
+.main.data-v-344a728f {
   display: flex;
   flex-direction: column;
   box-sizing: border-box;
   width: 100vw;
   height: 100vh;
 }
-.main .info {
+.main .info.data-v-344a728f {
   position: relative;
   flex-grow: 1;
 }
-.main .info .two {
+.main .info .two.data-v-344a728f {
   padding: 0 2vw;
 }
-.main .info .two .two_1 {
+.main .info .two .two_1.data-v-344a728f {
   font-weight: bold;
   font-size: var(--font16Size);
 }
-.main .info .two .two_2 {
+.main .info .two .two_2.data-v-344a728f {
   padding: 1vw;
   font-size: var(--font14Size);
   color: var(--f3CColor);
 }
-.main .info .two .two_3 .rich-img {
+.main .info .two .two_3 .rich-img.data-v-344a728f {
   width: 100% !important;
   display: block;
 }
-.main .info .two .two_4 {
+.main .info .two .two_4.data-v-344a728f {
   padding: 3vw 0;
   font-size: var(--font12Size);
   color: var(--f99Color);
   border-bottom: 1px solid var(--f9Color);
 }
-.main .info .thr .thr_1 {
+.main .info .thr .thr_1.data-v-344a728f {
   padding: 2vw 4vw;
   font-weight: 500;
   font-size: var(--font15Size);
   border-bottom: 1px solid var(--f9Color);
 }
-.main .foot {
+.main .foot.data-v-344a728f {
   padding: 2vw;
   background-color: var(--mainColor);
 }
-.main .foot .foot_1 {
+.main .foot .foot_1.data-v-344a728f {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
-.main .foot .foot_1 .left .is-input-border {
+.main .foot .foot_1 .left .is-input-border.data-v-344a728f {
   border-radius: 45px;
 }
-.main .foot .foot_1 .right {
+.main .foot .foot_1 .right.data-v-344a728f {
   width: 45%;
   display: flex;
   justify-content: space-around;
 }
-.main .foot .foot_1 .right .right_1 {
+.main .foot .foot_1 .right .right_1.data-v-344a728f {
   display: flex;
   align-items: center;
-  font-size: var(--font18Szie);
+  font-size: var(--font17Szie);
 }
-.main .foot .foot_1 .right .right_1 .iconfont {
+.main .foot .foot_1 .right .right_1 .iconfont.data-v-344a728f {
   padding: 0 1vw;
-  font-size: 22px;
+  font-size: 21px;
 }
-.scroll-view {
+.scroll-view.data-v-344a728f {
   position: absolute;
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
 }
-.scroll-view .list-scroll-view {
+.scroll-view .list-scroll-view.data-v-344a728f {
   display: flex;
   flex-direction: column;
 }
-.is_bottom {
+.is_bottom.data-v-344a728f {
   width: 100%;
   text-align: center;
 }
-.is_bottom text {
+.is_bottom text.data-v-344a728f {
   padding: 2vw 0;
   display: inline-block;
   color: var(--f85Color);

unpackage/dist/dev/mp-weixin/pagesIndex/login/index.wxss

@@ -1,3 +1,67 @@
-
-.main {}
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main.data-v-775621ce {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .wx.data-v-775621ce {
+  text-align: center;
+  margin: 25vw 0 0 0;
+}
+.main .wx .wx_1.data-v-775621ce {
+  margin: 0 0 5vw 0;
+}
+.main .wx .wx_1 .iconfont.data-v-775621ce {
+  color: var(--f35BColor);
+}
+.main .wx .wx_1 text.data-v-775621ce {
+  font-size: 50px;
+}
+.main .wx .wx_2 button.data-v-775621ce {
+  background: var(--f35BColor);
+  color: var(--fffColor);
+  font-size: var(--font16Size);
+}
+.main .wx .wx_3.data-v-775621ce {
+  position: absolute;
+  bottom: 10vw;
+  width: 100vw;
+  text-align: center;
+  font-size: 12px;
+}
+.main .popup.data-v-775621ce {
+  width: 86vw;
+  padding: 2vw;
+}
+.main .popup .title.data-v-775621ce {
+  text-align: center;
+  margin: 0 0 2vw 0;
+}
+.main .popup .title text.data-v-775621ce {
+  color: var(--fFB1Color);
+  font-size: var(--font16Size);
+}
+.main .popup .wx_1.data-v-775621ce {
+  text-align: center;
+  margin: 9vw 0;
+}
+.main .popup .wx_1 text.data-v-775621ce {
+  font-size: var(--font18Size);
+}
+.main .popup .wx_2.data-v-775621ce {
+  text-align: center;
+}
+.main .popup .wx_2 button.data-v-775621ce {
+  margin: 0 2vw;
+  font-size: var(--font16Size);
+  padding: 0 10vw;
+  color: var(--fffColor);
+  background-color: var(--f35BColor);
+}
+.main .popup .wx_2 button.data-v-775621ce:nth-child(1) {
+  background-color: var(--fFB1Color);
+}
 

unpackage/dist/dev/mp-weixin/pagesMy/account/index.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "账号设置",
-  "usingComponents": {}
+  "usingComponents": {
+    "upload": "/components/upload/index"
+  }
 }

unpackage/dist/dev/mp-weixin/pagesMy/account/index.wxss

@@ -1,3 +1,36 @@
-
-.main {}
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main .one.data-v-1d21aa13 {
+  padding: 2vw;
+  text-align: center;
+}
+.main .two.data-v-1d21aa13 {
+  padding: 2vw;
+}
+.main .two .two_1.data-v-1d21aa13 {
+  display: flex;
+  justify-content: space-between;
+  padding: 4vw;
+  border-bottom: 1px solid var(--f9Color);
+  font-size: var(--font14Size);
+  color: var(--f69Color);
+}
+.main .two .two_1 .right.data-v-1d21aa13 {
+  display: flex;
+  align-items: center;
+}
+.main .two .two_1 .right input.data-v-1d21aa13 {
+  text-align: right;
+  padding: 0 1vw;
+}
+.main .thr.data-v-1d21aa13 {
+  text-align: center;
+}
+.main .thr .button.data-v-1d21aa13 {
+  margin: 2vw 0 0 0;
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  font-size: var(--font14Size);
+}
 

unpackage/dist/dev/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 193))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 200))
     },
   }
 } catch (e) {