diff --git a/pages/activity/seckill.vue b/pages/activity/seckill.vue index cdf3c97..95e4eda 100644 --- a/pages/activity/seckill.vue +++ b/pages/activity/seckill.vue @@ -5,9 +5,9 @@ :background="background"> - + - + @@ -58,7 +58,7 @@ - + diff --git a/pages/index/index.vue b/pages/index/index.vue index 2c1e7e6..41df482 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -185,7 +185,7 @@ - + @@ -1786,7 +1786,7 @@ image { width: 100%; - height: auto; + height: 100%; } } diff --git a/pages/news1/wallet.vue b/pages/news1/wallet.vue index 8b8a1ea..7d088fc 100644 --- a/pages/news1/wallet.vue +++ b/pages/news1/wallet.vue @@ -102,7 +102,7 @@ - + @@ -183,6 +183,11 @@ }) }, methods: { + onReset() { + this.start_at = '' + this.end_at = '' + this.active = -1 + }, dropOpen() { this.OrderType = 999 }, @@ -231,7 +236,6 @@ this.timeShow = false }, onOrderTab(type) { - this.$refs.dropdown1.close(); this.OrderType = type; this.getBalance(type) }, diff --git a/pages/order/refund/refund.vue b/pages/order/refund/refund.vue index 593ca85..574c5cf 100644 --- a/pages/order/refund/refund.vue +++ b/pages/order/refund/refund.vue @@ -199,7 +199,8 @@ }, // 获取当前订单信息 toDetail(canReset = false) { - const app = this + const app = this + console.log(app.type == 1? 10 : (app.type == 2?30:20)) if (app.logisticsIndex == -1) { uni.showToast({ title: '请选择收货状态', @@ -235,7 +236,7 @@ } app.isLoading = true; let obj = { - type: app.type == 1? 10 : 30, + type: app.type == 1? 10 : (app.type == 2?30:20), content: app.contentNotes, images: app.imagesId, phone: app.phone, diff --git a/pages/user/index - 副本.vue b/pages/user/index - 副本.vue deleted file mode 100644 index 4d42d6e..0000000 --- a/pages/user/index - 副本.vue +++ /dev/null @@ -1,762 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/user/personal/index.vue b/pages/user/personal/index.vue index 4d42d6e..700049d 100644 --- a/pages/user/personal/index.vue +++ b/pages/user/personal/index.vue @@ -2,7 +2,7 @@ - +