顺序

hdApp/src/admin/order/workOrderResult.vue

@@ -5,7 +5,8 @@
 			<view class="result-view">
 				<view class="iconfont iconchenggong"></view>
 				<view class="result-title">操作成功</view>
-				<view class="result-title" v-if="sn!=''">制作单序号：{{sn}}</view>
+				<view class="result-title" v-if="sendNum!=''">订单顺序：{{sendNum}}</view>
+				<view class="result-title" v-if="sn!=''">制作顺序：{{sn}}</view>
 				<button class="admin-button-com big blue" style="width:45vw;" @click="goBackHome">返回</button>
 			</view>
 		</view>
@@ -17,7 +18,8 @@ export default {
     name: "success",
   	data () {
 		return {
-			sn:''
+			sn:'',
+			sendNum:""
 		}
 	},
 	onLoad (option) {
@@ -25,6 +27,7 @@ export default {
 		getInfoByOrderId({orderId:id}).then(res=>{
 			if(res.code == 1){
 				this.sn = res.data.info.sn
+				this.sendNum = res.data.order.sendNum
 			}
 		})
 	},
@@ -76,7 +79,7 @@ export default {
 			color: $mainColor1;
 		}
 		.result-title {
-			margin: 50upx 0 70upx;
+			margin: 10upx 0 60upx;
 			font-size: 32upx;
 		}
 	}

hdPad/src/pages/home/components/workInfo.vue

@@ -15,8 +15,10 @@
           <text class="right" style="color:red;font-weight:bold;font-size:20upx;">{{beginCount}} 秒后</text>
         </view>
 
-        <view v-if="orderInfo.hasReachTime == 1"><text class="left">配送</text>
-          <text class="right" style="color:red;font-weight:bold;">
+        <view>
+          <text class="left">配送</text>
+          <text class="right" v-if="orderInfo.sendType == 1" style="color:red;font-weight:bold;">到店自取</text>
+          <text class="right" v-else style="color:red;font-weight:bold;">
             <text v-if="orderInfo.reachDate == orderInfo.today">今天</text>
             <text v-else-if="orderInfo.reachDate == orderInfo.tomorrow">明天</text>
             <text v-else>{{orderInfo.reachDate.substr(5,9)}}</text>
@@ -53,11 +55,6 @@
           <text class="right" style="color:red;font-weight:bold;">¥{{orderInfo.orderDebtPrice?parseFloat(orderInfo.orderDebtPrice):0}}</text>
         </view>
 
-        <view v-if="orderInfo.sendType == 1">
-          <text class="left">类型</text>
-          <text class="right" style="color:red;font-weight:bold;">到店自取</text>
-        </view>
-
         <view v-if="orderInfo.fromType == 4">
           <text class="left">美团编号</text>
           <text class="right" style="color:black;font-weight:bold;">{{orderInfo.thirdSn}}</text>