diff --git a/app.json b/app.json index 4f4ee26..6728c29 100644 --- a/app.json +++ b/app.json @@ -11,7 +11,9 @@ "pages/mine/mineAccount/mineCoupons/mineCoupons", "pages/copyright/publicPay/publicPay", "pages/copyright/common/payState", - "pages/readTxt/readTxt" + "pages/readTxt/readTxt", + "pages/mine/mineAccount/mineInfo/mineInfo", + "pages/mine/mineAccount/mineOrder/mineOrder" ], "window": { "navigationBarTextStyle": "black", diff --git a/net/api/projectApi.js b/net/api/projectApi.js index 2eaddad..ffa7e4e 100644 --- a/net/api/projectApi.js +++ b/net/api/projectApi.js @@ -13,6 +13,7 @@ const apiPath = { getCommendProjectName: '/api/proj/recommend/list-proj-name/ai', //推荐项目名称 createProject: '/api/proj/create-quick', //快速创建项目 reCreate: '/api/proj/generate/proj-id/${projId}', //重新生成 + proLangList: '/api/env/custom/list-active-lang', //项目语言 } class ProjectService { //项目列表 @@ -55,6 +56,10 @@ class ProjectService { const path = apiPath.reCreate.replace('${projId}', url) return request(path, "POST") } + //获取项目可选语言 + static doGetProLangList() { + return request(apiPath.proLangList, "GET") + } } export default ProjectService; \ No newline at end of file diff --git a/net/api/userApi.js b/net/api/userApi.js index 02e8c4a..1c9ad7b 100644 --- a/net/api/userApi.js +++ b/net/api/userApi.js @@ -11,6 +11,8 @@ const apiPath = { mineAccount: '/api/user-info/get-user-self', //获取我的账户余额 minePackageCount: '/api/proj/servicepkg/packageorder/count/self', //我的套餐包剩余 uploadImg: '/api/file/v2/upload-image', //上传图片 + userInfo: '/api/user-info/get-self', //获取我的个人信息 + mineOrder: '/api/order/listpage/self', //我的订单 } class UserService { static doLogin(data) { @@ -28,16 +30,26 @@ class UserService { static doCreateContact(data) { return request(apiPath.createContact, "POST", data) } - + //获取我的账户余额 static doGetMineAccount() { return request(apiPath.mineAccount, "GET") } + //获取我的套餐包 static doGetMinePackageCount() { return request(apiPath.minePackageCount, "GET") } + //上传图片 static doUploadImg(data) { return request(apiPath.uploadImg, "POST", data) } + //获取个人信息 + static doGetUserInfo() { + return request(apiPath.userInfo, "GET") + } + //获取我的订单 + static doGetMineOrder(data) { + return request(apiPath.mineOrder, "GET", data) + } } export default UserService; \ No newline at end of file diff --git a/pages/copyright/createProjectInfo/createProjectInfo.js b/pages/copyright/createProjectInfo/createProjectInfo.js index b77157a..181a362 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.js +++ b/pages/copyright/createProjectInfo/createProjectInfo.js @@ -42,6 +42,10 @@ Page({ showPackage: false, //显示套餐包 canSelCoupons: true, //是否可以使用优惠卷 canSelPackage: true, //是否可以使用套餐包 + langList: [], //项目语言 + showLang: false, //显示选择语言 + tempLang: '', //临时选中的语言 + selectLang: '' }, onLoad(options) { wx.setNavigationBarTitle({ @@ -71,6 +75,8 @@ Page({ this.doGetCoupons() //获取客服ID this.doGetCsaNo(false) + //获取可选语言 + this.doGetProLangList() }, //系统版本 inputVersion(e) { @@ -91,9 +97,10 @@ Page({ isShowContact: !this.data.isShowContact }) }, + //系统语言 toggleOptions() { this.setData({ - isShowLanguage: !this.data.isShowLanguage + showLang: !this.data.showLang }); }, selectOption(e) { @@ -125,6 +132,26 @@ Page({ tempCoupons: e.currentTarget.dataset.value }) }, + //点击语言 + changeLang(e) { + console.log(e) + this.setData({ + tempLang: e.detail.value + }) + }, + //确定选择语言 + confirmSelectLang() { + const _self = this + _self.setData({ + showLang: false + }) + if (_self.data.tempLang != '') { + _self.setData({ + selectLang: _self.data.tempLang, + tempLang: '', + }) + } + }, //确定使用选中的优惠卷 confirmSelCoupons() { this.setData({ @@ -149,6 +176,20 @@ Page({ selectContact: this.data.contactList[e.detail.value] }) }, + //获取可选语言 + doGetProLangList() { + const _self = this + ProjectService.doGetProLangList() + .then(res => { + console.log(res) + _self.setData({ + langList: res, + selectLang: res[0] + }) + }, err => { + console.log(err) + }) + }, //获取产权联系人 doGetContactList() { wx.showLoading({ @@ -433,7 +474,7 @@ Page({ projDevCompleteDate: _self.data.completeDate, //开发完成日期 projName: _self.data.projectName, //项目简称 projVersion: _self.data.version, //项目版本 - backendCodeLang: _self.data.currentLanguage, + backendCodeLang: _self.data.selectLang, projChargeType: _self.data.type, //项目收费类型 ALL,FREE,MATERIAL,MATERIAL_AGENT,MATERIAL_AGENT_URGENT listProjChargeAdditional: list, packageOrderId: _self.data.selectPackage.packageOrderId ? _self.data.selectPackage.packageOrderId : '', //套餐包ID diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxml b/pages/copyright/createProjectInfo/createProjectInfo.wxml index 9d76f54..058d314 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxml +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxml @@ -35,14 +35,9 @@ 系统语言 - {{currentLanguage}} + {{selectLang}} - - - {{item}} - - @@ -179,6 +174,24 @@ + + 系统语言 + + + + + + {{item}} + + + + + + + + + + diff --git a/pages/copyright/publicPay/publicPay.js b/pages/copyright/publicPay/publicPay.js index 06e5f1a..4b44c6a 100644 --- a/pages/copyright/publicPay/publicPay.js +++ b/pages/copyright/publicPay/publicPay.js @@ -39,6 +39,14 @@ Page({ wx.setNavigationBarTitle({ title: '对公转账', }) + wx.setNavigationBarColor({ + frontColor: '#000000', // 必写项，字体颜色仅支持#ffffff和#000000 + backgroundColor: '#F0F0F0', // 传递的颜色值，仅支持十六进制颜色 + animation: { // 可选项 + duration: 500, + timingFunc: 'easeIn' + } + }) // 获取完整的年月日时分秒，以及默认显示的数组 const obj = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear); console.log(obj.dateTime) @@ -124,7 +132,7 @@ Page({ icon: 'error', duration: 1500, success: () => { - // wx.navigateBack() + wx.navigateBack() } }) } @@ -137,7 +145,7 @@ Page({ icon: 'error', duration: 1500, success: () => { - // wx.navigateBack() + wx.navigateBack() } }) }) diff --git a/pages/copyright/publicPay/publicPay.wxml b/pages/copyright/publicPay/publicPay.wxml index 04fbde3..91ef432 100644 --- a/pages/copyright/publicPay/publicPay.wxml +++ b/pages/copyright/publicPay/publicPay.wxml @@ -1,31 +1,14 @@ - - - 收款方信息 - - 公司名称 - {{incomeEnterprise.bankAccountName}} - - - 开户银行 - {{incomeEnterprise.bankName}} - - - 银行账号 - {{incomeEnterprise.bankNumber}} - - - 银行联行号 - {{incomeEnterprise.bankUnionpayNumber}} - - - 打款备注 - {{incomeEnterprise.bankRemark}} - - - 说明 - 请打款时必须按照以上备注填写 - - + + + + + + + + + + + 付款方信息 @@ -55,12 +38,40 @@ - - - + + 打款凭证 + + + + 收款方信息 + + 公司名称 + {{incomeEnterprise.bankAccountName}} + + + 开户银行 + {{incomeEnterprise.bankName}} + + + 银行账号 + {{incomeEnterprise.bankNumber}} + + + 银行联行号 + {{incomeEnterprise.bankUnionpayNumber}} + + + 打款备注 + {{incomeEnterprise.bankRemark}} + + + 说明 + 请打款时必须按照以上备注填写 + + 金额: diff --git a/pages/copyright/publicPay/publicPay.wxss b/pages/copyright/publicPay/publicPay.wxss index e3fd0da..3a2f78c 100644 --- a/pages/copyright/publicPay/publicPay.wxss +++ b/pages/copyright/publicPay/publicPay.wxss @@ -1,33 +1,36 @@ /* pages/copyright/publicPay/publicPay.wxss */ +page { + background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); +} + .container-box { display: flex; flex-direction: column; justify-content: center; align-items: flex-start; background-color: white; + margin-top: 10px; + border-radius: 5px; } .container-box:nth-of-type(n+2) { - margin-top: 20px; margin-bottom: 140px; } .box-title { - font-size: 18px; - font-weight: 800; - color: #5D3900; - background-color: #FCF3E5; - width: 100vw; - padding: 10px; + font-size: 16px; + font-weight: bold; + color: black; + padding: 10px 20px; } .item { display: flex; flex-direction: row; justify-content: center; - align-items: flex-start; - width: 100vw; - padding: 6px 10px; + align-items: center; + width: 90vw; + padding: 6px 20px; } .red { @@ -38,24 +41,21 @@ } */ .title { - flex: .2; + flex: .3; font-size: 14px; color: black; - font-weight: bold; } .content { - flex: .8; + flex: 1; font-size: 14px; - color: rgb(68, 68, 68); - font-weight: 400; } .time-picker-box { display: flex; flex-direction: row; justify-content: space-between; - width: 65vw; + width: 63vw; align-items: center; } @@ -72,11 +72,8 @@ margin-left: 3px; } - -.weui-uploader__title::after { - content: "*"; - color: red; - margin-left: 3px; +.weui-uploader { + width: 65vw; } .weui-uploader__bd { @@ -86,6 +83,10 @@ margin-left: 5px; } +.weui-uploader__hd { + display: none; +} + .weui-uploader__input-box { width: 65px; height: 65px; @@ -108,7 +109,12 @@ display: flex; flex-direction: row; justify-content: space-between; - width: 84vw; + width: 65vw; +} + +.weui-uploader__input-box { + background: white; + border: 1px solid #F0F0F0; } .time-picker { @@ -124,7 +130,13 @@ } .input-box { - width: 65vw; + width: 60vw; + background-color: #FAFAFA; + border-radius: 20px; + padding: 3px 8px; + text-align: left; + font-size: 12px; + border: 1px solid #F0F0F0; } .item-v { @@ -171,18 +183,20 @@ .green-bottom-btn { - background-color: #37AD46; - color: white; - text-align: center; height: 42px; width: 90vw; line-height: 42px; - border-radius: 20rpx; margin-bottom: 20px; + border-radius: 4px; + background-color: rgba(255, 169, 0, 1); + color: rgba(255, 255, 255, 1); + font-size: 16px; + text-align: center; + font-family: PingFangSC-semiBold; } .green-bottom-btn:active { - background-color: #7ef58e; + background-color: rgba(255, 169, 0, 0.3); color: white; } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index fb48ca0..60466eb 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -264,7 +264,7 @@ Page({ download(e) { const _self = this _self.setData({ - progress: 0, + downloadProgress: 0, downloading: true, //显示下载进度 showDownload: false, //关闭底部弹窗 }) @@ -281,7 +281,7 @@ Page({ header: header, success(res) { _self.setData({ - progress: 0, + downloadProgress: 0, downloading: false }) if (res.statusCode === 200) { @@ -339,7 +339,7 @@ Page({ downloadTask.onProgressUpdate(res => { console.log(res.progress) _self.setData({ - progress: res.progress + downloadProgress: res.progress }) }); }, @@ -351,7 +351,7 @@ Page({ showError: true, showDownload: false, downloading: false, - progress: 0 + downloadProgress: 0 }) }, //重新生成 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index a4a1c8a..ae89e03 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -90,39 +90,85 @@ - + 资料下载 - - 申请表 - - DOC - TXT - - - - 操作手册 - - DOC - PDF - - - - 源代码 - - DOC - PDF - - 温馨提示:若您想把下载的文件留存到本地，打开预览页面后，在界面右上角操作栏内，选择使用其他软件打开或者保存文件功能就能实现。 项目预览链接 {{sysPreviewUrl}} + + + + 申请表 + + + + + Word格式下载 + + + + TXT格式下载 + + + + + + + + 操作手册 + + + + + Word格式下载 + + + + PDF格式下载 + + + + + + + 源代码 + + + + + Word格式下载 + + + + PDF格式下载 + + + - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index cc370c0..be496ab 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -356,92 +356,97 @@ } } +.custom-dialog { + background-color: #F1F1F1; +} + .download-item { display: flex; flex-direction: row; justify-content: space-between; - align-items: flex-start; + align-items: center; padding: 10px; + background-color: white; + border-radius: 5px; + height: 80px; +} + +.download-item:nth-of-type(n+2) { + margin-top: 10px; } .download-title { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 10px; + width: 75px; +} + +.download-title-txt { font-size: 16px; font-weight: bold; - flex: 1; - align-items: flex-start; - text-align: left; + margin-top: 10px; } .download-btn-box { display: flex; - flex-direction: row; + flex-direction: column; justify-content: space-between; - flex: .5; + align-items: center; + height: 70px; + flex: .6; } .download-btn { - background-color: #fe9844c9; - color: white; - padding: 3px 10px; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + color: black; + padding: 5px 10px; border-radius: 5px; + border: 1px solid #CECECE; + width: 105px; +} + +.download-btn-txt { + font-size: 12px; + text-align: center; } .download-btn:active { - background-color: #fe9844; + background-color: #d1d1d0; } + + .icon-table { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; -} - -.icon-table::before { content: ""; - background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNTAyMTM4Nzc5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2ODIiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTUxMiA1MTJtLTQ5MC42NjY2NjcgMGE0OTAuNjY2NjY3IDQ5MC42NjY2NjcgMCAxIDAgOTgxLjMzMzMzNCAwIDQ5MC42NjY2NjcgNDkwLjY2NjY2NyAwIDEgMC05ODEuMzMzMzM0IDBaIiBmaWxsPSIjRTlGNEZGIiBwLWlkPSIyNjgzIj48L3BhdGg+PHBhdGggZD0iTTMzMi44IDc0Ni42NjY2NjdoMjkwLjEzMzMzM2wxMTkuNDY2NjY3LTExOS40NjY2NjdWMjY4LjhhMzQuMTMzMzMzIDM0LjEzMzMzMyAwIDAgMC0zNC4xMzMzMzMtMzQuMTMzMzMzSDMzMi44YTM0LjEzMzMzMyAzNC4xMzMzMzMgMCAwIDAtMzQuMTMzMzMzIDM0LjEzMzMzM3Y0NDMuNzMzMzMzYTM0LjEzMzMzMyAzNC4xMzMzMzMgMCAwIDAgMzQuMTMzMzMzIDM0LjEzMzMzNHoiIGZpbGw9IiMwMEExRkYiIHAtaWQ9IjI2ODQiPjwvcGF0aD48cGF0aCBkPSJNNTg5LjE2MjY2NyA0NTAuNTZsLTE4My41NzMzMzQgMTgzLjU3MzMzMyAyLjU2IDQ1LjczODY2NyA0NS43MTczMzQgMi41Mzg2NjcgMTgzLjU1Mi0xODMuNTczMzM0LTQ4LjI1Ni00OC4yNTZ6IG0xMi4wNTMzMzMtMTIuMDUzMzMzbDQ4LjI3NzMzMyA0OC4yNzczMzMgMjQuMTI4LTI0LjE0OTMzM2ExNi44OTYgMTYuODk2IDAgMCAwIDAtMjQuMTI4bC0yNC4xMDY2NjYtMjQuMTI4YTE2Ljg5NiAxNi44OTYgMCAwIDAtMjQuMTQ5MzM0IDBsLTI0LjE0OTMzMyAyNC4xMDY2NjZ6IiBmaWxsPSIjRTlGNEZGIiBwLWlkPSIyNjg1Ij48L3BhdGg+PHBhdGggZD0iTTYyMi45MzMzMzMgNzQ2LjY2NjY2N2wxMTkuNDY2NjY3LTExOS40NjY2NjdoLTc2LjhhNDIuNjY2NjY3IDQyLjY2NjY2NyAwIDAgMC00Mi42NjY2NjcgNDIuNjY2NjY3Vjc0Ni42NjY2Njd6IiBmaWxsPSIjOTZEOEZGIiBwLWlkPSIyNjg2Ij48L3BhdGg+PHBhdGggZD0iTTM2Mi42NjY2NjcgMjk4LjY2NjY2N20yMS4zMzMzMzMgMGwxOTIgMHEyMS4zMzMzMzMgMCAyMS4zMzMzMzMgMjEuMzMzMzMzbDAgMHEwIDIxLjMzMzMzMy0yMS4zMzMzMzMgMjEuMzMzMzMzbC0xOTIgMHEtMjEuMzMzMzMzIDAtMjEuMzMzMzMzLTIxLjMzMzMzM2wwIDBxMC0yMS4zMzMzMzMgMjEuMzMzMzMzLTIxLjMzMzMzM1oiIGZpbGw9IiNFOUY0RkYiIHAtaWQ9IjI2ODciPjwvcGF0aD48cGF0aCBkPSJNMzYyLjY2NjY2NyAzODRtMjEuMzMzMzMzIDBsMTA2LjY2NjY2NyAwcTIxLjMzMzMzMyAwIDIxLjMzMzMzMyAyMS4zMzMzMzNsMCAwcTAgMjEuMzMzMzMzLTIxLjMzMzMzMyAyMS4zMzMzMzRsLTEwNi42NjY2NjcgMHEtMjEuMzMzMzMzIDAtMjEuMzMzMzMzLTIxLjMzMzMzNGwwIDBxMC0yMS4zMzMzMzMgMjEuMzMzMzMzLTIxLjMzMzMzM1oiIGZpbGw9IiNFOUY0RkYiIHAtaWQ9IjI2ODgiPjwvcGF0aD48L3N2Zz4='); + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzIgMzIiIHdpZHRoPSI2NCIgaGVpZ2h0PSI2NCIgc3R5bGU9IiIgZmlsdGVyPSJub25lIj4KICAgIAogICAgPGc+CiAgICA8cGF0aCBkPSJNMTYgMjFoLTR2Mmg0di0yek0xNyAyMWg0djJoLTR2LTJ6TTE2IDI2aC00di0yaDR2MnpNMTcgMjZoNHYtMmgtNHYyek0xNiAxOGgtNHYyaDR2LTJ6TTE3IDE4aDR2MmgtNHYtMnpNMTYgMTVoLTR2Mmg0di0yek0xNyAxNWg0djJoLTR2LTJ6TTE5IDN2Ni4wMDJjMCAxLjExMSAwLjg5OCAxLjk5OCAyLjAwNiAxLjk5OGg0Ljk5NHYxNy4wMDNjMCAxLjEwNy0wLjg5NCAxLjk5Ny0xLjk5NyAxLjk5N2gtMTUuMDA1Yy0xLjEwNyAwLTEuOTk3LTAuODk5LTEuOTk3LTIuMDA3di0yMi45ODVjMC0xLjEwOSAwLjg5OS0yLjAwNyAyLjAwOS0yLjAwN2g5Ljk5MXpNMjAgM3Y1Ljk5N2MwIDAuNTU0IDAuNDUxIDEuMDAzIDAuOTkxIDEuMDAzaDUuMDA5bC02LTd6TTExIDEzdjE0aDExdi0xNGgtMTF6IiBmaWxsPSJyZ2JhKDI1NSwxNjksMCwxKSI+PC9wYXRoPgogICAgPC9nPgogIDwvc3ZnPg=='); background-size: cover; background-repeat: no-repeat; - width: 24px; - display: block; - height: 24px; - margin-right: 8px; + width: 48px; + height: 48px; } + .icon-tool { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; -} - -.icon-tool::before { - content: ""; - background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNTAyNDM0NDgxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM3MTEiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTEwMTMuMDU3MDYzIDQ3Ni44MDUyNDRjMC0xMi43OTk4NzctMS4wMDI2NTctMjUuNTk5NzU1LTIuMTMzMzEzLTM4LjM5OTYzMnYtMC44MTA2NTlhMzQwLjgzOTQgMzQwLjgzOTQgMCAwIDAtMi42NjY2NDEtMzUuMTU2OTk2Yy0yLjYyMzk3NS0yMC45MDY0NjYtNS40MTg2MTUtNDEuODEyOTMzLTkuNjQyNTc0LTYyLjMxNDA3LTUuNjMxOTQ2LTI3LjU0MTA2OS0xMS42NjkyMjItNTUuMDgyMTM5LTE5LjE5OTgxNi04Mi4wMjU4OGE0MTQuNzU4NjkyIDQxNC43NTg2OTIgMCAwIDAtNDAuNTMyOTQ1LTk2LjQ4OTc0MiAyMjkuMzMxMTM2IDIyOS4zMzExMzYgMCAwIDAtNjIuNTI3NDAxLTcwLjkzMjY1NCAzMTYuMzcwMzAxIDMxNi4zNzAzMDEgMCAwIDAtNjAuMzA4NzU1LTM0Ljk4NjMzMSA1MDUuMDE5MTYgNTA1LjAxOTE2IDAgMCAwLTc3LjIwNDU5NC0yNy43MzMwNjhBNjkzLjE3NzM1NyA2OTMuMTc3MzU3IDAgMCAwIDYyMC44MjYxNTUgNS45ODMwODljLTIzLjQ2NjQ0Mi0yLjEzMzMxMy00Ni45MzI4ODQtNS4wMzQ2MTgtNzAuMzk5MzI1LTUuNjMxOTQ2YTcyOS44MDYzMzkgNzI5LjgwNjMzOSAwIDAgMC0zNi43OTk2NDctMC4xOTE5OThjLTkuODU1OTA2LTAuMTkxOTk4LTE5LjQ5ODQ4LTAuMTkxOTk4LTI5LjM1NDM4NiAwcy0xOS40OTg0OCAwLjgxMDY1OS0yOS4xNDEwNTQgMS41OTk5ODVjLTEzLjQ2MTIwNCAwLjU5NzMyOC0yNy4xMzU3NCAxLjgxMzMxNi00MC41MzI5NDUgMy4yMjEzMDItNi4yMjkyNzQgMC41OTczMjgtMTIuNjcxODc5IDEuNDA3OTg3LTE4LjkwMTE1MiAyLjEzMzMxMy02LjgyNjYwMSAwLjgxMDY1OS0xMy44NjY1MzQgMS41OTk5ODUtMjAuNzE0NDY4IDIuODE1OTczLTUuMDM0NjE4IDAuNTk3MzI4LTkuODU1OTA2IDEuNDA3OTg3LTE0LjkzMzE5IDIuMTMzMzEzYTYxNC4xMTY3ODEgNjE0LjExNjc4MSAwIDAgMC05Ni43MDMwNzQgMjIuNzE5NzgyIDQyMy4xMjEyNzggNDIzLjEyMTI3OCAwIDAgMC05NC4wNzkwOTggNDEuNjIwOTM1IDIyOC4yNjQ0NzkgMjI4LjI2NDQ3OSAwIDAgMC01OS45MDM0MjYgNTEuMDcxNTFBMzE2LjYwNDk2NiAzMTYuNjA0OTY2IDAgMCAwIDY5LjU5OTQzOCAxOTMuMzUxOTZhNTM3LjQ0NTUxNiA1MzcuNDQ1NTE2IDAgMCAwLTMwLjc2MjM3MiA4Ni44NDcxNjggODY1LjM1NzA0IDg2NS4zNTcwNCAwIDAgMC0yNC4xMjc3NjkgMTQxLjMzMTk3OWMtMi4xMzMzMTMgMjMuNDY2NDQyLTMuMDA3OTcxIDQ3LjI1Mjg4LTMuNjI2NjMyIDcwLjc2MTk4OS0wLjE5MTk5OCA2LjYzNDYwMy0wLjE5MTk5OCAxMy4yNjkyMDYgMCAxOS43MTE4MTFzLTAuMTkxOTk4IDEzLjI2OTIwNiAwIDE5LjcxMTgxMWMwLjU5NzMyOCAyMy40NjY0NDIgMS40MDc5ODcgNDcuMjUyODggMy42MjY2MzIgNzAuNzYxOTg4YTg0MC44NjY2MDggODQwLjg2NjYwOCAwIDAgMCAyNC4xMjc3NjkgMTQxLjMzMTk3OSA1NTcuNDEzMzI1IDU1Ny40MTMzMjUgMCAwIDAgMzAuNzYyMzcyIDg2LjgyNTgzNSAzMTYuNTgzNjMzIDMxNi41ODM2MzMgMCAwIDAgMzkuODA3NjE4IDY1Ljc0ODcwMyAyMjQuNjE2NTE0IDIyNC42MTY1MTQgMCAwIDAgNTkuOTAzNDI2IDUxLjA3MTUxMSA0MjcuMjM4NTcyIDQyNy4yMzg1NzIgMCAwIDAgOTQuMDc5MDk5IDQxLjYyMDkzNCA2MDguOTExNDk4IDYwOC45MTE0OTggMCAwIDAgOTYuNzAzMDczIDIyLjcxOTc4MmM1LjAzNDYxOCAwLjgxMDY1OSA5Ljg1NTkwNiAxLjQwNzk4NyAxNC45MzMxOSAyLjEzMzMxMyA2LjgyNjYwMSAxLjIxNTk4OCAxMy42NzQ1MzYgMi4wMDUzMTQgMjAuNzE0NDY4IDIuODE1OTczYTkxMC4xMzUyNzggOTEwLjEzNTI3OCAwIDAgMCA1OS40MzQwOTcgNS4zNTQ2MTZjOS42NDI1NzQgMC44MTA2NTkgMTkuNDk4NDggMS4yMTU5ODggMjkuMTQxMDU0IDEuNTk5OTg0czE5LjQ5ODQ4IDAuMTkxOTk4IDI5LjM1NDM4NiAwYzEyLjI2NjU0OSAwLjE5MTk5OCAyNC41MzMwOTggMC4xOTE5OTggMzYuNzk5NjQ3LTAuMTkxOTk4IDIzLjQ2NjQ0Mi0wLjU5NzMyOCA0Ny4wMzk1NDktMy42MjY2MzIgNzAuMzk5MzI1LTUuNjMxOTQ2YTY4OS41NTA3MjUgNjg5LjU1MDcyNSAwIDAgMCAxMTguMDE0ODY5LTIxLjkwOTEyMyA0NTkuMTEwMjY3IDQ1OS4xMTAyNjcgMCAwIDAgNzcuMjA0NTk0LTI3LjczMzA2OCAzNTQuMTI5OTQgMzU0LjEyOTk0IDAgMCAwIDYwLjMwODc1NS0zNC45ODYzMzEgMjMxLjk1NTExIDIzMS45NTUxMSAwIDAgMCA2Mi4zMTQwNy03MC45NzUzMiA0MjMuNTQ3OTQxIDQyMy41NDc5NDEgMCAwIDAgNDAuNTMyOTQ1LTk2LjQ4OTc0MiAxMjA2LjE3NTEwNyAxMjA2LjE3NTEwNyAwIDAgMCAxOS4xOTk4MTYtODIuMDI1ODgxYzQuMjY2NjI2LTIwLjUwMTEzNyA2LjgyNjYwMS00MS42MjA5MzQgOS42NDI1NzQtNjIuMzE0MDY5YTM0NS4wNjMzNiAzNDUuMDYzMzYgMCAwIDAgMi42MjM5NzUtMzUuMTc4MzN2LTAuNjYxMzI3YzEuMjE1OTg4LTEyLjc5OTg3NyAyLjEzMzMxMy0yNS41OTk3NTUgMi4xMzMzMTMtMzguMzk5NjMydi03MC4zOTkzMjV6IiBmaWxsPSIjRkZBNjAwIiBvcGFjaXR5PSIuMSIgcC1pZD0iMzcxMiI+PC9wYXRoPjxwYXRoIGQ9Ik03NjUuODcwMDk5IDI5MC43Mzc2OTRBNjAuOTkxNDE1IDYwLjk5MTQxNSAwIDAgMCA3MDAuMjI4MDYxIDIzNC42NzQyMzFIMzM2LjUxOTU0NkE2NS45MTkzNjggNjUuOTE5MzY4IDAgMCAwIDI2Ni45MzA4OCAyOTQuNDA2OTkydjQxNC45NTA2OWE3Ny4wNzY1OTUgNzcuMDc2NTk1IDAgMCAwIDc4Ljc4MzI0NSA3NC42NjU5NTFoMzU0LjUxMzkzNmE2My40MjMzOTIgNjMuNDIzMzkyIDAgMCAwIDY1LjY0MjAzOC02Mi4yOTI3MzZWMjkwLjczNzY5NHogbS00MjAuMjYyNjQgNDMuNjA0OTE1aDIyMy4yMDg1MjhhMjQuOTU5NzYxIDI0Ljk1OTc2MSAwIDEgMSAwIDQ5LjgzNDE4OUgzNDUuNzE0MTI1YTI0Ljk1OTc2MSAyNC45NTk3NjEgMCAxIDEgMC00OS44MzQxODl6IG0wIDc0LjY2NTk1MWgxNzAuNjY1MDMxYTI0Ljk1OTc2MSAyNC45NTk3NjEgMCAxIDEgMCA0OS44MzQxODloLTE3MC42NjUwMzFhMjQuOTU5NzYxIDI0Ljk1OTc2MSAwIDEgMSAwLTQ5LjgzNDE4OXogbTM2Ny42MzM4MTEgMzExLjQ2MzY4MmExMi4wOTU4ODQgMTIuMDk1ODg0IDAgMCAxLTEzLjExOTg3NSAxMi40NTg1NDdIMzQ3LjAxNTQ0NmEyNy43MzMwNjggMjcuNzMzMDY4IDAgMCAxLTI3LjU2MjQwMy0yMS4xODM3OTcgMjUuNzA2NDIgMjUuNzA2NDIgMCAwIDEgMjYuMjYxMDgyLTI4LjY1MDM5MmgzNTQuNTEzOTM2YTEyLjA5NTg4NCAxMi4wOTU4ODQgMCAwIDEgMTMuMTE5ODc0IDEyLjQ1ODU0OHoiIGZpbGw9IiNGRkE2MDAiIHAtaWQ9IjM3MTMiPjwvcGF0aD48L3N2Zz4='); + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSI2NCA2NCA4OTYgODk2IiB3aWR0aD0iNTIiIGhlaWdodD0iNTIiIHN0eWxlPSIiIGZpbHRlcj0ibm9uZSI+CiAgICAKICAgIDxnPgogICAgPHBhdGggZD0iTTg4MCAxMTJIMTQ0Yy0xNy43IDAtMzIgMTQuMy0zMiAzMnY3MzZjMCAxNy43IDE0LjMgMzIgMzIgMzJoNzM2YzE3LjcgMCAzMi0xNC4zIDMyLTMyVjE0NGMwLTE3LjctMTQuMy0zMi0zMi0zMnpNNTEzLjEgNTE4LjFsLTE5MiAxNjFjLTUuMiA0LjQtMTMuMS43LTEzLjEtNi4xdi02Mi43YzAtMi4zIDEuMS00LjYgMi45LTYuMUw0MjAuNyA1MTJsLTEwOS44LTkyLjJhNy42MyA3LjYzIDAgMCAxLTIuOS02LjFWMzUxYzAtNi44IDcuOS0xMC41IDEzLjEtNi4xbDE5MiAxNjAuOWMzLjkgMy4yIDMuOSA5LjEgMCAxMi4zek03MTYgNjczYzAgNC40LTMuNCA4LTcuNSA4aC0xODVjLTQuMSAwLTcuNS0zLjYtNy41LTh2LTQ4YzAtNC40IDMuNC04IDcuNS04aDE4NWM0LjEgMCA3LjUgMy42IDcuNSA4djQ4eiIgZmlsbD0icmdiYSg1MiwxMjQsMTc1LDEpIj48L3BhdGg+CiAgICA8L2c+CiAgPC9zdmc+'); background-size: cover; background-repeat: no-repeat; - width: 24px; - display: block; - height: 24px; - margin-right: 8px; + width: 42px; + height: 42px; } + .icon-source { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; -} - -.icon-source::before { - content: ""; - background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNTU2NDY2OTIyIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjEwMzg3IiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiPjxwYXRoIGQ9Ik01MTEuMDI5IDUxMC43NzltLTQ0Ni41MyAwYTQ0Ni41MyA0NDYuNTMgMCAxIDAgODkzLjA2IDAgNDQ2LjUzIDQ0Ni41MyAwIDEgMC04OTMuMDYgMFoiIGZpbGw9IiM3NkMyQUYiIHAtaWQ9IjEwMzg4Ij48L3BhdGg+PHBhdGggZD0iTTY1Ny4wMDggNjc4LjIzNWMtOS4zNjIgMC0xOC41MDUtNC43MTUtMjMuNzg2LTEzLjI2Ni04LjA4OC0xMy4xMjMtNC4wMDYtMzAuMzEzIDkuMTEtMzguNDA4bDE0MS4yNzEtODcuMDk3YzAuMDY4LTAuMjQ1IDAuMDk1LTAuNTA0IDAuMDk1LTAuNzc3cy0wLjAyNy0wLjUzMS0wLjA5NS0wLjc3N2wtMTQxLjI3MS04Ny4wOTdjLTEzLjExNi04LjA5NC0xNy4xOTctMjUuMjg1LTkuMTEtMzguNDA4IDguMDg4LTEzLjExNiAyNS4yODUtMTcuMTk3IDM4LjQwOC05LjExbDE0OC4zMyA5MS40NTggMi4zMDMgMi4zMDNjMTEuMTI2IDExLjEyIDE3LjI1MiAyNS44OTggMTcuMjUyIDQxLjYzIDAgMTUuNzE5LTYuMTI1IDMwLjUwNC0xNy4yNDUgNDEuNjI0bC0yLjMxIDIuMzEtMTQ4LjMzIDkxLjQ1OGEyNy43OTcgMjcuNzk3IDAgMCAxLTE0LjYyMiA0LjE1N3pNMzY1LjA0OSA2NzguMjM1YTI3Ljc5NiAyNy43OTYgMCAwIDEtMTQuNjIyLTQuMTU2bC0xNDguMzMtOTEuNDU4LTIuMzEtMi4zMWMtMTEuMTItMTEuMTItMTcuMjQ1LTI1LjkwNS0xNy4yNDUtNDEuNjI0IDAtMTUuNzMyIDYuMTI1LTMwLjUxMSAxNy4yNTItNDEuNjNsMi4zMDMtMi4zMDMgMTQ4LjMzLTkxLjQ1OGMxMy4xMy04LjA4OCAzMC4zMDYtNC4wMDYgMzguNDA4IDkuMTEgOC4wODggMTMuMTIzIDQuMDA2IDMwLjMxMy05LjExIDM4LjQwOGwtMTQxLjI3MSA4Ny4wOTdjLTAuMDY4IDAuMjQ1LTAuMDk1IDAuNTA0LTAuMDk1IDAuNzc3czAuMDI3IDAuNTMxIDAuMDk1IDAuNzc3bDE0MS4yNzEgODcuMDk3YzEzLjExNiA4LjA5NCAxNy4xOTcgMjUuMjg1IDkuMTEgMzguNDA4LTUuMjczIDguNTUtMTQuNDI0IDEzLjI2NS0yMy43ODYgMTMuMjY1eiIgZmlsbD0iIzIzMUYyMCIgcC1pZD0iMTAzODkiPjwvcGF0aD48cGF0aCBkPSJNNDIwLjMyMSA4MDMuODIxYy0zLjMxMSAwLTYuNjg0LTAuNTkzLTkuOTYxLTEuODQ2LTE0LjM5Ny01LjUwNS0yMS42MDYtMjEuNjQtMTYuMS0zNi4wMzdMNTc1LjY2MiAyOTEuNWM1LjUwNS0xNC4zOTcgMjEuNjQtMjEuNjEyIDM2LjAzNy0xNi4xIDE0LjM5NyA1LjUwNSAyMS42MDYgMjEuNjQgMTYuMSAzNi4wMzdMNDQ2LjM5NiA3ODUuODc0Yy00LjI1MiAxMS4xMi0xNC44NCAxNy45NDctMjYuMDc1IDE3Ljk0N3oiIGZpbGw9IiMyMzFGMjAiIHAtaWQ9IjEwMzkwIj48L3BhdGg+PHBhdGggZD0iTTY1Ny4wMDggNjUwLjMyYy05LjM2MiAwLTE4LjUxMi00LjcwMS0yMy43ODYtMTMuMjU5LTguMDg4LTEzLjEyMy00LjAwNi0zMC4zMiA5LjExNi0zOC40MDFsMTQxLjI1MS04Ny4wOWEyLjk2NyAyLjk2NyAwIDAgMCAwLTEuNTgxbC0xNDEuMjUxLTg3LjA5Yy0xMy4xMjMtOC4wODEtMTcuMjA0LTI1LjI3OC05LjExNi0zOC40MDEgOC4wOTQtMTMuMTIzIDI1LjI3MS0xNy4yMTEgMzguNDAxLTkuMTAzbDE0OC4zNDQgOTEuNDUxIDIuMzEgMi4zMDNjMjIuOTQxIDIyLjk2MiAyMi45NDEgNjAuMyAwIDgzLjI2MWwtMi4zMSAyLjMwMy0xNDguMzQ0IDkxLjQ1MWEyNy43IDI3LjcgMCAwIDEtMTQuNjE1IDQuMTU2ek0zNjUuMDQ5IDY1MC4zMmEyNy43MDggMjcuNzA4IDAgMCAxLTE0LjYxNS00LjE1NkwyMDIuMDkgNTU0LjcxM2wtMi4zMS0yLjMwM2MtMjIuOTQxLTIyLjk2MS0yMi45NDEtNjAuMjk5IDAtODMuMjYxbDIuMzEtMi4zMDMgMTQ4LjM0NC05MS40NTFjMTMuMTAyLTguMTA4IDMwLjMyLTQuMDIgMzguNDAxIDkuMTAzIDguMDg4IDEzLjEyMyA0LjAwNiAzMC4zMi05LjExNiAzOC40MDFsLTE0MS4yNTEgODcuMDlhMi45NjcgMi45NjcgMCAwIDAgMCAxLjU4MWwxNDEuMjUxIDg3LjA5YzEzLjEyMyA4LjA4MSAxNy4yMDQgMjUuMjc4IDkuMTE2IDM4LjQwMS01LjI3MyA4LjU1Ny0xNC40MjQgMTMuMjU5LTIzLjc4NiAxMy4yNTl6IiBmaWxsPSIjRkZGRkZGIiBwLWlkPSIxMDM5MSI+PC9wYXRoPjxwYXRoIGQ9Ik00MjAuMzIxIDc3NS45MmMtMy4zMTEgMC02LjY4NC0wLjYtOS45NjEtMS44NTMtMTQuMzk3LTUuNTA1LTIxLjYwNi0yMS42NC0xNi4xLTM2LjAzbDE4MS40MDMtNDc0LjQzOGM1LjUwNS0xNC4zOSAyMS42NC0yMS42MjYgMzYuMDM3LTE2LjEwNyAxNC4zOTcgNS41MDUgMjEuNjA2IDIxLjY0IDE2LjEgMzYuMDNMNDQ2LjM5NiA3NTcuOTU5Yy00LjI1MiAxMS4xMi0xNC44NCAxNy45NjEtMjYuMDc1IDE3Ljk2MXoiIGZpbGw9IiNGRkZGRkYiIHAtaWQ9IjEwMzkyIj48L3BhdGg+PC9zdmc+'); + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSI2NCA2NCA4OTYgODk2IiB3aWR0aD0iNTIiIGhlaWdodD0iNTIiIHN0eWxlPSIiIGZpbHRlcj0ibm9uZSI+CiAgICAKICAgIDxnPgogICAgPHBhdGggZD0iTTkyOCAxNjFINjk5LjJjLTQ5LjEgMC05Ny4xIDE0LjEtMTM4LjQgNDAuN0w1MTIgMjMzbC00OC44LTMxLjNBMjU1LjIgMjU1LjIgMCAwIDAgMzI0LjggMTYxSDk2Yy0xNy43IDAtMzIgMTQuMy0zMiAzMnY1NjhjMCAxNy43IDE0LjMgMzIgMzIgMzJoMjI4LjhjNDkuMSAwIDk3LjEgMTQuMSAxMzguNCA0MC43bDQ0LjQgMjguNmMxLjMuOCAyLjggMS4zIDQuMyAxLjNzMy0uNCA0LjMtMS4zbDQ0LjQtMjguNkM2MDIgODA3LjEgNjUwLjEgNzkzIDY5OS4yIDc5M0g5MjhjMTcuNyAwIDMyLTE0LjMgMzItMzJWMTkzYzAtMTcuNy0xNC4zLTMyLTMyLTMyek00MDQgNTUzLjVjMCA0LjEtMy4yIDcuNS03LjEgNy41SDIxMS4xYy0zLjkgMC03LjEtMy40LTcuMS03LjV2LTQ1YzAtNC4xIDMuMi03LjUgNy4xLTcuNWgxODUuN2MzLjkgMCA3LjEgMy40IDcuMSA3LjV2NDV6bTAtMTQwYzAgNC4xLTMuMiA3LjUtNy4xIDcuNUgyMTEuMWMtMy45IDAtNy4xLTMuNC03LjEtNy41di00NWMwLTQuMSAzLjItNy41IDcuMS03LjVoMTg1LjdjMy45IDAgNy4xIDMuNCA3LjEgNy41djQ1em00MTYgMTQwYzAgNC4xLTMuMiA3LjUtNy4xIDcuNUg2MjcuMWMtMy45IDAtNy4xLTMuNC03LjEtNy41di00NWMwLTQuMSAzLjItNy41IDcuMS03LjVoMTg1LjdjMy45IDAgNy4xIDMuNCA3LjEgNy41djQ1em0wLTE0MGMwIDQuMS0zLjIgNy41LTcuMSA3LjVINjI3LjFjLTMuOSAwLTcuMS0zLjQtNy4xLTcuNXYtNDVjMC00LjEgMy4yLTcuNSA3LjEtNy41aDE4NS43YzMuOSAwIDcuMSAzLjQgNy4xIDcuNXY0NXoiIGZpbGw9InJnYmEoMTI5LDE3OSw1NSwxKSI+PC9wYXRoPgogICAgPC9nPgogIDwvc3ZnPg=='); background-size: cover; background-repeat: no-repeat; - width: 24px; - display: block; - height: 24px; - margin-right: 8px; + width: 42px; + height: 42px; } .download-all { diff --git a/pages/login/login.js b/pages/login/login.js index 32cd2f2..bd6f333 100644 --- a/pages/login/login.js +++ b/pages/login/login.js @@ -136,7 +136,7 @@ Page({ _self.setData({ phone: res.phone }) - _self.doUpdateUserInfo() + _self.doUpdateUserInfo('') _self.doGetCsaNo() } else { //获取客服编号 @@ -160,10 +160,10 @@ Page({ } }, //创建用户 - doUpdateUserInfo() { + doUpdateUserInfo(name) { const _self = this const data = { - userInfoName: '新用户', + userInfoName: name != '' ? name : '新用户', contactPhone: _self.data.phone, idCardType: 'ID_CARD', userInfoType: 'PERSONAL', @@ -223,6 +223,7 @@ Page({ wx.showLoading({ title: '创建中...', }) + _self.doUpdateUserInfo(_self.data.contactName) UserService.doCreateContact(data) .then(res => { wx.hideLoading() diff --git a/pages/login/login.wxml b/pages/login/login.wxml index fc1b40d..7aa0483 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -18,7 +18,8 @@ 创建联系人 - + 联系人用于在软件著作权创建流程中，联系人可供筛选，以确定登记信息录入人员。 + diff --git a/pages/login/login.wxss b/pages/login/login.wxss index 5405f9d..c627065 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -142,6 +142,22 @@ wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked:before { padding: 15px; text-align: center; } -.custom-tips{ + +.custom-tips { margin-top: 80px; +} + +.contact-hint { + font-size: 12px; + color: #FE9944; +} + +.contact-input { + font-size: 14px; + color: black; + line-height: 30px; + height: 30px; + padding: 2px 5px; + margin-top: 5px; + border: 1px solid #efefef; } \ No newline at end of file diff --git a/pages/mine/mineAccount/mineInfo/mineInfo.js b/pages/mine/mineAccount/mineInfo/mineInfo.js new file mode 100644 index 0000000..af8672c --- /dev/null +++ b/pages/mine/mineAccount/mineInfo/mineInfo.js @@ -0,0 +1,126 @@ +// pages/mine/mineAccount/mineInfo/mineInfo.js +import UserApi from '../../../../net/api/userApi' +const { + isValidPhone +} = require('../../../../utils/validator') +Page({ + + /** + * 页面的初始数据 + */ + data: { + userInfo: null, + showError: false, + errorHint: '', + showSuccess: false, + successHint: '', + infoHint: '', + showInfo: false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + wx.setNavigationBarTitle({ + title: '个人信息', + }) + wx.setNavigationBarColor({ + frontColor: '#000000', // 必写项，字体颜色仅支持#ffffff和#000000 + backgroundColor: '#F0F0F0', // 传递的颜色值，仅支持十六进制颜色 + animation: { // 可选项 + duration: 500, + timingFunc: 'easeIn' + } + }) + this.doGetMineInfo() + }, + //输入姓名 + inputName(e) { + console.log(e) + this.setData({ + 'userInfo.userInfoName': e.detail.value + }) + }, + //输入电话号码 + inputPhone(e) { + console.log(e) + this.setData({ + 'userInfo.contactPhone': e.detail.value + }) + }, + //校验参数 + checkParams() { + if (this.data.userInfo.userInfoName == '') { + this.setData({ + errorHint: '请输入姓名', + showError: true + }) + return false + } + if (this.data.userInfo.contactPhone == '' || !isValidPhone(this.data.userInfo.contactPhone)) { + this.setData({ + errorHint: '请输入正确的联系电话', + showError: true + }) + return false + } + return true + }, + //修改信息 + doUpdateInfo() { + const _self = this + const isLegal = _self.checkParams() + if (isLegal) { + wx.showLoading({ + title: '保存中...', + }) + const data = { + userInfoName: _self.data.userInfo.userInfoName, + contactPhone: _self.data.userInfo.contactPhone, + idCardType: 'ID_CARD', + userInfoType: 'PERSONAL', + } + UserApi.doUpdateUserInfo(data) + .then(res => { + wx.hideLoading() + console.log(res) + _self.setData({ + successHint: '个人信息修改成功', + showSuccess: true + }) + }, err => { + wx.hideLoading() + _self.setData({ + errorHint: err.msg ? err.msg : '信息修改失败,请稍后重试', + showError: true + }) + }) + } + }, + //获取个人信息 + doGetMineInfo() { + const _self = this + wx.showLoading({ + title: '加载中...', + }) + UserApi.doGetUserInfo() + .then(res => { + console.log(res) + wx.hideLoading() + _self.setData({ + userInfo: res + }) + }, err => { + wx.hideLoading() + console.log(res) + _self.setData({ + errorHint: '个人信息获取过程中出现异常，建议您稍作等待后再次尝试。', + showError: true + }) + setTimeout(() => { + wx.navigateBack() + }, 1500); + }) + } +}) \ No newline at end of file diff --git a/pages/mine/mineAccount/mineInfo/mineInfo.json b/pages/mine/mineAccount/mineInfo/mineInfo.json new file mode 100644 index 0000000..0c8eaa2 --- /dev/null +++ b/pages/mine/mineAccount/mineInfo/mineInfo.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "mp-toptips": "weui-miniprogram/toptips/toptips" + } +} \ No newline at end of file diff --git a/pages/mine/mineAccount/mineInfo/mineInfo.wxml b/pages/mine/mineAccount/mineInfo/mineInfo.wxml new file mode 100644 index 0000000..8990ed2 --- /dev/null +++ b/pages/mine/mineAccount/mineInfo/mineInfo.wxml @@ -0,0 +1,22 @@ + + + + 姓名 + + + + + + 联系电话 + + + + + + + 保存 + + + + + \ No newline at end of file diff --git a/pages/mine/mineAccount/mineInfo/mineInfo.wxss b/pages/mine/mineAccount/mineInfo/mineInfo.wxss new file mode 100644 index 0000000..3c45b20 --- /dev/null +++ b/pages/mine/mineAccount/mineInfo/mineInfo.wxss @@ -0,0 +1,58 @@ +/* pages/mine/mineAccount/mineInfo/mineInfo.wxss */ +page { + background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); +} + +.info-container { + height: 100vh; + background-color: white; + border-radius: 10px; + padding: 20px; +} + +.item { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: center; + padding: 10px 5px; +} + +.item-title { + flex: .3; +} + +.item-content { + flex: .7; + text-align: right; +} + +.bottom-box { + position: fixed; + left: 0; + bottom: 0; + width: 100vw; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.green-bottom-btn { + height: 42px; + width: 90vw; + line-height: 42px; + margin-bottom: 20px; + border-radius: 4px; + background-color: rgba(255, 169, 0, 1); + color: rgba(255, 255, 255, 1); + font-size: 16px; + text-align: center; + font-family: PingFangSC-semiBold; +} + + +.green-bottom-btn:active { + background-color: rgba(255, 169, 0, 0.3); + color: white; +} \ No newline at end of file diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.js b/pages/mine/mineAccount/mineOrder/mineOrder.js new file mode 100644 index 0000000..9274aee --- /dev/null +++ b/pages/mine/mineAccount/mineOrder/mineOrder.js @@ -0,0 +1,114 @@ +// pages/mine/mineAccount/mineOrder/mineOrder.js +import UserApi from '../../../../net/api/userApi' +Page({ + + /** + * 页面的初始数据 + */ + data: { + orderList: [], //订单列表 + pageData: { + page: 1, + rows: 10, + keywords: '' + }, //检索参数 + loadingState: 'loading', //加载状态 + listRefreshTrig: false, //list刷新状态 + isLoadMore: false, //加载更多的状态 + hasMore: true, //是否有更多数据 + keywords: '', //搜索关键字 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + wx.setNavigationBarTitle({ + title: '我的订单', + }) + wx.setNavigationBarColor({ + frontColor: '#000000', // 必写项，字体颜色仅支持#ffffff和#000000 + backgroundColor: '#F0F0F0', // 传递的颜色值，仅支持十六进制颜色 + animation: { // 可选项 + duration: 500, + timingFunc: 'easeIn' + } + }) + this.doGetMineOrderList() + }, + inputKeywords(e) { + this.setData({ + keywords: e.detail.value + }) + }, + //刷新列表 + doRefreshList() { + console.log('正在刷新...') + const _self = this + _self.setData({ + listRefreshTrig: true, + loadingState: 'loading', + hasMore: true, + 'pageData.page': 1, + 'pageData.keywords': _self.data.keywords, + isLoadMore: false + }) + _self.doGetMineOrderList(true) + }, + //加载更多 + doLoadMore() { + //判断是否正在加载中 与是否存在更多数据 + const _self = this + if (_self.data.isLoadMore || !_self.data.hasMore) { + return + } + _self.setData({ + isLoadMore: true, + 'pageData.page': ++_self.data.pageData.page, + keywords: _self.data.keywords + }) + _self.doGetMineOrderList(false) + }, + //获取我的订单列表 isRefresh false 加载更多 true 刷新 + doGetMineOrderList(isRefresh) { + const _self = this + _self.setData({ + orderList: isRefresh ? [] : _self.data.orderList, + loadingState: isRefresh ? 'loading' : '' + }) + UserApi.doGetMineOrder(_self.data.pageData) + .then(res => { + var status = 'success' + status = res.rows && res.rows.length > 0 ? 'success' : 'empty' + _self.setData({ + loadingState: isRefresh ? status : '', + orderList: _self.data.orderList.concat(res.rows), + listRefreshTrig: false, + isLoadMore: false + }) + _self.setData({ + hasMore: _self.data.orderList.length < res.total + }) + }, err => { + _self.setData({ + loadingState: 'error', + listRefreshTrig: false, + isLoadMore: false, + hasMore: true + }) + }) + }, + //清除搜索内容 + clearSearch() { + const _self = this + _self.setData({ + keywords: '' + }) + _self.doRefreshList() + }, + //发起搜索 + doSearchKeyWord() { + const _self = this + _self.doRefreshList() + } +}) \ No newline at end of file diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.json b/pages/mine/mineAccount/mineOrder/mineOrder.json new file mode 100644 index 0000000..d5ea87a --- /dev/null +++ b/pages/mine/mineAccount/mineOrder/mineOrder.json @@ -0,0 +1,6 @@ +{ + "usingComponents": { + "mp-loading": "weui-miniprogram/loading/loading", + "container-loading": "/components/container-loading/container-loading" + } +} \ No newline at end of file diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.wxml b/pages/mine/mineAccount/mineOrder/mineOrder.wxml new file mode 100644 index 0000000..5148990 --- /dev/null +++ b/pages/mine/mineAccount/mineOrder/mineOrder.wxml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + 订单号:{{item.orderNo}} + {{tools.orderStatus(item.orderStatus)}} + + + + {{detail.productName}} + + {{tools.proType(detail.productType)}} + 数量{{detail.quantity}} + 单价{{detail.unitPrice}} + 总金额{{item.totalAmount}} + + + 订单备注 + {{detail.notes}} + + + 商品描述 + {{detail.productDescription}} + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.wxss b/pages/mine/mineAccount/mineOrder/mineOrder.wxss new file mode 100644 index 0000000..2dafddb --- /dev/null +++ b/pages/mine/mineAccount/mineOrder/mineOrder.wxss @@ -0,0 +1,175 @@ +page { + background: linear-gradient(to bottom, #F0F0F0, #FFFFFF); +} + +.search-box { + position: fixed; + top: 0; + left: 0; + width: 100vw; + +} + +.search-container { + position: relative; + align-self: center; + border-radius: 5px; + background-color: rgba(255, 255, 255, 1); + font-family: -regular; + margin: 10px; + padding: 5px; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; +} + +.search-input { + width: 100%; + box-sizing: border-box; + color: rgba(16, 16, 16, 1); + font-size: 14px; + text-align: center; +} + +.search-input::after { + content: ''; + position: absolute; + left: 10px; + top: 50%; + transform: translateY(-50%); + width: 20px; + height: 20px; + margin-top: -1px; + background-size: cover; + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSI2NCA2NCA4OTYgODk2IiB3aWR0aD0iMTQiIGhlaWdodD0iMTkiIHN0eWxlPSIiIGZpbHRlcj0ibm9uZSI+CiAgICAKICAgIDxnPgogICAgPHBhdGggZD0iTTkwOS42IDg1NC41TDY0OS45IDU5NC44QzY5MC4yIDU0Mi43IDcxMiA0NzkgNzEyIDQxMmMwLTgwLjItMzEuMy0xNTUuNC04Ny45LTIxMi4xLTU2LjYtNTYuNy0xMzItODcuOS0yMTIuMS04Ny45cy0xNTUuNSAzMS4zLTIxMi4xIDg3LjlDMTQzLjIgMjU2LjUgMTEyIDMzMS44IDExMiA0MTJjMCA4MC4xIDMxLjMgMTU1LjUgODcuOSAyMTIuMUMyNTYuNSA2ODAuOCAzMzEuOCA3MTIgNDEyIDcxMmM2NyAwIDEzMC42LTIxLjggMTgyLjctNjJsMjU5LjcgMjU5LjZhOC4yIDguMiAwIDAgMCAxMS42IDBsNDMuNi00My41YTguMiA4LjIgMCAwIDAgMC0xMS42ek01NzAuNCA1NzAuNEM1MjggNjEyLjcgNDcxLjggNjM2IDQxMiA2MzZzLTExNi0yMy4zLTE1OC40LTY1LjZDMjExLjMgNTI4IDE4OCA0NzEuOCAxODggNDEyczIzLjMtMTE2LjEgNjUuNi0xNTguNEMyOTYgMjExLjMgMzUyLjIgMTg4IDQxMiAxODhzMTE2LjEgMjMuMiAxNTguNCA2NS42UzYzNiAzNTIuMiA2MzYgNDEycy0yMy4zIDExNi4xLTY1LjYgMTU4LjR6IiBmaWxsPSJyZ2JhKDIwNCwyMDQsMjA0LDEpIj48L3BhdGg+CiAgICA8L2c+CiAgPC9zdmc+'); +} + + +.content-container { + height: 86vh; + margin-top: 50px; +} + + +.order-box { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 100vw; +} + +.order-item { + display: flex; + flex-direction: column; + width: 100vw; +} + +.order-item:nth-of-type(n+2) { + margin-top: 15px; +} + +.order-title { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 87vw; + padding: 8px 17px; + background-color: #7AC483; +} + +.order-no { + color: rgba(39, 28, 0, 1); + font-size: 12px; + text-align: left; +} + +.order-status { + color: rgba(39, 28, 0, 1); + font-size: 12px; + text-align: left; +} + +.order-content { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; + background-color: white; + padding: 17px; +} + +.order-caption { + line-height: 25px; + color: rgba(16, 16, 16, 1); + font-size: 18px; + text-align: left; + font-family: SourceHanSansSC-medium; +} + +.order-types { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 87vw; + margin-top: 15px; +} + +.or-type { + color: rgba(16, 16, 16, 1); + font-size: 14px; + text-align: left; + font-family: PingFangSC-regular; +} + +.or-count { + color: rgba(16, 16, 16, 1); + font-size: 14px; + text-align: left; + font-family: PingFangSC-regular; +} + +.or-price { + color: rgba(16, 16, 16, 1); + font-size: 14px; + text-align: left; + font-family: PingFangSC-regular; +} + +.or-total { + color: rgba(16, 16, 16, 1); + font-size: 16px; + text-align: left; + font-family: PingFangSC-medium; +} + +.order-remark-box { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + margin-top: 10px; + width: 87vw; +} + +.order-remark-title { + color: rgba(16, 16, 16, 1); + font-size: 14px; + text-align: left; + font-family: PingFangSC-regular; +} + +.order-remark-content { + color: rgba(16, 16, 16, 1); + font-size: 10px; + text-align: left; + font-family: PingFangSC-light; + border-radius: 5px; + background-color: rgba(239, 239, 239, 1); + flex: 1; + padding: 7px 10px; + margin-left: 10px; +} \ No newline at end of file diff --git a/pages/mine/mineIndex/mine.js b/pages/mine/mineIndex/mine.js index aed12e6..3e97efe 100644 --- a/pages/mine/mineIndex/mine.js +++ b/pages/mine/mineIndex/mine.js @@ -1,5 +1,8 @@ // pages/mine/mine.js import UserApi from '../../../net/api/userApi' +import { + copyrightUrl +} from '../../../net/http' const Utils = require('../../../utils/util') const app = getApp() const deviceInfo = wx.getDeviceInfo() @@ -21,56 +24,21 @@ Page({ materialCount: 0, accountInfo: {}, menuList: [{ - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "个人信息" + "icon": "ic-user", + "title": "个人信息", + "path": "/pages/mine/mineAccount/mineInfo/mineInfo" }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "修改密码" + "icon": "ic-order", + "title": "我的订单", + "path": "/pages/mine/mineAccount/mineOrder/mineOrder" }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "我的订单" + "icon": "ic-invoice", + "title": "发票管理", + "path": "" }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "发票管理" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权所属人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" - }, { - "icon": "https://img.icons8.com/?size=100&id=OZzk5umGngVd&format=png&color=000000", - "title": "产权联系人" + "icon": "ic-contact", + "title": "产权联系人", + "path": "/pages/mine/mineAccount/mineInfo/mineInfo" }] }, @@ -129,5 +97,28 @@ Page({ wx.navigateTo({ url: '/pages/copyright/payment/payment', }) + }, + //条目点击 + itemClick(e) { + const path = e.currentTarget.dataset.path + if (path == '') { + wx.showModal({ + title: '提示', + content: `鉴于功能特性，需在电脑端完成操作。请打开浏览器，输入网址${copyrightUrl}，进行后续操作。`, + complete: (res) => { + if (res.cancel) { + + } + + if (res.confirm) { + + } + } + }) + } else { + wx.navigateTo({ + url: path, + }) + } } }) \ No newline at end of file diff --git a/pages/mine/mineIndex/mine.wxml b/pages/mine/mineIndex/mine.wxml index 1768c00..9dc14ee 100644 --- a/pages/mine/mineIndex/mine.wxml +++ b/pages/mine/mineIndex/mine.wxml @@ -36,11 +36,14 @@ - - - - {{item.title}} - + + + + + {{item.title}} + + + diff --git a/pages/mine/mineIndex/mine.wxss b/pages/mine/mineIndex/mine.wxss index a8bf13d..e350572 100644 --- a/pages/mine/mineIndex/mine.wxss +++ b/pages/mine/mineIndex/mine.wxss @@ -137,9 +137,23 @@ flex-direction: row; padding: 30rpx 40rpx; align-items: center; - border-bottom: 1rpx solid rgb(245, 244, 244); margin-left: 20rpx; margin-right: 20rpx; + width: 75vw; +} + +.menu-container { + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-start; +} + +.divider-padding { + background-color: #efefef6b; + height: 1px; + width: 75vw; + align-self: center; } .menu-icon { @@ -151,4 +165,41 @@ font-size: 28rpx; color: black; margin-left: 20rpx; +} + +.menu-item:active { + background-color: rgba(243, 243, 243, 0.685); + border-radius: 20px; +} + +.ic-user { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNjUwMjM5MzQ1IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjUyNzEiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMS45OTQyNjQgMEMyMjkuMjMxODE0IDAgMCAyMjkuMjIwMzQxIDAgNTExLjk5NDI2NHMyMjkuMjMxODE0IDUxMS45OTQyNjQgNTExLjk5NDI2NCA1MTEuOTk0MjY0IDUxMi4wMDU3MzYtMjI5LjIyMDM0MSA1MTIuMDA1NzM2LTUxMS45OTQyNjRTNzk0Ljc2ODE4NiAwIDUxMS45OTQyNjQgMHpNMzQ2LjA0NDcwMiAzNTcuOTQxNjc0YzUuNTI5NzQtODMuOTMyNzM0IDcwLjk5MTc2NS0xMzguMzgxMTY5IDE0MS40OTAyMTQtMTQ4LjA5ODM2OCAzLjkwMDY0Ni0wLjUzOTIwNyA3LjY3NTA5Ni0xLjkzODg1MSAxMS40NzI0OS0yLjkzNjk1N2gyNy40NTM2NjdjMjcuNTMzOTc1IDMuNTc5NDE3IDUyLjE3Njg4MiAxMy43NjY5ODcgNzYuNTEwMDMzIDI3LjM2MTg4OCA2NS4wMTQ1OTggMzYuMTg0MjMyIDg4LjI0NjM5IDExNy4yNzE3ODggNjguMzg3NTEgMTgyLjEzNzI0NC0yNC4xNjEwNjMgNzguOTA3NzgzLTExMi4zNjE1NjMgMTI4Ljk1MDc4My0xOTUuMTgxNDY1IDExMS4xMTEwNjEtNzkuNTYxNzE1LTE3LjE1MTM3Mi0xMzUuMTY4ODcyLTkzLjUzNTIwNy0xMzAuMTMyNDQ5LTE2OS41NDA0NXogbTQyNS40MjI4NTggNDEwLjI3OTE3MWMtMzAuMTM4MjMgMTkuMzg4NTA3LTY1LjA2MDQ4OCAyOC40ODYxOTItMTAwLjYxMzczMyAzMy4xODk5MTMtNTMuOTIwNzAxIDcuMTEyOTQ0LTEwOC4zNDYxOTEgMTEuMTE2ODQyLTEzOS4xNzI3NzEgMTQuMTU3MDUyLTk1LjIyMTY2My0yLjM4NjI3OC0xNjYuODY3MzYxLTQuNjQ2MzU4LTIzNS4zMDA3NjEtMjYuMTU3Mjc2LTc1LjU5MjIzNC0yMy43ODI0NzEtNzMuMTgzMDExLTQzLjM3NzQ4My02MS4xNDgzNjktOTYuNjkwMTQyIDE3LjI4OTA0Mi03Ni42MTMyODUgNjUuMDM3NTQzLTEzNC40MTE2ODggMTQyLjEzMjY3My0xNzAuNjk5MTcyYTI3LjAxNzcxMyAyNy4wMTc3MTMgMCAwIDEgNS4xODU1NjUtMS43NjY3NjQgMTk2LjAzMDQyOSAxOTYuMDMwNDI5IDAgMCAwIDgzLjAzNzg4IDQwLjM5NDYzNmM2My4yNDc4MzUgMTMuNjE3ODQ1IDEyOS4wNzY5OC01LjUwNjc5NSAxNzYuMzY2NTgxLTQ1LjQ4ODQyMWExMi4wNTc1ODcgMTIuMDU3NTg3IDAgMCAxIDEuODEyNjU0IDAuNjc2ODc3cTEzOS4zNTYzMzEgNjYuNDQ4NjU5IDE1MS4xODQ0NjcgMjA5LjMzODUxN2MxLjYxNzYyMSAxOS4xMjQ2NC03LjI5NjUwMyAzMi42NTA3MDUtMjMuNDg0MTg2IDQzLjA0NDc4eiIgZmlsbD0iI0U5OUQ0MiIgcC1pZD0iNTI3MiI+PC9wYXRoPjwvc3ZnPg=='); + background-size: cover; + background-repeat: no-repeat; + width: 24px; + height: 24px; +} + +.ic-order { + background-repeat: no-repeat; + background-size: cover; + width: 24px; + height: 24px; + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNjUwNDc1MzQ1IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjgzMDUiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTMxOS41MjEwMzIgOTYuNDIxMTYxIDQwMC42ODEyOSA5Ni40MjExNjFDNDA4LjY0MjA2NSA0NC40MjgzODcgNDUzLjMzNDcxIDQuNDkyMzg3IDUwNy41NzM2NzcgNC40OTIzODcgNTYxLjgxMjY0NSA0LjQ5MjM4NyA2MDYuNDM5MjI2IDQ0LjQyODM4NyA2MTQuNDY2MDY1IDk2LjQyMTE2MUw2OTguNDAxMDMyIDk2LjQyMTE2MSA2OTguNDAxMDMyIDIyOC4yNTI5MDMgMzE5LjQ4OCAyMjguMjUyOTAzIDMxOS40ODggOTYuNDIxMTYxIDMxOS41MjEwMzIgOTYuNDIxMTYxWk05MjQuMTc2NTE2IDg5MC4yNTIzODdDOTI0LjE3NjUxNiA5NTcuOTY4NTE2IDg2OS4zMDk5MzUgMTAxMi44NjgxMjkgODAxLjYyNjgzOSAxMDEyLjg2ODEyOUwyMjAuMTkzMDMyIDEwMTIuODY4MTI5QzE1Mi40NDM4NzEgMTAxMi44NjgxMjkgOTcuNjQzMzU1IDk1Ny45Njg1MTYgOTcuNjQzMzU1IDg5MC4yNTIzODdMOTcuNjQzMzU1IDIyMS41ODAzODdDOTcuNjQzMzU1IDE1My44OTcyOSAxNTIuNDQzODcxIDk5LjAzMDcxIDIyMC4xOTMwMzIgOTkuMDMwNzFMMjQ0LjMzOTYxMyA5OS4wMzA3MSAyNDQuMzM5NjEzIDMwOS41MTIyNTggNzc3LjQ0NzIyNiAzMDkuNTEyMjU4IDc3Ny40NDcyMjYgOTkuMDMwNzEgODAxLjU5MzgwNiA5OS4wMzA3MUM4NjkuMjc2OTAzIDk5LjAzMDcxIDkyNC4xNDM0ODQgMTUzLjg5NzI5IDkyNC4xNDM0ODQgMjIxLjU4MDM4N0w5MjQuMTQzNDg0IDg5MC4yNTIzODcgOTI0LjE3NjUxNiA4OTAuMjUyMzg3WiIgZmlsbD0iI0ZDQ0EwMCIgcC1pZD0iODMwNiI+PC9wYXRoPjwvc3ZnPg=='); +} + +.ic-invoice { + background-repeat: no-repeat; + background-size: cover; + width: 24px; + height: 24px; + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNjUwNjQ1Mzg5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9Ijk0OTIiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTkyNi40MjEzMzMgMTU3LjEydjM0MS4zMzMzMzNINzk3LjAxMzMzM2wwLjAyMTMzNCA0MDQuMDEwNjY3LTE1Ni4yNjY2NjctNzcuMzc2LTEzMi4xMzg2NjcgNjYuNzczMzMzLTEzMi4xMzg2NjYtNjYuNzczMzMzLTE1NS40NTYgNzYuOC0wLjAyMTMzNC00MDMuNDM0NjY3SDk0LjQyMTMzM3YtMzQxLjMzMzMzM2g4MzJ6IG0tMTkzLjQwOCAyMDIuNjQ1MzMzaC00NDh2NDM5LjEyNTMzNGw5MS43OTczMzQtNDUuMzMzMzM0IDEzMS44MTg2NjYgNjYuNTYgMTMxLjg4MjY2Ny02Ni41NiA5Mi41MDEzMzMgNDUuNzgxMzM0VjM1OS43NjUzMzN6IG0tOTYuMDY0IDI0NC4yMDI2Njd2NjRoLTI1NnYtNjRoMjU2eiBtMC0xNDcuMDUwNjY3djY0aC0yNTZ2LTY0aDI1NnogbTIyNS40NzItMjM1LjgxODY2NmgtNzA0djIxMy4zMzMzMzNoNjIuNTkybDAuMDIxMzM0LTEzOC42NjY2NjdoNTc2bC0wLjAyMTMzNCAxMzguNjY2NjY3aDY1LjQwOHYtMjEzLjMzMzMzM3oiIGZpbGw9IiMxNjc3RkYiIHAtaWQ9Ijk0OTMiPjwvcGF0aD48L3N2Zz4='); +} + +.ic-contact { + background-repeat: no-repeat; + background-size: cover; + width: 24px; + height: 24px; + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNjUxMDYwODE4IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM0MzM1IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik05MjQuNDYzNTE4IDE3OS43MTMwMzUgOTguNDU5OTY0IDE3OS43MTMwMzVjLTE5LjI5MjM5MiAwLTM0LjkzMjYwNCAxNS42NDAyMTItMzQuOTMyNjA0IDM0LjkzMjYwNGwwIDU5My4yOTc1ODRjMCAxOS4yOTEzNjggMTUuNjQwMjEyIDM0LjkzMDU1NyAzNC45MzI2MDQgMzQuOTMwNTU3bDgyNi4wMDM1NTQgMGMxOS4yOTEzNjggMCAzNC45MzE1OC0xNS42MzkxODkgMzQuOTMxNTgtMzQuOTMwNTU3TDk1OS4zOTUwOTggMjE0LjY0NTYzOEM5NTkuMzk1MDk4IDE5NS4zNTMyNDYgOTQzLjc1NDg4NiAxNzkuNzEzMDM1IDkyNC40NjM1MTggMTc5LjcxMzAzNXpNNTQyLjgwNDA3NSAzNjcuNTUyMTQ0bDMzMS45MzQ5NDggMCAwIDY0LjUyMzU0OUw1NDIuODA0MDc1IDQzMi4wNzU2OTMgNTQyLjgwNDA3NSAzNjcuNTUyMTQ0ek01NDIuODA0MDc1IDQ5My4wMjY4OGwzMzEuOTM0OTQ4IDAgMCA2NC41MjM1NDlMNTQyLjgwNDA3NSA1NTcuNTUwNDI5IDU0Mi44MDQwNzUgNDkzLjAyNjg4ek0zMzQuOTY5NTYzIDI3MS43MjM2MTFjOTEuODk4MDEzIDAgOTIuMDQyMjk5IDcwLjMwNDIwNiA5Mi4wNDIyOTkgMTA5Ljg3MjM4NyAwIDM5LjUzNDQxMi0zNi43OTkxMTQgMTEyLjk4NzMzMS05Mi4wNDIyOTkgMTEzLjA3NTMzNS01NS4xODQ4NTcgMC4wODgwMDQtOTIuMDQyMjk5LTczLjU0MDkyMy05Mi4wNDIyOTktMTEzLjA3NTMzNUMyNDIuOTI4Mjg3IDM0Mi4wNTY0NyAyNDMuMTAxMjI1IDI3MS43MjM2MTEgMzM0Ljk2OTU2MyAyNzEuNzIzNjExek0xNzkuNDM5MyA1NTIuNDQ4MjI0YzIzLjY4NjQ2OS0xOC4zMjYzOTEgOTEuODA4OTg2LTQ4Ljk0MzcxMiA5MS44MDg5ODYtNDguOTQzNzEybDQzLjAwNjQ5IDgxLjgxMTI4NCA3Ljg2NjE1NS0xOS44NDYtMTIuMTUwNzM4LTI0LjQ0MzcxNSAyNC4yNDIxMjQtMjQuNDc0NDE0IDI0LjI0MDA3NyAyNC40NzQ0MTQtMTIuMTE5MDE1IDI0LjQ0MzcxNSA2LjU1NjMyMyAxOS4zNzgzNDkgNDQuMjU3OTkzLTgxLjM0MzYzM2MwIDAgMjEuNzAyMjc4IDkuNzg0ODU0IDQ0LjgwOTU1NSAyMS41NTkwMTVsMC4wMzA2OTkgMCAwIDEwMS42ODM4OUwxNDUuMzc4NTUzIDYyNi43NDc0MTdDMTQ1LjM3ODU1MyA2MjYuNzQ4NDQxIDE1NS44MTQyMyA1NzAuODk5NDU4IDE3OS40MzkzIDU1Mi40NDgyMjR6TTg3Ny41NDM5MDUgNzYwLjEyMDAzMWwtNzMyLjE2NTM1MiAwTDE0NS4zNzg1NTMgNjk1LjU5NTQ1OGw3MzIuMTY1MzUyIDBMODc3LjU0MzkwNSA3NjAuMTIwMDMxeiIgZmlsbD0iI0ZDQ0EwMCIgcC1pZD0iMzQzMzYiPjwvcGF0aD48L3N2Zz4='); } \ No newline at end of file diff --git a/static/style/icon.wxss b/static/style/icon.wxss index 7b4b6f1..09a401b 100644 --- a/static/style/icon.wxss +++ b/static/style/icon.wxss @@ -60,4 +60,28 @@ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQyOTczMTgzNTk0IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDExMjkgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI1MTE0IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik04NjguOTUxNzc5MTggMjE1LjM0Njc4NDY4SDI3NC4xMTMxMjk5NGMtMTAuMjY3NDk2MjcgMC0xOS4wMDI3NzQ2NiAzLjYxNTE2MTgtMjYuMzA5NDM2NTMgMTAuODg5MTA3MzktNy4yMjQ4NzExMyA3LjIzMDMyNDMzLTEwLjg5NDU2MDU4IDE1Ljk3NjUwNzY4LTEwLjg5NDU2MDU5IDI2LjIwNTgzNTE1djM3MC43NTg1ODQ1M2MwIDEwLjI0MDIzMjQ1IDMuNjY5Njg5NDYgMTguOTUzNzAwMjIgMTAuODk0NTYwNTkgMjYuMjI3NjQ1NzkgNy4zMDY2NjI1OSA3LjIyNDg3MTEzIDE2LjA0MTk0MDk5IDEwLjg2MTg0NDI5IDI2LjMwOTQzNjUzIDEwLjg2MTg0NDI5aDU5NC44Mzg2NDkyNGMxMC4yODM4NTQ0MiAwIDE5LjA0MDk0NDE1LTMuNjM2OTczMTUgMjYuMjgyMTczNDQtMTAuODYxODQ0MjkgNy4zMDEyMDk0MS03LjI3Mzk0NTU4IDEwLjkyMTgyNDQtMTUuOTg3NDEzMzQgMTAuOTIxODI0MzktMjYuMjI3NjQ1NzlWMjUyLjQ0MTcyNzIyYzAtMTAuMjI5MzI3NS0zLjYyMDYxNTAxLTE4Ljk3NTUxMDgzLTEwLjkyNzI3Njg2LTI2LjIwNTgzNTE2LTcuMjM1Nzc2ODEtNy4yNzM5NDU1OC0xNS45OTI4NjU4Mi0xMC44ODkxMDgxLTI2LjI3NjcyMDk3LTEwLjg4OTEwNzM4TTI3NC4wOTEzMTkzMSAxNDEuMjExNDI1NzhoNTk0LjgzODY0OTI0YzMwLjc3NTIyNTcyIDAgNTcuMDczNzU2NTcgMTAuODY3Mjk2NzYgNzguODYyODc3NzMgMzIuNTk2NDM4NTMgMjEuNzg5MTIxMTYgMjEuNzQwMDQ2NzEgMzIuNjYxODcxMTIgNDcuOTE4NjE4MDYgMzIuNjYxODcxMTQgNzguNjI4NDEwNDV2MzcwLjc2NDAzNjk5YzAgMzAuNjg3OTgxNzYtMTAuODcyNzQ5OTYgNTYuOTE1NjI3NTYtMzIuNjYxODcxMTQgNzguNjMzODYyOTMtMjEuNzg5MTIxMTYgMjEuNzI5MTQxMDUtNDguMDg3NjUyNzQgMzIuNTk2NDM4NTMtNzguODYyODc3NzMgMzIuNTk2NDM4NTFINjA4LjY4NzM3Nzk2djc0LjE1NzE2OTUzaDExMS41NDY1NjAyYzEwLjI2MjA0Mzc5IDAgMTkuMDMwMDM4NDkgMy42MTUxNjE4IDI2LjI4MjE3MzQ0IDEwLjg4OTEwODEgNy4yOTAzMDQ0NSA3LjIyNDg3MTEzIDEwLjkxMDkxODc0IDE1Ljk3NjUwNzY4IDEwLjkxMDkxODcyIDI2LjIwNTgzNTE4IDAgMTAuMjQwMjMyNDUtMy42MjA2MTUwMSAxOC45ODY0MTY1MS0xMC45MTYzNzE5MiAyNi4yMDAzODE5NS03LjI1MjEzNDk2IDcuMjg0ODUxMjUtMTYuMDE0Njc3MTcgMTAuOTAwMDEzMDUtMjYuMjc2NzIwMjQgMTAuOTAwMDEzNzlINDIyLjgwMzcwNzg3Yy0xMC4yNzg0MDE5NSAwLTE5LjAxOTEzMjgtMy42MTUxNjE4LTI2LjMwOTQzNzI4LTEwLjkwMDAxMzc5LTcuMjUyMTM0OTYtNy4yMTM5NjYxOC0xMC44OTQ1NjA1OC0xNS45NjAxNDk1Mi0xMC44OTQ1NjA1Ni0yNi4yMDAzODE5NSAwLTEwLjIzNDc3OTk4IDMuNjQ3ODc4MS0xOC45NzU1MTA4MyAxMC44OTQ1NjA1Ni0yNi4yMDU4MzUxOCA3LjI5MDMwNDQ1LTcuMjczOTQ1NTggMTYuMDMxMDM1MzEtMTAuODg5MTA4MSAyNi4zMDk0MzcyOC0xMC44ODkxMDgxaDExMS41MzU2NTQ1MnYtNzQuMTU3MTY5NTNIMjc0LjA5MTMxOTMxYy0zMC43OTcwMzYzMyAwLTU3LjA5MDExNTQ0LTEwLjg2NzI5Njc2LTc4Ljg2Mjg3ODQ1LTMyLjU5NjQzODUxQzE3My40MzkzMTk2OCA2ODAuMTE1OTM5MzEgMTYyLjU0NDc1OTExIDY1My44ODgyOTM1MSAxNjIuNTQ0NzU5MTEgNjIzLjIwMDMxMTc1VjI1Mi40NDE3MjcyMkMxNjIuNTQ0NzU5MTEgMjIxLjcyNjQ4MjM2IDE3My40MzkzMTk2OCAxOTUuNTQ3OTExMDIgMTk1LjIyODQ0MDg2IDE3My44MDc4NjQzMSAyMTcuMDA2NjU3MDYgMTUyLjA3ODcyMjU0IDI0My4yOTQyODI5OCAxNDEuMjExNDI1NzggMjc0LjA5MTMxOTMxIDE0MS4yMTE0MjU3OCIgcC1pZD0iMjUxMTUiIGZpbGw9IiM1RDM5MDAiPjwvcGF0aD48L3N2Zz4='); background-repeat: no-repeat; background-size: contain; +} + +.ic-pdf { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNjU5NzI1NDQxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2NDMwIiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiPjxwYXRoIGQ9Ik02MTYuNzQ2NjY3IDg1LjMzMzMzM0w4OTYgMzQ3LjkwNFY4NTMuMzMzMzMzYTg1LjMzMzMzMyA4NS4zMzMzMzMgMCAwIDEtODUuMzMzMzMzIDg1LjMzMzMzNEgyMTMuMzMzMzMzYTg1LjMzMzMzMyA4NS4zMzMzMzMgMCAwIDEtODUuMzMzMzMzLTg1LjMzMzMzNFYxNzAuNjY2NjY3YTg1LjMzMzMzMyA4NS4zMzMzMzMgMCAwIDEgODUuMzMzMzMzLTg1LjMzMzMzNGg0MDMuNDEzMzM0eiBtMjQ0LjM1MiAyOTUuMzgxMzM0TDU4MS44MDI2NjcgMTE4LjE4NjY2N3YxNzcuMjM3MzMzYTg1LjMzMzMzMyA4NS4zMzMzMzMgMCAwIDAgODUuMzMzMzMzIDg1LjMzMzMzM2gxOTMuOTYyNjY3ek0yMzIuNzQ2NjY3IDUxMnYyMjQuODEwNjY3aDI4LjA3NDY2NnYtMTAyLjU3MDY2N2gxNC4zNzg2NjdjMjcuNjQ4IDAgNDYuOTMzMzMzLTEuMTA5MzMzIDU3LjgxMzMzMy0zLjI0MjY2NyAxMC44OC0yLjEzMzMzMyAyMC4wNTMzMzMtNS44NDUzMzMgMjcuNjA1MzM0LTExLjA5MzMzMyA3LjUwOTMzMy01LjE2MjY2NyAxMy4yNjkzMzMtMTEuNzc2IDE3LjI4LTE5Ljc1NDY2NyA0LjA1MzMzMy03Ljk3ODY2NyA2LjA1ODY2Ny0xNy4wMjQgNi4wNTg2NjYtMjcuMDUwNjY2cy0yLjA0OC0xOS4wMjkzMzMtNi4xODY2NjYtMjcuMDA4YTU2LjY2MTMzMyA1Ni42NjEzMzMgMCAwIDAtMTcuMTUyLTE5Ljk2OCA2NS45NjI2NjcgNjUuOTYyNjY3IDAgMCAwLTI0LjAyMTMzNC0xMS4wNTA2NjdDMzI3Ljg5MzMzMyA1MTMuMDI0IDMwOS41ODkzMzMgNTEyIDI4MS43MjggNTEySDIzMi43NDY2Njd6IG0yOC4wNzQ2NjYgOTYuNzI1MzMzdi03MC45MTJoMzkuMjEwNjY3YzM2LjU2NTMzMyAwIDU0Ljg2OTMzMyAxMS42NDggNTQuODY5MzMzIDM0Ljk4NjY2N2EzMy4yOCAzMy4yOCAwIDAgMS0xMS45NDY2NjYgMjYuMTEyYy03LjkzNiA2Ljk1NDY2Ny0yMi45MTIgMTAuMjQtNDQuODg1MzM0IDkuODEzMzMzaC0zNy4yNDh6TTQyNi4xMTIgNTEydjIyNC44MTA2NjdoNzcuMDU2YzMyIDAgNTYuMzItNC43Nzg2NjcgNzMuMDAyNjY3LTE0LjI5MzMzNCAxNi42NC05LjUxNDY2NyAyOS41MjUzMzMtMjIuNzQxMzMzIDM4LjU3MDY2Ni0zOS42MzczMzMgOS4wMDI2NjctMTYuODUzMzMzIDEzLjUyNTMzMy0zNC44NTg2NjcgMTMuNTI1MzM0LTUzLjg4OCAwLTE5LjAyOTMzMy0zLjAyOTMzMy0zNS44NC05LjEzMDY2Ny01MC4zNDY2NjdhMTAwLjg2NCAxMDAuODY0IDAgMCAwLTI2LjI4MjY2Ny0zNi45OTIgMTA4LjMzMDY2NyAxMDguMzMwNjY3IDAgMCAwLTQwLjY2MTMzMy0yMi40NDI2NjZjLTE1LjcwMTMzMy00LjgyMTMzMy00MC43NDY2NjctNy4yMTA2NjctNzUuMTM2LTcuMjEwNjY3SDQyNi4xMTJ6IG0yNy4wOTMzMzMgMTk5LjU5NDY2N3YtMTczLjc4MTMzNGgxNC4zNzg2NjdjMjYuNzk0NjY3IDAgNDcuMzYgMS4yOCA2MS43Mzg2NjcgMy44NCAxNC4zNzg2NjcgMi41NiAyNi44OCA3LjY4IDM3LjU0NjY2NiAxNS4zNnMxOC45MDEzMzMgMTcuNTc4NjY3IDI0LjY2MTMzNCAyOS43ODEzMzRjNS43NiAxMi4xNiA4LjY2MTMzMyAyNS40MjkzMzMgOC42NjEzMzMgMzkuNzY1MzMzIDAgMTQuMzM2LTIuNDMyIDI2Ljk2NTMzMy03LjMzODY2NyAzNy45MzA2NjdhNzQuMjgyNjY3IDc0LjI4MjY2NyAwIDAgMS0yMS40MTg2NjYgMjcuNzMzMzMzYy05LjM4NjY2NyA3LjU5NDY2Ny0yMC4zNTIgMTIuNzE0NjY3LTMyLjk4MTMzNCAxNS4zNi0xMi42MjkzMzMgMi42ODgtMzIuNzY4IDQuMDEwNjY3LTYwLjQxNiA0LjAxMDY2N2gtMjQuODMyeiBtMzM4LjA0OC04Mi45MDEzMzR2LTI2LjExMmgtOTQuMDM3MzMzdi02NC40NjkzMzNoOTQuMDM3MzMzVjUxMmgtMTIyLjE1NDY2NnYyMjQuODEwNjY3aDI4LjExNzMzM3YtMTA4LjExNzMzNGg5NC4wMzczMzN6IiBmaWxsPSIjRUE1NDU0IiBwLWlkPSIyNjQzMSI+PC9wYXRoPjwvc3ZnPg=='); + background-size: cover; + background-repeat: no-repeat; +} + +.ic-txt { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNjU5NzY3NTYzIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI3NDkzIiB3aWR0aD0iMzIiIGhlaWdodD0iMzIiPjxwYXRoIGQ9Ik04MzIuODcgMzE1LjYzYzEuMDMtMTcuNTUtNS4xNS0zNS40NC0xOC41Ni00OC44NUw3MDEuMzUgMTUzLjgyYy0xMS42Mi0xNS42Ny0zMC4yNi0yNS44My01MS4yNy0yNS44M0gyNTYuODNjLTI2LjUyIDAtNDkuMjUgMTYuMTgtNTguODggMzkuMjFhNjMuNTYgNjMuNTYgMCAwIDAtNS4wNSAyNC45MVY1NDVoLTI0Ljg4Yy0yMi4wOSAwLTQwIDE3LjkxLTQwIDQwdjE0Mi44YzAgMjIuMDkgMTcuOTEgNDAgNDAgNDBoMjQuODh2NzAuNDhoMC40NmMzLjI2IDMyLjE4IDMwLjQzIDU3LjI5IDYzLjQ3IDU3LjI5aDUxMi4zOXYwLjA2YzM1LjIzIDAgNjMuNzktMjguNTYgNjMuNzktNjMuNzlWMzE5Ljc1YzAuMDEtMS4zOS0wLjA1LTIuNzYtMC4xNC00LjEyek0yMjcuNTIgNjE2LjY3di0zMi41OWgxMDcuNnYzMi41OWgtMzUuODd2MTE2LjE0aC0zNS44N1Y2MTYuNjdoLTM1Ljg2eiBtNTQxLjcgMjE1LjExSDI1Ni43Vjc2Ny44aDQwNi42NGMyMi4wOSAwIDQwLTE3LjkxIDQwLTQwVjU4NWMwLTIyLjA5LTE3LjkxLTQwLTQwLTQwSDI1Ni43VjE5MS43OGgzMjcuNTF2MTIxLjQ1YzAgMzUuMjMgMjguNTYgNjMuNzkgNjMuNzkgNjMuNzloMTIxLjIydjQ1NC43NnogbS00MjUuMDgtMjQ3LjdoNDAuNzlsMjEuMzIgNDEuOTkgMjEuMzItNDEuOTloNDAuNzlsLTQyLjYzIDcyLjQ5IDQ1LjUgNzYuMjVoLTQwLjk5bC0yMy45OC00NS43NS0yMy45OCA0NS43NWgtNDAuOTlsNDUuNS03Ni4yNS00Mi42NS03Mi40OXogbTEzMy4yMiAzMi41OXYtMzIuNTloMTA3LjZ2MzIuNTlINTQ5LjF2MTE2LjE0aC0zNS44N1Y2MTYuNjdoLTM1Ljg3eiBtMjkxLjg2LTMwMy40NEg2NDhWMTkxLjc4aDEuMDlsMTIwLjEzIDEyMC4xM3YxLjMyeiIgZmlsbD0iIzI0QTBDNiIgcC1pZD0iMjc0OTQiPjwvcGF0aD48cGF0aCBkPSJNMzUxLjQ3IDMyMC4yMkg0NzkuMmMxNy43NSAwIDMyLjE0LTE0LjM5IDMyLjE0LTMyLjE0cy0xNC4zOS0zMi4xNC0zMi4xNC0zMi4xNEgzNTEuNDdjLTE3Ljc1IDAtMzIuMTQgMTQuMzktMzIuMTQgMzIuMTQgMCAxNy43NiAxNC4zOSAzMi4xNCAzMi4xNCAzMi4xNHpNNTQzLjk4IDM4NC4wNEgzNTEuNDdjLTE3Ljc1IDAtMzIuMTQgMTQuMzktMzIuMTQgMzIuMTRzMTQuMzkgMzIuMTQgMzIuMTQgMzIuMTRoMTkyLjUxYzE3Ljc1IDAgMzIuMTQtMTQuMzkgMzIuMTQtMzIuMTQtMC4wMS0xNy43NS0xNC40LTMyLjE0LTMyLjE0LTMyLjE0eiIgZmlsbD0iIzI0QTBDNiIgcC1pZD0iMjc0OTUiPjwvcGF0aD48L3N2Zz4='); + background-size: cover; + background-repeat: no-repeat; +} + +.ic-doc { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNjU5ODM3NjIxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI5NDI3IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik0yMTkuNDI0IDE4LjMwNGg1MzAuMjcybDIwMS4xNTIgMjE5LjQyNHY3NjhIMjE5LjQyNFYxOC4zMDR6IiBmaWxsPSIjRkZGRkZGIiBwLWlkPSIyOTQyOCI+PC9wYXRoPjxwYXRoIGQ9Ik03MzMuNjk2IDI1My43MjhWNTAuMzA0SDI1MS40MjR2OTIzLjQyNGg2NjcuNDI0di03MjBoLTE4NS4xNTJ6IG0yMTcuMTUyLTE2djc2OEgyMTkuNDI0VjE4LjMwNGg1MzAuMjcybDIwMS4xNTIgMjE5LjQyNHogbS01OC4wOC0xNmwtMTI3LjA0LTEzOC42MjR2MTM4LjYyNGgxMjcuMDR6IiBmaWxsPSIjNDY1Rjc4IiBwLWlkPSIyOTQyOSI+PC9wYXRoPjxwYXRoIGQ9Ik03My4xNTIgMjg4YTMyIDMyIDAgMCAxIDMyLTMyaDQ0OGEzMiAzMiAwIDAgMSAzMiAzMnY0NDhhMzIgMzIgMCAwIDEtMzIgMzJoLTQ0OGEzMiAzMiAwIDAgMS0zMi0zMlYyODh6TTY0MCA0MTZoMjI0djM3LjM0NGgtMjI0VjQxNnpNNjQwIDUwOS4zNDRoMjI0djM3LjMxMmgtMjI0di0zNy4zMTJ6TTY0MCA2MDIuNjU2aDIyNFY2NDBoLTIyNHYtMzcuMzQ0eiIgZmlsbD0iIzMxN0JGRiIgcC1pZD0iMjk0MzAiPjwvcGF0aD48cGF0aCBkPSJNMjIxLjk1MiA2NDBsLTU2LjI1Ni0yMzUuNjE2SDIxNC40bDM1LjUyIDE2MS44NTYgNDMuMDcyLTE2MS44NTZoNTYuNTc2bDQxLjI4IDE2NC41NzYgMzYuMTYtMTY0LjU3Nmg0Ny45MDRMNDE3LjY5NiA2NDBoLTUwLjQ2NGwtNDYuOTEyLTE3Ni4xNkwyNzMuNTM2IDY0MEgyMjEuOTUyeiIgZmlsbD0iI0ZGRkZGRiIgcC1pZD0iMjk0MzEiPjwvcGF0aD48L3N2Zz4='); + background-size: cover; + background-repeat: no-repeat; +} + +.icon-clear{ + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzNjcyMjA2OTExIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjMxNDUzIiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik01MTIgMzJDMjQ2LjQgMzIgMzIgMjQ2LjQgMzIgNTEyczIxNC40IDQ4MCA0ODAgNDgwIDQ4MC0yMTQuNCA0ODAtNDgwUzc3Ny42IDMyIDUxMiAzMnogbTE0MC44IDU3OS4yYzEyLjggMTIuOCAxMi44IDMyIDAgNDEuNi0xMi44IDEyLjgtMzIgMTIuOC00MS42IDBMNTEyIDU1My42bC05OS4yIDk5LjJjLTEyLjggMTIuOC0zMiAxMi44LTQxLjYgMHMtMTIuOC0zMiAwLTQxLjZsOTkuMi05OS4yLTk5LjItOTkuMmMtMTIuOC0xMi44LTEyLjgtMzIgMC00MS42IDEyLjgtMTIuOCAzMi0xMi44IDQxLjYgMGw5OS4yIDk5LjIgOTkuMi05OS4yYzEyLjgtMTIuOCAzMi0xMi44IDQxLjYgMCAxMi44IDEyLjggMTIuOCAzMiAwIDQxLjZMNTUzLjYgNTEybDk5LjIgOTkuMnoiIHAtaWQ9IjMxNDU0IiBmaWxsPSIjY2RjZGNkIj48L3BhdGg+PC9zdmc+'); + background-size: cover; + background-repeat: no-repeat; } \ No newline at end of file diff --git a/utils/comm.wxs b/utils/comm.wxs index ec3cd53..7658319 100644 --- a/utils/comm.wxs +++ b/utils/comm.wxs @@ -20,9 +20,54 @@ var status = function (value) { break } return status +}; +var orderStatus = function (value) { + var statusStr = '已完成' + switch (value) { + case 'PENDING': + statusStr = '等待' + break + case 'COMPLETE': + statusStr = '已完成' + break + case 'FULL_REFUND': + statusStr = '全额退款' + break + case 'CORRECTION1_REFUND': + statusStr = '补正1次退款' + break + case 'CORRECTION2_REFUND': + statusStr = '补正2次退款' + break + } +}; +var proType = function (value) { + // PROJ:项目、AGENT:代理、FULL_REFUND:全额退款、CORRECTION1_REFUND:补正1次退款、CORRECTION2_REFUND:补正2次退款 + var str = '项目创建' + switch (value) { + case 'PROJ': + str = '项目创建' + break + case 'AGENT': + str = '代理' + break + case 'FULL_REFUND': + str = "全额退款" + break + case 'CORRECTION1_REFUND': + str = '补正1次退款' + break + case 'CORRECTION2_REFUND': + str = '补正2次退款' + break + } + return str + } module.exports = { isEmpty: isEmpty, - status: status + status: status, + orderStatus: orderStatus, + proType: proType }; \ No newline at end of file diff --git a/utils/http.js b/utils/http.js deleted file mode 100644 index f521858..0000000 --- a/utils/http.js +++ /dev/null @@ -1,67 +0,0 @@ -// 定义api服务地址 -const baseUrl = 'https://www.xzszwhy.cn/daqi/app'; -// const baseUrl = 'http://106.74.34.136:8084/daqi/app'; -/** - * 传入请求参数，返回Promise支持链试调用 - * @param url 请求地址 - * @param method 请求方法类型，不传入默认是"GET" - * @param data 请求体数据 - * @param params 请求参数 - */ -function request(url, method = "GET", data = {}, params = {}) { - const header = { - "content-type": "application/json" - // 有其他content-type需求加点逻辑判断处理即可 - } - //TODO 获取token，有就丢进请求头 - // const tokenString = wx.getStorageSync("access_token"); - // if (tokenString) { - // header.Authorization = `Bearer ${tokenString}`; - // } - return new Promise(function (resolve, reject) { - // 判断是否传递了query参数，有则进行地址拼接 - // if (params) { - // url += "?" + urlEncode(params) - // } - // wx.showLoading({ - // title: '加载中...', - // mask: true //显示蒙层 - // }) - wx.request({ - url: baseUrl + url, - timeout: 8000, - method, - data, - dataType: "json", // 微信官方文档中介绍会对数据进行一次JSON.parse - header, - success(res) { - // wx.hideLoading(); - // HTTP状态码为200才视为成功 - if (res.statusCode === 200) { - // 真正的数据响应体中还有一层success字段判断业务状态，按实际情况处理 - resolve(res.data) - // if (res.data.success) { - // resolve(res.data.result) - // } else { - // // 业务判断错误 - // reject(res) - // } - } else { - // wx.request的特性，只要有响应就会走success回调，所以在这里判断状态，非200的均视为请求失败 - reject(res) - } - }, - fail(err) { - // wx.hideLoading(); - // 断网、服务器挂了都会fail回调，直接reject即可 - reject(err) - } - }) - }) -} - -// 导出请求和服务地址 -export { - request, - baseUrl -} \ No newline at end of file