diff --git a/config/login.js b/config/login.js index 9f4695b..b1d4858 100644 --- a/config/login.js +++ b/config/login.js @@ -24,23 +24,23 @@ export const verification = 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 => - http.post('/retail-member/api/retail-member-address/save', data) + http.post('/member/api/member-address/save', 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 => - http.put('/retail-member/api/retail-member/forget-password', data) + http.put('/member/api/member/forget-password', data) //获取地址详情 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) @@ -131,10 +131,10 @@ export const selfVerification = params => http.get('/retail-member/api/sms/self-verification', { 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 => - http.put('/retail-member/api/retail-member/forget-pay-password', data) + http.put('/member/api/member/forget-pay-password', data) // 站内信弹窗 export const getIndexPopmail = params => diff --git a/config/mine.js b/config/mine.js index df211d6..32dd650 100644 --- a/config/mine.js +++ b/config/mine.js @@ -1,16 +1,25 @@ - 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') +} diff --git a/config/request.js b/config/request.js index 1f704ab..f7009c6 100644 --- a/config/request.js +++ b/config/request.js @@ -20,7 +20,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://192.168.0.102:8080' + config.baseURL = 'http://localhost:8080' //#endif //#ifdef QA_SERVER diff --git a/pages/address/index.vue b/pages/address/index.vue index aa6d0c3..a2df8ec 100644 --- a/pages/address/index.vue +++ b/pages/address/index.vue @@ -3,11 +3,7 @@ - + - + - \ No newline at end of file + .subbtn { + background: #005bac; + border-radius: 46rpx; + font-size: 30rpx; + font-family: Source Han Sans CN; + font-weight: 400; + color: #ffffff; + } + } +} + diff --git a/pages/mine/index.vue b/pages/mine/index.vue index f769427..acb2229 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -176,6 +176,31 @@ + + + + {{ '我的区域' }} + + + + {{ + regionInfo.province || '-' + }} + {{ '省' }} + + + {{ regionInfo.city || '-' }} + {{ '市' }} + + + {{ + regionInfo.county || '-' + }} + {{ '区' }} + + + + @@ -295,6 +320,7 @@ import clTabbar from '@/components/cl-tabbar.vue' import * as min from '@/config/balance.js' import * as api from '@/config/login.js' import { MEMBER_SIGN } from '@/util/common.js' +import { getRegionSelect } from '@/config/mine.js' // import talentList from "@/components/talentList.vue"; export default { components: { @@ -372,13 +398,13 @@ export default { menuKey: 'wallet', ifshow: false, }, - { - url: '/pages/pickupArea/pickupArea', - name: '提货专区', - imgurl: '../../static/images/my_icon3.png', - menuKey: 'pickGoods', - ifshow: false, - }, + // { + // url: '/pages/pickupArea/pickupArea', + // name: '提货专区', + // imgurl: '../../static/images/my_icon3.png', + // menuKey: 'pickGoods', + // ifshow: false, + // }, { url: '/pages/ticket/index', name: '自助购票', @@ -466,24 +492,26 @@ export default { // menuKey: "", // ifshow: false, // }, - { - url: '/pages/mine/addNewPv/index', - name: '新增业绩', - imgurl: '../../static/images/mark9.png', - menuKey: 'iNewAchievement', - ifshow: false, - }, + // { + // url: '/pages/mine/addNewPv/index', + // name: '新增业绩', + // imgurl: '../../static/images/mark9.png', + // menuKey: 'iNewAchievement', + // ifshow: false, + // }, ], drShow: false, actMenu: false, iHonorAward: false, ifSpecial: false, awardsList: '', + regionInfo: {}, } }, onShow() { this.getInfo() this.orderNum() + this.getRegionSelect() // this.getUserAwardss() }, @@ -530,9 +558,19 @@ export default { marketWrapperVisible() { return this.userInfo.memberSign == MEMBER_SIGN.V5_LEVEL }, + regionInfoVisible() { + return this.regionInfo?.regionStatus === 0 + }, }, methods: { + getRegionSelect() { + getRegionSelect().then(res => { + if (res.code == 200) { + this.regionInfo = res.data + } + }) + }, goYear() { uni.navigateTo({ url: '/pages/mine/yearGift/index', @@ -1347,4 +1385,30 @@ export default { font-size: 24rpx; 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; +} diff --git a/pages/regiest/index.vue b/pages/regiest/index.vue index 66c6191..2ad3a92 100644 --- a/pages/regiest/index.vue +++ b/pages/regiest/index.vue @@ -33,7 +33,7 @@ - - - {{'修改登录密码'}} + + + {{ '修改登录密码' }} - - - {{'修改支付密码'}} + + + {{ '修改支付密码' }} - - + + 重置支付密码 - - {{'联系方式'}} + + {{ '联系方式' }} - - {{tel}} + + {{ tel }} - - - {{'联系方式'}} + + + {{ '联系方式' }} - - {{tel}} + + {{ tel }} - @@ -59,7 +47,6 @@ import clTabbar from '@/components/cl-tabbar.vue' import * as min from '@/config/balance.js' import * as ban from '@/config/balance.js' import { checkIfShow } from '@/config/selfService.js' -import { getData } from '@/config/login' export default { components: { @@ -77,17 +64,13 @@ export default { onLoad() { this.userInfo = uni.getStorageSync('User') this.checkIfShow() - this.getMemberInfo() + // this.getMemberInfo() + this.tel = this.userInfo.phone }, onShow() {}, methods: { - getMemberInfo() { - getData().then((res) => { - this.tel = res.data.phone - }) - }, checkIfShow() { - checkIfShow().then((res) => { + checkIfShow().then(res => { this.showFix = res.data.existDomicile }) }, @@ -101,7 +84,7 @@ export default { .checkPwd({ pwd: this.password, }) - .then((res) => { + .then(res => { if (res.code == 200) { this.password = '' this.pswShow = false @@ -303,4 +286,4 @@ page { background-color: #f2f2f2; padding: 20rpx 22rpx; } - \ No newline at end of file +