Explorar o código

数据导出样式调整,采购单位,中标单位模糊联想处理

wenmenghao321 hai 1 ano
pai
achega
c9c5400837

+ 3 - 3
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/dataExport.css

@@ -169,12 +169,12 @@ html .page .elseChoose .elseChooseList {
 
 html .page .elseChoose .elseChooseList ul li {
   padding: 0 .4rem;
-  height: .88rem;
-  line-height: .88rem;
+  /* height: .88rem;
+  line-height: .88rem; */
   background: #fff;
   font-size: 0.3rem;
   color: #1d1d1d;
-  margin-bottom: .24rem;
+  /* margin-bottom: .24rem; */
 }
 
 html .page .elseChoose .elseChooseList ul li a {

+ 64 - 28
src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -4,6 +4,8 @@
 <head>
     {{include "/common/meta.html"}}
     <title>数据导出</title>
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" type="text/css"
           href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" type="text/css"
@@ -20,9 +22,11 @@
           href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/appbutton.css?v={{Msg "seo" "version"}}"/>
     <link href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/p13.css?v={{Msg "seo" "version"}}" rel="stylesheet">
   <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.css">
+  <link rel="stylesheet"href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/css/dataExportAppend.css?v={{Msg "seo" "version"}}'/>
   <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.js"></script>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
     <script src="//cdn-common.jianyu360.com/cdn/lib/vue/2.6.14/vue.min.js"></script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
     {{include "/common/js.html"}}
 </head>
@@ -66,8 +70,8 @@
     html .page .chooseTime .dateMake input {
         display: inline-block;
         width: 3.05rem;
-        /*height: .72rem;
-        line-height: .72rem;*/
+        /* height: .72rem; */
+        line-height: 0.4rem;
         font-size: .28rem;
         border: 1px solid #CECECE;
         margin: .16rem .13rem;
@@ -226,30 +230,36 @@
     <span></span>
 </div>
 <div class="app-layout-content-b">
-    <div class="page">
-        <div class='main' style="">
-            <div class="progress" style="margin-top: -4px">
-                <div class="p-item">
-                    <p class="p-item-icon" style="background: #2cb7ca;">
-                        <i class="icon iconfont">&#xe606;</i>
-                    </p>
-                    <span class="active">条件筛选</span>
-                    <div class="line"></div>
-                </div>
-
-                <div class="p-item">
-                    <p class="p-item-icon">
-                        <i class="icon iconfont">&#xe617;</i>
-                    </p>
-                    <span>支付订单</span>
-                    <div class="line"></div>
-                </div>
-
-                <div class="p-item">
-                    <p class="p-item-icon icon-gray">
-                        <i class="icon iconfont">&#xe616;</i>
-                    </p>
-                    <span>数据导出</span>
+    <div class="page" style="background-color:#F5F6F7;">
+        <div class='main'>
+            <div class="screeningCondition">
+                <div class="sc-btn"><span class="sc-text">已存筛选&nbsp;</span><span class="sc-num">0</span></div>
+                <span class="sc-icon"></span>
+            </div>
+            <div class="progressBox">
+                <div class="progress" style="margin-top: -4px">
+                    <div class="p-item">
+                        <p class="p-item-icon" style="background: #2cb7ca;">
+                            <!-- <i class="icon iconfont">&#xe606;</i> -->
+                        </p>
+                        <span class="active">条件筛选</span>
+                        <div class="line"></div>
+                    </div>
+    
+                    <div class="p-item">
+                        <p class="p-item-icon">
+                            <!-- <i class="icon iconfont">&#xe617;</i> -->
+                        </p>
+                        <span>支付订单</span>
+                        <div class="line"></div>
+                    </div>
+    
+                    <div class="p-item">
+                        <p class="p-item-icon icon-gray">
+                            <!-- <i class="icon iconfont">&#xe616;</i> -->
+                        </p>
+                        <span>数据导出</span>
+                    </div>
                 </div>
             </div>
             <!-- dateChooseStart -->
@@ -261,13 +271,13 @@
                     <li><span data-value="2016_toNow"></span></li>
                 </ul>
                 <div class="dateMake">
-                    <i class="iconfont icon-rili" id="first"></i>
+                    <!-- <i class="iconfont icon-rili" id="first"></i> -->
                     <input id="starttime" type="text" placeholder="开始日期" readonly="readonly" unselectable="on"
                            onfocus="this.blur()"/>
                     <div class="heng">—</div>
                     <input id="endtime" type="text" placeholder="截止日期" readonly="readonly" unselectable="on"
                            onfocus="this.blur()"/>
-                    <i class="iconfont icon-rili" id="second"></i>
+                    <!-- <i class="iconfont icon-rili" id="second"></i> -->
                 </div>
             </div>
             <!-- dateChooseEnd -->
@@ -556,6 +566,7 @@
             $("#starttime").removeClass("timeSelect");
             $("#endtime").removeClass("timeSelect");
             $(".dateMake").css({"color": "#888"});
+            $(".dateMake").removeClass('chooseTimebox')
             localStorage.removeItem("export_starttime");
             localStorage.removeItem("export_endtime");
         });
@@ -889,6 +900,7 @@
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color": "#24C0D7"});
+                    $(".dateMake").addClass('chooseTimebox')
                     $(".chooseTime ul li").removeClass('active');
 
                     $(".confirm").hide();
@@ -913,6 +925,7 @@
                     $("#endtime").removeClass("timeSelect");
                     $("#starttime").removeClass("timeSelect");
                     $(".dateMake").css({"color": "#000"});
+                    $(".dateMake").removeClass('chooseTimebox')
                     $(".chooseTime > i").css("color", "#888");
                     $(".chooseTime ul li").removeClass('active');
                     $(".chooseTime ul li:eq(0)").addClass('active');
@@ -955,6 +968,7 @@
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color": "#24C0D7"});
+                    $(".dateMake").addClass('chooseTimebox')
                     $(".chooseTime ul li").removeClass('active');
 
                     $(".confirm").hide();
@@ -979,6 +993,7 @@
                     $("#endtime").removeClass("timeSelect");
                     $("#starttime").removeClass("timeSelect");
                     $(".dateMake").css({"color": "#000"});
+                    $(".dateMake").removeClass('chooseTimebox')
                     $(".chooseTime > i").css("color", "#888");
                     $(".chooseTime ul li").removeClass('active');
                     $(".chooseTime ul li:eq(0)").addClass('active');
@@ -1000,6 +1015,7 @@
             $("#starttime").addClass("timeSelect");
             $("#endtime").addClass("timeSelect");
             $(".dateMake").css({"color": "#24C0D7"});
+            $(".dateMake").addClass('chooseTimebox')
             $(".chooseTime ul li").removeClass('active');
             $(".confirm").hide();
             $(".resetOne").css('display', 'flex');
@@ -1017,6 +1033,7 @@
             $("#starttime").addClass("timeSelect");
             $("#endtime").addClass("timeSelect");
             $(".dateMake").css({"color": "#24C0D7"});
+            $(".dateMake").addClass('chooseTimebox')
             $(".chooseTime ul li").removeClass('active');
             $(".confirm").hide();
             $(".resetOne").css('display', 'flex');
@@ -1064,6 +1081,7 @@
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color": "#24C0D7"});
+                    $(".dateMake").addClass('chooseTimebox')
                     $(".chooseTime ul li").removeClass('active');
                 }
             }
