Răsfoiți Sursa

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

zhangxinlei1996 5 ani în urmă
părinte
comite
9df3edd4ef

+ 10 - 1
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_update.css

@@ -532,7 +532,7 @@
   float: left;
   width: 5rem;
   height: 100%;
-  color: #686868;
+  color: #000;
   font-size: 0.28rem;
   text-align: right;
   overflow: hidden;
@@ -541,6 +541,15 @@
   background-color: transparent;
 }
 
+.vip_update .choose_condition .chooseList .choose_item a .info::placeholder,
+.vip_update .choose_condition .pay_mode .choose_item a .info::placeholder {
+  color: #000;
+}
+
+.choose_item input:disabled, .choose_item input[disabled]{
+  opacity: 1;
+}
+
 .vip_update .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_update .choose_condition .pay_mode .choose_item a i.iconfont, .vip_renew .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_renew .choose_condition .pay_mode .choose_item a i.iconfont {

+ 2 - 2
src/jfw/modules/app/src/web/templates/vipsubscribe/choose_area_upgrade.html

@@ -800,8 +800,8 @@
             	let areas = JSON.parse(sessionStorage.vipSubSelectAreaUpgrade);
             	for(var province in areas){
             		if(province === "全国"){
-            			console.log("23123")
-              			$(".other").trigger("click");
+            			$(".other").prop("checked",true);
+              			AreaChoose.reset();
             		}
             	}
             }

+ 7 - 9
src/jfw/modules/app/src/web/templates/vipsubscribe/renew_pay.html

@@ -21,15 +21,15 @@
 	body,html {
 		height: 100%;
 	}
-	::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-	  	color: #686868;
-	}
 	.vip_update .fixed-bottom-box, .vip_renew .fixed-bottom-box {
 	    width: 100%;
 	    position: static;
 	    bottom: 0;
 	    left: 0;
 	}
+	::-webkit-input-placeholder{
+		color: #000;
+	}
 </style>
 <body class="no-touch">
 	<div class="app-layout-header">
@@ -70,7 +70,7 @@
                 <li class="choose_item select_cycle">
                     <a href="javascript:;">
                         <span class="label">延长订阅周期</span>
-                        <input type="text" value="" onfocus="this.blur();" placeholder="选择年、月" class="info choose_time">
+                        <input type="text" value="" disabled placeholder="选择年、月" class="info choose_time">
                         <!-- <span class="info choose_time">选择年、月</span> -->
                         <i class="iconfont icon-arrow choose_time"></i>
                     </a>
@@ -751,11 +751,9 @@
 	        }
 	    	//
 	    	let payTypes = sessionStorage.payTypes;
-            let payType = "";
-            if(payTypes === "wx"){
-            	payType = "wx_app";
-            }else if(payTypes === "alipy"){
-            	payType = "alipy_app";
+            let payType = "wx_app";
+            if(payTypes === "alipy"){
+            	payType = "ali_app";
             }
 	        $(".save_renew").attr("disabled","disabled");
 	    	var param = {

+ 11 - 13
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_upgrade.html

@@ -14,7 +14,7 @@
     <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" href="/jyapp/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}4">
+    <link rel="stylesheet" href="/jyapp/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}7">
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}"/>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}"/>
 </head>
@@ -22,15 +22,15 @@
 	body,html {
 		height: 100%;
 	}
-	::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-	  	color: #686868;
-	}
 	.vip_update .fixed-bottom-box, .vip_renew .fixed-bottom-box {
 	    width: 100%;
 	    position: static;
 	    bottom: 0;
 	    left: 0;
 	}
+	::-webkit-input-placeholder{
+		color: #000;
+	}
 </style>
 <body class="no-touch">
 	<div class="app-layout-header">
@@ -45,7 +45,7 @@
                 <li class="choose_item">
                     <a href="/jyapp/vipsubscribe/toChooseAreaUpgrade">
                         <span class="label">区域</span>
-                        <input type="text" id="area" value="" onfocus="this.blur();" placeholder="选择全国、省份、地市" class="info">
+                        <input type="text" id="area" value="" disabled placeholder="选择全国、省份、地市" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <p class="add_tips area-list" style="display: none;">已新增 1 个省级区域、4 个地市</p>
@@ -53,7 +53,7 @@
                 <li class="choose_item">
                     <a href="/jyapp/vipsubscribe/toChooseIndustryUpgrade">
                         <span class="label">行业</span>
-                        <input type="text" id="buyerclass" onfocus="this.blur();" value="" placeholder="选择采购单位行业" class="info">
+                        <input type="text" id="buyerclass" disabled value="" placeholder="选择采购单位行业" class="info">
                         <i class="iconfont icon-arrow"></i>
                     </a>
                     <p class="add_tips industry-list" style="display: none;">已新增 2 个行业</p>
