diff --git a/App.vue b/App.vue index de054426..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/common/css/page.css b/common/css/page.css index 56f5aa70..70341046 100644 --- a/common/css/page.css +++ b/common/css/page.css @@ -94,6 +94,7 @@ uni-page-head[uni-page-head-type=default]~uni-page-wrapper { } /* #endif */ + /** * 公共样式、框架样式覆盖 */ diff --git a/components/nav-back/nav-back.vue b/components/nav-back/nav-back.vue new file mode 100644 index 00000000..732f9007 --- /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.json b/pages.json index e392ea86..f28cd13f 100644 --- a/pages.json +++ b/pages.json @@ -281,7 +281,7 @@ { "path": "pages/user-answers-detail/user-answers-detail", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, @@ -301,7 +301,7 @@ "pages": [{ "path": "index/index", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "navigationBarTitleText": "限时秒杀" @@ -313,7 +313,7 @@ "pages": [{ "path": "index/index", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, @@ -341,7 +341,7 @@ "pages": [{ "path": "index/index", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, @@ -358,7 +358,7 @@ { "path": "user/user", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, @@ -421,7 +421,7 @@ "pages": [{ "path": "user/user", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, @@ -540,7 +540,7 @@ "pages": [{ "path": "user/user", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, @@ -550,7 +550,7 @@ { "path": "recharge/recharge", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": false, @@ -699,7 +699,7 @@ { "path": "index-detail/index-detail", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, @@ -734,7 +734,7 @@ "pages": [{ "path": "index/index", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, @@ -984,7 +984,7 @@ "pages": [{ "path": "index/index", "style": { - // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP + // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP "navigationStyle": "custom", // #endif "enablePullDownRefresh": true, 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..27b345c9 100644 --- a/pages/plugins/answers/index/index.css +++ b/pages/plugins/answers/index/index.css @@ -4,9 +4,9 @@ } .scroll-box { - height: calc(100vh - 166rpx - var(--status-bar-height) + 20rpx); + height: calc(100vh - 194rpx - var(--status-bar-height) - 5px); /* #ifdef H5 */ - height: calc(100vh - 166rpx); + height: calc(100vh - 170rpx); /* #endif */ } diff --git a/pages/plugins/answers/index/index.vue b/pages/plugins/answers/index/index.vue index 4398537a..5bf53f70 100644 --- a/pages/plugins/answers/index/index.vue +++ b/pages/plugins/answers/index/index.vue @@ -1,50 +1,47 @@