fix：“修复优化汇付商户入驻页面”

src/assets/language/en.json

@@ -630,7 +630,7 @@
     "beneficiary": "Beneficiary"
   },
   "joinpayMch": {
-    "withdrawalAccountNo": "Withdrawal account No",
+    "withdrawalAccountNo": "Standby withdrawal account No",
     "merchantNameLabel": "Merchant name",
     "merchantNamePlaceholder": "Please enter the merchant name",
     "merchantAccountLabel": "Merchant account",
@@ -914,7 +914,7 @@
     "confirm": "confirm"
   },
   "huifuMch": {
-    "standbyWithdrawalAccountNo": "Standby withdrawal account No",
+    "standbyWithdrawalAccountNo": "Withdrawal account No",
     "merchantType": "Merchant type",
     "personal": "personal",
     "enterprise": "enterprise",

src/assets/language/zh.json

@@ -631,7 +631,7 @@
     "beneficiary": "收款人"
   },
   "joinpayMch": {
-    "withdrawalAccountNo": "提现账号",
+    "withdrawalAccountNo": "备用提现账号",
     "merchantNameLabel": "商户名称",
     "merchantNamePlaceholder": "请输入商户名称",
     "merchantAccountLabel": "商户账号",
@@ -921,7 +921,7 @@
     "confirm": "确认"
   },
   "huifuMch": {
-    "standbyWithdrawalAccountNo": "备用提现账号",
+    "standbyWithdrawalAccountNo": "提现账号",
     "merchantType": "商户类型",
     "personal": "个人",
     "enterprise": "企业",

src/utils/config.js

@@ -2,10 +2,10 @@ let baseURL;
 // 开发环境
 if (process.env.NODE_ENV === 'development') {
     // 测试的
-    // baseURL = 'http://szwltest.sunzee.com.cn:49002/'
+    baseURL = 'http://szwltest.sunzee.com.cn:49002/'
     // baseURL = 'https://szwl.sunzee.com.cn/'
     // 正式的
-    baseURL = 'https://sz.sunzee.com.cn/'
+    // baseURL = 'https://sz.sunzee.com.cn/'
     
     // baseURL = 'http://120.25.151.99:49002/'
     // 编译环境

src/views/huifuMch/index.vue

@@ -246,7 +246,7 @@
         <span>{{ $t('huifuMch.cardType') }}：{{ huifuMchCheck.cardType == '1'? $t('huifuMch.personalAccount'):$t('huifuMch.corporateAccount') }}</span>
         <span>{{ $t('huifuMch.huifuCardName') }}：{{ huifuMchCheck.cardName }}</span>
         <span>{{ $t('huifuMch.huifuCardNo') }}：{{ huifuMchCheck.cardNo }}</span>
-        <span>{{ $t('huifuMch.huifuMp') }}：{{ huifuMchCheck.mp }}</span>
+        <span v-if="huifuMchCheck.cardType == '1'">{{ $t('huifuMch.huifuMp') }}：{{ huifuMchCheck.mp }}</span>
         <span>{{ $t('huifuMch.huifuCertNo') }}：{{ huifuMchCheck.certNo }}</span>
         <span v-if="huifuMchCheck.cardType == '0'">{{ $t('huifuMch.openLicenceNo') }}：{{ huifuMchCheck.openLicenceNo }}</span>
         <span v-if="huifuMchCheck.cardType == '0'">{{ $t('huifuMch.branchCode') }}：{{ huifuMchCheck.branchCode }}</span>

src/views/huifuMch/update.vue

@@ -329,7 +329,7 @@ export default {
       if (data.code === '00000') {
         Toast({
           duration: 2000,
-          message: t('huifuMch.successSend')+'\n' + maskPhoneNumber(data.data.phone)
+          message: t('huifuMch.successSend') + '\n' + maskPhoneNumber(data.data.phone)
         });
         console.log('seedVerCodeSuccess');
         verCodeTime.time = 60;
@@ -363,6 +363,22 @@ export default {
         addParams.type = data.data.type;
         addParams.regName = data.data.regName;
         addParams.shortName = data.data.shortName;
+        if (data.data.type === "1") {
+          addParams.regDetail = data.data.detailAddr;
+          addParams.licenseCode = data.data.licenseCode;
+          addParams.servicePhone = data.data.servicePhone;
+          addParams.regProvId = data.data.provId;
+          addParams.regAreaId = data.data.areaId;
+          addParams.regDistrictId = data.data.districtId;
+          addParams.foundDate = data.data.foundDate;
+          addParams.licenseValidityType = data.data.licenseValidityType;
+          addParams.licenseBeginDate = data.data.licenseBeginDate;
+          addParams.licenseEndDate = data.data.licenseEndDate;
+          companyFoundDate.value = formatDate(data.data.foundDate);
+          beginDateLicense.value = formatDate(data.data.licenseBeginDate);
+          endDateLicense.value = formatDate(data.data.licenseEndDate);
+          registeredAddress.value = areaList.province_list[data.data.provId] + '/' + areaList.city_list[data.data.areaId] + '/' + areaList.county_list[data.data.districtId];
+        }
         addParams.name = data.data.name;
         addParams.phone = data.data.phone;
         addParams.email = data.data.email;
@@ -372,6 +388,12 @@ export default {
         addParams.areaId = data.data.areaId;
         addParams.districtId = data.data.districtId;
         addParams.detailAddr = data.data.detailAddr;
+        addParams.cardType = data.data.cardType;
+        if(data.data.cardType === "0") {
+          addParams.branchCode = data.data.branchCode;
+          addParams.openLicenceNo = data.data.openLicenceNo;
+          addParams.certAddress = data.data.certAddress;
+        }
         addParams.cardProvId = data.data.cardProvId;
         addParams.cardAreaId = data.data.cardAreaId;
         addParams.mp = data.data.mp;
@@ -415,7 +437,7 @@ export default {
     };
     return {
       ...toRefs(addParams),
-      ...toRefs( verCodeTime),
+      ...toRefs(verCodeTime),
       verCodeTime,
       sendCode,
       onSubmit,

src/views/popPayment.vue

@@ -52,8 +52,6 @@ export default {
                 console.log("order", order.value);
                 console.log("orderDetails", orderDetails.value[0]);
                 amount.value = order.value.price * 100;
-                // console.log(amount.value);
-                // price.value = order.value.price.toFixed(2);
             } else { Toast.fail(data.message); }
 
         };
@@ -63,7 +61,7 @@ export default {
         const wxPay = () => {
             WeixinJSBridge.invoke(
                 'getBrandWCPayRequest', {
-                "appId": "wxcd5b1b2636c9f611",     //公众号ID，由商户传入     
+                "appId": "wxd9c7c138a055ee66",     //公众号ID，由商户传入     
                 "timeStamp": route.query.timeStamp,         //时间戳，自1970年以来的秒数     
                 "nonceStr": route.query.nonceStr, //随机串     
                 "package": route.query.package,

src/views/user.vue

@@ -125,7 +125,7 @@
           </div>
 
           <!-- 提现帐号 -->
-          <div v-if="isInland" class="taskListRow flex-col" @click="pushPageList('/joinpayMch')">
+          <div v-if="isInland" class="taskListRow flex-col" @click="pushPageList('/huifuMch')">
             <div class="taskIcon joinPayMchIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">{{ $t("user.withdrawalAccountNo") }}</div>
@@ -141,7 +141,7 @@
           </div>
 
           <!-- 备用提现账号 -->
-          <div v-if="isInland" class="taskListRow flex-col" @click="pushPageList('/huifuMch')">
+          <div v-if="isInland" class="taskListRow flex-col" @click="pushPageList('/joinpayMch')">
             <div class="taskIcon shandeMchIcon"></div>
             <div class="taskRight">
               <div class="taskTitle">

src/views/weChatPay.vue

@@ -15,7 +15,7 @@ export default {
         const route = useRoute();
         console.log(route.query.id);
         const id = route.query.id;
-        const appId = "wxcd5b1b2636c9f611";
+      fix：“修复优化汇付商户入驻页面”        const appId = "wxd9c7c138a055ee66"; //七云公众号appID
     
         onMounted(() => {
             wxPay();
@@ -24,7 +24,7 @@ export default {
 
         const wxPay = () => {
             // 处理回调接口
-            const redirectUri = encodeURIComponent('http://szwlh.sunzee.com.cn/PAY-SERVER/tOrder/callback');
+            const redirectUri = encodeURIComponent('http://sevencloud.com.cn/PAY-SERVER/tOrder/callback');
             // const redirectUri = encodeURIComponent('http://szwltest.sunzee.com.cn/PAY-SERVER/tOrder/callback');
             const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_base&state=${id}&connect_redirect=1#wechat_redirect`;
             console.log(url)