浏览代码

feat:“同步2025.01.14“

soobin 7 月之前
父节点
当前提交
8694090211

+ 1 - 1
package.json

@@ -30,7 +30,7 @@
     "pushstate-server": "^3.1.0",
     "qrcode-terminal": "^0.12.0",
     "qs": "^6.11.0",
-    "vant": "^4.8.0",
+    "vant": "^4.9.0",
     "vue": "^3.0.0",
     "vue-i18n": "^9.1.10",
     "vue-router": "^4.0.0-beta.13",

+ 21 - 20
src/assets/language/en.json

@@ -28,13 +28,13 @@
     "allDevices": "All devices",
     "commodityType": "Commodity type",
     "machineType": "Machine type",
-    "whole": "whole",
+    "whole": "All",
     "noPaymentRequired": "No payment required",
     "coin": "Coin",
-    "notes": "Notes",
-    "coinsNotes": "Coins+notes",
+    "notes": "Cash",
+    "coinsNotes": "Coins + Cash",
     "creditCard": "Credit Card",
-    "electronicPayment": "electronic payment",
+    "electronicPayment": "Electronic payment",
     "mainSweepOfAlipay": "Main sweep of Alipay",
     "weChatScanning": "WeChat scanning",
     "antiScanningOfAlipay": "Anti scanning of Alipay",
@@ -458,10 +458,10 @@
     "notSleeping": "Not sleeping",
     "lastRefreshTime": "Recent refresh time",
     "machineUniqueCode": "Machine Code",
-    "stirringTemperature": "Temperature two",
-    "cornGeneratorTemperature": "Temperature one",
+    "stirringTemperature": "Stirring temperature",
+    "cornGeneratorTemperature": "Corn generator temperature",
     "cupQuantity": "Cup quantity",
-    "bucketWeight": "Sugar bucket weight",
+    "bucketWeight": "Sugar oil weight",
     "numberOneTm": "NO.1000",
     "candyGeneratorTm": "Generator temperature",
     "outsideTm": "Outside temperature",
@@ -986,11 +986,12 @@
     "orderNoPlaceholder": "Please enter the order number",
     "orderSerialNumberLabel": "Order serial number",
     "orderSerialNumberPlaceholder": "Please enter the order serial number",
-    "equipmentNoPlaceholder": "Please enter the full Machine number",
+    "equipmentNoPlaceholder": "Please enter the Machine number",
     "searchCriteria": "Please enter search criteria",
     "searchDate": "Please enter the specified order date, no more than six months",
     "searchDateTips": "No more than half a year",
     "orderDate": "Order Date",
+    "orderDatePlaceholder": "Click to select a date range",
     "startTime": "start time",
     "to": "to",
     "endTime": "End time",
@@ -1397,9 +1398,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": {
@@ -1581,16 +1582,16 @@
     "M307": "Mixer motor"
   },
   "popParams": {
-    "D460": "NO.1095",
-    "D492": "NO.1091",
-    "D493": "NO.1092",
-    "D494": "NO.1093",
-    "D495": "NO.1094",
-    "D208": "NO.1084",
-    "D249": "NO.1034",
-    "D346": "NO.1052",
-    "D497": "NO.1096",
-    "D344": "NO.1083",
+    "D460": "Sugar drop factor",
+    "D492": "Chocolate factor",
+    "D493": "Caramel factor",
+    "D494": "Peach factor",
+    "D495": "Blueberry factor",
+    "D208": "Only X cups with remaining corn",
+    "D249": "Keep heating for X seconds after the first one pops",
+    "D346": "Max gen temp during making",
+    "D497": "Close door time after pickup",
+    "D344": "Blow cold air time",
     "M559": "Block the sugar shortage alarm",
     "M566": "Shield insulation heating wire fault alarm",
     "M568": "Shield generator air pump alarm",

+ 17 - 16
src/assets/language/ja.json

@@ -467,10 +467,10 @@
         "furnaceHeadTemperature": "釜の温度",
         "temperatureInCabinet": "内部温度",
         "humidityInCabinet": "内部湿度",
-        "stirringTemperature": "温度2です",
-        "cornGeneratorTemperature": "温度1です",
+        "stirringTemperature": "攪拌温度",
+        "cornGeneratorTemperature": "発生器温度",
         "cupQuantity": "カップの残量",
-        "bucketWeight": "砂糖の重さです",
+        "bucketWeight": "砂糖の重さです",
         "numberOneTm": "NO.1000",
         "candyGeneratorTm": "ジェネレーター温度",
         "outsideTm": "外部温度",
@@ -993,10 +993,11 @@
         "orderNoPlaceholder": "注文番号を入力",
         "orderSerialNumberLabel": "注文のシリアルナンバー",
         "orderSerialNumberPlaceholder": "注文のシリアルナンバーを入力",
-        "equipmentNoPlaceholder": "全ての機器番号の入力をお願いします。",
+        "equipmentNoPlaceholder": "機械番号を入力してください",
         "searchCriteria": "検索条件をお願いします。",
         "searchDate": "註文期日指定を入力してください,半年以内です",
         "searchDateTips": "期間はせいぜい半年以内です",
+        "orderDatePlaceholder": "をクリックして日付範囲を選択します",
         "orderDate": "注文日",
         "startTime": "開始時間",
         "to": "まで",
@@ -1419,9 +1420,9 @@
         "R0006": "認証コードエラー",
         "R0008": "認証コードが存在しません",
         "R0009": "頻繁に送信せず、10分後に再試行してください",
-        "A0201": "メールボックスは登録されていません",
+        "A0201": "口座名は既に存在します",
         "A0202": "ユーザーの携帯電話はすでに存在します",
-        "A0203": "携帯番号未登録",
+        "A0203": "携帯電話やメールアドレスが登録されています",
         "A0207": "ユーザーメールボックスはすでに存在します"
     },
     "robotRanking": {
@@ -1606,16 +1607,16 @@
         "M307": "攪拌モーターです"
     },
     "popParams": {
-        "D460": "NO.1095",
-        "D492": "NO.1091",
-        "D493": "NO.1092",
-        "D494": "NO.1093",
-        "D495": "NO.1094",
-        "D208": "NO.1084",
-        "D249": "NO.1034",
-        "D346": "NO.1052",
-        "D497": "NO.1096",
-        "D344": "NO.1083",
+        "D460": "砂糖投入係数",
+        "D492": "チョコレート係数",
+        "D493": "キャラメル係数",
+        "D494": "ピーチ係数",
+        "D495": "ブルーベリー係数",
+        "D208": "残ったコーンで作れるカップの数",
+        "D249": "最初のポップの後、X秒間加熱を続ける",
+        "D346": "製造時の発生器の最高温度",
+        "D497": "食事後のドア閉鎖時間",
+        "D344": "冷風吹き付け時間",
         "M559": "Block sugar shortage alarm",
         "M566": "Disarm insulation heating wire failure alarm",
         "M568": "Shield generator air pump alarm",

+ 18 - 17
src/assets/language/zh.json

@@ -470,10 +470,10 @@
     "furnaceHeadTemperature": "炉头温度",
     "temperatureInCabinet": "柜内温度",
     "humidityInCabinet": "柜内湿度",
-    "stirringTemperature": "温度",
-    "cornGeneratorTemperature": "温度",
+    "stirringTemperature": "搅拌温度",
+    "cornGeneratorTemperature": "玉米发生器温度",
     "cupQuantity": "杯子数量",
-    "bucketWeight": "糖桶总重量",
+    "bucketWeight": "糖重量",
     "numberOneTm": "NO.1000",
     "candyGeneratorTm": "发生器温度",
     "outsideTm": "柜外温度",
@@ -1020,11 +1020,12 @@
     "refundTime": "退款时间",
     "orderSerialNumberLabel": "商户单号",
     "orderSerialNumberPlaceholder": "请输入商户单号",
-    "equipmentNoPlaceholder": "请输入完整的设备编号",
+    "equipmentNoPlaceholder": "请输入设备编号",
     "searchCriteria": "请输入搜索条件",
-    "searchDate": "请输入指定订单日期,不超过半年",
+    "searchDate": "请输入订单日期范围",
     "searchDateTips": "时间最多不超过半年",
     "orderDate": "订单日期",
+    "orderDatePlaceholder": "点击选择日期范围",
     "startTime": "开始时间",
     "to": "至",
     "endTime": "结束时间",
@@ -1446,9 +1447,9 @@
     "R0006": "验证码错误",
     "R0008": "验证码不存在",
     "R0009": "请勿频繁发送, 10分钟后再试",
-    "A0201": "邮箱未注册",
+    "A0201": "用户登录名已存在",
     "A0202": "用户手机已存在",
-    "A0203": "手机号未注册",
+    "A0203": "用户手机/邮箱已存在",
     "A0207": "用户邮箱已存在"
   },
   "robotRanking": {
@@ -1630,16 +1631,16 @@
     "M307": "搅拌电机"
   },
   "popParams": {
-    "D460": "NO.1095",
-    "D492": "NO.1091",
-    "D493": "NO.1092",
-    "D494": "NO.1093",
-    "D495": "NO.1094",
-    "D208": "NO.1084",
-    "D249": "NO.1034",
-    "D346": "NO.1052",
-    "D497": "NO.1096",
-    "D344": "NO.1083",
+    "D460": "下糖系数",
+    "D492": "巧克力系数",
+    "D493": "焦糖系数",
+    "D494": "水蜜桃系数",
+    "D495": "蓝莓系数",
+    "D208": "剩下的玉米只能做X杯",
+    "D249": "第一颗爆开后继续加热X秒",
+    "D346": "制作时发生器最高温度",
+    "D497": "取餐后关门时间",
+    "D344": "吹冷风时间",
     "M559": "屏蔽缺糖报警",
     "M566": "屏蔽保温发热丝故障报警",
     "M568": "屏蔽发生器气泵报警",

+ 1 - 0
src/common/js/countries.js

@@ -1055,6 +1055,7 @@ export const countriesData = [
       { text: "格罗宁根", value: "Groningen" },
       { text: "阿尔梅勒", value: "Almere" },
       { text: "马斯特里赫特", value: "Maastricht" },
+      { text: "海尔伦", value: "Heerlen" },
     ],
   },
   {

+ 4 - 9
src/components/dateOrderList/index.vue

@@ -15,8 +15,8 @@
           <div class="block3 flex-col"></div>
         </div>
         <!-- 日期选择 -->
-        <van-calendar color="#4d6add" v-model:show="calendarShow" type="range" :show-confirm="false"
-          :allow-same-day="true" :min-date="minDate" @confirm="calendarConfirm" />
+        <van-calendar color="#2c87c8" v-model:show="calendarShow" type="range" :max-range="31" :show-confirm="false"
+          :allow-same-day="true" :min-date="minDate" :max-date="maxDate" @confirm="calendarConfirm" />
         <!-- 选择统计类型 -->
         <van-popup v-model:show="timeTypeShow" position="bottom">
           <van-picker :title="$t('dateSelectList.timeType')" :columns="timeTypeList" @confirm="timeTypeConfirm"
@@ -44,9 +44,6 @@ import { getLoginUser } from "@/common/js/utils";
 // import { showToast } from "vant";
 import { useI18n } from 'vue-i18n';
 
-
-
-
 export default {
   name: "dateSelectList",
   components: {},
@@ -71,7 +68,6 @@ export default {
     // 其他时间日期组件确认返回
     const calendarConfirm = (data) => {
       calendarShow.value = false;
-      console.log(data);
       calendarDate = data;
       outputDate();
     };
@@ -180,8 +176,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 +197,6 @@ export default {
       { text: t('dateSelectList.yearType'), value: "3" },
     ];
     const timeTypeConfirm = ({ selectedOptions }) => {
-      console.log('selectedOptions[0].text', selectedOptions[0].value);
       // 按日统计
       chartType.value = selectedOptions[0].value;
       if (selectedOptions[0].value == '1') {

+ 2 - 2
src/components/dateSelectList/index.vue

@@ -15,8 +15,8 @@
           <div class="block3 flex-col"></div>
         </div>
         <!-- 日期选择 -->
-        <van-calendar color="#2c87c8" v-model:show="calendarShow" type="range" :show-confirm="false"
-          :allow-same-day="true" :min-date="minDate" @confirm="calendarConfirm" />
+        <van-calendar color="#2c87c8" v-model:show="calendarShow" type="range" :max-range="186" :show-confirm="false"
+          :allow-same-day="true" :min-date="minDate" :max-date="maxDate" @confirm="calendarConfirm" />
         <!-- 选择统计类型 -->
         <van-popup v-model:show="timeTypeShow" position="bottom">
           <van-picker :title="$t('dateSelectList.timeType')" :columns="timeTypeList" @confirm="timeTypeConfirm"

+ 1 - 1
src/service/device/index.js

@@ -20,7 +20,7 @@ export function getDeviceDetal(params) {
 // 修改设备详情
 export function updateDevice(params) {
   return axios.post(
-    `/SZWL-SERVER/tEquipment/update?${stringToUrl(params)}`,
+    `/SZWL-SERVER/tEquipment/update`,
     params
   );
 }

+ 5 - 0
src/service/huifuMch/index.js

@@ -62,3 +62,8 @@ export function auditUpdateMerchant(params) {
     return axios.get(`/SZWL-SERVER/tHuifuMch/auditUpdateMerchant?${stringToUrl(params)}`);
 }
 
+// 查询账户余额
+export function checkBalance(params) {
+    return axios.get(`/SZWL-SERVER/tHuifuMch/checkBalance?${stringToUrl(params)}`);
+}
+

+ 3 - 3
src/styles/paramsSet/index.less

@@ -113,7 +113,7 @@
 
             .txt3 {
                 display: flex;
-                width: 30%;
+                width: 45%;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
                 font-size: 12px;
@@ -122,12 +122,12 @@
             }
 
             .van-field__label {
-                width: 30%;
+                width: 45%;
             }
 
 
             .van-field__control {
-                width: 75%;
+                width: 55%;
                 border: 1px solid var(--van-border-color);
                 padding: 0.2em 0;
             }

+ 11 - 9
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({
@@ -147,10 +149,12 @@ export default {
         addParams.roleList = accoutPerSet.roleList[0];
         addParams.equipmentIds = accoutPerSet.equipmentIds;
         havePassword.value = false;
-        passwordPlaceholder.value = t('accountPer.editPasswordPlaceholder')
+        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();
@@ -173,7 +177,6 @@ export default {
       }
     };
     const searchEquData = (e) => {
-      // console.log("设备列表", e);
       selEquipOptions.value = e;
     }
     // 获取机器下拉
@@ -207,20 +210,19 @@ 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);
         if (data.code === "00000") {
           showSuccessToast(t("accountPer.successfullyModifiedTheAccount"));
-          // router.push("/accountPer");
           router.replace("/accountPer");
         } else if (data.code === 'A0201') {
           showToast(t("accountPer.accountNameExists"));
@@ -232,7 +234,6 @@ export default {
         const { data } = await addLoginUser(params);
         if (data.code === "00000") {
           showSuccessToast(t("accountPer.accountAddedSuccessfully"));
-          // router.push("/accountPer");
           router.replace("/accountPer");
         } else {
           showFailToast(t("accountPer.failedToAddAccount"), data.message);
@@ -302,6 +303,7 @@ export default {
       busiEquipInpClk,
       havePassword,
       passwordPlaceholder,
+      passwordPattern,
       isUserName,
       searchEquData,
     };

+ 2 - 3
src/views/device/alarmClockSet/index.vue

@@ -67,7 +67,7 @@
             <van-cell v-for="(item, index) in equipmentList" clickable :key="index" :title="item.label"
               @click="equipementCheckItem(item.value)">
               <template #right-icon>
-                <van-checkbox :name="item.value" />
+                <van-checkbox :name="item.value" @click.stop/>
               </template>
             </van-cell>
           </van-cell-group>
@@ -96,11 +96,9 @@ export default {
   setup() {
     const { t } = useI18n();
     const onConfirm = ({ selectedValues }) => {
-      console.log(selectedValues);
       currentTime.value = selectedValues;
       currentTimeShow.value = false;
       hour.value = selectedValues.join(':');
-      console.log(hour.value);
     };
     // 周
     const weekDayList = ref([
@@ -198,6 +196,7 @@ export default {
         // 选中的周
         selectList.value = data.data.week.split(',');
         equipmentIds.value = data.data.equipmentIds.split(",");
+        equipmentIds.value = equipmentIds.value.filter((item) => item !== "");
         isEquipemntIdsText();
         // 回显闹钟类型
         const statusTxt = alarmClockTypeOptions.value.filter(

+ 1 - 1
src/views/device/deviceOper.vue

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

+ 1 - 7
src/views/device/index.vue

@@ -209,7 +209,7 @@
         showDateTime(item.lastUpdateTime)
       }}</span>
                   <!-- 音量 -->
-                  <span v-if="item.machineType != '2'" class="contentWord kBordBott">{{ $t("device.volume") }}:{{
+                  <span class="contentWord kBordBott">{{ $t("device.volume") }}:{{
         item.volume }}</span>
                   <!-- 报警内容 -->
                   <div class="alert-item kBordBott" v-for="itemAlarm in item.alarmList" :key="itemAlarm">
@@ -219,12 +219,6 @@
                       </span>
                       <span>{{ $t("device.alarmContent") }} : {{ itemAlarm.alarmContent }}</span>
                     </div>
-                    <!-- <div class="lineCon"></div>
-                    <div class="alert-actions">
-                      <van-button type="primary" color="#07c160" style="margin: 0 10px;"
-                        :text="$t('device.eliminateAlarm')"
-                        @click="clearAlarm(itemAlarm, item, item.alarmList)"></van-button>
-                    </div> -->
                   </div>
                   <div class="contentWord kBordBott l-flex-center" v-if="item.alarmList">
                     <van-button type="primary" color="#07c160" style="margin: 0 10px;"

+ 20 - 15
src/views/orderCenter/index.vue

@@ -158,10 +158,10 @@
           </div>
         </div>
         <div class="line flex-col"></div>
-        <!-- <div class="layer2 flex-row justify-between">
-              <span class="info2">{{ $t('orderCenter.accountBalance') }}</span>
-              <span class="txt6">{{ accountDetail.altAvilBalance }}</span>
-            </div> -->
+        <div class="orderDetailBox flex-row justify-between" v-if="user.ifForeign === '0' && user.type === 2">
+          <span class="title">{{ $t('orderCenter.accountBalance') }}</span>
+          <span class="content">{{ "¥ " + balance }} </span>
+        </div>
         <div class="orderDetailBox flex-row justify-between">
           <span class="title">{{ $t('orderCenter.orderNo') }}</span>
           <!-- <span class="content">{{ refundObject.sn }}</span> -->
@@ -273,7 +273,6 @@
         <van-field v-if="orderType === '3'" v-model="cofficentForm.refundReason" rows="2" autosize label="退款原因"
           type="textarea" maxlength="30" :clearable="true" placeholder="请输入退款原因" show-word-limit />
         <div class="btnFooter">
-          <!-- <van-checkbox class="checkAllBtn o-mt-5" v-model="checkedAll" @click="checkAll">全选</van-checkbox> -->
           <span></span>
           <div class="o-mt-5">
             <span class="">{{ $t('orderCenter.totalRefund') }}:</span>
@@ -285,7 +284,6 @@
   </div>
 </template>
 <script>
-// import { Api_getOnlineExport } from "../../service/order";
 // 导入接口
 import { getAdminMch } from "../../service/merchantManage";
 // 导入弹窗
@@ -299,7 +297,7 @@ import orderSearch from "./orderSearch.vue";
 import { getOrderList, refundOrder, refundWechatOrder, updateIsInvoice, sentMessage, exportOrder, refundSqbOrder } from "../../service/order/index";
 import { showFailToast, showToast, showLoadingToast } from "vant";
 import { getLoginUser, $M_IsDate, Format_time, $M_ExportFile, styleUrl } from "../../common/js/utils";
-import { getHuifuId } from "../../service/huifuMch/index";
+import { getHuifuId, checkBalance } from "../../service/huifuMch/index";
 import dateUtil from "../../utils/dateUtil";
 import dateSelectList from "../../components/dateSelectList";
 import typeDownMenu from "../../components/typeDownMenu";
@@ -327,6 +325,8 @@ export default {
     const orderType = ref('');
     // 是否开发票
     const isInvoice = ref(0);
+    // 账户余额
+    const balance = ref(0);
     // 更新是否开发票
     const updateInvoice = (id) => {
       const params = {
@@ -693,8 +693,6 @@ export default {
     onMounted(async () => {
       // 加载样式
       styleUrl('orderCenter');
-      // orderList.value = [];
-      // searchParams.current = 1;
       if (user) {
         searchParams.adminId = user.id;
         searchParams.userName = user.username;
@@ -715,14 +713,15 @@ export default {
         let endDate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59);
         searchParams.endDate = dateUtil.formateDate(endDate, "yyyy-MM-dd hh:mm:ss");
 
-        // finished.value = false;
-        // loading.value = true;
-        // getList();
         onLoad();
         addEventListener('load', onLoad);
         // 获取账户详情
         if (user.ifForeign === '0') {
-          getAccountDetail(user.id);
+          if (user.payPlatform === '0' || user.payPlatform === null) {
+            getAccountDetail(user.id);
+          } else if (user.payPlatform === '1') {
+            getHuifuBalance(user.id);
+          }
         }
       }
     });
@@ -747,10 +746,8 @@ export default {
         duration: 0,
       });
       try {
-        // const { headers, data } = await Api_getOnlineExport(searchParams);
         const { headers, data, status } = await exportOrder(searchParams);
         // 请求完成后隐藏加载框
-        // downloadOrder.close();
         $M_ExportFile(data, headers);
         if (status == 200) {
           downloadOrder.close();
@@ -787,8 +784,15 @@ export default {
     const getAccountDetail = (id) => {
       getAdminMch({ id }).then(res => {
         accountDetail.value = res.data.data;
+        balance.value = res.data.data.altMainBalance;
       })
     };
+    // 查询汇付账户余额
+    const getHuifuBalance = (id) => {
+      checkBalance({ adminId: id }).then(res => {
+        balance.value = res.data.data;
+      })
+    }
     // 订单时间格式转换
     const showOrderTime = (item, idx) => {
       if (idx === 1) {
@@ -970,6 +974,7 @@ export default {
       isInvoice,
       updateInvoice,
       total,
+      balance
     };
   },
 };

+ 47 - 35
src/views/orderCenter/orderSearch.vue

@@ -12,24 +12,12 @@
             :placeholder="$t('orderCenter.orderSerialNumberPlaceholder')" />
           <van-field v-model="clientId" name="clientId" :label="$t('orderCenter.equipmentNo')"
             :placeholder="$t('orderCenter.equipmentNoPlaceholder')" />
-
-          <div class="van-cell van-field">
-            <div class="van-cell__title van-field__label">
-              <label id="van-field-4-label" for="van-field-4-input">{{ $t('orderCenter.orderDate') }}</label>
-            </div>
-            <div class="van-cell__value van-field__value">
-              <div class="van-field__body">
-                <input type="text" class="van-field__control" :placeholder="$t('orderCenter.startTime')"
-                  style="text-align: center; width: 50%;" v-model="startTime" @click="startTimeClick()" />
-                <span>{{ $t('orderCenter.to') }}</span>
-                <input type="text" class="van-field__control" :placeholder="$t('orderCenter.endTime')"
-                  style="text-align: center; width: 50%;" v-model="endTime" @click="endTimeClick()" />
-              </div>
-            </div>
-          </div>
-
+          <van-field v-model="queryDateValue" is-link readonly :label="$t('orderCenter.orderDate')"
+            :placeholder="$t('orderCenter.orderDatePlaceholder')" @click="showOrderDate = true" />
           <!-- 操作 -->
-          <van-row justify="space-around" style="padding: 1em;">
+          <van-row justify="space-around" style="padding: 2em;">
+            <van-button class="clearBtn" span="5" round plain type="primary" style="height: 2em; padding: 0 2em;"
+              @click="registerClick">{{ $t('device.emptyingConditions') }}</van-button>
             <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;" native-type="submit">
               {{ $t('orderCenter.clickSearch') }}
             </van-button>
@@ -45,14 +33,17 @@
       <van-date-picker v-model="endDateValue" :title="$t('orderCenter.selectFullTime')"
         @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"
+      :allow-same-day="true" :min-date="minDate" :max-date="maxDate" :max-range="31" />
   </div>
 </template>
 
 <script>
 import { ref } from 'vue';
-// import dateUtil from "@/utils/dateUtil";
 import { showToast } from 'vant';
 import { useI18n } from "vue-i18n";
+import dateUtil from "@/utils/dateUtil";
+
 export default {
   name: 'orderSearch',
   setup(prop, context) {
@@ -73,6 +64,17 @@ export default {
     const startDateValue = ref([currentYear, currentMonth, currentDate])
     const endDateValue = ref([currentYear, currentMonth, currentDate])
 
+    // 订单日期弹窗显示
+    const showOrderDate = ref(false);
+    // 订单日期弹窗确认
+    const calendarConfirm = (value) => {
+      showOrderDate.value = false;
+      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";
+    }
+
+    const queryDateValue = ref(''); // 订单时间
     const userName = ref(''); // 用户名
     const sn = ref(''); // 订单编号
     const trxNo = ref(''); // 订单流水号
@@ -107,25 +109,13 @@ export default {
     }
     // 提交搜索表单触发搜索
     const onSubmit = () => {
-      console.log('startTime.value', startTime.value)
-      if (userName.value == '' && sn.value == '' && trxNo.value == '' && clientId.value == '' && startTime.value == '' && endTime.value == '') {
+      if (userName.value == '' && sn.value == '' && trxNo.value == '' && clientId.value == '') {
         showToast(t('orderCenter.searchCriteria'));
         return;
       }
-      if (clientId.value != '' || userName.value != '') {
-        if (startTime.value == '' || endTime.value == '') {
-          showToast(t('orderCenter.searchDate'));
-          return;
-        } else {
-          let start = new Date(startTime.value);
-          let end = new Date(endTime.value);
-          let diff = (end - start) / 1000 / 60 / 60 / 24;
-          if (diff > 180) {
-            showToast(t('orderCenter.searchDateTips'));
-            return;
-          }
-        }
-
+      if (queryDateValue.value == '') {
+        showToast(t('orderCenter.searchDate'));
+        return;
       }
       const searchParam = {
         userName: userName.value,
@@ -139,6 +129,17 @@ export default {
       sheetShow.value = false;
     }
 
+    // 清空条件
+    const registerClick = () => {
+      userName.value = '';
+      sn.value = '';
+      trxNo.value = '';
+      clientId.value = '';
+      startDate.value = '';
+      endDate.value = '';
+      queryDateValue.value = '';
+    };
+
     return {
       sheetShow,
       startDateShow,
@@ -164,7 +165,12 @@ export default {
       endTime,
       maxDate,
       startDateValue,
-      endDateValue
+      endDateValue,
+
+      showOrderDate,
+      calendarConfirm,
+      queryDateValue,
+      registerClick
     };
   },
   components: {},
@@ -175,6 +181,12 @@ export default {
 .orderSearch {
   width: 100%;
 
+  .clearBtn {
+    border-color: #2c87c8;
+    background-color: #fff;
+    color: #2c87c8;
+  }
+
   :deep(.orderSearchPopup) {
     width: 90%;
   }

+ 52 - 29
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">
@@ -28,28 +32,27 @@
                     <div class="group5 flex-col"></div>
                     <div class="TextGroup2 flex-col">
                       <span class="txt1 c-text-w6">{{
-                        $t("orderExport.orderDetails")
-                      }}</span>
+        $t("orderExport.orderDetails")
+      }}</span>
                     </div>
                   </div>
                 </div>
                 <div class="l-flex-RC">
                   <div class="c-text-13 l-flex-RC text5">
                     <span @click="noticeClk" class="">{{
-                      $t("orderExport.clickFilter")
-                    }}</span>
+        $t("orderExport.clickFilter")
+      }}</span>
                     <div class="outer4 flex-col o-ml-6"></div>
                   </div>
                   <div @click="exportOrder()" class="c-text-13 l-flex-RC o-ml-20 c-text-color">
                     <span class="">{{
-                      $t("orderExport.exportToExcel")
-                    }}</span>
+        $t("orderExport.exportToExcel")
+      }}</span>
                     <div class="outer4 flex-col o-ml-6"></div>
                   </div>
                 </div>
               </div>
-              <img class="img2" referrerpolicy="no-referrer"
-                src="../../assets/line.png" />
+              <img class="img2" referrerpolicy="no-referrer" src="../../assets/line.png" />
             </div>
           </div>
           <!-- <van-pull-refresh disabled v-model="refreshing" @refresh="onRefresh"> -->
@@ -65,12 +68,12 @@
               <div class="mod10 flex-row">
                 <span class="txt3 o-mr-10">{{ item.username }}</span>
                 <span class="txt4 c-text-line1">{{ item.name }}</span><span class="txt4 c-text-line1">,{{ item.phone
-                }}</span>
+                  }}</span>
               </div>
               <span class="info9">{{ $t("orderExport.address") }}:{{ item.address }}</span>
               <div class="mod11 flex-col">
                 <span v-if="packetType == '0'" class="txt5">{{ item.equipmentTotal }}{{ $t("orderExport.machines") }}
-                <!-- ,{{$t("orderExport.superior")}}:{{ item.lastUsername }} -->
+                  <!-- ,{{$t("orderExport.superior")}}:{{ item.lastUsername }} -->
                 </span>
                 <div v-else class="txt5 l-flex-RC">
                   <div>{{ item.equipmentType }}</div>
@@ -90,29 +93,29 @@
       :isCloseForCancel="false" @cancelclk="cancelClk">
       <template #content>
         <div class="cust_vantBorder">
-          <van-field v-if="packetType == '1'" clearable v-model="searchForm.orderNo" :placeholder="$t('orderExport.searchPop.orderNoPlace')"
-            :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 v-if="packetType == '1'" clearable v-model="searchForm.orderNo"
+            :placeholder="$t('orderExport.searchPop.orderNoPlace')" :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"
             :placeholder="$t('orderExport.searchPop.mainOverPlace')" :label="$t('orderExport.searchPop.mainOver')">
             <template #right-icon>
               <div class="l-flex-RC">
                 <van-icon v-if="searchForm.ifForeignName" @click="searchForm.ifForeignName = '';
-                searchForm.ifForeign = '';" class="o-mr-6" name="clear" />
+      searchForm.ifForeign = '';" class="o-mr-6" name="clear" />
                 <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')">
             <template #right-icon>
               <div class="l-flex-RC">
                 <van-icon v-if="searchForm.companyTypeName" @click="
-                  searchForm.companyTypeName = '';
-                searchForm.companyType = '';
-                " class="o-mr-6" name="clear" />
+        searchForm.companyTypeName = '';
+      searchForm.companyType = '';
+      " class="o-mr-6" name="clear" />
                 <van-icon @click="companyTypeInpClk" name="arrow-down" />
               </div>
             </template>
@@ -123,12 +126,13 @@
     <!-- 大陆或海外弹窗 -->
     <van-popup v-model:show="changeTypeShow" position="bottom">
       <van-picker :title="$t('orderExport.searchPop.mainOverPlace')" :columns="changeTypePopList"
-        :columns-field-names="changeTypePopFieldName" @confirm="changeTypePopConfirm" @cancel="changeTypeShow = false" />
+        :columns-field-names="changeTypePopFieldName" @confirm="changeTypePopConfirm"
+        @cancel="changeTypeShow = false" />
     </van-popup>
     <!-- 公司平台弹窗 -->
     <van-popup v-model:show="companyTypeShow" position="bottom">
-      <van-picker :title="$t('orderExport.searchPop.companyTypePlaceholder')"
-        :columns="companyTypePopList" :columns-field-names="changeTypePopFieldName" @confirm="companyTypePopConfirm"
+      <van-picker :title="$t('orderExport.searchPop.companyTypePlaceholder')" :columns="companyTypePopList"
+        :columns-field-names="changeTypePopFieldName" @confirm="companyTypePopConfirm"
         @cancel="companyTypeShow = false" />
     </van-popup>
   </div>
@@ -342,6 +346,18 @@ export default {
         id: 2,
       },
     ]);
+    const userTypeList = ref([
+    {
+        name: '国内',
+        icon: "",
+        id: 0,
+      },
+      {
+        name: '海外/港澳台',
+        icon: "",
+        id: 1,
+      },
+    ])
     // 公司平台
     const companyTypePopList = [
       {
@@ -361,7 +377,6 @@ export default {
     const tabChg = (e) => {
       pageNo.value = 1;
       pageSize.value = 10;
-      // ruleData.tableData = [];
       tableData.value = [];
       if (e == 0) {
         searchParams.packetType = "0";
@@ -370,6 +385,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: "", // 设备编号
@@ -385,7 +411,6 @@ export default {
     });
     // 搜索点击
     const searchClick = () => {
-      // console.log("searchClick");
     };
     // 今日、明日、本周、本月、其他时间选择回调
     const update = (uDate) => {
@@ -418,8 +443,6 @@ export default {
         );
       }
       getList();
-      console.log("searchParams的值是 >>>", searchParams);
-      // onRefresh(1);
     };
 
     // 自定义货币符号
@@ -456,8 +479,8 @@ export default {
       pageSize,
       loading,
       finished,
-      // refreshing,
-      // onRefresh,
+      userType,
+      userTypeList,
       onLoad,
       getList,
       isAdmin,

+ 4 - 0
src/views/register.vue

@@ -213,6 +213,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,

+ 7 - 35
src/views/robotRanking.vue

@@ -62,16 +62,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>
@@ -135,18 +125,18 @@
         @cancel="companyTypeShow = false" />
     </van-popup>
     <!-- 日的日期选择弹窗 -->
-    <van-calendar @confirm="calendarDayConfirm" v-model:show="dayShow" color="#2c87c8" :min-date="minDate"
+    <van-calendar @confirm="calendarDayConfirm" v-model:show="dayShow" color="#2c87c8" :min-date="minDate" :max-date="maxDate"
       :show-confirm="false" />
     <!-- 周的日期选择弹窗 -->
     <van-calendar @confirm="(e) => {
       calendarWeekOrMonConfirm(e, 1);
     }
-      " v-model:show="weekShow" :allow-same-day="true" color="#2c87c8" :min-date="minDate" type="range" />
+      " v-model:show="weekShow" :allow-same-day="true" color="#2c87c8" :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="#2c87c8" :min-date="minDate" type="range" />
+      " v-model:show="monthShow" :allow-same-day="true" color="#2c87c8" :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"
@@ -290,14 +280,12 @@ 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;
     };
     // 获取当前年前4年后1年
     let yearPopList = [];
-    for (let i = 0; i < 4; i++) {
+    for (let i = 0; i < 3; i++) {
       const year = moment().subtract(i, "years").format("YYYY");
       yearPopList.push({
         name: year,
@@ -350,7 +338,8 @@ export default {
       dayShow.value = false;
     };
     // 最小日期选择
-    const minDate = new Date(2018, 1, 1);
+    const minDate = new Date(2022, 1, 1);
+    const maxDate = new Date();
     const dayShow = ref(false);
     // 日,周,月,年的tab栏数据
     const tabDayList = ref([
@@ -440,16 +429,7 @@ export default {
       weekEnd: moment().weekday(7).format("YYYY-MM-DD") + " 23:59:59",
       // 上周
       lastWeekStart: moment().week(moment().week() - 1).startOf('week').add(1, 'days').format("YYYY-MM-DD") + " 00:00:00",
-      // moment()
-      //   .week(moment().week() - 1)
-      //   .startOf("week")
-      //   .format("YYYY-MM-DD") + " 00:00:00",
-
       lastWeekEnd: moment().week(moment().week() - 1).endOf('week').add(1, 'days').format("YYYY-MM-DD") + " 23:59:59",
-      // moment()
-      //   .week(moment().week() - 1)
-      //   .endOf("week")
-      //   .format("YYYY-MM-DD") + " 23:59:59",
 
       // 这个月
       monthStart: moment().startOf("month").format("YYYY-MM-DD") + " 00:00:00",
@@ -583,19 +563,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;
         }
         // 有数据返回则处理
@@ -756,9 +732,6 @@ export default {
       searchForm.companyTypeName = t("robotRanking.whole");
       searchForm.machineTypeName = t("robotRanking.whole");
       // 查询是否有订单数据权限
-      // const isOrderData = user.menuCodeList.some((item) => {
-      //   return item === "M4";
-      // })
       // 子商家type=3和公司人员type=1,默认看不到 
       if ((user.type > 2 || user.type === 1) && !isM11Included) {
         showRobotRankingDiv.value = false;
@@ -832,11 +805,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;
     };
@@ -865,6 +836,7 @@ export default {
       searchForm,
       dayShow,
       minDate,
+      maxDate,
       calendarDayConfirm,
       weekShow,
       monthShow,

+ 77 - 185
src/views/settlement/index.vue

@@ -12,41 +12,32 @@
             <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.joinpayAuditStatus') }}</span></div>
             <div class="van-cell__value van-field__value" style="text-align: left;">
               <span :style="{
-                color: joinPayMchID != null ? (joinPayMchType == '1' ? (joinPayMchStep == '1' ? (signStatus == '签约成功' ? '#00ff80'
-                  : '#FFA500') : '#FFA500') : '#FFA500') : '#FFA500'
-              }">
-                {{ joinPayMchID != null ? (joinPayMchType == '1' ? (joinPayMchStep == '1' ? (signStatus == '签约成功' ? '注册成功'
-                  : '待签约') : '待上传证件图片') : '审核未通过') : '未注册' }}
+      color: joinPayMchID != null ? (joinPayMchType == '1' ? (joinPayMchStep == '1' ? (signStatus == '签约成功' ? '#00ff80'
+        : '#FFA500') : '#FFA500') : '#FFA500') : '#FFA500'
+    }">
+                {{ joinPayMchID != null ? (joinPayMchType == '1' ? (joinPayMchStep == '1' ? (signStatus == '签约成功' ?
+      '注册成功'
+      : '待签约') : '待上传证件图片') : '审核未通过') : '未注册' }}
               </span>
             </div>
           </div>
           <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' :
-                    '#FF0000'))) : '#FFA500'
-              }">
+      color: huifuMchID != null ? (huifuAuditStatus == '2' ? '#00ff80' : (huifuAuditStatus == '0' ? '#FFA500' :
+        (huifuAuditStatus == '1' || huifuAuditStatus == '4' ? '#FFA500' :
+          '#FF0000'))) : '#FFA500'
+    }">
                 {{ huifuMchID != null ? (huifuAuditStatus == '2' ? '注册成功' : (huifuAuditStatus == '0' ? '待上传证件图片' :
-                  (huifuAuditStatus == '1' || huifuAuditStatus == '4' ? '待签约' :
-                    '审核未通过'))) : '未注册' }}
+      (huifuAuditStatus == '1' || huifuAuditStatus == '4' ? '待签约' :
+        '审核未通过'))) : '未注册' }}
               </span>
             </div>
           </div>
           <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 +47,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 +65,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 +83,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')"
@@ -138,8 +100,9 @@
             :placeholder="$t('joinpayMch.IDPlaceholder')"
             :rules="[{ required: true, message: $t('joinpayMch.IDPlaceholder') }]" @update:model-value="fieldUpdate" />
           <!-- 身份证地址 -->
-          <van-field v-if="bankAccountType == '4'" class="requiredLeft" v-model="certAddressValue" name="certAddressValue"
-            :label="$t('huifuMch.certAddress')" :placeholder="$t('huifuMch.certAddressPlaceholder')"
+          <van-field v-if="bankAccountType == '4'" class="requiredLeft" v-model="certAddressValue"
+            name="certAddressValue" :label="$t('huifuMch.certAddress')"
+            :placeholder="$t('huifuMch.certAddressPlaceholder')"
             :rules="[{ required: true, message: $t('huifuMch.certAddressPlaceholder') }]"
             @update:model-value="fieldUpdate" />
           <!-- 身份证有效期类型 -->
@@ -153,9 +116,9 @@
             </div>
           </div>
           <!-- 有效开始日期 -->
-          <van-field class="requiredLeft" v-model="beginDate" readonly name="beginDate" :label="$t('huifuMch.beginDate')"
-            :placeholder="$t('huifuMch.beginDatePlaceholder')" @click="showBeginDate = true"
-            :rules="[{ required: true, message: $t('huifuMch.beginDatePlaceholder') }]" />
+          <van-field class="requiredLeft" v-model="beginDate" readonly name="beginDate"
+            :label="$t('huifuMch.beginDate')" :placeholder="$t('huifuMch.beginDatePlaceholder')"
+            @click="showBeginDate = true" :rules="[{ required: true, message: $t('huifuMch.beginDatePlaceholder') }]" />
           <!-- 有效截止日期 -->
           <van-field class="requiredLeft" v-if="validityType == 0" v-model="endDate" readonly name="endDate"
             :label="$t('huifuMch.endDate')" :placeholder="$t('huifuMch.endDatePlaceholder')" @click="showEndDate = true"
@@ -163,28 +126,31 @@
           <!-- 图片审核情况 -->
           <div class="van-cell van-field" v-if="pageType === '4'">
             <div class="van-cell__title van-field__label"><span>{{ $t('joinpayMch.pictureReview') }}</span></div>
-            <div class="van-cell__value van-field__value radioBox" style="display: flex; justify-content: space-around;">
+            <div class="van-cell__value van-field__value radioBox"
+              style="display: flex; justify-content: space-around;">
               <span
                 :style="{ color: approveStatus === '审核通过' ? (huifuPicUpStatus === 1 ? '#00ff80' : '#FF0000') : (approveStatus === '审核中' ? '#FFA500' : '#FF0000') }">
                 {{ approveStatus === '审核通过' ? (huifuPicUpStatus === 1 ? '审核通过' : '请重新上传') : approveStatus }}
               </span>
-              <van-button span="5" round type="primary" style="height: 2em; padding: 0 1.5em" @click='updateSentImage()'>
+              <van-button span="5" round type="primary" style="height: 2em; padding: 0 1.5em"
+                @click='updateSentImage()'>
                 {{ $t('joinpayMch.reUpload') }}</van-button>
             </div>
           </div>
           <!-- 签约状态 -->
           <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;">
+            <div class="van-cell__value van-field__value radioBox"
+              style="display: flex; justify-content: space-around;">
               <span
                 :style="{ color: signStatus == '签约成功' ? (huifuMchID == null ? '#00ff80' : (huifuAuditStatus == '2' ? '#00ff80' : '#FFA500')) : '#FFA500' }">
                 {{ signStatus == '签约成功' ? (huifuMchID == null ? signStatus : (huifuAuditStatus == '2' ? signStatus :
-                  '待签约')) : '待签约' }}
+      '待签约')) : '待签约' }}
               </span>
               <van-button
                 :disabled="huifuMchID == null ? (signStatus == '签约成功' ? true : false) : (huifuAuditStatus == '2' && signStatus == '签约成功' ? true : false)"
                 span="5" round type="primary" style="height: 2em; padding: 0 2.5em" @click='altMchSignFun()'>{{
-                  $t('joinpayMch.signAContract') }}
+      $t('joinpayMch.signAContract') }}
               </van-button>
             </div>
           </div>
@@ -197,8 +163,8 @@
                 :disabled="altMerchantType === '10'">
                 <van-radio name="1" icon-size="18px">{{ $t('joinpayMch.debitCard') }}</van-radio>
                 <van-radio name="4" icon-size="18px">{{
-                  $t('joinpayMch.corporateAccount')
-                }}</van-radio>
+      $t('joinpayMch.corporateAccount')
+    }}</van-radio>
               </van-radio-group>
             </div>
           </div>
@@ -226,7 +192,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')"
@@ -235,7 +200,8 @@
           <!-- 银行编号 -->
           <van-field v-if="bankAccountType === '4'" class="requiredLeft" v-model="bankCodeValue" name="bankCodeValue"
             :label="$t('huifuMch.bankCodeLabel')" :placeholder="$t('huifuMch.bankCodePlaceholder')"
-            :rules="[{ required: true, message: $t('huifuMch.bankCodePlaceholder') }]" @update:model-value="fieldUpdate">
+            :rules="[{ required: true, message: $t('huifuMch.bankCodePlaceholder') }]"
+            @update:model-value="fieldUpdate">
             <template #button>
               <van-button size="small" type="primary" @click="showBankCode = true" style="padding: 0 1em;">
                 选择所属银行
@@ -272,28 +238,11 @@
               @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;">
             <van-button span="5" round type="primary" style="height: 2em; padding: 1.5em 2em" native-type="submit">{{
-              $t('joinpayMch.submitDataForReview') }}
+      $t('joinpayMch.submitDataForReview') }}
             </van-button>
           </van-row>
         </van-form>
@@ -306,10 +255,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" />
@@ -319,9 +264,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" />
@@ -335,34 +277,34 @@
         <div v-if="joinPayMchType === '0'" style="width: 100%;">
           <div style="width: 100%; text-align: center;">
             <span style=" font-size: 1.4em; font-weight: bold; line-height: 3;">{{
-              $t('joinpayMch.thePlatformAdministratorIsReviewing') }}</span>
+      $t('joinpayMch.thePlatformAdministratorIsReviewing') }}</span>
           </div>
           <div style="width: 100%; text-align: center;">
             <span style="line-height: 1.2;">{{ $t('joinpayMch.youCan') }}<span
                 style="color: #2c87c8; text-decoration: underline;" @click='updateJoinPay()'>{{
-                  $t('joinpayMch.withdrawAndRevise') }}</span></span>
+      $t('joinpayMch.withdrawAndRevise') }}</span></span>
           </div>
         </div>
         <div v-if="joinPayMchType === '2' || joinPayMchType === '3'" style="width: 100%;">
           <div style="width: 100%; text-align: center;">
             <span style=" font-size: 1.4em; font-weight: bold; line-height: 3; color: #ee0a24;">{{
-              $t('joinpayMch.failedToPassTheReview') }}</span>
+      $t('joinpayMch.failedToPassTheReview') }}</span>
           </div>
           <div style="width: 100%; text-align: center;">
             <span style="line-height: 1.2;">{{ $t('joinpayMch.failedToPassTheReview') }},<span
                 style="color: #2c87c8; text-decoration: underline;" @click='pageType = "1"'>{{
-                  $t('joinpayMch.clickHereToFillInTheInformationAgain') }}</span></span>
+      $t('joinpayMch.clickHereToFillInTheInformationAgain') }}</span></span>
           </div>
         </div>
         <div v-if="joinPayMchStep === '0'">
           <div style="width: 100%; text-align: center;">
             <span style=" font-size: 1.4em; font-weight: bold; line-height: 3; color: #07c160;">{{
-              $t('joinpayMch.approvalPassed') }}</span>
+      $t('joinpayMch.approvalPassed') }}</span>
           </div>
           <div style="width: 100%; text-align: center;">
             <span style="line-height: 1.2;">{{ $t('joinpayMch.approvalPassed') }},{{ $t('joinpayMch.youCan') }}<span
                 style="color: #2c87c8; text-decoration: underline;" @click='pageType = "1"'>{{
-                  $t('joinpayMch.clickHereToFillInAgainAndSubmitForReview') }}</span></span>
+      $t('joinpayMch.clickHereToFillInAgainAndSubmitForReview') }}</span></span>
           </div>
           <van-row justify="space-around" style="padding: 1em">
             <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em" @click='pageType = "3"'>
@@ -460,24 +402,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);
@@ -503,8 +431,16 @@ export default {
         value: "03010000",
       },
       {
-        text: '中国邮政储蓄银行',
-        value: "04030000",
+        text: '中信银行',
+        value: "03020000",
+      },
+      {
+        text: '中国光大银行',
+        value: "03030000",
+      },
+      {
+        text: '华夏银行',
+        value: "03040000",
       },
       {
         text: '中国民生银行',
@@ -519,6 +455,18 @@ export default {
         value: "03080000",
       },
       {
+        text: '兴业银行',
+        value: "03090000",
+      },
+      {
+        text: '中国邮政储蓄银行',
+        value: "04030000",
+      },
+      {
+        text: '农村商业银行',
+        value: "03140000",
+      },
+      {
         text: '广州银行',
         value: "03134401",
       },
@@ -528,7 +476,6 @@ export default {
       },
     ];
     const bankCodePopConfirm = ({ selectedOptions }) => {
-      console.log(selectedOptions[0])
       addParams.bankCodeValue = selectedOptions[0].value;
       fieldUpdate();
       showBankCode.value = false;
@@ -540,9 +487,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;
@@ -593,7 +538,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
@@ -610,7 +554,6 @@ export default {
       type: '0', // 类型 String 必填 企业:type='1'; 个人:type='0'
       regName: '', // 商户名称
       shortName: '', // 商户简称
-      foundDate: '', // 成立时间
       licenseCode: '', // 营业执照编号
       licenseValidityType: "1", // 营业执照有效期类型
       licenseBeginDate: '', // 营业执照有效开始日期
@@ -662,7 +605,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); // 汇聚签约状态
@@ -671,44 +613,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.licenseEndDate = selectedValues.join("");
       showEndDateLicense.value = false;
       fieldUpdate();
     };
