Merge branch 'master' of http://192.168.3.207:10080/group3/SwordFish_Interface_Service

service/projects.go

@@ -5,16 +5,14 @@ import (
 	"fmt"
 	"sfbase/core"
 	"sfbase/elastic"
-	"sfbase/global"
 	"sfbase/utils"
 	"sfis/db"
 	"sfis/model"
 
+	"log"
 	"strconv"
 	"strings"
 	"time"
-
-	"go.uber.org/zap"
 )
 
 var (
@@ -186,7 +184,7 @@ func GetAllByNgram(Es *elastic.Elastic, index, itype, qstr, findfields, order, f
 		if start > -1 {
 			qstr = qstr[:len(qstr)-1] + `,"from":` + strconv.Itoa(start) + `,"size":` + strconv.Itoa(limit) + "}"
 		}
-		global.Logger.Info("GetAllByNgram方法es查询", zap.Any("es语句", qstr))
+		log.Println("es语句", qstr)
 		return Es.Get(index, itype, qstr)
 	} else {
 		return nil, nil

static/templates/login.html

@@ -111,7 +111,7 @@
                                 str += '<td style="width: 100px">' + item.secret_key + '</td>';
                                 str += '<td style="width: 100px">' + item.phone + '</td>';
                                 str += '<td style="width: 100px">' + item.money + '</td>';
-                                str += '<td class="handle" style="width: 100px"><a href="/page/userRecharge">充值</a><a href="/page/chooseProductPage">购买产品</a></td>';
+                                str += '<td class="handle" style="width: 100px"><a href="/page/userRecharge?appId='+ item.app_id +'">充值</a><a href="/page/chooseProductPage">购买产品</a></td>';
 
                                 str += '</tr>';
                             }

static/templates/projectList.html

@@ -41,9 +41,18 @@
         }
     </style>
     <script>
-        var appid = "sfGSVYRQMAAgkGBAUBJg4f";
-        var key = "364xw909";
-
+        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 = GetQueryString("appId");
+        var key = GetQueryString("key");
         function submit(param, rType, url, hearders, str) {
             $.ajax({
                 url: url,

static/templates/projectListDetail.html

@@ -18,7 +18,7 @@
             <th style="width: 5%">项目标识</th>
             <th style="width: 4%">项目名称</th>
             <th style="width: 5%">项目代码</th>
-            <th style="width: 15%">中标单位</th>
+            <th style="width: 5%">中标单位</th>
             <th style="width: 5%">采购单位</th>
             <th style="width: 5%">采购单位电话</th>
             <th style="width: 5%">采购单位联系人</th>
@@ -29,9 +29,9 @@
             <th style="width: 5%">预算金额（元）</th>
             <th style="width: 5%">省份</th>
             <th style="width: 5%">城市</th>
-            <th style="width: 15%">中标信息列表</th>
-            <th style="width: 15%">原链接</th>
-            <th style="width: 15%">剑鱼标讯链接</th>
+            <th style="width: 5%">中标信息列表</th>
+            <th style="width: 5%">原链接</th>
+            <th style="width: 5%">剑鱼标讯链接</th>
         </tr>
         <tbody class="box">
 

static/templates/userRecharge.html

@@ -32,7 +32,7 @@
         </div>
         <div id="resultContent"></div>
         <script>
-            var appid = getParam("id");
+            var appid = getParam("appId");
             if (appid !== "") {
                 $.ajax({
                     url: "/manage/user/userProductList",