Merge pull request 'lh' (#50) from lh into master

Reviewed-on: http://git.feashow.cn/odjbin/city-store-transfer/pulls/50
2023-11-15 16:07:55 +00:00
parent 3b422a959d 5b05eb8eba
commit e50e90c841
5 changed files with 187 additions and 85 deletions
--- a/manifest.json
+++ b/manifest.json
@@ -1,82 +1,91 @@
 {
-	"name": "city-store-transfer",
-	"appid": "__UNI__F3EA0D6",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
-	/* 5+App特有相关 */
-	"app-plus": {
-		"usingComponents": true,
-		"nvueStyleCompiler": "uni-app",
-		"compilerVersion": 3,
-		"splashscreen": {
-			"alwaysShowBeforeRender": true,
-			"waiting": true,
-			"autoclose": true,
-			"delay": 0
-		},
-		/* 模块配置 */
-		"modules": {},
-		/* 应用发布信息 */
-		"distribute": {
-			/* android打包配置 */
-			"android": {
-				"permissions": [
-					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
-					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-					"<uses-feature android:name=\"android.hardware.camera\"/>",
-					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-				]
-			},
-			/* ios打包配置 */
-			"ios": {},
-			/* SDK配置 */
-			"sdkConfigs": {}
-		}
-	},
-	/* 快应用特有相关 */
-	"quickapp": {},
-	/* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxda178d12ae834c45",
-		"setting": {
-			"urlCheck": false
-		},
-		"usingComponents": true,
-		"permission": {
-			// 获取当前的地理位置、速度 配置
-			"scope.userLocation": {
-				"desc": "你的位置信息将用于小程序位置接口的效果展示"
-			},
-			"scope.userFuzzyLocation": {
-				"desc": "你的位置信息将用于小程序位置的效果展示"
-			}
-		},
-		"requiredPrivateInfos": ["choosePoi", "chooseAddress", "getFuzzyLocation"]
-	},
-	"mp-alipay": {
-		"usingComponents": true
-	},
-	"mp-baidu": {
-		"usingComponents": true
-	},
-	"mp-toutiao": {
-		"usingComponents": true
-	},
-	"uniStatistics": {
-		"enable": false
-	},
-	"vueVersion": "2"
+    "name" : "city-store-transfer",
+    "appid" : "__UNI__F3EA0D6",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "OAuth" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wxda178d12ae834c45",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxda178d12ae834c45",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "permission" : {
+            // 获取当前的地理位置、速度 配置
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            },
+            "scope.userFuzzyLocation" : {
+                "desc" : "你的位置信息将用于小程序位置的效果展示"
+            }
+        },
+        "requiredPrivateInfos" : [ "choosePoi", "chooseAddress", "getFuzzyLocation" ]
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2"
 }
--- a/pages.json
+++ b/pages.json
@@ -163,7 +163,16 @@
 				"enablePullDownRefresh": false
 			}
 		}
-	],
+	    ,{
+            "path" : "pages/my/edit/edit",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "修改个人信息",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"tabBar": {
 		"color": "#CCCCCC",
 		"borderStyle": "white",
--- a/pages/my/edit/edit.vue
+++ b/pages/my/edit/edit.vue
@@ -0,0 +1,66 @@
+<template>
+	<view>
+		<view class="avatar">
+			<u-avatar @click="changeAvatar()" :src="avatar"></u-avatar>
+		</view>
+		<view class="name-edit">
+			<text>用户名：</text>
+			<u-input border="surround"  v-model="username"></u-input>
+		</view>
+		<view class="send">
+			<u-button @click="editInfo" color="linear-gradient(to right, #E86262, #CC3333)">提交</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				username:'',
+				avatar:''
+			}
+		},
+		methods: {
+			changeAvatar(){
+				// uni.uploadFile()
+				console.log(111);
+			},
+			editInfo(){
+				this.$api.editPersonInfo({
+				nickname:this.$data.nickname,
+				avatar:this.$data.avatar,
+				Headers:wx.getStorageSync('token')
+			}).then(res => {
+				console.log(res);
+			})
+			}
+		},
+		onLoad() {
+			let that = this
+			this.$data.username = wx.getStorageSync('nickname')
+			this.$data.avatar = wx.getStorageSync('avatar')
+			
+		}
+	}
+</script>
+
+<style>
+	.avatar{
+		width: 100%;
+		height: 200rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.name-edit{
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+	}
+	.send{
+		width: 50%;
+		transform: translateX(50%) translateY(50%);
+
+	}
+</style>
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -7,7 +7,8 @@
 					<u-avatar :src="src"></u-avatar>
 				</view>
 				<view class="username">{{username}}</view>
-				<view class="account">账号:{{account}}</view>
+				<view class="account">账号:{{account}} <u-icon name="edit-pen" class="edit-icon" size="20" @click="toEdit"></u-icon></view>
+				
 			</view>
 			<view class="publish">
 				<u-cell-group>
@@ -42,8 +43,8 @@
 		data() {
 			return {
 				src: 'https://cdn.uviewui.com/uview/album/2.jpg',
-				account: '123456',
-				username: '用户名',
+				account: '',
+				username: '',
 				isLoad: true
 			}
 		},
@@ -53,6 +54,8 @@
 				return
 			}
 			this.isLoad = true
+			this.$data.account = wx.getStorageSync('account')
+			this.$data.username = wx.getStorageSync('nickname')
 		},
 		methods: {
 			reOnLoad() {
@@ -82,6 +85,11 @@
 				uni.navigateTo({
 					url: '/pages/Partnerships/Partnerships'
 				})
+			},
+			toEdit(){
+				uni.navigateTo({
+					url:'/pages/my/edit/edit'
+				})
 			}
 			//---------页面调用接口示例------------
 			// getInfo() {
@@ -124,6 +132,10 @@
 		.account {
 			font-size: 15px;
 			font-weight: 1rpx;
+			display: flex;
+		}
+		.edit-icon{
+			
 		}

 	}
--- a/service/request.js
+++ b/service/request.js
@@ -202,6 +202,12 @@ const apiService = {
 		return new Promise((resolve, reject) => {
 			resolve(service.get(url))
 		})
+	},
+	editPersonInfo(data){
+		const url = `/center/userupdate`
+		return new Promise((resolve,reject) => {
+			resolve(service.post(url,data))
+		})
 	}
 }
 export {