From fafb42842857e5c32bc45b8de10e37c6bac23b09 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Sat, 23 Jul 2022 14:54:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8C=87=E6=B4=BE=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/customer.vue | 6 +++--- pages/mine/reception/addreception.vue | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pages/index/customer.vue b/pages/index/customer.vue index 4b48042..4e3181f 100644 --- a/pages/index/customer.vue +++ b/pages/index/customer.vue @@ -136,11 +136,11 @@ - 接待延时 - 重新指派 + 接待延时 + 重新指派 结束接待 - + 指派顾问 diff --git a/pages/mine/reception/addreception.vue b/pages/mine/reception/addreception.vue index fdc0371..5ec4749 100644 --- a/pages/mine/reception/addreception.vue +++ b/pages/mine/reception/addreception.vue @@ -54,13 +54,12 @@ - 顾问 - + 顾问 + 接待顾问 - {{text}} 请选择接待顾问 @@ -251,7 +250,11 @@ this.parames.howMany = num; }, clickShowhid() { - if (this.userInfo.userRoleType == 6) { + if (!this.isShow) { + uni.showToast({ + icon: "none", + title: '您没有指派权限~' + }) return } if (this.freeList.length == 0) { From 6550b6dc3abdb9490386b41a5460c6dee64d0db3 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Sat, 23 Jul 2022 15:37:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8C=87=E6=B4=BE=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/consumer/index.vue | 1 + pages/index/customer.vue | 47 +++------------------------ pages/mine/reception/addreception.vue | 23 +++++++++++-- 3 files changed, 26 insertions(+), 45 deletions(-) diff --git a/pages/index/consumer/index.vue b/pages/index/consumer/index.vue index 1b8b42d..6c25623 100644 --- a/pages/index/consumer/index.vue +++ b/pages/index/consumer/index.vue @@ -408,6 +408,7 @@ }, onPullDownRefresh() { + this.buildingID = uni.getStorageSync('buildingID').id; this.LOADING = true this.nextPage = 1; this.isRefresh = true; diff --git a/pages/index/customer.vue b/pages/index/customer.vue index 4e3181f..96f428d 100644 --- a/pages/index/customer.vue +++ b/pages/index/customer.vue @@ -336,47 +336,9 @@ }, //新增接待 addreception() { - const { - dataCode, - addAccount - } = uni.getStorageSync("weapp_session_userInfo_data"); - - if (dataCode == 6) { - // if (addAccount != 0) { - // uni.showToast({ - // title: '不允许自建客户！', - // duration: 2000 - // }); - // return - // } - if (this.waitCustomList.length == 0) { - uni.navigateTo({ - url: '/pages/mine/reception/addreception' - }) - return - } else { - for (var i = 0; i < this.waitCustomList.length; i++) { - if (this.waitCustomList[i].status == 1) { - uni.showLoading({ - title: '当前还有未完成的客户项' - }); - setTimeout(function() { - uni.hideLoading(); - }, 1000); - return - } else { - uni.navigateTo({ - url: '/pages/mine/reception/addreception' - }) - return - } - } - } - } else { - uni.navigateTo({ - url: '/pages/mine/reception/addreception' - }); - } + uni.navigateTo({ + url: '/pages/mine/reception/addreception' + }); }, assign(item) { let url = `/pages/mine/reception/consultant?id=${item.id}` @@ -529,7 +491,7 @@ } .footer-button { - // margin-top: 30rpx; + padding: 0 30rpx; width: 100%; height: 108rpx; display: flex; @@ -566,7 +528,6 @@ border-radius: 30rpx; border: 1px solid #999999; margin-left: 30rpx; - margin-right: 30rpx; } } } diff --git a/pages/mine/reception/addreception.vue b/pages/mine/reception/addreception.vue index 5ec4749..20f1e97 100644 --- a/pages/mine/reception/addreception.vue +++ b/pages/mine/reception/addreception.vue @@ -69,8 +69,8 @@ 确定 - + { + return item.agentId == this.userInfo.accountId + }) || null + if (!obj && this.userInfo.userRoleType == 6) { + this.isPass = true + } else { + this.isPass = false + } + if (this.parames.name.length == 0) { uni.showToast({ icon: "none", @@ -175,6 +186,14 @@ }) return; } + // 判断条件2是否选中顾问 + if (this.isPass && !this.parames.agentId) { + uni.showToast({ + icon: "none", + title: "当前顾问正在接待，请选择其他顾问" + }) + return; + } const that = this; this.$u.post("customer/daitiReception", { phone: that.parames.phone, From 2fac29201b8fa25028eee03eae63aace4c904388 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Mon, 25 Jul 2022 14:56:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- utils/domain.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 8fc9fb1..1c353b5 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "AI销管", + "name" : "AI销讲助手", "appid" : "__UNI__7A1611D", "description" : "AI销讲助手", "versionName" : "1.1.0", @@ -72,7 +72,7 @@ }, "quickapp" : {}, "mp-weixin" : { - "appid" : "wxd6dd7eae72606ca2", + "appid" : "wx83fec12ec03d9349", "setting" : { "urlCheck" : false, "es6" : true, diff --git a/utils/domain.js b/utils/domain.js index f24d09c..922daea 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,10 +1,10 @@ -const base = 'http://81.70.55.170:9999'; // 测试站 +// const base = 'http://81.70.55.170:9999'; // 测试站 // const base = 'http://127.0.0.1:9999'; // 本地 // const base = 'http://192.168.31.148:9999' ;// 泽明 // const base = 'http://192.168.31.94:9999' ;// 胜浩 // const base = 'http://192.168.31.161:9999' // 长龙 // const base = 'https://zanyong.hfju.com';// 正式 AI销管// 弃用 -// const base = 'https://hxz.quhouse.com';// 正式 AI销讲助手 +const base = 'https://hxz.quhouse.com';// 正式 AI销讲助手 // http.js使用 const baseUrl = `${base}/autoSR/api`;