commit-m 修改重置密码

api/use.js

@@ -6,145 +6,6 @@
  */
 import request from '@/common/config/caimeiApi.js'
 import $reg from '@/common/config/common.js'
-/**
- *机构普通注册
- */
-export function organizationVerifyRegisterFirst(params) {
-	return new Promise(function(resolve,reject) {
-		if( params.userName == ''){
-			uni.showToast({title: '请输入联系人名称',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if( params.bindMobile == ''){
-			uni.showToast({title: '请输入手机号',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if(!$reg.isMobile(params.bindMobile)){
-			uni.showToast({title: '手机格式不正确',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if( params.activationCode == ''){
-			uni.showToast({title: '请输入手机验证码',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if(!$reg.isMobileCode(params.activationCode)){
-			uni.showToast({title: '验证码格式不正确',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if( params.password == ''){
-			uni.showToast({title: '请输入密码',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if(!$reg.checkPwd(params.password)){
-			uni.showToast({title: '密码必须为8-16位字母数字的组合',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if( params.passWordConfirm == ''){
-			uni.showToast({title: '请再次确认密码',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if( params.passWordConfirm !== params.password){
-			uni.showToast({title: '两次输入的密码不一致',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if(params.isAgreed == 0){
-			uni.showToast({title: '请勾选同意协议',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		request.post('/club/common',params,true,res => {
-			if(res.code == 0){
-				resolve(res);
-			}else{
-				reject(res)
-			}
-		})
-	});
-}
-/**
- *绑定邮箱
- */
-export function bindingEmail(params) {
-	return new Promise(function(resolve,reject) {
-		if( params.email == ''){
-			uni.showToast({title: '请输入邮箱地址',duration: 2000,mask:true, icon:'none'})
-			return
-		}
-		if(!$reg.isEmail(params.email)){
-			uni.showToast({title: '请输入正确的邮箱地址',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if( params.code == ''){
-			uni.showToast({title: '请输入邮箱验证码',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		if(!$reg.isEmailCode(params.code)){
-			uni.showToast({title: '验证码格式不正确',duration: 2000,mask:true,icon:'none'})
-			return
-		}
-		request.post('/user/binding',params,true, res => {
-			if(res.code == 0){
-				resolve(res);
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *绑定微信
- */
-export function bindingWechat(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/club/bindingWx',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *获取个人中心信息
- */
-export function personalInfo(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/personalCenter/myCentre',params, res => {
-			resolve(res)
-		})
-	})
-}
-/**
- *获取账户余额明细
- */
-export function accountInfo(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/personalCenter/touchBalance',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-
-/**
- *用户状态初始化
- */
-export function userInfoLogin(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/club/authorization',params,false, res => {
-			if(res.code == 0 || res.code == 4){
-				resolve(res)
-			}else if(res.code == -6){
-				reject(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
 /**
  *手机修改密码
  */

pages/login/register.vue

@@ -71,7 +71,6 @@
 	import wxLogin from "@/common/config/wxLogin.js"
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationVerifyRegisterFirst } from "@/api/use.js"
 	import { uploadFileImage } from "@/api/utils.js"
 	export default{
 		components:{

pages/user/account/account.vue

@@ -147,8 +147,16 @@
 					  * @param：pageSize(每页条数)
 					  * @param：userId(用户ID)
 					  */ 
-					let params = {year:year,month:month,userId:this.userID,pageNum:1,pageSize:this.pageSize, type:this.balanceType,}
-					accountInfo(params).then(response =>{
+					this.UserService.GetAccountInfo(
+						{
+							year:year,
+							month:month,
+							userId:this.userID,
+							pageNum:1,
+							pageSize:this.pageSize,
+							 type:this.balanceType,
+						})
+						.then(response =>{
 						let infoData = response.data
 						this.initAbleUserMoney(infoData.ableUserMoney)
 						let resultsData = infoData.pageDate.results
@@ -176,9 +184,16 @@
 				})	
 			},	
 			getOnReachBottomData(index,year,month){//上拉加载
-				this.pageNum+=1
-				let params = {year:year,month:month,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize,type:this.balanceType}
-				accountInfo(params).then(response =>{
+				this.UserService.GetAccountInfo(
+					{
+						year:year,
+						month:month,
+						userId:this.userID,
+						pageNum:this.pageNum+=1,
+						pageSize:this.pageSize,
+						type:this.balanceType,
+					})
+					.then(response =>{
 					let infoData = response.data
 					this.initAbleUserMoney(infoData.ableUserMoney)
 					let resultsData = infoData.pageDate.results

seller/pages/club/addoperator.vue

@@ -73,7 +73,6 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
-	import { bindingWechat } from "@/api/use.js"
 	import { getbindWechatCode } from "@/api/utils.js"
 	export default{
 		data() {

services/user.service.js

@@ -132,6 +132,22 @@ export default class UserService {
 			isHost:true
 		})
 	}
+	/**
+	 * 找回密码&修改密码
+	 * @param: mobileOrEmail	手机号或邮箱	
+	 * @param: password			密码
+	 * @param: passwordConfirm	用户确认密码
+	 * @param: smsCode			短信验证码
+	 * @param: status			1:手机号找回,2:邮箱找回
+	*/
+	ModifyMobilePassword (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/update/password', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
+	}
 	/**
 	 * @机构-地址列表
 	 * @param:userId 用户ID(必传)，
@@ -180,6 +196,17 @@ export default class UserService {
 			isLoading: false ,
 		})
 	}
+	/**
+	 * @机构-获取账户余额明细
+	 * @param:userId 用户ID(必传)，
+	 */
+	GetAccountInfo (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/personalCenter/touchBalance', 
+			data, 
+			isLoading: true ,
+		})
+	}
 	/* 运营人员管理-列表 */
 	QueryOperatorList (data = {}) {
 		return this.AjaxService.get({ 
@@ -212,4 +239,5 @@ export default class UserService {
 			isLoading: true ,
 		})
 	}
+	
 }

supplier/pages/user/setting/password.vue

@@ -17,7 +17,7 @@
 		<view class="content" v-if="tabCurrentIndex === 1">
 			<view class="login-form clearfix">
 				<view class="login-input">
-					<input type="number" v-model="mobile"  maxlength="11" class="input" placeholder="请输入手机号" placeholder-class="placeholder"/>
+					<input type="number" v-model="phoneParams.mobileOrEmail"  maxlength="11" class="input" placeholder="请输入手机号" placeholder-class="placeholder"/>
 				</view>
 			</view>
 			<view class="login-form clearfix">
@@ -36,7 +36,7 @@
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input code">
-					<input type="number" v-model="mobileCode"  maxlength="6" class="input" placeholder="请输入短信验证码"  placeholder-class="placeholder"/>
+					<input type="number" v-model="phoneParams.smsCode"  maxlength="6" class="input" placeholder="请输入短信验证码"  placeholder-class="placeholder"/>
 				</view>
 				<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
 					<button type="button"
@@ -49,15 +49,15 @@
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
-					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="isShowEye" type="text" v-model="phoneParams.password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="!isShowEye" type="password" v-model="phoneParams.password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
 					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
-					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="isShowEyes" type="text" v-model="phoneParams.passwordConfirm"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="!isShowEyes" type="password" v-model="phoneParams.passwordConfirm"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
 					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
 				</view>
 			</view>
@@ -69,12 +69,12 @@
 		<view class="content" v-else>
 			<view class="login-form clearfix">
 				<view class="login-input">
-					<input class="input" type="text" v-model="email"  maxlength="30" placeholder="请输入邮箱地址"  placeholder-class="placeholder"/>
+					<input class="input" type="text" v-model="emailParams.mobileOrEmail"  maxlength="30" placeholder="请输入邮箱地址"  placeholder-class="placeholder"/>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input code">
-					<input class="input" type="number" v-model="emailCode" maxlength="4"  placeholder="请输入邮箱验证码"  placeholder-class="placeholder"/>
+					<input class="input" type="number" v-model="emailParams.smsCode" maxlength="4"  placeholder="请输入邮箱验证码"  placeholder-class="placeholder"/>
 				</view>
 				<view class="login-input btn" :class="[isEmialDisabled ? 'disabled' : '']">
 					<button class="input"  
@@ -87,15 +87,15 @@
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
-					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="isShowEye" type="text" v-model="emailParams.password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="!isShowEye" type="password" v-model="emailParams.password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
 					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
 				</view>
 			</view>
 			<view class="login-form clearfix">
 				<view class="login-input pwd">
-					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="isShowEyes" type="text" v-model="emailParams.passwordConfirm"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
+					<input v-show="!isShowEyes" type="password" v-model="emailParams.passwordConfirm"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
 					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
 				</view>
 			</view>
@@ -134,6 +134,20 @@
 				emailCodeText: '获取验证码',
 				mobileCodeText: '获取验证码',
 				codeTime: null,
+				phoneParams: {
+					mobileOrEmail :'',
+					smsCode : '',
+					password : '',
+					passwordConfirm : '',
+					status:1
+				},
+				emailParams: {
+					mobileOrEmail :'',
+					smsCode : '',
+					password : '',
+					passwordConfirm : '',
+					status:2
+				},
 			}
 		},
 		onLoad(option) {