@@ -1080,6 +1098,13 @@
 //      	alert(scrollTop)
 //      	$(document).scrollTop(scrollTop);
 //      }
+       $(".screeningCondition .sc-btn").on('click', function () { // 跳转至保存筛选列表页
+         window.location.href = "/jy_mobile/search/filter-history/bidding?from=dataExport";
+       })
+       $(".screeningCondition .sc-icon").on('click', function () { // 调起说明弹框
+        checkboxVm.showDialog({title:'已存筛选说明', message:'数据导出后,会将历史筛选条件保存在已存筛选中。您可从已存筛选中直接选择并使用。'})
+         
+       })
         //筛选条件发送
         $(".saveData").on('click', function () {
             var date = "";
@@ -1279,6 +1304,7 @@
             $("#starttime").removeClass("timeSelect");
             $("#endtime").removeClass("timeSelect");
             $(".dateMake").css({"color": "#888"});
+            $(".dateMake").removeClass('chooseTimebox')
             $("#starttime").val("");
             $("#endtime").val("");
             //
@@ -1382,6 +1408,16 @@
         mounted() {
         },
         methods: {
+            showDialog ({title,message}){
+                this.$dialog({
+                    className:'msgDialog',
+                    title: title,
+                    message: message,
+                    messageAlign:'left',
+                    confirmButtonText: '我知道了',
+                    confirmButtonColor: '#2ABED1'
+                })
+            },
             open_(str){
                 this.list=[
                     {name:'标题',val:false},

+ 7 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -10,7 +10,9 @@
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
+	<link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/css/association.css?v={{Msg "seo" "version"}}'/>
 	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
+	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/js.html"}}
 </head>
 <style>
@@ -55,7 +57,6 @@
 						<button class="close">取消</button>
 					</div>
 				</div>
-
 				<!-- 添加附加词显示列表 -->
 				<div class="showKeyWord">
 					<ul>
@@ -63,16 +64,18 @@
 
 					</ul>
 
+				</div>
+				<div class="association-list-box" style="display: none;">
+					<ul class="association-list">
+					</ul>
 				</div>
 					</section>
 			</div>
-
 		</div>
 	</div>
 	<div class="addKeyWord">
 		<i class="iconfont icon-tianjia"></i>
 	</div>
-  <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/utils.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/js/additionWord.js?v={{Msg "seo" "version"}}"></script>
 <script>
@@ -108,6 +111,7 @@
 		$('.showKeyWord > ul').prepend(html);
 	}
 </script>
+<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/js/association.js?v={{Msg "seo" "version"}}"></script>
 
 <!--百度统计end-->
 {{include "/common/baiducc.html"}}

+ 7 - 2
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerInput.html

@@ -10,7 +10,9 @@
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/css/association.css?v={{Msg "seo" "version"}}'/>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
+    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/js.html"}}
     </head>
     <style>
@@ -59,7 +61,10 @@
         </ul>
 
         </div>
-
+        <div class="association-list-box" style="display: none;">
+            <ul class="association-list">
+            </ul>
+        </div>
         </section>
         </div>
        		</div>
@@ -130,7 +135,7 @@
             history.back();
         });
     </script>
-
+<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/js/association.js?v={{Msg "seo" "version"}}"></script>
 <!--百度统计end-->
 {{include "/common/baiducc.html"}}
 </body>

+ 7 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -10,7 +10,9 @@
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
+	<link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/css/association.css?v={{Msg "seo" "version"}}'/>
 	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
+	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/js.html"}}
 	</head>
 	<style>
@@ -60,6 +62,10 @@
 						</ul>
 
 						</div>
+						<div class="association-list-box" style="display: none;">
+							<ul class="association-list">
+							</ul>
+						</div>
 
 						</div>
 
@@ -282,6 +288,7 @@
 		})
 
 	</script>
