Merge remote-tracking branch 'origin/developer' into developer

src/main/resources/static/css/index/index_new.pc.css

@@ -52,6 +52,12 @@ li{list-style:none;}
     opacity: 0.2;
     font-size: 24px;
 }
+.quickOperation .el-icon-arrow-left:before {
+    content: "\276C";
+}
+.quickOperation .el-icon-arrow-right:before {
+    content: "\276D";
+}
 .quickOperation .el-carousel__container {
     height: 150px !important;
 }

src/main/resources/static/css/supplier-login/login-h5.css

@@ -1000,6 +1000,9 @@ video {
     padding: 5.600vw 7.467vw 1.667vw 7.467vw;
     background: url("https://static.caimei365.com/app/img/icon/supplier-h5.png") no-repeat;
 }
+.solutionDiag .el-icon-arrow-up:before {
+    content: url(/img/supplier-login/arrow-down.png);
+}
 .solutionDiag .solutioncontent .title_1 {
     color: #272727;
     font-size: 3.600vw;
@@ -1057,6 +1060,9 @@ video {
     background-size: contain;
     border: none;
 }
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
+    color: #FF5B00;
+}
 .el-select-dropdown__item {
     height: auto !important;
     white-space: normal !important;
@@ -1078,3 +1084,6 @@ video {
     background: #FF5B00;
     color: white;
 }
+.solutionDiag .el-dialog__close::before {
+    content: "\2716";
+}

src/main/resources/static/css/supplier-login/login.css

@@ -55,6 +55,9 @@ body{
 .username:hover::after{
     transform: rotate(270deg);
 }
+.username .el-popover__reference-wrapper .el-button--text {
+    color: #FF5B00;
+}
 .el-popover {
     padding: 5px !important;
     min-width: 90px !important;
@@ -65,6 +68,9 @@ body{
     justify-content: space-around;
     align-items: center;
 }
+.el-popover .cShow .a_cm {
+    color: #333;
+}
 .el-popover__reference{
     font-size: 0.8vw;
 }
@@ -366,6 +372,12 @@ body{
 #zeroPage .el-carousel__container {
     height: 26.562vw;
 }
+#zeroPage .el-carousel__container .el-icon-arrow-right::before {
+    content: "\276D";
+}
+#zeroPage .el-carousel__container .el-icon-arrow-left::before {
+    content: "\276C";
+}
 .el-carousel__item:nth-child(1) {
     display: flex;
     justify-content: center;
@@ -1634,6 +1646,12 @@ body{
 .solutionDiag .el-dialog__body {
     padding: 0 !important;
 }
+.solutionDiag .el-dialog__close::before {
+    content: "\2716";
+}
+.solutionDiag .el-icon-arrow-up:before {
+    content: url(/img/supplier-login/arrow-down.png);
+}
 .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
     display: none !important;
 }
@@ -1660,6 +1678,9 @@ body{
     background-size: contain;
     border: none;
 }
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
+    color: #FF5B00;
+}
 .el-select-dropdown__item {
     height: auto !important;
     white-space: normal !important;

src/main/resources/static/css/supplier-login/text_info.css

@@ -55,6 +55,9 @@ body{
 .username:hover::after{
     transform: rotate(270deg);
 }
+.username .el-popover__reference-wrapper .el-button--text {
+    color: #FF5B00;
+}
 .el-popover {
     padding: 5px !important;
     min-width: 90px !important;

src/main/resources/templates/components/head-link.html

@@ -11,3 +11,5 @@
     <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/base.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/base/base.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <link rel="stylesheet" href="/lib/element-ui/index.css" />
+    <link rel="stylesheet" href="/lib/element-ui/element-index.css" />

src/main/resources/templates/index.html

@@ -12,9 +12,6 @@
     <link th:href="@{/css/index/index_new.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/index/index_new.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/lib/css/swiper-bundle.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
-    <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css" />
     <template th:replace="components/analysis"></template>
 </head>
 <body>
@@ -635,8 +632,9 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script src="https://unpkg.com/vant@2.12/lib/vant.min.js"></script>
+<!--<script src="https://cdn.jsdelivr.net/npm/vant@2.10/lib/vant.min.js"></script>-->
 <script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+<script type="text/javascript" src="/lib/element-ui/vant.min.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmsMixins.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>

src/main/resources/templates/supplier-center/encyclopedia/preview.html

@@ -91,7 +91,7 @@
           <div class="line"></div>
         </div>
         <ul class="bk-literature-list">
-          <div v-for="item,index in previewFormData.referenceListStr" :key="item.id">
+          <div v-for="(item,index) in previewFormData.referenceListStr" :key="item.id">
             <li v-if="item.referenceType === 1">
               [<em>{{index + 1}}</em>]
               <i></i>
@@ -99,21 +99,21 @@
               <span>{{item.websiteName}}</span>
               <span v-if="item.acitationTimeStr">[引用日期:<span>{{item.acitationTimeStr}}</span>]</span>
             </li>
-<!--            <li v-if="item.referenceType === 2">-->
-<!--              [<em>{{index + 1}}</em>]-->
-<!--              <i></i>-->
-<!--              <span>{{item.author}}</span>-->
-<!--              <span>{{{item.workName}}</span>：-->
-<!--              <span>{{item.press}}</span>，-->
-<!--              <span>{{item.publicationYearStr}}</span>-->
-<!--            </li>-->
-<!--            <li v-if="item.referenceType === 3">-->
-<!--              [<em>{{index + 1}}</em>]-->
-<!--              <i></i>-->
-<!--              <span>{{item.referenceDescription}}</span>-->
-<!--              <span>{{item.imageDescription}}</span>-->
-<!--              <a class="image" :href="item.imageUrl" target="_blank">{{item.articleName}}</a>-->
-<!--            </li>-->
+            <li v-if="item.referenceType === 2">
+              [<em>{{index + 1}}</em>]
+              <i></i>
+              <span>{{item.author}}</span>
+              <span>{{item.workName}}</span>：
+              <span>{{item.press}}</span>，
+              <span>{{item.publicationYearStr}}</span>
+            </li>
+            <li v-if="item.referenceType === 3">
+              [<em>{{index + 1}}</em>]
+              <i></i>
+              <span>{{item.referenceDescription}}</span>
+              <span>{{item.imageDescription}}</span>
+              <a class="image" :href="item.imageUrl" target="_blank">{{item.articleName}}</a>
+            </li>
           </div>
         </ul>
       </div>

src/main/resources/templates/supplier_login/index.html

@@ -9,17 +9,18 @@
     <meta name="format-detection" content="telephone=yes" />
     <title>美业参谋</title>
     <link rel="canonical" href="https://www.caimei365.com/" />
-    <template th:replace="components/head-link"></template>
+<!--    <template th:replace="components/head-link"></template>-->
+    <link th:href="@{/css/base/base.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/base.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
+    <!--element ui 样式表-->
+    <link rel="stylesheet" href="/lib/element-ui/index.css" />
+    <link rel="stylesheet" href="/lib/element-ui/element-index.css" />
     <link th:href="@{/css/base/floor.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/index/index_new.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/index/index_new.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-login/login.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-login/login-h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
-    <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
-    <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" />
-    <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />
 </head>
 
 <body>
@@ -377,19 +378,19 @@
                     </el-carousel>
                     <div class="nextChange"  @click="prePageCar">></div>
                 </div>
-                <div class="H5_success" v-else>
-                    <van-swipe :loop="false" :width="successSideWidth">
-                        <van-swipe-item v-for="item in successList" :key="item.id" v-if="item.appStatus == '1'">
-                            <div class="innerSuccess">
-                                <div class="title">{{item.title}}</div>
-                                <div class="content" v-html="item.content"></div>
-                                <img class="success_img" :src="item.headAppBanner" />
-                            </div>
-                        </van-swipe-item>
-                    </van-swipe>
-                </div>
                 <div v-if="isPC" id="positionTab"></div>
             </div>
+            <div class="H5_success" v-else>
+                <van-swipe :loop="false" :width="successSideWidth">
+                    <van-swipe-item v-for="item in successList" :key="item.id" v-if="item.appStatus == '1'">
+                        <div class="innerSuccess">
+                            <div class="title">{{item.title}}</div>
+                            <div class="content" v-html="item.content"></div>
+                            <img class="success_img" :src="item.headAppBanner" />
+                        </div>
+                    </van-swipe-item>
+                </van-swipe>
+            </div>
         </div>
         <div id="fivePage" class="page section">
             <div class="Title" style="color: white">
@@ -575,9 +576,9 @@
 <!-- 底部区域 end -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script src="https://unpkg.com/vant@2.12/lib/vant.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+<script type="text/javascript" src="/lib/element-ui/vant.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-login/login.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier_login/text_info.html

@@ -15,11 +15,8 @@
     <link th:href="@{/css/supplier-login/text_info.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-login/login-h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
-    <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css" />
-    <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />
-    <!--    <template th:replace="components/analysis"></template>-->
+    <link rel="stylesheet" href="/lib/element-ui/index.css" />
+    <link rel="stylesheet" href="/lib/element-ui/element-index.css" />
 </head>
 
 <body>
@@ -85,9 +82,8 @@
 
 
     <script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
-    <script src="https://unpkg.com/vant@2.12/lib/vant.min.js"></script>
-    <!--<script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>-->
     <script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+    <script type="text/javascript" src="/lib/element-ui/vant.min.js"></script>
     <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-login/text_info.js(v=${version})}"></script>
 </body>