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

edit-gitignore

parents 8f91adc3 7079ba13
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
icon_noData:'https://qn-static.banshouhui.com/empty.png', icon_noData:'https://qn-static.banshouhui.com/empty.png',
//抢单 图标 //抢单 图标
icon_rob:'https://qn-static.banshouhui.com/take_order/icon/rob.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获取用户信息(登录) //通过code获取用户信息(登录)
......
...@@ -14,13 +14,19 @@ ...@@ -14,13 +14,19 @@
}, },
{ {
"path": "pages/take/detail", "path": "pages/take/finish",
"style": { "style": {
"navigationBarTitleText": "接单详情" "navigationBarTitleText": "完工信息"
} }
}, },
{
"path": "pages/take/detail",
"style": {
"navigationBarTitleText": "接单详情"
}
},
{ {
"path": "pages/index/index", "path": "pages/index/index",
...@@ -62,15 +68,7 @@ ...@@ -62,15 +68,7 @@
"navigationBarTitleText": "授权登录" "navigationBarTitleText": "授权登录"
} }
},
{
"path": "pages/take/finish",
"style": {
"navigationBarTitleText": "完工信息"
} }
}
], ],
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<text class="contentText u-m-l-20" v-if="orderInfo.guaranteeExplain">{{orderInfo.guaranteeExplain}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.guaranteeExplain">{{orderInfo.guaranteeExplain}}</text>
</view> </view>
</view> </view>
<view class="bottomView" v-if="orderInfo.status != '已完工'"> <view class="bottomView" v-if="orderInfo.statusText != '已完工'">
<view class="bottomLeftView" @click="cancelClick()"> <view class="bottomLeftView" @click="cancelClick()">
<text class="u-font-28 gray66">退单</text> <text class="u-font-28 gray66">退单</text>
</view> </view>
...@@ -97,6 +97,7 @@ ...@@ -97,6 +97,7 @@
export default { export default {
data() { data() {
return { return {
orderId:'',
orderInfo:{}, orderInfo:{},
photoList:[ photoList:[
{image:''},{image:''},{image:''},{image:''}, {image:''},{image:''},{image:''},{image:''},
...@@ -110,6 +111,7 @@ ...@@ -110,6 +111,7 @@
if(e && e.orderId){ if(e && e.orderId){
this.orderId = e.orderId this.orderId = e.orderId
} }
this.domain_name = getApp().globalData.domain_Name this.domain_name = getApp().globalData.domain_Name
//this.orderId = '10704466' //this.orderId = '10704466'
//getApp().globalData.token = 'RTOKENc9496ce49b2dc61bbae67968979af4f19e0dfad0' //getApp().globalData.token = 'RTOKENc9496ce49b2dc61bbae67968979af4f19e0dfad0'
...@@ -176,11 +178,62 @@ ...@@ -176,11 +178,62 @@
cancelClick: function () { cancelClick: function () {
console.log('退单点击') 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 () { finishClick: function () {
uni.navigateTo({ uni.navigateTo({
url: '/pages/take/finish' 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 @@ ...@@ -143,7 +143,7 @@
onShow() { onShow() {
//this.getData(); /*
uni.getStorage({ uni.getStorage({
key: 'token', key: 'token',
success: function (res) { success: function (res) {
...@@ -156,10 +156,16 @@ ...@@ -156,10 +156,16 @@
}) })
this.getData() this.getData()
*/
this.getToken()
}, },
async getToken () {
methods: {
async getToken () {
await uni.getStorage({ await uni.getStorage({
key: 'token', key: 'token',
success: function (res) { success: function (res) {
...@@ -172,12 +178,8 @@ ...@@ -172,12 +178,8 @@
}) })
await this.getData() await this.getData()
}, },
methods: {
//获取数据 //获取数据
getData: function () { getData: function () {
...@@ -325,20 +327,23 @@ ...@@ -325,20 +327,23 @@
}) })
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: '/pages/take/detail'+'?orderId='+item.orderId url: '/pages/take/detail'
+'?orderId='+item.orderId,
}) })
} }
} }
if(this.activeTop==1){ if(this.activeTop==1){
uni.navigateTo({ uni.navigateTo({
url: '/pages/take/detail'+'?orderId='+item.orderId url: '/pages/take/detail'
+'?orderId='+item.orderId,
}) })
} }
if(this.activeTop==2){ if(this.activeTop==2){
uni.navigateTo({ 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