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..f089327 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..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"> - + @@ -29,8 +30,9 @@ - 热搜: 热a搜商品 热搜商品 - 热搜sasas商品 + 热搜: 小张副食 正新酒店 + 麻辣鸡 + 手撕椒麻鸡 @@ -315,6 +317,7 @@ "/static/images/GXSC/DFTC.png", "/static/images/GXSC/JDMS.png", ], + street_id: "", price: 0, stock: 0, nows: false, @@ -389,6 +392,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 +411,7 @@ supMenuApi().then(res => { this.menuList = res.data }) + }, computed: { downMenus: function() { @@ -434,7 +439,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 0000000..2dc4691 Binary files /dev/null and b/static/images/GXSC/SJicon.png differ