diff --git a/template/admin/src/api/order.js b/template/admin/src/api/order.js
index 0d817a3b7..6ba1e119c 100644
--- a/template/admin/src/api/order.js
+++ b/template/admin/src/api/order.js
@@ -26,10 +26,11 @@ export function orderList(data) {
* @description 发票头部统计
* @param {Object} param data {Object} 传值参数
*/
-export function orderInvoiceChart() {
+export function orderInvoiceChart(data) {
return request({
url: 'order/invoice/chart',
method: 'get',
+ params: data,
});
}
diff --git a/template/admin/src/pages/kefu/pc/components/rightMenu.vue b/template/admin/src/pages/kefu/pc/components/rightMenu.vue
index 9f3685ab7..805091b07 100644
--- a/template/admin/src/pages/kefu/pc/components/rightMenu.vue
+++ b/template/admin/src/pages/kefu/pc/components/rightMenu.vue
@@ -147,7 +147,7 @@
diff --git a/template/admin/src/pages/marketing/storeBargain/create.vue b/template/admin/src/pages/marketing/storeBargain/create.vue
index a9cd6b137..333314057 100644
--- a/template/admin/src/pages/marketing/storeBargain/create.vue
+++ b/template/admin/src/pages/marketing/storeBargain/create.vue
@@ -295,7 +295,7 @@
-
+
-
+
{
+ this.formValidate.description += ' ';
+ }, 0);
} else {
return this.$Message.warning('请完善您的信息');
}
@@ -892,6 +897,11 @@ export default {
} else {
if (this.formValidate.image) {
this.current += 1;
+ if (this.current == 3) {
+ setTimeout((e) => {
+ this.formValidate.rule += ' ';
+ }, 0);
+ }
} else {
this.$Message.warning('请选择商品');
}
diff --git a/template/admin/src/pages/order/invoice/index.vue b/template/admin/src/pages/order/invoice/index.vue
index 59c0612b1..85e490bee 100644
--- a/template/admin/src/pages/order/invoice/index.vue
+++ b/template/admin/src/pages/order/invoice/index.vue
@@ -68,7 +68,7 @@
-
+
@@ -535,7 +535,7 @@ export default {
this.getList();
},
getTabs() {
- orderInvoiceChart()
+ orderInvoiceChart(this.orderData)
.then((res) => {
this.tablists = res.data;
})
@@ -546,6 +546,7 @@ export default {
// 精确搜索()
orderSearch() {
this.orderData.page = 1;
+ this.getTabs();
this.getList();
},
// 具体日期搜索();
diff --git a/template/uni-app/pages.json b/template/uni-app/pages.json
index 2d9c22c9b..8bb91361f 100644
--- a/template/uni-app/pages.json
+++ b/template/uni-app/pages.json
@@ -395,7 +395,7 @@
{
"path": "user_invoice_order/index",
"style": {
- "navigationBarTitleText": "订单详情",
+ "navigationBarTitleText": "发票详情",
"app-plus": {
// #ifdef APP-PLUS
"titleNView": {