From 0ba2d31e1e4dd0458a9ebe1b46ffa2cd3f5b1aae Mon Sep 17 00:00:00 2001 From: yangtao Date: Mon, 25 Mar 2024 16:25:29 +0800 Subject: [PATCH] 1 --- api/shop.js | 14 ++++++++++++++ manifest.json | 2 +- pages.json | 22 +++++++++++----------- pages/shop/css/shop.css | 4 ++-- pages/shop/index.vue | 6 +++++- static/iconfont/iconfont.css | 13 ++++++++++++- static/iconfont/iconfont.js | 1 + static/iconfont/iconfont.json | 23 +++++++++++++++++++++++ static/iconfont/iconfont.ttf | Bin 0 -> 2304 bytes static/iconfont/iconfont.woff | Bin 0 -> 1524 bytes static/iconfont/iconfont.woff2 | Bin 0 -> 1108 bytes static/images/1-1.png | Bin 0 -> 2497 bytes static/images/1-2.png | Bin 0 -> 2858 bytes static/images/2-1.png | Bin 0 -> 2676 bytes static/images/2-2.png | Bin 0 -> 3147 bytes static/images/3-1.png | Bin 0 -> 2960 bytes static/images/3-2.png | Bin 0 -> 3698 bytes static/images/4-1.png | Bin 0 -> 2590 bytes static/images/4-2.png | Bin 0 -> 2954 bytes static/images/5-1.png | Bin 0 -> 2644 bytes static/images/5-2.png | Bin 0 -> 3076 bytes 21 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 api/shop.js create mode 100644 static/iconfont/iconfont.js create mode 100644 static/iconfont/iconfont.json create mode 100644 static/iconfont/iconfont.ttf create mode 100644 static/iconfont/iconfont.woff create mode 100644 static/iconfont/iconfont.woff2 create mode 100644 static/images/1-1.png create mode 100644 static/images/1-2.png create mode 100644 static/images/2-1.png create mode 100644 static/images/2-2.png create mode 100644 static/images/3-1.png create mode 100644 static/images/3-2.png create mode 100644 static/images/4-1.png create mode 100644 static/images/4-2.png create mode 100644 static/images/5-1.png create mode 100644 static/images/5-2.png diff --git a/api/shop.js b/api/shop.js new file mode 100644 index 0000000..0c301c6 --- /dev/null +++ b/api/shop.js @@ -0,0 +1,14 @@ + +import request from "@/utils/request.js"; +/** + * 公共接口 ,获取商家列表,定位信息 + * +*/ +/** + * 获取主页数据 无需授权 + * +*/ +export function getIndexData() +{ + return request.get("common/home",{},{ noAuth : true}); +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index 60b6fdc..e249d16 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "多商户商城", - "appid" : "__UNI__99FC347", + "appid" : "__UNI__496DF55", "description" : "", "versionName" : "1.0.4", "versionCode" : 127, diff --git a/pages.json b/pages.json index 09388bb..a667e30 100644 --- a/pages.json +++ b/pages.json @@ -1303,40 +1303,40 @@ }, "tabBar": { "color": "#282828", - "selectedColor": "#E93323", + "selectedColor": "#208F43", "borderStyle": "white", "backgroundColor": "#ffffff", "list": [ { "pagePath": "pages/index/index" , - "iconPath": "static/images/1-001.png", - "selectedIconPath": "static/images/1-002.png", + "iconPath": "static/images/1-1.png", + "selectedIconPath": "static/images/1-2.png", "text": "首页" }, { "pagePath": "pages/goods_cate/goods_cate" , - "iconPath": "static/images/2-001.png", - "selectedIconPath": "static/images/2-002.png", + "iconPath": "static/images/2-1.png", + "selectedIconPath": "static/images/2-2.png", "text": "分类" }, { "pagePath": "pages/shop/index", - "iconPath": "static/images/shop/index-tab.png", - "selectedIconPath": "static/images/shop/index-tab.png", + "iconPath": "static/images/3-1.png", + "selectedIconPath": "static/images/3-2.png", "text": "商家" }, { "pagePath": "pages/order_addcart/order_addcart", - "iconPath": "static/images/3-001.png", - "selectedIconPath": "static/images/3-002.png", + "iconPath": "static/images/4-1.png", + "selectedIconPath": "static/images/4-2.png", "text": "购物车" }, { "pagePath": "pages/user/index", - "iconPath": "static/images/4-001.png", - "selectedIconPath": "static/images/4-002.png", + "iconPath": "static/images/5-1.png", + "selectedIconPath": "static/images/5-2.png", "text": "我的" } ] diff --git a/pages/shop/css/shop.css b/pages/shop/css/shop.css index cce572f..14172a8 100644 --- a/pages/shop/css/shop.css +++ b/pages/shop/css/shop.css @@ -26,10 +26,10 @@ font-size: 40rpx; position: absolute; right:28rpx; - color:#3587F7; + color:var(--view-theme); } .content .top-tab .tab-location .icon-dingwei{ - color: blue; + color: var(--view-theme); font-size: 28rpx; } .content .content-map{ diff --git a/pages/shop/index.vue b/pages/shop/index.vue index 583c131..74004f1 100644 --- a/pages/shop/index.vue +++ b/pages/shop/index.vue @@ -1,6 +1,6 @@