From af436aa050f76584cd5cb88e413e45cd08c15d50 Mon Sep 17 00:00:00 2001 From: qingyiay <2386314947@qq.com> Date: 星期三, 17 五月 2023 14:14:04 +0800 Subject: [PATCH] 修改部分错误,增加新功能 --- pages/public-page/forward/forward.vue | 630 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 528 insertions(+), 102 deletions(-) diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue index a8f43a6..7466107 100644 --- a/pages/public-page/forward/forward.vue +++ b/pages/public-page/forward/forward.vue @@ -1,21 +1,62 @@ <template> <!-- 杞彂 --> <view class="forward"> - <view class="forward-card"> - <u--form labelPosition="top" :model="forwardForm" ref="form1"> - <u-form-item label="杞彂瀵硅薄" labelWidth="20%" ref="item1" @click="forwardObjectClick"><u--input v-model="name" placeholder="鐐瑰嚮閫夋嫨杞彂瀵硅薄"></u--input></u-form-item> - <u-form-item label="杈撳叆鏁伴噺" labelWidth="20%" ref="item1"> - <view class="forward-card-amount"> - <view class="forward-card-amount-input"><u--input v-model="forwardForm.nums" placeholder="璇疯緭鍏ヨ浆鍙戞暟閲�"></u--input></view> - <u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange"> - <u-checkbox :customStyle="{ marginBottom: '8px' }" size="30" labelSize="30" label="鍏ㄩ儴杞彂" name="鍏ㄩ儴杞彂"></u-checkbox> - </u-checkbox-group> - </view> - </u-form-item> - </u--form> + <view class="forward-banner"> + <view class="banner-block"> + <view class="arrow-left" @click="back"><u-icon name="arrow-left" size="40" color="#ffffff"></u-icon></view> + <view class="forward-text">杞彂</view> + </view> </view> - <!-- 鎸夐挳 --> - <view class="forwardBtn"><u-button text="鎻愪氦" :hairline="false" type="primary" @click="submitForm"></u-button></view> + <view v-if="roleType == 1" class="notice-bar"> + <u-notice-bar :text="text" :fontSize="30"></u-notice-bar> + <view + class="notice-icon" + style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;" + ></view> + </view> + <view v-else-if="roleType == 2" class="notice-bar"><u-notice-bar :text="text1" :fontSize="30"></u-notice-bar></view> + <view class="card-main"> + <view class="card-block"> + <view class="forward-card" v-for="(val, index) in jhOrderPlanForwardList" :key="val.vid"> + <u-swipe-action> + <u-swipe-action-item :options="options1" @click="deleteGroup(index, val)" :name="val.vid"> + <view class="card-content"> + <u--form labelPosition="left" :model="forwardForm" ref="form1"> + <u-form-item label="杞彂瀵硅薄" labelWidth="21%" ref="item1" @click="forwardObjectClick(index)"> + <u--input v-model="val.name" placeholder="鐐瑰嚮閫夋嫨杞彂瀵硅薄" :readonly="true" border="bottom"></u--input> + </u-form-item> + <u-form-item label="杈撳叆鏁伴噺" ref="item2" labelWidth="21%"> + <view class="forward-card-amount"> + <view class="forward-card-amount-input"> + <u--input + v-model="val.carNum" + placeholder="璇疯緭鍏ヨ浆鍙戞暟閲�" + @input="debouncecarNumInput(index, val.carNum)" + @blur="blurInput(index, val.carNum)" + border="bottom" + ></u--input> + </view> + <u-checkbox-group v-model="val.checkboxValue1" placement="column" @change="v => checkboxChange(v, index, val)"> + <u-checkbox size="30" shape="circle" labelSize="30" label="鍏ㄩ儴杞彂" name="鍏ㄩ儴杞彂" :disabled="val.ischecked"></u-checkbox> + </u-checkbox-group> + </view> + </u-form-item> + <!-- <u-form-item><u-button text="鍒犻櫎鏈粍" :hairline="false" type="error" @click="deleteGroup(index, val)"></u-button></u-form-item> --> + </u--form> + </view> + </u-swipe-action-item> + </u-swipe-action> + </view> + </view> + </view> + + <view class="utils-buttonGroup"> + <!-- 娣诲姞鎸夐挳 --> + <view class="AdddBtn"><u-button text="娣诲姞" :hairline="false" @click.stop="addForm" :disabled="whetherClick"></u-button></view> + <!-- 鎻愪氦鎸夐挳 --> + <view class="forwardBtn"><u-button text="鎻愪氦" :hairline="false" type="warning" @click.stop="submitForm" :disabled="whetherClick1"></u-button></view> + </view> + <!-- 澧炲姞鎸夐挳 --> <!-- 閫夋嫨璐т唬鎴栬溅闃熷脊鍑烘 --> <view class="selectHuoDaiOrFleet-container"> @@ -25,14 +66,18 @@ <view class="" v-if="!tabHuoDai"> <u-cell-group> <u-cell v-for="(item, index) in fleetData" :key="index" :title="item.name"> - <view class="cell-util" slot="value"><u-button @click="forwardFleetObjectSelect(item)" text="閫夋嫨" type="primary" size="mini"></u-button></view> + <view class="cell-util" slot="value"> + <u-button @click="forwardFleetObjectSelect(item, index)" text="閫夋嫨" type="primary" size="mini"></u-button> + </view> </u-cell> </u-cell-group> </view> <view class="" v-else-if="tabHuoDai"> <u-cell-group> <u-cell v-for="(item, index) in huoDaiData" :key="index" :title="item.name"> - <view class="cell-util" slot="value"><u-button @click="forwardHuoDaiObjectSelect(item)" text="閫夋嫨" type="primary" size="mini"></u-button></view> + <view class="cell-util" slot="value"> + <u-button @click="forwardHuoDaiObjectSelect(item, index)" text="閫夋嫨" type="primary" size="mini"></u-button> + </view> </u-cell> </u-cell-group> </view> @@ -44,18 +89,57 @@ <script> import { customerId } from '@/utils/status'; +import toast from '../../../uni_modules/uview-ui/libs/config/props/toast'; export default { onLoad(params) { - console.log('杞彂鐨勬彁鐓ゅ崟id', params.orderPlanId, params.carNum); - if (params.carNumSurplus1 || params.carNumSurplusHuodai) { - if (params.carNumSurplus1 != 0) { - this.forwardSurplus = params.carNumSurplus1; - } else if (params.carNumSurplusHuodai != 0) { - this.forwardSurplus = params.carNumSurplusHuodai; + console.log(params, '杞彂椤甸潰鐨勫弬鏁�'); + // 瀹㈡埛 + this.cars2 = Number(params.cars2); + this.tempcarNumSurplus1 = this.carNumSurplus1 = Number(params.carNumSurplus1); + // 璐т唬 + this.carNum = Number(params.carNum); + this.carNumSurplusHuodai = this.forwardSurplus = Number(params.carNumSurplusHuodai); + this.orderPlanId = params.orderPlanId; + this.$reqGet('forwardList', { OrderPlanId: params.orderPlanId }).then(res => { + if (res.data.length !== 0 && this.roleType == 1) { + this.jhOrderPlanForwardList = res.data.map(item => { + return { + id: item.id, + orderPlanId: item.orderPlanId, + name: item.xsUserName === null ? item.fleetName : item.xsUserName, + carNum: item.carNum, + xsUserId: item.xsUserId === null ? 0 : item.xsUserId, + fleetId: item.fleetId === null ? 0 : item.fleetId, + checkboxValue1: '', + vid: new Date().getTime() + }; + }); + } else if (res.data.length !== 0 && this.roleType == 2) { + this.jhOrderPlanForwardList = res.data.map(item => { + return { + id: item.id, + orderPlanId: item.orderPlanId, + name: item.fleetName, + carNum: item.carNum, + xsUserId: item.xsUserId === null ? 0 : item.xsUserId, + fleetId: item.fleetId === null ? 0 : item.fleetId, + checkboxValue1: '', + vid: new Date().getTime() + }; + }); + } else { + this.jhOrderPlanForwardList = this.jhOrderPlanForwardList.map(v => { + if (!v.orderPlanId) { + return { + ...v, + orderPlanId: params.orderPlanId, + vid: new Date().getTime() + }; + } + }); } - } - this.forwardForm.orderPlanId = params.orderPlanId; + }); }, data() { return { @@ -63,24 +147,43 @@ paramsName: {}, huoDaiData: [], fleetData: [], - name: '', - forwardForm: { - orderPlanId: null, - nums: null, - userId: 0, - fleetId: 0 - }, - checkboxValue1: '', - selectPopupShow: false, - list1: [ + // 鏃ヨ鍒抜d + orderPlanId: '', + jhOrderPlanForwardList: [ { - name: '杞﹂槦' - }, - { - name: '璐т唬' + orderPlanId: '', + name: '', + carNum: null, + xsUserId: 0, + fleetId: 0, + checkboxValue1: '' } ], - tabHuoDai: false + // 绱㈠紩锛屽埄鐢ㄧ储寮曟纭樉绀� + index: '', + checkboxValue1: '', + selectPopupShow: false, + list1: [{ name: '杞﹂槦' }, { name: '璐т唬' }], + tabHuoDai: false, + carNumSurplus1: '', + tempcarNumSurplus1: '', + cars2: '', + carNum: '', + carNumSurplusHuodai: '', + formNum: 1, + // 涓汉杞彂鏁版嵁 + personalForward: {}, + whetherClick: false, + whetherClick1: false, + // 婊戝姩鍗曞厓鏍奸厤缃� + options1: [ + { + text: '鍒犻櫎', + style: { + backgroundColor: '#FB0101' + } + } + ] }; }, onShow() { @@ -93,11 +196,22 @@ computed: { roleType() { return uni.getStorageSync('roleType'); + }, + text() { + return `宸查鍙�${this.cars2}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplus1}寮犳彁鐓ゅ崟`; + }, + text1() { + return `宸叉嫢鏈�${this.carNum}寮犳彁鐓ゅ崟,鍓╀綑${this.carNumSurplusHuodai}寮犳彁鐓ゅ崟`; } }, methods: { + // 杩斿洖涓婁竴椤� + back() { + uni.navigateBack({ + delta: 1 + }); + }, init() { - console.log('roleType', this.roleType); switch (this.roleType) { case 1: this.getAllHuoDaiByCustomerId(); @@ -110,75 +224,270 @@ break; } }, - checkboxChange(value) { - console.log('澶嶉�夋鍙樺寲', value); - if (value.length != 0) { - this.forwardForm.nums = this.forwardSurplus; + allrelay(x, y) { + let a = 0; + if (y != 0) { + a = Number(x) + Number(y); + return a; } else { - this.forwardForm.nums = null; + return Number(x); + } + }, + allrelayto(x, y) { + let a = 0; + if (y != 0) { + a = Number(x) - Number(y); + return a; + } else { + return Number(x); + } + }, + checkboxChange(value, index, v) { + this.jhOrderPlanForwardList = this.jhOrderPlanForwardList.map(v => { + return { + ...v, + ischecked: false + }; + }); + if (value.length != 0) { + let tempforwardSurplus = this.forwardSurplus; + let tempcarNumSurplus1 = this.carNumSurplus1; + // if (v.id) { + // this.$reqGet('jhorderplanforward', { forwardId: v.id }).then(res => { + // this.personalForward = res.data; + // // 璁$畻鍏ㄩ儴杞彂鏁� + // // 瀹㈡埛 + // if (this.roleType == 1) { + // this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempcarNumSurplus1); + // this.calculate(this.jhOrderPlanForwardList); + // if (tempcarNumSurplus1 == 0) { + // this.jhOrderPlanForwardList[index].carNum = this.allrelay(0, this.carNumSurplus1); + // } + // } + // tempcarNumSurplus1 = 0; + // // 璐т唬 + // if (this.roleType == 2) { + // this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempforwardSurplus); + // } + // tempforwardSurplus = 0; + // }); + // } else { } + + if (this.roleType == 1) { + this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.carNumSurplus1, this.jhOrderPlanForwardList[index].carNum); + this.calculate(this.jhOrderPlanForwardList); + } + if (this.roleType == 2) { + this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.carNumSurplusHuodai, this.jhOrderPlanForwardList[index].carNum); + this.calculate(this.jhOrderPlanForwardList); + } + // 閫夋嫨涓�涓悗鍏朵綑绂佹澶嶉�� + this.jhOrderPlanForwardList.forEach((v, i) => { + if (i !== index) { + v.ischecked = true; + } + }); + this.whetherClick = true; + } else { + this.jhOrderPlanForwardList[index].carNum = 0; + this.calculate(this.jhOrderPlanForwardList); } }, // 鑾峰彇璐т唬鍒楄〃 getAllHuoDaiByCustomerId() { this.$reqGet('getAllHuoDaiByCustomerId').then(res => { this.huoDaiData = res.data; - console.log('璐т唬鍒楄〃', res); }); }, // 鑾峰彇杞﹂槦鍒楄〃 getFleet() { this.$reqGet('getFleet').then(res => { this.fleetData = res.data; - console.log('杞﹂槦鍒楄〃', res); }); }, // 杞彂 - forwardObjectClick() { - console.log('hahah'); + forwardObjectClick(index) { this.selectPopupShow = true; - console.log(this.huoDaiData, this.fleetData, '杞彂'); + this.index = index; }, selectPopupClose() { this.selectPopupShow = false; }, - selectPopupOpen() { - console.log('寮瑰嚭妗嗘墦寮�浜�'); - }, + selectPopupOpen() {}, // 杞彂閫夋嫨璐т唬 - forwardHuoDaiObjectSelect(item) { - this.selectPopupShow = false; - this.forwardForm.userId = item.userId; - this.name = item.name; - this.forwardForm.fleetId = 0; - console.log('璐т唬閫夋嫨', this.forwardForm); + forwardHuoDaiObjectSelect(item, index) { + this.$nextTick(() => { + let isableAdd = this.jhOrderPlanForwardList.filter(v => item.name === v.name); + if (isableAdd.length > 0) { + this.$u.toast('瀛樺湪閲嶅娣诲姞'); + this.selectPopupShow = true; + } else { + this.selectPopupShow = false; + this.jhOrderPlanForwardList[this.index].xsUserId = item.userId; + this.jhOrderPlanForwardList[this.index].name = item.name; + this.jhOrderPlanForwardList[this.index].fleetId = 0; + } + }); }, // 杞彂閫夋嫨杞﹂槦 - forwardFleetObjectSelect(item) { - this.selectPopupShow = false; - this.forwardForm.fleetId = item.id; - this.name = item.name; - this.forwardForm.userId = 0; - console.log('杞﹂槦閫夋嫨', this.forwardForm); + forwardFleetObjectSelect(item, index) { + this.$nextTick(() => { + let isableAdd = this.jhOrderPlanForwardList.filter(v => item.name === v.name); + if (isableAdd.length > 0) { + this.$u.toast('瀛樺湪閲嶅娣诲姞'); + this.selectPopupShow = true; + } else { + this.selectPopupShow = false; + this.jhOrderPlanForwardList[this.index].fleetId = item.id; + this.jhOrderPlanForwardList[this.index].name = item.name; + this.jhOrderPlanForwardList[this.index].xsUserId = 0; + } + }); + }, + // 璁$畻鎻愮叅鍗曟暟閲忥紝娣诲姞鎴栧垹闄ゆ椂璋冪敤 + calculate(arr) { + let total = arr.reduce((prev, cur) => { + return cur.carNum + prev; + }, 0); + console.log(total, '鎻愮叅鍗曚竴鍏辩殑鏁版嵁'); + if (this.roleType == 1) { + if (this.cars2 >= total) { + this.carNumSurplus1 = this.cars2 - total; + this.whetherClick = false; + this.whetherClick1 = false; + } else { + this.carNumSurplus1 = 0; + this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�'); + this.whetherClick = true; + this.whetherClick1 = true; + } + } + if (this.roleType == 2) { + if (this.carNum >= total) { + this.carNumSurplusHuodai = this.carNum - total; + this.whetherClick = false; + this.whetherClick1 = false; + } else { + this.carNumSurplusHuodai = 0; + this.$u.toast('鍓╀綑鎻愮叅鍗曟暟閲忎笉瓒�'); + this.whetherClick = true; + this.whetherClick1 = true; + } + } + }, + debouncecarNumInput(index, value) { + let time; + let that = this; + that.$set(that.jhOrderPlanForwardList[index], 'carNum', Number(value)); + if (that.roleType == 1) { + if (that.jhOrderPlanForwardList[index].carNum < that.carNumSurplus1) { + that.jhOrderPlanForwardList[index].checkboxValue1 = ''; + } + } + if (that.roleType == 2) { + if (that.jhOrderPlanForwardList[index].carNum < that.carNumSurplusHuodai) { + that.jhOrderPlanForwardList[index].checkboxValue1 = ''; + } + } + return (function() { + if (!time) { + time = setTimeout(() => { + that.calculate(that.jhOrderPlanForwardList); + time = null; + }, 800); + } + })(); + }, + blurInput(index, value) { + this.$set(this.jhOrderPlanForwardList[index], 'carNum', Number(value)); + this.calculate(this.jhOrderPlanForwardList); + }, + // 娣诲姞涓�缁勮〃鍗� + addForm() { + // 鍒ゆ柇鏄惁鏈変竴涓閫夛紝濡傛灉鏈夊垯绂佹鏂板姞鐨勫閫夛紝娌℃湁鍒欎笉绂佹 + let ischeck = this.jhOrderPlanForwardList.some(v => v.ischecked == true); + if (!ischeck) { + this.jhOrderPlanForwardList.push({ + orderPlanId: this.orderPlanId, + name: '', + carNum: null, + xsUserId: 0, + fleetId: 0, + checkboxValue1: '', + ischecked: false, + vid: new Date().getTime() + }); + } else { + this.jhOrderPlanForwardList.push({ + orderPlanId: this.orderPlanId, + name: '', + carNum: null, + xsUserId: 0, + fleetId: 0, + checkboxValue1: '', + ischecked: true, + vid: new Date().getTime() + }); + } + this.calculate(this.jhOrderPlanForwardList); + }, + // 鍒犻櫎涓�缁勮〃鍗� + deleteGroup(index, v) { + let tempcarNum = v.carNum; + if (v.id) { + this.$reqPost('deleteForward', { id: v.id }, 'params').then(res => { + if (res.code === 0) { + this.jhOrderPlanForwardList.splice(index, 1); + this.calculate(this.jhOrderPlanForwardList); + this.$u.toast('鍒犻櫎鎴愬姛'); + } else if (res.code === 1) { + this.$u.toast(res.msg); + } + }); + } else { + this.jhOrderPlanForwardList.splice(index, 1); + this.calculate(this.jhOrderPlanForwardList); + this.$u.toast('鍒犻櫎鎴愬姛'); + } }, // 鎻愪氦 submitForm() { - if (isNaN(Number(this.forwardForm.nums)) || Number(this.forwardForm.nums) <= 0) { - this.$u.toast('璇疯緭鍏ュ悎娉曟暟瀛�'); - } else if (Number(this.forwardForm.nums) > Number(this.forwardSurplus)) { - this.$u.toast('瓒呰繃鏈�澶ц鍗曞墿浣欓噺'); - } else { - this.$reqPost('forward', this.forwardForm, 'params').then(res => { + let isPass = false; + if (this.jhOrderPlanForwardList.length === 0) { + this.$u.toast('璇疯嚦灏戦�夋嫨涓�缁勮浆鍙戝璞�'); + } + let reg = /^[1-9]\d*$/; + this.jhOrderPlanForwardList.forEach(v => { + if (!reg.test(v.carNum) || Number(v.carNum) <= 0) { + this.$u.toast('璇疯緭鍏ュ悎娉曟暟瀛�'); + isPass = false; + return isPass; + } + // else if (Number(v.carNum) > Number(this.forwardSurplus)) { + // this.$u.toast('瓒呰繃鏈�澶ц鍗曞墿浣欓噺'); + // isPass = false; + // return isPass; + // } + else { + isPass = true; + return isPass; + } + }); + if (isPass) { + this.$reqPost('forward', this.jhOrderPlanForwardList, 'json').then(res => { + console.log(res, 'zh'); if (res.code == 0) { this.$u.toast('鎻愪氦鎴愬姛'); setTimeout(() => { uni.navigateBack({ delta: 1 }); }, 1000); + } else { + this.$u.toast(res.msg); } }); } }, tabClick(item) { - console.log('tab鐐瑰嚮', item); if (item.name == '璐т唬') { this.tabHuoDai = true; } else { @@ -190,30 +499,127 @@ </script> <style lang="scss" scoped> +@mixin flex { + display: flex; + justify-content: space-between; + align-items: center; +} +/deep/ .u-notice-bar { + background: rgba(255, 255, 255, 0.3) !important; + box-shadow: 0rpx 0rpx 5rpx 0rpx rgba(27, 103, 255, 0); + border-radius: 28rpx; + .u-notice__content { + text { + text-shadow: 3rpx 3rpx 8rpx #4784fe; + font-size: 24rpx; + color: #fd1446 !important; + font-weight: 400; + } + } +} +/deep/ .u-input { + border-bottom: 1px solid #c4c4c4; + width: 458rpx; +} ::v-deep.forward { - width: 90%; + width: 100%; margin: 0 auto; - - // 鍗$墖 - .forward-card { - margin-top: vww(24); - - .u-form { - .u-form-item { - .u-form-item__body { - .u-form-item__body__right { - .u-form-item__body__right__content { - .u-form-item__body__right__content__slot { - .forward-card-amount { - display: flex; - justify-content: space-between; - align-items: flex-end; - .forward-card-amount-input { - width: vww(245); + .forward-banner { + width: 100%; + height: 430rpx; + background: linear-gradient(0deg, #ffffff 0%, #0055fe 100%); + @include flex; + justify-content: flex-start; + overflow: hidden; + .banner-block { + width: 50%; + @include flex; + position: relative; + top: -75rpx; + left: 32rpx; + .forward-text { + width: 80rpx; + font-size: 40rpx; + font-weight: 400; + color: #ffffff; + line-height: 69rpx; + } + } + } + .notice-bar { + width: 688rpx; + height: 56rpx; + margin: 0 auto; + position: relative; + top: -200rpx; + background: transparent; + .notice-icon { + position: absolute; + top: 21rpx; + left: 7rpx; + } + } + .card-main { + width: 100%; + @include flex; + justify-content: center; + position: relative; + top: -100rpx; + z-index: 1; + margin-bottom: vww(40); + .card-block { + width: 690rpx; + @include flex; + flex-direction: column; + .forward-card { + margin-top: vww(10); + width: 690rpx; + height: 275rpx; + background: #ffffff; + box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15); + border-radius: 20rpx; + .card-content { + width: 612rpx; + margin-left: 48rpx; + margin-top: 24rpx; + // margin: 56rpx 30rpx 70rpx 48rpx; + .u-form { + .u-form-item { + .u-form-item__body { + .u-form-item__body__left { + .u-form-item__body__left__content { + .u-form-item__body__left__content__label { + font-weight: 400 !important; + color: #898989 !important; + font-size: 30rpx !important; + } } } - .u-input { - border: 1px solid #dddddd; + .u-form-item__body__right { + .u-form-item__body__right__content { + .u-form-item__body__right__content__slot { + .forward-card-amount { + display: flex; + justify-content: space-between; + align-items: flex-end; + .forward-card-amount-input { + .u-input { + width: 263rpx; + } + } + .u-checkbox-group { + position: relative; + top: vww(8); + left: vww(4); + .u-checkbox { + .u-checkbox__icon-wrap { + border-color: rgba(42, 97, 255, 1) !important; + } + } + } + } + } + } } } } @@ -221,21 +627,41 @@ } } } - .forward-card-amount { - display: flex; + } + .utils-buttonGroup { + width: 610rpx; + @include flex; + position: fixed; + bottom: vww(30); + left: vww(30); + z-index: 3; + .AdddBtn, + .forwardBtn { + width: 290rpx; + } + .AdddBtn { + .u-button { + height: 74rpx; + border: 1px solid #3b56eb; + border-radius: 37rpx 37rpx 37rpx 37rpx; + background: transparent; + color: #3b56eb; + } + } + .forwardBtn { + .u-button { + height: 74rpx; + color: #ffffff; + background: rgba(73, 123, 251, 1); + border: 0; + border-radius: 37rpx 37rpx 37rpx 37rpx; + } } } - - .forwardBtn { - width: 90%; - position: fixed; - bottom: vww(50); - } - .selectHuoDaiOrFleet-container { .u-popup { .u-transition { - height: 95%; + height: 80%; .u-popup__content { overflow: scroll !important; -- Gitblit v1.9.1