From 99a42d475713b2518e38628b7b1ab85310f3f8d0 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 9 Dec 2023 18:40:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 1 -
src/api/index.js | 15 +-
src/components/Businesses.vue | 19 +--
src/components/Businesses2.vue | 198 ++++++++++++++++++++++++
src/components/headView.vue | 51 ++++--
src/layout/index.vue | 36 ++++-
src/store/app.js | 30 +++-
src/utils/areaList.js | 39 +++++
src/utils/jiangyang_geo.js | 30 ++++
src/utils/luxian_geo.js | 54 +++++++
src/utils/xuyong_geo.js | 35 +++++
src/view/delivery/components/center.vue | 10 +-
src/view/index/components/centerMap.vue | 60 ++++---
src/view/login/index.vue | 16 +-
14 files changed, 520 insertions(+), 74 deletions(-)
create mode 100644 src/components/Businesses2.vue
create mode 100644 src/utils/areaList.js
create mode 100644 src/utils/jiangyang_geo.js
create mode 100644 src/utils/luxian_geo.js
create mode 100644 src/utils/xuyong_geo.js
diff --git a/src/App.vue b/src/App.vue
index ee6a9da..157c0b6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,4 @@
diff --git a/src/api/index.js b/src/api/index.js
index 79190fe..530c18f 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,11 +1,16 @@
import axios from "@/utils/axios.js";
-// 获取街道
+// 登录
export const login = (data) => {
return axios.post('dataview/login', data);
}
-// 获取街道
+// 区县
+export const getArea = (data) => {
+ return axios.get('city/get_area', { params: data });
+}
+
+// 乡镇
export const getStreet = (data) => {
return axios.get('city/get_street', { params: data });
}
@@ -15,6 +20,12 @@ export const orderList = (data) => {
return axios.get('dataview/curr_order_info', { params: data });
}
+// 订单列表
+export const logisticsList = (data) => {
+ return axios.get('dataview/logistics_list', { params: data });
+}
+
+
// 订单排行
export const orderRanking = (data) => {
return axios.get('dataview/order_ranking', { params: data });
diff --git a/src/components/Businesses.vue b/src/components/Businesses.vue
index 6a82af5..f3dafd6 100644
--- a/src/components/Businesses.vue
+++ b/src/components/Businesses.vue
@@ -11,22 +11,16 @@ const appStore = useAppStore();
const route = useRouter()
-const ShwostoreType = ref(false)
-const test = () => {
- console.log(6)
-}
-
const isShow = ref(false);
const hdClick = (e) => {
// console.log(e)
- if (e.columnIndex == 10) {
- // alert(45)
- route.replace('/storeLogin')
- }
-
-
+ // if (e.columnIndex == 10) {
+ // // alert(45)
+ // route.replace('/storeLogin')
+ // }
}
+
const initData = (data) => {
let arr = [];
for (let i = 0; i < data.length; i++) {
@@ -78,7 +72,8 @@ const pages = ref({
page: 1,
limit: 30,
total: 0,
- pageAll: 0
+ pageAll: 0,
+ type: '', //类型 1-待取货, 2-配送中, 3-已完成
})
const loadOrderList = (pramas) => {
diff --git a/src/components/Businesses2.vue b/src/components/Businesses2.vue
new file mode 100644
index 0000000..bbe9f1e
--- /dev/null
+++ b/src/components/Businesses2.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/headView.vue b/src/components/headView.vue
index cf5cca9..10dc0f7 100644
--- a/src/components/headView.vue
+++ b/src/components/headView.vue
@@ -3,8 +3,9 @@ import { reactive, ref, provide, nextTick, onMounted, inject } from "vue";
import areaList from "./areaList.vue";
import { useRoute, useRouter } from "vue-router";
import mitt from "@/utils/mitt";
-import { getStreet } from "@/api/index.js"
+import { getStreet } from "@/api/index.js";
import { useAppStore } from "@/store/app.js";
+import { useUserStore } from "@/store/user.js";
const reload = inject('reload');
@@ -14,13 +15,14 @@ const info = reactive({
})
const appStore = useAppStore();
+const userSotre = useUserStore();
const areaListRef = ref(null);
// 选择镇
const choseArea = ref(null)
const open = () => {
- areaListRef.value.show();
+ if (list.value.length > 0) areaListRef.value.show();
}
// 关闭
const offAreaList = (e) => {
@@ -35,20 +37,40 @@ const offAreaList = (e) => {
}
const list = ref([])
-const initList = () => {
- getStreet({
- area_code: appStore.address.areaCode
- }).then(res => {
- list.value = res.data;
- appStore.setAddress({
- areaCode: appStore.address.appStore,
- streetCode: res.data[0].code
+const initList = async () => {
+ let street = appStore.street;
+ if (street?.length == 0) {
+ let { data } = await getStreet({
+ area_code: appStore.address.areaCode
})
- info.address = res.data[0].name
- })
+ street = data;
+ appStore.setStreet(street);
+ }
+ let area = appStore.area;
+ if (userSotre.userInfo.street_code) {
+ let data = street.find(item => item.code == appStore.address.streetCode);
+ info.address = data?.name;
+ list.value = [];
+ appStore.setAddress({
+ areaCode: appStore.address.areaCode,
+ streetCode: appStore.address.streetCode
+ })
+ } else {
+ let data = area.find(item => item.code == appStore.address.areaCode);
+ info.address = data?.name;
+ list.value = [data, ...street];
+ if (appStore.address.streetCode) {
+ data = street.find(item => item.code == appStore.address.streetCode);
+ info.address = data?.name;
+ }
+ appStore.setAddress({
+ areaCode: appStore.address.areaCode,
+ streetCode: appStore.address.streetCode
+ })
+ }
+ mitt.emit('map_info', info);
}
-
const router = useRouter()
const route = useRoute()
@@ -84,9 +106,6 @@ const logout = () => {
}
onMounted(() => {
-
- mitt.emit('map_info', info);
-
initList();
// 每秒钟更新一次时间
diff --git a/src/layout/index.vue b/src/layout/index.vue
index e130352..c5fc720 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,9 +1,11 @@
diff --git a/src/view/login/index.vue b/src/view/login/index.vue
index 7874a2a..fae39af 100644
--- a/src/view/login/index.vue
+++ b/src/view/login/index.vue
@@ -2,7 +2,9 @@
import { ref, reactive } from "vue"
import { useRouter } from "vue-router";
import { login } from "@/api/index.js";
+import { getArea, getStreet } from "@/api/index.js"
import { useUserStore } from "@/store/user.js";
+import { useAppStore } from "@/store/app.js";
const router = useRouter()
const show = ref(false)
const account = ref('叙永镇')
@@ -11,9 +13,9 @@ const isAccount = ref(false)
const isPassword = ref(false)
const userStore = useUserStore();
+const appStore = useAppStore();
const submit = () => {
-
if (!account.value) {
isAccount.value = true;
return
@@ -21,18 +23,24 @@ const submit = () => {
else isAccount.value = false;
if (!password.value) {
isPassword.value = true;
-
return
}
else isPassword.value = false;
-
login({
account: account.value,
password: password.value
- }).then((res) => {
+ }).then(async (res) => {
userStore.setUserInfo(res.data.user);
userStore.setToken(res.data.token);
+ appStore.setAddress({
+ areaCode: res.data.user.area_code,
+ streetCode: res.data.user.street_code
+ });
+ let street = await getStreet({
+ area_code: res.data.user.area_code
+ })
+ appStore.setStreet(street.data);
router.push('/');
}).catch(e => {
console.log(e);