From efcee6f107d302be19258232324573a3065e3a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B?= <fengli.wang@pactera.com>
Date: Thu, 8 Nov 2018 16:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/coupon/index.vue |  2 +-
 src/components/shop/dialog.vue  | 13 +++++++++----
 src/components/shop/index.vue   | 27 +++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/components/coupon/index.vue b/src/components/coupon/index.vue
index 4516fc6d..5a8dfcfe 100644
--- a/src/components/coupon/index.vue
+++ b/src/components/coupon/index.vue
@@ -99,7 +99,7 @@
         searchFrom: {
           user_id: '',
           out_trade_no:'',
-          status:''
+          status:0
         },
         list: []
       }
diff --git a/src/components/shop/dialog.vue b/src/components/shop/dialog.vue
index 2396e024..08f70ad3 100644
--- a/src/components/shop/dialog.vue
+++ b/src/components/shop/dialog.vue
@@ -47,7 +47,7 @@
               <el-select multiple v-model="goodsYou" placeholder="全部">
                 <el-option v-for="data in goodsList"
                            :key="data.id"
-                           :label="data.name"
+                           :label="data | filterGoods"
                            :value="data.id">
                 </el-option>
               </el-select>
@@ -60,7 +60,7 @@
               <el-select v-model="goOn_goods_Id.before_goods_id" placeholder="请选择">
                 <el-option v-for="data in goodsList"
                            :key="data.id"
-                           :label="data.name"
+                           :label="data | filterGoods"
                            :value="data.id">
 
                 </el-option>
@@ -72,7 +72,7 @@
               <el-select v-model="goOn_goods_Id.after_goods_id" placeholder="请选择">
                 <el-option v-for="data in goodsList"
                            :key="data.id"
-                           :label="data.name"
+                           :label="data | filterGoods"
                            :value="data.id">
                 </el-option>
               </el-select>
@@ -269,12 +269,17 @@
 
 <script>
   import {getLessonApi,addGoodsApi,editGoodsApi,getGoodsDetailApi,uploadFileApi,getGoodsListApi} from "../../service/api";
-  import {TEACHERTYPE} from "../../util/wordbook";
+  import {TEACHERTYPE,GOODSTYPE} from "../../util/wordbook";
   export default {
     name: "dialogObj",
     props:[
       'dialogObj'
     ],
+    filters: {
+      filterGoods(val){
+        return '[' + GOODSTYPE[val.goods_type] + ']' + '[' +val.current_price / 100 + 'å…ƒ]' + val.name
+      }
+    },
     data(){
       return{
         loading:true,
diff --git a/src/components/shop/index.vue b/src/components/shop/index.vue
index d198a62c..9df9d3e5 100644
--- a/src/components/shop/index.vue
+++ b/src/components/shop/index.vue
@@ -4,6 +4,27 @@
           <el-form-item label="商品名称">
             <el-input v-model="searchFrom.name"></el-input>
           </el-form-item>
+          <el-form-item label="商品类型">
+            <el-select v-model="searchFrom.goods_type" placeholder="请选择" @change="getUser">
+              <el-option value="" label="请选择"></el-option>
+              <el-option
+                :label="'普通商品'"
+                :value="1">
+              </el-option>
+              <el-option
+                :label="'团购商品'"
+                :value="2">
+              </el-option>
+              <el-option
+                :label="'续课商品'"
+                :value="3">
+              </el-option>
+              <el-option
+                :label="'优惠券商品'"
+                :value="4">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="课程">
             <el-select v-model="searchFrom.course_id" placeholder="请选择" @change="getUser">
               <el-option value="" label="请选择"></el-option>
@@ -181,6 +202,9 @@
       return {
         searchFrom:{
           name:'',
+          goods_type: '',
+          status: '',
+          course_id: ''
         },
         userList:[],
         total:0,
@@ -299,6 +323,9 @@
         if (this.searchFrom.name) {
             json.name = this.searchFrom.name
         }
+        if (this.searchFrom.goods_type){
+            json.goods_type = this.searchFrom.goods_type
+        }
         if (this.searchFrom.course_id) {
           json.course_id = this.searchFrom.course_id
         }
-- 
2.21.0