订单处理相关

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

@@ -31,11 +31,11 @@
 					<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 v-else-if="item.status == 4">
+                </template>
+				<template v-else-if="['5','6'].indexOf(item.status) != -1">
+				    <div v-if="item.sendType == 3" class="admin-button-com default" style="color: #dddddd;border-color:#dddddd;">已自取</div>
+				    <div v-else class="admin-button-com default" @click.stop="seeSendFn(item)" style="color:#67C23A;border-color:#67C23A">已送达</div>
 				</template>
 				<template v-else>
                     <template v-if="item.currentFlow == 1">
@@ -43,18 +43,14 @@
 							<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>
+                        <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/detail.vue

@@ -126,16 +126,27 @@
 					<span class="app-size-40">{{ data.prePrice }}</span>
 				</span>
 			</div>
-			<template v-if="data.status == 0">
+			<template>
+			    <!--
 				<button class="admin-button-com middle" @click="updatePriceFn">修改价格</button>
+				-->
 			</template>
-			<template v-else-if="data.status == 1 || data.status == 2">
+			<template>
 				<div class="operate-btn-wrap">
-					<block v-if="data.status == 2">
-						<button class="admin-button-com middle" @click="seeSendFn">配送详情</button>
+				    <block v-if="data.status == 0">
+				        <button class="admin-button-com middle" style="color: #666666;border-color: #dddddd;">自取</button>
+                        <button class="admin-button-com middle" style="color: #666666;border-color: #dddddd;">发货</button>
+				    </block>
+				    <block v-else-if="data.status == 4">
+				    </block>
+					<block v-else-if="['5','6'].indexOf(data.status) != -1">
+
+					    <button v-if="data.sendType == 3" class="admin-button-com middle" style="color: #dddddd;border-color:#dddddd;">已自取</button>
+						<button v-else class="admin-button-com middle" @click="seeSendFn">已送达</button>
+
 					</block>
 					<block v-else>
-						<button class="admin-button-com middle" @click.stop="freeShippingFn">免发货</button>
+						<button class="admin-button-com middle" @click.stop="freeShippingFn">自取</button>
 						<button class="admin-button-com middle" @click.stop="pageTo({
 						url: '/admin/order/ship',
 						query: {