Merge branch 'master' of http://git.2weisou.com/liumin/NewZkgj into master

config.js

@@ -2,9 +2,9 @@
  * 小程序配置文件
  */
 // 此处主机域名修改成腾讯云解决方案分配的域名
-// var host = 'http://121.42.63.138:9091/autoSR/api'; // 测试站
+var host = 'http://121.42.63.138:9091/autoSR/api'; // 测试站
 // var host = 'http://192.168.31.163:8080/autoSR/api'; // 长龙
-var host = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪
+// var host = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪
 // var host = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏
 // var host = 'https://zkgj.quhouse.com/api'; // 质控正式
 // var host = 'https://hfju.com/api'; // 数智正式

pages/center/consumer/consumerDetail.vue

@@ -32,7 +32,7 @@
 						添加时间：<view class="content-sec-lab1">{{customerInfo.createTime}}</view>
 					</view>
 					<view class="content-sec-num">
-						<view class="">{{customerInfo.visitRecord}}次到访</view>
+						<view class="">{{customerInfo.visitRecord || '--'}}次到访</view>
 						<view class="">{{customerInfo.fraction || '0'}}% | {{customerInfo.fraction || '0'}}分</view>
 					</view>
 				</view>
@@ -74,12 +74,12 @@
 						<view class="content-sec">
 							<view class="left">
 								<view class="cus">客户：{{item.name || ''}} |</view>
-								<view class="arriveNum">{{item.visitRecord}}次到访</view>
+								<view class="arriveNum">{{item.visitRecord || '--'}}次到访</view>
 							</view>
 							<view class="right">{{item.fraction || '0'}}% | {{item.fraction || '0'}}分</view>
 						</view>
 						
-						<view class="content-last">{{item.createTime}} | 80分钟</view>
+						<view class="content-last">{{item.createTime}} | {{item.mm || '--'}}分钟</view>
 					</view>
 			</view>
 			<view class="tabactive2" v-if="activeTotal==1">

pages/center/consumer/index.vue

@@ -15,7 +15,15 @@
 		</view>
 
 		<view class="content">
-			<view class="content-tips" v-for="(item,index) in recordList" :key='index' @click="gotoDetail(item.id)">
+			<view v-if="recordList.length==0" style="width: 100%;height: 100%;display: flex;align-items: center;">
+				<view style="width: 100%;padding-top: 200rpx;">
+					<view style="width: 100%;text-align: center;">
+						<image style="width: 220rpx;height: 200rpx;" src="https://static.quhouse.com/zhikong_xcx_img/nodatalist.png" mode=""></image>
+					</view>
+					<view style="text-align: center;width: 100%;margin-top: 20rpx;color: #999999;">暂无数据</view>	
+				</view>
+			</view>
+			<view  v-if="recordList.length!=0" class="content-tips" v-for="(item,index) in recordList" :key='index' @click="gotoDetail(item.id)">
 				<view class="content-first">
 					<view class="left">
 						<view class="img">{{item.name.slice(0,1)}}</view>
@@ -33,7 +41,8 @@
 					</view>
 					<view class="content-sec-lab">
 						客户标签：
-						<!-- <view class="content-sec-tips" v-for="(che,ind) in item.demand.cusSemanticWords" :key='ind'>{{che.name}}</view> -->
+						<text v-if="item.demand.cusSemanticWordsList.length==0">暂无</text>
+						<view v-else class="content-sec-tips" v-for="(che,ind) in item.demand.cusSemanticWordsList" :key='ind'>{{che.name}}</view>
 						
 					</view>
 					<view class="content-sec-lab">
@@ -43,7 +52,7 @@
 						添加时间：<view class="content-sec-lab1">{{item.createTime}}</view>
 					</view>
 					<view class="content-sec-num">
