Merge branch 'dev3.0active' of http://192.168.3.207:10080/qmx/jy into dev3.0active

README.md

@@ -6,4 +6,4 @@ web用xweb框架
 v3.0active
 2020年双11超级订阅促销活动
 1.买一年送一年（可任意时间，最长一年）；
-2.买超级订阅送专家版大会员15天
+2.买超级订阅送专家版大会员15天

src/jfw/modules/app/src/web/staticres/jyapp/commonPay/js/common.js

@@ -328,8 +328,12 @@ var vTools = {
     // 解决 客户端2.9.5 replace失效问题
     locationReplace: function (url){
       if(history.replaceState){
-        history.replaceState(null, document.title, url);
-        history.go(0);
+    	try{
+        	history.replaceState(null, document.title, url);
+        	history.go(0);
+        }catch(e){
+        	window.location.href=url;
+        }
       }else{
         location.replace(url);
       }

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -3702,11 +3702,17 @@ var Active_Default = function(nowTime){
 var Active_Vip_Invite = function(nowTime){
 	this.init = function(){
 		$(".pop-new").on("tap",function(){
-			if(ActiveTip.isLogin){
+			//外部链接打开
+			if (adv_within=="abroad"){
 				ActiveTip.close();
-				window.location.href = adv_url;
+				JyObj.openExternalLink(adv_url,"");
 			}else{
-				window.location.href = "/jyapp/free/login?url="+encodeURIComponent(adv_url);
+				if(ActiveTip.isLogin){
+					ActiveTip.close();
+					window.location.href = adv_url;
+				}else{
+					window.location.href = "/jyapp/free/login?url="+encodeURIComponent(adv_url);
+				}
 			}
 		});
 		//nowTime = new Date(formatDate(nowTime,true)+ " 00:00:00").getTime();

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

@@ -938,20 +938,26 @@
   margin-top: .26rem!important;
 }
 
+/* 优惠弹框 */
+.discount-details .weui-half-screen-dialog__hd,
 .coupon-picker .weui-half-screen-dialog__hd {
   padding-left: 0;
   padding-right: 0;
 }
+
+.discount-details .icon-del-grey,
 .coupon-picker .icon-del-grey {
   padding-left: 0;
   padding-right: 0;
   order: 2;
 }
 
+.discount-details .weui-picker__bd,
 .coupon-picker .weui-picker__bd {
   padding: 0 0.2rem;
 }       
 
+.discount-details .weui-picker__group,
 .coupon-picker .weui-picker__group {
   position: relative;
   display: flex;
@@ -962,6 +968,50 @@
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
+.discount-details .weui-mask,
+.discount-details .weui-picker {
+  bottom: 3.1rem;
+  min-height: unset;
+  transform: unset;
+}
+.discount-details .weui-picker__bd {
+  padding: 0;
+  padding-bottom: .36rem;
+  flex-direction: column;
+}
+.discount-details .details-bd-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: .24rem 0;
+  font-size: .28rem;
+  line-height: .4rem;
+  color: #171826;
+}
+.discount-details .d-b-right .dis-price {
+    text-decoration: unset;
+}
+
+.discount-button {
+  display: none;
+  margin-right: .16rem;
+  padding: .03rem .06rem;
+  font-size: .2rem;
+  line-height: .28rem;
+  color: #9B9CA3;
+  background-color: #F5F7F7;
+  border-radius: 2px;
+}
+.discount-button .icon-arrow {
+  display: inline-block;
+  font-size: .2rem;
+  transform: rotate(90deg);
+}
+
+.text-red {
+  color: #FB483D;
+}
+
 .free-7day-tip {
   justify-content: space-between;
 }

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

@@ -875,6 +875,8 @@ $(function () {
                         });
                     }
                 }
+            }else{
+				weui.loading().hide();
             }
         }, false);
     }

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

@@ -48,7 +48,7 @@
                         <div class="active-r-text">2、活动期间，用户第一次购买超级订阅的订单参与此活动，多次购买无效。</div>
                         <div class="active-r-text">3、每个用户赠送1次超级订阅时长，赠送时长与购买时长相等，最多送1年。</div>
                         <div class="active-r-text">4、每个用户赠送剑鱼大会员专家版15天使用时长，仅在活动时间内领取有效。</div>
-                        <div class="active-r-text">5、此活动最终解释权归剑鱼标讯。</div>
+                        <div class="active-r-text">5、此活动最终解释权归剑鱼标讯所有。</div>
                     </div>
                 </div>
                 <div class="group-title">

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

@@ -214,6 +214,10 @@
                 </div>
                 {{if not .T.isTrial }}
                     <div class="origin-price" style="display:none;">
