fix:"优化注册账号功能"

src/assets/language/en.json

@@ -1413,9 +1413,9 @@
     "R0006": "Verification code error",
     "R0008": "The verification code does not exist",
     "R0009": "Do not send frequently, try again in 10 minutes",
-    "A0201": "Email not registered",
+    "A0201": "The account name already exists",
     "A0202": "The user's mobile phone already exists",
-    "A0203": "The phone number is not registered",
+    "A0203": "The user's mobile phone or email address already exists",
     "A0207": "The user mailbox already exists"
   },
   "robotRanking": {

src/assets/language/ja.json

@@ -1429,9 +1429,9 @@
         "R0006": "認証コードエラー",
         "R0008": "認証コードが存在しません",
         "R0009": "頻繁に送信せず、10分後に再試行してください",
-        "A0201": "メールボックスは登録されていません",
+        "A0201": "口座名は既に存在します",
         "A0202": "ユーザーの携帯電話はすでに存在します",
-        "A0203": "携帯番号未登録",
+        "A0203": "携帯電話やメールアドレスが登録されています",
         "A0207": "ユーザーメールボックスはすでに存在します"
     },
     "robotRanking": {

src/assets/language/zh.json

@@ -1483,9 +1483,9 @@
     "R0006": "验证码错误",
     "R0008": "验证码不存在",
     "R0009": "请勿频繁发送, 10分钟后再试",
-    "A0201": "邮箱未注册",
+    "A0201": "用户登录名已存在",
     "A0202": "用户手机已存在",
-    "A0203": "手机号未注册",
+    "A0203": "用户手机/邮箱已存在",
     "A0207": "用户邮箱已存在"
   },
   "robotRanking": {

src/components/commom/kDialog/index.less

@@ -22,13 +22,13 @@
       }
 
       .block6 {
-        margin: 20px 30px;
+        margin: 20px 35px;
 
         .mod7 {
           border-radius: 20px;
-          height: 30px;
-          padding: 0 20px;
-          width: 60px;
+          // height: 30px;
+          padding: 8px 20px;
+          // width: 55px;
           justify-content: center;
           align-items: center;
           border: 1px solid rgba(77, 106, 221, 1);
@@ -45,9 +45,9 @@
 
         .mod8 {
           border-radius: 20px;
-          height: 30px;
-          padding: 0 20px;
-          width: 60px;
+          // height: 30px;
+          padding: 8px 25px;
+          // width: 70px;
           justify-content: center;
           align-items: center;
           background-color: rgba(77, 106, 221, 1);

src/components/dateOrderList/index.vue

@@ -15,7 +15,7 @@
           <div class="block3 flex-col"></div>
         </div>
         <!-- 日期选择 -->
-        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :show-confirm="false"
+        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :max-range="31"
           :allow-same-day="true" :min-date="minDate" :max-date="maxDate" @confirm="calendarConfirm" />
         <!-- 选择统计类型 -->
         <van-popup v-model:show="timeTypeShow" position="bottom">
@@ -71,7 +71,7 @@ export default {
     // 其他时间日期组件确认返回
     const calendarConfirm = (data) => {
       calendarShow.value = false;
-      console.log(data);
+      // console.log(data);
       calendarDate = data;
       outputDate();
     };
@@ -180,8 +180,8 @@ export default {
         } else if (chartType.value == '3') {
           // 按年统计
           params.chartType = "year";
-          startTime = new Date(monthDate.value[0] + '-01-01');
-          endTime = new Date(monthDate.value[0] + '-12-31');
+          startTime = new Date(yearDate.value[0] + '-01-01');
+          endTime = new Date(yearDate.value[0] + '-12-31');
           params.startDate =
             dateUtil.formateDate(startTime, "yyyy-MM-dd") + " 00:00:00";
           params.endDate =
@@ -201,7 +201,7 @@ export default {
       { text: t('dateSelectList.yearType'), value: "3" },
     ];
     const timeTypeConfirm = ({ selectedOptions }) => {
-      console.log('selectedOptions[0].text', selectedOptions[0].value);
+      // console.log('selectedOptions[0].text', selectedOptions[0].value);
       // 按日统计
       chartType.value = selectedOptions[0].value;
       if (selectedOptions[0].value == '1') {

src/components/dateSelectList/index.vue

@@ -15,7 +15,7 @@
           <div class="block3 flex-col"></div>
         </div>
         <!-- 日期选择 -->
-        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :show-confirm="false" :max-range="31"
+        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :max-range="186" switch-mode="year-month"
           :allow-same-day="true" :min-date="minDate" :max-date="maxDate" @confirm="calendarConfirm" />
         <!-- 选择统计类型 -->
         <van-popup v-model:show="timeTypeShow" position="bottom">

src/styles/joinpayMch/index.less

@@ -98,7 +98,7 @@
                 content: '*';
                 color: red;
                 position: absolute;
-                left: -6em;
+                left: -.6em;
             }
         }
     }
@@ -111,7 +111,7 @@
         display: block;
         border-bottom: 1px solid #ebedf0;
         transform: scaleY(.5);
-        margin: 0 15px;
+        margin: 0 1px;
     }
 
 

src/styles/robotRanking/index.less

@@ -108,7 +108,6 @@ button:active {
 .robotRanking {
     background-color: #fff;
     width: 100%;
-    // height: calc(100vh - 100px);
 
 
     .box1 {

src/views/accountPer/add.vue

@@ -11,6 +11,7 @@
         <van-field v-model="password" name="password" type="password" :label="$t('accountPer.passwordLabel')"
           :placeholder="passwordPlaceholder" :rules="[
             { required: havePassword, message: $t('accountPer.passwordPlaceholder') },
+            { pattern: passwordPattern, message: $t('register.passwordPattern') }
           ]" />
         <van-field v-model="name" name="name" :label="$t('accountPer.nameLabel')"
           :placeholder="$t('accountPer.namePlaceholder')" :rules="[
@@ -114,6 +115,7 @@ export default {
       equipmentIdText.value = selectedOptions[0].text;
     };
     const passwordPlaceholder = ref("");
+    const passwordPattern = ref(/^$/);
     const havePassword = ref(true);
     const isUserName = ref(false);
     let addParams = reactive({
@@ -148,9 +150,11 @@ export default {
         addParams.equipmentIds = accoutPerSet.equipmentIds;
         havePassword.value = false;
         passwordPlaceholder.value = t('accountPer.editPasswordPlaceholder')
+        passwordPattern.value = /^$/;
       } else {
         pageTitle.value = t("accountPer.addAccount");
-        passwordPlaceholder.value = t('accountPer.passwordPlaceholder');
+        passwordPlaceholder.value = t('register.passwordPlaceholder');
+        passwordPattern.value = /^(?=.*[a-zA-Z])(?=.*\d).{10,}$/;
         havePassword.value = true;
       }
       getSysRoleListFun();
@@ -174,7 +178,6 @@ export default {
     };
 
     const searchEquData = (e) => {
-      // console.log("设备列表", e);
       selEquipOptions.value = e;
     }
     // 获取机器下拉
@@ -208,14 +211,15 @@ export default {
 
     const onSubmit = async () => {
       let params = { adminId: user.id };
+      if (addParams.username ==='admin') {
+        showFailToast(t('register.A0201'));
+        return false;
+      }
       params = Object.assign({ adminId: user.id }, addParams);
       if (params.password !== "") {
         params.password = md5(params.password);
       }
       params.roleList = [params.roleList];
-      // if (params.equipmentIds !== 'all') {
-      //   params.equipmentIds= [params.equipmentIds];
-      // }
       if (pageTitle.value === t("accountPer.modifyAccount")) {
         // delete params.password;
         const { data } = await updataLoginUser(params);
@@ -226,7 +230,6 @@ export default {
         } else {
           showFailToast(t("accountPer.failedToModifyTheAccount"), data.message);
         }
-        console.log("onSubmit", data);
       } else {
         const { data } = await addLoginUser(params);
         if (data.code === "00000") {
@@ -238,7 +241,6 @@ export default {
         } else {
           showFailToast(t("accountPer.failedToAddAccount"), data.message);
         }
-        console.log("onSubmit", data);
       }
     };
     const deleteLoginUserFun = async () => {
@@ -272,16 +274,6 @@ export default {
       console.log("e", e);
       console.log("e1", e1);
       if (e.length > 0) {
-        // const list = [];
-        // // 根据id找到对应的name
-        // selEquipOptions.value.forEach(item => {
-        //   e.forEach(item1 => {
-        //     if (item.id === item1) {
-        //       list.push(item.name);
-        //     }
-        //   })
-        // })
-        // console.log("list", list)
         cofficentForm.value.equipmentNames = e.join(",");
         addParams.equipmentIds = e1.join(",");
         console.log("equipmentNames", cofficentForm.value.equipmentNames);
@@ -313,6 +305,7 @@ export default {
       busiEquipInpClk,
       havePassword,
       passwordPlaceholder,
+      passwordPattern,
       isUserName,
       searchEquData,
     };

src/views/device/deviceOper.vue

@@ -111,7 +111,7 @@
         <div class="operText">{{ $t("device.timeSwitch") }}</div>
       </div>
       <!-- 音量调节 -->
-      <div class="operItem" @click="modulation()" v-if="device.equimentType != 'SI320'">
+      <div class="operItem" @click="modulation()" v-if="device.equimentType != 'SI320' || user.id == 31">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/modulation.png" />
         </div>

src/views/device/index.vue

@@ -214,7 +214,7 @@
         showDateTime(item.lastUpdateTime)
       }}</span>
                   <!-- 音量 -->
-                  <span v-if="item.machineType != '2'" class="contentWord kBordBott">{{ $t("device.volume") }}：{{
+                  <span v-if="item.machineType != '2' || user.id == 31" class="contentWord kBordBott">{{ $t("device.volume") }}：{{
         item.volume }}</span>
                   <!-- 报警内容 -->
                   <div class="alert-item kBordBott" v-for="itemAlarm in item.alarmList" :key="itemAlarm">

src/views/orderCenter/orderSearch.vue

@@ -48,7 +48,7 @@
         @confirm="endDateConFirm($event)" @cancel="endDateCancel()" :min-date="minDate" :max-date="maxDate" />
     </van-popup>
     <van-calendar color="#4d6add" v-model:show="showOrderDate" @confirm="calendarConfirm" type="range"
-      :show-confirm="false" :allow-same-day="true" :min-date="minDate" :max-date="maxDate" :max-range="31" />
+       :allow-same-day="true" :min-date="minDate" :max-date="maxDate" :max-range="31" />
   </div>
 </template>
 
@@ -87,8 +87,6 @@ export default {
       queryDateValue.value = dateUtil.formateDate(value[0], "yyyy/MM/dd") + "——" + dateUtil.formateDate(value[1], "yyyy/MM/dd");
       startDate.value = dateUtil.formateDate(value[0], "yyyy-MM-dd") + " 00:00:00";
       endDate.value = dateUtil.formateDate(value[1], "yyyy-MM-dd") + " 23:59:59";
-
-      console.log(startDate, endDate);
     }
 
 

src/views/orderExport/index.vue

@@ -20,6 +20,10 @@
             <span class="o-mr-6 c-text-13 c-text-color">{{ $t("orderExport.groupType") }}:</span>
             <kTabs @tabchg="tabChg" :tabList="tabList"></kTabs>
           </div>
+          <div class="l-f l-flex-e o-plr-15 o-pt-10">
+            <span class="o-mr-6 c-text-13 c-text-color">用户类型:</span>
+            <kTabs @tabchg="userType" :tabList="userTypeList"></kTabs>
+          </div>
           <div class="mod7 flex-col">
             <div class="box1 flex-col justify-between">
               <div class="group4 l-flex-between">
@@ -96,7 +100,7 @@
             :label="$t('orderExport.searchPop.orderNo')" />
           <van-field v-if="packetType == '0'" clearable v-model="searchForm.busiName" :placeholder="$t('orderExport.searchPop.busiNamePlace')"
             :label="$t('orderExport.searchPop.busiName')" />
-          <van-field @click-input="changeTypeInpClk" readonly clearable v-model="searchForm.ifForeignName"
+          <!-- <van-field @click-input="changeTypeInpClk" readonly clearable v-model="searchForm.ifForeignName"
             :placeholder="$t('orderExport.searchPop.mainOverPlace')" :label="$t('orderExport.searchPop.mainOver')">
             <template #right-icon>
               <div class="l-flex-RC">
@@ -105,7 +109,7 @@
                 <van-icon @click="changeTypeInpClk" name="arrow-down" />
               </div>
             </template>
-          </van-field>
+          </van-field> -->
           <van-field v-if="isAdmin()" @click-input="companyTypeInpClk" readonly clearable
             v-model="searchForm.companyTypeName" :placeholder="$t('orderExport.searchPop.companyTypePlaceholder')"
             :label="$t('orderExport.searchPop.companyTypeLabel')">
@@ -358,6 +362,18 @@ export default {
         id: 2,
       },
     ]);
+    const userTypeList = ref([
+    {
+        name: '国内',
+        icon: "",
+        id: 0,
+      },
+      {
+        name: '海外/港澳台',
+        icon: "",
+        id: 1,
+      },
+    ])
     // 公司平台
     const companyTypePopList = [
       {
@@ -377,7 +393,6 @@ export default {
     const tabChg = (e) => {
       pageNo.value = 1;
       pageSize.value = 10;
-      // ruleData.tableData = [];
       tableData.value = [];
       if (e == 0) {
         searchParams.packetType = "0";
@@ -386,6 +401,17 @@ export default {
       }
       getList();
     };
+    const userType = (e) => {
+      pageNo.value = 1;
+      pageSize.value = 10;
+      tableData.value = [];
+      if (e == 0) {
+        searchParams.ifForeign = "0";
+      } else {
+        searchParams.ifForeign = "1";
+      }
+      getList();
+    }
     let searchParams = reactive({
       type: user.type, // 商户类型
       clientId: "", // 设备编号
@@ -401,7 +427,6 @@ export default {
     });
     // 搜索点击
     const searchClick = () => {
-      // console.log("searchClick");
     };
     // 今日、明日、本周、本月、其他时间选择回调
     const update = (uDate) => {
@@ -434,8 +459,6 @@ export default {
         );
       }
       getList();
-      console.log("searchParams的值是 >>>", searchParams);
-      // onRefresh(1);
     };
 
     // 自定义货币符号
@@ -473,7 +496,8 @@ export default {
       pageSize,
       loading,
       finished,
-      // refreshing,
+      userType,
+      userTypeList,
       // onRefresh,
       onLoad,
       getList,

src/views/register.vue

@@ -214,6 +214,10 @@ export default {
         showFailToast(t('register.twoTypedDiff'));
         return false;
       }
+      if (username.value ==='admin') {
+        showFailToast(t('register.A0201'));
+        return false;
+      }
       const { data } = await tAdminSave({
         username: username.value,
         name: name.value,

src/views/robotRanking.vue

@@ -66,16 +66,6 @@
       ref="kDialogRef" @confirmclk="confirmClk">
       <template #content>
         <div class="cust_vantBorder">
-          <!-- <van-field @click-input="busiInpClk" readonly clearable  v-model="searchForm.businessName"
-            :placeholder="$t('subLedgerManage.search.busiPlaceholder')" :label="$t('subLedgerManage.search.business')">
-            <template #right-icon>
-              <div class="l-flex-RC">
-                <van-icon v-if="searchForm.businessName" @click="searchForm.businessName = ''" class="o-mr-6"
-                  name="clear" />
-                <van-icon @click="busiInpClk" name="arrow-down" />
-              </div>
-            </template>
-          </van-field> -->
           <van-field @click-input="changeTypeInpClk" readonly clearable v-model="searchForm.changeTypeName"
             :placeholder="$t('robotRanking.changeTypePlace')" :label="$t('robotRanking.changeType')">
             <template #right-icon>
@@ -145,12 +135,12 @@
     <van-calendar @confirm="(e) => {
       calendarWeekOrMonConfirm(e, 1);
     }
-      " v-model:show="weekShow" :allow-same-day="true" color="#4d6add" :min-date="minDate" :max-date="maxDate" type="range" />
+      " v-model:show="weekShow" :allow-same-day="true" color="#4d6add" :min-date="minDate" :max-date="maxDate" type="range" :max-range="7" />
     <!-- 月的日期选择弹窗 -->
     <van-calendar @confirm="(e) => {
       calendarWeekOrMonConfirm(e, 2);
     }
-      " v-model:show="monthShow" :allow-same-day="true" color="#4d6add" :min-date="minDate" :max-date="maxDate" type="range" />
+      " v-model:show="monthShow" :allow-same-day="true" color="#4d6add" :min-date="minDate" :max-date="maxDate" type="range" :max-range="31" />
     <!-- 年的日期选择弹窗 -->
     <van-popup v-model:show="yearShow" position="bottom">
       <van-picker :title="$t('robotRanking.yearPopTitle')" :columns="yearPopList" :columns-field-names="yearPopFieldName"
@@ -296,8 +286,6 @@ export default {
         moment().year(year).startOf("year").format("YYYY-MM-DD") + " 00:00:00";
       const endDate =
         moment().year(year).endOf("year").format("YYYY-MM-DD") + " 23:59:59";
-      console.log("startDate", startDate);
-      console.log("endDate", endDate);
       getEquipRankList("year", startDate, endDate);
       yearShow.value = false;
     };
@@ -589,19 +577,15 @@ export default {
         switch (chartType) {
           case "day":
             totalObj.dayData = data.data;
-            // console.log("日返回值", data);
             break;
           case "week":
             totalObj.weekData = data.data;
-            // console.log("周返回值", data);
             break;
           case "month":
             totalObj.monthData = data.data;
-            // console.log("月返回值", data);
             break;
           case "year":
             totalObj.yearData = data.data;
-            // console.log("年返回值", data);
             break;
         }
         // 有数据返回则处理
@@ -839,11 +823,9 @@ export default {
     // 筛选弹窗
     // 点击商家输入框
     const busiInpClk = () => {
-      // console.log(111111111);
       busiPopShow.value = true;
     };
     const busiPopConfirm = (e) => {
-      // console.log("e的值是", e);
       busiPopShow.value = false;
       searchForm.businessName = e.name;
     };

src/views/settlement/index.vue

@@ -23,15 +23,6 @@
           <div class="van-cell van-field">
             <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.huifuAuditStatus') }}</span></div>
             <div class="van-cell__value van-field__value" style="text-align: left;">
-              <!-- <span :style="{
-                color: huifuMchID != null ? (huifuAuditStatus == '2' ? (conStat == '5' ? '#00ff80' : '#FFA500') :
-                  (huifuAuditStatus == '0' ? '#FFA500' : (huifuAuditStatus == '1' || huifuAuditStatus == '4' ? '#FFA500' :
-                    '#FF0000'))) : '#FFA500'
-              }">
-                {{ huifuMchID != null ? (huifuAuditStatus == '2' ? (conStat == '5' ? '注册成功' : '待签约') :
-                  (huifuAuditStatus == '0' ? '待上传证件图片' : (huifuAuditStatus == '1' || huifuAuditStatus == '4' ? '待签约' :
-                    '审核未通过'))) : '未注册' }}
-              </span> -->
               <span :style="{
                 color: huifuMchID != null ? (huifuAuditStatus == '2' ? '#00ff80' : (huifuAuditStatus == '0' ? '#FFA500' :
                   (huifuAuditStatus == '1' || huifuAuditStatus == '4' ? '#FFA500' :
@@ -46,7 +37,6 @@
           <div v-if="pageType === '4'">
             <van-field v-model="altMchName" name="altMchName" :label="$t('joinpayMch.merchantNameLabel')" readonly />
             <van-field v-model="altMchNo" name="altMchNo" :label="$t('joinpayMch.merchantAccountLabel')" readonly />
-            <!-- <van-field v-model="altMchShortName" name="altMchShortName" :label="$t('joinpayMch.merchantAbbreviationLabel')" readonly /> -->
           </div>
           <div class="intervalRow"></div>
           <!-- 商户类型 -->
@@ -56,7 +46,6 @@
               <van-radio-group v-model="altMerchantType" direction="horizontal" @change="fieldUpdate"
                 :disabled="huifuMchID != null || joinPayMchID != null">
                 <van-radio name="10" icon-size="18px">{{ $t('joinpayMch.personal') }}</van-radio>
-                <!-- <van-radio name="11" icon-size="18px">{{$t('joinpayMch.individualBusinesses')}}</van-radio> -->
                 <van-radio name="12" icon-size="18px">{{ $t('joinpayMch.enterprise') }}</van-radio>
               </van-radio-group>
             </div>
@@ -75,35 +64,12 @@
                 {{ $t('joinpayMch.merchantNameTips') }}
               </van-popover>
             </div>
-            <!-- 商户简称 -->
-            <!-- <div class="cell-input">
-              <van-popover v-model:show="shortNameVisible" trigger="manual" placement="bottom"
-                popover-class="custom-popover" :offset="[25, 0]" theme="dark">
-                <template #reference>
-                  <van-field v-model="shortNameValue" name="shortNameValue" :label="$t('huifuMch.shortNameLabel')"
-                    :placeholder="$t('huifuMch.shortNamePlaceholder')"
-                    :rules="[{ required: true, message: $t('huifuMch.shortNamePlaceholder') }]"
-                    @update:model-value="fieldUpdate" @click="showPopover(2)" />
-                </template>
-                {{ $t('joinpayMch.merchantAbbreviationTips') }}
-              </van-popover>
-            </div> -->
             <!-- 注册地址 -->
             <van-field v-model="registeredAddress" is-link readonly name="registeredAddress"
               :label="$t('huifuMch.huifuRegisteredAddress')"
               :placeholder="$t('huifuMch.huifuRegisteredAddressPlaceholder')"
               :rules="[{ required: true, message: $t('huifuMch.huifuRegisteredAddressPlaceholder') }]"
               @click="showReAddress = true" />
-            <!-- 成立时间 -->
-            <!-- <van-field v-model="companyFoundDate" readonly name="companyFoundDate"
-              :label="$t('huifuMch.companyFoundDate')" :placeholder="$t('huifuMch.companyFoundDatePlaceholder')"
-              @click="showFoundDate = true"
-              :rules="[{ required: true, message: $t('huifuMch.companyFoundDatePlaceholder') }]" /> -->
-            <!-- 客服电话 -->
-            <!-- <van-field v-model="servicePhoneValue" name="servicePhoneValue" :label="$t('huifuMch.huifuServicePhone')"
-              :placeholder="$t('huifuMch.huifuServicePhonePlaceholder')"
-              :rules="[{ required: true, message: $t('huifuMch.huifuServicePhonePlaceholder') }]"
-              @update:model-value="fieldUpdate" /> -->
           </div>
           <div class="intervalRow"></div>
           <!-- 联系人姓名 -->
@@ -116,11 +82,6 @@
             :label="$t('joinpayMch.cellPhoneLabel')" :placeholder="$t('joinpayMch.cellPhonePlaceholder')"
             :rules="[{ required: true, message: $t('joinpayMch.cellPhonePlaceholder') }]"
             @update:model-value="fieldUpdate" />
-          <!-- 联系人邮箱 -->
-          <!-- <van-field class="requiredLeft" v-model="emailValue" name="emailValue" :label="$t('huifuMch.huifuContactEmail')"
-            :placeholder="$t('huifuMch.huifuContactEmailPlaceholder')"
-            :rules="[{ required: true, pattern: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/, message: $t('huifuMch.huifuContactEmailMessage') }]"
-            @update:model-value="fieldUpdate" /> -->
           <!-- 法人/个人姓名 -->
           <van-field class="requiredLeft" v-model="legalPerson" name="legalPerson"
             :label="$t('joinpayMch.nameOfLegalPerson/IndividualLabel')"
@@ -176,12 +137,6 @@
           <div class="van-cell van-field" v-if="pageType === '4'">
             <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.signingStatus') }}</span></div>
             <div class="van-cell__value van-field__value radioBox" style="display: flex; justify-content: space-around;">
-              <!-- <span
-                :style="{ color: signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? '#00ff80' : (conStat == 5 && huifuAuditStatus == '2' ? '#00ff80' : '#FFA500')) : '#FFA500' }">
-                {{ signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? signStatus : (conStat == 5 &&
-                  huifuAuditStatus == '2' ?
-                  signStatus : '待签约')) : '待签约' }}
-              </span> -->
               <span
                 :style="{ color: signStatus == '签约成功' ? (huifuMchID == null ? '#00ff80' : (huifuAuditStatus == '2' ? '#00ff80' : '#FFA500')) : '#FFA500' }">
                 {{ signStatus == '签约成功' ? (huifuMchID == null ? signStatus : (huifuAuditStatus == '2' ? signStatus :
@@ -213,7 +168,7 @@
             <van-popover v-model:show="popoverVisible" trigger="manual" placement="top" popover-class="custom-popover"
               :offset="[25, 5]" theme="dark">
               <template #reference>
-                <van-field class="custom-input" v-model="bankAccountName" name="bankAccountName"
+                <van-field class="custom-input" v-model="bankAccountName" name="bankAccountName" 
                   :label="$t('joinpayMch.bankAccountNameLabel')"
                   :placeholder="$t('joinpayMch.bankAccountNamePlaceholder')"
                   :rules="[{ required: true, message: $t('joinpayMch.bankAccountNamePlaceholder') }]"
@@ -232,7 +187,6 @@
             :label="$t('huifuMch.huifuBankAddress')" :placeholder="$t('huifuMch.huifuBankAddressPlaceholder')"
             :rules="[{ required: true, message: $t('huifuMch.huifuBankAddressPlaceholder') }]"
             @click="showBankAddress = true" />
-          <!-- <div v-if="bankAccountType === '4'" class="requiredLeft"> -->
           <!-- 联行号 -->
           <van-field v-if="bankAccountType === '4'" class="requiredLeft" v-model="bankChannelNo" name="bankChannelNo"
             :label="$t('joinpayMch.interBankNoLabel')" :placeholder="$t('joinpayMch.interBankNoPlaceholder')"
@@ -278,23 +232,6 @@
               @click="showEndDateLicense = true"
               :rules="[{ required: true, message: $t('huifuMch.endDatePlaceholder') }]" />
           </div>
-          <!-- <div class="intervalRow"></div> -->
-          <!-- 经营范围 -->
-          <!-- <van-field v-model="manageScope" name="manageScope" :label="$t('joinpayMch.natureOfBusinessLabel')"
-            :placeholder="$t('joinpayMch.natureOfBusinessPlaceholder')" @update:model-value="fieldUpdate" />
-          <van-field class="requiredLeft" v-model="manageAddr" is-link readonly name="manageAddr"
-            :label="$t('huifuMch.huifuBusinessAddress')" :placeholder="$t('huifuMch.huifuBusinessAddressPlaceholder')"
-            :rules="[{ required: true, message: $t('huifuMch.huifuBusinessAddressPlaceholder') }]"
-            @click="showArea = true" />
-          <van-field v-if="huifuMchNO != null" v-model="sms" center clearable :label="$t('huifuMch.sms')"
-            class="requiredLeft" :placeholder="$t('huifuMch.smsPlaceholder')"
-            :rules="[{ required: true, message: $t('huifuMch.smsPlaceholder') }]">
-            <template #button>
-              <van-button size="small" type="primary" @click="sendCode()" :disabled="time !== 0" style="padding: 0 1em">
-                {{ time === 0 ? $t('huifuMch.sendSms') : time + $t('huifuMch.replaysInSeconds') }}
-              </van-button>
-            </template>
-          </van-field> -->
           <!-- 操作 -->
           <van-row justify="space-around" v-if="huifuAuditStatus != '4' && huifuAuditStatus != '1'"
             style="padding: 1em; margin: 2em 0;">
@@ -312,10 +249,6 @@
           <van-date-picker :min-date="minDate" :max-date="maxDate" @confirm="onConfirmEndDate"
             @cancel="showEndDate = false" />
         </van-popup>
-        <van-popup v-model:show="showFoundDate" position="bottom">
-          <van-date-picker :min-date="minDate" :max-date="maxDate" @confirm="onConfirmFoundDate"
-            @cancel="showFoundDate = false" />
-        </van-popup>
         <van-popup v-model:show="showEndDateLicense" position="bottom">
           <van-date-picker :min-date="minDate" :max-date="maxDate" @confirm="onConfirmEndDateLicense"
             @cancel="showEndDateLicense = false" />
@@ -325,9 +258,6 @@
             @cancel="showBeginDateLicense = false" />
         </van-popup>
         <!-- 地址弹窗 -->
-        <van-popup v-model:show="showArea" position="bottom">
-          <van-area :area-list="areaList" @confirm="onConfirm" @cancel="showArea = false" />
-        </van-popup>
         <van-popup v-model:show="showBankAddress" position="bottom">
           <van-area :area-list="areaList" :columns-num="2" @confirm="onConfirmBankAddress"
             @cancel="showBankAddress = false" />
@@ -453,9 +383,12 @@ import { showFailToast, showSuccessToast, showToast, showLoadingToast } from "va
 import { areaList } from "@vant/area-data";
 import {
   getOneJoinPayMch, updateJoinPayMchCheck, altMchSign,
-  sentImage, updateApproveStatus, saveJoinPayMch
+  sentImage, updateApproveStatus, 
+  saveJoinPayMch
 } from '../../service/joinpayMch';
-import { newUploadPic, getHuifuMchCheck, newSaveHuifuMch, updateMerchant, openAccount, sendSms } from "@/service/huifuMch";
+import { newUploadPic, getHuifuMchCheck, 
+  newSaveHuifuMch, updateMerchant, 
+  openAccount, sendSms } from "@/service/huifuMch";
 import { getLoginUser, styleUrl, getLocal, setLocal } from "../../common/js/utils";
 import dateUtil from "../../utils/dateUtil";
 import { useI18n } from "vue-i18n";
@@ -466,24 +399,10 @@ export default {
     // 引入语言
     const { t } = useI18n();
     const user = getLoginUser();
-    const idCardExpiryShow = ref(false);
-    const idCardExpiryOnConfirm = (value) => {
-      idCardExpiryShow.value = false;
-      addParams.idCardExpiry = dateUtil.formateDate(value, "yyyy-MM-dd");
-      fieldUpdate();
-    };
-    const licenseExpiryShow = ref(false);
-    const licenseExpiryOnConfirm = (value) => {
-      licenseExpiryShow.value = false;
-      addParams.licenseExpiry = dateUtil.formateDate(value, "yyyy-MM-dd");
-      fieldUpdate();
-    };
     const showBeginDate = ref(false);
     const showEndDate = ref(false);
     const showBeginDateLicense = ref(false);
     const showEndDateLicense = ref(false);
-    const showFoundDate = ref(false);
-    const showArea = ref(false); // 是否弹窗
     const showBankAddress = ref(false);
     const showReAddress = ref(false);
     const showBankCode = ref(false);
@@ -554,7 +473,6 @@ export default {
       },
     ];
     const bankCodePopConfirm = ({ selectedOptions }) => {
-      console.log(selectedOptions[0])
       addParams.bankCodeValue = selectedOptions[0].value;
       fieldUpdate();
       showBankCode.value = false;
@@ -566,9 +484,7 @@ export default {
     const regNameVisible = ref(false);
     const shortNameVisible = ref(false);
     const popoverVisible = ref(false);
-
     const showPopover = (value) => {
-      console.log(value);
       switch (value) {
         case 1:
           regNameVisible.value = true;
@@ -619,7 +535,6 @@ export default {
       beginDateLicense: '', // 有效期开始日期
       endDateLicense: '', // 有效期截日期
 
-
       settMode: 1, // 结算方式 * 1 由汇聚自动结算 * 2 由商户平台手工结算（结算接口）;	integer(int32)	默认填1
       settDateType: 1, // 结算周期类型 * 1 工作日，2 自然日，3 月结日;	integer(int32)	默认填1
       riskDay: 1, // 结算周期;	integer(int32)	默认填1
@@ -636,7 +551,6 @@ export default {
       type: '0', // 类型 String 必填 企业:type='1'; 个人:type='0'
       regName: '', // 商户名称
       shortName: '', // 商户简称
-      foundDate: '', // 成立时间
       licenseCode: '', // 营业执照编号
       licenseValidityType: "1", // 营业执照有效期类型
       licenseBeginDate: '', // 营业执照有效开始日期
@@ -648,11 +562,7 @@ export default {
       name: '', // 联系人姓名
       phone: '', // 联系人手机号码
       email: '', // 联系人邮箱
-      provId: '', // 省编码
-      areaId: '',  // 省编码
-      districtId: '', // 市编码 
       detailAddr: '', // 经营地址
-      servicePhone: '', // 客服电话
       cardName: '', // 卡户名
       cardType: '1', // 结算账户类型，“0”为对公账户，“1”为个人账户
       cardNo: '', // 银行卡号
@@ -688,7 +598,6 @@ export default {
     const joinPayMchID = ref(null); // 汇聚账号ID
     const huifuMchID = ref(null); //汇付账号ID
     const huifuPicUpStatus = ref(0); // 汇付照片上传状态
-    // let joinPayMchNo = null; // 汇聚商户号
     const huifuMchNO = ref(null); // 汇付商户号
     const approveStatus = ref(null);
     const signStatus = ref(null); // 汇聚签约状态
@@ -697,45 +606,35 @@ export default {
     let isMemoryFormType = false;
 
     // 日期选择
+    // 身份证有效开始日期
     const onConfirmBeginDate = ({ selectedValues }) => {
       addParams.beginDate = selectedValues.join("-");
+      huifuParams.certBeginDate = selectedValues.join("");
       showBeginDate.value = false;
       fieldUpdate();
     };
+    // 身份证有效截止日期
     const onConfirmEndDate = ({ selectedValues }) => {
       addParams.endDate = selectedValues.join("-");
+      huifuParams.certEndDate = selectedValues.join("");
       showEndDate.value = false;
       fieldUpdate();
     };
-    const onConfirmFoundDate = ({ selectedValues }) => {
-      addParams.companyFoundDate = selectedValues.join("-");
-      showFoundDate.value = false;
-      fieldUpdate();
-    };
+    // 营业执照有效开始日期
     const onConfirmEndDateLicense = ({ selectedValues }) => {
       addParams.endDateLicense = selectedValues.join("-");
+      huifuParams.licenseBeginDate = selectedValues.join("");
       showEndDateLicense.value = false;
       fieldUpdate();
     };
+    // 营业执照有效截止日期
     const onConfirmBeginDateLicense = ({ selectedValues }) => {
       addParams.beginDateLicense = selectedValues.join("-");
+      huifuParams.licenseEndDate = selectedValues.join("");
       showBeginDateLicense.value = false;
       fieldUpdate();
     };
     // 地址选择
-    const onConfirm = ({ selectedOptions }) => {
-      console.log(selectedOptions[0].value);
-      showArea.value = false;
-      addParams.manageAddr = (selectedOptions[0]?.text != selectedOptions[1]?.text ? selectedOptions[0]?.text : '')
-        + selectedOptions[1]?.text + selectedOptions[2]?.text;
-      console.log(addParams.manageAddr)
-      huifuParams.provId = selectedOptions[0]?.value || '';
-      huifuParams.areaId = selectedOptions[1]?.value || '';
-      huifuParams.districtId = selectedOptions[2]?.value || '';
-      huifuParams.detailAddr = addParams.manageAddr;
-      fieldUpdate();
-      console.log("huifuMch", huifuParams);
-    };
     const onConfirmBankAddress = ({ selectedOptions }) => {
       showBankAddress.value = false;
       addParams.bankAddress = (selectedOptions[0]?.text != selectedOptions[1]?.text ? selectedOptions[0]?.text : '')
@@ -743,7 +642,6 @@ export default {
       huifuParams.cardProvId = selectedOptions[0]?.value || '';
       huifuParams.cardAreaId = selectedOptions[1]?.value || '';
       fieldUpdate();
-      console.log("huifuMch", huifuParams);
     };
     const onConfirmReAddress = ({ selectedOptions }) => {
       showReAddress.value = false;
@@ -753,19 +651,15 @@ export default {
       huifuParams.regAreaId = selectedOptions[1]?.value || '';
       huifuParams.regDistrictId = selectedOptions[2]?.value || '';
       huifuParams.regDetail = addParams.registeredAddress;
-      // console.log("详细地址", huifuParams.regDetail);
       fieldUpdate();
-      console.log("huifuMch", huifuParams);
     };
     onMounted(async () => {
       styleUrl('joinpayMch');
-      console.log("huifuMch", huifuParams);
       getOneJoinPayMchFun();
       getHuifuMchFun();
       verCodeTime.time = getLocal('registerVerCodeTime');
       if (huifuMchID.value == null) {
         huifuPicUpStatus.value = 1;
-        console.log(huifuPicUpStatus.value);
       }
       if (verCodeTime.time && verCodeTime.time !== '') {
         verCodeTime.time = parseInt(verCodeTime.time);
@@ -779,7 +673,6 @@ export default {
     // 获取汇聚账号回显
     const getOneJoinPayMchFun = async () => {
       const { data } = await getOneJoinPayMch({ adminId: user.id });
-      console.log(data);
       if (data.code === "00000") {
         joinPayMchType.value = data.data.type;
         if (data.data.type === '2' || data.data.type === '3' || data.data.type === '0') {
@@ -793,13 +686,11 @@ export default {
           pageType.value = '4';
           joinPayMchStep.value = '1';
         }
-        console.log('pageType', pageType.value);
         joinPayMchID.value = data.data.id;
         approveStatus.value = data.data.approveStatus;
         signStatus.value = data.data.signStatus;
         addParams.altMchName = data.data.altMchName;
         addParams.altMchNo = data.data.altMchNo;
-        // joinPayMchNo = data.data.altMchNo;
         addParams.altMchShortName = data.data.altMchShortName;
         addParams.altMerchantType = data.data.altMerchantType ? data.data.altMerchantType.toString() : '';
 
@@ -842,12 +733,10 @@ export default {
     // 获取汇付账号回显
     const getHuifuMchFun = async () => {
       const { data } = await getHuifuMchCheck({ adminId: user.id });
-      console.log("huifu", data);
       if (data.code === "00000") {
         if (data.data != null) {
           huifuMchID.value = data.data.id;
           huifuParams.id = data.data.id;
-          console.log("huifuMchID", huifuMchID.value);
           conStat.value = data.data.conStat;
           addParams.altMerchantType = "10";
           addParams.busiContactName = data.data.name;
@@ -861,15 +750,9 @@ export default {
           addParams.emailValue = data.data.email;
           addParams.manageAddr = areaList.province_list[data.data.provId] + areaList.city_list[data.data.areaId] + areaList.county_list[data.data.districtId];
           huifuMchNO.value = data.data.huifuId;
-          // if (huifuMchNO.value != null && conStat.value != "5") {
-          //   changeConStat();
-          // }
           addParams.validityType = data.data.certValidityType;
           addParams.beginDate = dateUtil.formatDate(data.data.certBeginDate);
           addParams.endDate = dateUtil.formatDate(data.data.certEndDate);
-          huifuParams.provId = data.data.provId;
-          huifuParams.areaId = data.data.areaId;
-          huifuParams.districtId = data.data.districtId;
           huifuParams.cardProvId = data.data.cardProvId;
           huifuParams.cardAreaId = data.data.cardAreaId;
           huifuParams.detailAddr = data.data.detailAddr;
@@ -878,7 +761,6 @@ export default {
           if (data.data.cardFrontPic != null && data.data.legalCertBackPic != null && data.data.legalCertFrontPic) {
             huifuPicUpStatus.value = 1;
           }
-          console.log(data.data.cardProvId);
           if (data.data.type === "1") {
             addParams.altMerchantType = "12";
             addParams.regNameValue = data.data.regName;
@@ -888,8 +770,6 @@ export default {
             huifuParams.regProvId = data.data.regProvId;
             huifuParams.regAreaId = data.data.regAreaId;
             huifuParams.regDistrictId = data.data.regDistrictId;
-            addParams.companyFoundDate = dateUtil.formatDate(data.data.foundDate);
-            addParams.servicePhoneValue = data.data.servicePhone;
             addParams.licenseNo = data.data.licenseCode;
             if (data.data.cardType === "0") {
               addParams.bankAccountType = '4';
@@ -907,27 +787,14 @@ export default {
           }
           if (data.data.status === '0') {
             huifuPicUpStatus.value = 0;
-            console.log(huifuPicUpStatus.value)
           }
-          console.log('huifuAuditStatus', huifuAuditStatus.value)
         }
       }
     }
-    // 更新汇付签约状态
-    // const changeConStat = async () => {
-    //   const { data } = await updateConStat(huifuParams);
-    //   if (data.code === "00000") {
-    //     // showSuccessToast(t('joinpayMch.withdrawalSucceeded'));
-    //     if (data.data === "5") {
-    //       location.reload();
-    //     }
-    //   }
-    // }
     // 更新图片审核情况
     const changeApproveStatus = async () => {
       const { data } = await updateApproveStatus({ id: joinPayMchID.value });
       if (data.code === "00000") {
-        // showSuccessToast(t('joinpayMch.withdrawalSucceeded'));
         if (data.data === "P1000") {
           location.reload();
         }
@@ -955,13 +822,11 @@ export default {
       const { data } = await sendSms({
         adminId: user.id,
       });
-      console.log('seedVerCodeSuccess', data);
       if (data.code === '00000') {
         showToast({
           duration: 2000,
           message: t('huifuMch.successSend') + '\n' + maskPhoneNumber(data.data.phone)
         });
-        console.log('seedVerCodeSuccess');
         verCodeTime.time = 60;
         verCodeTimeInterval();
       } else {
@@ -993,32 +858,34 @@ export default {
       params.settDateType = parseInt(params.settDateType);
       addParams.idCardExpiry = addParams.beginDate;
       addParams.licenseExpiry = addParams.beginDateLicense;
+      // 身份证有效期类型
       if (addParams.validityType === '0') {
         addParams.idCardExpiry = addParams.endDate;
       }
+      // 营业执照有效期类型
       if (addParams.validityType1 === '0') {
         addParams.licenseExpiry = addParams.endDateLicense;
       }
-      huifuParams.regName = addParams.legalPerson;
-      huifuParams.name = addParams.legalPerson;
-      huifuParams.phone = addParams.phoneNo;
-      huifuParams.email = addParams.emailValue;
-      huifuParams.cardName = addParams.bankAccountName;
-      huifuParams.cardNo = addParams.bankAccountNo.replace(/\s/g, '');
-      huifuParams.mp = addParams.phoneNo;
-      huifuParams.certNo = addParams.idCardNo;
-      huifuParams.certValidityType = addParams.validityType;
-      huifuParams.certBeginDate = addParams.beginDate.replace(/-/g, "");
-      huifuParams.certEndDate = addParams.endDate.replace(/-/g, "");
+      // 整合汇付参数
+      huifuParams.regName = params.legalPerson;
+      huifuParams.name = params.legalPerson;
+      huifuParams.phone = params.phoneNo;
+      huifuParams.email = params.emailValue;
+      huifuParams.cardName = params.bankAccountName;
+      huifuParams.cardNo = params.bankAccountNo.replace(/\s/g, '');
+      huifuParams.mp = params.phoneNo;
+      huifuParams.certNo = params.idCardNo;
+      huifuParams.certValidityType = params.validityType;
+      // huifuParams.certBeginDate = addParams.beginDate.replace(/-/g, "");
+      // huifuParams.certEndDate = addParams.endDate.replace(/-/g, "");
       if (addParams.altMerchantType === '12') {
         huifuParams.type = '1';
         huifuParams.regName = addParams.regNameValue;
-        huifuParams.foundDate = addParams.companyFoundDate.replace(/-/g, "");
         huifuParams.licenseCode = addParams.licenseNo;
         huifuParams.licenseValidityType = addParams.validityType1;
-        huifuParams.licenseBeginDate = addParams.beginDateLicense.replace(/-/g, "");
-        huifuParams.licenseEndDate = addParams.endDateLicense.replace(/-/g, "");
-        huifuParams.servicePhone = addParams.servicePhoneValue;
+        // huifuParams.licenseBeginDate = addParams.beginDateLicense.replace(/-/g, "");
+        // huifuParams.licenseEndDate = addParams.endDateLicense.replace(/-/g, "");
+        // huifuParams.servicePhone = addParams.servicePhoneValue;
         huifuParams.regDetail = addParams.registeredAddress;
         if (addParams.bankAccountType === '4') {
           huifuParams.cardType = '0';
@@ -1028,8 +895,8 @@ export default {
           huifuParams.certAddress = addParams.certAddressValue
         }
       }
-      console.log("addParams:", addParams);
-      console.log("huifuParams:", huifuParams)
+      // console.log("addParams:", addParams);
+      // console.log("huifuParams:", huifuParams)
       try {
         const { data } = await saveJoinPayMch(addParams);
         if (data.code === "00000") {
@@ -1037,7 +904,6 @@ export default {
           if (huifuMchNO.value == null) {
             huifuMch = await newSaveHuifuMch(huifuParams);
           } else {
-            // huifuMch = await auditMerchantUpdate(huifuParams);
             huifuMch = await updateMerchant(huifuParams);
           }
           if (huifuMch.data.code === "00000") {
@@ -1102,14 +968,12 @@ export default {
           if (huifuMchNO.value == null) {
             response = await openAccount({ id: huifuMchID.value });
             if (response.data.code === "00000") {
-              console.log("response", response);
               loadingUp.close();
               showSuccessToast(t('joinpayMch.uploadSucceeded'));
               setTimeout(() => {
                 location.reload();
               }, 1500);
             } else {
-              console.log("response", response);
               loadingUp.close();
               showFailToast(`${response.data.message}`);
             }
@@ -1133,12 +997,9 @@ export default {
     }
     // 签约触发
     const altMchSignFun = async () => {
-      console.log("joinPayMchID", joinPayMchID.value);
-      console.log("huifuMchID", huifuMchID.value);
       try {
         const { data } = await altMchSign({ id: joinPayMchID.value });
         if (data.code === "00000") {
-          console.log(huifuAuditStatus.value);
           let huifuMch = await openAccount({ id: huifuMchID.value });
           if (huifuMch.data.code === "00000") {
             showSuccessToast(t('joinpayMch.signingSuccessfully'));
@@ -1158,7 +1019,6 @@ export default {
     }
     // 记录表单填写
     const fieldUpdate = () => {
-      // console.log('fieldUpdate');
       if (addParams.altMerchantType === '10') {
         addParams.bankAccountType = '1';
       }
@@ -1193,7 +1053,6 @@ export default {
           params.fileType = "F02";
         }
         try {
-          console.log(params.fileType);
           const { data } = await newUploadPic(params);
           if (data.code == "00000") {
             file.status = 'done';
@@ -1216,7 +1075,6 @@ export default {
           params.fileType = "F03";
         }
         try {
-          console.log(params.fileType);
           const { data } = await newUploadPic(params);
           if (data.code == "00000") {
             file.status = 'done';
@@ -1235,7 +1093,6 @@ export default {
         params.base64Str = statementCard.value[0].content;
         params.fileType = "F13";
         try {
-          console.log(params.fileType);
           const { data } = await newUploadPic(params);
           if (data.code == "00000") {
             file.status = 'done';
@@ -1329,10 +1186,6 @@ export default {
       conStat,
       updateSentImage,
       altMchSignFun,
-      idCardExpiryShow,
-      idCardExpiryOnConfirm,
-      licenseExpiryShow,
-      licenseExpiryOnConfirm,
       fieldUpdate,
       afterRead,
       deleteCertFront,
@@ -1353,12 +1206,8 @@ export default {
       bankCodePopConfirm,
       areaList,
       onConfirmBankAddress,
-      showArea,
-      onConfirm,
       showReAddress,
       onConfirmReAddress,
-      showFoundDate,
-      onConfirmFoundDate,
       showBeginDateLicense,
       showEndDateLicense,
       onConfirmEndDateLicense,