提交更改

src/jfw/modules/app/src/web/staticres/jyapp/course/css/order_list.css

@@ -860,7 +860,7 @@ button[disabled] {
 
 #order_list .main .tabs .card .card-content .media {
   display: flex;
-  background: #F5F4F9;
+  /* background: #F5F4F9; */
   padding: .22rem .2rem;
   margin: .16rem .3rem;
 }
@@ -937,8 +937,9 @@ button[disabled] {
 }
 
 #order_list .main .tabs .card .card-footer .cancle {
-  border: 1px solid #2cb7ca;
-  color: #2cb7ca;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  /* color: #2cb7ca; */
+  color: #5F5E64;
   background: transparent;
   margin-right: .16rem;
 }

src/jfw/modules/app/src/web/staticres/jyapp/css/myorder/order_list.css

@@ -808,12 +808,14 @@ button[disabled] {
 
 #order_list .main .tabs .card .card-header .time {
     font-size: .24rem;
+    white-space: nowrap;
 }
 
 #order_list .main .tabs .card .card-header .status {
     font-size: .3rem;
     display: flex;
     align-items: center;
+    white-space: nowrap;
 }
 
 #order_list .main .tabs .card .card-header .notpay {
@@ -860,7 +862,7 @@ button[disabled] {
 
 #order_list .main .tabs .card .card-content .media {
     display: flex;
-    background: #F5F4F9;
+    /* background: #F5F4F9; */
     padding: .22rem .2rem;
     margin: .16rem .3rem;
 }
@@ -945,8 +947,8 @@ button[disabled] {
 }
 
 #order_list .main .tabs .card .card-footer .cancle {
-    border: 1px solid #2cb7ca;
-    color: #2cb7ca;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    color: #5F5E64;
     background: transparent;
     margin-right: .16rem;
 }

src/jfw/modules/app/src/web/staticres/jyapp/me/css/mine.css

@@ -66,16 +66,19 @@
   position: relative;
 }
 
