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

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

@@ -565,6 +565,7 @@
 }
 
 .jy-alert .weui-dialog__bd {
+  margin: 0;
   padding: 0 0.4rem 0.48rem;
   font-size: 0.28rem;
   color: #686868;

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

@@ -264,6 +264,9 @@ $(function () {
         pickerShow('.billing-list-container', false)
         pickerShow('.coupon-picker', false)
     })
+    $('body').on('click', '.jy-dialog .weui-mask', function () {
+        pickerShow('.jy-dialog', false)
+    })
 
     $('.close-expire-remind').on("click", function () {
         $(".expire-remind").hide();
@@ -344,6 +347,7 @@ $(function () {
             //cancelTip(module);
             window.history.back();
         });
+        window.removeEventListener('popstate')
         setTimeout(function () {
             window.addEventListener("popstate", function (e) {
                 //如果订单计费清单显示，则关闭清单；
@@ -871,9 +875,7 @@ $(function () {
         var confirmButton = $('.coupon-picker .weui-picker__btn')
         var cancelButton = $('.coupon-picker .cancel')
         var value = input.val()
-        input.focus(function (e) {
-          e.target.scrollIntoView({ 'block': 'center' })
-        }).on('input', function () {
+        input.val('').focus().val(value).on('input', function () {
             value = this.value
             confirmButton.prop('disabled', (value === '' || value === undefined))
         })

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

@@ -62,7 +62,7 @@ var purchase = {
 				isUsedActiveCode = true;
 			}
 			if (sessionStorage.liveActiveCode_renew === "jianyu360"){
-				$('.coupon-code-tx .keywords-text').text("支付成功赠送30天订阅周期");
+				$('.coupon-code-tx .keywords-text').text("支付成功赠送30天订阅周期");
 				$('.coupon-picker .weui-input').val("jianyu360");
 				$('.coupon-code-tx').off('click');
 			}
@@ -603,12 +603,10 @@ $('.coupon-code-tx').on('click', function() {
 	var confirmButton = $('.coupon-picker .weui-picker__btn')
 	var cancelButton = $('.coupon-picker .cancel')
 	var value = input.val()
-	input.focus(function (e) {
-    e.target.scrollIntoView({ 'block': 'center' })
-  }).on('input', function() {
-		value = this.value
-		confirmButton.prop('disabled', (value === '' || value === undefined))
-	})
+	input.val('').focus().val(value).on('input', function () {
+    value = this.value
+    confirmButton.prop('disabled', (value === '' || value === undefined))
+  })
 
 	confirmButton.on('click', function() {
 		if (value.toLowerCase() !== couponInfo.code) {

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

@@ -229,7 +229,7 @@
 	<div class="j-container" id="order_detail">
 	<!--			过期的订单-->
 	<div class="nothing" style="display:none">
-        <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/vipsubscribe/image/nothing.png?v=51430"/>
+        <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/image/nothing.png?v=51430"/>
 		<div class="nothingDiv">
 			该订单记录已删除
 		</div>
@@ -381,7 +381,7 @@
       if(r.success){
 		if(r.data.order.order_status==-1){
 			$(".nothing").show();
-			$(".j-body").hide();
+			$(".j-body").remove();
 		}
         //下单时间
         if(r.data.order.create_time) {

src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -153,6 +153,10 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 	//}
 	//支付成功后
 	if flag {
+		//支付成功后 清除首页redis缓存
+		go func() {
+			redis.Del("other", "p1_indexMessage_"+userid)
+		}()
 		//支付提醒
 		liveStart := Config.LiveActiveStartTime
 		liveEnd := Config.LiveActiveEndTime

src/jfw/modules/subscribepay/src/util/vrew.go

@@ -177,6 +177,9 @@ func GetSqlObjFromId(_id string) *ViewCondition {
 	o_vipjy, _ := (*query)["o_vipjy"].(map[string]interface{})
 	a_items := o_vipjy["a_items"].([]interface{})
 	a_buyerclass := o_vipjy["a_buyerclass"].([]interface{})
+	if len(a_buyerclass) > 0 && qutil.IntAllDef(o_vipjy["i_matchbuyerclass_other"], 1) == 1 && len(a_items) > 0 {
+		a_buyerclass = append(a_buyerclass, "其它")
+	}
 	a_infotype := o_vipjy["a_infotype"].([]interface{})
 	o_area := o_vipjy["o_area"].(map[string]interface{})
 	return &ViewCondition{

src/web/staticres/vipsubscribe/css/vip_index_new.css

@@ -560,6 +560,7 @@
 }
 
 .jy-alert .weui-dialog__bd {
+  margin: 0;
   padding: 0 0.4rem 0.48rem;
   font-size: 0.28rem;
   color: #686868;

src/web/staticres/vipsubscribe/js/vip_index_new.js

@@ -266,6 +266,9 @@ $(function () {
         pickerShow('.billing-list-container', false)
         pickerShow('.coupon-picker', false)
     })
+    $('body').on('click', '.jy-dialog .weui-mask', function () {
+        pickerShow('.jy-dialog', false)
+    })
 
     $('.close-expire-remind').on("click", function () {
         $(".expire-remind").hide();
@@ -345,15 +348,15 @@ $(function () {
         $('.vip-footer .button-l.reset').off("click").on("click", function () {
             cancelTip(module);
         });
+        window.removeEventListener('popstate')
         window.addEventListener("popstate", function (e) {
-            //如果订单计费清单显示，则关闭清单；
+            // 如果订单计费清单显示，则关闭清单；
             if ($(".billing-list-container").css("display") != "none" && module === 2) {
                 pickerShow('.billing-list-container', false);
                 pushHistory();
             } else {//提示是否保存
                 $('.weui-mask').trigger('click')
                 cancelTip(module);
-                //pushHistory();
             }
         }, false);
     }
@@ -875,11 +878,9 @@ $(function () {
         var confirmButton = $('.coupon-picker .weui-picker__btn')
         var cancelButton = $('.coupon-picker .cancel')
         var value = input.val()
-        input.focus(function (e) {
-          e.target.scrollIntoView({ 'block': 'center' })
-        }).on('input', function () {
-            value = this.value
-            confirmButton.prop('disabled', (value === '' || value === undefined))
+        input.val('').focus().val(value).on('input', function () {
+          value = this.value
+          confirmButton.prop('disabled', (value === '' || value === undefined))
         })
 
         confirmButton.on('click', function () {