+	<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/js/association.js?v={{Msg "seo" "version"}}"></script>
 <!--百度统计end-->
 {{include "/common/baiducc.html"}}
 	</body>

+ 7 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerInput.html

@@ -10,7 +10,9 @@
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css" />
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/css/association.css?v={{Msg "seo" "version"}}'/>
     <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
+    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/js.html"}}
     </head>
     <style>
@@ -57,6 +59,10 @@
         </ul>
 
 
+        </div>
+        <div class="association-list-box" style="display: none;">
+            <ul class="association-list">
+            </ul>
         </div>
             </section>
         </div>
@@ -132,6 +138,7 @@
     })
 
     </script>
+    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/dataExport/js/association.js?v={{Msg "seo" "version"}}"></script>
 <!--百度统计end-->
 {{include "/common/baiducc.html"}}
 </body>

+ 49 - 0
src/web/staticres/common-module/dataExport/css/association.css

@@ -0,0 +1,49 @@
+.association-list-box{
+  flex: 1;
+  box-sizing: border-box;
+  padding-top: 0.16rem;
+  overflow-y: scroll;
+  padding-bottom: 0.16rem;
+  background-color: #fff;
+  border-radius: 0.2rem 0.2rem 0 0;
+}
+.association-list{
+  height: 100%;
+  overflow-y: scroll;
+  box-sizing: border-box;
+  padding-left: 0.32rem;
+  background-color: #fff;
+  border-radius: 0.2rem 0.2rem 0 0;
+  
+}
+.association-item{
+  height: 0.92rem;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid #F5F6F7;
+  color: #171826;
+  font-size: 0.28rem;
+}
+.btn{
+  height: 0.94rem;
+}
+.keyWord{
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  overflow: scroll;
+
+}
+.keyWord .content{
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+
+}
+.enter.addkeyWord{
+  /* height: 100%; */
+}
+.highlight-text{
+  color: #2ABED1;
+}

