+
@@ -43,7 +43,7 @@
#5bdbf6 calc(100% - 12px)
);
}
- .center {
+ .border-center {
flex: 1;
display: flex;
justify-content: space-between;
@@ -58,7 +58,7 @@
);
}
}
- .box {
+ .border-slot {
flex: 1;
}
}
diff --git a/src/components/headView.vue b/src/components/headView.vue
index 17b3229..03f5dc5 100644
--- a/src/components/headView.vue
+++ b/src/components/headView.vue
@@ -35,8 +35,30 @@ const navToDelivery = () => {
else router.back();
}
+let nowTime = ref([]);
+
+const updateClock = () => {
+ let now = new Date();
+ let hours = now.getHours();
+ let minutes = now.getMinutes();
+ let seconds = now.getSeconds();
+ let y = now.getFullYear();
+ let m = now.getMonth() + 1;
+ let d = now.getDate();
+
+ nowTime.value[0] = y + '.' + m.toString().padStart(2, '0') + '.' + d.toString().padStart(2, '0');
+
+ nowTime.value[1] = hours.toString().padStart(2, '0') + ':' +
+ minutes.toString().padStart(2, '0') + ':' +
+ seconds.toString().padStart(2, '0');
+}
+
onMounted(() => {
+
mitt.emit('map_info', info);
+
+ // 每秒钟更新一次时间
+ setInterval(updateClock, 1000);
})
@@ -48,9 +70,9 @@ onMounted(() => {
src="/src/assets/head_img/logo.png"
@click="navToDelivery"
/>
-
2023.11.17
+
{{ nowTime[0] }}
-
11:30:20
+
{{ nowTime[1] }}
diff --git a/src/main.js b/src/main.js
index 79a17e2..61ecf54 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,8 +4,12 @@ import App from './App.vue'
import dataV from '@jiaminghi/data-view'
import './assets/font/fonts.css';
import router from "./router";
+import { createPinia } from 'pinia'
+
+const pinia = createPinia();
const app = createApp(App)
app.use(dataV)
+app.use(pinia)
app.use(router)
app.mount('#app')
diff --git a/src/store/app.js b/src/store/app.js
new file mode 100644
index 0000000..42435dd
--- /dev/null
+++ b/src/store/app.js
@@ -0,0 +1,16 @@
+import { defineStore } from "pinia"
+import { ref } from "vue"
+
+export const useAppStore = defineStore('app', () => {
+ const map_info = ref(localStorage.getItem('map_info') || 'luxian');
+
+ const setMapInfo = (e) => {
+ map_info.value = e;
+ localStorage.setItem('map_info', e);
+ }
+
+ return {
+ map_info,
+ setMapInfo
+ }
+})
\ No newline at end of file
diff --git a/src/view/delivery/components/bottom.vue b/src/view/delivery/components/bottom.vue
index 5ddb3f6..91f2c97 100644
--- a/src/view/delivery/components/bottom.vue
+++ b/src/view/delivery/components/bottom.vue
@@ -4,28 +4,55 @@ import border from "@/components/border.vue";
import * as echarts from 'echarts';
import mitt from "@/utils/mitt"
+const initData = (aaa) => {
+ for (let i = 0; i < 20; i++) {
+ if (i % 2 == 0) {
+ aaa.data.push(
+ [
+ `
排序
`,
+ `
排sd序
`,
+ `
排序
`,
+ `
排序
`,
+ `
排序
`,
+ ]
+ )
+ } else {
+ aaa.data.push(
+ [
+ `
排序
`,
+ `
排sd序
`,
+ `
排序
`,
+ `
排序
`,
+ `
排序
`,
+ ]
+ )
+ }
+
+ }
+}
+
const list = reactive({
- header: ['ID', '收件人', '收件人电话', '商品信息', '收货地址'],
- data: [
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
- ['
1233', '
张某某', '
15566667777', '
南瓜饼', '
莲花池街道实打实打算'],
+ header: [
+ `
ID
`,
+ `
收货人
`,
+ `
收货人电话
`,
+ `
商品名称
`,
+ `
收货人地址
`,
],
+ data: [],
// index: true,
- headerBGC: 'rgba(0, 168, 255, 0.56)',
- oddRowBGC: 'rgba(91, 219, 246, 0.20)',
- evenRowBGC: 'rgba(0, 168, 255, 0.16)',
+ // headerBGC: 'rgba(0, 168, 255, 0.76)',
+ // oddRowBGC: 'rgba(91, 219, 246, 0.20)',
+ // evenRowBGC: 'rgba(0, 168, 255, 0.16)',
+ oddRowBGC: '',
+ evenRowBGC: "",
// columnWidth: [50],
align: ['center'],
rowNum: 7
})
+initData(list);
+
const orderList = reactive([
{
name: '今日订单',
@@ -373,7 +400,7 @@ onMounted(() => {