-.mine .user .vip .crown {
-  position: absolute;
-  top: -0.08rem;
-  right: -0.08rem;
-  width: .32rem;
-  height: .27rem;
-  transform: rotate(10deg);
-  z-index: 99;
-  background: url(data:img/jpg;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAbCAYAAAAdx42aAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAIfSURBVHgBvVf/UcIwFH6p/OtZJzBOQJnAbiBOAE4ATABMQJkA2MANqBNQJrAb2IO/JX6vjXdVW5qE6neXC2mbvO/9ynsIAo775fSk1EwQxR9KPd32Jhn9Ezrvu0XIwnmhiEJMQ4yILIFzfEwBRmKjgIeR/nhmrT2ES0+IN4wtxo7Xpns9sE1hgWdoH2OeY70me4wxfP1bUmFFI3T0/KKUipkMuSFtWDcSiGC6LuYeuWEN6wVCiAcosrGxIscAXQlxhyk47qMFWQL+HrLf8TP2g/E9hM9s9ucElPbfSdGYU9JkI2fPIYk46FZU+F2SAzw9y68HnJKH/XJA9YIlBK844nXaXoSOzl+//BB+XMMS8ro7mpcEh3DVAEKHitoDB6GsepFbIomkEJTBNUMm2abgMgG/7mWu7V9ILYFjQFI78MkBrRFAUN6QA5iAE/MKBOSADiK725KbpclHOuv6GPnVzxZoq/b7nKp0XjhXzR1fXlw9+XsPDcgEKbfkangpGVhz1EBC0ndLhYJ+s2Rf8v3+SO4Bmuru6pWKBiXRZ/u6bkgM3C+qJ86dwtqgwk1FC1euFjihwtKsJMdAJkx2gkgfzLlSSnIEu1hV9JtGBEpEZiBiVC3LYM0huLLPtCKgSYSlEtyEvN2D8LjuA2sCmgSn0/YcCQjeYBo3dchOBBpIZLq5NWrtnQnUkEhORaClpmdcRECT4GZ0pYqcn9n+q/oESNf9AgIjAS4AAAAASUVORK5CYII=) no-repeat;
-  background-size: .32rem .27rem;
+.mine .user .crown {
+  max-width:5rem!important;
+  /* position: absolute; */
+  /* top: -0.08rem; */
+  /* right: -0.08rem; */
+  /* display: inline-block; */
+  /* width: .4rem; */
+  /* height: .4rem; */
+  /* transform: rotate(10deg); */
+  /* z-index: 99; */
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAALzSURBVHgB7VhdctowEF5RnltygjgnqDlByAnaG0BPEDhBkxMAM30POUHpCeqeAOelr3FPEKftTB9KrX4LMngceSUi8uZvhmAk7frTav8UohYtWohQdAQ8rKbRK6VuNFGMnz0oTf5p/eGkP8koEMEEmVxHqRUTq03lhdYXIJlSADoUCFjuIz0lx+hhbkqBCCaIY30vzMUUiGCCL41ggnBiyceWFIhgghyt+MosUxmC5JoC0a3+QEQOuh31TmuKlaJ0Xej5MVKFBLyz1+10LrXW7K85NjyvRv4uzfy+mw8xuajJZyZVZA3KY6SYz3iMyA6XPKeor3V5yEwgM9sR5F1g4T1Z0gUn3dfx+IIsu4aiK/IAdF+ti+K2TvRnOuPkPrKIcA49w/q8POJNBbAph4KBIRXxOrjAeaFpBAXW9TbwRkByDEJLnNIXDGV8jEKKYt0DfJbdykAjHtOZ3r+MnoseWwtER0ana33Of0qCiRnwtopF2RKW+lEOgMgpba0Q0eHIyKSvXZDgCHl30wNJsq9wU2DNd5Jv++pUNYURvkaooeel70kwihY1+Q3KgMBRMsGI3EiLrX8uqsFk7WZM+N+Tm+AJRxo//7qbTeGf49oSb7cx6Sipj1sridlBTg6U5Bic3C1LfI82t5EjEkqdMbeIP98/nZbPXPIgM9fbgDsIWqjnXUGOhYbCPK3/rvlIJ/xsrL47Yi6bCr2i8vBlLRijsaP29UPaNwWJraRBzwx6LiUFkO83dd5iy39ABJbIzH3kuiTrsdHsTTw+a5oU2y0fP6whMrV1VyY8uqFEmnT1g8+68MBiD75rYYRv0rwUJAzO5jeC8rLL6dE+pXDqSco1HCwkI5EmnddOyQ+ridqGpn6vghT+1ycBLgtu/LApCvnlIMERnFc+bEluy95yW0Zysna6kJMgbY+gKU2UHfUT+LRlPkHoc2lK6OWQuBY4CW58TOtbOjKK7eXIWe+9/zfzuJouSKkhHQEgx/eTEbVo0SIc/wFjc26mXIN39AAAAABJRU5ErkJggg==) no-repeat center right;
+  background-size: .4rem .4rem;
+  padding-right: .3rem;
 }
 
 .mine .user .vip .vip_sign {
@@ -100,6 +103,11 @@
   font-size: .4rem;
   line-height: .58rem;
   color: #33373C;
+  display: inline-block;
+  max-width:3.6rem;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 .mine .user .user_info .set_phone, .mine .user .user_info .user_phone {
@@ -142,7 +150,9 @@
 }
 
 .mine .user .u_right {
-  width: 1.26rem;
+  /* width: 1.26rem; */
+  white-space: nowrap;
+  padding: 0 .2rem;
   height: .48rem;
   line-height: .48rem;
   text-align: center;

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_index_new.js

@@ -264,6 +264,35 @@ $(function () {
         $('.coupon-picker').hide()
     })
 
+    // 关键词匹配方式
+    var defaultVal = $('.match-way-value').text()
+    var $iosActionsheet = $('#iosActionsheet');
+    var $iosMask = $('#iosMask');
+    function hideActionSheet() {
+        $iosActionsheet.removeClass('weui-actionsheet_toggle');
+        $iosMask.fadeOut(200);
+    }
+    $iosMask.on('click', hideActionSheet);
+    $('#iosActionsheet .weui-actionsheet__cell').each(function(index,item){
+      var t = $(item).children().text().trim();
+      // console.log(t,$(this))
+      if (t == defaultVal) {
+        $(this).addClass('active')
+      }
+    })
+    $('#iosActionsheetCancel').on('click', hideActionSheet);
+    $('body').on('click', '.match-way', function(){
+      $iosActionsheet.addClass('weui-actionsheet_toggle');
+      $iosMask.fadeIn(200);
+    })
+    $('#iosActionsheet .weui-actionsheet__cell').on('click',function(){
+      $(this).addClass('active').siblings().removeClass('active');
+      $iosActionsheet.removeClass('weui-actionsheet_toggle');
+      $iosMask.fadeOut(200);
+      console.log($(this).children('.cell_title').text())
+      $('.match-way-value').text($(this).children('.cell_title').text())
+    })
+    
     
     $('body').on('click', '.jy-dialog .weui-mask', function () {
         pickerShow('.jy-dialog', false)
@@ -886,35 +915,6 @@ $(function () {
         })
     })
 
-    // 关键词匹配方式
-    var defaultVal = $('.match-way-value').text()
-    var $iosActionsheet = $('#iosActionsheet');
-    var $iosMask = $('#iosMask');
-    function hideActionSheet() {
-        $iosActionsheet.removeClass('weui-actionsheet_toggle');
-        $iosMask.fadeOut(200);
-    }
-    $iosMask.on('click', hideActionSheet);
-    $('#iosActionsheet .weui-actionsheet__cell').each(function(index,item){
-      var t = $(item).children().text().trim();
-      // console.log(t,$(this))
-      if (t == defaultVal) {
-        $(this).addClass('active')
-      }
-    })
-    $('#iosActionsheetCancel').on('click', hideActionSheet);
-    $('body').on('click', '.match-way', function(){
-      $iosActionsheet.addClass('weui-actionsheet_toggle');
-      $iosMask.fadeIn(200);
-    })
-    $('#iosActionsheet .weui-actionsheet__cell').on('click',function(){
-      $(this).addClass('active').siblings().removeClass('active');
-      $iosActionsheet.removeClass('weui-actionsheet_toggle');
-      $iosMask.fadeOut(200);
-      console.log($(this).children('.cell_title').text())
-      $('.match-way-value').text($(this).children('.cell_title').text())
-    })
-
 });
 
 function clearSessionStorage() {

src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -1770,10 +1770,10 @@
 		                        	if((vip_status=="-2")&&(obj.lastbuy_code!=undefined)){
 		                        		iconHtml+='<div class="card-footer">'
                                 if (applybill_status ==0){
-          												+'<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a><a  onclick="renewalOrBuyAgain(2,this)" class="btn cancle green-btn">再次购买</a>'
+          												+'<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a><a  onclick="renewalOrBuyAgain(2,this)" class="btn green-btn">再次购买</a>'
           											}
                                 if (applybill_status ==1){
-                                  +'<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a><a  onclick="renewalOrBuyAgain(2,this)" class="btn cancle green-btn">再次购买</a>'
+                                  +'<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a><a  onclick="renewalOrBuyAgain(2,this)" class="btn green-btn">再次购买</a>'
                                 }
 										iconHtml+='</div>'
 		                        	}else if((vip_status=="2")&&(obj.lastbuy_code!=undefined)){
@@ -1781,12 +1781,12 @@
 													if(way !== "trial"){
 														if (applybill_status ==0){
 															iconHtml+='<div class="card-footer">'
-																+'<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a><a  onclick="renewalOrBuyAgain(1,this)" class="btn cancle">续费</a>'
+																+'<a  onclick="invoiceAdd(this)" class="btn  gray-btn">开发票</a><a  onclick="renewalOrBuyAgain(1,this)" class="btn green-btn">续费</a>'
 																+'</div>'
 														}
 														if (applybill_status ==1){
 															iconHtml+='<div class="card-footer">'
-																	+'<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a><a  onclick="renewalOrBuyAgain(1,this)" class="btn cancle">续费</a>'
+																	+'<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a><a  onclick="renewalOrBuyAgain(1,this)" class="btn green-btn">续费</a>'
 																	+'</div>'
 														}
 													}
@@ -2404,7 +2404,7 @@
 							}else{
 								iconHtml+='<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a>'
 							}
-							iconHtml+='<a  onclick="renewalOrBuyAgain_ent(1,this)" class="btn cancle green-btn">再次购买</a>'
+							iconHtml+='<a  onclick="renewalOrBuyAgain_ent(1,this)" class="btn green-btn">再次购买</a>'
 									+'</div>'
 						}else if(ent_status==true){
 							iconHtml+='<div class="card-footer">'
@@ -2413,7 +2413,7 @@
 							}else{
 								iconHtml+='<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a>'
 							}
-							iconHtml+='<a  onclick="renewalOrBuyAgain_ent(2,this)" class="btn cancle green-btn">续费</a>'
+							iconHtml+='<a  onclick="renewalOrBuyAgain_ent(2,this)" class="btn green-btn">续费</a>'
 							+'</div>'
 						}else if (ent_status==undefined){
 							iconHtml+='<div class="card-footer">'

src/jfw/modules/app/src/web/templates/me/mine.html

@@ -162,8 +162,8 @@ color:#1d1d1d;
                         <img id="head_img" style="border-radius:50%;" class="avatar"  src="" onerror="this.src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/persional/my_head.png?v={{Msg "seo" "version"}}'">
                         <!-- 开通vip 显示 crown、vip_sign DOM-->
                         <!-- <img class="crown" style="display:none" src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/me/images/mine/crown.png?v={{Msg "seo" "version"}}" alt=""> -->
-                        <span class="crown" style="display:none"></span>
-                        <div class="vip_sign" style="display:none" >vip</div>
+                        <!-- <span class="crown" style="display:none"></span> -->
+                        <!-- <div class="vip_sign" style="display:none" >vip</div> -->
                     </div>
                     <div class="user_info">
                         <span class="user_name"></span>
@@ -432,10 +432,12 @@ color:#1d1d1d;
 		  $.post("/subscribepay/orderListDetails/isVip?v="+nowTimestamp,{},function(data){
           if(!data.isvip){
             $(".govip").show();
+            $('.user_name').removeClass('crown')
           }else{
             //crown、vip_sign
-            $(".crown").show();
-            $(".vip_sign").show();
+            // $(".crown").show();
+            // $(".vip_sign").show();
+            $('.user_name').addClass('crown')
             $(".mine .user .vip").css("border", "2px solid #F1D090");
           }
 				})

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -386,7 +386,7 @@
 				      },200)
 				$(".app-content").css("justify-content","flex-start");
 				$(".switch").addClass("only-personal");
