移动端发货管理

mobile-code/src/admin/home/order.vue

@@ -24,21 +24,37 @@
 							<span>应付金额：</span>
 							<span class="app-size-30 app-bold">¥{{ item.actPrice }}</span>
 						</div>
-						<div class="list-button">
-							<!-- 待配送 -->
-							<div v-if="item.status == 2" class="admin-button-com" @click.stop="freeShippingFn(item, index)">免发货</div>
-							<div v-if="item.status == 2" class="admin-button-com" @click.stop="pageTo({
-						url: '/admin/order/ship',
-						query: {
-							id: item.id,
-							pageStatus: 0
-						}
-					})">发货</div>
-							<!-- 配送中 -->
-							<div v-if="item.status == 2" class="admin-button-com">继续</div>
-							<!-- 已完成 -->
-							<div v-if="item.status == 5" class="admin-button-com default" @click.stop="seeSendFn(item)">配送详情</div>
-						</div>
+
+<div class="list-button">
+
+				<template v-if="item.status == 0">
+					<div class="admin-button-com default" @click.stop="">自取</div>
+					<div class="admin-button-com default" @click.stop="">发货</div>
+				</template>
+
+				<template v-else-if="['4','5','6'].indexOf(item.status) != -1">
+
+				    <div class="admin-button-com default" @click.stop="seeSendFn(item)">配送详情</div>
+
+				</template>
+				<template v-else>
+                    <template v-if="item.currentFlow == 1">
+							<div class="admin-button-com" @click.stop="freeShippingFn(item, index)">自取</div>
+							<div class="admin-button-com" @click.stop="pageTo({url: '/admin/order/ship',query: {id: item.id,pageStatus: 0}})">发货</div>
+					</template>
+                    <template v-else>
+                        <div class="admin-button-com" @click.stop="pageTo({url: '/admin/order/ship',query: {id: item.id,pageStatus: 0}})">继续发货</div>
+                    </template>
+				</template>
+
+
+</div>
+
+
+
+
+
+
 					</div>
 				</div>
 			</block>

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

@@ -27,13 +27,13 @@
 						<div class="axis-det">
 							<div class="app-color-0 app-bold">{{ orderComData[1].addTime | formatTime }}</div>
 							<block v-if="!$util.isEmpty(orderComData[1].sendInfo)">
-								<div>配送方：{{ orderComData[1].sendInfo.sendSideName }}</div>
-								<div>距离：{{ orderComData[1].sendInfo.sendDistance }}km</div>
-								<div>运费：¥{{ orderComData[1].sendInfo.sendCost }}</div>
-								<div>小费：¥{{ orderComData[1].sendInfo.sendTip }}</div>
+								<div>配送方：{{ orderComData[1].sendInfo.sideName }}</div>
+								<div>距离：{{ orderComData[1].sendInfo.distance }}km</div>
+								<div>运费：¥{{ orderComData[1].sendInfo.cost }}</div>
+								<div>小费：¥{{ orderComData[1].sendInfo.tip }}</div>
 								<div>
 									<span>状态：</span>
-									<span class="app-color-4">{{ orderComData[1].sendInfo.sendStatus | constantfilter('SEND_STATUS') }}</span>
+									<span class="app-color-4">{{ orderComData[1].sendInfo.status | constantfilter('SEND_STATUS') }}</span>
 								</div>
 							</block>
 							<block v-else>

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

@@ -13,8 +13,8 @@
 					<div class="axis-slot-wrap">
 						<div class="axis-title">发货</div>
 						<div class="axis-det btn-wrap">
-							<button class="admin-button-com big blue confirm-btn" @click="sendSelfFn">自己送</button>
-							<button class="admin-button-com big blue confirm-btn" @click="sendShipFn">代送</button>
+							<button class="admin-button-com big blue confirm-btn" @click="sendSelfFn" style="margin:auto;">自己送</button>
+							<button class="admin-button-com big blue confirm-btn" @click="sendShipFn" style="margin:auto;">代送</button>
 						</div>
 					</div>
 				</template>
@@ -70,7 +70,7 @@
 						<div class="inp-list-line">
 							<div class="line-label">配送方</div>
 							<div class="line-input">
-								<picker mode="selector" :range="deliveryList" @change="changedeliveryFn" range-key="text" class="inp-select">
+								<picker mode="selector" :range="deliveryList" @change="changeDeliveryFn" range-key="text" class="inp-select">
 									<div v-if="form.sendSide">{{ sendSideText }}</div>
 									<div class="tui-placeholder" v-else>请选择</div>
 								</picker>
@@ -120,9 +120,9 @@ export default {
 			form: {
 				sendType: 0,
 				sendTime: '',
-				sendSide: ''
+				sendSide: 1
 			},
-			sendSideText: '',
+			sendSideText: '达达配送',
 			// time
 			timeList: [
 				['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23', '24'],
@@ -143,10 +143,11 @@ export default {
 	methods: {
 		sendShipFn() {
 			this.shipModal = true
+            this.sendSideText = '达达配送'
 			this.form = {
-				sendType: 0,
+				sendType: 3,
 				sendTime: '',
-				sendSide: ''
+				sendSide: 1
 			}
 		},
 		sendSelfFn() {
@@ -154,7 +155,7 @@ export default {
 			this.form = {
 				sendType: 2,
 				sendTime: '',
-				sendSide: 1
+				sendSide: ''
 			}
 		},
 		printOrderFn() {
@@ -180,7 +181,7 @@ export default {
 			let twoIndex = e.detail.value[1] || 0
 			this.form.sendTime = this.timeList[0][oneIndex] + ':' + this.timeList[1][twoIndex]
 		},
-		changedeliveryFn(e) {
+		changeDeliveryFn(e) {
 			this.form.sendSide = this.deliveryList[e.detail.value].key
 			this.sendSideText = this.deliveryList[e.detail.value].text
 		},