From c493b3fc68234c6e75fe35479d46aab1faae50cf Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 19 Feb 2020 14:43:40 +0800
Subject: [PATCH] =?UTF-8?q?yshop1.9.9=E7=89=88=E6=9C=AC,=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=86=E5=85=AC=E4=BC=97=E5=8F=B7=E9=85=8D=E7=BD=AE,?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=90=9C=E7=B4=A2=E4=B8=8E=E4=BC=98=E5=8C=96=E4=BA=86?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA=E7=AD=89,=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D#I19S9R=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/order/index.vue | 35 ++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index 208d952..a08adbc 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -16,6 +16,14 @@
           :value="item.value"
         />
       </el-select>
+      <el-select v-model="orderType" clearable placeholder="订单类型" class="filter-item" style="width: 130px">
+        <el-option
+          v-for="item in typeOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
       <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
       <!-- 新增 -->
     </div>
@@ -36,14 +44,6 @@
       <el-table-column prop="realName" label="用户姓名" />
       <el-table-column prop="cartInfoList" width="300" label="商品信息">
         <template slot-scope="scope">
-          <div v-for="(item,index) in scope.row.cartInfoList">
-            <span><img
-              style="width: 30px;height: 30px;margin:0;cursor: pointer;"
-              :src="item.cartInfoMap.productInfo.image"
-            ></span>
-            <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
-            <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
-          </div>
           <div v-for="(item,index) in scope.row.cartInfoList" v-if="item.cartInfoMap.productInfo.attrInfo">
             <span>
               <img
@@ -54,6 +54,14 @@
             <span>{{ item.cartInfoMap.productInfo.storeName }}&nbsp;{{ item.cartInfoMap.productInfo.attrInfo.suk }}</span>
             <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
           </div>
+          <div v-else v-for="(item,index) in scope.row.cartInfoList">
+            <span><img
+              style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+              :src="item.cartInfoMap.productInfo.image"
+            ></span>
+            <span>{{ item.cartInfoMap.productInfo.storeName }}</span>
+            <span> | ￥{{ item.cartInfoMap.truePrice }}×{{ item.cartInfoMap.cartNum }}</span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column prop="payPrice" label="实际支付" />
@@ -166,7 +174,7 @@ export default {
   mixins: [initData],
   data() {
     return {
-      delLoading: false, status,
+      delLoading: false, status, orderType: '0',
       queryTypeOptions: [
         { key: 'orderId', display_name: '订单号' },
         { key: 'realName', display_name: '用户姓名' },
@@ -182,6 +190,13 @@ export default {
         { value: '-1', label: '退款中' },
         { value: '-2', label: '已退款' },
         { value: '-4', label: '已删除' }
+      ],
+      typeOptions: [
+        { value: '0', label: '所有订单' },
+        { value: '1', label: '普通订单' },
+        { value: '2', label: '拼团订单' },
+        { value: '3', label: '秒杀订单' },
+        { value: '4', label: '砍价订单' }
       ]
     }
   },
@@ -196,7 +211,7 @@ export default {
     beforeInit() {
       this.url = 'api/yxStoreOrder'
       const sort = 'id,desc'
-      this.params = { page: this.page, size: this.size, sort: sort, orderStatus: this.status }
+      this.params = { page: this.page, size: this.size, sort: sort, orderStatus: this.status, orderType: this.orderType }
       const query = this.query
       const type = query.type
       const value = query.value