From f5330fad92108c4b097de51cd0a9ef1b2a105a49 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 27 Dec 2023 15:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.vue | 2 +- pages/moreProject/moreProject.vue | 461 +++++++++++++---------- pages/product/basicSet.vue | 11 +- pages/users/order_confirm/indexOther.vue | 2 +- pages/users/user_address/index.vue | 9 +- 5 files changed, 268 insertions(+), 217 deletions(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index ff8a065..de48bf4 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -261,7 +261,7 @@ - +
{{detail.title}}
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 6fef310..1328398 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -429,10 +429,10 @@
- + - - + +
{{detail.title}}
甲方公司:{{company?company:"暂无公司信息"}} @@ -442,13 +442,14 @@
- @@ -456,46 +457,57 @@
- - -
- + + + 填写信息 - - - 开户银行名称: - - - - - - + + + + 公司名称: + + {{merchantData.company_name}} + + - - 银行卡号: - 对公账号: + + + 开户行名称: + + + + + + 开户行地址: + + + + + + @@ -768,33 +780,39 @@ export default { } }, - validateForm: function () { - let that = this, - value = that.merchantData; + validateForm: function() { + let that = this, + value = that.merchantData; - if (!value.bank_username) return that.$util.Tips({ - title: '请输入银行账户姓名' - }); - if (!value.bank_opening) return that.$util.Tips({ - title: '请输入银行卡号' - }); + if (!value.company_name) return that.$util.Tips({ + title: '请输入公司名称' + }); + if (!value.bank_code) return that.$util.Tips({ + title: '请输入对公账号' + }); + if (!value.bank_username) return that.$util.Tips({ + title: '请输入开户行名称' + }); + if (!value.bank_opening) return that.$util.Tips({ + title: '请输入开户行地址' + }); - if (value.bank_front.length == 0) return that.$util.Tips({ - title: '请上传一张或者多张图片' - }); + // if (value.bank_front.length == 0) return that.$util.Tips({ + // title: '请上传一张或者多张图片' + // }); - if (value.bank_back.length == 0) return that.$util.Tips({ - title: '请上传一张或者多张图片' - }); - if (value.cardno_front.length == 0) return that.$util.Tips({ - title: '请上传一张或者多张图片' - }); - if (value.cardno_back.length == 0) return that.$util.Tips({ - title: '请上传一张或者多张图片' - }); - that.validate = true; - return true; - }, + // if (value.bank_back.length == 0) return that.$util.Tips({ + // title: '请上传一张或者多张图片' + // }); + // if (value.cardno_front.length == 0) return that.$util.Tips({ + // title: '请上传一张或者多张图片' + // }); + // if (value.cardno_back.length == 0) return that.$util.Tips({ + // title: '请上传一张或者多张图片' + // }); + that.validate = true; + return true; + }, /** * 上传文件 * @@ -917,7 +935,8 @@ export default { let that = this; getUserInfo().then(res => { this.userInfoData = res.data; - this.merchantData.phone = res.data.phone + this.merchantData.phone = res.data.phone; + this.merchantData.company_name = res.data.mer_info.company_name; merstreet({ street_code: res.data.mer_info.street_id }).then((res) => { @@ -984,40 +1003,41 @@ export default { } .userpage-icon { - width: 60rpx; - height: 60rpx; - position: absolute; - top: 65rpx; - right: 60rpx; + width: 90rpx; + height: 90rpx; + position: absolute; + top: 90rpx; + right: 30rpx; - image { - width: 100%; - height: 100%; + image { + width: 100%; + height: 100%; + } } -} - .item-name { width: 190rpx; } .merchantsSettled { - height: 100%; - padding-top: 80rpx; -} + height: 100%; + padding-top: 130rpx; -.merchantsSettled .title { - font-size: 35rpx; - font-family: Microsoft YaHei; - font-weight: 400; - text-align: center; -} + } -.merchantsSettled .list { - background-color: #fff; - border-radius: 12px; - margin: 0 15px; - position: absolute; -} + .merchantsSettled .title { + font-size: 35rpx; + font-family: Microsoft YaHei; + font-weight: 400; + text-align: center; + } + + .merchantsSettled .list { + background-color: #fff; + border-radius: 12px; + margin: 0 15px; + width: 694rpx; + position: absolute; + } .application-record { position: absolute; @@ -1058,33 +1078,33 @@ export default { } } -.merchantsSettled .list .item { - padding: 50rpx 0 20rpx; + .merchantsSettled .list .item { + padding: 30rpx 0 10rpx; - position: relative; - margin: 0 20px; + position: relative; + margin: 0 20px; - &.no-border { - border-bottom: none; - padding-left: 0; - padding-right: 0; + &.no-border { + border-bottom: none; + padding-left: 0; + padding-right: 0; + } + + .item-title { + color: #666666; + font-size: 32rpx; + display: block; + } + + .item-desc { + color: #B2B2B2; + font-size: 32rpx; + display: block; + margin-top: 9rpx; + line-height: 36rpx; + } } - .item-title { - color: #666666; - font-size: 28rpx; - display: block; - } - - .item-desc { - color: #b2b2b2; - font-size: 22rpx; - display: block; - margin-top: 9rpx; - line-height: 36rpx; - } -} - .acea-row, .upload { display: -webkit-box; @@ -1139,93 +1159,94 @@ export default { } .merchantsSettled .list .item .pictrue { - width: 130rpx; - height: 130rpx; - margin: 24rpx 22rpx 0 0; - position: relative; - font-size: 11px; - color: #bbb; + width: 130rpx; + height: 130rpx; + margin: 24rpx 22rpx 0 0; + position: relative; + font-size: 32rpx; + color: #bbb; - &:nth-child(4n) { - margin-right: 0; - } + &:nth-child(4n) { + margin-right: 0; + } - &:nth-last-child(1) { - border: 0.5px solid #ddd; - box-sizing: border-box; - } + &:nth-last-child(1) { + border: 0.5px solid #ddd; + box-sizing: border-box; + } - uni-image, - image { - width: 100%; - height: 100%; - border-radius: 1px; - - img { - -webkit-touch-callout: none; - -webkit-user-select: none; - -moz-user-select: none; - display: block; - position: absolute; - top: 0; - left: 0; - opacity: 0; + uni-image, + image { width: 100%; height: 100%; + border-radius: 1px; + + img { + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + display: block; + position: absolute; + top: 0; + left: 0; + opacity: 0; + width: 100%; + height: 100%; + } + } + + .icon-guanbi1 { + font-size: 33rpx; + position: absolute; + top: -10px; + right: -10px; } } - .icon-guanbi1 { - font-size: 33rpx; - position: absolute; - top: -10px; - right: -10px; - } -} - .uni-list-cell-db { position: relative; } .merchantsSettled .submitBtn { - width: 588rpx; - margin: 0 auto; - height: 86rpx; + width: 588rpx; + margin: 0 auto; + height: 86rpx; - border-radius: 25px; - text-align: center; - line-height: 86rpx; - font-size: 15px; - color: #fff; - background: #e3e3e3; - margin-top: 25px; - pointer-events: none; -} + border-radius: 25px; + text-align: center; + line-height: 86rpx; + font-size: 32rpx; + color: #fff; + background: #E3E3E3; + margin-top: 25px; + pointer-events: none; + margin-bottom: 100px; + } -.merchantsSettled .submitBtn.on { - background: red; - pointer-events: all; -} + .merchantsSettled .submitBtn.on { + background: red; + pointer-events: all; + } .settlementAgreement { - width: 100%; - height: 100%; + width: 100vw; + height: 100vh; position: fixed; top: 0; left: 0; - background: rgba(0, 0, 0, 0.5); + background: rgba(0, 0, 0, .5); z-index: 10; } .settlementAgreement .setAgCount { background: #fff; - width: 656rpx; + width: 694rpx; // height: 458px; position: absolute; top: 50%; left: 50%; - - padding: 52rpx; + + padding: 28rpx; -webkit-transform: translate(-50%, -50%); -moz-transform: translate(-50%, -50%); transform: translate(-50%, -50%); @@ -1267,62 +1288,84 @@ export default { line-height: 22px; text-align: justify; text-justify: distribute-all-lines; - height: 75%; + height: 76%; overflow-y: scroll; } .setAgCountbtn { - display: flex; - justify-content: space-around; + display: flex; + justify-content: space-around; + padding-bottom: 30rpx; + position: relative; - .setAgCountbtna { - margin-top: 40rpx; - width: 200rpx; - height: 74rpx; - text-align: center; - line-height: 74rpx; - border-radius: 46rpx 46rpx; - opacity: 1; - border: 2rpx solid #b3b3b3; - font-size: 25rpx; - font-family: PingFang SC-Medium, PingFang SC; - font-weight: 500; - color: #737373; + .setAgCountbtna { + margin-top: 40rpx; + width: 200rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + border-radius: 46rpx 46rpx; + opacity: 1; + border: 2rpx solid #B3B3B3; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #737373; + + } + + .setAgCountbtnb { + margin-top: 40rpx; + padding-left: 20rpx; + padding-right: 20rpx; + + text-align: center; + line-height: 74rpx; + background: #cecece; + border-radius: 46rpx 46rpx; + opacity: 1; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + + } + + .setAgCountbtnc { + margin-top: 40rpx; + width: 200rpx; + height: 74rpx; + text-align: center; + line-height: 74rpx; + background: linear-gradient(270deg, #FF6D20 0%, #F84221 100%); + border-radius: 46rpx 46rpx; + opacity: 1; + font-size: 25rpx; + font-family: PingFang SC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + + } + + .border{ + position: absolute; + top: 0; + left: -28rpx; + width: 100vw; + height: 100%; + border-radius: 40rpx 40rpx 0 0; + box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2); /* 在上边框添加阴影 */ + } + + .btn{ + width: 694rpx; + font-weight: bold; + font-size: 34rpx; + } + } - .setAgCountbtnb { - margin-top: 40rpx; - padding-left: 20rpx; - padding-right: 20rpx; - - text-align: center; - line-height: 74rpx; - background: #cecece; - border-radius: 46rpx 46rpx; - opacity: 1; - font-size: 25rpx; - font-family: PingFang SC-Medium, PingFang SC; - font-weight: 500; - color: #fff; - } - - .setAgCountbtnc { - margin-top: 40rpx; - width: 200rpx; - height: 74rpx; - text-align: center; - line-height: 74rpx; - background: linear-gradient(270deg, #ff6d20 0%, #f84221 100%); - border-radius: 46rpx 46rpx; - opacity: 1; - font-size: 25rpx; - font-family: PingFang SC-Medium, PingFang SC; - font-weight: 500; - color: #fff; - } -} - .bg-img { position: absolute; width: 100%; diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue index 9c4f529..a402608 100644 --- a/pages/product/basicSet.vue +++ b/pages/product/basicSet.vue @@ -201,6 +201,7 @@