Browse Source

Merge branch 'master' into message

message
douzhuo 2 years ago
parent
commit
01b73a311c
4 changed files with 39 additions and 56 deletions
  1. +2
    -2
      manifest.json
  2. +7
    -46
      pages/index/customer.vue
  3. +28
    -6
      pages/mine/reception/addreception.vue
  4. +2
    -2
      utils/domain.js

+ 2
- 2
manifest.json View File

@@ -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,


+ 7
- 46
pages/index/customer.vue View File

@@ -136,11 +136,11 @@
</view>
</view>
<view class="footer-button" v-if="item.status!=0">
<view v-if="permissions.commonly3" class="footer1" @click.stop="addTime(item)">接待延时</view>
<view v-if="permissions.commonly4" class="footer1" @click.stop="assign(item)">重新指派</view>
<view v-if="permissions.commonly4" class="footer1" @click.stop="addTime(item)">接待延时</view>
<view v-if="permissions.commonly3" class="footer1" @click.stop="assign(item)">重新指派</view>
<view v-if="permissions.commonly5" class="footer3" @click.stop="changeEnd(item.id)">结束接待</view>
</view>
<view class="footer-button" v-if="item.status==0">
<view class="footer-button" v-if="item.status==0 && permissions.commonly3">
<view class="footer3" @click.stop="assign(item)">指派顾问</view>
</view>
</view>
@@ -361,47 +361,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}`
@@ -554,7 +516,7 @@
}

.footer-button {
// margin-top: 30rpx;
padding: 0 30rpx;
width: 100%;
height: 108rpx;
display: flex;
@@ -591,7 +553,6 @@
border-radius: 30rpx;
border: 1px solid #999999;
margin-left: 30rpx;
margin-right: 30rpx;
}
}
}


+ 28
- 6
pages/mine/reception/addreception.vue View File

@@ -54,13 +54,12 @@
</view>

</view>
<view class="Pinspeak" v-if="isShow">顾问</view>
<view class="chented" v-if="isShow" @click="clickShowhid()">
<view class="Pinspeak">顾问</view>
<view class="chented" @click="clickShowhid()">
<view class="title" style="border: none;">
<view class="titletext">接待顾问</view>
<view class="titletext2"
style="font-size: 30rpx;font-weight: 400;color: #B2B2B2;line-height: 110rpx;padding-left: 10rpx;">
<!-- {{text || '请选择接待顾问'}} -->
<text v-if="text" style="color: #333333;">{{text}}</text>
<text v-else>请选择接待顾问</text>
</view>
@@ -70,8 +69,8 @@
</view>
</view>
<view class="clive" @click="$noMultipleClicks(save)">确定</view>
<u-select :mask-close-able="false" v-model="Showhiddenunits" mode="single-column" :list="list"
@cancel="cancel" @confirm="confirm"></u-select>
<u-select :mask-close-able="false" v-model="Showhiddenunits" mode="single-column" :list="list" @cancel="cancel"
@confirm="confirm"></u-select>
<u-select :mask-close-able="false" v-model="Showhid" mode="single-column" :list="freeList" @cancel="cancel1"
@confirm="confirm1"></u-select>
<u-modal v-model="show" :mask-close-able="true" :title="'代接待提醒'" :confirm-text="confirmtext"
@@ -120,6 +119,7 @@
daitiReceptionobj: {},
isShow: false, // 默认隐藏该权限
userInfo: {}, // 用户信息
isPass: false, // 当前顾问是否正在接待
};
},
onLoad() {
@@ -155,6 +155,16 @@
this.baochunfun()
},
save() {
// 校验当前登录人是否是顾问
let obj = this.freeList.find(item => {
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",
@@ -176,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,
@@ -251,7 +269,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) {


+ 2
- 2
utils/domain.js View File

@@ -1,9 +1,9 @@
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.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`;


Loading…
Cancel
Save