From 110b6b66982f0c02a70a3291d54c1f19693138ee Mon Sep 17 00:00:00 2001 From: xuxueyang <xuxy@fengyuntec.com> Date: 星期六, 03 八月 2024 15:42:46 +0800 Subject: [PATCH] 1 --- pages/user/supplier-user.vue | 172 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 126 insertions(+), 46 deletions(-) diff --git a/pages/user/supplier-user.vue b/pages/user/supplier-user.vue index e490fb8..93c7b95 100644 --- a/pages/user/supplier-user.vue +++ b/pages/user/supplier-user.vue @@ -180,6 +180,13 @@ <uni-icons type="right"></uni-icons> </view> </view> + <!-- <view class="user-util m-t-12 flex" v-if="selftype==='partner'" + @click="goto('/sub_pages/partner/partner-info/partner-code-v2',true)"> + <view class="title">测试二维码</view> + <view class="right-icon"> + <uni-icons type="right"></uni-icons> + </view> + </view> --> <!-- #endif --> <!-- #ifdef PUB_CUSTOMER --> <view class="user-util m-t-12 flex" @@ -191,7 +198,14 @@ </view> </view> <!-- #endif --> - + <view class="user-util m-t-12 flex" + v-if="selftype==='supplier'&¤tInfo&¤tInfo.id&¤tInfo.supplierDTO&¤tInfo.supplierDTO.status==='P'" + @click="goto('/sub_pages/supplier/supplier-info/supplier-info-update',true)"> + <view class="title">信息维护</view> + <view class="right-icon"> + <uni-icons type="right"></uni-icons> + </view> + </view> <view class="user-util m-t-12 flex" v-if="selftype==='supplier'" @click="goto('/sub_pages/supplier/supplier-info/supplier-info',true)"> <view class="title">店铺信息</view> @@ -199,19 +213,19 @@ <uni-icons type="right"></uni-icons> </view> </view> - + <view class="user-util m-t-12 flex" @click="goto('/pages/user/user-pwd/user-pwd',true)"> <view class="title">修改密码</view> <view class="right-icon"> <uni-icons type="right"></uni-icons> </view> - </view> - <view class="user-util m-t-12 flex" v-if="currentInfo&¤tInfo.id" - @click="goto('/pages/user/user-bind-wx/user-bind-wx',true)"> - <view class="title">绑定当前微信</view> - <view class="right-icon"> - <uni-icons type="right"></uni-icons> - </view> + </view> + <view class="user-util m-t-12 flex" v-if="currentInfo&¤tInfo.id" + @click="goto('/pages/user/user-bind-wx/user-bind-wx',true)"> + <view class="title">绑定当前微信</view> + <view class="right-icon"> + <uni-icons type="right"></uni-icons> + </view> </view> <view class="user-util m-t-12 flex" v-if="selftype==='customer'" @click="clearlogout"> <view class="title">退出登录</view> @@ -222,15 +236,18 @@ <view class="user-util m-t-12 " v-if="selftype==='supplier'||selftype==='customer' || !selftype"> <view class="title">我的客服</view> - <view class="flex" open-type="contact"> - <image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image> - <!-- @click="callTel" --> - <view class="name"> - 客服电话 : <span class="topic-gray">{{ tel }}</span> - </view> - <view class="right-icon" > - <uni-icons type="right"></uni-icons> - </view> + <view class="flex flex-wrap-normal"> + <image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image> + <!-- @click="callTel" --> + <button open-type="contact" class="component-button-contact" @handleContact="handleContact"> + <view class="name"> + 客服电话 : <span class="topic-gray">{{ tel }}</span> + </view> + <view class="right-icon"> + <uni-icons type="right"></uni-icons> + </view> + </button> + </view> </view> <!-- <view class="user-util m-t-12 " @click="callTel" v-if="selftype==='partner'"> @@ -319,21 +336,62 @@ order_pendding_num: 0, }; - }, - // watch: { - // currentInfo(nv, ov) { - // if (!cacheUserId) { - - // } - // } - // }, + }, + // #ifndef PUB_CUSTOMER + onShareAppMessage() { + let that = this; + var name = that.currentInfo.customerDTO&¤tInfo.customerDTO.name || that.currentInfo.supplierDTO&¤tInfo.supplierDTO.name || that.currentInfo.partnerDTO&¤tInfo.partnerDTO.name || '' + var url = + `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 + return { + title: "花满芫", + path: url, + } + }, + onShareTimeline() { + let that = this; + var name = that.currentInfo.customerDTO&¤tInfo.customerDTO.name || that.currentInfo.supplierDTO&¤tInfo.supplierDTO.name || that.currentInfo.partnerDTO&¤tInfo.partnerDTO.name || '' + var url = + `/pages/login/supplier-login?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 + return { + title: "花满芫", + path: url, + } + }, + // #endif + // #ifdef PUB_CUSTOMER + onShareAppMessage() { + let that = this; + var name = that.currentInfo.customerDTO&¤tInfo.customerDTO.name || that.currentInfo.supplierDTO&¤tInfo.supplierDTO.name || that.currentInfo.partnerDTO&¤tInfo.partnerDTO.name || '' + var url = + `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 + return { + title: "花满芫", + path: url, + } + }, + onShareTimeline() { + let that = this; + var name = that.currentInfo.customerDTO&¤tInfo.customerDTO.name || that.currentInfo.supplierDTO&¤tInfo.supplierDTO.name || that.currentInfo.partnerDTO&¤tInfo.partnerDTO.name || '' + var url = + `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数 + return { + title: "花满芫", + path: url, + } + }, + // #endif onShow() { this.getTj() }, onLoad(options) { // const url = options.q ? decodeURIComponent(options.q) : ''; // const urlcode = options.url && decodeURIComponent(options.url) || '' - + // #ifdef PUB_CUSTOMER + if (options.partnerUserId) { + this.bindPartnerUser(options.partnerUserId, options.partnerUserName) + } + // #endif }, @@ -345,8 +403,25 @@ uni.stopPullDownRefresh() }, methods: { + async bindPartnerUser(userId, name) { + await this.$message.confirm(`确定要绑定${name}合伙人吗?`) + //调用接口绑定 + this.$message.showLoading() + const { + code, + data + } = await this.$http.request('post', '/api/customer/bind/partner', { + data: { + partnerUserId: userId + } + }) + this.$message.hideLoading() + if (code == 0) { + this.$message.showToast(`绑定合伙人${name}成功`) + await this.$store.dispatch('getCurrentInfo') + } + }, async scanPartnerCode() { - await this.$message.confirm('确定要绑定合伙人吗?') //扫二维码确认 let that = this uni.scanCode({ @@ -354,31 +429,34 @@ console.log('条码内容:' + res.result); var dto = undefined try { - dto = JSON.parse(res.result) + if (res.result && (res.result.startsWith('https://')||res.result.startsWith('http://')) && res.result.indexOf( + 'partnerUserId') >= 0) { + var arr = res.result.split("?")[1].split("&") + dto = {} + for (var item of arr) { + var tarr = item.split("=") + if (tarr[1]) { + dto[tarr[0]] = dto[tarr[1]] + } + } + dto['name'] = dto['partnerUserName'] || '' + dto['userId'] = dto['partnerUserId'] || '' + + } else { + dto = JSON.parse(res.result) + + } if (!!dto['userId']) { var partnerName = dto['name'] || '' var partnerId = dto['userId'] || '' - //调用接口绑定 - that.$message.showLoading() - const { - code, - data - } = await that.$http.request('post', '/api/customer/bind/partner', { - data: { - partnerId: partnerId - } - }) - that.$message.hideLoading() - if (code == 0) { - that.$message.showToast(`绑定合伙人${partnerName}成功`) - await this.$store.dispatch('getCurrentInfo') + that.bindPartnerUser(partnerId, partnerName) - } } else { that.$message.showToast('二维码格式不正确扫码失败') } - } catch (e) { - that.$message.showToast('二维码格式不正确扫码失败') + } catch (e) { + console.log('e',e) + that.$message.showToast('二维码扫码错误') } }, fail() { @@ -387,6 +465,8 @@ } }); }, + + toInfo() { var url = '' if (this.currentInfo.id) { -- Gitblit v1.9.3