From e04c20f1952003ce0843f5bc032c15836c06f34c Mon Sep 17 00:00:00 2001 From: THK3121 Date: Mon, 4 Sep 2023 14:12:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BE=9B=E9=94=80=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E4=BA=91=E5=B8=82=E5=9C=BA=E9=99=84=E8=BF=91=E5=95=86=E5=AE=B6?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/store.js | 13 +++++++++++- config/app.js | 8 +++---- manifest.json | 7 +++--- pages.json | 18 +++++++--------- pages/nongKe/supply_chain/maps.vue | 27 ++++++++++++++++++++++-- pages/nongKe/supply_chain/supplier.vue | 12 +++++++---- pages/nongKe/supply_chain/supplierA.vue | 27 ++++++++++-------------- static/images/GXSC/SJicon.png | Bin 0 -> 3082 bytes 8 files changed, 72 insertions(+), 40 deletions(-) create mode 100644 static/images/GXSC/SJicon.png diff --git a/api/store.js b/api/store.js index 8ced6c6..73d54da 100644 --- a/api/store.js +++ b/api/store.js @@ -561,4 +561,15 @@ export function supAgoodsApi(data) { return request.get('store/merchant/lst', data); } // /api/store / merchant / lst ? page = 1 & limit = 10 & order = & category_id = 22 & type_id = 10 & street_id = & -// credit_buy = \ No newline at end of file +// credit_buy = +// /api/region/:street_id/merchant +/** + * 附近商家 + * @returns {*} + */ +// export function supAgoodsApi(data) { +// return request.get('store/merchant/lst', data); +// } +export function vicinityStoreApi(data) { + return request.get(`region/${data}/merchant`); +} \ No newline at end of file diff --git a/config/app.js b/config/app.js index d98a31e..adddc06 100644 --- a/config/app.js +++ b/config/app.js @@ -9,11 +9,11 @@ let httpApiThree // 网络接口修改此字符 小程序域名要求https // let httpApi = 'http://192.168.31.110:8324' // 测试 if (process.env.NODE_ENV === "development") { - // httpApi = 'https://shop.lihaink.cn' // 生产 - httpApi = "https://crmeb-test.shop.lihaink.cn" + // httpApi = 'https://shop.lihaink.cn' // 生产 + httpApi = "https://crmeb-test.shop.lihaink.cn" // httpApi = "http://192.168.0.222" - // httpApi = "http://192.168.0.108:8325" - // httpApi = 'http://192.168.0.108:8325' + // httpApi = "http://192.168.0.108:8325" + // httpApi = 'http://192.168.0.108:8325' // #ifdef MP-WEIXIN httpApiTwo = "https://nk.lihaink.cn" httpApiThree = 'http://ceshi-oa.lihaink.cn' diff --git a/manifest.json b/manifest.json index a7ebb6d..43987aa 100644 --- a/manifest.json +++ b/manifest.json @@ -30,7 +30,8 @@ "OAuth" : {}, "UniMP" : { "description" : "uni小程序" - } + }, + "Maps" : {} }, "safearea" : { "bottom" : { @@ -94,8 +95,8 @@ "sdkConfigs" : { "maps" : { "amap" : { - "appkey_ios" : "", - "appkey_android" : "" + "appkey_ios" : "048d9f3f323eea894b49c3a7edbc8d87", + "appkey_android" : "048d9f3f323eea894b49c3a7edbc8d87" } }, "payment" : { diff --git a/pages.json b/pages.json index 82eb8ae..f21afa3 100644 --- a/pages.json +++ b/pages.json @@ -95,15 +95,14 @@ } }, { - "path" : "pages/moreProject/moreProject", - "style" : - { - "navigationBarTitleText": "更多功能", - "enablePullDownRefresh": false - } - - } - ], + "path": "pages/moreProject/moreProject", + "style": { + "navigationBarTitleText": "更多功能", + "enablePullDownRefresh": false + } + + } + ], "subPackages": [{ "root": "pages/goods_cate", "name": "goods_cate", @@ -220,7 +219,6 @@ }, { "path": "supply_chain/maps", "style": { - "enablePullDownRefresh": true, "navigationBarTitleText": "", "navigationBarBackgroundColor": "#e93323", "navigationStyle": "custom" diff --git a/pages/nongKe/supply_chain/maps.vue b/pages/nongKe/supply_chain/maps.vue index d80355d..1696597 100644 --- a/pages/nongKe/supply_chain/maps.vue +++ b/pages/nongKe/supply_chain/maps.vue @@ -1,6 +1,6 @@ diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 3dc4211..ac92e63 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -21,7 +21,7 @@ :showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"> - + @@ -29,8 +29,9 @@ - 热搜: 热a搜商品 热搜商品 - 热搜sasas商品 + 热搜: 小张副食 正新酒店 + 麻辣鸡 + 手撕椒麻鸡 @@ -315,6 +316,7 @@ "/static/images/GXSC/DFTC.png", "/static/images/GXSC/JDMS.png", ], + street_id: "", price: 0, stock: 0, nows: false, @@ -389,6 +391,7 @@ }, onLoad(options) { // console.log(options); + this.street_id = options.street_id this.product_type = options.product_type ?? 0 if (options.street_id != undefined) { this.sotreParam.street_id = options.street_id @@ -407,6 +410,7 @@ supMenuApi().then(res => { this.menuList = res.data }) + }, computed: { downMenus: function() { @@ -434,7 +438,7 @@ }, navGo(id) { uni.navigateTo({ - url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}` + url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}&street_id=${this.street_id}` }) }, go_details: function(product_type, product_id) { diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue index e5b17b8..57e344c 100644 --- a/pages/nongKe/supply_chain/supplierA.vue +++ b/pages/nongKe/supply_chain/supplierA.vue @@ -293,16 +293,8 @@ }, data() { return { - titName: "", - imgList: [ - "/static/images/GXSC/BBY.png", - "/static/images/GXSC/JYPX.png", - "/static/images/GXSC/NFCP.png", - "/static/images/GXSC/SCFW.png", - "/static/images/GXSC/BBY.png", - - ], + titName: "坝坝宴", price: 0, stock: 0, nows: false, @@ -376,7 +368,6 @@ }; }, onLoad(options) { - console.log(options); this.product_type = options.product_type ?? 0 if (options.street_id != undefined) { this.sotreParam.street_id = options.street_id @@ -394,11 +385,15 @@ this.getClassfication(); this.getStoreType(); supMenuApi().then(res => { - this.menuList = res.data - }) - .then(res => { - console.log(res) - }) + this.menuList = res.data + let index = this.menuList.findIndex((item) => { + return item.merchant_category_id == options.merchant_category_id; + }); + this.titName = this.menuList[index].category_name + // console.log(this.menuList) + }) + // console.log(this.menuList) + }, computed: { downMenus: function() { @@ -604,7 +599,7 @@ this.storeList = this.storeList.concat(res.data.list) this.loading = false this.loadingIcon = false - this.titName = this.storeList[0].mer_info + // this.titName = this.storeList[0].mer_info }) }, // 进店 diff --git a/static/images/GXSC/SJicon.png b/static/images/GXSC/SJicon.png new file mode 100644 index 0000000000000000000000000000000000000000..2dc4691ac9f30c0db218134526381ae69ee51c1c GIT binary patch literal 3082 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 Ye`3s)hlwG4WB>pF07*qoM6N<$f`xS1ApigX literal 0 HcmV?d00001 From dedcc538527a2d5e98264ab60123377243fb7448 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Mon, 4 Sep 2023 14:22:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/nongKe/supply_chain/maps.vue | 34 +++++++++++++++++++++----- pages/nongKe/supply_chain/supplier.vue | 3 ++- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/pages/nongKe/supply_chain/maps.vue b/pages/nongKe/supply_chain/maps.vue index 1696597..f089327 100644 --- a/pages/nongKe/supply_chain/maps.vue +++ b/pages/nongKe/supply_chain/maps.vue @@ -20,20 +20,42 @@ id: 1, latitude: 28.908447, longitude: 105.439304, - title: "手动升级的话", + title: "测试商家名称", iconPath: "/static/images/GXSC/SJicon.png" - }] + }, { + id: 2, + latitude: 28.909447, + longitude: 105.439304, + title: "测试商家名称", + iconPath: "/static/images/GXSC/SJicon.png" + }, { + id: 3, + latitude: 28.908447, + longitude: 105.459304, + title: "测试商家名称", + iconPath: "/static/images/GXSC/SJicon.png" + }, ] } } , - onLoad() { + onLoad(options) { let that = this // supAgoodsApi() - vicinityStoreApi(510502106).then(res => { - console.log(res.data.list) + vicinityStoreApi(options.street_id).then(res => { + // console.log(res.data.list) res.data.list.forEach(item => { - that.markers.push({}) + if (!item.lat) return + this.markers = [] + // console.log(item) + that.markers.push({ + id: item.mer_id, + latitude: item.lat, + longitude: item.long, + title: item.mer_name, + iconPath: "/static/images/GXSC/SJicon.png" + + }) }) }) } diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index ac92e63..773621e 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -21,7 +21,8 @@ :showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx" height="56.82rpx"> - +