angelo
/
web-store-retail-h5
forked from angelo/web-retail-h5
3
0
Fork 0
Code Pull Requests Activity

feat(specialArea): fix regiest

This commit is contained in:
woody 2025-06-11 10:48:43 +08:00
parent 5ab945a902
commit 3d98cee3b6
8 changed files with 535 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/login.js
View File

@ -24,23 +24,23 @@ export const verification = params =>
//忘记密码获取验证码 //忘记密码获取验证码
export const forgetVerification = params => export const forgetVerification = params =>
http.get('/retail-member/api/sms/forget-verification', { params }) http.get('/member/api/sms/forget-verification', { params })
//保存地址 //保存地址
export const saveAddress = data => export const saveAddress = data =>
http.post('/retail-member/api/retail-member-address/save', data) http.post('/member/api/member-address/save', data)
//更新密码 //更新密码
export const updatePassword = data => export const updatePassword = data =>
http.put('/retail-member/api/retail-member/update-password', data) http.put('/member/api/member/update-password', data)
//忘记密码更新 //忘记密码更新
export const forgetPassword = data => export const forgetPassword = data =>
http.put('/retail-member/api/retail-member/forget-password', data) http.put('/member/api/member/forget-password', data)
//获取地址详情 //获取地址详情
export const getAddress = params => export const getAddress = params =>
http.get('/retail-member/api/retail-member-address/detail/' + params) http.get('/member/api/member-address/detail/' + params)
//获取菜单权限 //获取菜单权限
export const menuList = data => http.get('/system/api/menu/list', data) export const menuList = data => http.get('/system/api/menu/list', data)
@ -131,10 +131,10 @@ export const selfVerification = params =>
http.get('/retail-member/api/sms/self-verification', { params }) http.get('/retail-member/api/sms/self-verification', { params })
// 重置支付密码获取验证码 // 重置支付密码获取验证码
export const resetPayPasswordVerification = params => export const resetPayPasswordVerification = params =>
http.get('/retail-member/api/sms/reset-verification', { params }) http.get('/member/api/sms/self-verification', { params })
//更新支付密码 //更新支付密码
export const forgetPayPassword = data => export const forgetPayPassword = data =>
http.put('/retail-member/api/retail-member/forget-pay-password', data) http.put('/member/api/member/forget-pay-password', data)
// 站内信弹窗 // 站内信弹窗
export const getIndexPopmail = params => export const getIndexPopmail = params =>

21
config/mine.js
View File

@ -1,16 +1,25 @@
const http = uni.$u.http const http = uni.$u.http
//我的市场 //我的市场
export const getMyMarket = (params) => http.get('/sale/api/order/index-myMarket', { params }) export const getMyMarket = params =>
http.get('/sale/api/order/index-myMarket', { params })
// 我的市场点亮 // 我的市场点亮
export const getMyMarketColor = (params) => http.get('/system/manage/area/get-light-area', { params }) export const getMyMarketColor = params =>
http.get('/system/manage/area/get-light-area', { params })
// 礼品地址列表 // 礼品地址列表
export const getMemberGift = (params) => http.get('/member/api/member-gift/member-gift-list', { params }) export const getMemberGift = params =>
http.get('/member/api/member-gift/member-gift-list', { params })
//全部荣誉墙 //全部荣誉墙
export const getMemberHonorWallAll = (params) => http.get('/member/api/member/member-honor-wall-all', { params }) export const getMemberHonorWallAll = params =>
http.get('/member/api/member/member-honor-wall-all', { params })
//年度奖衔 //年度奖衔
export const yearAwards = (params) => http.get('/member/api/member/year-awards-list', { params }) export const yearAwards = params =>
http.get('/member/api/member/year-awards-list', { params })
// 获取是否能区域选择的资格
export const getRegionSelect = () => {
return http.get('/retail-member/api/retail-member/get-region')
}

2
config/request.js
View File

@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER //#ifdef DEV_SERVER
console.log('DEV_SERVER') console.log('DEV_SERVER')
config.baseURL = 'http://192.168.0.102:8080' config.baseURL = 'http://localhost:8080'
//#endif //#endif
//#ifdef QA_SERVER //#ifdef QA_SERVER

169
pages/address/index.vue
View File

