Merge branch 'iteration-new-apply' into jenkins-test

src/components/m-qrcode/index.module.less

@@ -10,15 +10,19 @@
     position: absolute;
     top: 50%;
     left: 50%;
-    margin-left: -20px;
-    margin-top: -20px;
+    margin-left: -23px;
+    margin-top: -23px;
     width: 40px !important;
     height: 40px !important;
     border-radius: 4px;
+    padding: 3px;
+    border-radius: 5px;
+    background-color: #fff;
+    box-sizing: content-box;
 
     &.small {
-      margin-left: -10px;
-      margin-top: -10px;
+      margin-left: -13px;
+      margin-top: -13px;
       width: 20px !important;
       height: 20px !important;
     }

src/helpers/utils.ts

@@ -5,15 +5,14 @@ import qs from 'query-string';
 export function vaildMusicScoreUrl() {
   const url: string = window.location.href;
   let returnUrl = '';
-  if (/kt.colexiu.com/.test(url)) {
-    returnUrl = 'https://mec.colexiu.com';
-  } else if (/test/.test(url)) {
-    // dev 环境
+  if (/test/.test(url) || /localhost/.test(url)) {
+    // test 环境
     returnUrl = 'https://test.kt.colexiu.com';
   } else if (/dev/.test(url)) {
     returnUrl = 'https://dev.kt.colexiu.com';
+  } else if (/kt.colexiu.com/.test(url)) {
+    returnUrl = 'https://mec.colexiu.com';
   } else {
-    // 默认dev环境
     returnUrl = 'https://mec.colexiu.com';
   }
   return returnUrl;

src/views/tenantAllData/index.module.less

@@ -54,14 +54,19 @@
     margin-top: 18px;
 
     .cardItem {
+      flex: 1;
       padding: 8px 16px;
-      width: 110px;
+      // width: 110px;
       height: 70px;
       background: #ffffff;
       border-radius: 10px;
       overflow: hidden;
       position: relative;
 
+      &+.cardItem {
+        margin-left: 8px;
+      }
+
       .cardLine {
         width: 6px;
         height: 70px;