From 57daf0f0f8b1a2fa51164c071fa8430806cfa032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B5=A9?= <15830956848@163.com> Date: Mon, 24 Mar 2025 10:53:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E6=B7=BB=E5=8A=A0=E8=BE=BE?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 16 +- api/home.js | 11 + api/store.js | 2 +- config/config.js | 2 +- pages.json | 4 +- pages/product/product/shop/-shop.vue | 1 + pages/product/shopList.vue | 23 +- pages/tabbar/home/index.vue | 19 +- pages/tabbar/home/template/Talent.vue | 103 +++++++++ pages/tabbar/home/template/tpl_activity.vue | 20 ++ pages/tabbar/home/template/tpl_search.vue | 239 +++++++++++++++++++- pages/tabbar/home/views.vue | 19 +- static/shop.png | Bin 0 -> 1446 bytes static/tabbar/bei.png | Bin 0 -> 508083 bytes static/tabbar/shop.png | Bin 0 -> 1428 bytes static/tanback.png | Bin 0 -> 99452 bytes 16 files changed, 417 insertions(+), 42 deletions(-) create mode 100644 pages/tabbar/home/template/Talent.vue create mode 100644 pages/tabbar/home/template/tpl_activity.vue create mode 100644 static/shop.png create mode 100644 static/tabbar/bei.png create mode 100644 static/tabbar/shop.png create mode 100644 static/tanback.png diff --git a/App.vue b/App.vue index 0b37504d..80198fec 100644 --- a/App.vue +++ b/App.vue @@ -259,12 +259,12 @@ body { transition-duration: 300ms; } -uni-page-body, -html, -body, -page { - width: 100% !important; - height: 100% !important; - overflow: hidden; -} +// uni-page-body, +// html, +// body, +// page { +// width: 100% !important; +// height: 100% !important; +// overflow: hidden; +// } diff --git a/api/home.js b/api/home.js index a5dee697..d76ec4d5 100644 --- a/api/home.js +++ b/api/home.js @@ -12,6 +12,17 @@ export function getAdvertisement() { }); } +/** + * 像后端传递经纬度 + */ +export function postAdvertisementjw(data) { + return http.request({ + url: "/member/address/location", + method: Method.POST, + header: { "content-type": "application/x-www-form-urlencoded" }, + data + }); +} /** diff --git a/api/store.js b/api/store.js index 20e5ee2c..00e8fe4b 100644 --- a/api/store.js +++ b/api/store.js @@ -13,7 +13,7 @@ import {http, Method} from '@/utils/request.js'; */ export function getStoreList(params) { return http.request({ - url: '/store', + url: '/store/store', method: Method.GET, params, }); diff --git a/config/config.js b/config/config.js index 48013e54..807b63c3 100644 --- a/config/config.js +++ b/config/config.js @@ -7,7 +7,7 @@ export default { shareLink: "https://m-b2b2c.pickmall.cn", //分享地址，也就是在h5中默认的复制地址 appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态） appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看 - aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key + aMapKey: "AOHBZ-VCEL3-XX73N-O623U-FMTP6-ASBTD", //在腾讯的中申请web端key scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转 iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看 logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png", //logo地址 diff --git a/pages.json b/pages.json index f7528cd6..40e78be3 100644 --- a/pages.json +++ b/pages.json @@ -21,7 +21,7 @@ "navigationBarTitleText": "商城", "navigationStyle": "custom", // 隐藏系统导航栏 "navigationBarTextStyle": "black", - "enablePullDownRefresh":true + "enablePullDownRefresh": true } }, @@ -1084,7 +1084,7 @@ }, { "pagePath": "pages/tabbar/home/index", - "text": "商城" + "text": "本地" }, { "pagePath": "pages/tabbar/im/index", diff --git a/pages/product/product/shop/-shop.vue b/pages/product/product/shop/-shop.vue index 3220628d..94327de9 100644 --- a/pages/product/product/shop/-shop.vue +++ b/pages/product/product/shop/-shop.vue @@ -63,6 +63,7 @@ export default { }, tostorePage(val) { + console.log(val); uni.navigateTo({ url: "../product/shopPage?id=" + val.storeId, }); diff --git a/pages/product/shopList.vue b/pages/product/shopList.vue index c91daa8c..d81a8da3 100644 --- a/pages/product/shopList.vue +++ b/pages/product/shopList.vue @@ -7,21 +7,22 @@
- +
- {{item.storeName}} +
{{item.storeName}}
+
{{item.selfOperated?'自营':'非自营'}}
- 商品 {{item.goodsNum}} + 商品 {{item.goodsNum}} | 收藏 {{item.collectionNum}}
- {{item.serviceScore | unitPrice}} - | - 收藏 {{item.collectionNum}} +
@@ -113,11 +114,19 @@ export default { padding: 24rpx; } .store-msg { + width: 100%; margin-left: 20rpx; } .store-name { font-weight: bold; - font-size: 30rpx; + font-size: 35rpx; + display: flex; + justify-content: space-between; + .typeof{ + border: 1px solid red; + color: red; + font-size: 30rpx; + } } .goods-num, .store-collection { diff --git a/pages/tabbar/home/index.vue b/pages/tabbar/home/index.vue index c77fad59..32e524c6 100644 --- a/pages/tabbar/home/index.vue +++ b/pages/tabbar/home/index.vue @@ -1,7 +1,9 @@ diff --git a/pages/tabbar/home/template/Talent.vue b/pages/tabbar/home/template/Talent.vue new file mode 100644 index 00000000..bae24739 --- /dev/null +++ b/pages/tabbar/home/template/Talent.vue @@ -0,0 +1,103 @@ + + + diff --git a/pages/tabbar/home/template/tpl_activity.vue b/pages/tabbar/home/template/tpl_activity.vue new file mode 100644 index 00000000..00fe5331 --- /dev/null +++ b/pages/tabbar/home/template/tpl_activity.vue @@ -0,0 +1,20 @@ + + + + + \ No newline at end of file diff --git a/pages/tabbar/home/template/tpl_search.vue b/pages/tabbar/home/template/tpl_search.vue index 2bbc598d..728d9199 100644 --- a/pages/tabbar/home/template/tpl_search.vue +++ b/pages/tabbar/home/template/tpl_search.vue @@ -1,38 +1,259 @@ diff --git a/pages/tabbar/home/views.vue b/pages/tabbar/home/views.vue index 3379e8d5..21ac1e68 100644 --- a/pages/tabbar/home/views.vue +++ b/pages/tabbar/home/views.vue @@ -18,14 +18,17 @@ - + + + - + + @@ -56,6 +59,8 @@ import tpl_menu from "@/pages/tabbar/home/template/tpl_menu"; //五列菜单模 import tpl_search from "@/pages/tabbar/home/template/tpl_search"; //搜索栏 import tpl_group from "@/pages/tabbar/home/template/tpl_group"; // import tpl_goods from "@/pages/tabbar/home/template/tpl_goods"; //商品分类以及分类中的商品 +import Talent from "@/pages/tabbar/home/template/Talent"; //达人店 +import tpl_activity from "@/pages/tabbar/home/template/tpl_activity"; //活动 // 结束引用组件 import { getFloorData } from "@/api/home"; //获取楼层装修接口 import permision from "@/js_sdk/wa-permission/permission.js"; //权限工具类 @@ -90,6 +95,8 @@ export default { flexOne: tpl_flex_one, goods: tpl_goods, group: tpl_group, + Talent, + activity: tpl_activity, // spike: tpl_spike, // joinGroup: tpl_join_group, // integral: tpl_integral, @@ -102,7 +109,7 @@ export default { uni.showShareMenu({ withShareTicket: true }); // #endif }, - + methods: { /** * 实例化首页数据楼层 @@ -112,6 +119,7 @@ export default { getFloorData().then((res) => { if (res.data.success) { this.pageData = JSON.parse(res.data.result.pageData); + console.log(this.pageData.list); } }); }, @@ -128,7 +136,6 @@ export default { uni.scanCode({ success: function (res) { let path = encodeURIComponent(res.result); - // WX_CODE 为小程序码 if (res.scanType == "WX_CODE") { console.log(res) @@ -208,14 +215,14 @@ export default { this.seacnCode(); // #endif }, + }, };