+
-import { reactive, ref } from "vue";
+import { reactive, ref, provide, nextTick, onMounted } from "vue";
import areaList from "./areaList.vue";
+import { useRoute, useRouter } from "vue-router";
+import mitt from "@/utils/mitt";
const info = reactive({
- address: '泸县'
+ address: '泸县',
+ pinyin: 'luxian'
})
+const areaListRef = ref(null);
+
// 选择镇
const choseArea = ref(null)
const open = () => {
- choseArea.value = !choseArea.value;
+ areaListRef.value.show();
}
// 关闭
const offAreaList = (e) => {
+ Object.keys(e).forEach(key => {
+ if (e[key]) {
+ info[key] = e[key];
+ }
+ })
info.address = e.name;
+ mitt.emit('map_info', info);
}
+
+const router = useRouter()
+const route = useRoute()
+
+const navToDelivery = () => {
+ if (route.path == '/') router.push('/delivery');
+ else router.back();
+}
+
+onMounted(() => {
+ mitt.emit('map_info', info);
+})
- 
+
{{ info.address }}
+import { ref } from "vue";
+
+const pages = ref({
+ page: 1,
+ total: 63,
+ pageSize: 30,
+ pageAll: 7
+})
+
+const prev = () => {
+ if (pages.value.page > 1) pages.value.page--;
+}
+const next = () => {
+ if (pages.value.page < pages.value.pageAll) pages.value.page++;
+}
+const setPage = (page = 1) => {
+ pages.value.page = page;
+}
+const getPage = () => {
+ console.log(pages.value.page);
+ if (pages.value.page < 0) pages.value.page = 1;
+ if (pages.value.page > pages.value.pageAll) pages.value.page = pages.value.pageAll;
+}
+const input = (e) => {
+ if (e.data >= 0 && e.data <= 9) return getPage();
+ pages.value.page = 1;
+}
+
+
+
+ 
-
+
2023.11.17
11:30:20
@@ -31,6 +58,7 @@ const offAreaList = (e) => {
{{ info.address }}
+
+
+
+
\ No newline at end of file
diff --git a/src/utils/mitt.js b/src/utils/mitt.js
new file mode 100644
index 0000000..3d214dc
--- /dev/null
+++ b/src/utils/mitt.js
@@ -0,0 +1,5 @@
+import mitt from "mitt"
+
+const m = mitt();
+
+export default m;
\ No newline at end of file
diff --git a/src/view/delivery/components/AMap.vue b/src/view/delivery/components/AMap.vue
index 38dc096..07a4d73 100644
--- a/src/view/delivery/components/AMap.vue
+++ b/src/view/delivery/components/AMap.vue
@@ -1,9 +1,11 @@
-
+ 共 {{ pages.total }} 条
+ {{ "<" }}
+
+ 1
+
+
+ 2
+
+
+ 3
+
+
+ ...
+
+
+ {{ pages.pageAll - 2 }}
+
+
+ {{ pages.pageAll - 1 }}
+
+
+ {{ pages.pageAll }}
+
+ {{ ">" }}
+
+
+ 前往
+
+ 页
+
+
+
-
diff --git a/src/view/delivery/components/AMapLeft.vue b/src/view/delivery/components/AMapLeft.vue
index 155fcfd..81741a1 100644
--- a/src/view/delivery/components/AMapLeft.vue
+++ b/src/view/delivery/components/AMapLeft.vue
@@ -1,9 +1,11 @@
-
+
+ 加载中...
+
+
+
+
-
diff --git a/src/view/delivery/components/bottom.vue b/src/view/delivery/components/bottom.vue
index b069a9b..5ddb3f6 100644
--- a/src/view/delivery/components/bottom.vue
+++ b/src/view/delivery/components/bottom.vue
@@ -2,6 +2,7 @@
import { onMounted, reactive, ref } from "vue"
import border from "@/components/border.vue";
import * as echarts from 'echarts';
+import mitt from "@/utils/mitt"
const list = reactive({
header: ['ID', '收件人', '收件人电话', '商品信息', '收货地址'],
@@ -324,6 +325,10 @@ const initEcahrts = () => {
chart.setOption(option);
}
+const openList = () => {
+ mitt.emit('showBusinesses')
+}
+
onMounted(() => {
initEcahrts()
})
@@ -354,7 +359,7 @@ onMounted(() => {
+ 加载中...
+
+
今日订单
+
diff --git a/src/view/delivery/components/center.vue b/src/view/delivery/components/center.vue
index 4dd1944..c46a484 100644
--- a/src/view/delivery/components/center.vue
+++ b/src/view/delivery/components/center.vue
@@ -1,7 +1,6 @@
diff --git a/src/view/index/components/ball.vue b/src/view/index/components/ball.vue
index 4bb7d13..4d04a0c 100644
--- a/src/view/index/components/ball.vue
+++ b/src/view/index/components/ball.vue
@@ -61,8 +61,8 @@
right: 0;
bottom: 0;
margin: auto;
- width: 80vh;
- height: 80vh;
+ width: 50vh;
+ height: 50vh;
transform-style: preserve-3d;
/*border: 1px solid #fff;*/
animation: starrotate 10s linear;
diff --git a/src/view/index/components/centerMap.vue b/src/view/index/components/centerMap.vue
index 2085f4c..0c4a074 100644
--- a/src/view/index/components/centerMap.vue
+++ b/src/view/index/components/centerMap.vue
@@ -1,72 +1,181 @@
diff --git a/src/view/index/components/leftItme1.vue b/src/view/index/components/leftItme1.vue
index 577c3ad..9fe8b5a 100644
--- a/src/view/index/components/leftItme1.vue
+++ b/src/view/index/components/leftItme1.vue
@@ -1,24 +1,50 @@
-
查看更多
{{ "〉" }}
+
-
今日订单数
0
@@ -59,7 +89,7 @@ const navToDelivery = () => {
今日订单
+
@@ -173,8 +203,14 @@ const navToDelivery = () => {
}
}
}
- ::v-deep .dv-scroll-board .rows .row-item {
- margin-bottom: 0.6rem;
+
+ :deep(.ceil) {
+ padding: 0 !important;
+ margin-bottom: 5px;
+ }
+
+ :deep(.header-item) {
+ padding: 0 !important;
}
}
.cylinder {
查看更多
{{ "〉" }}