lilei 4 rokov pred
rodič
commit
37f55e4cd0

+ 9 - 0
hybrid/html/css/styles.less

@@ -151,6 +151,15 @@ body{
           }
         }
       }
+	  .checkWork-button{
+		  > div{
+			  padding: 10px;
+			  text-align: center;
+			  font-size: 18px;
+			  background: #FAAD14;
+			  color: #fff;
+		  }
+	  }
     }
   }
   // 播放器

+ 17 - 5
hybrid/html/video.html

@@ -38,7 +38,7 @@
     <div class="checkWork">
       <!-- 统计及摄像头切换 -->
       <div class="checkWork-head">
-        <div class="checkWork-head-row">
+        <div class="checkWork-head-row" v-if="xdType=='video'">
           <!-- 机位 -->
           <div>
             <div>机位:</div>
@@ -136,10 +136,14 @@
 			  </div>
             </div>
           </div>
-		  
 		  </div>
       </div>
-    </div>
+      <!-- 提交按钮 -->
+	  <div class="checkWork-button">
+		  <div v-if="xdType=='video'" @click="submitTask">提交本次巡店</div>
+		  <div v-if="xdType=='scene'" @click="nextStep">下一步</div>
+	  </div>
+	</div>
 	<!-- 拍照弹框 -->
 	<a-drawer
 	  title="快拍"
@@ -238,6 +242,8 @@
 		  setTyps(type){
 			  console.log(type)
 			  this.xdType = type
+			  // 设置标题
+			  document.title = type=='video'?'远程巡店':'现场巡店'
 		  },
 		  // 设置视频列表
 		  setVideoList(data){
@@ -269,8 +275,6 @@
 		  },
 		  // 初始化播放器
 		  videoInit(){
-			  // 设置标题
-			  document.title = '远程巡店'
 			  const _this = this
 			  const videoSrc = this.curVideo.videoSrc
 			  // 初始化播放器
@@ -468,6 +472,14 @@
 		  saveZbPlImgsSuccess(){
 			  this.zbItem.splice(this.activeZbIndex,1,this.curZbItem)
 			  this.onClosePz()
+		  },
+		  // 提交此次任务
+		  submitTask(){
+			  this.sendMsg('submitTask','')
+		  },
+		  // 现场巡店下一步签字
+		  nextStep(){
+			  this.sendMsg('nextStep','')
 		  }
 		}
 	})

+ 3 - 3
pages.json

@@ -107,13 +107,13 @@
 		{
 			"path": "pages/shopTourOver/shopTourOver", //  现场巡店结束签字
 			"style": {
-				"navigationBarTitleText": "现场巡店"
+				"navigationBarTitleText": "签字"
 			}
 		},
 		{
 			"path": "pages/shopTourCompleted/shopTourCompleted", //  现场巡店-巡店完成
 			"style": {
-				"navigationBarTitleText": "现场巡店"
+				"navigationBarTitleText": "巡店完成"
 			}
 		},
 		{
@@ -247,7 +247,7 @@
 		{
 			"path": "pages/toDoList/chooseReceiveUser", //  待办单 > 选择抄送人
 			"style": {
-				"navigationBarTitleText": "选择处理人"
+				"navigationBarTitleText": "选择抄送人"
 			}
 		}
 	],

+ 31 - 1
pages/shopTour/shopTour.vue

@@ -188,6 +188,33 @@
 						this.wv.evalJS("vm.setVideoList('"+JSON.stringify(res.data)+"')")
 					}
 				})
