Merge branch 'test'

application/app/view/index/share_detail.html

@@ -191,7 +191,8 @@
     <a href="javascript:;" id="fix_area_bottom_btn"><img src="/app/images/xq_cha@2x.png" /></a>
 </div>
 
-<script src="/app/js/jquery.js"></script>
+<!--<script src="/app/js/jquery.js"></script>-->
+<script src="/app/js/libs/jquery-0325-min.js" charset="UTF-8"></script>
 <script src="/app/js/swiper.js"></script>
 <script src="/app/js/app_jump.js" ></script>
 <script src="/app/js/common.js" charset="utf-8"></script>

public/resource/js/user.js

@@ -331,7 +331,7 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                             $("#cus_id").html(data.data.user_info.user_id);//客户编号
                             $("#cus_name").val(data.data.user_info.user_nick);//姓名
                             $("#sex").val(data.data.user_info.sex);//性别
-                            $("#cus_phone").html(data.data.user_info.user_phone);//电话
+                            $("#cus_phone").html(hideTel(data.data.user_info.user_phone));//电话
                             $("#cus_date").html(data.data.user_info.create_time);//上传时间
                             $("#cus_fang").val(data.data.user_info.agentinfo);//客方
                             var caozuo_table="";

public/resource/template/user_template_tpl.html

@@ -8,7 +8,7 @@
                 [%= it[item]["user_nick"] %]
             [% } %]
         </td>
-        <td>[%= it[item]["user_phone"] %]</td>
+        <td>[%= hideTel(it[item]["user_phone"]) %]</td>
         <td>[%= it[item]["create_time"] %]</td>
         <td>
             [% if(it[item]["follow_time"] != null) { %]