From 5259ccf99aad486933373249a4011f653e4af815 Mon Sep 17 00:00:00 2001 From: sws <1141121512@qq.com> Date: Fri, 13 Oct 2023 13:40:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=E9=A1=B6=E9=83=A8=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=94=B9=E4=B8=BA=E7=BB=84=E4=BB=B6=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 8 +- components/nav-back/nav-back.vue | 98 ++++++++++ components/search/search.vue | 8 +- main.js | 2 +- pages/goods-category/goods-category.vue | 16 +- pages/plugins/answers/index/index.css | 4 +- pages/plugins/answers/index/index.vue | 141 ++++++-------- pages/plugins/coupon/index/index.vue | 82 +++----- pages/plugins/distribution/user/user.vue | 35 +--- .../membershiplevelvip/index/index.vue | 94 +++++----- .../plugins/membershiplevelvip/user/user.vue | 35 +--- pages/plugins/points/index/index.vue | 36 +--- pages/plugins/realstore/detail/detail.css | 18 +- pages/plugins/realstore/detail/detail.vue | 80 ++++---- pages/plugins/realstore/index/index.vue | 4 +- pages/plugins/seckill/index/index.css | 4 +- pages/plugins/seckill/index/index.vue | 53 +++--- .../signin/index-detail/index-detail.vue | 35 +--- pages/plugins/wallet/recharge/recharge.vue | 17 +- pages/plugins/wallet/user/user.vue | 175 ++++++++---------- .../user-answers-detail.vue | 23 +-- 21 files changed, 423 insertions(+), 545 deletions(-) create mode 100644 components/nav-back/nav-back.vue diff --git a/App.vue b/App.vue index 453b19c7..c682d5f3 100644 --- a/App.vue +++ b/App.vue @@ -67,11 +67,11 @@ // tabbar页面 tabbar_pages: ['/pages/index/index', '/pages/goods-category/goods-category', '/pages/cart/cart', '/pages/user/user'], // 请求地址 - // request_url: 'https://new.shopxo.vip/', - request_url: 'http://shopxo.com/', + request_url: 'https://new.shopxo.vip/', + // request_url: 'http://shopxo.com/', // 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/) - // static_url: 'https://new.shopxo.vip/', - static_url: 'http://shopxo.com/', + static_url: 'https://new.shopxo.vip/', + // static_url: 'http://shopxo.com/', // 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立) system_type: 'default', // 基础信息 diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue new file mode 100644 index 00000000..94a62756 --- /dev/null +++ b/components/nav-back/nav-back.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/components/search/search.vue b/components/search/search.vue index b78a707d..e01ae0ff 100644 --- a/components/search/search.vue +++ b/components/search/search.vue @@ -159,13 +159,7 @@ search_event() { // 是否回调事件 if (this.propIsIconOnEvent) { - this.$emit('onsearch', this.input_value); - } else { - console.log('this.input_value', this.input_value); - // 进入搜索页面 - uni.navigateTo({ - url: this.propUrl + '?' + this.propFormName + '=' + this.input_value, - }); + this.$emit('onicon', {}); } }, }, diff --git a/main.js b/main.js index b967c99d..82df5f94 100644 --- a/main.js +++ b/main.js @@ -15,6 +15,6 @@ Vue.component("iconfont", iconfont); App.mpType = 'app'; const app = new Vue({ - ...App + ...App }); app.$mount(); \ No newline at end of file diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue index cfd8f896..57cf7ee7 100644 --- a/pages/goods-category/goods-category.vue +++ b/pages/goods-category/goods-category.vue @@ -23,7 +23,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -92,11 +92,11 @@ - + - + - + @@ -198,7 +198,7 @@ - + @@ -294,7 +294,7 @@ 清空 - + diff --git a/pages/plugins/answers/index/index.css b/pages/plugins/answers/index/index.css index 693a7b8b..e754d68d 100644 --- a/pages/plugins/answers/index/index.css +++ b/pages/plugins/answers/index/index.css @@ -4,9 +4,11 @@ } .scroll-box { - height: calc(100vh - 166rpx - var(--status-bar-height) + 20rpx); + height: calc(100vh - 166rpx - var(--status-bar-height) + 34rpx); + padding-top: calc(166rpx + var(--status-bar-height) + 34rpx); /* #ifdef H5 */ height: calc(100vh - 166rpx); + padding-top: 166rpx; /* #endif */ } diff --git a/pages/plugins/answers/index/index.vue b/pages/plugins/answers/index/index.vue index 4398537a..b834e8ac 100644 --- a/pages/plugins/answers/index/index.vue +++ b/pages/plugins/answers/index/index.vue @@ -1,50 +1,47 @@