diff --git a/app.json b/app.json index 6de5d4a..74c0217 100644 --- a/app.json +++ b/app.json @@ -19,7 +19,8 @@ "pages/mine/mineAccount/mineInvoice/mineInvoice", "pages/mine/mineAccount/invoiceInfo/invoiceInfo", "pages/mine/mineAccount/makeInvoice/makeInvoice", - "pages/mine/mineAccount/invoiceOrder/invoiceOrder" + "pages/mine/mineAccount/invoiceOrder/invoiceOrder", + "pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail" ], "window": { "navigationBarTextStyle": "black", diff --git a/app.wxss b/app.wxss index f391a42..7504e84 100644 --- a/app.wxss +++ b/app.wxss @@ -2,7 +2,9 @@ @import "/static/style/icon.wxss"; page { - background-color: #FAFAFA; + background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); + background-size: 100% 100vh; + background-repeat: no-repeat; } .page-container { @@ -54,7 +56,13 @@ page { .star::after { content: "*"; color: red; - margin-left: 3px; + margin-left: 6rpx; +} + +.gray-star::after { + content: '*'; + color: #525252; + margin-left: 6rpx; } .bottom-footer { diff --git a/net/api/invoiceApi.js b/net/api/invoiceApi.js index 681d391..617c0f7 100644 --- a/net/api/invoiceApi.js +++ b/net/api/invoiceApi.js @@ -11,7 +11,7 @@ const apiPath = { deleteInvoiceInfo: '/api/invoice-config/remove/{ids}', //删除开票信息 mineInvoiceRecordList: '/api/invoicerecharge/listpage/{userId}', //我的开票记录 saveInvoiceRecord: '/api/invoicerecharge/save/{userId}', // 保存开票申请 - updateInvoiceRecord: '/api/invoicerecharge/save/{userId}', //修改开票申请 + updateInvoiceRecord: '/api/invoicerecharge/update/{invoiceRechargeId}', //修改开票申请 cancelInvoiceRecord: '/api/invoicerecharge/cancel/{invoiceRechargeId}', //取消开票申请 dicByPId: '/api/data/listbyparentid/{pId}', //数据字典 } @@ -55,7 +55,7 @@ class InvoiceApi { //取消开票申请 static doCancelInvoiceRecord(id) { const path = apiPath.cancelInvoiceRecord.replace('{invoiceRechargeId}', id) - return request(path, "DELETE", null, null, 'plug') + return request(path, "PUT", null, null, 'plug') } //提交开票申请 static doSaveInvoiceRecord(data) { @@ -63,8 +63,8 @@ class InvoiceApi { return request(path, "POST", data, null, 'plug') } //修改开票申请 - static doUpdateInvoiceRecord(data) { - const path = apiPath.updateInvoiceRecord.replace('{userId}', this.userId) + static doUpdateInvoiceRecord(id, data) { + const path = apiPath.updateInvoiceRecord.replace('{invoiceRechargeId}', id) return request(path, 'PUT', data, null, 'plug') } } diff --git a/pages/copyright/createBuy/createBuy.wxss b/pages/copyright/createBuy/createBuy.wxss index 43ef713..7f57259 100644 --- a/pages/copyright/createBuy/createBuy.wxss +++ b/pages/copyright/createBuy/createBuy.wxss @@ -1,8 +1,4 @@ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} + .custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked { color: #fff !important; diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxss b/pages/copyright/createProjectInfo/createProjectInfo.wxss index cb1ef2d..8ad1fec 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxss +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxss @@ -1,8 +1,4 @@ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} + .custom-checkbox { font-size: 14px; diff --git a/pages/copyright/payment/payment.wxss b/pages/copyright/payment/payment.wxss index f70ced8..c1eaa37 100644 --- a/pages/copyright/payment/payment.wxss +++ b/pages/copyright/payment/payment.wxss @@ -1,9 +1,4 @@ -/* pages/copyright/payment/payment.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} + .input-money { font-size: 48rpx; diff --git a/pages/copyright/publicPay/publicPay.wxss b/pages/copyright/publicPay/publicPay.wxss index 26783ac..acba96a 100644 --- a/pages/copyright/publicPay/publicPay.wxss +++ b/pages/copyright/publicPay/publicPay.wxss @@ -1,9 +1,4 @@ -/* pages/copyright/publicPay/publicPay.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100vw 100vh; - background-repeat: no-repeat; -} + .container-box { display: flex; diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml index df4092e..fa8fe27 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml @@ -23,7 +23,7 @@ 纳税识别号:{{item.invoiceNumber}} - 企业电话:{{item.invoiceOrgtel}} + 企业电话:{{item.invoiceOrgtel}} {{item.invoiceOrgaddress}} diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss index dcf6ff3..0647634 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss @@ -1,11 +1,4 @@ /* pages/mine/mineAccount/mineInvoice/mineInvoice.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} - - .ic-user { diff --git a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.js b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.js index 040cc6f..6bb388d 100644 --- a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.js +++ b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.js @@ -157,7 +157,7 @@ Page({ } else { const idArray = this.data.checkList.map(item => item.accountRechargeId) const ids = idArray.join(',') - wx.navigateTo({ + wx.redirectTo({ url: `/pages/mine/mineAccount/makeInvoice/makeInvoice?money=${this.data.money}&ids=${ids}`, }) } diff --git a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss index cd468e8..c6fce7d 100644 --- a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss +++ b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss @@ -1,9 +1,3 @@ -/* pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} .list-title-btns { diff --git a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js new file mode 100644 index 0000000..f2cf31d --- /dev/null +++ b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js @@ -0,0 +1,33 @@ +// pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + detailBean: null + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + const beanStr = options.bean + const bean = JSON.parse(beanStr) + this.setData({ + detailBean: bean + }) + wx.setNavigationBarTitle({ + title: '详情', + }) + wx.setNavigationBarColor({ + frontColor: '#000000', // 必写项，字体颜色仅支持#ffffff和#000000 + backgroundColor: '#F0F0F0', // 传递的颜色值，仅支持十六进制颜色 + animation: { // 可选项 + duration: 500, + timingFunc: 'easeIn' + } + }) + }, + +}) \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.json b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxml b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxml new file mode 100644 index 0000000..0f039dd --- /dev/null +++ b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxml @@ -0,0 +1,89 @@ + + + + + + + + + + + 开票信息 + {{tools.invoiceStatus(detailBean.invoiceStatus)}} + + + + 公司名称 + + {{detailBean.invoiceName}} + + + + 纳税人识别号 + + {{detailBean.invoiceNumber}} + + + + 公司地址 + + {{detailBean.invoiceOrgaddress}} + + + + 联系电话 + + {{detailBean.invoiceOrgtel}} + + + + 开户行 + + {{detailBean.invoiceBank}} + + + + 开户行账号 + + {{detailBean.invoiceBanknumber}} + + + + 开票内容 + + {{detailBean.invoicePurpose}} + + + + 开票税率 + + {{detailBean.invoiceTaxrate}} + + + + 发票类型 + + {{detailBean.invoiceClassify}} + + + + 开票内容 + + + 开票金额 + + + + + + 开票备注 + {{detailBean.invoiceRecord}} + + + 失败原因 + {{detailBean.invoiceFinalRecord}} + + + + + \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxss b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxss new file mode 100644 index 0000000..84c9973 --- /dev/null +++ b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxss @@ -0,0 +1,96 @@ +/* pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxss */ +.invoice-info-title { + font-size: 36rpx; + font-weight: bold; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + +.record-title-status { + font-size: 24rpx; + line-height: 32rpx; + height: 32rpx; + text-align: center; + padding: 5rpx 10rpx; + font-weight: bold; + min-width: 80rpx; + border-radius: 5rpx; + margin-right: 15rpx; +} + +.col-yellow { + background-color: #FFA900; + color: #000000; +} + +.col-gray { + background-color: #ccc; + color: #666; +} + +.col-green { + background-color: #90ee90; + color: #006400; +} + +.col-red { + background-color: #f08080; + color: #8b0000; +} + + +.invoice-info-box { + display: flex; + flex-direction: column; + padding: 30rpx; + background-color: white; + border-radius: 10rpx; +} + +.invoice-info-item { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} + + +.invoice-info-item:nth-of-type(n+2) { + margin-top: 20rpx; +} + +.invoice-info-item-title { + font-size: 28rpx; +} + +.invoice-info-item-content { + font-size: 28rpx; + padding-left: 20rpx; + flex: 1; + align-items: center; + justify-content: flex-end; + display: flex; + flex-direction: row; +} + + +.invoice-remark { + height: 120rpx; + border: 1rpx solid #dbdbdb; + align-self: center; + border-radius: 10rpx; + width: 95%; + padding: 10rpx; + margin-top: 10rpx; + margin-bottom: 20rpx; + font-size: 28rpx; +} + +.invoice-info-item-ver { + display: flex; + flex-direction: column; + box-sizing: border-box; + margin-top: 20rpx; +} \ No newline at end of file diff --git a/pages/mine/mineAccount/makeInvoice/makeInvoice.js b/pages/mine/mineAccount/makeInvoice/makeInvoice.js index 3be6778..446d973 100644 --- a/pages/mine/mineAccount/makeInvoice/makeInvoice.js +++ b/pages/mine/mineAccount/makeInvoice/makeInvoice.js @@ -21,6 +21,7 @@ Page({ invoiceInfoList: [], //开票信息 payOrderIds: '', //开票记录id remark: '', //备注信息 + editBean: null, //编辑页面传递过来的 }, /** @@ -38,10 +39,32 @@ Page({ timingFunc: 'easeIn' } }) - this.setData({ - invoiceMoney: options.money, - payOrderIds: options.ids - }) + const ids = options.ids + if (ids) { + this.setData({ + invoiceMoney: options.money, + payOrderIds: options.ids + }) + } else { + const beanStr = options.bean + const bean = JSON.parse(beanStr) + this.setData({ + editBean: bean, + rateId: bean.invoiceTaxrate, + contentId: bean.invoicePurpose, + typeId: bean.invoiceClassify, + invoiceMoney: bean.invoiceRechargeMoney, + payOrderIds: bean.invoiceRechargeIds, + remark: bean.invoiceRecord, + invoiceInfo: { + invoiceId: bean.invoiceId, + invoiceName: bean.invoiceName, + invoiceNumber: bean.invoiceNumber, + invoiceOrgaddress: bean.invoiceOrgaddress, + invoiceOrgtel: bean.invoiceOrgtel + } + }) + } //获取开票类型 //获取开票内容 //获取开票税率 @@ -65,7 +88,6 @@ Page({ rateList: res[1], typeList: res[2] }) - console.log(res) }) .catch(err => { wx.hideLoading() @@ -173,6 +195,7 @@ Page({ return data }, doSaveInfo() { + //判断编辑 新增 const isLegal = this.checkParams() if (isLegal) { wx.showLoading({ @@ -190,6 +213,9 @@ Page({ msgHint: '开票信息提交成功!我们会以最快速度完成开票，还请耐心等待!', msgShow: true }) + setTimeout(() => { + _self.backPageRefresh() + }, 1800); } else { this.setData({ msgType: 'error', @@ -200,7 +226,11 @@ Page({ }) .catch(err => { wx.hideLoading() - console.log(err) + this.setData({ + msgType: 'error', + msgHint: err.msg ? err.msg : '发票开取失败,请稍后重试', + msgShow: true + }) }) } }, @@ -239,6 +269,59 @@ Page({ return false } return true + }, + //提交 + confirmSubmit() { + if (this.data.bean != null && this.data.bean.invoiceRechargeId != '') { + this.doSaveInfo() + } else { + this.doEditInfo() + } + }, + //编辑 + doEditInfo() { + const isLegal = this.checkParams() + if (isLegal) { + const data = this.buildParams() + const _self = this + wx.showLoading({ + title: '提交中...', + }) + InvoiceApi.doUpdateInvoiceRecord(_self.data.editBean.invoiceRechargeId, data) + .then(res => { + wx.hideLoading() + if (res.data && res.data != '') { + this.setData({ + msgType: 'success', + msgHint: '开票信息编辑成功!我们会以最快速度完成开票，还请耐心等待!', + msgShow: true + }) + setTimeout(() => { + _self.backPageRefresh() + }, 1800); + } else { + this.setData({ + msgType: 'error', + msgHint: '发票信息编辑失败,请稍后重试', + msgShow: true + }) + } + }) + .catch(err => { + wx.hideLoading() + this.setData({ + msgType: 'error', + msgHint: err.msg ? err.msg : '发票信息编辑失败,请稍后重试', + msgShow: true + }) + }) + } + }, + backPageRefresh() { + const _self = this + let pages = getCurrentPages(); + let beforePage = pages[pages.length - 2]; + beforePage.doRefreshList() + wx.navigateBack() } - }) \ No newline at end of file diff --git a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml index 235593d..714910c 100644 --- a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml +++ b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml @@ -19,7 +19,7 @@ - {{item.dataName}} + {{item.dataName}} @@ -29,7 +29,7 @@ - {{item.dataName}} + {{item.dataName}} @@ -39,7 +39,7 @@ - {{item.dataName}} + {{item.dataName}} @@ -55,11 +55,15 @@ 开票备注 - + + + + 失败原因 + {{editBean.invoiceFinalRecord}} - 提交 + 提交 diff --git a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss index 7923a50..79889d8 100644 --- a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss +++ b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss @@ -1,9 +1,4 @@ -/* pages/mine/mineAccount/makeInvoice/makeInvoice.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} + .invoice-info-title { font-size: 36rpx; diff --git a/pages/mine/mineAccount/mineContact/mineContact.wxss b/pages/mine/mineAccount/mineContact/mineContact.wxss index 26c38a0..57b0719 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.wxss +++ b/pages/mine/mineAccount/mineContact/mineContact.wxss @@ -1,11 +1,3 @@ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} - - - .ic-user { background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzOTg4MzkwNjkwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM0MDkiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMiAxMDI0QzIyOS4yMDUzMzMgMTAyNCAwIDc5NC43OTQ2NjcgMCA1MTJTMjI5LjIwNTMzMyAwIDUxMiAwczUxMiAyMjkuMjA1MzMzIDUxMiA1MTItMjI5LjIwNTMzMyA1MTItNTEyIDUxMnogbTAtNDk2LjQ2OTMzM2ExNzAuNjY2NjY3IDE3MC42NjY2NjcgMCAxIDAgMC0zNDEuMzMzMzM0IDE3MC42NjY2NjcgMTcwLjY2NjY2NyAwIDAgMCAwIDM0MS4zMzMzMzR6IG0yNjMuNzY1MzMzIDI2My43MjI2NjZhMjYzLjc2NTMzMyAyNjMuNzY1MzMzIDAgMSAwLTUyNy41MzA2NjYgMGg1MjcuNTMwNjY2eiIgcC1pZD0iMzQxMCIgZmlsbD0iIzEyOTZkYiI+PC9wYXRoPjwvc3ZnPg=='); background-size: cover; diff --git a/pages/mine/mineAccount/mineCoupons/mineCoupons.wxss b/pages/mine/mineAccount/mineCoupons/mineCoupons.wxss index 6f85d89..53966f5 100644 --- a/pages/mine/mineAccount/mineCoupons/mineCoupons.wxss +++ b/pages/mine/mineAccount/mineCoupons/mineCoupons.wxss @@ -1,9 +1,3 @@ -/* pages/mine/mineAccount/mineCoupons/mineCoupons.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} .list-title-btns { position: fixed; diff --git a/pages/mine/mineAccount/mineInfo/mineInfo.wxss b/pages/mine/mineAccount/mineInfo/mineInfo.wxss index 48042f3..0b6e594 100644 --- a/pages/mine/mineAccount/mineInfo/mineInfo.wxss +++ b/pages/mine/mineAccount/mineInfo/mineInfo.wxss @@ -1,9 +1,4 @@ -/* pages/mine/mineAccount/mineInfo/mineInfo.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} + .info-container { height: 100vh; diff --git a/pages/mine/mineAccount/mineInvoice/mineInvoice.js b/pages/mine/mineAccount/mineInvoice/mineInvoice.js index b5121fc..48a7182 100644 --- a/pages/mine/mineAccount/mineInvoice/mineInvoice.js +++ b/pages/mine/mineAccount/mineInvoice/mineInvoice.js @@ -122,5 +122,67 @@ Page({ wx.navigateTo({ url: '/pages/mine/mineAccount/invoiceOrder/invoiceOrder', }) + }, + //取消开票 + cancelRecord(e) { + const item = e.currentTarget.dataset.value + const _self = this + wx.showModal({ + title: '警告', + content: '请问您是否真的想要取消此次开票操作?', + complete: (res) => { + if (res.confirm) { + _self.doCancelInvoiceRecord(item) + } + } + }) + }, + //取消开票 + doCancelInvoiceRecord(item) { + const _self = this + wx.showLoading({ + title: '取消中...', + }) + InvoiceApi.doCancelInvoiceRecord(item.invoiceRechargeId) + .then(res => { + wx.hideLoading() + console.log(res) + _self.setData({ + msgHint: '取消成功', + msgType: 'success', + msgShow: true + }) + _self.doRefreshList() + }) + .catch(err => { + wx.hideLoading() + _self.setData({ + msgHint: err.msg ? err.msg : '取消出错了,请稍后重试', + msgShow: true, + msgType: 'error' + }) + }) + }, + //去修改 + doUpdate(e) { + const item = e.currentTarget.dataset.value + const params = JSON.stringify(item) + const _self = this + wx.navigateTo({ + url: '/pages/mine/mineAccount/makeInvoice/makeInvoice?bean=' + params, + events: { + refreshData: function (data) { + console.log('刷新') + _self.doRefreshList() + } + } + }) + }, + openDetail(e) { + const item = e.currentTarget.dataset.value + const params = JSON.stringify(item) + wx.navigateTo({ + url: '/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail?bean=' + params, + }) } }) \ No newline at end of file diff --git a/pages/mine/mineAccount/mineInvoice/mineInvoice.wxml b/pages/mine/mineAccount/mineInvoice/mineInvoice.wxml index 2524e2d..c292d68 100644 --- a/pages/mine/mineAccount/mineInvoice/mineInvoice.wxml +++ b/pages/mine/mineAccount/mineInvoice/mineInvoice.wxml @@ -14,16 +14,16 @@ {{tools.invoiceStatus(item.invoiceStatus)}} - {{item.invoiceName}} + {{item.invoiceName}} - 修改 - 取消 + 修改 + 取消 - 纳税人识别号: {{item.invoiceNumber}} - - + 纳税人识别号: {{item.invoiceNumber}} + {{item.gmtCreate}} + diff --git a/pages/mine/mineAccount/mineInvoice/mineInvoice.wxss b/pages/mine/mineAccount/mineInvoice/mineInvoice.wxss index 9dedbea..f82e548 100644 --- a/pages/mine/mineAccount/mineInvoice/mineInvoice.wxss +++ b/pages/mine/mineAccount/mineInvoice/mineInvoice.wxss @@ -1,9 +1,3 @@ -/* pages/mine/mineAccount/mineInvoice/mineInvoice.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.wxss b/pages/mine/mineAccount/mineOrder/mineOrder.wxss index 9c765c1..a512f9f 100644 --- a/pages/mine/mineAccount/mineOrder/mineOrder.wxss +++ b/pages/mine/mineAccount/mineOrder/mineOrder.wxss @@ -1,8 +1,3 @@ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100vw 100vh; - background-repeat: no-repeat; -} .search-box { position: fixed; diff --git a/pages/mine/mineAccount/minePayRecord/minePayRecord.wxss b/pages/mine/mineAccount/minePayRecord/minePayRecord.wxss index 82789f7..031e526 100644 --- a/pages/mine/mineAccount/minePayRecord/minePayRecord.wxss +++ b/pages/mine/mineAccount/minePayRecord/minePayRecord.wxss @@ -1,8 +1,4 @@ -page { - background: linear-gradient(to bottom, #F5F5F5, #FFFFFF); - background-size: 100vw 100vh; - background-repeat: no-repeat; -} + .search-box { position: fixed; diff --git a/pages/treaty/rule/rule.wxss b/pages/treaty/rule/rule.wxss index 51b1725..f6bcada 100644 --- a/pages/treaty/rule/rule.wxss +++ b/pages/treaty/rule/rule.wxss @@ -1,9 +1,4 @@ -/* pages/treaty/privacy/privacy.wxss */ -page { - background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); - background-size: 100% 100vh; - background-repeat: no-repeat; -} + .content-box { display: flex; flex-direction: column; diff --git a/utils/comm.wxs b/utils/comm.wxs index bca8874..9975e39 100644 --- a/utils/comm.wxs +++ b/utils/comm.wxs @@ -55,16 +55,16 @@ var invoiceStatusColor = function (status) { var str = 'col-yellow' // -1:用户取消,0:开票失败,1:开票中,2:开票完成 switch (status) { - case -1: + case '-1': str = 'col-gray' break - case 0: + case '0': str = 'col-red' break - case 1: + case '1': str = 'col-yellow' break - case 2: + case '2': str = 'col-green' break @@ -75,19 +75,18 @@ var invoiceStatus = function (status) { var str = '待审核' // -1:用户取消,0:开票失败,1:开票中,2:开票完成 switch (status) { - case -1: + case '-1': str = '已取消' break - case 0: + case '0': str = '未通过' break - case 1: + case '1': str = '待审核' break - case 2: + case '2': str = '完成' break - } return str }