Browse Source

Merge branch 'dev2.8.5' of http://39.105.157.10:10080/qmx/jy into dev2.8.5

wangshan 5 years ago
parent
commit
5a8f60ff16

+ 2 - 2
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/subscribe_list.css

@@ -116,7 +116,7 @@
   background-size: contain;
 }
 
-.free7days_pic:after {
+/*.free7days_pic:after {
   content: '试用7天';
   position: relative;
   top: -0.03rem;
@@ -129,7 +129,7 @@
   text-align: center;
   background-color: #CFAD89;
   border-radius: .06rem;
-}
+}*/
 
 .vip_banner .box {
   width: 100%;

+ 1 - 1
src/jfw/modules/app/src/web/templates/me/setemail/bind_success.html

@@ -19,7 +19,7 @@
 		<div class="app-layout-content-b">
 			<div class="bind_success">
 				<div class="success">
-					<img src="{{Msg "seo" "cdn"}}/wxmyemail/img/successed.png" >
+					<img src="{{Msg "seo" "cdn"}}/jyapp/myemail/img/successed.png" >
 					<p></p>
 				</div>
 				<button class="common_btn back">返回 <time class="time">()</time> </button>

+ 1 - 1
src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -756,7 +756,7 @@ function tointroducepage(){
 		<div class="vip_banner" style="">
 			<div class="box">
 				<div class="left">
-					<img src="/vipsubscribe/image/v.png" alt="v">
+					<img src="/jyapp/vipsubscribe/image/v.png" alt="v">
 					<h4>剑鱼标讯 VIP订阅</h4>
 				</div>
 				<a onclick="tointroducepage()" class="right">了解详情 &gt; </a>

+ 2 - 2
src/web/staticres/vipsubscribe/css/subscribe_list.css

@@ -115,7 +115,7 @@
   background-size: contain;
 }
 
-.free7days_pic:after {
+/*.free7days_pic:after {
   content: '试用7天';
   position: relative;
   top: 0px;
@@ -128,7 +128,7 @@
   text-align: center;
   background-color: #CFAD89;
   border-radius: .06rem;
-}
+}*/
 
 .vip_banner .box {
   width: 100%;