需求优化

pages/cart/cart.vue

@@ -342,9 +342,9 @@
 			}
 			.button1 {
 				/deep/button {
-					background-color: #ffffff !important;
-					border: 1px solid #74bd60 !important;
-					color: #74bd60 !important;
+					background-color: #74bd60 !important;
+					border: none !important;
+					color: white !important;
 				}
 				width: 40%;
 				height: 34px;

pagesGood/goodDetails.vue

@@ -123,7 +123,7 @@
 			</scroll-view>
 		</view>
 		<uni-goods-nav :fill="true" :options="goodData.productType == 4 ? [] : options" @click="goToShop" @buttonClick="showPopup"
-		 style="width: 100%; position: fixed; bottom: 0px;" :buttonGroup="goodData.productType == 2 ? buttonGroup2 : (goodData.productType == 4 ? (minePlant ? buttonGroup4 : buttonGroup3) : buttonGroup1)" />
+		 style="width: 100%; position: fixed; bottom: 0px;z-index: 2;" :buttonGroup="goodData.productType == 2 ? buttonGroup2 : (goodData.productType == 4 ? (minePlant ? buttonGroup4 : buttonGroup3) : buttonGroup1)" />
 		<!-- <uni-popup ref="popup" type="bottom">
 			<view class="popup-box">
 				<view class="popup-good-info-box">
@@ -494,6 +494,7 @@
 			color: #FFFFFF;
 			text-align: center;
 			padding: 5px;
+			line-height: 25px;
 		}
 		.auction-explain {
 			background:#52A63A;

pagesMain/entrustList.vue

@@ -1,9 +1,13 @@
 <template>
 	<scroll-view class="container" :style="{backgroundColor: entrustTotle ? '#f7f7f7' : '#f7f7f7'}" scroll-y="true" @scrolltolower="handleLoadMore()">
-		<view class="entrust-info">
+		<view class="entrust-info" :style="{height: entrustTotle ? '115px' : '60px'}">
 			<view class="entrust-info-text">共{{entrustTotle}}个委托订单</view>
 		</view>
-		<view class="entrust-row" v-for="(item, index) in entrustList" :key="index">
+		<view v-if="!entrustTotle" class="no-cart">
+			<image class="no-cart-img" src="../static/images/noCart.png" mode="aspectFill"></image>
+			<text class="no-cart-text">暂无订单</text>
+		</view>
+		<view v-if="entrustTotle" class="entrust-row" v-for="(item, index) in entrustList" :key="index">
 			<view class="entrust-title">已委托订单</view>
 			<view class="entrust-text">委托开始时间：{{item.entrustStartTime}}</view>
 			<view class="entrust-text">委托时长：{{item.entrustDurationTime}}小时</view>
@@ -147,7 +151,35 @@
 				line-height: 50px;
 			}
 		}
-
+        
+		.no-cart {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			top: 25%;
+			left:30%;
+			position: absolute;
+			.no-cart-img {
+				width: 155px;
+				height: 200px;
+				margin-bottom: 20px;
+			}
+			.no-cart-text {
+				font-size: 16px;
+				font-family: PingFang SC;
+				color: #999999;
+			}
+			.button1 {
+				/deep/button {
+					background-color: #ffffff !important;
+					border: 1px solid #74bd60 !important;
+					color: #74bd60 !important;
+				}
+				width: 40%;
+				height: 34px;
+			}
+		}
 		.entrust-row {
 			width: calc(100% - 30px);
 			float: left;

pagesMain/orderDetail.vue

@@ -115,7 +115,7 @@
 			</view>
 		</view>
 		<!-- </view> -->
-		<uni-goods-nav :fill="true" :options="[]" @click="" @buttonClick="orderHandle" class="order-handle" :buttonGroup="buttonGroup" />
+		<uni-goods-nav :fill="true" :options="[]" @click="" @buttonClick="orderHandle" class="order-handle" :buttonGroup="buttonGroup"/>
 		<u-modal v-model="modalShow" :content="modalContent" @confirm="submitHandle" :async-close="true" :show-cancel-button="true"></u-modal>
 		<u-top-tips ref="uTips"></u-top-tips>
 		<view class="uni-popup-dialog" :hidden="show_qx">
@@ -663,7 +663,7 @@
 		float: left;
 		background-color: #f7f7f7;
 		// box-sizing: border-box;
-		// padding-bottom: 50px;
+		padding-bottom: 50px;
 		overflow-y: auto;
 
 		.order-type-info {
@@ -1187,6 +1187,9 @@
 			height: 50px;
 			float: left;
 			border-top: 1px solid #cccccc;
+			position: fixed;
+			bottom: 0;
+			left:0;
 		}
 	}
 	.uni-popup-dialog {