Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner-admin into dev

src/views/mall/product/spu/index.vue

@@ -389,7 +389,7 @@ const resetQuery = () => {
 /** 新增或修改 */
 const openForm = (id?: number) => {
   // 修改
-  if (typeof id === 'number') {
+  if (id) {
     push({ name: 'ProductSpuEdit', params: { id } })
     return
   }

src/views/mall/trade/config/index.vue

@@ -216,15 +216,15 @@ const formData = ref({
   deliveryExpressFreePrice: 0,
   deliveryPickUpEnabled: false,
   brokerageEnabled: false,
-  brokerageEnabledCondition: undefined,
-  brokerageBindMode: undefined,
+  brokerageEnabledCondition: 1,
+  brokerageBindMode: 1,
   brokeragePosterUrls: [],
   brokerageFirstPercent: 0,
   brokerageSecondPercent: 0,
   brokerageWithdrawMinPrice: 0,
   brokerageWithdrawFeePercent: 0,
   brokerageFrozenDays: 0,
-  brokerageWithdrawTypes: []
+  brokerageWithdrawTypes: [3, 4]
 })
 const formRules = reactive({
   deliveryExpressFreePrice: [{ required: true, message: '满额包邮不能为空', trigger: 'blur' }],