+ 130 - 0
src/web/staticres/common-module/dataExport/css/dataExportAppend.css

@@ -0,0 +1,130 @@
+.screeningCondition{
+  box-sizing: border-box;
+  height: 1.12rem;
+  padding-right: 0.35rem;
+  display: flex;
+  align-items: center;
+  justify-content: end;
+}
+.screeningCondition .sc-btn{
+  padding: 0.08rem 0.16rem;
+  display: flex;
+  background-color: #fff;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #2ABED1;
+  border-radius: 0.08rem;
+  color: #2ABED1;
+
+}
+.screeningCondition .sc-icon{
+  width: 0.4rem;
+  height: 0.4rem;
+  background-image: url(/images/help.png);
+  background-size: contain;
+  display: flex;
+  margin-left: 0.16rem;
+}
+html .page .elseChoose .elseChooseList ul li{
+  height: 1.08rem;
+  line-height: 1.08rem;
+  border-bottom: 1px solid #F5F6F7;
+  padding-left: 0;
+  color: #171826;
+}
+html .page .elseChoose .elseChooseList ul {
+  margin-bottom: 0.24rem;
+  padding-left: 0.32rem;
+  box-sizing: border-box;
+  background-color: #fff;
+}
+html .page .elseChoose .elseChooseList ul li a span{
+  height: 1.08rem;
+}
+html .page .elseChoose .elseChooseList ul li a i{
+  color: #C0C4CC;
+}
+html .page .elseChoose .elseChooseList ul .iconfont{
+  font-size: 15px;
+}
+html .page .elseChoose .elseChooseList ul li a span{
+  color: #9B9CA3;
+}
+html .page .elseChoose p{
+  color: #9B9CA3;
+}
+html .page .chooseTime{
+  background-color: #fff;
+  padding-top: 0.32rem;
+  margin-top: 0;
+  padding-bottom: 0.16rem;
+}
+html .page .progress{
+/* padding: 0 0.32rem; */
+margin: 0 0.32rem;
+border-bottom: 1px solid #F5F6F7;
+}
+html .page .progress .p-item{
+  /* border-bottom: 1px solid #F5F6F7; */
+  /* padding: 0.2rem 0; */
+  color: #9B9CA3;
+}
+html .page .progressBox{
+  background-color: #fff;
+
+}
+html .page .chooseTime ul li{
+  color: #5F5E64;
+  background-color: #F5F6F7;
+}
+html .page .chooseTime .dateMake {
+  height: 1.04rem;
+  line-height: 1.04rem;
+  width: 6.84rem;
+  padding: 0.16rem;
+  margin: auto;
+  margin-top: 0.16rem;
+  box-sizing: border-box;
+}
+html .page .chooseTime .dateMake .heng{
+  color: #0000004D;
+}
+html .page .chooseTime .dateMake input{
+  width: 2.96rem !important;
+  margin: 0!important;
+  border-radius: 0.08rem !important;
+  border: 1px solid #0000001A !important;
+  color: #171826 !important;
+  padding-left: 0.38rem!important;
+  padding-right: 0.38rem!important;;
+  /* text-align:center; */
+}
+html .page .chooseTimebox{
+  background-color: #E8FAFD !important;
+  position: relative;
+  border-radius: 0.08rem;
+}
+html .page .chooseTimebox::before{
+  content: '';
+  position: absolute;
+  width: 0.28rem;
+  height: 0.24rem;
+  background-image: url(/images/right_corner.png);
+  background-size: contain;
+  right: 0;
+  bottom: 0;
+}
+
+html .page .progress .p-item .p-item-icon{
+  width: 0.2rem;
+  height: 0.2rem;
+  line-height: 0.2rem;
+  background-color: #E6E6E6;
+}
+html .page .progress .p-item .line{
+  top: 0.1rem;
+  background-color: #E6E6E6;
+  height: 0.02rem;
+  width: 2rem;
+  right: -1rem;
+}

