cyl/master-0822
wangxia 3 months ago
parent f8ca3098f9
commit 5f4ab4dc7e

@ -1,25 +1,35 @@
<template> <template>
<view class="g-components-panel-fixed"> <view class="g-components-panel-fixed" :style="{ backgroundColor }" :class="[border ? 'g_border_e_t' : '']">
<slot></slot> <slot></slot>
</view> </view>
</template> </template>
<script> <script>
export default {
props: {
border: {
type: Boolean,
default: true,
},
backgroundColor: {
type: String,
default: "#fff",
},
},
};
</script> </script>
<style> <style>
.g-components-panel-fixed{ .g-components-panel-fixed {
position: fixed; position: fixed;
width: 100%; width: 100%;
bottom: 0; bottom: 0;
left: 0; left: 0;
background-color: #fff; padding-top: 12px;
padding-top: 12px; padding-bottom: calc(constant(safe-area-inset-bottom)); /*兼容 IOS<11.2*/
padding-bottom: calc(constant(safe-area-inset-bottom)); /*兼容 IOS<11.2*/ padding-bottom: calc(env(safe-area-inset-bottom)); /*兼容 IOS>11.2*/
padding-bottom: calc(env(safe-area-inset-bottom)); /*兼容 IOS>11.2*/ min-height: 72px;
min-height:72px; z-index: 999;
border-top: 1rpx solid #eee; box-sizing: border-box;
z-index: 999; }
box-sizing: border-box;
}
</style> </style>

