Merge branch 'dev2.5.1' of ssh://192.168.3.207:10022/qmx/jy into dev2.5.1

src/jfw/front/dataExport.go

@@ -25,11 +25,12 @@ var (
 
 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"`  //查询我的订单
-	deleteOrder xweb.Mapper `xweb:"/front/dataExport/deleteOrder"` //删除订单
+	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"`         //查询我的订单
+	deleteOrder   xweb.Mapper `xweb:"/front/dataExport/deleteOrder"`        //删除订单
+	toOrderDetail xweb.Mapper `xweb:"/front/dataExport/toOrderDetail/(.*)"` //订单详情
 
 	superSearchExport xweb.Mapper `xweb:"/front/dataExport/superSearchExport"`      //数据导出-超级搜索
 	toCreateOrderPage xweb.Mapper `xweb:"/front/dataExport/toCreateOrderPage/(.*)"` //数据导出-订单页面
@@ -139,16 +140,26 @@ func (d *DataExport) SieveData() error {
 	d.ServeJson(&d.T)
 	return nil
 }
-
+/*筛选条件-关键词*/
 type KeyWord struct {
 	Keyword  string   `json:"keyword"`  //关键词
 	Appended []string `json:"appended"` //附加词
 	Exclude  []string `json:"exclude"`  //排除词
 }
 
+/*筛选条件*/
+type SieveCondition struct {
+	PublishTime string    `json:"publishtime"`
+	Area        []string  `json:"area"`
+	Industry    []string  `json:"industry"`
+	Keyword     []KeyWord `json:"keyword"`
+	Buyer       []string  `json:"buyer"`
+	Winner      []string  `json:"winner"`
+}
+
 func (d *DataExport) ToMyOrder() error {
 	d.T["logid"] = config.Seoconfig["dataexport"].(string)
-	d.Render("/pc/myOrder.html",&d.T)
+	d.Render("/pc/myOrder.html", &d.T)
 	return nil
 }
 
@@ -169,7 +180,7 @@ func (d *DataExport) QueryOrder() error {
 	if openid := d.GetSession("s_m_openid"); openid != nil {
 		query["user_openid"] = openid.(string)
 	}
-	fileds := "id,create_time,out_trade_no,filter_publishtime,filter_keys,data_count,data_spec,order_money,order_status"
+	fileds := "id,create_time,order_code,filter_publishtime,filter_keys,data_count,data_spec,order_money,order_status"
 	list := tools.Mysql.Find(tableName_order, query, fileds, "create_time desc", -1, -1)
 	if list != nil {
 		for _, v := range *list {
@@ -195,6 +206,39 @@ func (d *DataExport) DeleteOrder() error {
 	return nil
 }
 
+func (d *DataExport) ToOrderDetail(id string) error {
+	orderDetail := map[string]interface{}{}
+	filter := SieveCondition{}
+	if id != "" {
+		orderDetail = *tools.Mysql.FindOne(tableName_order, map[string]interface{}{"id": id}, "", "")
+	}
+	log.Println("ToOrderDetail", id, orderDetail)
+	if orderDetail["pay_money"] != nil {
+		orderDetail["pay_money"] = orderDetail["pay_money"].(int64) / 100
+	}
+	if orderDetail["filter"] != nil {
+		err := json.Unmarshal([]byte(orderDetail["filter"].(string)), &filter)
+		if err == nil {
+			publishtime := filter.PublishTime
+			if publishtime != "" {
+				timeArr := strings.Split(publishtime, "_")
+				start, err := strconv.ParseInt(timeArr[0], 10, 64)
+				end, erro := strconv.ParseInt(timeArr[1], 10, 64)
+				if err == nil && erro == nil {
+					filter.PublishTime = util.FormatDateByInt64(&start, layout_date) + "-" + util.FormatDateByInt64(&end, layout_date)
+				}
+			}
+			orderDetail["filter"] = filter
+		}else{
+			log.Println("筛选条件-关键词-结构体反序列化-错误",err)
+		}
+	}
+	d.T["o"] = orderDetail
+	d.T["logid"] = config.Seoconfig["dataexport"].(string)
+	d.Render("/pc/orderDetail.html", &d.T)
+	return nil
+}
+
 //---------------------------生成订单预览----------------------------------
 func (de *DataExport) SuperSearchExport() error {
 	openid := util.ObjToString(de.GetSession("s_m_openid"))

src/web/templates/pc/dataExport_sieve.html

@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="/dataExport/css/conditions.css">
     <script language="javascript" type="text/javascript" src="/My97DatePicker/WdatePicker.js"></script>
 
-    {{include "/common/pnc.html"}}
+{{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"}}"/>
@@ -21,6 +21,7 @@
             border-color: #2CB7CA;
             color: #2CB7CA;
         }
+
         .btn-border {
             border: 1px solid #e0e0e0;
         }
@@ -28,7 +29,7 @@
 </head>
 <body>
 {{include "/common/pchead.html"}}
-<section class="conditions-box w" style="padding-top: 106px;">
+<section class="conditions-box w">
     <!--指示条-->
     <div class="progress_">
         <div class="l c3">
@@ -351,7 +352,7 @@
 
         var param = {
             "publishtime": date,
-            "area": area.toString(),
+            "area": area.toString() == "全国" ? "" : area.toString(),
             "industry": industry.toString(),
             "keyword": JSON.stringify(keyword),
             "buyer": buyer.toString(),

src/web/templates/pc/myOrder.html

@@ -18,7 +18,7 @@
 </head>
 <body style="background-color: #fff !important;">
 {{include "/common/pchead.html"}}
-<section id="drder" class="w" style="padding-top: 107px;">
+<section id="drder" class="w">
     <div class="tab-bar">
         <ul class="tab clearfix">
             <li class="active">全部</li>
@@ -50,16 +50,15 @@
 </section>
 {{include "/common/pcbottom.html"}}
 {{include "/common/baiducc.html"}}
-<script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
 <script>
     $(function () {
         selcetIndexNav(4);
         haslogin({{.T.logid}});
 
-        $("body").css("background-color","#fff !important");
         $("body").css("line-height","1");
         $(".logo img").attr("src", "/images/swordfish/sf_01.png");
         $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
+        $("section[id='drder']").css("padding-top","107px");
 
         /*设置关键词css*/
         var $gjccss =  $(".list .gjc");
@@ -97,7 +96,7 @@
                     for (var i=0;i<data.length;i++){
                         var obj = data[i];
                         var id = obj["id"];
-                        var spec = obj.data_spec=='1'?'高级字段包':'标准字段包';
+                        var spec = obj.data_spec=='1'?'标准字段包':'高级字段包';
                         var orderStatus = obj["order_status"];
                         var orderStatusHtml =  "";
                         var cla = "";
@@ -106,19 +105,14 @@
                         if(orderStatus==0){
                             orderStatusHtml +=
                                     `<p>待付款</p>
-                                    <a class="xq" href="#">查看详情</a>
+                                    <a class="xq" onclick="toDetail(`+id+`);">查看详情</a>
                                     <a class="pay" href="#">去支付</a>`;
                             cla = "nopay";
                             deleteOrderHtml = `<a href="#" class="fr iconfont  icon-shanchu" onclick="deleteOrder(`+id+`,this)"></a>`;
                         }else if(orderStatus==1){
                             orderStatusHtml +=
                                     `<p class="wc">已完成</p>
-                                    <a class="wcxq" href="#">查看详情</a>`;
-                            cla = "pay";
-                        }else if(orderStatus==-1){
-                            orderStatusHtml +=
-                                    `<p class="wc">已删除</p>
-                                    <a class="wcxq" href="#">查看详情</a>`;
+                                    <a class="wcxq" onclick="toDetail(`+id+`);">查看详情</a>`;
                             cla = "pay";
                         }
                         if(obj.filter_keys && obj.filter_keys.split(",").length>0){
@@ -149,7 +143,7 @@
                             `<li>
                                 <div class="info `+cla+`">
                                     <span>`+obj.create_time+`</span>
-                                    <span>订单号：`+obj.out_trade_no+`</span>
+                                    <span>订单号：`+obj.order_code+`</span>
                                     `+deleteOrderHtml+`
                                 </div>
                                 <div class="iner">
@@ -198,6 +192,10 @@
             });
         }
     }
+
+    function toDetail(id) {
+        window.location.href = "/front/dataExport/toOrderDetail/"+id;
+    }
 </script>
 </body>
 </html>

src/web/templates/pc/orderDetail.html

@@ -0,0 +1,181 @@
+<!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/order_twoleave.css">
+
+{{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>
+    <title>订单详情</title>
+    <style>
+        span{
+            margin-right: 8px;
+        }
+        .gjc p{
+            margin-top: 5px;
+        }
+        .gjc p:nth-child(1){
+            margin-top: 0px !important;
+        }
+        /*#order_two .c-info .inner div:nth-child(2){*/
+            /*width: 1000px;*/
+        /*}*/
+    </style>
+</head>
+<body style="background-color:#fff !important;">
+{{include "/common/pchead.html"}}
+<section id="order_two" class="w">
+    <div class="nav">
+        <a href="/front/dataExport/toMyOrder">我的订单></a>
+        <a href="#">订单详情</a>
+    </div>
+    <div class="dd-info">
+        <div class="title">订单详情</div>
+        <div class="inner">
+            <div class="item">
+                <p>订单编号：{{.T.o.order_code}}</p>
+                <p>购买时间：{{.T.o.create_time}}</p>
+                <p>产品类型：{{.T.o.product_type}}</p>
+            </div>
+            <div class="item">
+                <p>数据规格：{{if .T.o.data_spec}}{{if eq .T.o.data_spec "1"}}标准字段库{{else if eq .T.o.data_spec "2"}}高级字段库{{end}}{{end}}</p>
+                <p>数量：{{.T.o.data_count}}条</p>
+                <p>价格：{{.T.o.pay_money}}元</p>
+                <p>邮箱地址：{{.T.o.user_mail}}</p>
+            </div>
+            <div class="item">
+                <p>发票类型：</p>
+                <p>发票抬头：</p>
+                <p>发票内容：</p>
+            </div>
+        </div>
+    </div>
+    <div class="c-info">
+        <div class="title">
+            筛选条件
+        </div>
+    </div>
+</section>
+{{include "/common/pcbottom.html"}}
+{{include "/common/baiducc.html"}}
+<script>
+    $(function () {
+        selcetIndexNav(4);
+        haslogin({{.T.logid}});
+
+        $(".logo img").attr("src", "/images/swordfish/sf_01.png");
+        $(".public-nav").css("background-color", "#fff");
+        $(".public-nav").css("border-bottom", "1px solid #e0e0e0");
+        $("section[id='order_two']").css("padding-top","107px");
+
+        /*筛选条件*/
+        var filter = {{.T.o.filter}};
+        if (filter){
+            var publishtime = filter["publishtime"];
+            var area = filter["area"];
+            var industry = filter["industry"];
+            var keywords = filter["keyword"];
+            var buyer = filter["buyer"];
+            var winner = filter["winner"];
+
+            var areaHtml = "";
+            for (var i=0;i<area.length;i++){
+                areaHtml += `<span>`+area[i]+`</span>`;
+            }
+            var industryHtml = "";
+            for (var i=0;i<industry.length;i++){
+                industryHtml += `<span>`+industry[i]+`</span>`;
+            }
+            var keywordsHtml = "";
+            for (var i=0;i<keywords.length;i++){
+                var keywordObj = keywords[i];
+                var word = keywordObj["keyword"];
+                var appended = keywordObj["appended"];
+                var exclude = keywordObj["exclude"];
+                keywordsHtml +=
+                        `<div class="gjc fl">
+                    <p>关键词：`+word+`</p>
+                    <p>附加词：`;
+                for(var j=0;j<appended.length;j++){
+                    keywordsHtml += `<span>`+appended[j]+`</span>`;
+                }
+                keywordsHtml +=
+                        `</p>
+                    <p>排除词：`;
+                for(var j=0;j<exclude.length;j++){
+                    keywordsHtml += `<span>`+exclude[j]+`</span>`;
+                }
+                keywordsHtml += `</p>`;
+                keywordsHtml += `</div>`;
+            }
+            var buyerHtml = "";
+            for (var i=0;i<buyer.length;i++){
+                buyerHtml += `<span>`+buyer[i]+`</span>`;
+            }
+            var winnerHtml = "";
+            for (var i=0;i<winner.length;i++){
+                winnerHtml += `<span>`+winner[i]+`</span>`;
+            }
+            var filterHtml =
+                    `<div class="inner">
+                    <div class="item clearfix">
+                        <div class="l fl">
+                            筛选日期：
+                        </div>
+                        <div class="r fl">
+                            `+publishtime+`
+                        </div>
+                    </div>
+                    <div class="item clearfix">
+                        <div class="l fl">
+                            区域：
+                        </div>
+                        <div class="r fl">
+                            `+areaHtml+`
+                        </div>
+                    </div>
+                    <div class="item clearfix">
+                        <div class="l fl">
+                            行业：
+                        </div>
+                        <div class="r fl">
+                            `+industryHtml+`
+                        </div>
+                    </div>
+                    <div class="item clearfix">
+                        <div class="l fl">
+                            关键词：
+                        </div>
+                        `+keywordsHtml+`
+                    </div>
+                    <div class="item clearfix">
+                        <div class="l fl">
+                            采购单位：
+                        </div>
+                        <div class="r fl">
+                            `+buyerHtml+`
+                        </div>
+                    </div>
+                    <div class="item clearfix">
+                        <div class="l fl">
+                            中标单位：
+                        </div>
+                        <div class="r fl">
+                            `+winnerHtml+`
+                        </div>
+                    </div>
+                </div>`;
+            $(".c-info").append($(filterHtml));
+        }
+    });
+</script>
+</body>
+</html>