From 7a68f7e13913f8d4f86962979fd1e79c18f57fb6 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 10:44:25 +0800
Subject: [PATCH] update 登录和其他部分信息
---
pages/login/supplier-login.vue | 132 ++++++++++++++++---------
sub_pages/supplier/supplier-info/supplier-info.vue | 18 ++-
sub_pages/partner/partner-info/partner-code-v2.vue | 4
sub_pages/customer/trade/trade.vue | 3
App.vue | 63 ++++++++----
sub_pages/customer/customer-info/customer-info.vue | 26 ++++-
pages/user/address/address.vue | 15 ++
sub_pages/partner/partner-info/partner-info.vue | 15 ++
8 files changed, 180 insertions(+), 96 deletions(-)
diff --git a/App.vue b/App.vue
index f423ad2..f858281 100644
--- a/App.vue
+++ b/App.vue
@@ -6,6 +6,21 @@
export default {
onLaunch: function(options) {
+ var query = options.q && decodeURIComponent(options.q) || ''
+ var querydto = {}
+ if (query) {
+ try {
+ var keyvalues = query.split("?")[1].split("&")
+ for (var item of keyvalues) {
+ var tarr = item.split("=")
+ querydto[tarr[0]] = tarr[1]
+ }
+ } catch (e) {
+ console.error('error', e)
+ }
+ }
+ console.log('app query222',options, query,'\n@@\n ', querydto)
+
console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
console.log('App Launch')
@@ -25,17 +40,17 @@
setTimeout(async () => {
const res = await this.$store.dispatch('getCurrentInfo');
// #ifndef PUB_CUSTOMER
- if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
- if(this.currentInfo.type==='admin'){
- uni.reLaunch({
- url: '/sub_pages/partner/delivery/delivery-home'
- })
- }else{
- uni.reLaunch({
- url: '/pages/home/supplier-home'
- })
+ if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
+ if (this.currentInfo.type === 'admin') {
+ uni.reLaunch({
+ url: '/sub_pages/partner/delivery/delivery-home'
+ })
+ } else {
+ uni.reLaunch({
+ url: '/pages/home/supplier-home'
+ })
}
-
+
} else {
uni.reLaunch({
url: '/pages/login/supplier-login'
@@ -51,18 +66,18 @@
// #endif
}
// #endif
- // #ifdef PUB_CUSTOMER
- // 需要处理一下，判断是跳转登录还是原封不动
- if(options.partnerUserId){
- //需要去注册页面
- console.log('options',options)
-
- }else{
- uni.reLaunch({
- url: '/pages/home/home'
- })
+ // #ifdef PUB_CUSTOMER
+ // 需要处理一下，判断是跳转登录还是原封不动
+ if (!!querydto.partnerUserId) {
+ //需要去注册页面
+ console.log('options', options)
+
+ } else {
+ // uni.reLaunch({
+ // url: '/pages/home/home'
+ // })
}
-
+
// #endif
},
@@ -410,9 +425,11 @@
.m-t-15 {
margin-top: 30rpx;
}
- .p-t-12{
- padding-top: 30rpx;
+
+ .p-t-12 {
+ padding-top: 30rpx;
}
+
.m-t-icon {
margin-top: 8rpx;
}
diff --git a/pages/login/supplier-login.vue b/pages/login/supplier-login.vue
index 6e36103..ed2e6b5 100644
--- a/pages/login/supplier-login.vue
+++ b/pages/login/supplier-login.vue
@@ -76,6 +76,9 @@
</form>
</view>
+ <!-- <view v-if="optionsStr">
+ {{optionsStr}}
+ </view> -->
</view>
</view>
</template>
@@ -83,67 +86,99 @@
export default {
onLoad(options) {
// #ifdef PUB_CUSTOMER
- if (options.partnerUserId) {
+ var query = options.q && decodeURIComponent(options.q) || ''
+ var querydto = {}
+ if (query) {
+ try {
+ var keyvalues = query.split("?")[1].split("&")
+ for (var item of keyvalues) {
+ var tarr = item.split("=")
+ querydto[tarr[0]] = tarr[1]
+ }
+ } catch (e) {
+ console.error('error', e)
+ }
+ }
+ console.log('options query111', querydto)
+ // this.optionsStr = JSON.stringify(options) || ''
+ if (querydto.partnerUserId) {
if (this.$storage.getItem('token')) {
+ console.log('to login 1')
this.$message.showLoading()
//稍微等一会，避免currentInfo还在同步
let tmp = this
- setTimeout(() => {
- tmp.$message.hideLoading()
- if (tmp.currentInfo.id || tmp.$storage.getItem('token')) {
- //这种已经登录的
- //确定是注册绑定还是重新绑定
- var t = {
- title: '提示,您已登录,是否退出并注册绑定合伙人',
- content: '',
- showCancel: true,
- cancelText: '使用当前账号绑定合伙人',
- cancelColor: '#000000',
- confirmText: '退出当前账号并注册、绑定',
- confirmColor: '#20613D'
- }
- uni.showModal({
- ...t,
- success: (res) => {
- if (res.confirm) {
- //清空登录信息，
- this.$store.commit('updateLogin', false)
- setTimeout(() => {
- uni.navigateTo({
- url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${options.partnerUserId}&partnerUserName=${options.partnerUserName}`
- })
- }, 200)
+ setTimeout(async () => {
+ try {
+ tmp.$message.hideLoading()
+ if (tmp.currentInfo && tmp.currentInfo.id || tmp.$storage.getItem('token')) {
+ await this.$store.dispatch('getCurrentInfo');
+ //这种已经登录的
+ //确定是注册绑定还是重新绑定
+ tmp.$nextTick(() => {
+ var tt = {
+ title: '提示:您已登录,是直接用该账号绑定，还是退出并注册新账号绑定合伙人',
+ content: '',
+ showCancel: true,
+ cancelText: '直接绑定',
+ cancelColor: '#000000',
+ confirmText: '退出注册',
+ confirmColor: '#20613D'
}
- if (res.cancel) {
- if (!tmp.currentInfo.customer) {
- tmp.$message.showToast('您尚未完善信息无法绑定')
- return
- } else {
- if (tmp.currentInfo.customer.partnerId) {
- tmp.$message.showToast('您已绑定，请联系客服解除绑定')
- return
- } else {
- //前往绑定页面
- uni.reLaunch({
- url: `/pages/user/supplier-user?partnerUserId=${options.partnerUserId}&partnerUserName=${options.partnerUserName}`
- })
+ uni.showModal({
+ ...tt,
+ success: (res) => {
+ if (res.confirm) {
+ //清空登录信息，
+ this.$store.commit('updateLogin', false)
+ setTimeout(() => {
+ uni.navigateTo({
+ url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ })
+ }, 200)
}
+ if (res.cancel) {
+ if (!tmp.currentInfo.customerDTO) {
+ tmp.$message.showToast('您尚未完善信息无法绑定')
+ return
+ } else {
+ if (tmp.currentInfo.customerDTO
+ .partnerId) {
+ tmp.$message.showToast(
+ '您已绑定，请联系客服解除绑定')
+ return
+ } else {
+ //前往绑定页面
+ uni.reLaunch({
+ url: `/pages/user/supplier-user?partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ })
+ }
+ }
+ }
+ },
+ fail(res) {
+ console.log('res uni model', res)
}
- }
- }
- })
+ })
- } else {
- //退出登录了，或者失效了
- uni.navigateTo({
- url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${options.partnerUserId}&partnerUserName=${options.partnerUserName}`
- })
+ })
+ } else {
+ console.log('to login 3')
+ //退出登录了，或者失效了
+ uni.navigateTo({
+ url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ })
+ }
+ } catch (e2) {
+ console.log('to login error', e2)
}
}, 2000)
} else {
+ console.log('to login 2',
+ `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
+ )
uni.navigateTo({
- url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${options.partnerUserId}&partnerUserName=${options.partnerUserName}`
+ url: `/sub_pages/customer/customer-info/customer-info?source=step&partnerUserId=${querydto.partnerUserId}&partnerUserName=${querydto.partnerUserName}`
})
}
@@ -154,6 +189,7 @@
},
data() {
return {
+ optionsStr: '',
openId: '-1',
userName: '',
password: '',
diff --git a/pages/user/address/address.vue b/pages/user/address/address.vue
index 5a7fc55..e320be3 100644
--- a/pages/user/address/address.vue
+++ b/pages/user/address/address.vue
@@ -221,10 +221,17 @@
if (this.regionDataPlus && this.regionDataPlus.length > 0) {
}else{
- const res = await this.$http.request('get', '/api/pub/china/area/json')
- this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll(
- 'name',
- 'text')) || []
+ var a = this.$storage.getItem('cache_area')
+ if (a) {
+ this.regionDataPlus = JSON.parse(a) || []
+ } else {
+ const res = await this.$http.request('get', '/api/pub/china/area/json')
+ // console.log('area', JSON.parse(res.data))
+ this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll(
+ 'name',
+ 'text')) || []
+ this.$storage.setItem('cache_area', JSON.stringify(this.regionDataPlus))
+ }
}
},
diff --git a/sub_pages/customer/customer-info/customer-info.vue b/sub_pages/customer/customer-info/customer-info.vue
index 5e4c1e3..3512e0b 100644
--- a/sub_pages/customer/customer-info/customer-info.vue
+++ b/sub_pages/customer/customer-info/customer-info.vue
@@ -127,6 +127,7 @@
}
},
onLoad(options) {
+ console.log('customer-info options', options)
//判断是不是来自登录步骤，是等话需要从缓存里面拿信息
this.source = options.source || ''
@@ -138,11 +139,16 @@
...JSON.parse(tjson)
}
}
- if(options.partnerUserId){
+ if (options.partnerUserId) {
this.dto.partnerUserId = options.partnerUserId || ''
}
- if(options.partnerUserName){
+ if (options.partnerUserName) {
this.dto.partnerUserName = options.partnerUserName || ''
+ }
+ if (this.dto.partnerUserId && this.dto.partnerUserName) {
+ uni.setNavigationBarTitle({
+ title: '注册并绑定合伙人: ' + this.dto.partnerUserName
+ })
}
} else {
this.getCurrentInfo()
@@ -190,10 +196,18 @@
}
},
async init_area() {
- const res = await this.$http.request('get', '/api/pub/china/area/json')
- // console.log('area', JSON.parse(res.data))
- this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll('name',
- 'text')) || []
+ var a = this.$storage.getItem('cache_area')
+ if (a) {
+ this.regionDataPlus = JSON.parse(a) || []
+ } else {
+ const res = await this.$http.request('get', '/api/pub/china/area/json')
+ // console.log('area', JSON.parse(res.data))
+ this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll(
+ 'name',
+ 'text')) || []
+ this.$storage.setItem('cache_area', JSON.stringify(this.regionDataPlus))
+ }
+
},
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 0473b66..f576d1c 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -46,8 +46,7 @@
<view class="cateen_infos list">
<view class="title">{{item.name}}</view>
<view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
- <view class="desc" v-if="item.stock">在售 {{item.stock||'0'}} 扎</view>
-
+ <view class="desc">在售 {{item.stock||'0'}} 扎</view>
</view>
</view>
diff --git a/sub_pages/partner/partner-info/partner-code-v2.vue b/sub_pages/partner/partner-info/partner-code-v2.vue
index c6d015e..be6113e 100644
--- a/sub_pages/partner/partner-info/partner-code-v2.vue
+++ b/sub_pages/partner/partner-info/partner-code-v2.vue
@@ -32,7 +32,7 @@
goodsTitle2: '',
shareImage: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/d4/d43cdefc7b8f4c3e91fb451a236a4435WechatIMG2882.jpg', // 背景图片
qrSize: 100, // 二维码大小
- qrUrl: 'http://www.hmyxianhua.com/wx/jump?partnerUserId=1&partnerUserName=', // 生成二维码的链接
+ qrUrl: '', // 生成二维码的链接
}
},
onLoad() {
@@ -42,7 +42,7 @@
}
this.name = this.currentInfo.partnerDTO.name || '佚名'
this.qrUrl =
- `http://www.hmyxianhua.com/wx/jump?partnerUserId=${this.currentInfo.id||'-'}&partnerUserName=${this.name||'-'}`
+ `https://scan.hmyxianhua.com/wx/?partnerUserId=${this.currentInfo.id||'-'}&partnerUserName=${this.name||'-'}`
this.goodsTitle = `${this.name||'-'}的推广二维码`
this.goodsTitle2 = `扫码注册绑定合伙人`
this.$message.showLoading()
diff --git a/sub_pages/partner/partner-info/partner-info.vue b/sub_pages/partner/partner-info/partner-info.vue
index 698993b..c816e67 100644
--- a/sub_pages/partner/partner-info/partner-info.vue
+++ b/sub_pages/partner/partner-info/partner-info.vue
@@ -241,10 +241,17 @@
}
},
async init_area() {
- const res = await this.$http.request('get', '/api/pub/china/area/json')
- // console.log('area', JSON.parse(res.data))
- this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll('name',
- 'text')) || []
+ var a = this.$storage.getItem('cache_area')
+ if (a) {
+ this.regionDataPlus = JSON.parse(a) || []
+ } else {
+ const res = await this.$http.request('get', '/api/pub/china/area/json')
+ // console.log('area', JSON.parse(res.data))
+ this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll(
+ 'name',
+ 'text')) || []
+ this.$storage.setItem('cache_area', JSON.stringify(this.regionDataPlus))
+ }
diff --git a/sub_pages/supplier/supplier-info/supplier-info.vue b/sub_pages/supplier/supplier-info/supplier-info.vue
index 2427a8c..2baac13 100644
--- a/sub_pages/supplier/supplier-info/supplier-info.vue
+++ b/sub_pages/supplier/supplier-info/supplier-info.vue
@@ -382,13 +382,17 @@
}
},
async init_area() {
- const res = await this.$http.request('get', '/api/pub/china/area/json')
- // console.log('area', JSON.parse(res.data))
- this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll('name',
- 'text')) || []
-
- // console.log('area', this.regionDataPlus)
-
+ var a = this.$storage.getItem('cache_area')
+ if (a) {
+ this.regionDataPlus = JSON.parse(a) || []
+ } else {
+ const res = await this.$http.request('get', '/api/pub/china/area/json')
+ // console.log('area', JSON.parse(res.data))
+ this.regionDataPlus = res.data && JSON.parse(res.data.replaceAll('code', 'value').replaceAll(
+ 'name',
+ 'text')) || []
+ this.$storage.setItem('cache_area', JSON.stringify(this.regionDataPlus))
+ }
},
--
Gitblit v1.9.3