diff --git a/.env.development b/.env.development index 37d0863..33ccd50 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,4 @@ -VITE_BASE_URL = 'https://crmeb-test.shop.lihaink.cn/api' +# VITE_BASE_URL = 'https://crmeb-test.shop.lihaink.cn/api' # VITE_BASE_URL = 'https://shop.lihaink.cn/api' +VITE_BASE_URL = 'https://test.shop.lihaink.cn/api' # VITE_BASE_URL = '/' \ No newline at end of file diff --git a/src/components/Businesses.vue b/src/components/Businesses.vue index f3dafd6..716d5a7 100644 --- a/src/components/Businesses.vue +++ b/src/components/Businesses.vue @@ -88,7 +88,12 @@ const loadOrderList = (pramas) => { onMounted(() => { // loadOrderList(); - mitt.on('showBusinesses', () => { + mitt.on('showBusinesses', (type='address') => { + pages.value.areaCode = appStore[type]?.areaCode; + pages.value.streetCode = appStore[type]?.streetCode; + pages.value.page = 1; + pages.value.total = 0; + pages.value.pageAll = 0; isShow.value = !isShow.value; }) }) diff --git a/src/components/headView.vue b/src/components/headView.vue index c636c20..44fe8b5 100644 --- a/src/components/headView.vue +++ b/src/components/headView.vue @@ -90,7 +90,7 @@ const initList = async (re = false) => { } let area = appStore.area; if (userSotre.userInfo.street_code) { - let data = street.find((item) => item.code == appStore.address.streetCode); + let data = appStore.street.find((item) => item.code == appStore.address.streetCode); info.address = data?.name; list.value = []; appStore.setAddress({ @@ -100,14 +100,15 @@ const initList = async (re = false) => { } else { let data = area.find((item) => item.code == appStore.address.areaCode); info.address = data?.name; - list.value = [data, ...street]; + list.value = [data, ...appStore.street]; + appStore.setStreet(list.value); if (appStore.address.streetCode) { - data = street.find((item) => item.code == appStore.address.streetCode); + data = list.value.find((item) => item.code == appStore.address.streetCode); info.address = data?.name; } appStore.setAddress({ areaCode: appStore.address.areaCode, - streetCode: appStore.address.streetCode, + streetCode: appStore.address.streetCode==appStore.address.areaCode?'':appStore.address.streetCode, }); } if(!re) mitt.emit("map_info", info); diff --git a/src/utils/axiosShop.js b/src/utils/axiosShop.js index 27b9b59..e5155c6 100644 --- a/src/utils/axiosShop.js +++ b/src/utils/axiosShop.js @@ -2,7 +2,7 @@ import axios from "axios"; import { ElMessage } from "element-plus"; const request = axios.create({ - baseURL: 'https://shop.lihaink.cn/api', + baseURL: import.meta.env.VITE_BASE_URL, timeout: 5000 }) diff --git a/src/view/delivery/components/bottom.vue b/src/view/delivery/components/bottom.vue index 56a04cc..05d95f1 100644 --- a/src/view/delivery/components/bottom.vue +++ b/src/view/delivery/components/bottom.vue @@ -359,7 +359,7 @@ const initEcahrts = (yData1 = [], yData2 = [], yData3 = [], yData4 = []) => { } const openList = () => { - mitt.emit('showBusinesses') + mitt.emit('showBusinesses', 'delivery_address') } const initInfo = () => { @@ -391,7 +391,8 @@ const pages = ref({ const loadOrderList = () => { getOrderList(pages.value).then((res) => { initData(res.data.currOrderList); - orderList.value[0].value = res.data.currOrderCount; + // orderList.value[0].value = res.data.currOrderCount; + orderList.value[0].value = res.data.realTodayOrderCount; orderList.value[1].value = res.data.pendingOrderCount; orderList.value[2].value = res.data.undeliveredOrderCount; orderList.value[3].value = res.data.doneOrderCountQuery; diff --git a/src/view/index/components/centerMap.vue b/src/view/index/components/centerMap.vue index fd6d6b5..5462097 100644 --- a/src/view/index/components/centerMap.vue +++ b/src/view/index/components/centerMap.vue @@ -492,7 +492,7 @@ const mapInfo = async () => { if (area.name == "合江县") map = hejiang_geo; if (area.name == "古蔺县") map = gulin_geo; map = JSON.parse(JSON.stringify(map)); - if (appStore.address.streetCode) { + if (appStore.address.streetCode&&appStore.address.streetCode!=appStore.address.areaCode) { if(appStore.street.length==0) { let { data } = await getStreet({ area_code: appStore.address.areaCode, diff --git a/src/view/index/components/rightItem1.vue b/src/view/index/components/rightItem1.vue index 6fde8e3..afefd02 100644 --- a/src/view/index/components/rightItem1.vue +++ b/src/view/index/components/rightItem1.vue @@ -8,7 +8,8 @@ import { useAppStore } from "@/store/app.js" const appStore = useAppStore(); -const list = ref([]) +const list = ref([]); +const list2 = ref([]); const count = ref(0); const loadList = () => { @@ -16,7 +17,8 @@ const loadList = () => { areaCode: appStore.address.areaCode, streetCode: appStore.address.streetCode, }).then(res => { - list.value = res.data.list; + list.value = res.data.list.slice(0,4); + list2.value = res.data.list.slice(4); count.value = res.data.count; // for (let i = 0; i < 2; i++) { // list.value = [...list.value, ...res.data.list]; @@ -71,7 +73,7 @@ onMounted(() => {
@@ -89,24 +91,27 @@ onMounted(() => {
-
+
{{ item.license }}
-
+
+ +
@@ -231,3 +236,28 @@ onMounted(() => { } } + + \ No newline at end of file