diff --git a/App.vue b/App.vue index 013f46f..9b047a7 100644 --- a/App.vue +++ b/App.vue @@ -352,7 +352,7 @@ flex-direction: column; justify-content: center; padding: 30rpx; - } + } .dialog-title-box { display: flex; diff --git a/common/js/conver.js b/common/js/conver.js index cf5d1c3..3835012 100644 --- a/common/js/conver.js +++ b/common/js/conver.js @@ -137,6 +137,70 @@ var phoneNum = function(str, startLength, endLength, replaceStr) { return str; } return str.slice(0, startLength) + replaceStr + str.slice(str.length - endLength); +} + +var repairStatusColor = function (status) { + var color = 'repair-status-yellow' + switch (status) { + case 'PENDING': + color = 'repair-status-yellow' + break + case 'APPROVED': + color = 'repair-status-green' + 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 } export { isEmpty, @@ -148,5 +212,9 @@ export { timeSplit, objIsEmpty, moneyTxt, - phoneNum + phoneNum, + repairStatusColor, + repairKind, + repairType, + repairStatus } \ No newline at end of file diff --git a/common/js/net/projectApi.js b/common/js/net/projectApi.js index 2c433e9..bd6b9c1 100644 --- a/common/js/net/projectApi.js +++ b/common/js/net/projectApi.js @@ -17,8 +17,21 @@ const apiPath = { proLangList: '/api/env/custom/list-active-lang', //项目语言 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', //申请补正 + refundProList: '/api/proj/refund/apply/listpage/self', //我的退款项目 + canRefundProList: '/api/proj/refund/apply/listpage-proj-unapply/self', //可以退款的项目 + applyRefundPro: '/api/proj/refund/apply/save', //申请退款 + cancelRefundPro: '/api/proj/refund/apply/cancel/self/{projRefundApplyId}', //取消申请退款 } class ProApi { + //首页介绍数量 + static doGetMainProCount() { + return request(apiPath.mainProCount, 'GET') + } //项目列表 static doGetSelfProjectList(data) { return request(apiPath.getSelfProjectList, 'GET', data) @@ -71,11 +84,44 @@ class ProApi { //获取使用规则数据 static doGetRuleDate(id) { const path = apiPath.ruleData.replace('{id}', id) - return request(path, "GET", null, null, "online", false) + return request(path, "GET", null, null, "operator", false) } 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) + } + //退款项目列表 + static doGetMineRefundProList(data) { + return request(apiPath.refundProList, "GET", data) + } + static doGetCanRefundProList(data) { + return request(apiPath.canRefundProList, "GET", data) + } + //取消申请退款 + static doCancelRefundPro(id) { + const path = apiPath.cancelRefundPro.replace('{projRefundApplyId}', id) + return request(path, "PUT") + } + //提交申请退款 + static doApplyRefundPro(data) { + return request(apiPath.applyRefundPro, "POST", data) + } } export default ProApi; \ No newline at end of file diff --git a/common/style/icons.css b/common/style/icons.css index 0c0a038..4ab3ded 100644 --- a/common/style/icons.css +++ b/common/style/icons.css @@ -119,4 +119,10 @@ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ3Mjk4NjU3MTUxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2MjEiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTc2NS41MDU2OTEgMTkxLjk0MjU2NyA2MzkuNjI3NzcyIDE5MS45NDI1NjdjMC0zNS4zMjQ1My0yOC42MzYyMDEtNjMuOTYwNzMxLTYzLjk2MDczMS02My45NjA3MzFMNDQ3Ljc0NTU4IDEyNy45ODE4MzZjLTM1LjMyNDUzIDAtNjMuOTYwNzMxIDI4LjYzNjIwMS02My45NjA3MzEgNjMuOTYwNzMxTDI1Ny45MDU5MDggMTkxLjk0MjU2N2MtMzYuNDUyMjEzIDAtNjYuMDAzMjUgMjkuNTUxMDM2LTY2LjAwMzI1IDY2LjAwMzI1bDAgNTkuODc1NjkyYzAgMzYuNDUyMjEzIDI5LjU1MTAzNiA2Ni4wMDMyNSA2Ni4wMDMyNSA2Ni4wMDMyNWwtMi4wNDI1MTkgMCAwIDQ0NS42ODE1NzJjMCAzNi40NTIyMTMgMjkuNTUxMDM2IDY2LjAwMzI1IDY2LjAwMzI1IDY2LjAwMzI1bDYxLjkxODIxMSAwIDYzLjk2MDczMSAwIDEyNy45MjE0NjEgMCA2My45NjA3MzEgMCA2MS45MTgyMTEgMGMzNi40NTIyMTMgMCA2Ni4wMDMyNS0yOS41NTEwMzYgNjYuMDAzMjUtNjYuMDAzMjVMNzY3LjU0OTIzNCAzODMuODIzNzM2bC0yLjA0MjUxOSAwYzM2LjQ1MjIxMyAwIDY2LjAwMzI1LTI5LjU1MTAzNiA2Ni4wMDMyNS02Ni4wMDMyNWwwLTU5Ljg3NTY5MkM4MzEuNTA4OTQxIDIyMS40OTI1OCA4MDEuOTU4OTI4IDE5MS45NDI1NjcgNzY1LjUwNTY5MSAxOTEuOTQyNTY3ek03MDMuNTg3NDggODAzLjQxMzA0NmMtMC4xMDEzMDcgMy4xMjMxMzEtMS43NDM3MTQgMjcuODEzNDYyLTI3Ljk2MTg0MiAyOC4xMzQ3ODFsLTM1Ljk5ODg4OSAwLTYzLjk2MDczMSAwTDQ0Ny43NDU1OCA4MzEuNTQ3ODI3IDM4My43ODQ4NSA4MzEuNTQ3ODI3bC0zNS44NzkxNjIgMGMtMjcuOTg4NDQ4LTAuMzQzODMxLTI3Ljk2OTAwNS0yOC40NTkxNjktMjcuOTY5MDA1LTI4LjQ1OTE2OWwtMC4xMTI1NjQgMC4wMzE3MjJMMzE5LjgyNDExOSAzODMuODIzNzM2bDM4My43NjMzNiAwTDcwMy41ODc0OCA4MDMuNDEzMDQ2ek03MzUuNTY3ODQ1IDMxOS44NjMwMDUgMjg3Ljg0Mzc1NCAzMTkuODYzMDA1Yy0xNy42NjIyNjUgMC0zMS45ODAzNjUtMTQuMzE4MS0zMS45ODAzNjUtMzEuOTgwMzY1IDAtMTcuNjYyMjY1IDE0LjMxODEtMzEuOTgwMzY1IDMxLjk4MDM2NS0zMS45ODAzNjVsMTU5LjkwMTgyNyAwIDEyNy45MjE0NjEgMCAxNTkuOTAxODI3IDBjMTcuNjYyMjY1IDAgMzEuOTgwMzY1IDE0LjMxODEgMzEuOTgwMzY1IDMxLjk4MDM2NUM3NjcuNTQ4MjEgMzA1LjU0NDkwNSA3NTMuMjMwMTEgMzE5Ljg2MzAwNSA3MzUuNTY3ODQ1IDMxOS44NjMwMDV6IiBwLWlkPSIyNjIyIiBmaWxsPSIjZTQ3YzZlIj48L3BhdGg+PHBhdGggZD0iTTQ0Ny43NDU1OCA3NjcuNTg4MTE5YzE3LjY2MjI2NSAwIDMxLjk4MDM2NS0xNC4zMTgxIDMxLjk4MDM2NS0zMS45ODAzNjVMNDc5LjcyNTk0NiA0NzkuNzY0ODMxYzAtMTcuNjYyMjY1LTE0LjMxODEtMzEuOTgwMzY1LTMxLjk4MDM2NS0zMS45ODAzNjUtMTcuNjYyMjY1IDAtMzEuOTgwMzY1IDE0LjMxODEtMzEuOTgwMzY1IDMxLjk4MDM2NWwwIDI1NS44NDI5MjJDNDE1Ljc2NTIxNSA3NTMuMjcwMDE5IDQzMC4wODMzMTYgNzY3LjU4ODExOSA0NDcuNzQ1NTggNzY3LjU4ODExOXoiIHAtaWQ9IjI2MjMiIGZpbGw9IiNlNDdjNmUiPjwvcGF0aD48cGF0aCBkPSJNNTc1LjY2NzA0MiA3NjcuNTg4MTE5YzE3LjY2MjI2NSAwIDMxLjk4MDM2NS0xNC4zMTgxIDMxLjk4MDM2NS0zMS45ODAzNjVMNjA3LjY0NzQwNyA0NzkuNzY0ODMxYzAtMTcuNjYyMjY1LTE0LjMxODEtMzEuOTgwMzY1LTMxLjk4MDM2NS0zMS45ODAzNjUtMTcuNjYyMjY1IDAtMzEuOTgwMzY1IDE0LjMxODEtMzEuOTgwMzY1IDMxLjk4MDM2NWwwIDI1NS44NDI5MjJDNTQzLjY4NjY3NiA3NTMuMjcwMDE5IDU1OC4wMDQ3NzcgNzY3LjU4ODExOSA1NzUuNjY3MDQyIDc2Ny41ODgxMTl6IiBwLWlkPSIyNjI0IiBmaWxsPSIjZTQ3YzZlIj48L3BhdGg+PC9zdmc+'); background-size: cover; background-repeat: no-repeat; +} + +.icon-cancel-yellow { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ3MzAyNjYxODQ1IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjU2MDMiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTQyNi42MjQgOTYuNTY4ODg5TDcxLjMxMDIyMiA0NTEuMzg0ODg5YTQ5LjEyMzU1NiA0OS4xMjM1NTYgMCAwIDAgMCA2OS41NDY2NjdsMzU1LjMxMzc3OCAzNTQuODQ0NDQ0YzcuMjUzMzMzIDcuMjY3NTU2IDE3LjA5NTExMSAxMS4zNjM1NTYgMjcuMzYzNTU2IDExLjM3Nzc3OGw0LjI2NjY2Ni0wLjIxMzMzNGEzOC42NTYgMzguNjU2IDAgMCAwIDM0LjQ3NDY2Ny0zOC40VjY0MS4wNTI0NDRsMTEuNzE5MTExIDAuNDU1MTEyYTUxMi44ODE3NzggNTEyLjg4MTc3OCAwIDAgMSAzOTUuMzc3Nzc4IDIxNS4xODIyMjJsNTIuMDUzMzMzIDc0LjA0MDg4OSAxMS42MDUzMzMtODkuNzg0ODg5YTQ3MS40NjY2NjcgNDcxLjQ2NjY2NyAwIDAgMCAzLjc1NDY2Ny01OS40MzQ2NjdsLTAuMDk5NTU1LTEwLjczNzc3OGMtNS42ODg4ODktMjUwLjMxMTExMS0yMTAuODU4NjY3LTQ1Mi4zNjYyMjItNDY2Ljc3MzMzNC00NjMuMzg4NDQ0bC03LjU2NjIyMi0wLjI0MTc3OFYxMjMuOTYwODg5YTM4LjY5ODY2NyAzOC42OTg2NjcgMCAwIDAtNjYuMDYyMjIyLTI3LjI5MjQ0NWwtMC4xMTM3NzgtMC4wOTk1NTV6IiBmaWxsPSIjRkU5OTQ0IiBwLWlkPSI1NjA0Ij48L3BhdGg+PC9zdmc+'); + background-size: cover; + background-repeat: no-repeat; } \ No newline at end of file diff --git a/components/download-progress.vue b/components/download-progress.vue index ab89161..ac17cc5 100644 --- a/components/download-progress.vue +++ b/components/download-progress.vue @@ -40,7 +40,8 @@ left: 0; width: 100vw; height: 100vh; - background-color: rgba(0, 0, 0, 0.2); + background-color: rgba(0, 0, 0, 0.2); + z-index: 9999; } .download-popup-box { diff --git a/pages.json b/pages.json index e7425e9..2d4d36a 100644 --- a/pages.json +++ b/pages.json @@ -100,6 +100,14 @@ "navigationBarTitleText": "", "enablePullDownRefresh": true } + }, + { + "path" : "pages/copyright/refund/refund", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh": true + } } ], "globalStyle": { diff --git a/pages/copyright/refund/refund.vue b/pages/copyright/refund/refund.vue new file mode 100644 index 0000000..66564f4 --- /dev/null +++ b/pages/copyright/refund/refund.vue @@ -0,0 +1,812 @@ + + + + + \ No newline at end of file diff --git a/pages/index/home.vue b/pages/index/home.vue index c0265fc..00da40a 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -502,8 +502,8 @@ doShowDownload(item) { console.log('点击了下载') this.$refs.downloadPopup.open() - this.sysPreviewUrl = `${this.cUrl}/${item.previewUrl}`, - this.tempItem = item + this.sysPreviewUrl = `${this.cUrl}/${item.previewUrl}` + this.tempItem = item }, //复制链接到剪贴板 copyLink() {