From d3af08d65365c33790a2ec9dc11ff8b297c6cbb6 Mon Sep 17 00:00:00 2001
From: Shaw <shaw_z@hotmail.com>
Date: Tue, 5 Mar 2024 16:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=85=8D=E7=BD=AE=E7=A7=81?=
 =?UTF-8?q?=E9=92=A5=E8=AF=81=E4=B9=A6=E6=98=BE=E7=A4=BA=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E4=B8=AD=E5=BF=83=E5=90=8D=E7=A7=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=81=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=A6=82=E5=86=B5=E5=AD=97=E6=AE=B5=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E3=80=81=E5=88=86=E9=94=80=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributor/product/StoreProductForm.vue  | 23 ++++++++++++++++---
 src/views/mall/member/user/UserDetail.vue     | 16 ++++++-------
 .../discountCoupon/DiscountCouponForm.vue     |  2 +-
 .../merchantDetails/MerchantDetailsForm.vue   |  9 ++++----
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/views/distributor/product/StoreProductForm.vue b/src/views/distributor/product/StoreProductForm.vue
index 7438e1c..a7b9cc7 100644
--- a/src/views/distributor/product/StoreProductForm.vue
+++ b/src/views/distributor/product/StoreProductForm.vue
@@ -163,6 +163,9 @@
 </template>
 <script setup lang="ts">
 import * as StoreProductApi from '@/api/mall/product/product'
+import {getDistributionDictConfig} from "@/api/system/dict/dict.type";
+import {DICT_TYPE} from "@/utils/dict";
+import {ref} from "vue";
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -293,6 +296,7 @@ const open = (type: string, id?: number) => {
   } else {
     id = 0
   }
