lilei %!s(int64=4) %!d(string=hai) anos
pai
achega
6aca73edee

+ 83 - 5
hybrid/html/css/styles.less

@@ -20,13 +20,11 @@ body{
       .checkWork-head{
         position: relative;
         .checkWork-head-row{
-          display: flex;
-          align-items: center;
-          border-bottom: 1px solid #eee;
           &:first-child{
             > div{
               display: flex;
               align-items: center;
+			  width: 100%;
               > div{
                 &:last-child{
                   flex-grow: 1;
@@ -35,14 +33,23 @@ body{
             }
           }
           > div{
-            width: 50%;
+            width: 100%;
             padding: 5px 10px;
+			display: flex;
+			align-items: center;
             &:first-child{
-              border-right: 1px solid #eee;
+              border-bottom: 1px solid #eee;
             }
             > div{
+			  width: 33.3%;
               padding: 3px 0;
             }
+			.ant-dropdown-link{
+				width: 100%;
+				display: block;
+				text-align: right;
+				color: #666666;
+			}
           }
         }
       }
@@ -76,6 +83,15 @@ body{
             margin-bottom: 10px;
             border-radius: 5px;
             box-shadow: 1px 1px 3px #eee;
+			.photos{
+			  span{
+				  border: 1px solid #eee;
+			  }
+			  display: block;
+			  > div{
+				  display: inline-block;
+			  }
+			}
             > div{
               display: flex;
               align-items: center;
@@ -84,6 +100,20 @@ body{
                 &:first-child{
                   flex-grow: 1;
                 }
+				.anticon{
+					font-size: 30px;
+					color: #666;
+					margin-left: 15px;
+				}
+				.choose-bhs{
+					color: #13C2C2;
+				}
+				.choose-bhg{
+					color: #ff0000;
+				}
+				.choose-hg{
+					color: #00be00;
+				}
               }
             }
           }
@@ -145,4 +175,52 @@ body{
     .prism-player .prism-controlbar{
       background: rgba(0, 0, 0, 0.5);
     }
+  }
+  
+  // 拍照弹框
+  .pzPopus{
+	  .pz-pinglun{
+		  position: relative;
+		  .icons{
+			  position: absolute;
+			  right: 15px;
+			  top: 50%;
+			  margin-top: -26px;
+			  z-index: 1000;
+			  border: 1px solid #eee;
+			  padding: 10px;
+			  border-radius: 100%;
+			  .aicon{
+				  font-size: 30px;
+				  color: #999;
+			  }
+		  }
+	  }
+	  .imglist{
+		  display: flex;
+		  align-items: center;
+		  flex-wrap: wrap;
+		  padding: 30px 0;
+		  > div{
+			  position: relative;
+			  padding: 3px;
+			  border: 1px solid #eee;
+			  border-radius: 5px;
+			  margin-right: 15px;
+			  img{
+				  width: 45px;
+				  height: 45px;
+			  }
+			  .aicon{
+				  position: absolute;
+				  right: -8px;
+				  top: -8px;
+				  color: red;
+				  font-size: 16px;
+			  }
+		  }
+	  }
+	  .f-btns{
+		  padding: 10px 20px;
+	  }
   }

+ 71 - 79
hybrid/html/video.html

@@ -49,12 +49,14 @@
                   <a-menu-item key="4"> 维修工位 </a-menu-item>
                   <a-menu-item key="5"> 客户休息区 </a-menu-item>
                 </a-menu>
-                <a-button block> 收银台 <a-icon type="down" /> </a-button>
+				<a class="ant-dropdown-link" @click="e => e.preventDefault()">
+				  收银台 <a-icon type="right" />
+				</a>
               </a-dropdown>
             </div>
           </div>
           <!-- 预置位 -->
-          <div>
+          <!-- <div>
             <div>预置位:</div>
             <div>
               <a-dropdown>
@@ -66,13 +68,13 @@
                 <a-button block> 请选择 <a-icon type="down" /> </a-button>
               </a-dropdown>
             </div>
-          </div>
+          </div> -->
         </div>
         <div class="checkWork-head-row">
           <div>
             <div>进度:2/13</div>
             <div>耗时:3时5分钟</div>
-            <div>得分:10.2/22.3</div>
+            <!-- <div>得分:10.2/22.3</div> -->
           </div>
           <div>
             <div>不适用:0</div>
@@ -121,86 +123,77 @@
           <div class="tabCons-items">
             <div>
               <div><b>正常营业</b></div>
-              <div><a-icon type="camera" style="font-size: 30px;" /></div>
+			  <!-- 点击打开拍照 -->
+              <div @click="openCamera()"><a-icon type="camera" style="font-size: 30px;" /></div>
             </div>
+			<!-- 拍照图片 -->
+			<div class="photos">
+				<div><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+				<div><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+			</div>
+			<!-- 评分 -->
             <div>
-              <div>分值:10 <a-icon @click="openEditFs" type="edit" style="font-size: 20px;margin-left: 10px;"/></div>
+              <div><!-- 分值:10 <a-icon @click="openEditFs" type="edit" style="font-size: 20px;margin-left: 10px;"/> --></div>
               <div>
-                <a-icon type="minus-circle" style="font-size: 30px;color: #13C2C2;margin-right: 15px;"/>
+				  <!-- 不适用 -->
+                <a-icon type="minus-circle" class="choose-bhs"/>
               </div>
 			  <div>
-				  <a-icon type="close-circle" style="font-size: 30px;color: #ff0000;margin-right: 15px;"/>
+				  <!-- 不合格 -->
+				  <a-icon type="close-circle" class="choose-bhg"/>
 			  </div>
 			  <div>
-				  <a-icon type="check-circle" style="font-size: 30px;color: #00be00;"/>
+				  <!-- 合格 -->
+				  <a-icon type="check-circle" class="choose-hg"/>
 			  </div>
             </div>
           </div>
-          <div class="tabCons-items">
-            <div>
-              <div><b>正常营业</b></div>
-              <div><a-icon type="camera" style="font-size: 30px;" /></div>
-            </div>
-            <div>
-              <div>分值:10 <a-icon type="edit" style="font-size: 20px;margin-left: 10px;"/></div>
-              <div>
-                <a-icon type="minus-circle" style="font-size: 30px;color: #13C2C2;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="close-circle" style="font-size: 30px;color: #ff0000;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="check-circle" style="font-size: 30px;color: #00be00;"/>
-              </div>
-            </div>
-          </div>
-          <div class="tabCons-items">
-            <div>
-              <div><b>正常营业</b></div>
-              <div><a-icon type="camera" style="font-size: 30px;" /></div>
-            </div>
-            <div>
-              <div>分值:10 <a-icon type="edit" style="font-size: 20px;margin-left: 10px;"/></div>
-              <div>
-                <a-icon type="minus-circle" style="font-size: 30px;color: #13C2C2;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="close-circle" style="font-size: 30px;color: #ff0000;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="check-circle" style="font-size: 30px;color: #00be00;"/>
-              </div>
-            </div>
-          </div>
-          <div class="tabCons-items">
-            <div>
-              <div><b>正常营业</b></div>
-              <div><a-icon type="camera" style="font-size: 30px;" /></div>
-            </div>
-            <div>
-              <div>分值:10 <a-icon type="edit" style="font-size: 20px;margin-left: 10px;"/></div>
-              <div>
-                <a-icon type="minus-circle" style="font-size: 30px;color: #13C2C2;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="close-circle" style="font-size: 30px;color: #ff0000;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="check-circle" style="font-size: 30px;color: #00be00;"/>
-              </div>
-            </div>
-          </div>
-        </div>
+		  </div>
       </div>
     </div>
+	<!-- 拍照弹框 -->
+	<a-drawer
+	  title="快拍"
+	  placement="bottom"
+	  :closable="true"
+	  :visible="showPz"
+	  @close="onClosePz"
+	  :height="360"
+	>
+	  <div class="pzPopus">
+		  <!-- 评论 -->
+		  <div class="pz-pinglun">
+			  <div><a-textarea placeholder="请填写备注内容(选填)" :rows="4" /></div>
+			  <span class="icons">
+				  <a-icon class="aicon" type="camera" />
+			  </span>
+		  </div>
+		  <!-- 图片列表 -->
+		  <div class="imglist">
+			  <div>
+				  <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
+				  <a-icon class="aicon" type="close-circle" />
+			  </div>
+			  <div>
+				  <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
+				  <a-icon class="aicon" type="close-circle" />
+			  </div>
+		  </div>
+		  <!-- 提交 -->
+		  <div class="f-btns">
+			  <a-button size="large" type="primary" block> 提交 </a-button>
+		  </div>
+	  </div>
+	</a-drawer>
   </div>
 <script>
 	var vm = new Vue({
 	  el: '#app',
 	  data: {
 		  player: null,
-		  showYt: false,
-		  showYtbtns: false
+		  showYt: false, // 显示云台控制
+		  showYtbtns: false,
+		  showPz: false,// 显示拍照弹框
 		},
 		mounted () {
 		  this.videoInit()
@@ -269,13 +262,13 @@
 			      }
 			    ]
 			  }, function (player) {
-			    _this.sendMsg('The player is created')
+			    _this.sendMsg('message','The player is created')
 			  }
 			  )
 			  /* h5截图按钮, 截图成功回调 */
 			  _this.player.on('snapshoted', function (data) {
 			    const pictureData = data.paramData.base64
-			    _this.sendMsg('截图成功回调')
+			    _this.sendMsg('snapshoted','截图成功回调')
 			  })
 			  // 控制栏
 			  _this.player.on('playing', function () {
@@ -286,10 +279,10 @@
 			  })
 		  },
 		  // 发送消息给app
-		  sendMsg (msg) {
+		  sendMsg (action,msg) {
 		    uni.postMessage({
 		      data: {
-		        action: 'message',
+		        action: action,
 		        msg: msg
 		      }
 		    })
@@ -301,16 +294,15 @@
 		  // 控制云台
 		  kzYt (index) {
 		    const cmd = ['left', 'right', 'up', 'down']
-		    this.sendMsg('控制云台' + cmd[index - 1])
+		    this.sendMsg('kzyt','控制云台' + cmd[index - 1])
+		  },
+		  // 打开拍照
+		  openCamera(){
+			 this.showPz = true
 		  },
-		  // 修改分数
-		  openEditFs(){
-			   this.$confirm({
-				  title: 'Confirm',
-				  content: 'Bla bla ...',
-				  okText: '确认',
-				  cancelText: '取消',
-				});
+		  // 关闭拍照弹框
+		  onClosePz(){
+			  this.showPz = false
 		  }
 		}
 	})

+ 4 - 2
pages/index/index.vue

@@ -13,13 +13,15 @@ export default {
 			wv: null
 		};
 	},
-	onLoad() {},
+	onLoad() {
+		let _this = this
+	},
 	methods: {
 		openVideo() {
 			 uni.navigateTo({
 			 	url:"/pages/shopTour/shopTour"
 			 })
-		}
+		},
 	}
 };
 </script>

