Merge branch 'dev4.6.3.4' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.4

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

@@ -928,6 +928,7 @@
                 SuperSearch.init(true,true,true);
                 $("#search-header-input").focus()
                 $("#sideIcon").hide()
+                $('#intercept').addClass('hidden')
             });
             SuperSearch.openTablepro=result.tablepro;
             //加载广告

src/jfw/modules/publicapply/src/bidcollection/entity/entity.go

@@ -460,7 +460,7 @@ func Power(userid string) (bool, map[string]interface{}) {
 			if entInfo := *db.Mysql.SelectBySql(`SELECT status,isNew FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len(entInfo) > 0 {
 				for _, v := range entInfo {
 					//&& qu.IntAll(v["isNew"]) == 1
-					if qu.IntAll(v["status"]) == 1 && qu.IntAll(v["isNew"]) == 1{
+					if qu.IntAll(v["status"]) == 1 {
 						isEnt = true
 						break
 					}

src/web/templates/pc/createOrderPage.html

@@ -195,71 +195,73 @@
                 <div>省份、城市、公告标题、公告类别、公告内容、发布时间、公告地址、剑鱼标讯地址、项目名称、项目范围、预算金额、中标金额、开标日期、采购单位、采购单位信息(采购单位联系人、采购单位联系电话、招标代理机构)、中标单位信息(中标单位、中标单位联系人、中标单位联系电话)(来源:招标公告网站)、中标单位信息(中标单位联系人、中标单位联系电话、电子邮箱)(来源:国家企业公示网站)</div>
             </span>
         </span>
-        <div class="pc-coupon-w1200" style="margin-bottom: 25px">
-            <!--S-优惠券-->
-            <div id="coupon-group"></div>
-            <!--E-优惠券-->
-        </div>
-        <div class="moneys data-pack" style="margin-top:120px;display: none;">
-            <div class="show-detail">
-                <div class="all-line">
-                    <div class="line" data-show-type="数据流量包">
-                        <div class="item">已选择数据:</div>
-                        <div><span id="changeExportTextForTotal">20000</span>条</div>
-                    </div>
-                    <div class="line" data-show-type="数据流量包">
-                        <div class="item">重复导出数据:</div>
-                        <div><span>(不再扣除)</span><span class="blue-font" id="changeExportTextForRepeat">2470</span>条</div>
-                    </div>
-                    <div class="line should_pay_count" data-show-type="数据流量包">
-                        <div class="item">本次扣除:</div>
-                        <div><span class="red-font" id="changeExportForNow">17530</span>条</div>
-                    </div>
-                    <div class="line" data-show-type="数据流量包">
-                        <div class="item">所属企业账户余额:</div>
-                        <div><span class="red-font" id="changeExportForPackTotal">3150</span>条</div>
-                    </div>
-                    <div class="line" data-show-type="数据流量包">
-                        <div class="item">您每日导出限额:</div>
-                        <div><span class="red-font" id="changeExportForPackDayTotal">10000000</span>条</div>
-                    </div>
-                    <div class="line" data-show-type="数据流量包">
-                        <div class="item">您今日余额:</div>
-                        <div><span class="red-font" id="changeExportForPackDayNow">10000000</span>条</div>
-                    </div>
-                    <div class="line" data-show-type="单日限量包">
-                        <div class="item">本次扣除:</div>
-                        <div><span class="red-font"id="changeExportForNowDayTotal">3150</span>条</div>
-                    </div>
-                    <div class="line" data-show-type="单日限量包">
-                        <div class="item">今日限量余额:</div>
-                        <div><span class="red-font" id="changeExportForNowDayNow">10000000</span>条</div>
-                    </div>
-                    <div class="line" data-show-type="单日限量包">
-                        <div class="item">本日仍可导出:</div>
-                        <div><span class="red-font" id="changeExportForNowDayNewNow">10000000</span>条</div>
+        <div class="main_footer">
+            <div class="pc-coupon-w1200" style="margin-bottom: 25px">
+                <!--S-优惠券-->
+                <div id="coupon-group"></div>
+                <!--E-优惠券-->
+            </div>
+            <div class="moneys data-pack" style="margin-top:120px;display: none;">
+                <div class="show-detail">
+                    <div class="all-line">
+                        <div class="line" data-show-type="数据流量包">
+                            <div class="item">已选择数据:</div>
+                            <div><span id="changeExportTextForTotal">20000</span>条</div>
+                        </div>
+                        <div class="line" data-show-type="数据流量包">
+                            <div class="item">重复导出数据:</div>
+                            <div><span>(不再扣除)</span><span class="blue-font" id="changeExportTextForRepeat">2470</span>条</div>
+                        </div>
+                        <div class="line should_pay_count" data-show-type="数据流量包">
+                            <div class="item">本次扣除:</div>
+                            <div><span class="red-font" id="changeExportForNow">17530</span>条</div>
+                        </div>
+                        <div class="line" data-show-type="数据流量包">
+                            <div class="item">所属企业账户余额:</div>
+                            <div><span class="red-font" id="changeExportForPackTotal">3150</span>条</div>
+                        </div>
+                        <div class="line" data-show-type="数据流量包">
+                            <div class="item">您每日导出限额:</div>
+                            <div><span class="red-font" id="changeExportForPackDayTotal">10000000</span>条</div>
+                        </div>
+                        <div class="line" data-show-type="数据流量包">
+                            <div class="item">您今日余额:</div>
+                            <div><span class="red-font" id="changeExportForPackDayNow">10000000</span>条</div>
+                        </div>
+                        <div class="line" data-show-type="单日限量包">
+                            <div class="item">本次扣除:</div>
+                            <div><span class="red-font"id="changeExportForNowDayTotal">3150</span>条</div>
+                        </div>
+                        <div class="line" data-show-type="单日限量包">
+                            <div class="item">今日限量余额:</div>
+                            <div><span class="red-font" id="changeExportForNowDayNow">10000000</span>条</div>
+                        </div>
+                        <div class="line" data-show-type="单日限量包">
+                            <div class="item">本日仍可导出:</div>
+                            <div><span class="red-font" id="changeExportForNowDayNewNow">10000000</span>条</div>
+                        </div>
                     </div>
                 </div>
             </div>
-        </div>
-        <div class="info pay-info main_footer clearfix">
-            <div class="fl left" data-show-type="个人支付">
-                <p>购买须知：</p>
-                <p>最低起售<span></span>元，标准字段包：原价<span></span>元/条，<span></span>
-                    折价<span></span>元/条计费，</p>
-                <p>高级字段包：原价<span></span>元/条，<span></span>折价<span></span>元/条计费</p>
-            </div>
-            <div class="fr right">
-                <p class="clearfix t fr">
-                    <span id="checkBoxjy" class="bif-checkbox iconfont"></span>
-                    <i>已阅读并同意<a href="/front/staticPage/serviceterms.html" target="_blank">《剑鱼标讯线上购买与服务条款》</a></i>
-                </p>
-                <p class="btn_createOrder">
-                    <button class="dataPreview" id="track-data-preview-for-button">预览数据</button>
-                    <button id="pay-button-for-money" class="toPay" data-need-bind-phone disabled="disabled">确认支付</button>
-                    <button id="pay-button-for-datapack" class="toDeduction" data-need-bind-phone style="display: none" disabled="disabled">确认扣除
-                    </button>
-                </p>
+            <div class="info pay-info clearfix">
+                <div class="fl left" data-show-type="个人支付">
+                    <p>购买须知：</p>
+                    <p>最低起售<span></span>元，标准字段包：原价<span></span>元/条，<span></span>
+                        折价<span></span>元/条计费，</p>
+                    <p>高级字段包：原价<span></span>元/条，<span></span>折价<span></span>元/条计费</p>
+                </div>
+                <div class="fr right">
+                    <p class="clearfix t fr">
+                        <span id="checkBoxjy" class="bif-checkbox iconfont"></span>
+                        <i>已阅读并同意<a href="/front/staticPage/serviceterms.html" target="_blank">《剑鱼标讯线上购买与服务条款》</a></i>
+                    </p>
+                    <p class="btn_createOrder">
+                        <button class="dataPreview" id="track-data-preview-for-button">预览数据</button>
+                        <button id="pay-button-for-money" class="toPay" data-need-bind-phone disabled="disabled">确认支付</button>
+                        <button id="pay-button-for-datapack" class="toDeduction" data-need-bind-phone style="display: none" disabled="disabled">确认扣除
+                        </button>
+                    </p>
+                </div>
             </div>
         </div>
     </div>
@@ -1368,7 +1370,7 @@
         // refreshStickyInfo()
         // 购买底部固定
         // 判断xx是否处于可视区域
-        var mainFooter = $('.info.main_footer')
+        var mainFooter = $('.main_footer')
         var stickyFooter = $('.sticky-footer')
 
         var show = !isInViewport(mainFooter[0])

src/web/templates/pc/dataPack/createOrderForDataPackage.html

@@ -114,29 +114,31 @@
                 <div>省份、城市、公告标题、公告类别、公告内容、发布时间、公告地址、剑鱼标讯地址、项目名称、项目范围、预算金额、中标金额、开标日期、采购单位、采购单位信息(采购单位联系人、采购单位联系电话、招标代理机构)、中标单位信息(中标单位、中标单位联系人、中标单位联系电话)(来源:招标公告网站)、中标单位信息(中标单位联系人、中标单位联系电话、电子邮箱)(来源:国家企业公示网站)</div>
             </span>
         </span>
-        <div class="pc-coupon-w1200" style="margin-bottom: 25px">
-            <!--S-优惠券-->
-            <div id="coupon-group"></div>
-            <!--E-优惠券-->
-        </div>
-        <div class="moneys" style="margin-top:120px;display: none;">
-            <div class="show-detail">
+        <div class="main_footer">
+            <div class="pc-coupon-w1200" style="margin-bottom: 25px">
+                <!--S-优惠券-->
+                <div id="coupon-group"></div>
+                <!--E-优惠券-->
             </div>
-        </div>
-        <div class="info pay-info main_footer clearfix">
-            <div class="fl left">
-                <p>购买须知：</p>
-                <p class="read-tip-group">1、数据流量包是数据自助导出充值服务，最低1000条起充，仅针对线上自助充值使<br>用（与线下企业数据充值账户不可共享）；<br> 2、已购数据包条数按导出数据量扣除（数据已排重，相同数据多次导出，不重复计<br>费），有效期2年，因产品特殊性，购买后不支持退款。</p>
+            <div class="moneys" style="margin-top:120px;display: none;">
+                <div class="show-detail">
+                </div>
             </div>
-            <div class="fr right">
-                <p class="clearfix t fr">
-                    <span id="checkBoxjy" class="bif-checkbox iconfont"></span>
-                    <i>已阅读并同意<a href="/front/staticPage/serviceterms.html" target="_blank">《剑鱼标讯线上购买与服务条款》</a></i>
-
-                </p>
-                <p class="btn_createOrder">
-                    <button id="buy-datapack-pay-button" class="toPay" data-need-bind-phone disabled="disabled">确认支付</button>
-                </p>
+            <div class="info pay-info clearfix">
+                <div class="fl left">
+                    <p>购买须知：</p>
+                    <p class="read-tip-group">1、数据流量包是数据自助导出充值服务，最低1000条起充，仅针对线上自助充值使<br>用（与线下企业数据充值账户不可共享）；<br> 2、已购数据包条数按导出数据量扣除（数据已排重，相同数据多次导出，不重复计<br>费），有效期2年，因产品特殊性，购买后不支持退款。</p>
+                </div>
+                <div class="fr right">
+                    <p class="clearfix t fr">
+                        <span id="checkBoxjy" class="bif-checkbox iconfont"></span>
+                        <i>已阅读并同意<a href="/front/staticPage/serviceterms.html" target="_blank">《剑鱼标讯线上购买与服务条款》</a></i>
+
+                    </p>
+                    <p class="btn_createOrder">
+                        <button id="buy-datapack-pay-button" class="toPay" data-need-bind-phone disabled="disabled">确认支付</button>
+                    </p>
+                </div>
             </div>
         </div>
     </div>
@@ -530,7 +532,7 @@
     function windowScrollFn () {
         // 购买底部固定
         // 判断xx是否处于可视区域
-        var mainFooter = $('.info.main_footer')
+        var mainFooter = $('.main_footer')
         var stickyFooter = $('.sticky-footer')
         
         var show = !isInViewport(mainFooter[0])

src/web/templates/structuredata/pc/index.html

@@ -99,7 +99,7 @@
                 </div>
             </div>
             <div class="section-buttons">
-                <button class="action-button get-data-example" data-id="structedData" style="width: 240px;">咨询客服，了解更多</button>
+                <button class="action-button open-customer" data-id="structedData" style="width: 240px;">咨询客服，了解更多</button>
             </div>
         </div>
     </div>

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

@@ -1184,6 +1184,7 @@
         }).on("touchend",function () {
             SuperSearch.init(true,true,true);
 			$("#sideIcon").hide();
+      $('#intercept').addClass('hidden')
         });
 		// $(".home_search .home_search_left").on('click', function(){
         //     $("#sideIcon").hide()