diff --git a/src/views/activity/activityList.vue b/src/views/activity/activityList.vue
index 25e5079..eab4730 100644
--- a/src/views/activity/activityList.vue
+++ b/src/views/activity/activityList.vue
@@ -167,7 +167,8 @@ export default {
return ( < div style = {
{
cursor: 'pointer',
- color: "blue"
+ color: "blue",
+ textDecoration: "underline"
}
}
on = {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6ee40ac..c432169 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -106,7 +106,8 @@
}
}
},
- created: function() {
+ created: function() {
+ let that = this
this.search.date = this.getCurrMonthDays()
that.search.sdate = this.search.date[0]
that.search.edate = this.search.date[1]
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index 742051e..e5a6023 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -164,7 +164,8 @@
return {
selectId: null,
isShowLog: false,
- isShowEdit: false,
+ isShowEdit: false,
+ memberId:"",
merchants: [],
orderItemStates: [],
orderStates: [],
@@ -455,7 +456,7 @@
this.select.productTypeName = this.$refs['cascader'].getCheckedNodes()[0].data.name;
},
searchOrder() {
-
+ this.memberId = ""
this.select.page = 1
this.getOrders()
},
@@ -483,7 +484,8 @@
page_size: this.select.pageSize,
product_type_id: this.select.productType,
merchant_id: this.select.merchant.id,
- order_state: this.select.orderStates.key,
+ order_state: this.select.orderStates.key,
+ member_id:this.memberId,
...this.select
})
this.select.is_merchant = is_merchant;
@@ -512,7 +514,8 @@
keyword: this.select.keyword,
product_type_id: this.select.productType,
merchant_id: this.select.merchant.id,
- is_export: 1,
+ is_export: 1,
+ member_id:this.memberId,
...this.select
},
'订单列表.xlsx')
@@ -522,7 +525,8 @@
this.select.order_paid = order_paid;
}
},
- mounted() {
+ mounted() {
+ this.memberId = this.$route.query.user_id
this.getTypes()
this.getOrders()
}
diff --git a/src/views/reports/userOrder.vue b/src/views/reports/userOrder.vue
new file mode 100644
index 0000000..f01e41a
--- /dev/null
+++ b/src/views/reports/userOrder.vue
@@ -0,0 +1,241 @@
+
+
+
+
+
+
+
+
+
+
+
+ 存在手机号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+