最新代码,测试环境

This commit is contained in:
2023-07-12 10:30:37 +08:00
8 changed files with 631 additions and 564 deletions

View File

@@ -61,6 +61,25 @@ const orderCancel = order => {
})
}
// 核验列表
const codes = code => {
return request({
url : "empower/code",
data : { code },
method : "POST",
})
}
// 确认核验
const sign = item_id => {
return request({
url : "empower/code/sign",
data : { item_id },
method : "POST",
})
}
export {
lists,
info,
@@ -68,6 +87,8 @@ export {
buy,
orderInit,
orderList,
orderCancel
orderCancel,
codes,
sign
}

View File

@@ -154,6 +154,28 @@ const synDiffDg = (diff_price_id, data) =>{
})
}
// 公共收银台支付
const payWechat = data => {
return request({
url: "pay/cashier_desk/wechat",
method: 'POST',
data
})
}
const payUms = data => {
return request({
url: "pay/cashier_desk/ums",
method: 'POST',
data
})
}
const payDg = data => {
return request({
url: "pay/cashier_desk/dg",
method: 'POST',
data
})
}
export {
ums,
@@ -176,6 +198,11 @@ export {
entrustDg,
synDiffPay,
synDiffUms,
synDiffDg
synDiffDg,
// 综合收银台
payWechat,
payUms,
payDg
}

View File

@@ -642,7 +642,7 @@
"style" :{
"navigationBarTitleText": "赋能订单",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#FFF"
"navigationBarBackgroundColor": "#FFFFFF"
}
}
],

View File

@@ -53,20 +53,20 @@
<view class="orders-content-item">
<label>支付金额</label>
<view class="nowrap">{{item.price}}</view>
</view>
<view class="orders-content-item">
<label>下单时间</label>
<view class="nowrap">{{item.created_at}}</view>
</view>
<view class="orders-content-item" v-if="item.paid_at != ''">
<label>支付时间</label>
<view class="nowrap">{{item.paid_at}}</view>
</view>
<view class="orders-content-item">
<label>下单时间</label>
<view class="nowrap">{{item.created_at}}</view>
</view>
<view class="orders-content-item" v-if="item.paid_at != ''">
<label>支付时间</label>
<view class="nowrap">{{item.paid_at}}</view>
</view>
</view>
<view class="orders-flex">
<view class="btns">
<view class="btns-item btns-border" v-if="item.status == 0" @click="onCancel(item.order_id)">取消</view>
<view class="btns-item btns-border" v-if="item.status == 0">支付</view>
<view class="btns-item btns-border" v-if="item.status == 0" @click="onPay(item)">支付</view>
<view class="btns-item" @click="onShowUsers(item.items)">报名信息</view>
</view>
</view>
@@ -228,6 +228,22 @@
if(ListIndex >= 0){
this.orders.splice(ListIndex, 1)
}
},
// 订单支付
onPay(obj){
let { order_id, order_type, price } = obj
console.log(obj)
this.$Router.replace({
name: 'FeePay',
params: {
orderId : order_id,
orderType : order_type,
price : price,
payForm : 'entrust',
}
})
}
},
onReachBottom() {

View File

@@ -88,6 +88,9 @@
};
},
onShow(){
console.log(codes)
codes(this.$Route.query.code).then(res => {
this.vouchers = res;
})

File diff suppressed because it is too large Load Diff

View File

@@ -218,7 +218,10 @@
// 综法订单数据数量
synthesisInfo() {
synthesisCount({channel: 'self'}).then(res => {
synthesisCount({channel: 'self'}).then(res => {
console.log(res)
this.synthesisAll = res
}).catch(err => {
uni.showToast({

View File

@@ -43,7 +43,7 @@ router.beforeEach((to, from, next) => {
})
})
return
}
}
// 检查是否需要登录
if(to.auth && token === ''){