diff --git a/pages.json b/pages.json
index 099e077..5aeed9f 100644
--- a/pages.json
+++ b/pages.json
@@ -134,6 +134,20 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "pages/index/orderStatistics",
+ "style": {
+ "navigationBarTitleText": "当日订单统计",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/index/countEmployees",
+ "style": {
+ "navigationBarTitleText": "员工",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/index/addStaff",
"style": {
diff --git a/pages/Tollannouncement/Tollannouncement.vue b/pages/Tollannouncement/Tollannouncement.vue
index c3f290c..9e52d6a 100644
--- a/pages/Tollannouncement/Tollannouncement.vue
+++ b/pages/Tollannouncement/Tollannouncement.vue
@@ -2,21 +2,25 @@
-
-
-
-
- 发布
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -40,10 +44,10 @@
-
+
-
+
@@ -51,8 +55,10 @@
\ No newline at end of file
+
diff --git a/pages/coupon/coupon.vue b/pages/coupon/coupon.vue
index 941625c..3048a0c 100644
--- a/pages/coupon/coupon.vue
+++ b/pages/coupon/coupon.vue
@@ -1,17 +1,25 @@
-
-
-
-
-
-
-
-
-
- 搜索
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- 添加优惠券
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -144,7 +147,9 @@
import request from '../../utils/request';
import upload from '@/utils/upload.js'
import code from '../../uni_modules/uview-ui/libs/config/props/code';
+ import headersVue from "@/components/header/headers.vue";
export default {
+ components: {headersVue},
data() {
return {
baseUrl:this.$baseUrl,
@@ -539,7 +544,7 @@ import code from '../../uni_modules/uview-ui/libs/config/props/code';
.dlanniu{
width: 80%;
height: 45px;
- background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
+ background: linear-gradient(180deg, #327DFB 0%, #327DFB 100%);
border-radius: 50px;
display: flex;
align-items: center;
diff --git a/pages/index/Neworder.vue b/pages/index/Neworder.vue
index 624a5bd..238b065 100644
--- a/pages/index/Neworder.vue
+++ b/pages/index/Neworder.vue
@@ -1,16 +1,19 @@
-
-
-
-
-
-
- {{ title }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -231,8 +234,10 @@ import request from '../../utils/request';
import upload from '@/utils/upload.js'
import {getToken, getTenantId} from '@/utils/auth'
import {formatDate} from "@/utils/utils";
+import headersVue from "@/components/header/headers.vue";
export default {
+ components: {headersVue},
data() {
return {
imagePath: '',
@@ -1036,7 +1041,7 @@ export default {
.dlanniu {
width: 80%;
height: 45px;
- background: linear-gradient(180deg, #3F61C0 0%, #0D2E8D 100%);
+ background: linear-gradient(180deg, #327DFB 0%, #327DFB 100%);
border-radius: 50px;
display: flex;
align-items: center;
diff --git a/pages/index/UserInfo.vue b/pages/index/UserInfo.vue
index 879d085..281eeea 100644
--- a/pages/index/UserInfo.vue
+++ b/pages/index/UserInfo.vue
@@ -1,12 +1,16 @@
-
-
-
-
- 个人信息
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -62,8 +66,10 @@
import {getStorageWithExpiry, setStorageWithExpiry} from "../../utils/auth";
import request from '../../utils/request';
import config from '@/config'
+import headersVue from "@/components/header/headers.vue";
export default {
name: "UserInfo",
+ components: {headersVue},
data(){
return{
customInfo: {},
diff --git a/pages/index/countEmployees.vue b/pages/index/countEmployees.vue
new file mode 100644
index 0000000..a857c8e
--- /dev/null
+++ b/pages/index/countEmployees.vue
@@ -0,0 +1,180 @@
+
+
+
+
+ 请选择工作内容
+
+
+
+ 排名
+ 员工
+
+ 服务台次
+
+
+
+ {{index + 1}}
+
+
+
+
+
+ 王一
+ 13812345678
+
+
+ 5000
+
+
+
+ 外检:
+ 200
+
+
+ 安检:
+ 200
+
+
+ 其他:
+ 200
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/orderStatistics.vue b/pages/index/orderStatistics.vue
new file mode 100644
index 0000000..5dffb52
--- /dev/null
+++ b/pages/index/orderStatistics.vue
@@ -0,0 +1,155 @@
+
+
+
+
+
+ 排名
+ 车型
+
+
+ 销量
+ 营业额
+
+
+
+
+ {{index + 1}}
+
+
+
+
+
+
+
+
+
+ {{item.goodsName}}
+
+
+ {{ item.salesAmount }}
+ {{ item.salesNum }}
+
+
+
+
+
+
+
+
+
diff --git a/pages/index/ordermanage.vue b/pages/index/ordermanage.vue
index 5104401..a104bea 100644
--- a/pages/index/ordermanage.vue
+++ b/pages/index/ordermanage.vue
@@ -212,7 +212,7 @@ export default {
.search_box{
box-sizing: border-box;
- padding-bottom: 20rpx;
+ padding: 0 20rpx;
border-bottom: 2rpx solid #F5F5F5;
margin-top: 130rpx;
}
@@ -263,7 +263,7 @@ export default {
.top-ail {
width: 100%;
box-sizing: border-box;
- padding: 15px;
+ padding: 0 15px;
//background-color: #F4F4F4;
background: white;
@@ -314,7 +314,7 @@ export default {
.m-box {
position: relative;
- background: #F4F4F4;
+ background: #F7F8FC;
border-radius: 8px;
box-sizing: border-box;
padding: 15px 10px;
diff --git a/pages/manage/NewdeviceManage.vue b/pages/manage/NewdeviceManage.vue
index 02930c0..a32de17 100644
--- a/pages/manage/NewdeviceManage.vue
+++ b/pages/manage/NewdeviceManage.vue
@@ -11,10 +11,9 @@
- {{ item.label }}
- 100
+ {{ item.categoryName }}
+ {{ item.count }}
-
@@ -25,6 +24,7 @@
diff --git a/pages/order/order.vue b/pages/order/order.vue
index d381494..9056c5d 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -1,411 +1,459 @@
-
-
-
-
-
-
-
-
-
-
- 搜索
-
-
-
- {{item.Text}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.goodsTitle}}
- 销量 {{item.salesNum}}
- ¥{{item.price / 100}}
-
-
-
-
-
- 待提交
-
-
- 审核中
-
-
- 未通过
-
-
+
+
+
+
+
+
+
+
-
- 编辑
-
-
- 上架
- 下架
-
-
- 删除
-
-
- 价格
-
-
-
-
-
+
+
+
-
-
+
+
+
-
+
+
+
+
+
+
+
+ {{ item.Text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.goodsTitle }}
+ 销量 {{ item.salesNum }}
+ ¥{{ item.price / 100 }}
+
+
+
+
+
+ 待提交
+
+
+ 审核中
+
+
+ 未通过
+
+
+
+
+ 编辑
+
+
+ 上架
+ 下架
+
+
+ 删除
+
+
+ 价格
+
+
+
+
+
+
+
+
+
+