@@ -863,7 +863,7 @@
 					if(checkObj(area)){
 						areaHtml = "全国";
 					}
-			    	$('#area').val(areaHtml);
+			    	$('#area').attr("placeholder",areaHtml);
 			    }
 			    if(buyerclass !== "" && buyerclass !== undefined){
 			    	for(var i in buyerclass){
@@ -875,7 +875,7 @@
 					if(checkObj(buyerclass)){
 						buyerclassHtml = "全行业";
 					}
-					$('#buyerclass').val(buyerclassHtml);
+					$('#buyerclass').attr("placeholder",buyerclassHtml);
 			    }
 			    //
 			    var nowDate = data.now.replace(/-/g, ".");
@@ -1206,11 +1206,9 @@
             }
             //
             let payTypes = sessionStorage.payType;
-            let payType = "";
-            if(payTypes === "wx"){
-            	payType = "wx_app";
-            }else if(payTypes === "alipy"){
-            	payType = "alipy_app";
+            let payType = "wx_app";
+            if(payTypes === "alipy"){
+            	payType = "ali_app";
             }
             //
 	    	var param = {

+ 9 - 0
src/web/staticres/vipsubscribe/css/vip_update.css

@@ -541,6 +541,15 @@
   background-color: transparent;
 }
 
+.vip_update .choose_condition .chooseList .choose_item a .info::placeholder,
+.vip_update .choose_condition .pay_mode .choose_item a .info::placeholder {
+  color: #000;
+}
+
+.choose_item input:disabled, .choose_item input[disabled]{
+  opacity: 1;
+}
+
 .vip_update .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_update .choose_condition .pay_mode .choose_item a i.iconfont, .vip_renew .choose_condition .chooseList .choose_item a i.iconfont,
 .vip_renew .choose_condition .pay_mode .choose_item a i.iconfont {

+ 2 - 2
src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html

@@ -795,8 +795,8 @@
             	let areas = JSON.parse(sessionStorage.vipSubSelectAreaUpgrade);
             	for(var province in areas){
             		if(province === "全国"){
-            			console.log("23123")
-              			$(".other").trigger("click");
+              			$(".other").prop("checked",true);
+              			AreaChoose.reset();
             		}
             	}
             }

+ 5 - 5
src/web/templates/weixin/vipsubscribe/renew_pay.html

@@ -13,16 +13,13 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
-    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}5">
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}7">
 	{{include "/common/weixin.html"}}
 </head>
 <style type="text/css">
 	body,html {
 		height: 100%;
 	}
-	::-webkit-input-placeholder { /* Chrome/Opera/Safari */
-	  	color: #686868;
-	}
 	.weixin_pay{
 		padding-right: 3px;
 	}
@@ -36,6 +33,9 @@
 	    -webkit-overflow-scrolling: touch;
 	    height: 100%;
 	}
+	::-webkit-input-placeholder{
+		color: #000;
+	}
 	
 </style>
 <body class="no-touch">
@@ -75,7 +75,7 @@
                 <li class="choose_item select_cycle">
                     <a href="javascript:;">
                         <span class="label">延长订阅周期</span>
-                        <input type="text" value="" onfocus="this.blur();" placeholder="选择年、月" class="info choose_time">
+                        <input type="text" value="" disabled placeholder="选择年、月" class="info choose_time">
                         <!-- <span class="info choose_time">选择年、月</span> -->
                         <i class="iconfont icon-arrow choose_time"></i>
                     </a>

+ 4 - 8
src/web/templates/weixin/vipsubscribe/vip_upgrade.html

@@ -14,20 +14,13 @@
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" href="/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}6">
+    <link rel="stylesheet" href="/vipsubscribe/css/vip_update.css?v={{Msg "seo" "version"}}7">
 	{{include "/common/weixin.html"}}
 </head>
 <style type="text/css">
 	body,html {
 		height: 100%;
 	}
-	.vip_update .choose_condition .chooseList .choose_item a .info::placeholder,
-	.vip_update .choose_condition .pay_mode .choose_item a .info::placeholder {
-	    color: #000;
-	}
-	::-webkit-input-placeholder { /* Chrome/Opera/Safari */
- 	  	color: #000;
- 	}
 	.weixin_pay{
 		padding-right: 3px;
 	}
@@ -41,6 +34,9 @@
 	    -webkit-overflow-scrolling: touch;
 	    height: 100%;
 	}
+	::-webkit-input-placeholder{
+		color: #000;
+	}
 	
 </style>
 <body class="no-touch">