lalala 6 ani în urmă
părinte
comite
b09110a4e2

+ 3 - 1
mobile-code/src/admin/order/components/sel-express-confirm.vue

@@ -50,7 +50,9 @@
 						<div class="axis-title">{{ orderComData[2].actionName }}</div>
 						<div class="axis-det">
 							<div class="app-bold">{{ orderComData[2].addTime | formatTime }}</div>
-							<card-name :info="orderComData[2].receive" />
+							<block v-if="!$util.isEmpty(orderComData[2].receive)">
+								<card-name :info="orderComData[2].receive" />
+							</block>
 							<div class="btn-wrap-com">
 								<!-- <button class="admin-button-com default">明细</button> -->
 								<button class="admin-button-com default">重打</button>

+ 2 - 1
mobile-code/src/admin/order/components/sel-ship-manage.vue

@@ -60,7 +60,7 @@
 						<div class="inp-list-line">
 							<div class="line-label">送花时间</div>
 							<div class="line-input">
-								<picker mode="multiSelector" :range="timeList" @change="changeTimeFn" class="inp-select">
+								<picker mode="multiSelector" :range="timeList" :value="timeValue" @change="changeTimeFn" class="inp-select">
 									<div v-if="form.sendTime">{{ form.sendTime }}</div>
 									<div class="tui-placeholder" v-else>请选择</div>
 								</picker>
@@ -125,6 +125,7 @@ export default {
 				['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24'],
 				['00', '10', '20', '30', '40', '50']
 			],
+			timeValue: [0, 0],
 			// deliveryList
 			deliveryList: [
 				{

+ 22 - 21
mobile-code/src/admin/order/ship.vue

@@ -130,27 +130,28 @@ export default {
 		},
 		getPageStatus() {
 			uni.hideLoading()
-			if (this.$util.isEmpty(this.orderComData)) return false
-			let textStatus = this.orderComData[0].actionName
-			if (textStatus == '打单') {
-				let receive = this.orderComData[0].receive
-				if (this.$util.isEmpty(receive)) {
-					this.showIndex = 0
-				} else {
-					this.showIndex = 1
-				}
-			} else if (textStatus == '发货') {
-				this.showIndex = 7
-			} else if (textStatus == '送达') {
-				this.showIndex = 4
-			} else if (textStatus == '完成') {
-				let classify = this.orderComData[0].classify
-				if (this.$util.isEmpty(classify)) {
-					this.showIndex = 5
-				} else {
-					this.showIndex = 6
-				}
-			}
+			this.showIndex = 7
+			// if (this.$util.isEmpty(this.orderComData)) return false
+			// let textStatus = this.orderComData[0].actionName
+			// if (textStatus == '打单') {
+			// 	let receive = this.orderComData[0].receive
+			// 	if (this.$util.isEmpty(receive)) {
+			// 		this.showIndex = 0
+			// 	} else {
+			// 		this.showIndex = 1
+			// 	}
+			// } else if (textStatus == '发货') {
+			// 	this.showIndex = 7
+			// } else if (textStatus == '送达') {
+			// 	this.showIndex = 4
+			// } else if (textStatus == '完成') {
+			// 	let classify = this.orderComData[0].classify
+			// 	if (this.$util.isEmpty(classify)) {
+			// 		this.showIndex = 5
+			// 	} else {
+			// 		this.showIndex = 6
+			// 	}
+			// }
 		}
 	}
 }

+ 2 - 2
mobile-code/src/components/plugin/modal.vue

@@ -135,7 +135,7 @@ export default {
 		top: 50%;
 		margin: auto;
 		background: #fff;
-		z-index: 1008;
+		z-index: 998;
 		transition: all 0.3s ease-in-out;
 		opacity: 0;
 		box-sizing: border-box;
@@ -162,7 +162,7 @@ export default {
 		right: 0;
 		bottom: 0;
 		background: rgba(0, 0, 0, 0.6);
-		z-index: 1006;
+		z-index: 996;
 		transition: all 0.3s ease-in-out;
 		opacity: 0;
 		visibility: hidden;