lilei 8 kuukautta sitten
vanhempi
commit
5455b97e0d

+ 3 - 3
pagesA/digitalShelf/orderDetail.vue

@@ -26,7 +26,7 @@
 			<!-- 头部车辆信息 -->
 			<!-- 头部车辆信息 -->
 			<div class="flex align-center cpb_header" v-if="info&&!info.billSource">
 			<div class="flex align-center cpb_header" v-if="info&&!info.billSource">
 				<div>
 				<div>
-					<u-image :src="info.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+					<u-image :src="info.vehicleLogo?info.vehicleLogo:'/static/def_imgs.png'" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
 				</div>
 				</div>
 				<div class="flex flex_column justify_center align_start">
 				<div class="flex flex_column justify_center align_start">
 					<view class="carModel flex align-center" v-if="info.vehicleNumber" >
 					<view class="carModel flex align-center" v-if="info.vehicleNumber" >
@@ -51,7 +51,7 @@
 				</view>
 				</view>
 				<view v-for="item in partList" :key="item.productSn" class="flex align-center item-list">
 				<view v-for="item in partList" :key="item.productSn" class="flex align-center item-list">
 					<view>
 					<view>
-						<u-image :src="item.images" border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
+						<u-image :src="item.images?item.images:'/static/def_imgs.png'" border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
 					</view>
 					</view>
 					<view>
 					<view>
 						<view class="item-name">
 						<view class="item-name">
@@ -100,7 +100,7 @@
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="footer flex align_center justify_center" v-if="info">
 		<view class="footer flex align_center justify_center" v-if="info">
-			<u-button v-if="info.billState != 'CLOSE'&&info.settleState=='WAIT'" :throttle-time="100" @click="deleteRow" shape="circle" type="info">取消订单</u-button>
+			<u-button v-if="info.billState != 'CLOSE'&&info.settleState=='WAIT'" :throttle-time="100" @click="deleteRow" shape="circle" plain type="error">取消订单</u-button>
 			<!-- <u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="sanCodeRow" :custom-style="{background:'#066cff',color:'#fff'}" shape="circle" type="success">扫码取货</u-button> -->
 			<!-- <u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="sanCodeRow" :custom-style="{background:'#066cff',color:'#fff'}" shape="circle" type="success">扫码取货</u-button> -->
 			<u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="onceQh()" :loading="loading" :custom-style="{background:'#066cff',color:'#fff'}" shape="circle" type="success">一键取货</u-button>
 			<u-button v-if="info.billState == 'WAIT'" :throttle-time="100" @click="onceQh()" :loading="loading" :custom-style="{background:'#066cff',color:'#fff'}" shape="circle" type="success">一键取货</u-button>
 		</view>
 		</view>

+ 4 - 4
pagesA/digitalShelf/orderList.vue

@@ -378,7 +378,7 @@
 						color: #fff;
 						color: #fff;
 						border-radius: 100rpx;
 						border-radius: 100rpx;
 						margin-left: 15upx;
 						margin-left: 15upx;
-						font-size: 24upx;
+						font-size: 22upx;
 						&:after{
 						&:after{
 							border: 0;
 							border: 0;
 						}
 						}
@@ -391,9 +391,9 @@
 						background-color: #066cff;
 						background-color: #066cff;
 					}
 					}
 					.del{
 					.del{
-						color: #666;
-						border:2rpx solid #EDEDED;
-						background: none;
+						color: #fa3534;
+						border-color: #fab6b6;
+						background-color: #fef0f0;
 					}
 					}
 				}
 				}
 			}
 			}

+ 4 - 4
pagesA/digitalShelf/tempOrderList/orderDetail.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<view class="orderDetail-digitalShel flex flex_column">
 	<view class="orderDetail-digitalShel flex flex_column">
-		<view class="contHead" :style="{background:state== 0?'#1283d4':'#06ab50',color:'#fff'}">
+		<view class="contHead" :style="{background:state== 0?'#066cff':'#06ab50',color:'#fff'}">
 			<view class="statusH">
 			<view class="statusH">
 				<view class="flex flex_column align_center">
 				<view class="flex flex_column align_center">
 					<view class="status-row">
 					<view class="status-row">
@@ -16,7 +16,7 @@
 			<!-- 头部车辆信息 -->
 			<!-- 头部车辆信息 -->
 			<div class="flex align-center cpb_header" v-if="info">
 			<div class="flex align-center cpb_header" v-if="info">
 				<div>
 				<div>
-					<u-image :src="info.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
+					<u-image :src="info.vehicleLogo?info.vehicleLogo:'/static/def_imgs.png'" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image>
 				</div>
 				</div>
 				<div class="flex flex_column justify_center align_start">
 				<div class="flex flex_column justify_center align_start">
 					<view class="carModel flex align-center" v-if="info.vehicleNumber" >
 					<view class="carModel flex align-center" v-if="info.vehicleNumber" >
@@ -41,7 +41,7 @@
 				</view>
 				</view>
 				<view v-for="item in partList" :key="item.productSn" class="flex align-center item-list">
 				<view v-for="item in partList" :key="item.productSn" class="flex align-center item-list">
 					<view>
 					<view>
-						<u-image :src="item.images" border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
+						<u-image :src="item.images?item.images:'/static/def_imgs.png'" border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
 					</view>
 					</view>
 					<view>
 					<view>
 						<view class="item-name">
 						<view class="item-name">
@@ -112,7 +112,7 @@
 		  // 更改标题栏背景色
 		  // 更改标题栏背景色
 		  uni.setNavigationBarColor({
 		  uni.setNavigationBarColor({
 		  	frontColor: '#ffffff',
 		  	frontColor: '#ffffff',
-		  	backgroundColor: option.state== 0 ? '#1283d4':'#06ab50',
+		  	backgroundColor: option.state== 0 ? '#066cff':'#06ab50',
 		  })
 		  })
 	   },
 	   },
 	   onShow() {
 	   onShow() {

+ 1 - 1
pagesB/procureOrderList.vue

@@ -32,7 +32,7 @@
 										 <span v-if="item.billStatus == 'WAIT_OUT_WAREHOUSE' || item.billStatus == 'WAIT_RECEIVE'">待收货</span>
 										 <span v-if="item.billStatus == 'WAIT_OUT_WAREHOUSE' || item.billStatus == 'WAIT_RECEIVE'">待收货</span>
 										 <span v-if="item.billStatus == 'FINISH'">已完结</span>
 										 <span v-if="item.billStatus == 'FINISH'">已完结</span>
 										 <span v-if="item.billStatus == 'CANCEL'">已取消</span>
 										 <span v-if="item.billStatus == 'CANCEL'">已取消</span>
-										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_AUDIT'" size="mini" shape="circle" type="error" @click="cancelOrder(item)">取消订单</u-button>
+										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_AUDIT'" size="mini" shape="circle" type="error" plain @click="cancelOrder(item)">取消订单</u-button>
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_RECEIVE'" size="mini" shape="circle" type="primary" @click="receiveOrder(item)">确认收货</u-button>
 										 <u-button style="margin-left: 10px;" v-if="item.billStatus == 'WAIT_RECEIVE'" size="mini" shape="circle" type="primary" @click="receiveOrder(item)">确认收货</u-button>
 									 </view>
 									 </view>
 								 </view>
 								 </view>