@ -9,9 +9,9 @@
<switch :checked="isInBlacklist" @change="(checked) => handleSwitchChange(checked)" /> <switch :checked="isInBlacklist" @change="(checked) => handleSwitchChange(checked)" />
</div> </div>
<div class="userInfo-item"> <div class="userInfo-item">
<div class="item-left">{{ "客服手机号" }}</div> <div class="item-left">{{ "手机号" }}</div>
<div class="g_flex_row_end" @click="takeTel"> <div class="g_flex_row_end" @click="takeTel">
<div class="">{{ userInfo.tel || '-' }}</div> <div class="">{{ tel || "-" }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -93,6 +93,7 @@ import Icon from "../../../components/Icon.vue";
import G from "../../../../../utils/ajax.js"; import G from "../../../../../utils/ajax.js";
const userInfo = ref<V2NIMUser>(); const userInfo = ref<V2NIMUser>();
const tel = ref();
const relation = ref<Relation>("stranger"); const relation = ref<Relation>("stranger");
const isInBlacklist = ref(false); const isInBlacklist = ref(false);
@ -122,12 +123,12 @@ onLoad((props) => {
console.log(G, "123131231231232"); console.log(G, "123131231231232");
G.Post("/wyyx/user/findUser", { accid: userInfo.value.accountId }, (res) => { G.Post("/wyyx/user/findUser", { accid: userInfo.value.accountId }, (res) => {
console.log("resresresresresres", res); console.log("resresresresresres", res);
userInfo.value.tel = res.data.tel; tel.value = res.data.tel;
}); });
}); });
function takeTel() { function takeTel() {
uni.makePhoneCall({ uni.makePhoneCall({
phoneNumber: userInfo.value.tel, phoneNumber: tel,
}); });
} }
const handleSwitchChange = async (e: any) => { const handleSwitchChange = async (e: any) => {

@ -377,18 +377,18 @@
<view class="g_flex_column_center flex_center g_mr_12" @click="getServiceInfo({ type: 'tel' })"> <i class="iconfont icon-phone g_c_main"></i><view class="g_fs_12 g_c_6 g_mt_4">电话客服</view> </view> <view class="g_flex_column_center flex_center g_mr_12" @click="getServiceInfo({ type: 'tel' })"> <i class="iconfont icon-phone g_c_main"></i><view class="g_fs_12 g_c_6 g_mt_4">电话客服</view> </view>
<view class="g_flex_row_between flex_center g_flex_1"> <view class="g_flex_row_between flex_center g_flex_1">
<view class="g_flex_1 g_mr_12" v-if="orderDetail.downAgencyId && orderDetail.downAgencyId != agencyId"> <view class="g_flex_1 g_mr_12" v-if="orderDetail.downAgencyId && orderDetail.downAgencyId != agencyId">
<g-button @clickBtn="getServiceInfo({ type: 'im', info: 'up' })" size="auto" btnText="下游客服" type="primary" ></g-button> <g-button @clickBtn="getServiceInfo({ type: 'im', info: 'up' })" size="auto" btnText="下游客服" type="primary"></g-button>
</view> </view>
<view class="g_flex_1" v-if="orderDetail.upAgencyId && orderDetail.upAgencyId != agencyId"> <view class="g_flex_1" v-if="orderDetail.upAgencyId && orderDetail.upAgencyId != agencyId">
<g-button @clickBtn="getServiceInfo({ type: 'im', info: 'down' })" size="auto" btnText="上游客服" type="primary" ></g-button> <g-button @clickBtn="getServiceInfo({ type: 'im', info: 'down' })" size="auto" btnText="上游客服" type="primary"></g-button>
</view> </view>
</view> </view>
</view> </view>
</slot> </slot>
</g-panel-fixed> </g-panel-fixed>
<u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height="600px" :mask-close-able="true"> <!-- <u-popup v-model="shareModal.isShow" mode="bottom" border-radius="16" height="600px" :mask-close-able="true">
<mainPanel :showBg="true" :rid="rid" :oid="oid" :active="1" :name="orderDetail.userName" :job="orderDetail.storeJobName" :recommendList="recommendList[0]" /> <mainPanel :showBg="true" :rid="rid" :oid="oid" :active="1" :name="orderDetail.userName" :job="orderDetail.storeJobName" :recommendList="recommendList[0]" />
</u-popup> </u-popup> -->
</view> </view>
</template> </template>
@ -1155,7 +1155,7 @@ export default {
return false; return false;
} }
that.goImLoading = true; that.goImLoading = true;
that.F.wyyxGet(that.api.job_get_agency_cus + "?agencyId=" + val.info == "up" ? that.orderDetail.upAgencyId : that.orderDetail.downAgencyId, {}, (cusData) => { that.F.wyyxGet(that.api.job_get_agency_cus + "?agencyId=" + (val.info == "up" ? that.orderDetail.upAgencyId : that.orderDetail.downAgencyId), {}, (cusData) => {
console.log("cusDatacusDatacusDatacusData", cusData); console.log("cusDatacusDatacusDatacusData", cusData);
if (val.type == "im") { if (val.type == "im") {
that.goIm(cusData); that.goIm(cusData);
@ -1183,6 +1183,7 @@ export default {
receiverAccid: cusData.accid, receiverAccid: cusData.accid,
}, },
(res) => { (res) => {
console.log("111111111111111111111111111111111", res);
uni.$UIKitStore.uiStore.selectConversation(res.conversationId); uni.$UIKitStore.uiStore.selectConversation(res.conversationId);
let params = { let params = {
工单信息: "", 工单信息: "",
@ -1200,6 +1201,7 @@ export default {
text: that.G.objToStr(params, "copy"), text: that.G.objToStr(params, "copy"),
}, },
(res) => { (res) => {
console.log("222222222222222222222222222222222", res);
uni.navigateTo({ uni.navigateTo({
url: "/root/NEUIKit/pages/Chat/index", url: "/root/NEUIKit/pages/Chat/index",
}); });

@ -84,7 +84,7 @@ export default {
icon: "success", icon: "success",
}); });
that.G.checkToken(); that.G.checkToken();
uni.setStorageSync("apply-avatar", res); uni.setStorageSync("apply-avatar", res.image);
setTimeout(() => { setTimeout(() => {
uni.navigateBack(); uni.navigateBack();
}, 1500); }, 1500);

@ -141,6 +141,7 @@ export default {
that.G.checkToken(); that.G.checkToken();
setTimeout(() => { setTimeout(() => {
uni.$emit("getBossAddress");
uni.navigateBack(); uni.navigateBack();
}, 1500); }, 1500);
} }
@ -151,7 +152,6 @@ export default {
this.info.value.address = e.address; this.info.value.address = e.address;
this.info.value.lat = e.lat; this.info.value.lat = e.lat;
this.info.value.lng = e.lng; this.info.value.lng = e.lng;
uni.$emit("getBossAddress", that.avatar);
}, },
}, },
}; };

@ -29,11 +29,11 @@
/> />
</view> --> </view> -->
</scroll-view> </scroll-view>
<g-panel-fixed> <g-panel-fixed backgroundColor="#ededed" :border="false">
<slot> <slot>
<view class="g_ml_10 g_mr_10 g_position_rela"> <view class="g_ml_10 g_mr_10 g_position_rela">
<div class="g_w_8 g_h_8 g_radius_50 g_bg_f0a g_position_abso" style="right: 50px; top: 0px" v-if="readed && readed > 0"></div> <div class="g_w_8 g_h_8 g_radius_50 g_bg_f0a g_position_abso" style="right: 50px; top: 0px" v-if="readed && readed > 0"></div>
<g-button btnText="合并团队" type="primary" size="default" @clickBtn="goMarge" /> <div class="g_text_c g_c_sub g_fs_14" @click="goMarge"></div>
</view> </view>
</slot> </slot>
</g-panel-fixed> </g-panel-fixed>

@ -66,7 +66,7 @@
@clickItem="handleClickItem" @clickItem="handleClickItem"
/> />
</view> </view>
<view class="g_mt_10 g_ml_10 g_mr_10"> <view class="g_mt_24 g_ml_10 g_mr_10">
<g-button btnText="切换团队" type="none" size="medium" @clickBtn="toChangeTeam" mode="square" /> <g-button btnText="切换团队" type="none" size="medium" @clickBtn="toChangeTeam" mode="square" />
<!-- <g-panel-form-item <!-- <g-panel-form-item
:list="[ :list="[
@ -81,7 +81,7 @@
@clickItem="handleClickItem" @clickItem="handleClickItem"
/> --> /> -->
</view> </view>
<view class="g_mt_24 g_ml_10 g_mr_10"> <view class="g_mt_10 g_ml_10 g_mr_10">
<g-button btnText="退出登录" type="delete" size="medium" @clickBtn="handleLayout" mode="square" /> <g-button btnText="退出登录" type="delete" size="medium" @clickBtn="handleLayout" mode="square" />
</view> </view>
<u-popup v-model="showTeamToggle" class="" mode="bottom" uZindex="9999" :closeable="true" border-radius="12" :mask-close-able="true"> <u-popup v-model="showTeamToggle" class="" mode="bottom" uZindex="9999" :closeable="true" border-radius="12" :mask-close-able="true">

Loading…
Cancel
Save