图片压缩等

apis/modules/user.js

@@ -33,4 +33,16 @@ export const sendPhoneOrEmailCode = (data) => {
   return post('users/users/userAccount/sendPhoneOrEmailCode', data)
 }
 
+export const changeAccount = account => {
+  return post(`users/applets/mine/changeAccount?account=${account}`)
+}
+
+export const changePhoneNumber = phone => {
+  return post(`users/applets/mine/changePhoneNumber?phone=${phone}`)
+}
+
+export const checkIfAnAccountExists = account => {
+  return post(`users/applets/mine/checkIfAnAccountExists?account=${account}`)
+}
+
 export const updateUserAvatars = `http://39.108.250.202:9000/users/users/userAccount/updateUserAvatars`

apis/request.js

@@ -14,7 +14,7 @@ const request = options => {
 	const header = Object.assign({}, config.headers, {
 		token: uni.getStorageSync('token')
 	})
-	const otherUrl = ['my', 'generateInvitationCode', 'weChatAppletCallback', 'userBinding', 'getUserRolesPermissionMenu']
+	const otherUrl = ['generateInvitationCode', 'weChatAppletCallback', 'userBinding', 'getUserRolesPermissionMenu']
 	return new Promise((resolve, reject)=>{
 		const { url } = options
 		uni.request({

manifest.json

@@ -51,7 +51,9 @@
         /* 小程序特有相关 */
         "appid" : "wx77a8a2a23138998b",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "es6" : true,
+            "minified" : true
         },
         "usingComponents" : true
     },

pages/account/account.vue

@@ -1,43 +1,42 @@
 <template>
 	<view class="page">
 		<view class="input">
-			<uni-easyinput v-model.trim="account" placeholder="请输入账号"></uni-easyinput>
+			<uni-easyinput v-model.trim="account" placeholder="请输入账号" @input="accountChange"></uni-easyinput>
 		</view>
 		<button type="primary" @click="submit">确认</button>
 	</view>
 </template>
 
 <script>
-	import { queryUserInfoDetails, updatePersonCenter } from '@/apis/modules/user.js'
+	import { checkIfAnAccountExists, changeAccount } from '@/apis/modules/user.js'
 	export default {
 		data() {
 			return {
+				timer: null,
 				account: '',
-				hrUserInfo: {},
+				repeat: false
-				personalFileList: [],
-				userAccountList: [],
 			}
 		},
 		onShow() {
-			this.getInfo()
+			
 		},
 		methods: {
-			// 获取个人信息
+			// 账号判重
-			getInfo() {
+			accountChange() {
-				queryUserInfoDetails().then(({ result }) => {
+				clearTimeout(this.timer)
-					this.hrUserInfo = result.hrUserInfo
+				this.timer = setTimeout(() => {
-					this.userAccountList = result.userAccountList
+					checkIfAnAccountExists(this.account).then(() => {
-				}).catch(e => {})
+						this.repeat = false
+					}).catch(e => {
+						this.repeat = true
+					})
+				}, 500)
 			},
 			submit() {
-				const { account, hrUserInfo, userAccountList } = this
+				const { account } = this
 				if(!account) return this.$util.errMsg('请输入账号')
-				userAccountList[0].userId = hrUserInfo.userId
+				if (this.repeat) return this.$util.errMsg('账号已存在!')
-				userAccountList[0].account = account
+				changeAccount(account).then(res => {
-				updatePersonCenter({
-					hrUserInfo,
-					userAccountList
-				}).then(res => {
 					this.$util.sucMsg('修改成功！')
 					setTimeout(() => {
 						uni.reLaunch({

pages/clientDetail/clientDetail.vue

@@ -284,6 +284,7 @@
 .page {
 	height: calc(100vh - 120rpx - env(safe-area-inset-bottom));
 	overflow: auto;
+	-webkit-overflow-scrolling: touch;
 }
 .info {
 	.name {

pages/editCourse/editCourse.vue

@@ -311,6 +311,7 @@
 .page {
 	height: calc(100vh - 140rpx - env(safe-area-inset-bottom));
 	overflow: auto;
+	-webkit-overflow-scrolling: touch;
 }
 .block {
 	position: relative;

pages/orderDetail/orderDetail.vue

@@ -402,6 +402,7 @@
 .page {
 	height: calc(100vh - 300rpx - env(safe-area-inset-bottom));
 	overflow: auto;
+	-webkit-overflow-scrolling: touch;
 }
 .show {
 	height: calc(100vh - 130rpx - env(safe-area-inset-bottom));

pages/orders/orders.vue

@@ -222,7 +222,6 @@
 			},
 			// 删除
 			del(e) {
-				console.log(e);
 				const that = this
 				uni.showModal({
 					title: '提示',

pages/person/person.vue

@@ -5,7 +5,7 @@
 			<view class="info">
 				<image class="avatar" :src="avatar" mode=""></image>
 				<view class="text">
-					<view class="name">{{ userName }}</view>
+					<view class="name">{{ my.info.userName }}</view>
 					<view class="phone">{{ my.info.phone }}</view>
 				</view>
 			</view>
@@ -84,13 +84,14 @@
 			},
 			// 退出登录
 			logout() {
+				const that = this
 				uni.showModal({
 					title: '提示',
 					content: '确定要退出账号吗？',
 					success(res) {
 						if (res.confirm) {
 							uni.clearStorageSync()
-							this.$util.to('../login/login')
+							that.$util.to('../login/login')
 						}
 					}
 				})

pages/phone/phone.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-	import { queryUserInfoDetails, bindPhoneOrEmail, sendPhoneOrEmailCode } from '@/apis/modules/user.js'
+	import { sendPhoneOrEmailCode, changePhoneNumber } from '@/apis/modules/user.js'
 	export default {
 		data() {
 			return {
@@ -28,15 +28,9 @@
 			}
 		},
 		onShow() {
-			this.getInfo()
+			
 		},
 		methods: {
-			// 获取个人信息
-			getInfo() {
-				queryUserInfoDetails().then(({ result }) => {
-					this.userId = result.hrUserInfo.userId
-				}).catch(e => {})
-			},
 			// 发送验证码
 			sendCode() {
 				const { phone } = this.form
@@ -78,13 +72,7 @@
 				const { phone, code } = this.form
 				if (!phone) return this.$util.errMsg('请输入手机号')
 				if (!code) return this.$util.errMsg('请输入验证码')
-				bindPhoneOrEmail({
+				changePhoneNumber(phone).then(res => {
-					userId: this.userId,
-					phone,
-					types: 2,
-					code,
-					opener: this.phoneOpener
-				}).then(res => {
 					this.$util.sucMsg('修改成功！')
 					setTimeout(() => {
 						uni.reLaunch({