diff --git a/project.config.json b/project.config.json
index daebe7c..14e2ab4 100644
--- a/project.config.json
+++ b/project.config.json
@@ -18,7 +18,9 @@
"ignore": [],
"disablePlugins": [],
"outputPath": ""
- }
+ },
+ "ignoreDevUnusedFiles": false,
+ "ignoreUploadUnusedFiles": false
},
"condition": {},
"editorSetting": {
diff --git a/src/App.vue b/src/App.vue
index a343598..7d00a30 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -17,7 +17,7 @@ onLaunch(() => {
});
// #endif
- // #ifndef MP-ALIPAY
+ // #ifdef MP-WEIXN || MP-TOUTIAO || H5
uni.hideTabBar();
// #endif
});
diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue
index 2431984..46a8f9c 100644
--- a/src/pagesHome/index.vue
+++ b/src/pagesHome/index.vue
@@ -34,27 +34,27 @@
>
爱梵达
diff --git a/src/pagesHome/profile.vue b/src/pagesHome/profile.vue
index 3239315..bd83ea6 100644
--- a/src/pagesHome/profile.vue
+++ b/src/pagesHome/profile.vue
@@ -45,7 +45,10 @@
-
+
{handleModal(v)}"
- @handleOk="handleOk()"
- />
+ :title="'确认退出吗?'"
+ :content="'退出后将返回至登陆页'"
+ :okText="'确认退出'"
+ :isMain="true"
+ :show="isShowCancelModal"
+ @handleModal="(v:boolean) => {handleModal(v)}"
+ @handleOk="handleOk()"
+ />
@@ -89,7 +92,10 @@ import { UserApi } from "@/services";
import SmallModal from "@/components/Modal/smallModal.vue";
const store = useMemberStore(pinia);
const profile = store.profile.userInfo;
-const list = reactive([
+function isHasToken () {
+ return store.profile.token !== ""
+}
+const list = reactive([
{
name: "收款信息",
icon: "pay.png",
@@ -108,6 +114,20 @@ const list = reactive([
path: "",
},
]);
+const list1 = reactive([
+ {
+ name: "收款信息",
+ icon: "pay.png",
+ },
+ {
+ name: "用户协议",
+ icon: "4.png",
+ },
+ {
+ name: "隐私政策",
+ icon: "5.png",
+ }
+]);
const entryItemList = ref([
{
@@ -139,10 +159,9 @@ const hanldeClick = (item: any) => {
} else if (item.name === "隐私政策") {
openDoc("在生万有隐私政策");
} else if (item.name === "收款信息") {
-
uni.navigateTo({
- url: '/pagesOrder/collection', // 要跳转到的页面路径
- });
+ url: "/pagesOrder/collection", // 要跳转到的页面路径
+ });
} else if (item.name === "退出登录") {
handleModal(true);
}
@@ -156,6 +175,7 @@ const handleModal = (v: boolean) => {
const handleOk = () => {
UserApi.logOut({}).then((res: any) => {
if (res.code === 200) {
+ store.clearProfile();
uni.reLaunch({
url: "/pagesLogin/index", // 要跳转到的页面路径
});
@@ -215,7 +235,7 @@ my.hideTabBar({
});
// #endif
-// #ifndef MP-ALIPAY
+// #ifdef MP-WEIXN || MP-TOUTIAO || H5
uni.hideTabBar();
// #endif
diff --git a/src/pagesOrder/battery/index.vue b/src/pagesOrder/battery/index.vue
index f4d3f44..e37866c 100644
--- a/src/pagesOrder/battery/index.vue
+++ b/src/pagesOrder/battery/index.vue
@@ -42,7 +42,7 @@
:isLoading="pageList.isLoading"
>
-
+
@@ -68,7 +68,7 @@
{{ item[tItem.key] ? "已处理" : "待处理" }}
diff --git a/src/pagesOrder/joinus/index.vue b/src/pagesOrder/joinus/index.vue
index 064b6f2..98bb1e7 100644
--- a/src/pagesOrder/joinus/index.vue
+++ b/src/pagesOrder/joinus/index.vue
@@ -36,7 +36,7 @@
:isLoading="pageList.isLoading"
>
-
+
diff --git a/src/pagesOrder/vehicle/index.vue b/src/pagesOrder/vehicle/index.vue
index 1260475..e5d4a90 100644
--- a/src/pagesOrder/vehicle/index.vue
+++ b/src/pagesOrder/vehicle/index.vue
@@ -36,7 +36,7 @@
:isLoading="pageList.isLoading"
>
-
+
diff --git a/src/pagesVehicle/inquiry.vue b/src/pagesVehicle/inquiry.vue
index 840fe5e..198dc41 100644
--- a/src/pagesVehicle/inquiry.vue
+++ b/src/pagesVehicle/inquiry.vue
@@ -374,7 +374,7 @@ const formAttrList = reactive([
key: "totalWeight",
type: "input",
required: true,
- unit: "",
+ unit: "KG",
},
{
name: "车牌号",
diff --git a/src/pagesVehicle/recovery.vue b/src/pagesVehicle/recovery.vue
index 5dad6ba..e4e5856 100644
--- a/src/pagesVehicle/recovery.vue
+++ b/src/pagesVehicle/recovery.vue
@@ -339,7 +339,7 @@ const formAttrList = reactive([
key: "totalWeight",
type: "input",
required: true,
- unit: "",
+ unit: "KG",
},
{
name: "车牌号",
diff --git a/src/pagesVehicle/regisList.vue b/src/pagesVehicle/regisList.vue
index 8d90c84..8faaed5 100644
--- a/src/pagesVehicle/regisList.vue
+++ b/src/pagesVehicle/regisList.vue
@@ -12,7 +12,7 @@
:isLoading="pageList.isLoading"
>
-
+
diff --git a/src/pagesVehicle/registration.vue b/src/pagesVehicle/registration.vue
index fee6361..dc5027a 100644
--- a/src/pagesVehicle/registration.vue
+++ b/src/pagesVehicle/registration.vue
@@ -340,7 +340,7 @@ const formAttrList = reactive([
key: "totalWeight",
type: "input",
required: true,
- unit: "",
+ unit: "KG",
},
{
name: "车牌号",
diff --git a/src/static/avatar/1.jpg b/src/static/avatar/1.jpg
deleted file mode 100644
index 0228bfc..0000000
Binary files a/src/static/avatar/1.jpg and /dev/null differ
diff --git a/src/static/avatar/2.jpg b/src/static/avatar/2.jpg
deleted file mode 100644
index aa2ef87..0000000
Binary files a/src/static/avatar/2.jpg and /dev/null differ
diff --git a/src/static/avatar/3.jpg b/src/static/avatar/3.jpg
deleted file mode 100644
index 3bafb9b..0000000
Binary files a/src/static/avatar/3.jpg and /dev/null differ
diff --git a/src/static/avatar/4.jpg b/src/static/avatar/4.jpg
deleted file mode 100644
index a04a3e0..0000000
Binary files a/src/static/avatar/4.jpg and /dev/null differ
diff --git a/src/static/avatar/5.jpg b/src/static/avatar/5.jpg
deleted file mode 100644
index 96bb27d..0000000
Binary files a/src/static/avatar/5.jpg and /dev/null differ
diff --git a/src/static/style/common.scss b/src/static/style/common.scss
index f06a560..05d4fd5 100644
--- a/src/static/style/common.scss
+++ b/src/static/style/common.scss
@@ -53,7 +53,7 @@ body {
position: fixed;
width: calc(100vw - 100rpx);
bottom: 0rpx;
- z-index: 98;
+ z-index: 20;
}
.uni-calendar-item--multiple .uni-calendar-item--before-checked,