@ -3,11 +3,7 @@
<view class="contents"> <view class="contents">
<u-form :model="addressForm" labelWidth="auto" ref="uForm"> <u-form :model="addressForm" labelWidth="auto" ref="uForm">
<view class="view-class"> <view class="view-class">
<u-form-item <u-form-item label="收货人" label-width="100px" prop="recName">
label="收货人"
label-width="100px"
prop="recName"
>
<u-input <u-input
:maxlength="40" :maxlength="40"
v-model.trim="addressForm.recName" v-model.trim="addressForm.recName"
@ -18,11 +14,7 @@
</u-form-item> </u-form-item>
</view> </view>
<view class="view-class"> <view class="view-class">
<u-form-item <u-form-item label="联系方式" label-width="100px" prop="recPhone">
label="联系方式"
label-width="100px"
prop="recPhone"
>
<u-input <u-input
v-if="pkCountry == 1" v-if="pkCountry == 1"
v-model.trim="addressForm.recPhone" v-model.trim="addressForm.recPhone"
@ -98,11 +90,13 @@
:defaultCode="defaultCode" :defaultCode="defaultCode"
@addressData="addressData" @addressData="addressData"
></v-address> ></v-address>
<u-button <u-button
:disabled="!addressForm.recName || !addressForm.recPhone || !addressForm.recAddress" :disabled="
!addressForm.recName || !addressForm.recPhone || !addressForm.recAddress
"
type="success" type="success"
shape="circle" shape="circle"
class="btn" class="btn"
@click="submit" @click="submit"
color="#005BAC" color="#005BAC"
:loading="loading" :loading="loading"
@ -114,28 +108,28 @@
</template> </template>
<script> <script>
import * as api from "@/config/login.js"; import * as api from '@/config/login.js'
import { setToken } from "@/config/auth.js"; import { setToken } from '@/config/auth.js'
import address from "@/components/address.vue"; import address from '@/components/address.vue'
import store from "@/store"; import store from '@/store'
export default { export default {
data() { data() {
return { return {
userInfo: "", userInfo: '',
pkCountry:'', pkCountry: '',
check: false, check: false,
address: "", address: '',
defaultCode: [], defaultCode: [],
urls: "/member/api/maker-space/update-file", urls: '/member/api/maker-space/update-file',
addressForm: { addressForm: {
recName: "", recName: '',
recPhone: "", recPhone: '',
recProvince: "", recProvince: '',
recCity: "", recCity: '',
recCounty: "", recCounty: '',
recAddress: "", recAddress: '',
isDefault: 0, isDefault: 0,
pkId: "", pkId: '',
}, },
loading: false, loading: false,
rules: { rules: {
@ -144,7 +138,7 @@ export default {
// 必填项 // 必填项
required: true, required: true,
// 提示内容（会出现在u-form-item内的底部） // 提示内容（会出现在u-form-item内的底部）
message: "姓名不能为空", message: '姓名不能为空',
}, },
], ],
recAddress: [ recAddress: [
@ -152,7 +146,7 @@ export default {
// 必填项 // 必填项
required: true, required: true,
// 提示内容（会出现在u-form-item内的底部） // 提示内容（会出现在u-form-item内的底部）
message: "详细地址不能为空", message: '详细地址不能为空',
}, },
], ],
recProvince: [ recProvince: [
@ -160,122 +154,125 @@ export default {
// 必填项 // 必填项
required: true, required: true,
// 提示内容（会出现在u-form-item内的底部） // 提示内容（会出现在u-form-item内的底部）
message: "地址不能为空", message: '地址不能为空',
trigger: ["change"], trigger: ['change'],
}, },
], ],
recPhone: [ recPhone: [
{ {
required: true, required: true,
message: "请输入手机号", message: '请输入手机号',
trigger: ["blur"], trigger: ['blur'],
}, },
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
return this.$u.test.mobile(value); return this.$u.test.mobile(value)
}, },
message: "手机号格式不正确", message: '手机号格式不正确',
trigger: ["blur"], trigger: ['blur'],
}, },
], ],
}, },
}; }
}, },
onLoad(option) { onLoad(option) {
if (option.pkId) { if (option.pkId) {
this.getAddress(option.pkId); this.getAddress(option.pkId)
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: "修改收货地址", title: '修改收货地址',
}); })
} }
this.pkCountry = uni.getStorageSync("pkCountry"); this.pkCountry = uni.getStorageSync('pkCountry')
this.userInfo = uni.getStorageSync("User"); this.userInfo = uni.getStorageSync('User')
}, },
onReady() { onReady() {
this.$refs.uForm.setRules(this.rules); this.$refs.uForm.setRules(this.rules)
}, },
components: { components: {
"v-address": address, 'v-address': address,
}, },
methods: { methods: {
AddressData(name) { AddressData(name) {
this.address = name; this.address = name
}, },
submit() { submit() {
this.$refs.uForm.validate().then((res) => { this.$refs.uForm.validate().then(res => {
this.loading = true this.loading = true
api.saveAddress(this.addressForm).then((res) => { api
if (res.code == "200") { .saveAddress(this.addressForm)
const toast = uni.showToast({ .then(res => {
title: res.msg, if (res.code == '200') {
icon: "none", const toast = uni.showToast({
complete() { title: res.msg,
setTimeout(() => { icon: 'none',
this.loading = false complete() {
uni.navigateBack(1) setTimeout(() => {
toast.hideToast() this.loading = false
}, 500); uni.navigateBack(1)
}, toast.hideToast()
}); }, 500)
} else { },
})
} else {
this.loading = false
}
})
.catch(() => {
this.loading = false this.loading = false
} })
}).catch(() => { })
this.loading = false
})
});
}, },
getDiqu() { getDiqu() {
this.$refs.address.setShow(); this.$refs.address.setShow()
}, },
addressData(diqu, obj) { addressData(diqu, obj) {
this.address = diqu; this.address = diqu
this.addressForm.recProvince = obj.province; this.addressForm.recProvince = obj.province
this.addressForm.recCity = obj.city; this.addressForm.recCity = obj.city
this.addressForm.recCounty = obj.county; this.addressForm.recCounty = obj.county
this.$forceUpdate(); this.$forceUpdate()
// this.getPostAge() // this.getPostAge()
// this.queryAdressPostage() // this.queryAdressPostage()
}, },
checkTap() { checkTap() {
if (this.addressForm.isDefault == 0) { if (this.addressForm.isDefault == 0) {
this.addressForm.isDefault = 1; this.addressForm.isDefault = 1
} else { } else {
this.addressForm.isDefault = 0; this.addressForm.isDefault = 0
} }
}, },
getAddressData(e) { getAddressData(e) {
console.error(e); console.error(e)
}, },
getAddress(id) { getAddress(id) {
api api
.getAddress(id) .getAddress(id)
.then((res) => { .then(res => {
if (res) { if (res) {
this.addressForm = { this.addressForm = {
recName: res.data.recName, recName: res.data.recName,
recPhone: res.data.recPhone, recPhone: res.data.recPhone,
recProvince: res.data.recProvince, recProvince: res.data.recProvince,
recCity: res.data.recCity, recCity: res.data.recCity,
recCounty: res.data.recCounty || "", recCounty: res.data.recCounty || '',
pkId: res.data.pkId, pkId: res.data.pkId,
recAddress: res.data.recAddress, recAddress: res.data.recAddress,
isDefault: res.data.isDefault, isDefault: res.data.isDefault,
}; }
this.defaultCode = [ this.defaultCode = [
res.data.recProvince, res.data.recProvince,
res.data.recCity, res.data.recCity,
res.data.recCounty || "", res.data.recCounty || '',
]; ]
} }
}) })
.catch((error) => { .catch(error => {
reject(error); reject(error)
}); })
}, },
}, },
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -297,7 +294,7 @@ export default {
view { view {
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
border: 1rpx solid #dddddd; border: 1rpx solid #000;
border-radius: 50%; border-radius: 50%;
margin-top: 25rpx; margin-top: 25rpx;
} }

565
pages/mine/balance/withdrawal.vue
View File

@ -1,256 +1,337 @@
<template> <template>
<view class="content"> <view class="content">
<view class="theform"> <view class="theform">
<u--form labelPosition="left" :model="dataForm" :rules="rules" ref="uForm"> <u--form
<u-form-item label-width="200rpx" :label="'银行卡号'" prop="cardNumber" borderBottom ref="item1"> labelPosition="left"
<u--input v-if="bankData.cardNumber" v-model="bankData.cardNumber" disabled disabledColor="#F5F5F5;" :model="dataForm"
border="none"></u--input> :rules="rules"
<view v-else style="color:red" @click="goBindbank"> ref="uForm"
{{'请先绑定银行卡'}} >
</view> <u-form-item
</u-form-item> label-width="200rpx"
<u-form-item label-width="200rpx" :label="`${'提现金额'}(${isLocaled()})`" prop="cashAmount" :label="'银行卡号'"
borderBottom ref="item1"> prop="cardNumber"
<u--input type='number' v-model="dataForm.cashAmount" :placeholder="'请输入'" borderBottom
border="none"></u--input> ref="item1"
</u-form-item> >
<u-form-item label-width="200rpx" :label="'二级密码'" prop="payPwd" borderBottom ref="item1"> <u--input
<template v-if="!ifeye"> v-if="bankData.cardNumber"
<u--input type='password' v-model="dataForm.payPwd" :placeholder="'请输入'" v-model="bankData.cardNumber"
border="none"></u--input> disabled
<image @click="ifeye=!ifeye" slot="right" style="width: 38rpx; disabledColor="#F5F5F5;"
height: 25rpx;" src="../../../static/images/my_eye.png" mode=""></image> border="none"
</template> ></u--input>
<template v-if="ifeye"> <view v-else style="color: red" @click="goBindbank">
<u--input v-model="dataForm.payPwd" :placeholder="'请输入'" border="none"></u--input> {{ '请先绑定银行卡' }}
<image @click="ifeye=!ifeye" slot="right" style="width: 38rpx; </view>
height: 30rpx;" src="../../../static/images/my_eye2.png" mode=""></image> </u-form-item>
</template> <u-form-item
</u-form-item> label-width="200rpx"
<u-form-item label-width="200rpx" :label="'备注'" prop="remarks" borderBottom ref="item1"> :label="`${'提现金额'}(${isLocaled()})`"
<u--input v-model="dataForm.remarks" border="none"></u--input> prop="cashAmount"
</u-form-item> borderBottom
<u-form-item label-width="200rpx" :label="'提现账户'" prop="pkAccountName" ref="item1"
@click="showAmount = true; " ref="item1"> >
<u--input v-model="dataForm.pkAccountName" disabled disabledColor="#ffffff" <u--input
:placeholder="'请选择'" border="none"></u--input> type="number"
<u-icon slot="right" name="arrow-right"></u-icon> v-model="dataForm.cashAmount"
</u-form-item> :placeholder="'请输入'"
<u-picker @cancel='showAmount=false' :show="showAmount" ref="uPicker" :columns="pkBdAccountList" border="none"
@confirm="confirm" keyName='accountName'></u-picker> ></u--input>
</u--form> </u-form-item>
<u-form-item
label-width="200rpx"
:label="'二级密码'"
prop="payPwd"
borderBottom
ref="item1"
>
<template v-if="!ifeye">
<u--input
type="password"
v-model="dataForm.payPwd"
:placeholder="'请输入'"
border="none"
></u--input>
<image
@click="ifeye = !ifeye"
slot="right"
style="width: 38rpx; height: 25rpx"
src="../../../static/images/my_eye.png"
mode=""
></image>
</template>
<template v-if="ifeye">
<u--input
v-model="dataForm.payPwd"
:placeholder="'请输入'"
border="none"
></u--input>
<image
@click="ifeye = !ifeye"
slot="right"
style="width: 38rpx; height: 30rpx"
src="../../../static/images/my_eye2.png"
mode=""
></image>
</template>
</u-form-item>
<u-form-item
label-width="200rpx"
:label="'备注'"
prop="remarks"
borderBottom
ref="item1"
>
<u--input v-model="dataForm.remarks" border="none"></u--input>
</u-form-item>
<u-form-item
label-width="200rpx"
:label="'提现账户'"
prop="pkAccountName"
@click="showAmount = true"
ref="item1"
>
<u--input
v-model="dataForm.pkAccountName"
disabled
disabledColor="#ffffff"
:placeholder="'请选择'"
border="none"
></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-picker
@cancel="showAmount = false"
:show="showAmount"
ref="uPicker"
:columns="pkBdAccountList"
@confirm="confirm"
keyName="accountName"
></u-picker>
</u--form>
<view class="contentbox">
<view class="contentbox"> <view class="linebox">
<view class="linebox"> <view>{{ '可提现金额' }}(￥)：</view>
<view>{{'可提现金额'}}(￥)：</view> <view>{{ widthDrwaData.amount || '0.00' }}</view>
<view>{{widthDrwaData.amount||'0.00'}}</view> </view>
</view> <view class="linebox">
<view class="linebox"> <view>{{ '账户余额' }}(￥)：</view>
<view>{{'账户余额'}}(￥)：</view> <view>{{ widthDrwaData.balance || '0.00' }}</view>
<view>{{widthDrwaData.balance||'0.00'}}</view> </view>
</view> <view class="linebox">
<view class="linebox"> <view>{{ '提现手续费' }}：</view>
<view>{{'提现手续费'}}：</view> <view>{{ widthDrwaData.srviceCharge || '0.00' }}</view>
<view>{{widthDrwaData.srviceCharge||'0.00'}}</view> </view>
</view> <view class="linebox">
<view class="linebox"> <view>{{ '最低提现额度' }}(￥)：</view>
<view>{{'最低提现额度'}}(￥)：</view> <view>{{ widthDrwaData.minAmount || '0.00' }}</view>
<view>{{widthDrwaData.minAmount||'0.00'}}</view> </view>
</view> </view>
</view> </view>
<view class="btnbox">
<u-button :disabled="canbind" class="subbtn" @click="submit">{{
</view> '提现'
<view class="btnbox"> }}</u-button>
<u-button :disabled="canbind" class="subbtn" @click="submit">{{'提现'}}</u-button> </view>
</view> <u-toast ref="uToast"></u-toast>
<u-toast ref="uToast"></u-toast> </view>
</view>
</template> </template>
<script> <script>
import * as bal from "@/config/balance.js" import * as bal from '@/config/balance.js'
import { import { isLocaled } from '@/util/numberToCurrency'
isLocaled export default {
} from '@/util/numberToCurrency' data() {
export default { return {
data() { showAmount: false,
return { dataForm: {
showAmount: false, cardNumber: '',
dataForm: { cashAmount: '',
cardNumber: "", payPwd: '',
cashAmount: "", remarks: '',
payPwd: "", pkAccountName: '',
remarks: "", pkAccount: '',
pkAccountName: "", pkBank: '',
pkAccount: "", },
pkBank: "" pkBdAccountList: [],
}, rules: {
pkBdAccountList: [], cashAmount: [
rules: { {
cashAmount: [{ type: 'string',
type: 'string', required: true,
required: true, message: '请输入',
message: '请输入', trigger: ['blur', 'change'],
trigger: ['blur', 'change'] },
}], ],
payPwd: [{ payPwd: [
type: 'string', {
required: true, type: 'string',
message: '请输入', required: true,
trigger: ['blur', 'change'] message: '请输入',
}], trigger: ['blur', 'change'],
pkAccountName: [{ },
required: true, ],
message: '请选择', pkAccountName: [
trigger: ['change'] {
}], required: true,
}, message: '请选择',
bankData: {}, trigger: ['change'],
widthDrwaData: {}, },
ifeye: false, ],
canbind:false },
bankData: {},
widthDrwaData: {
amount: 0,
balance: 0,
srviceCharge: 0,
minAmount: 0,
},
ifeye: false,
canbind: false,
}
},
watch: {
'dataForm.cashAmount': {
handler(newVal) {
this.checkAccount(newVal || 0, this.dataForm.pkAccount)
},
},
},
onNavigationBarButtonTap() {
uni.navigateTo({
url: '/pages/mine/balance/withdrawlDetail',
})
},
onLoad() {
this.getList()
},
methods: {
isLocaled,
//绑定银行卡
goBindbank() {
uni.navigateTo({
url: '/pages/mine/bindBank/bindBank',
})
},
getList() {
bal
.getPkBdAccountList({
accountProperty: 3,
})
.then(res => {
res.data.forEach(ele => {
ele.name = ele.accountName
})
this.pkBdAccountList = [res.data]
} if (this.pkBdAccountList.length > 0) {
}, this.dataForm.pkAccountName = res.data[0].accountName
watch: { this.dataForm.pkAccount = res.data[0].pkId
'dataForm.cashAmount': 'checkAccount' this.checkAccount(0, this.dataForm.pkAccount)
}, }
onNavigationBarButtonTap() { })
uni.navigateTo({ bal.getDefaultBank().then(res => {
url:'/pages/mine/balance/withdrawlDetail' this.bankData = res.data
}) this.dataForm.pkBank = res.data.pkId
}, })
onLoad() { //校验是否绑定银行卡
this.getList() bal.checkIsbindBank().then(res => {
}, if (res.flag == 'Y') {
methods: { this.canbind = false
isLocaled, } else if (res.flag == 'N') {
//绑定银行卡 this.canbind = true
goBindbank(){ }
uni.navigateTo({ })
url:'/pages/mine/bindBank/bindBank' },
}) submit() {
}, this.$refs.uForm
getList() { .validate()
bal.getPkBdAccountList({ .then(res => {
accountProperty: 3 bal.addWithdraw(this.dataForm).then(res => {
}).then(res => { if (res.code == 200) {
res.data.forEach(ele => { this.$refs.uToast.show({
ele.name = ele.accountName message: res.msg,
}) type: 'success',
this.pkBdAccountList = [res.data] })
setTimeout(() => {
if(this.pkBdAccountList.length>0){ uni.navigateBack()
this.dataForm.pkAccountName = res.data[0].accountName }, 1000)
this.dataForm.pkAccount = res.data[0].pkId }
} })
})
}) .catch(errors => {
bal.getDefaultBank().then((res) => { uni.$u.toast('校验失败')
this.bankData = res.data; })
this.dataForm.pkBank = res.data.pkId; },
}); confirm(e) {
//校验是否绑定银行卡 this.dataForm.pkAccountName = e.value[0].accountName
bal.checkIsbindBank().then(res => { this.dataForm.pkAccount = e.value[0].pkId
if (res.flag == 'Y') { this.showAmount = false
this.canbind = false this.checkAccount(this.dataForm.cashAmount, this.dataForm.pkAccount)
} else if (res.flag == 'N') { },
this.canbind = true checkAccount(cashAmount, pkAccount) {
} if (!cashAmount && cashAmount !== 0) {
}) uni.$u.toast('请先输入金额')
return
}, } else if (!pkAccount) {
submit() { uni.$u.toast('请先选择账户')
this.$refs.uForm.validate().then(res => { return
bal.addWithdraw(this.dataForm).then(res => { }
if (res.code == 200) { bal
this.$refs.uToast.show({ .getWidthdrawShow({
message: res.msg, pkAccount,
type: 'success' cashAmount,
}) })
setTimeout(() => { .then(res => {
uni.navigateBack() this.widthDrwaData = res.data
}, 1000); })
} },
}) },
}
}).catch(errors => {
uni.$u.toast('校验失败')
})
},
confirm(e) {
this.dataForm.pkAccountName = e.value[0].accountName
this.dataForm.pkAccount = e.value[0].pkId
this.showAmount = false
this.checkAccount()
},
checkAccount() {
if (!this.dataForm.cashAmount) {
uni.$u.toast('请先输入金额')
return
} else if (!this.dataForm.pkAccount) {
uni.$u.toast('请先选择账户')
return
}
bal.getWidthdrawShow({
pkAccount: this.dataForm.pkAccount,
cashAmount: this.dataForm.cashAmount,
}).then(res => {
this.widthDrwaData = res.data
})
}
}
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content { .content {
background: #F2F2F2; background: #f2f2f2;
.theform { .theform {
margin-top: 6rpx; margin-top: 6rpx;
background: #FFFFFF; background: #ffffff;
padding: 20rpx 23rpx 48rpx 23rpx; padding: 20rpx 23rpx 48rpx 23rpx;
.contentbox { .contentbox {
background: rgba(251, 48, 36, 0.15); background: rgba(251, 48, 36, 0.15);
border-radius: 20rpx; border-radius: 20rpx;
padding: 35rpx 20rpx; padding: 35rpx 20rpx;
margin-top: 20rpx; margin-top: 20rpx;
.linebox { .linebox {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
font-size: 24rpx; font-size: 24rpx;
font-family: Source Han Sans CN; font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
margin-top: 8rpx; margin-top: 8rpx;
} }
} }
}
} .btnbox {
margin-top: 38rpx;
padding: 0 20rpx;
.btnbox { .subbtn {
margin-top: 38rpx; background: #005bac;
padding: 0 20rpx; border-radius: 46rpx;
font-size: 30rpx;
.subbtn { font-family: Source Han Sans CN;
background: #005BAC; font-weight: 400;
border-radius: 46rpx; color: #ffffff;
font-size: 30rpx; }
font-family: Source Han Sans CN; }
font-weight: 400; }
color: #FFFFFF; </style>
}
}
}
</style>

92
pages/mine/index.vue
View File

@ -176,6 +176,31 @@
</view> </view>
</view> </view>
<!-- 我的区域 -->
<view class="my_order" v-if="regionInfoVisible">
<view class="my_title">
<text class="thetitle">{{ '我的区域' }}</text>
</view>
<view class="region-info-box">
<view class="region-info-item">
<text class="region-info-value">{{
regionInfo.province || '-'
}}</text>
<text class="region-info-label">{{ '省' }}</text>
</view>
<view class="region-info-item">
<text class="region-info-value">{{ regionInfo.city || '-' }}</text>
<text class="region-info-label">{{ '市' }}</text>
</view>
<view class="region-info-item">
<text class="region-info-value">{{
regionInfo.county || '-'
}}</text>
<text class="region-info-label">{{ '区' }}</text>
</view>
</view>
</view>
<!-- 市场动态 --> <!-- 市场动态 -->
<view class="my_order" v-if="marketWrapperVisible"> <view class="my_order" v-if="marketWrapperVisible">
<view class="my_title"> <view class="my_title">
@ -295,6 +320,7 @@ import clTabbar from '@/components/cl-tabbar.vue'
import * as min from '@/config/balance.js' import * as min from '@/config/balance.js'
import * as api from '@/config/login.js' import * as api from '@/config/login.js'
import { MEMBER_SIGN } from '@/util/common.js' import { MEMBER_SIGN } from '@/util/common.js'
import { getRegionSelect } from '@/config/mine.js'
// import talentList from "@/components/talentList.vue"; // import talentList from "@/components/talentList.vue";
export default { export default {
components: { components: {
@ -372,13 +398,13 @@ export default {
menuKey: 'wallet', menuKey: 'wallet',
ifshow: false, ifshow: false,
}, },
{ // {
url: '/pages/pickupArea/pickupArea', // url: '/pages/pickupArea/pickupArea',
name: '提货专区', // name: '提货专区',
imgurl: '../../static/images/my_icon3.png', // imgurl: '../../static/images/my_icon3.png',
menuKey: 'pickGoods', // menuKey: 'pickGoods',
ifshow: false, // ifshow: false,
}, // },
{ {
url: '/pages/ticket/index', url: '/pages/ticket/index',
name: '自助购票', name: '自助购票',
@ -466,24 +492,26 @@ export default {
// menuKey: "", // menuKey: "",
// ifshow: false, // ifshow: false,
// }, // },
{ // {
url: '/pages/mine/addNewPv/index', // url: '/pages/mine/addNewPv/index',
name: '新增业绩', // name: '新增业绩',
imgurl: '../../static/images/mark9.png', // imgurl: '../../static/images/mark9.png',
menuKey: 'iNewAchievement', // menuKey: 'iNewAchievement',
ifshow: false, // ifshow: false,
}, // },
], ],
drShow: false, drShow: false,
actMenu: false, actMenu: false,
iHonorAward: false, iHonorAward: false,
ifSpecial: false, ifSpecial: false,
awardsList: '', awardsList: '',
regionInfo: {},
} }
}, },
onShow() { onShow() {
this.getInfo() this.getInfo()
this.orderNum() this.orderNum()
this.getRegionSelect()
// this.getUserAwardss() // this.getUserAwardss()
}, },
@ -530,9 +558,19 @@ export default {
marketWrapperVisible() { marketWrapperVisible() {
return this.userInfo.memberSign == MEMBER_SIGN.V5_LEVEL return this.userInfo.memberSign == MEMBER_SIGN.V5_LEVEL
}, },
regionInfoVisible() {
return this.regionInfo?.regionStatus === 0
},
}, },
methods: { methods: {
getRegionSelect() {
getRegionSelect().then(res => {
if (res.code == 200) {
this.regionInfo = res.data
}
})
},
goYear() { goYear() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/mine/yearGift/index', url: '/pages/mine/yearGift/index',
@ -1347,4 +1385,30 @@ export default {
font-size: 24rpx; font-size: 24rpx;
padding: 0 4rpx; padding: 0 4rpx;
} }
.region-info-box {
display: flex;
justify-content: space-around;
padding: 30rpx 0;
text-align: center;
}
.region-info-item {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.region-info-label {
font-size: 24rpx;
color: #999;
margin-top: 10rpx;
}
.region-info-value {
font-size: 28rpx;
color: #333;
font-weight: 600;
}
</style> </style>

4
pages/regiest/index.vue
View File

@ -33,7 +33,7 @@
</u-form-item> </u-form-item>
<u-form-item label="会员姓名" required borderBottom prop="memberName"> <u-form-item label="会员姓名" required borderBottom prop="memberName">
<u-input <u-input
:disabled="isRegiest" :disabled="!isRegiest"
:maxlength="40" :maxlength="40"
v-model="form.memberName" v-model="form.memberName"
border="none" border="none"
@ -48,7 +48,7 @@
> >
<u-input <u-input
v-model="form.phone" v-model="form.phone"
:disabled="isRegiest" :disabled="!isRegiest"
maxlength="11" maxlength="11"
type="number" type="number"
border="none" border="none"

69
pages/userSecure/index.vue
View File

@ -3,54 +3,42 @@
<!-- 账号安全 --> <!-- 账号安全 -->
<view class="contentLink"> <view class="contentLink">
<u-cell-group> <u-cell-group>
<u-cell isLink <u-cell isLink url="/pages/password/loginPassword" class="border-style">
url="/pages/password/loginPassword" <view slot="title" class="u-slot-title">
class="border-style"> <text class="u-cell-text">{{ '修改登录密码' }}</text>
<view slot="title"
class="u-slot-title">
<text class="u-cell-text">{{'修改登录密码'}}</text>
</view> </view>
</u-cell> </u-cell>
<u-cell isLink <u-cell isLink url="/pages/password/payPassword" class="border-style">
url="/pages/password/payPassword" <view slot="title" class="u-slot-title">
class="border-style"> <text class="u-cell-text">{{ '修改支付密码' }}</text>
<view slot="title"
class="u-slot-title">
<text class="u-cell-text">{{'修改支付密码'}}</text>
</view> </view>
</u-cell> </u-cell>
<u-cell isLink <u-cell isLink @click="goUrl" class="border-style">
@click="goUrl" <view slot="title" class="u-slot-title">
class="border-style">
<view slot="title"
class="u-slot-title">
<text class="u-cell-text">重置支付密码</text> <text class="u-cell-text">重置支付密码</text>
</view> </view>
</u-cell> </u-cell>
<u-cell v-if="showFix == 1"> <u-cell v-if="showFix == 1">
<view slot="title" <view slot="title" class="u-slot-title">
class="u-slot-title"> <text class="u-cell-text">{{ '联系方式' }}</text>
<text class="u-cell-text">{{'联系方式'}}</text>
</view> </view>
<view slot="value" <view slot="value" class="u-slot-title">
class="u-slot-title"> <text class="u-cell-text">{{ tel }}</text>
<text class="u-cell-text">{{tel}}</text>
</view> </view>
</u-cell> </u-cell>
<u-cell v-if="showFix == 0" <u-cell
isLink v-if="showFix == 0"
url="/pages/selfService/updateDomicile/addDomicile"> isLink
<view slot="title" url="/pages/selfService/updateDomicile/addDomicile"
class="u-slot-title"> >
<text class="u-cell-text">{{'联系方式'}}</text> <view slot="title" class="u-slot-title">
<text class="u-cell-text">{{ '联系方式' }}</text>
</view> </view>
<view slot="value" <view slot="value" class="u-slot-title">
class="u-slot-title"> <text class="u-cell-text">{{ tel }}</text>
<text class="u-cell-text">{{tel}}</text>
</view> </view>
</u-cell> </u-cell>
</u-cell-group> </u-cell-group>
</view> </view>
</view> </view>
</template> </template>
@ -59,7 +47,6 @@ import clTabbar from '@/components/cl-tabbar.vue'
import * as min from '@/config/balance.js' import * as min from '@/config/balance.js'
import * as ban from '@/config/balance.js' import * as ban from '@/config/balance.js'
import { checkIfShow } from '@/config/selfService.js' import { checkIfShow } from '@/config/selfService.js'
import { getData } from '@/config/login'
export default { export default {
components: { components: {
@ -77,17 +64,13 @@ export default {
onLoad() { onLoad() {
this.userInfo = uni.getStorageSync('User') this.userInfo = uni.getStorageSync('User')
this.checkIfShow() this.checkIfShow()
this.getMemberInfo() // this.getMemberInfo()
this.tel = this.userInfo.phone
}, },
onShow() {}, onShow() {},
methods: { methods: {
getMemberInfo() {
getData().then((res) => {
this.tel = res.data.phone
})
},
checkIfShow() { checkIfShow() {
checkIfShow().then((res) => { checkIfShow().then(res => {
this.showFix = res.data.existDomicile this.showFix = res.data.existDomicile
}) })
}, },
@ -101,7 +84,7 @@ export default {
.checkPwd({ .checkPwd({
pwd: this.password, pwd: this.password,
}) })
.then((res) => { .then(res => {
if (res.code == 200) { if (res.code == 200) {
this.password = '' this.password = ''
this.pswShow = false this.pswShow = false
@ -303,4 +286,4 @@ page {
background-color: #f2f2f2; background-color: #f2f2f2;
padding: 20rpx 22rpx; padding: 20rpx 22rpx;
} }
</style> </style>