From 5938217538c65770544398c7c7bf78f2c9e8b2c2 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Wed, 30 Apr 2025 16:08:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=8F=98=E9=87=8F,=E5=8F=91=E7=A5=A8,=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9D=A1=E7=9B=AE=E6=94=B9=E4=B8=BA=E6=BB=91=E5=8A=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=A0=E9=99=A4,=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 44 +-------- app.wxss | 2 +- .../container-loading/container-loading.js | 12 ++- .../container-loading/container-loading.wxml | 6 +- main-app.js | 52 +++++++++++ pages/copyright/createBuy/createBuy.js | 4 +- pages/copyright/createBuy/createBuy.wxml | 43 ++++----- .../createProjectInfo/createProjectInfo.js | 13 ++- .../createProjectInfo/createProjectInfo.wxml | 18 ++-- .../createProjectInfo/createProjectInfo.wxss | 84 ++++++++---------- pages/copyright/payment/payment.js | 3 + pages/copyright/payment/payment.wxml | 4 +- pages/copyright/payment/payment.wxss | 54 ++++++----- pages/copyright/publicPay/publicPay.js | 3 +- pages/copyright/publicPay/publicPay.wxml | 4 +- pages/copyright/publicPay/publicPay.wxss | 43 ++++----- pages/mainPage/mainPage.js | 1 + pages/mainPage/mainPage.wxml | 32 +++---- pages/mainPage/mainPage.wxss | 2 +- .../mineAccount/invoiceInfo/invoiceInfo.js | 38 ++++++-- .../mineAccount/invoiceInfo/invoiceInfo.json | 3 +- .../mineAccount/invoiceInfo/invoiceInfo.wxml | 34 ++++--- .../mineAccount/invoiceInfo/invoiceInfo.wxss | 46 +++++----- .../mineAccount/invoiceOrder/invoiceOrder.js | 13 ++- .../invoiceOrder/invoiceOrder.wxml | 22 ++--- .../invoiceOrder/invoiceOrder.wxss | 36 ++++---- .../invoiceRecordDetail.js | 31 ++++++- .../invoiceRecordDetail.wxml | 21 +++-- .../invoiceRecordDetail.wxss | 37 ++++++-- .../mineAccount/makeInvoice/makeInvoice.js | 10 +++ .../mineAccount/makeInvoice/makeInvoice.wxml | 12 +-- .../mineAccount/makeInvoice/makeInvoice.wxss | 28 +++--- .../mineAccount/mineContact/mineContact.js | 33 +++++-- .../mineAccount/mineContact/mineContact.json | 3 +- .../mineAccount/mineContact/mineContact.wxml | 31 ++++--- .../mineAccount/mineContact/mineContact.wxss | 31 ++++--- .../mineAccount/mineCoupons/mineCoupons.wxss | 39 ++++---- pages/mine/mineAccount/mineInfo/mineInfo.wxss | 6 +- .../mineAccount/mineInvoice/mineInvoice.js | 39 ++++++++ .../mineAccount/mineInvoice/mineInvoice.json | 3 +- .../mineAccount/mineInvoice/mineInvoice.wxml | 2 + .../mineAccount/mineInvoice/mineInvoice.wxss | 61 +++++++------ pages/mine/mineAccount/mineOrder/mineOrder.js | 1 + .../mine/mineAccount/mineOrder/mineOrder.wxss | 39 ++++---- .../minePayRecord/minePayRecord.js | 1 + .../minePayRecord/minePayRecord.wxss | 16 ++-- static/images/ic_delete_red.png | Bin 0 -> 996 bytes static/images/ic_edit_blue.png | Bin 0 -> 749 bytes static/style/common.wxss | 20 +++++ 49 files changed, 638 insertions(+), 442 deletions(-) create mode 100644 main-app.js create mode 100644 static/images/ic_delete_red.png create mode 100644 static/images/ic_edit_blue.png diff --git a/app.js b/app.js index fb9fe3d..1f91822 100644 --- a/app.js +++ b/app.js @@ -1,42 +1,2 @@ -// app.js -import { - imgAssets -} from './net/http' -App({ - globalData: { - imgAssetsUrl: imgAssets, - localAssets: "/static/images" - }, - onLaunch() { - //自定义字体 - // wx.loadFontFace({ - // family: 'PingFang-regular', - // global: true, - // source: 'https://www.aimzhu.com/miniapp-assets/PingFangSC-Regular.ttf', - // success(res) { - // console.log('字体加载成功') - // }, - // fail(err) { - // console.log('字体加载错误') - // } - // }) - // 全局事件对象 - // this.eventBus = {} - // // 监听事件 - // this.on = function (eventName, callback) { - // if (!this.eventBus[eventName]) { - // this.eventBus[eventName] = [] - // } - // this.eventBus[eventName].push(callback) - // } - // // 触发事件 - // this.emit = function (eventName, data) { - // const callbacks = this.eventBus[eventName] - // if (callbacks) { - // callbacks.forEach(callback => { - // callback(data) - // }) - // } - // } - } -}) \ No newline at end of file +//app.js +import app from './main-app' \ No newline at end of file diff --git a/app.wxss b/app.wxss index b4fd5fc..1e24db7 100644 --- a/app.wxss +++ b/app.wxss @@ -55,7 +55,7 @@ .gray-star::after { content: '*'; - color: var(--text-color); + color: var(--text-gray-hint-color); margin-left: 6rpx; } diff --git a/components/container-loading/container-loading.js b/components/container-loading/container-loading.js index e3781cf..f6ad81e 100644 --- a/components/container-loading/container-loading.js +++ b/components/container-loading/container-loading.js @@ -27,9 +27,17 @@ Component({ }, data: { loadingVisible: 'loading', - height: 200 + height: 200, + localAssets: '' + }, + lifetimes: { + attached() { + const app = getApp() + this.setData({ + localAssets: app.globalData.localAssets + }) + } }, - /** * 组件的方法列表 */ diff --git a/components/container-loading/container-loading.wxml b/components/container-loading/container-loading.wxml index c2a3ccf..ad0e788 100644 --- a/components/container-loading/container-loading.wxml +++ b/components/container-loading/container-loading.wxml @@ -1,15 +1,15 @@ - + 加载失败,点击重试 - + 暂无数据,点击刷新 - + 点击去创建项目 diff --git a/main-app.js b/main-app.js new file mode 100644 index 0000000..50683d8 --- /dev/null +++ b/main-app.js @@ -0,0 +1,52 @@ +// app.js +import { + imgAssets +} from './net/http' +App({ + globalData: { + imgAssetsUrl: imgAssets, + localAssets: "/static/images", + slideBtns: [] + }, + onLaunch() { + this.globalData.slideBtns = [{ + text: '编辑', + src: this.globalData.localAssets + "/ic_edit_blue.png" // icon的路径 + }, + { + text: '删除', + src: this.globalData.localAssets + "/ic_delete_red.png" // icon的路径 + } + ] + //自定义字体 + // wx.loadFontFace({ + // family: 'PingFang-regular', + // global: true, + // source: 'https://www.aimzhu.com/miniapp-assets/PingFangSC-Regular.ttf', + // success(res) { + // console.log('字体加载成功') + // }, + // fail(err) { + // console.log('字体加载错误') + // } + // }) + // 全局事件对象 + // this.eventBus = {} + // // 监听事件 + // this.on = function (eventName, callback) { + // if (!this.eventBus[eventName]) { + // this.eventBus[eventName] = [] + // } + // this.eventBus[eventName].push(callback) + // } + // // 触发事件 + // this.emit = function (eventName, data) { + // const callbacks = this.eventBus[eventName] + // if (callbacks) { + // callbacks.forEach(callback => { + // callback(data) + // }) + // } + // } + } +}) \ No newline at end of file diff --git a/pages/copyright/createBuy/createBuy.js b/pages/copyright/createBuy/createBuy.js index 9dddfe7..e723261 100644 --- a/pages/copyright/createBuy/createBuy.js +++ b/pages/copyright/createBuy/createBuy.js @@ -1,11 +1,13 @@ import ProjectService from '../../../net/api/projectApi' - +const app = getApp() Page({ /** * 页面的初始数据 */ data: { + imgAssets: app.globalData.imgAssetsUrl, + localImgAssets:app.globalData.localAssets, urgent: 0, projTypes: [], //全托管,写材料 type= ALL type =MATERIAL allPrice: 0, diff --git a/pages/copyright/createBuy/createBuy.wxml b/pages/copyright/createBuy/createBuy.wxml index d42785c..0f4780e 100644 --- a/pages/copyright/createBuy/createBuy.wxml +++ b/pages/copyright/createBuy/createBuy.wxml @@ -1,10 +1,10 @@ - + - + @@ -23,37 +23,37 @@ 提供的服务 - + 包可运行软件开发与搭建 - + 包鉴别材料撰写 - + 包代办,包下证,包开发票提 - + 供可运行软件安装包 - + 提供可运行软件云服务900天 - + 提供可运行软件演示视频 - + 客服一对一服务 @@ -73,13 +73,6 @@ - @@ -97,37 +90,37 @@ 提供的服务 - + 通过平台自己搭建可运行软件 - + 平台自动撰写鉴别材料 - + 包补正材料撰写一直到下证 - + 两次补正不通过平台退款 - + 包开发票 - + 提供可运行软件云服务300天 - + 客服一对一服务 @@ -135,11 +128,11 @@ 使用流程 - + 按系统操作流程执行 - + 如需视频文件和安装包请在下证后购买下载 diff --git a/pages/copyright/createProjectInfo/createProjectInfo.js b/pages/copyright/createProjectInfo/createProjectInfo.js index 851493f..a29173d 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.js +++ b/pages/copyright/createProjectInfo/createProjectInfo.js @@ -6,9 +6,11 @@ const { isValidEmail, objIsEmpty } = require('../../../utils/validator') - +const app = getApp() Page({ data: { + imgAssets: app.globalData.imgAssetsUrl, + localAssets: app.globalData.localAssets, date: utils.formatDate(new Date()), completeDate: '', //开发完成时间 version: "V1.0", //系统版本 @@ -661,5 +663,14 @@ Page({ return false } return true + }, + closeDialog(e) { + this.setData({ + showLang: false, + showPackage: false, + showCoupons: false, + showCommendProject: false, + isShowContact: false + }) } }) \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxml b/pages/copyright/createProjectInfo/createProjectInfo.wxml index b7c3502..63d662e 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxml +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxml @@ -2,10 +2,10 @@ - + - + @@ -33,9 +33,9 @@ 系统语言 - + - {{selectLang}} + {{selectLang}} @@ -82,7 +82,7 @@ - + 创建联系人 @@ -107,7 +107,7 @@ - + 推荐系统全称 @@ -125,7 +125,7 @@ - + 优惠卷 @@ -159,7 +159,7 @@ - + 套餐包 @@ -192,7 +192,7 @@ - + 系统语言 diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxss b/pages/copyright/createProjectInfo/createProjectInfo.wxss index 8ad1fec..742645f 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxss +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxss @@ -1,5 +1,3 @@ - - .custom-checkbox { font-size: 14px; margin-left: 14px; @@ -7,8 +5,8 @@ .custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked { color: #fff !important; - background-color: #FFA900; - border: 1px solid #FFA900; + background-color: var(--primary-color); + border: 1px solid var(--primary-color); } .custom-wx-checkbox .wx-checkbox-input { @@ -21,7 +19,7 @@ height: 32rpx; background-color: transparent; position: relative; - border: 1rpx solid #FFA900; + border: 1rpx solid var(--primary-color); box-sizing: border-box; text-align: center; } @@ -45,10 +43,6 @@ padding: 15px; } -.create-title { - height: 80rpx; - background-color: blanchedalmond; -} .info-box { display: flex; @@ -63,7 +57,7 @@ .info-value { margin-top: 20rpx; - border: 1rpx solid #f2f2f2; + border: 1rpx solid var(--divider-color); font-size: 14px; line-height: 16px; background-color: white; @@ -74,7 +68,7 @@ .info-btn { align-self: flex-end; - background-color: #FFA900; + background-color: var(--primary-color); margin-top: 20rpx; padding: 5rpx 40rpx; color: white; @@ -87,7 +81,7 @@ } .section { - border: 1px solid #f4f4f4; + border: 1px solid var(--divider-color); border-radius: 5rpx; padding: 15rpx; margin-bottom: 15rpx; @@ -149,11 +143,11 @@ .value-hint { - color: #9A9A9A; + color: var(--text-gray-hint-color); } .v-select { - color: #000000; + color: var(--text-color); } @@ -165,7 +159,7 @@ .link { - color: #007AFF; + color: var(--blue-color); } .flex-1 { @@ -186,16 +180,16 @@ top: 100%; left: -20rpx; padding: 10rpx 20rpx; - border: 1px solid #f2f2f2; + border: 1px solid var(--divider-color); border-top: none; background-color: white; - box-shadow: 0rpx 0rpx 10rpx 10rpx #f2f2f2; + box-shadow: 0rpx 0rpx 10rpx 10rpx var(--divider-color); } .option { padding: 15rpx; cursor: pointer; - border-bottom: 1rpx solid #f2f2f2; + border-bottom: 1rpx solid var(--divider-color); } .option:hover { @@ -222,25 +216,25 @@ } .bottom-box .btn { - background-color: #37AD46; + background-color: var(--btn-green-color); color: white; text-align: center; height: 40px; width: 94vw; line-height: 40px; - border-radius: 20rpx; + border-radius: 10rpx; margin-bottom: 20px; } .bottom-box .money { - color: #532A00; + color: var(--text-brown-color); font-size: 20px; display: flex; flex-direction: row; } .price { - color: rgb(250, 0, 0); + color: var(--red-color); } .form-box { @@ -249,7 +243,7 @@ justify-content: center; align-items: flex-start; font-size: 14px; - background-color: #FFA900; + background-color: var(--primary-color); } .form-item { @@ -264,14 +258,14 @@ .form-item-title { flex: .3; font-size: 14px; - color: black; + color: var(--black-color); font-weight: 500; text-align: left; } .form-item-title:not(.no-after)::before { content: "*"; - color: red; + color: var(--red-color); font-size: 14px; margin-left: 1px; text-align: center; @@ -291,16 +285,16 @@ .project-item { font-size: 24rpx; - background-color: #ffaa0034; + background-color: var(--primary-color-light); text-align: center; - color: #FFA900; + color: var(--primary-color); text-align: center; margin: 10rpx; padding: 5rpx 20rpx; } .confirm-btn { - background-color: green; + background-color: var(--btn-green-color); color: white; font-size: 16px; height: 40px; @@ -338,8 +332,8 @@ display: flex; flex-direction: column; justify-content: space-between; - background: radial-gradient(circle at right top, transparent 16rpx, #ffaa0017 0) right top / 100% 50% no-repeat, - radial-gradient(circle at right bottom, transparent 16rpx, #ffaa0017 0) right bottom / 100% 50% no-repeat; + background: radial-gradient(circle at right top, transparent 16rpx, var(--bg-primary-shallow-color) 0) right top / 100% 50% no-repeat, + radial-gradient(circle at right bottom, transparent 16rpx, var(--bg-primary-shallow-color) 0) right bottom / 100% 50% no-repeat; } @@ -350,7 +344,7 @@ width: 8rpx; top: 0; left: -8rpx; - background: radial-gradient(circle at left center, transparent 8rpx, #ffaa0017 0) left center / 8rpx 20rpx; + background: radial-gradient(circle at left center, transparent 8rpx, var(--bg-primary-shallow-color) 0) left center / 8rpx 20rpx; } @@ -358,15 +352,15 @@ .r-tickets { flex: 1; position: relative; - background: radial-gradient(circle at left top, transparent 16rpx, #ffaa0017 0, #ffaa0017 100%) right top / 100% 50% no-repeat, - radial-gradient(circle at left bottom, transparent 16rpx, #ffaa0017 0, #ffaa0017 100%) right bottom / 100% 50% no-repeat; + background: radial-gradient(circle at left top, transparent 16rpx, var(--bg-primary-shallow-color) 0, var(--bg-primary-shallow-color) 100%) right top / 100% 50% no-repeat, + radial-gradient(circle at left bottom, transparent 16rpx, var(--bg-primary-shallow-color) 0, var(--bg-primary-shallow-color) 100%) right bottom / 100% 50% no-repeat; display: flex; flex-direction: row; justify-content: center; align-items: center; font-size: 14px; font-weight: 500; - color: #5D3900; + color: var(--text-brown-color); } .r-tickets::after { @@ -376,7 +370,7 @@ width: 8rpx; top: 0; right: -8rpx; - background: radial-gradient(circle at right center, transparent 8rpx, #ffaa0017 0) right center / 8rpx 20rpx; + background: radial-gradient(circle at right center, transparent 8rpx, var(--bg-primary-shallow-color) 0) right center / 8rpx 20rpx; } .r-tickets::before { @@ -400,20 +394,20 @@ justify-content: space-between; align-items: center; font-size: 14px; - color: #5D3900; + color: var(--text-brown-color); font-weight: 400; } .ticket-content { font-size: 18px; - color: #5D3900; + color: var(--text-brown-color); text-align: center; font-weight: bold; } .ticket-desc { font-size: 12px; - color: #5D3900; + color: var(--text-brown-color); margin-top: 10px; font-weight: 400; min-height: 12px; @@ -425,7 +419,7 @@ flex-direction: row; justify-content: flex-start; align-items: center; - background-color: #ffaa0017; + background-color: var(--bg-primary-shallow-color); border-radius: 10px; width: 85vw; padding: 10px 5px; @@ -453,12 +447,12 @@ .coupons-desc .title { font-size: 16px; - color: red; + color: var(--red-color); } .coupons-desc .dd { font-size: 12px; - color: red; + color: var(--red-color); } .counpons-check { @@ -470,7 +464,7 @@ .counpons-check .txt { font-size: 16px; - color: red; + color: var(--red-color); font-weight: 600; } @@ -488,7 +482,7 @@ /* 未选中状态 */ .custom-radio .wx-radio-input { - border-color: #FFA900; + border-color: var(--primary-color); /* 自定义未选中时的边框颜色 */ background-color: transparent; width: 32rpx; @@ -497,9 +491,9 @@ /* 选中状态 */ .custom-radio .wx-radio-input.wx-radio-input-checked { - border-color: #FFA900; + border-color: var(--primary-color); /* 自定义选中时的边框颜色 */ - background: linear-gradient(to right, #FFA900, #ffaa007e); + background: linear-gradient(to right, var(--primary-color), var(--primary-color-light)); /* 自定义选中时的背景颜色 */ } diff --git a/pages/copyright/payment/payment.js b/pages/copyright/payment/payment.js index 77604d8..3a69009 100644 --- a/pages/copyright/payment/payment.js +++ b/pages/copyright/payment/payment.js @@ -1,11 +1,14 @@ // pages/copyright/payment/payment.js import PayService from '../../../net/api/payApi'; +const app = getApp() Page({ /** * 页面的初始数据 */ data: { + imgAssets: app.globalData.imgAssetsUrl, + localAssets: app.globalData.localAssets, paySumOptions: [100, 300, 500, 1000, 2000, 5000], currentTab: 0, //充值金额选项 payMoney: 100, //支付金额 diff --git a/pages/copyright/payment/payment.wxml b/pages/copyright/payment/payment.wxml index 2cb7832..0100094 100644 --- a/pages/copyright/payment/payment.wxml +++ b/pages/copyright/payment/payment.wxml @@ -1,10 +1,10 @@ - + - + diff --git a/pages/copyright/payment/payment.wxss b/pages/copyright/payment/payment.wxss index c1eaa37..3b68a6f 100644 --- a/pages/copyright/payment/payment.wxss +++ b/pages/copyright/payment/payment.wxss @@ -1,5 +1,3 @@ - - .input-money { font-size: 48rpx; font-weight: bold; @@ -20,7 +18,7 @@ height: 32rpx; width: 32rpx; border-radius: 50%; - border: 2rpx solid #e6c171; + border: 2rpx solid var(--primary-color); background: transparent; } @@ -33,7 +31,7 @@ text-align: center; font-size: 0rpx; color: transparent; - background: #e6c171; + background: var(--primary-color); transform: translate(-50%, -50%) scale(1); -webkit-transform: translate(-50%, -50%) scale(1); } @@ -45,7 +43,7 @@ flex-direction: column; padding: 30rpx; background-color: white; - border: 1rpx solid #F5F5F5; + border: 1rpx solid var(--divider-color); } .sum-input-box { @@ -54,12 +52,12 @@ .sum-input-box .title { font-size: 12px; - color: black; + color: var(--text-color); } .sum-input-box input { font-size: 42rpx; - color: black; + color: var(--text-color); padding: 20rpx 10rpx; flex: 1; } @@ -69,7 +67,7 @@ flex-direction: row; justify-content: flex-start; align-items: baseline; - border-bottom: 1rpx solid #dbdada; + border-bottom: 1rpx solid var(--divider-color); font-weight: bold; } @@ -107,7 +105,7 @@ .bag-select { flex: 1; text-align: center; - background-color: #FFA900; + background-color: var(--primary-color); color: white; padding: 20rpx; } @@ -116,15 +114,15 @@ flex: 1; text-align: center; background-color: #FFFFFF; - color: #FFA900; - border: 1rpx solid #FFA900; + color: var(--primary-color); + border: 1rpx solid var(--primary-color); padding: 20rpx; } .tab-select { font-size: 20rpx; color: black; - background-color: #FAE9D0; + background-color: var(--bg-primary-shallow-color); text-align: center; padding: 5rpx 30rpx; white-space: nowrap; @@ -144,9 +142,9 @@ .tab-normal { font-size: 20rpx; - color: #F4CC92; + color: var(--bg-primary-deep-color); background: #FFFFFF; - border: 1rpx solid #F4CC92; + border: 1rpx solid var(--bg-primary-deep-color); text-align: center; padding: 5rpx 30rpx; white-space: nowrap; @@ -169,19 +167,19 @@ } .green-bottom-btn { - background-color: #37AD46; + background-color: var(--btn-green-color); color: white; text-align: center; height: 42px; width: 90vw; line-height: 42px; - border-radius: 20rpx; + border-radius: 10rpx; margin-bottom: 20px; } .green-bottom-btn:active { - background-color: #7ef58e; + background-color: var(--btn-green-color-active); color: white; } @@ -196,15 +194,15 @@ .bag-item { display: flex; flex-direction: column; - border: 1rpx solid rgba(239, 239, 239, 1); + border: 1rpx solid var(--divider-color); padding: 20rpx; } .bag-item:nth-of-type(n+2) { border-top: none; - border-left: 1rpx solid rgba(239, 239, 239, 1); - border-right: 1rpx solid rgba(239, 239, 239, 1); - border-bottom: 1rpx solid rgba(239, 239, 239, 1); + border-left: 1rpx solid var(--divider-color); + border-right: 1rpx solid var(--divider-color); + border-bottom: 1rpx solid var(--divider-color); } .bag-item-title-box { @@ -217,25 +215,25 @@ .p-title { font-size: 14px; font-weight: 800; - color: black; + color: var(--text-color); } .bag-item-title-box .title { font-size: 40rpx; - color: black; + color: var(--text-color); font-weight: 500; } .bag-item-title-box .sum { font-size: 14px; - color: black; + color: var(--text-color); font-weight: 400; } .bag-item-title-box .sum::before { content: "¥"; font-size: 24rpx; - color: black; + color: var(--text-color); font-weight: 400; } @@ -249,15 +247,15 @@ .bag-item-desc-box .desc { font-size: 28rpx; - color: #363636; + color: var(--text-gray-hint-color); } .bag-item-desc-box .btn { padding: 1px 15px; color: white; border-radius: 47px; - background-color: rgba(255, 198, 125, 1); - color: rgba(255, 255, 255, 1); + background-color: var(--btn-primary-color); + color: var(--white-color); font-size: 14px; text-align: center; font-family: PingFangSC-regular; diff --git a/pages/copyright/publicPay/publicPay.js b/pages/copyright/publicPay/publicPay.js index 04af02f..cb60a2e 100644 --- a/pages/copyright/publicPay/publicPay.js +++ b/pages/copyright/publicPay/publicPay.js @@ -1,16 +1,17 @@ // pages/copyright/publicPay/publicPay.js import PayApi from '../../../net/api/payApi' import { - request, uploadImgUrl } from "../../../net/http"; const dateTimePicker = require('../../../utils/util'); const Cache = require('../../../utils/storage') +const app = getApp() Page({ /** * 页面的初始数据 */ data: { + imgAssets: app.globalData.imgAssetsUrl, incomeEnterprise: {}, showError: false, errorHint: '', diff --git a/pages/copyright/publicPay/publicPay.wxml b/pages/copyright/publicPay/publicPay.wxml index d20ee3e..295f65b 100644 --- a/pages/copyright/publicPay/publicPay.wxml +++ b/pages/copyright/publicPay/publicPay.wxml @@ -2,10 +2,10 @@ - + - + diff --git a/pages/copyright/publicPay/publicPay.wxss b/pages/copyright/publicPay/publicPay.wxss index acba96a..2173770 100644 --- a/pages/copyright/publicPay/publicPay.wxss +++ b/pages/copyright/publicPay/publicPay.wxss @@ -1,11 +1,9 @@ - - .container-box { display: flex; flex-direction: column; justify-content: center; align-items: flex-start; - background-color: white; + background-color: var(--white-color); margin-top: 10px; border-radius: 5px; } @@ -17,7 +15,7 @@ .box-title { font-size: 16px; font-weight: bold; - color: black; + color: var(--text-color); padding: 10px 20px; } @@ -35,7 +33,7 @@ } .red { - color: red; + color: var(--red-color); } /* .item:nth-last-of-type(n+1){ @@ -44,7 +42,7 @@ .title { flex: 0.3; font-size: 14px; - color: black; + color: var(--black-color); } .content { @@ -54,31 +52,24 @@ .time-picker-box { flex: 1; - background-color: #FAFAFA; - border: 1px solid #F0F0F0; + background-color: var(--white-color); + border: 1px solid var(--divider-color); border-radius: 2rpx; padding: 3px 8px; text-align: left; font-size: 12px; - /* display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; - background-color: #FAFAFA; - border: 1px solid #F0F0F0; - padding: 5rpx 10rpx; */ } .weui-uploader__title { font-size: 14px; - color: black; + color: var(--black-color); font-weight: 800; padding-right: 10px; } .star::after { content: "*"; - color: red; + color: var(--red-color); margin-left: 3px; } @@ -125,12 +116,12 @@ .weui-uploader__input-box { background: white; - border: 1px solid #F0F0F0; + border: 1px solid var(--divider-color); } .time-picker { font-size: 14px; - color: rgb(68, 68, 68); + color: var(--black-color); font-weight: 400; } @@ -142,8 +133,8 @@ .input-box { flex: 1; - background-color: #FAFAFA; - border: 1px solid #F0F0F0; + background-color: var(--bg-gray-color); + border: 1px solid var(--divider-color); border-radius: 2rpx; padding: 3px 8px; text-align: left; @@ -176,7 +167,7 @@ width: 100vw; line-height: 100rpx; border-radius: 20rpx; - background-color: white; + background-color: var(--white-color); display: flex; flex-direction: column; justify-content: center; @@ -185,12 +176,12 @@ } .money { - color: #532A00; + color: var(--text-brown-color); font-size: 20px; } .price { - color: rgb(250, 0, 0); + color: var(--red-color); } @@ -200,7 +191,7 @@ line-height: 42px; margin-bottom: 20px; border-radius: 4px; - background-color: rgba(255, 169, 0, 1); + background-color: var(--btn-green-color); color: rgba(255, 255, 255, 1); font-size: 16px; text-align: center; @@ -209,6 +200,6 @@ .green-bottom-btn:active { - background-color: rgba(255, 169, 0, 0.3); + background-color: var(--btn-green-color-active); color: white; } \ No newline at end of file diff --git a/pages/mainPage/mainPage.js b/pages/mainPage/mainPage.js index 9dc3fd7..2922b98 100644 --- a/pages/mainPage/mainPage.js +++ b/pages/mainPage/mainPage.js @@ -11,6 +11,7 @@ Page({ data: { statusBarHeight: statusBarHeight, imgAssets: app.globalData.imgAssetsUrl, + localImgAssets:app.globalData.localAssets, recommendList: [{ id: '1', content: '生成真实系统 | 可下载安装包' diff --git a/pages/mainPage/mainPage.wxml b/pages/mainPage/mainPage.wxml index e5e2eeb..ade1aef 100644 --- a/pages/mainPage/mainPage.wxml +++ b/pages/mainPage/mainPage.wxml @@ -25,37 +25,37 @@ 提供的服务 - + 包可运行软件开发与搭建 - + 包鉴别材料撰写 - + 包代办,包下证,包开发票提 - + 供可运行软件安装包 - + 提供可运行软件云服务900天 - + 提供可运行软件演示视频 - + 客服一对一服务 @@ -92,37 +92,37 @@ 提供的服务 - + 通过平台自己搭建可运行软件 - + 平台自动撰写鉴别材料 - + 包补正材料撰写一直到下证 - + 两次补正不通过平台退款 - + 包开发票 - + 提供可运行软件云服务300天 - + 客服一对一服务 @@ -130,11 +130,11 @@ 使用流程 - + 按系统操作流程执行 - + 如需视频文件和安装包请在下证后购买下载 diff --git a/pages/mainPage/mainPage.wxss b/pages/mainPage/mainPage.wxss index 3e3b050..e9fd136 100644 --- a/pages/mainPage/mainPage.wxss +++ b/pages/mainPage/mainPage.wxss @@ -297,7 +297,7 @@ width: 83vw; text-align: center; margin-top: 30rpx; - box-shadow: 0rpx 0rpx 10rpx 0rpx rgb(233, 233, 233); + box-shadow: 0rpx 0rpx 10rpx 0rpx var(--divider-color); } .main-btn:active { diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.js b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.js index 9fec4f1..06ed6db 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.js +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.js @@ -3,12 +3,15 @@ import InvoiceApi from '../../../../net/api/invoiceApi' import { isValidPhone } from '../../../../utils/validator' +const app = getApp() Page({ /** * 页面的初始数据 */ data: { + imgAssets: app.globalData.imgAssetsUrl, + localAssets: app.globalData.localAssets, keywords: '', pageData: { page: 1, @@ -34,6 +37,7 @@ Page({ btnTxt: '提交', invoiceInfoList: [], //开票信息列表 tempItem: null, + slideButtons: app.globalData.slideBtns }, /** @@ -53,6 +57,11 @@ Page({ }) this.doRefreshList() }, + closeDialog(e){ + this.setData({ + createDialog:false + }) + }, inputKeywords(e) { this.setData({ keywords: e.detail.value @@ -164,9 +173,8 @@ Page({ }) }, //显示编辑 - showEditDialog(e) { + showEditDialog(item) { const _self = this - const item = e.currentTarget.dataset.value _self.setData({ tempItem: item, companyName: item.invoiceName, @@ -180,20 +188,19 @@ Page({ }) }, //删除 - showDelDialog(e) { + showDelDialog(item) { wx.showModal({ title: '警告', content: '您确定要删除该开票信息吗?', complete: (res) => { if (res.confirm) { - this.doDeleteInvoiceInfo(e) + this.doDeleteInvoiceInfo(item) } } }) }, //删除开票信息 - doDeleteInvoiceInfo(e) { - const item = e.currentTarget.dataset.value + doDeleteInvoiceInfo(item) { const _self = this wx.showLoading({ title: '删除中...', @@ -333,5 +340,24 @@ Page({ } } return true + }, + + show() { + console.log('show') + }, + hide() { + console.log('hide') + }, + slideButtonTap(e) { + console.log(e) + const item = e.currentTarget.dataset.value + const btn = e.detail.index + if (btn == 0) { + //编辑 + this.showEditDialog(item) + } else { + //删除 + this.showDelDialog(item) + } } }) \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.json b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.json index 67284f6..9578b29 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.json +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.json @@ -3,6 +3,7 @@ "mp-half-screen-dialog": "weui-miniprogram/half-screen-dialog/half-screen-dialog", "mp-loading": "weui-miniprogram/loading/loading", "container-loading": "/components/container-loading/container-loading", - "mp-toptips": "weui-miniprogram/toptips/toptips" + "mp-toptips": "weui-miniprogram/toptips/toptips", + "mp-slideview": "weui-miniprogram/slideview/slideview" } } \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml index fa8fe27..6f09145 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml @@ -7,28 +7,26 @@ 新建 - - + + - - - - - {{item.invoiceName}} + + + + + + {{item.invoiceName}} + - - 编辑 - 删除 + 纳税识别号:{{item.invoiceNumber}} + 企业电话:{{item.invoiceOrgtel}} + + + {{item.invoiceOrgaddress}} - 纳税识别号:{{item.invoiceNumber}} - 企业电话:{{item.invoiceOrgtel}} - - - {{item.invoiceOrgaddress}} - - + @@ -38,7 +36,7 @@ - + {{title}} diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss index 0647634..39c004b 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss @@ -24,7 +24,7 @@ position: relative; align-self: center; border-radius: 5px; - background-color: rgba(255, 255, 255, 1); + background-color: var(--white-color); font-family: -regular; margin: 10px 15px; padding: 5px; @@ -37,7 +37,7 @@ .search-input { box-sizing: border-box; - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: center; flex: 1; @@ -58,7 +58,7 @@ .add-btn { border-radius: 4px; - background-color: rgba(50, 112, 255, 1); + background-color: var(--btn-green-color); color: rgba(255, 255, 255, 1); font-size: 14px; text-align: center; @@ -68,7 +68,7 @@ } .add-btn:active { - background-color: rgba(50, 112, 255, .7); + background-color: var(--btn-green-color-active); } .content-container { @@ -108,6 +108,10 @@ margin-top: 15px; } +#mp-slide { + margin-top: 20rpx; +} + .contact-desc { display: flex; flex-direction: row; @@ -125,7 +129,7 @@ .name { line-height: 32rpx; flex: 1; - color: rgba(0, 0, 0, 1); + color: var(--text-color); font-size: 28rpx; text-align: left; font-weight: bold; @@ -140,7 +144,7 @@ .service-desc { padding: 5rpx 15rpx 15rpx 30rpx; line-height: 26rpx; - color: rgba(122, 122, 122, 1); + color: var(--text-gray-desc-color); font-size: 26rpx; text-align: left; font-family: SourceHanSansSC-regular; @@ -152,28 +156,32 @@ .edit { line-height: 20px; border-radius: 4px; - background-color: rgba(122, 196, 131, 0.42); + background-color: var(--btn-blue-color); color: rgba(255, 255, 255, 1); - font-size: 28rpx; + font-size: 24rpx; text-align: center; font-family: PingFangSC-regular; - padding: 5rpx 10rpx; + padding: 5rpx 15rpx; +} + +.edit:active { + background-color: var(--btn-blue-color-active); } .del { line-height: 20px; border-radius: 4px; - background-color: rgba(247, 49, 42, 0.42); + background-color: var(--btn-red-color); color: rgba(255, 255, 255, 1); - font-size: 28rpx; + font-size: 24rpx; text-align: center; font-family: PingFangSC-regular; - padding: 5rpx 10rpx; + padding: 5rpx 15rpx; margin-left: 5px; } .del:active { - background-color: rgba(247, 49, 42, 0.7); + background-color: var(--btn-red-color-active); } .options-box { @@ -185,10 +193,6 @@ min-width: 170rpx; } -.edit:active { - background-color: rgba(122, 196, 131, 0.6); -} - .form-box { display: flex; @@ -211,14 +215,14 @@ .form-item-title { flex: .5; font-size: 14px; - color: black; + color: var(--text-color); font-weight: 500; text-align: left; } .form-item-title:not(.no-after)::before { content: "*"; - color: red; + color: var(--red-color); font-size: 14px; margin-left: 1px; text-align: center; @@ -230,7 +234,7 @@ } .confirm-btn { - background-color: #FFA900; + background-color: var(--btn-green-color); color: white; font-size: 16px; height: 70rpx; @@ -241,7 +245,7 @@ } .confirm-btn:active { - background-color: #ffaa0083; + background-color: var(--btn-green-color-active); color: white; } diff --git a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.js b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.js index 6bb388d..1a7559a 100644 --- a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.js +++ b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.js @@ -1,5 +1,6 @@ // pages/mine/mineAccount/invoiceOrder/invoiceOrder.js import InvoiceApi from '../../../../net/api/invoiceApi' +const app = getApp() Page({ /** @@ -25,7 +26,7 @@ Page({ money: 0, //开票金额 msgHint: '', msgType: 'error', - msgShow: false + msgShow: false, }, /** @@ -161,5 +162,15 @@ Page({ url: `/pages/mine/mineAccount/makeInvoice/makeInvoice?money=${this.data.money}&ids=${ids}`, }) } + }, + show(e) { + + }, + hide(e) { + + }, + slideButtonTap(e) { + const item = e.currentTarget.dataset.value + const btn = e.detail.index } }) \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxml b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxml index ba71629..3c304e8 100644 --- a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxml +++ b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxml @@ -20,19 +20,19 @@ - - - - - {{item.reconciliationTime}} - - - - 到账时间:{{item.rechargeFinalTime}} - + + + + + {{item.reconciliationTime}} + + + + 到账时间:{{item.rechargeFinalTime}} + + - diff --git a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss index c6fce7d..c6795bc 100644 --- a/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss +++ b/pages/mine/mineAccount/invoiceOrder/invoiceOrder.wxss @@ -1,5 +1,3 @@ - - .list-title-btns { position: fixed; top: 0; @@ -14,18 +12,17 @@ .btn-select { line-height: 20px; - color: rgba(233, 157, 66, 1); font-size: 16px; text-align: center; flex: 1; padding: 10px; - color: #2A9E75; + color: var(--btn-green-color); font-weight: bold; } .btn-normal { line-height: 20px; - color: rgba(16, 16, 16, 1); + color: var(--text-gray-desc-color); flex: 1; font-size: 16px; text-align: center; @@ -36,7 +33,7 @@ .border-select { width: 20px; height: 4px; - background-color: #2A9E75; + background-color: var(--btn-green-color); margin-top: 10px; border-radius: 2px; } @@ -53,7 +50,7 @@ height: 4px; margin-top: 10px; border-radius: 2px; - background-color: #F0F0F0; + background-color: var(--divider-color); } @@ -98,8 +95,9 @@ .order-item-time-box { display: flex; flex-direction: row; - font-size: 28rpx; + font-size: 32rpx; padding: 10rpx 10rpx 0rpx 10rpx; + color: var(--text-color); justify-content: space-between; } @@ -112,15 +110,15 @@ .success-time { font-size: 24rpx; padding-left: 5rpx; - color: #3a3a3a; + color: var(--text-gray-desc-color); } .icon-time::before { content: ''; background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODEyODg5NzI5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM2MTgwIiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik01MTMgMzMuMjJjLTI2NS4xIDAtNDgwIDIxNC45LTQ4MCA0ODBzMjE0LjkgNDgwIDQ4MCA0ODAgNDgwLTIxNC45IDQ4MC00ODAtMjE0LjktNDgwLTQ4MC00ODB6IG0yMDguOSA2NTIuNTljLTExLjA1IDE5LjEzLTM1LjUxIDI1LjY5LTU0LjY0IDE0LjY0TDQ3NC4xIDU4OC45M2MtMTMuMDYtNy41NC0yMC4yNi0yMS4zNC0xOS45OS0zNS40MiAwLTAuMTctMC4wMS0wLjM0LTAuMDEtMC41MVYzMjkuOTVjMC0yMi4wOSAxNy45MS00MCA0MC00MHM0MCAxNy45MSA0MCA0MHYyMDEuMjNsMTczLjE3IDk5Ljk4YzE5LjEyIDExLjA1IDI1LjY4IDM1LjUxIDE0LjYzIDU0LjY1eiIgZmlsbD0iI2RiZGJkYiIgcC1pZD0iMzYxODEiPjwvcGF0aD48L3N2Zz4='); background-size: cover; - width: 28rpx; - height: 28rpx; + width: 32rpx; + height: 32rpx; display: flex; flex-direction: row; margin-right: 10rpx; @@ -133,8 +131,8 @@ .custom-wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked { color: #fff !important; - background-color: #FFA900; - border: 1px solid #FFA900; + background-color: var(--primary-color); + border: 1px solid var(--primary-color); } .custom-wx-checkbox .wx-checkbox-input { @@ -148,7 +146,7 @@ border-radius: 16rpx; background-color: transparent; position: relative; - border: 1rpx solid #FFA900; + border: 1rpx solid var(--primary-color); box-sizing: border-box; text-align: center; } @@ -179,28 +177,28 @@ .confirm-btn { - background-color: #FFA900; + 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; + width: 90vw !important; } .confirm-btn:active { - background-color: #ffaa0083; + background-color: var(--btn-green-color-active); color: white; } .money { - color: #532A00; + color: var(--text-brown-color); font-size: 20px; display: flex; flex-direction: row; } .price { - color: rgb(255, 0, 0); + color: var(--red-color); } \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js index f2cf31d..67e0797 100644 --- a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js +++ b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js @@ -1,11 +1,17 @@ // pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.js +import { + previewUrl +} from '../../../../net/http' +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - detailBean: null + imgAssets: app.globalData.imgAssetsUrl, + imgPrefix: previewUrl, + detailBean: null, }, /** @@ -13,7 +19,10 @@ Page({ */ onLoad(options) { const beanStr = options.bean - const bean = JSON.parse(beanStr) + let bean = JSON.parse(beanStr) + if (bean != null && bean.invoiceFile != '') { + bean = this.parseImg(bean) + } this.setData({ detailBean: bean }) @@ -29,5 +38,21 @@ Page({ } }) }, - + //预览图片 + preImg(e) { + const _self = this + wx.previewImage({ + urls: _self.data.detailBean.imgFileList + }) + }, + parseImg(bean) { + const prefix = this.data.imgPrefix; + const splits = bean.invoiceFile.split(',') + bean.imgFileList= [] + splits.map(item => { + const img = prefix + item + bean.imgFileList.push(img) + }) + return bean + } }) \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxml b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxml index 0f039dd..5dcd757 100644 --- a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxml +++ b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxml @@ -1,10 +1,10 @@ - + - + @@ -72,18 +72,27 @@ 开票金额 - + 开票备注 {{detailBean.invoiceRecord}} + + 发票 + + + + + + + + - 失败原因 - {{detailBean.invoiceFinalRecord}} + 失败原因 + {{detailBean.invoiceFinalRecord}} - \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxss b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxss index 84c9973..8653d04 100644 --- a/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxss +++ b/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail.wxss @@ -21,23 +21,42 @@ } .col-yellow { - background-color: #FFA900; - color: #000000; + background-color: var(--primary-color); + color: var(--text-color); } +.invoice-img-box { + display: flex; + flex-direction: row; + justify-content: space-between; + flex-wrap: wrap; + margin-top: 15rpx; +} + +.invoice-img { + width: 24vw; + height: 130rpx; + border-radius: 5rpx; +} + +.invoice-img-item { + margin: 5rpx; +} + + .col-gray { - background-color: #ccc; - color: #666; + background-color: var(--bg-gray-color); + color: var(--text-gray-desc-color); } .col-green { - background-color: #90ee90; - color: #006400; + background-color: var(--bg-green-color); + color: var(--btn-green-color); } .col-red { - background-color: #f08080; - color: #8b0000; + background-color: var(--bg-red-color); + color: var(--red-color); } @@ -78,7 +97,7 @@ .invoice-remark { height: 120rpx; - border: 1rpx solid #dbdbdb; + border: 1rpx solid var(--divider-color); align-self: center; border-radius: 10rpx; width: 95%; diff --git a/pages/mine/mineAccount/makeInvoice/makeInvoice.js b/pages/mine/mineAccount/makeInvoice/makeInvoice.js index 446d973..e5a7258 100644 --- a/pages/mine/mineAccount/makeInvoice/makeInvoice.js +++ b/pages/mine/mineAccount/makeInvoice/makeInvoice.js @@ -1,11 +1,13 @@ // pages/mine/mineAccount/makeInvoice/makeInvoice.js import InvoiceApi from '../../../../net/api/invoiceApi' +const app = getApp() Page({ /** * 页面的初始数据 */ data: { + imgAssets: app.globalData.imgAssetsUrl, msgType: 'error', msgHint: '', msgShow: false, @@ -139,6 +141,9 @@ Page({ }) }, openCreateInvoiceInfo() { + this.setData({ + showInvoiceInfo: false + }) wx.navigateTo({ url: '/pages/mine/mineAccount/invoiceInfo/invoiceInfo', }) @@ -323,5 +328,10 @@ Page({ let beforePage = pages[pages.length - 2]; beforePage.doRefreshList() wx.navigateBack() + }, + closeDialog(e) { + this.setData({ + showInvoiceInfo: false + }) } }) \ No newline at end of file diff --git a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml index 714910c..6cf5963 100644 --- a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml +++ b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml @@ -1,10 +1,10 @@ - + - + 开票信息 @@ -50,7 +50,7 @@ 开票金额 - + @@ -58,8 +58,8 @@ - 失败原因 - {{editBean.invoiceFinalRecord}} + 失败原因 + {{editBean.invoiceFinalRecord}} @@ -67,7 +67,7 @@ - + 开票信息 diff --git a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss index 79889d8..dbf4b14 100644 --- a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss +++ b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss @@ -1,5 +1,3 @@ - - .invoice-info-title { font-size: 36rpx; font-weight: bold; @@ -29,7 +27,7 @@ .invoice-remark { height: 120rpx; - border: 1rpx solid #dbdbdb; + border: 1rpx solid var(--divider-color); align-self: center; border-radius: 10rpx; width: 95%; @@ -62,7 +60,7 @@ } .confirm-btn { - background-color: #FFA900; + background-color: var(--btn-green-color); color: white; font-size: 16px; height: 70rpx; @@ -74,7 +72,7 @@ } .confirm-btn:active { - background-color: #ffaa0083; + background-color: var(--btn-green-color-active); color: white; } @@ -121,11 +119,11 @@ } .normal-value { - color: #dbdbdb; + color: var(--text-gray-hint-color); } .select-value { - color: #000000; + color: var(--text-color); } .custom-radio-no-border .wx-radio-input { @@ -145,12 +143,12 @@ /* 选中状态下的内部圆圈 */ .custom-radio-no-border .wx-radio-input.wx-radio-input-checked::before { - color: #FFA900; + color: var(--primary-color); } /* 未选中状态 */ .custom-radio .wx-radio-input { - border-color: #757575; + border-color: var(--gray-color); background-color: transparent; width: 28rpx; height: 28rpx; @@ -159,13 +157,13 @@ /* 选中状态 */ .custom-radio .wx-radio-input.wx-radio-input-checked { - border-color: #FFA900; - background: linear-gradient(to right, #FFA900, #ffaa007e); + border-color: var(--primary-color); + background: linear-gradient(to right, var(--primary-color), var(--primary-color-light)); } /* 选中状态下的内部圆圈 */ .custom-radio .wx-radio-input.wx-radio-input-checked::before { - color: #FFFFFF; + color: var(--white-color); } .custom-radio:nth-of-type(n+2) { @@ -184,14 +182,14 @@ display: flex; flex-direction: column; text-align: left; - color: #FFA900; + color: var(--primary-color); } .invoice-sel-item-gray { display: flex; flex-direction: column; text-align: left; - color: #535353; + color: var(--text-gray-desc-color); } .invoice-sel-item-box { @@ -201,5 +199,5 @@ align-items: center; flex: 1; padding: 20rpx 10rpx; - border-bottom: 1rpx solid #F0F0F0; + border-bottom: 1rpx solid var(--divider-color); } \ No newline at end of file diff --git a/pages/mine/mineAccount/mineContact/mineContact.js b/pages/mine/mineAccount/mineContact/mineContact.js index 41e3d7a..e6f4d31 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.js +++ b/pages/mine/mineAccount/mineContact/mineContact.js @@ -4,12 +4,14 @@ const { isValidPhone, isValidEmail } = require('../../../../utils/validator') +const app = getApp() Page({ /** * 页面的初始数据 */ data: { + slideBtns: app.globalData.slideBtns, contactList: [], //联系人列表 pageData: { page: 1, @@ -94,9 +96,8 @@ Page({ }) }, //显示编辑弹窗 - showEditDialog(e) { + showEditDialog(item) { const _self = this - const item = e.currentTarget.dataset.value _self.setData({ title: '编辑', showCreateContact: true, @@ -126,16 +127,12 @@ Page({ console.log(err) }) }, - showDelDialog(e) { + showDelDialog(item) { const _self = this - const item = e.currentTarget.dataset.value wx.showModal({ title: '警告', content: '一旦删除，该联系人信息将无法恢复，你仍要删除吗？', complete: (res) => { - if (res.cancel) { - - } if (res.confirm) { _self.doDelContact(item.projContactId) } @@ -356,5 +353,27 @@ Page({ doSearchKeyWord() { const _self = this _self.doRefreshList() + }, + hide(e) { + + }, + show(e) { + + }, + //滑动条目 + slideButtonTap(e) { + const item = e.currentTarget.dataset.value + const index = e.detail.index + console.log(index) + if (index == 0) { + this.showEditDialog(item) + } else { + this.showDelDialog(item) + } + }, + closeDialog(e) { + this.setData({ + showCreateContact: false + }) } }) \ No newline at end of file diff --git a/pages/mine/mineAccount/mineContact/mineContact.json b/pages/mine/mineAccount/mineContact/mineContact.json index 67284f6..9578b29 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.json +++ b/pages/mine/mineAccount/mineContact/mineContact.json @@ -3,6 +3,7 @@ "mp-half-screen-dialog": "weui-miniprogram/half-screen-dialog/half-screen-dialog", "mp-loading": "weui-miniprogram/loading/loading", "container-loading": "/components/container-loading/container-loading", - "mp-toptips": "weui-miniprogram/toptips/toptips" + "mp-toptips": "weui-miniprogram/toptips/toptips", + "mp-slideview": "weui-miniprogram/slideview/slideview" } } \ No newline at end of file diff --git a/pages/mine/mineAccount/mineContact/mineContact.wxml b/pages/mine/mineAccount/mineContact/mineContact.wxml index 68c9120..ed70936 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.wxml +++ b/pages/mine/mineAccount/mineContact/mineContact.wxml @@ -11,21 +11,24 @@ - - - - - {{item.name}} - - {{item.phone}} - - 编辑 - 删除 + + + + + + + {{item.name}} + + {{item.phone}} + + {{item.company}} + 专属客服 : {{item.csaNo}} - {{item.company}} - 专属客服 : {{item.csaNo}} - + @@ -35,7 +38,7 @@ - + {{title}} diff --git a/pages/mine/mineAccount/mineContact/mineContact.wxss b/pages/mine/mineAccount/mineContact/mineContact.wxss index 57b0719..3d76eec 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.wxss +++ b/pages/mine/mineAccount/mineContact/mineContact.wxss @@ -21,7 +21,7 @@ position: relative; align-self: center; border-radius: 5px; - background-color: rgba(255, 255, 255, 1); + background-color: var(--white-color); font-family: -regular; margin: 10px 15px; padding: 5px; @@ -34,7 +34,7 @@ .search-input { box-sizing: border-box; - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: center; flex: 1; @@ -55,7 +55,7 @@ .add-btn { border-radius: 4px; - background-color: rgba(50, 112, 255, 1); + background-color: var(--btn-green-color); color: rgba(255, 255, 255, 1); font-size: 14px; text-align: center; @@ -65,7 +65,7 @@ } .add-btn:active { - background-color: rgba(50, 112, 255, .7); + background-color: var(--btn-green-color-active); } .content-container { @@ -110,7 +110,7 @@ .name { line-height: 23rpx; - color: rgba(0, 0, 0, 1); + color: var(--text-color); font-size: 32rpx; text-align: left; font-weight: bold; @@ -169,9 +169,7 @@ display: flex; flex-direction: column; justify-content: center; - align-items: flex-start; font-size: 14px; - width: 100vw; } .form-item { @@ -179,22 +177,21 @@ flex-direction: row; justify-content: flex-start; align-items: center; - width: 80vw; padding: 10px; } .form-item-title { flex: .3; - font-size: 14px; - color: black; + font-size: 28rpx; + color: var(--text-color); font-weight: 500; text-align: left; } .form-item-title:not(.no-after)::before { content: "*"; - color: red; - font-size: 14px; + color: var(--red-color); + font-size: 28rpx; margin-left: 1px; text-align: center; } @@ -202,16 +199,22 @@ .form-item-content { flex: 1; text-align: right; + font-size: 28rpx; } .confirm-btn { - background-color: green; + background-color: var(--btn-green-color); color: white; font-size: 16px; height: 40px; border-radius: 5px; text-align: center; - width: 85vw !important; + width: 100% !important; + /* width: 85vw !important; */ +} + +.confirm-btn:active { + background-color: var(--btn-green-color-active); } .weui-half-screen-dialog__ft { diff --git a/pages/mine/mineAccount/mineCoupons/mineCoupons.wxss b/pages/mine/mineAccount/mineCoupons/mineCoupons.wxss index 53966f5..38d3fac 100644 --- a/pages/mine/mineAccount/mineCoupons/mineCoupons.wxss +++ b/pages/mine/mineAccount/mineCoupons/mineCoupons.wxss @@ -1,4 +1,3 @@ - .list-title-btns { position: fixed; top: 0; @@ -13,18 +12,18 @@ .btn-select { line-height: 20px; - color: rgba(233, 157, 66, 1); + color: var(--btn-primary-color); font-size: 16px; text-align: center; flex: 1; padding: 10px; - color: #2A9E75; + color: var(--btn-green-color); font-weight: bold; } .btn-normal { line-height: 20px; - color: rgba(16, 16, 16, 1); + color: var(--text-color); flex: 1; font-size: 16px; text-align: center; @@ -35,7 +34,7 @@ .border-select { width: 20px; height: 4px; - background-color: #2A9E75; + background-color: var(--btn-green-color); margin-top: 10px; border-radius: 2px; } @@ -52,7 +51,7 @@ height: 4px; margin-top: 10px; border-radius: 2px; - background-color: #F0F0F0; + background-color: var(--divider-color); } .coupons-list-box { @@ -71,7 +70,7 @@ background-color: white; flex-direction: row; padding: 20px 0px; - box-shadow: 0px 0px 1px 1px #F0F0F0; + box-shadow: 0px 0px 1px 1px var(--divider-color); } .tickets:nth-of-type(n+2) { @@ -79,32 +78,32 @@ } .tickets-yellow { - border-left: 5px solid #FFA900; + border-left: 5px solid var(--primary-color); } .tickets-gray { - border-left: 5px solid #A9A9A9; + border-left: 5px solid var(--gray-color); } .tickets-green { - border-left: 5px solid #2A9E75; + border-left: 5px solid var(--bg-green-color); } .font-yellow { - color: #FFA900 + color: var(--primary-color) } .font-gray { - color: #A9A9A9; + color: var(--gray-color); } .font-green { - color: #2A9E75; + color: var(--green-color-light); } .v-divide { height: auto; - border-right: 1.5px dashed rgba(221, 221, 221, 1); + border-right: 1.5px dashed var(--divider-color); } .l-tickets-box { @@ -124,7 +123,7 @@ } .use-link { - color: #0a86fa; + color: var(--blue-color); text-align: center; font-size: 12px; } @@ -152,7 +151,7 @@ .r-title { line-height: 25px; - color: #313131; + color: var(--text-color); font-size: 14px; font-weight: bold; text-align: center; @@ -161,7 +160,7 @@ .r-time { line-height: 17px; - color: rgba(118, 118, 118, 1); + color: var(--text-gray-desc-color); font-size: 12px; text-align: left; font-family: PingFangSC-regular; @@ -179,13 +178,13 @@ justify-content: space-between; align-items: center; font-size: 14px; - color: #5D3900; + color: var(--text-brown-color); font-weight: 400; } .ticket-content { font-size: 18px; - color: #5D3900; + color: var(--text-brown-color); text-align: center; margin-top: 5px; font-weight: 800; @@ -193,7 +192,7 @@ .ticket-desc { font-size: 12px; - color: #5D3900; + color: var(--text-brown-color); margin-top: 10px; font-weight: 400; } diff --git a/pages/mine/mineAccount/mineInfo/mineInfo.wxss b/pages/mine/mineAccount/mineInfo/mineInfo.wxss index 0b6e594..eb90996 100644 --- a/pages/mine/mineAccount/mineInfo/mineInfo.wxss +++ b/pages/mine/mineAccount/mineInfo/mineInfo.wxss @@ -1,5 +1,3 @@ - - .info-container { height: 100vh; background-color: white; @@ -41,7 +39,7 @@ line-height: 42px; margin-bottom: 20px; border-radius: 4px; - background-color: rgba(255, 169, 0, 1); + background-color: var(--btn-green-color); color: rgba(255, 255, 255, 1); font-size: 16px; text-align: center; @@ -50,6 +48,6 @@ .green-bottom-btn:active { - background-color: rgba(255, 169, 0, 0.3); + background-color: var(--btn-green-color-active); color: white; } \ No newline at end of file diff --git a/pages/mine/mineAccount/mineInvoice/mineInvoice.js b/pages/mine/mineAccount/mineInvoice/mineInvoice.js index 48a7182..232f388 100644 --- a/pages/mine/mineAccount/mineInvoice/mineInvoice.js +++ b/pages/mine/mineAccount/mineInvoice/mineInvoice.js @@ -1,5 +1,7 @@ // pages/mine/mineAccount/mineInvoice/mineInvoice.js +// 发票管理首页 import InvoiceApi from '../../../../net/api/invoiceApi' +const app = getApp() Page({ /** @@ -20,6 +22,10 @@ Page({ isLoadMore: false, hasMore: true, recordList: [], //开票记录 + slideBtns: [{ + text: '删除', + src: app.globalData.localAssets + "/ic_delete_red.png" // icon的路径 + }] }, /** @@ -184,5 +190,38 @@ Page({ wx.navigateTo({ url: '/pages/mine/mineAccount/invoiceRecordDetail/invoiceRecordDetail?bean=' + params, }) + }, + slideButtonTap(e) { + const item = e.currentTarget.dataset.value + const btn = e.detail.index + console.log(item) + if (btn == 0) { + //删除,先判断状态 用户取消-1,开票失败:0,开票中:1,开票完成:2 + if (item.invoiceStatus != '1') { + this.showDelDialog(item) + } else { + this.setData({ + msgHint: '当前发票处于开具流程中，暂不支持删除', + msgType: 'error', + msgShow: true + }) + } + } + }, + showDelDialog(item) { + const _self = this + wx.showModal({ + title: '警告', + content: '该开票记录删除后不可恢复，是否确认执行删除操作？请谨慎抉择', + complete: (res) => { + if (res.confirm) { + _self.doDelRecord(item) + } + } + }) + }, + //删除记录 + doDelRecord(item) { + } }) \ No newline at end of file diff --git a/pages/mine/mineAccount/mineInvoice/mineInvoice.json b/pages/mine/mineAccount/mineInvoice/mineInvoice.json index 67284f6..9578b29 100644 --- a/pages/mine/mineAccount/mineInvoice/mineInvoice.json +++ b/pages/mine/mineAccount/mineInvoice/mineInvoice.json @@ -3,6 +3,7 @@ "mp-half-screen-dialog": "weui-miniprogram/half-screen-dialog/half-screen-dialog", "mp-loading": "weui-miniprogram/loading/loading", "container-loading": "/components/container-loading/container-loading", - "mp-toptips": "weui-miniprogram/toptips/toptips" + "mp-toptips": "weui-miniprogram/toptips/toptips", + "mp-slideview": "weui-miniprogram/slideview/slideview" } } \ No newline at end of file diff --git a/pages/mine/mineAccount/mineInvoice/mineInvoice.wxml b/pages/mine/mineAccount/mineInvoice/mineInvoice.wxml index c292d68..93c4d8f 100644 --- a/pages/mine/mineAccount/mineInvoice/mineInvoice.wxml +++ b/pages/mine/mineAccount/mineInvoice/mineInvoice.wxml @@ -11,6 +11,7 @@ + {{tools.invoiceStatus(item.invoiceStatus)}} @@ -26,6 +27,7 @@ + diff --git a/pages/mine/mineAccount/mineInvoice/mineInvoice.wxss b/pages/mine/mineAccount/mineInvoice/mineInvoice.wxss index f82e548..2783fdd 100644 --- a/pages/mine/mineAccount/mineInvoice/mineInvoice.wxss +++ b/pages/mine/mineAccount/mineInvoice/mineInvoice.wxss @@ -1,7 +1,3 @@ - - - - .ic-user { background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzOTg4MzkwNjkwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM0MDkiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMiAxMDI0QzIyOS4yMDUzMzMgMTAyNCAwIDc5NC43OTQ2NjcgMCA1MTJTMjI5LjIwNTMzMyAwIDUxMiAwczUxMiAyMjkuMjA1MzMzIDUxMiA1MTItMjI5LjIwNTMzMyA1MTItNTEyIDUxMnogbTAtNDk2LjQ2OTMzM2ExNzAuNjY2NjY3IDE3MC42NjY2NjcgMCAxIDAgMC0zNDEuMzMzMzM0IDE3MC42NjY2NjcgMTcwLjY2NjY2NyAwIDAgMCAwIDM0MS4zMzMzMzR6IG0yNjMuNzY1MzMzIDI2My43MjI2NjZhMjYzLjc2NTMzMyAyNjMuNzY1MzMzIDAgMSAwLTUyNy41MzA2NjYgMGg1MjcuNTMwNjY2eiIgcC1pZD0iMzQxMCIgZmlsbD0iIzEyOTZkYiI+PC9wYXRoPjwvc3ZnPg=='); background-size: cover; @@ -25,8 +21,7 @@ position: relative; align-self: center; border-radius: 5px; - background-color: rgba(255, 255, 255, 1); - font-family: -regular; + background-color: var(--white-color); margin: 10px 15px; padding: 5px; display: flex; @@ -38,7 +33,7 @@ .search-input { box-sizing: border-box; - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: center; flex: 1; @@ -59,7 +54,7 @@ .add-btn { border-radius: 4px; - background-color: rgba(50, 112, 255, 1); + background-color: var(--btn-green-color); color: rgba(255, 255, 255, 1); font-size: 14px; text-align: center; @@ -69,7 +64,7 @@ } .add-btn:active { - background-color: rgba(50, 112, 255, .7); + background-color: var(--btn-green-color-active); } .content-container { @@ -95,6 +90,10 @@ flex-direction: column; } +#mp-slide:nth-of-type(n+2) { + margin-top: 20rpx; +} + .order-item { display: flex; flex-direction: column; @@ -122,17 +121,17 @@ } .red { - background-color: rgba(247, 49, 42, 0.42); + background-color: var(--bg-red-color); color: rgba(255, 255, 255, 1); } .green { - background-color: rgba(122, 196, 131, 0.42); + background-color: var(--bg-green-color); color: rgba(255, 255, 255, 1); } .green:active { - background-color: rgba(122, 196, 131, 1); + background-color: var(--bg-green-deep-color); color: rgba(255, 255, 255, 1); } @@ -141,7 +140,7 @@ } .red:active { - background-color: rgba(247, 49, 42, 1); + background-color: var(--red-color); } .record-title-status { @@ -157,35 +156,35 @@ } .col-yellow { - background-color: #FFA900; - color: #000000; + background-color: var(--primary-color); + color: var(--text-color); } .col-gray { - background-color: #ccc; - color: #666; + background-color: var(--bg-gray-deep-color); + color: var(--text-gray-desc-color); } .col-green { - background-color: #90ee90; + background-color: var(--bg-green-color); color: #006400; } .col-red { - background-color: #f08080; + background-color: var(--bg-red-color); color: #8b0000; } .record-title-name { font-size: 32rpx; - color: #000000; + color: var(--text-color); font-weight: bold; flex: 1; } .record-number { font-size: 24rpx; - color: rgb(114, 114, 114); + color: var(--text-gray-desc-color); margin-left: 10rpx; } @@ -234,7 +233,7 @@ .name { line-height: 23rpx; - color: rgba(0, 0, 0, 1); + color: var(--text-color); font-size: 32rpx; text-align: left; font-weight: bold; @@ -244,7 +243,7 @@ .service-desc { padding: 0px 15px 15px 15px; line-height: 20px; - color: rgba(0, 0, 0, 1); + color: var(--text-color); font-size: 14px; text-align: left; font-family: SourceHanSansSC-regular; @@ -253,7 +252,7 @@ .edit { line-height: 20px; border-radius: 4px; - background-color: rgba(122, 196, 131, 0.42); + background-color: var(--btn-green-color); color: rgba(255, 255, 255, 1); font-size: 28rpx; text-align: center; @@ -264,7 +263,7 @@ .del { line-height: 20px; border-radius: 4px; - background-color: rgba(247, 49, 42, 0.42); + background-color: var(--btn-red-color); color: rgba(255, 255, 255, 1); font-size: 28rpx; text-align: center; @@ -274,7 +273,7 @@ } .del:active { - background-color: rgba(247, 49, 42, 0.7); + background-color: var(--btn-red-color-active); } .options-box { @@ -285,7 +284,7 @@ } .edit:active { - background-color: rgba(122, 196, 131, 0.6); + background-color: var(--btn-green-color-active); } @@ -310,14 +309,14 @@ .form-item-title { flex: .3; font-size: 14px; - color: black; + color: var(--text-color); font-weight: 500; text-align: left; } .form-item-title:not(.no-after)::before { content: "*"; - color: red; + color: var(--red-color); font-size: 14px; margin-left: 1px; text-align: center; @@ -329,7 +328,7 @@ } .confirm-btn { - background-color: #FFA900; + background-color: var(--btn-green-color); color: white; font-size: 16px; height: 70rpx; @@ -340,7 +339,7 @@ } .confirm-btn:active { - background-color: #ffaa0083; + background-color: var(--btn-green-color-active); color: white; } diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.js b/pages/mine/mineAccount/mineOrder/mineOrder.js index 9fd8379..f68dd2b 100644 --- a/pages/mine/mineAccount/mineOrder/mineOrder.js +++ b/pages/mine/mineAccount/mineOrder/mineOrder.js @@ -1,4 +1,5 @@ // pages/mine/mineAccount/mineOrder/mineOrder.js +// 我的订单 import UserApi from '../../../../net/api/userApi' Page({ diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.wxss b/pages/mine/mineAccount/mineOrder/mineOrder.wxss index a512f9f..f255609 100644 --- a/pages/mine/mineAccount/mineOrder/mineOrder.wxss +++ b/pages/mine/mineAccount/mineOrder/mineOrder.wxss @@ -1,4 +1,3 @@ - .search-box { position: fixed; top: 0; @@ -10,7 +9,7 @@ position: relative; align-self: center; border-radius: 5rpx; - background-color: rgba(255, 255, 255, 1); + background-color: var(--white-color); font-family: -regular; margin: 20rpx 30rpx; padding: 5px; @@ -23,7 +22,7 @@ .search-input { width: 100%; box-sizing: border-box; - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: center; } @@ -72,20 +71,20 @@ justify-content: space-between; align-items: center; padding: 8px 17px; - background-color: #7AC483; - border-top-left-radius: 5rpx; - border-top-right-radius: 5rpx; + background-color: var(--bg-primary-shallow-color); + border-top-left-radius: 10rpx; + border-top-right-radius: 10rpx; } .order-no { - color: rgba(39, 28, 0, 1); - font-size: 12px; + color: var(--text-color); + font-size: 24rpx; text-align: left; } .order-status { - color: rgba(39, 28, 0, 1); - font-size: 12px; + color: var(--text-color); + font-size: 24rpx; text-align: left; } @@ -93,7 +92,7 @@ display: flex; flex-direction: column; justify-content: center; - background-color: white; + background-color: var(--white-color); padding: 17px; border-bottom-left-radius: 5rpx; border-bottom-right-radius: 5rpx; @@ -101,7 +100,7 @@ .order-caption { line-height: 25px; - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 18px; text-align: left; font-family: SourceHanSansSC-medium; @@ -116,28 +115,28 @@ } .or-type { - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: left; font-family: PingFangSC-regular; } .or-count { - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: left; font-family: PingFangSC-regular; } .or-price { - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: left; font-family: PingFangSC-regular; } .or-total { - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 16px; text-align: left; font-family: PingFangSC-medium; @@ -151,19 +150,19 @@ } .order-remark-title { - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: left; font-family: PingFangSC-regular; } .order-remark-content { - color: rgba(16, 16, 16, 1); - font-size: 20rpx; + color: var(--text-color); + font-size: 22rpx; text-align: left; font-family: PingFangSC-light; border-radius: 5px; - background-color: rgba(239, 239, 239, 1); + background-color: var(--bg-gray-color); flex: 1; padding: 7px 10px; margin-left: 10px; diff --git a/pages/mine/mineAccount/minePayRecord/minePayRecord.js b/pages/mine/mineAccount/minePayRecord/minePayRecord.js index e8fa9be..d5c5d85 100644 --- a/pages/mine/mineAccount/minePayRecord/minePayRecord.js +++ b/pages/mine/mineAccount/minePayRecord/minePayRecord.js @@ -1,4 +1,5 @@ // pages/mine/mineAccount/minePayRecord/minePayRecord.js +// 资金流水 import UserApi from '../../../../net/api/userApi' Page({ diff --git a/pages/mine/mineAccount/minePayRecord/minePayRecord.wxss b/pages/mine/mineAccount/minePayRecord/minePayRecord.wxss index 031e526..6d79271 100644 --- a/pages/mine/mineAccount/minePayRecord/minePayRecord.wxss +++ b/pages/mine/mineAccount/minePayRecord/minePayRecord.wxss @@ -1,5 +1,3 @@ - - .search-box { position: fixed; top: 0; @@ -11,7 +9,7 @@ position: relative; align-self: center; border-radius: 5rpx; - background-color: rgba(255, 255, 255, 1); + background-color: var(--white-color); font-family: -regular; margin: 20rpx 30rpx; padding: 5px; @@ -24,7 +22,7 @@ .search-input { width: 100%; box-sizing: border-box; - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 14px; text-align: center; } @@ -66,7 +64,7 @@ .order-item:nth-of-type(n+1) { margin-top: 15px; padding-bottom: 34rpx; - border-bottom: 1rpx solid rgba(239, 239, 239, 1); + border-bottom: 1rpx solid var(--divider-color); } .record-title-box { @@ -95,7 +93,7 @@ } .select-time { - color: rgba(16, 16, 16, 1); + color: var(--text-color); font-size: 28rpx; text-align: left; font-family: PingFangSC-regular; @@ -110,7 +108,7 @@ } .value-hint { - color: #5e5e5e; + color: var(--text-gray-hint-color); font-size: 28rpx; } @@ -154,14 +152,14 @@ } .record-title-order-type { - color: rgba(0, 0, 0, 1); + color: var(--text-color); font-size: 28rpx; text-align: left; font-family: PingFangSC-regular; } .record-title-order-num { - color: rgba(206, 206, 206, 1); + color: var(--text-gray-hint-color); font-size: 24rpx; text-align: left; font-family: PingFangSC-light; diff --git a/static/images/ic_delete_red.png b/static/images/ic_delete_red.png new file mode 100644 index 0000000000000000000000000000000000000000..c184df0a2e9c5d99b746c883ae7aef25aba75787 GIT binary patch literal 996 zcmVPx&o=HSOR9HvFmraNqRS?Jj)wBJ^tPwqAqtTt7*~@nKEP;>@67isscnCs3A%Rs8 zG!hKvrsP8elS3eh$wlx3GzSrMJ%wC?ppXQ=jVH6?^cckH*Rv#`A%~EVe!bIWdff@* zWHRqFnE!l8rk3y$8siP)j)<0iCY1PegP1!psK-*<=x=g(jFOgo%!U19Je~ z;w;;<4HE|o(acv-lYvif*`?{3+j1aq1ZMyXsbv$8%rAgFo>WJA9{B&}fg`R1c+Zn+ zuZd$*O$I>Bue(w5fexU>pi{n#cXSIo$=Y3trfYMhnE`-ba%J+_K!Ca<&Jz%LQf=)P z_N(oF*EP4+(=!??u#9c-cS?A^8mbc-fZ|yTY2wOcQ(geUSkXnB0|Gtc%J`eXS5Ouw zm{InnTAdq!GxP*teV1DNc(s}QG#H>Hj)U;DC)HSP0Hxv<5T8sLE31*3)&aZ=!VXWW z2Xg}`+pmD>cv`S3)xU0pgL9xH-Xg-m-=rGa2DCfk#U$a)(%uc=Ft^n*e+HK|5wKqa z(T9|%5%(hg$qC>vfZgo}RB@sPrRxLR0DQ@9a{Zb3k6Zx$%d5$oU2wR!aoyI68%}W( zgTJ;?-Z0)ue$EBJ5hnqx@uV8n1C;D_O!Ny<+U&LBukryXe#_v8e5qFI0V=}d6!nxb zS&h_G9sqSmOapY;m+_NYfS@$|C}?&D%sag(`6v&7z!5DF&UvAFP76>Q!P3GKakY1- zTud3(9dV5qQ(mODYXLGr!x35iA91DHx7Y~OCLjt|Ma;~{{6154-=VbOh${@5@?^Yo zu>j}C?tj>BCzmY3+vA}+XcU3K5t0bsyP=xw1|XuQE7i;0YfN;udwR;QDjP;SbHlBF zLZV%67{6}>&~U^w6Cy8EMz3PMPP>2qUa>b=Dg9^>UK|hA=SBd5BYptj^lKc04(qqq zDBG_x)5k>gtQ*Fsi~#DT;u}PK)MC6a9;q)DdT2-AEDx`^!Ly$LSalx_t*wODFB$>V zD)y>EO4-34fC$Wg-W3GVS^!H2P1$#RHM{T#MpE0}ni4I)tHbAw3XH~}DEPx%r%6OXR9HvtmrqC(Q5?s=zqh-BhsYTZ5n33{tYBTEs35gtL?HABJcsU#C3Nhf z6?ExT>&^-VVHBbr?AD<_Dg+f2)uq(85ag+JW(`3!+xLszGDcZ<+ie!<&x3)PH}B2w zGr#x!{@x5>gBxvdeEi)2^~2NEOEXJ#Gq#ahFVlH5P?LPufUn_(a+YWAj5(H_SKBvv zn1y%<;0>6@J=^Hc_q@CSx|4bj@PcoG0$2f1%%liVpzJl}`f~S(6c`^p%RGUe(XhT{ z+Xsd^ovEsR8eUqw0z#W&Zke;Aul*qF07&*Mvuu6n2{{B{KLp)h7Mb(&9gVYEQnnN0 z_S)wL4xlBZMFh*U%-xzJ2XY`vbrXrL5Ol z8gygEwL%3g5Dn#z+NvvOU f+dn9T4F~uJak*(Qlu_-W00000NkvXXu0mjfIx