Commit 9734ab07 by shz

tospur

parent f65f4c8f
......@@ -132,9 +132,9 @@ class consultantScoreList extends WP_List_Table
//$data = $this->example_data;
$sql = "SELECT s.id,c.display_name as consultant,u.user_login as user,s.score,s.valid FROM tospur_consultant_score s " .
"left join wp_users u on s.user_id = u.ID " .
"left join wp_users c on s.consultant_id = c.ID";
$sql = "SELECT s.id,c.name as consultant,u.user_login as user,s.score,s.valid FROM tospur_consultant_score s" .
" left join wp_users u on s.user_id = u.ID" .
" left join tospur_consultant c on s.consultant_id = c.id";
$result = $wpdb->get_results($sql);
$data = array();
foreach ($result as $key => $value) {
......
......@@ -88,7 +88,7 @@ class customer extends Tospur_House
$current_user = wp_get_current_user();
$context['role'] = $current_user->roles[0];
if ($context['role'] == 'author') {
if ($context['role'] == 'zygw') {
$context['consultant_id'] = $current_user->ID;
}
$context['city'] = SearchDao::searchCity();
......
<?php
$house_id = $_GET['id'];
$house_sql = 'SELECT v.id, h.name, u.user_login as phone, v.date, v.time, v.consultant_id as consultant_id, v.handle, v.handle_date FROM tospur_view_house v '
global $wpdb;
$id = $_GET['id'];
$role_flag = current_user_can('zygw');
if (isset($_POST['submit']) && !$role_flag) {
$consultant_id = $_POST['data']['recConsultant'][0];
if (isset($consultant_id) && $consultant_id != null && isset($id)) {
$result = TospurDao::update_view_house_consultant($id, $consultant_id);
} else {
echo '<script>alert("请选择置业顾问")</script>';
}
} else if (isset($_POST['handle']) && $role_flag) {
$wpdb->update('tospur_view_house',
array(
'handle' => 1,
'handle_date' => current_time('Y-m-d H:i:s'),
),
array('id' => $id)
);
}
$house_sql = 'SELECT v.id,h.name,h.city_id as cityId,u.user_login as phone,v.date,v.time,v.consultant_id as consultant_id,v.handle,v.handle_date,c.imageUrl,c.name as consultant_name FROM tospur_view_house v '
. 'left join tospur_house h on v.house_id = h.id '
. 'left join wp_users u on v.user_id = u.id '
. 'where v.id = ' . $house_id;
$consultant_sql = 'SELECT u.id,u.display_name FROM wp_users u '
. 'left join wp_usermeta m on u.id=m.user_id where meta_key="wp_user_level" and meta_value=7;';
global $wpdb;
. 'left join tospur_consultant c on v.consultant_id = c.id '
. 'where v.id = ' . $id;
$context['house_result'] = $wpdb->get_row($house_sql);
$context['consultant_result'] = $wpdb->get_results($consultant_sql);
$context['role_flag'] = $role_flag;
$context['city'] = SearchDao::searchCity();
$result = $wpdb->get_row($house_sql);
$context['url'] = home_url();
$context['id'] = $house_id;
if ($result->consultant_id && !$role_flag) {
$context['consultant'][0] = array(
'id' => $result->consultant_id,
'imageUrl' => $result->imageUrl,
'name' => $result->consultant_name
);
}
$context['cityId'] = $result->cityId;
$context['page'] = 'view';
$context['house_result'] = $result;
Timber::render('handle.html', $context);
......
......@@ -92,18 +92,21 @@ class viewHouseList extends WP_List_Table
$this->_column_headers = array($columns, $hidden);
$sql = 'SELECT v.id, h.name, u.user_login as phone, v.date, v.time, c.display_name as consultant, v.handle, v.handle_date FROM tospur_view_house v '
$sql = 'SELECT v.id, h.name, u.user_login as phone, v.date, v.time, c.name as consultant, v.handle, v.handle_date FROM tospur_view_house v '
. 'left join tospur_house h on v.house_id = h.id '
. 'left join wp_users u on v.user_id = u.id '
. 'left join wp_users c on v.consultant_id = c.id '
. 'order by handle';
. 'left join tospur_consultant c on v.consultant_id = c.id';
if (current_user_can('zygw')) {
$sql .= " where c.id = " . get_current_user_id();
}
$sql .= ' order by handle';
$result = $wpdb->get_results($sql);
$data = array();
foreach ($result as $key => $value) {
$data[$key] = array(
'id' => $value->id,
'name' => $value->name,
'date' => $value->date.' '.$value->time,
'date' => $value->date . ' ' . $value->time,
'phone' => $value->phone,
'consultant' => $value->consultant,
'handle' => $value->handle,
......
......@@ -46,7 +46,7 @@
row.append(left).append(mid).append(right);
var p = $("<p>").append(row).append(recommendConsultant);
$("#consultantImg").append(p);
{% if (house_type == 1 or house_type == 2 or page == 'customer') %}
{% if (house_type == 1 or house_type == 2 or page == 'customer' or page == 'view') %}
controlCommand("consultantImg",1,1);
{% endif %}
}
......
......@@ -22,7 +22,7 @@
<li role="presentation">
<a href="#customer_tracking" aria-controls="customer_tracking" role="tab" data-toggle="tab">房源跟进</a>
</li>
{% if role == 'administrator' or role == 'editor' %}
{% if role != 'zygw' %}
<li role="presentation">
<a href="#addConsultant" aria-controls="addConsultant" role="tab" data-toggle="tab">置业顾问</a>
</li>
......@@ -40,12 +40,12 @@
{% include 'save_customer_tracking.html' %}
{{ macro.customer_tracking_list(houseId, 2) }}
</div>
{% if role == 'administrator' or role == 'editor' %}
{% if role == 'zygw' %}
<input type="hidden" name="data[recConsultant][]" value="{{ consultant_id }}">
{% else %}
<div role="tabpanel" class="tab-pane" id="addConsultant">
{% include 'addConsultant.html' %}
</div>
{% elseif role == 'author' %}
<input type="hidden" name="consultant_id" value="{{ consultant_id }}">
{% endif %}
</div>
{% if houseId %}
......@@ -55,7 +55,7 @@
</div>
<div class="col-md-1">
<input type="submit" id="submit" class="button action" style="position: fixed;">
{% if role == 'administrator' or role == 'editor' %}
{% if role != 'zygw' %}
<div class="row" style="position: fixed;top:50px;">
<select id="status" name="status">
{% for item in status %}
......
<div class="wrap">
<h2>客户列表</h2>
<form method="get">
<form method="get" id="search_form">
<input type="hidden" name="page" value="customerList">
<div id="search_form">
<div>
<input type="hidden" name="hasSearch" value="1"/>
{% include 'selectOrganization.html' %}
<label for="status" class="hidden"></label>
<select name="status" id="status">
<option value="-1">状态</option>
{% for item in status %}
<option {{ item.id == status_id ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% set customer_status_array = function('SearchDao::searchStatusType', 5) %}
{% for item in customer_status_array %}
<option {{ item.id == req.status ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %}
</select>
<label for="customer_type" class="hidden"></label>
<select name="customer_type" id="customer_type">
<option value="-1">客户类型</option>
{% for item in customer_type %}
<option {{ item.id == customer_type_id ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% set customer_type_array = function('SearchDao::searchStatusType', 6) %}
{% for item in customer_type_array %}
<option {{ item.id == req.customer_type ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %}
</select>
<label for="demand_type" class="hidden"></label>
......@@ -29,74 +32,80 @@
<select id="listCity" name="listCity">
<option value="-1"> 城市</option>
{% for item in city %}
<option {{ item.id == cityId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
<option {{ item.id == req.listCity ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %}
</select>
<label for="listDistrict" class="hidden"></label>
<select id="listDistrict" name="listDistrict">
<option value="-1">区域</option>
{% set district = function('SearchDao::searchCity', req.listCity) %}
{% if district %}
{% for item in district %}
<option {{ item.id == districtId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
<option {{ item.id == req.listDistrict ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %}
{% endif %}
</select>
<label for="listPlate" class="hidden"></label>
<select id="listPlate" name="listPlate">
<option value="-1">板块</option>
{% set plate = function('SearchDao::searchCity', req.listCity, req.listDistrict) %}
{% if plate %}
{% for item in plate %}
<option {{ item.id == plateId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
<option {{ item.id == req.listPlate ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %}
{% endif %}
</select>
<label for="totalPrice" class="hidden"></label>
<select id="totalPrice" name="totalPrice" class="hidden">
<option value="">总价</option>
<option value="-1">总价</option>
{% set dicTotalPrice = function('SearchDao::searchTotalPrice', req.listCity) %}
{% if dicTotalPrice %}
{% for item in dicTotalPrice %}
<option {{ item.value == totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
<option {{ item.value == req.totalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
{% endfor %}
{% endif %}
</select>
<label for="rentalPrice" class="hidden"></label>
<select id="rentalPrice" name="rentalPrice" class="hidden">
<option value ="">月租</option>
<option value ="-1">月租</option>
{% set dicRentalPrice = function('SearchDao::searchRentalPrice', req.listCity) %}
{% if dicRentalPrice %}
{% for item in dicRentalPrice %}
<option {{ item.value == rentalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
<option {{ item.value == req.rentalPrice ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
{% endfor %}
{% endif %}
</select>
<label for="buildProperty" class="hidden"></label>
<select id="buildProperty" name="buildProperty">
<option value="-1">房型</option>
{% for item in buildProperty %}
<option {{ item.id == buildPropertyId ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% set buildProperty_array = function('SearchDao::searchBuildProperty') %}
{% for item in buildProperty_array %}
<option {{ item.id == req.buildProperty ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %}
</select>
<label for="acreage" class="hidden"></label>
<select id="acreage" name="acreage">
<option value="">面积</option>
{% if acreage %}
<option value="-1">面积</option>
{% set dicArea = function('SearchDao::searchArea', req.listCity) %}
{% if dicArea %}
{% for item in dicArea %}
<option {{ item.value == acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
<option {{ item.value == req.acreage ?"selected":"" }} value="{{ item.value }}">{{ item.value }}</option>
{% endfor %}
{% endif %}
</select>
</div>
<div style="margin-top: 10px;">
<input type="text" placeholder="请输入姓名" name="search_name" value="{{ search_name }}">
<input type="text" placeholder="请输入置业顾问" name="search_consultant_name" value="{{ search_consultant_name }}">
<input type="text" placeholder="请输入电话" name="search_phone" value="{{ search_phone }}">
<input type="text" placeholder="请输入姓名" name="search_name" value="{{ req.search_name }}">
<input type="text" placeholder="请输入置业顾问" name="search_consultant_name" value="{{ req.search_consultant_name }}">
<input type="text" placeholder="请输入电话" name="search_phone" value="{{ req.search_phone }}">
</div>
<div style="margin-top: 10px;">
<span>日期</span>
<label>日期:</label>
<label for="search_min_time" class="hidden"></label>
<input type="date" name="search_min_time" id="search_min_time" value="{{ search_min_time }}">
<input type="date" name="search_min_time" id="search_min_time" value="{{ req.search_min_time }}">
<label for="search_max_time" class="hidden"></label>
<input type="date" name="search_max_time" id="search_max_time" value="{{ search_max_time }}">
<input type="date" name="search_max_time" id="search_max_time" value="{{ req.search_max_time }}">
<input type="submit" id="submit" class="button action" value="搜索">
</div>
</form>
......@@ -110,7 +119,7 @@
<script>
$(document).ready(function () {
var demand_type_select = $('#demand_type');
demand_type_select.val('{{ demand_type }}');
demand_type_select.val('{{ req.demand_type|default(-1) }}');
search_form_set_page();
var acreage = $("#acreage");
......@@ -157,5 +166,16 @@
}
allot_consultant('customerlist');
$('form').submit(function () {
var organization = getOrganization();
var select = $('select[data-depth]:not(.hidden)');
if (select.length > 1 && organization == -1) {
alert('请选择门店');
return false;
} else {
$(this).append('<input type="hidden" name="organization" value="' + organization + '">');
}
});
});
</script>
\ No newline at end of file
<div class="wrap">
<h2>签约-房客跟进</h2>
<form method="get">
<form method="get" id="search_form">
<input type="hidden" name="page" value="customerTrackingList">
<div id="search_form">
<div>
{% include 'selectOrganization.html' %}
<label for="status_type" class="hidden"></label>
<select name="status_type" id="status_type">
<option value="-1">跟进类型</option>
{% for item in status %}
<option
{{ item.id == status_type ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{{ item.id == (req.status_type) ?"selected":"" }} value="{{ item.id }}">{{ item.value }}</option>
{% endfor %}
</select>
<label for="search_consultant_name" class="hidden"></label>
<input type="text" placeholder="请输入置业顾问" name="search_consultant_name" id="search_consultant_name"
value="{{ search_consultant_name }}">
<span>日期</span>
value="{{ req.search_consultant_name }}">
<label>日期:</label>
<label for="search_min_time" class="hidden"></label>
<input type="date" name="search_min_time" id="search_min_time" value="{{ search_min_time }}">
<input type="date" name="search_min_time" id="search_min_time" value="{{ req.search_min_time }}">
<label for="search_max_time" class="hidden"></label>
<input type="date" name="search_max_time" id="search_max_time" value="{{ search_max_time }}">
<input type="date" name="search_max_time" id="search_max_time" value="{{ req.search_max_time }}">
<input type="submit" id="submit" class="button action" value="搜索">
</div>
</form>
<form method="post">
{{ function("addCustomerTrackingTable") }}
</form>
</div>
<script>
$(document).ready(function () {
search_form_set_page();
$('form').submit(function () {
var organization = getOrganization();
var select = $('select[data-depth]:not(.hidden)');
if (select.length > 1 && organization == -1) {
alert('请选择门店');
return false;
} else {
$(this).append('<input type="hidden" name="organization" value="' + organization + '">');
}
});
});
</script>
\ No newline at end of file
<!DOCTYPE html>
<html>
<head lang="en">
<meta charset="UTF-8">
<title></title>
<style></style>
<script>
(function ($) {
$(document).ready(function () {
$('#handle').click(function () {
var consultant_id = $('#consultant option:selected').val();
$.ajax({
type: 'POST',
url: '{{ url }}/wp-admin/admin-ajax.php/',
data: 'action=update_consultant&id={{ id }}&consultant_id=' + consultant_id,
success: function (data) {
if (data.code == 2000) {
alert('提交处理成功');
} else {
alert('提交处理失败');
}
}
});
});
});
})(jQuery);
</script>
</head>
<body>
<div>
<ul>
<li>楼盘名/房源名:{{ house_result.name }}</li>
<li>用户:{{ house_result.phone }}</li>
<li>预约时间:{{ house_result.date }} {{ house_result.time }}</li>
</ul>
</div>
<label for="consultant"></label>
<select id="consultant">
{% for consultant in consultant_result %}
<option value="{{ consultant.id }}"
{% if(house_result.consultant_id==consultant.id) %}selected="selected"{% endif %}>{{ consultant.display_name }}</option>
{% endfor %}
</select>
<button id="handle">提交处理</button>
</body>
</html>
\ No newline at end of file
<style>
.handle ul {
margin-top: 30px;
}
.handle ul li {
margin: 20px 0;
}
.handle ul li span:nth-of-type(1) {
font-weight: bold;
font-size: 14px;
display: inline-block;
width: 120px;
}
.handle ul li span:nth-of-type(2) {
font-size: 14px;
display: inline-block;
width: 400px;
}
</style>
<form method="post">
<div class="handle">
<ul>
<li>
<span>楼盘名/房源名:</span>
<span>{{ house_result.name }}</span>
</li>
<li>
<span>用户:</span>
<span>{{ house_result.phone }}</span>
</li>
<li>
<span>预约时间:</span>
<span>{{ house_result.date }} {{ house_result.time }}</span>
</li>
</ul>
{% if role_flag %}
<input type="hidden" name="handle" value="1">
{% else %}
{% include 'addConsultant.html' %}
<input type="hidden" id="baseCity" value="{{ cityId }}">
<input type="hidden" name="submit" value="1">
{% include 'recConsultant.html' %}
{{ block('recConsultant') }}
{% endif %}
<input type="submit" id="handle" class="button action" value="提交处理">
</div>
</form>
\ No newline at end of file
......@@ -200,7 +200,7 @@
function search_form_set_page(){
var search_flag = false;
var search_form = $('#search_form');
var search_form = $('#search_form');
$('form').submit(function () {
var search_select = search_form.find('select');
var search_input = search_form.find('input[type=text],input[type=date]');
......
......@@ -17,16 +17,6 @@
width: 400px;
}
</style>
<script>
(function ($) {
$(document).ready(function () {
$('#handle').click(function () {
var consultant_id = $('#consultant').find('option:selected').val();
alert(consultant_id);
});
});
})(jQuery);
</script>
{% if house_type == 1 %}
{% set unit = '万元' %}
{% set price = '售价' %}
......
{% if function('current_user_can', 'zygw') %}
<style>
.customer_tracking h2 {
margin-bottom: 30px;
......@@ -39,4 +40,5 @@
<label for="description"></label>
</span>
</p>
</div>
\ No newline at end of file
</div>
{% endif %}
\ No newline at end of file
......@@ -6,32 +6,34 @@ class CustomerTrackingDao
{
public static function insert($house_id, $request)
{
$page = $request['page'];
$origin = 0;
switch ($page) {
case 'newHouse':
case 'secHandHouse':
case 'rentHouse':
$origin = 1;
break;
case 'customer':
$origin = 2;
break;
}
global $wpdb;
$array = array(
'house_id' => $house_id,
'status_type' => $request['customer_tracking_status'],
'consultant_id' => wp_get_current_user()->ID,
'time' => current_time('Y-m-d H:i:s'),
'description' => $request['description'],
'origin' => $origin
);
$result = $wpdb->insert(Config::TOSPUR_CUSTOMER_TRACKING_TABLE, $array);
if ($result) {
return $wpdb->insert_id;
} else {
return '新增客户跟踪失败';
if(current_user_can('zygw')){
$page = $request['page'];
$origin = 0;
switch ($page) {
case 'newHouse':
case 'secHandHouse':
case 'rentHouse':
$origin = 1;
break;
case 'customer':
$origin = 2;
break;
}
global $wpdb;
$array = array(
'house_id' => $house_id,
'status_type' => $request['customer_tracking_status'],
'consultant_id' => wp_get_current_user()->ID,
'time' => current_time('Y-m-d H:i:s'),
'description' => $request['description'],
'origin' => $origin
);
$result = $wpdb->insert(Config::TOSPUR_CUSTOMER_TRACKING_TABLE, $array);
if ($result) {
return $wpdb->insert_id;
} else {
return '新增客户跟踪失败';
}
}
}
......
......@@ -379,7 +379,9 @@ class SearchDao
$mainImage = $wpdb->get_results($wpdb->prepare($mainImagesSql,$hid));
foreach($mainImage as $key => $value){
$value->path = Image::getImage($value->path,'big');
$path = $value->path;
$value->path = Image::getImage($path,'big');
$value->smallPath = Image::getImage($path,'small');
}
$context['mainImage'] = $mainImage;
......@@ -424,11 +426,12 @@ class SearchDao
}
$images = $wpdb->get_results($wpdb->prepare($imagesSql,$hid,$hid));
foreach($images as $key => $value){
$value->path = Image::getImage($value->path,'big');
$path = $value->path;
$value->path = Image::getImage($path,'big');
$context['normalImages'][]->path = Image::getImage($path,'normal');
}
$context['images'] = $images;
return $context;
}
......
......@@ -93,7 +93,7 @@ class TospurDao
{
global $wpdb;
$sql = 'select c.id, c.cityId, c.mobile, c.imageUrl, c.name as display_name, c.introduction, s.average_score from ' . Config::TOSPUR_CONSULTANT . ' c ' .
'left join (select consultant_id,sum(score)/count(score) as average_score from ' . Config::TOSPUR_CONSULTANT_SCORE_TABLE . ' group by consultant_id) s ' .
'left join (select consultant_id,sum(score)/count(score) as average_score from ' . Config::TOSPUR_CONSULTANT_SCORE_TABLE . ' where valid = 1 group by consultant_id) s ' .
'on c.id = s.consultant_id where c.id = ' . $consultant_id;
return $wpdb->get_row($sql);
}
......
......@@ -43,11 +43,22 @@
});
},false);
var sliderTap = false;
$("#slider").bind("tap",function(){
$("#carouselModal").modal('show');
var carousel = $("#carousel_wrapper");
var carouselWidth = carousel.width();
if (!sliderTap) {
$.each(JSON.parse('{{ images|json_encode() }}'), function (index, item) {
carousel.find('#carousel_scroller ul').append('<li><p><span>' +
'<img src="{{ siteUrl }}' + item.path + '">' +
'</span></p></li>');
$('#carousel_indicator').append('<li/>');
});
}
carousel.find("#carousel_scroller ul li").css({"width":carouselWidth});
carousel.find("#carousel_indicator li").removeClass("carousel_active");
carousel.find("#carousel_indicator li:first").addClass("carousel_active");
......@@ -64,6 +75,7 @@
$("#carousel_indicator li").removeClass("carousel_active");
$("#carousel_indicator li").eq(this.currentPage.pageX).addClass("carousel_active");
});
sliderTap = true;
return false;
});
$("#carouselModal,#photoModal").bind("click",function(){
......@@ -114,7 +126,7 @@
<div class="addWrap">
<div id="slider" class="swipe">
<div class="swipe-wrap">
{% for item in images %}
{% for item in normalImages %}
<div>
<img src="{{siteUrl}}{{item.path}}">
</div>
......@@ -122,7 +134,7 @@
</div>
</div>
<ul id="indicator" class="list-inline text-center">
{% for i in 1..images|length %}
{% for i in 1..normalImages|length %}
<li {% if loop.index0 == 0 %}class="active"{% endif %}></li>
{% endfor %}
</ul>
......@@ -158,7 +170,7 @@
<ul class="list-inline text-nowrap">
{% for item in mainImage %}
<li data-image-url="{{siteUrl}}{{ item.path }}">
<p><img src="{{siteUrl}}{{ item.path }}"></p>
<p><img src="{{siteUrl}}{{ item.smallPath }}"></p>
<p>{{item.type}}</p>
<p>{{item.area}}m<em>2</em></p>
</li>
......@@ -308,19 +320,9 @@
<div id="carousel_wrapper">
<div id="carousel_scroller">
<ul class="list-inline text-nowrap">
{% for item in images %}
<li>
<p>
<span><img src="{{siteUrl}}{{item.path}}"></span>
</p>
</li>
{% endfor %}
</ul>
</div>
<ul id="carousel_indicator" class="list-inline text-center indicators">
{% for i in 1..images|length %}
<li></li>
{% endfor %}
</ul>
</div>
</div>
......
......@@ -42,10 +42,21 @@
});
},false);
var sliderTap = false;
$("#slider").bind("tap",function(){
$("#carouselModal").modal("show");
var carousel = $("#carousel_wrapper");
var carouselWidth = carousel.width();
if (!sliderTap) {
$.each(JSON.parse('{{ images|json_encode() }}'), function (index, item) {
carousel.find('#carousel_scroller ul').append('<li><p><span>' +
'<img src="{{ siteUrl }}' + item.path + '">' +
'</span></p></li>');
$('#carousel_indicator').append('<li/>');
});
}
carousel.find("#carousel_scroller ul li").css({"width":carouselWidth});
carousel.find("#carousel_indicator li").removeClass("carousel_active");
carousel.find("#carousel_indicator li:first").addClass("carousel_active");
......@@ -113,7 +124,7 @@
<div class="addWrap">
<div id="slider" class="swipe">
<div class="swipe-wrap">
{% for item in images %}
{% for item in normalImages %}
<div>
<img src="{{siteUrl}}{{item.path}}">
</div>
......@@ -121,7 +132,7 @@
</div>
</div>
<ul id="indicator" class="list-inline text-center">
{% for i in 1..images|length %}
{% for i in 1..normalImages|length %}
<li {% if loop.index0 == 0 %}class="active"{% endif %}></li>
{% endfor %}
</ul>
......@@ -294,19 +305,9 @@
<div id="carousel_wrapper">
<div id="carousel_scroller">
<ul class="list-inline text-nowrap">
{% for item in images %}
<li>
<p>
<span><img src="{{siteUrl}}{{item.path}}"></span>
</p>
</li>
{% endfor %}
</ul>
</div>
<ul id="carousel_indicator" class="list-inline text-center indicators">
{% for i in 1..images|length %}
<li></li>
{% endfor %}
</ul>
</div>
</div>
......
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