+ 84 - 0
src/web/staticres/common-module/dataExport/js/association.js

@@ -0,0 +1,84 @@
+$(function(){
+  var chooseindex;
+  var debouncedInputHandler = utils.debounce(function(e) {
+    if($('.keyWord .addkeyWord').css('display') != 'none'){
+      var input_query = $('.keyWord input').val()
+    }else{
+      var input_query = $('.keyWord textarea').eq(chooseindex).val()
+    } 
+    let type = ''
+    if(window.location.href.indexOf('buyer') > -1){
+      type = 'buyer'
+    }else{
+      type = 'ent'
+    }
+    associationNameList(type,input_query,function(res){
+      $('.keyWord .association-list').html('')
+      if(res.length > 0){
+        $('.keyWord .association-list').html('')
+        res.forEach(function(item){
+          $('.keyWord .association-list').append('<li class="association-item" data-val='+item.value+'>'+ utils.replaceKeyword(item.value,input_query, '<span class="highlight-text">' + input_query + '</span>')+'</li>')
+        })
+        $('.keyWord .association-list-box').show()
+        }else{
+          $('.keyWord .association-list-box').hide()
+        }
+    })
+  },300)
+  $('.keyWord').on('click','.editKeyWord',function(){
+     chooseindex = $(this).index('.editKeyWord') // 当前修改索引赋值
+     console.log(chooseindex)
+  })
+  $('.keyWord input').on('input',debouncedInputHandler) // 新增
+  $('.keyWord').on('input','textarea',debouncedInputHandler) // 修改
+  $('.keyWord input').on('blur',function(){
+    setTimeout(function () {
+      $('.keyWord .association-list-box').hide()
+    }, 100);
+  })
+  $('.keyWord').on('blur','textarea',function(){
+    setTimeout(function () {
+      $('.keyWord .association-list-box').hide()
+    }, 100);
+  })
+  $('.keyWord .association-list').on('click','.association-item',function(){
+    if($('.keyWord .addkeyWord').css('display') != 'none'){
+      $('.keyWord input').val($(this).attr('data-val'))
+    }else{
+      $('.keyWord textarea').eq(chooseindex).val($(this).attr('data-val'))
+
+    }
+    $('.keyWord .association-list-box').hide()
+  })
+})
+function associationNameList (type,str, cb) {
+  const query = str.trim()
+  if (query.length < 2) {
+    return cb([])
+  }
+  $.ajax({
+    type: 'POST',
+    url: '/bigmember/search/'+type+'/association',
+    data: {
+      name: query,
+      typ: type
+    },
+    success: function (res) {
+      if (res.error_code == 0) {
+        if (res.data) {
+          // const result = (res.data.list || []).map(v => {
+          //   return {
+          //     ...v,
+          //     value: v.name
+          //   }
+          // })
+          const result = [{value:'中国佛学院'},{value:'中国佛学院'},{value:'中国佛学院'},{value:'中国佛学院'},{value:'中国佛学院'},{value:'中国佛学院'},{value:'中国佛学院'}]
+          cb(result)
+        }
+      }
+    },
+    error: function (error) {
+      cb([])
+    }
+  })
+}

BIN=BIN
src/web/staticres/images/right_corner.png


+ 3 - 3
src/web/staticres/wx_dataExport/css/dataExport.css

