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

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_introduce.css

@@ -575,7 +575,7 @@ body .j-container {
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-top: .08rem;
+  margin-top: .24rem;
 }
 .vip_introduce .split-box--before::before{
   content: "";

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html

@@ -19,11 +19,8 @@
     <link rel="stylesheet" type="text/css" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.css' />
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/css/vip_introduce.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
-<<<<<<< HEAD
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/css/vip-free-introduce-template.css?v={{Msg "seo" "version"}}">
-=======
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
->>>>>>> master
         <style>
         .pop-tip-group.tip-box > div,
         .pop-tip-group.active > div{
@@ -157,16 +154,12 @@
     </div>
 </div>
 <script src='https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js'></script>
-<<<<<<< HEAD
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js> </script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/js/contrast_function.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/js/vip-free-introduce-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/vip_introduce.js?v={{Msg "seo" "version"}}'></script>
-=======
-<script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/plugins/js/jy-bind-phone.umd.js?v={{Msg "seo" "version"}}'></script>
->>>>>>> master
 <script>
     {{$ss1:=(Ad "app-banner-data-info" -1 .Host (cookie "SESSIONID"))}}
     var headerImageList={{$ss1}}

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

@@ -33,7 +33,7 @@
 	padding: 0 .12rem;
 	font-size: .3rem;
 	line-height: .48rem;
-	color: #FAE7CA;
+	color: #FFFFFF;
 }
 .product-introduce .product-introduce-text {
 	margin-top: .16rem;
@@ -52,6 +52,7 @@
 
 .introduction-card {
 	border-radius: .24rem;
+  overflow: hidden;
 }
 .introduction-card .head-list {
 	display: flex;
@@ -122,7 +123,7 @@
 	width: 100%;
 	height: 100%;
 	content: '';
-	background: url(../image/icon/icon-red-close.png) no-repeat center;
+	background: url(../image/icon/icon-gray-close.png) no-repeat center;
 	background-size: .4rem .4rem;
 }
 .introduction-card .body-list .body-item .product-free .free-class.right, .introduction-card .body-list .body-item .product-vip .free-class.right {
@@ -134,7 +135,7 @@
 	width: 100%;
 	height: 100%;
 	content: '';
-	background: url(../image/icon/right.png) no-repeat center;
+	background: url(../image/icon/icon-gold-right.png) no-repeat center;
 	background-size: .48rem .48rem;
 }
 .introduction-card .body-list .body-item .product-free .vip-class.right, .introduction-card .body-list .body-item .product-vip .vip-class.right {
@@ -146,7 +147,7 @@
 	width: 100%;
 	height: 100%;
 	content: '';
-	background: url(../image/icon/right.png) no-repeat center;
+	background: url(../image/icon/icon-gold-right.png) no-repeat center;
 	background-size: .48rem .48rem;
 }
 .introduction-card .body-list .body-item .product-free {

src/web/staticres/vipsubscribe/css/vip_introduce.css

@@ -568,7 +568,7 @@ body {
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-top: .08rem;
+  margin-top: .24rem;
 }
 .vip_introduce .split-box--before::before{
   content: "";