twt 3 년 전
부모
커밋
623cf4c3d7

+ 6 - 1
operatingCompany/manifest.json

@@ -73,5 +73,10 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {}
+        }
+    }
 }

+ 8 - 1
operatingCompany/pages.json

@@ -1,7 +1,6 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
 
-		
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -194,7 +193,15 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/entryReport/signIn",
+			"style": {
+				"navigationBarTitleText": "签到",
+				"navigationBarBackgroundColor": "#FFFFFF"
+			}
 		}
+		
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

+ 6 - 1
operatingCompany/pages/entryReport/entryReport.vue

@@ -134,7 +134,7 @@
 					<!-- btns -->
 					<view class="btns">
 						<view class="lishi" @click="goHistory(item)">历史记录</view>
-						<view class="qiandao">签到</view>
+						<view class="qiandao" @click="sinnIn(item)">签到</view>
 						<view class="baogao" @click="goEntered(item)">录入报告</view>
 					</view>
 				</view>
@@ -207,6 +207,11 @@
 					url: 'historyReport?shopId=' + item.shopId
 				})
 			},
+			sinnIn(item){
+				uni.navigateTo({
+					url:'signIn?shopId=' + item.shopId
+				})
+			},
 			goEntered(item) {
 				this.$store.commit('mutationsCategoryList', '');
 				this.$store.commit('mutationssuggestList', '')

+ 245 - 0
operatingCompany/pages/entryReport/signIn.vue

@@ -0,0 +1,245 @@
+<template>
+	<view class="content">
+		<view class="mapBox">
+			<map id="map1" ref="map1" style="width:100%;height:50vh;" :latitude="lat":longitude="lng" 
+			:markers="covers" @poitap="labeltap"
+			></map>
+		</view>
+		
+		<view class="siginBox">
+			<scroll-view scroll-y="true" class="scrollView">
+				<view class="dizline" v-for="(item,index) in addressList" @click="ckSignin(index,item)" :class="{active:ckIndex==index}">
+				 <image src="../../static/img/icon_zuobiao_def@2x.png" mode="" class="dizlineImg" v-if="ckIndex!=index"></image>
+				 <image src="../../static/img/icon_zuobiao@2x.png" mode="" class="dizlineImg2" v-else></image>
+				 <view class="addressTxt">
+					 <view class="addressName">{{item.name}}</view>
+				     <view class="district">{{item.district}}{{item.address}}</view>
+				 </view>
+				 <image src="../../static/img/icon_duihao@2x.png" mode="" v-if="ckIndex==index" class="duihaoimg"></image>
+				
+			 </view>
+			</scroll-view>
+			<view class="bottom">
+				<view class="bottomBtn" @click="signin">签到</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				shopId:'',
+				lng: '',
+				lat: '',
+				covers:[],
+				addressName:'',
+				appkey:'064b6a4a8ade55656edcde2f528876de',
+				keywords:'',
+				addressList:'',
+				ckIndex:0,
+				address:'',
+			}
+		},
+		onLoad(opt) {
+           this.shopId=opt.shopId;
+		   var that = this
+		   uni.getLocation({
+			//type: 'gcj02',
+		   	success(res) {
+				console.log(res)
+		   		that.lng = res.longitude;
+		   		that.lat = res.latitude;
+				var obj={
+					 latitude: that.lat,
+					 longitude: that.lng,
+				}
+				that.covers.push(obj)
+				that.getaddress()
+		   	},
+		   	fail() {
+		   
+		   	}
+		   })
+		   //#ifdef H5
+		   
+		   that.lng = '117.143411'
+		   that.lat = '36.677445'
+		   var obj={
+		   	 latitude: that.lat,
+		   	 longitude: that.lng,
+		   }
+		   that.covers.push(obj)
+		   that.getaddress()
+		   // #endif
+		},
+		methods: {
+			ckSignin(index,item){
+				this.ckIndex=index;
+				this.address=item.name;
+			},
+			signin(){
+				uni.showLoading({ });
+				this.$http('accompany/SuperAccounts/addSuperSignIn', {
+					shopId:this.shopId,
+					address:this.address,
+					lat:this.lat,
+					lng:this.lng
+				}, 'POST').then(res => {
+				     uni.showToast({
+				         title: '签到成功',
+				     	 icon:'success',
+				         duration: 2000,
+				     });
+					 //this.$store.commit('mutationsCategoryList',this.categoryList)
+					 setTimeout(function(){
+					 	uni.navigateBack({
+					 		delta:1
+					 	})
+					 },1000)
+					
+				})
+			},
+			labeltap(e){
+				console.log(e);
+				this.lat=e.detail.latitude;
+				this.lng=e.detail.longitude;
+				this.addressName=e.detail.name;
+				this.getcovers()
+			},
+			getcovers(){
+				this.covers=[]
+				var obj={
+					 latitude: this.lat,
+					 longitude: this.lng,
+					 callout:{
+						 content:this.addressName,
+						 display:'ALWAYS',
+						 padding: 10, //文本边缘留白
+						 fontSize: 16, //文字大小
+						 borderRadius: 10, //callout边框圆角
+					 }
+				}
+				this.covers.push(obj)
+				this.getLocationList()
+			},
+			getLocationList() {
+				console.log("getLocationList")
+				let _this = this;
+				let data = {};
+				data.keywords =this.addressName;
+				data.location = this.lng+','+this.lat;
+				data.key=this.appkey;
+				uni.request({
+					url: 'https://restapi.amap.com/v3/assistant/inputtips?parameters',
+					method: 'GET',
+					data: data,
+					success(res) {
+						 _this.addressList = res.data.tips;
+						 _this.address=_this.addressList[0].name
+					}
+				})
+			},
+			getaddress(){
+				let _this = this;
+				let data = {};
+				
+				data.location = this.lng+','+this.lat;
+				data.key=this.appkey;
+				uni.request({
+					url: 'https://restapi.amap.com/v3/geocode/regeo',
+					method: 'GET',
+					data: data,
+					success(res) {
+						/* _this.list = res.data.tips; */
+						//console.log(res.data.regeocode.formatted_address)
+						_this.addressName=res.data.regeocode.formatted_address;
+						console.log(_this.addressName)
+						_this.getLocationList()
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.content{
+		 background: #F4F5F7;
+		 min-height: 100vh;
+		
+	}
+	/* #ifdef H5 */
+		.content{
+			 background: #F4F5F7;
+			 min-height:calc(100vh - 44px);
+			
+		}
+	/* #endif */
+	.siginBox{
+		background: #FFFFFF;
+		height: 50vh;
+	}
+	.dizlineImg{
+		width: 24rpx;
+		height: 24rpx;
+		margin-top: 30rpx;
+	}
+	.dizline{
+		display: flex;
+		margin: 30rpx 24rpx;
+		padding-bottom: 24rpx;
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.scrollView{
+		height: calc(50vh -  120rpx);
+	}
+	.addressTxt{
+		padding-left: 30rpx;
+		width: 600rpx;
+	}
+	.addressName{
+		font-size: 30rpx;
+		color: #3C3C3C;
+	}
+	.district{
+		font-size: 24rpx;
+		color: #999999;
+		padding-top: 8rpx;
+	}
+	.bottom{
+		width: 750rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 8px 0px rgba(153,153,153,0.08);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+	}
+	.bottomBtn{
+		width: 702rpx;
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size:30rpx;
+		margin-top: 24rpx;
+		margin-left: 24rpx;
+	}
+	.active .addressName{
+		color: #FF4F00;
+	}
+	.dizlineImg2{
+		width: 24rpx;
+		height: 38rpx;
+		margin-top: 20rpx;
+	}
+	.duihaoimg{
+		width: 40rpx;
+		height: 28rpx;
+		margin-top: 20rpx;
+	}
+</style>

+ 4 - 1
operatingCompany/pages/index/index.vue

@@ -77,7 +77,10 @@
 		},
 		onShow() {
 			this.uid = uni.getStorageSync("logInData").uid;
-			this.permissionList=uni.getStorageSync("logInData").permissionList
+			this.permissionList=uni.getStorageSync("logInData").permissionList;
+			if(!this.permissionList){
+				this.permissionList=[]
+			}
 			//this.permissionList=['N001']
 			console.log(this.uid);
 			if (this.uid) {

+ 52 - 1
operatingCompany/pages/reportManage/reportDetail.vue

@@ -137,6 +137,11 @@
 						<view>{{info.shopEvaTime}}</view>
 						<view v-if="info.shopEvaOpName">{{info.shopEvaOpName}}</view>
 					</view>
+					<!-- 店主回复 -->
+					<view class="shopEvaReplyBox">
+						<view class="shopEvaReplyContent">{{info.shopEvaReplyContent}}</view>
+						<view class="shopEvaReplyTime">{{info.shopEvaReplyTime}}</view>
+					</view>
 				</view>
 				
 				<view class="remarksLine" v-if="lookShow">
@@ -180,6 +185,9 @@
 	   <view class="bottom"  v-if="info.state==4&&loginType==2">
 	   		<view class="shoreDz" @click="goReply">回复</view>
 	   </view>
+	   <view class="bottom"  v-if="info.state==3&&loginType==2" @click="goremarks2">
+	   		<view class="shoreDz">点评</view>
+	   </view>
 	</view>
 </template>
 
@@ -245,6 +253,11 @@
 					delta:1
 				})
 			},
+			goremarks2(){
+				uni.navigateTo({
+					url:'../shop/shopIndex/reviewsContent?id='+this.id
+				})
+			},
 			editBg(){
 				this.info.categoryList.forEach(item=>{
 					item.sectionList.forEach(v=>{
@@ -410,6 +423,15 @@
 				 }); 
 			},
 			submitBg(){
+				if(this.info.suggestList.length==0){
+					uni.showToast({
+					    title: '请先编辑,填写行动建议',
+						 icon:'none',
+					    duration: 3000,
+					});
+					return false;
+				}
+				
 				uni.showLoading({ });
 				this.$http('accompany/SuperCheckSheet/submitSuperCheckSheet', {
 					sheetID:this.id,
@@ -425,9 +447,22 @@
 		},
 		onShareAppMessage(res) {
 		    console.log(res)
+		
 		    return {
 		      title: '报告详情',
-		      path: '/pages/reportManage/reportDetail?id='+this.id
+		      path: '/pages/reportManage/reportDetail?id='+this.id,
+			   success(res){
+				    uni.hideLoading();
+					setTimeout(function(){
+						uni.showToast({
+						     title: '发送成功',
+							 icon:'success',
+						     duration: 3000,
+						}); 
+					},1000)
+			             	
+							console.log("c成功")
+			   },
 		    }
 		 }
 	}
@@ -779,4 +814,20 @@
 	 padding:10rpx 20rpx;
 	  color: #999999;
 	}
+	.shopEvaReplyBox{
+		background: #F4F5F7;
+		border-radius: 10px;
+		font-size: 26rpx;
+		margin: 20rpx;
+		padding: 10rpx;
+	}
+	.shopEvaReplyContent{
+		color: #666666;
+		line-height: 40rpx;
+
+	}
+	.shopEvaReplyTime{
+		color: #999999;
+		
+	}
 </style>

+ 9 - 5
operatingCompany/pages/shop/shopIndex/reviews.vue

@@ -20,8 +20,8 @@
 			<view v-for="(item,index) in shopData" :key="index">
 			
 			<!-- shopBox 待点评 -->
-				<view class="shopBox" @click="goAppraise(item)" v-if="tabIndex == 0">
-					<view class=" shopTop">
+				<view class="shopBox"  v-if="tabIndex == 0">
+					<view class=" shopTop" @click="goDetal(item)">
 			
 						<view class="shopName">{{item.ShopName}}</view>
 			
@@ -37,7 +37,7 @@
 			
 			
 					<!-- 第2行 -->
-					<view class="secondView">
+					<view class="secondView" @click="goDetal(item)">
 						<!-- 运营经理 -->
 						<view class="manager">{{item.ManagerName}} · {{item.CheckTime.slice(0,item.CheckTime.length-8)}}</view>
 						<!-- 评分 -->
@@ -46,7 +46,7 @@
 					
 					<!-- 点评 -->
 					<view class="bottomView">
-						<view class="reviews" @click="goReviews(item)">点评</view>
+						<view class="reviews" @click="goAppraise(item)">点评</view>
 					</view>
 					
 				</view>
@@ -122,7 +122,11 @@
 					url:'reviewsContent?sheetID='+item.ID
 				})
 			},
-			
+			goDetal(item){
+				uni.navigateTo({
+					url:'../../reportManage/reportDetail?id='+item.ID
+				})
+			},
 			tabClick(num) {
 				this.tabIndex = num;
 

BIN
operatingCompany/static/img/icon_duihao@2x.png


BIN
operatingCompany/static/img/icon_zuobiao@2x.png


BIN
operatingCompany/static/img/icon_zuobiao_def@2x.png