+ 2 - 1
pages/shopTour/shopTour.vue

@@ -8,12 +8,13 @@
 	export default {
 		data() {
 			return {
-				wv: null
+				wv: null,
 			};
 		},
 		methods: {
 			onmessage(event) {
 				console.log(event.detail.data, 'event');
+				let data = event.detail.data[0]
 			}
 		},
 		onNavigationBarButtonTap(e) {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 2
unpackage/dist/dev/app-plus/app-service.js


+ 83 - 5
unpackage/dist/dev/app-plus/hybrid/html/css/styles.less

@@ -20,13 +20,11 @@ body{
       .checkWork-head{
         position: relative;
         .checkWork-head-row{
-          display: flex;
-          align-items: center;
-          border-bottom: 1px solid #eee;
           &:first-child{
             > div{
               display: flex;
               align-items: center;
+			  width: 100%;
               > div{
                 &:last-child{
                   flex-grow: 1;
@@ -35,14 +33,23 @@ body{
             }
           }
           > div{
-            width: 50%;
+            width: 100%;
             padding: 5px 10px;
+			display: flex;
+			align-items: center;
             &:first-child{
-              border-right: 1px solid #eee;
+              border-bottom: 1px solid #eee;
             }
             > div{
+			  width: 33.3%;
               padding: 3px 0;
             }
+			.ant-dropdown-link{
+				width: 100%;
+				display: block;
+				text-align: right;
+				color: #666666;
+			}
           }
         }
       }
@@ -76,6 +83,15 @@ body{
             margin-bottom: 10px;
             border-radius: 5px;
             box-shadow: 1px 1px 3px #eee;
+			.photos{
+			  span{
+				  border: 1px solid #eee;
+			  }
+			  display: block;
+			  > div{
+				  display: inline-block;
+			  }
+			}
             > div{
               display: flex;
               align-items: center;
@@ -84,6 +100,20 @@ body{
                 &:first-child{
                   flex-grow: 1;
                 }
+				.anticon{
+					font-size: 30px;
+					color: #666;
+					margin-left: 15px;
+				}
+				.choose-bhs{
+					color: #13C2C2;
+				}
+				.choose-bhg{
+					color: #ff0000;
+				}
+				.choose-hg{
+					color: #00be00;
+				}
               }
             }
           }
@@ -145,4 +175,52 @@ body{
     .prism-player .prism-controlbar{
       background: rgba(0, 0, 0, 0.5);
     }
+  }
+  
+  // 拍照弹框
+  .pzPopus{
+	  .pz-pinglun{
+		  position: relative;
+		  .icons{
+			  position: absolute;
+			  right: 15px;
+			  top: 50%;
+			  margin-top: -26px;
+			  z-index: 1000;
+			  border: 1px solid #eee;
+			  padding: 10px;
+			  border-radius: 100%;
+			  .aicon{
+				  font-size: 30px;
+				  color: #999;
+			  }
+		  }
+	  }
+	  .imglist{
+		  display: flex;
+		  align-items: center;
+		  flex-wrap: wrap;
+		  padding: 30px 0;
+		  > div{
+			  position: relative;
+			  padding: 3px;
+			  border: 1px solid #eee;
+			  border-radius: 5px;
+			  margin-right: 15px;
+			  img{
+				  width: 45px;
+				  height: 45px;
+			  }
+			  .aicon{
+				  position: absolute;
+				  right: -8px;
+				  top: -8px;
+				  color: red;
+				  font-size: 16px;
+			  }
+		  }
+	  }
+	  .f-btns{
+		  padding: 10px 20px;
+	  }
   }

+ 71 - 79
unpackage/dist/dev/app-plus/hybrid/html/video.html

@@ -49,12 +49,14 @@
                   <a-menu-item key="4"> 维修工位 </a-menu-item>
                   <a-menu-item key="5"> 客户休息区 </a-menu-item>
                 </a-menu>
-                <a-button block> 收银台 <a-icon type="down" /> </a-button>
+				<a class="ant-dropdown-link" @click="e => e.preventDefault()">
+				  收银台 <a-icon type="right" />
+				</a>
               </a-dropdown>
             </div>
           </div>
           <!-- 预置位 -->
-          <div>
+          <!-- <div>
             <div>预置位:</div>
             <div>
               <a-dropdown>
@@ -66,13 +68,13 @@
                 <a-button block> 请选择 <a-icon type="down" /> </a-button>
               </a-dropdown>
             </div>
-          </div>
+          </div> -->
         </div>
         <div class="checkWork-head-row">
           <div>
             <div>进度:2/13</div>
             <div>耗时:3时5分钟</div>
-            <div>得分:10.2/22.3</div>
+            <!-- <div>得分:10.2/22.3</div> -->
           </div>
           <div>
             <div>不适用:0</div>
@@ -121,86 +123,77 @@
           <div class="tabCons-items">
             <div>
               <div><b>正常营业</b></div>
-              <div><a-icon type="camera" style="font-size: 30px;" /></div>
+			  <!-- 点击打开拍照 -->
+              <div @click="openCamera()"><a-icon type="camera" style="font-size: 30px;" /></div>
             </div>
+			<!-- 拍照图片 -->
+			<div class="photos">
+				<div><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+				<div><a-avatar :size="40" shape="square" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" /></div>
+			</div>
+			<!-- 评分 -->
             <div>
-              <div>分值:10 <a-icon @click="openEditFs" type="edit" style="font-size: 20px;margin-left: 10px;"/></div>
+              <div><!-- 分值:10 <a-icon @click="openEditFs" type="edit" style="font-size: 20px;margin-left: 10px;"/> --></div>
               <div>
-                <a-icon type="minus-circle" style="font-size: 30px;color: #13C2C2;margin-right: 15px;"/>
+				  <!-- 不适用 -->
+                <a-icon type="minus-circle" class="choose-bhs"/>
               </div>
 			  <div>
-				  <a-icon type="close-circle" style="font-size: 30px;color: #ff0000;margin-right: 15px;"/>
+				  <!-- 不合格 -->
+				  <a-icon type="close-circle" class="choose-bhg"/>
 			  </div>
 			  <div>
-				  <a-icon type="check-circle" style="font-size: 30px;color: #00be00;"/>
+				  <!-- 合格 -->
+				  <a-icon type="check-circle" class="choose-hg"/>
 			  </div>
             </div>
           </div>
-          <div class="tabCons-items">
-            <div>
-              <div><b>正常营业</b></div>
-              <div><a-icon type="camera" style="font-size: 30px;" /></div>
-            </div>
-            <div>
-              <div>分值:10 <a-icon type="edit" style="font-size: 20px;margin-left: 10px;"/></div>
-              <div>
-                <a-icon type="minus-circle" style="font-size: 30px;color: #13C2C2;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="close-circle" style="font-size: 30px;color: #ff0000;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="check-circle" style="font-size: 30px;color: #00be00;"/>
-              </div>
-            </div>
-          </div>
-          <div class="tabCons-items">
-            <div>
-              <div><b>正常营业</b></div>
-              <div><a-icon type="camera" style="font-size: 30px;" /></div>
-            </div>
-            <div>
-              <div>分值:10 <a-icon type="edit" style="font-size: 20px;margin-left: 10px;"/></div>
-              <div>
-                <a-icon type="minus-circle" style="font-size: 30px;color: #13C2C2;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="close-circle" style="font-size: 30px;color: #ff0000;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="check-circle" style="font-size: 30px;color: #00be00;"/>
-              </div>
-            </div>
-          </div>
-          <div class="tabCons-items">
-            <div>
-              <div><b>正常营业</b></div>
-              <div><a-icon type="camera" style="font-size: 30px;" /></div>
-            </div>
-            <div>
-              <div>分值:10 <a-icon type="edit" style="font-size: 20px;margin-left: 10px;"/></div>
-              <div>
-                <a-icon type="minus-circle" style="font-size: 30px;color: #13C2C2;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="close-circle" style="font-size: 30px;color: #ff0000;margin-right: 15px;"/>
-              </div>
-              <div>
-            	  <a-icon type="check-circle" style="font-size: 30px;color: #00be00;"/>
-              </div>
-            </div>
-          </div>
-        </div>
+		  </div>
       </div>
     </div>
+	<!-- 拍照弹框 -->
+	<a-drawer
+	  title="快拍"
+	  placement="bottom"
+	  :closable="true"
+	  :visible="showPz"
+	  @close="onClosePz"
+	  :height="360"
+	>
+	  <div class="pzPopus">
+		  <!-- 评论 -->
+		  <div class="pz-pinglun">
+			  <div><a-textarea placeholder="请填写备注内容(选填)" :rows="4" /></div>
+			  <span class="icons">
+				  <a-icon class="aicon" type="camera" />
+			  </span>
+		  </div>
+		  <!-- 图片列表 -->
+		  <div class="imglist">
+			  <div>
+				  <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
+				  <a-icon class="aicon" type="close-circle" />
+			  </div>
+			  <div>
+				  <img src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png">
+				  <a-icon class="aicon" type="close-circle" />
+			  </div>
+		  </div>
+		  <!-- 提交 -->
+		  <div class="f-btns">
+			  <a-button size="large" type="primary" block> 提交 </a-button>
+		  </div>
+	  </div>
+	</a-drawer>
   </div>
 <script>
 	var vm = new Vue({
 	  el: '#app',
 	  data: {
 		  player: null,
-		  showYt: false,
-		  showYtbtns: false
+		  showYt: false, // 显示云台控制
+		  showYtbtns: false,
+		  showPz: false,// 显示拍照弹框
 		},
 		mounted () {
 		  this.videoInit()
@@ -269,13 +262,13 @@
 			      }
 			    ]
 			  }, function (player) {
-			    _this.sendMsg('The player is created')
+			    _this.sendMsg('message','The player is created')
 			  }
 			  )
 			  /* h5截图按钮, 截图成功回调 */
 			  _this.player.on('snapshoted', function (data) {
 			    const pictureData = data.paramData.base64
-			    _this.sendMsg('截图成功回调')
+			    _this.sendMsg('snapshoted','截图成功回调')
 			  })
 			  // 控制栏
 			  _this.player.on('playing', function () {
@@ -286,10 +279,10 @@
 			  })
 		  },
 		  // 发送消息给app
-		  sendMsg (msg) {
+		  sendMsg (action,msg) {
 		    uni.postMessage({
 		      data: {
-		        action: 'message',
+		        action: action,
 		        msg: msg
 		      }
 		    })
@@ -301,16 +294,15 @@
 		  // 控制云台
 		  kzYt (index) {
 		    const cmd = ['left', 'right', 'up', 'down']
-		    this.sendMsg('控制云台' + cmd[index - 1])
+		    this.sendMsg('kzyt','控制云台' + cmd[index - 1])
+		  },
+		  // 打开拍照
+		  openCamera(){
+			 this.showPz = true
 		  },
-		  // 修改分数
-		  openEditFs(){
-			   this.$confirm({
-				  title: 'Confirm',
-				  content: 'Bla bla ...',
-				  okText: '确认',
-				  cancelText: '取消',
-				});
+		  // 关闭拍照弹框
+		  onClosePz(){
+			  this.showPz = false
 		  }
 		}
 	})

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio