From e3d1f9bfba4b8f18b7a4ac9dde377ded204c2fe9 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期二, 05 三月 2024 16:07:50 +0800
Subject: [PATCH] feat:图片替换线上地址

---
 pages/driver-page/driver-index/test-index.vue |  516 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 456 insertions(+), 60 deletions(-)

diff --git a/pages/driver-page/driver-index/test-index.vue b/pages/driver-page/driver-index/test-index.vue
index 681ab98..0663547 100644
--- a/pages/driver-page/driver-index/test-index.vue
+++ b/pages/driver-page/driver-index/test-index.vue
@@ -1,8 +1,14 @@
 <template>
-    <div class="warp">
-        <div class="warp-box">
-            <!-- 褰撳墠鐨勮鍗� -->
-            <div class="ingOrder">
+    <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 v-if="loading" class="ingOrderBox"></div>
+                <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">
@@ -15,52 +21,87 @@
                         </div>
                     </div>
                     <div class="centerTitle">
-                        <p>鏃犱汉鍊煎畧浠撳簱</p>
+                        <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>
-                        <p>鏋佹槗鍑�姘寸鎶�(涓婃捣)鏈夐檺鍏徃</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"
-						size="40"></u-icon>
-                        <u-icon name="map"
+                         @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">
+                    <view class="status">
+				<u-tag :text="coalStatus[item.statusWeigh] || ''"
+				plain>
+				</u-tag>
+			 </view>
+                </div>
+                
                 <div class="twoLine">
                     <div class="twoleft">
 							<view class="time-icon"><u-icon name="clock"
 									color="#515151"
-									size="30"></u-icon></view>
-							<view class="send-date">2023-4-24</view>
+									size="25"></u-icon></view>
+							<view class="send-date">{{ item.yuYueTime }}</view>
                     </div>
                     <div class="twoRight">
-                        <u-tag text="鐓ゆ偿" plain> </u-tag>
-                        <u-tag text="澶栭攢" plain> </u-tag>
+                        <u-tag :text="item.coalName" plain> </u-tag>
+                        <u-tag :text="item.orderType" plain> </u-tag>
                     </div>
                 </div>
                 <div class="threeLine">
-                    <span class="more">MORE>></span>
+                    <span class="more" @click="todoHistory">MORE>></span>
                 </div>
             </div>
+             <!-- 钂欏眰 -->
+  
             <!-- 涔濆鏍� -->
-             <view class="gridBox">
+            <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"
+                    
                  >
-                 <u--image :showLoading="true" :src="listItem.src" width="50px" height="50px" @click="click"></u--image>
-                 <text class="grid-text">{{listItem.title}}</text>
+                 <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">
+            <div class="orderGrabbing" v-for="item,i in driverBillOfLoadingData.list1" :key="i">
                 <!-- 绗竴琛� -->
                 <div class="firstLine">
                     <div class="leftIcon">
@@ -73,23 +114,39 @@
                         </div>
                     </div>
                     <div class="centerTitle">
-                        <p>鏃犱汉鍊煎畧浠撳簱</p>
+                        <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>
-                        <p>鏋佹槗鍑�姘寸鎶�(涓婃捣)鏈夐檺鍏徃</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="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;">18</span>
+                        <span style="font-size: 24rpx;color: #C78A64;font-weight: 400;">{{ item.carNum }}</span>
                      </div>
                     </div>
                 </div>
                 <div class="twoLine">
                     <div class="twoleft">
-						<span>鐓ゆ偿</span>
+						<span>{{ item.coalName }}</span>
                         <span>|</span>
-                        <span>澶栭攢</span>
+                        <span>{{ item.orderType }}</span>
                     </div>
                 </div>
                 <div class="threeLine">
@@ -97,16 +154,18 @@
                         <view class="time-icon"><u-icon name="clock"
 									color="#515151"
 									size="30"></u-icon></view>
-							<view class="send-date">2023-4-24</view>
+							<view class="send-date">{{ item.createTime }}</view>
                     </div>
                     <span class="more">
-                        <div class="qiangdanBtn">绔嬪嵆鎶㈠崟</div>
+                        <div  	@click.stop="toAppointmentClick(item)" class="qiangdanBtn">绔嬪嵆棰勭害</div>
                     </span>
                 </div>
             </div>
             <!-- 寰呴绾︽彁鐓ゅ崟 -->
             <combined-title title="寰呴绾﹂�氱煡鍗�"></combined-title>
-            <div class="pendingAppointment">
+            <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">
@@ -118,23 +177,39 @@
                         </div>
                     </div>
                     <div class="centerTitle">
-                        <p>鏃犱汉鍊煎畧浠撳簱</p>
+                        <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>
-                        <p>鏋佹槗鍑�姘寸鎶�(涓婃捣)鏈夐檺鍏徃</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>
                         <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>
                 <div class="twoLine">
                     <div class="twoleft">
-						<span>鐓ゆ偿</span>
+						<span>{{ item.coalName }}</span>
                         <span>|</span>
-                        <span>澶栭攢</span>
+                        <span>{{ item.orderType }}</span>
                     </div>
                 </div>
                 <div class="threeLine">
@@ -142,18 +217,98 @@
                         <view class="time-icon"><u-icon name="clock"
 									color="#515151"
 									size="30"></u-icon></view>
-							<view class="send-date">2023-4-24</view>
+							<view class="send-date"> {{ item.createTime }}</view>
                     </div>
                     <span class="more">
-                        <div class="qiangdanBtn">绔嬪嵆鎶㈠崟</div>
+                        <div class="qiangdanBtn" 	@click.stop="toAppointmentClick(item)">绔嬪嵆棰勭害</div>
                     </span>
                 </div>
             </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
+            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)">
+                     
+                    <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
+            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="mark"  ref="mark" :style="{  display:markFlag ,top: markFlag ? 0 : '100vh'}">
+            </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 { customerId } from '@/utils/status';
 	import { onlineurl } from '@/api/request.js'
 	import { BaseUrl } from '@/api/publicInterface.js'
     import combinedTitle from '@/components/combined-title/combined-title.vue';
@@ -188,6 +343,29 @@
 		},
 		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: '鍚堜綔鍩哄湴'
@@ -196,17 +374,17 @@
                         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(2).jpg',
+                    //     title: '璐ㄦ'
+                    // },
+                    // {
+                    //     src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(3).jpg',
+                    //     title: '杞﹂槦绠$悊'
+                    // },
                     {
                         src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(4).jpg',
-                        title: '鍏充簬鎴戜滑'
+                        title: '鍏充簬鎴戜滑',
                     },
                     {
                         src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 14.jpg',
@@ -228,6 +406,11 @@
 				},
 				// 鎶㈠崟妯℃�佹
 				qiangDanShow: false,
+                noticePage:{
+                current:1,
+                page:10,
+                },
+                
 				qiangDanTitle: '鎶㈠崟鎻愮ず',
 				qiangDanContent: '',
 				qiangDanOrderPlanId: null,
@@ -237,16 +420,19 @@
 				coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'],
 				onlineurl,
 				phone: "",
+                loading:true,
 				isFirstLogin: true //鏄惁鏄涓�娆$櫥褰�
 			};
 		},
 		mounted() {
 			// this.TourImgList = TourImgList
 			this.getLogOn()
-			
+		    this.getNoticeList();
+            this.watchScrollFun();
 		},
 		onShow() {
 			this.init();
+        
 		},
 		methods: {
 			// 璺宠浆鍦板浘
@@ -257,9 +443,114 @@
 				}`
 				});
 			},
+            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/historicalOrders/index?historyData=${JSON.stringify(this.driverBillOfLoadingData.list2)}`
+				    });
+                        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;
+                
+                    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({
@@ -268,7 +559,10 @@
 				this.$reqGet('qiangDanList').then(res => {
 					uni.hideLoading();
 					this.driverBillOfLoadingData = res.data;
-				});
+                    this.loading = false;
+				}).finally(() => {
+                    this.loading = false;
+                })
 			},
 			// 鎶㈠崟鎸夐挳
 			qiangDanBtn:Debounce(function(value){
@@ -355,11 +649,31 @@
 					});
 				})
 			},
+            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;
+    }
     width: 100%;
     height:100%;
     display: flex;
@@ -367,19 +681,27 @@
     flex: 1;
     flex-direction: column;
     padding-top: calc(var(--window-top) + 20px);
-    background:url('https://mx.jzeg.cn:9095/appimg/image/banner/diverbanner.png')   no-repeat fixed center; 
     background-position: 0rpx 0rpx;
     background-size: 100% 600rpx;
     .warp-box{
      width: 100%;
-    height:calc(100vh - 45px);
+    height:calc(100vh - 73px);
+    z-index: 9;
     display: flex;
     flex-direction: column;
-    overflow-y: auto;
+    // overflow-y: auto;
     margin:  0 auto;
+    background-color: unset;
+    // padding-bottom: 100rpx;
+    .ingOrderBox{
+        width: 94%;
+        height: 30%;
+        transform: translateY(20%);
+    }
+   
     .ingOrder{
         width: 94%;
-        height: 330rpx;
+        height: 380rpx;
         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);
@@ -388,6 +710,15 @@
         display: flex;
         flex-direction: column;
         padding-top: 20rpx;
+        .statusBox{
+            width: 94%;
+            margin: 0 auto;
+            margin-top: 20rpx;
+        }
+        .status{
+            display: flex;
+            width: 150rpx;
+        }
        
         .firstLine{
             flex:  0 1 60%;
@@ -463,16 +794,16 @@
         .twoLine{
             flex:  0 1 25%;
             width: 92%;
-            margin:  35rpx auto;
+            margin:   20rpx auto;
             display: flex;
             justify-content: space-between;
             .twoleft{
-                width: 200rpx;
+              
                 display: flex;
                 justify-content: space-around;
                 align-items: center;
                 .send-date{
-                    font-size: 28rpx;
+                    font-size: 25rpx;
                     font-family: Microsoft YaHei;
                     font-weight: 300;
                     color: #515151;
@@ -484,7 +815,6 @@
                 }
             }
             .twoRight{
-                width: 210rpx;
                 display: flex;
                 justify-content: space-around;
             }
@@ -495,6 +825,7 @@
             justify-content: flex-end;
             height: 100rpx;
             margin-bottom: 20rpx;
+            transform: translateY(-20rpx);
             .more{
                 width: 106rpx;
                 height: 20rpx;
@@ -512,6 +843,7 @@
         height: 270rpx;
         margin: 0 auto;
         margin-top: 30rpx;
+        margin-bottom: 30rpx;
         .grid-text{
             font-size: 28rpx;
             font-family: Microsoft YaHei;
@@ -606,7 +938,7 @@
             display: flex;
             justify-content: space-between;
             .twoleft{
-                width: 200rpx;
+                
                 display: flex;
                 justify-content: space-around;
                 align-items: center;
@@ -648,6 +980,7 @@
                 font-family: Microsoft YaHei;
                 font-weight: 300;
                 margin-right: 20rpx;
+               
                 .qiangdanBtn{
                     width: 230rpx;
                     height:60rpx;
@@ -752,7 +1085,7 @@
             display: flex;
             justify-content: space-between;
             .twoleft{
-                width: 200rpx;
+               
                 display: flex;
                 justify-content: space-around;
                 align-items: center;
@@ -761,6 +1094,10 @@
                     font-family: Microsoft YaHei;
                     font-weight: 300;
                     color: #515151;
+                }
+                span{
+                    font-size: 28rpx;
+                    margin-left: 10rpx;
                 }
             }
             .twoRight{
@@ -778,12 +1115,13 @@
             justify-content: space-between;
             align-items: center;
             .date{
-              width: 200rpx;
+              width: 300rpx;
               display: flex;
               align-items: center;
               justify-content: space-around;
               .send-date{
-                     font-size: 28rpx;
+                width: 260rpx;
+                     font-size: 25rpx;
                     font-family: Microsoft YaHei;
                     font-weight: 300;
                     color: #515151;
@@ -811,9 +1149,67 @@
             }
         }
     }
+    .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: 92%;
+    margin:  10rpx auto;
 
-
+}
+.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 缁勫悎 */
+//     box-shadow: -5px -5px 10px -4px #fff, -5px 5px 10px -4px #fff;
+//   }
+//   .no-left {
+//     /* .right-bottom, .right-top 缁勫悎 */
+//     box-shadow: 5px 5px 10px -4px #fff, 5px -5px 10px -4px #fff;
+//   }
 </style>
\ No newline at end of file

--
Gitblit v1.9.1