+			},
+			// 提交本次任务
+			submitTask(){
+				const _this = this;
+				clzConfirm({
+					title: '提示',
+					content: '确定提交本次巡店?',
+					success: function(res) {
+						if (res.confirm || res.index == 0) {
+							submitTask({storeId:this.storeId}).then(res=>{
+								if(res.status == 200){
+									uni.navigateBack()
+								}
+								uni.showToast({
+									icon:'none',
+									title: res.message
+								})
+							})
+						}
+					}
+				});
+			},
+			// 现场巡店下一步签字
+			nextStep(){
+				uni.navigateTo({
+					url:"/pages/shopTourOver/shopTourOver?storeId="+this.storeId
+				})
 			}
 		},
 		onLoad(options) {
@@ -206,7 +233,10 @@
 			 setTimeout(function() {
 				_this.wv = currentWebview.children()[0]
 				_this.wv.evalJS("vm.setTyps('"+_this.types+"')")
-				_this.getVideoList() // 获取视频列表
+				// 获取视频列表
+				if(_this.types == 'video'){
+					_this.getVideoList() 
+				}
 				if(_this.restart == 1){ // 重新开始
 					_this.creatTask(1)
 				}else if(_this.restart == 0){ // 继续上次巡店

+ 1 - 1
pages/signIn/signIn.vue

@@ -63,7 +63,7 @@ export default {
 					console.log(res);
 					// _this.location = res.address.province + res.address.city + res.address.district + res.address.street + res.address.streetNum +'靠近' + res.address.poiName
 					// console.log(_this.location, '城市编码 ', res.address.cityCode)
-					this.position = res;
+					_this.position = res;
 				}
 			});
 		},

+ 3 - 1
pages/siteInspection/siteInspection.vue

@@ -27,6 +27,7 @@
 					</view>
 				</view>
 				<u-empty class="nodata" :text="noDataText" v-if="listdata.length==0 && status!='loading'" mode="list"></u-empty>
+				<u-loadmore bg-color="#f8f8f8" v-if="listdata.length < total || status == 'loading'" :status="status" class="loadmore" />
 			</scroll-view>
 		</view>
 	</view>
@@ -41,7 +42,7 @@
 				queryValue: '',
 				location: '陕西西安未央区北二环信息机大厦100号',
 				noDataText: '未查找到附近门店',  //  列表请求状态提示语
-				status: 'loadmore',  //  加载中状态
+				status: 'loading',  //  加载中状态
 				listdata: [],  //  列表数据
 				pageNo: 1,  //  当前页码
 				pageSize: 10,  //  每页条数
@@ -74,6 +75,7 @@
 			},
 			//查询门店列表
 			searchHandle(res){
+				this.listdata = []
 				this.status = "loading"
 				findStoreList({
 					lng:res.longitude,

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 9 - 2
unpackage/dist/dev/app-plus/app-view.js


+ 9 - 0
unpackage/dist/dev/app-plus/hybrid/html/css/styles.less

@@ -151,6 +151,15 @@ body{
           }
         }
       }
+	  .checkWork-button{
+		  > div{
+			  padding: 10px;
+			  text-align: center;
+			  font-size: 18px;
+			  background: #FAAD14;
+			  color: #fff;
+		  }
+	  }
     }
   }
   // 播放器

+ 9 - 5
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -38,7 +38,7 @@
     <div class="checkWork">
       <!-- 统计及摄像头切换 -->
       <div class="checkWork-head">
-        <div class="checkWork-head-row">
+        <div class="checkWork-head-row" v-if="xdType=='video'">
           <!-- 机位 -->
           <div>
             <div>机位:</div>
@@ -136,10 +136,14 @@
 			  </div>
             </div>
           </div>
-		  
 		  </div>
       </div>
-    </div>
+      <!-- 提交按钮 -->
+	  <div class="checkWork-button">
+		  <div v-if="xdType=='video'" @click="submitTask">提交本次巡店</div>
+		  <div v-if="xdType=='scene'" @click="nextStep">下一步</div>
+	  </div>
+	</div>
 	<!-- 拍照弹框 -->
 	<a-drawer
 	  title="快拍"
@@ -238,6 +242,8 @@
 		  setTyps(type){
 			  console.log(type)
 			  this.xdType = type
+			  // 设置标题
+			  document.title = type=='video'?'远程巡店':'现场巡店'
 		  },
 		  // 设置视频列表
 		  setVideoList(data){
@@ -269,8 +275,6 @@
 		  },
 		  // 初始化播放器
 		  videoInit(){
-			  // 设置标题
-			  document.title = '远程巡店'
 			  const _this = this
 			  const videoSrc = this.curVideo.videoSrc
 			  // 初始化播放器

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov