Merge branch 'dev' into 'test'

商品列表页文案修改

See merge request quanshu/mp-ui-pc!333

src/views/business/goods/index.vue

@@ -49,7 +49,7 @@
           <el-option label="全部" value="" />
           <el-option label="支持兑换" value="1" />
           <el-option label="不支持兑换" value="0" />
-          <el-option label="只展示在首页" value="2" />
+          <el-option label="盲票商品" value="2" />
         </el-select>
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">
@@ -124,6 +124,7 @@
         <template slot-scope="{row}">
           <span v-if="row.exchangeShow == '1'">支持</span>
           <span v-if="row.exchangeShow == '0'">不支持</span>
+          <span v-if="row.exchangeShow == '2'">盲票商品</span>
         </template>
       </el-table-column>
       <el-table-column label="盲豆兑换数量" prop="exchangePrice" sortable="custom" min-width="125" />