diff --git a/app.json b/app.json index 3b22031..6a86cb9 100644 --- a/app.json +++ b/app.json @@ -21,7 +21,10 @@ "pages/mine/mineAccount/makeInvoice/makeInvoice", "pages/mine/mineAccount/invoiceOrder/invoiceOrder", "pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail", - "pages/mine/mineAccount/mineMsgNotice/mineMsgNotice" + "pages/mine/mineAccount/mineMsgNotice/mineMsgNotice", + "pages/copyright/refund/refund", + "pages/copyright/repair/repair", + "pages/copyright/applyRepair/applyRepair" ], "window": { "navigationBarTextStyle": "black", diff --git a/app.wxss b/app.wxss index 2cc0bc3..f1c4eb9 100644 --- a/app.wxss +++ b/app.wxss @@ -208,6 +208,15 @@ align-self: center; } +.divider-h-white { + width: 1rpx; + height: 20rpx; + background-color: var(--primary-color-active); + padding: 0rpx 1rpx; + align-self: center; + margin-left: 20rpx; +} + .divider-v-100 { height: 1rpx; background-color: var(--divider-color); @@ -230,7 +239,7 @@ .multiple-2-ellipsis { display: -webkit-box; -webkit-box-orient: vertical; - -webkit-line-clamp: 3; + -webkit-line-clamp: 2; overflow: hidden; } diff --git a/main-app.js b/main-app.js index de8491a..49fb21b 100644 --- a/main-app.js +++ b/main-app.js @@ -10,9 +10,14 @@ App({ slideBtns: [], appTitle: 'AI喵著', appUrl: appUrl, - onlyDelBtns: [] + onlyDelBtns: [], + cancelEditBtns: [] }, onLaunch() { + this.globalData.cancelEditBtns = [{ + text: '撤销', + src: this.globalData.localAssets + "/ic_cancel_yellow.png" // icon的路径 + }] this.globalData.onlyDelBtns = [{ text: '删除', src: this.globalData.localAssets + "/ic_delete_red.png" // icon的路径 diff --git a/net/api/projectApi.js b/net/api/projectApi.js index 46dd463..5dec146 100644 --- a/net/api/projectApi.js +++ b/net/api/projectApi.js @@ -18,6 +18,12 @@ const apiPath = { ruleData: '/app/agreementportal/getrelease/{id}', //使用规则 project="operator" investDetail: "/news-content/listpage?rows=1&page=1", //投资优势 mainProCount: '/api/env/custom/get-proj-counts', //首页介绍数量 + repairProList: '/api/proj/correction/apply/listpage/self', //我的补正 + canProRepairList: '/api/proj/correction/apply/listpage-proj-unapply/self', //可以补正的项目列表 + cancelProPepair: '/api/proj/correction/apply/cancel/self/{projCorrectionApplyId}', //取消补正 + applyProRepair: '/api/proj/correction/apply/save', //申请补正 + + } class ProjectService { //首页介绍数量 @@ -81,6 +87,23 @@ class ProjectService { static doGetInvestDetail(data) { return request(apiPath.investDetail, "GET", data) } + //我的补正项目列表 + static doGetMineRepairList(data) { + return request(apiPath.repairProList, "GET", data) + } + //撤销补正 + static doCancelProrepair(id) { + const path = apiPath.cancelProPepair.replace('{projCorrectionApplyId}', id) + return request(path, 'PUT') + } + //提交补正 + static doApplyProRepair(data) { + return request(apiPath.applyProRepair, "POST", data) + } + //获取可以补正的项目列表 + static doGetCanProRepairList(data) { + return request(apiPath.canProRepairList, 'GET', data) + } } export default ProjectService; \ No newline at end of file diff --git a/pages/copyright/applyRepair/applyRepair.js b/pages/copyright/applyRepair/applyRepair.js new file mode 100644 index 0000000..d0e652d --- /dev/null +++ b/pages/copyright/applyRepair/applyRepair.js @@ -0,0 +1,38 @@ +// pages/copyright/applyRepair/applyRepair.js +const app = getApp() +Page({ + /** + * 页面的初始数据 + */ + data: { + imgAssets: app.globalData.imgAssetsUrl, + msgHint: '', + msgType: '', + msgShow: false, + selPro: '', + selType: '', + files: [], + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + wx.setNavigationBarTitle({ + title: '申请补正', + }) + wx.setNavigationBarColor({ + frontColor: '#000000', // 必写项，字体颜色仅支持#ffffff和#000000 + backgroundColor: '#F0F0F0', // 传递的颜色值，仅支持十六进制颜色 + animation: { // 可选项 + duration: 500, + timingFunc: 'easeIn' + } + }) + }, + deleteImage: function (e) { + var index = e.detail.index; + this.data.files.splice(index, 1); + }, +}) \ No newline at end of file diff --git a/pages/copyright/applyRepair/applyRepair.json b/pages/copyright/applyRepair/applyRepair.json new file mode 100644 index 0000000..854c484 --- /dev/null +++ b/pages/copyright/applyRepair/applyRepair.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "mp-toptips": "weui-miniprogram/toptips/toptips", + "mp-half-screen-dialog": "weui-miniprogram/half-screen-dialog/half-screen-dialog", + "mp-uploader": "weui-miniprogram/uploader/uploader" + } +} \ No newline at end of file diff --git a/pages/copyright/applyRepair/applyRepair.wxml b/pages/copyright/applyRepair/applyRepair.wxml new file mode 100644 index 0000000..4245b48 --- /dev/null +++ b/pages/copyright/applyRepair/applyRepair.wxml @@ -0,0 +1,41 @@ + + + + + + + + + + + + 补正信息 + + 补正软著 + + 选择需要补正的软著 + + + + + 补正种类 + + 选择种类 + + + + + 补正原因 + + + + 补正凭证 + + + + + + + + + \ No newline at end of file diff --git a/pages/copyright/applyRepair/applyRepair.wxss b/pages/copyright/applyRepair/applyRepair.wxss new file mode 100644 index 0000000..79eedf2 --- /dev/null +++ b/pages/copyright/applyRepair/applyRepair.wxss @@ -0,0 +1,95 @@ +/* pages/copyright/applyRepair/applyRepair.wxss */ +.apply-box { + margin-top: 20rpx; + display: flex; + flex-direction: column; + padding: 30rpx; + background-color: var(--white-color); + border-radius: 5rpx; +} + +.apply-item-row { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.apply-item-column { + display: flex; + flex-direction: column; +} + +.apply-title { + font-size: 28rpx; + color: var(--text-color); +} + +.apply-content { + font-size: 28rpx; + display: flex; + flex-direction: row; + align-items: center; +} + +.reason-content { + border-radius: 10rpx; + border: 1rpx solid var(--divider-color); + height: 120rpx; + font-size: 28rpx; + padding: 20rpx; +} + +.text-hint { + color: var(--text-gray-hint-color); +} + +.text-sel { + color: var(--text-color); +} + + + +/* 上传图片 */ + +.weui-uploader { + margin-top: 10rpx; + width: 100%; +} + +.weui-uploader__bd { + display: flex; + flex-direction: row; + margin-bottom: 0; +} + +.weui-uploader__hd { + display: none; +} + +.weui-uploader__input-box { + width: 65px; + height: 65px; + border-radius: 5px; +} + +.weui-uploader__file { + width: 65px; + height: 65px; + border-radius: 5px; +} + +.weui-uploader__img { + border-radius: 5px; +} + +.weui-uploader__overview { + display: flex; + flex-direction: row; + justify-content: space-between; + width: 65vw; +} + +.weui-uploader__input-box { + background: white; + border: 1px solid var(--divider-color); +} \ No newline at end of file diff --git a/pages/copyright/refund/refund.js b/pages/copyright/refund/refund.js new file mode 100644 index 0000000..7db6e93 --- /dev/null +++ b/pages/copyright/refund/refund.js @@ -0,0 +1,66 @@ +// pages/copyright/refund/refund.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/copyright/refund/refund.json b/pages/copyright/refund/refund.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/copyright/refund/refund.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/copyright/refund/refund.wxml b/pages/copyright/refund/refund.wxml new file mode 100644 index 0000000..197f907 --- /dev/null +++ b/pages/copyright/refund/refund.wxml @@ -0,0 +1,2 @@ + +pages/copyright/refund/refund.wxml \ No newline at end of file diff --git a/pages/copyright/refund/refund.wxss b/pages/copyright/refund/refund.wxss new file mode 100644 index 0000000..2abc8c3 --- /dev/null +++ b/pages/copyright/refund/refund.wxss @@ -0,0 +1 @@ +/* pages/copyright/refund/refund.wxss */ \ No newline at end of file diff --git a/pages/copyright/repair/repair.js b/pages/copyright/repair/repair.js new file mode 100644 index 0000000..ee7739f --- /dev/null +++ b/pages/copyright/repair/repair.js @@ -0,0 +1,291 @@ +// pages/copyright/repair/repair.js +import ProApi from '../../../net/api/projectApi' +import { + previewUrl +} +from '../../../net/http.js' +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + keywords: '', + pageData: { + page: 1, + rows: 10, + projName: '', + type: '', + correctionType: '', + applyStatus: '' + }, + msgShow: false, + msgHint: '', + msgType: 'error', + loadingState: 'loading', + listRefreshTrig: false, + isLoadMore: false, + hasMore: true, + repairList: [], //开票记录 + typeList: [{ + title: '一次补正', + value: 'CORRECTION1' + }, { + title: '二次补正', + value: 'CORRECTION2' + }], + selectType: '', + kindList: [{ + value: 'CODE', + title: '代码' + }, { + title: '操作手册', + value: 'MANUAL' + }, { + title: '全部', + value: 'ALL' + }], + selectKind: '', + stateList: [{ + title: '待审核', + value: 'PENDING' + }, { + title: '已通过', + value: 'APPROVED' + }, { + title: '未通过', + value: 'REJECTED' + }, { + title: '已取消', + value: 'CANCELED' + }], + selectState: '', + buttons: [{ + text: '关闭' + }], + showHint: false, + approveImgs: [], + approveTime: '', + approveDesc: '', + preUrl: previewUrl, + approveStatus: false, //是否显示编辑提示 + slideBtns: app.globalData.cancelEditBtns + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + wx.setNavigationBarTitle({ + title: '补正项目', + }) + wx.setNavigationBarColor({ + frontColor: '#000000', // 必写项，字体颜色仅支持#ffffff和#000000 + backgroundColor: '#F0F0F0', // 传递的颜色值，仅支持十六进制颜色 + animation: { // 可选项 + duration: 500, + timingFunc: 'easeIn' + } + }) + this.doRefreshList() + }, + chooseType(e) { + const value = e.currentTarget.dataset.value + this.setData({ + selectType: value == this.data.selectType ? '' : value + }) + this.doRefreshList() + }, + chooseKind(e) { + const value = e.currentTarget.dataset.value + this.setData({ + selectKind: value == this.data.selectKind ? '' : value + }) + this.doRefreshList() + }, + chooseState(e) { + const value = e.currentTarget.dataset.value + this.setData({ + selectState: value == this.data.selectState ? '' : value + }) + this.doRefreshList() + }, + inputKeywords(e) { + this.setData({ + keywords: e.detail.value + }) + }, + //清除搜索内容 + clearSearch() { + const _self = this + _self.setData({ + keywords: '' + }) + _self.doRefreshList() + }, + //发起搜索 + doSearchKeyWord() { + const _self = this + _self.doRefreshList() + }, + doRefreshList() { + console.log('正在刷新...') + const _self = this + _self.setData({ + listRefreshTrig: true, + loadingState: 'loading', + hasMore: true, + 'pageData.page': 1, + 'pageData.projName': _self.data.keywords, + 'pageData.type': _self.data.selectType, + 'pageData.correctionType': _self.data.selectKind, + 'pageData.applyStatus': _self.data.selectState, + isLoadMore: false + }) + _self.doGetRepairList(true) + }, + doLoadMore() { + //判断是否正在加载中 与是否存在更多数据 + const _self = this + if (_self.data.isLoadMore || !_self.data.hasMore) { + return + } + _self.setData({ + isLoadMore: true, + 'pageData.page': ++_self.data.pageData.page, + 'pageData.projName': _self.data.keywords, + 'pageData.type': _self.data.selectType, + 'pageData.correctionType': _self.data.selectKind, + 'pageData.applyStatus': _self.data.selectState, + }) + _self.doGetRepairList(false) + }, + //加载列表 + doGetRepairList(isRefresh) { + const _self = this + _self.setData({ + repairList: isRefresh ? [] : _self.data.repairList, + loadingState: isRefresh ? 'loading' : '' + }) + ProApi.doGetMineRepairList(_self.data.pageData) + .then(res => { + console.log(res) + var status = 'success' + status = res.rows && res.rows.length > 0 ? 'success' : 'empty' + _self.setData({ + loadingState: isRefresh ? status : '', + repairList: _self.data.repairList.concat(res.rows), + listRefreshTrig: false, + isLoadMore: false + }) + _self.setData({ + hasMore: _self.data.repairList.length < res.total + }) + }, err => { + _self.setData({ + loadingState: 'error', + listRefreshTrig: false, + isLoadMore: false, + hasMore: true + }) + }) + }, + show(e) { + console.log('显示', e) + //判断状态 + const _self = this + const value = e.currentTarget.dataset.value + const id = e.currentTarget.id + if (value.applyStatus == 'APPROVED' || value.applyStatus == 'CANCELED') { + //通过 或 取消 后不能撤销 + const item = _self.selectComponent(`#${id}`) + if (item) { + item.setData({ + show: false + }) + } + } + }, + slideButtonTap(e) { + const index = e.detail.index + const item = e.currentTarget.dataset.value + console.log(e) + if (index == 0) { + //取消 + this.showCancel(item) + } + }, + //取消 + showCancel(item) { + const _self = this + wx.showLoading({ + title: '取消中...', + }) + ProApi.doCancelProrepair(item.projCorrectionApplyId) + .then(res => { + wx.hideLoading() + _self.setData({ + msgType: 'success', + msgHint: '撤销成功', + msgShow: true + }) + _self.doRefreshList() + }) + .catch(err => { + wx.hideLoading() + _self.setData({ + msgType: 'error', + msgHint: err.msg ? err.msg : '撤销失败,请稍后重试', + msgShow: true + }) + }) + }, + //显示凭证与未通过原因 + showReason(e) { + const item = e.currentTarget.dataset.value + const _self = this + item.correctionVoucherFileKVs.map(value => { + value.url = _self.data.preUrl + value.key + return value + }) + _self.setData({ + approveImgs: item.correctionVoucherFileKVs, + approveTime: item.gmtReview, + approveDesc: item.reviewReason, + approveStatus: item.applyStatus == 'APPROVED' ? false : true, + showHint: true + }) + }, + //预览图片 + previewImg(e) { + const _self = this + const current = e.currentTarget.dataset.value + const url = [] + _self.data.approveImgs.forEach(item => url.push(item.url)) + console.log(url) + wx.previewImage({ + urls: url, + current: current + }) + }, + //下载文件 + downloadFile(e) { + const item = e.currentTarget.dataset.value + }, + closeHint(e) { + this.setData({ + approveImgs: [], + approveTime: '', + approveDesc: '', + showHint: false, + approveStatus: false + }) + }, + //去申请补正 + applyRepair() { + wx.navigateTo({ + url: '/pages/copyright/applyRepair/applyRepair', + }) + } +}) \ No newline at end of file diff --git a/pages/copyright/repair/repair.json b/pages/copyright/repair/repair.json new file mode 100644 index 0000000..2a0e6de --- /dev/null +++ b/pages/copyright/repair/repair.json @@ -0,0 +1,10 @@ +{ + "usingComponents": { + "mp-loading": "weui-miniprogram/loading/loading", + "container-loading": "/components/container-loading/container-loading", + "mp-toptips": "weui-miniprogram/toptips/toptips", + "mp-dialog": "weui-miniprogram/dialog/dialog", + "mp-half-screen-dialog": "weui-miniprogram/half-screen-dialog/half-screen-dialog", + "mp-slideview": "weui-miniprogram/slideview/slideview" + } +} \ No newline at end of file diff --git a/pages/copyright/repair/repair.wxml b/pages/copyright/repair/repair.wxml new file mode 100644 index 0000000..f3ee3dc --- /dev/null +++ b/pages/copyright/repair/repair.wxml @@ -0,0 +1,78 @@ + + + + + + + + 申请补正 + + + + + + {{item.title}} + + + + {{item.title}} + + + + {{item.title}} + + + + + + + + + + + + + + {{tools.repairStatus(item.applyStatus)}} + + {{item.gmtCreate}} + + + + {{item.projName}} + + {{item.correctionReason}} + + + {{tools.repairType(item.type)}} + {{tools.repairKind(item.correctionType)}} + + 下载 + + + + + + + + + + + + + 补正凭证 + + + + + + + 审核时间 + {{approveTime}} + 审核意见 + {{approveDesc}} + + + + + \ No newline at end of file diff --git a/pages/copyright/repair/repair.wxss b/pages/copyright/repair/repair.wxss new file mode 100644 index 0000000..36e675b --- /dev/null +++ b/pages/copyright/repair/repair.wxss @@ -0,0 +1,527 @@ +.ic-user { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzOTg4MzkwNjkwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM0MDkiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMiAxMDI0QzIyOS4yMDUzMzMgMTAyNCAwIDc5NC43OTQ2NjcgMCA1MTJTMjI5LjIwNTMzMyAwIDUxMiAwczUxMiAyMjkuMjA1MzMzIDUxMiA1MTItMjI5LjIwNTMzMyA1MTItNTEyIDUxMnogbTAtNDk2LjQ2OTMzM2ExNzAuNjY2NjY3IDE3MC42NjY2NjcgMCAxIDAgMC0zNDEuMzMzMzM0IDE3MC42NjY2NjcgMTcwLjY2NjY2NyAwIDAgMCAwIDM0MS4zMzMzMzR6IG0yNjMuNzY1MzMzIDI2My43MjI2NjZhMjYzLjc2NTMzMyAyNjMuNzY1MzMzIDAgMSAwLTUyNy41MzA2NjYgMGg1MjcuNTMwNjY2eiIgcC1pZD0iMzQxMCIgZmlsbD0iIzEyOTZkYiI+PC9wYXRoPjwvc3ZnPg=='); + background-size: cover; + background-repeat: no-repeat; +} + + +.search-box { + position: fixed; + top: 0; + left: 0; + display: flex; + flex-direction: column; + box-sizing: border-box; + width: 100%; + padding: 20rpx 30rpx 0rpx 30rpx; +} + +.search-input-box { + display: flex; + flex-direction: row; + align-items: center; +} + +.search-container { + position: relative; + align-self: center; + border-radius: 5px; + background-color: var(--white-color); + padding: 5px; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + flex: 1; +} + +.search-input { + box-sizing: border-box; + color: var(--text-color); + font-size: 28rpx; + text-align: center; + flex: 1; +} + +.search-input::after { + content: ''; + position: absolute; + left: 10px; + top: 50%; + transform: translateY(-50%); + width: 20px; + height: 20px; + margin-top: -1px; + background-size: cover; + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSI2NCA2NCA4OTYgODk2IiB3aWR0aD0iMTQiIGhlaWdodD0iMTkiIHN0eWxlPSIiIGZpbHRlcj0ibm9uZSI+CiAgICAKICAgIDxnPgogICAgPHBhdGggZD0iTTkwOS42IDg1NC41TDY0OS45IDU5NC44QzY5MC4yIDU0Mi43IDcxMiA0NzkgNzEyIDQxMmMwLTgwLjItMzEuMy0xNTUuNC04Ny45LTIxMi4xLTU2LjYtNTYuNy0xMzItODcuOS0yMTIuMS04Ny45cy0xNTUuNSAzMS4zLTIxMi4xIDg3LjlDMTQzLjIgMjU2LjUgMTEyIDMzMS44IDExMiA0MTJjMCA4MC4xIDMxLjMgMTU1LjUgODcuOSAyMTIuMUMyNTYuNSA2ODAuOCAzMzEuOCA3MTIgNDEyIDcxMmM2NyAwIDEzMC42LTIxLjggMTgyLjctNjJsMjU5LjcgMjU5LjZhOC4yIDguMiAwIDAgMCAxMS42IDBsNDMuNi00My41YTguMiA4LjIgMCAwIDAgMC0xMS42ek01NzAuNCA1NzAuNEM1MjggNjEyLjcgNDcxLjggNjM2IDQxMiA2MzZzLTExNi0yMy4zLTE1OC40LTY1LjZDMjExLjMgNTI4IDE4OCA0NzEuOCAxODggNDEyczIzLjMtMTE2LjEgNjUuNi0xNTguNEMyOTYgMjExLjMgMzUyLjIgMTg4IDQxMiAxODhzMTE2LjEgMjMuMiAxNTguNCA2NS42UzYzNiAzNTIuMiA2MzYgNDEycy0yMy4zIDExNi4xLTY1LjYgMTU4LjR6IiBmaWxsPSJyZ2JhKDIwNCwyMDQsMjA0LDEpIj48L3BhdGg+CiAgICA8L2c+CiAgPC9zdmc+'); +} + +.options-list-box { + display: flex; + flex-direction: row; + justify-content: flex-start; + padding-top: 30rpx; + flex-wrap: nowrap; +} + +.options-tab-select { + white-space: nowrap; + line-height: 17px; + border-radius: 2px; + border: 1rpx solid var(--primary-color-light); + background-color: var(--primary-color-light); + color: var(--text-brown-color); + font-size: 12px; + text-align: center; + padding: 2px 8px; +} + + +.options-tab-normal { + line-height: 17px; + border-radius: 2px; + border: 1rpx solid transparent; + color: rgba(154, 154, 154, 1); + font-size: 12px; + text-align: center; + white-space: nowrap; + padding: 2px 8px; +} + + +.add-btn { + border-radius: 8rpx; + background-color: var(--btn-green-color); + color: rgba(255, 255, 255, 1); + font-size: 28rpx; + text-align: center; + height: 50rpx; + margin-left: 20rpx; + line-height: 50rpx; + font-family: PingFangSC-regular; + padding: 5rpx 10rpx; +} + +.add-btn:active { + background-color: var(--btn-green-color-active); +} + +.content-container { + height: 82vh; + margin-top: 80px; +} + +.bottom-btn { + position: fixed; + bottom: 40rpx; + left: 0; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + width: 100%; +} + + + +.repair-list-box { + display: flex; + flex-direction: column; +} + +.repair-list-item { + display: flex; + flex-direction: column; + background-color: var(--white-color); + padding: 20rpx; + border-radius: 8rpx; +} + +.repair-list-item:nth-of-type(n+2) { + margin-top: 20rpx; +} + +.repair-item-title-box { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.repair-title-box { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + font-size: 28rpx; +} + +.repair-name-box { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.repair-title-content { + font-size: 28rpx; + font-weight: bold; +} + +.repair-reason-desc { + margin-top: 10rpx; + font-size: 24rpx; + color: var(--text-gray-desc-color); +} + +.repair-footer-box { + margin-top: 20rpx; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: flex-end; +} + +.repair-attr-box { + display: flex; + flex-direction: row; +} + +.repair-attr-item { + font-size: 20rpx; + color: var(--text-brown-color); + background-color: var(--divider-color); + padding: 2rpx 10rpx; + border-radius: 5rpx; + text-align: center; +} + +.repair-attr-item:nth-of-type(n+2) { + margin-left: 10rpx; +} + +.repair-title-apply-time { + font-size: 22rpx; + color: var(--text-gray-hint-color); +} + +.repair-status-green { + background-color: var(--bg-green-color); +} + +.repair-status-red { + background-color: var(--bg-red-color); +} + +.repair-status-yellow { + background-color: var(--primary-color); + +} + +.repair-status-content { + padding: 2rpx 10rpx; + font-size: 22rpx; + border-radius: 5rpx; + height: 30rpx; + line-height: 30rpx; + text-align: center; + color: var(--text-color); +} + +.repair-status-gray { + background-color: var(--bg-gray-deep-color); +} + + +.order-item { + display: flex; + flex-direction: column; + background-color: white; + border-radius: 10rpx; + padding: 10rpx 20rpx; +} + +.record-title-box { + display: flex; + flex-direction: row; +} + +.record-options { + display: flex; + flex-direction: row; +} + +.options-btn { + font-size: 24rpx; + line-height: 24rpx; + height: 24rpx; + padding: 10rpx 20rpx; + border-radius: 5rpx; + background-color: var(--btn-green-color); + color: var(--white-color); +} + +.options-btn:active { + background-color: var(--btn-green-color-active); +} + + +.red:active { + background-color: var(--red-color); +} + +.record-title-status { + font-size: 20rpx; + line-height: 24rpx; + height: 24rpx; + margin-top: 8rpx; + text-align: center; + padding: 5rpx; + min-width: 80rpx; + border-radius: 5rpx; + margin-right: 15rpx; +} + +.approve-box { + display: flex; + flex-direction: column; + align-items: flex-start; +} + +.approve-title { + font-size: 28rpx; + color: var(--text-color); + font-weight: bold; +} + +.approve-content-box { + margin-top: 10rpx; + display: flex; + flex-direction: column; + align-items: flex-start; +} + +.approve-img-box { + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin-top: 15rpx; +} + +.approve-img-item { + width: 120rpx; + height: 120rpx; + border-radius: 5rpx; + margin: 5rpx; +} + +.approve-content { + font-size: 24rpx; + margin-left: 20rpx; + text-align: left; + color: var(--text-gray-desc-color); +} + +.approve-hint { + margin-top: 20rpx; + font-size: 24rpx; + color: var(--text-gray-hint-color); +} + +.col-yellow { + background-color: var(--primary-color); + color: var(--text-color); +} + +.col-gray { + background-color: var(--bg-gray-deep-color); + color: var(--text-gray-desc-color); +} + +.col-green { + background-color: var(--bg-green-color); + color: #006400; +} + +.col-red { + background-color: var(--bg-red-color); + color: #8b0000; +} + +.record-title-name { + font-size: 32rpx; + color: var(--text-color); + font-weight: bold; + flex: 1; +} + +.record-number { + font-size: 24rpx; + color: var(--text-gray-desc-color); + margin-left: 10rpx; +} + +.record-time { + display: flex; + flex-direction: row; + align-items: center; + font-size: 24rpx; +} + +.record-bottom-box { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.icon-time::before { + content: ''; + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODEyODg5NzI5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM2MTgwIiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik01MTMgMzMuMjJjLTI2NS4xIDAtNDgwIDIxNC45LTQ4MCA0ODBzMjE0LjkgNDgwIDQ4MCA0ODAgNDgwLTIxNC45IDQ4MC00ODAtMjE0LjktNDgwLTQ4MC00ODB6IG0yMDguOSA2NTIuNTljLTExLjA1IDE5LjEzLTM1LjUxIDI1LjY5LTU0LjY0IDE0LjY0TDQ3NC4xIDU4OC45M2MtMTMuMDYtNy41NC0yMC4yNi0yMS4zNC0xOS45OS0zNS40MiAwLTAuMTctMC4wMS0wLjM0LTAuMDEtMC41MVYzMjkuOTVjMC0yMi4wOSAxNy45MS00MCA0MC00MHM0MCAxNy45MSA0MCA0MHYyMDEuMjNsMTczLjE3IDk5Ljk4YzE5LjEyIDExLjA1IDI1LjY4IDM1LjUxIDE0LjYzIDU0LjY1eiIgZmlsbD0iI2RiZGJkYiIgcC1pZD0iMzYxODEiPjwvcGF0aD48L3N2Zz4='); + background-size: cover; + width: 28rpx; + height: 28rpx; + display: flex; + flex-direction: row; + margin-right: 10rpx; +} + +.order-item:nth-of-type(n+2) { + margin-top: 15px; +} + +.contact-desc { + display: flex; + flex-direction: row; + justify-content: space-between; + padding: 15px; + align-items: center; +} + +.contact-icon { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.name { + line-height: 23rpx; + color: var(--text-color); + font-size: 32rpx; + text-align: left; + font-weight: bold; + font-family: SourceHanSansSC-black; +} + +.service-desc { + padding: 0px 15px 15px 15px; + line-height: 20px; + color: var(--text-color); + font-size: 14px; + text-align: left; + font-family: SourceHanSansSC-regular; +} + +.edit { + line-height: 20px; + border-radius: 4px; + background-color: var(--btn-green-color); + color: rgba(255, 255, 255, 1); + font-size: 28rpx; + text-align: center; + font-family: PingFangSC-regular; + padding: 5rpx 10rpx; +} + +.del { + line-height: 20px; + border-radius: 4px; + background-color: var(--btn-red-color); + color: rgba(255, 255, 255, 1); + font-size: 28rpx; + text-align: center; + font-family: PingFangSC-regular; + padding: 5rpx 10rpx; + margin-left: 5px; +} + +.del:active { + background-color: var(--btn-red-color-active); +} + +.options-box { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.edit:active { + background-color: var(--btn-green-color-active); +} + + +.form-box { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + font-size: 14px; + width: 100vw; +} + +.form-item { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + width: 80vw; + padding: 10px; +} + +.form-item-title { + flex: .3; + font-size: 14px; + color: var(--text-color); + font-weight: 500; + text-align: left; +} + +.form-item-title:not(.no-after)::before { + content: "*"; + color: var(--red-color); + font-size: 14px; + margin-left: 1px; + text-align: center; +} + +.form-item-content { + flex: 1; + text-align: right; +} + +.confirm-btn { + background-color: var(--btn-green-color); + color: white; + font-size: 16px; + height: 70rpx; + line-height: 70rpx; + border-radius: 5px; + text-align: center; + width: 85vw !important; +} + +.confirm-btn:active { + background-color: var(--btn-green-color-active); + color: white; +} + +.weui-half-screen-dialog__ft { + padding: 0rpx 0rpx 40rpx; +} + +.weui-half-screen-dialog__bd { + padding-bottom: 40rpx; +} + +.weui-dialog__hd { + padding: 30rpx; +} \ No newline at end of file diff --git a/pages/mainPage/mainPage.wxss b/pages/mainPage/mainPage.wxss index e9fd136..72035e5 100644 --- a/pages/mainPage/mainPage.wxss +++ b/pages/mainPage/mainPage.wxss @@ -109,11 +109,15 @@ .buy-all-btn { padding: 5rpx 35rpx; border-radius: 10rpx; - background-color: var(--btn-cyan-color); + background-color: var(--btn-green-color); color: var(--white-color); font-size: 28rpx; } +.buy-all-btn:active { + background-color: var(--btn-green-color-active); +} + .buy-desc-box { display: flex; flex-direction: column; @@ -289,7 +293,7 @@ .main-btn { align-self: center; - background-color: var(--btn-cyan-color); + background-color: var(--btn-green-color); font-size: 28rpx; padding: 20rpx 40rpx; border-radius: 10rpx; @@ -301,7 +305,7 @@ } .main-btn:active { - background-color: var(--btn-cyan-active); + background-color: var(--btn-green-color-active); color: var(--white-color); } diff --git a/pages/mine/mineAccount/mineContact/mineContact.wxml b/pages/mine/mineAccount/mineContact/mineContact.wxml index ed70936..cf3cf41 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.wxml +++ b/pages/mine/mineAccount/mineContact/mineContact.wxml @@ -13,17 +13,12 @@ - {{item.name}} {{item.phone}} - {{item.company}} 专属客服 : {{item.csaNo}} diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss index d74a732..c48c967 100644 --- a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss +++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss @@ -57,8 +57,6 @@ .coupons-list-box { display: flex; flex-direction: column; - justify-content: center; - align-items: center; } .msg-item-box { @@ -68,6 +66,7 @@ padding: 20rpx; background-color: var(--white-color); border-radius: 5rpx; + } .msg-title-box { diff --git a/pages/mine/mineIndex/mine.js b/pages/mine/mineIndex/mine.js index d206c81..cd085bf 100644 --- a/pages/mine/mineIndex/mine.js +++ b/pages/mine/mineIndex/mine.js @@ -41,6 +41,14 @@ Page({ icon: 'ic-msg', title: '消息通知', path: '/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice' + }, { + icon: 'ic-refund', + title: '退款项目', + path: '/pages/copyright/refund/refund' + }, { + icon: 'ic-repair', + title: '补正项目', + path: '/pages/copyright/repair/repair' }, { icon: 'ic-invoice-info', title: '开票信息', diff --git a/pages/mine/mineIndex/mine.wxss b/pages/mine/mineIndex/mine.wxss index 8aa8af7..e2b265c 100644 --- a/pages/mine/mineIndex/mine.wxss +++ b/pages/mine/mineIndex/mine.wxss @@ -303,9 +303,24 @@ background-size: cover; width: 24px; height: 24px; - } .custom-tips { margin-top: 82px; +} + +.ic-refund { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ2NTgyMTEwOTk2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM1NzYiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTU1MC4wMjc2MzYgMjI3Ljc0NjkwOWEyNzkuMjcyNzI3IDI3OS4yNzI3MjcgMCAxIDEgMCA1NTguNTQ1NDU1IDI3OS4yNzI3MjcgMjc5LjI3MjcyNyAwIDAgMSAwLTU1OC41NDU0NTV6IG0tNTQuNDU4MTgxIDE0Mi4xNDk4MThhMjIuMDYyNTQ1IDIyLjA2MjU0NSAwIDAgMC0zMS4xODU0NTUgMzEuMTg1NDU1bDQ3LjEwNCA0Ny4xMDRoLTQyLjM1NjM2NGEyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMSAwIDAgNDQuMTI1MDkxaDU4LjgzMzQ1NXYyOS4zNzAxODJINDY5LjE3ODE4MmEyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMSAwIDAgNDQuMTI1MDloNTguNzg2OTA5djczLjU0MTgxOWEyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMCAwIDQ0LjEyNTA5MSAwdi03My41NDE4MTloNTguNzg2OTA5YTIyLjA2MjU0NSAyMi4wNjI1NDUgMCAxIDAgMC00NC4wNzg1NDVINTcyLjA0MzYzNnYtMjkuNDE2NzI3aDU4LjgzMzQ1NWEyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMSAwIDAtNDQuMDc4NTQ2aC00Mi4zNTYzNjRsNDcuMTk3MDkxLTQ3LjE1MDU0NSAxLjU4MjU0Ni0xLjgxNTI3M2EyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMCAwLTMyLjc2OC0yOS4zNzAxODJMNTUyLjQ5NDU0NSA0MjEuODQxNDU1bC0xLjU4MjU0NSAxLjgxNTI3Mi0wLjkzMDkwOSAxLjI1NjcyOGEyMi4xNTU2MzYgMjIuMTU1NjM2IDAgMCAwLTIuNTEzNDU1LTMuMDcybC01MS45OTEyNzItNTEuOTQ0NzI4eiIgZmlsbD0iIzNCOERGRiIgcC1pZD0iMzU3NyI+PC9wYXRoPjxwYXRoIGQ9Ik05NzcuNDU0NTQ1IDUxMmMwLTIzMS4zMzA5MDktMTg4LjUwOTA5MS00MTguOTA5MDkxLTQyMS4wMDM2MzYtNDE4LjkwOTA5MS0yMzIuNTQxMDkxIDAtNDIxLjA1MDE4MiAxODcuNTc4MTgyLTQyMS4wNTAxODIgNDE4LjkwOTA5MWEzMC4wMjE4MTggMzAuMDIxODE4IDAgMCAwIDMwLjA2ODM2NCAyOS4xODRjMTYuMzM3NDU1IDAgMjkuNjk2LTEyLjkzOTYzNiAzMC4xMTQ5MDktMjkuMTg0IDAtMTk4LjI4MzYzNiAxNjEuNTEyNzI3LTM1OS4wNTE2MzYgMzYwLjg2NjkwOS0zNTkuMDUxNjM2IDE5OS4zMDc2MzYgMCAzNjAuODY2OTA5IDE2MC43MjE0NTUgMzYwLjg2NjkwOSAzNTkuMDUxNjM2IDAgMTk4LjI4MzYzNi0xNjEuNTU5MjczIDM1OS4wNTE2MzYtMzYwLjg2NjkwOSAzNTkuMDUxNjM2YTM2MC42MzQxODIgMzYwLjYzNDE4MiAwIDAgMS0xNjguMjYxODE4LTQxLjI4NTgxOCAzMC4xNjE0NTUgMzAuMTYxNDU1IDAgMCAwLTQwLjAyOTA5MSAxMi44IDI5LjgzNTYzNiAyOS44MzU2MzYgMCAwIDAgMTEuOTYyMTgyIDQwLjEyMjE4MkE0MjAuOTU3MDkxIDQyMC45NTcwOTEgMCAwIDAgNTU2LjQ1MDkwOSA5MzAuOTA5MDkxQzc4OC45NDU0NTUgOTMwLjkwOTA5MSA5NzcuNDU0NTQ1IDc0My4zMzA5MDkgOTc3LjQ1NDU0NSA1MTJ6TTE3OS43NTg1NDUgNTk3LjgyOTgxOGw1NC41NTEyNzMtNzIuNDI0NzI3YTE3LjY4NzI3MyAxNy42ODcyNzMgMCAwIDAtMTQuMjQyOTA5LTI4LjM5MjcyN0gxMTAuOTE3ODE4YTE3LjY4NzI3MyAxNy42ODcyNzMgMCAxIDAtMTQuMjQyOTA5IDI4LjM5MjcyN2w1NC41NTEyNzMgNzIuNDI0NzI3YTE3Ljg3MzQ1NSAxNy44NzM0NTUgMCAwIDAgMjguNTMyMzYzIDB6IiBmaWxsPSIjM0I4REZGIiBwLWlkPSIzNTc4Ij48L3BhdGg+PC9zdmc+'); + background-repeat: no-repeat; + background-size: cover; + width: 24px; + height: 24px; +} + +.ic-repair { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ2NTgyMjU3MDY5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjEyNjg2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik04NjEuMTg0IDk1Mi4zMmMzMy4yOCAwIDYwLjQxNi0yNy42NDggNjAuNDE2LTYxLjQ0VjEzMy4xMmMwLTMzLjc5Mi0yNy4xMzYtNjEuNDQtNjAuNDE2LTYxLjQ0SDE2Mi44MTZDMTI5LjUzNiA3MS42OCAxMDIuNCA5OS4zMjggMTAyLjQgMTMzLjEydjc1Ny43NmMwIDMzLjc5MiAyNy4xMzYgNjEuNDQgNjAuNDE2IDYxLjQ0aDY5OC4zNjh6IG0tMTYuODk2LTgwMy44NHY3MjcuMDRIMTc5LjJWMTQ4LjQ4aDY2NS4wODh6IiBwLWlkPSIxMjY4NyIgZmlsbD0iIzEyOTZkYiI+PC9wYXRoPjxwYXRoIGQ9Ik03MTEuNjggMjE1LjU1MkgzMTIuMzJjLTIwLjk5MiAwLTM4LjQgMTcuNDA4LTM4LjQgMzguNHMxNy40MDggMzguNCAzOC40IDM4LjRoMzk5LjM2YzIwLjk5MiAwIDM4LjQtMTcuNDA4IDM4LjQtMzguNHMtMTcuNDA4LTM4LjQtMzguNC0zOC40eiBtMCAxMjhIMzEyLjMyYy0yMC45OTIgMC0zOC40IDE3LjQwOC0zOC40IDM4LjRzMTcuNDA4IDM4LjQgMzguNCAzOC40aDM5OS4zNmMyMC45OTIgMCAzOC40LTE3LjQwOCAzOC40LTM4LjRzLTE3LjQwOC0zOC40LTM4LjQtMzguNHpNNTMxLjk2OCA2NDIuMDQ4Yy0xNC4zMzYgMTMuODI0LTI5LjE4NCAyOS42OTYtNDEuNDcyIDQxLjk4NCAxMy44MjQgMTMuODI0IDI3LjY0OCAyNy4xMzYgMzIuNzY4IDMyLjc2OGwtMjguNjcyIDM3LjM3NmMtMTEuMjY0LTE2LjM4NC0zMy4yOC00MS40NzItNTIuMjI0LTYyLjQ2NHYxNTUuMTM2aC00OS4xNTJWNzA2LjU2Yy0xNy40MDggMTUuODcyLTMzLjc5MiAzMC4yMDgtNTEuMiA0MS45ODQtNC42MDgtMTMuMzEyLTE3LjQwOC0zNy4zNzYtMjUuNi00Ni41OTIgNDYuMDgtMjcuMTM2IDkzLjY5Ni03NS4yNjQgMTIzLjM5Mi0xMjQuOTI4SDMyOS4yMTZ2LTQ0LjAzMmg3Mi43MDRjLTkuMjE2LTEzLjgyNC0yMy41NTItMzAuNzItMzYuMzUyLTQ0LjAzMmwzNS4zMjgtMjUuMDg4YzE2Ljg5NiAxNC44NDggMzUuODQgMzUuODQgNDQuNTQ0IDUwLjE3NmwtMjQuNTc2IDE4Ljk0NGg0Ni4wOGw4LjcwNC0yLjA0OCAyOC4xNiAxOS45NjhjLTEzLjgyNCAzMi43NjgtMzMuNzkyIDY0LjUxMi01NS44MDggOTQuMjA4IDQuNjA4IDMuNTg0IDkuNzI4IDguMTkyIDE1LjM2IDEzLjMxMiAxMS43NzYtMTUuMzYgMjUuMDg4LTMyLjc2OCAzMi4yNTYtNDYuNTkybDM2LjM1MiAzMC4yMDh6IG04MC4zODQtNTYuODMyYzI5LjY5NiAyNS4wODggNzMuNzI4IDYxLjQ0IDk1LjIzMiA4NC45OTJsLTM5LjkzNiAzNS44NGMtMTUuMzYtMTkuNDU2LTQ2LjA4LTQ3LjYxNi03Mi43MDQtNzEuNjh2MjEwLjk0NGgtNTMuMjQ4VjQ2NC44OTZoNTMuMjQ4VjU5OS4wNGwxNy40MDgtMTMuODI0eiIgcC1pZD0iMTI2ODgiIGZpbGw9IiMxMjk2ZGIiPjwvcGF0aD48L3N2Zz4='); + background-repeat: no-repeat; + background-size: cover; + width: 24px; + height: 24px; } \ No newline at end of file diff --git a/static/images/ic_cancel_yellow.png b/static/images/ic_cancel_yellow.png new file mode 100644 index 0000000..608c718 Binary files /dev/null and b/static/images/ic_cancel_yellow.png differ diff --git a/utils/comm.wxs b/utils/comm.wxs index 9975e39..7dd414a 100644 --- a/utils/comm.wxs +++ b/utils/comm.wxs @@ -284,6 +284,70 @@ var timeSplit = function (value) { var regex = getRegExp('-', 'g'); return value.replace(regex, '.') } + +var repairStatusColor = function (status) { + var color = 'repair-status-green' + switch (status) { + case 'PENDING': + color = 'repair-status-green' + break + case 'APPROVED': + color = 'repair-status-yellow' + break + case 'REJECTED': + color = 'repair-status-red' + break + case 'CANCELED': + color = 'repair-status-gray' + break + } + return color +} +var repairStatus = function (status) { + var str = '待审核' + switch (status) { + case 'PENDING': + str = '待审核' + break + case 'APPROVED': + str = '已通过' + break + case 'REJECTED': + str = '未通过' + break + case 'CANCELED': + str = '已取消' + break + } + return str +} +var repairType = function (type) { + var str = '未知' + switch (type) { + case 'CORRECTION1': + str = '一次补正' + break + case 'CORRECTION2': + str = '二次补正' + break + } + return str +} +var repairKind = function (kind) { + var str = '未知' + switch (kind) { + case 'CODE': + str = '代码' + break + case 'MANUAL': + str = '操作手册' + break + case 'ALL': + str = '代码+操作手册' + break + } + return str +} module.exports = { isEmpty: isEmpty, status: status, @@ -301,5 +365,9 @@ module.exports = { payWay: payWay, moneyTxt: moneyTxt, invoiceStatus: invoiceStatus, - invoiceStatusColor: invoiceStatusColor + invoiceStatusColor: invoiceStatusColor, + repairStatus: repairStatus, + repairStatusColor: repairStatusColor, + repairType: repairType, + repairKind: repairKind }; \ No newline at end of file