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

src/main/resources/static/js/activity/attestation.js

@@ -12,7 +12,7 @@ new Vue({
             {
                 logo: '/img/activity/attestation/1.jpg',
                 name: '上海品辉医疗科技有限公司',
-                entryRoute: '/62/app',
+                entryRoute: '/4/app',
                 secondRoute: ''
             },
             {
@@ -34,8 +34,8 @@ new Vue({
             {
                 logo: '/img/activity/attestation/shuishu.jpg',
                 name: '水素水设备认证',
-                entryRoute: '/62/app',
-                secondRoute: '/approve/device?id=18'
+                entryRoute: '/4/app',
+                secondRoute: '/approve/device'
             },
             {
                 logo: '/img/activity/attestation/3.jpg',
@@ -57,7 +57,7 @@ new Vue({
                 return false
             }
             // 将要跳转的链接
-            var baseUrl = 'https://zp-b.caimei365.com' + data.entryRoute + data.secondRoute
+            var baseUrl = 'https://zp.caimei365.com' + data.entryRoute + data.secondRoute
             window.open(baseUrl, '_blank')
         }
     }

src/main/resources/static/js/product/alliance-page.js

@@ -102,7 +102,7 @@ var zplm = new Vue({
             var that = this;
             var data = {productId:that.productId}
             $.ajax({
-                url: 'https://zplma-b.caimei365.com/wx/auth/product/details',
+                url: 'https://zplma.caimei365.com/wx/auth/product/details',
                 data: data,
                 xhrFields: {//此处为跨域后台保持session一致,切勿删除!!!
                     withCredentials: true