shish пре 8 месеци
родитељ
комит
5293fe5e11

+ 1 - 1
ghsApp/src/admin/home/components/OrderItem.vue

@@ -18,7 +18,7 @@
       </view>
       </view>
       <view class="order-list_info">
       <view class="order-list_info">
         <view class="order-info_box">
         <view class="order-info_box">
-          <view>号:</view>
+          <view>号:</view>
           <view>{{ item.sendNum }}</view>
           <view>{{ item.sendNum }}</view>
         </view>
         </view>
         <view class="order-info_box">
         <view class="order-info_box">

+ 3 - 4
ghsApp/src/pagesOrder/detail.vue

@@ -59,9 +59,9 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="bills-info_box content-box">
 			<view class="bills-info_box content-box">
-				<view class="order-info_box" v-if="detailInfo.hasNoticeCustom && detailInfo.hasNoticeCustom == 1">
-					<view>通知客户:</view>
-					<view style="color:green;font-weight:bold;">已自动通知</view>
+				<view class="order-info_box">
+					<view>取货号码:</view>
+					<view>{{ detailInfo.sendNum }}</view>
 				</view>
 				</view>
 				<view class="order-info_box">
 				<view class="order-info_box">
 					<view>创建日期:</view>
 					<view>创建日期:</view>
@@ -179,7 +179,6 @@
 					<view>订单状态:</view>
 					<view>订单状态:</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 					<view>{{ detailInfo.status==1?'待付款':detailInfo.status==2?'待发货':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>
 				</view>
 				</view>
-
 				<view class="order-info_box" v-if="detailInfo.fhType == 1">
 				<view class="order-info_box" v-if="detailInfo.fhType == 1">
 					<view>物流名称:</view>
 					<view>物流名称:</view>
 					<view>{{ detailInfo.fhWl }}</view>
 					<view>{{ detailInfo.fhWl }}</view>

+ 1 - 1
hdApp/src/admin/home/components/order-item.vue

@@ -7,7 +7,7 @@
 				</view>
 				</view>
 				<image class="scan-icon" v-if="info.repeat == 1 && info.payStatus == 1" :src="`${constant.imgUrl}/gathering/scan.jpg`" mode="aspectFit"></image>
 				<image class="scan-icon" v-if="info.repeat == 1 && info.payStatus == 1" :src="`${constant.imgUrl}/gathering/scan.jpg`" mode="aspectFit"></image>
 				<view class="list-msg">
 				<view class="list-msg">
-					<view><text>客户:</text><text>{{info.customName||''}}</text></view>
+					<view><text>货号:</text><text>{{info.sendNum||''}}</text></view>
 					<view style="margin-top:3upx;">
 					<view style="margin-top:3upx;">
 						<text>{{info.sendType==1?'取花':'配送'}}:</text>
 						<text>{{info.sendType==1?'取花':'配送'}}:</text>
 						<text>
 						<text>

+ 1 - 1
hdApp/src/admin/home/order.vue

@@ -38,7 +38,7 @@
       <block v-if="!$util.isEmpty(list.data)">
       <block v-if="!$util.isEmpty(list.data)">
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="$util.pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="$util.pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
           <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
           <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
-            <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.sendNum }}<text v-if="item.bookName!=''" style="margin-left:12upx;">| {{item.bookName}}</text></view>
+            <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">{{ item.customName||'' }}<text v-if="item.bookName!=''" style="margin-left:30upx;color:#866b6b;font-weight: normal;">{{item.bookName}}</text></view>
             <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">赊账</view>
             <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">赊账</view>
             <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.refund == 1">有售后</view>
             <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.refund == 1">有售后</view>
             <view style="font-size:28upx;" class='app-price app-green' v-if="item.status==2&&item.sendType==1">待取货</view>
             <view style="font-size:28upx;" class='app-price app-green' v-if="item.status==2&&item.sendType==1">待取货</view>

+ 6 - 0
hdApp/src/admin/order/detail.vue

@@ -156,6 +156,12 @@
                   @click.stop="callUp(orderInfo.bookMobile)">{{orderInfo.bookMobile}}</text>
                   @click.stop="callUp(orderInfo.bookMobile)">{{orderInfo.bookMobile}}</text>
               </view>
               </view>
             </view>
             </view>
+
+            <view class="msg-list">
+              <view class="label">取货号码:</view>
+              <view class="value"><text class="tag tag--primary">{{ orderInfo.sendNum }}</text></view>
+            </view>
+
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>