Parcourir la source

Merge branch 'dev2.10.9' of ssh://192.168.3.207:10022/qmx/jy into dev2.10.9

wangkaiyue il y a 5 ans
Parent
commit
ca4b887e84

+ 1 - 0
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -514,6 +514,7 @@
 	<script>
         $(window).bind("pageshow", function (event) {
             if (event.originalEvent.persisted) {
+                sessionStorage.liveActiveCode_new = "";
                 window.location.reload();
             }
         });

+ 1 - 0
src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -687,6 +687,7 @@ func PayCancel(userId, product_type, entname string) bool {
 				})
 				if bl {
 					util.MsgRemind.Delete(qutil.IntAll(v["id"]))
+					util.ActiveMsgRemind.Delete(qutil.IntAll(v["id"]))
 					i++
 				}
 			}

+ 1 - 1
src/web/templates/pc/billing_list.html

@@ -92,7 +92,7 @@
 					"order_code":{{.T.order_code}}
 				},
 				success: function (data) {
-                    console.log(data)
+                    // console.log(data)
 					appendList(data.list,data.order_money);
 				}
 			});