误提交代码回滚

src/App.vue

@@ -159,7 +159,7 @@ export default {
     setUserData(userInfo) {
       if (userInfo && userInfo.token) {
         // 如果已经登录则直接获取相关信息
-		this.$u.vuex('vuex_token',"RTOKENf22df8e7b9db396f560e8f61bebceea2000cb05c" ); // userInfo.token
+		this.$u.vuex('vuex_token',userInfo.token); // RTOKENf22df8e7b9db396f560e8f61bebceea2000cb05c
 		this.$u.vuex('vuex_user', userInfo);
 		this.$u.vuex('vuex_wx_uid', userInfo.wxopenid);
       } else {

src/pages/login/index.vue

@@ -181,10 +181,9 @@ export default {
 		},
 		setUserData(userInfo) {
 		  if (userInfo && userInfo.token) {
-			  debugger
 		    // 如果已经登录则直接获取相关信息
 		    util.setOpenid(userInfo.wxopenid);
-			this.$u.vuex('vuex_token',"RTOKENf22df8e7b9db396f560e8f61bebceea2000cb05c" ); // userInfo.token
+			this.$u.vuex('vuex_token',userInfo.token ); 
 		    uni.setStorageSync("user-info", userInfo);
 		  } else {
 		    this.$u.vuex('vuex_token', '');

src/pages/order/detail.vue

@@ -112,19 +112,19 @@
 			</view>
 		</view>
 		<take-photo type="test" v-if="takeStatus" @close="closeTake"></take-photo>
-		<!-- <PopView title="aaaa" message="bbbb" :visible.sync="visibale" @click="handleClick"/> -->
+		<PopView title="查看交互规范" message="为完善交付质量，请查看对应的交付规范" :visible.sync="visibale" @click="handleClick"/>
 	</view>
 </template>
 
 <script>
 	import appointTime from '@/components/appoint/appoint-time.vue'
 	import takePhoto from '@/components/take/index.vue'
-	// import PopView from "@/components/popView/index.vue"
+	import PopView from "@/components/popView/index.vue"
 	export default {
 		components: {
 			appointTime,
 			'take-photo': takePhoto,
-			// PopView
+			PopView
 		},
 		data() {
 			return {
@@ -136,6 +136,7 @@
 					// backgroundSize: 'cover',
 					// 渐变色
 				},
+				visibale: false,
 				orderId: null,
 				order: {},
 				allowRejection: false, // 允许拒单
@@ -221,6 +222,7 @@
 						console.log("===", res.data)
 						self.order = res.data
 						this.getCurrentBtn()
+						this.visibale = true
 						//  self.order.operationType = "accept"
 						// }else{
 						//   self.order.operationType = "appointment"
@@ -439,6 +441,12 @@
 					this.btnClass='timeOut-btn'
 					self.$refs['uCountDown'].seconds += 2
 				}
+			},handleClick(){
+				this.visibale = false
+				// 去完工
+				uni.navigateTo({
+					url: 'pages/photo/list'
+				})
 			}
 		}
 	};

src/pages/order/index.vue

@@ -182,6 +182,7 @@
 									submissionTime: '2021.04.19  16:24:48', // 提交时间
 									auditResults: {}, // 审核结果
 									orderBusinessType: 'R', // 业务类型 R 为抢单
+									orderId:'1100000216'
 								}]
 							}