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

* 'master' of http://47.98.226.240:3000/twt/operatingCompany:
  111
  点评

operatingCompany/pages.json

@@ -166,6 +166,13 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/entryReport/remarks",
+			"style": {
+				"navigationBarTitleText": "点评",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
 		}
 
 

operatingCompany/pages/entryReport/remarks.vue

@@ -0,0 +1,179 @@
+<template>
+	<view class="content">
+	    <view style="height: 20rpx;"></view>
+		<view class="competeCont">
+			<view class="competeContTitle">对门店行动完成情况打分</view>
+			<view class="xxBox">
+				<uni-rate :max="5" v-model="xx" @change="onXXChange"/>
+			</view>
+
+			<view>
+				<textarea placeholder-style="color:#CCCCCC" placeholder="请填写十字以上的评价内容～" v-model="shopEvaContent" class="textareaCont"/>
+			</view>
+			<view class="submitBox">
+				<view class="submit" @click="submit">提交</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	
+	export default {
+		
+		data() {
+			return {
+				sheetID:'',
+				shopEvaContent:'',
+				shopEvaStar:0,
+				xx:0,
+			}
+		},
+		onLoad(opt) {
+		  this.sheetID=opt.id
+		  
+		},
+		onShow() {
+				
+		},
+		methods: {
+		  
+			onXXChange(e){
+				console.log(e)
+				this.shopEvaStar=e.value
+			},
+			submit(){
+				
+				uni.showLoading({ });
+				
+				this.$http('accompany/SuperCheckSheet/shopEvaStar', {
+					sheetID:this.sheetID,
+					shopEvaStar:this.shopEvaStar,
+					shopEvaContent:this.shopEvaContent
+				}, 'POST').then(res => {
+				    //this.submitSuperCheckSheet()
+					uni.showToast({
+					    title: '提交成功',
+						icon:'none',
+					    duration: 2000,
+					});
+					uni.navigateBack({
+						delta:1
+					})
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+	
+	}
+
+	/* #ifdef H5 */
+	.content {
+		background: #F4F5F7;
+	
+		
+	}
+
+	/* #endif */
+	.status_bar{
+		background: #FFFFFF;
+	}
+	.nav{
+		width: 100vw;
+		height: 44px;
+		background: #FFFFFF;
+		display: flex;
+		justify-content: space-between;
+		font-size: 34rpx;
+		line-height: 44px;
+	}
+	.baiheiback{
+		width: 70px;
+		height: 44px;
+	}
+	.zdyNav{
+		position: fixed;
+		left: 0;
+		top: 0;
+		background: #FFFFFF;
+		z-index: 11;
+	}
+	.top{
+		background: #FFFFFF;
+	}
+	.toptop{
+		display: flex;
+		justify-content: center;
+		padding-top: 20rpx;
+	}
+	.toptopIMg{
+		width: 44rpx;height: 44rpx;
+	}
+	.topTitle{
+		font-size: 36rpx;
+		padding-left: 10rpx;
+		color: #3C3C3C;
+	}
+	.topCont{
+		display: flex;
+		justify-content: space-around;
+		padding: 40rpx;
+	}
+	.topContBtn{
+		width: 150rpx;
+		height: 56rpx;
+		border-radius: 34rpx;
+		border: 2rpx solid #DDDDDD;
+		line-height: 56rpx;
+		text-align: center;
+		font-size: 28rpx;
+		color: #3C3C3C;
+	}
+	.competeCont{
+		margin-top: 20rpx;
+		background: #FFFFFF;
+		padding: 40rpx 24rpx;
+	}
+	.competeContTitle{
+		font-size: 30rpx;
+		color: #3C3C3C;
+		text-align: center;
+	}
+	.textareaCont{
+		width: 662rpx;
+		height: 200rpx;
+		background: #F4F5F7;
+		border-radius: 10rpx;
+		padding: 20rpx;
+		margin-top: 20rpx;
+		font-size: 28rpx;
+	}
+	.submit{
+		width: 420rpx;
+		height: 74rpx;
+		background: #FF4F00;
+		border-radius: 50rpx;
+		line-height: 74rpx;
+		text-align: center;
+		font-size: 30rpx;
+		color: #FFFFFF;
+	}
+	.submitBox{
+		display: flex;
+		justify-content: center;
+		padding-top: 40rpx;
+	}
+	.xxBox{
+		display: flex;
+		justify-content: center;
+		padding-top: 20rpx;
+		padding-bottom: 20rpx;
+	}
+</style>

operatingCompany/pages/reportManage/reportDetail.vue

@@ -71,6 +71,7 @@
 			<view class="tabBox">
 				<view class="tabLine" :class="{tabActive:tabIndex==1}" @click="tabClick(1)">检测情况</view>
 				<view class="tabLine" :class="{tabActive:tabIndex==2}" @click="tabClick(2)">行动建议</view>
+				<view class="tabLine" v-if="info.state==4||info.state==5" :class="{tabActive:tabIndex==3}" @click="tabClick(3)">点评</view>
 			</view>
 			<!-- 检测情况 -->
 			<view class="categoryList" v-if="tabIndex==1">
@@ -119,9 +120,44 @@
 				
 				<nodata v-if="info.suggestList.length==0"></nodata>
 			</view>
-			
+			<!-- 点评 -->
+			<view class="remarksBox" v-if="tabIndex==3">
+				<view class="remarksLine">
+					<view class="remarksLineTop">
+						<view class="remarksLineTopTitle">对门店行动完成情况打分</view>
+						<view class="remarksLineTopXxbox">
+							<uni-rate :max="5" v-model="info.shopEvaStar" :size="16" :readonly="true"/>
+						</view>
+					</view>
+					<view class="remarksLineTxt1">
+						补充说明
+					</view>
+					<view class="remarksLineTxt2">{{info.shopEvaContent}}</view>
+					<view class="timeBox">
+						<view>{{info.shopEvaTime}}</view>
+						<view>{{info.shopEvaOpName}}</view>
+					</view>
+				</view>
+				
+				<view class="remarksLine">
+					<view class="remarksLineTop">
+						<view class="remarksLineTopTitle">对运营经理的服务评价</view>
+						<view class="remarksLineTopXxbox">
+							<uni-rate :max="5" v-model="info.userEvaStar" :size="16" :readonly="true"/>
+						</view>
+					</view>
+					<view class="remarksLineTxt1">
+						其他建议
+					</view>
+					<view class="remarksLineTxt2">{{info.userEvaContent}}</view>
+					<view class="timeBox">
+						<view>{{info.userEvaTime}}</view>
+						<view>{{info.userEvaOpName}}</view>
+					</view>
+				</view>
+				
+			</view>
 		</view>
-	  
 	   <view style="height: 150rpx;"></view>
 	   <view class="bottom"  v-if="info.state==1&&loginType==1">
 		    <view class="delBtn">删除</view>
@@ -131,7 +167,7 @@
 	   <view class="bottom"  v-if="info.state==2&&loginType==1">
 	   		<view class="shoreDz">发送给店长</view>
 	   </view>
-	   <view class="bottom"  v-if="info.state==3&&loginType==1">
+	   <view class="bottom"  v-if="info.state==3&&loginType==1" @click="goremarks">
 	   		<view class="shoreDz">点评</view>
 	   </view>
 	   <!-- 店主-->
@@ -155,7 +191,7 @@
 				 iStatusBarHeight:'',
 				 id:'',
 				 info:'',
-				 tabIndex:2,
+				 tabIndex:3,
 				 lat:'',
 				 lng:'',
 				 loginType:'',
@@ -187,6 +223,11 @@
 			that.getSuperCheckSheetInfo()
 			 // #endif
 		},
+		onShow() {
+			if(this.id){
+				this.getSuperCheckSheetInfo()
+			}
+		},
 		methods: {
 			back(){
 				uni.navigateBack({
@@ -230,6 +271,11 @@
 			tabClick(num){
 				this.tabIndex=num
 			},
+			goremarks(){
+				uni.navigateTo({
+					url:'../entryReport/remarks?id='+this.id
+				})
+			},
 			getSuperCheckSheetInfo(){
 				uni.showLoading({
 					title: '加载中'
@@ -571,4 +617,33 @@
         font-size: 30rpx;
 		margin-top: 24rpx;
 	}
+	.remarksLine{
+		background: #FFFFFF;
+		margin-top: 20rpx;
+	}
+	.remarksLineTop{
+		display: flex;
+		justify-content: space-between;
+		padding: 30rpx 20rpx;
+		font-size: 30rpx;
+		color: #3C3C3C;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.remarksLineTxt1{
+		font-size: 28rpx;
+		color: #444444;
+		padding: 28rpx 20rpx;
+	}
+	.remarksLineTxt2{
+		font-size: 26rpx;
+		padding: 0rpx 20rpx 20rpx 20rpx;
+		color: #666666;
+	}
+	.timeBox{
+	  display: flex;
+	  justify-content: space-between;
+	  font-size: 26rpx;
+	 padding:10rpx 20rpx;
+	  color: #999999;
+	}
 </style>

operatingCompany/pages/shop/shopIndex/editcomplete.vue

@@ -3,7 +3,7 @@
 		<view class="zdyNav">
 		  <view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
 		  <view class="nav">
-			  <view><image src="../../../static/img/baiheiback.png" mode="" class="baiheiback" @click="back"></image></view>
+			  <view @click="back"><image src="../../../static/img/baiheiback.png" mode="" class="baiheiback" @click="back"></image></view>
 			  <view >修改完成</view>
 			  <view style="width:70px;"></view>
 		  </view>
@@ -16,7 +16,7 @@
 				<view class="topTitle">修改完成</view>
 			</view>
 			<view class="topCont">
-				<view class="topContBtn">回到首页</view>
+				<view class="topContBtn" @click="goHome">回到首页</view>
 				<view class="topContBtn">查看详情</view>
 			</view>
 		</view>
@@ -57,7 +57,16 @@
 				
 		},
 		methods: {
-		   
+		   back(){
+			 uni.navigateBack({
+			 	delta:1
+			 })  
+		   },
+		   goHome(){
+			 uni.navigateTo({
+			 	url:'index'
+			 })  
+		   },
 			onXXChange(e){
 				console.log(e)
 				this.userEvaStar=e.value