-						<view class="">{{item.visitRecord}}次到访</view>
+						<view class="">{{item.visitRecord || '--'}}次到访</view>
 						<view class="">{{item.fraction || '0'}}% | {{item.fraction || '0'}}分</view>
 					</view>
 				</view>

pages/center/records/index.vue

@@ -30,8 +30,15 @@
 			</view>
 		</view>
 		<view class="content">
-			
-			<view class="content-tips" v-for="(item,index) in recordList" :key='index' @click="tapThevisiting(item)">
+			<view v-if="recordList.length==0" style="width: 100%;height: 100%;display: flex;align-items: center;">
+				<view style="width: 100%;padding-top: 200rpx;">
+					<view style="width: 100%;text-align: center;">
+						<image style="width: 220rpx;height: 200rpx;" src="https://static.quhouse.com/zhikong_xcx_img/nodatalist.png" mode=""></image>
+					</view>
+					<view style="text-align: center;width: 100%;margin-top: 20rpx;color: #999999;">暂无数据</view>	
+				</view>
+			</view>
+			<view  v-if="recordList.length!=0" class="content-tips" v-for="(item,index) in recordList" :key='index' @click="tapThevisiting(item)">
 				<view class="content-first">
 				<view class="left">
 					<view class="img">{{item.agentName.slice(0,1)}}</view>

pages/index/customer.vue

@@ -1,7 +1,14 @@
 <template>
 	<view class="cented-box">
-		
-		<view class="customer" v-for="(item,index) in waitCustomList" :key='index' @click="tapThevisiting(item)">
+		<view v-if="waitCustomList.length==0" style="width: 100%;height: 100%;display: flex;align-items: center;">
+			<view style="width: 100%;padding-top: 200rpx;">
+				<view style="width: 100%;text-align: center;">
+					<image style="width: 220rpx;height: 200rpx;" src="https://static.quhouse.com/zhikong_xcx_img/nodatalist.png" mode=""></image>
+				</view>
+				<view style="text-align: center;width: 100%;margin-top: 20rpx;color: #999999;">暂无数据</view>	
+			</view>
+		</view>
+		<view class="customer"  v-if="waitCustomList.length!=0" v-for="(item,index) in waitCustomList" :key='index' @click="tapThevisiting(item)">
 			<view class="title">
 				<view class="zuo">
 					<view class="zuoimg">A</view>
@@ -40,6 +47,7 @@
 			
 		</view>
 		<image v-if="isAdd == 0&&(dataCode!=6||(dataCode==6&&addAccount==0))" @click="addreception()" class="add" src="/static/images/add.png" mode=""></image>
+		<image class="add2" @click="reshCustom()" src="https://static.quhouse.com/zhikong_xcx_img/refresh.png" mode=""></image>
 	</view>
 </template>
 
@@ -67,6 +75,9 @@
 			this.queryHaveDept()
 		},
 		methods: {
+			reshCustom(){
+				this.init()
+			},
 			tapThevisiting(item) {
 				if(item.status==0){
 					uni.showToast({
@@ -337,10 +348,17 @@
 	}
 }
 .add {
-	width: 90rpx;
-	height: 90rpx;
+	width: 90upx;
+	height: 90upx;
+	position: fixed;
+	bottom: 180upx;
+	right: 44upx;
+}
+.add2{
+	width: 90upx;
+	height: 90upx;
 	position: fixed;
-	bottom: 70rpx;
-	right: 44rpx;
+	bottom: 60upx;
+	right: 44upx;
 }
 </style>

utils/http.js

@@ -1,6 +1,6 @@
-// const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
+const baseUrl = 'http://121.42.63.138:9091/autoSR/api';// 测试站
 // const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙
-const baseUrl = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪
+// const baseUrl = 'http://192.168.31.128:8080/autoSR/api'; // 佳豪
 // const baseUrl = 'http://10.2.1.104:8081/autoSR/api'; // 刘敏
 // const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式
 // const baseUrl = 'https://hfju.com/api'; // 数智正式