From 8d4a4ac151db27dfb5f8e1323f636dd47f27a7da Mon Sep 17 00:00:00 2001
From: Shaw <shaw_z@hotmail.com>
Date: Thu, 29 Feb 2024 19:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E7=AD=89=E7=BA=A7=E3=80=81?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE=E3=80=81=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distributor/level/levelForm.vue     |  6 ++---
 src/views/mall/product/storeProduct/form.vue  |  2 ++
 .../mall/shopAssistant/ShopAssistantForm.vue  |  2 ++
 .../merchantDetails/MerchantDetailsForm.vue   |  6 ++---
 src/views/system/user/index.vue               | 24 +++++++++----------
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/views/distributor/level/levelForm.vue b/src/views/distributor/level/levelForm.vue
index 4a1e661..a481e81 100644
--- a/src/views/distributor/level/levelForm.vue
+++ b/src/views/distributor/level/levelForm.vue
@@ -187,7 +187,7 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
             <el-input-number
               v-model="formData.userCount"
               :min="0"
-              :max="99.99"
+              :max="999999999"
               :step="1"
               :precision="0"
               controls-position="right"
@@ -202,7 +202,7 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
             <el-input-number
               v-model="formData.amount"
               :min="0"
-              :max="99.99"
+              :max="999999999"
               :step="1"
               :precision="0"
               controls-position="right"
@@ -217,7 +217,7 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
             <el-input-number
               v-model="formData.wages"
               :min="0"
-              :max="99.99"
+              :max="999999999"
               :step="1"
               :precision="0"
               controls-position="right"
diff --git a/src/views/mall/product/storeProduct/form.vue b/src/views/mall/product/storeProduct/form.vue
index 345de4c..c81bad0 100644
--- a/src/views/mall/product/storeProduct/form.vue
+++ b/src/views/mall/product/storeProduct/form.vue
@@ -275,6 +275,8 @@ const submitForm = async () => {
       return message.warning('请选择运费模板！');
     }
     await StoreProductApi.createStoreProduct(formValidate.value)
+    message.success('保存成功！')
+    router.push({path:'/mall/product/store-product'})
   } finally {
     formLoading.value = false
   }
diff --git a/src/views/mall/shopAssistant/ShopAssistantForm.vue b/src/views/mall/shopAssistant/ShopAssistantForm.vue
index d70ffb1..e19fc50 100644
--- a/src/views/mall/shopAssistant/ShopAssistantForm.vue
+++ b/src/views/mall/shopAssistant/ShopAssistantForm.vue
@@ -67,6 +67,8 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await ShopAssistantApi.getShopAssistant(id)
+      getUserId(formData.value.nickname)
+      getStoreList(formData.value.storeName)
     } finally {
       formLoading.value = false
     }
diff --git a/src/views/pay/merchantDetails/MerchantDetailsForm.vue b/src/views/pay/merchantDetails/MerchantDetailsForm.vue
index 2d3b79d..2900f3e 100644
--- a/src/views/pay/merchantDetails/MerchantDetailsForm.vue
+++ b/src/views/pay/merchantDetails/MerchantDetailsForm.vue
@@ -21,7 +21,7 @@
       <el-form-item label="支付id" prop="detailsId">
         <el-input :disabled="disabled" v-model="formData.detailsId" placeholder="请输入支付id" />
       </el-form-item>
-      <el-form-item label="标题" prop="detailsId">
+      <el-form-item label="标题" prop="title">
         <el-input v-model="formData.title" placeholder="请输入标题" />
       </el-form-item>
       <el-form-item label="应用id" prop="appid">
@@ -61,7 +61,7 @@
         <el-input v-model="formData.returnUrl" placeholder="请输入同步回调地址，大部分用于付款成功后页面转跳" />
       </el-form-item>
       <el-form-item label="签名方式" prop="signType">
-        <el-select v-model="formData.signType" placeholder="请选择签名方式MD5,RSA等等">
+        <el-select v-model="formData.signType" placeholder="请选择签名方式">
           <el-option label="RSA" value="RSA" />
           <el-option label="RSA2" value="RSA2" />
           <el-option label="MD5" value="MD5" />
@@ -125,7 +125,7 @@ const formRules = reactive({
   title: [{ required: true, message: '标题不能为空', trigger: 'change' }],
   signType: [{ required: true, message: '请选择签名方式', trigger: 'change' }],
   notifyUrl: [{ required: true, message: '异步回调地址不能为空', trigger: 'blur' }],
-  mchId: [{ required: true, message: '微信商户ID不能为空', trigger: 'blur' }]
+  mchId: [{ required: true, message: '微信商户id不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 561ecda..1113a06 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -71,14 +71,14 @@
             >
               <Icon icon="ep:plus" /> 新增
             </el-button>
-            <el-button
-              type="warning"
-              plain
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >
-              <Icon icon="ep:upload" /> 导入
-            </el-button>
+<!--            <el-button-->
+<!--              type="warning"-->
+<!--              plain-->
+<!--              @click="handleImport"-->
+<!--              v-hasPermi="['system:user:import']"-->
+<!--            >-->
+<!--              <Icon icon="ep:upload" /> 导入-->
+<!--            </el-button>-->
             <el-button
               type="success"
               plain
@@ -260,10 +260,10 @@ const openForm = (type: string, id?: number) => {
 }
 
 /** 用户导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
+// const importFormRef = ref()
+// const handleImport = () => {
+//   importFormRef.value.open()
+// }
 
 /** 修改用户状态 */
 const handleStatusChange = async (row: UserApi.UserVO) => {