+                        <span class="discount-button">
+                            <span>优惠明细</span>
+                            <span class="iconfont icon-arrow"></span>
+                        </span>
                         <span class="price-label">原价：</span>
                         <div class="price-container">
                             <span class="currency-type">&yen;</span>
@@ -371,6 +375,43 @@
                     </div>
                 </div>
             </div>
+            <!-- 优惠明细 -->
+            <div class="j-picker adaption discount-details" style="display:none;">
+                <div class="weui-mask"></div>
+                <div class="weui-half-screen-dialog weui-picker">
+                    <div class="weui-half-screen-dialog__hd">
+                        <div class="weui-half-screen-dialog__hd__main">
+                            <strong class="weui-half-screen-dialog__title">优惠明细</strong>
+                        </div>
+                        <span class="j-icon icon-del-grey cancel"></span>
+                    </div>
+                    <div class="weui-half-screen-dialog__bd">
+                        <div class="weui-picker__bd">
+                            <div class="details-bd-item origin-price">
+                                <div class="d-b-left">原价</div>
+                                <div class="d-b-right">
+                                    <span class="dis-mon">&yen;</span>
+                                    <span class="dis-price price-num">0</span>
+                                </div>
+                            </div>
+                            <div class="details-bd-item">
+                                <div class="d-b-left">限时优惠</div>
+                                <div class="d-b-right text-red">
+                                    <span class="dis-mon">-&yen;</span>
+                                    <span class="dis-price">0</span>
+                                </div>
+                            </div>
+                            <div class="details-bd-item">
+                                <div class="d-b-left">实付</div>
+                                <div class="d-b-right text-red">
+                                    <span class="dis-mon">&yen;</span>
+                                    <span class="dis-price">0</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
         <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
         <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
@@ -382,7 +423,14 @@
                     $(".j-notice-bar.bar-red.free-7day-tip.give").css('display', 'flex')
                     $("#giveTimeBox").show()
                     $(".origin-price").css('display', 'flex')
-
+                    $('.discount-button').show().on('click', function () {
+                        var details = $('.discount-details')
+                        if (details.is(':hidden')) {
+                            $('.discount-details').show()
+                        } else {
+                            $('.discount-details').hide()
+                        }
+                    })
                 } else {
                     $(".j-notice-bar.bar-red.free-7day-tip.give").hide()
                     $("#giveTimeBox").hide()
@@ -878,6 +926,7 @@
                 $('#pay_way').hide(200);
                 $('#time_cycle').hide(200);
                 $('.coupon-picker').hide()
+                $('.discount-details').hide()
             }
 
 
@@ -911,10 +960,6 @@
                         $(".industry_warn").css("display", "block");
                     }
                 }
-                // else {
-                //     $(".area_warn").css("display", "");
-                //     $(".industry_warn").css("display", "");
-                // }
 
                 sessionStorage.setItem("vipSub_read", checked)
 

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -400,6 +400,7 @@
 <script type="text/javascript">
   var adv_url = "/datareport/page/introduce";
   var adv_img = "/jyapp/images/reportTip.png?v=51430"
+  var adv_within = "";//是否是外部链接打开
   {{$s:=(Ad "jyapp-wxsearch-index" -1)}}
   {{if $s}}
   var ADList={{$s}}
@@ -411,6 +412,9 @@
       if(AD.s_pic){
         adv_img = AD.s_pic+"?v="+ new Date().getTime()
       }
+      if (AD.o_extend != undefined) {
+        adv_within = AD.o_extend.linktype;
+      }
     }
   {{end}}
 	var userId = {{session "userId"}};

src/jfw/modules/subscribepay/src/service/vipSubscribeChange.go

@@ -416,7 +416,7 @@ func needUpgrade(newBuySet, oldBuySet *entity.SubvipBuySet) (bool, *entity.Subvi
 
 //升级详情单
 func getUpgradeDetail(userId string, newBuySet, oldBuySet *entity.SubvipBuySet, oldEndtime int64, count, unit int) (totalPrice int, subtotals []map[string]interface{}) {
-	rResult, ok := util.MQFW.Find("vip_upgrade", &bson.M{"s_userid": userId, "i_isvalid": 0}, `{"l_validtime":"1"}`, `{"o_buyset":1,"l_validtime":1}`, false, -1, -1)
+	rResult, ok := util.MQFW.Find("vip_upgrade", &bson.M{"s_userid": userId, "i_isvalid": 0}, `{"l_validtime":1}`, `{"o_buyset":1,"l_validtime":1}`, false, -1, -1)
 	if !ok {
 		return -2, nil
 	}
@@ -433,6 +433,7 @@ func getUpgradeDetail(userId string, newBuySet, oldBuySet *entity.SubvipBuySet,
 			if this_price < 0 {
 				return -1, nil
 			}
+			log.Println("---------------this_price:", this_price)
 			totalPrice += this_price
 			subtotals = append(subtotals, map[string]interface{}{
 				"type":      1,
@@ -447,6 +448,7 @@ func getUpgradeDetail(userId string, newBuySet, oldBuySet *entity.SubvipBuySet,
 	//当前升级
 	now := time.Now()
 	price_now := getSubtotalPrice(oldBuySet, newBuySet, now.Unix(), nowEndTime)
+	log.Println("~~~~~~~~2", price_now)
 	if price_now < 0 {
 		return -1, nil
 	}
@@ -462,6 +464,7 @@ func getUpgradeDetail(userId string, newBuySet, oldBuySet *entity.SubvipBuySet,
 	if count > 0 {
 		renew_price := entity.JyVipSubStruct.GetSubVipPriceByBuySet(newBuySet.NewCitys, newBuySet.AreaCount, newBuySet.BuyerclassCount, count, unit, false)
 		if renew_price < 0 {
+			log.Println("~~~~~~~~3", renew_price)
 			return -1, nil
 		}
 		totalPrice += renew_price
@@ -490,7 +493,6 @@ func getSubtotalPrice(oldBuyset, newBuyset *entity.SubvipBuySet, startTime, endt
 			newCitysBuyTwo++
 		}
 	}
-
 	if (oldBuyset.AreaCount != -1 && newBuyset.AreaCount != -1 && (oldBuyset.AreaCount > newBuyset.AreaCount || len(oldBuyset.NewCitys)+oldBuyset.AreaCount > len(newBuyset.NewCitys)+newBuyset.AreaCount || oldCitysBuyTwo+oldBuyset.AreaCount > newCitysBuyTwo+newBuyset.AreaCount)) ||
 		(oldBuyset.AreaCount == -1 && newBuyset.AreaCount != -1) || //旧套餐全国 新套餐非全国
 		(oldBuyset.BuyerclassCount != -1 && newBuyset.BuyerclassCount != -1 && oldBuyset.BuyerclassCount > newBuyset.BuyerclassCount) || //非全行业下 新套餐行业数量小于旧套餐数量

src/web/templates/weixin/search/mainSearch.html

@@ -96,18 +96,18 @@
 	SuperSearch.industry = {{.T.industry}};
 	SuperSearch.sortArray = {{.T.sortArray}};
 	// 判断1111活动
-  $.get('/jyactive/doubleEleven/isActiving', function (r) {
-      if (r && r.data) {
-          if (r.data.isActiving && r.data.isWritten === 1) {
-              var readToDay = localStorage.getItem('doubleEleven_isActiving') === new Date().toDateString()
-              localStorage.setItem('doubleEleven_isActiving', new Date().toDateString())
-              if (!readToDay) {
-                  history.pushState({state: 'full'}, null)
-                  location.href = '/big/wx/page/write_infor_wx'
-              }
-          }
-      }
-  })
+  // $.get('/jyactive/doubleEleven/isActiving', function (r) {
+  //     if (r && r.data) {
+  //         if (r.data.isActiving && r.data.isWritten === 1) {
+  //             var readToDay = localStorage.getItem('doubleEleven_isActiving') === new Date().toDateString()
+  //             localStorage.setItem('doubleEleven_isActiving', new Date().toDateString())
+  //             if (!readToDay) {
+  //                 history.pushState({state: 'full'}, null)
+  //                 location.href = '/big/wx/page/write_infor_wx'
+  //             }
+  //         }
+  //     }
+  // })
     // 动画隐藏tab栏
     function hideTab() {
         $('.newdialog .tab-box .sub-search-title').slideUp('fast');
@@ -1286,6 +1286,7 @@
     }, true)
 	}
   function gotoIntroducePage(e){
+    $("#homePageTap").modal("hide");
     var dataUrl = $(e).attr("dataUrl");
     window.location.href = dataUrl;
   }

src/web/templates/weixin/vipsubscribe/vip_introduce.html

@@ -43,7 +43,7 @@
                             <div class="active-r-text">2、活动期间，用户第一次购买超级订阅的订单参与此活动，多次购买无效。</div>
                             <div class="active-r-text">3、每个用户赠送1次超级订阅时长，赠送时长与购买时长相等，最多送1年。</div>
                             <div class="active-r-text">4、每个用户赠送剑鱼大会员专家版15天使用时长，仅在活动时间内领取有效。</div>
-                            <div class="active-r-text">5、此活动最终解释权归剑鱼标讯。</div>
+                            <div class="active-r-text">5、此活动最终解释权归剑鱼标讯所有。</div>
                         </div>
                     </div>
                     <div class="group-title">