diff --git a/app.wxss b/app.wxss index 17a0d3a..e669a9e 100644 --- a/app.wxss +++ b/app.wxss @@ -2,6 +2,10 @@ @import "/static/style/icon.wxss"; @import "/static/style/common.wxss"; +swiper-item { + border-radius: 10rpx; +} + .page-container { display: flex; flex-direction: column; @@ -29,8 +33,8 @@ /***End***/ .custom-checkbox { - font-size: 14px; - margin-left: 14px; + font-size: 28rpx; + margin-left: 28rpx; border-radius: 50%; } @@ -253,7 +257,7 @@ .size-16 { height: 16rpx; - height: 16rpx; + width: 16rpx; } .size-32 { diff --git a/pages/copyright/applyRefund/applyRefund.wxml b/pages/copyright/applyRefund/applyRefund.wxml index 441180e..3b8114e 100644 --- a/pages/copyright/applyRefund/applyRefund.wxml +++ b/pages/copyright/applyRefund/applyRefund.wxml @@ -14,7 +14,7 @@ 退款软著 {{selPro==null? '选择需要退款的软著' :selPro.projName}} - + @@ -61,8 +61,7 @@ {{item.projName}} - {{item.applyContactName}} - {{item.projContext}} + {{item.authorName}} {{item.gmtCreate}} diff --git a/pages/copyright/applyRefund/applyRefund.wxss b/pages/copyright/applyRefund/applyRefund.wxss index 1d53111..2355d96 100644 --- a/pages/copyright/applyRefund/applyRefund.wxss +++ b/pages/copyright/applyRefund/applyRefund.wxss @@ -31,18 +31,21 @@ } .apply-content { - font-size: 28rpx; display: flex; flex-direction: row; align-items: center; justify-content: flex-end; flex: 0.7; + background-color: var(--bg-gray-input-color); + padding: 10rpx 15rpx; + font-size: 28rpx; + border-radius: 15rpx; } .reason-content { - border-radius: 10rpx; - border: 1rpx solid var(--divider-color); + border-radius: 15rpx; height: 120rpx; + background-color: var(--bg-gray-input-color); font-size: 28rpx; padding: 20rpx; } @@ -110,6 +113,7 @@ .pro-list-item-left-tag { font-size: 24rpx; color: var(--text-color); + flex: .5; } .pro-list-name { diff --git a/pages/copyright/applyRepair/applyRepair.wxml b/pages/copyright/applyRepair/applyRepair.wxml index 8e09a6f..db4dce3 100644 --- a/pages/copyright/applyRepair/applyRepair.wxml +++ b/pages/copyright/applyRepair/applyRepair.wxml @@ -13,15 +13,15 @@ 补正软著 - {{selPro==null? '选择需要补正的软著' :selPro.projName}} - + {{selPro==null? '请选择需要补正的软著' :selPro.projName}} + 补正种类 - {{selType==null?'选择种类':selType.title}} - + {{selType==null?'请选择种类':selType.title}} + diff --git a/pages/copyright/applyRepair/applyRepair.wxss b/pages/copyright/applyRepair/applyRepair.wxss index ff036d1..465f81f 100644 --- a/pages/copyright/applyRepair/applyRepair.wxss +++ b/pages/copyright/applyRepair/applyRepair.wxss @@ -5,7 +5,7 @@ flex-direction: column; padding: 30rpx; background-color: var(--white-color); - border-radius: 5rpx; + border-radius: 15rpx; } .label { @@ -37,11 +37,14 @@ align-items: center; justify-content: flex-end; flex: 0.7; + padding: 10rpx 15rpx; + border-radius: 15rpx; + background-color: var(--bg-gray-input-color); } .reason-content { - border-radius: 10rpx; - border: 1rpx solid var(--divider-color); + border-radius: 15rpx; + background-color: var(--bg-gray-input-color); height: 120rpx; font-size: 28rpx; padding: 20rpx; diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxml b/pages/copyright/createProjectInfo/createProjectInfo.wxml index 63d662e..ad6e2d5 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxml +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxml @@ -1,105 +1,128 @@ - - - - - - - - - - - 项目信息 - - 推荐 - - - - - - 产权联系人 - - - {{selectContact.name}} - + + + + + + + + + + + + + + 推荐 + + + 基本信息 + + + + 产权联系人 + + + + + + {{selectContact.name}} + {{tools.phoneNum(selectContact.phone,3,4,'****')}} + + + + + + + 新建 + - - 新建 - - - - 系统版本 - - - 系统语言 - - - {{selectLang}} - + + 系统版本 + + + + 系统语言 + + + + {{selectLang}} + + + + + + + 开发完成时间 + + + {{completeDate != ''? completeDate:'请选择开发完成时间'}} + + + + - - 开发完成时间 - - {{completeDate != ''? completeDate:'请选择开发完成时间'}} - - - - + + + + 套餐与优惠 + + + 套餐包 + + {{selectPackage.packageName?selectPackage.packageName:'请选择套餐包'}} + + 取消 + + + + 优惠券 + + {{selectCoupons.couponId? selectCoupons.coupon.title : '请选择优惠券'}} + + 取消 + - - - - - 套餐包 - {{selectPackage.packageName?selectPackage.packageName:'请选择套餐包'}} - 取消 - - - 优惠券 - {{selectCoupons.couponId? selectCoupons.coupon.title : '请选择优惠券'}} - 取消 - 选择 - - - - + + 金额:{{price/100}}元 - + - 加急办理{{urgent/100}}元 + 加急办理{{urgent/100}}元 - 保存并付款 + 保存并付款 - 创建联系人 + 创建联系人 - - 姓名 - - - - 联系电话 - - - - 联系邮箱 - - - - 公司 - + + + 姓  名 + + + + 联系电话 + + + + 联系邮箱 + + + + 公  司 + + diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxss b/pages/copyright/createProjectInfo/createProjectInfo.wxss index abf2e05..64d23cc 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxss +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxss @@ -4,11 +4,18 @@ justify-content: flex-start; } +.scroll-container { + height: 100vh; + /* background: linear-gradient(to bottom, var(--bg-top-color), var(--bg-bottom-color)); + background-size: 100% 100vh; + background-repeat: no-repeat; */ +} + .container-box { display: flex; flex-direction: column; justify-content: flex-start; - padding: 15px; + padding: 30rpx 30rpx 240rpx 30rpx; } @@ -16,6 +23,9 @@ display: flex; flex-direction: column; margin-top: 20rpx; + background-color: var(--white-color); + padding: 20rpx; + border-radius: 20rpx; } .info-title { @@ -25,13 +35,13 @@ .info-value { margin-top: 20rpx; - border: 1rpx solid var(--divider-color); font-size: 24rpx; line-height: 24rpx; - background-color: var(--white-color); + background-color: var(--bg-gray-input-color); height: 65rpx; width: auto; padding: 15px; + border-radius: 20rpx; } .info-btn { @@ -45,30 +55,38 @@ } .content-box { + border-radius: 20rpx; + padding: 20rpx; + background-color: var(--white-color); margin-top: 20rpx; } .section { - border: 1px solid var(--divider-color); - border-radius: 5rpx; - padding: 15rpx; margin-bottom: 15rpx; - background-color: white; } .item { display: flex; - align-items: center; + flex-direction: column; margin-bottom: 10rpx; padding: 20rpx 10rpx; font-size: 28rpx; } .label { - color: black; + color: var(--text-color); font-weight: bold; } +.select-content { + margin-top: 15rpx; + display: flex; + flex-direction: row; + padding: 10rpx 20rpx; + border-radius: 15rpx; + background-color: var(--bg-gray-input-color); +} + .desc { flex: 1; color: #999; @@ -82,11 +100,10 @@ } .select-time { - color: #000000; + color: var(--text-color); flex: 1; font-size: 28rpx; text-align: left; - padding-left: 30rpx; } .clear-icon { @@ -101,12 +118,9 @@ } .value { - color: #9A9A9A; - padding-right: 10px; flex: 1; - text-align: right; - padding-right: 10px; - font-size: 14px; + text-align: left; + font-size: 28rpx; } @@ -118,11 +132,14 @@ color: var(--text-color); } +.v-normal { + color: var(--text-gray-hint-color) +} .language-sel { font-size: 14px; flex: 1; - text-align: center; + text-align: left; } @@ -165,7 +182,7 @@ } .weui-half-screen-dialog__ft { - padding: 0rpx 0rpx 40rpx; + padding: 0rpx 0rpx 40rpx 0rpx; } .bottom-box { @@ -194,11 +211,13 @@ margin-bottom: 20px; } -.bottom-box .money { +.money { color: var(--text-brown-color); font-size: 20px; display: flex; flex-direction: row; + align-items: center; + justify-content: center; } .price { @@ -208,40 +227,28 @@ .form-box { display: flex; flex-direction: column; - justify-content: center; - align-items: flex-start; - font-size: 14px; - background-color: var(--primary-color); } .form-item { display: flex; flex-direction: row; - justify-content: flex-start; align-items: center; - padding: 10px; - width: 80vw; + padding: 10rpx 0rpx; } .form-item-title { - flex: .3; - font-size: 14px; + flex: 0.25; + font-size: 28rpx; color: var(--black-color); - font-weight: 500; text-align: left; } -.form-item-title:not(.no-after)::before { - content: "*"; - color: var(--red-color); - font-size: 14px; - margin-left: 1px; - text-align: center; -} - .form-item-content { - flex: 1; + flex: 0.75; text-align: right; + background-color: var(--bg-gray-input-color); + border-radius: 15rpx; + padding: 15rpx; } .project-box { @@ -268,7 +275,7 @@ height: 40px; border-radius: 5px; text-align: center; - width: 85vw !important; + width: 100% !important; } @@ -276,7 +283,6 @@ padding-bottom: 40rpx; display: flex; flex-direction: column; - align-items: center; } .coupons-list-box { diff --git a/pages/copyright/payment/payment.wxss b/pages/copyright/payment/payment.wxss index 0fb4630..61b3874 100644 --- a/pages/copyright/payment/payment.wxss +++ b/pages/copyright/payment/payment.wxss @@ -38,7 +38,7 @@ .card-box { margin-top: 20rpx; - border-radius: 10rpx; + border-radius: 15rpx; display: flex; flex-direction: column; padding: 30rpx; diff --git a/pages/copyright/publicPay/publicPay.wxml b/pages/copyright/publicPay/publicPay.wxml index e01f511..4a92d97 100644 --- a/pages/copyright/publicPay/publicPay.wxml +++ b/pages/copyright/publicPay/publicPay.wxml @@ -14,7 +14,7 @@ 公司名称 - + @@ -23,7 +23,7 @@ 银行账号 - + 打款时间 @@ -33,6 +33,7 @@ {{dateTimeArray[0][dateTime[0]]}}-{{dateTimeArray[1][dateTime[1]]}}-{{dateTimeArray[2][dateTime[2]]}} {{dateTimeArray[3][dateTime[3]]}}:{{dateTimeArray[4][dateTime[4]]}}:{{dateTimeArray[5][dateTime[5]]}} + @@ -47,15 +48,15 @@ 收款方信息 - 公司名称 + 公 司 名 称 {{incomeEnterprise.bankAccountName}} - 开户银行 + 开 户 银 行 {{incomeEnterprise.bankName}} - 银行账号 + 银 行 账 号 {{incomeEnterprise.bankNumber}} @@ -63,11 +64,11 @@ {{incomeEnterprise.bankUnionpayNumber}} - 打款备注 + 打 款 备 注 {{incomeEnterprise.bankRemark}} - 说明 + 说      明 请打款时必须按照以上备注填写 diff --git a/pages/copyright/publicPay/publicPay.wxss b/pages/copyright/publicPay/publicPay.wxss index af450b6..235e935 100644 --- a/pages/copyright/publicPay/publicPay.wxss +++ b/pages/copyright/publicPay/publicPay.wxss @@ -4,7 +4,7 @@ justify-content: center; background-color: var(--white-color); margin-top: 10px; - border-radius: 5px; + border-radius: 15rpx; } .container-box:nth-of-type(n+2) { @@ -44,12 +44,15 @@ .time-picker-box { flex: 1; - background-color: var(--white-color); - border: 1px solid var(--divider-color); - border-radius: 2rpx; - padding: 3px 8px; + background-color: var(--bg-gray-input-color); + border-radius: 10rpx; + padding: 10rpx 15rpx; text-align: left; - font-size: 12px; + font-size: 28rpx; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; } .weui-uploader { @@ -127,12 +130,11 @@ .input-box { flex: 1; - background-color: var(--bg-gray-color); - border: 1px solid var(--divider-color); - border-radius: 2rpx; - padding: 6rpx 14rpx; + background-color: var(--bg-gray-input-color); + border-radius: 10rpx; + padding: 12rpx 15rpx; text-align: left; - font-size: 12px; + font-size: 28rpx; } .item-v { diff --git a/pages/copyright/refund/refund.js b/pages/copyright/refund/refund.js index 916fca9..a5ec6ee 100644 --- a/pages/copyright/refund/refund.js +++ b/pages/copyright/refund/refund.js @@ -161,6 +161,7 @@ Page({ _self.setData({ hasMore: _self.data.refundList.length < res.total }) + _self.showEditDel() }, err => { _self.setData({ loadingState: 'error', @@ -334,5 +335,18 @@ Page({ downloading: false, downloadProgress: 0 }) - } + }, + showEditDel() { + const _self = this + const isFirst = Cache.get('refundFirst', '0') + if (isFirst == '0') { + const item = _self.selectComponent('#mp-slide-0') + if (item) { + item.setData({ + show: true + }) + Cache.set('refundFirst', '1') + } + } + }, }) \ No newline at end of file diff --git a/pages/copyright/repair/repair.js b/pages/copyright/repair/repair.js index b91866f..7360f97 100644 --- a/pages/copyright/repair/repair.js +++ b/pages/copyright/repair/repair.js @@ -210,6 +210,7 @@ Page({ _self.setData({ hasMore: _self.data.repairList.length < res.total }) + _self.showEditDel() }, err => { _self.setData({ loadingState: 'error', @@ -497,5 +498,18 @@ Page({ downloading: false, downloadProgress: 0 }) - } + }, + showEditDel() { + const _self = this + const isFirst = Cache.get('repairFirst', '0') + if (isFirst == '0') { + const item = _self.selectComponent('#mp-slide-0') + if (item) { + item.setData({ + show: true + }) + Cache.set('repairFirst', '1') + } + } + }, }) \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.js b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.js index 06ed6db..b634bf3 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.js +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.js @@ -4,6 +4,7 @@ import { isValidPhone } from '../../../../utils/validator' const app = getApp() +const Cache = require('../../../../utils/storage') Page({ /** @@ -57,9 +58,9 @@ Page({ }) this.doRefreshList() }, - closeDialog(e){ + closeDialog(e) { this.setData({ - createDialog:false + createDialog: false }) }, inputKeywords(e) { @@ -100,6 +101,7 @@ Page({ _self.setData({ hasMore: _self.data.invoiceInfoList.length < res.total }) + _self.showEditDel() }, err => { _self.setData({ loadingState: 'error', @@ -169,7 +171,13 @@ Page({ this.setData({ title: '开票信息', isCreate: true, - createDialog: !this.data.createDialog + createDialog: !this.data.createDialog, + companyName: '', + tinNum: '', + companyAddress: '', + companyPhone: '', + companyBank: '', + bankNum: '', }) }, //显示编辑 @@ -359,5 +367,18 @@ Page({ //删除 this.showDelDialog(item) } - } + }, + showEditDel() { + const _self = this + const isFirst = Cache.get('invoiceFirst', '0') + if (isFirst == '0') { + const item = _self.selectComponent('#mp-slide-0') + if (item) { + item.setData({ + show: true + }) + Cache.set('invoiceFirst', '1') + } + } + }, }) \ No newline at end of file diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml index 607ed69..712f3cd 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxml @@ -11,7 +11,7 @@ - + @@ -30,8 +30,8 @@ - - + + @@ -44,27 +44,27 @@ - 公司名称 + 公 司 名 称 - 纳税人识别号 + 纳税人识别号 - 公司地址 + 公 司 地 址 - 公司电话 + 公 司 电 话 - 开户行 + 开  户  行 - 开户行账号 + 开 户 行 账 号 diff --git a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss index 39c004b..5fd8988 100644 --- a/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss +++ b/pages/mine/mineAccount/invoiceInfo/invoiceInfo.wxss @@ -93,22 +93,16 @@ display: flex; flex-direction: column; justify-content: center; - align-items: center; } .order-item { display: flex; flex-direction: column; - background-color: white; - border-radius: 10px; - width: 94vw; + background-color: var(--white-color); + border-radius: 15rpx; } .order-item:nth-of-type(n+2) { - margin-top: 15px; -} - -#mp-slide { margin-top: 20rpx; } @@ -198,9 +192,6 @@ display: flex; flex-direction: column; justify-content: center; - align-items: flex-start; - font-size: 14px; - width: 100vw; } .form-item { @@ -208,39 +199,35 @@ flex-direction: row; justify-content: flex-start; align-items: center; - width: 80vw; - padding: 10px; + padding: 10rpx 0rpx; } .form-item-title { flex: .5; - font-size: 14px; + font-size: 28rpx; color: var(--text-color); font-weight: 500; text-align: left; } -.form-item-title:not(.no-after)::before { - content: "*"; - color: var(--red-color); - font-size: 14px; - margin-left: 1px; - text-align: center; -} .form-item-content { flex: 1; text-align: right; + background-color: var(--bg-gray-input-color); + padding: 15rpx; + border-radius: 15rpx; + margin-left: 20rpx; } .confirm-btn { background-color: var(--btn-green-color); color: white; - font-size: 16px; + font-size: 28rpx; height: 70rpx; line-height: 70rpx; border-radius: 5px; - width: 85vw !important; + width: 100% !important; padding: 0rpx; } diff --git a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml index 6cf5963..b63f21c 100644 --- a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml +++ b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxml @@ -62,8 +62,8 @@ {{editBean.invoiceFinalRecord}} - - 提交 + + 提交 diff --git a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss index dbf4b14..4333006 100644 --- a/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss +++ b/pages/mine/mineAccount/makeInvoice/makeInvoice.wxss @@ -7,8 +7,8 @@ display: flex; flex-direction: column; padding: 20rpx; - background-color: white; - border-radius: 10rpx; + background-color: var(--white-color); + border-radius: 15rpx; } .invoice-info-item { @@ -27,14 +27,14 @@ .invoice-remark { height: 120rpx; - border: 1rpx solid var(--divider-color); align-self: center; border-radius: 10rpx; width: 95%; - padding: 10rpx; margin-top: 10rpx; margin-bottom: 20rpx; font-size: 28rpx; + padding: 15rpx; + background-color: var(--bg-gray-input-color); } @@ -87,11 +87,17 @@ .invoice-info-item-content { font-size: 28rpx; padding-left: 20rpx; + margin-left: 15rpx; flex: 1; align-items: center; justify-content: flex-end; display: flex; flex-direction: row; + padding: 10rpx 15rpx; +} + +.bg-gray { + background-color: var(--bg-gray-input-color); } .custom-radio-group { diff --git a/pages/mine/mineAccount/mineContact/mineContact.js b/pages/mine/mineAccount/mineContact/mineContact.js index e6f4d31..df92dee 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.js +++ b/pages/mine/mineAccount/mineContact/mineContact.js @@ -5,6 +5,7 @@ const { isValidEmail } = require('../../../../utils/validator') const app = getApp() +const Cache = require('../../../../utils/storage') Page({ /** @@ -332,6 +333,8 @@ Page({ _self.setData({ hasMore: _self.data.contactList.length < res.total }) + //首次提示滑动删除和编辑 + _self.showEditDel() }, err => { _self.setData({ loadingState: 'error', @@ -341,6 +344,20 @@ Page({ }) }) }, + //首次提示滑动删除和编辑 + showEditDel() { + const _self = this + const isFirst = Cache.get('contactFirst', '0') + if (isFirst == '0') { + const item = _self.selectComponent('#mp-slide-0') + if (item) { + item.setData({ + show: true + }) + Cache.set('contactFirst', '1') + } + } + }, //清除搜索内容 clearSearch() { const _self = this diff --git a/pages/mine/mineAccount/mineContact/mineContact.wxml b/pages/mine/mineAccount/mineContact/mineContact.wxml index ff8a2f6..69772dc 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.wxml +++ b/pages/mine/mineAccount/mineContact/mineContact.wxml @@ -11,24 +11,26 @@ - - - - - - {{item.name}} + + + + + + + {{item.name}} + + {{item.phone}} - {{item.phone}} + {{item.company}} + 专属客服 : {{item.csaNo}} - {{item.company}} - 专属客服 : {{item.csaNo}} - - + + - - + + @@ -37,23 +39,23 @@ - {{title}} + {{title}} - 姓名 + 姓  名 - 联系电话 + 联系电话 - 联系邮箱 + 联系邮箱 - 公司 + 公  司 diff --git a/pages/mine/mineAccount/mineContact/mineContact.wxss b/pages/mine/mineAccount/mineContact/mineContact.wxss index 9131514..10ea012 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.wxss +++ b/pages/mine/mineAccount/mineContact/mineContact.wxss @@ -84,15 +84,22 @@ .order-item { display: flex; flex-direction: column; - background-color: white; border-radius: 10px; width: 94vw; } -#mp-slide:nth-of-type(n+2) { +.order-item-container { + display: flex; + flex-direction: column; + border-radius: 10px; + background-color: var(--white-color); +} + +.order-item:nth-of-type(n+2) { margin-top: 20rpx; } + .contact-desc { display: flex; flex-direction: row; @@ -169,7 +176,6 @@ display: flex; flex-direction: column; justify-content: center; - font-size: 14px; } .form-item { @@ -177,29 +183,24 @@ flex-direction: row; justify-content: flex-start; align-items: center; - padding: 10px; + padding: 10rpx 0rpx; } .form-item-title { flex: .3; font-size: 28rpx; color: var(--text-color); - font-weight: 500; text-align: left; } -.form-item-title:not(.no-after)::before { - content: "*"; - color: var(--red-color); - font-size: 28rpx; - margin-left: 1px; - text-align: center; -} .form-item-content { flex: 1; text-align: right; font-size: 28rpx; + padding: 15rpx; + border-radius: 15rpx; + background-color: var(--bg-gray-input-color); } .confirm-btn { @@ -210,7 +211,6 @@ border-radius: 5px; text-align: center; width: 100% !important; - /* width: 85vw !important; */ } .confirm-btn:active { @@ -218,7 +218,7 @@ } .weui-half-screen-dialog__ft { - padding: 0rpx 0rpx 40rpx; + padding: 0rpx 0rpx 40rpx 0rpx; } .weui-half-screen-dialog__bd { diff --git a/pages/mine/mineAccount/mineInfo/mineInfo.wxml b/pages/mine/mineAccount/mineInfo/mineInfo.wxml index ef52b6d..63ac8b2 100644 --- a/pages/mine/mineAccount/mineInfo/mineInfo.wxml +++ b/pages/mine/mineAccount/mineInfo/mineInfo.wxml @@ -1,7 +1,7 @@ - 姓名 + 姓  名 diff --git a/pages/mine/mineAccount/mineInfo/mineInfo.wxss b/pages/mine/mineAccount/mineInfo/mineInfo.wxss index ac3ca08..f078b19 100644 --- a/pages/mine/mineAccount/mineInfo/mineInfo.wxss +++ b/pages/mine/mineAccount/mineInfo/mineInfo.wxss @@ -20,6 +20,10 @@ .item-content { flex: .7; text-align: right; + padding: 15rpx; + border-radius: 15rpx; + background-color: var(--bg-gray-input-color); + font-size: 28rpx; } .bottom-box { diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js index 5334ccf..7e578be 100644 --- a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js +++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.js @@ -6,6 +6,7 @@ const screenInfo = wx.getWindowInfo(); const statusBarHeight = screenInfo.statusBarHeight; // 状态栏高度 const navBarHeight = deviceInfo.platform == 'IOS' ? 48 : 50; // 导航栏高度（iOS 为 44px，Android 为 48px） const windowHeight = screenInfo.windowHeight - navBarHeight - statusBarHeight; //可用内容高度 +const Cache = require('../../../../utils/storage') Page({ /** @@ -104,6 +105,7 @@ Page({ _self.setData({ hasMore: _self.data.msgList.length < res.total }) + _self.showEditDel() }, err => { _self.setData({ loadingState: 'error', @@ -182,5 +184,18 @@ Page({ msgShow: true }) }) - } + }, + showEditDel() { + const _self = this + const isFirst = Cache.get('noticeFirst', '0') + if (isFirst == '0') { + const item = _self.selectComponent('#mp-slide-0') + if (item) { + item.setData({ + show: true + }) + Cache.set('noticeFirst', '1') + } + } + }, }) \ No newline at end of file diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxml b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxml index 001bbe6..60e2ad8 100644 --- a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxml +++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxml @@ -20,27 +20,29 @@ - + - - - - - {{item.title}} - {{item.gmtCreate}} + + + + + {{item.title}} + {{item.gmtCreate}} + + + + {{item.content}} + - - - {{item.content}} - - - + + + - - + + diff --git a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss index c48c967..42e7340 100644 --- a/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss +++ b/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.wxss @@ -59,6 +59,14 @@ flex-direction: column; } +.msg-item-container { + background-color: transparent; +} + +.msg-item-container:nth-of-type(n+2) { + margin-top: 20rpx; +} + .msg-item-box { display: flex; flex-direction: column; @@ -103,8 +111,4 @@ .msg-content-content { font-size: 28rpx; -} - -#mp-slide:nth-of-type(n+2) { - margin-top: 20rpx; } \ No newline at end of file diff --git a/static/style/common.wxss b/static/style/common.wxss index eaf4e9d..4b3be95 100644 --- a/static/style/common.wxss +++ b/static/style/common.wxss @@ -34,6 +34,7 @@ page { --bg-green-status-light-color: #AFE5C7; --bg-red-deep-color: #F7312A; --bg-gray-shade-color: #00000025; + --bg-gray-input-color: #F9FAFB; /* 按钮颜色 */ --btn-cyan-color: #39C7C1; --btn-cyan-active: #39c7c08f; diff --git a/static/style/icon.wxss b/static/style/icon.wxss index 9e5499e..c9ff6cc 100644 --- a/static/style/icon.wxss +++ b/static/style/icon.wxss @@ -102,4 +102,16 @@ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1NzQzODkzOTMwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjUxMzEiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUzNi4yMTcgOTAuNjljLTE2OC4wMjcgMC0zMDIuNTI0IDEzNC40OTctMzAyLjUyNCAzMDIuNTI0IDAgMTIwLjk2MSA4Ny4wNTYgMjE1LjA5NSAxODEuMTkxIDMzNi4wNTUgMzIuNzg2IDQ1Ljk0OSA1OC44NjYgOTEuOSA5Mi4wMjMgMTUwLjI2OCAxLjc0IDMuMTA1IDMuOTc0IDUuOTYxIDYuNTgyIDguMzIxIDUuNTg4IDUuMDkxIDEyLjA0NyA5LjQzOCAyMi43MjYgOS40Mzh2MGMxMS40MjUgMCAxOC4wMDctNC44NDQgMjMuODQ0LTEwLjQzMiAxLjk4Ni0xLjg2MiAzLjcyNi00LjA5OCA1LjIxNy02LjMzNCAzMy4xNTgtNTIuNDA5IDU5LjM2Mi05OC40ODEgOTIuMjczLTE0NC41NTYgOTQuMTM1LTEyNy42NjYgMTgxLjE5MS0yMjEuODAxIDE4MS4xOTEtMzQyLjc2MSAwLTE2OC4wMjctMTM0LjQ5Ny0zMDIuNTI0LTMwMi41MjQtMzAyLjUyNHYwek01MzYuMjE3IDQ5NC4wNTVjLTUzLjc3NCAwLTEwMC44NDItNDAuMzYyLTEwMC44NDItMTAwLjg0MnM0MC4zNjItMTAwLjg0MiAxMDAuODQyLTEwMC44NDJjNTMuNzc0IDAgMTAwLjg0MiA0MC4zNjIgMTAwLjg0MiAxMDAuODQyIDAgNTMuNzc0LTQwLjM2MiAxMDAuODQyLTEwMC44NDIgMTAwLjg0MnYweiIgcC1pZD0iNTEzMiIgZmlsbD0iI0ZFOTk0NCI+PC9wYXRoPjxwYXRoIGQ9Ik01MzYuMjE3IDc3MC42MjRjLTE0MC4zMzQgMC0yNTQuMDkxIDUzLjUyNS0yNTQuMDkxIDExOS40N3MxMTMuNzU3IDExOS40NyAyNTQuMDkxIDExOS40NyAyNTQuMDkxLTUzLjUyNSAyNTQuMDkxLTExOS40Ny0xMTMuNzU3LTExOS40Ny0yNTQuMDkxLTExOS40N3pNNTM2LjIxNyA5MzguNjUxYy0xMDUuNTYxIDAtMTkxLjAwMy0zNy41MDUtMTkxLjAwMy03OC43MzVzODUuNTY2LTc0Ljg4NiAxOTEuMDAzLTc0Ljg4NiAxOTEuMDAzIDMzLjUzMiAxOTEuMDAzIDc0Ljg4Ni04NS41NjYgNzguNzM1LTE5MS4wMDMgNzguNzM1eiIgcC1pZD0iNTEzMyIgZmlsbD0iI0ZFOTk0NCI+PC9wYXRoPjwvc3ZnPg=='); background-size: cover; background-repeat: no-repeat; +} + +.icon-add-circle-blue { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ3MDM1NjY4ODU4IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE2NDIiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMiA5MzYuOTE1NjE5Yy0yMzQuNjcyNzY0IDAtNDI0LjkxNTYxOS0xOTAuMjQzODc5LTQyNC45MTU2MTktNDI0LjkxNTYxOVMyNzcuMzI3MjM2IDg3LjA4MzM1NyA1MTIgODcuMDgzMzU3YzIzNC42NzY4NTcgMCA0MjQuOTE2NjQzIDE5MC4yNDM4NzkgNDI0LjkxNjY0MyA0MjQuOTE1NjE5Uzc0Ni42NzY4NTcgOTM2LjkxNTYxOSA1MTIgOTM2LjkxNTYxOXpNNzI0LjQ1NzgxIDQ2OS41MDQxNCA1NTQuNDkxNzY3IDQ2OS41MDQxNCA1NTQuNDkxNzY3IDI5OS41NDYyODRsLTg0Ljk4MzUzMyAwIDAgMTY5Ljk1Nzg1N0wyOTkuNTQyMTkgNDY5LjUwNDE0bDAgODQuOTkxNzIgMTY5Ljk2NjA0MyAwIDAgMTY5Ljk2NjA0MyA4NC45ODM1MzMgMEw1NTQuNDkxNzY3IDU1NC40OTU4NmwxNjkuOTY2MDQzIDBMNzI0LjQ1NzgxIDQ2OS41MDQxNHoiIHAtaWQ9IjE2NDMiIGZpbGw9IiMzMjcwRkYiPjwvcGF0aD48L3N2Zz4='); + background-size: cover; + background-repeat: no-repeat; +} + +.icon-user-default-blue { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzOTg4MzkwNjkwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM0MDkiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMiAxMDI0QzIyOS4yMDUzMzMgMTAyNCAwIDc5NC43OTQ2NjcgMCA1MTJTMjI5LjIwNTMzMyAwIDUxMiAwczUxMiAyMjkuMjA1MzMzIDUxMiA1MTItMjI5LjIwNTMzMyA1MTItNTEyIDUxMnogbTAtNDk2LjQ2OTMzM2ExNzAuNjY2NjY3IDE3MC42NjY2NjcgMCAxIDAgMC0zNDEuMzMzMzM0IDE3MC42NjY2NjcgMTcwLjY2NjY2NyAwIDAgMCAwIDM0MS4zMzMzMzR6IG0yNjMuNzY1MzMzIDI2My43MjI2NjZhMjYzLjc2NTMzMyAyNjMuNzY1MzMzIDAgMSAwLTUyNy41MzA2NjYgMGg1MjcuNTMwNjY2eiIgcC1pZD0iMzQxMCIgZmlsbD0iIzEyOTZkYiI+PC9wYXRoPjwvc3ZnPg=='); + background-size: cover; + background-repeat: no-repeat; } \ No newline at end of file diff --git a/utils/comm.wxs b/utils/comm.wxs index e7356d9..bab8187 100644 --- a/utils/comm.wxs +++ b/utils/comm.wxs @@ -348,6 +348,12 @@ var repairKind = function (kind) { } return str } +var phoneNum = function (str, startLength, endLength, replaceStr) { + if (str.length <= startLength + endLength) { + return str; + } + return str.slice(0, startLength) + replaceStr + str.slice(str.length - endLength); +} module.exports = { isEmpty: isEmpty, status: status, @@ -369,5 +375,6 @@ module.exports = { repairStatus: repairStatus, repairStatusColor: repairStatusColor, repairType: repairType, - repairKind: repairKind + repairKind: repairKind, + phoneNum: phoneNum }; \ No newline at end of file