Merge branch 'master' into cpq-dev

src/assets/less/home.less

@@ -47,10 +47,9 @@
     }
 
     .wrap {
-      border-radius: 10px;
       background: #fff;
       padding: 20px 30px;
-      box-shadow: 0px 0px 15px 0px #544beb17;
+      box-shadow: 0px 0px 15px 0px @primary-color;
       height: 145px;
       display: flex;
       flex-direction: column;
@@ -72,7 +71,6 @@
 
       .btn_self {
         font-size: 14px;
-        border-radius: 0;
         height: auto;
         padding: 3px 30px;
         margin-top: 6%;
@@ -103,7 +101,6 @@
   .r4 {
     background: #fff;
     padding: 20px 20px 0 20px;
-    border-radius: 10px;
 
     .title {
       font-size: 15px;
@@ -166,19 +163,18 @@
   .r5 {
     background: #fff;
     padding: 10px;
-    border-radius: 10px;
     margin: 0 !important;
 
     .wrap {
-      box-shadow: 0px 2px 4px 0px rgba(84, 75, 235, .3);
+      box-shadow: 0px 2px 4px 0px @primary-color;
       padding: 15px;
-      border-radius: 10px;
       overflow: hidden;
       background: #fff;
+      border-radius: 10px;
       transition: all .3s;
 
       &.blue {
-        box-shadow: 0px 2px 4px 0px rgba(88, 203, 168, .3);
+        box-shadow: 0px 2px 4px 0px @primary-color;
       }
 
       &.effect:hover {
@@ -226,7 +222,6 @@
         position: relative;
 
         .ant-btn {
-          border-radius: 0;
           border: none;
           margin-right: 10px;
         }
@@ -257,7 +252,6 @@
     }
 
     .box {
-      border-radius: 10px;
       text-align: center;
       min-height: 180px;
       display: flex;
@@ -299,7 +293,6 @@
   .r6 {
     background: #fff;
     padding: 10px 5px;
-    border-radius: 10px;
     margin: 0 !important;
 
     .ant-col:not(:last-child) .wrap:after {
@@ -318,7 +311,6 @@
       background: #fff;
       transition: all .3s;
       cursor: pointer;
-      border-radius: 10px;
 
       &:hover {
         background: #f1f8ff;
@@ -339,7 +331,6 @@
   .r7 {
     background: #fff;
     padding: 15px 5px;
-    border-radius: 10px;
     margin: 0 !important;
 
     .ant-col {
@@ -353,7 +344,6 @@
         background: #f1f8ff;
         float: left;
         padding: 0px 20px;
-        border-radius: 50%;
         width: 70px;
         height: 70px;
         text-align: center;

src/views/adweb/data/trafficAnalysis.vue

@@ -60,8 +60,8 @@
             <a-row class="r5-1">
               <a-col :span="24">
                 <div class="fr" v-if="coreDataChart.x.length > 0">
-                  <span><i style="background: #544BEB;"></i>UV</span>
-                  <span><i style="background: #F0B358;"></i>PV</span>
+                  <span><i style="background: #544BEB;"></i>访客数（UV）</span>
+                  <span><i style="background: #F0B358;"></i>浏览量（PV）</span>
                   <span><i style="background: #58CCA8;"></i>询盘数</span>
                 </div>
                 <area-chart v-if="coreDataChart.x.length > 0"
@@ -83,7 +83,7 @@
                 <img src="@/assets/trafficAnalysis/avgVisitTime.svg" />
                 <div class="fr">
                   <p>平均访问时长</p>
-                  <p style="font-size: 25px;">{{ statistics.averageVisitDuration }}s</p>
+                  <p style="font-size: 25px;">{{ statistics.averageVisitDuration }}</p>
                 </div>
               </div>
             </a-col>
@@ -673,7 +673,7 @@ const setTime = (time) => {
   margin: 0 !important;
 
   .wrap {
-    box-shadow: 0px 2px 4px 0px rgba(84, 75, 235, .3);
+    box-shadow: 0px 2px 4px 0px @primary-color;
     padding: 15px;
     border-radius: 10px;
     overflow: hidden;
@@ -681,7 +681,7 @@ const setTime = (time) => {
     transition: all .3s;
 
     &.blue {
-      box-shadow: 0px 2px 4px 0px rgba(88, 203, 168, .3);
+      box-shadow: 0px 2px 4px 0px @primary-color;
     }
 
     &.effect:hover {

src/views/adweb/keywords/SeoKeywordsList.vue

@@ -286,7 +286,8 @@ function downloadTemplate() {
 
 <style scoped>
 .r1 {
-  margin: 20px;
+  margin-left: 20px;
+  margin-top: 20px;
   .choose-site {
     display: flex;
   }

src/views/adweb/seo/SeoKeywordsRankList.vue

@@ -3,7 +3,7 @@
     <a-row class="r1">
       <a-col :span="24">
         <div class="choose-site">
-          <span class="t1">{{ siteinfo.length > 1 ? "请选择站点：" : "套餐：" }}</span>
+          <span class="t1">{{ siteinfo.length > 1 ? "站点：" : "套餐：" }}</span>
           <select-site v-if="siteinfo.length > 1" @set-site-info="changeSite" selectWidth="300px" />
           <span style="margin-left: 16px"
                 class="t1">{{ (selectSiteInfo.planName && selectSiteInfo.planType !== "STATIONCONSTRUCTION") ? selectSiteInfo.planName : "暂无SEO推广套餐~"