修改订单列表状态展示

page_goods/orderDetail/orderDetail.vue

@@ -8,7 +8,9 @@
 				<image :src="$util.img(action.icon)"></image>
 				<view class="status-name">
 					<view class="name">
-						{{ orderData.order_status_name }}
+            <text v-if="orderData.order_status_name == '待审核' && payInfo.pay_status == 0">待支付</text>
+            <text v-else>{{ orderData.order_status_name }}</text>
+
 						<text v-if="orderData.promotion_status_name">（{{ orderData.promotion_status_name }}）</text>
 					</view>
 					<view class="desc" v-if="orderData.promotion_type == 'presale' && orderData.order_status == 1">

pages/order/list.vue

@@ -30,7 +30,10 @@
 						<view class="order-header">
 
 							<text class="font-size-base">订单号：{{ orderItem.order_no }}</text>
-							<text class="status-name color-base-text">
+              <text class="status-name color-base-text" v-if="orderStatusName">
+                {{ orderStatusName }}
+              </text>
+							<text class="status-name color-base-text" v-else>
 								{{ orderItem.order_status_name }}
 							</text>
 						</view>
@@ -84,9 +87,23 @@
 											</text>
 
 										</text>
-										<text v-if="goodsItem.delivery_status">
+<!--										<text v-if="goodsItem.delivery_status">-->
-											{{goodsItem.delivery_status_name}}
+<!--											{{goodsItem.delivery_status_name}}-->
-										</text>
+<!--										</text>-->
+
+                    <!--支付状态-->
+                    <text v-if="orderItem.pay.pay_status == 2">
+                      已支付
+                    </text>
+                    <text v-else-if="orderItem.pay.pay_status == 0 && orderItem.pay.pay_money > 0 && orderItem.pay.received_money == 0">
+                      未支付
+                    </text>
+                    <text v-else-if="orderItem.pay.pay_status == 0 && orderItem.pay.pay_money > 0 && orderItem.pay.received_money > 0">
+                      部分支付
+                    </text>
+
+
+
 										<text class="goods-num">
 
 											<text class="iconfont icon-close"></text>
@@ -279,6 +296,7 @@
 			return {
 				scrollInto: '',
 				orderStatus: 'all',
+				orderStatusName: '',
 				statusList: [],
 				orderList: [],
 				contentText: {},
@@ -346,9 +364,22 @@
 				}
 				if (this.orderStatus == '') this.mergePayOrder = [];
 				this.orderStatus = this.statusList[index].status;
-				this.$refs.loadingCover.show();
+
+        let _findRes = this.findStatusItem(this.statusList, this.orderStatus);
+        //如果tab的索引=all(全部),那么就展示订单原有的状态名称,否则展示当前tab的名称
+        if (this.orderStatus == 'all'){
+          this.orderStatusName = ''//当前订单卡片的状态名称
+        }else{
+          this.orderStatusName = _findRes.name//当前订单卡片的状态名称
+        }
+
+        this.$refs.loadingCover.show();
 				this.$refs.mescroll.refresh();
 			},
+      //查找状态名称
+      findStatusItem(statusArray, statusValue) {
+        return statusArray.find(item => item.status === statusValue);
+      },
 			getListData(mescroll) {
 				this.$api.sendRequest({
 					url: '/api/order/lists',