diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdf57eb..7559edf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -93,6 +93,7 @@
交付物 | 重构交付物审核部分,修复审核bug | [5fd8889](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/5fd8889)
- | 解决默认角色不是第一个时显示出错问题 | [8dba578](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/8dba578)
- | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079)
+ - | 拍照上传交付物 | [1cbb2ac](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/1cbb2ac)
- | 日历列表H5在手机端不显示 | [0b4ae72](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/0b4ae72)
- | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a)
- | 上个提交导致的bug | [7524b24](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/7524b24)
diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss
index 9e2b117..803b2ab 100644
--- a/common/styles/theme/default.scss
+++ b/common/styles/theme/default.scss
@@ -4,15 +4,14 @@
.u-card {
font-size: 16px !important;
background-color: #f3f3f3 !important;
-
- .mask {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- z-index: 100;
- }
+ }
+ .mask {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ z-index: 100;
}
// 弹出层 内容盒子
.modal-content-wrap {
diff --git a/components/Adv/Adv.vue b/components/Adv/Adv.vue
index 11f75ae..4af6183 100644
--- a/components/Adv/Adv.vue
+++ b/components/Adv/Adv.vue
@@ -19,7 +19,7 @@
import { useStore } from 'vuex';
const store = useStore();
- const indicatorDots = true;
+ const indicatorDots = false;
const autoplay = true;
const advs = computed(() => store.state.advs);
const imgs = ref([]);
@@ -32,7 +32,7 @@
imgs.value = JSON.parse(advs.value);
})
- const time = ref(5);
+ const time = ref(10);
let timer = setInterval(() => {
time.value--;
@@ -92,12 +92,12 @@
right: 10px;
display: inline-block;
width: 60px;
- height: 24px;
- line-height: 22px;
+ height: 30px;
+ line-height: 30px;
font-size: 12px;
text-align: center;
background-color: rgba(255, 255, 255, .7);
- border-radius: 12px;
+ border-radius: 15px;
color: #666;
border: 1px solid #eee;
}
diff --git a/components/Calendar/Calendar.vue b/components/Calendar/Calendar.vue
index 49dd1d6..fa04492 100644
--- a/components/Calendar/Calendar.vue
+++ b/components/Calendar/Calendar.vue
@@ -100,7 +100,7 @@ const props = defineProps({
},
});
-const emit = defineEmits(['handleFindPoint', 'handleFindPoint', 'days-change', 'selected-change']);
+const emit = defineEmits(['handleFindPoint', 'days-change', 'selected-change']);
const data = reactive({
weeks: ['日', '一', '二', '三', '四', '五', '六'], // 周
diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue
index b771b9c..aae944e 100644
--- a/components/Globals/Globals.vue
+++ b/components/Globals/Globals.vue
@@ -11,7 +11,7 @@
-
+
-
+
+
+
+
+
-
+
@@ -186,15 +211,19 @@
display: flex;
justify-content: center;
align-items: center;
- width: 50px;
- height: 50px;
+ width: 40px;
+ height: 40px;
border-radius: 50%;
background-color: #eeeeee;
text-align: center;
- line-height: 50px;
+ line-height: 40px;
border: 1px solid #ddd;
overflow: hidden;
+ text {
+ font-size: 12px;
+ }
+
image {
display: inline-block;
width: 40px;
diff --git a/pages/user/login.vue b/pages/user/login.vue
index fa5866a..0296d8d 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -2,8 +2,10 @@
-
+
+ 登录
+
@@ -16,7 +18,7 @@
- 粘贴
+
{{ mixinInit.dataObj.interval }}
diff --git a/plugins/p-deliver-check/p-deliver-check.vue b/plugins/p-deliver-check/p-deliver-check.vue
index 28e3795..7bd1021 100644
--- a/plugins/p-deliver-check/p-deliver-check.vue
+++ b/plugins/p-deliver-check/p-deliver-check.vue
@@ -2,9 +2,23 @@
-
+
+ {{ deliverData ? deliverData.deliverName : '' }}审核状态
- {{ deliverData ? deliverData.deliverName : '' }} 审核状态
+
+
+
@@ -59,7 +73,7 @@
已通过
已驳回
-
+
{{ item.score }}
@@ -72,7 +86,7 @@
diff --git a/plugins/p-project version management/p-project version management.vue b/plugins/p-project-version-management/p-project-version-management.vue
similarity index 78%
rename from plugins/p-project version management/p-project version management.vue
rename to plugins/p-project-version-management/p-project-version-management.vue
index c803a97..9b93ee0 100644
--- a/plugins/p-project version management/p-project version management.vue
+++ b/plugins/p-project-version-management/p-project-version-management.vue
@@ -1,11 +1,10 @@
-
+
diff --git a/static/headimg.png b/static/headimg.png
deleted file mode 100644
index c47e6f6..0000000
Binary files a/static/headimg.png and /dev/null differ
diff --git a/static/headimg4.png b/static/headimg4.png
new file mode 100644
index 0000000..b17a977
Binary files /dev/null and b/static/headimg4.png differ