From 86e0777971b6ad84c9281814cdc6023a629a89be Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 27 Jul 2022 10:35:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9domain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/domain.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/domain.js b/utils/domain.js index 2c543da..39d0d4a 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,8 +1,8 @@ // http.js使用域名 -const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 // const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 -// const baseUrl = 'http://192.168.31.90:8080/api'; // 盛浩 +const baseUrl = 'http://192.168.31.149:9090/api'; // 盛浩 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 // const baseUrl = 'https://xitong.pachira.cn/api'; // AI营销辅助 普强使用 From f626718422adcdceeedd4f08e2718289e7837424 Mon Sep 17 00:00:00 2001 From: douzhuo <17611323298@163.com> Date: Wed, 27 Jul 2022 13:44:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=BE=85=E7=9A=84=E6=A0=B7=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/mine/details2.vue | 11 +++++-- pages/mine/reception/addreception.vue | 44 ++++++++++++++------------- pages/mine/reception/consultant.vue | 40 +++++++++++------------- utils/domain.js | 4 +-- 4 files changed, 52 insertions(+), 47 deletions(-) diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 0c56be6..f63e48d 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -34,7 +34,7 @@ 录音文件 + v-for="(item,index) in dialog.message" :key="index" :data-speaker="item.speaker" @click.stop> {{ item.speaker | toCapital }} @@ -648,7 +648,6 @@ }) this.$zaudio.on('playing', this.ACTION, (obj) => { this.duration = obj.duration - console.log(obj) this.TimeUpdate(this.TIMEEVENT(obj.current)) }) this.$zaudio.on('error', this.ACTION, e => { @@ -710,6 +709,14 @@ }, methods: { + // 隐藏长按提示框 + cancelBeast() { + this.dialogList.forEach(res => { + res.message.forEach(asd => { + asd.isshow = false; + }) + }) + }, hangeshow2(item,type){ item.show = !item.show; }, diff --git a/pages/mine/reception/addreception.vue b/pages/mine/reception/addreception.vue index b136a5b..d749bc9 100644 --- a/pages/mine/reception/addreception.vue +++ b/pages/mine/reception/addreception.vue @@ -10,9 +10,6 @@ placeholder-class="titletext-input" placeholder-style="color:#B2B2B2;" type="text" placeholder="请输入客户姓名（必填）" /> - - - 客户性别 @@ -55,7 +52,6 @@ - 顾问 @@ -70,16 +66,17 @@ - - - + + 确定 + - + + + @@ -113,8 +110,7 @@ }, showSourceName: '', // 展示文字 shifoinfo: 0, // 高级权限 项目是否能指派顾问 - freeList: [], - Showhid: false, + freeList: [], // 顾问列表 text: null, show: false, content: '', @@ -136,6 +132,18 @@ }, }, + onLoad() { + uni.$on('addreception', customerId => { + let obj = this.freeList.find(item => item.agentId == customerId) + this.text = obj.name; + this.parames.agentId = customerId; + }) + }, + + onUnload() { + uni.$off('addreception') + }, + onShow() { this.parames.projectId = uni.getStorageSync('buildingID').id; console.log(this.$u) @@ -157,7 +165,6 @@ success: (data) => { console.log(data) if (data.data.code == 10000) { - // this.shifoinfo=data.data.data.selfAssigned this.list = data.data.data } } @@ -337,17 +344,12 @@ duration: 2000 }); } else { - this.Showhid = true; + uni.navigateTo({ + url: `/pages/mine/reception/consultant?from=addreception&id=${this.parames.agentId}` + }) + } }, - cancel1() { - this.Showhid = false; - }, - confirm1(e) { - this.text = e[0].label; - this.parames.agentId = e[0].value; - this.Showhid = false; - }, Buildingselection() { this.Showhiddenunits = true; diff --git a/pages/mine/reception/consultant.vue b/pages/mine/reception/consultant.vue index 5b7314e..54d0a9a 100644 --- a/pages/mine/reception/consultant.vue +++ b/pages/mine/reception/consultant.vue @@ -67,12 +67,14 @@ confirmtext: '1', //确认文字 canceltext: '2', //取消文字 daitiReceptionobj: {}, - replaceReception: 0 + replaceReception: 0, + from: '', // 来源页面需要通知的事件 } }, onLoad(option) { this.LOADING = true - this.customerId = option.id; + if (option.id) this.customerId = option.id; + if (option.from) this.from = option.from }, async onShow() { this.buildingID = uni.getStorageSync('buildingID').id; @@ -86,11 +88,6 @@ this.getFreeList(); }, - // - searchFunc() { - - }, - async iniPage() { // await this.getAllDeptName() await this.getFreeList(); @@ -117,15 +114,19 @@ try { // deptId 部门id // name 顾问名称 - let res = await this.$u.get(`/zkAgentPool/freeList?itemId=${this.buildingID}&name=${this.keywords||''}&deptId=${this.list[this.listCurrent].id || ''}`) + let res = await this.$u.get(`/zkAgentPool/freeList?itemId=${this.buildingID}`) if (res.length == 0) { this.freeList = [] } else { + // 回显上次选中的顾问 + if (this.from != '' && this.id != '') { + this.current = res.findIndex(item => item.agentId == this.customerId) + } this.freeList = res; this.textcdhSKJ = res[0].name } this.LOADING = false - }catch (e) { + } catch (e) { this.LOADING = false } }, @@ -156,6 +157,14 @@ }) return } + + // 如果是从其他页面跳转过来的 + if (this.from) { + uni.$emit(this.from, this.chosedAgentId) + uni.navigateBack() + return + } + const that = this; this.$u.post("customer/daitiReception", { agentId: that.chosedAgentId, @@ -209,19 +218,6 @@ uni.hideLoading(); }); }, - getFreeList() { - this.$u.get("/zkAgentPool/freeList?itemId=" + this.buildingID).then(res => { - this.LOADING = false - if (res.length == 0) { - this.freeList = [] - } else { - this.freeList = res; - this.textcdhSKJ = res[0].name - } - }).catch(e => { - this.LOADING = false - }) - }, radioChange(evt) { this.chosedAgentId = ''; this.chosedAgentId = evt.detail.value; diff --git a/utils/domain.js b/utils/domain.js index 39d0d4a..3dd5e94 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,8 +1,8 @@ // http.js使用域名 // const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地 -// const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 -const baseUrl = 'http://192.168.31.149:9090/api'; // 盛浩 +const baseUrl = 'http://192.168.31.169:8080/autoSR/api'; // 长龙 +// const baseUrl = 'http://192.168.31.149:9090/api'; // 盛浩 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 // const baseUrl = 'https://xitong.pachira.cn/api'; // AI营销辅助 普强使用 From 0519c75793dcff494d353098afddcddd1a13f491 Mon Sep 17 00:00:00 2001 From: corala <18339694416@163.com> Date: Wed, 27 Jul 2022 14:29:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/center/consumer/consumerDetail.vue | 4 ++-- pages/mine/details2.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/center/consumer/consumerDetail.vue b/pages/center/consumer/consumerDetail.vue index 6f154e0..393fe05 100644 --- a/pages/center/consumer/consumerDetail.vue +++ b/pages/center/consumer/consumerDetail.vue @@ -518,12 +518,12 @@ if (res[0].merge == 0) { let newobj = res[0]; uni.navigateTo({ - url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"2"}` + url: `/pages/mine/details2?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=2&wordFraction=${this.customerInfo.wordFraction}` }) } else { let newobj = res[0]; uni.navigateTo({ - url: `/pages/mine/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=${"1"}` + url: `/pages/mine/details?customerId=${newobj.customerId}&status=${newobj.status}&stateisshow=1&wordFraction=${this.customerInfo.wordFraction}` }) } }) diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index f63e48d..daa7711 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -634,7 +634,7 @@ this.status = options.status; this.customerId = options.customerId; - this.KeyWordsfraction = options.wordFraction||0; + this.KeyWordsfraction = options.wordFraction=='undefined'?options.wordFraction:0; this.itemobj = uni.getStorageSync('searchobj'); console.log(this.itemobj) this.stateisshow = options.stateisshow;