-                $(".switch>span").text("免费试用 VIP");
+                $(".switch>span").text("免费试用 超级订阅");
                 $(".switch").click(tointroducepage);
                 $(".switch_ext").click(tointroducepage);
                 thisClass.InitPersonal(r);

src/web/staticres/wx_course/css/order_list.css

@@ -808,12 +808,14 @@ button[disabled] {
 
 #order_list .main .tabs .card .card-header .time {
   font-size: .24rem;
+  white-space: nowrap;
 }
 
 #order_list .main .tabs .card .card-header .status {
   font-size: .3rem;
   display: flex;
   align-items: center;
+  white-space: nowrap;
 }
 
 #order_list .main .tabs .card .card-header .notpay {
@@ -860,7 +862,7 @@ button[disabled] {
 
 #order_list .main .tabs .card .card-content .media {
   display: flex;
-  background: #F5F4F9;
+  background: #fff;
   padding: .22rem .2rem;
   margin: .16rem .3rem;
 }
@@ -937,8 +939,8 @@ button[disabled] {
 }
 
 #order_list .main .tabs .card .card-footer .cancle {
-  border: 1px solid #2cb7ca;
-  color: #2cb7ca;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  color: #5F5E64;
   background: transparent;
   margin-right: .16rem;
 }

src/web/staticres/wx_dataExport/css/order_list.css

