修改页面

src/main.go

@@ -8,6 +8,7 @@ import (
 	"log"
 	qu "qfw/util"
 	"qfw/util/mail"
+	"recharge"
 	"service"
 	"time"
 	"util"
@@ -41,6 +42,7 @@ func init() {
 	xweb.AddAction(&client.Client{})
 	xweb.AddAction(&client.OwnTag{})
 	xweb.AddAction(&client.CustomerRule{})
+	xweb.AddAction(&recharge.EntRecharge{})
 	xweb.RootApp().AppConfig.SessionTimeout = 7 * 24 * time.Hour
 	xweb.RootApp().Logger.SetOutputLevel(1)
 	go history.SaveMgo()

src/recharge/recharge.go

@@ -0,0 +1,81 @@
+package recharge
+
+import (
+	. "api"
+	"database/sql"
+	"errors"
+	"github.com/go-xweb/xweb"
+	"log"
+	"qfw/util"
+	"time"
+	util2 "util"
+)
+
+type EntRecharge struct {
+	*xweb.Action
+	recharge       xweb.Mapper `xweb:"/back/Recharge"`   //后台充值接口
+}
+
+// 充值用户额度
+func (this *EntRecharge) Recharge() {
+	if !R.CheckReqParam(this.ResponseWriter, this.Request, "phone", "entId", "rechargeNum") {
+		return
+	}
+	// 获取用户id 企业id
+	form := this.GetForm()
+	phone := form.Get("phone")
+	entId := util.IntAll(form.Get("entId"))
+	rechargeNum := util.IntAll(form.Get("rechargeNum"))
+	remark := form.Get("remark")
+	// 充值
+	err := UserRecharge(phone, rechargeNum, entId, remark)
+	if err != nil {
+		this.ServeJson(Result{Error_code: 1006, Error_msg: "充值失败"})
+	} else {
+		this.ServeJson(Result{Error_code: 0})
+	}
+}
+
+
+// 用户额度充值
+func UserRecharge(phone string, rechargeNum int, entId int, remark string) error {
+	// 查询用户是否存在
+	tmpRs := util2.JyMysql.FindOne("entniche_user", map[string]interface{}{"phone": phone, "ent_id": entId}, "", "")
+	if tmpRs == nil {
+		log.Printf("用户手机号有误:phone-%s,\n", phone)
+		return errors.New("用户id错误")
+	}
+	userId := int((*tmpRs)["id"].(int64))
+	// 查询是否已经在账户余额表
+	queryMap := map[string]interface{}{"user_id": userId, "ent_id": entId}
+	rs := util2.JyMysql.FindOne("user_account", queryMap, "", "")
+	if rs == nil {
+		// 用户额度表还没有该用户的记录 1.初始化一条记录
+		nowStr := time.Now().Local().Format("2006-01-02 15:04:05")
+		addRs := util2.JyMysql.Insert("user_account", map[string]interface{}{"user_id": userId, "ent_id": entId, "left_num": 0, "create_at": nowStr})
+		println(addRs)
+	}
+	// 充值前剩余
+	result := util2.JyMysql.FindOne("user_account", queryMap, "", "")
+	if result == nil {
+		return errors.New("用户账户查询失败")
+	}
+	before := int((*result)["left_num"].(int64))
+	after := before + rechargeNum
+	// 充值
+	rechargeRs := util2.JyMysql.ExecTx("用户充值", func(tx *sql.Tx) bool {
+		// 更新剩余额度
+		updateNowStr := time.Now().Local().Format("2006-01-02 15:04:05")
+		ok1 := util2.JyMysql.UpdateOrDeleteBySqlByTx(tx, "update user_account set left_num=?,update_at=? where user_id=? and ent_id=?", after, updateNowStr, userId, entId) > 0
+		// 生充值记录
+		sqlStr := "insert into user_recharge_record (user_id,ent_id,`before`,`after`,trade,create_at,remark) values(?,?,?,?,?,?,?)"
+		ok2 := util2.JyMysql.InsertBySqlByTx(tx, sqlStr, userId, entId, before, after, rechargeNum, updateNowStr, remark) != -1
+		return ok1 && ok2
+	})
+	if rechargeRs != true {
+		log.Printf("用户额度充值失败:user_id-%dent_id:%d\n", userId, entId)
+		return errors.New("充值失败")
+	}
+	return nil
+}
+

src/web/templates/choose_ent.html

@@ -11,7 +11,7 @@
 </style>
 
 <!-- Content Wrapper. Contains page content -->
-<div class="content-wrapper">
+<div class="content-wrapper" style="    margin-left: 0">
     <!-- Main content -->
     <section class="content">
     </section>
@@ -45,7 +45,7 @@
     $(document).ready(function () {
         // window.
         for (let i = 0; i < entInfo.length; i++) {
-            let htmlStr = '                    <li  class="list-group-item " id='+entInfo[i]["ent_id"]+'>'
+            let htmlStr = '                    <li  class="list-group-item " style="cursor:pointer" id='+entInfo[i]["ent_id"]+'>'
                + entInfo[i]["ent_name"] +
             '                    </li>'
             $(".list-group").append(htmlStr)

src/web/templates/client/adminIndex.html

@@ -1,7 +1,7 @@
 {{include "com/inc.html"}}
 <!-- Main Header -->
 {{include "com/header.html"}}
-<div class="content-wrapper">
+<div class="content-wrapper" style="margin-left: 0" >
     
     <!-- Main content -->
     <section class="content">

src/web/templates/client/cuser_rule_create.html

@@ -15,7 +15,7 @@
         font-weight: bold;
     }
 </style>
-<div class="content-wrapper">
+<div class="content-wrapper" style="margin-left: 0">
     <section class="content-header">
         <h1> 新建客户规则
             <small>
@@ -24,7 +24,10 @@
                 </button>
                 <a class="btn btn-sm btn-instagram" onclick="produceData()"><i class="fa fa-fw fa-database fa-lg"></i>生成数据</a>
             </small>
+            <a class="btn btn-primary opr" id="back" style="float: right"> 返回</a>
+
         </h1>
+
     </section>
     <!-- Main content -->
     <section class="content">
@@ -343,12 +346,12 @@
                                         </div>
                                     </div>
                                     <hr>
-                                    <div id="es_div" class="form-group" style="display: none">
-                                        <label class="col-sm-2 control-label">ES语句</label>
-                                        <div class="col-sm-8">
-                                            <textarea class="form-control" id="estxt" readonly></textarea>
-                                        </div>
-                                    </div>
+<!--                                    <div id="es_div" class="form-group" style="display: none">-->
+<!--                                        <label class="col-sm-2 control-label">ES语句</label>-->
+<!--                                        <div class="col-sm-8">-->
+<!--                                            <textarea class="form-control" id="estxt" readonly></textarea>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                 </div>
                             </div>
                         </form>
@@ -397,6 +400,8 @@
 
 {{include "com/footer.html"}}
 <script>
+    $('#back').attr("href", "javascript:history.go(-1)")
+
     // menuActive("/customer/list");
     var state = 1;
     var clearkeyMatchArr = ["detail", "title"];

src/web/templates/client/cuser_rule_edit.html

@@ -38,7 +38,7 @@
         text-align: center;
     }
 </style>
-<div class="content-wrapper">
+<div class="content-wrapper" style="margin-left: 0">
     <section class="content-header">
         <h1> 编辑规则
             <small>
@@ -49,8 +49,12 @@
                     <input type='file' name='xlsx' id='file'/>
                 </form>
                 <a class="btn btn-sm btn-instagram" onclick="produceData()"><i class="fa fa-fw fa-database fa-lg"></i>生成数据</a>
+
             </small>
+            <a class="btn btn-primary btn-sm" id="back" style="float: right"> 返回</a>
+
         </h1>
+
     </section>
     <!-- Main content -->
     <section class="content">
@@ -383,12 +387,12 @@
                                         </div>
                                     </div>
                                     <hr>
-                                    <div id="es_div" class="form-group">
-                                        <label class="col-sm-2 control-label">ES语句</label>
-                                        <div class="col-sm-8">
-                                            <textarea class="form-control" id="estxt" readonly></textarea>
-                                        </div>
-                                    </div>
+<!--                                    <div id="es_div" class="form-group">-->
+<!--                                        <label class="col-sm-2 control-label">ES语句</label>-->
+<!--                                        <div class="col-sm-8">-->
+<!--                                            <textarea class="form-control" id="estxt" readonly></textarea>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                 </div>
                             </div>
                         </form>
@@ -415,7 +419,7 @@
                                 </div>
                                 <tr>
                                     <th>编号</th>
-                                    <th><input type="checkbox" onclick="allSelect(this)" id="allCheckbox"></th>
+                                    <th><input type="checkbox" onclick="allSelect(this)" id="allCheckbox" style="zoom:135%;"></th>
                                     <th>关键词</th>
                                     <th>匹配方式</th>
                                     <th>附加词</th>
@@ -698,7 +702,7 @@
                 {"data": null, width: "2%"},
                 {
                     "data": "", width: "1%", render: function () {
-                        return `<input type="checkbox" name="ckb-keyid" onclick="singleSelect(this)" style="text-align: center">`
+                        return `<input type="checkbox" name="ckb-keyid" onclick="singleSelect(this)" style="text-align: center ;zoom: 135%">`
                     }
                 },
                 {"data": "s_matchkey", width: "10%"},
@@ -1729,6 +1733,7 @@
 
         $("#file").click();
     }
+    $('#back').attr("href", "javascript:history.go(-1)")
 
     $(function () {
         $("#uploadform").find("input").change(function () {

src/web/templates/client/exportLog.html

@@ -1,8 +1,14 @@
 {{include "com/inc.html"}}
 <!-- Main Header -->
 {{include "com/header.html"}}
-<div class="content-wrapper">
-    
+<div class="content-wrapper" style="margin-left: 0">
+    <section class="content-header">
+
+        <h1>导出日志
+            <a class="btn btn-primary opr" id="back" style="float: right"> 返回</a>
+        </h1>
+
+    </section>
     <!-- Main content -->
     <section class="content">
         <div class="tab-content">
@@ -48,6 +54,7 @@
     // menuActive("/customer/list");
     var exportLog = {{.T.exportLog}};
     console.log(exportLog);
+    $('#back').attr("href", "javascript:history.go(-1)")
 
     $(document).ready(function () {
         $('#departTable').DataTable({

src/web/templates/client/keywordRule.html

@@ -20,7 +20,7 @@
             </div>
             <tr>
                 <th>编号</th>
-                <th><input type="checkbox" onclick="allSelect(this)" id="allCheckbox"></th>
+                <th><input type="checkbox" onclick="allSelect(this)" id="allCheckbox" style="zoom:300%"></th>
                 <th>关键词</th>
                 <th>匹配方式</th>
                 <th>附加词</th>

src/web/templates/client/personnelIndex.html

@@ -3,11 +3,14 @@
 {{include "com/header.html"}}
 <!-- Left side column. 权限菜单 -->
 {{/*<!--{{include "com/menu.html"}}-->*/}}
-<div class="content-wrapper" id="showbtn">
+<div class="content-wrapper" id="showbtn" style="margin-left: 0">
     <section class="content-header">
         <h1>
             <small><a id="addTag" class="btn btn-primary opr">新增规则</a></small>
+            <a class="btn btn-primary opr" id="back" style="float: right"> 返回</a>
+
         </h1>
+
     </section>
     <!-- Main content -->
     <section class="content">
@@ -45,7 +48,7 @@
                     <div class="edit-form">
                         <div class="edit-info">
                             <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span>
-                            <span class="info">链接地址</span>
+                            <span class="info">数据预览</span>
                         </div>
                         <a id="preview-href" target="_blank" style="word-wrap: break-word"></a>
                     </div>
@@ -65,6 +68,7 @@
     var entRuleArr = {{.T.entRuleArr}};
     console.log(entRuleArr);
     $('#addTag').attr("href", "/client/rule/create?entUserId="+{{.T.id}})
+    $('#back').attr("href", "javascript:history.go(-1)")
     $(function () {
         ttable = $('#dataTable').DataTable({
             "paging": true,
@@ -132,7 +136,7 @@
                 {
                     "data": "_id", width: "15%", render: function (val, a, row, pos) {
                         tmp = '<div xmlns="http://www.w3.org/1999/html">' +
-                            '<button class="btn btn-sm btn-instagram" onclick="preview(\'' + row.s_dataid + '\')">链接地址</button>&nbsp;&nbsp;' +
+                            '<button class="btn btn-sm btn-instagram" onclick="preview(\'' + row.s_dataid + '\')">数据预览</button>&nbsp;&nbsp;' +
                             // <!--                      '<a class="btn btn-sm btn-success" href="/service/rule/history?tagid='+val+'">变更历史</a>'+-->
                             '</div>';
                         return tmp

src/web/templates/com/footer.html

@@ -1,4 +1,4 @@
-	<footer class="main-footer no-print">
+	<footer class="main-footer no-print" style="    margin-left: 0">
 	   <div class="pull-right hidden-xs">
 	     <!--<b>Dada Tags</b>-->
 	   </div>

src/web/templates/com/header.html

@@ -1,6 +1,6 @@
 <header class="main-header">
     <!-- Logo -->
-    <a href="/front/index" class="logo">
+    <a href="#" class="logo" style="background-color: #3c8dbc">
       <!-- mini logo for sidebar mini 50x50 pixels -->
       <span class="logo-mini"><b>ProcessPlatform</b></span>
       <!-- logo for regular state and mobile devices -->
@@ -9,9 +9,9 @@
     <!-- Header Navbar -->
     <nav class="navbar navbar-static-top" role="navigation">
       <!-- Sidebar toggle button-->
-      <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
-        <span class="sr-only">Toggle navigation</span>
-      </a>
+<!--      <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">-->
+<!--        <span class="sr-only">Toggle navigation</span>-->
+<!--      </a>-->
       <!-- Navbar Right Menu -->
       <div class="navbar-custom-menu">
         <ul class="nav navbar-nav">

src/web/templates/com/header_2.html

@@ -9,9 +9,9 @@
     <!-- Header Navbar -->
     <nav class="navbar navbar-static-top" role="navigation">
       <!-- Sidebar toggle button-->
-      <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
-        <span class="sr-only">Toggle navigation</span>
-      </a>
+<!--      <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">-->
+<!--        <span class="sr-only">Toggle navigation</span>-->
+<!--      </a>-->
       <!-- Navbar Right Menu -->
       <div class="navbar-custom-menu">
 

src/web/templates/index.html

@@ -5,7 +5,7 @@
 {{include "com/menu.html"}}
 
   <!-- Content Wrapper. Contains page content -->
-  <div class="content-wrapper">
+  <div class="content-wrapper" style="    margin-left: 0">
     <!-- Main content -->
     <section class="content">
          this is index.html