Skip to content

T
tl_estate
Commit ee829aa0 authored by clone's avatar clone
Browse files
Options

Merge branch '0213-v3.0.7' into test

# Conflicts: # application/api/controller/Member.php
parents 35107fd9 55433ead
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1184 additions and 132 deletions
application/api/controller/AppointmentTime.php
View file @ ee829aa0
......@@ -228,27 +228,32 @@ class AppointmentTime extends Basic
public function getYetListV2($pageNo, $pageSize, $params)
{
$field = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,a.predict_see_time as expect_time,b.house_id,
d.external_title as house_title,d.residue_num as room_num_left, d.is_show,d.status,d.external_image_id";
d.external_title as house_title,d.residue_num as room_num_left, d.is_show,d.status,d.external_image_id,d.is_show_image";
$where_["a.user_id"] = $params["user_id"];
// $result = $this->appointmentTimeModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
$result = $this->reportModel->getHaveToSeeList($pageNo, $pageSize, "id desc", $field, $where_);
//获取图片信息
foreach ($result as $key => $val) {
$result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL;
/*$param["house_id"] = $val["house_id"];
$param["img_type"] = 1; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);*/
$result[$key]["images"] = [];
if ($val['is_show_image']) {
$result[$key]["api_path"] = CK_IMG_URL . 'images/';
$param["house_id"] = $val["house_id"];
$param["img_type"] = 1; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);
} else {
$result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL;
if ($val["external_image_id"]) {
$param["id"] = array( "in", $val["external_image_id"] );
$param["img_status"] = 0;
$param_2["id"] = array( "in", $val["external_image_id"] );
$param_2["img_status"] = 0;
$field = 'id,0 as house_id,img_type,label,img_name,img_status';
$res = $this->imageDepotModel->getImageDepotById($field, $param,1);
$res = $this->imageDepotModel->getImageDepotById($field, $param_2,1);
$result[$key]["images"] = count($res) > 0 ? $res : [];
}
}
//todo 是否评价
$evaluateResult = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);
$result[$key]["is_evaluate"] = count($evaluateResult) > 0 ? 1 : 0;
......@@ -265,7 +270,7 @@ class AppointmentTime extends Basic
public function getWaitListV2($pageNo, $pageSize, $params)
{
$field = "a.id,a.report_agent_phone as phone,a.report_agent_id as agents_id,b.house_id,a.predict_see_time as expect_time,
d.external_title as house_title,d.residue_num as room_num_left,d.external_image_id";
d.external_title as house_title,d.residue_num as room_num_left";
$where_["user_id"] = $params["user_id"];
......@@ -273,20 +278,24 @@ class AppointmentTime extends Basic
//获取图片信息
foreach ($result as $key => $val) {
$result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL;
/* $param["house_id"] = $val["house_id"];
$param["img_type"] = 1; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);*/
$result[$key]["images"] = [];
if ($val['is_show_image']) {
$result[$key]["api_path"] = CK_IMG_URL . 'images/';
$param["house_id"] = $val["house_id"];
$param["img_type"] = 2; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);
} else {
$result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL;
if ($val["external_image_id"]) {
$param["id"] = array( "in", $val["external_image_id"] );
$param["img_status"] = 0;
$param_2["id"] = array( "in", $val["external_image_id"] );
$param_2["img_status"] = 0;
$field = 'id,0 as house_id,img_type,label,img_name,img_status';
$res = $this->imageDepotModel->getImageDepotById($field, $param,1);
$res = $this->imageDepotModel->getImageDepotById($field, $param_2,1);
$result[$key]["images"] = count($res) > 0 ? $res : [];
}
}
//todo 是否评价
$evaluateResult = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);
$result[$key]["is_evaluate"] = count($evaluateResult) > 0 ? 1 : 0;
......
application/api/controller/Banner.php
View file @ ee829aa0
......@@ -46,7 +46,7 @@ class Banner extends Basic
$where_["type"] = array("in",[2,3]);
}
$field = "id,title,CONCAT('".CK_IMG_URL."' , pic_path) as pic_path, url, type,sort,is_show,create_time,update_time";
$field = "id,title,CONCAT('".CK_IMG_URL.'images/'."' , pic_path) as pic_path, url, type,sort,is_show,create_time,update_time";
$where_['is_show'] = array( "eq", 0 );
......
application/api/controller/Member.php
View file @ ee829aa0
......@@ -416,11 +416,10 @@ class Member extends Basic
$data["buyer_nick"] = $result[0]["buyer_nick"];
$data["user_nick"] = $result[0]["user_nick"];
$data["user_phone"] = $result[0]["user_phone"];
$data["user_pic"] = !empty($result[0]["user_pic"]) ? HEADERIMGURL . $result[0]["user_pic"] : $result[0]["other_pic"];
$data["user_pic"] = empty($result[0]["user_pic"]) ? HEADERIMGURL .$result[0]["other_pic"] : HEADERIMGURL . $result[0]["user_pic"];
$data["AuthToken"] = $AuthToken;
}else{
return $this->response("101", "数据查询失败");
return $this->response("101", "没有该用户");
}
return $this->response("200","请求成功",$data);
}
......@@ -461,7 +460,9 @@ class Member extends Basic
$data['status'] = 200;
$data['msg'] = '上传成功';
$data['data'] = ['file_name' => HEADERIMGURL . $img_path];
$data['data'] = ['file_name' => IMAGES_URL . $img_path];
} else {
$data['msg'] = '用户信息错误';
} else {
$data['msg'] = '用户信息错误';
}
......
application/api_broker/controller/Feed.php
View file @ ee829aa0
......@@ -64,7 +64,7 @@ class Feed extends Basic
foreach ($data as $k => $v) {
if ($v['type'] == 0) {
//todo 0923 经理提的问题
$data[$k]['icon'] = CURRENT_URL . "resource/image/notice_xibaotl.png";
$data[$k]['icon'] = IMAGES_URL . "resource/image/notice_xibaotl.png";
$data[$k]['content'] = "恭喜{$v['content']}成交{$v['house_title']}商铺一套";
unset($data[$k]);
}
......
application/api_broker/controller/Shop.php
View file @ ee829aa0
......@@ -148,6 +148,16 @@ class Shop extends Basic
$conditions['is_vip'] = $params['is_vip'];
}
//residue_type 2已租，1求租
if (is_numeric($params['residue_type'])) {
if($params['residue_type'] == 1){
$conditions['residue_num'] = array('gt',0);
}else{
$conditions['residue_num'] = 0;
}
}
$order_ = "";
$spTagArr = array();
switch ($params['site_area']) {
......@@ -267,6 +277,7 @@ class Shop extends Basic
$conditions['status'] = !empty($params['status']) ? $params['status'] : array('in', "1,2"); //只显示上架或下架的
}
$result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr);
$m_business_district = new GBusinessDistrict();
//获取图片信息
foreach ($result as $key => $val) {
......@@ -1039,7 +1050,7 @@ class Shop extends Basic
$res = $this->gHousesModel->getExclusive($this->params['houses_id']);
// dump($res);
foreach ($res['exclusive_img'] as $key => $val) {
$res['exclusive_img'][$key]['file_name'] = CURRENT_URL.'resource/lib/Attachments/images/'.$val['img_name'];
$res['exclusive_img'][$key]['file_name'] = IMAGES_URL.'resource/lib/Attachments/images/'.$val['img_name'];
$res['exclusive_img'][$key]['save_path'] = $val['img_name'];
}
} else {
......
application/api_broker/controller/Statement.php
View file @ ee829aa0
......@@ -115,7 +115,7 @@ class Statement extends Basic
$data['agent_id'] = $this->params['agent_id'];
$data['img_url'] = $img_name;
$data['type'] = $this->params['type'];
$data['img_name'] = CURRENT_URL.$url;
$data['img_name'] = IMAGES_URL.$url;
$result = $agent_report->editData($data);
} else {
$result = 0;
......@@ -194,7 +194,7 @@ class Statement extends Basic
$data['list'] = $agent_report->getList($pageNo, $pageSize, 'id desc', $fields, $where);
$data['total'] = $agent_report->getTotal($where);
foreach ($data['list'] as $k=>$v) {
$data['list'][$k]['img_url'] = CURRENT_URL.'static/week_work_img/'.$data['list'][$k]['img_url'];
$data['list'][$k]['img_url'] = IMAGES_URL.'static/week_work_img/'.$data['list'][$k]['img_url'];
}
return $this->response($code, $msg, $data);
}
......
application/api_broker/controller/UploadImg.php
View file @ ee829aa0
......@@ -47,4 +47,27 @@ class UploadImg extends Basic
}
}
/**
* 富文本文件上传
*/
public function uploadEditor() {
header('Access-Control-Allow-Origin:*');
set_time_limit(0);
$file = $_FILES['image'];
if (empty($file)) {
$file = $_FILES['upload'];
}
$type = request()->param('type');
$uploadResult = $this->uFService->upload($file, $type);
$cb = $_GET['CKEditorFuncNum']; //获得ck的回调id
try {
$url = $uploadResult["msg"]['internet_img_name']; //我自己的放置上传图片的逻辑，返回图片放置后的url
echo "<script type='text/javascript'>window.parent.CKEDITOR.tools.callFunction($cb,'".$url."','');</script>";
}catch (\Exception $e) {
$erro = $e->getMessage();
echo "<script>window.parent.CKEDITOR.tools.callFunction($cb, '','$erro');</script>"; //图片上传失败，通知ck失败消息
}
}
}
\ No newline at end of file
application/app_broker/view/index/shop_detail_pc.html
View file @ ee829aa0
......@@ -11,7 +11,7 @@
</head>
<body style="display: none;">
<div id="app">
<div id="app" style="color: #061C43;font-size: 14px;">
<main>
<section v-show="dataCode==200">
<table>
......
application/config.php
View file @ ee829aa0
......@@ -15,15 +15,16 @@ define('PAGESIZE', 15); //分页每页条数
define('ADMIN_URL_TL','https://admin.tonglianjituan.com/'); //B端网址
//define('TEST_ADMIN_URL_TL','https://dev.tonglianjituan.com/'); //B端网址
define('CURRENT_URL', 'https://'.$_SERVER['HTTP_HOST'].'/'); //取当前域名地址
define('HEADERIMGURL', CURRENT_URL . 'static'. DS . 'head_portrait/'); //头像地址
define('AGENTHEADERIMGURL', CURRENT_URL . 'static'. DS . 'user_header/'); //头像地址
define('CHAT_IMG_URL', CURRENT_URL . 'static'. DS . 'chat_image/'); //聊天图片地址
define('CK_IMG_URL', CURRENT_URL . 'resource/lib/Attachments/'); //ck 资源文件
define('IMAGES_URL', 'http://images.tonglianjituan.com/'); //取当前域名地址
define('HEADERIMGURL', IMAGES_URL . 'static'. DS . 'head_portrait/'); //头像地址
define('AGENTHEADERIMGURL', IMAGES_URL . 'static'. DS . 'user_header/'); //头像地址
define('CHAT_IMG_URL', IMAGES_URL . 'static'. DS . 'chat_image/'); //聊天图片地址
define('CK_IMG_URL', IMAGES_URL . 'resource/lib/Attachments/'); //ck 资源文件
define('_POOLKEY','FC100000022056027');//隐私号码
define('_TLSYPoolKey','FC100000022056027');//隐私号码池
define('WEEK_WORK_IMG', CURRENT_URL . 'static'. DS . 'week_work_img/'); //周报日报目录
define('WEEK_WORK_IMG', IMAGES_URL . 'static'. DS . 'week_work_img/'); //周报日报目录
define('PHONE_VOICE', ROOT_PATH.'public'.DS.'static'.DS.'voice'); //录音绝对路径
define('SHOP_IMAGE_DEPOT_URL', CURRENT_URL . 'static'. DS . 'shop_image_depot/'); //C端商铺随机图片地址
define('SHOP_IMAGE_DEPOT_URL', IMAGES_URL . 'static'. DS . 'shop_image_depot/'); //C端商铺随机图片地址
return [
// +----------------------------------------------------------------------
......
application/index/controller/Broker.php
View file @ ee829aa0
......@@ -1016,7 +1016,7 @@ class Broker extends Basic
if (!isset($params["agents_black_list_id"])) {
return $this->response("101", "请求参数错误");
}
$internet_path = CURRENT_URL.'static/agent_black_list/';
$internet_path = IMAGES_URL.'static/agent_black_list/';
$m_agents_black_list = new AAgentsBlackList();
$m_agents_black_list_img = new AAgentsBlackListImg();
......
application/index/controller/Finance.php
View file @ ee829aa0
This diff is collapsed.
application/index/controller/Houses.php
View file @ ee829aa0
......@@ -148,6 +148,15 @@ class Houses extends Basic
}
}
//求租已租筛选 2已租，1求租
if (is_numeric($this->params['residue_type'])) {
if($this->params['residue_type'] == 1){
$where['residue_num'] = array('gt',0);
}else{
$where['residue_num'] = 0;
}
}
/*0是1否显示在c端用户*/
if ($this->params['is_show'] != -1) {
if ($this->params['is_show'] == 1) {
......
application/index/controller/ImageDepot.php
View file @ ee829aa0
......@@ -121,7 +121,7 @@ class ImageDepot extends Basic
$res_total = $this->imageDepot->getImageDepotListTotal($params_);
foreach($res as $k=>$v)
{
$res[$k]['img_file_path'] = CURRENT_URL . 'static/shop_image_depot/' . $v['img_name'];;
$res[$k]['img_file_path'] = IMAGES_URL . 'static/shop_image_depot/' . $v['img_name'];;
}
$data['total'] =$res_total;
......@@ -150,7 +150,7 @@ class ImageDepot extends Basic
if(!$res){
return $this->response("101", "查无数据");
}
$res[0]['img_file_path'] = CURRENT_URL . 'static/shop_image_depot/' . $res['img_name'];
$res[0]['img_file_path'] = IMAGES_URL . 'static/shop_image_depot/' . $res['img_name'];
$data['list'] =$res[0];
return $this->response("200", "成功",$data);
}
......@@ -179,6 +179,13 @@ class ImageDepot extends Basic
public function ceshi()
{
$arr=array('1','2','3');
$result=array_shift($arr);
dump($result);
dump($arr);
dump(count($arr));
dump(array_sum($arr));
}
......
application/index/controller/Member.php
View file @ ee829aa0
......@@ -343,7 +343,7 @@ class Member extends Basic{
foreach ($return_user_list as $k=>$v) {
if ($v['user_pic']) {
$return_user_list[$k]['user_pic'] = CURRENT_URL . 'static/head_portrait/' . $v['user_pic'];
$return_user_list[$k]['user_pic'] = IMAGES_URL . 'static/head_portrait/' . $v['user_pic'];
} else {
$return_user_list[$k]['user_pic'] = '';
}
......
application/index/controller/MyTransfer.php 0 → 100644
View file @ ee829aa0
<?php
namespace app\index\controller;
/**
* Created by PhpStorm.
* User: liu yin ping
* Date: 2018/3/13
* Time: 15:48
*/
use app\index\extend\Basic;
class MyTransfer extends Basic
{
public function myTransferList()
{
if (!$this->request->isAjax()) {
return view('transfer/myTransferList');
}
}
}
application/index/controller/News.php
View file @ ee829aa0
......@@ -14,6 +14,7 @@ use app\index\extend\Basic;
use app\model\SFile;
use app\model\SLabel;
use app\model\SNews;
use app\model\SNewsComment;
use think\Request;
class News extends Basic
......@@ -236,4 +237,82 @@ class News extends Basic
}
}
/**
* 商学院评论列表
* @return \think\Response
*/
public function getCommentList()
{
$where['a.status'] = 0;
#时间 start_time end_time
if (!empty($this->params['end_time']) && !empty($this->params['start_time'])) {
$where['a.create_time'] = [ 'between time', [ $this->params['start_time'] . ' 00:00:00', $this->params['end_time'] . ' 23:59:59' ] ];
}
#部门 district_id
if (!empty($this->params['district_id'])) {
$where['b.district_id'] = $this->params['district_id'];
}
#门店 store_id
if (!empty($this->params['store_id'])) {
$where['b.store_id'] = $this->params['store_id'];
}
#姓名 name
if (!empty($this->params['name'])) {
$where['b.name'] = ['LIKE','%'.$this->params['name'].'%'];
}
#手机号 phone
if (!empty($this->params['phone'])) {
$where['b.phone'] = ['LIKE','%'.$this->params['phone'].'%'];
}
#标题 title
if (!empty($this->params['title'])) {
$where['c.title'] = ['LIKE','%'.$this->params['title'].'%'];
}
$pageNo = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
$pageSize = empty($this->params['pageSize']) ? 10 : $this->params['pageSize'];
$m_comment = new SNewsComment();
$field = 'a.id,a.comment_content,a.create_time,b.name,c.title';
$return = $m_comment->getCommentList($pageNo, $pageSize, 'a.id DESC', $field, $where);
$data['list'] = $return;
$data['total'] = $m_comment->getCommentListTotal($where);
return $this->response(200, "", $data);
}
/**
* 删除商学院评论
* @return \think\Response
*/
public function delNewsComment()
{
if (empty($this->params['id'])) {
return $this->response(101, "Id is null.");
}
$params_['id'] = $this->params['id'];
$params_['status'] = 1;
$m_comment = new SNewsComment();
$res = $m_comment->updateSite($params_);//int(1)
if($res == 1){
return $this->response("200", "成功",['data'=>$res]);
}else{
return $this->response("300", "失败");
}
}
/**
* @return \think\response\View
*/
public function plNews() {
return view('plNews');
}
}
\ No newline at end of file
application/index/controller/Notice.php
View file @ ee829aa0
......@@ -74,7 +74,7 @@ class Notice extends Basic
$file_data = $m_file->getFileList('id,file_name', ['new_id'=>$v['id'], 'type'=>2]);
if (!empty($file_data)) {
foreach ($file_data as $k2=>$v2) {
$file_name[] = CURRENT_URL . 'static/business_school_file/' . $v2['file_name'];
$file_name[] = IMAGES_URL . 'static/business_school_file/' . $v2['file_name'];
}
}
$data['list'][$k]['annex_file_path'] = $file_name;
......
application/index/controller/PerformanceReport.php
View file @ ee829aa0
......@@ -78,7 +78,7 @@ class PerformanceReport extends Basic
foreach ($res as $key => $val) {
$url = 'static/week_work_img/' . $val['img_url'];
$res[$key]["img_file_path"] = CURRENT_URL . $url;
$res[$key]["img_file_path"] = IMAGES_URL . $url;
}
$data['list'] = $res;
......
application/index/controller/Supervise.php
View file @ ee829aa0
......@@ -70,7 +70,7 @@ class Supervise extends Basic
}
$visit = new AgentsVisitors();
$fields = 'a.id,created,a.visitor_name,a.agentshopname,a.address,c.address as shop_address,a.scene_photo,a.distance,a.remarks';
$fields = 'a.id,a.create_time,a.visitor_name,a.agentshopname,a.address,c.address as shop_address,a.scene_photo,a.distance,a.remarks';
$where['visit_type'] = 0;
$data['data'] = $visit->getVisitorsList($pageNo, $pageSize, 'a.id desc', $fields, $where);
......
application/index/controller/Transfer.php
View file @ ee829aa0
......@@ -71,14 +71,28 @@ class Transfer extends Basic
$where['a.shop_name'] = ['like', $params['shop_name'].'%'];
}
$sublet = new SubletModel();
if (!empty($params['agent_id'])) {
$where['c.agent_id'] = $params['agent_id'];
}else{
//是否有客方 0为没有，1为有
if (is_numeric($params['agent_type'])) {
if($params['agent_type'] == 1){
$where['c.agent_id'] = array('gt',0);
}else{
$where[] = ['EXP', 'c.agent_id IS NULL OR c.agent_id = 0'];
}
}
}
$sublet = new SubletModel();
$fields = 'a.id,a.shop_name,a.manage_type,a.address_detail,a.province,a.city,a.district,FORMAT(a.expected_rent/100,2) as expected_rent,
if(b.status=2,"3",a.status) as status,a.appellation,a.tel,a.create_time,a.status';
$data['list'] = $sublet->getSublet($pageNo, $pageSize, 'a.id desc', $fields, $where);
$data['total'] = $sublet->getSubletTotal($where);
return $this->response($data['status'], $data['msg'], $data);
}
......
application/index/controller/UploadImg.php
View file @ ee829aa0
......@@ -42,4 +42,27 @@ class UploadImg extends Basic
}
}
/**
* 富文本文件上传
*/
public function uploadEditor() {
header('Access-Control-Allow-Origin:*');
set_time_limit(0);
$file = $_FILES['image'];
if (empty($file)) {
$file = $_FILES['upload'];
}
$type = request()->param('type');
$uploadResult = $this->uFService->upload($file, $type);
$cb = $_GET['CKEditorFuncNum']; //获得ck的回调id
try {
$url = $uploadResult["msg"]['internet_img_name']; //我自己的放置上传图片的逻辑，返回图片放置后的url
echo "<script type='text/javascript'>window.parent.CKEDITOR.tools.callFunction($cb,'".$url."','');</script>";
}catch (\Exception $e) {
$erro = $e->getMessage();
echo "<script>window.parent.CKEDITOR.tools.callFunction($cb, '','$erro');</script>"; //图片上传失败，通知ck失败消息
}
}
}
\ No newline at end of file
application/index/view/finance/getCollection.html
View file @ ee829aa0
......@@ -1059,6 +1059,85 @@
<!-- /.modal -->
</div>
<!--状态==详情-->
<div class="modal fade" id="modal-status" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog modal-body-width">
<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 modal-body-height">
<div class="col-xs-12">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<th class="text-center">提交时间</th>
<th class="text-center">收款ID</th>
<th class="text-center">带看ID</th>
<th class="text-center">成交报告ID</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>
<th class="text-center">来源</th>
</tr>
</thead>
<tbody class="text-center" id="statusBody1">
</table>
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<th class="text-center">提交时间</th>
<th class="text-center">调整ID</th>
<th class="text-center">调整前带看ID</th>
<th class="text-center">调整前商铺ID</th>
<th class="text-center">调整前收款ID</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">调整后收款ID</th>
<th class="text-center">提交人</th>
</tr>
</thead>
<tbody class="text-center" id="statusBody2">
</table>
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<th class="text-center">提交时间</th>
<th class="text-center">退款ID</th>
<th class="text-center">状态</th>
<th class="text-center">带看（订单）ID</th>
<th class="text-center">收款ID</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="statusBody3">
</table>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary submit_edit" data-dismiss="modal" aria-hidden="true"> 确定 </button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
......
application/index/view/houses/edit.html
View file @ ee829aa0
......@@ -7,8 +7,18 @@
.p-t-10{
margin-top:10px;
}
#xiangqing_pic_btn{
margin-right: 141px;
.upload-image-btn{
width: 82px;
height: 40px;
position: relative;
opacity: 0;
z-index: 66;
}
.btn-default-liu{
position: relative;
left: -80px;
z-index: 6;
}
</style>
<!--默认#page-content-wrapper是隐藏的-->
......@@ -544,7 +554,8 @@
<div class="form-group full-width-100 full-pic-area">
<label for="">详情页轮播图(至少2张)</label>
<input readonly="readonly" type="text" name="xiangqing_pic_input" class="form-control" style="display: none" id="xiangqing_pic_input" placeholder="请选择图片">
<button class="btn btn-default upload-image-btn" id="xiangqing_pic_btn" type="button" data-limittop="20">选择图片</button>
<input class="upload-image-btn" id="xiangqing_pic_btn" type="file" data-limittop="20" style="display: inline-block;">
<button class="btn btn-default btn-default-liu">选择图片</button>
<span class="tip"></span>
<label for="isShowShopDetail">是否对客户展示对内详情图</label>
<select class="form-control" name="isShowShopDetail" id="isShowShopDetail" data-alert="请选择是否对客户展示对内详情图">
......@@ -559,7 +570,9 @@
<div class="form-group full-width-100 full-pic-area">
<label for="">楼层平面图(选填)</label>
<input readonly="readonly" type="text" name="louceng_pic_input" class="form-control" style="display: none" id="louceng_pic_input" placeholder="请选择图片">
<button class="btn btn-default upload-image-btn" id="louceng_pic_btn" type="button" data-limittop="20">选择图片</button>
<input readonly="readonly" class="upload-image-btn" id="louceng_pic_btn" type="file" data-limittop="20" style="display: inline-block;">
<button class="btn btn-default btn-default-liu">选择图片</button>
<span class="tip"></span>
</div>
<ul class="img-pre-ul" id="louceng_pic_ul"></ul>
......@@ -568,7 +581,9 @@
<div class="form-group full-width-100 full-pic-area">
<label for="">附件上传(pdf格式，选填，1个)</label>
<input readonly="readonly" type="text" name="fujian_pre" class="form-control" style="display: none" id="fujian_pre" placeholder="请选择图片">
<button class="btn btn-default upload-image-btn" id="fujian_btn" type="button" data-limittop="1" data-spfile="pdf">选择文件</button>
<input class="upload-image-btn" id="fujian_btn" type="file" data-limittop="1" data-spfile="pdf" style="display: inline-block;">
<button class="btn btn-default btn-default-liu">选择附件</button>
<span class="tip"></span>
</div>
<ul class="img-pre-ul" id="fujian_ul"></ul>
......@@ -613,7 +628,9 @@
<div class="form-group full-width-100 full-pic-area">
<label for="">独家合同上传</label>
<input readonly="readonly" type="text" name="dujia_pic_input" class="form-control" style="display: none" id="dujia_pic_input" placeholder="请选择图片">
<button class="btn btn-default upload-image-btn" id="dujia_pic_btn" type="button" data-limittop="20">选择图片</button>
<input class="upload-image-btn" id="dujia_pic_btn" type="file" data-limittop="20" style="display: inline-block;">
<button class="btn btn-default btn-default-liu">选择图片</button>
<span class="tip"></span>
</div>
<ul class="img-pre-ul" id="dujia_pic_ul"></ul>
......
application/index/view/houses/houseList.html
View file @ ee829aa0
......@@ -196,6 +196,34 @@
.ld-Marheight{
margin-top: 5px;
}
/*商铺详情 样式优化*/
.btn-info-liu{
font-size: 18px;
color: #FF8018;
}
.btn-default-liu{
opacity: 0.4;
font-size: 18px;
color: #1F3865;
}
.detail-modal-header-tab span{
cursor: pointer;
margin-left: 30px;
font-weight: 600;
}
.upload-image-btn{
width: 82px;
height: 40px;
position: relative;
opacity: 0;
z-index: 66;
}
.btn-default-liu-css{
position: relative;
left: -80px;
z-index: 6;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -207,7 +235,7 @@
<div class="pull-right">
<ul class="bread_btn">
<li>
<a href="/admin.php/index/houseAdd" data-toggle="modal" class="btn btn-default"><i class="icon-plus"></i>新增商铺</a>
<a href="/admin.php/index/houseAdd" class="btn btn-default"><i class="icon-plus"></i>新增商铺</a>
</li>
</ul>
</div>
......@@ -240,6 +268,12 @@
<option value="3">无效</option>
</select>
<select class="form-control btn2" id="lease_state">
<option value="">出租状态</option>
<option value="1">求租</option>
<option value="2">已租</option>
</select>
<select class="form-control btn2 " id="yetai_id">
<option value="" selected="selected">业态筛选</option>
</select>
......@@ -339,6 +373,7 @@
<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>
......@@ -443,8 +478,10 @@
<div class="form-group is_dujia" >
<label class="col-sm-2 control-label">独家合同上传(小于10张)：</label>
<span id="liudan_pic_pre"></span>
<input readonly="readonly" type="hidden" name="liudan_pic_pre" class="form-control btn6" placeholder="请选择图片">
<button class="btn btn-default liudan_pic_btn" id="liudan_pic_btn" type="button">选择图片</button>
<!--<input readonly="readonly" type="hidden" name="liudan_pic_pre" class="form-control btn6" placeholder="请选择图片">
<button class="btn btn-default liudan_pic_btn" id="liudan_pic_btn" type="button">选择图片</button>-->
<input class="upload-image-btn" id="xiangqing_pic_btn" type="file" data-limittop="10" style="display: inline-block;">
<button class="btn btn-default btn-default-liu-css">选择图片</button>
</div>
<div class="form-group is_dujia">
......@@ -568,14 +605,14 @@
&times;
</button>
<h4 class="modal-title detail-modal-header-tab" >
<a href="javascript:;" class="btn btn-info">查看商铺</a>
<a href="javascript:;" class="btn btn-default">商铺跟进</a>
<a href="javascript:;" class="btn btn-default">盘方记录</a>
<a href="javascript:;" class="btn btn-default">查看日志</a>
<a href="javascript:;" class="btn btn-default">编辑日志</a>
<span class="btn-info-liu">查看商铺</span>
<span class="btn-default-liu">商铺跟进</span>
<span class="btn-default-liu">盘方记录</span>
<span class="btn-default-liu">查看日志</span>
<span class="btn-default-liu">编辑日志</span>
</h4>
</div>
<div class="modal-body modal-body-one">
<div class="modal-body modal-body-one" style="padding-top: 0;">
<div class="detail-modal-body-sec">
<iframe class="iframe-shop-detail"></iframe>
</div>
......
application/index/view/marchin/marchin_list.html
View file @ ee829aa0
......@@ -32,6 +32,9 @@
height: 30px;
/*border-radius: 15px;*/
}
#preview img{
width: 388px;
}
</style>
<div id="page-content-wrapper">
<div class="container">
......@@ -134,7 +137,7 @@
<td>{1}</td>
<td>{2}</td>
<td>
<img src='{5}' class="diagram-image J_preview"
<img src='{5}' class="diagram-image J_preview no-scroll-page-img"
data-bimg='{5}'>
</td>
<td>{4}</td>
......
application/index/view/member/user_genjing_modal.html
View file @ ee829aa0
......@@ -240,11 +240,18 @@
width: 30px;
border-radius: 3px;
line-height: 20px;
margin-top: 2px;
font-size: 10px;
font-size: 14px;
text-align: center;
cursor: pointer;
margin-left: 2px;
color: #FF8018;
text-decoration: none;
font-weight: 600;
}
.user_call:hover{
text-decoration: none;
color: #FF8018;
}
/*客户动态*/
......@@ -311,13 +318,14 @@
/*上一条 下一条 样式*/
#user_up,
#user_down {
color: #337ab7;
cursor: pointer;
margin-right: 30px;
}
.detail-modal-header-tab {
width: 220px;
width: 240px;
float: left;
margin-top: 8px;
}
.user_up_con {
......@@ -397,8 +405,6 @@
}
/*收藏样式*/
#user_is_collect{
margin-left: 30px;
font-weight: 600;
cursor: pointer;
}
......@@ -406,27 +412,117 @@
width: 818px!important;
margin: 0 auto;
background-color: white;
}
/*客户详情 样式优化*/
.btn-info-liu{
font-size: 18px;
color: #FF8018;
}
.btn-default-liu{
opacity: 0.4;
font-size: 18px;
color: #1F3865;
}
.detail-modal-header-tab span{
cursor: pointer;
font-weight: 600;
}
.public-box-liu-88{
display: block;
width: 88px;
height: 30px;
line-height: 30px;
text-align: center;
border: 1px solid #D8DBED;
border-radius: 3px;
font-size: 12px;
color: #A4ACCF;
float: left;
}
.public-box-liu-73{
display: block;
width: 73px;
height: 30px;
line-height: 30px;
text-align: center;
border: 1px solid #D8DBED;
border-radius: 3px;
font-size: 12px;
color: #A4ACCF;
float: left;
}
.public-box-noleft-73{
display: inline-block;
width: 73px;
height: 26px;
line-height: 26px;
text-align: center;
border: 1px solid #D8DBED;
border-radius: 3px;
font-size: 12px;
color: #A4ACCF;
margin-top: 5px;
}
#edit_add{
display: inline-block;
width: 66px;
height: 32px;
text-align: center;
line-height: 32px;
font-size: 12px;
color: #fff;
background-image: linear-gradient(-146deg, #FFDC0F 0%, #FF750E 91%);
border-radius: 3px;
}
.btn-info-rent{
display: inline-block;
width: 48px;
height: 26px;
line-height: 26px;
font-size: 11px;
color: #fff;
background-color: #FF8018;
border-radius: 2px;
text-align: center;
cursor: pointer;
margin-top: 5px;
}
.btn-default-rent{
display: inline-block;
width: 48px;
height: 26px;
line-height: 26px;
font-size: 11px;
color: #000;
background-color: #F8F8F8;
border-radius: 2px;
text-align: center;
cursor: pointer;
margin-top: 5px;
}
</style>
<div>
<div class="modal-header">
<h4 class="modal-title text-info detail-modal-header-tab">
<a href="javascript:;" class="btn btn-info">客户详情/跟进</a>
<a href="javascript:;" class="btn btn-default caozuo-yue">约带看</a>
<span class="btn-info-liu" style="margin-right: 30px;">客户详情/跟进</span>
<span class="btn-default-liu caozuo-yue">约带看</span>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="position: absolute;top: 0;right: 10px;width: 30px;height: 30px;">
×
</button>
</h4>
<div class="user_up_con">
<span id="user_up" class="ld-Marheight text-primary ld-Marheight">上一条客户</span>
<span id="user_down" class="ld-Marheight text-primary ld-Marheight">下一条客户</span>
<span id='user_is_collect' class='ld-Marheight text-primary'>收藏</span>
<a id='user_add_relational' class='ld-Marheight text-primary' style="margin-left: 32px;cursor: pointer;" href="#modal-addRelational" data-toggle="modal">添加关联客户</a>
<span id="user_up" class="public-box-liu-73">上一条客户</span>
<span id="user_down" class="public-box-liu-73">下一条客户</span>
<span id='user_is_collect' class='public-box-liu-73'>收藏</span>
<a id='user_add_relational' class='public-box-liu-88' style="margin-left: 32px;cursor: pointer;" href="#modal-addRelational" data-toggle="modal">添加关联客户</a>
</div>
</div>
<div class="modal-body modal-body1">
<div class="modal-body modal-body1" style="color: #061C43;font-size: 14px;">
<div class="detail-modal-body-sec">
<div class="call-user-five"></div>
<div class="detail-modal-body-sec-2">
......@@ -476,7 +572,7 @@
<td>
<span class="fore-span">电话:</span>
<span class="fore-span cus_phone"></span>
<a class="fore-span btn-primary user_call" >拨打</a>
<a class="fore-span user_call" >拨打</a>
</td>
<td>
......@@ -556,7 +652,7 @@
</table>
<!--关联客户-->
<div>
<div class="text-info" style="font-size: 16px;">
<div style="font-size: 16px;color: #061C43;font-weight: 600;">
关联客户
</div>
<div class="user-detail-relational" style="overflow: hidden;">
......@@ -564,7 +660,7 @@
</div>
<!--客户详情 最近一条带看动态-->
<div>
<div class="text-info" style="margin: 2px;font-size: 16px;">最近一条带看动态</div>
<div style="margin: 2px;font-size: 16px;color: #061C43;font-weight: 600;">最近一条带看动态</div>
<table class="table table-striped table-bordered table-hover table-condensed" style="margin-bottom: 0;">
<tbody class="text-center user-log-detail">
</tbody>
......@@ -572,7 +668,7 @@
</div>
<div class="clear modal-title-genjing">
<span class="modal-title-genjing-con">
<span class="text-info">客户动态</span>
<span class="btn-info-liu">客户动态</span>
<span>带看动态</span>
</span>
......@@ -599,24 +695,22 @@
</div>
<div class="clear margin-top-ld">
</div>
<label class="col-sm-3 control-label">跟进<span class="text-danger">(必填)</span>：</label>
<div class="col-sm-9">
<textarea class="form-control" rows="2" id="genj_text"></textarea>
<div class="col-sm-12">
<textarea class="form-control" rows="2" id="genj_text" placeholder="请输入客户跟进信息(必填)"></textarea>
</div>
<label class="col-sm-3 control-label">状态标签 <span class="text-danger">(必填)</span>：</label>
<div class="col-sm-9">
<!--<label class="control-label">无效</label><input type="radio" name="user_status" value="-1">-->
<label class="control-label">已租</label><input type="radio" name="user_status" value="1">
<label class="control-label">求租</label><input type="radio" name="user_status" value="0">
<div class="col-sm-12">
<!--<label class="control-label">已租</label><input type="radio" name="user_status" value="1">
<label class="control-label">求租</label><input type="radio" name="user_status" value="0">-->
<span class="modal-rent-genjing-con">
<span data-value='1' style="margin-left: 15px;" class="btn-default-rent">已租</span>
<span data-value='0' class="btn-default-rent">求租</span>
</span>
</div>
<!--跟进保存-->
<div class="center-btn">
<button type="button" class="btn btn-primary right-btn" id="edit_add">保存</button>
<button type="button" class="btn btn-default btn-guanbi" data-dismiss="modal">关闭</button>
<span id="edit_add">保存</span>
<!--<button type="button" class="btn btn-default btn-guanbi" data-dismiss="modal">关闭</button>-->
</div>
</div>
......
application/index/view/myCollectionShop/myCollectionShopList.html
View file @ ee829aa0
......@@ -56,6 +56,7 @@
<li>
<a href="javascript:;">商铺收藏</a>
</li>
<li> <span class="btn btn-info btn3 " id="fresh_btn">刷新</span></li>
</div>
<div class="panel-body">
<div class="table-responsive">
......
application/index/view/myCollectionUser/myCollectionUserList.html
View file @ ee829aa0
......@@ -307,12 +307,14 @@
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li><a href="#">我收藏的客户</a></li>
<li> <span class="btn btn-info btn3 " id="fresh_btn">刷新</span></li>
<!--<li class="active">新增</li>-->
<div class="pull-right">
<ul class="bread_btn">
<li>
<!--<a href="#modal-edit" data-toggle="modal" class="btn btn-default edit_add"><i class="icon-plus"></i>
新增</a>-->
</li>
</ul>
</div>
......
application/index/view/news/new_text.html
View file @ ee829aa0
......@@ -275,11 +275,9 @@
<div class="form-group">
<label class="col-sm-2 control-label">封面图：</label>
<div class="col-sm-9">
<!--选择图片-->
<!--<div class="col-sm-9">
<ul class="list-group">
<li class="list-group-item">
<!--封面图 一张-->
<div class="form-group full-width-100 full-pic-area">
<input readonly="readonly" type="text" name="liebiao_pic_input" class="form-control" style="width: 150px !important;display:none" id="liebiao_pic_input" placeholder="请选择图片">
<button class="btn btn-default upload-image-btn" id="liebiao_pic_btn" type="button" data-limittop="1">选择图片</button>
......@@ -288,8 +286,37 @@
<ul class="img-pre-ul" id="liebiao_pic_ul"></ul>
</li>
</ul>
</div>-->
<div class="col-xs-9">
<ul class="list-group">
<li class="list-group-item">
<div class="file-upload-area p-a-0 ">
<ul class="img-pre-ul" id="fujian_ul"></ul>
<div class="btn-area">
<input class="btn btn-default" type="file" id="upload-image-btn" data-limittop="1" /> <!--修改上传文件的最大数字-->
<button class="btn btn-default">选择图片</button>
</div>
</div>
</li>
</ul>
<!--<div class="file-upload-area p-a-0 ">
<ul class="img-pre-ul" id="fujian_ul"></ul>
<div class="btn-area">
<input class="btn btn-default" type="file" id="file_input" data-limittop="10" /> <!--修改上传文件的最大数字-->
<!--<button class="btn btn-default">选择图片</button>
</div>
<div class="col-xs-12 img_area p-t-10">
</div>
</div>-->
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">内容:</label>
......@@ -297,7 +324,7 @@
<div class="" style="width: 100%;">
<div class="input-group" style="width: 100%;" id="dajiangtang">
<?php
create_editor('goods_sup_id','');
create_editor('goods_sup_id','',['filebrowserUploadUrl'=>IMAGES_URL.'index/uploadEditor?type=business_school']);
?>
</div>
</div>
......@@ -314,7 +341,7 @@
<input type="file" id="file_input" class="" data-limittop="10" /> <!--修改上传文件的最大数字-->
<button class="btn btn-default">选择附件</button>
</div>
<ul class="img-pre-ul" id="fujian_ul"></ul>
<ul class="img-pre-ul" id="fujian_ul_liu"></ul>
<p class="text-danger">保存成功后,点击文件名称即可下载</p>
</div>
</div>
......
application/index/view/news/plNews.html 0 → 100644
View file @ ee829aa0
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="plNews" />
<style>
.modal-body1 {
height: 600px;
overflow-y: auto;
padding-bottom: 60px;
}
.modal-body2 {
padding: 35px;
height: 380px;
}
.user-ul {
width: 100%;
height: auto;
padding-bottom: 15px;
float: left;
position: relative;
left: -40px;
}
.user-ul li {
list-style: none;
line-height: 30px;
}
.user-ul2 {
width: 100%;
height: auto;
padding-bottom: 15px;
float: left;
position: relative;
left: -40px;
}
.user-ul2 li {
list-style: none;
line-height: 30px;
}
.input {
width: 16%!important;
}
.text-left {
float: left;
display: inline-block;
height: 26px;
line-height: 26px;
font-size: 14px;
}
.text-right {
float: right;
display: inline-block;
}
#batch {
float: left;
height: 34px;
line-height: 34px;
}
.ld-Marheight {
margin-top: 15px;
}
.phone_list {
margin-top: 32px;
width: 182px;
margin-left: -182px;
}
.phone_jia {
width: 182px;
}
.phone_list li {
height: 22px;
line-height: 22px;
}
.phone_list li:nth-of-type(even) {
display: none;
}
.modal-dialog-one {
width: 668px;
}
.clear {
clear: both;
}
.left {
float: left;
font-size: 12px;
}
.bottom {
margin-top: 30px;
}
.btn6_1 {
width: 80% !important;
float: left;
}
.notice-title {
font-size: 20px;
}
.notice-time {
font-size: 13px;
margin-top: 20px;
}
.notice-text {
font-size: 16px;
margin-top: 30px;
text-indent: 2em;
}
.col-sm-9 .btn5 {
width: 30%!important;
}
.img-pre-ul {
padding-left: 0;
overflow: hidden;
/*width: 100%;*/
}
/*图片上传相关样式*/
.img-pre-ul>li {
list-style: no;
float: left;
width: 210px;
height: 170px;
overflow: hidden;
margin-right: 10px;
margin-top: 10px;
}
.img-pre-ul>li.pdf-pre-li {
height: 70px;
}
.img-pre-ul>li>img {
float: left;
width: 210px;
height: 140px;
object-fit: contain;
cursor: pointer;
}
.img-pre-ul>li>a {
float: left;
width: 210px;
text-align: center;
line-height: 30px;
}
.img-pre-ul>li>a.pdf-pre-a {
line-height: 20px;
word-break: break-all;
}
/*图片点击放大预览区域的样式*/
#img_mask_area {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: hidden;
z-index: 1999;
background-color: rgba(0, 0, 0, .3);
display: none;
}
#img_mask_area>img {
width: 900px;
height: 700px;
object-fit: contain;
position: absolute;
left: 50%;
top: 50%;
margin-left: -450px;
margin-top: -350px;
}
/*上传图片列表 样式*/
.form-group {
margin: 10px;
}
.input-100-width {
width: 100px!important;
}
.input-360-width {
width: 360px!important;
}
.textarea-500-width {
width: 500px!important;
}
.list-group-item>.full-width-100+.full-width-100 {
padding-top: 10px;
}
.list-group-item>.full-width-100>label {
width: 60px;
}
.list-group-item>.full-pic-area>label {
width: 120px;
}
.delet-pic-btn {
color: red;
}
#modal_content_add {
width: 900px;
}
.cke_skin_kama .cke_wrapper{
background-color:#fff;
}
#modal_detail_value{
height: 200px;
overflow-y: scroll;
border: 1px solid #ccc;
background: #fff;
}
.btn4{
width : 10% !important;
}
.autocut{
display:block ;
max-width : 300px;
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
-o-text-overflow:ellipsis;
-icab-text-overflow: ellipsis;
-khtml-text-overflow: ellipsis;
-moz-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis; }
table{
width:100%;
/*table-layout:auto;*/
}
</style>
<!--导航star-->
<!-- Sidebar -->
<!-- /#sidebar-wrapper -->
<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="">
<div class="panel panel-default">
<div class="panel-heading breadcrumb">
<li class="active">商学院心得评论</li>
<div class="pull-right">
</div>
</div>
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed" style="width : 100%!important;overflow:hidden ; ">
<thead>
<tr>
<td colspan="11">
<form action="" method="get" 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_date" 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_date" type="date">
<select class="form-control btn2 ld-Marheight" id="commit_home">
<option value="">提交人所在部门</option>
</select>
<select class="form-control btn2 ld-Marheight" id="commit_shop">
<option value="">提交人所在门店</option>
</select>
<input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" id="comit_name" placeholder="姓名/手机号" type="text" value="">
<input class="form-control btn2 margin-top-ld" data-rule-phoneus="false" data-rule-required="false" id="release_title" placeholder="文章名称" type="text" value="">
<ul class="user-ul" style="display:none"></ul>
<span class="btn btn-info btn3 margin-top-ld" id="search">搜索</span>
<span class="btn btn-info btn3 margin-top-ld" 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" style="max-width : 40%">评论内容</th>
<th class="text-center">操作</th>
</tr>
</thead>
<tbody id="users_list" class="text-center">
</tbody>
</table>
</div>
<div class="text-right" id="pagediv">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- /#wrapper -->
<!-- /#删除模态框 -->
<div class="modal fade" id="modal-delete" 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">
&times;
</button>
<h4 class="modal-title">
删除
</h4>
</div>
<div class="modal-body">
<div class="modal-body">
<input type="hidden" value="" id="delete_id" /> 确认删除吗？
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id="confirm_delete">
删除
</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
<!-- 查看-->
<div class="modal fade" id="show_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" >
<div class="modal-dialog button-center-bargain" style="width:70%!important">
<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">
<span id="realContex"></span>
</div>
<div class="modal-footer text-center">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
</div>
</div>
<!-- /.modal-content -->
</div>
<!-- /.modal -->
</div>
\ No newline at end of file
application/index/view/notice/add_notice_view.html
View file @ ee829aa0
......@@ -282,7 +282,7 @@
<!--<label for="" style="width: 100%;">内容</label>-->
<div class="input-group" style="width: 100%;" id="dajiangtang">
<?php
create_editor('goods_sup_id','');
create_editor('goods_sup_id',''， ['filebrowserUploadUrl'=>IMAGES_URL.'index/uploadEditor?type=house_img']);
?>
</div>
</div>
......
application/index/view/transfer/index.html
View file @ ee829aa0
......@@ -47,26 +47,35 @@
class="glyphicon glyphicon-calendar"></span></span>
</div>
</div>-->
<span class="fore-span ld-Marheight">提交时间:</span>
<!--<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_date" 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_date" type="date">
<input class="form-control btn4 ld-Marheight" value="" data-rule-phoneus="false" data-rule-required="false" id="end_date" name="end_date" type="date">-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="name" placeholder="客户姓名"
type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="phone" placeholder="手机号" type="text"
value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="shop_name" placeholder="店铺名"
type="text" value="">
type="text" value="">-->
<select class="form-control btn2 ld-Marheight" id="is_guest">
<option value="">是否有客方</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
<div class="clear" style="clear: both;">
</div>
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="form_search_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>
......
application/index/view/transfer/myTransferList.html 0 → 100644
View file @ ee829aa0
{layout name="global/frame_two_tpl" /}
<input type="hidden" class="page-load" id="myTransfer"/>
<!--导航star-->
<!-- Sidebar -->
<!-- /#sidebar-wrapper -->
<!-- Page Content -->
<div id="page-content-wrapper">
<div class="container">
<div class="row">
<div class="">
<div class="panel panel-default">
<div class="panel-heading">
委托转铺列表
</div>
<div class="panel-body">
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover table-condensed">
<thead>
<tr>
<td colspan="9">
<form id="form_search">
<!--<span class="fore-span">提交时间:</span>
<div class="form-group">
<div class="input-group date form_date " data-date=""
data-date-format="yyyy-MM-dd" data-link-field="dtp_input2"
data-link-format="yyyy-mm-dd" style="width: 200px;float: left;">
<input class="form-control" size="16" type="text" value=""
id="start_date"
readonly>
<span class="input-group-addon"><span
class="glyphicon glyphicon-remove"></span></span>
<span class="input-group-addon"><span
class="glyphicon glyphicon-calendar"></span></span>
</div>
<div class="input-group date form_date " data-date=""
data-date-format="yyyy-MM-dd" data-link-field="dtp_input2"
data-link-format="yyyy-mm-dd" style="width: 200px;float: left">
<input class="form-control" size="16" type="text" value=""
id="end_date"
readonly>
<span class="input-group-addon"><span
class="glyphicon glyphicon-remove"></span></span>
<span class="input-group-addon"><span
class="glyphicon glyphicon-calendar"></span></span>
</div>
</div>-->
<!--<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_date" 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_date" type="date">-->
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="name" placeholder="客户姓名"
type="text" value="">
<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="phone" placeholder="手机号" type="text"
value="">
<!--<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false"
data-rule-required="false" id="shop_name" placeholder="店铺名"
type="text" value="">-->
<span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
<span class="btn btn-info btn3 ld-Marheight" id="form_search_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>
<th class="text-center">操作</th>
</tr>
</thead>
<tbody id="sublet_list" class="text-center">
</tbody>
</table>
</div>
<!-- /#page-content-wrapper -->
<div class="text-right pageinfo" id="pagediv">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- /#wrapper -->
<!-- /#跟进模态框 -->
<div class="modal fade" id="modal-process" 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">
&times;
</button>
<h4 class="modal-title" id="myModalLabel">
跟进
</h4>
</div>
<div class="modal-body">
<div class="table-responsive table-responsive1">
<table class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>跟进内容</th>
<th>跟进人</th>
<th>跟进时间</th>
</tr>
</thead>
<tbody id="list_follow">
</tbody>
</table>
</div>
<div class="control-group">
<label class="control-label">备注</label>
<div class="controls">
<textarea class="form-control" rows="3" id="content"></textarea>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">关闭
</button>
<button type="button" class="btn btn-primary" id="submit_follow">
提交
</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal -->
</div>
application/model/AgentsVisitors.php
View file @ ee829aa0
......@@ -5,6 +5,8 @@ namespace app\model;
class AgentsVisitors extends BaseModel
{
protected $table = 'a_visiting';
/**
* @param int $pageNo
* @param int $pageSize
......
application/model/Evaluate.php
View file @ ee829aa0
......@@ -58,7 +58,7 @@ class Evaluate extends Model
if (empty($data[$k]['user_pic'])) {
$data[$k]['user_pic'] = $data[$k]['user_pic'];
} else {
$data[$k]['user_pic'] = CURRENT_URL . '/static/head_portrait/' . $data[$k]['user_pic'];
$data[$k]['user_pic'] = IMAGES_URL . '/static/head_portrait/' . $data[$k]['user_pic'];
}
if ($v['evaluate_sign']) {
......
application/model/OReportModel.php
View file @ ee829aa0
......@@ -963,7 +963,8 @@ class OReportModel extends Model
d.residue_num AS room_num_left,
d.is_show,
d.status,
d.external_image_id
d.external_image_id,
d.is_show_image
FROM
`o_report` `a`
LEFT JOIN `o_order` `b` ON `b`.`f_id` = `a`.`id`
......@@ -986,7 +987,8 @@ class OReportModel extends Model
b.residue_num AS room_num_left,
b.is_show,
b.status,
b.external_image_id
b.external_image_id,
b.is_show_image
FROM
u_appoint_watch_shop a
LEFT JOIN g_houses b ON a.house_id = b.id
......
application/model/SNews.php
View file @ ee829aa0
......@@ -93,7 +93,7 @@ class SNews extends BaseModel
->select();
if (!empty($file[0]['annex_file_name'])) {
$data['annex_file_path'] = CURRENT_URL . 'static/business_school_file/' . $file[0]['annex_file_name'];
$data['annex_file_path'] = IMAGES_URL . 'static/business_school_file/' . $file[0]['annex_file_name'];
}
foreach ($file as $k=>$v) {
......
application/model/SNewsComment.php
View file @ ee829aa0
......@@ -58,4 +58,39 @@ class SNewsComment extends BaseModel
->count();
}
public function getCommentList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field = '', $params = '')
{
$data = $this->field($field)
->alias('a')
->join('a_agents b', 'a.agent_id = b.id', 'left')
->join('s_news c', 'a.s_news_id = c.id', 'left')
->where($params)
->order($order_)
->limit($pageSize)
->page($pageNo)
->select();
return $data;
}
public function getCommentListTotal($params = '')
{
$data = $this
->alias('a')
->join('a_agents b', 'a.agent_id = b.id', 'left')
->join('s_news c', 'a.s_news_id = c.id', 'left')
->where($params)
->count();
return $data;
}
/**
* 更新数据
*/
public function updateSite($params)
{
$result = $this->update($params);
//dump($this->getLastSql());
return $result;
}
}
\ No newline at end of file
application/model/SubletModel.php
View file @ ee829aa0
......@@ -48,11 +48,13 @@ class SubletModel extends BaseModel
$result = $this->field($fields)
->alias("a")
->join("g_houses b","a.house_id=b.id","left")
->join("u_users c", "a.user_id = c.id", "left")
->where($params)
->order($order_)
->limit($pageSize)
->page($pageNo)
->select();
big_log($this->getLastSql());
return $result;
}
......@@ -64,9 +66,12 @@ class SubletModel extends BaseModel
*/
public function getSubletTotal($params)
{
return $this->alias("a")
$result = $this->alias("a")
->join("g_houses b","a.house_id=b.id","left")
->where($params)->count();
->join("u_users c", "a.user_id = c.id", "left")
->where($params)
->count();
return $result;
}
/**
......
application/model/Users.php
View file @ ee829aa0
......@@ -170,7 +170,7 @@ class Users extends Model
$data[$k] = $v->getData();
if ($data[$k]['user_pic']) {
$data[$k]['user_pic'] = CURRENT_URL . 'static/head_portrait/' . $data[$k]['user_pic'];
$data[$k]['user_pic'] = IMAGES_URL . 'static/head_portrait/' . $data[$k]['user_pic'];
} else {
$data[$k]['user_pic'] = '';
}
......
application/route.php
View file @ ee829aa0
......@@ -90,6 +90,7 @@ Route::group('index', [
//transfer转铺列表
'transfer_list' => ['index/transfer/index', ['method' => 'get']],
'my_transfer_list' => ['index/MyTransfer/myTransferList', ['method' => 'get']],//我的转铺列表
'get_transfer' => ['index/transfer/getlist', ['method' => 'get']],
'addFollow' => ['index/transfer/addFollow', ['method' => 'post']], //添加跟进
'followList' => ['index/transfer/followList', ['method' => 'get']], //跟进记录
......@@ -302,25 +303,31 @@ Route::group('index', [
'yindaoIos' => [ 'index/ShareShop/yindaoIos', [ 'method' => 'POST|GET' ] ],
'receivables' => ['index/Finance/receivables', ['method' => 'GET']], //获取实收日期
'adjustment' => ['index/Finance/adjustment', ['method' => 'GET']], //获取实收日期
'evaluationList' => ['index/Evaluation/evaluationList', ['method' => 'POST|GET']], //评价列表 朱伟 2018-06-13
'marchInList' => ['index/MarchIn/marchInList', ['method' => 'POST|GET']], //进场记录列表 朱伟 2018-06-13
'superviseList' => ['index/Supervise/superviseList', ['method' => 'POST|GET']], //监督执行列表 朱伟 2018-06-14
'business_school' => ['index/news/index', ['method' => 'GET']], //商学院资讯列表
'addNews' => ['index/news/addNews', ['method' => 'POST']], //新增商学院资讯
'getNewsInfo' => ['index/news/getNewsInfo', ['method' => 'GET']], //商学院资讯详情
'getNewsLabel' => ['index/news/getNewsLabel', ['method' => 'GET']], //商学院资标签
'delNews' => ['index/news/delNews', ['method' => 'POST']], //删除商学院文章
'new_text' => ['index/news/newText', ['method' => 'GET']],
'delNewsFile' => ['index/news/delNewsFile', ['method' => 'POST']], //删除商学院附件
'agentEvaluateNumAndFraction' => ['index/broker/agentEvaluateNumAndFraction', ['method' => 'POST|GET']],//经纪人列表计算-评价次数和分数 朱伟 2018-07-03
'uploadImg' => ['index/UploadImg/uploadImg', ['method' => 'POST']],//全局图片上传
'followUpList' => ['index/HouseFollowUp/followUpList', ['method' => 'GET']],//商铺跟进liu
'userModalList' => ['index/Member/userDetail', ['method' => 'GET']], //客户跟进模态框，公用
'inspectionRecordList' => ['index/InspectionRecord/inspectionRecordList', ['method' => 'GET']],//约带看记录liu
'realtimePerformance' => ['index/RealTimePerformance/realtimePerformanceList', ['method' => 'GET']],//实时业绩liu
'shopinspectionLog' => ['index/ShopInspectionLog/shopinspectionLogList', ['method' => 'POST|GET']],//商铺查看日志liu
'shopinspectionLogTest' => ['index/ShopInspectionLogTest/shopinspectionLogListTest', ['method' => 'POST|GET']],//商铺查看日志测试liu
'getPayLogData' => ['index/Finance/getPayLogData', ['method' => 'GET']], //收款各种详情
'evaluationList' => [ 'index/Evaluation/evaluationList', [ 'method' => 'POST|GET' ] ], //评价列表 朱伟 2018-06-13
'marchInList' => [ 'index/MarchIn/marchInList', [ 'method' => 'POST|GET' ] ], //进场记录列表 朱伟 2018-06-13
'superviseList' => [ 'index/Supervise/superviseList', [ 'method' => 'POST|GET' ] ], //监督执行列表 朱伟 2018-06-14
'business_school' => [ 'index/news/index', [ 'method' => 'GET' ] ], //商学院资讯列表
'addNews' => [ 'index/news/addNews', [ 'method' => 'POST' ] ], //新增商学院资讯
'getNewsInfo' => [ 'index/news/getNewsInfo', [ 'method' => 'GET' ] ], //商学院资讯详情
'getNewsLabel' => [ 'index/news/getNewsLabel', [ 'method' => 'GET' ] ], //商学院资标签
'delNews' => [ 'index/news/delNews', [ 'method' => 'POST' ] ], //删除商学院文章
'getCommentList' => [ 'index/news/getCommentList', [ 'method' => 'POST|GET' ] ], //商学院评论列表
'delNewsComment' => [ 'index/news/delNewsComment', [ 'method' => 'POST|GET' ] ], //删除商学院评论
'new_text' => [ 'index/news/newText', [ 'method' => 'GET' ] ],
'delNewsFile' => [ 'index/news/delNewsFile', [ 'method' => 'POST' ] ], //删除商学院附件
'plNews' => ['index/news/plNews', ['method' => 'GET']], //商学院评论
'agentEvaluateNumAndFraction' => [ 'index/broker/agentEvaluateNumAndFraction', [ 'method' => 'POST|GET' ] ],//经纪人列表计算-评价次数和分数 朱伟 2018-07-03
'uploadImg' => [ 'index/UploadImg/uploadImg', [ 'method' => 'POST' ] ],//全局图片上传
'uploadEditor' => [ 'index/UploadImg/uploadEditor', [ 'method' => 'POST' ] ],//全局图片上传
'followUpList' => [ 'index/HouseFollowUp/followUpList', [ 'method' => 'GET' ] ],//商铺跟进liu
'userModalList' => [ 'index/Member/userDetail', [ 'method' => 'GET' ] ], //客户跟进模态框，公用
'inspectionRecordList' => [ 'index/InspectionRecord/inspectionRecordList', [ 'method' => 'GET' ] ],//约带看记录liu
'realtimePerformance' => [ 'index/RealTimePerformance/realtimePerformanceList', [ 'method' => 'GET' ] ],//实时业绩liu
'shopinspectionLog' => [ 'index/ShopInspectionLog/shopinspectionLogList', [ 'method' => 'POST|GET' ] ],//商铺查看日志liu
'shopinspectionLogTest' => [ 'index/ShopInspectionLogTest/shopinspectionLogListTest', [ 'method' => 'POST|GET' ] ],//商铺查看日志测试liu
'performancesubsidiaryList' => ['index/PerformanceSubsidiary/performancesubsidiaryList', ['method' => 'POST|GET']],//业绩明细liu
'pkList' => ['index/PkList/pkList', ['method' => 'POST|GET']],//pk榜 liu
......@@ -730,6 +737,7 @@ Route::group('broker', [
'addSupervise' => ['api_broker/Supervise/addSupervise', ['method' => 'POST|GET']], //新增-监督执行
'superviseUploadImg' => ['api_broker/Supervise/superviseUploadImg', ['method' => 'POST|GET']], //监督执行-上传图片
'uploadImg' => ['api_broker/UploadImg/uploadImg', ['method' => 'POST|GET']], //图片上传
'uploadEditor' => ['api_broker/UploadImg/uploadEditor', ['method' => 'POST|GET']], //图片上传
'business_school' => ['api_broker/news/index', ['method' => 'GET']], //商学院资讯列表
'getNewsInfo' => ['api_broker/news/getNewsInfo', ['method' => 'GET']], //商学院资讯详情
'getNewsLabel' => ['api_broker/news/getNewsLabel', ['method' => 'GET']], //商学院标签
......
public/app/css/shop_detail_pc.css
View file @ ee829aa0
......@@ -18,7 +18,7 @@ table td{
height: 20px;
}
tbody>tr.border-bottom{
border-bottom: 1px solid #999;
border-bottom: 1px solid rgba(206, 213, 235,.5);
}
tbody>tr.tr-bold{
font-size: 16px;
......@@ -27,8 +27,8 @@ tbody>tr.tr-bold{
}
.img-list>li{
width:140px;
height: 140px;
width:66px;
height: 66px;
}
.img-list>li+li{
margin-left: 20px;
......@@ -43,11 +43,12 @@ tbody>tr.tr-bold{
background-color: #e0e0e0;
}
.phone-list>li>a{
background-color: #286090;
color: white;
color: #FF750E;
padding: 0 5px;
border-radius: 4px;
margin-left: 6px;
font-weight: 600;
font-size: 15px;
}
.phone-list>li+li{
margin-left: 20px;
......@@ -243,10 +244,11 @@ html{
/*c端公开样式*/
.is-public-user{
display: inline-block;
background-color: #286090;
background-image: linear-gradient(-146deg, #FFDC0F 0%, #FF750E 91%);
border-radius: 3px;
/*background-color: #FF750E;*/
color: white;
padding: 0 3px;
border-radius: 6px;
width: 83px;
height: 34px;
line-height: 34px;
......
public/app/dist/index.html
View file @ ee829aa0
......@@ -23,4 +23,4 @@
if(!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);</script><link href=./static/css/app.49e7068bb37112ab84a6f844f9088bbe.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.f54574412330d2feee20.js></script></body></html>
\ No newline at end of file
})(document, window);</script><link href=./static/css/app.8e7a1294243657c878b001aee61ce09a.css rel=stylesheet></head><body><div id=app></div><script src=https://api.tonglianjituan.com/app/js/libs/vue.min.js></script><script src=https://api.tonglianjituan.com/app/js/libs/vue-router.min.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.1b35a927314506fe4a4f.js></script><script type=text/javascript src=./static/js/app.95bcdcbc5ae5c04a833f.js></script></body></html>
\ No newline at end of file
public/app/dist/static/js/app.95bcdcbc5ae5c04a833f.js 0 → 100644
View file @ ee829aa0
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.f54574412330d2feee20.js deleted 100644 → 0
View file @ 35107fd9
This diff is collapsed.
public/app/js/common.js
View file @ ee829aa0
This diff is collapsed.
public/app/js/customer_gj.js
View file @ ee829aa0
This diff is collapsed.
public/app/js/daily_achieve_dz.js
View file @ ee829aa0
This diff is collapsed.
public/app/js/daily_achieve_mdzj.js
View file @ ee829aa0
This diff is collapsed.
public/app/js/daily_achieve_ywy.js
View file @ ee829aa0
This diff is collapsed.
public/app/js/weekly_achieve_dz.js
View file @ ee829aa0
This diff is collapsed.
public/app/js/weekly_achieve_mdzj.js
View file @ ee829aa0
This diff is collapsed.
public/appnew/package-lock.json
View file @ ee829aa0
This diff is collapsed.
public/appnew/src/assets/js/public.js
View file @ ee829aa0
This diff is collapsed.
public/appnew/src/components/download/images/anzhuo@2x.png 0 → 100644
View file @ ee829aa0
This diff is collapsed.
public/appnew/src/components/download/images/pingguo@2x.png 0 → 100644
View file @ ee829aa0
This diff is collapsed.
public/resource/js/addNoticeView.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/banner.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/black_list.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/getCollection.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/houseList.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/marchinList.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/myCollectionShopList.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/myCollectionUserList.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/myTransfer.js 0 → 100644
View file @ ee829aa0
This diff is collapsed.
public/resource/js/pictureShow.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/plNews.js 0 → 100644
View file @ ee829aa0
This diff is collapsed.
public/resource/js/public.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/refundList.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/schoolBusinessNew.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/shop_edit.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/transfer.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/user_genjing_modal.js
View file @ ee829aa0
This diff is collapsed.
public/resource/js/waitBackout.js
View file @ ee829aa0
This diff is collapsed.
public/resource/lib/Ckeditor/config.js
View file @ ee829aa0
This diff is collapsed.
public/resource/lib/Ckfinder/config.php
View file @ ee829aa0
This diff is collapsed.
public/resource/lib/js/blow-up.js
View file @ ee829aa0
This diff is collapsed.
public/resource/template/my_transfer_template_tpl.html 0 → 100644
View file @ ee829aa0
This diff is collapsed.
public/resource/template/plNews_template_tpl.html 0 → 100644
View file @ ee829aa0
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment