Merge branch 'master' into salesman

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

@@ -53,6 +53,8 @@
           >
             <el-option label="实物商品" value="PHYSICAL_GOODS" />
             <el-option label="虚拟商品" value="VIRTUAL_GOODS" />
+            <!-- E_COUPON：卡密商品；平台无卡池管理权限（S-04） -->
+            <el-option label="电子卡券" value="E_COUPON" />
           </el-select>
         </el-form-item>
         <el-form-item label="商品分组" prop="groupId">
@@ -385,7 +387,8 @@ export default {
     goodsTypeText(v) {
       if (v === "PHYSICAL_GOODS") return "实物商品";
       if (v === "VIRTUAL_GOODS") return "虚拟商品";
-      return "电子卡券";
+      if (v === "E_COUPON") return "电子卡券"; // 卡密商品
+      return v || "—";
     },
     marketEnableText(v) {
       if (v === "DOWN") return "下架";