add
This commit is contained in:
zmj
parent
d95ed4f482
commit
763e68af20
3
App.vue
3
App.vue
@ -162,6 +162,9 @@
|
||||
// this.audioTeam.push(result.extras.type);
|
||||
// }
|
||||
}
|
||||
|
||||
console.log("收到消息")
|
||||
console.log(result)
|
||||
// 点击事件
|
||||
if (notificationEventType == 'notificationOpened') {
|
||||
if (result.extras.type == 2) {
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
"name": "惠农生活",
|
||||
"appid": "__UNI__3A527D1",
|
||||
"description": "",
|
||||
"versionName": "2.0.45",
|
||||
"versionCode": 2045,
|
||||
"versionName": "2.0.48",
|
||||
"versionCode": 2048,
|
||||
"transformPx": false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus": {
|
||||
|
||||
@ -180,7 +180,7 @@
|
||||
|
||||
.next-btn {
|
||||
position: absolute;
|
||||
bottom: 100rpx;
|
||||
bottom: 100px;
|
||||
left: 375rpx;
|
||||
transform: translateX(-50%);
|
||||
width: 240rpx;
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<image src="/static/images/greenLine.png" style="width:35px;height: 60px;" mode=""></image>
|
||||
</view>
|
||||
<view class="tabbar2 center" :style="{top:(offsetY-68)+'px'}">
|
||||
<image src="/static/images/fabu.png" class="tab-icon"></image>
|
||||
<image src="/static/images/ydwd.png" class="tab-icon"></image>
|
||||
<text class="te">工作台</text>
|
||||
</view>
|
||||
<view class="pointe2" :style="{top:(offsetY-58)+'px'}">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -227,7 +227,7 @@
|
||||
<button class="settleAgree" @click="getConfig">《入驻协议》</button>
|
||||
</view>
|
||||
|
||||
<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
|
||||
<button class='submitBtn' @click="formSubmit">
|
||||
提交申请
|
||||
</button>
|
||||
</view>
|
||||
@ -252,9 +252,6 @@
|
||||
</view>
|
||||
|
||||
<div class="title">{{detail.title}}</div>
|
||||
<!-- <view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
|
||||
<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view> -->
|
||||
|
||||
<view class="contenta" v-if="detail.mer_services_agree">
|
||||
<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
|
||||
|
||||
@ -974,7 +971,7 @@
|
||||
}
|
||||
},
|
||||
formSubmit() {
|
||||
if (this.validateForm() && this.validate) {
|
||||
if (true) {
|
||||
if (this.merchantData.mer_type == '12') return this.agree();
|
||||
if (this.codenote.length == 0) {
|
||||
this.isshow = true
|
||||
@ -1500,7 +1497,7 @@
|
||||
color: #fff;
|
||||
background: #E3E3E3;
|
||||
margin-top: 25px;
|
||||
pointer-events: none;
|
||||
// pointer-events: none;
|
||||
}
|
||||
|
||||
.merchantsSettled .submitBtn.on {
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
<template>
|
||||
<div :style="viewColor">
|
||||
<div class="register_main" :style="{ 'background-image': formItem == 1 ? `url(${domain}/static/images/logo_bgl.png)` : `url(${domain}/static/images/logo_bgh.png)`}">
|
||||
<div class="register_main"
|
||||
:style="{ 'background-image': formItem == 1 ? `url(${domain}/static/images/logo_bgl.png)` : `url(${domain}/static/images/logo_bgh.png)`}">
|
||||
<view class="system-height" :style="{ height: statusBarHeight }"></view>
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<view class="title-bar" style="height: 43px;">
|
||||
@ -21,12 +22,15 @@
|
||||
<div class="list" :hidden="current !== 0">
|
||||
<form @submit.prevent="submit">
|
||||
<div class="item">
|
||||
<input type="text" placeholder="请输入手机号或账号" placeholder-class="placeholder" v-model="account" required />
|
||||
<input type="text" placeholder="请输入手机号或账号" placeholder-class="placeholder"
|
||||
v-model="account" required />
|
||||
</div>
|
||||
<div class="item">
|
||||
<input type="password" placeholder="填写登录密码" placeholder-class="placeholder" v-model="password" required />
|
||||
<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
|
||||
忘记密码
|
||||
<input type="password" placeholder="填写登录密码" placeholder-class="placeholder"
|
||||
v-model="password" required />
|
||||
<navigator class="forgetPwd" hover-class="none"
|
||||
url="/pages/users/retrievePassword/index">
|
||||
忘记密we码
|
||||
</navigator>
|
||||
</div>
|
||||
</form>
|
||||
@ -37,8 +41,10 @@
|
||||
<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
|
||||
</div>
|
||||
<div class="item">
|
||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
|
||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
|
||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
|
||||
v-model="captcha" />
|
||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
|
||||
@click="handleVerify">
|
||||
{{ text }}
|
||||
</button>
|
||||
</div>
|
||||
@ -49,11 +55,13 @@
|
||||
<div class="tip">
|
||||
<text v-if="current==0" @click="current = 1">手机号登录</text>
|
||||
<text v-else @click="current = 0">账号登录</text>
|
||||
</div>
|
||||
</div>
|
||||
<div class="protocol acea-row row-between-wrapper">
|
||||
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
|
||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />
|
||||
<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
|
||||
<text class="protocol_text">我已同意<text @click="userAgree"
|
||||
class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
|
||||
class="font_pro">《隐私政策》</text></text>
|
||||
</checkbox-group>
|
||||
</div>
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
@ -83,17 +91,23 @@
|
||||
<input type="text" placeholder="请输入手机号" placeholder-class="placeholder" v-model="account" />
|
||||
</div>
|
||||
<div class="item">
|
||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
|
||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
|
||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
|
||||
v-model="captcha" />
|
||||
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
|
||||
@click="handleVerify">
|
||||
{{ text }}
|
||||
</button>
|
||||
</div>
|
||||
<div class="item">
|
||||
<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder" v-model="password" />
|
||||
<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder"
|
||||
v-model="password" />
|
||||
</div>
|
||||
<div class="item" v-if="isShowCode">
|
||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="codeVal" />
|
||||
<div class="code" @click="getcaptcha"><image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" /></div>
|
||||
<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
|
||||
v-model="codeVal" />
|
||||
<div class="code" @click="getcaptcha">
|
||||
<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tip">
|
||||
@ -104,7 +118,9 @@
|
||||
<div class="protocol acea-row row-between-wrapper">
|
||||
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
|
||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />
|
||||
<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
|
||||
<text class="protocol_text">我已同意<text @click="userAgree"
|
||||
class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
|
||||
class="font_pro">《隐私政策》</text></text>
|
||||
</checkbox-group>
|
||||
</div>
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
@ -123,7 +139,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
<!-- #endif -->
|
||||
</div>
|
||||
<div class="bottom"></div>
|
||||
</div>
|
||||
@ -135,21 +151,27 @@
|
||||
</view>
|
||||
<view class="list">
|
||||
<view class="item">
|
||||
<input type='number' placeholder='填写手机号码' placeholder-class='placeholder' v-model="account"></input>
|
||||
<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
|
||||
v-model="account"></input>
|
||||
</view>
|
||||
<view class="item">
|
||||
<input type='number' placeholder='填写验证码' placeholder-class='placeholder' class="codeIput" v-model="captcha"></input>
|
||||
<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled' @click="handleVerify">
|
||||
<input type='number' placeholder='填写验证码' placeholder-class='placeholder'
|
||||
class="codeIput" v-model="captcha"></input>
|
||||
<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
|
||||
@click="handleVerify">
|
||||
{{ text }}
|
||||
</button>
|
||||
</view>
|
||||
<view class="item">
|
||||
<input type='password' placeholder='填写登录密码' placeholder-class='placeholder' v-model="password"></input>
|
||||
<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
|
||||
v-model="password"></input>
|
||||
</view>
|
||||
<view class="protocol acea-row">
|
||||
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
|
||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />
|
||||
<text class="protocol_text">您已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
|
||||
<text class="protocol_text">您已同意<text @click="userAgree"
|
||||
class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree"
|
||||
class="font_pro">《隐私政策》</text></text>
|
||||
</checkbox-group>
|
||||
</view>
|
||||
</view>
|
||||
@ -157,10 +179,11 @@
|
||||
<button form-type="submit" @click="auth_token = ''" class="logon back">返回</button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
</form>
|
||||
<view class="copyright" @click="goCopyUrl">{{copyData}}</view>
|
||||
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
|
||||
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
|
||||
ref="verify"></Verify>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@ -190,7 +213,10 @@
|
||||
loginMpPhone
|
||||
} from "@/api/user";
|
||||
// #ifdef APP-PLUS
|
||||
import { wechatAppAuth, appleAppAuth } from '@/api/api.js'
|
||||
import {
|
||||
wechatAppAuth,
|
||||
appleAppAuth
|
||||
} from '@/api/api.js'
|
||||
// #endif
|
||||
import attrs, {
|
||||
required,
|
||||
@ -209,10 +235,16 @@
|
||||
VUE_APP_API_URL,
|
||||
configMap
|
||||
} from "@/utils";
|
||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
||||
import {
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app';
|
||||
import parser from "@/components/jyf-parser/jyf-parser";
|
||||
import { commonAuth } from '../../../api/public';
|
||||
import { mapGetters} from "vuex";
|
||||
import {
|
||||
commonAuth
|
||||
} from '../../../api/public';
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import Verify from '@/components/verify/verify.vue';
|
||||
const BACK_URL = "login_back_url";
|
||||
|
||||
@ -253,13 +285,14 @@
|
||||
copyright: {}
|
||||
};
|
||||
},
|
||||
computed:{
|
||||
...configMap(['login_logo','wechat_phone_switch'], mapGetters(['viewColor'])),
|
||||
computed: {
|
||||
...configMap(['login_logo', 'wechat_phone_switch'], mapGetters(['viewColor'])),
|
||||
copyData() {
|
||||
let copy = this.copyright.status == -1 ? this.copyright.year+" "+this.copyright.url : this.copyright.Copyright
|
||||
let copy = this.copyright.status == -1 ? this.copyright.year + " " + this.copyright.url : this.copyright
|
||||
.Copyright
|
||||
return copy;
|
||||
}
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
formItem: function(nval, oVal) {
|
||||
if (nval == 1) {
|
||||
@ -282,37 +315,37 @@
|
||||
mounted: function() {
|
||||
this.getVersion();
|
||||
},
|
||||
onReady(){
|
||||
onReady() {
|
||||
let that = this
|
||||
// #ifdef MP
|
||||
wx.login({
|
||||
success (res) {
|
||||
if (res.code) {
|
||||
that.codeVal = res.code
|
||||
} else {
|
||||
console.log('登录失败！' + res.errMsg)
|
||||
}
|
||||
}
|
||||
success(res) {
|
||||
if (res.code) {
|
||||
that.codeVal = res.code
|
||||
} else {
|
||||
console.log('登录失败！' + res.errMsg)
|
||||
}
|
||||
}
|
||||
})
|
||||
// #endif
|
||||
},
|
||||
onShow() {
|
||||
uni.setStorageSync('tabbar_sale_type', 1);
|
||||
},
|
||||
onShow() {
|
||||
uni.setStorageSync('tabbar_sale_type', 1);
|
||||
},
|
||||
methods: {
|
||||
// #ifdef MP
|
||||
getPhoneNumber(e) {
|
||||
getPhoneNumber(e) {
|
||||
let that = this;
|
||||
if(!that.isAgree){
|
||||
if (!that.isAgree) {
|
||||
return that.$util.Tips({
|
||||
title: '请勾选用户协议与隐私政策'
|
||||
});
|
||||
}else{
|
||||
} else {
|
||||
loginMpPhone({
|
||||
iv:e.detail.iv,
|
||||
encryptedData:e.detail.encryptedData,
|
||||
code:that.codeVal,
|
||||
auth_token: uni.getStorageSync('auth_token'),
|
||||
iv: e.detail.iv,
|
||||
encryptedData: e.detail.encryptedData,
|
||||
code: that.codeVal,
|
||||
auth_token: uni.getStorageSync('auth_token'),
|
||||
}).then(({
|
||||
data
|
||||
}) => {
|
||||
@ -324,10 +357,11 @@
|
||||
});
|
||||
that.$store.commit("SETUID", data.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', data.user);
|
||||
|
||||
|
||||
let method
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index','/pages/plant_grass/index'
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
||||
'/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index', '/pages/plant_grass/index'
|
||||
]
|
||||
if (indexPat.includes(this.getPath(backUrl))) {
|
||||
method = 'switchTab'
|
||||
@ -350,7 +384,7 @@
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
// #endif
|
||||
goCopyUrl() {
|
||||
@ -358,20 +392,20 @@
|
||||
location.href = this.copyright.url
|
||||
// #endif
|
||||
},
|
||||
userAgree(){
|
||||
userAgree() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/user_about/index?from=sys_user_agree'
|
||||
})
|
||||
},
|
||||
userPrivacyAgree(){
|
||||
userPrivacyAgree() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/users/user_about/index?from=sys_userr_privacy'
|
||||
})
|
||||
},
|
||||
getSystem(system) {
|
||||
if(system.indexOf('iOS') === -1){
|
||||
if (system.indexOf('iOS') === -1) {
|
||||
return system
|
||||
}else{
|
||||
} else {
|
||||
let str = system.split(' ')[1]
|
||||
if (str.indexOf('.')) {
|
||||
return Number(str.split('.')[0])
|
||||
@ -388,11 +422,11 @@
|
||||
// 苹果登录
|
||||
appleLogin() {
|
||||
let self = this
|
||||
if(!self.isAgree){
|
||||
if (!self.isAgree) {
|
||||
return self.$util.Tips({
|
||||
title: '请勾选用户协议与隐私政策'
|
||||
});
|
||||
}else{
|
||||
} else {
|
||||
this.account = ''
|
||||
this.captcha = ''
|
||||
uni.showLoading({
|
||||
@ -431,19 +465,21 @@
|
||||
})
|
||||
}
|
||||
},
|
||||
appleLoginApi(){
|
||||
appleLoginApi() {
|
||||
let that = this
|
||||
commonAuth({
|
||||
auth: {
|
||||
type:'apple',
|
||||
type: 'apple',
|
||||
auth: {
|
||||
userInfo: that.appleUserInfo,
|
||||
openId: that.appleUserInfo.openId,
|
||||
nickname: (that.appleUserInfo.fullName.familyName || '') + (that.appleUserInfo.fullName.giveName || ''),
|
||||
nickname: (that.appleUserInfo.fullName.familyName || '') + (that.appleUserInfo.fullName
|
||||
.giveName || ''),
|
||||
}
|
||||
}}).then(res => {
|
||||
}
|
||||
}).then(res => {
|
||||
const data = res.data;
|
||||
if(res.data.status == 200){
|
||||
if (res.data.status == 200) {
|
||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$store.commit("LOGIN", {
|
||||
@ -453,8 +489,9 @@
|
||||
that.$store.commit("SETUID", data.result.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', data.result.user);
|
||||
let method
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index','/pages/plant_grass/index'
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
||||
'/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index', '/pages/plant_grass/index'
|
||||
]
|
||||
if (indexPat.includes(this.getPath(backUrl))) {
|
||||
method = 'switchTab'
|
||||
@ -470,7 +507,7 @@
|
||||
uni[method]({
|
||||
url: backUrl
|
||||
});
|
||||
}else{
|
||||
} else {
|
||||
uni.hideLoading();
|
||||
that.auth_token = res.data.result.key;
|
||||
}
|
||||
@ -521,15 +558,16 @@
|
||||
const that = this
|
||||
commonAuth({
|
||||
auth: {
|
||||
type:'app_wechat',
|
||||
type: 'app_wechat',
|
||||
auth: {
|
||||
code: that.appUserInfo.authResult.access_token,
|
||||
openid: that.appUserInfo.authResult.openid,
|
||||
phone: this.account,
|
||||
}
|
||||
}}).then(res => {
|
||||
}
|
||||
}).then(res => {
|
||||
const data = res.data;
|
||||
if(res.data.status == 200){
|
||||
if (res.data.status == 200) {
|
||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$store.commit("LOGIN", {
|
||||
@ -539,8 +577,9 @@
|
||||
that.$store.commit("SETUID", data.result.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', data.result.user);
|
||||
let method
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index','/pages/plant_grass/index'
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
||||
'/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index', '/pages/plant_grass/index'
|
||||
]
|
||||
if (indexPat.includes(this.getPath(backUrl))) {
|
||||
method = 'switchTab'
|
||||
@ -556,11 +595,11 @@
|
||||
uni[method]({
|
||||
url: backUrl
|
||||
});
|
||||
}else{
|
||||
} else {
|
||||
that.auth_token = res.data.result.key;
|
||||
that.bindStatus = true;
|
||||
}
|
||||
uni.hideLoading();
|
||||
uni.hideLoading();
|
||||
}).catch(res => {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
@ -606,55 +645,56 @@
|
||||
if (!that.isAgree) return that.$util.Tips({
|
||||
title: '请勾选用户协议与隐私政策'
|
||||
});
|
||||
|
||||
loginMobile({
|
||||
auth_token: uni.getStorageSync('auth_token'),
|
||||
phone: that.account,
|
||||
sms_code: that.captcha,
|
||||
spread: that.$Cache.get("spread"),
|
||||
// #ifdef APP-PLUS
|
||||
user_type: 'app',
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
user_type: 'h5',
|
||||
// #endif
|
||||
})
|
||||
.then(({
|
||||
data
|
||||
}) => {
|
||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$store.commit("LOGIN", {
|
||||
'token': data.token,
|
||||
'time': data.exp
|
||||
});
|
||||
that.$store.commit("SETUID", data.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', data.user);
|
||||
|
||||
let method
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index'
|
||||
]
|
||||
if (indexPat.includes(this.getPath(backUrl))) {
|
||||
method = 'switchTab'
|
||||
} else {
|
||||
method = 'navigateTo'
|
||||
}
|
||||
if (this.getPath(backUrl) === '/pages/users/login/index') {
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index'
|
||||
loginMobile({
|
||||
auth_token: uni.getStorageSync('auth_token'),
|
||||
phone: that.account,
|
||||
sms_code: that.captcha,
|
||||
spread: that.$Cache.get("spread"),
|
||||
// #ifdef APP-PLUS
|
||||
user_type: 'app',
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
user_type: 'h5',
|
||||
// #endif
|
||||
})
|
||||
.then(({
|
||||
data
|
||||
}) => {
|
||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$store.commit("LOGIN", {
|
||||
'token': data.token,
|
||||
'time': data.exp
|
||||
});
|
||||
that.$store.commit("SETUID", data.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', data.user);
|
||||
|
||||
let method
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
||||
'/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index'
|
||||
]
|
||||
if (indexPat.includes(this.getPath(backUrl))) {
|
||||
method = 'switchTab'
|
||||
} else {
|
||||
method = 'navigateTo'
|
||||
}
|
||||
if (this.getPath(backUrl) === '/pages/users/login/index') {
|
||||
uni.switchTab({
|
||||
url: '/pages/index/index'
|
||||
});
|
||||
return
|
||||
}
|
||||
uni[method]({
|
||||
url: backUrl
|
||||
});
|
||||
})
|
||||
.catch(res => {
|
||||
that.$util.Tips({
|
||||
title: res
|
||||
});
|
||||
return
|
||||
}
|
||||
uni[method]({
|
||||
url: backUrl
|
||||
});
|
||||
})
|
||||
.catch(res => {
|
||||
that.$util.Tips({
|
||||
title: res
|
||||
});
|
||||
});
|
||||
},
|
||||
async register() {
|
||||
let that = this;
|
||||
@ -680,36 +720,36 @@
|
||||
title: '请勾选用户协议与隐私政策'
|
||||
});
|
||||
register({
|
||||
auth_token: this.auth_token || uni.getStorageSync('auth_token'),
|
||||
phone: that.account,
|
||||
sms_code: that.captcha,
|
||||
pwd: that.password,
|
||||
spread: that.$Cache.get("spread"),
|
||||
// #ifdef APP-PLUS
|
||||
user_type: 'app',
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
user_type: 'h5',
|
||||
// #endif
|
||||
})
|
||||
.then(res => {
|
||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$store.commit("LOGIN", {
|
||||
'token': res.data.token,
|
||||
'time': res.data.exp
|
||||
auth_token: this.auth_token || uni.getStorageSync('auth_token'),
|
||||
phone: that.account,
|
||||
sms_code: that.captcha,
|
||||
pwd: that.password,
|
||||
spread: that.$Cache.get("spread"),
|
||||
// #ifdef APP-PLUS
|
||||
user_type: 'app',
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
user_type: 'h5',
|
||||
// #endif
|
||||
})
|
||||
.then(res => {
|
||||
const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
|
||||
that.$Cache.clear(BACK_URL);
|
||||
that.$store.commit("LOGIN", {
|
||||
'token': res.data.token,
|
||||
'time': res.data.exp
|
||||
});
|
||||
that.$store.commit("SETUID", res.data.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', res.data.user);
|
||||
uni.switchTab({
|
||||
url: '/pages/user/index'
|
||||
})
|
||||
})
|
||||
.catch(res => {
|
||||
that.$util.Tips({
|
||||
title: res
|
||||
});
|
||||
});
|
||||
that.$store.commit("SETUID", res.data.user.uid);
|
||||
that.$store.commit('UPDATE_USERINFO', res.data.user);
|
||||
uni.switchTab({
|
||||
url: '/pages/user/index'
|
||||
})
|
||||
})
|
||||
.catch(res => {
|
||||
that.$util.Tips({
|
||||
title: res
|
||||
});
|
||||
});
|
||||
},
|
||||
async code(data) {
|
||||
let that = this;
|
||||
@ -725,7 +765,7 @@
|
||||
type: 'login',
|
||||
key: that.keyCode,
|
||||
// code: that.codeVal,
|
||||
toke:data.token,
|
||||
toke: data.token,
|
||||
captchaType: 'blockPuzzle',
|
||||
captchaVerification: data.captchaVerification
|
||||
})
|
||||
@ -792,7 +832,8 @@
|
||||
that.$store.commit('UPDATE_USERINFO', data.user);
|
||||
|
||||
let method
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
|
||||
let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart',
|
||||
'/pages/goods_cate/goods_cate',
|
||||
'/pages/user/index'
|
||||
]
|
||||
if (indexPat.includes(this.getPath(backUrl))) {
|
||||
@ -808,7 +849,7 @@
|
||||
}
|
||||
uni[method]({
|
||||
url: backUrl
|
||||
});
|
||||
});
|
||||
})
|
||||
.catch(e => {
|
||||
that.$util.Tips({
|
||||
@ -843,51 +884,58 @@
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
/deep/uni-checkbox .uni-checkbox-input,
|
||||
/deep/checkbox .wx-checkbox-input{
|
||||
/deep/checkbox .wx-checkbox-input {
|
||||
border-radius: 100%;
|
||||
width: 28rpx;
|
||||
height: 28rpx;
|
||||
}
|
||||
|
||||
/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
|
||||
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
|
||||
border: 1px solid var(--view-theme)!important;
|
||||
background-color: var(--view-theme)!important;
|
||||
border: 1px solid var(--view-theme) !important;
|
||||
background-color: var(--view-theme) !important;
|
||||
}
|
||||
|
||||
.ChangePassword .phone {
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
margin-top: 55rpx;
|
||||
}
|
||||
|
||||
|
||||
.ChangePassword .list {
|
||||
width: 580rpx;
|
||||
margin: 53rpx auto 0 auto;
|
||||
}
|
||||
|
||||
|
||||
.ChangePassword .list .item {
|
||||
width: 100%;
|
||||
height: 110rpx;
|
||||
border-bottom: 2rpx solid #f0f0f0;
|
||||
}
|
||||
|
||||
|
||||
.ChangePassword .list .item input {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
font-size: 32rpx;
|
||||
}
|
||||
|
||||
.ChangePassword .list .item .placeholder {
|
||||
color: #bbbbbb;
|
||||
}
|
||||
|
||||
.ChangePassword .list .item input.codeIput {
|
||||
width: 240rpx;
|
||||
width: 240rpx;
|
||||
}
|
||||
.register .whiteBg .title_info text{
|
||||
|
||||
.register .whiteBg .title_info text {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
|
||||
.register .list .item .code {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
|
||||
.title-bar {
|
||||
position: relative;
|
||||
display: flex;
|
||||
@ -897,6 +945,7 @@
|
||||
font-weight: 500;
|
||||
color: #333333;
|
||||
line-height: 48rpx;
|
||||
|
||||
.icon {
|
||||
position: absolute;
|
||||
left: 30rpx;
|
||||
@ -906,14 +955,15 @@
|
||||
justify-content: center;
|
||||
width: 80rpx;
|
||||
height: 80rpx;
|
||||
|
||||
image {
|
||||
width: 50rpx;
|
||||
height: 50rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.getPhoneBtn{
|
||||
|
||||
.getPhoneBtn {
|
||||
font-size: 32rpx;
|
||||
width: 580rpx;
|
||||
height: 90rpx;
|
||||
@ -923,15 +973,18 @@
|
||||
margin: 40rpx auto 0 auto;
|
||||
text-align: center;
|
||||
line-height: 90rpx;
|
||||
.iconfont{
|
||||
|
||||
.iconfont {
|
||||
font-size: 32rpx;
|
||||
margin-right: 12rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.code image {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.settlementAgreement {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
@ -941,52 +994,63 @@
|
||||
background: rgba(0, 0, 0, .5);
|
||||
z-index: 10;
|
||||
}
|
||||
.protocol_text{
|
||||
|
||||
.protocol_text {
|
||||
color: #999;
|
||||
font-size: 24rpx;
|
||||
}
|
||||
.protocol{
|
||||
|
||||
.protocol {
|
||||
margin-top: 82rpx;
|
||||
justify-content: center;
|
||||
}
|
||||
.protocol_text{
|
||||
.font_pro{
|
||||
|
||||
.protocol_text {
|
||||
.font_pro {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
}
|
||||
|
||||
.appLogin {
|
||||
margin-top: 82rpx;
|
||||
|
||||
.hds {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 24rpx;
|
||||
color: #B4B4B4;
|
||||
color: #B4B4B4;
|
||||
|
||||
.line {
|
||||
width: 68rpx;
|
||||
height: 1rpx;
|
||||
background: #CCCCCC;
|
||||
}
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0 20rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btn-wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-top: 30rpx;
|
||||
|
||||
.btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 68rpx;
|
||||
height: 68rpx;
|
||||
border-radius: 50%;
|
||||
+ .btn {
|
||||
border-radius: 50%;
|
||||
|
||||
+.btn {
|
||||
margin-left: 30rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.apple-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -997,31 +1061,38 @@
|
||||
background: #EAEAEA;
|
||||
border-radius: 34rpx;
|
||||
font-size: 24rpx;
|
||||
|
||||
.icon-s-pingguo {
|
||||
color: #333;
|
||||
margin-right: 10rpx;
|
||||
font-size: 34rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
font-size: 40rpx;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.wx {
|
||||
background-color: #61C64F;
|
||||
&.btn-apple{
|
||||
|
||||
&.btn-apple {
|
||||
margin-right: 0;
|
||||
background-color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.mima {
|
||||
background-color: #28B3E9;
|
||||
}
|
||||
|
||||
.yanzheng {
|
||||
background-color: #F89C23;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.whiteBg .logon {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -1034,14 +1105,17 @@
|
||||
color: #FFFFFF;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
.whiteBg .back{
|
||||
border: 1px solid var(--view-theme);
|
||||
|
||||
.whiteBg .back {
|
||||
border: 1px solid var(--view-theme);
|
||||
color: var(--view-theme);
|
||||
margin-top: 30rpx;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.login-wrapper {
|
||||
padding: 30rpx;
|
||||
|
||||
.shading {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -1052,6 +1126,7 @@
|
||||
/* #endif */
|
||||
/* #ifndef APP-VUE */
|
||||
margin-top: 200rpx;
|
||||
|
||||
/* #endif */
|
||||
image {
|
||||
width: 180rpx;
|
||||
@ -1059,6 +1134,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.copyright {
|
||||
position: fixed;
|
||||
bottom: 30rpx;
|
||||
@ -1069,4 +1145,4 @@
|
||||
line-height: 28rpx;
|
||||
color: #9E9E9E;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
@ -148,9 +148,9 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="logon" @click="registerReset">完成并登录</view>
|
||||
<view class="tip">
|
||||
<!-- <view class="tip">
|
||||
<text @click="formItem=1">立即登录</text>
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="protocol acea-row row-between-wrapper">
|
||||
<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
|
||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />
|
||||
@ -173,13 +173,13 @@
|
||||
</view>
|
||||
|
||||
<!-- #ifdef APP-PLUS -->
|
||||
<view class="footer-btns" v-if='formItem!=2'>
|
||||
<view class="footer-btns">
|
||||
<view class="login-type-btn" :class="{actLoginType:formItem==0}" style="margin-right: 70rpx;">
|
||||
<text v-if='formItem == 1' @click="formItem = 0">微信快捷登录</text>
|
||||
<text v-if='formItem == 1||formItem==2' @click="formItem = 0">微信快捷登录</text>
|
||||
<text v-else @click="appOneClcik">本机一键登录</text>
|
||||
</view>
|
||||
<view class="login-type-btn" :class="{actLoginType:formItem==1}">
|
||||
<text v-if='formItem == 0' @click="formItem = 1">更多登录方式</text>
|
||||
<text v-if='formItem == 0 ||formItem==2' @click="formItem = 1">更多登录方式</text>
|
||||
<text v-else @click="appOneClcik">本机一键登录</text>
|
||||
</view>
|
||||
</view>
|
||||
@ -1693,7 +1693,7 @@
|
||||
|
||||
.footer-btns {
|
||||
position: absolute;
|
||||
bottom: 160rpx;
|
||||
bottom: 100rpx;
|
||||
left: 50%;
|
||||
transform: translate(-50%);
|
||||
display: flex;
|
||||
|
||||
@ -5,35 +5,42 @@
|
||||
<image :src="login_logo" v-if="login_logo" />
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="whiteBg" style="margin: 0;width: 100%;padding: 50rpx 60rpx;" :style="{ 'background-image': `url(${domain}/static/images/logo_bgl.png)`}">
|
||||
<view class="whiteBg" style="margin: 0;width: 100%;padding: 50rpx 60rpx;"
|
||||
:style="{ 'background-image': `url(${domain}/static/images/logo_bgl.png)`}">
|
||||
<view class="login_title">
|
||||
<view class="title_h">找回密码</view>
|
||||
</view>
|
||||
<form class="list">
|
||||
<view class="item">
|
||||
<input type="number" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" autocomplete="off" />
|
||||
<input type="number" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account"
|
||||
autocomplete="off" />
|
||||
<!-- <input type="text" style="height: 0;opacity: 0"> -->
|
||||
</view>
|
||||
<view class="item">
|
||||
<input type="password" placeholder="填写您的新密码" placeholder-class="placeholder" v-model="password" autocomplete="off" />
|
||||
<input type="password" placeholder="填写您的新密码" placeholder-class="placeholder" v-model="password"
|
||||
autocomplete="off" />
|
||||
</view>
|
||||
<view class="item">
|
||||
<input type="password" placeholder="再次输入新密码" placeholder-class="placeholder" v-model="confirm_pwd" autocomplete="off" />
|
||||
<input type="password" placeholder="再次输入新密码" placeholder-class="placeholder" v-model="confirm_pwd"
|
||||
autocomplete="off" />
|
||||
</view>
|
||||
<view class="item" style="display: flex;justify-content: space-between;">
|
||||
<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput" v-model="captcha" autocomplete="off" />
|
||||
<button class="code" style="color: #fff;" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
|
||||
<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder"
|
||||
class="codeIput" v-model="captcha" autocomplete="off" />
|
||||
<button class="code" style="color: #fff;" :disabled="disabled"
|
||||
:class="disabled === true ? 'on' : ''" @click="handleVerify">
|
||||
{{ text }}
|
||||
</button>
|
||||
</view>
|
||||
</form>
|
||||
<view class="logon" @click="registerReset">确认</view>
|
||||
<view class="tip">
|
||||
<!-- <view class="tip">
|
||||
<text @click="back">立即登录</text>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="bottom"></view>
|
||||
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
|
||||
<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
|
||||
ref="verify"></Verify>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -48,7 +55,9 @@
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
const app = getApp();
|
||||
import { mapGetters} from "vuex";
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import sendVerifyCode from "@/mixins/SendVerifyCode";
|
||||
import {
|
||||
registerVerify,
|
||||
@ -56,19 +65,25 @@
|
||||
getCodeApi,
|
||||
getCaptcha
|
||||
} from "@/api/user";
|
||||
import { validatorDefaultCatch } from "@/utils/dialog";
|
||||
import {
|
||||
validatorDefaultCatch
|
||||
} from "@/utils/dialog";
|
||||
import attrs, {
|
||||
required,
|
||||
alpha_num,
|
||||
chs_phone
|
||||
} from "@/utils/validate";
|
||||
import { configMap } from '@/utils';
|
||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
||||
import Verify from '@/components/verify/verify.vue';
|
||||
import {
|
||||
configMap
|
||||
} from '@/utils';
|
||||
import {
|
||||
HTTP_REQUEST_URL
|
||||
} from '@/config/app';
|
||||
import Verify from '@/components/verify/verify.vue';
|
||||
export default {
|
||||
name: "RetrievePassword",
|
||||
components: {
|
||||
Verify
|
||||
components: {
|
||||
Verify
|
||||
},
|
||||
mixins: [sendVerifyCode],
|
||||
data: function() {
|
||||
@ -85,16 +100,14 @@
|
||||
};
|
||||
},
|
||||
computed: configMap(['login_logo'], mapGetters(['viewColor'])),
|
||||
onReady() {
|
||||
},
|
||||
mounted: function() {
|
||||
},
|
||||
onReady() {},
|
||||
mounted: function() {},
|
||||
methods: {
|
||||
back() {
|
||||
uni.navigateBack();
|
||||
},
|
||||
again() {
|
||||
this.codeUrl = VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date());
|
||||
this.codeUrl = VUE_APP_API_URL + "/captcha?" + this.keyCode + Date.parse(new Date());
|
||||
},
|
||||
|
||||
async code(data) {
|
||||
@ -108,7 +121,7 @@
|
||||
await registerVerify({
|
||||
phone: that.account,
|
||||
type: 'change_pwd',
|
||||
captchaType: 'blockPuzzle',
|
||||
captchaType: 'blockPuzzle',
|
||||
captchaVerification: data.captchaVerification
|
||||
})
|
||||
.then(res => {
|
||||
@ -169,7 +182,7 @@
|
||||
})
|
||||
});
|
||||
},
|
||||
success(data) {
|
||||
success(data) {
|
||||
this.$refs.verify.hide();
|
||||
this.code(data);
|
||||
},
|
||||
@ -180,13 +193,15 @@
|
||||
};
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.register{
|
||||
.register {
|
||||
background: #ffffff;
|
||||
height: 100vh;
|
||||
}
|
||||
|
||||
.register .list .item .code {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
|
||||
.whiteBg .logon {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -194,13 +209,14 @@
|
||||
width: 100%;
|
||||
height: 86rpx;
|
||||
margin-top: 48rpx;
|
||||
background-color:var(--view-theme);
|
||||
background-color: var(--view-theme);
|
||||
border-radius: 120rpx;
|
||||
color: #FFFFFF;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
.whiteBg{
|
||||
|
||||
.whiteBg {
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% auto;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.4 KiB |
Loading…
x
Reference in New Issue
Block a user