jiaojiao7 4 жил өмнө
parent
commit
82a1087e2e

+ 8 - 3
router/pageRouter.go

@@ -12,7 +12,8 @@ func pageRouterRegister(router *gin.Engine) {
 		pageRouterGroup.GET("/chooseProductPage", chooseProductPage)
 		pageRouterGroup.GET("/createUser", createUser)
 		pageRouterGroup.GET("/userRecharge", userRechargePage)
-		pageRouterGroup.GET("/productDetailsPage", productDetailsPage)
+		pageRouterGroup.GET("/projectDetailsPage", projectDetailsPage)
+		pageRouterGroup.GET("/projectListPage", projectListPage)
 	}
 }
 
@@ -31,6 +32,10 @@ func userRechargePage(context *gin.Context) {
 	context.HTML(200, "userRecharge.html", nil)
 }
 
-func productDetailsPage(context *gin.Context) {
-	context.HTML(200, "productDetails.html", nil)
+func projectDetailsPage(context *gin.Context) {
+	context.HTML(200, "projectDetails.html", nil)
+}
+
+func projectListPage(context *gin.Context) {
+	context.HTML(200, "projectList.html", nil)
 }

+ 1 - 1
service/user.go

@@ -118,7 +118,7 @@ func CreateUserProduct(appId string, productArr []map[string]interface{}, buyTyp
 				}
 				return nil
 			})
