Merge branch 'master' of http://47.98.226.240:3000/twt/operatingCompany

operatingCompany/pages.json

@@ -1,20 +1,20 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 
-		// {
-		// 	"path": "pages/shop/shopIndex/index",
-		// 	"style": {
-		// 		"navigationBarTitleText": "运营陪伴",
-		// 		"navigationStyle": "custom",
-		// 		"enablePullDownRefresh": true
-		// 		/* "navigationBarBackgroundColor": "#FFFFFF",*/
-		// 		/* "app-plus":{
-		// 			"titleNView":{
-		// 				"autoBackButton":false
-		// 			}
-		// 		} */
-		// 	}
-		// },
+		{
+			"path": "pages/shop/shopIndex/index",
+			"style": {
+				"navigationBarTitleText": "运营陪伴",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+				/* "navigationBarBackgroundColor": "#FFFFFF",*/
+				/* "app-plus":{
+					"titleNView":{
+						"autoBackButton":false
+					}
+				} */
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -100,20 +100,20 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		{
-			"path": "pages/shop/shopIndex/index",
-			"style": {
-				"navigationBarTitleText": "运营陪伴",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": true
-				/* "navigationBarBackgroundColor": "#FFFFFF",*/
-				/* "app-plus":{
-					"titleNView":{
-						"autoBackButton":false
-					}
-				} */
-			}
-		},
+		// {
+		// 	"path": "pages/shop/shopIndex/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "运营陪伴",
+		// 		"navigationStyle": "custom",
+		// 		"enablePullDownRefresh": true
+		// 		/* "navigationBarBackgroundColor": "#FFFFFF",*/
+		// 		/* "app-plus":{
+		// 			"titleNView":{
+		// 				"autoBackButton":false
+		// 			}
+		// 		} */
+		// 	}
+		// },
 		{
 			"path": "pages/shop/shopIndex/reviews",
 			"style": {

operatingCompany/pages/entryReport/entryReport.vue

@@ -34,8 +34,9 @@
 
 		<!-- 门店列表 -->
 		<view class="shopContent">
-			<view v-for="(item,index) in shopData" :key="index">
-				<view class="shopBox">
+			<view v-for="(item,index) in shopData" :key="index">
+				<!-- 需要检查项 大于0 -->
+				<view class="shopBox" v-if="isHave && item.checkCount > 0">
 					<view class="shopTop">
 						<view class="shopName">{{item.ShopName}}</view>
 						
@@ -77,6 +78,51 @@
 						<view class="baogao" @click="goEntered(item)">录入报告</view>
 					</view>
 				</view>
+				
+				<!-- 展示全部数据 -->
+				<view class="shopBox" v-if="!isHave">
+					<view class="shopTop">
+						<view class="shopName">{{item.ShopName}}</view>
+						
+						
+							<!-- 地址 和电话 图标 -->
+							<image class="tubiao" src="../../static/img/icon_daohang_def@2x.png" @click="goAddress(item)">
+							</image>
+							<image class="tubiao" src="../../static/img/icon_phone_def@2x.png"
+								@click="call(item.ContactorPhone)">
+							</image>
+						
+						
+				
+				
+					</view>
+					<!-- 门店类型-开业时间-联系人 -->
+					<view class="shopType"><text style='color: #B98B5D;'>{{item.levelName}}</text> ·
+						<text v-if="item.OpeningTime != null">{{item.OpeningTime}}</text> 联系人：{{item.Contactor}}
+					</view>
+					
+					<!-- 详细地址 -->
+					<view class="addressView">
+						<view class="address">{{item.Address}}</view>
+						<view class="distance" v-if="item.distance != 0.00">{{item.distance}}km</view>
+					</view>
+				
+					<!-- 提交信息 -->
+					<view class="tijao">
+						<view class="time" v-if="item.maxTime">距上次提交：<text style='color: #FF4F00;'>{{item.maxTime}}</text>天</view>
+						<view class="time" v-else>暂无提交记录</view>
+						
+						<view class="xiangmu"><text style='color: #FF4F00;'>{{item.checkCount}}</text>项需要检测</view>
+					</view>
+				
+					<!-- btns -->
+					<view class="btns">
+						<view class="lishi" @click="goHistory(item)">历史记录</view>
+						<view class="qiandao">签到</view>
+						<view class="baogao" @click="goEntered(item)">录入报告</view>
+					</view>
+				</view>
+							
 			</view>
 		</view>
 
@@ -153,8 +199,7 @@
 			
 			changeHave() {
 				this.isHave = !this.isHave
-				this.page = 1
-				this.getShopData()
+				
 			},
 			goAddress(v) {
 			
@@ -184,10 +229,7 @@
 				else {
 					maxTime = Number(this.firstIndex)
 				}
-				var checkCount = ''
-				if(this.isHave == true){
-					checkCount = 1
-				}
+				
 				
 				let url = 'accompany/SuperAccounts/queryShopListByMyTeam',
 					params = {
@@ -197,7 +239,7 @@
 						lng: this.lng,
 						lat: this.lat,
 						maxTime:maxTime,
-						checkCount:checkCount,
+						
 					}
 				this.$http(url, params, 'GET').then(res => {
 					var list = res.data

operatingCompany/pages/shop/shopIndex/index.vue

@@ -99,7 +99,7 @@
 
 				<!-- shopBox -->
 				<view class="shopBox" @click="goAppraise(item)">
-					<view class=" shopTop">
+					<view class="shopTop">
 
 						<view class="shopName">{{item.ShopName}}</view>
 
@@ -112,18 +112,19 @@
 
 					</view>
 
-
-
 					<!-- 第2行 -->
 					<view class="bottomView">
 						<!-- 运营经理 -->
-						<view class="manager">{{item.ManagerName}} · {{item.CheckTime}}</view>
+						<view class="manager">{{item.ManagerName}} · {{item.CheckTime.slice(0,item.CheckTime.length-8)}}</view>
 						<!-- 评分 -->
 						<view class="score" v-if="item.ShopScore">{{item.ShopScore}}分</view>
 					</view>
 
 
 				</view>
+			
+				
+			
 			</view>
 		</view>
 

operatingCompany/pages/shop/shopIndex/reviews.vue

@@ -18,37 +18,70 @@
 		<!-- 列表 -->
 		<view class="shopList">
 			<view v-for="(item,index) in shopData" :key="index">
-
-				<!-- shopBox -->
-				<view class="shopBox" @click="goAppraise(item)" >
-					<view class=" shopTop">
-
-						<view class="shopName">{{item.ShopName}}</view>
-
+			
+			<!-- shopBox 待点评 -->
+				<view class="shopBox" @click="goAppraise(item)" v-if="tabIndex == 0">
+					<view class=" shopTop">
+			
+						<view class="shopName">{{item.ShopName}}</view>
+			
 						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
 						<view class="type" v-if="item.State == 1">待提交</view>
 						<view class="type" v-if="item.State == 2">待作业</view>
 						<view class="type" v-if="item.State == 3">待点评</view>
 						<view class="type" v-if="item.State == 4">待回复</view>
-						<view class="type" v-if="item.State == 5">已完成</view>
-
-					</view>
-
-
-
-					<!-- 第2行 -->
-					<view class="bottomView">
-						<!-- 运营经理 -->
-						<view class="manager">{{item.ManagerName}} · {{item.CheckTime}}</view>
-						<!-- 评分 -->
-						<view class="score" v-if="item.ShopScore">{{item.ShopScore}}分</view>
-					</view>
+						<view class="type" v-if="item.State == 5">已完成</view>
+			
+					</view>
+			
+			
+			
+					<!-- 第2行 -->
+					<view class="secondView">
+						<!-- 运营经理 -->
+						<view class="manager">{{item.ManagerName}} · {{item.CheckTime.slice(0,item.CheckTime.length-8)}}</view>
+						<!-- 评分 -->
+						<view class="score" v-if="item.ShopScore">{{item.ShopScore}}分</view>
+					</view>
+					
+					<!-- 点评 -->
+					<view class="bottomView">
+						<view class="reviews" @click="goReviews(item)">点评</view>
+					</view>
 					
-					<!-- 点评 -->
-					<view class="reviews" @click="goReviews(item)">点评</view>
-					
-				</view>
+				</view>
+			
+			<!-- shopBox 点评历史 -->
+				<view class="shopBox" v-if="tabIndex == 1">
+					<view class="shopTop">
+					
+						<view class="shopName">对{{item.ManagerName}}的服务评价</view>
+			
+						<!-- 星星 -->
+						
+						<!-- <uni-rate :value="3" color="#EEEEEE" active-color="#FF4F00"  :size="32" :readonly="true" /> -->
+						
+						
+							
+					</view>
+			
+			
+					 <!-- 第2行 -->
+					 <view class="contentMes">{{item.UserEvaContent}}</view>
+					 
+					<view class="timeView">
+						<!-- 时间 -->
+						<view class="time">{{item.UserEvaTime}}</view>
+						<!-- 评价人 -->
+						<view class="appraiser">{{item.UserEvaOpName}}</view>
+					</view>
+					
+			</view>
+					
+			
 			</view>
+				
+				
 		</view>
 
 		<!-- 上拉 加载更多 -->
@@ -70,10 +103,11 @@
 		data() {
 			return {
 				tabIndex: 0,
-				status: '', 
+				status: '0', 
 				shopData: [],
 				page: 1,
-				noMoreShow: false,
+				noMoreShow: false,
+				rateValue:2,
 				
 			}
 		},
@@ -93,7 +127,6 @@
 			tabClick(num) {
 				this.tabIndex = num;
 
-				
 				this.status = num;
 				
 				this.page = 1;
@@ -131,7 +164,8 @@
 					} else {
 						this.shopData = this.shopData.concat(list)
 					}
-
+					
+					console.log(this.shopData);
 				})
 			},
 			
@@ -233,7 +267,7 @@
 		margin-left: 10rpx;
 	}
 
-	.bottomView {
+	.secondView {
 		padding: 28rpx 20rpx;
 		display: flex;
 		justify-content: space-between;
@@ -249,6 +283,10 @@
 		font-size: 28rpx;
 		color: #B98B5D;
 	}
+	.bottomView {
+		display: flex;
+		justify-content: flex-end;
+	}
 	.reviews{
 		width: 150rpx;
 		height: 56rpx;
@@ -258,10 +296,28 @@
 		text-align: center;
 		border-radius: 28rpx;
 		border: 2rpx #FF4F00 solid;
-		position: relative;
-		right: 20rpx;
-		top: 20rpx;
+		margin-top: 20rpx;
+		margin-right: 20rpx;
+		margin-bottom: 20rpx;
 	}
+
+	.contentMes{
+		padding: 20rpx;
+		color: #666666;
+		font-size: 26rpx;
+		
+	} 
+	.timeView{
+		padding: 20rpx 20rpx 30rpx 20rpx;
+		display: flex;
+		justify-content: space-between;
+		
+	}
+	.time,
+	.appraiser{
+		color: #999999;
+		font-size: 26rpx;
+	}
 
 	/* 空白页css */
 	.nodataBox {