Browse Source

init websize

1557492053 1 year ago
parent
commit
265caf0314
40 changed files with 1277 additions and 97 deletions
  1. 10 5
      application/api/model/service/Service.php
  2. 14 13
      application/api/service/OrderService.php
  3. 1 2
      application/index/controller/Index.php
  4. 237 77
      application/index/view/index/index.html
  5. 84 0
      application/index/view/index/index_2.html
  6. 258 0
      public/assets/websize/css/index.css
  7. BIN
      public/assets/websize/img/__UNI__D48D872_0420105913.ipa
  8. BIN
      public/assets/websize/img/a.jpg
  9. BIN
      public/assets/websize/img/aa.jpeg
  10. BIN
      public/assets/websize/img/ad.png
  11. BIN
      public/assets/websize/img/adTwo.png
  12. 1 0
      public/assets/websize/img/add.svg
  13. BIN
      public/assets/websize/img/ae.jfif
  14. BIN
      public/assets/websize/img/au.jpg
  15. BIN
      public/assets/websize/img/aw.webp
  16. BIN
      public/assets/websize/img/b.jpg
  17. BIN
      public/assets/websize/img/c.jpg
  18. BIN
      public/assets/websize/img/d.jpg
  19. BIN
      public/assets/websize/img/e.jpg
  20. BIN
      public/assets/websize/img/f.jpg
  21. BIN
      public/assets/websize/img/fa4.jpg
  22. BIN
      public/assets/websize/img/log.jpg
  23. BIN
      public/assets/websize/img/logoTwo.png
  24. BIN
      public/assets/websize/img/lun.jpg
  25. BIN
      public/assets/websize/img/nj.jpeg
  26. 1 0
      public/assets/websize/img/right.svg
  27. BIN
      public/assets/websize/img/wa.jpeg
  28. BIN
      public/assets/websize/img/wb.png
  29. BIN
      public/assets/websize/img/wc.png
  30. BIN
      public/assets/websize/img/wd.webp
  31. BIN
      public/assets/websize/img/we.jpg
  32. BIN
      public/assets/websize/img/wf.png
  33. BIN
      public/assets/websize/img/you1.png
  34. BIN
      public/assets/websize/img/you2.png
  35. BIN
      public/assets/websize/img/yy.jpg
  36. BIN
      public/assets/websize/img/zuo1.png
  37. BIN
      public/assets/websize/img/zuo2.png
  38. 14 0
      public/assets/websize/js/jquery.SuperSlide.2.1.3.js
  39. 503 0
      public/assets/websize/js/jquery.SuperSlide.2.1.3.source.js
  40. 154 0
      public/assets/websize/js/jquery1.42.min.js

+ 10 - 5
application/api/model/service/Service.php

@@ -3,24 +3,29 @@
 namespace app\api\model\service;
 
 use app\api\model\BaseModel;
