diff --git a/api/payment.js b/api/payment.js
index 441e510..4d7f58d 100644
--- a/api/payment.js
+++ b/api/payment.js
@@ -42,4 +42,12 @@ export function orderPay(data) {
*/
export function qrcode(data) {
return request.get(`scanPay/qrcode`, data);
+}
+
+
+/**
+ * 收付款详情
+ */
+export function paymentDetail(data) {
+ return request.get(`admin/${data.mer_id}/expenditure`, data);
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 2207d70..bb1dd05 100644
--- a/pages.json
+++ b/pages.json
@@ -295,12 +295,11 @@
}
},
{
- "path" : "pages/redpacket/redpacket",
- "style" :
- {
- "navigationBarTitleText" : "补贴",
- "enablePullDownRefresh" : false
- }
+ "path": "pages/redpacket/redpacket",
+ "style": {
+ "navigationBarTitleText": "补贴",
+ "enablePullDownRefresh": false
+ }
}
],
"subPackages": [{
@@ -323,6 +322,11 @@
"style": {
"navigationBarTitleText": "支付"
}
+ }, {
+ "path": "payment_detail",
+ "style": {
+ "navigationBarTitleText": "收付明细"
+ }
}]
}, {
"root": "pages/goods_cate",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f0d0b71..26c5dfd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,369 +1,379 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{userInfoData.mer_info.mer_name?userInfoData.mer_info.mer_name:'暂无信息'}}
-
-
-
-
-
-
- {{userInfoData.mer_info.type_name}}
-
-
-
-
- 请登录
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{userInfoData.mer_info.mer_name?userInfoData.mer_info.mer_name:'暂无信息'}}
+
+
+
+
+
+
+ {{userInfoData.mer_info.type_name}}
+
+
+
+
+ 请登录
+
+
+
+
+
+
+
+
-
-
-
- {{item.name}}
-
-
- {{item.value}}
-
-
- (次日18点后可提现)
-
-
-
-
-
-
-
- 订单数据统计
+
+
+
+ 订单数据统计
-
-
-
+
+
+
- {{item.user_address}}
-
-
-
-
-
- 备注
- 去发货
-
+
+
+
+
+
+
+
+ 订单编号: {{item.order_sn}}
+
+
+
+
+
+
+ {{item.real_name}} {{ item.user_phone}}
+ {{item.user_address}}
+
+
+
+
+
+ 备注
+ 去发货
+
-
+
-
-
-
+
+
+
-
- {{loadTitle}}
-
+
+ {{loadTitle}}
+
-
+
-
-
-
-
- 订单备注
-
-
-
-
-
-
- 确认提交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{userInfoData.account}}
-
-
-
- {{userInfoData.mer_info.mer_name}}
-
-
-
-
-
+
+
+
+
+ 订单备注
+
+
+
+
+
+
+ 确认提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{userInfoData.account}}
+
+
+
+ {{userInfoData.mer_info.mer_name}}
+
+
+
+
+
-
-
- 退出
-
-
-
-
-
-
-
-
-
-
-
- {{detail.title}}
- 甲方公司:{{company?company:"暂无公司信息"}}
- 机构代码:{{organization_code?organization_code:"暂无公司信息"}}
-
-
-
-
-
-
+
+
+
+ {{detail.title}}
+ 甲方公司:{{company?company:"暂无公司信息"}}
+ 机构代码:{{organization_code?organization_code:"暂无公司信息"}}
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/payment/payment_detail.vue b/pages/payment/payment_detail.vue
new file mode 100644
index 0000000..04518d5
--- /dev/null
+++ b/pages/payment/payment_detail.vue
@@ -0,0 +1,273 @@
+
+
+
+
+
+
+
+
+ {{startTimeTxt}}
+
+
+
+ {{endTimeTxt}}
+
+
+
+ 重置
+
+
+ 支出￥{{outcome}} 收入￥{{income}}
+
+
+
+
+
+
+
+
+
+ {{item.come_msg}}
+ {{item.msg == '支出'?'-':'+'}}{{item.pay_price}}
+
+ {{new Date(item.create_time).format('MM月dd日 hh:mm')}}
+
+
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/users/order_list/indexOther.vue b/pages/users/order_list/indexOther.vue
index 26ccfe1..6514601 100644
--- a/pages/users/order_list/indexOther.vue
+++ b/pages/users/order_list/indexOther.vue
@@ -1,9 +1,7 @@
-
共{{item.orderNum || 0}}件商品，总金额
￥{{item.presell_price}}
- 共{{item.orderNum || 0}}件商品，结算周期到期后付款
- ￥{{item.pay_price}}
-
+
+ 共{{item.orderNum || 0}}件商品，结算周期到期后付款
+ ￥{{item.pay_price}}
+
共{{item.orderNum || 0}}件商品，总金额
￥{{item.pay_price}}
@@ -262,7 +262,9 @@
+
+ 上传凭证
查看详情
@@ -306,10 +308,9 @@
@click.stop='goPay(item.pay_price,item.group_order_id,item.activity_type)'>
去结算
-->
-
- 去结算
-
+
+ 去结算
+
去评价
@@ -374,15 +375,15 @@
let app = getApp();
import {
getOrderList,
- getOtherOrderList,
+ getOtherOrderList,
orderData,
- otherOrderData,
+ otherOrderData,
unOrderCancel,
orderDel,
orderPay,
groupOrderList,
orderTake,
- otherOrderTake,
+ otherOrderTake,
applyInvoiceApi,
refundList
} from '@/api/order.js';
@@ -465,7 +466,7 @@
add: false,
},
len: 0,
- product_type: 98
+ product_type: 98
};
},
computed: {
@@ -494,9 +495,9 @@
this.isShowAuth = true
}
},
- onLoad(options) {
- if(options.product_type)this.product_type = options.product_type
- },
+ onLoad(options) {
+ if (options.product_type) this.product_type = options.product_type
+ },
onReady() {},
mounted: function() {
this.arrlist()
@@ -531,12 +532,12 @@
})
}
},
- // 先货后款去支付
- navToPay(item){
- uni.navigateTo({
- url: `/pages/users/payment/payment?order_id=${item.group_order_id}&product_type=${item.orderProduct[0]?.product_type||''}`
- })
- },
+ // 先货后款去支付
+ navToPay(item) {
+ uni.navigateTo({
+ url: `/pages/users/payment/payment?order_id=${item.group_order_id}&product_type=${item.orderProduct[0]?.product_type||''}`
+ })
+ },
onLoadFun() {
this.isShowAuth = false;
this.getOrderData();
@@ -660,14 +661,22 @@
title: '缺少订单号无法查看订单详情'
});
uni.navigateTo({
- url: `/pages/order_details/indexOther?order_id=${order_id}`
+ url: `/pages/order_details/indexOther?order_id=${order_id}`
})
},
+
+ // 上传凭证
+ uploadVoucher(item) {
+ let that = this;
+ that.$util.uploadImageOne('upload/image', res => {
+ const path = res.data.path;
+ });
+ },
+
/**
* 提示
*/
dePay() {
-
uni.showModal({
title: '提示',
title: '该订单属于先货后款的订单，等商户确认后才能支付',
@@ -679,7 +688,6 @@
}
}
});
-
},
/**
* 点击去评价
@@ -719,7 +727,7 @@
if (status == 5) {
uni.navigateTo({
- url: '/pages/users/refund/list?type='+this.product_type
+ url: '/pages/users/refund/list?type=' + this.product_type
})
} else {
if (status == this.orderStatus) return;
@@ -1014,6 +1022,12 @@
background-color: var(--view-theme);
}
+ .b-plain {
+ background-color: #fff;
+ color: var(--view-theme) !important;
+ border: 2rpx solid var(--view-theme);
+ }
+
.my-order .header .picTxt {
height: 190rpx;
}