@@ -860,7 +860,7 @@ button[disabled] {
 
 #order_list .main .tabs .card .card-content .media {
     display: flex;
-    background: #F5F4F9;
+    background: #fff;
     padding: .22rem .2rem;
     margin: .16rem .3rem;
 }
@@ -945,8 +945,8 @@ button[disabled] {
 }
 
 #order_list .main .tabs .card .card-footer .cancle {
-    border: 1px solid #2cb7ca;
-    color: #2cb7ca;
+    border: 1px solid rgba(0, 0, 0, 0.1);
+    color: #5F5E64;
     background: transparent;
     margin-right: .16rem;
 }

src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -1126,7 +1126,7 @@
                         } else {
                             iconHtml += '<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a>'
                         }
-                        iconHtml += '<a  onclick="renewalOrBuyAgain(2,this)" class="btn cancle green-btn">再次购买</a></div>'
+                        iconHtml += '<a  onclick="renewalOrBuyAgain(2,this)" class="btn  green-btn">再次购买</a></div>'
                     } else if ((vip_status == "2") && (obj.lastbuy_code != undefined)) {
 						if(obj.pay_way !== "trial"){
 							iconHtml += '<div class="card-footer">'
@@ -1135,7 +1135,7 @@
 							} else {
 							    iconHtml += '<a  onclick="checkinvoice(this)" class="btn  gray-btn">查看发票</a>'
 							}
-							iconHtml += '<a  onclick="renewalOrBuyAgain(1,this)" class="btn cancle">续费</a></div>'
+							iconHtml += '<a  onclick="renewalOrBuyAgain(1,this)" class="btn green-btn">续费</a></div>'
 						}
                     } else if ((vip_status == "-2") && (obj.lastbuy_code == undefined)) {
                         iconHtml += '<div class="card-footer">'

src/web/templates/weixin/my.html

@@ -78,7 +78,7 @@
             <a class="menu_list vip" id="menu_list_vip">
                 <div class="menu_list_left">
                     <img src="/images/wx/persional/my_vip.png" alt="">
-                    <span>VIP订阅</span>
+                    <span>超级订阅</span>
                 </div>
                 <img class="arrow_right" src="/images/wx/persional/my_arrow_right.png" alt="">
             </a>