商品列表问题展示搜索字段，展示商品类型

manager/src/views/goods/goods-info/goods.vue

@@ -38,6 +38,12 @@
               <Option value="DOWN">下架</Option>
             </Select>
           </Form-item>
+          <Form-item label="商品类型" prop="status">
+            <Select v-model="searchForm.goodsType" placeholder="请选择" clearable style="width: 200px">
+              <Option value="PHYSICAL_GOODS">实物商品</Option>
+              <Option value="VIRTUAL_GOODS">虚拟商品</Option>
+            </Select>
+          </Form-item>
           <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search" >搜索</Button>
         </Form>
       </Row>
@@ -132,6 +138,7 @@ export default {
         pageSize: 10, // 页面大小
         sort: "create_time", // 默认排序字段
         order: "desc", // 默认排序方式
+        goodsType: "", // 商品类型
       },
       underForm: { // 下架原因
         reason: "",
@@ -174,6 +181,20 @@ export default {
             );
           },
         },
+        {
+          title: "商品类型",
+          key: "goodsType",
+          width: 130,
+          render: (h, params) => {
+            if (params.row.goodsType === 'PHYSICAL_GOODS') {
+              return h("div", "实物商品");
+            } else if (params.row.goodsType === 'VIRTUAL_GOODS') {
+              return h("div", "虚拟商品");
+            } else {
+              return h("div", "电子卡券");
+            }
+          },
+        },
         {
           title: "状态",
           key: "marketEnable",

seller/src/views/goods/goods-seller/goods.vue

@@ -12,6 +12,12 @@
               <Option value="UPPER">上架</Option>
             </Select>
           </Form-item>
+          <Form-item label="商品类型" prop="status">
+            <Select v-model="searchForm.goodsType" placeholder="请选择" clearable style="width: 200px">
+              <Option value="PHYSICAL_GOODS">实物商品</Option>
+              <Option value="VIRTUAL_GOODS">虚拟商品</Option>
+            </Select>
+          </Form-item>
           <Form-item label="商品编号" prop="sn">
             <Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px"/>
           </Form-item>
@@ -49,7 +55,8 @@
               </div>
               <Poptip trigger="hover" title="扫码在手机中查看" transfer>
                 <div slot="content">
-                  <vue-qr :text="wapLinkTo(row.id,row.skuId)"  :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
+                  <vue-qr :text="wapLinkTo(row.id,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff"
+                          :size="150"></vue-qr>
                 </div>
                 <img src="../../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
               </Poptip>
@@ -60,7 +67,8 @@
       </Table>
 
       <Row type="flex" justify="end" class="page">
-        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+              @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
               show-total show-elevator show-sizer></Page>
       </Row>
     </Card>
@@ -78,7 +86,8 @@
     <Modal title="批量设置运费模板" v-model="shipTemplateModal" :mask-closable="false" :width="500">
       <Form ref="shipTemplateForm" :model="shipTemplateForm" :label-width="120">
         <FormItem class="form-item-view-el" label="运费" prop="freightPayer">
-          <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange" v-model="shipTemplateForm.freightPayer">
+          <RadioGroup type="button" button-style="solid" @on-change="logisticsTemplateUndertakerChange"
+                      v-model="shipTemplateForm.freightPayer">
             <Radio label="STORE">
               <span>卖家承担运费</span>
             </Radio>
@@ -245,6 +254,20 @@ export default {
             );
           },
         },
+        {
+          title: "商品类型",
+          key: "goodsType",
+          width: 130,
+          render: (h, params) => {
+            if (params.row.goodsType === 'PHYSICAL_GOODS') {
+              return h("div", "实物商品");
+            } else if (params.row.goodsType === 'VIRTUAL_GOODS') {
+              return h("div", "虚拟商品");
+            } else {
+              return h("div", "电子卡券");
+            }
+          },
+        },
         {
           title: "商品价格",
           key: "price",