-			if errs == nil {
+			if errs != nil {
 				global.Logger.Info("用户已购买产品失败:", zap.Any("appId:", appId), zap.Any("productId:", productId))
 				continue
 			}

+ 1 - 1
static/templates/chooseProduct.html

@@ -71,7 +71,7 @@
                         var str = ""
                         for (var i = 0; i < r.data.length; i++) {
                             var item = r.data[i];
-                            str += '<tr>';
+                            str += '<tr style="">';
                             str += '<td style="width: 20px"><input id=' + item["id"] + ' value=' + item["id"] + ' type="radio" name="item"></td>';
                             str += '<td style="width: 50px">' + (i + 1) + '</td>';
                             str += '<td style="width: 100px">' + item.name + '</td>';

+ 16 - 54
static/templates/login.html

@@ -13,15 +13,15 @@
     <body>
         <dev id="main">
             <h1>对外接口</h1>
-            <dev>
-                <a onclick="$('#projectList').show();$('#main').hide();">1.项目列表</a>
+            <div>
+                <a href="/page/projectListPage">1.项目列表</a>
                 <a onclick="$('#projectListDetail').show();$('#main').hide();">2.项目列表及详情</a>
-            </dev>
+            </div>
              <h1><a href="/page/userRecharge">充值接口</a></h1>
             <h1>内部接口</h1>
-            <dev>
+            <div>
                 <a href="/page/createUser">1.创建用户</a>
-            </dev>
+            </div>
             <h1>产品接口</h1>
             <dev>
                 <a href="/page/chooseProductPage">1.选择产品</a>
@@ -40,56 +40,18 @@
             <button type="button" id="projectListDetailBtn">提交</button>
         </dev>
         <dev id="resultContent"></dev>
-        <script>
-            var appid = "sfGSVYRQMAAgkGBAUBJg4f";
-            var key = "364xw909";
-            function submit(param,rType,url,hearders,str){
-                $.ajax({
-                    url: url,
-                    type: rType,
-                    headers: hearders,
-                    data: param,
-                    success:function(r){
-                    	if(r.data){
-                            $("#resultContent").text("");
-                            for (var i in r.data){
-                                var html = `
-                                    <div>
-                                        <p>序号: ${i+1}</p>
-                                        <p>项目标识: ${r.data[i]["project_id"]}</p>
-                                        <p>项目名称: ${r.data[i]["projectname"]}</p>
-                                        <p>采购单位: ${r.data[i]["buyer"]}</p>
-                                        <p>采购单位行业: ${r.data[i]["buyerclass"]}</p>
-                                        <p>招标日期: ${r.data[i]["zbtime"]}</p>
-                                        <p>中标日期: ${r.data[i]["jgtime"]}</p>
-                                    </div>
-                                `
-                                $("#resultContent").append(html);
-                            } 
-                    	}else{
-                    		$("#resultContent").text(r.msg);
-                    	}
-                    }
-                })
+        {{/*<style>
+            .title {
+                text-align: center;
             }
-            
-            $("#projectListBtn").on("click", function(){
-                var param = {
-                    "app_id": appid,
-                    "project_name": $("#projectName").val(),
-                    "winner": $("#winner").val(),
-                    "bid_time": $("#bidTime").val()
-                };
-                var url = "/sfis/api/v1/projectList";
-                var rType = "post";
-                var now = new Date().getTime();
-                var token = md5(appid+Math.round(now/1000)+key);
-                var hearders = {
-                    "timestamp": ""+Math.round(now/1000),
-                    "token": token
-                }
-                submit(param,rType,url,hearders,"list");
-            })
+
+        </style>
+        <div>
+            <h1 class="title">接口服务平台测试系统</h1>
+        </div>*/}}
+
+        <script>
+
             
             $("#projectListDetailBtn").on("click", function(){
                 var param = {

+ 0 - 18
static/templates/productDetails.html

@@ -1,18 +0,0 @@
-{{define "productDetails.html"}}
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <title>项目详情</title>
-        <script src="http://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
-        <script src="https://cdn.bootcss.com/blueimp-md5/2.10.0/js/md5.js"></script>
-    </head>
-    <body>
-    <div>
-        <input type="text">
-        <button onclick="" id="search">搜索</button>
-    </div>
-
-    </body>
-    </html>
-{{end}}

+ 87 - 0
static/templates/projectDetails.html

@@ -0,0 +1,87 @@
+{{define "projectDetails.html"}}
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>项目详情</title>
+        <script src="http://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
+        <script src="https://cdn.bootcss.com/blueimp-md5/2.10.0/js/md5.js"></script>
+    </head>
+    <body>
+    <div id="resultContent">
+
+
+    </div>
+
+    </body>
+    </html>
+    <script>
+        var LocString = String(window.document.location.href);
+
+        // 获取页面跳转传过来的参数
+        function GetQueryString(name) {
+            var rs = new RegExp("(^|)" + name + "=([^&]*)(&|$)", "gi").exec(LocString);
+            var tmp;
+            if (tmp = rs) {
+                return decodeURI(tmp[2])
+            }
+            return "";
+        }
+
+        var appid = "sfGSVYRQMAAgkGBAUBJg4f";
+        var key = "364xw909";
+
+        function details() {
+            var projectId = GetQueryString("projectId")
+            var param = {
+                "app_id": appid,
+                "project_id": projectId,
+            };
+            var url = "/sfis/api/v1/projectDetail";
+            var rType = "post";
+            var now = new Date().getTime();
+            var token = md5(appid + Math.round(now / 1000) + key);
+            var hearders = {
+                "timestamp": "" + Math.round(now / 1000),
+                "token": token
+            }
+            $.ajax({
+                url: url,
+                type: rType,
+                headers: hearders,
+                data: param,
+                success: function (r) {
+                    if (r.code == 0) {
+                        $("#resultContent").text("");
+                        var str = "";
+                        console.log(r.data[0]);
+                        var html = `
+                        <div>
+                            <p>项目标识: ${r.data[0]["project_id"]}</p>
+                            <p>项目名称: ${r.data[0]["projectname"]}</p>
+                            <p>项目代码: ${r.data[0]["projectcode"]}</p>
+                            <p>中标单位: ${r.data[0]["s_winner"]}</p>
+                            <p>采购单位: ${r.data[0]["buyer"]}</p>
+                            <p>采购单位电话: ${r.data[0]["buyertel"]}</p>
+                            <p>采购单位联系人: ${r.data[0]["buyerperson"]}</p>
+                            <p>采购单位行业: ${r.data[0]["buyerclass"]}</p>
+                            <p>招标日期: ${r.data[0]["zbtime"]}</p>
+                            <p>中标日期: ${r.data[0]["jgtime"]}</p>
+                            <p>中标金额(元): ${r.data[0]["bidamount"]}</p>
+                            <p>预算金额(元): ${r.data[0]["budget"]}</p>
+                            <p>省份: ${r.data[0]["area"]}</p>
+                            <p>城市: ${r.data[0]["city"]}</p>
+                            <p>原链接: ${r.data[0]["sourceinfourl"]}</p>
+                        </div>
+                        `
+                        $("#resultContent").append(html);
+                    } else {
+                        $("#resultContent").text(r.msg);
+                    }
+                }
+            })
+        }
+
+        details()
+    </script>
+{{end}}

+ 112 - 0
static/templates/projectList.html

@@ -0,0 +1,112 @@
+{{define "projectList.html"}}
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <title>项目列表页面</title>
+        <script src="http://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
+        <script src="https://cdn.bootcss.com/blueimp-md5/2.10.0/js/md5.js"></script>
+    </head>
+    <body>
+    <div id="projectList">
+        <input type="text" id="projectName" placeholder="请输入项目名">
+        <input type="text" id="winner" placeholder="请输入中标企业名">
+        <input type="text" id="bidTime" placeholder="请输入中标日期">
+        <button type="button" id="projectListBtn">提交</button>
+    </div>
+    <div id="tableDiv" hidden>
+        <table border="0" id="tableId">
+            <thead>
+            <tr class="tableTitle">
+                {{/*                <th style="width: 20px"><input type="checkbox" name="item"></td></th>*/}}
+                <th style="width: 5%;">序号</th>
+                <th style="width: 20%">项目标识</th>
+                <th style="width: 36%">项目名称</th>
+                <th style="width: 15%">采购单位</th>
+                <th style="width: 8%">采购单位行业</th>
+                <th style="width: 8%">招标日期</th>
+                <th style="width: 8%">中标日期</th>
+            </tr>
+            </thead>
+            <tbody class="box">
+
+            </tbody>
+        </table>
+    </div>
+
+    </body>
+    <style>
+        .box tr .td {
+            text-align: center;
+        }
+    </style>
+    <script>
+        var appid = "sfGSVYRQMAAgkGBAUBJg4f";
+        var key = "364xw909";
+
+        function submit(param, rType, url, hearders, str) {
+            $.ajax({
+                url: url,
+                type: rType,
+                headers: hearders,
+                data: param,
+                success: function (r) {
+                    if (r.data) {
+                        $("#tableDiv").show();
+                        $("#resultContent").text("");
+                        var str = "";
+                        for (var i = 0; i < r.data.length; i++) {
+                            var item = r.data[i]
+                            str += '<tr onclick="projectDetails(this)">';
+                            // str += '<td style="width: 20px"></td>';
+                            str += '<td class="td">' + (i + 1) + '</td>';
+                            str += '<td class="td">' + item.project_id + '</td>';
+                            str += '<td>' + item.projectname + '</td>';
+                            str += '<td>' + item.buyer + '</td>';
+                            str += '<td class="td">' + item.buyerclass + '</td>';
+                            if (item.zbtime == undefined || item.zbtime == "") {
+                                str += '<td class="td"></td>';
+                            } else {
+                                str += '<td class="td">' + item.zbtime + '</td>';
+                            }
+                            if (item.jgtime == undefined || item.jgtime == "") {
+                                str += '<td></td>';
+                            } else {
+                                str += '<td class="td">' + item.jgtime + '</td>';
+                            }
+                            str += '</tr>';
+                        }
+                        $(".box").html(str);
+                    } else {
+                        $("#resultContent").text(r.msg);
+                    }
+                }
+            })
+        }
+
+        $("#projectListBtn").on("click", function () {
+            var param = {
+                "app_id": appid,
+                "project_name": $("#projectName").val(),
+                "winner": $("#winner").val(),
+                "bid_time": $("#bidTime").val()
+            };
+            var url = "/sfis/api/v1/projectList";
+            var rType = "post";
+            var now = new Date().getTime();
+            var token = md5(appid + Math.round(now / 1000) + key);
+            var hearders = {
+                "timestamp": "" + Math.round(now / 1000),
+                "token": token
+            }
+            $("#tableDiv").hide();
+            submit(param, rType, url, hearders, "list");
+        })
+
+        function projectDetails(obj) {
+            var p = $(obj).find("td:eq(1)").text();
+            location.href = "/page/projectDetailsPage?projectId=" + p
+        }
+    </script>
+    </html>
+{{end}}