Sfoglia il codice sorgente

修改个人中心无法访问

e 8 anni fa
parent
commit
0b0f348121

File diff suppressed because it is too large
+ 0 - 16
www/protected/modules/o2o/views/web/index.php


+ 158 - 34
www/webapp/o2o/css/home.css

@@ -1,68 +1,158 @@
 .content{
     background-color: #fff;
 }
-
-/*banner图*/
-.swiper-container {
-    width: 100%;
-    /*height: 100%;*/
+.spa-page-home {
+    /*��ͼ*/
+    /*��Ʒ�б�*/
+    /*������*/
+    /*������*/
 }
 
-.swiper-slide {
-    text-align: center;
-    font-size: 18px;
-    background: #fff;
-
-    /* Center slide text vertically */
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-box-pack: center;
-    -ms-flex-pack: center;
-    -webkit-justify-content: center;
-    justify-content: center;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    -webkit-align-items: center;
-    align-items: center;
+.spa-page-home .main-service-box .the-main-figure {
+    background-position: center;
+    /*/!*background-position: center;*/
+    /*margin-top: -6%;*/
+    overflow: hidden;
 }
 
-.swiper-slide img {
+.spa-page-home .main-service-box .the-main-figure img {
     width: 100%;
+    /*width: 100%;*/
+    margin: -4% 0 -6% 0;
 }
 
-.swiper-pagination-bullet-active {
-    background-color: #516663 !important;
-}
-/*产品展示*/
 .spa-page-home .global-msg {
     font-size: 15px;
+    /*display: block;*/
     font-weight: 500;
+    /*margin-top: 25px;*/
     height: 65px;
+    /*line-height: 50px;*/
     color: #999999;
-    font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';
+    font-family: '΢���ź�', 'Microsoft YaHei', 'STHeiti Light';
     text-align: center;
+    /*float: left;*/
 }
+
 .spa-page-home .global-msg-active {
     border-bottom: 5px solid #b89400;
     color: #b89400;
 }
+
+.spa-page-home .extra-service-box .extra-service:nth-child(1) {
+    border-top: 1px solid #999999;
+}
+
+.spa-page-home .extra-service-box .extra-service:nth-child(2) {
+    margin-bottom: 15%;
+}
+
+.spa-page-home .extra-service-box .extra-service-item {
+    padding: 50%;
+    position: relative;
+    text-align: center;
+    /*�ճ����-logo*/
+    /*������-logo*/
+    /*����ɱ��-logo*/
+    /*����-logo*/
+    /*����a��ǩ�µ�������ʽ*/
+}
+
+.spa-page-home .extra-service-box .extra-service-item a {
+    position: absolute;
+    left: 20px;
+    right: 20px;
+    top: 10px;
+    bottom: 0;
+}
+
+.spa-page-home .extra-service-box .extra-service-item a:active {
+    transform: scale(0.95);
+    -webkit-transform: scale(0.95);
+}
+
+.spa-page-home .extra-service-box .extra-service-item .extra-service-name {
+    left: 0;
+    right: 0;
+    bottom: 40px;
+    font-size: 15px;
+    font-weight: 500;
+    position: absolute;
+    color: #999999;
+}
+
 .spa-page-home .products-list {
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
 }
 
-/*商品展示*/
-/*.products-list li{
-    float: left;
-}*/
+.spa-page-home .extra-service-box .extra-service-item .logo {
+    background-size: 50% 50%;
+    background-position: center center;
+    padding: 50%;
+    display: inline-block;
+}
+
+.spa-page-home .extra-service-box .extra-service-item .logo-richang {
+    background: url("http://odulvej8l.bkt.clouddn.com/Home_btn_clean%20%281%29.png");
+    background-repeat: no-repeat;
+    background-size: 50% 50%;
+    background-position: center center;
+}
+
+.spa-page-home .extra-service-box .extra-service-item .logo-shendu {
+    background: url("http://odulvej8l.bkt.clouddn.com/Home_btn_clean%20%282%29.png");
+    background-repeat: no-repeat;
+    background-size: 50% 50%;
+    background-position: center center;
+}
+
+.spa-page-home .extra-service-box .extra-service-item .logo-chumanshajun {
+    background: url("http://odulvej8l.bkt.clouddn.com/Home_btn_clean%20%283%29.png");
+    background-repeat: no-repeat;
+    background-size: 50% 50%;
+    background-position: center center;
+}
+
+.spa-page-home .extra-service-box .extra-service-item .logo-qita {
+    background: url("http://odulvej8l.bkt.clouddn.com/Home_btn_clean%20%284%29.png");
+    background-repeat: no-repeat;
+    background-size: 50% 50%;
+    background-position: center center;
+}
+
+.spa-page-home .extra-service-box .extra-service-item .extra-service {
+    display: block;
+    color: #999999;
+    font-weight: 500;
+    font-size: 18px;
+    text-align: center;
+    font-family: '΢���ź�', 'Microsoft YaHei', 'STHeiti Light';
+}
 
+.spa-page-home .extra-service-box .extra-service-item .extra-service .extra-service-name {
+    width: 100%;
+    height: 100%;
+}
 
+.spa-page-home .extra-service-box .extra-service-item .extra-service:nth-child(1) {
+    background-color: #00a2d4;
+}
 
+.spa-page-home .extra-service-box .extra-service-item .extra-service:nth-child(1) div .extra-service-item {
+    border-bottom: 1px solid #999999;
+}
+
+.spa-page-home .extra-service-box .extra-service-item:nth-child(1) {
+    border-right: 1px solid #999999;
+    border-bottom: 1px solid #999999;
+}
+
+.spa-page-home .h-clearfix-index {
+    margin-bottom: 20px;
+}
 
-/*底部*/
 .spa-page-home .prevent-scroll {
     width: 100%;
     position: fixed;
@@ -154,4 +244,38 @@
 
 .spa-page-home .prevent-scroll .width-percent-33:nth-child(3) a:active .name {
     color: #fff;
+}
+
+/*banner图*/
+.swiper-container {
+    width: 100%;
+    /*height: 100%;*/
+}
+
+.swiper-slide {
+    text-align: center;
+    font-size: 18px;
+    background: #fff;
+
+    /* Center slide text vertically */
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-box-pack: center;
+    -ms-flex-pack: center;
+    -webkit-justify-content: center;
+    justify-content: center;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    -webkit-align-items: center;
+    align-items: center;
+}
+
+.swiper-slide img {
+    width: 100%;
+}
+
+.swiper-pagination-bullet-active {
+    background-color: #516663 !important;
 }

File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/css/main.css


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/main.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/model/product.js


+ 1 - 1
www/webapp/o2o/dist/js/page/home.js

@@ -1 +1 @@
-define(["$","template","IScroll","product","user","native","config","address"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),s.back()}return{title:"壹管家上门服务",body:"",init:function(t,n){var o=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},o),o.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),s.call("4000328170")},o),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));u.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:r.allList[n-1],needReset:!0}})},o),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:""})},o),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),i.checkLogin(function(){u.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},o),n.resolve()},beforeopen:function(e,t){localStorage.removeItem("cart_products"),t.resolve(),s.switchPopGesture(!0)},afteropen:function(s,a){var f=this,l=e(document);if(!s.pushData.dontNeedReload){l.trigger("spa:openloader");var c=t("home/index",{showNavBar:!o.isWX&&!o.isChubao});e(".spa-page-body",f).html(c),setTimeout(function(){s.scroll=new n("#homeScroll",{});var e=new Swiper(".swiper-container",{autoplay:2500,pagination:".swiper-pagination",paginationClickable:!0})},100),r.getListAll(i.id),u.getList({request_from:"weixin",user_id:i.id}),l.trigger("spa:closeloader")}a.resolve(),s.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),s.switchPopGesture(!1)}}});
+define(["$","template","IScroll","product","user","native","config","address"],function(e,t,n,r,i,s,o,u){function a(e){e.preventDefault(),s.back()}return{title:"壹管家上门服务",body:"",init:function(t,n){var o=this,u=e(document);e.newTouch(".back-button",function(e){a.call(this,e)},o),o.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".service-telephone",function(e){e.preventDefault(),s.call("4000328170")},o),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));u.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:r.allList[n-1],needReset:!0}})},o),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),u.trigger("spa:navigate",{hash:""})},o),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),i.checkLogin(function(){u.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},o),n.resolve()},beforeopen:function(e,t){localStorage.removeItem("cart_products"),t.resolve(),s.switchPopGesture(!0)},afteropen:function(s,a){var f=this,l=e(document);if(!s.pushData.dontNeedReload){l.trigger("spa:openloader");var c=t("home/index",{showNavBar:!o.isWX&&!o.isChubao});e(".spa-page-body",f).html(c),setTimeout(function(){s.scroll=new n("#homeScroll");var e=new Swiper(".swiper-container",{autoplay:2500,pagination:".swiper-pagination",paginationClickable:!0})},500),r.getListAll(i.id),u.getList({request_from:"weixin",user_id:i.id}),l.trigger("spa:closeloader")}a.resolve(),s.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve(),s.switchPopGesture(!1)}}});

File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/page/mine.js


File diff suppressed because it is too large
+ 1 - 1
www/webapp/o2o/js/build/template.js


File diff suppressed because it is too large
+ 3 - 11
www/webapp/o2o/js/model/product.js


+ 2 - 11
www/webapp/o2o/js/page/home.js

@@ -30,7 +30,6 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
              * 为什么不是$(selector).onclick(function)呢?
              */
 
-
             //返回
             $.newTouch('.back-button', function (event) {
                 back.call(this, event);
@@ -213,21 +212,13 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 
                 /* 建立IScroll */
                 setTimeout(function () {
-                    pageData.scroll = new IScroll('#homeScroll',{
-                        /*mouseWheel: true,
-                        scrollbars: false,
-                        hideScrollbar: false,
-                        vScrollbar: false*/
-                        //eventPassthrough: true
-                    });
-                    //alert("1");
+                    pageData.scroll = new IScroll('#homeScroll');
                     var swiper = new Swiper('.swiper-container', {
                         autoplay: 2500,
                         pagination: '.swiper-pagination',
                         paginationClickable: true
                     });
-
-                }, 100);
+                }, 500);
 
                 // 目前的作用只是供后端判断,该用户是否为新用户,所以没有回调。
                 product.getListAll(user.id);

+ 0 - 50
www/webapp/o2o/js/page/mine.js

@@ -10,56 +10,6 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address'], func
         });
     }
 
-    $(document).ready(function () {
-        var iNow = 0, index = 1, nStartX = 0;
-        var oBanner = document.getElementById('banner-box');
-        bannerShow();
-        $(window).resize(function () {
-            bannerShow();
-        });
-
-        oBanner.addEventListener('touchstart', function (event) {
-            event.preventDefault();
-            nStartX = event.targetTouches[0].pageX;
-        }, false);
-
-        oBanner.addEventListener('touchend', function (event) {
-            event.preventDefault();
-            var mw = $('.banner-show li').width(); // 获取可视区域宽度
-            var _l = mw + $('.banner-show').position().left % mw, _w = mw / 2, _m = $('.banner-show li').length - 1;
-            console.log(_l);
-            var ml = $('.banner-show').position().left; //这里要重新获取left值
-            if (_l <= _w) { //中点判断
-                ml = ml - _l
-            } else {
-                ml = ml + (mw - _l)
-            }
-            if (ml >= 0) {
-                ml = 0;
-            } else if (ml <= -mw * _m) {
-                ml = -mw * _m;
-            }
-            $('.banner-show').animate({'left': ml}, 200);
-            var _now = parseInt(-ml / mw);
-        }, false);
-
-        oBanner.addEventListener('touchmove', function (event) {
-            event.preventDefault();
-            var touch = event.targetTouches[0];
-            var _l = $('.banner-show').position().left + touch.pageX - nStartX;
-            nStartX = touch.pageX;
-            $('.banner-show').css('left', _l);
-        }, false);
-    });
-    //自适应
-    function bannerShow() {
-        var _w = $(window).width();
-        var _h = _w * 0.5
-        $('.banner-box').height(_h);
-        $('.banner-show').width(_w * 4);
-        $('.banner-show li').width(_w);
-    };
-
     /*
      * 模块结构:5部分。
      * title:题目。

File diff suppressed because it is too large
+ 2 - 1
www/webapp/o2o/tpl/home/index.html


Some files were not shown because too many files changed in this diff