mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'old' of https://gitea.lihaink.cn/mkm/nk-shop2.0 into old

Browse Source
This commit is contained in:
jia 2023-09-04 14:55:06 +08:00
commit 1e9257bc66
8 changed files with 95 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/store.js
View File

@ -561,4 +561,15 @@ export function supAgoodsApi(data) {
return request.get('store/merchant/lst', 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 = & // /api/store / merchant / lst ? page = 1 & limit = 10 & order = & category_id = 22 & type_id = 10 & street_id = &
// credit_buy = // 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`);
}

8
config/app.js
View File

@ -9,11 +9,11 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https // 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试 // let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
// httpApi = 'https://shop.lihaink.cn' // 生产 // httpApi = 'https://shop.lihaink.cn' // 生产
httpApi = "https://crmeb-test.shop.lihaink.cn" httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222" // 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 // #ifdef MP-WEIXIN
httpApiTwo = "https://nk.lihaink.cn" httpApiTwo = "https://nk.lihaink.cn"
httpApiThree = 'http://ceshi-oa.lihaink.cn' httpApiThree = 'http://ceshi-oa.lihaink.cn'

7
manifest.json
View File

@ -30,7 +30,8 @@
"OAuth" : {}, "OAuth" : {},
"UniMP" : { "UniMP" : {
"description" : "uni小程序" "description" : "uni小程序"
} },
"Maps" : {}
}, },
"safearea" : { "safearea" : {
"bottom" : { "bottom" : {
@ -94,8 +95,8 @@
"sdkConfigs" : { "sdkConfigs" : {
"maps" : { "maps" : {
"amap" : { "amap" : {
"appkey_ios" : "", "appkey_ios" : "048d9f3f323eea894b49c3a7edbc8d87",
"appkey_android" : "" "appkey_android" : "048d9f3f323eea894b49c3a7edbc8d87"
} }
}, },
"payment" : { "payment" : {

18
pages.json
View File

@ -95,15 +95,14 @@
} }
}, { }, {
"path" : "pages/moreProject/moreProject", "path": "pages/moreProject/moreProject",
"style" : "style": {
{ "navigationBarTitleText": "更多功能",
"navigationBarTitleText": "更多功能", "enablePullDownRefresh": false
"enablePullDownRefresh": false }
}
}
} ],
],
"subPackages": [{ "subPackages": [{
"root": "pages/goods_cate", "root": "pages/goods_cate",
"name": "goods_cate", "name": "goods_cate",
@ -220,7 +219,6 @@
}, { }, {
"path": "supply_chain/maps", "path": "supply_chain/maps",
"style": { "style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#e93323", "navigationBarBackgroundColor": "#e93323",
"navigationStyle": "custom" "navigationStyle": "custom"

49
pages/nongKe/supply_chain/maps.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class=""> <view class="">
<map :class="mapClass" id="map" :enable-zoom="true" :scale="19" :latitude="28.908447" :enable-scroll="true" <map id="map" :enable-zoom="true" :markers="markers" :scale="19" :latitude="28.908447" :enable-scroll="true"
:longitude="105.439304" style="width: 100vw;height: 100vh;"> :longitude="105.439304" style="width: 100vw;height: 100vh;">
<!-- <cover-image class="map_btn" @tap="test" src="../../static/img/logistics/DH.png"> <!-- <cover-image class="map_btn" @tap="test" src="../../static/img/logistics/DH.png">
</cover-image> --> </cover-image> -->
@ -9,12 +9,57 @@
</template> </template>
<script> <script>
import {
vicinityStoreApi,
supAgoodsApi
} from '@/api/store.js';
export default { export default {
data() { data() {
return { return {
markers: [{
id: 1,
latitude: 28.908447,
longitude: 105.439304,
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(options) {
let that = this
// supAgoodsApi()
vicinityStoreApi(options.street_id).then(res => {
// console.log(res.data.list)
res.data.list.forEach(item => {
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"
})
})
})
}
} }
</script> </script>

13
pages/nongKe/supply_chain/supplier.vue
View File

@ -21,7 +21,8 @@
:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx" :showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
height="56.82rpx"></u--image> height="56.82rpx"></u--image>
</view> </view>
<view class='iconfont search-right' @click="goMap('/pages/nongKe/supply_chain/maps')"> <view class='iconfont search-right'
@click="goMap(`/pages/nongKe/supply_chain/maps?street_id=${street_id}`)">
<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="50.82rpx" <u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="50.82rpx"
height="50.82rpx"></u--image> height="50.82rpx"></u--image>
</view> </view>
@ -29,8 +30,9 @@
</view> </view>
<view class="content"> <view class="content">
<view class="hot_serch"> <view class="hot_serch">
<text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text> <text>热搜:</text> <text>小张副食</text> <text>正新酒店</text>
<text>热搜sasas商品</text> <text>麻辣鸡</text>
<text>手撕椒麻鸡</text>
</view> </view>
<view class="menu_cls"> <view class="menu_cls">
@ -315,6 +317,7 @@
"/static/images/GXSC/DFTC.png", "/static/images/GXSC/DFTC.png",
"/static/images/GXSC/JDMS.png", "/static/images/GXSC/JDMS.png",
], ],
street_id: "",
price: 0, price: 0,
stock: 0, stock: 0,
nows: false, nows: false,
@ -389,6 +392,7 @@
}, },
onLoad(options) { onLoad(options) {
// console.log(options); // console.log(options);
this.street_id = options.street_id
this.product_type = options.product_type ?? 0 this.product_type = options.product_type ?? 0
if (options.street_id != undefined) { if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id this.sotreParam.street_id = options.street_id
@ -407,6 +411,7 @@
supMenuApi().then(res => { supMenuApi().then(res => {
this.menuList = res.data this.menuList = res.data
}) })
}, },
computed: { computed: {
downMenus: function() { downMenus: function() {
@ -434,7 +439,7 @@
}, },
navGo(id) { navGo(id) {
uni.navigateTo({ 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) { go_details: function(product_type, product_id) {

27
pages/nongKe/supply_chain/supplierA.vue
View File

@ -293,16 +293,8 @@
}, },
data() { data() {
return { 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, price: 0,
stock: 0, stock: 0,
nows: false, nows: false,
@ -376,7 +368,6 @@
}; };
}, },
onLoad(options) { onLoad(options) {
console.log(options);
this.product_type = options.product_type ?? 0 this.product_type = options.product_type ?? 0
if (options.street_id != undefined) { if (options.street_id != undefined) {
this.sotreParam.street_id = options.street_id this.sotreParam.street_id = options.street_id
@ -394,11 +385,15 @@
this.getClassfication(); this.getClassfication();
this.getStoreType(); this.getStoreType();
supMenuApi().then(res => { supMenuApi().then(res => {
this.menuList = res.data this.menuList = res.data
}) let index = this.menuList.findIndex((item) => {
.then(res => { return item.merchant_category_id == options.merchant_category_id;
console.log(res) });
}) this.titName = this.menuList[index].category_name
// console.log(this.menuList)
})
// console.log(this.menuList)
}, },
computed: { computed: {
downMenus: function() { downMenus: function() {
@ -604,7 +599,7 @@
this.storeList = this.storeList.concat(res.data.list) this.storeList = this.storeList.concat(res.data.list)
this.loading = false this.loading = false
this.loadingIcon = false this.loadingIcon = false
this.titName = this.storeList[0].mer_info // this.titName = this.storeList[0].mer_info
}) })
}, },
// 进店 // 进店

BIN
static/images/GXSC/SJicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB