style：“优化部分英文样式”

src/assets/language/en.json

@@ -300,15 +300,15 @@
     "closed": "Closed",
     "weekday2": "weekday",
     "weekend2": "weekend",
-    "monday": "Monday",
-    "tuesday": "Tuesday",
-    "wednesday": "Wednesday",
-    "thursday": "Thursday",
-    "friday": "Friday",
-    "saturday": "Saturday",
-    "sunday": "Sunday",
+    "monday": "Mon",
+    "tuesday": "Tue",
+    "wednesday": "Wed",
+    "thursday": "Thu",
+    "friday": "Fri",
+    "saturday": "Sat",
+    "sunday": "Sun",
     "deletionSucceeded": "Deletion succeeded",
-    "commonOperations": "Remote operating equipment",
+    "commonOperations": "Remote operation",
     "equipmentNo": "Equipment No",
     "restart": "Reset machine",
     "restartFurnaceHead": "Restart furnace head",
@@ -433,7 +433,7 @@
     "alarmContentNoData": "Machine is normal, no alarm.",
     "alarmClock": "Machine alarm!",
     "eliminateAlarm": "Eliminate",
-    "editDevice": "Machine details",
+    "editDevice": "Machine information",
     "seeMore": "See more",
     "stow": "Pack up",
     "successfullyEliminatedTheAlarm": "Successfully eliminated the alarm",

src/assets/language/zh.json

@@ -305,7 +305,7 @@
     "saturday": "周六",
     "sunday": "周日",
     "deletionSucceeded": "删除成功",
-    "commonOperations": "远程操作设备",
+    "commonOperations": "远程操作",
     "equipmentNo": "设备编号",
     "restart": "机器复位",
     "restartFurnaceHead": "重启炉头",
@@ -434,7 +434,7 @@
     "alarmContentNoData": "机器正常，无报警",
     "alarmClock": "设备报警！",
     "eliminateAlarm": "消除",
-    "editDevice": "设备详细信息",
+    "editDevice": "详细信息",
     "seeMore": "查看更多",
     "stow": "收起",
     "successfullyEliminatedTheAlarm": "消除报警成功",
@@ -724,8 +724,8 @@
     "bankAccountPlaceholder": "请输入银行账号，确保无误",
     "interBankNoLabel": "联行号",
     "interBankNoPlaceholder": "请输入联行号",
-    "businessLicenseNoLabel": "营业执照编号",
-    "businessLicenseNoPlaceholder": "请输入营业执照编号",
+    "businessLicenseNoLabel": "统一社会信用代码",
+    "businessLicenseNoPlaceholder": "请输入统一社会信用代码",
     "validityOfBusinessLicenseLabel": "营业执照有效期",
     "validityOfBusinessLicensePlaceholder": "请输入营业执照有效期",
     "settlementMethod": "结算方式",

src/styles/device/index.less

@@ -2,7 +2,7 @@
   background-color: rgba(255, 255, 255, 1);
   position: relative;
   // overflow: hidden;
-  
+
   .listBox {
     width: 100%;
     // height: calc(100vh - 100px);
@@ -21,8 +21,7 @@
           .outer4 {
             width: 16px;
             height: 16px;
-            background: url("../../assets/home/titleIcon.png") top center
-              no-repeat;
+            background: url("../../assets/home/titleIcon.png") top center no-repeat;
             background-size: 100%;
           }
 
@@ -211,8 +210,7 @@
               }
 
               &.deviceOn {
-                background: url("../../assets/device/powerOn.png") 100%
-                  no-repeat;
+                background: url("../../assets/device/powerOn.png") 100% no-repeat;
                 background-size: 100%;
               }
             }
@@ -299,6 +297,7 @@
               font-size: 14px;
               width: 85%;
             }
+
             // .clickable-link:active {
             //   color: rgb(26, 49, 117);
             // }
@@ -363,11 +362,23 @@
               font-size: 14px;
               text-align: left;
               white-space: nowrap;
-              // display: block;
+            }
+
+
+            .info4 {
+              width: 60%;
+            }
+
+            .info5 {
+              overflow-wrap: break-word;
+              word-wrap: break-word;
+              color: rgba(64, 77, 116, 1);
+              font-size: 14px;
+              text-align: left;
+              max-width: 100%;
             }
 
             .editDeviceBtnCon {
-              // color: #4d6add;
 
               .box2 {
                 width: 18px;
@@ -378,12 +389,17 @@
               }
 
               .c-text-14 {
-                display: inline-block; /* 将行内文本转为块级元素 */
-                padding: 4px 7px; /* 添加内边距 */
+                display: inline-block;
+                /* 将行内文本转为块级元素 */
+                padding: 4px 7px;
+                /* 添加内边距 */
                 background-color: #df5e4c;
-                border-radius: 14px; /* 添加圆角效果 */
-                color: #fff; /* 设置文本颜色 */
-                cursor: pointer; /* 设置光标样式 */
+                border-radius: 14px;
+                /* 添加圆角效果 */
+                color: #fff;
+                /* 设置文本颜色 */
+                cursor: pointer;
+                /* 设置光标样式 */
               }
             }
 
@@ -417,8 +433,7 @@
               .outer6 {
                 width: 18px;
                 height: 18px;
-                background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng164fc6854bc0badab9c36f9e9751c42ceda02742fc5e78f7662ced4a0f76844c)
-                  100% no-repeat;
+                background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng164fc6854bc0badab9c36f9e9751c42ceda02742fc5e78f7662ced4a0f76844c) 100% no-repeat;
                 margin-left: 141px;
               }
             }
@@ -469,8 +484,7 @@
               .block1 {
                 width: 10px;
                 height: 4px;
-                background: url("../../assets/device/deviceSelect.png") 0px -1px
-                  no-repeat;
+                background: url("../../assets/device/deviceSelect.png") 0px -1px no-repeat;
                 margin-top: 7px;
               }
             }