+    // 营业执照有效截止日期
     const onConfirmBeginDateLicense = ({ selectedValues }) => {
       addParams.beginDateLicense = selectedValues.join("-");
+      huifuParams.licenseBeginDate = 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();
-    };
     const onConfirmBankAddress = ({ selectedOptions }) => {
       showBankAddress.value = false;
       addParams.bankAddress = (selectedOptions[0]?.text != selectedOptions[1]?.text ? selectedOptions[0]?.text : '')
@@ -748,7 +681,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') {
@@ -762,13 +694,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() : '';
 
@@ -803,7 +733,6 @@ export default {
         }
       } else {
         pageType.value = '1';
-        // showFailToast(data.message);
       }
       memoryForm();
       isMemoryFormType = true;
@@ -811,12 +740,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;
@@ -833,9 +760,6 @@ export default {
           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;
@@ -844,7 +768,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;
@@ -854,8 +777,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';
@@ -873,9 +794,7 @@ export default {
           }
           if (data.data.status === '0') {
             huifuPicUpStatus.value = 0;
-            console.log(huifuPicUpStatus.value)
           }
-          console.log('huifuAuditStatus', huifuAuditStatus.value)
         }
       }
     }
@@ -883,7 +802,6 @@ export default {
     const changeApproveStatus = async () => {
       const { data } = await updateApproveStatus({ id: joinPayMchID.value });
       if (data.code === "00000") {
-        // showSuccessToast(t('joinpayMch.withdrawalSucceeded'));
         if (data.data === "P1000") {
           location.reload();
         }
@@ -911,13 +829,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 {
@@ -955,26 +871,21 @@ export default {
       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;
       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.regDetail = addParams.registeredAddress;
         if (addParams.bankAccountType === '4') {
           huifuParams.cardType = '0';
@@ -984,8 +895,6 @@ export default {
           huifuParams.certAddress = addParams.certAddressValue
         }
       }
-      console.log("addParams:", addParams);
-      console.log("huifuParams:", huifuParams)
       try {
         const { data } = await saveJoinPayMch(addParams);
         if (data.code === "00000") {
@@ -993,7 +902,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") {
@@ -1058,14 +966,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}`);
             }
@@ -1089,12 +995,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'));
@@ -1114,7 +1017,6 @@ export default {
     }
     // 记录表单填写
     const fieldUpdate = () => {
-      // console.log('fieldUpdate');
       if (addParams.altMerchantType === '10') {
         addParams.bankAccountType = '1';
       }
@@ -1149,7 +1051,6 @@ export default {
           params.fileType = "F02";
         }
         try {
-          console.log(params.fileType);
           const { data } = await newUploadPic(params);
           if (data.code == "00000") {
             file.status = 'done';
@@ -1172,7 +1073,6 @@ export default {
           params.fileType = "F03";
         }
         try {
-          console.log(params.fileType);
           const { data } = await newUploadPic(params);
           if (data.code == "00000") {
             file.status = 'done';
@@ -1285,10 +1185,6 @@ export default {
       conStat,
       updateSentImage,
       altMchSignFun,
-      idCardExpiryShow,
-      idCardExpiryOnConfirm,
-      licenseExpiryShow,
-      licenseExpiryOnConfirm,
       fieldUpdate,
       afterRead,
       deleteCertFront,
@@ -1309,12 +1205,8 @@ export default {
       bankCodePopConfirm,
       areaList,
       onConfirmBankAddress,
-      showArea,
-      onConfirm,
       showReAddress,
       onConfirmReAddress,
-      showFoundDate,
-      onConfirmFoundDate,
       showBeginDateLicense,
       showEndDateLicense,
       onConfirmEndDateLicense,