@@ -169,12 +169,12 @@ html .page .elseChoose .elseChooseList {
 
 html .page .elseChoose .elseChooseList ul li {
   padding: 0 .4rem;
-  height: .88rem;
-  line-height: .88rem;
+  /* height: .88rem;
+  line-height: .88rem; */
   background: #fff;
   font-size: 0.3rem;
   color: #1d1d1d;
-  margin-bottom: .24rem;
+  /* margin-bottom: .24rem; */
 }
 
 html .page .elseChoose .elseChooseList ul li a {

+ 49 - 12
src/web/templates/weixin/dataExport/dataExport.html

@@ -7,12 +7,15 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>数据导出</title>
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/index.css />
+    <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/icon/local.css />
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 <!--    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">-->
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}5">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}1">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
+    <link rel="stylesheet"href='{{Msg "seo" "cdn"}}/common-module/dataExport/css/dataExportAppend.css?v={{Msg "seo" "version"}}'/>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
   <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
   <script src="//cdn-common.jianyu360.com/cdn/lib/vue/2.6.14/vue.min.js"></script>
@@ -25,6 +28,7 @@
     <script src="https://cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js"></script>
     <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
+    <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
     <!--2.10.4-->
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}"/>
     <script type="text/javascript" src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
@@ -83,9 +87,10 @@
         border: 1px solid #CECECE;
         margin: .16rem .13rem;
         border-radius: 0.02rem;
-		    padding-top: 0.14rem;
-    	  padding-bottom: 0.14rem;
-		    padding-left: 0.68rem;
+		padding-top: 0.14rem;
+    	padding-bottom: 0.14rem;
+		padding-left: 0.68rem;
+        line-height: 0.4rem;
     }
     html .page .chooseTime > i{
         position: relative;
@@ -225,13 +230,18 @@
   }
 </style>
 <body class="p13">
-    <div class="page j-container">
+    <div class="page j-container" style="background-color:#F5F6F7;">
       <div class="main j-main">
        <div>
-        <div class="progress">
+        <div class="screeningCondition">
+            <div class="sc-btn"><span class="sc-text">已存筛选&nbsp;</span><span class="sc-num">0</span></div>
+            <span class="sc-icon"></span>
+        </div>
+        <div class="progressBox">
+         <div class="progress">
         	<div class="p-item">
         		<p class="p-item-icon" style="background: #2cb7ca;">
-        			<i class="icon iconfont" >&#xe606;</i>
+        			<!-- <i class="icon iconfont" >&#xe606;</i> -->
         		</p>
         		<span class="active">条件筛选</span>
         		<div class="line"></div>
@@ -239,7 +249,7 @@
 
         	<div class="p-item">
         		<p class="p-item-icon">
-        			<i class="icon iconfont">&#xe617;</i>
+        			<!-- <i class="icon iconfont">&#xe617;</i> -->
         		</p>
         		<span>支付订单</span>
         		<div class="line"></div>
@@ -247,12 +257,13 @@
 
         	<div class="p-item">
         		<p class="p-item-icon icon-gray">
-        			<i class="icon iconfont">&#xe616;</i>
+        			<!-- <i class="icon iconfont">&#xe616;</i> -->
         		</p>
         		<span>数据导出</span>
         	</div>
+         </div>
         </div>
-            <div class="tit">
+            <!-- <div class="tit">
               <div class="helpwhat">数据导出可以帮助您做什么<img style="width: 15px; margin-top: -2px; margin-left: 2px;transform: rotate(180deg);" src="/wx_dataExport/images/jt.png"/></div>
               <div class="btn_img" style="display:none;" >
                 <span class="j-icon icon-arrow-top cion_img"></span>
@@ -267,7 +278,7 @@
                 <div class="sieve-cont ">2、准确掌握行业客户、竞争对手、合作伙伴的招投标活动;</div>
                 <div class="sieve-cont mar-bot10">3、轻松挖掘潜在客户、合作伙伴、拓展市场空间。</div>
               </div>
-          </div>
+          </div> -->
          <div>
         <!-- dateChooseStart -->
         <div class="chooseTime">
@@ -278,11 +289,11 @@
                 <li><span data-value="2016_toNow"></span></li>
             </ul>
             <div class="dateMake">
