From 1cb780b1762c62751c7f5f26132f3a7aa4ef3e2f Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期四, 23 三月 2023 16:45:30 +0800
Subject: [PATCH] 微信登录修改，呼叫客服功能（完成）
---
api/publicInterface.js | 2
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 46 ++++----
pages/login/userPassword.vue | 27 ++--
pages/driver-page/appointment/appointment.vue | 2
api/globalApi.js | 6 +
pages/login/login.vue | 39 +------
api/request.js | 4
pages.json | 2
utils/status.config.js | 3
pages/tabbar-page/index-tabbar/index-tabbar.vue | 19 +++
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 135 +++++++++++++++++++++-----
utils/status.js | 6
12 files changed, 188 insertions(+), 103 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index ab1cbff..0cc3752 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -262,5 +262,11 @@
coalDayPage: {
url: "/wrzs/tmtaskcoallog/getTmId",
method: 'GET'
+ },
+
+ // 鑾峰彇openId
+ getCallOutList:{
+ url:'/wrzs/callout/getCallOutList',
+ method:'GET'
}
}
diff --git a/api/publicInterface.js b/api/publicInterface.js
index eb43d49..bba27cf 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -4,7 +4,7 @@
// const BaseUrl = "http://192.168.3.159:9999/";
import {BaseUrl as wrBaseUrl} from '@/api/request.js'
// const BaseUrl = "http://192.168.0.120:9999"
-const BaseUrl = "http://192.168.110.82:9999"
+const BaseUrl = "http://192.168.3.109:9999"
// 鐧诲綍
// function apiLogin({
diff --git a/api/request.js b/api/request.js
index e71aba2..ed6e018 100644
--- a/api/request.js
+++ b/api/request.js
@@ -80,8 +80,8 @@
// const BaseUrl = "http://192.168.0.120:9997"
// const webSocketUrl = "ws://192.168.0.120:9997/wrzs/ws/info"
-const BaseUrl = "http://192.168.110.82:9997";
-const webSocketUrl = "ws://192.168.110.82:9997/wrzs/ws/info"
+const BaseUrl = "http://192.168.3.109:9997";
+const webSocketUrl = "ws://192.168.3.109:9997/wrzs/ws/info"
// 璇锋眰鎷︽埅
const fetch = (url, opt) => {
diff --git a/pages.json b/pages.json
index da8e598..2d780f8 100644
--- a/pages.json
+++ b/pages.json
@@ -115,7 +115,7 @@
}, {
"path": "pages/driver-page/appointment/appointment",
"style": {
- "navigationBarTitleText": "棰勭害",
+ "navigationBarTitleText": "鏃舵",
"enablePullDownRefresh": false
}
diff --git a/pages/driver-page/appointment/appointment.vue b/pages/driver-page/appointment/appointment.vue
index 987df15..791699b 100644
--- a/pages/driver-page/appointment/appointment.vue
+++ b/pages/driver-page/appointment/appointment.vue
@@ -13,7 +13,7 @@
<uni-td align="center">{{ (item.startTime || '') + '-' + (item.endTime || '') }}</uni-td>
<uni-td align="center">{{ item.carNum || '' }}</uni-td>
<uni-td align="center">{{ item.carNum1 || '' }}</uni-td>
- <uni-td><u-button text="棰勭害" type="primary" :disabled="item.carNum == item.carNum1" @click="yuYueBtnClick(item)"></u-button></uni-td>
+ <uni-td><u-button text="閫夋嫨" type="primary" :disabled="item.carNum == item.carNum1" @click="yuYueBtnClick(item)"></u-button></uni-td>
</uni-tr>
</uni-table>
</view>
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index d03e6e0..0fbcc08 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -2,32 +2,34 @@
<view class="bill-of-lading-details">
<view class="bangDanMessage">
<view class="">
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'瀹㈡埛锛�' + coalDetailsData.customerName"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐭垮巶锛�' + coalDetailsData.deptName"></u--text>
+ <text>瀹㈡埛锛歿{ coalDetailsData.customerName }}</text>
+ <text>鐭垮巶锛歿{ coalDetailsData.deptName }}</text>
</view>
<view class="">
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐨噸锛�' + coalDetailsData.skin"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'姣涢噸锛�' + coalDetailsData.hair"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鍑�閲嶏細' + coalDetailsData.clean"></u--text>
+ <text>鐨噸锛歿{ coalDetailsData.skin }}</text>
+ <text>姣涢噸锛歿{ coalDetailsData.hair }}</text>
+ <text>鍑�閲嶏細{{ coalDetailsData.clean }}</text>
</view>
<view class="">
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'纾呭崟绫诲瀷锛�' + coalDetailsData.orderTye"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐘舵�侊細' + coalStatus[coalDetailsData.status]"></u--text>
+ <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderTye }}</text>
+ <text>鐘舵�侊細{{ coalStatus[coalDetailsData.status] }}</text>
</view>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐓ゅ満锛�' + coalDetailsData.filedName"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鍙戣繍鏃堕棿锛�' + coalDetailsData.sendDate"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鎻愮叅鍗曠紪鍙凤細' + coalDetailsData.code"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'璁㈠崟缂栧彿锛�' + coalDetailsData.orderCode"></u--text>
+ <view class="">
+ <text>鐓ゅ満锛歿{ coalDetailsData.filedName }}</text>
+ <text>鍙戣繍鏃堕棿锛歿{ coalDetailsData.sendDate }}</text>
+ <text>鎻愮叅鍗曠紪鍙凤細{{ coalDetailsData.code }}</text>
+ <text>璁㈠崟缂栧彿锛歿{ coalDetailsData.orderCode }}</text>
+ </view>
</view>
<view class="timeLine" style="font-size: 16rpx;">
- <u--text type="primary" size="30" plain text="涓昏壊" v-for="(item, index) in dayRZ" :key="index" :text="item.taskStatusDes"></u--text>
+ <u--text type="primary" size="30" plain v-for="(item, index) in dayRZ" :key="index" :text="item.taskStatusDes"></u--text>
</view>
<view class="utilsBox">
<view class="utils_chil utils_chilTop">
<u-button text="绛惧埌" type="primary" plain @click="arriveClick"></u-button>
<u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick"></u-button>
<u-button text="鏀剧┖" type="primary" plain></u-button>
- <u-button text="鍛煎彨瀹㈡湇" type="primary" plain></u-button>
+ <u-button text="鍛煎彨瀹㈡湇" type="primary" plain @click="callCustomerService"></u-button>
</view>
<view class="utils_chil"><u-button text="灞曠ず鎻愮叅鍗�" @click="showCaolPickUpBill" type="primary"></u-button></view>
<view class="utils_chil"><u-button text="涓婄璁￠噺" @click="cengZhongClick" type="primary"></u-button></view>
@@ -38,11 +40,11 @@
<script>
export default {
onLoad(value) {
- console.log('椤甸潰鍔犺浇', value);
if (value.orderPlanId && value.yyId) {
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
}
+ // wx.startRecord();
},
data() {
return {
@@ -50,18 +52,29 @@
yyId: null,
dayRZ: [],
coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
+ // 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
- // 鑾峰彇鎵�鍦ㄧ鎴�
deptId: '',
filedId: '',
tmId: '',
tmCode: '',
carNo: ''
},
+ // 鑾峰彇鍏ュ満鐢宠鐨勫垪琛ㄩ〉闈㈠弬鏁�
getYuYueDataParams: {
deptId: '',
filedId: '',
sendDate: ''
+ },
+ // 鑾峰彇瀹㈡湇openid鍙傛暟
+ getServiceOpenid: {
+ deptId: '',
+ filedId: ''
+ },
+ // 瀹㈡湇淇℃伅
+ serviceInfoObj: {
+ openId: null,
+ openName: ''
},
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] // 鐘舵��
};
@@ -70,8 +83,8 @@
this.init();
},
computed: {
- userName() {
- return uni.getStorageSync('username');
+ name() {
+ return uni.getStorageSync('name');
},
openid() {
return uni.getStorageSync('openid');
@@ -79,8 +92,23 @@
},
methods: {
init() {
- this.coalDayPage();
- this.getTakeCoal();
+ this.coalDayPage(); //鑾峰彇鏃ュ織
+ this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getgetService(); //鑾峰彇瀹㈡湇
+ },
+ // 鑾峰彇瀹㈡湇openid
+ getgetService() {
+ this.$reqGet('getCallOutList', this.getServiceOpenid).then(res => {
+ console.log(res, '瀹㈡湇openid');
+ if (res.code != 0) {
+ this.$u.toast('鑾峰彇瀹㈡湇淇℃伅澶辫触');
+ } else {
+ if (res.data.length > 0) {
+ this.serviceInfoObj.openId = res.data[0].openId;
+ this.serviceInfoObj.openName = res.data[0].openName;
+ }
+ }
+ });
},
// 鑾峰彇鎻愮叅鍗曡鎯�
getTakeCoal() {
@@ -97,6 +125,9 @@
this.getYuYueDataParams.deptId = this.coalDetailsData.deptId;
this.getYuYueDataParams.filedId = this.coalDetailsData.filedId;
this.getYuYueDataParams.sendDate = this.coalDetailsData.sendDate;
+ // 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
+ this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
+ this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
}
});
},
@@ -130,12 +161,49 @@
},
// 鍛煎彨瀹㈡湇
callCustomerService() {
- wx.join1v1Chat({
- caller: { nickname: this.userName, openid: this.openid },
- listener: { nickname: '瀹㈡湇', openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
- backgroundType: 2,
- roomType: 'voice'
+ // if (!this.serviceInfoObj.openId) {
+ // this.$u.toast('鏃犲鏈嶄俊鎭�');
+ // }
+ wx.getSetting({
+ success(res) {
+ console.log('鎺堟潈success', res);
+ if (!res.authSetting['scope.camera'] || !res.authSetting['scope.record']) {
+ if (!res.authSetting['scope.camera']) {
+ uni.showToast({
+ title: '鏃犵浉鏈烘潈闄�'
+ });
+ } else if (!res.authSetting['scope.record']) {
+ uni.showToast({
+ title: '鏃犻害鍏嬮鏉冮檺'
+ });
+ }
+ } else {
+ wx.join1v1Chat({
+ caller: { nickname: uni.getStorageSync('name'), openid: uni.getStorageSync('openid') },
+ listener: { nickname: '浠樺欢浣�', openid: 'oZjXk5e7G9uIvOzaTO6nFV51ALwk' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
+ backgroundType: 2,
+ roomType: 'voice',
+ success() {
+ console.log('涓�瀵逛竴鎴愬姛');
+ },
+ fail(err) {
+ console.log('涓�瀵逛竴澶辫触', err);
+ }
+ });
+ }
+ },
+ fail() {
+ console.log('鑾峰彇澶辫触');
+ }
});
+ },
+ calling() {
+ // wx.join1v1Chat({
+ // caller: { nickname: this.name, openid: this.openid }, //oZjXk5RRmbroAfl1m5aZ6hRNvqh4
+ // listener: { nickname: this.serviceInfoObj.openName, openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
+ // backgroundType: 2,
+ // roomType: 'voice'
+ // });
},
// 绉伴噸
cengZhongClick() {
@@ -164,14 +232,14 @@
display: flex;
flex-direction: column;
.bangDanMessage {
- padding:vww(10);
+ padding: vww(10);
border: vww(2) solid #dddddd;
border-radius: vww(20);
margin: vww(20);
margin-bottom: vww(10);
height: 40%;
- box-sizing: border-box;
- overflow-y: overlay; //琛屼负涓� auto 鐩稿悓锛屼絾鏄粴鍔ㄦ潯缁樺埗鍦ㄥ唴瀹逛箣涓婏紝鑰屼笉鏄崰鎹┖闂淬��
+ font-size:vww(16);
+ font-weight: 500;
.u-text {
margin-bottom: vww(5) !important;
}
@@ -180,12 +248,25 @@
}
view:nth-of-type(1) {
display: flex;
+ text{
+ width:50%;
+ }
}
view:nth-of-type(2) {
display: flex;
+ text{
+ width:33%;
+ }
}
view:nth-of-type(3) {
display: flex;
+ text{
+ width:50%;
+ }
+ }
+ view:nth-of-type(4){
+ display:flex;
+ flex-direction: column;
}
}
.timeLine {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index b33e955..b9a1b3b 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -90,29 +90,29 @@
// pingMessage: JSON.stringify({ type: 'ping' }) // 蹇冭烦璇锋眰淇℃伅
// }
// 涓存椂绉伴噸瀵硅薄
- temporaryWeighObj:{
- skin:0,
- hair:0,
- clean:0
+ temporaryWeighObj: {
+ skin: 0,
+ hair: 0,
+ clean: 0
},
- infraredStatus:false// 绾㈠鐘舵��
+ infraredStatus: false // 绾㈠鐘舵��
};
},
- watch:{
- realTimeWeigh(newV,oldV){
- if(this.weighList.orderTye == '澶栭攢'){
- if(this.weighList.skin == 0){
- this.temporaryWeighObj.skin = this.realTimeWeigh
+ watch: {
+ realTimeWeigh(newV, oldV) {
+ if (this.weighList.orderTye == '澶栭攢') {
+ if (this.weighList.skin == 0) {
+ this.temporaryWeighObj.skin = this.realTimeWeigh;
} else {
- this.temporaryWeighObj.hair = this.realTimeWeigh
- this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin
+ this.temporaryWeighObj.hair = this.realTimeWeigh;
+ this.temporaryWeighObj.clean = this.temporaryWeighObj.hair - this.weighList.skin;
}
- } else if(this.weighList.orderTye == '澶栬喘'){
- if(this.weighList.hair == 0){
- this.temporaryWeighObj.hair = this.realTimeWeigh
+ } else if (this.weighList.orderTye == '澶栬喘') {
+ if (this.weighList.hair == 0) {
+ this.temporaryWeighObj.hair = this.realTimeWeigh;
} else {
- this.temporaryWeighObj.skin = this.realTimeWeigh
- this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin
+ this.temporaryWeighObj.skin = this.realTimeWeigh;
+ this.temporaryWeighObj = this.weighList.hair - this.temporaryWeighObj.skin;
}
}
}
@@ -134,7 +134,7 @@
return false;
}
}
- },
+ }
},
methods: {
init() {
@@ -227,13 +227,13 @@
// 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
socket.onMessage(res => {
console.log('socketWeigh', res);
- let nowWeighObj = JSON.parse(res.data.slice(7))
+ let nowWeighObj = JSON.parse(res.data.slice(7));
if (nowWeighObj.eqCode == this.weighHouseCode) {
- if(nowWeighObj.eqInfraredStatus){
- this.infraredStatus = true
+ if (nowWeighObj.eqInfraredStatus) {
+ this.infraredStatus = true;
this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
- }else{
- this.infraredStatus = false
+ } else {
+ this.infraredStatus = false;
this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
}
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 7a3b0b5..944adea 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,7 +2,7 @@
<view class="login">
<view class="logo">鏃犱汉鍊煎畧</view>
<!--鐢ㄦ埛鍚嶅瘑鐮佺櫥褰�-->
- <user-password :btnText='0'/>
+ <user-password :btnText="0" />
<!-- 寰俊openid鐧诲綍 -->
<view class="loginBtn">
<u-button class="button" @click.stop="beforeLoginEvent" :disabled="btnLoading" :loading="btnLoading" type="primary" text="寰俊涓�閿櫥褰�"></u-button>
@@ -39,7 +39,6 @@
export default {
data() {
return {
- wxcode: '', // 鍙告満1
btnLoading: false,
loginPopupShow: false,
// 缁戝畾寰俊妯℃�佹
@@ -62,8 +61,7 @@
uni.login({
success: res => {
if (res.code) {
- this.wxcode = res.code;
- this.apiLogin();
+ this.apiLogin(res.code);
} else {
uni.showToast({
title: '寰俊鐧诲綍澶辫触锛�',
@@ -74,37 +72,18 @@
});
},
// 鐧诲綍鎺ュ彛
- apiLogin() {
- // apiLoginWx({ code: this.wxcode })
- // .then(res => {
- // console.log('璇锋眰鐧诲綍', res);
- // if (res.msg == '闇�缁戝畾') {
- // uni.navigateTo({
- // url: `/pages/register/register?code=${res.data}`
- // });
- // }
- // if (res.msg == '鐧诲綍鎴愬姛') {
- // uni.setStorageSync('userInfo', res.data);
- // this.setUserTabbar(res.data.type);
- // uni.switchTab({
- // url: '/pages/tabbar-page/index-tabbar/index-tabbar'
- // });
- // }
- // })
- // .catch(err => {
- // console.log('閿欒', err);
- // });
-
+ apiLogin(code) {
/**
* @openid
* 鑾峰彇寰俊鐢ㄦ埛openid,寰俊涓�閿櫥褰曟殏鏃犵浉鍏虫帴鍙ｏ紝鐢ㄤ簬娴嬭瘯鍛煎彨瀹㈡湇鍔熻兘
*/
-
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
wx.request({
- url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${this.wxcode}&grant_type=authorization_code`,
+ url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx4a62fc1684c429a9&secret=ee90afe376cdcec2fdd947c0a4db961a&js_code=${code}&grant_type=authorization_code`,
success(res) {
- let id = res.data.openid;
- uni.setStorageSync('openid', id);
+ uni.setStorageSync('openid', res.data.openid);
uni.showToast({
title: '鎴愬姛鑾峰彇娴嬭瘯openid',
icon: 'none'
@@ -113,6 +92,7 @@
});
this.$nextTick(() => {
apiLoginWx({ code: uni.getStorageSync('openid') }).then(res => {
+ uni.hideLoading();
if (res.code != 1) {
this.$u.toast('鎭枩鎮紝鐧诲綍鎴愬姛锛�');
// 鐧婚檰鎴愬姛锛屽瓨鍌ㄧ浉鍏充俊鎭�
@@ -135,7 +115,6 @@
}
});
});
-
this.loginPopupShow = false;
},
bindWxConfirm() {
diff --git a/pages/login/userPassword.vue b/pages/login/userPassword.vue
index f21222d..053900f 100644
--- a/pages/login/userPassword.vue
+++ b/pages/login/userPassword.vue
@@ -31,7 +31,7 @@
<script>
import { apiLoginPassword } from '@/api/publicInterface.js';
import { mapMutations } from 'vuex';
-import { setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
+import { setName, setToken, setRefreshToken, setUsernameKey, setCustomerId, redirectHome } from '@/utils/status.js';
export default {
name: 'userPassword',
props: {
@@ -44,7 +44,7 @@
data() {
return {
// username: '12222222222', // 瀹㈡埛
- username: '13333333332',// 鍙告満
+ username: '13333333332', // 鍙告満
password: '123456',
remember: true,
baseUrl: ''
@@ -90,6 +90,7 @@
this.setUserTabbar(res.data.type);
uni.setStorageSync('roleType', res.data.type);
setCustomerId(res.data.customerid);
+ setName(res.name);
uni.hideLoading();
//璺宠浆椤甸潰
this.$nextTick(() => {
@@ -105,18 +106,16 @@
this.$u.toast(res.msg);
}
} else {
- this.$nextTick(() => {
- this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('code') }, 'params').then(res => {
- uni.hideLoading();
- if (res.code == 0) {
- this.$u.toast('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
- setTimeout(() => {
- uni.navigateBack();
- }, 1000);
- } else {
- this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
- }
- });
+ this.$reqPost('wxBind', { state: 'MINI', code: uni.getStorageSync('openid') }, 'params').then(res => {
+ uni.hideLoading();
+ if (res.code == 0) {
+ this.$u.toast('缁戝畾鎴愬姛锛佸嵆灏嗗洖鍒扮櫥褰曢〉锛�');
+ setTimeout(() => {
+ uni.navigateBack();
+ }, 1000);
+ } else {
+ this.$u.toast(res.msg ? res.msg : '缁戝畾澶辫触');
+ }
});
}
})
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 1704840..aa804f7 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -18,6 +18,23 @@
driverIndex,
freightForwarderIndex
},
+ onLoad(){
+ // 寮�鍚弻浜洪�氳瘽
+ wx.setEnable1v1Chat({
+ enable: true,
+ backgroundType: 1,
+ minWindowType:2,
+ success() {
+ console.log('寮�鍚弻浜洪�氳瘽鎴愬姛');
+ },
+ fail() {
+ console.log('寮�鍚弻浜洪�氳瘽澶辫触');
+ },
+ complete() {
+ console.log('寮�鍚弻浜洪�氳瘽鎴愬姛Complete');
+ }
+ });
+ },
data() {
return {
roleType: null
@@ -57,7 +74,7 @@
userAuthorization() {
wx.getSetting({
success(res) {
- wx.startRecord();
+ // wx.startRecord();
console.log('success');
if (!res.authSetting['scope.record'] || !res.authSetting['scope.camera']) {
if (!res.authSetting['scope.camera']) {
diff --git a/utils/status.config.js b/utils/status.config.js
index 4c5f903..820027e 100644
--- a/utils/status.config.js
+++ b/utils/status.config.js
@@ -5,4 +5,5 @@
export const UserTabbar = 'userTabbar';
export const FailRedirect = '/pages/login/login';
export const SuccessRedirect = '/pages/tabbar-page/index-tabbar/index-tabbar';
-export const customerIdKey = 'customerId';
\ No newline at end of file
+export const customerIdKey = 'customerId';
+export const nameKey = 'name';
\ No newline at end of file
diff --git a/utils/status.js b/utils/status.js
index 0777b0f..08ae5c6 100644
--- a/utils/status.js
+++ b/utils/status.js
@@ -4,7 +4,8 @@
UsernameKey,
SuccessRedirect,
FailRedirect,
- customerIdKey
+ customerIdKey,
+ nameKey
} from './status.config.js';
const SetStorage = (key) => (value) => uni.setStorageSync(key, value);
@@ -12,7 +13,8 @@
export const setToken = SetStorage(TokenKey);
export const setRefreshToken = SetStorage(RefreshToken);
export const setUsernameKey = SetStorage(UsernameKey);
-export const setCustomerId = SetStorage(customerIdKey)
+export const setCustomerId = SetStorage(customerIdKey);
+export const setName = SetStorage(nameKey)
export const redirectHome = (path) => {
uni.switchTab({
url: path || SuccessRedirect
--
Gitblit v1.9.1