From 3f798d6f31282420a4785e850278aee3c15de171 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期二, 09 七月 2024 17:57:50 +0800 Subject: [PATCH] fix:首页样式更新 --- pages/public-page/aboutus/index.vue | 2 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 6 pages/driver-page/driver-index/test-index.vue | 2461 ++++++++++++++++++++++++++++++--------------------------- 3 files changed, 1,300 insertions(+), 1,169 deletions(-) diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue index d18ad56..a14f03f 100644 --- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue +++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue @@ -29,7 +29,7 @@ <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view> - <view class="send-date">{{ coalDetailsData.sendDate }}</view> + <view class="send-date" >{{ coalDetailsData.sendDate }}</view> </view> <view class="coal-code">閫氱煡鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view> <view class="order-code"> @@ -695,6 +695,10 @@ <style lang="scss" scoped> + .send-date{ + font-size: 12px; + color: #eee; + } .weighing-item{ min-height: 200rpx!important; } diff --git a/pages/driver-page/driver-index/test-index.vue b/pages/driver-page/driver-index/test-index.vue index f9c2c31..e4ed2af 100644 --- a/pages/driver-page/driver-index/test-index.vue +++ b/pages/driver-page/driver-index/test-index.vue @@ -1,1229 +1,1356 @@ <template> - <div class="warp" :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/diverbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }"> - <scroll-view - scroll-y class="page" @scroll="onScroll"> - <div class="warp-box"> - <!-- 褰撳墠鐨勮鍗� --> - <!-- 鍗犱綅 --> - <div class="ingOrderDiv"> - <div class="ingOrder" v-for="(item,i) in driverBillOfLoadingData.list2" :key="i" v-if="i == 0" - @click="list3CardIconClick(item)" + <div + class="warp" + :style="{ + backgroundImage: `url(${onlineurl}/appimg/image/banner/diverbanner.png)`, + backgroundSize: 'contain', + backgroundRepeat: 'no-repeat', + }" + > + <scroll-view scroll-y class="page" @scroll="onScroll"> + <div class="warp-box"> + <!-- 褰撳墠鐨勮鍗� --> + <!-- 鍗犱綅 --> + <div class="ingOrderDiv"> + <div + class="ingOrder" + v-for="(item, i) in driverBillOfLoadingData.list2" + :key="i" + v-if="i == 0" + @click="list3CardIconClick(item)" + > + <!-- 绗竴琛� --> + <div class="firstLine"> + <div class="leftIcon"> + <div class="leftOneDiv"> + <span class="leftOne">瑁�</span> + </div> + <div class="leftLine"></div> + <div class="rightDiv"> + <span class="rightone">鍗�</span> + </div> + </div> + <div class="centerTitle"> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'" + >{{ item.deptName }}</text + > + <text + v-else-if=" + item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' + " + >{{ item.customerName }}</text + > + <text + v-else-if=" + item.orderType == '杞嚭' || item.orderType == '杞叆' + " + > + {{ item.filedName }} + </text> + </view> + <p class="centerLine"></p> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'" + >{{ item.customerName }}</text + > + <text + v-else-if=" + item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' + " + >{{ item.deptName }}</text + > + <text + v-else-if=" + item.orderType == '杞嚭' || item.orderType == '杞叆' + " + > + {{ item.toFiledName }} + </text> + </view> + </div> + <div class="rightIcon"> + <u-icon + name="map" + color="#4978F0" + @click.stop="skipMap(item)" + size="40" + ></u-icon> + <u-icon + @click.stop="skipMap(item)" + name="map" + color="#4978F0" + size="40" + ></u-icon> + </div> + </div> + <div class="statusBox"> + <div class="twoleft"> + <view class="time-icon" + ><u-icon name="clock" color="#515151" size="25"></u-icon + ></view> + <view + class="send-date" + style="font-size: 28rpx; color: #1f4978f0" + >{{ item.yuYueSection || item.yuYueTime }}</view > - <!-- 绗竴琛� --> - <div class="firstLine"> - <div class="leftIcon"> - <div class="leftOneDiv"> - <span class="leftOne">瑁�</span> - </div> - <div class="leftLine"></div> - <div class="rightDiv"> - <span class="rightone">鍗�</span> - </div> - </div> - <div class="centerTitle"> - <view class="filedname exceedHide"> - <text - v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName }}</text> - <text - v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerName }}</text> - <text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'"> - {{item.filedName}} - </text> - </view> - <p class="centerLine"></p> - <view class="filedname exceedHide"> - <text - v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.customerName }}</text> - <text - v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'">{{ item.deptName }}</text> - <text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'"> - {{item.toFiledName}} - </text> - </view> - </div> - <div class="rightIcon"> - <u-icon name="map" - color="#4978F0" - @click.stop="skipMap(item)" - size="40"></u-icon - > - <u-icon - @click.stop="skipMap(item)" - name="map" - color="#4978F0" - size="40"></u-icon> - </div> - </div> - <div class="statusBox"> - <div class="twoleft"> - <view class="time-icon"><u-icon name="clock" - color="#515151" - size="25"></u-icon></view> - <view class="send-date">{{ item.yuYueTime }}</view> - </div> - <view class="status"> - <u-tag :text="coalStatus[item.statusWeigh] || ''" - plain> - </u-tag> - </view> - </div> - - <div class="twoLine"> - - <div class="twoRight"> - <view> - <u-tag :text="item.coalName" plain> </u-tag> - </view> - <view style="margin-left: 10rpx"> - <u-tag :text="item.orderType" plain> </u-tag> - </view> - - </div> - </div> - <div class="threeLine"> - <span class="more" @click="todoHistory">MORE>></span> - </div> + </div> + <view class="status"> + <u-tag :text="coalStatus[item.statusWeigh] || ''" plain> + </u-tag> + </view> </div> - <u-empty mode="data" - :marginTop='330' - icon="http://cdn.uviewui.com/uview/empty/data.png" - textSize="30" - iconSize="1000" - text="鏆傛棤鏁版嵁" - v-if="driverBillOfLoadingData.list2.length ===0"></u-empty> - </div> - <!-- 钂欏眰 --> - <!-- 涔濆鏍� --> - <view class="gridBoxBg no-right no-left"> - <view class="gridBox" > - <u-grid - :border="false" - col="4" - v-if="!loading" - > + <div class="twoLine"> + <div class="twoRight"> + <view> + <u-tag :text="item.coalName" plain> </u-tag> + </view> + <view style="margin-left: 10rpx"> + <u-tag :text="item.orderType" plain> </u-tag> + </view> + </div> + </div> + <div class="threeLine"> + <span class="more" @click="todoHistory">MORE>></span> + </div> + </div> + <u-empty + mode="data" + :marginTop="330" + icon="http://cdn.uviewui.com/uview/empty/data.png" + textSize="30" + iconSize="1000" + text="鏆傛棤鏁版嵁" + v-if="driverBillOfLoadingData.list2.length === 0" + ></u-empty> + </div> + <!-- 钂欏眰 --> + + <!-- 涔濆鏍� --> + <view class="gridBoxBg no-right no-left"> + <view class="gridBox"> + <u-grid :border="false" col="4" v-if="!loading"> <u-grid-item - v-for="(listItem,listIndex) in list" - :key="listIndex" + v-for="(listItem, listIndex) in list" + :key="listIndex" + > + <u--image + :showLoading="true" + :src="listItem.src" + width="50px" + height="50px" + @click="gridClick(listItem)" + ></u--image> + <text class="grid-text">{{ listItem.title }}</text> + </u-grid-item> + </u-grid> + </view> + </view> - > - <u--image :showLoading="true" :src="listItem.src" width="50px" height="50px" @click="gridClick(listItem)"></u--image> - <text class="grid-text" >{{listItem.title}}</text> - </u-grid-item> - </u-grid> - </view> - </view> - - <!-- 绔嬪嵆鎶㈠崟 --> - <div class="orderGrabbing" v-for="item,i in driverBillOfLoadingData.list1" :key="i"> - <!-- 绗竴琛� --> - <div class="firstLine"> - <div class="leftIcon"> - <div class="leftOneDiv"> - <span class="leftOne">瑁�</span> - </div> - <div class="leftLine"></div> - <div class="rightDiv"> - <span class="rightone">鍗�</span> - </div> - </div> - <div class="centerTitle"> - <view class="filedname exceedHide"> - <text - v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName|| '' }}</text> - <text - v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerId?item.customerName:item.customerNameCopy|| '' }}</text> - <text v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}} - </text> - </view> - <p class="centerLine"></p> - <view class="filedname exceedHide"> - <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' "> - {{ item.customerNameCopy ? item.customerNameCopy : item.customerName|| '' }} - </text> - <text - v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.deptName|| '' }}</text> - <text - v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}} - </text> - </view> - </div> - <div class="rightIcon"> - <div> - <span style="color: #F81414;font-size: 40rpx;font-weight: 400">{{ item.carNum - item.taskNum }}</span> - <span style="font-size: 24rpx;color: #C78A64;font-weight: 400;">/</span> - <span style="font-size: 24rpx;color: #C78A64;font-weight: 400;">{{ item.carNum }}</span> - </div> - </div> - </div> - <div class="twoLine"> - <div class="twoleft"> - <span>{{ item.coalName }}</span> - <span>|</span> - <span>{{ item.orderType }}</span> - </div> - </div> - <div class="threeLine"> - <div class="date"> - <view class="time-icon"><u-icon name="clock" - color="#515151" - size="30"></u-icon></view> - <view class="send-date">{{ item.createTime }}</view> - </div> - <span class="more"> - <div @click.stop="toAppointmentClick(item)" class="qiangdanBtn">绔嬪嵆棰勭害</div> - </span> - </div> + <!-- 绔嬪嵆鎶㈠崟 --> + <div + class="orderGrabbing" + v-for="(item, i) in driverBillOfLoadingData.list1" + :key="i" + > + <!-- 绗竴琛� --> + <div class="firstLine"> + <div class="leftIcon"> + <div class="leftOneDiv"> + <span class="leftOne">瑁�</span> + </div> + <div class="leftLine"></div> + <div class="rightDiv"> + <span class="rightone">鍗�</span> + </div> </div> - <!-- 寰呴绾︽彁鐓ゅ崟 --> - <combined-title title="寰呴绾﹂�氱煡鍗�"></combined-title> - <div class="pendingAppointment" v-for="item,i in driverBillOfLoadingData.list3 " :key="i" - @click.stop="list3CardIconClick(item)" - > - <div class="firstLine"> - <div class="leftIcon"> - <div class="leftOneDiv"> - <span class="leftOne">瑁�</span> - </div> - <div class="leftLine"></div> - <div class="rightDiv"> - <span class="rightone">鍗�</span> - </div> - </div> - <div class="centerTitle"> - <view class="filedname exceedHide"> - <text - v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName|| '' }}</text> - <text - v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerId?item.customerName:item.customerNameCopy|| '' }}</text> - <text v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}} - </text> - </view> - <p class="centerLine"></p> - <view class="filedname exceedHide"> - <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' "> - {{ item.customerNameCopy ? item.customerNameCopy : item.customerName|| '' }} - </text> - <text - v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.deptName|| '' }}</text> - <text - v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}} - </text> - </view> - </div> - <div class="rightIcon"> - <!-- <div> + <div class="centerTitle"> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'" + >{{ item.deptName || "" }}</text + > + <text + v-else-if=" + item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' + " + >{{ + item.customerId + ? item.customerName + : item.customerNameCopy || "" + }}</text + > + <text + v-else-if=" + item.orderType == '杞嚭' || item.orderType == '杞叆' + " + >{{ item.filedName }} + </text> + </view> + <p class="centerLine"></p> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'" + > + {{ + item.customerNameCopy + ? item.customerNameCopy + : item.customerName || "" + }} + </text> + <text + v-else-if=" + item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' + " + >{{ item.deptName || "" }}</text + > + <text + v-else-if=" + item.orderType == '杞嚭' || item.orderType == '杞叆' + " + >{{ item.toFiledName }} + </text> + </view> + </div> + <div class="rightIcon"> + <div> + <span + style="color: #f81414; font-size: 40rpx; font-weight: 400" + >{{ item.carNum - item.taskNum }}</span + > + <span style="font-size: 24rpx; color: #c78a64; font-weight: 400" + >/</span + > + <span + style="font-size: 24rpx; color: #c78a64; font-weight: 400" + >{{ item.carNum }}</span + > + </div> + </div> + </div> + <div class="twoLine"> + <div class="twoleft"> + <span>{{ item.coalName }}</span> + <span>|</span> + <span>{{ item.orderType }}</span> + </div> + </div> + <div class="threeLine"> + <div class="date"> + <view class="time-icon" + ><u-icon name="clock" color="#515151" size="30"></u-icon + ></view> + <view class="send-date">{{ item.createTime }}</view> + </div> + <span class="more"> + <div @click.stop="qiangDanBtn(item)" class="qiangdanBtn"> + 绔嬪嵆鎶㈠崟 + </div> + </span> + </div> + </div> + <!-- 寰呴绾︽彁鐓ゅ崟 --> + <combined-title title="寰呴绾﹂�氱煡鍗�"></combined-title> + <div + class="pendingAppointment" + v-for="(item, i) in driverBillOfLoadingData.list3" + :key="i" + @click.stop="list3CardIconClick(item)" + > + <div class="firstLine"> + <div class="leftIcon"> + <div class="leftOneDiv"> + <span class="leftOne">瑁�</span> + </div> + <div class="leftLine"></div> + <div class="rightDiv"> + <span class="rightone">鍗�</span> + </div> + </div> + <div class="centerTitle"> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'" + >{{ item.deptName || "" }}</text + > + <text + v-else-if=" + item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' + " + >{{ + item.customerId + ? item.customerName + : item.customerNameCopy || "" + }}</text + > + <text + v-else-if=" + item.orderType == '杞嚭' || item.orderType == '杞叆' + " + >{{ item.filedName }} + </text> + </view> + <p class="centerLine"></p> + <view class="filedname exceedHide"> + <text + v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'" + > + {{ + item.customerNameCopy + ? item.customerNameCopy + : item.customerName || "" + }} + </text> + <text + v-else-if=" + item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' + " + >{{ item.deptName || "" }}</text + > + <text + v-else-if=" + item.orderType == '杞嚭' || item.orderType == '杞叆' + " + >{{ item.toFiledName }} + </text> + </view> + </div> + <div class="rightIcon"> + <!-- <div> <span style="color: #F81414;font-size: 40rpx;font-weight: 400">3</span> <span style="font-size: 24rpx;color: #C78A64;font-weight: 400;">/</span> <span style="font-size: 24rpx;color: #C78A64;font-weight: 400;">18</span> </div> --> - </div> - </div> - <div class="twoLine"> - <div class="twoleft"> - <span>{{ item.coalName }}</span> - <span>|</span> - <span>{{ item.orderType }}</span> - </div> - </div> - <div class="threeLine"> - <div class="date"> - <view class="time-icon"><u-icon name="clock" - color="#515151" - size="30"></u-icon></view> - <view class="send-date"> {{ item.createTime }}</view> - </div> - <span class="more"> - <div class="qiangdanBtn" @click.stop="toAppointmentClick(item)">绔嬪嵆棰勭害</div> - </span> - </div> </div> - <!-- <div v-if="!driverBillOfLoadingData.list3.length"><u-empty + </div> + <div class="twoLine"> + <div class="twoleft"> + <span>{{ item.coalName }}</span> + <span>|</span> + <span>{{ item.orderType }}</span> + </div> + </div> + <div class="threeLine"> + <div class="date"> + <view class="time-icon" + ><u-icon name="clock" color="#515151" size="30"></u-icon + ></view> + <view class="send-date"> {{ item.createTime }}</view> + </div> + <span class="more"> + <div class="qiangdanBtn" @click.stop="toAppointmentClick(item)"> + 绔嬪嵆棰勭害 + </div> + </span> + </div> + </div> + <!-- <div v-if="!driverBillOfLoadingData.list3.length"><u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30"></u-empty></div> --> - <!-- 閫氱煡閫氬憡 --> - <combined-title title="閫氱煡鍏憡"></combined-title> - <div class="tongzhi"> - <u-list + <!-- 閫氱煡閫氬憡 --> + <combined-title title="閫氱煡鍏憡"></combined-title> + <div class="tongzhi"> + <u-list v-if="noticeList && noticeList.length" height="280rpx" @scrolltolower="scrolltolower" pagingEnabled - > - <u-list-item - v-for="(item, index) in noticeList" - :key="index" - > - <div class="listItem" @click="todoNotice(item)"> + > + <u-list-item v-for="(item, index) in noticeList" :key="index"> + <div class="listItem" @click="todoNotice(item)"> + <div class="listItemTop"> + <u-avatar + slot="icon" + shape="square" + size="35" + :src="item.url" + customStyle="margin: -3px 5px -3px 0" + ></u-avatar> + <div v-html="item.title"></div> + </div> - <div class="listItemTop"> - <u-avatar - slot="icon" - shape="square" - size="35" - :src="item.url" - customStyle="margin: -3px 5px -3px 0" - ></u-avatar> - <div v-html="item.title"></div></div> - - <span class="listDate">{{ item.createTime }}</span> - </div> - </u-list-item> - </u-list> - <u-empty + <span class="listDate">{{ item.createTime }}</span> + </div> + </u-list-item> + </u-list> + <u-empty v-if="!noticeList.length" - mode="data" - icon="http://cdn.uviewui.com/uview/empty/data.png" - textSize="30"></u-empty> - </div> - <!-- 寮曞椤� --> - <view class="noob-tour" - v-if="roleType===3&&isFirstLogin"> - <combined-title title="鎿嶄綔鎸囧紩"></combined-title> - <u-cell-group> - <u-cell title="鏂版墜鎸囧紩" - name='1' - :clickable="true" - @click="noobTour"> - <u-badge type="primary" - value="01" - slot='icon'></u-badge> - <u-icon slot="value" - name="arrow-right" - size="30" - color="#b8b8b8"></u-icon> - </u-cell> - </u-cell-group> - </view> - - </div> - </scroll-view> - <!-- 鎶㈠崟鎻愮ず妯℃�佹 --> - <view class="qianDanModel"> - <u-modal :show="qiangDanShow" - :title="qiangDanTitle" - showCancelButton - :content="qiangDanContent" - @confirm="qiangDanConfirm" - @cancel="qiangDanCancel"></u-modal> - </view> - <!-- 鍥剧墖棰勮寮瑰嚭妗� --> - <view class="previewImage-container"> - <previewImage ref="previewImage" - :imgs="driverTourImgList" - :saveBtn='false'></previewImage> - </view> - <!-- 閫氱煡鍏憡 --> - <u-modal :show="noticeModelShow" :title="notice.title" @confirm="noticConfirm" > - <div v-html="notice.content"></div> - </u-modal> - </div> + mode="data" + icon="http://cdn.uviewui.com/uview/empty/data.png" + textSize="30" + ></u-empty> + </div> + <!-- 寮曞椤� --> + <view class="noob-tour" v-if="roleType === 3 && isFirstLogin"> + <combined-title title="鎿嶄綔鎸囧紩"></combined-title> + <u-cell-group> + <u-cell + title="鏂版墜鎸囧紩" + name="1" + :clickable="true" + @click="noobTour" + > + <u-badge type="primary" value="01" slot="icon"></u-badge> + <u-icon + slot="value" + name="arrow-right" + size="30" + color="#b8b8b8" + ></u-icon> + </u-cell> + </u-cell-group> + </view> + </div> + </scroll-view> + <!-- 鎶㈠崟鎻愮ず妯℃�佹 --> + <view class="qianDanModel"> + <u-modal + :show="qiangDanShow" + :title="qiangDanTitle" + showCancelButton + :content="qiangDanContent" + @confirm="qiangDanConfirm" + @cancel="qiangDanCancel" + ></u-modal> + </view> + <!-- 鍥剧墖棰勮寮瑰嚭妗� --> + <view class="previewImage-container"> + <previewImage + ref="previewImage" + :imgs="driverTourImgList" + :saveBtn="false" + ></previewImage> + </view> + <!-- 閫氱煡鍏憡 --> + <u-modal + :show="noticeModelShow" + :title="notice.title" + @confirm="noticConfirm" + > + <div v-html="notice.content"></div> + </u-modal> + </div> </template> <script> - import { onlineurl } from '@/api/request.js' - import { BaseUrl } from '@/api/publicInterface.js' - import combinedTitle from '@/components/combined-title/combined-title.vue'; - import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue'; - import { mapState } from 'vuex'; - import { Debounce } from '../../../utils/util'; - export default { - components: { - combinedTitle, - previewImage - }, - props: { - indexdriverBillOfLoadingData: { - type: Object, - default: {} - } - }, - watch: { - indexdriverBillOfLoadingData: { - handler(v) { - this.driverBillOfLoadingData = v; - }, - deep: true, - immediate: true - }, - }, - computed: { - ...mapState(['driverTourImgList']), - roleType() { - return uni.getStorageSync('roleType'); - }, - }, - data() { - return { - labaIcon:`${onlineurl}/appimg/image/鍙告満绔椤�/缁� 27 鎷疯礉 3.jpg`, - newIcon:`${onlineurl}/appimg/image/鍙告満绔椤�/缁� 27.jpg`, - markFlag:'none', - noticeModelShow:false, - garidInitTop:'', //鍏冪礌鍒濆璺濈椤堕儴鐨勯珮搴� - screenHeight:'', - notice:{ - title:'', - content:"", - }, - noticeList: [], - urls: [ - 'https://cdn.uviewui.com/uview/album/1.jpg', - 'https://cdn.uviewui.com/uview/album/2.jpg', - 'https://cdn.uviewui.com/uview/album/3.jpg', - 'https://cdn.uviewui.com/uview/album/4.jpg', - 'https://cdn.uviewui.com/uview/album/5.jpg', - 'https://cdn.uviewui.com/uview/album/6.jpg', - 'https://cdn.uviewui.com/uview/album/7.jpg', - 'https://cdn.uviewui.com/uview/album/8.jpg', - 'https://cdn.uviewui.com/uview/album/9.jpg', - 'https://cdn.uviewui.com/uview/album/10.jpg', - ], - list: [{ - src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15.jpg', - title: '鍚堜綔鍩哄湴' - }, - { - src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(1).jpg', - title: '鍘嗗彶璁㈠崟' - }, - // { - // src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(2).jpg', - // title: '璐ㄦ' - // }, - // { - // src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(3).jpg', - // title: '杞﹂槦绠$悊' - // }, - { - src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(4).jpg', - title: '鍏充簬鎴戜滑', - }, - { - src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 14.jpg', - title: '娑堟伅' - }, - { - src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 32.jpg', - title: '鎿嶄綔鎸囧崡' - }, - { - src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(5).jpg', - title: '鏁版嵁缁熻' - }, - ], - driverBillOfLoadingData: { - list1: [], - list2: [], - list3: [] - }, - // 鎶㈠崟妯℃�佹 - qiangDanShow: false, - noticePage:{ - current:1, - page:10, - }, +import { onlineurl } from "@/api/request.js"; +import { BaseUrl } from "@/api/publicInterface.js"; +import combinedTitle from "@/components/combined-title/combined-title.vue"; +import previewImage from "@/components/kxj-previewImage/kxj-previewImage.vue"; +import { mapState } from "vuex"; +import { Debounce } from "../../../utils/util"; +export default { + components: { + combinedTitle, + previewImage, + }, + props: { + indexdriverBillOfLoadingData: { + type: Object, + default: {}, + }, + }, + watch: { + indexdriverBillOfLoadingData: { + handler(v) { + this.driverBillOfLoadingData = v; + }, + deep: true, + immediate: true, + }, + }, + computed: { + ...mapState(["driverTourImgList"]), + roleType() { + return uni.getStorageSync("roleType"); + }, + }, + data() { + return { + labaIcon: `${onlineurl}/appimg/image/鍙告満绔椤�/缁� 27 鎷疯礉 3.jpg`, + newIcon: `${onlineurl}/appimg/image/鍙告満绔椤�/缁� 27.jpg`, + markFlag: "none", + noticeModelShow: false, + garidInitTop: "", //鍏冪礌鍒濆璺濈椤堕儴鐨勯珮搴� + screenHeight: "", + notice: { + title: "", + content: "", + }, + noticeList: [], + urls: [ + "https://cdn.uviewui.com/uview/album/1.jpg", + "https://cdn.uviewui.com/uview/album/2.jpg", + "https://cdn.uviewui.com/uview/album/3.jpg", + "https://cdn.uviewui.com/uview/album/4.jpg", + "https://cdn.uviewui.com/uview/album/5.jpg", + "https://cdn.uviewui.com/uview/album/6.jpg", + "https://cdn.uviewui.com/uview/album/7.jpg", + "https://cdn.uviewui.com/uview/album/8.jpg", + "https://cdn.uviewui.com/uview/album/9.jpg", + "https://cdn.uviewui.com/uview/album/10.jpg", + ], + list: [ + { + src: "/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15.jpg", + title: "鍚堜綔鍩哄湴", + }, + { + src: "/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(1).jpg", + title: "鍘嗗彶璁㈠崟", + }, + // { + // src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(2).jpg', + // title: '璐ㄦ' + // }, + // { + // src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(3).jpg', + // title: '杞﹂槦绠$悊' + // }, + { + src: "/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(4).jpg", + title: "鍏充簬鎴戜滑", + }, + { + src: "/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 14.jpg", + title: "娑堟伅", + }, + { + src: "/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 32.jpg", + title: "鎿嶄綔鎸囧崡", + }, + { + src: "/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(5).jpg", + title: "鏁版嵁缁熻", + }, + ], + driverBillOfLoadingData: { + list1: [], + list2: [], + list3: [], + }, + // 鎶㈠崟妯℃�佹 + qiangDanShow: false, + noticePage: { + current: 1, + page: 10, + }, - qiangDanTitle: '鎶㈠崟鎻愮ず', - qiangDanContent: '', - qiangDanOrderPlanId: null, - fleetId: '', - xsUserId: '', - customerId: '', - coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'], - onlineurl, - phone: "", - loading:true, - isFirstLogin: true //鏄惁鏄涓�娆$櫥褰� - }; - }, - mounted() { - // this.TourImgList = TourImgList - this.getLogOn() - this.getNoticeList(); - this.watchScrollFun(); - }, - onShow() { - this.init(); + qiangDanTitle: "鎶㈠崟鎻愮ず", + qiangDanContent: "", + qiangDanOrderPlanId: null, + fleetId: "", + xsUserId: "", + customerId: "", + coalStatus: ["鏈О閲�", "绉伴噸涓�", "楠岃川涓�", "绉伴噸瀹屾垚", "澶勭悊瀹屾垚"], + onlineurl, + phone: "", + loading: true, + isFirstLogin: true, //鏄惁鏄涓�娆$櫥褰� + }; + }, + mounted() { + // this.TourImgList = TourImgList + this.getLogOn(); + this.getNoticeList(); + this.watchScrollFun(); + }, + onShow() { + this.init(); + }, + methods: { + // 璺宠浆鍦板浘 + 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}` + : "" + }`, + }); + }, + gridClick(item) { + console.log(item, "1231"); + switch (item.title) { + case "鍏充簬鎴戜滑": + uni.navigateTo({ + url: `/pages/public-page/aboutus/index`, + }); + break; - }, - methods: { - // 璺宠浆鍦板浘 - 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}` : '' - }` - }); - }, - gridClick(item){ - console.log(item,'1231') - switch (item.title) { - case '鍏充簬鎴戜滑': - uni.navigateTo({ - url: `/pages/public-page/aboutus/index` - }); - break; + case "鏁版嵁缁熻": + uni.navigateTo({ + url: `/pages/public-page/dataStatistics/index`, + }); + break; - case '鏁版嵁缁熻': - uni.navigateTo({ - url: `/pages/public-page/dataStatistics/index` - }); - break; + case "鍘嗗彶璁㈠崟": + uni.navigateTo({ + url: `/pages/public-page/historicalOrders/index?historyData=${JSON.stringify( + this.driverBillOfLoadingData.list2 + )}`, + }); + break; - case '鍘嗗彶璁㈠崟': - uni.navigateTo({ - url: `/pages/public-page/historicalOrders/index?historyData=${JSON.stringify(this.driverBillOfLoadingData.list2)}` - }); - break; + case "鎿嶄綔鎸囧崡": + this.noobTour(); + break; + case "娑堟伅": + uni.navigateTo({ + url: "/pages/public-page/message/message", + }); + break; - case '鎿嶄綔鎸囧崡': - this.noobTour(); - break; - case '娑堟伅': - uni.navigateTo({ - url: '/pages/public-page/message/message' - }); - break; + case "鍚堜綔鍩哄湴": + uni.navigateTo({ + url: "/pages/public-page/cooperationBase/index", + }); + break; - case '鍚堜綔鍩哄湴': - uni.navigateTo({ - url: '/pages/public-page/cooperationBase/index' - }); - break; - - default: - break; - } - - }, - onScroll(e){ - // 鐩戝惉椤甸潰鍚戜笂婊氬姩浜嬩欢 - // let query = uni.createSelectorQuery().in(this); - // query.select('.gridBox').boundingClientRect(data => { - // if(this.garidInitTop && (this.garidInitTop > data.top)){ - // // console.log(data,data.top, query.select('.mark')); - // this.$nextTick(() => { - // this.markFlag = 'block'; //鏄剧ず - // }); - // }else{ - // this.$nextTick(() => { - // this.markFlag = 'none'; //闅愯棌 - // }); - // } - // }).exec(); - }, - init() { - this.qiangDanList(); - }, - scrolltolower() { - this.loadmore() - }, - loadmore(){ - this.noticePage.current ++; - this.getNoticeList(); - - }, - watchScrollFun(){ - //鍒濆鍖栬幏鍙栧睆骞曢珮搴� - const res = uni.getSystemInfoSync(); - let query = uni.createSelectorQuery().in(this); - query.select('.gridBox').boundingClientRect(data => { - this.garidInitTop = data.top; - }).exec(); - this.screenHeight = res.screenHeight; - - }, - getNoticeList(){ - this.$reqGet('noticeList',{...this.noticePage,isNotice:'1'}).then(res => { - console.log(res,'resresres') - if(res.code == 0){ - let result = res.data.records; - if(result.length){ - this.noticeList = this.noticeList.concat(result) - }else{ - //鍚﹀垯灏辨槸绌� - - } - - let arr = this.noticeList.sort((a,b)=>{ - return new Date(a) - new Date(b); - }) - console.log(arr) - this.noticeList = arr.map((item,i)=>{ - if(i == 0){ - item.url = this.newIcon - - }else{ - item.url = this.labaIcon - } - return item - }); - - } - }) - - }, - // 鍙告満棣栭〉鍒楄〃 - qiangDanList() { - uni.showLoading({ - title: '鍔犺浇涓�...' - }); - this.$reqGet('qiangDanList').then(res => { - uni.hideLoading(); - this.driverBillOfLoadingData = res.data; - this.loading = false; - }).finally(() => { - this.loading = false; - }) - }, - // 鎶㈠崟鎸夐挳 - qiangDanBtn:Debounce(function(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}鍗曪紝纭畾鎶㈠崟锛焋; - } - } ,500) - - , - // 鎶㈠崟妯℃�佹 - 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) { - this.$reqPost('qiangDan', { - orderPlanId: id, - fleetId: fleetId, - customerId: customerId, - xsUserId: xsUserId - }, 'params') - .then(res => { - 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}` - }); - }, - noobTour() { - this.$refs.previewImage.open('https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj1.jpg') - }, - getLogOn() { - this.$reqGet('getUserEntity').then(res => { - this.phone = res.data.phone - }).then(() => { - uni.request({ - url: `${BaseUrl}/admin/log/getLogOnType?phone=${this.phone}`, - success: res => { - // res.data.data 涓�1 浠h〃绗竴娆$櫥褰� 涓�0鍙栨秷瀛︿範鎸囧紩 涓�2 浠h〃瀛樺湪 - if (res.data.data === 1) { - this.noobTour() - } else if (res.data.data === 2) { - this.isFirstLogin = true - } else { - this.isFirstLogin = false - } - } - }); - }) - }, - todoHistory(){ - uni.navigateTo({ - url: `/pages/public-page/historicalOrders/index?historyData=${JSON.stringify( this.driverBillOfLoadingData.list2)}` - }); - }, - todoNotice(item){ - console.log(item,'item') - if(item){ - this.noticeModelShow = true; - this.notice = item; - } - - }, - noticConfirm(){ - this.noticeModelShow = false; + default: + break; + } + }, + onScroll(e) { + // 鐩戝惉椤甸潰鍚戜笂婊氬姩浜嬩欢 + // let query = uni.createSelectorQuery().in(this); + // query.select('.gridBox').boundingClientRect(data => { + // if(this.garidInitTop && (this.garidInitTop > data.top)){ + // // console.log(data,data.top, query.select('.mark')); + // this.$nextTick(() => { + // this.markFlag = 'block'; //鏄剧ず + // }); + // }else{ + // this.$nextTick(() => { + // this.markFlag = 'none'; //闅愯棌 + // }); + // } + // }).exec(); + }, + init() { + this.qiangDanList(); + }, + scrolltolower() { + this.loadmore(); + }, + loadmore() { + this.noticePage.current++; + this.getNoticeList(); + }, + watchScrollFun() { + //鍒濆鍖栬幏鍙栧睆骞曢珮搴� + const res = uni.getSystemInfoSync(); + let query = uni.createSelectorQuery().in(this); + query + .select(".gridBox") + .boundingClientRect((data) => { + this.garidInitTop = data.top; + }) + .exec(); + this.screenHeight = res.screenHeight; + }, + getNoticeList() { + this.$reqGet("noticeList", { ...this.noticePage, isNotice: "1" }).then( + (res) => { + console.log(res, "resresres"); + if (res.code == 0) { + let result = res.data.records; + if (result.length) { + this.noticeList = this.noticeList.concat(result); + } else { + //鍚﹀垯灏辨槸绌� } - } - }; + let arr = this.noticeList.sort((a, b) => { + return new Date(a) - new Date(b); + }); + console.log(arr); + this.noticeList = arr.map((item, i) => { + if (i == 0) { + item.url = this.newIcon; + } else { + item.url = this.labaIcon; + } + return item; + }); + } + } + ); + }, + // 鍙告満棣栭〉鍒楄〃 + qiangDanList() { + uni.showLoading({ + title: "鍔犺浇涓�...", + }); + this.$reqGet("qiangDanList") + .then((res) => { + uni.hideLoading(); + this.driverBillOfLoadingData = res.data; + this.loading = false; + }) + .finally(() => { + this.loading = false; + }); + }, + // 鎶㈠崟鎸夐挳 + qiangDanBtn: Debounce(function (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}鍗曪紝纭畾鎶㈠崟锛焋; + } + }, 500), + + // 鎶㈠崟妯℃�佹 + 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) { + this.$reqPost( + "qiangDan", + { + orderPlanId: id, + fleetId: fleetId, + customerId: customerId, + xsUserId: xsUserId, + }, + "params" + ) + .then((res) => { + 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}`, + }); + }, + noobTour() { + this.$refs.previewImage.open( + "https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj1.jpg" + ); + }, + getLogOn() { + this.$reqGet("getUserEntity") + .then((res) => { + this.phone = res.data.phone; + }) + .then(() => { + uni.request({ + url: `${BaseUrl}/admin/log/getLogOnType?phone=${this.phone}`, + success: (res) => { + // res.data.data 涓�1 浠h〃绗竴娆$櫥褰� 涓�0鍙栨秷瀛︿範鎸囧紩 涓�2 浠h〃瀛樺湪 + if (res.data.data === 1) { + this.noobTour(); + } else if (res.data.data === 2) { + this.isFirstLogin = true; + } else { + this.isFirstLogin = false; + } + }, + }); + }); + }, + todoHistory() { + uni.navigateTo({ + url: `/pages/public-page/historicalOrders/index?historyData=${JSON.stringify( + this.driverBillOfLoadingData.list2 + )}`, + }); + }, + todoNotice(item) { + console.log(item, "item"); + if (item) { + this.noticeModelShow = true; + this.notice = item; + } + }, + noticConfirm() { + this.noticeModelShow = false; + }, + }, +}; </script> <style lang="scss" scoped> -.warp{ - .page{ - z-index: 999; - } +.warp { + .page { + z-index: 999; + } + width: 100%; + height: 100%; + display: flex; + margin: 0 auto; + flex: 1; + flex-direction: column; + padding-top: calc(var(--window-top) + 20px); + background-position: 0rpx 0rpx; + background-size: 100% 600rpx; + .warp-box { width: 100%; - height:100%; - display: flex; - margin: 0 auto; - flex: 1; - flex-direction: column; - padding-top: calc(var(--window-top) + 20px); - background-position: 0rpx 0rpx; - background-size: 100% 600rpx; - .warp-box{ - width: 100%; - height:calc(100vh - 73px); + height: calc(100vh - 73px); z-index: 9; display: flex; flex-direction: column; // overflow-y: auto; - margin: 0 auto; + margin: 0 auto; background-color: unset; // padding-bottom: 100rpx; - .ingOrderDiv{ - width: 100%; - min-height: 630rpx; - margin: 0 auto; - } - .ingOrder{ + .ingOrderDiv { + width: 100%; + min-height: 630rpx; + margin: 0 auto; + } + .ingOrder { + width: 94%; + height: 370rpx; + margin: 0 auto; + 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; + margin-top: 270rpx; + display: flex; + flex-direction: column; + padding-top: 20rpx; + .statusBox { width: 94%; - height: 370rpx; - margin: 0 auto; - 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; - margin-top: 270rpx; + margin: 0 auto; + margin-top: 20rpx; display: flex; - flex-direction: column; - padding-top: 20rpx; - .statusBox{ - width: 94%; - margin: 0 auto; - margin-top: 20rpx; + justify-content: space-between; + .twoleft { display: flex; - justify-content: space-between; - .twoleft{ + justify-items: center; + .time-icon { + margin-right: 10rpx; display: flex; - justify-items: center; - .time-icon{ - margin-right: 10rpx; - display: flex; - align-items: center; - } + align-items: center; } } - .status{ - display: flex; - width: 150rpx; - } - - .firstLine{ - flex: 0 1 60%; - width: 92%; - margin: 0 auto; - display: flex; - justify-content: space-between; - .rightIcon{ - display: flex; - height: 150rpx; - flex-direction: column; - justify-content: space-between; - } - .leftIcon{ - display: flex; - height: 150rpx; - flex-direction: column; - justify-content: space-between; - .leftOneDiv{ - width: 46rpx; - height: 46rpx; - background: #035CFB; - box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255,255,255,0.85); - border-radius: 5rpx; - text-align: center; - .leftOne{ - width: 31rpx; - height: 31rpx; - font-size: 30rpx; - font-family: Microsoft YaHei; - font-weight: 400; - color: #FFFFFF; - } - } - .rightDiv{ - width: 46rpx; - height: 46rpx; - background: #F1333C; - box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255,255,255,0.85); - border-radius: 5rpx; - text-align: center; - .rightone{ - width: 29rpx; - height: 31rpx; - font-size: 30rpx; - font-family: Microsoft YaHei; - font-weight: 400; - color: #FFFFFF; - } - } - .leftLine{ - width: 2rpx; - height: 43rpx; - border-right: 2px dotted #303030; - transform: translateX(15rpx); - } - - } - - } - .centerTitle{ - display: flex; - flex-direction: column; - justify-content: space-between; - height: 150rpx; - .centerLine{ - width: 510rpx; - height: 1rpx; - border-bottom: solid 1px #ccc; - } - } - - .twoLine{ - flex: 0 1 25%; - width: 92%; - margin: 20rpx auto; - display: flex; - justify-content: space-between; - .twoleft{ - - display: flex; - justify-content: space-around; - align-items: center; - .send-date{ - font-size: 25rpx; - font-family: Microsoft YaHei; - font-weight: 300; - color: #515151; - } - span{ - color: #515151; - font-size: 30rpx; - font-weight: 300; - } - } - .twoRight{ - display: flex; - justify-content: space-around; - } - } - .threeLine{ - flex: 0 1 25%; - display: flex; - justify-content: flex-end; - height: 100rpx; - .more{ - width: 106rpx; - height: 20rpx; - font-size: 24rpx; - font-family: Microsoft YaHei; - font-weight: 300; - color: #494949; - margin-right: 20rpx; - } - } - - } - .gridBox{ - width: 100%; - height: 270rpx; - margin: 0 auto; - margin-top: 30rpx; - margin-bottom: 30rpx; - .grid-text{ - font-size: 28rpx; - font-family: Microsoft YaHei; - font-weight: 300; - color: #494949; - } - } - .orderGrabbing{ - width: 690rpx; - height: 351rpx; - background: #FFFFFF; - box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73,120,240,0.15); - border-radius: 20rpx; - margin: 30rpx auto; - padding-top: 20rpx; - .firstLine{ - flex: 0 1 60%; - width: 92%; - margin: 0 auto; - display: flex; - justify-content: space-between; - .rightIcon{ - display: flex; - height: 150rpx; - flex-direction: column; - justify-content: space-between; - } - .leftIcon{ - display: flex; - height: 150rpx; - flex-direction: column; - justify-content: space-between; - .leftOneDiv{ - width: 46rpx; - height: 46rpx; - background: #035CFB; - box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255,255,255,0.85); - border-radius: 5rpx; - text-align: center; - .leftOne{ - width: 31rpx; - height: 31rpx; - font-size: 30rpx; - font-family: Microsoft YaHei; - font-weight: 400; - color: #FFFFFF; - } - } - .rightDiv{ - width: 46rpx; - height: 46rpx; - background: #F1333C; - box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255,255,255,0.85); - border-radius: 5rpx; - text-align: center; - .rightone{ - width: 29rpx; - height: 31rpx; - font-size: 30rpx; - font-family: Microsoft YaHei; - font-weight: 400; - color: #FFFFFF; - } - } - .leftLine{ - width: 2rpx; - height: 43rpx; - border-right: 2px dotted #303030; - transform: translateX(15rpx); - } - - } - - } - .centerTitle{ - display: flex; - flex-direction: column; - justify-content: space-between; - height: 150rpx; - .centerLine{ - width: 510rpx; - height: 1rpx; - border-bottom: solid 1px #ccc; - } - } - - .twoLine{ - flex: 0 1 25%; - width: 92%; - margin: 0 auto; - margin-top: 35rpx; - display: flex; - justify-content: space-between; - .twoleft{ - - display: flex; - justify-content: space-around; - align-items: center; - .send-date{ - font-size: 28rpx; - font-family: Microsoft YaHei; - font-weight: 300; - color: #515151; - } - } - .twoRight{ - width: 210rpx; - display: flex; - justify-content: space-around; - } - } - .threeLine{ - flex: 0 1 25%; - display: flex; - width: 92%; - margin: 0 auto; - height: 100rpx; - justify-content: space-between; - align-items: center; - .date{ - width: 200rpx; - display: flex; - align-items: center; - justify-content: space-around; - .send-date{ - font-size: 28rpx; - font-family: Microsoft YaHei; - font-weight: 300; - color: #515151; - } - } - .more{ - font-size: 24rpx; - font-family: Microsoft YaHei; - font-weight: 300; - margin-right: 20rpx; - - .qiangdanBtn{ - width: 230rpx; - height:60rpx; - font-weight: 300; - font-size: 28rpx; - color: #FFFFFF; - background: url('@/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/鐭╁舰 4.jpg') no-repeat; - background-position: center center; - text-align: center; - line-height: 60rpx; - font-family: Microsoft YaHei; - border-radius: 40rpx; - margin-bottom:30rpx; - } - } - } - } - .pendingAppointment{ - width: 690rpx; - height: 351rpx; - background: #FFFFFF; - box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73,120,240,0.15); - border-radius: 20rpx; - margin: 30rpx auto; - padding-top: 20rpx; - .firstLine{ - flex: 0 1 60%; - width: 92%; - margin: 0 auto; - display: flex; - justify-content: space-between; - .rightIcon{ - display: flex; - height: 150rpx; - flex-direction: column; - justify-content: space-between; - } - .leftIcon{ - display: flex; - height: 150rpx; - flex-direction: column; - justify-content: space-between; - .leftOneDiv{ - width: 46rpx; - height: 46rpx; - background: #035CFB; - box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255,255,255,0.85); - border-radius: 5rpx; - text-align: center; - .leftOne{ - width: 31rpx; - height: 31rpx; - font-size: 30rpx; - font-family: Microsoft YaHei; - font-weight: 400; - color: #FFFFFF; - } - } - .rightDiv{ - width: 46rpx; - height: 46rpx; - background: #F1333C; - box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255,255,255,0.85); - border-radius: 5rpx; - text-align: center; - .rightone{ - width: 29rpx; - height: 31rpx; - font-size: 30rpx; - font-family: Microsoft YaHei; - font-weight: 400; - color: #FFFFFF; - } - } - .leftLine{ - width: 2rpx; - height: 43rpx; - border-right: 2px dotted #303030; - transform: translateX(15rpx); - } - - } - - } - .centerTitle{ - display: flex; - flex-direction: column; - justify-content: space-between; - height: 150rpx; - .centerLine{ - width: 510rpx; - height: 1rpx; - border-bottom: solid 1px #ccc; - } - } - - .twoLine{ - flex: 0 1 25%; - width: 92%; - margin: 0 auto; - margin-top: 35rpx; - display: flex; - justify-content: space-between; - .twoleft{ - - display: flex; - justify-content: space-around; - align-items: center; - .send-date{ - font-size: 28rpx; - font-family: Microsoft YaHei; - font-weight: 300; - color: #515151; - } - span{ - font-size: 28rpx; - margin-left: 10rpx; - } - } - .twoRight{ - width: 210rpx; - display: flex; - justify-content: space-around; - } - } - .threeLine{ - flex: 0 1 25%; - display: flex; - width: 92%; - margin: 0 auto; - height: 100rpx; - justify-content: space-between; - align-items: center; - .date{ - width: 300rpx; - display: flex; - align-items: center; - justify-content: space-around; - .send-date{ - width: 260rpx; - font-size: 25rpx; - font-family: Microsoft YaHei; - font-weight: 300; - color: #515151; - } - } - .more{ - font-size: 24rpx; - font-family: Microsoft YaHei; - font-weight: 300; - margin-right: 20rpx; - .qiangdanBtn{ - width: 230rpx; - height:60rpx; - font-weight: 300; - font-size: 28rpx; - color: #FFFFFF; - background: url('@/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/鐭╁舰 4.jpg') no-repeat; - background-position: center center; - text-align: center; - line-height: 60rpx; - font-family: Microsoft YaHei; - border-radius: 40rpx; - margin-bottom:30rpx; - } - } - } - } - .tongzhi{ - width: 94%; - margin: 0 auto; - height: 280rpx; - // background-color: #fff; - 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; - transform: translateY(-10rpx); - } - .listItem{ + } + .status { display: flex; - align-items: center; - height: 80rpx; - width: 94%; + width: 150rpx; + } + + .firstLine { + flex: 0 1 60%; + width: 92%; + margin: 0 auto; + display: flex; justify-content: space-between; - border-bottom: solid 1px #E3E3E3; - margin: 0 auto; - margin-top: 20rpx; - .listDate{ - font-size: 24rpx; + .rightIcon { + display: flex; + height: 150rpx; + flex-direction: column; + justify-content: space-between; + } + .leftIcon { + display: flex; + height: 150rpx; + flex-direction: column; + justify-content: space-between; + .leftOneDiv { + width: 46rpx; + height: 46rpx; + background: #035cfb; + box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255, 255, 255, 0.85); + border-radius: 5rpx; + text-align: center; + .leftOne { + width: 31rpx; + height: 31rpx; + font-size: 30rpx; + font-family: Microsoft YaHei; + font-weight: 400; + color: #ffffff; + } + } + .rightDiv { + width: 46rpx; + height: 46rpx; + background: #f1333c; + box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255, 255, 255, 0.85); + border-radius: 5rpx; + text-align: center; + .rightone { + width: 29rpx; + height: 31rpx; + font-size: 30rpx; + font-family: Microsoft YaHei; + font-weight: 400; + color: #ffffff; + } + } + .leftLine { + width: 2rpx; + height: 43rpx; + border-right: 2px dotted #303030; + transform: translateX(15rpx); + } + } + } + .centerTitle { + display: flex; + flex-direction: column; + justify-content: space-between; + height: 150rpx; + .centerLine { + width: 510rpx; + height: 1rpx; + border-bottom: solid 1px #ccc; + } + } + + .twoLine { + flex: 0 1 25%; + width: 92%; + margin: 20rpx auto; + display: flex; + justify-content: space-between; + .twoleft { + display: flex; + justify-content: space-around; + align-items: center; + .send-date { + font-size: 25rpx; font-family: Microsoft YaHei; font-weight: 300; - color: #6E6E6E; + color: #515151; + } + span { + color: #515151; + font-size: 30rpx; + font-weight: 300; + } } - .listItemTop{ - display: flex; - justify-content: space-around; - align-items: center; + .twoRight { + display: flex; + justify-content: space-around; + } + } + .threeLine { + flex: 0 1 25%; + display: flex; + justify-content: flex-end; + height: 100rpx; + .more { + width: 106rpx; + height: 20rpx; + font-size: 24rpx; + font-family: Microsoft YaHei; + font-weight: 300; + color: #494949; + margin-right: 20rpx; + } + } + } + .gridBox { + width: 100%; + height: 270rpx; + margin: 0 auto; + margin-top: 30rpx; + margin-bottom: 30rpx; + .grid-text { + font-size: 28rpx; + font-family: Microsoft YaHei; + font-weight: 300; + color: #494949; + } + } + .orderGrabbing { + width: 690rpx; + height: 351rpx; + background: #ffffff; + box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15); + border-radius: 20rpx; + margin: 30rpx auto; + padding-top: 20rpx; + .firstLine { + flex: 0 1 60%; + width: 92%; + margin: 0 auto; + display: flex; + justify-content: space-between; + .rightIcon { + display: flex; + height: 150rpx; + flex-direction: column; + justify-content: space-between; + } + .leftIcon { + display: flex; + height: 150rpx; + flex-direction: column; + justify-content: space-between; + .leftOneDiv { + width: 46rpx; + height: 46rpx; + background: #035cfb; + box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255, 255, 255, 0.85); + border-radius: 5rpx; + text-align: center; + .leftOne { + width: 31rpx; + height: 31rpx; + font-size: 30rpx; + font-family: Microsoft YaHei; + font-weight: 400; + color: #ffffff; + } + } + .rightDiv { + width: 46rpx; + height: 46rpx; + background: #f1333c; + box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255, 255, 255, 0.85); + border-radius: 5rpx; + text-align: center; + .rightone { + width: 29rpx; + height: 31rpx; + font-size: 30rpx; + font-family: Microsoft YaHei; + font-weight: 400; + color: #ffffff; + } + } + .leftLine { + width: 2rpx; + height: 43rpx; + border-right: 2px dotted #303030; + transform: translateX(15rpx); + } + } + } + .centerTitle { + display: flex; + flex-direction: column; + justify-content: space-between; + height: 150rpx; + .centerLine { + width: 510rpx; + height: 1rpx; + border-bottom: solid 1px #ccc; + } + } + + .twoLine { + flex: 0 1 25%; + width: 92%; + margin: 0 auto; + margin-top: 35rpx; + display: flex; + justify-content: space-between; + .twoleft { + display: flex; + justify-content: space-around; + align-items: center; + .send-date { font-size: 28rpx; - white-space: nowrap; - text-overflow:ellipsis; - overflow:hidden; + font-family: Microsoft YaHei; + font-weight: 300; + color: #515151; + } } + .twoRight { + width: 210rpx; + display: flex; + justify-content: space-around; + } + } + .threeLine { + flex: 0 1 25%; + display: flex; + width: 92%; + margin: 0 auto; + height: 100rpx; + justify-content: space-between; + align-items: center; + .date { + display: flex; + align-items: center; + justify-content: space-around; + .send-date { + font-size: 28rpx; + font-family: Microsoft YaHei; + font-weight: 300; + color: #515151; + } + } + .more { + font-size: 24rpx; + font-family: Microsoft YaHei; + font-weight: 300; + margin-right: 20rpx; + .qiangdanBtn { + width: 230rpx; + height: 60rpx; + font-weight: 300; + font-size: 28rpx; + color: #ffffff; + background: url("@/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/鐭╁舰 4.jpg") + no-repeat; + background-position: center center; + text-align: center; + line-height: 60rpx; + font-family: Microsoft YaHei; + border-radius: 40rpx; + margin-bottom: 30rpx; + } + } + } } + .pendingAppointment { + width: 690rpx; + height: 351rpx; + background: #ffffff; + box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15); + border-radius: 20rpx; + margin: 30rpx auto; + padding-top: 20rpx; + .firstLine { + flex: 0 1 60%; + width: 95%; + margin: 0 auto; + display: flex; + justify-content: space-between; + .rightIcon { + display: flex; + height: 150rpx; + flex-direction: column; + justify-content: space-between; + } + .leftIcon { + display: flex; + height: 150rpx; + flex-direction: column; + justify-content: space-between; + .leftOneDiv { + width: 46rpx; + height: 46rpx; + background: #035cfb; + box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255, 255, 255, 0.85); + border-radius: 5rpx; + text-align: center; + .leftOne { + width: 31rpx; + height: 31rpx; + font-size: 30rpx; + font-family: Microsoft YaHei; + font-weight: 400; + color: #ffffff; + } + } + .rightDiv { + width: 46rpx; + height: 46rpx; + background: #f1333c; + box-shadow: 0rpx 0rpx 10rpx 0rpx rgba(255, 255, 255, 0.85); + border-radius: 5rpx; + text-align: center; + .rightone { + width: 29rpx; + height: 31rpx; + font-size: 30rpx; + font-family: Microsoft YaHei; + font-weight: 400; + color: #ffffff; + } + } + .leftLine { + width: 2rpx; + height: 43rpx; + border-right: 2px dotted #303030; + transform: translateX(15rpx); + } + } + } + .centerTitle { + display: flex; + flex-direction: column; + justify-content: space-between; + height: 150rpx; + .centerLine { + width: 510rpx; + height: 1rpx; + border-bottom: solid 1px #ccc; + } + } + + .twoLine { + flex: 0 1 25%; + width: 92%; + margin: 0 auto; + margin-top: 35rpx; + display: flex; + justify-content: space-between; + .twoleft { + display: flex; + justify-content: space-around; + align-items: center; + .send-date { + font-size: 28rpx; + font-family: Microsoft YaHei; + font-weight: 300; + color: #515151; + } + span { + font-size: 28rpx; + margin-left: 10rpx; + } + } + .twoRight { + width: 210rpx; + display: flex; + justify-content: space-around; + } + } + .threeLine { + flex: 0 1 25%; + display: flex; + width: 92%; + margin: 0 auto; + height: 100rpx; + justify-content: space-between; + align-items: center; + .date { + width: 300rpx; + display: flex; + align-items: center; + justify-content: space-around; + .send-date { + width: 260rpx; + font-size: 25rpx; + font-family: Microsoft YaHei; + font-weight: 300; + color: #515151; + } + } + .more { + font-size: 24rpx; + font-family: Microsoft YaHei; + font-weight: 300; + margin-right: 20rpx; + .qiangdanBtn { + width: 230rpx; + height: 60rpx; + font-weight: 300; + font-size: 28rpx; + color: #ffffff; + background: url("@/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/鐭╁舰 4.jpg") + no-repeat; + background-position: center center; + text-align: center; + line-height: 60rpx; + font-family: Microsoft YaHei; + border-radius: 40rpx; + margin-bottom: 30rpx; + } + } + } } - + .tongzhi { + width: 94%; + margin: 0 auto; + height: 280rpx; + // background-color: #fff; + 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; + transform: translateY(-10rpx); + } + .listItem { + display: flex; + align-items: center; + height: 80rpx; + width: 94%; + justify-content: space-between; + border-bottom: solid 1px #e3e3e3; + margin: 0 auto; + margin-top: 20rpx; + .listDate { + font-size: 24rpx; + font-family: Microsoft YaHei; + font-weight: 300; + color: #6e6e6e; + } + .listItemTop { + display: flex; + justify-content: space-around; + align-items: center; + font-size: 28rpx; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + } + } } -.gridBoxBg{ - // box-shadow:0 0 10px 10px #9fb1c5; - width: 100%; - margin: 20rpx auto 10rpx; - +.gridBoxBg { + // box-shadow:0 0 10px 10px #9fb1c5; + width: 100%; + margin: 20rpx auto 10rpx; } -.mark{ - height: calc(100vh - 60vh); - background-color: #ccc; - position: absolute; - bottom: 0; - width: 100%; - left :0; - z-index: 1; - opacity: 0.6; - transition: 2.5s all ; +.mark { + height: calc(100vh - 60vh); + background-color: #ccc; + position: absolute; + bottom: 0; + width: 100%; + left: 0; + z-index: 1; + opacity: 0.6; + transition: 2.5s all; } // .no-right { // /* .left-top, .left-bottom 缁勫悎 */ diff --git a/pages/public-page/aboutus/index.vue b/pages/public-page/aboutus/index.vue index ab9540a..37b841c 100644 --- a/pages/public-page/aboutus/index.vue +++ b/pages/public-page/aboutus/index.vue @@ -73,7 +73,7 @@ return { onlineurl, indexBackgroundImage:`${onlineurl}/appimg/image/aboutUs/borderTop.jpg`, - topBg:`${onlineurl}/appimg/image/aboutUs/juxing.jpg"` + topBg:`${onlineurl}/appimg/image/aboutUs/juxing.jpg` }; }, } -- Gitblit v1.9.1