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 3540a0e..4315f91 100644
--- a/pages/mine/details2.vue
+++ b/pages/mine/details2.vue
@@ -29,7 +29,6 @@
-
@@ -652,7 +651,7 @@
this.status = options.status;
this.customerId = options.customerId;
- this.KeyWordsfraction = options.wordFraction || 0;
+ this.KeyWordsfraction = options.wordFraction == 'undefined' ? 0 : options.wordFraction;
this.itemobj = uni.getStorageSync('searchobj');
console.log(this.itemobj)
this.stateisshow = options.stateisshow;
@@ -666,7 +665,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 => {
@@ -733,8 +731,6 @@
item.checked = !item.checked
this.$forceUpdate()
},
-
-
// 隐藏长按提示框
cancelBeast() {
this.dialogList.forEach(res => {
diff --git a/pages/mine/reception/addreception.vue b/pages/mine/reception/addreception.vue
index f601956..ec3f0e0 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 c214041..83896bf 100644
--- a/pages/mine/reception/consultant.vue
+++ b/pages/mine/reception/consultant.vue
@@ -81,11 +81,13 @@
list: [], // 部门列表
listCurrent: 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;
@@ -103,7 +105,7 @@
searchFunc() {
},
-
+
async iniPage() {
await this.getAllDeptName()
await this.getFreeList();
@@ -134,11 +136,15 @@
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
}
},
@@ -170,6 +176,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,
diff --git a/utils/domain.js b/utils/domain.js
index 4b9822d..04967f5 100644
--- a/utils/domain.js
+++ b/utils/domain.js
@@ -1,9 +1,9 @@
// 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.149:9090/api'; // 盛浩
-const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式
+// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式
// const baseUrl = 'https://hfju.com/api'; // 数智正式
// const baseUrl = 'https://xitong.pachira.cn/api'; // AI营销辅助 普强使用