2 Commits 8a11f374b6 ... 0db47f02c5

Author SHA1 Message Date
  wuwen 0db47f02c5 Merge branch 'master' of http://47.112.200.206:3000/shenhao/weixin 3 years ago
  wuwen 4df360d962 支付 3 years ago

+ 2 - 1
src/main/java/com/ssj/weixin/library/controller/LibVipController.java

@@ -702,7 +702,8 @@ public class LibVipController extends BaseController {
 	}
 	
 	@RequestMapping("/serviceLocation")
-	public String serviceLocation(Model model){
+	public String serviceLocation(Model model,String know){
+		model.addAttribute("know", know!=null?know:"");
 		return "weixin/vip/serviceLocation";
 	}
 	

+ 4 - 2
src/main/java/com/ssj/weixin/payment/controller/PaymentController.java

@@ -1127,7 +1127,8 @@ public class PaymentController extends BaseController {
 	* @String
 	 */
 	@RequestMapping("/service")
-	public String service(Model model){
+	public String service(Model model,String know){
+		model.addAttribute("know", know!=null?know:"");
 		return "weixin/vip/service";
 	}
 	
@@ -1142,7 +1143,7 @@ public class PaymentController extends BaseController {
 	* @String
 	*/
 	@RequestMapping("/serviceVipBuy_{libId}")
-	public String serviceVipBuy(Model model,@PathVariable String libId){
+	public String serviceVipBuy(Model model,@PathVariable String libId,String know){
 		
 		//通用的收费标准,150/月
 		List<LibSalesPrice> specieList=libSalesPriceService.findByLibIdAndSpeciesAndType("S008");
@@ -1158,6 +1159,7 @@ public class PaymentController extends BaseController {
 		model.addAttribute("user", user);
 		model.addAttribute("tbLibJoin", tbLibJoin);
 		model.addAttribute("specieList", specieList);
+		model.addAttribute("know", know!=null?know:"");
 		return "weixin/vip/serviceVipBuy";
 	}
 	

+ 2 - 1
src/main/resources/templates/weixin/vip/service.html

@@ -9,6 +9,7 @@
 
 <script type="text/javascript">
 $(function(){
+	var know="[[${know}]]";
 	jssdk();
 });
 function  jssdk(){
@@ -39,7 +40,7 @@ function  jssdk(){
              var imgUrl='[[${imgUrl}]]/images/sharingschool.jpg';
              var desc ="为孩子找个好老师-阅读辅导,一站解决,第三空间,伴我成长,家长社群,认知共享,微校结对,家教无忧!";	  
              var link = "[[${sysUrl}]]/wechat/index.html";
-             var curl="[[${sysUrl}]]/weixin/payment/serviceVipBuy_#LIBID#.html";
+             var curl="[[${sysUrl}]]/weixin/payment/serviceVipBuy_#LIBID#.html?know="+know;
 	             wx.ready(function () {
 	    			      wx.getLocation({
 		            		    type: 'wgs84', // 默认为wgs84的gps坐标,如果要返回直接给openLocation用的火星坐标,可传入'gcj02'

+ 1 - 1
src/main/resources/templates/weixin/vip/serviceLocation.html

@@ -57,7 +57,7 @@
 <script type="text/javascript">
 	mui("body").on('tap','div.divlist',function(){
 		var id = this.getAttribute('data-id');
-	    var openUrl =  '[[${sysUrl}]]/weixin/payment/serviceVipBuy_'+id+'.html';
+	    var openUrl =  '[[${sysUrl}]]/weixin/payment/serviceVipBuy_'+id+'.html?know=[[${know}]]';
 	  	mui.openWindow({
  			url:openUrl,
  			id: 'vipCard',

+ 2 - 2
src/main/resources/templates/weixin/vip/serviceVipBuy.html

@@ -21,7 +21,7 @@
 	<!--内容-->
 	<div class="mui-content">
 		<div class="vipcard">
-			<a class="dc_flex btnweizhi" th:href="@{/weixin/libVip/serviceLocation.html}">
+			<a class="dc_flex btnweizhi" th:href="@{/weixin/libVip/serviceLocation.html?know={know}(know=${know})}">
 				<div><i class="iconfont">&#xe663;</i></div>
 				<div class="dc_hd" th:text="${tbLibJoin.leagueName}"></div>
 				<div><i class="iconfont">&#xe619;</i></div>
@@ -233,7 +233,7 @@
 				 return false;
 			}
 			
-			var know = '家长小塾学伴缴费';
+			var know = '[[${know}]]';
 			var details="小塾学伴月费";
 			var price =$('div.vip2typeselect').find('.active').data('price');
 			var salesPriceId =$('div.vip2typeselect').find('.active').data('id');