订单流程联通

admin-update/src/views/order/components/sel-order.vue

@@ -79,7 +79,7 @@
                                       placement="top"
                                       width="160"
                                       v-model="sendMySelfConfirm">
-                                      <p>确认已送达？</p>
+                                      <p>确认自配送？</p>
                                       <div style="text-align: right; margin: 0">
                                         <el-button size="mini" type="text" @click="sendMySelfConfirm = false">取消</el-button>
                                         <el-button type="primary" size="mini" @click="sendMySelfFn">确定</el-button>

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

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

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

@@ -114,7 +114,7 @@ export default {
 				id: this.orderData.id,
 				option: 1
 			}).then(res => {
-				this.$msg('确认送达成功！')
+				this.$msg('已确认')
 				setTimeout(() => {
 					this.$util.pageTo({
 						url: '/admin/order/ship',

mobile-code/src/admin/order/components/sel-pending-order.vue

@@ -13,16 +13,16 @@
 					<div class="axis-slot-wrap">
 						<div class="axis-title">{{ orderComData[0].actionName }}</div>
 						<div class="axis-det">
-							<div>配送方：{{ orderComData[0].sendInfo.sendSideName }}</div>
-                            <div>距离：{{ orderComData[0].sendInfo.sendDistance }}km</div>
-                            <div>运费：¥{{ orderComData[0].sendInfo.sendCost }}</div>
+							<div>配送方：{{ orderComData[0].sendInfo.sideName }}</div>
+                            <div>距离：{{ orderComData[0].sendInfo.distance }}km</div>
+                            <div>运费：¥{{ orderComData[0].sendInfo.cost }}</div>
                             <div>
-                                <span>小费：¥{{ orderComData[0].sendInfo.sendTip }}</span>
+                                <span>小费：¥{{ orderComData[0].sendInfo.tip }}</span>
                                 <i class="iconfont iconbianjijiage1 modify-btn"></i>
                             </div>
                             <div>
 								<span>状态：</span>
-								<span class="app-price">{{ orderComData[0].sendInfo.sendStatus | constantfilter('SEND_STATUS') }}</span>
+								<span class="app-price">{{ orderComData[0].sendInfo.status | constantfilter('SEND_STATUS') }}</span>
 							</div>
                             <div>期待送花时间：{{ orderComData[2].addTime | formatTime }}</div>
                             <div class="admin-button-com default">取消</div>

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

@@ -40,11 +40,11 @@
 						<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[2].sendInfo.sendSideName }}</div>
-								<div>距离：{{ orderComData[2].sendInfo.sendDistance }}km</div>
-								<div>运费：¥{{ orderComData[2].sendInfo.sendCost }}</div>
-								<div>小费：¥{{ orderComData[2].sendInfo.sendTip }}</div>
-								<div>状态：{{ orderComData[2].sendInfo.sendStatus | constantfilter('SEND_STATUS') }}</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>状态：{{ orderComData[1].sendInfo.status | constantfilter('SEND_STATUS') }}</div>
 							</block>
 							<block v-else>
 								<div>配送方：门店</div>

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

@@ -81,7 +81,7 @@
 			</template>
 		</modal-module>
 		<!-- 删除提示 -->
-		<modal-module :show="selfShipModal" @cancel="modalCancel" @click="shipModalClick" content="确认已送达？" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
+		<modal-module :show="selfShipModal" @cancel="modalCancel" @click="shipModalClick" content="确认自配送？" color="#333" :size="32" padding="30rpx 30rpx"></modal-module>
 	</div>
 </template>