浏览代码

逻辑修改

lilei 4 年之前
父节点
当前提交
3d3fec771d
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      pages/getOrder/getOrder.vue
  2. 1 1
      pages/index/index.vue
  3. 1 1
      pages/work/index/index.vue

+ 2 - 2
pages/getOrder/getOrder.vue

@@ -63,12 +63,12 @@
 							</view>
 						</view>
 					</view>
-					<view class="read">
+					<view class="read" @click="intoAgreement">
 						<u-radio-group v-model="isRead">
 							<u-radio shape="square" :disabled="isRead!='read'" name="read" active-color="red" icon-size="28" label-size="28">
 								点击阅读并同意
 								<text>无人洗车</text>
-								<text @click="intoAgreement">《注意事项及服务协议》</text>
+								<text>《注意事项及服务协议》</text>
 							</u-radio>
 						</u-radio-group>
 					</view>

+ 1 - 1
pages/index/index.vue

@@ -121,10 +121,10 @@
 		onShow() {
 			console.log(this.$store.state.vuex_orderInfo,'vuex_orderInfo')
 			console.log(this.$store.state.vuex_workStatus,'vuex_workStatus')
+			this.workStatus = this.$store.state.vuex_workStatus
 		},
 		onLoad() {
 			this.getUserLocation()
-			this.workStatus = this.$store.state.vuex_workStatus
 		},
 		methods: {
 			// 如果机器正在运行,提示并点击跳转的运行界面

+ 1 - 1
pages/work/index/index.vue

@@ -163,7 +163,6 @@ export default {
 			if (this.status == 'start') {
 				cmd.operateType = 'start' //操作命令
 				this.$store.commit("$sendWebsocket",JSON.stringify(cmd))
-				this.step= 0;
 				this.showStart = true;
 			}
 			// 急停
@@ -187,6 +186,7 @@ export default {
 			this.$store.state.vuex_workStatus = 'working'
 			this.curWorkStutesText='设备已启动';
 			this.showStart = false;
+			this.step = 0;
 			// 进度条,服务时间根据不同的服务类型而不同
 			let serverTime = this.washDuration/60
 			this.interId = setInterval(()=>{