修改配送方式

pageE/order/Details.vue

@@ -59,9 +59,9 @@
 						<view class="title">支付方式</view>
 						<view class="price">{{ orderInfo.payment_name }}</view>
 					</view>
-					<view v-if="orderInfo.is_selfraising == 1">
+					<view>
 						<view class="title">配送方式</view>
-						<view class="price">自提</view>
+						<view class="price">{{ orderInfo.member_deliver_type | getDeliverType(orderInfo.store_deliver_type) }}</view>
 					</view>
 				</view>
 			</view>
@@ -69,7 +69,7 @@
 				<view>订单编号：{{ orderInfo.order_sn }}</view>
 				<view>支付单号：{{ orderInfo.pay_sn }}</view>
 				<view>创建时间：{{ orderInfo.add_time | date}}</view>
-				<view v-if="orderInfo.is_selfraising == 1" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
+				<view v-if="orderInfo.member_deliver_type == 3" class="address">自提地址：{{ orderInfo.extend_store.store_address }}</view>
 			</view>
 		</view>
 		 <!-- '4', '8' -->
@@ -77,7 +77,7 @@
 			<!-- orderstate == '4' ||  -->
 			<view class="cancel" v-if="(orderstate == '1') && orderInfo.is_refund == 1" @click="toOtherPage('RefundOrder')">申请退款</view>
 			<!-- <view class="cancel" v-if="orderstate == '8'" @click="cancelOrder">取消订单</view> -->
-			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.is_selfraising != 1" @click="toOtherPage('Logistics')">查看物流</view>
+			<view class="cancel" v-if="orderstate == '1' && orderInfo.shipping_code && orderInfo.member_deliver_type != 3" @click="toOtherPage('Logistics')">查看物流</view>
 			<view class="logistics" v-if="orderstate == '1'" @click="confirmReceive">确认收货</view>
 			<view class="comment" v-if="orderstate == '2'" @click="toOtherPage('Comment')">立即评价</view>
 			<view class="cancel" v-if="orderstate == '6'" @click="cancelOrder">取消支付</view>
@@ -157,6 +157,32 @@ export default {
 	beforeDestroy() {
 		clearInterval(this.timer);
 	},
+	filters: {
+		getDeliverType(user, store) {
+			let deliverType = '';
+			function setType(type) {
+				switch (type) {
+					case 1:
+						deliverType = '快递'
+						break;
+					case 2:
+						deliverType = '骑手'
+						break;
+					case 3:
+						deliverType = '自提'
+						break;
+					default:
+						deliverType = '-'
+						break;
+				}
+			}
+			setType(user);
+			if(store) {
+				setType(store);
+			}
+			return deliverType;
+		}
+	},
 	methods: {
 		viewStoreDetails(id) {
 			this.$u.route('pageC/merchant/index', {

pageE/order/Index.vue

@@ -132,7 +132,7 @@ export default {
 			console.log(load)
 			res.data.forEach(element => {
 				element.extend_order_goods.forEach(i=>{
-					console.log(i)
+					// console.log(i)
 				})
 			});
 			this.timer = true;
@@ -148,7 +148,7 @@ export default {
 			}
 			this.orderList[this.current].forEach(element => {
 				element.extend_order_goods.forEach(i=>{
-					console.log(i)
+					// console.log(i)
 				})
 			});
 			this.$forceUpdate();