Skip to content

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

时间空间，css加载顺序

parent 96d48eb6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 10 deletions
application/api/controller/AppointmentTime.php
View file @ a68f61ad
......@@ -51,6 +51,7 @@ class AppointmentTime extends Basic
if (isset($params["house_id"]) && isset($params["house_title"])) {
$where_["house_id"] = $params["house_id"];
$where_["title"] = $params["title"];
$where_['show_all'] = array( 'eq', 0 );
$houseInfo = $this->houseInfoModel->getHouseDetail("id", $where_);
if (count($houseInfo) <= 0) {
return $this->response("101", "楼盘ID或楼盘名错误");
......
application/api/controller/Shop.php
View file @ a68f61ad
......@@ -37,7 +37,7 @@ class Shop extends Basic
/* $params = array(
"site_area" => 2, //来源 1首页 2搜索
"title" => "尚美",
"carefully_chosen" => 0,
"carefully_chosen" => 0, //精选商铺--0是1否
"disc" => "黄浦区",
"yetai" => "休闲娱乐",
"area_start" => 45,//面积起始范围 room_area2
......@@ -115,6 +115,7 @@ class Shop extends Basic
$conditions['id'] = array( '<>', 16 );
//todo sales下架字段并没用处 根据room_num_left剩余铺数来判断 为0 表示下架
$conditions['room_num_left'] = array( '<>', 0 );
$conditions['show_all'] = array( 'eq', 0 ); //只显示公开的楼盘
}
$result = $this->db->getHouseInfoList($pageNo, $pageSize, $order_, $field, $conditions);
......@@ -150,6 +151,7 @@ class Shop extends Basic
}
$conditions['id'] = array( "eq", $params["id"] );
$conditions['show_all'] = array( 'eq', 0 ); //只显示公开楼盘
$result = $this->db->getHouseDetail($field, $conditions);
if ($result[0]['room_num_left'] == 0) {
......
application/index/view/global/frame_tpl.html
View file @ a68f61ad
<!DOCTYPE html>
<html lang="en-us">
<head>
{include file="global/header_tpl" /}
<link rel="stylesheet" href="../../../../resource/css/bootstrap.css" type="text/css" />
<link rel="stylesheet" href="../../../../resource/css/public.css" type="text/css" />
</head>
<body>
<div class="navbar">
<div class="container-fluid">
<a class="brand">
......@@ -24,10 +26,12 @@
</ul>
</div>
</div>
{include file="global/footer_tpl" /}
<div id="wrapper">
{include file="global/navigation" /}
{__CONTENT__}
{include file="global/footer_tpl" /}
</div>
</body>
</html>
application/index/view/member/member.html
View file @ a68f61ad
{layout name="global/frame_tpl" /}
<input type="hidden" class="page-load" id="user" />
<link rel="stylesheet" href="../../../../resource/css/bootstrap-combined.min.css" type="text/css" />
<link rel="stylesheet" href="../../../../resource/css/bootstrap-datetimepicker.min.css" type="text/css" />
<label>编辑：</label>
<?php
create_editor('describe');
......@@ -16,4 +20,11 @@ Copy
<button type="button" class="btn btn-default btn-lg">
<span class="glyphicon glyphicon-star" aria-hidden="true"></span> Star
</button>
\ No newline at end of file
</button>
<div id="datetimepicker" class="input-append date">
<input type="text"></input>
<span class="add-on">
<i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
</span>
</div>
\ No newline at end of file
application/index/view/member/member2.html 0 → 100644
View file @ a68f61ad
<!DOCTYPE HTML>
<html>
<head>
<link rel="stylesheet" href="../../../../resource/css/bootstrap.css" type="text/css" />
<link href="http://netdna.bootstrapcdn.com/twitter-bootstrap/2.2.2/css/bootstrap-combined.min.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" media="screen"
href="http://tarruda.github.com/bootstrap-datetimepicker/assets/css/bootstrap-datetimepicker.min.css">
</head>
<body>
<div id="datetimepicker" class="input-append date">
<input type="text"></input>
<span class="add-on">
<i data-time-icon="icon-time" data-date-icon="icon-calendar"></i>
</span>
</div>
<script src="../../../resource/lib/js/jquery-2.0.3.min.js"></script>
<script src="../../../resource/lib/js/bootstrap.min.js"></script>
<script src="../../../resource/lib/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript">
$('#datetimepicker').datetimepicker({
format: 'yyyy-MM-dd',
language: 'zh-CN',
pickTime: false
}).on('changeDate',function(){
$(this).datetimepicker('hide');
});
</script>
</body>
\ No newline at end of file
application/model/AttentionModel.php
View file @ a68f61ad
......@@ -68,6 +68,7 @@ class AttentionModel extends Model
public function myAttentionList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $param){
$params["a.user_id"] = $param["user_id"];
$params["b.room_num_left"] = array("<>",0); //剩余数为0 的商品不显示
$params["b.show_all"] = array("eq",0); //只显示公开的楼盘
return $this->field($field)
->alias("a")
->join('houseinfos b','a.house_id = b.id','LEFT')
......
application/route.php
View file @ a68f61ad
......@@ -41,12 +41,14 @@ Route::rule([
Route::rule(['/city/:name' => 'error/index'] , '' ,'GET');*/
Route::group('index',[
'member' => ['index/member.index/member',['method' => 'get']],
'member' => ['index/member.index/member',['method' => 'get']],
'preview_list' => ['index/member.index/preview_list',['method' => 'get']],
'consumer_list' => ['index/member.index/consumer_list',['method' => 'get']],
'diagram_list' => ['index/member.index/diagram_list',['method' => 'get']],
'entrust_list' => ['index/member.index/entrust_list',['method' => 'get']]
]);
Route::group('api',[
//get
'sendSms/:phone' => ['api/member/sendSms', ['method' => 'get']], //发送短信
......
public/resource/css/bootstrap-combined.min.css 0 → 100644
View file @ a68f61ad
This source diff could not be displayed because it is too large. You can view the blob instead.
public/resource/css/bootstrap-datetimepicker.min.css 0 → 100644
View file @ a68f61ad
/*!
* Datepicker for Bootstrap
*
* Copyright 2012 Stefan Petre
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
*/.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-datetimepicker-widget{top:0;left:0;width:250px;padding:4px;margin-top:1px;z-index:3000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.bootstrap-datetimepicker-widget:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,0.2);position:absolute;top:-7px;left:6px}.bootstrap-datetimepicker-widget:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.bootstrap-datetimepicker-widget.pull-right:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.pull-right:after{left:auto;right:7px}.bootstrap-datetimepicker-widget>ul{list-style-type:none;margin:0}.bootstrap-datetimepicker-widget .timepicker-hour,.bootstrap-datetimepicker-widget .timepicker-minute,.bootstrap-datetimepicker-widget .timepicker-second{width:100%;font-weight:bold;font-size:1.2em}.bootstrap-datetimepicker-widget table[data-hour-format="12"] .separator{width:4px;padding:0;margin:0}.bootstrap-datetimepicker-widget .datepicker>div{display:none}.bootstrap-datetimepicker-widget .picker-switch{text-align:center}.bootstrap-datetimepicker-widget table{width:100%;margin:0}.bootstrap-datetimepicker-widget td,.bootstrap-datetimepicker-widget th{text-align:center;width:20px;height:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.bootstrap-datetimepicker-widget td.day:hover,.bootstrap-datetimepicker-widget td.hour:hover,.bootstrap-datetimepicker-widget td.minute:hover,.bootstrap-datetimepicker-widget td.second:hover{background:#eee;cursor:pointer}.bootstrap-datetimepicker-widget td.old,.bootstrap-datetimepicker-widget td.new{color:#999}.bootstrap-datetimepicker-widget td.active,.bootstrap-datetimepicker-widget td.active:hover{color:#fff;background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.bootstrap-datetimepicker-widget td.active:hover,.bootstrap-datetimepicker-widget td.active:hover:hover,.bootstrap-datetimepicker-widget td.active:active,.bootstrap-datetimepicker-widget td.active:hover:active,.bootstrap-datetimepicker-widget td.active.active,.bootstrap-datetimepicker-widget td.active:hover.active,.bootstrap-datetimepicker-widget td.active.disabled,.bootstrap-datetimepicker-widget td.active:hover.disabled,.bootstrap-datetimepicker-widget td.active[disabled],.bootstrap-datetimepicker-widget td.active:hover[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.bootstrap-datetimepicker-widget td.active:active,.bootstrap-datetimepicker-widget td.active:hover:active,.bootstrap-datetimepicker-widget td.active.active,.bootstrap-datetimepicker-widget td.active:hover.active{background-color:#039 \9}.bootstrap-datetimepicker-widget td.disabled,.bootstrap-datetimepicker-widget td.disabled:hover{background:0;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget td span{display:block;width:47px;height:54px;line-height:54px;float:left;margin:2px;cursor:pointer;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.bootstrap-datetimepicker-widget td span:hover{background:#eee}.bootstrap-datetimepicker-widget td span.active{color:#fff;background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color:#04c;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.bootstrap-datetimepicker-widget td span.active:hover,.bootstrap-datetimepicker-widget td span.active:active,.bootstrap-datetimepicker-widget td span.active.active,.bootstrap-datetimepicker-widget td span.active.disabled,.bootstrap-datetimepicker-widget td span.active[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.bootstrap-datetimepicker-widget td span.active:active,.bootstrap-datetimepicker-widget td span.active.active{background-color:#039 \9}.bootstrap-datetimepicker-widget td span.old{color:#999}.bootstrap-datetimepicker-widget td span.disabled,.bootstrap-datetimepicker-widget td span.disabled:hover{background:0;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget th.switch{width:145px}.bootstrap-datetimepicker-widget th.next,.bootstrap-datetimepicker-widget th.prev{font-size:21px}.bootstrap-datetimepicker-widget th.disabled,.bootstrap-datetimepicker-widget th.disabled:hover{background:0;color:#999;cursor:not-allowed}.bootstrap-datetimepicker-widget thead tr:first-child th{cursor:pointer}.bootstrap-datetimepicker-widget thead tr:first-child th:hover{background:#eee}.input-append.date .add-on i,.input-prepend.date .add-on i{display:block;cursor:pointer;width:16px;height:16px}.bootstrap-datetimepicker-widget.left-oriented:before{left:auto;right:6px}.bootstrap-datetimepicker-widget.left-oriented:after{left:auto;right:7px}
\ No newline at end of file
public/resource/js/main.js
View file @ a68f61ad
......@@ -11,7 +11,8 @@ require.config ({
'doT': 'lib/js/doT',
'ckfinder': 'lib/Ckfinder/ckfinder',
'ckfinderStart': 'lib/js/ckfinderStart',
'bootstrapJs': 'lib/js/bootstrap.min'
'bootstrapJs': 'lib/js/bootstrap.min',
'datetimepicker': 'lib/js/bootstrap-datetimepicker.min'
},
'shim': {
'jquery': {
......@@ -28,6 +29,9 @@ require.config ({
},
'bootstrapJs': {
'exports': 'bootstrapJs'
},
'datetimepicker': {
'exports': 'datetimepicker'
}
},
'map': {
......@@ -39,4 +43,4 @@ require.config ({
}
});
require (['require', 'jquery', 'doT', 'app/public', 'css!style/bootstrap.css','css!style/public.css']);
require (['require', 'jquery', 'doT', 'app/public']);
public/resource/js/user.js
View file @ a68f61ad
define (['doT', 'text!temp/user_templete_tpl.html','ckfinder','ckfinderStart', 'css!style/user.css'], function (doT, template) {
define (['doT', 'text!temp/user_templete_tpl.html','ckfinder','ckfinderStart', 'css!style/user.css',"datetimepicker"], function (doT, template) {
var user = {
urls: '',
init: function () {
......@@ -6,7 +6,13 @@ define (['doT', 'text!temp/user_templete_tpl.html','ckfinder','ckfinderStart', '
$ ("body").append (template);
user.getList ();
user.event ();
$('#datetimepicker').datetimepicker({
format: 'yyyy-MM-dd',
language: 'zh-CN',
pickTime: false
}).on('changeDate',function(){
$(this).datetimepicker('hide');
});
},
event: function () {
$ (".Bannertu").click (function () {
......
public/resource/lib/js/bootstrap-datetimepicker.min.js 0 → 100644
View file @ a68f61ad
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