diff --git a/src/App.vue b/src/App.vue index df93535..7d1cfba 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,6 +9,7 @@ if (localStorage.getItem("TRADE_USER")) { let userInfo = JSON.parse(localStorage.getItem('TRADE_USER')) areaStroe.changeUserInfo(userInfo) let { area_code, street_code } = userInfo.user + console.log(area_code,45454) areaStroe.changeArea({ areaCode: area_code, streetCode: street_code }) } diff --git a/src/components/header.vue b/src/components/header.vue index 418233c..42d32df 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -127,6 +127,10 @@ const backUrl = ref('/') watch( () => route.path, (value, oldValue) => { + + +console.log(value,oldValue) + if (value == '/index') { showFn(0) area.value = '龙马潭区' diff --git a/src/main.js b/src/main.js index 04c2a96..bf6303f 100644 --- a/src/main.js +++ b/src/main.js @@ -4,8 +4,8 @@ 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 VueDatePicker from '@vuepic/vue-datepicker'; +// import '@vuepic/vue-datepicker/dist/main.css' import { createPinia } from 'pinia' @@ -15,10 +15,8 @@ import 'element-plus/dist/index.css' import 'amfe-flexible' const pinia = createPinia() const app = createApp(App) -app.component('VueDatePicker', VueDatePicker); -for (const [key, component] of Object.entries(ElementPlusIconsVue)) { - app.component(key, component) -} + + app.use(router) app.use(dataV) app.use(pinia) diff --git a/src/view/Businesses.vue b/src/view/Businesses.vue index 4bfb850..4862858 100644 --- a/src/view/Businesses.vue +++ b/src/view/Businesses.vue @@ -73,7 +73,7 @@ const addConfigData = (data) => { `
${item.is_best ? "推荐" : "不推荐"}
`, `
${item.create_time}
`, `
${item.margin}
`, - `
${item.merchantCategory.category_name}
`, + `
${item.merchantCategory?.category_name||'--'}
`, `
${item.status ? '开启' : '关闭'}
`, `
登录
`, ] @@ -89,7 +89,7 @@ const addConfigData = (data) => { `
${item.is_best ? "推荐" : "不推荐"}
`, `
${item.create_time}
`, `
${item.margin}
`, - `
${item.merchantCategory.category_name}
`, + `
${item.merchantCategory?.category_name||'--'}
`, `
${item.status ? '开启' : '关闭'}
`, `
登录
`, ] diff --git a/src/view/index.vue b/src/view/index.vue index 9976ca6..d358a68 100644 --- a/src/view/index.vue +++ b/src/view/index.vue @@ -36,27 +36,11 @@ import bottomRight from "@/components/index/bottomRight.vue" import { areaObj } from '@/store/index.js' import { useRouter } from "vue-router" const router = useRouter() - - - - - - const areaStore = areaObj() -console.log(areaStore.areaCodes, 45454) - - const areaCodes = reactive({ ...areaStore.area }) - - const loading = ref(false) - - - - -