From 7af16f32de779ba2360344218f807c9909677ee1 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期四, 08 八月 2024 11:20:20 +0800 Subject: [PATCH] feat:关于产品名称换行样式修改 --- pages/driver-page/driver-index/driver-index.vue | 1593 +++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 1,122 insertions(+), 471 deletions(-) diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue index 498ea06..369347c 100644 --- a/pages/driver-page/driver-index/driver-index.vue +++ b/pages/driver-page/driver-index/driver-index.vue @@ -2,30 +2,40 @@ <view class=""> <view class="driver-index"> <view class="driver-index-body"> - <!-- <combined-title title="寰呴鍙�"></combined-title> --> - <!-- <u-empty - mode="data" - icon="http://cdn.uviewui.com/uview/empty/data.png" - textSize="30" - iconSize="1000" - v-if="driverBillOfLoadingData.list1 ? (driverBillOfLoadingData.list1.length == 0 ? true : false) : true" - ></u-empty> --> - - <!-- 寰呴鍙栨彁鐓ゅ崟 --> - <view class="wait-collection" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain"></view> + <!-- 寰呴鍙栨敹鍙戝崟 --> + <view class="wait-collection" + style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain"> + </view> + <!-- 寮曞椤� --> + <noob-tour></noob-tour> + <!-- 鑷富閰嶉�佺晫闈� --> + <!-- <view class="self-deliver"> + <view class="self-deliver_text"> + 鍒涘缓鑷富閰嶉�佸崟 + </view> + <view class="self-deliver_btn"> + <u-button text="鍘诲垱寤�" + type="primary" + shape="cirle" + @click="selfDeliver"></u-button> + </view> + </view> --> <view class="collection-form"> - <view class="collection-form-item" v-for="(item, index) in driverBillOfLoadingData.list1" :key="index"> + <view class="collection-form-item" + v-for="(item, index) in driverBillOfLoadingData.list1" + :key="index"> + <view class="main-divider"></view> <view class="first-line"> - <view class="dispatch-receive"> - <view v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'" class="container"> - <view class="dispatch">{{ item.deptName || '' }}</view> - <view class="receive-icon"></view> - <view class="receive">{{ item.customerNameCopy || '' }}}</view> - </view> - <view v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'" class="container"> - <view class="dispatch">{{ item.customerNameCopy || '' }}</view> - <view class="receive-icon"></view> - <view class="receive">{{ item.deptName || '' }}}</view> + <view class="main-information"> + <view class="sign">瑁�</view> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName|| '' }}</text> + <text + v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.customerId?item.customerName:item.customerNameCopy|| '' }}</text> + <text v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}} + + </text> </view> </view> <view class="point-number"> @@ -33,595 +43,1236 @@ <text>/{{ item.carNum }}</text> </view> </view> - <view class="second-line"> + <view class="first-extra"> + <view class="main-information"> + <view class="sign">鍗�</view> + <view class="filedname exceedHide"> + <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' "> + {{ item.customerNameCopy ? item.customerNameCopy : item.customerName|| '' }} + </text> + <text + v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.deptName|| '' }}</text> + <text + v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}} + + </text> + </view> + </view> + </view> + <!-- <view class="second-line"> <view class="coal-name">{{ item.coalName }}</view> - <!-- <view class="black-block"><view class="black-bar"></view></view> - <view class="coal-type">{{ item.orderType }}</view> --> - </view> + </view> --> <view class="third-line"> - <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view> + <view class="time-icon"><u-icon name="clock" + color="#515151" + size="40"></u-icon></view> <view class="send-date">{{ item.sendDate }}</view> + <view class="type"> + <view class="coal-name">{{ item.productNames || item.productName }}</view> + </view> </view> - <view class="fourth-line" @click="qiangDanBtn(item)" v-if="item.carNum - item.taskNum !== 0"><view class="button-img">绔嬪嵆鎶㈠崟</view></view> + <view class="fourth-line" + @click="qiangDanBtn(item)" + v-if="item.carNum - item.taskNum !== 0"> + <!-- <view class="button-img">绔嬪嵆鎺ュ崟</view> --> + <u-button type="primary" + class="button-img">绔嬪嵆鎺ュ崟</u-button> + </view> </view> </view> - <!-- 鎶㈠崟鎻愮ず妯℃�佹 --> + <!-- 鎺ュ崟鎻愮ず妯℃�佹 --> <view class="qianDanModel"> - <u-modal :show="qiangDanShow" :title="qiangDanTitle" showCancelButton :content="qiangDanContent" @confirm="qiangDanConfirm" @cancel="qiangDanCancel"></u-modal> + <u-modal :show="qiangDanShow" + :title="qiangDanTitle" + showCancelButton + :content="qiangDanContent" + @confirm="qiangDanConfirm" + @cancel="qiangDanCancel"></u-modal> </view> - - <!-- 寰呴绾︽彁鐓ゅ崟 --> + <!-- 寰呴绾︽敹鍙戝崟 --> <view class="wait-appointment"> - <combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title> - <u-empty - mode="data" + <combined-title title="寰呴绾︽敹鍙戝崟"></combined-title> + <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" + text="鏆傛棤鏁版嵁" textSize="30" iconSize="1000" - v-if="driverBillOfLoadingData.list3 ? (driverBillOfLoadingData.list3.length == 0 ? true : false) : true" - ></u-empty> + v-if="driverBillOfLoadingData.list3 ? (driverBillOfLoadingData.list3.length == 0 ? true : false) : true"></u-empty> <view class="appointment-form"> - <view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index"> + <view class="appointment-form-item" + v-for="(item, index) in driverBillOfLoadingData.list3" + :key="index"> + <view class="main-divider"></view> <view class="first-line"> <view class="main-information"> <view class="sign">瑁�</view> - <view class="filedname"> - <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text> - <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName }}</text> + <text + v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.customerName }}</text> + <text + v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}} + </text> </view> </view> - <view class="main-divider"></view> - <view class="map-icon"> - <view><u-icon name="map" color="#4978F0" size="40"></u-icon></view> + <view class="map-icon" + @click.stop="skipMap(item)"> + <view><u-icon name="map" + color="#4978F0" + size="40"></u-icon></view> </view> </view> - <view class="second-line"> + <view class="first-extra"> <view class="main-information"> <view class="sign">鍗�</view> - <view class="filedname"> - <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text> - <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.customerName }}</text> + <text + v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.deptName }}</text> + <text + v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}}</text> </view> </view> - <view class="map-icon"> - <view><u-icon name="map" color="#4978F0" size="40"></u-icon></view> + <view class="map-icon" + @click.stop="skipMap(item)"> + <view><u-icon name="map" + color="#4978F0" + size="40"></u-icon></view> </view> </view> <view class="third-line"> <view class="clock"> - <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view> + <view class="time-icon"><u-icon name="clock" + color="#515151" + size="40"></u-icon></view> <view class="send-date">{{ item.sendDate }}</view> </view> <view class="type"> - <view class="coal-name">{{ item.coalName }}</view> + <view class="coal-name">{{ item.productNames || item.productName }}</view> <!-- <view class="order-type">{{ item.orderType }}</view> --> </view> </view> - <view class="fourth-line" @click="toAppointmentClick(item)"><view class="button-img">绔嬪嵆棰勭害</view></view> + <view class="fifth-line"> + <view class="button-img" + v-if="item.isDanger === 1 && !item.idCardEscort" + @click.stop="cancelCerifCate(item)"> + 閬撹矾杩愯緭璇� + </view> + <view class="button-img" + @click.stop="cancelAppoint(item)"> + 璇锋眰閫�鍗� + </view> + <view class="button-img" + @click.stop="toAppointmentClick(item)">绔嬪嵆棰勭害</view> + </view> </view> </view> </view> - - <!-- 宸查绾︽彁鐓ゅ崟 --> + <!-- 璇锋眰閫�鍗曞脊绐� --> + <view class=""> + <u-modal :show="cancelAppointShow" + title="閫�鍗曠‘璁�" + showCancelButton + content="鏄惁纭閫�鍗�" + @confirm="cancelAppointConfirm" + @cancel="cancelAppointCancel"></u-modal> + </view> + <!-- 鍦哄唴鎺ュ崟寮圭獥 --> + <view class=""> + <u-modal :show="insideConnectShow" + title="鎺ュ崟閫夋嫨" + showCancelButton + cancel-text="姝e父鎺ュ崟" + confirm-text="鍦哄唴鎺ュ崟" + content="鍦哄唴鎺ュ崟鏃犻渶绉扮毊,鏄惁纭鎺ュ崟" + @confirm="insideConnectConfirm" + @cancel="insideConnectCancel"></u-modal> + </view> + <!-- 宸查绾︽敹鍙戝崟 --> + <!-- 濉啓闆嗚绠卞彿 --> + <view class=""> + <u-modal :show="enterCode" + title="闆嗚绠卞彿" + showCancelButton + content="璇峰~鍐欓泦瑁呯鍙�" + @confirm="cancelCodeEnter" + @cancel="cancelCodeCancel"> + <view style=" display: flex; align-items: center;"> + <text>璇疯緭鍏ワ細</text> <u--input + style="border: 1px solid black" + v-model="enterCodeStr" + placeholder="璇疯緭鍏ラ泦瑁呯鍙�"></u--input> + </view> + + </u-modal> + </view> <view class="Reserved"> - <combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title> - <u-empty - mode="data" + <combined-title title="宸查绾︽敹鍙戝崟"></combined-title> + <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" - v-if="driverBillOfLoadingData.list2 ? (driverBillOfLoadingData.list2.length == 0 ? true : false) : true" - ></u-empty> + text="鏆傛棤鏁版嵁" + v-if="driverBillOfLoadingData.list2 ? (driverBillOfLoadingData.list2.length == 0 ? true : false) : true"></u-empty> <view class="appointment-form"> - <view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index" @click="list3CardIconClick(item)"> + <view class="appointment-form-item" + v-for="(item, index) in driverBillOfLoadingData.list2" + :key="index" + @click="list3CardIconClick(item)"> + <view class="main-divider"></view> <view class="first-line"> <view class="main-information"> <view class="sign">瑁�</view> - <view class="filedname"> - <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text> - <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName }}</text> + <text + v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.customerName }}</text> + <text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'"> + {{item.filedName}} + + </text> </view> </view> - <view class="main-divider"></view> - <view class="map-icon"> - <view><u-icon name="map" color="#4978F0" size="40"></u-icon></view> + <view class="map-icon" + @click.stop="skipMap(item)"> + <view><u-icon name="map" + color="#4978F0" + size="40"></u-icon></view> </view> </view> <view class="second-line"> <view class="main-information"> <view class="sign">鍗�</view> - <view class="filedname"> - <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text> - <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.customerName }}</text> + <text + v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.deptName }}</text> + <text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'"> + {{item.toFiledName}} + + </text> </view> </view> - <view class="map-icon"> - <view><u-icon name="map" color="#4978F0" size="40"></u-icon></view> + <view class="map-icon" + @click.stop="skipMap(item)"> + <view><u-icon name="map" + color="#4978F0" + size="40"></u-icon></view> </view> </view> <view class="third-line"> <view class="clock havedclock"> - <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view> - <view class="send-date">{{ item.yuYueSection }}</view> + <view class="time-icon"><u-icon name="clock" + color="#515151" + size="40"></u-icon></view> + <view class="send-date">{{ item.yuYueSection|| '' }}</view> </view> <view class="type"> - <view class="coal-name">{{ item.coalName }}</view> + <view class="coal-name">{{ item.productNames || item.productName }}</view> <!-- <view class="order-type">{{ item.orderType }}</view> --> + </view> + </view> + <view class="fourth-line" + v-if="item.isDanger === 1"> + <view class="button-img" + @click.stop="cancelCerifCate(item)"> + 閬撹矾杩愯緭璇� + </view> + <view class="button-img" + @click.stop="cancelAppoint(item)"> + 璇锋眰閫�鍗� </view> </view> </view> </view> - <view class="white-block" v-if="driverBillOfLoadingData.list2.length !== 0">娌℃湁鏁版嵁浜�...</view> + <view class="white-block"></view> </view> </view> </view> + <u-popup :show="show" + @close="close" + @open="open" + mode="center" + round="10"> + <view class="receiverPopup"> + <view class="image"> + <u--image + :src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''" + width="80px" + height="80px" + > + <view slot="error" + style="font-size: 24rpx;">鍔犺浇澶辫触</view> + </u--image> + </view> + <view class="tables"> + <uni-table border + stripe + type="selection" + @selection-change="selectionChange" + emptyText="鏆傛棤鏇村鏁版嵁"> + <uni-tr> + <uni-th align="center">鎶艰繍鍛�</uni-th> + <uni-th align="center">韬唤璇佸彿</uni-th> + <uni-th align="center">鎵嬫満鍙�</uni-th> + </uni-tr> + <uni-tr v-for="(item, index) in inspectData" + :key="item.id"> + <uni-td align="center">{{ item.name.split("|")[0] }}</uni-td> + <uni-td align="center">{{ item.name.split("|")[1] }}</uni-td> + <uni-td align="center">{{ item.name.split("|")[2] }}</uni-td> + </uni-tr> + </uni-table> + </view> + + <view class="receiverPopup__btn"><u-button text="纭畾" + type="primary" + @click="popClick" + :loading="ClickLoading"></u-button></view> + </view> + </u-popup> </view> </template> <script> -import { customerId } from '@/utils/status'; -import combinedTitle from '@/components/combined-title/combined-title.vue'; - -export default { - components: { - combinedTitle - }, - props: { - indexdriverBillOfLoadingData: { - type: Object, - default: {} - } - }, - watch: { - indexdriverBillOfLoadingData: { - handler(v) { - this.driverBillOfLoadingData = v; - }, - deep: true, - immediate: true - } - }, - data() { - return { - driverBillOfLoadingData: {}, - // 鎶㈠崟妯℃�佹 - qiangDanShow: false, - qiangDanTitle: '鎶㈠崟鎻愮ず', - qiangDanContent: '', - qiangDanOrderPlanId: null, - fleetId: '', - xsUserId: '', - customerId: '', - // 闆嗘垚楂樺痉鍦板浘 - amapPlugin: null, - key: 'e3106700a6225e6a25727d3a41fa54c5', - addressName: '' - }; - }, - onShow() { - this.init(); - }, - methods: { - init() { - this.qiangDanList(); + import { customerId } from '@/utils/status'; + import combinedTitle from '@/components/combined-title/combined-title.vue'; + import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue'; + import { mapState } from 'vuex' + import { BaseUrl } from '@/api/publicInterface.js' + export default { + components: { + combinedTitle, + previewImage, + }, - // 鍙告満棣栭〉鍒楄〃 - qiangDanList() { - uni.showLoading({ - title: '鍔犺浇涓�...' - }); - this.$reqGet('qiangDanList').then(res => { - uni.hideLoading(); - this.driverBillOfLoadingData = res.data; - }); - }, - // 鎶㈠崟鎸夐挳 - qiangDanBtn(value) { - if (value.tmcCount == '0') { - this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId, value.xsUserId === null ? '0' : value.xsUserId); - } else { - this.qiangDanOrderPlanId = value.orderPlanId; - this.fleetId = value.fleetId; - this.customerId = value.customerId === null ? '0' : value.customerId; - this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId; - this.qiangDanShow = true; - this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋; + props: { + indexdriverBillOfLoadingData: { + type: Object, + default: {} } }, - // 鎶㈠崟妯℃�佹 - qiangDanConfirm() { - this.qiangDanContent = ''; - this.qiangDanShow = false; - this.qiangDan(this.qiangDanOrderPlanId, this.fleetId, this.customerId, this.xsUserId); + watch: { + indexdriverBillOfLoadingData: { + handler(v) { + this.driverBillOfLoadingData = v; + }, + deep: true, + immediate: true + } }, - qiangDanCancel() { - this.qiangDanShow = false; + computed: { + ...mapState(['driverTourImgList']), + roleType() { + return uni.getStorageSync('roleType'); + }, }, - // 鎶㈠崟璇锋眰 - qiangDan(id, fleetId, customerId, xsUserId) { - this.$reqPost('qiangDan', { orderPlanId: id, fleetId: fleetId, customerId: customerId, xsUserId: xsUserId }, 'params') - .then(res => { - if (res.code == 0) { - this.$u.toast('鎶㈠崟鎴愬姛'); + data() { + return { + show: false, + BaseUrl, + yaList:[], + inspectData:[], + activeObj:{}, + driverBillOfLoadingData: { + list1: [], + list2: [], + list3: [] + }, + // 鎺ュ崟妯℃�佹 + qiangDanShow: false, + enterCode:false, + enterCodeStr:'', + qiangDanTitle: '鎺ュ崟鎻愮ず', + qiangDanContent: '', + qiangDanOrderPlanId: null, + isFirstLogin: true, //鏄惁鏄涓�娆$櫥褰� + phone: "", + isFirstTime: false, //鏄惁鏄櫥褰曡繘鍏ラ椤碉紝杩樻槸鍒殑椤甸潰杩斿洖 false鏄櫥褰� true鏄埆鐨勯〉闈� + cancelAppointShow: false, //纭閫�鍗曞脊绐楁帶鍒� + cancelAppointId: '', + insideConnectShow: false, + orderPlanId: '', + fleetId: '', + customerId: '', + xsUserId: '', + filedId: '', + previewImageSrc:"", + }; + }, + onShow() { + this.init(); + }, + methods: { + open() {}, + close() { + this.show = false; + }, + selectionChange(e) { + this.yaList= e.detail.index.map(item=>{ + return this.inspectData[item] + }) + }, + popClick(){ + let data=this.yaList.map(item=>{ + return item.name + }) + let paramsData={ + idCardEscort:data.join(','),roadTransportId:this.yaList[0].roadTransportId,id: this.yaList[0].Id + } + this.$reqPut('saveMyEscort', paramsData, 'json') + .then(res => { + if (res.code == 0) { + this.$u.toast('娣诲姞鎴愬姛'); + this.qiangDanList(); + this.show=false + } else { + this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触'); + } + }) + }, + // 璺宠浆鍦板浘 + skipMap(val) { + uni.navigateTo({ + url: `/pages/public-page/mapRoute/mapRoute?customerId=${val.customerId}&filedId=${val.filedId}&orderType=${val.orderType}${ + val.toFiledId ? `&toFiledId=${val.toFiledId}&filedId=${val.filedId}` : '' + }` + }); + }, + init() { + this.inspectData=[] + this.qiangDanList(); + }, + // 鍙告満棣栭〉鍒楄〃 + qiangDanList() { + uni.showLoading({ + title: '鍔犺浇涓�...' + }); + this.$reqGet('qiangDanList').then(res => { + uni.hideLoading(); + this.driverBillOfLoadingData = res.data; + }); + }, + // 鎺ュ崟鎸夐挳 + qiangDanBtn(value) { + //鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠� + if (value.isInsideConnect === 1) { + this.insideConnectShow = true + this.orderPlanId = value.orderPlanId + this.fleetId = value.fleetId + this.customerId = !value.customerId ? '0' : value.customerId + this.xsUserId = !value.xsUserId ? '0' : value.xsUserId + this.filedId = value.filedId + } else { + if (value.tmcCount == '0') { + this.qiangDan(value.orderPlanId, value.fleetId, !value.customerId ? '0' : value.customerId, + !value.xsUserId ? '0' : value.xsUserId); } else { - this.$u.toast(res.msg ? res.msg : '鎶㈠崟澶辫触'); + this.qiangDanOrderPlanId = value.orderPlanId; + this.fleetId = value.fleetId; + this.customerId = !value.customerId ? '0' : value.customerId; + this.xsUserId = !value.xsUserId ? '0' : value.xsUserId; + this.qiangDanShow = true; + this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋; + } + } + }, + // 鎺ュ崟妯℃�佹 + qiangDanConfirm() { + this.qiangDanContent = ''; + this.qiangDanShow = false; + this.qiangDan(this.qiangDanOrderPlanId, this.fleetId, this.customerId, this.xsUserId); + }, + qiangDanCancel() { + this.qiangDanShow = false; + }, + // 鎺ュ崟璇锋眰 + qiangDan(id, fleetId, customerId, xsUserId) { + uni.showLoading({ + title: '鍔犺浇涓�' + }) + this.$reqPost('qiangDan', { + orderPlanId: id, + fleetId: fleetId, + customerId: customerId, + xsUserId: xsUserId + }, 'params') + .then(res => { + uni.hideLoading() + if (res.code == 0) { + this.$u.toast('鎺ュ崟鎴愬姛'); + + } else { + this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触'); + } + }) + .then(() => { + setTimeout(() => { + this.qiangDanList(); + }, 1500); + }).catch(e => { + uni.hideLoading() + }) + }, + insideConnectHandle(orderPlanId, fleetId, customerId, xsUserId, filedId) { + uni.showLoading({ + title: '鍔犺浇涓�' + }) + this.$reqPost('insideConnect', { + orderPlanId, + fleetId, + customerId, + xsUserId, + filedId + }, 'params').then(res => { + uni.hideLoading() + if (res.code == 0) { + this.$u.toast('鍦哄唴鎺ュ崟鎴愬姛'); + } else { + this.$u.toast(res.msg ? res.msg : '鍦哄唴鎺ュ崟澶辫触'); } }) - .then(() => { + }, + list3CardIconClick(value) { + uni.navigateTo({ + url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}&orderType=${value.orderType}` + }); + }, + // 鏀跺彂鍗曡鎯� + cardBodyClick(name) { + uni.navigateTo({ + url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}` + }); + }, + // 璇锋眰閫�鍗� + cancelAppoint(item) { + if (item.status >= 3) { + this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�') + return + } + this.cancelAppointShow = true + this.cancelAppointId = item.id + }, + cancelCerifCate(value){ + this.$reqGet('getMyEscortList', { customerId: value.customerId }).then(res => { + this.inspectData=[] + if (res.code == 0) { + this.previewImageSrc=res.data.certificateImg + this.inspectData=res.data.persons.map(item=>{ + return {name:item,roadTransportId:res.data.id,Id: value.id} + }) + this.show=true + } else { + this.$u.toast(res.msg ? res.msg : '璇锋坊鍔犻亾璺繍杈撹瘉'); + uni.navigateTo({ + url: '/pages/driver-page/drvier-my/certifiCate/certifiCate' + }) + } + }) + }, + // 閫�鍗曞脊绐楃‘璁� + cancelAppointConfirm() { + this.cancelAppointShow = false + uni.showLoading({ + title: '鍔犺浇涓�' + }) + this.$reqPost('cancelAppoint', { takeCoalId: this.cancelAppointId }, 'params').then(res => { + uni.hideLoading() + if (res.code == 0) { + this.$u.toast('閫�鍗曟垚鍔�'); + } else { + this.$u.toast(res.msg ? res.msg : '閫�鍗曞け璐�'); + } + }).then(() => { setTimeout(() => { this.qiangDanList(); }, 1000); - }); - }, - list3CardIconClick(value) { - uni.navigateTo({ - url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}` - }); - }, - // 鎻愮叅鍗曡鎯� - cardBodyClick(name) { - uni.navigateTo({ - url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}` - }); - }, - // 鍘婚绾� - toAppointmentClick(value) { - uni.navigateTo({ - url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}` - }); + }).catch(e => { + uni.hideLoading() + }) + }, + // 閫�鍗曞脊绐楀彇娑� + cancelAppointCancel() { + this.cancelAppointShow = false + }, + insideConnectCancel() { + this.insideConnectShow = false + this.qiangDan(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId) + }, + // 鍦哄唴鎺ュ崟 + insideConnectConfirm() { + this.insideConnectShow = false + this.insideConnectHandle(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId, this.filedId) + }, + // 鍘婚绾� + toAppointmentClick(value) { + // 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸~鍐欏師鍙戜负1涓嶉渶瑕佸~鍐欏師鍙� + uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0); + //鍒ゆ柇鏄笉鏄泦瑁呯 鏄惁闇�瑕佽緭鍏� + this.activeObj = value; + if(value.isDanger === 1){ + if(!value.idCardEscort){ + this.$u.toast('璇烽�夋嫨閬撹矾杩愯緭璇佸徃鏈猴紒'); + this.cancelCerifCate(value); + return + } + } + if(value.isContainerNum){ + this.enterCode = true; + }else{ + this.enterCode = false; + if (value.orderType === '澶栬喘') { + uni.navigateTo({ + url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}&isWeight=${value.isWeight}` + }); + } else { + uni.navigateTo({ + url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}` + }); + } + } + + }, + // 鑷富閰嶉�� + selfDeliver() { + uni.navigateTo({ + url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery' + }) + }, + cancelCodeEnter(){ + console.log(this.activeObj,'tmid') + this.activeObj.containerNumber = this.enterCodeStr; + this.$reqPut('addContainer',{ + id:this.activeObj.id, + containerNumber:this.activeObj.containerNumber + }).then(res=>{ + this.$u.toast('鎿嶄綔鎴愬姛'); + this.enterCodeStr = ''; + this.enterCode = false; + + }).catch(err=>{ + + }).finally(() => { + if (this.activeObj.orderType === '澶栬喘') { + uni.navigateTo({ + url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}` + }); + } else { + uni.navigateTo({ + url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}` + }); + } + }) + }, + cancelCodeCancel(){ + this.enterCode = false; + this.enterCodeStr = ''; + if (this.activeObj.orderType === '澶栬喘') { + uni.navigateTo({ + url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}` + }); + } else { + uni.navigateTo({ + url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}` + }); + } + } } - } -}; + }; </script> -<style lang="scss" scoped> -@mixin formItem { - width: vww(345); - height: vww(150); - margin-top: vww(5); - background: #ffffff; - box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15); - border-radius: 20rpx; - position: relative; - display: flex; - flex-direction: column; - justify-content: space-around; -} -@mixin firstLine { - width: 94%; - height: vww(68); - margin: vww(18) vww(16) 0 vww(16); - display: flex; - justify-content: space-between; -} -@mixin thirdLine { - width: 30%; - height: vww(68); - margin-left: vww(15); - display: flex; - justify-content: space-between; - align-items: center; - .send-date { - width: 148rpx; - height: 24rpx; - line-height: 24rpx; - font-size: 28rpx; - font-weight: 300; - color: #515151; +<style lang="scss" + scoped> + @mixin formItem { + width: vww(345); + height: vww(150); + margin-top: vww(5); + background: #ffffff; + box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15); + border-radius: 20rpx; + position: relative; + display: flex; + flex-direction: column; + justify-content: space-around; } - .havedclock { - width: 58% !important; - margin-right: 0 !important; + + @mixin firstLine { + width: 94%; + height: vww(68); + margin: vww(18) vww(16) 0 vww(16); + display: flex; + justify-content: space-between; + } + + @mixin thirdLine { + width: 30%; + height: vww(68); + margin-left: vww(15); + display: flex; + justify-content: space-between; + align-items: center; + .send-date { - width: 100%; - margin-left: vww(12); + min-width: 170rpx; + height: 24rpx; + line-height: 24rpx; + font-size: 28rpx; + font-weight: 300; + color: #515151; + } + + .havedclock { + width: 70% !important; + margin-right: 0 !important; + + .send-date { + width: 100%; + margin-left: vww(12); + } } } -} -@mixin flex { - display: flex; - justify-content: space-between; - align-items: center; -} -@mixin fourthLine { - width: 34%; - height: vww(68); - display: flex; - align-items: center; - position: relative; - left: vww(203); - bottom: vww(3); - .button-img { + + @mixin flex { + display: flex; + justify-content: space-between; + align-items: center; + } + + @mixin fourthLine { + width: 64%; + height: vww(68); + display: flex; + align-items: center; + position: relative; + left: vww(102); + bottom: vww(3); + + .button-img { + width: vww(122); + height: vww(41); + background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat; + background-size: cover; + font-size: 28rpx; + font-weight: 300; + color: #ffffff; + text-align: center; + line-height: vww(40); + + } + } + .receiverPopup { + height: vww(220); + width: 700rpx; + .image{ + width: 100%; + height: vww(110); + display: flex; + align-items: center; + justify-content: center; + } + .tables{ + width: 100%; + } + .receiverPopup__title { + margin: vww(10) auto 0; + width: 80%; + text-align: center; + } + + + &__btn { + margin: vww(10) auto; + width: 50%; + + .u-button { + height: vww(20); + } + } + } + /deep/.u-button { width: 100%; - height: 100%; - background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat; - background-size: cover; + height: 28px !important; + line-height: 40px; + padding: 0 12px; font-size: 28rpx; font-weight: 300; color: #ffffff; - text-align: center; - line-height: vww(40); + background: #497bfb !important; + letter-spacing: 4rpx; + border-radius: 37rpx 37rpx 37rpx 37rpx !important; + box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29); } -} -::v-deep.driver-index { - width: 100%; - margin: 0 auto; - // 涓讳綋 - .driver-index-body { - // margin-bottom: vww(56); - // 寰呴鍙栨彁鐓ゅ崟 - .wait-collection { - width: 100%; - height: 600rpx; - } - .collection-form { - width: vww(345); - margin: 0 vww(15); - position: relative; - top: vww(-120); - .collection-form-item { - width: vww(345); - height: vww(150); - margin-top: vww(5); - background: #ffffff; - box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15); - border-radius: 20rpx; + + .exceedHide { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + ::v-deep.driver-index { + width: 100%; + margin: 0 auto; + + // 涓讳綋 + .driver-index-body { + + // margin-bottom: vww(56); + // 寰呴鍙栨敹鍙戝崟 + .wait-collection { + width: 100%; + height: 600rpx; + } + + // 鑷富閰嶉�� + .self-deliver { position: relative; - display: flex; - flex-direction: column; - justify-content: space-around; - .first-line { - width: 94%; - height: vww(68); - margin: vww(18) vww(16) 0 vww(16); + top: vww(-120); + width: 88%; + height: vww(50); + margin: vww(8) auto; + padding: 0 vww(8); + background: #ffffff; + box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12); + border-radius: 20rpx; + @include flex; + } + + .collection-form { + width: vww(345); + margin: 0 vww(15); + position: relative; + top: vww(-120); + + .collection-form-item { + width: vww(345); + height: vww(185); + margin-top: vww(5); + background: #ffffff; + box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15); + border-radius: 20rpx; + position: relative; display: flex; - justify-content: space-between; - .dispatch-receive { - width: 70%; + flex-direction: column; + justify-content: space-around; + + .main-divider { + width: 560rpx; + height: 2rpx; + background: #e3e3e3; + position: absolute; + top: 122rpx; + left: 128rpx; + } + + .first-line { + width: 94%; + height: vww(68); + margin: vww(18) vww(16) 0 vww(16); display: flex; justify-content: space-between; - align-items: center; - .container { - width: 100%; + + .main-information { + width: 88%; + height: vww(28); display: flex; - justify-content: space-between; + justify-content: flex-start; align-items: center; + + .sign { + width: vww(28); + height: vww(28); + line-height: vww(28); + text-align: center; + background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat; + background-size: contain; + font-size: 30rpx; + font-weight: 400; + color: #ffffff; + margin-right: vww(20); + } } - .receive-icon { - width: 62rpx; - height: 14rpx; - border-bottom: 3px solid #275fa5; - position: relative; - &:after { - content: ''; - position: absolute; - width: 3px; - height: 10px; - background-color: #275fa5; - right: 0; - transform: rotate(-45deg); + + .point-number { + position: absolute; + right: 0; + width: 15%; + + text { + font-size: 24rpx; + font-weight: 400; + color: #c78a64; + } + + .residue { + font-size: 40rpx; + font-weight: 400; + color: #f81414; } } } - .point-number { - width: 15%; - text { - font-size: 24rpx; - font-weight: 400; - color: #c78a64; - } - .residue { - font-size: 40rpx; - font-weight: 400; - color: #f81414; + .first-extra { + @include firstLine; + + .main-information { + width: 100%; + height: vww(28); + display: flex; + justify-content: flex-start; + align-items: center; + + .sign { + width: vww(28); + height: vww(28); + line-height: vww(28); + text-align: center; + background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat; + background-size: contain; + font-size: 30rpx; + font-weight: 400; + color: #ffffff; + margin-right: vww(20); + } } } - } - .second-line { - width: 100%; - height: vww(68); - margin-left: vww(12); - display: flex; - justify-content: flex-start; - align-items: center; - .coal-name { - min-width: vww(50); - height: 30rpx; - font-size: 30rpx; - font-weight: 300; - color: #515151; - position: relative; - display: flex; - justify-content: center; - } - .black-block { - min-width: vww(50); - height: 30rpx; - font-size: 30rpx; - - font-weight: 300; - color: #515151; - position: relative; - top: vww(2); - display: flex; - justify-content: center; - align-items: center; - .black-bar { - width: 2rpx; - height: 30rpx; - background: #515151; - } - } - .coal-type { - min-width: vww(50); - height: 30rpx; - font-size: 30rpx; - font-weight: 300; - color: #515151; - text-align: center; - } - } - .third-line { - width: 100%; - height: vww(68); - margin-left: vww(15); - display: flex; - justify-content: flex-start; - align-items: center; - .send-date { - width: 148rpx; - height: 24rpx; - margin-left: vww(14); - line-height: 24rpx; - font-size: 28rpx; - font-weight: 300; - color: #515151; - } - } - .fourth-line { - width: 30%; - height: vww(68); - margin-left: vww(15); - display: flex; - justify-content: flex-end; - position: relative; - left: vww(190); - bottom: vww(10); - .button-img { + .second-line { width: 100%; - height: 100%; - background: url('https://mx.jzeg.cn:9095/appimg/image/banner/button.png') no-repeat; - background-size: cover; - font-size: 28rpx; - font-weight: 300; - color: #ffffff; - text-align: center; - line-height: vww(33); - } - } - } - } - .wait-appointment, - .Reserved { - position: relative; - top: vww(-120); - } - .appointment-form { - width: vww(345); - margin: 0 vww(15); - .appointment-form-item { - @include formItem; - height: vww(191); - justify-content: space-between; - .first-line { - position: relative; - @include firstLine; - .main-information { - width: 100%; - height: vww(28); + height: vww(68); + margin-left: vww(21); display: flex; justify-content: flex-start; align-items: center; - .sign { - width: vww(28); - height: vww(28); - line-height: vww(28); - text-align: center; - background: url('https://mx.jzeg.cn:9095/appimg/image/banner/blueblock.png') no-repeat; - background-size: contain; + .coal-name { + min-width: vww(50); + height: 35rpx; font-size: 30rpx; - font-weight: 400; - color: #ffffff; - margin-right: vww(20); + font-weight: 300; + color: #515151; + position: relative; + display: flex; + justify-content: flex-start; + } + + .black-block { + min-width: vww(50); + height: 30rpx; + font-size: 30rpx; + font-weight: 300; + color: #515151; + position: relative; + top: vww(2); + display: flex; + justify-content: center; + align-items: center; + + .black-bar { + width: 2rpx; + height: 30rpx; + background: #515151; + } + } + + .coal-type { + min-width: vww(50); + height: 30rpx; + font-size: 30rpx; + font-weight: 300; + color: #515151; + text-align: center; } } + + .third-line { + width: 100%; + height: vww(68); + margin-left: vww(21); + display: flex; + justify-content: flex-start; + align-items: center; + + .send-date { + min-width: 146rpx; + height: 24rpx; + margin-left: vww(14); + margin-right: vww(56); + line-height: 24rpx; + font-size: 28rpx; + font-weight: 300; + color: #515151; + } + + .type { + flex: 1; + margin-right: vww(10); + display: flex; + justify-content: center; + align-items: center; + + .coal-name { + width: 120rpx; + height: 42rpx; + line-height: 42rpx; + border: 2px solid #035cfb; + border-radius: 4rpx; + font-size: 28rpx; + font-weight: 300; + color: #035cfb; + text-align: center; + padding: vww(3) vww(11); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + } + } + + // 寰呴绾� + .fourth-line { + width: 30%; + height: vww(68); + margin-left: vww(15); + margin-top: vww(5); + display: flex; + justify-content: flex-end; + position: relative; + left: vww(203); + bottom: vww(3); + } + } + } + + .wait-appointment, + .Reserved { + position: relative; + top: vww(-120); + } + + .appointment-form { + width: vww(345); + margin: 0 vww(15); + + .appointment-form-item { + @include formItem; + height: vww(191); + justify-content: space-between; + overflow: hidden; + .main-divider { - width: 548rpx; + width: 560rpx; height: 1rpx; background: #e3e3e3; position: absolute; - top: vww(40); - left: vww(50); + top: 122rpx; + left: 128rpx; } - } - .second-line { - @include firstLine margin: 0; - margin-left: vww(16); - .main-information { - width: 100%; - height: vww(28); - display: flex; - justify-content: flex-start; - align-items: center; - .sign { - width: vww(28); + + .first-line { + position: relative; + @include firstLine; + + .main-information { + width: 100%; height: vww(28); - line-height: vww(28); - text-align: center; - background: url('https://mx.jzeg.cn:9095/appimg/image/banner/redblock.png') no-repeat; - background-size: contain; - font-size: 30rpx; - font-weight: 400; - color: #ffffff; - margin-right: vww(20); + display: flex; + justify-content: flex-start; + align-items: center; + + .sign { + width: vww(28); + height: vww(28); + line-height: vww(28); + text-align: center; + background: url('https://mx.jzeg.cn:9096/appimg/image/banner/blueblock.png') no-repeat; + background-size: contain; + font-size: 30rpx; + font-weight: 400; + color: #ffffff; + margin-right: vww(20); + } + + .filedname { + width: 80%; + } + } + + .map-icon { + position: absolute; + right: vww(-1); + top: vww(2) } } - } - .third-line { - @include thirdLine; - width: 94%; - justify-content: flex-start; - .clock { - width: 33%; - height: vww(21); - margin-right: vww(70); - line-height: vww(21); - @include flex; + + .first-extra { + @include firstLine; + position: relative; + + .main-information { + width: 100%; + height: vww(28); + display: flex; + justify-content: flex-start; + align-items: center; + + .sign { + width: vww(28); + height: vww(28); + line-height: vww(28); + text-align: center; + background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat; + background-size: contain; + font-size: 30rpx; + font-weight: 400; + color: #ffffff; + margin-right: vww(20); + } + + .filedname { + width: 80%; + } + } + + .map-icon { + position: absolute; + right: vww(-1); + top: vww(2) + } + } + + .second-line { + @include firstLine; + margin: 0; + margin-left: vww(16); + position: relative; + + .main-information { + width: 100%; + height: vww(28); + display: flex; + justify-content: flex-start; + align-items: center; + + .sign { + width: vww(28); + height: vww(28); + line-height: vww(28); + text-align: center; + background: url('https://mx.jzeg.cn:9096/appimg/image/banner/redblock.png') no-repeat; + background-size: contain; + font-size: 30rpx; + font-weight: 400; + color: #ffffff; + margin-right: vww(20); + } + + .filedname { + width: 80%; + } + } + + .map-icon { + position: absolute; + right: vww(-1); + top: vww(2) + } + } + + .third-line { + @include thirdLine; + width: 94%; justify-content: flex-start; - .send-date { - margin-left: vww(14); + margin-left: vww(18); + + .clock { + width: 40%; + height: vww(21); + margin-right: vww(50); + line-height: vww(21); + @include flex; + justify-content: flex-start; + + .send-date { + margin-left: vww(14); + } + } + + .type { + flex: 1; + margin-right: vww(10); + display: flex; + justify-content: center; + align-items: center; + + .order-type, + .coal-name { + width: 120rpx; + height: 42rpx; + line-height: 42rpx; + border: 2px solid #035cfb; + border-radius: 4rpx; + font-size: 28rpx; + font-weight: 300; + color: #035cfb; + text-align: center; + padding: vww(3) vww(11); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } } } - .type { - flex: 1; - margin-right: vww(10); + + .fourth-line { + @include fourthLine; + } + .fifth-line { + height: vww(68); display: flex; - justify-content: center; align-items: center; - .order-type, - .coal-name { - // min-width: 120rpx; - height: 42rpx; - line-height: 42rpx; - border: 2px solid #035cfb; - border-radius: 4rpx; + .button-img { + width: vww(122); + height: vww(41); + background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat; + background-size: cover; font-size: 28rpx; font-weight: 300; - color: #035cfb; + color: #ffffff; text-align: center; - padding: vww(3) vww(11); + line-height: vww(40); + } } } + } + + .Reserved { .fourth-line { - @include fourthLine; + justify-content: flex-end; + letter-spacing: vww(2); + left: 223rpx !important; + } + + .white-block { + width: 100%; + height: vww(50); + line-height: vww(50); + text-align: center; + color: #333; + margin-top: vww(10); } } - } - .Reserved { - .white-block { - width: 100%; - height: vww(50); - line-height: vww(50); - text-align: center; - color: #333; - margin-top: vww(10); + + .noob-tour { + margin-bottom: vww(10); + position: relative; + top: -240rpx; } } } -} -</style> +</style> \ No newline at end of file -- Gitblit v1.9.1