liuxiaolu 6 years ago
parent
commit
883cb29da6

+ 15 - 1
.gitignore

@@ -1,8 +1,22 @@
 pkg
 bin
+.project
+extend
 */pkg
 *.exe
 *.log
 */src/src
 *.data
-*/bin
+*/bin
+.idea/*
+.gitignore
+.gitignore.bak
+src/jfw/modules/entsesearch/.idea/*
+src/jfw/modules/followent/.idea/*
+src/jfw/modules/app/.idea/*
+src/jfw/modules/weixin/.idea/*
+src/jfw/modules/push/.idea/*
+src/jfw/modules/pc/server/.idea/*
+src/jfw/my_test.go
+src/web/templates/weixin/jylab/testC.html
+src/jfw/modules/pc/client/*

+ 13 - 1
src/jfw/front/dataExport.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"strings"
 	"encoding/json"
+	"jfw/tools"
 )
 
 type DataExport struct {
@@ -96,6 +97,17 @@ func (d *DataExport) ToMyOrder() error {
 }
 
 func (d *DataExport) QueryOrder() error{
-	d.ServeJson(nil)
+	//openid := d.GetString("openid")
+	//status := d.GetString("status")
+	//query := map[string]interface{}{"s_m_openid":openid,"order_status":status}
+	fileds := "create_time,out_trade_no,filter_publishtime,filter_keys,data_count,data_spec,order_money,order_status"
+	list := tools.Mysql.Find("dataexport_order",nil,fileds,"create_time",-1,-1)
+	if list != nil {
+		log.Println(list)
+	}
+	d.ServeJson(list)
 	return nil
 }
+
+type Order struct {
+} 

+ 3 - 1
src/web/templates/pc/dataExport_sieve.html

@@ -22,7 +22,7 @@
             color: #2CB7CA; }
     </style>
 </head>
-<body>
+<body style="background-color: #f5f5fb !important;">
 {{include "/common/pchead.html"}}
 <section class="conditions-box w" style="padding-top: 106px;">
     <!--指示条-->
@@ -177,6 +177,8 @@
     var sortArray = {{.T.sortArray}};
     $(function () {
         $(".logo img").attr("src","/images/swordfish/sf_01.png");
+        $(".public-nav").css("background-color","#fff");
+        $(".public-nav").css("border-bottom","1px solid #e0e0e0");
         //行业
         var industryhtml = '<span id="induAll" class="active">全部</span>';
         if (sortArray != null && sortArray.length > 0) {

+ 47 - 47
src/web/templates/pc/myOrder.html

@@ -121,55 +121,55 @@
             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-已支付
+            // 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>`;
             // }
-            // $.ajax({
-            //     type: "post",
-            //     url: "/front/dataExport/queryOrder",
-            //     data: param,
-            //     dataType: 'json',
-            //     success: function(data){
             //
-            //     },
-            //     error: function(xhr, type){
-            //
-            //     }
-            // });
+            // $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){
+                    console.log(data);
+                },
+                error: function(xhr, type){
+                    console.log("1111111111111");
+                }
+            });
         })
 
     })