支付配置私钥证书显示、优惠券中心名称优化、用户管理用户概况字段隐藏、分销规则配置问题

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>
 

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.integral }}</el-descriptions-item>-->
-            <el-descriptions-item label="佣金金额">{{ DetailData.brokeragePrice }}</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.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="等级">{{ DetailData.level }}</el-descriptions-item>-->
-            <el-descriptions-item label="推广id">{{ DetailData.spreadUid }}</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.payCount }}</el-descriptions-item>-->
-            <el-descriptions-item label="下级人数">{{ DetailData.spreadCount }}</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.loginType }}</el-descriptions-item>-->
             <el-descriptions-item label="注册时间">{{ formatDate(DetailData.createTime) }}</el-descriptions-item>
           </el-descriptions>
         </el-tab-pane>

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>

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-form-item label="私钥或私钥证书" prop="keyPrivate">
-<!--        <el-input v-model="formData.keyPrivate" placeholder="请输入私钥或私钥证书" />-->
+        <el-input v-model="formData.keyPrivate" placeholder="请输入私钥或私钥证书" />
-<!--      </el-form-item>-->
+      </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