Merge remote-tracking branch 'origin/dev4.4' into dev4.4

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

@@ -84,7 +84,7 @@
         </form>
         <div class="trial_btn j-footer">
             <!-- 未完善个人信息展示的按钮 type类型为submit-->
-            <button class="btn j-button" type="submit">申请免费试用</button>
+            <button class="btn j-button" type="submit">立即使用</button>
             <!-- 已完善过个人信息 展示的按钮 type类型为button -->
         </div>
     </div>
@@ -113,7 +113,7 @@
     $(function () {
         //initScroll()
         scrollView("input");
-        $(".btn").text("申请免费试用").attr("disabled", "disabled");
+        $(".btn").text("立即使用").attr("disabled", "disabled");
         //获取用户手机号
         var bindPhone = sessionStorage.getItem('bind-phone') || ''
         if (bindPhone.length === 11) {
@@ -249,7 +249,7 @@
         })
     }
     {{else}}
-    $(".btn").text('立即免费试用').on("click", function (e) {
+    $(".btn").text('立即使用').on("click", function (e) {
         window.location.replace("/jyapp/vipsubscribe/vipsubscribe_trial");
     });
     {{end}}

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

@@ -144,9 +144,9 @@
     <div class="vip-footer-container">
         <div class="vip-intro-footer">
             {{if not .T.notShowTrial}}
-            <span class="vi-footer-l" data-need-bind-phone data-url="/jyapp/vipsubscribe/trialInfo"  id="vip-free-7days">
+<!--            <span class="vi-footer-l" data-need-bind-phone data-url="/jyapp/vipsubscribe/trialInfo"  id="vip-free-7days">
                 <span class="text">试用7天</span>
-            </span>
+            </span>-->
             {{end}}
             <span class="vi-footer-r" data-need-bind-phone data-url="/jyapp/vipsubscribe/vipsubscribe_new{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}"  id="vip-introduce">
                 <span class="text">开通 超级订阅</span>

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

@@ -135,10 +135,10 @@
                     <i class="iconfont icon-arrow"></i>
                   </a>
                 {{else}}
-                  <div class="free-7day">
+<!--                  <div class="free-7day">
                       <span class="label">订阅周期</span>
-                      <i class="info">免费试用7天</i>
-                  </div>
+                      <i class="info">立即使用7天</i>
+                  </div>-->
                 {{end}}
               </li>
             </ul>

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -78,7 +78,7 @@
   			<div class="only-personal" style="position: absolute;top: .2rem;left: 4%;background-image: url(/jyapp/vipsubscribe/image/entback.png?v=51430);background-size: 100%;background-repeat: no-repeat;border-radius: 8px;width: 92%;display: flex;align-items: center;justify-content: space-between;height: 44px;">
   				<img style="width: 20px;height: 20px; margin-left: .3rem;" src="/jyapp/vipsubscribe/image/vip-icon.png?v=1">
   				<span  data-name="doubleEleven_title" style="color:#fff;font-weight: bold;font-size: 15px;text-align: left;width: 4.1rem;">300组关键词特权</span>
-  				<span  data-name="doubleEleven_button" class="switch_ext" id="app-historypush-vipSub-banner" style="border-radius: 32px;display: flex;flex-direction: row;padding: 3px 12px;font-size: 12px;color: #FAE7CA;margin-right: .2rem;background: linear-gradient(to bottom, #F1D090 0%, #FAE7CA 100%);color: #33323A;font-family: PingFang SC;font-size: 12px;line-height: 18px;letter-spacing: 0px;text-align: center;">免费试用</span>
+  				<span  data-name="doubleEleven_button" class="switch_ext" id="app-historypush-vipSub-banner" style="border-radius: 32px;display: flex;flex-direction: row;padding: 3px 12px;font-size: 12px;color: #FAE7CA;margin-right: .2rem;background: linear-gradient(to bottom, #F1D090 0%, #FAE7CA 100%);color: #33323A;font-family: PingFang SC;font-size: 12px;line-height: 18px;letter-spacing: 0px;text-align: center;">立即使用</span>
   			</div>
   		</div>
       {{end}}
@@ -696,7 +696,7 @@
 
             $(".app-content").css("justify-content","flex-start");
             $(".switch").addClass("only-personal");
-            $(".switch>span").text("免费试用 超级订阅");
+            $(".switch>span").text("立即使用 超级订阅");
             $(".switch").click(tointroducepage);
             $(".switch_ext").click(tointroducepage);
             thisClass.InitPersonal(r);

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

@@ -218,7 +218,7 @@
                 <p class="tips_text home_1" style="display: none;">设置订阅关键词，随时接收最新招标信息</p>
                 <p class="tips_text home_2" style="display: none;">为了使您接收更多信息，可对关键词进行新增或修改。</p>
                 <p class="tips_text home_3" style="display: none;">您未设置关键词，设置后接收信息更精准!</p>
-                <p class="tips_text home_4" style="display: none;">免费试用超级订阅，商机获取能力提升30倍</p>
+                <p class="tips_text home_4" style="display: none;">立即使用超级订阅，商机获取能力提升30倍</p>
                 <p class="tips_all" style="display: none;"><a class="GetAll">查看全部</a></p>
                 <div class="tips_btn home_toset" style="display: none;">
                     <a class="home_toset" id="wx-setting">去设置</a>

src/jfw/modules/app/src/web/templates/weixin/wxkeyset/index.html

@@ -27,7 +27,7 @@
             <div class="banner-box">
                 <span class="j-icon vip-icon"></span>
                 <span  data-name="doubleEleven_title" class="content">300组关键词特权</span>
-                <a  data-name="doubleEleven_button" class="right-action" id="free-keyset-list-link" href="/jyapp/vipsubscribe/introducePage">免费试用</a>
+                <a  data-name="doubleEleven_button" class="right-action" id="free-keyset-list-link" href="/jyapp/vipsubscribe/introducePage">立即使用</a>
             </div>
         </div>
         {{end}}

src/jfw/modules/bigmember/src/service/analysis/forecastwinner.go

@@ -114,6 +114,7 @@ func (this *Analysis) FWData() {
 				//success=false; id=""  ---没有正在预测 也没有未查看的预测数据
 				//接受参数 调rpc 预测中标数据
 				getRes := new(util.ForecastS)
+				log.Println("getRes:", getRes.Budget)
 				//接收参数
 				json.Unmarshal(this.Body(), &getRes)
 				if getRes.Type == "" && getRes.Id != "" {

src/web/templates/pc/subscribe_new.html

@@ -54,7 +54,7 @@
                 <img src="{{Msg "seo" "cdn"}}/images/subscribe/vip-logo.png?v={{Msg "seo" "version"}}" alt="">
                 <h3 class="vip-title">超级订阅</h3>
             </div>
-            <button class="vip-btn" id="pc-vip-free7days" data-toggle="modal" data-target=".bs-example-modal-sm">免费试用</button>
+            <button class="vip-btn" id="pc-vip-free7days" data-toggle="modal" data-target=".bs-example-modal-sm">立即使用</button>
         </div>
     </div>
 </div>
@@ -126,7 +126,7 @@
                     <li>订阅区域<span>精确到地级市</span>，只看你最关注的</li>
                     <li>低至5.8元/月
                         <a href="#" id="pc-compare-vip-free7days" class="On-trial vip-btn" data-toggle="modal"
-                           data-target=".bs-example-modal-sm">免费试用</a>
+                           data-target=".bs-example-modal-sm">立即使用</a>
                     </li>
                 </ul>
             </div>

src/web/templates/weixin/historypush.html

@@ -551,7 +551,7 @@
                 <img src="/vipsubscribe/image/vip-icon.png">
                 <h4  data-name="doubleEleven_title">300组关键词特权</h4>
             </div>
-            <a data-name="doubleEleven_button" onclick="tointroducepage()" id="app-historypush-vipSub-topBanner" class="right freeuse" style="text-decoration: none;background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%)">免费试用</a>
+            <a data-name="doubleEleven_button" onclick="tointroducepage()" id="app-historypush-vipSub-topBanner" class="right freeuse" style="text-decoration: none;background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%)">立即使用</a>
             {{end}}
         </div>
     </div>

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

@@ -521,7 +521,7 @@
             {{if .T.LiveState}}
             <p class="tips_text home_4" style="display: none;">超级订阅6折，全年仅此一次。</p>
             {{else}}
-            <p class="tips_text home_4" style="display: none;">免费试用超级订阅，商机获取能力提升30倍。</p>
+            <p class="tips_text home_4" style="display: none;">立即使用超级订阅，商机获取能力提升30倍。</p>
             {{end}}
             <p class="tips_all" style="display: none;"><a class="GetAll">查看全部</a></p>
             <div class="tips_btn home_toset" style="display: none;">

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

@@ -1,4 +1,4 @@
-<!-- 免费试用弹窗 -->
+<!-- 立即使用弹窗 -->
 <script type="text/javascript" src="/js/bootstrap.min.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript">
 $(function(){
@@ -36,7 +36,7 @@ $(function(){
   
 	$(".toast_but").on("click",function(){
 		$("#myModal").modal("hide");
-        window.location.href="/front/vipsubscribe/trialInfo"
+        window.location.href="/front/vipsubscribe/introducePage"
 	})
 })
 </script>

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

@@ -76,7 +76,7 @@
     </form>
     <div class="trial_btn j-footer">
         <!-- 未完善个人信息展示的按钮 type类型为submit-->
-        <button class="j-button btn" type="submit">申请免费试用</button>
+        <button class="j-button btn" type="submit">立即使用</button>
         <!-- 已完善过个人信息 展示的按钮 type类型为button -->
     </div>
 </div>
@@ -100,7 +100,7 @@
     $(function () {
         //initScroll()
         scrollView("input");
-        $(".btn").text("申请免费试用").attr("disabled", "disabled");
+        $(".btn").text("立即使用").attr("disabled", "disabled");
         //获取用户手机号
         var bindPhone = sessionStorage.getItem('bind-phone') || ''
         if (bindPhone.length === 11) {
@@ -234,7 +234,7 @@
         })
     }
     {{else}}
-    $(".btn").text("立即免费试用").on("click",function (e) {
+    $(".btn").text("立即使用").on("click",function (e) {
         window.location.replace("/front/vipsubscribe/vipsubscribe_trial");
     });
     {{end}}

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

@@ -139,9 +139,9 @@
         <div class="vip-footer-container">
             <div class="vip-intro-footer">
                 {{if not .T.notShowTrial}}
-                <span class="vi-footer-l" data-need-bind-phone data-url="/front/vipsubscribe/trialInfo">
+<!--                <span class="vi-footer-l" data-need-bind-phone data-url="/front/vipsubscribe/trialInfo">
                     <span class="text">试用7天</span>
-                </span>
+                </span>-->
                 {{end}}
                 <span class="vi-footer-r" data-need-bind-phone data-url="/front/vipsubscribe/vipsubscribe_new{{if .T.disWord}}?disWord={{.T.disWord}}{{end}}"   id="vip-introduce">
                     <span class="text">开通 超级订阅</span>

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

@@ -133,10 +133,10 @@
                                 <i class="iconfont icon-arrow"></i>
                             </a>
                         {{else}}
-                            <div class="free-7day">
+<!--                            <div class="free-7day">
                                 <span class="label">订阅周期</span>
-                                <i class="info">免费试用7天</i>
-                            </div>
+                                <i class="info">立即使用7天</i>
+                            </div>-->
                         {{end}}
 
                     </li>

src/web/templates/weixin/wxkeyset/index.html

@@ -31,7 +31,7 @@
             <div class="banner-box">
                 <span class="j-icon vip-icon"></span>
                 <span  data-name="doubleEleven_title" class="content">300组关键词特权</span>
-                <a  data-name="doubleEleven_button" class="right-action" id="free-keyset-list-link" href="/front/vipsubscribe/introducePage">免费试用</a>
+                <a  data-name="doubleEleven_button" class="right-action" id="free-keyset-list-link" href="/front/vipsubscribe/introducePage">立即使用</a>
             </div>
         </div>
         <div class="j-main keyset" ref="jMain">