conditions.css--progress update to progress_

src/jfw/front/dataExport.go

@@ -11,6 +11,9 @@ type DataExport struct {
 	*xweb.Action
 	toSieve   xweb.Mapper `xweb:"/front/dataExport/toSieve"`   //数据导出-条件筛选
 	sieveData xweb.Mapper `xweb:"/front/dataExport/sieveData"` //筛选数据
+
+	toMyOrder  xweb.Mapper `xweb:"/front/dataExport/toMyOrder"`  //我的订单
+	queryOrder xweb.Mapper `xweb:"/front/dataExport/queryOrder"` //查询我的订单
 }
 
 func init() {
@@ -86,3 +89,13 @@ type KeyWord struct {
 	Appended []string `json:"appended"` //附加词
 	Exclude  []string `json:"exclude"`  //排除词
 }
+
+func (d *DataExport) ToMyOrder() error {
+	d.Render("/pc/myOrder.html")
+	return nil
+}
+
+func (d *DataExport) QueryOrder() error{
+	d.ServeJson(nil)
+	return nil
+}

src/web/staticres/dataExport/css/conditions.css

@@ -38,13 +38,13 @@ button {
   padding: 30px 0;
   font-family: MicrosoftYaHei;
   font-size: 16px; }
-  .conditions-box .progress {
+  .conditions-box .progress_ {
     width: 1200px;
     display: inline-block;
     padding-left: 120px;
     margin-bottom: 30px;
     box-sizing: border-box; }
-    .conditions-box .progress div {
+    .conditions-box .progress_ div {
       width: 300px;
       height: 38px;
       line-height: 38px;
@@ -53,19 +53,19 @@ button {
       color: white;
       float: left;
       margin-right: 8px; }
-      .conditions-box .progress div.a1 {
+      .conditions-box .progress_ div.a1 {
         background-color: #BFBFBF;
         color: #fff; }
-      .conditions-box .progress div.b2 {
+      .conditions-box .progress_ div.b2 {
         background-color: #72DAE8;
         color: #fff; }
-      .conditions-box .progress div.c3 {
+      .conditions-box .progress_ div.c3 {
         background-color: #2CB7CA;
         color: #fff; }
-    .conditions-box .progress .l {
+    .conditions-box .progress_ .l {
       position: relative;
       z-index: 3; }
-      .conditions-box .progress .l:after {
+      .conditions-box .progress_ .l:after {
         content: "";
         position: absolute;
         right: -23px;
@@ -75,10 +75,10 @@ button {
         border-top: 19px solid transparent;
         border-left: 23px solid #2CB7CA;
         border-bottom: 19px solid transparent; }
-    .conditions-box .progress .c {
+    .conditions-box .progress_ .c {
       z-index: 2;
       position: relative; }
-      .conditions-box .progress .c:before {
+      .conditions-box .progress_ .c:before {
         content: "";
         position: absolute;
         left: 0;
@@ -88,7 +88,7 @@ button {
         border-top: 19px solid transparent;
         border-left: 23px solid #fff;
         border-bottom: 19px solid transparent; }
-      .conditions-box .progress .c:after {
+      .conditions-box .progress_ .c:after {
         content: "";
         position: absolute;
         right: -23px;
@@ -98,9 +98,9 @@ button {
         border-top: 19px solid transparent;
         border-left: 23px solid #BFBFBF;
         border-bottom: 19px solid transparent; }
-    .conditions-box .progress .r {
+    .conditions-box .progress_ .r {
       position: relative; }
-      .conditions-box .progress .r:before {
+      .conditions-box .progress_ .r:before {
         content: "";
         position: absolute;
         left: 0;

src/web/staticres/js/public-nav.js

@@ -9,7 +9,7 @@ $(function () {
 		    $thisWidth = $(this).width(),
 		    //当前宽度
 		$thisIndex = $(this).index();
-		if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("jyblog")>-1){
+		if($href.indexOf("supsearch")>-1||$href.indexOf("bidsearchforent")>-1||$href.indexOf("promotional/topics")>-1||$href.indexOf("list")>-1||$href.indexOf("article/content")>-1||$href.indexOf("article/bdprivate")>-1||$href.indexOf("jyblog")>-1||$href.indexOf("dataExport/toSieve")>-1){
 			$navLi.find("a").css({"color":"#252627"});
 		}else{
 			$navLi.find("a").css({"color":"#fff"});

src/web/templates/pc/dataExport_sieve.html

@@ -5,6 +5,12 @@
     <meta name="viewport"
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    {{include "/common/pnc.html"}}
+    <link href="/css/pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+    <link href="/css/dev2/reset_pc.css?v={{Msg "seo" "version"}}" rel="stylesheet">
+    <link rel="stylesheet" type="text/css" href="/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}" />
+    <script type="text/javascript" src="/js/public-nav.js?v={{Msg "seo" "version"}}"></script>
+
     <link rel="stylesheet" href="//at.alicdn.com/t/font_624651_c3e1rnkx3cn.css">
     <link rel="stylesheet" href="/dataExport/css/reset_pc.css">
     <link rel="stylesheet" href="/dataExport/css/conditions.css">
@@ -17,9 +23,10 @@
     </style>
 </head>
 <body>
-<section class="conditions-box w">
+{{include "/common/pchead.html"}}
+<section class="conditions-box w" style="padding-top: 106px;">
     <!--指示条-->
-    <div class="progress">
+    <div class="progress_">
         <div class="l c3">
             1.条件筛选
         </div>
@@ -89,13 +96,13 @@
         <!--行业-->
         <div class="line-box float-box" style="padding-bottom: 0">
             <div class="left" style="padding-top: 8px">行业</div>
-            <div class="right">
+            <div class="right" style="font-size: 14px;">
                 <div class="industry">
                     <!--收起-->
                     <div class="stop">
                         更多
                     </div>
-                    <div class="industry-content">
+                    <div class="industry-content" style="width:1004px;">
                     </div>
                 </div>
             </div>
@@ -154,10 +161,12 @@
         <!--确定筛选-->
         <div class="button-box">
             <button class="sussecc" id="sieve">确定</button>
-            <button>重置</button>
+            <button id="reset">重置</button>
         </div>
     </div>
 </section>
+{{include "/common/pcbottom.html"}}
+{{include "/common/baiducc.html"}}
 <script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
 <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
 <script src="/dataExport/js/mapJSON.js"></script>
@@ -167,6 +176,7 @@
     var industrylist = {{.T.industrylist}};
     var sortArray = {{.T.sortArray}};
     $(function () {
+        $(".logo img").attr("src","/images/swordfish/sf_01.png");
         //行业
         var industryhtml = '<span id="induAll" class="active">全部</span>';
         if (sortArray != null && sortArray.length > 0) {
@@ -185,6 +195,13 @@
     });
 
     $(".u-select").click(function () {
+        resetSelectDate();
+        $(".u-select").removeClass("select");
+        $(this).addClass("select");
+    });
+
+    //重置开始时间 结束时间
+    function resetSelectDate() {
         $(".select-date").removeClass("select");
         $("#starttime").attr("data-value", "");
         $("#endtime").attr("data-value", "");
@@ -192,10 +209,7 @@
         $("#endtime").text("");
         $("#starttime").attr("data-text", "开始时间");
         $("#endtime").attr("data-text", "结束时间");
-        //
-        $(".u-select").removeClass("select");
-        $(this).addClass("select");
-    });
+    }
 
     //datepicker start-------------
     function onpicking(dp, obj) {
@@ -264,7 +278,6 @@
     function getIndustries() {
         var arr = new Array();
         $.each($(".industry-content").children("font[class='active']"), function (index, value) {
-            console.log($(value).data("value"));
             var obj = $(value);
             if (obj) {
                 arr.push(obj.data("value"));
@@ -319,6 +332,8 @@
     }
 
     $("#sieve").click(function () {
+        $("#sieve").addClass("sussecc");
+        $("#reset").removeClass("sussecc");
         var date = getDate();
         var area = getAreas();
         var industry = getIndustries();
@@ -339,5 +354,26 @@
 
         }, 'json');
     });
+
+    $("#reset").click(function () {
+        //botton
+        $("#reset").addClass("sussecc");
+        $("#sieve").removeClass("sussecc");
+        //publishtime
+        resetSelectDate();
+        $(".u-select").removeClass("select");
+        $(".u-select").first().addClass("select");
+        //area
+        $("#area-del").children().remove();
+        //industry
+        $(".industry-content").children("font").removeClass("active");
+        $(".industry-content #induAll").addClass("active");
+        //keyword
+        $("#inputDel_0").find("div[data-arr='inputDel_0']").remove();
+        //buyer
+        $("#inputDel_1").find("div[data-arr='inputDel_1']").remove();
+        //winner
+        $("#inputDel_2").find("div[data-arr='inputDel_2']").remove();
+    });
 </script>
 </html>

src/web/templates/pc/myOrder.html

@@ -0,0 +1,178 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+          content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_624651_bjdvktmum68.css">
+    <link rel="stylesheet" href="/dataExport/css/reset_pc.css">
+    <link rel="stylesheet" href="/dataExport/css/drder_details.css">
+    <title>我的订单</title>
+</head>
+<body>
+<section id="drder" class="w">
+    <div class="tab-bar">
+        <ul class="tab clearfix">
+            <li class="active">全部</li>
+            <li>待付款</li>
+            <li>已完成</li>
+        </ul>
+    </div>
+    <div class="title-bar">
+        <ul class="clearfix">
+            <li>日期</li>
+            <li>关键词</li>
+            <li>数据量</li>
+            <li>数据规格</li>
+            <li>金额</li>
+            <li>状态</li>
+        </ul>
+    </div>
+    <div class="list">
+        <!--全部-->
+        <ul class="item clearfix">
+            <li>
+                <div class="info nopay">
+                    <span>2018.09.15 15:45:23</span>
+                    <span>订单号：456670000659</span>
+                    <a href="#" class="fr iconfont  icon-shanchu"></a>
+                </div>
+                <div class="iner">
+                    <ul class="clearfix">
+                        <li class="clearfix">
+                            <img src="/dataExport/image/historical_data.png" alt="">
+                            <span>2017.05-2018.05</span>
+                        </li>
+                        <li class="gjc">
+                            <span>建筑工程</span>
+                        </li>
+                        <li>
+                            10.564条
+                        </li>
+                        <li>标准字段包</li>
+                        <li>
+                            ¥1205
+                        </li>
+                        <li>
+                            <p>待付款</p>
+                            <a class="xq" href="#">查看详情</a>
+                            <a class="pay" href="#">去支付</a>
+                        </li>
+                    </ul>
+                </div>
+            </li>
+            <li>
+                <div class="info pay">
+                    <span>2018.09.15 15:45:23</span>
+                    <span>订单号：456670000659</span>
+                    <!--<a href="#" class="fr iconfont  icon-shanchu"></a>-->
+                </div>
+                <div class="iner">
+                    <ul class="clearfix">
+                        <li class="clearfix">
+                            <img src="/dataExport/image/historical_data.png" alt="">
+                            <span>2017.05-2018.05</span>
+                        </li>
+                        <li class="gjc">
+                            <span>建筑工程</span>
+                            <span>建筑工程</span>
+                            <span>建筑工程</span>
+                        </li>
+                        <li>
+                            10.564条
+                        </li>
+                        <li>标准字段包</li>
+                        <li>
+                            ¥1205
+                        </li>
+                        <li>
+                            <p class="wc">已完成</p>
+                            <a class="wcxq" href="#">查看详情</a>
+                        </li>
+                    </ul>
+                </div>
+            </li>
+        </ul>
+        <!--待付款-->
+        <ul class="item clearfix">
+        </ul>
+        <!--已完成-->
+        <ul class="item clearfix">
+        </ul>
+    </div>
+</section>
+
+<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
+<script>
+    $(function () {
+        /*设置关键词css*/
+        var $gjccss =  $(".list .gjc");
+        $gjccss.each(function (v,i) {
+            var $l = i.children.length;
+            var $h = 66;
+            i.style.height = ($h/$l)+'px';
+            i.style.lineHeight = ($h/$l)+'px';
+        });
+
+        $(".tab-bar .tab li").on("click",function () {
+            var $Index = $(this).index();
+            $(this).addClass("active").siblings().removeClass("active");
+            var $list = $(".list .item");
+            $list.eq($Index).show().siblings().hide();
+
+            var temp = "";
+            for (var i=0;i<3;i++){
+                temp +=
+                `<li>
+                    <div class="info pay">
+                        <span>2018.09.15 15:45:23</span>
+                        <span>订单号：456670000659</span>
+                    </div>
+                    <div class="iner">
+                        <ul class="clearfix">
+                            <li class="clearfix">
+                                <img src="/dataExport/image/historical_data.png" alt="">
+                                <span>2017.05-2018.05</span>
+                            </li>
+                            <li class="gjc" style="height: 22px; line-height: 22px;">
+                                <span>建筑工程</span>
+                                <span>建筑工程</span>
+                                <span>建筑工程</span>
+                            </li>
+                            <li>10.564条</li>
+                            <li>标准字段包</li>
+                            <li>¥1205</li>
+                            <li>
+                                <p class="wc">已完成</p>
+                                <a class="wcxq" href="#">查看详情</a>
+                            </li>
+                        </ul>
+                    </div>
+                </li>`;
+            }
+
+            $list.eq($Index).html(temp);
+
+            // var param = {
+            //     "openid":"111",
+            //     "type":$Index // 0-全部 1-待支付 2-已支付
+            // }
+            // $.ajax({
+            //     type: "post",
+            //     url: "/front/dataExport/queryOrder",
+            //     data: param,
+            //     dataType: 'json',
+            //     success: function(data){
+            //
+            //     },
+            //     error: function(xhr, type){
+            //
+            //     }
+            // });
+        })
+
+    })
+</script>
+</body>
+</html>