Merge branch 'dev/v4.10.7_tsz' of qmx/jy into feature/v4.10.7

src/web/staticres/common-module/vipsubscribe/css/vip-free-introduce-template.css

@@ -44,6 +44,7 @@
 }
 .product-introduce .product-introduce-text .gold {
 	color: #FAE7CA;
+  text-decoration: underline;
 }
 .product-introduce .product-introduce-content {
 	padding: .36rem .16rem;

src/web/staticres/common-module/vipsubscribe/js/vip-free-introduce-template.js

@@ -54,15 +54,34 @@ var vipFreeIntroduceNode = {
   template: vipFreeIntroduceTemplate,
   data: function () {
     return {
-      info: contrastFunctionJson
+      info: contrastFunctionJson,
+      userInfo: {}
     }
   },
   created:function () {
     console.log('vipFreeIntroduceNode created', this.info)
   },
   methods: {
+    getUserInfo() {
+      var _this = this
+      $.ajax({
+        url: '/bigmember/use/isAdd',
+        type: 'GET',
+        dataType: 'json',
+        success: function (res) {
+          if (res.error_code == 0) {
+            _this.userInfo = res.data || {}
+          }
+        }
+
+      })
+    },
     goBuyMember: function () {
-      window.location.href = '/jy_mobile/order/create/bigmember?meal=sj'
+      if(this.userInfo?.memberStatus) {
+        window.location.href = '/jy_mobile/tabbar/home'
+      } else {
+        window.location.href = '/jy_mobile/order/create/bigmember?meal=sj'
+      }
     }
   }
 }

src/web/templates/pc/subscribe_new.html

@@ -672,8 +672,27 @@
           var href = $(this).attr('data-href');
           window.open(href);
         })
+        var userInfo = {}
+        function getUserInfo() {
+          $.ajax({
+            url: '/bigmember/use/isAdd',
+            type: 'GET',
+            dataType: 'json',
+            success: function (res) {
+              if (res.error_code == 0) {
+                userInfo = res.data || {}
+              }
+            }
+
+          })
+        }
+        getUserInfo()
         $('.contrast-main-line span').click(function () {
-          location.href = '/swordfish/page_big_pc/big/pc/page/buy_commit'
+          if(userInfo && userInfo.memberStatus) {
+            location.href = '/page_workDesktop/work-bench/app/big/workspace/dashboard'
+          } else {
+            location.href = '/swordfish/page_big_pc/big/pc/page/buy_commit'
+          }
         })
 
     })