+  getOptionConfig()
   getInfo(id)
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -301,7 +305,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   // 校验表单
-  if (!formRef) return
+  if (!formRef.value) return
  // const valid = await formRef.value.validate()
   formRef.value.validate((valid, fields) => {
   if (valid) {
@@ -349,11 +353,10 @@ console.log(formValidate.value, 'formValidate.value')
 const switchingRules = () => {
   if (!formValidate.value.distributionRule) {
     formValidate.value.distributionProductSettlement = 1
-    formValidate.value.distributionPurchase = 0
+    formValidate.value.distributionPurchase = findOptionConfig(DICT_TYPE.DISTRIBUTOR_PURCHASE).value === '0' ? 0 : 1;
     formValidate.value.distributionWagesSettlement = 0
     formValidate.value.distributionLevel = undefined
   }
-  console.log(formValidate.value.distributionRule, 'distributionRule')
 }
 /** 重置表单 */
 const resetForm = () => {
@@ -529,6 +532,20 @@ const validateDetails = (arr) => {
   // 验证全部通过，返回 true
   return true;
 };
+const configList = ref([])
+async function getOptionConfig(){
+  try {
+    configList.value = await getDistributionDictConfig();
+    if (formValidate.value.distributionRule === 0) {
+      formValidate.value.distributionPurchase = findOptionConfig(DICT_TYPE.DISTRIBUTOR_USER_EXPIRE).value === '0' ? 0 : 1;
+    }
+  } finally {
+  }
+}
+
+function findOptionConfig(key:string):any{
+  return configList.value.find((item:any) => item.dictType === key)
+}
 
 </script>
 
diff --git a/src/views/mall/member/user/UserDetail.vue b/src/views/mall/member/user/UserDetail.vue
index a248732..ce5df53 100644
--- a/src/views/mall/member/user/UserDetail.vue
+++ b/src/views/mall/member/user/UserDetail.vue
@@ -12,15 +12,15 @@
             <el-descriptions-item label="身份证号码">{{ DetailData.cardId }}</el-descriptions-item>
           </el-descriptions>
           <el-descriptions title="用户概况" :column="2">
-            <el-descriptions-item label="积分">{{ DetailData.integral }}</el-descriptions-item>
-            <el-descriptions-item label="佣金金额">{{ DetailData.brokeragePrice }}</el-descriptions-item>
-            <el-descriptions-item label="连续签到天数">{{ DetailData.signNum }}</el-descriptions-item>
+<!--            <el-descriptions-item label="积分">{{ DetailData.integral }}</el-descriptions-item>-->
+<!--            <el-descriptions-item label="佣金金额">{{ DetailData.brokeragePrice }}</el-descriptions-item>-->
+<!--            <el-descriptions-item label="连续签到天数">{{ DetailData.signNum }}</el-descriptions-item>-->
             <el-descriptions-item label="登录ip">{{ DetailData.loginIp }}</el-descriptions-item>
-            <el-descriptions-item label="等级">{{ DetailData.level }}</el-descriptions-item>
-            <el-descriptions-item label="推广id">{{ DetailData.spreadUid }}</el-descriptions-item>
-            <el-descriptions-item label="购买次数">{{ DetailData.payCount }}</el-descriptions-item>
-            <el-descriptions-item label="下级人数">{{ DetailData.spreadCount }}</el-descriptions-item>
-            <el-descriptions-item label="登陆类型">{{ DetailData.loginType }}</el-descriptions-item>
+<!--            <el-descriptions-item label="等级">{{ DetailData.level }}</el-descriptions-item>-->
+<!--            <el-descriptions-item label="推广id">{{ DetailData.spreadUid }}</el-descriptions-item>-->
+<!--            <el-descriptions-item label="购买次数">{{ DetailData.payCount }}</el-descriptions-item>-->
+<!--            <el-descriptions-item label="下级人数">{{ DetailData.spreadCount }}</el-descriptions-item>-->
+<!--            <el-descriptions-item label="登陆类型">{{ DetailData.loginType }}</el-descriptions-item>-->
             <el-descriptions-item label="注册时间">{{ formatDate(DetailData.createTime) }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>
diff --git a/src/views/mall/product/discountCoupon/DiscountCouponForm.vue b/src/views/mall/product/discountCoupon/DiscountCouponForm.vue
index fb9fb84..f2be633 100644
--- a/src/views/mall/product/discountCoupon/DiscountCouponForm.vue
+++ b/src/views/mall/product/discountCoupon/DiscountCouponForm.vue
@@ -11,7 +11,7 @@
       <el-row :gutter="24" type="flex">
         <el-col :xl="18" :lg="18" :md="18" :sm="24" :xs="24">
           <el-form-item label="优惠券名称：" prop="couponName">
-            <el-input type="text" placeholder="请输入优惠券名称" v-model="formData.couponName"/>
+            <el-input type="text" placeholder="请输入优惠券名称" :maxlength="32" show-word-limit	v-model="formData.couponName"/>
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/pay/merchantDetails/MerchantDetailsForm.vue b/src/views/pay/merchantDetails/MerchantDetailsForm.vue
index 2900f3e..1e5b1b3 100644
--- a/src/views/pay/merchantDetails/MerchantDetailsForm.vue
+++ b/src/views/pay/merchantDetails/MerchantDetailsForm.vue
@@ -42,9 +42,9 @@
           <el-option label="URL" value="URL" />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="私钥或私钥证书" prop="keyPrivate">-->
-<!--        <el-input v-model="formData.keyPrivate" placeholder="请输入私钥或私钥证书" />-->
-<!--      </el-form-item>-->
+      <el-form-item label="私钥或私钥证书" prop="keyPrivate">
+        <el-input v-model="formData.keyPrivate" placeholder="请输入私钥或私钥证书" />
+      </el-form-item>
 <!--      <el-form-item label="公钥或公钥证书" prop="keyPublic">-->
 <!--        <el-input v-model="formData.keyPublic" placeholder="请输入公钥或公钥证书" />-->
 <!--      </el-form-item>-->
@@ -125,7 +125,8 @@ 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' }],
+  keyPrivate: [{ required: true, message: '请输入私钥或私钥证书', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref