导航栏高亮修复，支付成功页面跳转功能修改

src/main/resources/config/dev/application-dev.yml

@@ -53,7 +53,7 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: http://192.168.2.67:8008
+  spiServer: http://192.168.2.81:8008
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

src/main/resources/static/css/pay/caimei-success.css

@@ -19,7 +19,7 @@
     .pay-content .success-text .tx1{line-height: 60px;font-size: 30px;color: #FF2A2A;text-align: center;font-weight: 600;}
     .pay-content .success-text .tx2{line-height: 40px;font-size: 16px;color: #333;text-align: center;}
     .pay-content .success-text .tx2 span{color: #FF2A2A;}
-    .pay-content .success-text .tx2 a{color: #e15616;margin-left: 10px;}
-    .pay-content .success-text .tx2 a:hover{text-decoration: underline;}
+    .pay-content .success-text .tx2 a{color: #e15616;}
+    .pay-content .success-text .tx2 a:hover{text-decoration: underline;color:#FF2A2A}
 
 }

src/main/resources/static/js/base.js

@@ -216,7 +216,9 @@ var globalHead = new Vue({
                 }
             })
         }
+        console.log('hello')
         _self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
+        // _self.nav_linkName = window.localStorage.getItem('name');
         setTimeout(function(){
             $('.navBox li').each(function () {
                 var _thisName = $(this).find('a').text();

src/main/resources/static/js/pay/caimei-success.js

@@ -64,19 +64,20 @@ var payContainer = new Vue({
                     }
                     break;
                 default:
-                    _self.linkText = '回到首页';
+                    _self.linkText = '采美商城首页';
                     _self.openLink = '/index.html';
             }
             _self.isRequest = true;
-            var timeClock = setInterval(function(){
-                _self.maxtime--;
-                if (_self.maxtime == 0) {
-                    window.location.href = _self.openLink;
-                    clearInterval(timeClock);
-                    _self.maxtime = 10;
-                    _self.isRefresh = true;
-                }
-            },1000);
+            //自动跳转
+            // var timeClock = setInterval(function(){
+            //     _self.maxtime--;
+            //     if (_self.maxtime == 0) {
+            //         window.location.href = _self.openLink;
+            //         clearInterval(timeClock);
+            //         _self.maxtime = 10;
+            //         _self.isRefresh = true;
+            //     }
+            // },1000);
         },
         toFixedFn:function(text){//处理小数点后两位数
             return Number(text).toFixed(2);

src/main/resources/static/js/product/instruement.js

@@ -14,6 +14,7 @@
             userId:'',
             source:1
          },
+         nav_linkName:''
     },
     filters:{
          NumFormat:function(value) {//处理金额
@@ -48,7 +49,7 @@
             }
         },
         toserch:function(item){
-            window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeID+'&typeSort='+this.typeSort
+            window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeID+'&typeSort='+this.typeSort+'&name='+this.nav_linkName
         },
         seeMore:function(page){
              page.isPageMore = !page.isPageMore;
@@ -148,6 +149,8 @@
     },
     mounted: function(){
         var _self = this;
+         _self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
+         console.log(_self.nav_linkName);
          var userInfo = localStorage.getItem('userInfo');
          if(userInfo){
              this.params.userId = JSON.parse(userInfo).userId;

src/main/resources/templates/pay/caimei-success.html

@@ -23,7 +23,8 @@
             </div>
             <div class="success-text"><p class="tx1">{{isSuccessText}}</p></div>
             <div class="success-text"><p class="tx2">付款金额: <span>￥{{payAmount | NumFormat}}</span> </p></div>
-            <div class="success-text"><p class="tx2"><span>{{maxtime}}s</span>后自动跳转到{{linkText}}<a :href="openLink">立即跳转</a></p></div>
+            <!-- <div class="success-text"><p class="tx2"><span>{{maxtime}}s</span>后自动跳转到{{linkText}}<a :href="openLink">立即跳转</a></p></div>-->
+            <div class="success-text"><p class="tx2">点击<a :href="openLink">立即跳转</a>到{{linkText}}</p></div>
     </div>
 </div>
 <!-- 引入底部 -->