From f4c2333170ebc73f6424d2e30d69f4851f38ddf0 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Mon, 18 Dec 2023 18:49:23 +0800 Subject: [PATCH] updata --- src/api.js | 7 ++++- src/components/header.vue | 7 ++--- src/main.js | 4 +-- src/store/index.js | 9 ++---- src/view/Businesses.vue | 40 +++++++++++++++++++----- src/view/index.vue | 24 ++++++++++++-- src/view/login.vue | 4 +-- src/view/storeLogin.vue | 26 ++++++++++++--- src/view/townDetail.vue | 66 +++++++++++++++++++++++++-------------- 9 files changed, 133 insertions(+), 54 deletions(-) diff --git a/src/api.js b/src/api.js index 7231e30..2811ef4 100644 --- a/src/api.js +++ b/src/api.js @@ -189,6 +189,11 @@ export function merchant_product_visitApi(params) { export function merchant_product_cartApi(params) { return instacne.get('/api/dataview/merchant_product_cart', { params }) } + +export function merchantApi(params) { + return instacne.get('/api/dataview/merchant', { params }) +} + // -///api/dataview/merchant_product_cart?areaCode=510524&streetCode=510524100&mer_id=42&start_date=2023-01-01&end_date=2023-12-09 +//api/dataview/merchant?mer_id=36&areaCode=510524&streetCode=510524100 // } diff --git a/src/components/header.vue b/src/components/header.vue index 42d32df..5da08e4 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -52,7 +52,7 @@
- +
{{ area }}
@@ -129,11 +129,10 @@ watch( (value, oldValue) => { -console.log(value,oldValue) - + if (value == '/index') { showFn(0) - area.value = '龙马潭区' + area.value = '泸县' } if (value == '/townDetail') { showFn(0) diff --git a/src/main.js b/src/main.js index bf6303f..5d23df8 100644 --- a/src/main.js +++ b/src/main.js @@ -4,13 +4,11 @@ import dataV from '@jiaminghi/data-view' import router from "./router"; import ElementPlus from 'element-plus' import * as ElementPlusIconsVue from '@element-plus/icons-vue' -// import VueDatePicker from '@vuepic/vue-datepicker'; -// import '@vuepic/vue-datepicker/dist/main.css' + import { createPinia } from 'pinia' import 'element-plus/dist/index.css' -// import '@/components/townDetail/test.js' import 'amfe-flexible' const pinia = createPinia() diff --git a/src/store/index.js b/src/store/index.js index 4393680..0dc9749 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -35,12 +35,9 @@ export const areaObj = defineStore('counter', { this.store.mer_id = mer_id } - - - - - - + }, + storeLogin(obj) { + this.userInfo.user = obj } } diff --git a/src/view/Businesses.vue b/src/view/Businesses.vue index 4862858..8a2f5fa 100644 --- a/src/view/Businesses.vue +++ b/src/view/Businesses.vue @@ -1,5 +1,10 @@