Commit c3d7da9c authored by 李俊赕's avatar 李俊赕

edit-gitignore

parents 8f91adc3 7079ba13
......@@ -28,7 +28,8 @@
icon_noData:'https://qn-static.banshouhui.com/empty.png',
//抢单 图标
icon_rob:'https://qn-static.banshouhui.com/take_order/icon/rob.png',
//右箭头 图标
icon_arrow_right:'https://qn-static.banshouhui.com/arrow_right.png',
//登录注册页--
//通过code获取用户信息(登录)
......
......@@ -13,6 +13,14 @@
}
},
{
"path": "pages/take/finish",
"style": {
"navigationBarTitleText": "完工信息"
}
},
{
"path": "pages/take/detail",
"style": {
......@@ -20,8 +28,6 @@
}
},
{
"path": "pages/index/index",
"style": {
......@@ -62,15 +68,7 @@
"navigationBarTitleText": "授权登录"
}
},
{
"path": "pages/take/finish",
"style": {
"navigationBarTitleText": "完工信息"
}
}
}
],
......
......@@ -82,7 +82,7 @@
<text class="contentText u-m-l-20" v-if="orderInfo.guaranteeExplain">{{orderInfo.guaranteeExplain}}</text>
</view>
</view>
<view class="bottomView" v-if="orderInfo.status != '已完工'">
<view class="bottomView" v-if="orderInfo.statusText != '已完工'">
<view class="bottomLeftView" @click="cancelClick()">
<text class="u-font-28 gray66">退单</text>
</view>
......@@ -97,6 +97,7 @@
export default {
data() {
return {
orderId:'',
orderInfo:{},
photoList:[
{image:''},{image:''},{image:''},{image:''},
......@@ -110,6 +111,7 @@
if(e && e.orderId){
this.orderId = e.orderId
}
this.domain_name = getApp().globalData.domain_Name
//this.orderId = '10704466'
//getApp().globalData.token = 'RTOKENc9496ce49b2dc61bbae67968979af4f19e0dfad0'
......@@ -176,11 +178,62 @@
cancelClick: function () {
console.log('退单点击')
uni.request({
url: getApp().globalData.domain_Name
+'/wxh-worker-rest/rest/'
+getApp().globalData.token
+'/order/'+this.orderId+'/workerReject',
method: 'POST',
data: {
rejectReason:'不想接单了',
remark:'不想接单了'
},
header:{
'Content-Type': 'application/x-www-form-urlencoded'
},
success: (res) => {
console.log('退单 成功')
console.log(res)
if(res.data.code==200){
uni.showToast({
title:'退单成功',
})
uni.navigateBack({
})
}else{
uni.showToast({
title:res.data.message
})
}
},
fail: (e) => {
console.log('退单 失败')
console.log(e)
uni.showToast({
title:'退单失败',
})
}
})
},
finishClick: function () {
uni.navigateTo({
url: '/pages/take/finish'
+'?orderId='+this.orderId
+'&inGuaranteePeriod='+this.orderInfo.inGuaranteePeriod
+'&contactName='+this.orderInfo.contactName
+'&contactMobilephone='+this.orderInfo.contactMobilephone
+'&contactAddress='+this.orderInfo.contactAddress
+'&inGuaranteePeriodText='+this.orderInfo.inGuaranteePeriodText
+'&orderServiceType='+this.orderInfo.orderServiceType,
})
},
......
This diff is collapsed.
......@@ -143,7 +143,7 @@
onShow() {
//this.getData();
/*
uni.getStorage({
key: 'token',
success: function (res) {
......@@ -156,28 +156,30 @@
})
this.getData()
*/
this.getToken()
},
async getToken () {
await uni.getStorage({
key: 'token',
success: function (res) {
console.log('本地获取token成功')
console.log(res.data);
getApp().globalData.token = res.data
}
})
await this.getData()
},
methods: {
async getToken () {
await uni.getStorage({
key: 'token',
success: function (res) {
console.log('本地获取token成功')
console.log(res.data);
getApp().globalData.token = res.data
}
})
await this.getData()
},
//获取数据
getData: function () {
......@@ -325,20 +327,23 @@
})
}else{
uni.navigateTo({
url: '/pages/take/detail'+'?orderId='+item.orderId
url: '/pages/take/detail'
+'?orderId='+item.orderId,
})
}
}
if(this.activeTop==1){
uni.navigateTo({
url: '/pages/take/detail'+'?orderId='+item.orderId
url: '/pages/take/detail'
+'?orderId='+item.orderId,
})
}
if(this.activeTop==2){
uni.navigateTo({
url: '/pages/take/detail'+'?orderId='+item.orderId
url: '/pages/take/detail'
+'?orderId='+item.orderId,
})
}
......
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