Commit 9578e392 authored by 郭晓清's avatar 郭晓清

误提交代码回滚

parent da86b864
...@@ -159,7 +159,7 @@ export default { ...@@ -159,7 +159,7 @@ export default {
setUserData(userInfo) { setUserData(userInfo) {
if (userInfo && userInfo.token) { 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_user', userInfo);
this.$u.vuex('vuex_wx_uid', userInfo.wxopenid); this.$u.vuex('vuex_wx_uid', userInfo.wxopenid);
} else { } else {
......
...@@ -181,10 +181,9 @@ export default { ...@@ -181,10 +181,9 @@ export default {
}, },
setUserData(userInfo) { setUserData(userInfo) {
if (userInfo && userInfo.token) { if (userInfo && userInfo.token) {
debugger
// 如果已经登录则直接获取相关信息 // 如果已经登录则直接获取相关信息
util.setOpenid(userInfo.wxopenid); util.setOpenid(userInfo.wxopenid);
this.$u.vuex('vuex_token',"RTOKENf22df8e7b9db396f560e8f61bebceea2000cb05c" ); // userInfo.token this.$u.vuex('vuex_token',userInfo.token );
uni.setStorageSync("user-info", userInfo); uni.setStorageSync("user-info", userInfo);
} else { } else {
this.$u.vuex('vuex_token', ''); this.$u.vuex('vuex_token', '');
......
...@@ -112,19 +112,19 @@ ...@@ -112,19 +112,19 @@
</view> </view>
</view> </view>
<take-photo type="test" v-if="takeStatus" @close="closeTake"></take-photo> <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> </view>
</template> </template>
<script> <script>
import appointTime from '@/components/appoint/appoint-time.vue' import appointTime from '@/components/appoint/appoint-time.vue'
import takePhoto from '@/components/take/index.vue' import takePhoto from '@/components/take/index.vue'
// import PopView from "@/components/popView/index.vue" import PopView from "@/components/popView/index.vue"
export default { export default {
components: { components: {
appointTime, appointTime,
'take-photo': takePhoto, 'take-photo': takePhoto,
// PopView PopView
}, },
data() { data() {
return { return {
...@@ -136,6 +136,7 @@ ...@@ -136,6 +136,7 @@
// backgroundSize: 'cover', // backgroundSize: 'cover',
// 渐变色 // 渐变色
}, },
visibale: false,
orderId: null, orderId: null,
order: {}, order: {},
allowRejection: false, // 允许拒单 allowRejection: false, // 允许拒单
...@@ -221,6 +222,7 @@ ...@@ -221,6 +222,7 @@
console.log("===", res.data) console.log("===", res.data)
self.order = res.data self.order = res.data
this.getCurrentBtn() this.getCurrentBtn()
this.visibale = true
// self.order.operationType = "accept" // self.order.operationType = "accept"
// }else{ // }else{
// self.order.operationType = "appointment" // self.order.operationType = "appointment"
...@@ -439,6 +441,12 @@ ...@@ -439,6 +441,12 @@
this.btnClass='timeOut-btn' this.btnClass='timeOut-btn'
self.$refs['uCountDown'].seconds += 2 self.$refs['uCountDown'].seconds += 2
} }
},handleClick(){
this.visibale = false
// 去完工
uni.navigateTo({
url: 'pages/photo/list'
})
} }
} }
}; };
......
...@@ -182,6 +182,7 @@ ...@@ -182,6 +182,7 @@
submissionTime: '2021.04.19 16:24:48', // 提交时间 submissionTime: '2021.04.19 16:24:48', // 提交时间
auditResults: {}, // 审核结果 auditResults: {}, // 审核结果
orderBusinessType: 'R', // 业务类型 R 为抢单 orderBusinessType: 'R', // 业务类型 R 为抢单
orderId:'1100000216'
}] }]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment