style：“优化机器排行和商户管理样式”

src/styles/merchantManage/index.less

@@ -584,16 +584,17 @@
                     }
 
                     .word12 {
-                        width: 56px;
+                        width: 80%;
                         height: 13px;
                         overflow-wrap: break-word;
+                        word-wrap: break-word;
                         color: rgba(64, 77, 116, 1);
                         font-size: 14px;
                         text-align: left;
-                        white-space: nowrap;
-                        line-height: 14px;
+                        // white-space: normal;
+                        line-height: 20px;
                         display: block;
-                        margin: 15px 0 0 32px;
+                        margin: 15px 15px 10px 32px;
                     }
                 }
 

src/styles/user/index.less

@@ -113,13 +113,15 @@
                     border-radius: 2px;
                     background: #fff;
                     border: 1px solid #dddde8;
+                    width: 60%;
                 }
 
                 .van-field__button {
                     background-color: #4d6add;
                     color: #fff;
-                    padding: 0 0.5em;
-                    margin-left: 10px;
+                    padding: 0 1em;
+                    margin-left: 15px;
+                    border-radius: 1em;
                 }
             }
         }

src/views/merchantManage/set.vue

@@ -123,10 +123,8 @@
             <span v-if="adminMchObj.bankAccountType == 4" class="word12">{{ $t('merchantManage.bankNo') }}：{{
               adminMchObj.bankChannelNo }}</span>
             <div v-if="adminType < 2">
-              <span class="word12">{{ $t('merchantManage.joinpayMch') }}：{{ adminMchObj.signStatus == '签约成功' ?
-                adminMchObj.signStatus : '未签约' }}</span>
-              <span class="word12">{{ $t('merchantManage.huifuMch') }}：{{ huifuMchObj != null && huifuMchObj.status == '2'
-                ? '签约成功' : '未签约' }}</span>
+              <span class="word12">{{ $t('merchantManage.joinpayMch') }}：{{ joinpayState }}</span>
+              <span class="word12">{{ $t('merchantManage.huifuMch') }}：{{ huifuState }}</span>
             </div>
           </div>
         </div>
@@ -157,6 +155,8 @@ export default {
     const adminMchObj = ref({});
     const huifuMchObj = ref({});
     const ifForeign = ref('0');
+    const huifuState = ref('未入驻');
+    const joinpayState = ref('未入驻');
     onMounted(async () => {
       // 加载样式
       styleUrl('merchantManage');
@@ -188,7 +188,22 @@ export default {
       const { data } = await getAdminMch({ id: merchantId.value });
       if (data.code === "00000") {
         if (data.data != null) {
+          // adminMchObj.signStatus == '签约成功' ?
+          //       adminMchObj.signStatus : '未签约'
           adminMchObj.value = data.data;
+          if (adminMchObj.value.approveStatus == '审核通过') {
+            if (adminMchObj.value.signStatus == '签约成功') {
+              joinpayState.value = adminMchObj.value.signStatus;
+            } else {
+              if (adminMchObj.value.approveNote != null && adminMchObj.value.approveNote != '') {
+                joinpayState.value = adminMchObj.value.approveNote;
+              }
+            }
+          } else {
+            if (adminMchObj.value.approveNote != null && adminMchObj.value.approveNote != '') {
+              joinpayState.value = adminMchObj.value.approveNote;
+            }
+          }
         }
       }
       // console.log('getAdminMchFun', data);
@@ -199,6 +214,14 @@ export default {
       if (data.code === "00000") {
         if (data.data != null) {
           huifuMchObj.value = data.data;
+          if (huifuMchObj.value.status == '2') {
+            huifuState.value = '签约成功';
+          } else {
+            if (huifuMchObj.value.auditDesc != null && huifuMchObj.value.auditDesc != '') {
+              huifuState.value = huifuMchObj.value.auditDesc;
+            }
+          }
+
         }
       }
       // console.log('getHuifuMchFun', data);
@@ -243,7 +266,9 @@ export default {
       adminObj,
       adminMchObj,
       huifuMchObj,
-      onSubmit
+      onSubmit,
+      joinpayState,
+      huifuState,
     };
   },
 };

src/views/robotRanking.vue

@@ -696,7 +696,7 @@ export default {
             dayChartOption.dataZoom[0]["startValue"] =
               data.data.categories[0];
             dayChartOption.dataZoom[0]["endValue"] =
-              data.data.categories[4];
+              data.data.categories[3];
             // 解决resize不起作用，配合onMounted里的方法使用
             switch (chartType) {
               case "day":