-            	<i class="iconfont icon-rili" id="first"></i>
+            	<!-- <i class="iconfont icon-rili" id="first"></i> -->
                 <input id="starttime" placeholder="开始日期" readonly="readonly">
                 <div class="heng">—</div>
                 <input id="endtime" placeholder="截止日期" readonly="readonly">
-                <i class="iconfont icon-rili" id="second"></i>
+                <!-- <i class="iconfont icon-rili" id="second"></i> -->
             </div>
         </div>
         <!-- dateChooseEnd -->
@@ -584,6 +595,7 @@
             $("#starttime").removeClass("timeSelect");
             $("#endtime").removeClass("timeSelect");
             $(".dateMake").css({"color":"#888"});
+            $(".dateMake").removeClass('chooseTimebox')
 			localStorage.removeItem("export_starttime");
            	localStorage.removeItem("export_endtime");
         });
@@ -912,6 +924,7 @@
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color":"#24C0D7"});
+                    $(".dateMake").addClass('chooseTimebox')
                     $(".chooseTime ul li").removeClass('active');
 
                     $(".confirm").hide();
@@ -934,6 +947,7 @@
                     $("#endtime").removeClass("timeSelect");
                     $("#starttime").removeClass("timeSelect");
                     $(".dateMake").css({"color":"#000"});
+                    $(".dateMake").removeClass('chooseTimebox')
                     $(".chooseTime > i").css("color","#888");
                     $(".chooseTime ul li").removeClass('active');
                     $(".chooseTime ul li:eq(0)").addClass('active');
@@ -975,6 +989,7 @@
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color":"#24C0D7"});
+                    $(".dateMake").addClass('chooseTimebox')
                     $(".chooseTime ul li").removeClass('active');
 
                     $(".confirm").hide();
@@ -997,6 +1012,7 @@
                     $("#endtime").removeClass("timeSelect");
                     $("#starttime").removeClass("timeSelect");
                     $(".dateMake").css({"color":"#000"});
+                    $(".dateMake").removeClass('chooseTimebox')
                     $(".chooseTime > i").css("color","#888");
                     $(".chooseTime ul li").removeClass('active');
                     $(".chooseTime ul li:eq(0)").addClass('active');
@@ -1018,6 +1034,7 @@
             $("#starttime").addClass("timeSelect");
             $("#endtime").addClass("timeSelect");
             $(".dateMake").css({"color":"#24C0D7"});
+            $(".dateMake").addClass('chooseTimebox')
             $(".chooseTime ul li").removeClass('active');
             $(".confirm").hide();
             $(".resetOne").css('display','flex');
@@ -1035,6 +1052,7 @@
             $("#starttime").addClass("timeSelect");
             $("#endtime").addClass("timeSelect");
             $(".dateMake").css({"color":"#24C0D7"});
+            $(".dateMake").addClass('chooseTimebox')
             $(".chooseTime ul li").removeClass('active');
             $(".confirm").hide();
             $(".resetOne").css('display','flex');
@@ -1082,6 +1100,7 @@
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color":"#24C0D7"});
+                    $(".dateMake").addClass('chooseTimebox')
                     $(".chooseTime ul li").removeClass('active');
                 }
             }
@@ -1093,6 +1112,13 @@
             sessionStorage.removeItem("keyWord");
             sessionStorage.IOSsession = "";
         }
