diff --git a/pages.json b/pages.json index 6d2783b..a6f02d8 100644 --- a/pages.json +++ b/pages.json @@ -380,7 +380,52 @@ "enablePullDownRefresh": true } } - ], + ,{ + "path" : "pages/invoice/index", + "style" : + { + "navigationBarTitleText": "我的发票抬头", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/invoice/detail", + "style" : + { + "navigationBarTitleText": "我的发票抬头", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/invoice/edit", + "style" : + { + "navigationBarTitleText": "申请发票", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/order/refund/refund", + "style" : + { + "navigationBarTitleText": "申请退款", + "enablePullDownRefresh": false + } + + } + ,{ + "path" : "pages/order/refund/index", + "style" : + { + "navigationBarTitleText": "申请售后", + "enablePullDownRefresh": false + } + + } + ], "globalStyle": { // #ifdef H5 // "navigationStyle": "custom", diff --git a/pages/invoice/detail.vue b/pages/invoice/detail.vue new file mode 100644 index 0000000..7c6f227 --- /dev/null +++ b/pages/invoice/detail.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/pages/invoice/edit.vue b/pages/invoice/edit.vue new file mode 100644 index 0000000..2998ca7 --- /dev/null +++ b/pages/invoice/edit.vue @@ -0,0 +1,406 @@ + + + + + diff --git a/pages/invoice/index.vue b/pages/invoice/index.vue new file mode 100644 index 0000000..c41ed51 --- /dev/null +++ b/pages/invoice/index.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/pages/order/index - 副本2021-1-19.vue b/pages/order/index - 副本2021-1-19.vue new file mode 100644 index 0000000..d278668 --- /dev/null +++ b/pages/order/index - 副本2021-1-19.vue @@ -0,0 +1,523 @@ + + + + + diff --git a/pages/order/index.vue b/pages/order/index.vue index d278668..6d3d1f4 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -1,103 +1,57 @@ @@ -118,10 +72,7 @@ // tab栏数据 const tabs = [{ - name: `全部`, - value: 'all' - }, { - name: `待支付`, + name: `待付款`, value: 'payment' }, { name: `待发货`, @@ -129,6 +80,9 @@ }, { name: `待收货`, value: 'received' + }, { + name: `已完成`, + value: 'received' }, { name: `待评价`, value: 'comment' @@ -138,6 +92,8 @@ mixins: [MescrollMixin], data() { return { + isToggle: false, + show: true, // 枚举类 DeliveryStatusEnum, DeliveryTypeEnum, @@ -205,7 +161,9 @@ }, methods: { - + toggleImage() { + this.isToggle = !this.isToggle + }, // 初始化当前选中的标签 initCurTab(options) { const app = this @@ -350,174 +308,194 @@ diff --git a/pages/order/refund/index.vue b/pages/order/refund/index.vue new file mode 100644 index 0000000..28c548d --- /dev/null +++ b/pages/order/refund/index.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/pages/order/refund/refund.vue b/pages/order/refund/refund.vue new file mode 100644 index 0000000..ca1e697 --- /dev/null +++ b/pages/order/refund/refund.vue @@ -0,0 +1,435 @@ + + + + + diff --git a/static/invoice/select-active.png b/static/invoice/select-active.png new file mode 100644 index 0000000..c2bd0aa Binary files /dev/null and b/static/invoice/select-active.png differ diff --git a/static/invoice/select-on.png b/static/invoice/select-on.png new file mode 100644 index 0000000..7c70868 Binary files /dev/null and b/static/invoice/select-on.png differ diff --git a/static/invoice/select.png b/static/invoice/select.png new file mode 100644 index 0000000..626c5b7 Binary files /dev/null and b/static/invoice/select.png differ diff --git a/static/news/icon-arrow.png b/static/news/icon-arrow.png new file mode 100644 index 0000000..85092c8 Binary files /dev/null and b/static/news/icon-arrow.png differ diff --git a/static/news/icon-close.png b/static/news/icon-close.png new file mode 100644 index 0000000..e46145c Binary files /dev/null and b/static/news/icon-close.png differ diff --git a/static/news/icon-edit.png b/static/news/icon-edit.png new file mode 100644 index 0000000..5d3d967 Binary files /dev/null and b/static/news/icon-edit.png differ diff --git a/static/news/icon-mall.jpg b/static/news/icon-mall.jpg new file mode 100644 index 0000000..da935ff Binary files /dev/null and b/static/news/icon-mall.jpg differ diff --git a/static/news/icon-refund-01.png b/static/news/icon-refund-01.png new file mode 100644 index 0000000..e4b8a65 Binary files /dev/null and b/static/news/icon-refund-01.png differ diff --git a/static/news/icon-refund-02.png b/static/news/icon-refund-02.png new file mode 100644 index 0000000..ef87e91 Binary files /dev/null and b/static/news/icon-refund-02.png differ diff --git a/static/news/icon-refund-03.png b/static/news/icon-refund-03.png new file mode 100644 index 0000000..4ce6898 Binary files /dev/null and b/static/news/icon-refund-03.png differ diff --git a/static/news/icon-search.png b/static/news/icon-search.png new file mode 100644 index 0000000..7a82e01 Binary files /dev/null and b/static/news/icon-search.png differ diff --git a/static/news/icon-upload.png b/static/news/icon-upload.png new file mode 100644 index 0000000..b8358f4 Binary files /dev/null and b/static/news/icon-upload.png differ diff --git a/static/news/refund-bg.png b/static/news/refund-bg.png new file mode 100644 index 0000000..56b00f2 Binary files /dev/null and b/static/news/refund-bg.png differ