Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3

src/views/mall/product/category/CategoryForm.vue

@@ -62,8 +62,10 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
+  parentId: 0, // root parent id
   name: '',
   picUrl: '',
+  sort: 0,
   status: CommonStatusEnum.ENABLE
 })
 const formRules = reactive({
@@ -126,8 +128,10 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
+    parentId: 0, // root parent id
     name: '',
     picUrl: '',
+    sort: 0,
     status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()

src/views/mall/product/spu/form/InfoForm.vue

@@ -18,14 +18,14 @@
         v-model="formData.categoryId"
         :options="categoryList"
         :props="defaultProps"
-        class="w-80"
+        class="w-80!"
         clearable
         filterable
         placeholder="请选择商品分类"
       />
     </el-form-item>
     <el-form-item label="商品品牌" prop="brandId">
-      <el-select v-model="formData.brandId" class="w-80" placeholder="请选择商品品牌">
+      <el-select v-model="formData.brandId" class="w-80!" placeholder="请选择商品品牌">
         <el-option
           v-for="item in brandList"
           :key="item.id"

src/views/pay/app/components/channel/WalletChannelForm.vue

@@ -50,7 +50,7 @@ const formData = ref<any>({
   feeRate: 0,
   remark: '',
   config: {
-    name: 'mock-conf'
+    name: 'wallet-conf'
   }
 })
 const formRules = {
@@ -114,7 +114,7 @@ const resetForm = (appId, code) => {
     remark: '',
     feeRate: 0,
     config: {
-      name: 'mock-conf'
+      name: 'wallet-conf'
     }
   }
   formRef.value?.resetFields()

src/views/pay/app/index.vue

@@ -361,7 +361,7 @@ const openChannelForm = async (row, payCode) => {
     mockFormRef.value.open(row.id, payCode)
   }
   if (payCode.indexOf('wallet') === 0) {
-    mockFormRef.value.open(row.id, payCode)
+    walletFormRef.value.open(row.id, payCode)
   }
 }