-use redis\RedisClient;
 
 class Service extends BaseModel
 {
     // 表名
     protected $name = 'service';
 
-    public function fetchServices($type, $params, $page = 1, $size = 10, $user = null)
+    /**
+     * @param $type
+     * @param $params
+     * @param $page
+     * @param $size
+     * @return \think\Paginator
+     * @throws \think\exception\DbException
+     */
+    public function fetchServices($type, $params, $page = 1, $size = 10)
     {
         $where = [
             'type' => $type,
             'status' => \E_BASE_STATUS::Normal,
         ];
-
-        if(isset($params['p_code']) && $params['p_code'] > 0) {
+        if (isset($params['p_code']) && $params['p_code'] > 0) {
             $where['p_code'] = $params['p_code'];
         }
-
         if (isset($params['category_id']) && $params['category_id'] > 0)
             $where['category_id'] = $params['category_id'];
         if (isset($params['hot']) && $params['hot'])

+ 14 - 13
application/api/service/OrderService.php

@@ -152,14 +152,15 @@ class OrderService extends BaseService
      * @param $user
      * @param array $option_service_ids
      * @param array $option_services
-     * @param int|null $m_id
-     * @param int|null $store_id
-     * @param  $is_app
-     * @param $open_membership
+     * @param $m_id
+     * @param $store_id
+     * @param bool $is_app
      * @return \SResult
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function create($user, array $option_service_ids, array $option_services, $m_id = null, $store_id = null, $is_app = true): \SResult
+    public function create($user, array $option_service_ids, array $option_services, $m_id = null, $store_id = null, bool $is_app = true): \SResult
     {
         $city_code = null;
         if ($is_app) { // 线上订单
@@ -375,7 +376,7 @@ class OrderService extends BaseService
             $db_service = [];
             foreach ($services as $service) {
                 $quantity = $option_services[$service['id']]['quantity'];
-                array_push($db_service, [
+                $db_service[] = [
                     "order_id" => $order_id,
                     "store_id" => $order["store_id"],
                     "service_id" => $service['id'],
@@ -387,7 +388,7 @@ class OrderService extends BaseService
                     "status" => \E_BASE_STATUS::Normal,
                     "createtime" => time(),
                     "updatetime" => time(),
-                ]);
+                ];
             }
             $total_service_amount = array_reduce($db_service, function ($p, $cur) {
                 $p += ($cur["amount"] * $cur["quantity"]);
@@ -443,14 +444,14 @@ class OrderService extends BaseService
      * 修改订单选项
      * @param $user_id
      * @param $order_id
-     * @param null $description
-     * @param null $trip_type
-     * @param null $service_start_date
-     * @param null $balance_deduction
+     * @param $description
+     * @param $trip_type
+     * @param $service_start_date
+     * @param $balance_deduction
      * @return \SResult
      * @throws \think\exception\DbException
      */
-    public function modifyOrder($user_id, $order_id, $description = null, $trip_type = null, $service_start_date = null, $balance_deduction = null)
+    public function modifyOrder($user_id, $order_id, $description = null, $trip_type = null, $service_start_date = null, $balance_deduction = null): \SResult
     {
         $order = $this->model->get($order_id);
         if (!$order)
@@ -487,7 +488,7 @@ class OrderService extends BaseService
      * @return \SResult
      * @throws \think\exception\DbException
      */
-    public function updateOrderOpenMembership($user_id, $order_id, $open_membership)
+    public function updateOrderOpenMembership($user_id, $order_id, $open_membership): \SResult
     {
         $order = $this->model->get($order_id);
         if (!$order)

+ 1 - 2
application/index/controller/Index.php

@@ -14,8 +14,7 @@ class Index extends Frontend
 
     public function index()
     {
-        echo phpinfo();
-//        return $this->view->fetch();
+        return $this->view->fetch();
     }
 
 

File diff suppressed because it is too large
+ 237 - 77
application/index/view/index/index.html


File diff suppressed because it is too large
+ 84 - 0
application/index/view/index/index_2.html


+ 258 - 0
public/assets/websize/css/index.css

@@ -0,0 +1,258 @@
+html{color:#000;background:#fff; }
+body { color:#666;font-size:12px; overflow-x:hidden;} /*网站字体颜色*/
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}
+table{border-collapse:collapse;border-spacing:0;}
+fieldset,img{border:0;}
+address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}
+del,ins{text-decoration:none;}
+li{list-style: none;}
+caption,th{text-align:left;}
+q:before,q:after{content:'';}
+abbr,acronym{border:0;font-variant:normal;}
+sup{vertical-align:baseline;}
+sub{vertical-align:baseline;} 
+input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}
+input,button,textarea,select{*font-size:100%;}
+input,select{vertical-align:middle;}
+select,input,button,textarea,button{font:99% arial,helvetica,clean,sans-serif;}
+table{font-size:inherit;font:100%; border-collapse:collapse;}
+pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}
+/*title*/
+h1 { font-size:32px;}
+h2 { font-size:24px; color:#000;}
+h3 { font-size:20px; color: #fff; text-align: center; margin-bottom: 50px; font-size: 36px;}
+h4 { font-size:14px;}
+h5 { font-size:12px; font-weight:500;}
+h6 { font-size:10px;}
+ /*for ie f6n.net*/
+a{ text-decoration:none;}
+a:focus{outline:0;} /*for ff f6n.net*/
+a:hover { text-decoration:none;}
+p{ word-spacing:-1.5px;}
+h2 a:hover{ text-decoration: none;}
+textarea{ resize:none;}
+em{ font-style: normal;}
+		
+.title_top{
+	position: fixed;
+	left: 0;
+	top: 0;
+	background: #f8fffa;
+	width: 100%;
+	height: 70px;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	min-width: 1440px;
+	z-index: 999;
+}
+
+.title_navigation{
+	width: 1000px;
+	display: flex;
+	justify-content: space-between;
+}
+
+.title_navigation div{
+	font-size: 16px;
+}
+
+.title_navigation div a{
+	color: #000;
+}
+
+.ad{
+	position: relative;
+	height: 600px;
+}
+
+.back{
+	width: 100%;
+	background: #1bb188;
+	display: flex;
+	justify-content: center;
+	min-width: 1440px;
+	overflow: hidden;
+}
+
+.back_nei{
+	padding-top: 50px;
+}
+
+.back_nei_item{
+	width: 1440px;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	flex-wrap: wrap;
+}
+
+.back_nei_item div{
+	width: 30%;
+	height: 250px;
+	background: #fff;
+	border-radius: 20px;
+	margin-bottom: 50px;
+	overflow: hidden;
+	position: relative;
+}
+
+.back_nei_item_text{
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	padding: 20px;
+	color: #fff;
+	font-size: 18px;
+	background: rgba(0, 0, 0, 0.6);
+}
+
+.back_nei_item div img{
+	width: 100%;
+	height: auto;
+}
+
+.recruit{
+	display: flex;
+	align-items: center;
+}
+
+.recruit_text{
+	margin-top: 20px;
+	border-radius: 15px;
+	background-color: #fdf7f7;
+	display: flex;
+	flex-wrap: wrap;
+	box-sizing: border-box;
+	padding: 30px 300px 0px 40px;
+}
+
+.recruit_text div{
+	width: 30%;
+	color: #13a08b;
+	font-size: 22px;
+	padding-bottom: 30px;
+}
+
+.my{
+	width: 100%;
+	background: #b1b1b1;
+	margin-top: 100px;
+	padding: 20px 50px;
+	box-sizing: border-box;
+}
+
+.my_text{
+	display: flex;
+	justify-content: space-between;
+}
+.my_text div{
+	flex: 1;
+	color: #fff;
+}
+.edit_shop{
+	width: 80%;
+	margin: 0 auto;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	color: #fff;
+	font-size: 22px;
+	margin-left: 180px;
+}
+.edit_shop_item{
+	width: 400px;
+	height: 60px;
+	font-size: 15px;
+	background: #fff;
+	color: #13a08b;
+	margin-bottom: 15px;
+	padding: 5px;
+	box-sizing: border-box;
+	border-radius: 5px;
+	cursor: default;
+}
+.edit_shop_item:hover{
+	width: 400px;
+	height: 60px;
+	font-size: 15px;
+	background: #fff;
+	color: #13a08b;
+	margin-bottom: 15px;
+	padding: 5px;
+	box-sizing: border-box;
+	border-radius: 5px;
+	box-shadow: 0px 0px 10px #555;
+}
+.edit_shop_item span{
+	font-size: 18px;
+	font-weight: 600;
+}
+
+.edit_shop_left{
+	/* height: 300px; */
+}
+
+.edit_shop_right{
+	/* height: 300px; */
+}
+
+.edit_shop_center img{
+	width: 250px;
+}
+
+.join_top{
+	
+}
+
+.join_flowPath{
+	display: flex;
+	justify-content: space-between;
+	flex-wrap: wrap;
+}
+
+.join_flowPath_div{
+	width: 25%;
+	display: flex;
+	justify-content: space-between;
+	font-size: 16px;
+	margin-bottom: 50px;
+}
+
+.join_flowPath_div span{
+	font-weight: 600;
+	font-size: 25px;
+	width: 100%;
+	display: block;
+}
+.join_flowPath_div img{
+	width: 64px !important;
+	margin: 0 20px;
+}
+
+.an{ width:100%;}
+.an-nei{ width:1200px; margin: 0 auto; text-align:center;box-sizing:border-box;}
+.biao-an{font-weight:500; font-size:36px;color:#000;}
+.biao-an p{ letter-spacing:4px; font-size:16px;color:#666666;}
+
+
+		.picScroll-left{ position:relative; margin-top:48px;}
+		.picScroll-left .hd .prev,.picScroll-left .hd .next{ display:block; width:50px; height:50px; float:right; margin-right:5px; margin-top:10px;
+			 cursor:pointer;}
+		.picScroll-left .prev,
+		.picScroll-left .next{ position:absolute; right:-8%; top:45%; display:block; filter:alpha(opacity=50);opacity:0.5;}
+		.picScroll-left .next{ left:auto; left:-8%; background-position:8px 5px; }
+		.picScroll-left .bd ul li{ width:385px; _display:inline; text-align:center; margin-right:23px; position: relative;}
+		.picScroll-left a{ display:block; text-decoration:none;}
+		.picScroll-left .bd ul li .pic{ text-align:center; height: 250px; overflow: hidden;}
+		.picScroll-left .bd ul li .pic img{ width: auto; height:100%;display:block;}
+		.picScroll-left .bd ul li .title{
+			width: 100%;
+			position: absolute;
+			bottom: 0;
+			background: rgba(0, 0, 0, 0.6);
+		}
+		.picScroll-left .bd ul li .title h4{ font-size:20px; color:#fff; text-align:center; overflow:hidden; margin-bottom:10px;}
+		.picScroll-left .bd ul li .title a{ padding:20px; font-size:14px; color:#fff; text-align:left; line-height:24px; display:block; }
+		.picScroll-left .bd ul li .title span{ color:#ec7f18; display:block; margin-top:10px;}

BIN
public/assets/websize/img/__UNI__D48D872_0420105913.ipa


BIN
public/assets/websize/img/a.jpg


BIN
public/assets/websize/img/aa.jpeg


BIN
public/assets/websize/img/ad.png


BIN
public/assets/websize/img/adTwo.png


File diff suppressed because it is too large
+ 1 - 0
public/assets/websize/img/add.svg


BIN
public/assets/websize/img/ae.jfif


BIN
public/assets/websize/img/au.jpg


BIN
public/assets/websize/img/aw.webp


BIN
public/assets/websize/img/b.jpg


BIN
public/assets/websize/img/c.jpg


BIN
public/assets/websize/img/d.jpg


BIN
public/assets/websize/img/e.jpg


BIN
public/assets/websize/img/f.jpg


BIN
public/assets/websize/img/fa4.jpg


BIN
public/assets/websize/img/log.jpg


BIN
public/assets/websize/img/logoTwo.png


BIN
public/assets/websize/img/lun.jpg


BIN
public/assets/websize/img/nj.jpeg


+ 1 - 0
public/assets/websize/img/right.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681981981300" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6751" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><path d="M583.19 322.7l0-142.153 334.226 333.657-334.226 333.654 0-142.148-419.922 0 0-383.009z" fill="#ffffff" p-id="6752"></path></svg>

BIN
public/assets/websize/img/wa.jpeg


BIN
public/assets/websize/img/wb.png


BIN
public/assets/websize/img/wc.png


BIN
public/assets/websize/img/wd.webp


BIN
public/assets/websize/img/we.jpg


BIN
public/assets/websize/img/wf.png


BIN
public/assets/websize/img/you1.png


BIN
public/assets/websize/img/you2.png


BIN
public/assets/websize/img/yy.jpg


BIN
public/assets/websize/img/zuo1.png


BIN
public/assets/websize/img/zuo2.png


File diff suppressed because it is too large
+ 14 - 0
public/assets/websize/js/jquery.SuperSlide.2.1.3.js


+ 503 - 0
public/assets/websize/js/jquery.SuperSlide.2.1.3.source.js

@@ -0,0 +1,503 @@
+/*!
+ * SuperSlide v2.1.3
+ * 轻松解决网站大部分特效展示问题
+ * 详尽信息请看官网:http://www.SuperSlide2.com/
+ *
+ * Copyright 2011-至今, 大话主席
+ *
+ * 请尊重原创,保留头部版权
+ * 在保留版权的前提下可应用于个人或商业用途
+
+ * v2.1.3:处理Jquery已经弃用的API,兼容最新版本的Jquery,目前是jquery3.3.1,日后如果发现插件不兼容新版本的jquery,请联系我 305491515@qq.com
+
+ */
+
+(function($){
+	$.fn.slide=function(options){
+		$.fn.slide.defaults={
+		type:"slide", 
+		effect:"fade", 
+		autoPlay:false, 
+		delayTime:500, 
+		interTime:2500,
+		triggerTime:150,
+		defaultIndex:0,
+		titCell:".hd li",
+		mainCell:".bd",
+		targetCell:null,
+		trigger:"mouseover",
+		scroll:1,
+		vis:1,
+		titOnClassName:"on",
+		autoPage:false, 
+		prevCell:".prev",
+		nextCell:".next",
+		pageStateCell:".pageState",
+		opp: false, 
+		pnLoop:true, 
+		easing:"swing", 
+		startFun:null,
+		endFun:null,
+		switchLoad:null,
+
+		playStateCell:".playState",
+		mouseOverStop:true,
+		defaultPlay:true,
+		returnDefault:false 
+		};
+
+		return this.each(function() {
+
+			var opts = $.extend({},$.fn.slide.defaults,options);
+			var slider = $(this);
+			var effect = opts.effect;
+			var prevBtn = $(opts.prevCell, slider);
+			var nextBtn = $(opts.nextCell, slider);
+			var pageState = $(opts.pageStateCell, slider);
+			var playState = $(opts.playStateCell, slider);
+
+			var navObj = $(opts.titCell, slider);//导航子元素结合
+			var navObjSize = navObj.length;
+			var conBox = $(opts.mainCell , slider);//内容元素父层对象
+			var conBoxSize=conBox.children().length;
+			var sLoad=opts.switchLoad;
+			var tarObj = $(opts.targetCell, slider);
+
+			/*字符串转换*/
+			var index=parseInt(opts.defaultIndex);
+			var delayTime=parseInt(opts.delayTime);
+			var interTime=parseInt(opts.interTime);
+			var triggerTime=parseInt(opts.triggerTime);
+			var scroll=parseInt(opts.scroll);
+			var autoPlay = (opts.autoPlay=="false"||opts.autoPlay==false)?false:true;
+			var opp = (opts.opp=="false"||opts.opp==false)?false:true;
+			var autoPage = (opts.autoPage=="false"||opts.autoPage==false)?false:true;
+			var pnLoop = (opts.pnLoop=="false"||opts.pnLoop==false)?false:true;
+			var mouseOverStop = (opts.mouseOverStop=="false"||opts.mouseOverStop==false)?false:true;
+			var defaultPlay = (opts.defaultPlay=="false"||opts.defaultPlay==false)?false:true;
+			var returnDefault = (opts.returnDefault=="false"||opts.returnDefault==false)?false:true;
+			var vis=isNaN(opts.vis)?1:parseInt(opts.vis);
+	
+			var isIE6 = !-[1,]&&!window.XMLHttpRequest;//v2.1.2
+
+			var slideH=0;
+			var slideW=0;
+			var selfW=0;
+			var selfH=0;
+			var easing=opts.easing;
+			var inter=null;//autoPlay-setInterval 
+			var mst =null;//trigger-setTimeout
+			var rtnST=null;//returnDefault-setTimeout
+			var titOn = opts.titOnClassName;
+
+			var onIndex = navObj.index( slider.find( "."+titOn) );
+			var oldIndex = index = onIndex==-1?index:onIndex;
+			var defaultIndex = index;
+
+
+			var _ind = index;
+			var cloneNum = conBoxSize>=vis?( conBoxSize%scroll!=0?conBoxSize%scroll:scroll):0; 
+			var _tar;
+			var isMarq = effect=="leftMarquee" || effect=="topMarquee"?true:false;
+
+			var doStartFun=function(){ if ( $.isFunction( opts.startFun) ){ opts.startFun( index,navObjSize,slider,$(opts.titCell, slider),conBox,tarObj,prevBtn,nextBtn ) } }
+			var doEndFun=function(){ if ( $.isFunction( opts.endFun ) ){ opts.endFun( index,navObjSize,slider,$(opts.titCell, slider),conBox,tarObj,prevBtn,nextBtn ) } }
+			var resetOn=function(){ navObj.removeClass(titOn); if( defaultPlay ) navObj.eq(defaultIndex).addClass(titOn)  }
+
+
+
+			//单独处理菜单效果
+			if( opts.type=="menu" ){
+
+				if( defaultPlay ){ navObj.removeClass(titOn).eq(index).addClass(titOn); }
+				navObj.hover(
+						function(){
+							_tar=$(this).find( opts.targetCell );
+							var hoverInd =navObj.index($(this));
+						
+							mst = setTimeout(function(){  
+								index=hoverInd;
+								navObj.removeClass(titOn).eq	(index).addClass(titOn);
+								doStartFun();
+								switch (effect)
+								{
+									case "fade":_tar.stop(true,true).animate({opacity:"show"}, delayTime,easing,doEndFun ); break;
+									case "slideDown":_tar.stop(true,true).animate({height:"show"}, delayTime,easing,doEndFun ); break;
+								}
+							} ,opts.triggerTime);
+
+						},function(){
+							clearTimeout(mst);
+							switch (effect){ case "fade":_tar.animate( {opacity:"hide"},delayTime,easing ); break; case "slideDown":_tar.animate( {height:"hide"},delayTime,easing ); break; }
+						}
+				);
+
+				if (returnDefault){ 
+					slider.hover(function(){clearTimeout(rtnST);},function(){ rtnST = setTimeout( resetOn,delayTime ); });
+				}
+				
+
+				return;
+			}
+
+			
+			//处理分页
+			if( navObjSize==0 )navObjSize=conBoxSize;//只有左右按钮
+			if( isMarq ) navObjSize=2;
+			if( autoPage ){
+				if(conBoxSize>=vis){
+					if( effect=="leftLoop" || effect=="topLoop" ){ navObjSize=conBoxSize%scroll!=0?(conBoxSize/scroll^0)+1:conBoxSize/scroll; }
+					else{ 
+							var tempS = conBoxSize-vis;
+							navObjSize=1+parseInt(tempS%scroll!=0?(tempS/scroll+1):(tempS/scroll)); 
+							if(navObjSize<=0)navObjSize=1; 
+					}
+				}
+				else{ navObjSize=1 }
+				
+				navObj.html(""); 
+				var str="";
+
+				if( opts.autoPage==true || opts.autoPage=="true" ){ for( var i=0; i<navObjSize; i++ ){ str+="<li>"+(i+1)+"</li>" } }
+				else{ for( var i=0; i<navObjSize; i++ ){ str+=opts.autoPage.replace("$",(i+1))  } }
+				navObj.html(str); 
+				
+				var navObj = navObj.children();//重置导航子元素对象
+			}
+
+
+			if(conBoxSize>=vis){ //当内容个数少于可视个数,不执行效果。
+				conBox.children().each(function(){ //取最大值
+					if( $(this).width()>selfW ){ selfW=$(this).width(); slideW=$(this).outerWidth(true);  }
+					if( $(this).height()>selfH ){ selfH=$(this).height(); slideH=$(this).outerHeight(true);  }
+				});
+
+				var _chr = conBox.children();
+				var cloneEle = function(){ 
+					for( var i=0; i<vis ; i++ ){ _chr.eq(i).clone().addClass("clone").appendTo(conBox); } 
+					for( var i=0; i<cloneNum ; i++ ){ _chr.eq(conBoxSize-i-1).clone().addClass("clone").prependTo(conBox); }
+				}
+				
+				switch(effect)
+				{
+					case "fold": conBox.css({"position":"relative","width":slideW,"height":slideH}).children().css( {"position":"absolute","width":selfW,"left":0,"top":0,"display":"none"} ); break;
+					case "top": conBox.wrap('<div class="tempWrap" style="overflow:hidden; position:relative; height:'+vis*slideH+'px"></div>').css( { "top":-(index*scroll)*slideH, "position":"relative","padding":"0","margin":"0"}).children().css( {"height":selfH} ); break;
+					case "left": conBox.wrap('<div class="tempWrap" style="overflow:hidden; position:relative; width:'+vis*slideW+'px"></div>').css( { "width":conBoxSize*slideW,"left":-(index*scroll)*slideW,"position":"relative","overflow":"hidden","padding":"0","margin":"0"}).children().css( {"float":"left","width":selfW} ); break;
+					case "leftLoop":
+					case "leftMarquee":
+						cloneEle();
+						conBox.wrap('<div class="tempWrap" style="overflow:hidden; position:relative; width:'+vis*slideW+'px"></div>').css( { "width":(conBoxSize+vis+cloneNum)*slideW,"position":"relative","overflow":"hidden","padding":"0","margin":"0","left":-(cloneNum+index*scroll)*slideW}).children().css( {"float":"left","width":selfW}  ); break;
+					case "topLoop":
+					case "topMarquee":
+						cloneEle();
+						conBox.wrap('<div class="tempWrap" style="overflow:hidden; position:relative; height:'+vis*slideH+'px"></div>').css( { "height":(conBoxSize+vis+cloneNum)*slideH,"position":"relative","padding":"0","margin":"0","top":-(cloneNum+index*scroll)*slideH}).children().css( {"height":selfH} ); break;
+				}
+			}
+
+
+
+			//针对leftLoop、topLoop的滚动个数
+			var scrollNum=function(ind){ 
+				var _tempCs= ind*scroll; 
+				if( ind==navObjSize ){ _tempCs=conBoxSize; }else if( ind==-1 && conBoxSize%scroll!=0){ _tempCs=-conBoxSize%scroll; }
+				return _tempCs;
+			}
+
+			//切换加载
+			var doSwitchLoad=function(objs){ 
+
+					var changeImg=function(t){
+						for ( var i= t; i<( vis+ t); i++ ){
+								objs.eq(i).find("img["+sLoad+"]").each(function(){ 
+									var _this =  $(this);
+									_this.attr("src",_this.attr(sLoad)).removeAttr(sLoad);
+									if( conBox.find(".clone")[0] ){ //如果存在.clone
+										var chir = conBox.children();
+										for ( var j=0 ; j< chir.length ; j++ )
+										{
+											chir.eq(j).find("img["+sLoad+"]").each(function(){
+												if( $(this).attr(sLoad)==_this.attr("src") ) $(this).attr("src",$(this).attr(sLoad)).removeAttr(sLoad) 
+											})
+										}
+									}
+								})
+							}
+					}
+
+					switch(effect)
+					{
+						case "fade": case "fold": case "top": case "left": case "slideDown":
+							changeImg( index*scroll );
+							break;
+						case "leftLoop": case "topLoop":
+							changeImg( cloneNum+scrollNum(_ind) );
+							break;
+						case "leftMarquee":case "topMarquee": 
+							var curS = effect=="leftMarquee"? conBox.css("left").replace("px",""):conBox.css("top").replace("px",""); 
+							var slideT = effect=="leftMarquee"? slideW:slideH; 
+							var mNum=cloneNum;
+							if( curS%slideT!=0 ){
+								var curP = Math.abs(curS/slideT^0);
+								if( index==1 ){ mNum=cloneNum+curP }else{  mNum=cloneNum+curP-1  }
+							}
+							changeImg( mNum );
+							break;
+					}
+			}//doSwitchLoad end
+
+
+			//效果函数
+			var doPlay=function(init){
+				 // 当前页状态不触发效果
+				if( defaultPlay && oldIndex==index && !init && !isMarq ) return;
+				
+				//处理页码
+				if( isMarq ){ if ( index>= 1) { index=1; } else if( index<=0) { index = 0; } }
+				else{ 
+					_ind=index; if ( index >= navObjSize) { index = 0; } else if( index < 0) { index = navObjSize-1; }
+				}
+
+				doStartFun();
+
+				//处理切换加载
+				if( sLoad!=null ){ doSwitchLoad( conBox.children() ) }
+
+				//处理targetCell
+				if(tarObj[0]){ 
+					_tar = tarObj.eq(index);
+					if( sLoad!=null ){ doSwitchLoad( tarObj ) }
+					if( effect=="slideDown" ){
+							tarObj.not(_tar).stop(true,true).slideUp(delayTime); 
+							_tar.slideDown( delayTime,easing,function(){ if(!conBox[0]) doEndFun() }); 
+					}
+					else{
+							tarObj.not(_tar).stop(true,true).hide();
+							_tar.animate({opacity:"show"},delayTime,function(){ if(!conBox[0]) doEndFun() }); 
+					}
+				}
+				
+				if(conBoxSize>=vis){ //当内容个数少于可视个数,不执行效果。
+					switch (effect)
+					{
+						case "fade":conBox.children().stop(true,true).eq(index).animate({opacity:"show"},delayTime,easing,function(){doEndFun()}).siblings().hide(); break;
+						case "fold":conBox.children().stop(true,true).eq(index).animate({opacity:"show"},delayTime,easing,function(){doEndFun()}).siblings().animate({opacity:"hide"},delayTime,easing);break;
+						case "top":conBox.stop(true,false).animate({"top":-index*scroll*slideH},delayTime,easing,function(){doEndFun()});break;
+						case "left":conBox.stop(true,false).animate({"left":-index*scroll*slideW},delayTime,easing,function(){doEndFun()});break;
+						case "leftLoop":
+							var __ind = _ind;
+							conBox.stop(true,true).animate({"left":-(scrollNum(_ind)+cloneNum)*slideW},delayTime,easing,function(){
+								if( __ind<=-1 ){ conBox.css("left",-(cloneNum+(navObjSize-1)*scroll)*slideW);  }else if( __ind>=navObjSize ){ conBox.css("left",-cloneNum*slideW); }
+								doEndFun();
+							});
+							break;//leftLoop end
+
+						case "topLoop":
+							var __ind = _ind;
+							conBox.stop(true,true).animate({"top":-(scrollNum(_ind)+cloneNum)*slideH},delayTime,easing,function(){
+								if( __ind<=-1 ){ conBox.css("top",-(cloneNum+(navObjSize-1)*scroll)*slideH);  }else if( __ind>=navObjSize ){ conBox.css("top",-cloneNum*slideH); }
+								doEndFun();
+							});
+							break;//topLoop end
+
+						case "leftMarquee":
+							var tempLeft = conBox.css("left").replace("px",""); 
+							if(index==0 ){
+									conBox.animate({"left":++tempLeft},0,function(){
+										if( conBox.css("left").replace("px","")>= 0){ conBox.css("left",-conBoxSize*slideW) }
+									});
+							}
+							else{
+									conBox.animate({"left":--tempLeft},0,function(){
+										if(  conBox.css("left").replace("px","")<= -(conBoxSize+cloneNum)*slideW){ conBox.css("left",-cloneNum*slideW) }
+									});
+							}break;// leftMarquee end
+
+							case "topMarquee":
+							var tempTop = conBox.css("top").replace("px",""); 
+							if(index==0 ){
+									conBox.animate({"top":++tempTop},0,function(){
+										if( conBox.css("top").replace("px","")>= 0){ conBox.css("top",-conBoxSize*slideH) }
+									});
+							}
+							else{
+									conBox.animate({"top":--tempTop},0,function(){
+										if(  conBox.css("top").replace("px","")<= -(conBoxSize+cloneNum)*slideH){ conBox.css("top",-cloneNum*slideH) }
+									});
+							}break;// topMarquee end
+
+					}//switch end
+				}
+
+					navObj.removeClass(titOn).eq(index).addClass(titOn);
+					oldIndex=index;
+					if( !pnLoop ){ //pnLoop控制前后按钮是否继续循环
+						nextBtn.removeClass("nextStop"); prevBtn.removeClass("prevStop");
+						if (index==0 ){ prevBtn.addClass("prevStop"); }
+						if (index==navObjSize-1 ){ nextBtn.addClass("nextStop"); }
+					}
+
+					pageState.html( "<span>"+(index+1)+"</span>/"+navObjSize);
+
+			};// doPlay end
+
+			//初始化执行
+			if( defaultPlay ){ doPlay(true); }
+
+			if (returnDefault)//返回默认状态
+			{
+				slider.hover(function(){ clearTimeout(rtnST) },function(){
+						rtnST = setTimeout( function(){
+							index=defaultIndex;
+							if(defaultPlay){ doPlay(); }
+							else{
+								if( effect=="slideDown" ){ _tar.slideUp( delayTime, resetOn ); }
+								else{ _tar.animate({opacity:"hide"},delayTime,resetOn ); }
+							}
+							oldIndex=index;
+						},300 );
+				});
+			}
+			
+			///自动播放函数
+			var setInter = function(time){ inter=setInterval(function(){  opp?index--:index++; doPlay() }, !!time?time:interTime);  }
+			var setMarInter = function(time){ inter = setInterval(doPlay, !!time?time:interTime);  }
+			// 处理mouseOverStop
+			var resetInter = function(){ if( !mouseOverStop && autoPlay &&  !playState.hasClass("pauseState") ){clearInterval(inter); setInter() } } /* 修复 mouseOverStop 和 autoPlay均为false下,点击切换按钮后会自动播放bug */
+			// 前后按钮触发
+			var nextTrigger = function(){ if ( pnLoop || index!=navObjSize-1 ){ index++; doPlay(); if(!isMarq)resetInter(); } }
+			var prevTrigger = function(){ if ( pnLoop || index!=0 ){ index--; doPlay(); if(!isMarq)resetInter(); } }
+			//处理playState
+			var playStateFun = function(){ clearInterval(inter); isMarq?setMarInter():setInter(); playState.removeClass("pauseState") }
+			var pauseStateFun = function(){ clearInterval(inter);playState.addClass("pauseState"); }
+
+			//自动播放
+			if (autoPlay) {
+					if( isMarq ){ 
+						opp?index--:index++; setMarInter();
+						if(mouseOverStop) conBox.hover(pauseStateFun,playStateFun);
+					}else{
+						setInter();
+						if(mouseOverStop) slider.hover( pauseStateFun,playStateFun );
+					}
+			}
+			else{ if( isMarq ){ opp?index--:index++; } playState.addClass("pauseState"); }
+
+
+			//暂停按钮
+			playState.click(function(){  playState.hasClass("pauseState")?playStateFun():pauseStateFun()  });
+
+			//titCell事件
+			if(opts.trigger=="mouseover"){
+				navObj.hover(function(){ var hoverInd = navObj.index(this);  mst = setTimeout(function(){  index=hoverInd; doPlay(); resetInter();  },opts.triggerTime); }, function(){ clearTimeout(mst) });
+			}else{ navObj.click(function(){ index=navObj.index(this); doPlay(); resetInter(); })  }
+
+			//前后按钮事件
+			if (isMarq){
+				
+				nextBtn.mousedown(nextTrigger);
+				prevBtn.mousedown(prevTrigger);
+				//前后按钮长按10倍加速
+				if (pnLoop)
+				{	
+					var st;
+					var marDown = function(){ st=setTimeout(function(){ clearInterval(inter); setMarInter( interTime/10^0 ) },150) }
+					var marUp = function(){ clearTimeout(st); clearInterval(inter); setMarInter() }
+					nextBtn.mousedown(marDown); nextBtn.mouseup(marUp);
+					prevBtn.mousedown(marDown); prevBtn.mouseup(marUp);
+				}
+				//前后按钮mouseover事件
+				if( opts.trigger=="mouseover"  ){ nextBtn.hover(nextTrigger,function(){}); prevBtn.hover(prevTrigger,function(){}); }
+			}else{
+				nextBtn.click(nextTrigger);
+				prevBtn.click(prevTrigger);
+			}
+
+
+			//检测设备尺寸变化
+			if ( opts.vis == "auto" && scroll==1  && ( effect=="left" || effect=="leftLoop" )  ){
+
+				var resizeTimer;
+				
+				var orientationChange = function(){ 
+					
+					if (isIE6){
+						conBox.width("auto"); 
+						conBox.children().width("auto");
+					}
+					conBox.parent().width("auto"); 
+					slideW = conBox.parent().width();
+
+					if (isIE6){  conBox.parent().width(slideW) }
+
+					conBox.children().width(slideW);
+
+					if ( effect=="left" ){
+						conBox.width( slideW * conBoxSize);
+						conBox.stop(true,false).animate({"left":-index*slideW},0);
+					}else{
+						conBox.width( slideW * (conBoxSize+2));
+						conBox.stop(true,false).animate({"left":-(index+1)*slideW},0);
+					}
+
+					if (!isIE6 && (slideW != conBox.parent().width()) ){
+						orientationChange();
+					}
+					
+				} 
+
+				$(window).resize(function(){
+
+					clearTimeout(resizeTimer);
+					resizeTimer = setTimeout(orientationChange, 100);
+				
+				});
+				orientationChange();
+			}
+
+
+    	});//each End
+
+	};//slide End
+
+})(jQuery);
+
+jQuery.easing['jswing'] = jQuery.easing['swing'];
+jQuery.extend( jQuery.easing,
+{
+	def: 'easeOutQuad',
+	swing: function (x, t, b, c, d) { return jQuery.easing[jQuery.easing.def](x, t, b, c, d); },
+	easeInQuad: function (x, t, b, c, d) {return c*(t/=d)*t + b;},
+	easeOutQuad: function (x, t, b, c, d) {return -c *(t/=d)*(t-2) + b},
+	easeInOutQuad: function (x, t, b, c, d) {if ((t/=d/2) < 1) return c/2*t*t + b;return -c/2 * ((--t)*(t-2) - 1) + b},
+	easeInCubic: function (x, t, b, c, d) {return c*(t/=d)*t*t + b},
+	easeOutCubic: function (x, t, b, c, d) {return c*((t=t/d-1)*t*t + 1) + b},
+	easeInOutCubic: function (x, t, b, c, d) {if ((t/=d/2) < 1) return c/2*t*t*t + b;return c/2*((t-=2)*t*t + 2) + b},
+	easeInQuart: function (x, t, b, c, d) {return c*(t/=d)*t*t*t + b},
+	easeOutQuart: function (x, t, b, c, d) {return -c * ((t=t/d-1)*t*t*t - 1) + b},
+	easeInOutQuart: function (x, t, b, c, d) {if ((t/=d/2) < 1) return c/2*t*t*t*t + b;return -c/2 * ((t-=2)*t*t*t - 2) + b},
+	easeInQuint: function (x, t, b, c, d) {return c*(t/=d)*t*t*t*t + b},
+	easeOutQuint: function (x, t, b, c, d) {return c*((t=t/d-1)*t*t*t*t + 1) + b},
+	easeInOutQuint: function (x, t, b, c, d) {if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;return c/2*((t-=2)*t*t*t*t + 2) + b},
+	easeInSine: function (x, t, b, c, d) {return -c * Math.cos(t/d * (Math.PI/2)) + c + b},
+	easeOutSine: function (x, t, b, c, d) {return c * Math.sin(t/d * (Math.PI/2)) + b},
+	easeInOutSine: function (x, t, b, c, d) {return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b},
+	easeInExpo: function (x, t, b, c, d) {return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b},
+	easeOutExpo: function (x, t, b, c, d) {return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b},
+	easeInOutExpo: function (x, t, b, c, d) {if (t==0) return b;if (t==d) return b+c;if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;return c/2 * (-Math.pow(2, -10 * --t) + 2) + b},
+	easeInCirc: function (x, t, b, c, d) {return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b},
+	easeOutCirc: function (x, t, b, c, d) {return c * Math.sqrt(1 - (t=t/d-1)*t) + b},
+	easeInOutCirc: function (x, t, b, c, d) {if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b},
+	easeInElastic: function (x, t, b, c, d) {var s=1.70158;var p=0;var a=c;if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b},
+	easeOutElastic: function (x, t, b, c, d) {var s=1.70158;var p=0;var a=c;if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b},
+	easeInOutElastic: function (x, t, b, c, d) {var s=1.70158;var p=0;var a=c;if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b},
+	easeInBack: function (x, t, b, c, d, s) {if (s == undefined) s = 1.70158;return c*(t/=d)*t*((s+1)*t - s) + b},
+	easeOutBack: function (x, t, b, c, d, s) {if (s == undefined) s = 1.70158;return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b},
+	easeInOutBack: function (x, t, b, c, d, s) {if (s == undefined) s = 1.70158; 
+		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b},
+	easeInBounce: function (x, t, b, c, d) {return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b},
+	easeOutBounce: function (x, t, b, c, d) {if ((t/=d) < (1/2.75)) {	return c*(7.5625*t*t) + b;} else if (t < (2/2.75)) {	return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;} else if (t < (2.5/2.75)) {	return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;} else {	return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;}},
+	easeInOutBounce: function (x, t, b, c, d) {if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;}
+});

File diff suppressed because it is too large
+ 154 - 0
public/assets/websize/js/jquery1.42.min.js