From 31ff647fdf17731147316f8de46b3a8c28f4defe Mon Sep 17 00:00:00 2001 From: yangtao Date: Sun, 24 Mar 2024 15:49:14 +0800 Subject: [PATCH 1/6] 1 --- pages.json | 28 +++++++++++----------------- pages/shop/index.vue | 2 +- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pages.json b/pages.json index 526d390..43bce6f 100644 --- a/pages.json +++ b/pages.json @@ -16,7 +16,7 @@ "navigationBarTitleText": "首页", "navigationStyle": "custom", // #ifdef APP-PLUS - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, // #endif "app-plus": { "scrollIndicator": false //禁用原生导航栏 @@ -26,7 +26,7 @@ { "path": "pages/order_addcart/order_addcart", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "购物车" } }, @@ -40,7 +40,7 @@ { "path": "pages/user/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "个人中心", "navigationStyle": "custom" } @@ -53,13 +53,6 @@ } }, - { - "path": "pages/shop/index", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "门店" - } - }, { "path": "pages/shop_details/index", "style": { @@ -84,15 +77,16 @@ { "path": "pages/goods_cate/goods_cate", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "商品分类" } }, { "path": "pages/shop/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "商家联盟" + } }, { @@ -972,7 +966,7 @@ "pages": [{ "path": "goods_seckill/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "限时秒杀", "navigationBarBackgroundColor": "#F2F2F2" } @@ -994,7 +988,7 @@ { "path": "presell/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "预售列表" // #ifdef MP || APP-PLUS , @@ -1012,7 +1006,7 @@ { "path": "combination/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "拼团" // #ifdef MP || APP-PLUS , @@ -1038,7 +1032,7 @@ { "path": "assist/index", "style": { - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "navigationBarTitleText": "助力列表", "navigationBarBackgroundColor": "#F2F2F2" } @@ -1328,7 +1322,7 @@ "pagePath": "pages/shop/index", "iconPath": "static/images/shop/index-tab.png", "selectedIconPath": "static/images/shop/index-tab.png", - "text": "门店" + "text": "商家" }, { "pagePath": "pages/order_addcart/order_addcart", diff --git a/pages/shop/index.vue b/pages/shop/index.vue index 6513780..6703d6e 100644 --- a/pages/shop/index.vue +++ b/pages/shop/index.vue @@ -3,7 +3,7 @@ - 北京 + 深圳 商家联盟 From 9707fd296339dcec9a6687e7dff25d5bc9531f17 Mon Sep 17 00:00:00 2001 From: yangtao Date: Sun, 24 Mar 2024 17:43:00 +0800 Subject: [PATCH 2/6] 1 --- config/app.js | 4 ++-- pages/shop/index.vue | 48 +++++++++++++++++++++++++++++++++++---- static/images/shop/1.jpg | Bin 0 -> 63494 bytes static/images/shop/2.jpg | Bin 0 -> 5401 bytes static/images/shop/3.png | Bin 0 -> 178830 bytes static/images/shop/4.jpg | Bin 0 -> 17509 bytes 6 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 static/images/shop/1.jpg create mode 100644 static/images/shop/2.jpg create mode 100644 static/images/shop/3.png create mode 100644 static/images/shop/4.jpg diff --git a/config/app.js b/config/app.js index 5dc8628..e87e172 100644 --- a/config/app.js +++ b/config/app.js @@ -6,8 +6,8 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user` let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https -// let httpApi = 'http://many.shop.lo' //测试 -let httpApi = 'https://plus.hwms.shop' //生产 +let httpApi = 'http://many.shop.lo' //测试 +// let httpApi = 'https://plus.hwms.shop' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如:wss://mer. .net // let wsApi = 'ws://192.168.3.20:8324' diff --git a/pages/shop/index.vue b/pages/shop/index.vue index 6703d6e..73ea12c 100644 --- a/pages/shop/index.vue +++ b/pages/shop/index.vue @@ -22,7 +22,7 @@ - 休息娱乐 + 休闲娱乐 @@ -45,7 +45,7 @@ 汽车服务 - + 家装 @@ -60,8 +60,17 @@ - - + + + + + + + + + + + @@ -88,22 +97,51 @@ + +