bug修改

492ab38d · agping · e7f2998f · 492ab38d · 492ab38d
Commit 492ab38d authored Jun 13, 2018 by agping
Hide whitespace changes
Inline Side-by-side

Showing with 115 additions and 12 deletions

evaluation_list.html application/index/view/evaluation/evaluation_list.html +114 -11

RemarkFollowIndex.js public/resource/js/RemarkFollowIndex.js +1 -1

No files found.
--- a/application/index/view/evaluation/evaluation_list.html
+++ b/application/index/view/evaluation/evaluation_list.html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
+{layout name="global/frame_tpl" /}
+<input type="hidden" class="page-load" id="visitShop" />
+<style>
+    .modal-body{
+        /*height: 600px;*/
+        overflow-y: auto;
+        padding-bottom: 60px;
+    }
+    .user-ul2{
+        width: 100%;
+        height: auto;
+        padding-bottom: 15px;
+        float: left;
+    }
+    .user-ul2 li{
+        list-style: none;
+        line-height: 30px;
+    }
+    .money_total_two{
+        font-weight: bold;
+        font-size: 15px;
+       
+    }
+    #search{
+        float: left;
+    }
+   #reset{
+        float: left;
+    }
+</style>
+<div id="page-content-wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-10 col-lg-offset-0">
+                <div class="panel panel-default">
+                    <div class="panel-heading breadcrumb">
+                        <li>
+                            <a href="javascript:;">评价列表</a>
+                        </li>
+                    </div>
+                    <div class="panel-body">
+                        <div class="table-responsive">
+                            <table class="table table-striped table-bordered table-hover table-condensed">
+                                <thead>
+                                <tr>
+                                    <td colspan="10">
+                                        <form id="form_search">
+                                            <span class="fore-span ld-Marheight">拜访时间:</span>
+                                            <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="start_date" name="start_date1" type="date">
+                                            <span class="fore-span ld-Marheight">-</span>
+                                            <input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date1" type="date">
+                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="visitors_shop" placeholder="拜访人所属门店名称" type="text" value="">
+                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="visitors_phone" placeholder="拜访人手机号" type="text" value="">
+                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="visitors_name" placeholder="拜访人姓名" type="text" value="">
+                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="visiting_shop" placeholder="拜访的门店名称" type="text" value="">
+                                            <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
+                                            <span class="btn btn-info btn3 ld-Marheight" id="reset">重置</span>
+                                        </form>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <th class="text-center">拜访时间</th>
+                                    <th class="text-center">拜访人</th>
+                                    <th class="text-center">拜访门店</th>
+                                    <th class="text-center">门店注册地址</th>
+                                    <th class="text-center">打卡地址</th>
+                                    <th class="text-center">跟进</th>
+                                    <th class="text-center">距离门店</th>
+                                    <th class="text-center">图片</th>
+                                </tr>
+                                </thead>
+                                <tbody class="text-center" id="follow_list">
+                            </table>
+                        </div>
+                        <!-- /#page-content-wrapper -->
+                        <div class="text-right" id="pagediv">
+
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+<!--时间轴-->
+<div class="modal fade" id="modal-time" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    ×
+                </button>
+                <h4 class="modal-title">
+                    图片
+                </h4>
+            </div>
+            <div class="modal-body">
+            	<img src="images/banner/Tulips.jpg" alt="" />
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal -->
+</div>
+
+
+
+
+
+
+
+
+
+ 
\ No newline at end of file
--- a/public/resource/js/RemarkFollowIndex.js
+++ b/public/resource/js/RemarkFollowIndex.js
@@ -87,7 +87,7 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 					if(data.code == 200){
 						if (data.data) {
 							$("#cus_id").html(data.data.user_info.user_id);//客户编号
-							$("#cus_name").val(data.data.user_info.user_nick);//姓名
+							$("#cus_name").val(data.data.user_info.user_name);//姓名
 							$("#sex").val(data.data.user_info.sex);//性别
 							$("#cus_phone").html(data.data.user_info.user_phone);//电话
 							$("#cus_date").html(data.data.user_info.create_time);//上传时间