Skip to content

F
FlashMan
Commit b3ae30ea authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

取消订单

parent 3b52ed93
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 58 deletions
app.js
View file @ b3ae30ea
//app.js //app.js
let md5 = require('utils/md5.js') let md5 = require('utils/md5.js')
// let javaUrl = 'https://efficient.oytour.com/';
let javaUrl = 'http://47.96.12.235:9001/';
// let netUrl = 'https://reborn.oytour.com/api/common/post';
let netUrl = 'http://192.168.2.214:8082/api/Common/Post';
App({ App({
// 小程序初始化时 // 小程序初始化时
onLaunch: function(options) { onLaunch: function(options) {
...@@ -51,11 +54,7 @@ App({ ...@@ -51,11 +54,7 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '') let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
wx.request({ wx.request({
// url: 'http://192.168.2.214:8082/api/Common/Post', url: netUrl,
// url: 'http://192.168.2.16:8083/api/Common/Post',
url: 'https://reborn.oytour.com/api/common/post', //线上
// url: ' http://test.viitto.com/api/common/post',
method: 'POST', method: 'POST',
data: { data: {
cmd: url, cmd: url,
...@@ -91,11 +90,7 @@ App({ ...@@ -91,11 +90,7 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '') let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
wx.request({ wx.request({
// url: 'http://192.168.2.214:8082/api/Common/Post', url: netUrl,
// url: 'http://192.168.2.16:8283/api/Common/Post', //春姐
url: 'https://reborn.oytour.com/api/common/post', //线上
// url: ' http://test.viitto.com/api/common/post',
method: 'POST', method: 'POST',
data: { data: {
cmd: url, cmd: url,
...@@ -123,10 +118,7 @@ App({ ...@@ -123,10 +118,7 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey) let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
wx.request({ wx.request({
url: 'https://efficient.oytour.com/' + url, //线上 url: javaUrl + url,
// url: 'http://47.96.12.235:9001/' + url, //测试
// url: 'http://192.168.2.215:9000/'+ url,
method: 'POST', method: 'POST',
data: { data: {
msg: msg, msg: msg,
...@@ -140,15 +132,7 @@ App({ ...@@ -140,15 +132,7 @@ App({
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
resolve(res.data); resolve(res.data);
} else if (res.data.resultCode === 10000 || res.data.resultCode === 10001) { } else if (res.data.resultCode === 10000 || res.data.resultCode === 10001) {
// wx.reLaunch({
// url: '/pages/login/login'
// })
// wx.showToast({
// title: res.data.message,
// icon: 'none',
// duration: 1000
// })
// reject(res.data)
} else { } else {
wx.showToast({ wx.showToast({
title: res.data.message, title: res.data.message,
...@@ -175,10 +159,7 @@ App({ ...@@ -175,10 +159,7 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey) let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
wx.request({ wx.request({
url: 'https://efficient.oytour.com/'+ url, //线上 url: javaUrl + url,
// url: 'http://47.96.12.235:9001/' + url, //测试
// url: 'http://192.168.2.215:9000/'+ url,
method: 'POST', method: 'POST',
data: { data: {
msg: msg, msg: msg,
...@@ -192,15 +173,7 @@ App({ ...@@ -192,15 +173,7 @@ App({
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
resolve(res.data.data); resolve(res.data.data);
} else if (res.data.resultCode === 10000 || res.data.resultCode === 10001) { } else if (res.data.resultCode === 10000 || res.data.resultCode === 10001) {
// wx.reLaunch({
// url: '/pages/login/login'
// })
// wx.showToast({
// title: res.data.message,
// icon: 'none',
// duration: 1000
// })
// reject(res.data)
} else { } else {
wx.showToast({ wx.showToast({
title: res.data.message, title: res.data.message,
...@@ -224,9 +197,7 @@ App({ ...@@ -224,9 +197,7 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey) let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
wx.request({ wx.request({
url: 'https://efficient.oytour.com/'+ url, //线上 url: javaUrl + url,
// url: 'http://47.96.12.235:9001/' + url, //测试
method: 'POST', method: 'POST',
data: { data: {
msg: msg, msg: msg,
...@@ -241,9 +212,7 @@ App({ ...@@ -241,9 +212,7 @@ App({
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
resolve(res.data.data); resolve(res.data.data);
} else if (res.data.resultCode === 10000 || res.data.resultCode === 10001) { } else if (res.data.resultCode === 10000 || res.data.resultCode === 10001) {
// wx.reLaunch({
// url: '/pages/login/login'
// })
} else { } else {
wx.showToast({ wx.showToast({
title: res.data.message, title: res.data.message,
......
pages/member/orderCenter/orderCenter.js
View file @ b3ae30ea
...@@ -118,6 +118,45 @@ Page({ ...@@ -118,6 +118,45 @@ Page({
tagID: 4, tagID: 4,
tagIndex: 0, tagIndex: 0,
}, },
//tc
cancelTCOrder: function(id){
app.$api('sellorder_post_B2BRemoveOrder', { ID: id, }).then(res => {
this.getOrderList()
}).catch(err => {})
},
//all
cancelAllOrder: function (id, url) {
app.$apiJavaNew(url, { orderId: id}).then(res => {
this.getOrderList()
}).catch(err => { })
},
cancleOrder: function(e){
let id = e.currentTarget.dataset.id,
type = e.currentTarget.dataset.type,
url = 'api/b2b/visa/cancelVisaOrder',
_this = this;
wx.showModal({
title: '提示',
content: '是否取消订单',
success(res) {
if (res.confirm) {
if (type == 'group' || type == 'tk') {
_this.cancelTCOrder(id)
} else if (type == 'visa'){
_this.cancelAllOrder(id, url)
} else if (type == 'meishi'){
url = 'api/b2b/food/cancelFoodOrder'
_this.cancelAllOrder(id, url)
} else if (type == 'menpiao') {
url = 'api/b2b/scenic/cancelTicketCouponsOrder'
_this.cancelAllOrder(id, url)
}
} else if (res.cancel) {
}
}
})
},
// 团 支付跳转 // 团 支付跳转
goTuanPay(e) { goTuanPay(e) {
let payInfoMsg = e.currentTarget.dataset.item; let payInfoMsg = e.currentTarget.dataset.item;
......
pages/member/orderCenter/orderCenter.wxml
View file @ b3ae30ea
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<text wx:elif="{{item.orderState == 2}}">待付尾款</text> <text wx:elif="{{item.orderState == 2}}">待付尾款</text>
<text wx:elif="{{item.orderState == 3}}">待发团</text> <text wx:elif="{{item.orderState == 3}}">待发团</text>
<text wx:elif="{{item.orderState == 4}}">交易完成</text> <text wx:elif="{{item.orderState == 4}}">交易完成</text>
<text wx:elif="{{item.orderState == 5}}">取消</text> <text wx:elif="{{item.orderState == 5}}" >取消</text>
</view> </view>
<view class='list-item-info' data-index='{{index}}' bindtap='formSubmit'> <view class='list-item-info' data-index='{{index}}' bindtap='formSubmit'>
<view class='list-item-name'>{{item.title}}</view> <view class='list-item-name'>{{item.title}}</view>
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
</view> </view>
</view> </view>
<view class='list-item-btn'> <view class='list-item-btn'>
<view wx:if="{{item.orderState == 1}}">联系客服</view> <!-- <view wx:if="{{item.orderState == 1}}">联系客服</view> -->
<view wx:if="{{item.orderState == 3 || item.orderState == 2}}">取消订单</view> <view wx:if="{{item.orderState == 3 || item.orderState == 2}}" data-type='group' bindtap='cancleOrder' data-id='{{item.orderId}}'>取消订单</view>
<view catchtap="goTuanPay" data-item="{{item}}" wx:if="{{item.orderState == 1 || item.orderState == 2}}" class='btn-red'>付款</view> <view catchtap="goTuanPay" data-item="{{item}}" wx:if="{{item.orderState == 1 || item.orderState == 2}}" class='btn-red'>付款</view>
<!-- <view class='btn-red'>确认收货</view> --> <!-- <view class='btn-red'>确认收货</view> -->
<view class='btn-red' wx:if="{{item.orderState == 5 || item.orderState == 4}}">再次购买</view> <!-- <view class='btn-red' wx:if="{{item.orderState == 5 || item.orderState == 4}}">再次购买</view> -->
</view> </view>
<!-- </button> <!-- </button>
</form> --> </form> -->
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
</view> </view>
</view> </view>
<view class='list-item-btn'> <view class='list-item-btn'>
<view wx:if="{{item.visaOrderStatus == 1}}">联系客服</view> <!-- <view wx:if="{{item.visaOrderStatus == 1}}">联系客服</view> -->
<view bindtap="exitVisa" data-item="{{item}}" wx:if="{{item.visaOrderStatus == 1 || item.visaOrderStatus == 3}}">取消订单</view> <view bindtap="exitVisa" data-item="{{item}}" wx:if="{{item.visaOrderStatus == 1 || item.visaOrderStatus == 3}}" bindtap='cancleOrder' data-id='{{item.orderId}}' data-type='visa'>取消订单</view>
<view bindtap="goCommonPay" data-item="{{item}}" wx:if="{{item.visaOrderStatus == 3}}" class='btn-red'>付款</view> <view bindtap="goCommonPay" data-item="{{item}}" wx:if="{{item.visaOrderStatus == 3}}" class='btn-red'>付款</view>
<!-- <view class='btn-red'>确认收货</view> --> <!-- <view class='btn-red'>确认收货</view> -->
<!-- <view class='btn-red' wx:if="{{item.orderState == 5 || item.orderState == 4}}">再次购买</view> --> <!-- <view class='btn-red' wx:if="{{item.orderState == 5 || item.orderState == 4}}">再次购买</view> -->
...@@ -102,10 +102,10 @@ ...@@ -102,10 +102,10 @@
</view> </view>
</view> </view>
<view class='list-item-btn'> <view class='list-item-btn'>
<view wx:if="{{item.status == 1}}">联系客服</view> <!-- <view wx:if="{{item.status == 1}}">联系客服</view> -->
<view wx:if="{{item.status == 1 || item.status == 3}}">取消订单</view> <view wx:if="{{item.status == 1 || item.status == 3}}" bindtap='cancleOrder' data-type='meishi' data-id='{{item.orderId}}'>取消订单</view>
<view bindtap="goCommonPay" data-item="{{item}}" wx:if="{{item.status == 3}}" class='btn-red'>付款</view> <view bindtap="goCommonPay" data-item="{{item}}" wx:if="{{item.status == 3}}" class='btn-red'>付款</view>
<view class='btn-red' wx:if="{{item.orderState == 1}}">再次购买</view> <!-- <view class='btn-red' wx:if="{{item.orderState == 1}}">再次购买</view> -->
</view> </view>
<!-- </button> <!-- </button>
</form> --> </form> -->
...@@ -132,10 +132,10 @@ ...@@ -132,10 +132,10 @@
</view> </view>
</view> </view>
<view class='list-item-btn'> <view class='list-item-btn'>
<view wx:if="{{item.status == 1}}">联系客服</view> <!-- <view wx:if="{{item.status == 1}}">联系客服</view> -->
<view wx:if="{{item.status == 1 || item.status == 3}}">取消订单</view> <view wx:if="{{item.status == 1 || item.status == 3}}" bindtap='cancleOrder' data-type='menpiao' data-id='{{item.id}}'>取消订单</view>
<view bindtap="goCommonPay" data-item="{{item}}" wx:if="{{item.status == 3}}" class='btn-red'>付款</view> <view bindtap="goCommonPay" data-item="{{item}}" wx:if="{{item.status == 3}}" class='btn-red'>付款</view>
<view class='btn-red' wx:if="{{item.orderState == 1}}">再次购买</view> <!-- <view class='btn-red' wx:if="{{item.orderState == 1}}">再次购买</view> -->
</view> </view>
<!-- </button> <!-- </button>
</form> --> </form> -->
...@@ -170,10 +170,10 @@ ...@@ -170,10 +170,10 @@
</view> </view>
</view> </view>
<view class='list-item-btn'> <view class='list-item-btn'>
<view wx:if="{{item.orderState == 1}}">联系客服</view> <!-- <view wx:if="{{item.orderState == 1}}">联系客服</view> -->
<view wx:if="{{item.orderState == 1}}">取消订单</view> <view wx:if="{{item.orderState == 0}}" bindtap='cancleOrder' data-type='tk' data-id='{{item.orderId}}'>取消订单</view>
<view bindtap="airTicketPay" data-item="{{item}}" wx:if="{{item.orderState == 1}}" class='btn-red'>付款</view> <view bindtap="airTicketPay" data-item="{{item}}" wx:if="{{item.orderState == 1}}" class='btn-red'>付款</view>
<view class='btn-red' wx:if="{{item.orderState == 2}}">再次购买</view> <!-- <view class='btn-red' wx:if="{{item.orderState == 2}}">再次购买</view> -->
</view> </view>
<!-- </button> <!-- </button>
</form> --> </form> -->
......
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