diff --git a/components/cartBall.vue b/components/cartBall.vue index 0680ddb..86c9997 100644 --- a/components/cartBall.vue +++ b/components/cartBall.vue @@ -59,7 +59,7 @@ export default { this.downShow = false this.getCar() }, - + getCar() { this.$store.dispatch('getCarLength', this.specialArea) }, @@ -120,4 +120,4 @@ export default { ::v-deep .u-popup__content { overflow: hidden; } - \ No newline at end of file + diff --git a/components/cartBtmList.vue b/components/cartBtmList.vue index 427b781..7e4732c 100644 --- a/components/cartBtmList.vue +++ b/components/cartBtmList.vue @@ -156,6 +156,7 @@ import { canOrder } from '@/config/order' export default { data() { return { + newShareMember: false, isSelectAll: [], shopCarList: [], isLoading: false, @@ -213,6 +214,8 @@ export default { // this.getCarList() }, onShow() { + this.newShareMember = uni.getStorageSync('User')?.loginType !== 0 + console.log('this.nerShareMember', this.newShareMember) // this.getCarList() }, methods: { @@ -377,13 +380,25 @@ export default { shoppingId: item, }) }) - uni.navigateTo({ - url: - '/pages/regiest/index?specialArea=' + - this.goodsCheck[0].specialArea + - '&shoppArr=' + - JSON.stringify(shoppArr), - }) + // sangelxiu1 + this.newShareMember = uni.getStorageSync('User')?.loginType !== 0 + if(this.newShareMember){ + uni.navigateTo({ + url: + '/pages/regiest/shareRegister?specialArea=' + + 41 + + '&shoppArr=' + + JSON.stringify(shoppArr), + }) + }else{ + uni.navigateTo({ + url: + '/pages/regiest/index?specialArea=' + + this.goodsCheck[0].specialArea + + '&shoppArr=' + + JSON.stringify(shoppArr), + }) + } } else if (this.goodsCheck[0].specialArea == 21) { if ( this.userInfo.registerShare == 0 || diff --git a/components/raised-tabbar.vue b/components/raised-tabbar.vue index 4174757..c6bc1a9 100644 --- a/components/raised-tabbar.vue +++ b/components/raised-tabbar.vue @@ -34,6 +34,7 @@ class="tabbar-item center-item" :class="{ active: current === 2 }" @click="tabbarChange(2)" + v-if="!newShareMember" > @@ -88,8 +89,12 @@ export default { default: 0, }, }, + mounted() { + this.newShareMember = uni.getStorageSync('User')?.loginType !== 0 + }, data() { return { + newShareMember: false, // 完整的路由列表 list: [ { diff --git a/components/region-select/index.vue b/components/region-select/index.vue index e151678..59824a0 100644 --- a/components/region-select/index.vue +++ b/components/region-select/index.vue @@ -194,6 +194,7 @@ export default { ) if (province) { if (!province.children) { + console.log(item) province.children = [item] } else { province.children.push(item) diff --git a/config/share.js b/config/share.js index e825d35..cc377ad 100644 --- a/config/share.js +++ b/config/share.js @@ -2,3 +2,20 @@ const http = uni.$u.http export const getShareCode = params => http.get('/member/api/share/get-shared-img', { params }) + +// 根据短码获取memberCode +export const getMemberCode = code => + http.get(`/member/api/share/find-share-code/${code}`) + +// 获取手机验证码 +export const getPhoneCode = params => + http.get('/member/api/share/share-sms-code', { params }) + +// 注册 +export const getRegister = data => + http.post('/member/api/share/share-register', data) + +// 自动登录 +export const autoLogin = data => + // http.post('/retail-member/api/retail-auth/auto-login', data) + http.post('/member/auth/api/share-login', data) diff --git a/pages.json b/pages.json index 3313612..9879e48 100644 --- a/pages.json +++ b/pages.json @@ -318,6 +318,12 @@ "navigationBarTitleText": "注册专区" } }, + { + "path": "pages/regiest/shareRegister", + "style": { + "navigationBarTitleText": "会员专区" + } + }, { "path": "pages/shareArea/haiShare", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index 8ffc1a2..f7cdf29 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -199,6 +199,7 @@ export default { }, data() { return { + newShareMember: false, promptFlag: false, promptMsg: '', confirmText: '', @@ -394,6 +395,19 @@ export default { }, ], }, + { + label: '会员专区', + value: 41, + name: 'membersOnly', + children: [ + { + label: '自营专区', + value: 41, + name: 'regiestArea', + isShow: true, + }, + ], + }, ], } }, @@ -407,12 +421,17 @@ export default { ) { } this.getGoodsInfo() - this.getAreaGoods() + // this.getLanguage(); this.getService() }, onShow() { this.$store.dispatch('getCarLength') + this.$store.dispatch('GetInfo').then(() => { + this.user = uni.getStorageSync('User') + this.getAreaGoods() + this.newShareMember = this.user?.loginType !== 0 + }) }, onPullDownRefresh() { let that = this @@ -458,6 +477,17 @@ export default { getAreaGoods() { getAreaGoods().then(res => { this.recommendSpecialAreaList = res.data?.recommendSpecialAreaList || [] + if (this.newShareMember) { + let obj = this.recommendSpecialAreaList.find( + item => item.specialArea === 41 + ) + if (obj) { + this.$set(obj, 'specialAreaName', '会员专区') + } + this.recommendSpecialAreaList = this.recommendSpecialAreaList.filter( + item => item.specialArea === 41 + ) + } }) }, toDel() { @@ -596,7 +626,6 @@ export default { tapx = index } }) - if (tapx == -1) { this.zoneList.forEach((items, index) => { items.children.forEach(ctem => { diff --git a/pages/login/index.vue b/pages/login/index.vue index 15de27a..9b738cc 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -1,26 +1,26 @@ -