diff --git a/pages/index/home.vue b/pages/index/home.vue
index 0c773c7..5ba3553 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -50,8 +50,14 @@
下次保养日期
{{ item.maintenanceDate }}
-
- {{ item.maintenanceProject }}
+
+ {{ $utils.calculateDateDifference(item.maintenanceDate) + '天后维保' }}
+
+
+ 已超出维保时间
+
+
+ 当天维修
@@ -194,6 +200,7 @@ export default {
},
onLoad(){
this.getBannerList()
+
},
}
diff --git a/subPages/home/RAArecord.vue b/subPages/home/RAArecord.vue
index a4eafa7..1e31319 100644
--- a/subPages/home/RAArecord.vue
+++ b/subPages/home/RAArecord.vue
@@ -92,7 +92,7 @@
上传图片
-
+
@@ -126,7 +126,7 @@
-
+
-
+
-
+
-
+
@@ -242,12 +242,16 @@
{{ collapsedStates[index] ? '▼' : '▲' }}
-
+
+
+
-
+
-
+
+
+
@@ -265,7 +269,8 @@ export default {
activeFilter: 0, // 当前激活的筛选器
collapsedStates: [], // 控制每个记录项的展开/收起状态
afterUpdateDataFn(list) {
- this.collapsedStates = new Array(list.length).fill(true)
+ // 改为新增加的数组部分 为true 原来的 状态保留
+ this.collapsedStates.push(...new Array(8).fill(true))
},
filterOptions: [
{ name: '时间' },
@@ -315,6 +320,7 @@ export default {
this.mixinListApi = this.activeMainTab === 'repair' ? 'exhibit.queryRepairList' : 'exhibit.queryMaintenanceList'
this.onFilterChange()
this.initPage()
+ this.list = []
this.getList(true)
// this.initCollapsedStates()
},
diff --git a/subPages/home/maintainanceSubmit.vue b/subPages/home/maintainanceSubmit.vue
index 8ea3670..d1bcca7 100644
--- a/subPages/home/maintainanceSubmit.vue
+++ b/subPages/home/maintainanceSubmit.vue
@@ -458,7 +458,9 @@ export default {
remark: this.remark,
showpieceId: this.showpieceId
}
-
+ if (formData.isExpend === '0'){
+ delete formData.expenseList
+ }
this.submiting = true
try{
@@ -481,6 +483,8 @@ export default {
},
onLoad(options) {
this.showpieceId = options.id
+
+
}
}
diff --git a/subPages/login/login.vue b/subPages/login/login.vue
index 4577f7b..a9cba02 100644
--- a/subPages/login/login.vue
+++ b/subPages/login/login.vue
@@ -1,7 +1,7 @@
-
+
@@ -152,7 +152,7 @@ export default {
top: 0;
left: 0;
width: 100%;
- height: 100%;
+ height: 33%;
z-index: 1;
}
diff --git a/subPages/repair/maintainSubmit.vue b/subPages/repair/maintainSubmit.vue
index f352510..e736a8d 100644
--- a/subPages/repair/maintainSubmit.vue
+++ b/subPages/repair/maintainSubmit.vue
@@ -540,7 +540,7 @@ export default {
delete tempData.expenseList
}
const submitRes = await this.$api.exhibit.addRepair({
- id: this.showpieceId,
+ showpieceId: this.showpieceId,
...tempData,
amount: this.amount
})
diff --git a/subPages/static/first.png b/subPages/static/first.png
deleted file mode 100644
index 4477ccf..0000000
Binary files a/subPages/static/first.png and /dev/null differ
diff --git a/subPages/static/rank_bg.png b/subPages/static/rank_bg.png
deleted file mode 100644
index c934d57..0000000
Binary files a/subPages/static/rank_bg.png and /dev/null differ
diff --git a/subPages/static/second.png b/subPages/static/second.png
deleted file mode 100644
index 1879856..0000000
Binary files a/subPages/static/second.png and /dev/null differ
diff --git a/subPages/static/third.png b/subPages/static/third.png
deleted file mode 100644
index 87c1bcb..0000000
Binary files a/subPages/static/third.png and /dev/null differ
diff --git a/subPages/static/volunteer_bg@2x.png b/subPages/static/volunteer_bg@2x.png
deleted file mode 100644
index dfbb9d7..0000000
Binary files a/subPages/static/volunteer_bg@2x.png and /dev/null differ
diff --git a/subPages/static/商品_积分@2x.png b/subPages/static/商品_积分@2x.png
deleted file mode 100644
index de3d956..0000000
Binary files a/subPages/static/商品_积分@2x.png and /dev/null differ
diff --git a/subPages/static/活动日历_图标@2x.png b/subPages/static/活动日历_图标@2x.png
deleted file mode 100644
index b22c1f1..0000000
Binary files a/subPages/static/活动日历_图标@2x.png and /dev/null differ
diff --git a/subPages/static/登录_标题.png b/subPages/static/登录_标题.png
deleted file mode 100644
index 428f311..0000000
Binary files a/subPages/static/登录_标题.png and /dev/null differ
diff --git a/subPages/static/登录_背景图.png b/subPages/static/登录_背景图.png
deleted file mode 100644
index 844920d..0000000
Binary files a/subPages/static/登录_背景图.png and /dev/null differ
diff --git a/subPages/static/登录背景.png b/subPages/static/登录背景.png
new file mode 100644
index 0000000..b726ac5
Binary files /dev/null and b/subPages/static/登录背景.png differ
diff --git a/utils/common.js b/utils/common.js
index e33c974..5c54ed5 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -54,6 +54,8 @@ const checkPhone = (phone) => {
}
// 转换时间戳为yyyy-mm-dd
+// params： 时间戳
+// return yyyy-mmm-dd
const formatTime = (time) => {
if (!time) {
return '时间格式错误，需要传入时间戳'
@@ -65,9 +67,36 @@ const formatTime = (time) => {
return `${year}-${month}-${day}`
}
+// 计算yyyy-mm-dd与当前时间的差值
+// params： yyyy-mm-dd格式的字符串
+// return： 差值（天）
+const calculateDateDifference = (dateString) => {
+ if (!dateString) {
+ return '时间格式错误，需要传入yyyy-mm-dd格式的字符串'
+ }
+ // 传入值为yyyy-mm-dd格式的字符串
+ const inputDate = new Date(dateString)
+ // 化为时间戳
+ // const inputTime = inputDate.getTime()
+ const currentDate = new Date()
+ const timeDifference = inputDate - currentDate
+
+ if (!(currentDate.setHours(0, 0, 0, 0) - inputDate.setHours(0, 0, 0, 0))) {
+ return 0
+ }
+ // 如果为负 返回-1
+ if (timeDifference < 0) {
+ return -1
+ }
+ // 计算天数
+ const dayDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24))
+
+ return dayDifference
+}
export {
authorize,
checkPhone,
- formatTime
+ formatTime,
+ calculateDateDifference
}
\ No newline at end of file
diff --git a/utils/index.js b/utils/index.js
index 3925288..771a6de 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -1,7 +1,8 @@
import {
authorize,
checkPhone,
- formatTime
+ formatTime,
+ calculateDateDifference
} from '@/utils/common'
import {
@@ -14,6 +15,7 @@ export default {
authorize,
checkPhone,
formatTime,
+ calculateDateDifference,
uploadImage,
chooseAndUpload,
getFileExtension