提交合并

pages/login/index.vue

@@ -8,15 +8,15 @@
 				<view class="cwjs-item center">
 					<image src="https://qufang.oss-cn-beijing.aliyuncs.com/channelHelper/user.png" class="logo_input">
 					</image>
-					<input class="cwjs-item cwjs-input" v-model="username"  placeholder="请输入账号名"  type="number" maxlength="11" placeholder-style="color:#AAAAAA"/>
+					<input class="cwjs-item cwjs-input" style="font-size: 36rpx;" v-model="username"  placeholder="请输入账号名"  type="number" maxlength="11" placeholder-style="color:#AAAAAA"/>
 				</view>
 			</view>
 			<view class="cwjs-cells item-flex" style="margin-top:13rpx;">
 				<view class="cwjs-item center">
 					<image src="https://qufang.oss-cn-beijing.aliyuncs.com/channelHelper/lock.png" class="logo_input">
 					</image>
-					<input class="cwjs-item cwjs-input" placeholder="请输入密码" placeholder-style="color:#AAAAAA" type="password" v-model="password" maxlength="16" v-if="passwordType"/>
-					<input class="cwjs-item cwjs-input" placeholder="请输入密码" placeholder-style="color:#AAAAAA" maxlength="16" v-model="password" v-else/>
+					<input class="cwjs-item cwjs-input" style="font-size: 36rpx;" placeholder="请输入密码" placeholder-style="color:#AAAAAA" type="password" v-model="password" maxlength="16" v-if="passwordType"/>
+					<input class="cwjs-item cwjs-input" style="font-size: 36rpx;" placeholder="请输入密码" placeholder-style="color:#AAAAAA" maxlength="16" v-model="password" v-else/>
 				</view>
 				<view class="imagesBox" @tap="changeBindPassword">
 					<image v-if="passwordType==false" src="../../static/images/zhengkai.png" class="images" mode="scaleToFill"></image>

pages/mine/reception/consultant.vue

@@ -22,7 +22,8 @@
 						</view>
 						<view class="text">
 							<view class="name">
-								{{item.name}}
+								<text class="names">{{item.name}}</text>
+								<text :class="item.class">{{ item.label }}</text>
 							</view>
 							<view class="num">
 								今日接待: {{item.todayNum}}
@@ -142,6 +143,19 @@
 							this.current = res.findIndex(item => item.agentId == this.customerId)
 						}
 						this.freeList = res;
+						
+						this.freeList.forEach(item => {
+							if (item.onLine == 0) {
+								item.label = "(离线)";
+								item.class = 'red'
+							} else if (item.onLine == 1) {
+								item.label = "(在线)";
+								item.class = 'gren'
+							} else {
+								item.label = "(无设备)";
+								item.class = 'none'
+							}
+						})
 						this.textcdhSKJ = res[0].name
 					}
 					this.LOADING = false
@@ -307,10 +321,31 @@
 					.text {
 						.name {
 							margin-top: 4rpx;
-							font-weight: 600;
-							color: #333333;
-							line-height: 30rpx;
 							margin-bottom: 24rpx;
+							line-height: 30rpx;
+							
+							.names {
+								font-weight: 600;
+								color: #333333;
+							}
+							
+							.red {
+								margin-left: 10rpx;
+								color: #E7483C;
+								font-size: 28rpx;
+							}
+							
+							.gren {
+								margin-left: 10rpx;
+								color: #43CD80;
+								font-size: 28rpx;
+							}
+							
+							.none {
+								margin-left: 10rpx;
+								color: #999;
+								font-size: 28rpx;
+							}
 						}
 
 					}

pages/reportExcel/dayReport.vue

@@ -454,7 +454,9 @@
 				}
 				if (this.weekObj.ZXLTopList && this.weekObj.ZXLTopList.length > 0) {
 					this.consultant = this.weekObj.ZXLTopList.reverse().slice(0, 3)
-					this.lowest.push(this.weekObj.ZXLTopList[this.weekObj.ZXLTopList.length - 1])
+					if (this.weekObj.ZXLTopList[this.weekObj.ZXLTopList.length - 1].value != 100) {
+						this.lowest.push(this.weekObj.ZXLTopList[this.weekObj.ZXLTopList.length - 1])
+					}
 				}
 				if (this.weekObj.avgJdsList && this.weekObj.avgJdsList.length > 0) {
 					this.recording = this.weekObj.avgJdsList.reverse().slice(0, 3)

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.149:9090/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营销辅助 普强使用