+        $(".screeningCondition .sc-btn").on('click', function () { // 跳转至保存筛选列表页
+         window.location.href = "/jy_mobile/search/filter-history/bidding?from=dataExport";
+       })
+       $(".screeningCondition .sc-icon").on('click', function () { // 调起说明弹框
+        checkboxVm.showDialog({title:'已存筛选说明', message:'数据导出后,会将历史筛选条件保存在已存筛选中。您可从已存筛选中直接选择并使用。'})
+         
+       })
         //
         //筛选条件发送
         $(".saveData").on('click', function () {
@@ -1292,6 +1318,7 @@
             $("#starttime").removeClass("timeSelect");
             $("#endtime").removeClass("timeSelect");
             $(".dateMake").css({"color":"#888"});
+            $(".dateMake").removeClass('chooseTimebox')
             $("#starttime").val("");
             $("#endtime").val("");
             //
@@ -1391,6 +1418,16 @@
         mounted() {
         },
         methods: {
+            showDialog ({title,message}){
+                this.$dialog({
+                    className:'msgDialog',
+                    title: title,
+                    message: message,
+                    messageAlign:'left',
+                    confirmButtonText: '我知道了',
+                    confirmButtonColor: '#2ABED1'
+                })
+            },
             open_(str){
                 this.list=[
                     {name:'标题',val:false},

+ 7 - 0
src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

@@ -10,6 +10,7 @@
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}5">
+	<link rel="stylesheet"href='{{Msg "seo" "cdn"}}/common-module/dataExport/css/association.css?v={{Msg "seo" "version"}}'/>
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
 	{{include "/common/weixin.html"}}
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
@@ -54,6 +55,10 @@
 		</ul>
 
 	</div>
+	<div class="association-list-box" style="display: none;">
+		<ul class="association-list">
+		</ul>
+	</div>
 </div>
 <div class="addKeyWord">
 	<i class="iconfont icon-tianjia"></i>
@@ -100,6 +105,8 @@
 	}
 
 </script>
+<script src="{{Msg "seo" "cdn"}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/common-module/dataExport/js/association.js?v={{Msg "seo" "version"}}"></script>
 
 	{{include "/common/baiducc.html"}}
 </body>

+ 7 - 0
src/web/templates/weixin/dataExport/dataExport_buyerInput.html

@@ -10,9 +10,11 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
+    <link rel="stylesheet"href='{{Msg "seo" "cdn"}}/common-module/dataExport/css/association.css?v={{Msg "seo" "version"}}'/>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <style>
         .keyWord .addKeyWord {
@@ -51,6 +53,10 @@
         <i class="iconfont icon-tianjia"></i>
         </div>
         </div>
+        <div class="association-list-box" style="display: none;">
+            <ul class="association-list">
+            </ul>
+        </div>
         </div>
         <script src="https://cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
@@ -121,6 +127,7 @@
         })
 
     </script>
+    <script src="{{Msg "seo" "cdn"}}/common-module/dataExport/js/association.js?v={{Msg "seo" "version"}}"></script>
 
 	{{include "/common/baiducc.html"}}
 </body>

+ 8 - 1
src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -11,8 +11,11 @@
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}4">
+	<link rel="stylesheet"href='{{Msg "seo" "cdn"}}/common-module/dataExport/css/association.css?v={{Msg "seo" "version"}}'/>
 	{{include "/common/weixin.html"}}
+	<script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+	<script src="{{Msg "seo" "cdn"}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}"></script>
 	</head>
 	<style>
 		.addKeyWord i {
@@ -50,7 +53,10 @@
 			</ul>
 
 		</div>
-
+		<div class="association-list-box" style="display: none;">
+			<ul class="association-list">
+			</ul>
+		</div>
 	</div>
 	<div class="addKeyWord">
 		<i class="iconfont icon-tianjia"></i>
@@ -282,6 +288,7 @@
 		})
 
 	</script>
+	<script src="{{Msg "seo" "cdn"}}/common-module/dataExport/js/association.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/baiducc.html"}}
 	</body>
 

+ 8 - 1
src/web/templates/weixin/dataExport/dataExport_winnerInput.html

@@ -10,9 +10,12 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}4">
+    <link rel="stylesheet"href='{{Msg "seo" "cdn"}}/common-module/dataExport/css/association.css?v={{Msg "seo" "version"}}'/>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/common-module/public/js/utils.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <style>
         .keyWord .addKeyWord {
@@ -50,7 +53,10 @@
         </div>
 
         </div>
-
+        <div class="association-list-box" style="display: none;">
+            <ul class="association-list">
+            </ul>
+        </div>
         </div>
         <script src="https://cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
@@ -124,6 +130,7 @@
         })
 
     </script>
+     <script src="{{Msg "seo" "cdn"}}/common-module/dataExport/js/association.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/baiducc.html"}}
     </body>