@@ -512,15 +526,13 @@
               .section4 {
                 width: 22px;
                 height: 15px;
-                background: url(https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/be1271ed70774869b81ed2d5f43b6a44_mergeImage.png)
-                  100% no-repeat;
+                background: url(https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/be1271ed70774869b81ed2d5f43b6a44_mergeImage.png) 100% no-repeat;
                 margin: 3px 0 0 111px;
               }
 
               .section5 {
                 height: 18px;
-                background: url(https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/5723fcdad1574aef9e65c326de33d8b2_mergeImage.png)
-                  100% no-repeat;
+                background: url(https://lanhu-dds-backend.oss-cn-beijing.aliyuncs.com/merge_image/imgs/5723fcdad1574aef9e65c326de33d8b2_mergeImage.png) 100% no-repeat;
                 margin-left: 8px;
                 width: 18px;
 
@@ -570,8 +582,7 @@
             .group2 {
               width: 10px;
               height: 5px;
-              background: url("../../assets/device/deviceSelect.png") center
-                no-repeat;
+              background: url("../../assets/device/deviceSelect.png") center no-repeat;
               background-size: 100%;
 
               &.checkType {
@@ -615,4 +626,4 @@
 
 .van-dropdown-menu__title {
   color: #4d6add;
-}
+}

src/views/device/index.vue

@@ -213,14 +213,17 @@
                   }}</span>
                   <span class="info2 o-ptb-7 kBordBott">{{ $t("device.volume") }}：{{ item.volume }}</span>
                   <div class="l-flex-RC o-ptb-7">
-                    <span class="info3 o-pr-10 kBordBott">{{ $t("device.alarmContent") }}：{{
-                      item.alarmList && item.alarmList[0]
-                      ? item.alarmList[0].alarmContent
-                      : $t("device.alarmContentNoData")
-                    }}
-                    </span>
-                    <van-button v-if="item.alarmList && item.alarmList[0]" type="primary" size="small" color="#07c160"
-                      :text="$t('device.eliminateAlarm')" @click="clearAlarm(item.alarmList[0])"></van-button>
+                    <span class="info3 kBordBott">{{ $t("device.alarmContent") }}：</span>
+                    <div class="info4 l-flex-RC">
+                      <span class="info5 o-pr-10 kBordBott">{{
+                        item.alarmList && item.alarmList[0]
+                        ? item.alarmList[0].alarmContent
+                        : $t("device.alarmContentNoData")
+                      }}
+                      </span>
+                      <van-button v-if="item.alarmList && item.alarmList[0]" type="primary" size="small" color="#07c160"
+                        :text="$t('device.eliminateAlarm')" @click="clearAlarm(item.alarmList[0])"></van-button>
+                    </div>
                   </div>
                   <div class="editDeviceBtnCon l-flex-center o-mt-10">
                     <div class="l-flex-RC" @click="deviceSet(item)">

src/views/settlement/index.vue

@@ -248,6 +248,11 @@
               @update:model-value="fieldUpdate" /> -->
           </div>
           <div v-if="altMerchantType === '12'" class="requiredLeft">
+            <!-- 营业执照编号 -->
+            <van-field v-model="licenseNo" name="licenseNo" :label="$t('joinpayMch.businessLicenseNoLabel')"
+              :placeholder="$t('joinpayMch.businessLicenseNoPlaceholder')"
+              :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.businessLicenseNoPlaceholder') }]"
+              @update:model-value="fieldUpdate" />
             <!-- 营业执照有效期 -->
             <div class="van-cell van-field">
               <div class="van-cell__title van-field__label"><span>{{ $t('huifuMch.validityType') }}</span></div>
@@ -258,11 +263,6 @@
                 </van-radio-group>
               </div>
             </div>
-            <!-- 营业执照编号 -->
-            <van-field v-model="licenseNo" name="licenseNo" :label="$t('joinpayMch.businessLicenseNoLabel')"
-              :placeholder="$t('joinpayMch.businessLicenseNoPlaceholder')"
-              :rules="[{ required: bankAccountType === '4', message: $t('joinpayMch.businessLicenseNoPlaceholder') }]"
-              @update:model-value="fieldUpdate" />
             <van-field v-model="beginDateLicense" readonly name="beginDateLicense" :label="$t('huifuMch.beginDate')"
               :placeholder="$t('huifuMch.beginDatePlaceholder')" @click="showBeginDateLicense = true"
               :rules="[{ required: true, message: $t('huifuMch.beginDatePlaceholder') }]" />
@@ -787,7 +787,7 @@ export default {
           huifuParams.cardAreaId = data.data.cardAreaId;
           huifuParams.detailAddr = data.data.detailAddr;
           addParams.bankAddress = areaList.province_list[data.data.cardProvId] == areaList.city_list[data.data.cardAreaId] ? areaList.province_list[data.data.cardProvId] :
-          (areaList.province_list[data.data.cardProvId] + areaList.city_list[data.data.cardAreaId]);
+            (areaList.province_list[data.data.cardProvId] + areaList.city_list[data.data.cardAreaId]);
           if (data.data.cardFrontPic != null && data.data.legalCertBackPic != null && data.data.legalCertFrontPic) {
             huifuPicUpStatus.value = 1;
           }
@@ -797,7 +797,7 @@ export default {
             addParams.regNameValue = data.data.regName;
             addParams.shortNameValue = data.data.shortName;
             addParams.registeredAddress = areaList.province_list[data.data.regProvId] == areaList.city_list[data.data.regAreaId] ? (areaList.city_list[data.data.regAreaId] + areaList.county_list[data.data.regDistrictId]) :
-            (areaList.province_list[data.data.regProvId] + areaList.city_list[data.data.regAreaId] + areaList.county_list[data.data.regDistrictId]);
+              (areaList.province_list[data.data.regProvId] + areaList.city_list[data.data.regAreaId] + areaList.county_list[data.data.regDistrictId]);
             huifuParams.regProvId = data.data.regProvId;
             huifuParams.regAreaId = data.data.regAreaId;
             huifuParams.regDistrictId = data.data.regDistrictId;
@@ -1286,4 +1286,5 @@ export default {
 
 <style lang="less" scoped>
 @import "../../common/style/common.less";
-@import "../../styles/joinpayMch/index.less";</style>
+@import "../../styles/joinpayMch/index.less";
+</style>