1

2024-03-25 16:25:29 +08:00 · 2024-03-25 16:25:29 +08:00 · 0ba2d31e1e
parent abba3e842a
commit 0ba2d31e1e
21 changed files with 69 additions and 16 deletions
--- a/api/shop.js
+++ b/api/shop.js
@ -0,0 +1,14 @@
+ 
+import request from "@/utils/request.js";
+/**
+ * 公共接口 ，获取商家列表，定位信息
+ * 
+*/
+/**
+ * 获取主页数据 无需授权
+ * 
+*/
+export function getIndexData()
+{
+  return request.get("common/home",{},{ noAuth : true});
+}
--- a/manifest.json
+++ b/manifest.json
@ -1,6 +1,6 @@
 {
    "name" : "多商户商城",
-    "appid" : "__UNI__99FC347",
+    "appid" : "__UNI__496DF55",
    "description" : "",
    "versionName" : "1.0.4",
    "versionCode" : 127,
--- 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": "我的"
 			}
 		]
--- 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{
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@ -1,6 +1,6 @@

 <template>
-	<view class="content">
+	<view class="content" :style="viewColor">
 		<view class="top-tab" :style="`padding-top:`+navtop">
 			<view class="tab-location">
 				深圳
@ -115,6 +115,7 @@
 	import { HTTP_REQUEST_URL } from '@/config/app';
 	import { getNavigation } from '@/api/public.js';
 	import customTab from '@/components/customTab';
+	import { mapGetters } from "vuex";
 	export default {
 		components:{
 			customTab,
@ -134,6 +135,9 @@
 		onShow(){
 			this.getNav();
 		},
+		computed:{
+			...mapGetters(['viewColor'])
+		},
 		created(options) {
 			let statusBarHeight= uni.getSystemInfoSync().statusBarHeight+"px";
 			this.navtop=statusBarHeight;
--- a/static/iconfont/iconfont.css
+++ b/static/iconfont/iconfont.css
@ -2,7 +2,10 @@
  font-family: "iconfont"; /* Project id 993865 */
  src: url('https://at.alicdn.com/t/c/font_993865_si3tuotdqz.woff2?t=1704965757795') format('woff2'),
       url('https://at.alicdn.com/t/c/font_993865_si3tuotdqz.woff?t=1704965757795') format('woff'),
-       url('https://at.alicdn.com/t/c/font_993865_si3tuotdqz.ttf?t=1704965757795') format('truetype');
+       url('https://at.alicdn.com/t/c/font_993865_si3tuotdqz.ttf?t=1704965757795') format('truetype'),
+	   url('@/static/iconfont/iconfont.woff2?t=1711354111351') format('woff2'),
+		url('@/static/iconfont/iconfont.woff?t=1711354111351') format('woff'),
+		url('@/static/iconfont/iconfont.ttf?t=1711354111351') format('truetype')
 }

 .iconfont {
@ -13,6 +16,14 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-mh-info:before {
+  content: "\e601";
+}
+
+.icon-mh-shoukuang:before {
+  content: "\e602";
+}
+
 .icon-huodong-renshu:before {
  content: "\e869";
 }
--- a/static/iconfont/iconfont.js
+++ b/static/iconfont/iconfont.js
@ -0,0 +1 @@
+window._iconfont_svg_string_4480899='<svg><symbol id="icon-a-zu9963" viewBox="0 0 1024 1024"><path d="M732.136727 203.892364a48.267636 48.267636 0 0 0 49.268364-43.799273v-93.090909A44.706909 44.706909 0 0 0 732.136727 23.202909a47.080727 47.080727 0 0 0-43.799272 43.799273v93.090909c-5.469091 21.922909 16.500364 43.799273 43.799272 43.799273z m-443.368727 0a48.267636 48.267636 0 0 0 49.268364-43.799273v-93.090909A44.706909 44.706909 0 0 0 288.768 23.202909a47.080727 47.080727 0 0 0-43.799273 43.799273v93.090909a43.170909 43.170909 0 0 0 43.799273 43.799273z" fill="#2C93F5" ></path><path d="M896.349091 110.848h-76.637091v43.799273a95.930182 95.930182 0 0 1-93.090909 93.090909 92.253091 92.253091 0 0 1-93.090909-93.090909V110.848H381.812364v43.799273a95.930182 95.930182 0 0 1-93.090909 93.090909 89.088 89.088 0 0 1-93.09091-93.090909V110.848H113.524364a77.800727 77.800727 0 0 0-32.837819 10.938182 77.800727 77.800727 0 0 0-10.938181 32.837818v793.6a47.313455 47.313455 0 0 0 16.430545 32.837818 19.991273 19.991273 0 0 0 27.368727 10.938182h782.731637a77.800727 77.800727 0 0 0 32.837818-10.938182 47.313455 47.313455 0 0 0 16.430545-32.837818v-793.6a47.313455 47.313455 0 0 0-16.430545-32.837818 58.693818 58.693818 0 0 0-32.768-10.938182z m-202.542546 733.556364H316.136727a47.313455 47.313455 0 0 1-32.837818-16.430546 34.909091 34.909091 0 0 1 0-32.837818 39.563636 39.563636 0 0 1 32.837818-21.899636h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430545 34.909091 34.909091 0 0 1 0 32.837818 39.563636 39.563636 0 0 1-32.861091 21.899637z m0-180.619637H316.136727a47.313455 47.313455 0 0 1-32.837818-16.430545 34.909091 34.909091 0 0 1 0-32.837818 33.093818 33.093818 0 0 1 32.837818-16.430546h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430546 34.909091 34.909091 0 0 1 0 32.837818 47.313455 47.313455 0 0 1-32.861091 16.337454z m0-175.150545H316.136727a30.091636 30.091636 0 0 1-27.368727-16.430546 34.909091 34.909091 0 0 1 0-32.837818 33.093818 33.093818 0 0 1 32.837818-16.430545h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430545 34.909091 34.909091 0 0 1 0 32.837818 72.773818 72.773818 0 0 1-38.330182 16.337455z" fill="#2C93F5" ></path></symbol><symbol id="icon-a-zu9962" viewBox="0 0 1024 1024"><path d="M373.853091 255.697455h240.151273c76.8 0 134.469818-163.281455 134.469818-163.281455-0.093091-48.058182-4.747636-86.458182-86.458182-86.458182-81.640727-4.794182-100.864 52.829091-163.281455 52.829091S407.482182 10.752 330.635636 1.140364c-72.145455-9.611636-86.458182 43.217455-86.458181 91.252363 0.023273 0 57.646545 163.304727 129.675636 163.304728z m259.351273 48.011636H373.853091C90.484364 303.709091 23.249455 860.811636 23.249455 860.811636c0 76.8 57.623273 148.945455 134.469818 148.945455h696.413091c72.145455 0 134.469818-72.145455 134.469818-148.945455-4.794182 0-72.029091-557.102545-355.397818-557.102545z m28.811636 432.244364a28.811636 28.811636 0 0 1 0 57.623272h-124.858182v81.640728a28.811636 28.811636 0 1 1-57.623273 0V793.6h-134.49309a28.811636 28.811636 0 1 1 0-57.623273h124.858181v-38.446545h-124.858181a28.811636 28.811636 0 0 1 0-57.623273h86.458181l-86.458181-163.281454a31.301818 31.301818 0 0 1 52.82909-33.629091l105.658182 187.298909h4.794182l105.658182-187.298909a31.301818 31.301818 0 1 1 52.829091 33.629091l-86.458182 153.6h81.640727a28.811636 28.811636 0 0 1 0 57.623272h-124.834909v38.493091h124.858182z m0 0" fill="#2C93F5" ></path></symbol></svg>',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var a,i,o,c,d,l=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}a=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4480899,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?l(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),a()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=a,c=n.document,d=!1,h(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,s())})}function s(){d||(d=!0,o())}function h(){try{c.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}s()}}(window);
--- a/static/iconfont/iconfont.json
+++ b/static/iconfont/iconfont.json
@ -0,0 +1,23 @@
+{
+  "id": "4480899",
+  "name": "海悦",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "39681063",
+      "name": "商品信息",
+      "font_class": "a-zu9963",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "39681064",
+      "name": "我要收款",
+      "font_class": "a-zu9962",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    }
+  ]
+}
--- a/static/iconfont/iconfont.ttf
+++ b/static/iconfont/iconfont.ttf
--- a/static/iconfont/iconfont.woff
+++ b/static/iconfont/iconfont.woff
--- a/static/iconfont/iconfont.woff2
+++ b/static/iconfont/iconfont.woff2
--- a/static/images/1-1.png
+++ b/static/images/1-1.png
--- a/static/images/1-2.png
+++ b/static/images/1-2.png
--- a/static/images/2-1.png
+++ b/static/images/2-1.png
--- a/static/images/2-2.png
+++ b/static/images/2-2.png
--- a/static/images/3-1.png
+++ b/static/images/3-1.png
--- a/static/images/3-2.png
+++ b/static/images/3-2.png
--- a/static/images/4-1.png
+++ b/static/images/4-1.png
--- a/static/images/4-2.png
+++ b/static/images/4-2.png
--- a/static/images/5-1.png
+++ b/static/images/5-1.png
--- a/static/images/5-2.png
+++ b/static/images/5-2.png
				`@ -0,0 +1 @@`
				window._iconfont_svg_string_4480899='<svg><symbol id="icon-a-zu9963" viewBox="0 0 1024 1024"><path d="M732.136727 203.892364a48.267636 48.267636 0 0 0 49.268364-43.799273v-93.090909A44.706909 44.706909 0 0 0 732.136727 23.202909a47.080727 47.080727 0 0 0-43.799272 43.799273v93.090909c-5.469091 21.922909 16.500364 43.799273 43.799272 43.799273z m-443.368727 0a48.267636 48.267636 0 0 0 49.268364-43.799273v-93.090909A44.706909 44.706909 0 0 0 288.768 23.202909a47.080727 47.080727 0 0 0-43.799273 43.799273v93.090909a43.170909 43.170909 0 0 0 43.799273 43.799273z" fill="#2C93F5" ></path><path d="M896.349091 110.848h-76.637091v43.799273a95.930182 95.930182 0 0 1-93.090909 93.090909 92.253091 92.253091 0 0 1-93.090909-93.090909V110.848H381.812364v43.799273a95.930182 95.930182 0 0 1-93.090909 93.090909 89.088 89.088 0 0 1-93.09091-93.090909V110.848H113.524364a77.800727 77.800727 0 0 0-32.837819 10.938182 77.800727 77.800727 0 0 0-10.938181 32.837818v793.6a47.313455 47.313455 0 0 0 16.430545 32.837818 19.991273 19.991273 0 0 0 27.368727 10.938182h782.731637a77.800727 77.800727 0 0 0 32.837818-10.938182 47.313455 47.313455 0 0 0 16.430545-32.837818v-793.6a47.313455 47.313455 0 0 0-16.430545-32.837818 58.693818 58.693818 0 0 0-32.768-10.938182z m-202.542546 733.556364H316.136727a47.313455 47.313455 0 0 1-32.837818-16.430546 34.909091 34.909091 0 0 1 0-32.837818 39.563636 39.563636 0 0 1 32.837818-21.899636h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430545 34.909091 34.909091 0 0 1 0 32.837818 39.563636 39.563636 0 0 1-32.861091 21.899637z m0-180.619637H316.136727a47.313455 47.313455 0 0 1-32.837818-16.430545 34.909091 34.909091 0 0 1 0-32.837818 33.093818 33.093818 0 0 1 32.837818-16.430546h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430546 34.909091 34.909091 0 0 1 0 32.837818 47.313455 47.313455 0 0 1-32.861091 16.337454z m0-175.150545H316.136727a30.091636 30.091636 0 0 1-27.368727-16.430546 34.909091 34.909091 0 0 1 0-32.837818 33.093818 33.093818 0 0 1 32.837818-16.430545h377.693091a47.313455 47.313455 0 0 1 32.837818 16.430545 34.909091 34.909091 0 0 1 0 32.837818 72.773818 72.773818 0 0 1-38.330182 16.337455z" fill="#2C93F5" ></path></symbol><symbol id="icon-a-zu9962" viewBox="0 0 1024 1024"><path d="M373.853091 255.697455h240.151273c76.8 0 134.469818-163.281455 134.469818-163.281455-0.093091-48.058182-4.747636-86.458182-86.458182-86.458182-81.640727-4.794182-100.864 52.829091-163.281455 52.829091S407.482182 10.752 330.635636 1.140364c-72.145455-9.611636-86.458182 43.217455-86.458181 91.252363 0.023273 0 57.646545 163.304727 129.675636 163.304728z m259.351273 48.011636H373.853091C90.484364 303.709091 23.249455 860.811636 23.249455 860.811636c0 76.8 57.623273 148.945455 134.469818 148.945455h696.413091c72.145455 0 134.469818-72.145455 134.469818-148.945455-4.794182 0-72.029091-557.102545-355.397818-557.102545z m28.811636 432.244364a28.811636 28.811636 0 0 1 0 57.623272h-124.858182v81.640728a28.811636 28.811636 0 1 1-57.623273 0V793.6h-134.49309a28.811636 28.811636 0 1 1 0-57.623273h124.858181v-38.446545h-124.858181a28.811636 28.811636 0 0 1 0-57.623273h86.458181l-86.458181-163.281454a31.301818 31.301818 0 0 1 52.82909-33.629091l105.658182 187.298909h4.794182l105.658182-187.298909a31.301818 31.301818 0 1 1 52.829091 33.629091l-86.458182 153.6h81.640727a28.811636 28.811636 0 0 1 0 57.623272h-124.834909v38.493091h124.858182z m0 0" fill="#2C93F5" ></path></symbol></svg>',function(n){var t=(t=document.getElementsByTagName("script"))[t.length-1],e=t.getAttribute("data-injectcss"),t=t.getAttribute("data-disable-injectsvg");if(!t){var a,i,o,c,d,l=function(t,e){e.parentNode.insertBefore(t,e)};if(e&&!n.__iconfont__svg__cssinject__){n.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(t){console&&console.log(t)}}a=function(){var t,e=document.createElement("div");e.innerHTML=n._iconfont_svg_string_4480899,(e=e.getElementsByTagName("svg")[0])&&(e.setAttribute("aria-hidden","true"),e.style.position="absolute",e.style.width=0,e.style.height=0,e.style.overflow="hidden",e=e,(t=document.body).firstChild?l(e,t.firstChild):t.appendChild(e))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(a,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),a()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=a,c=n.document,d=!1,h(),c.onreadystatechange=function(){"complete"==c.readyState&&(c.onreadystatechange=null,s())})}function s(){d\|\|(d=!0,o())}function h(){try{c.documentElement.doScroll("left")}catch(t){return void setTimeout(h,50)}s()}}(window);