Ver código fonte

Merge branch 'test' of https://git.oschina.net/yiguanjia/php into test

Charlie 8 anos atrás
pai
commit
8c871f7634

+ 2 - 3
www/protected/controllers/ROrderController.php

@@ -223,6 +223,7 @@ class ROrderController extends AdminController{
         // 获取用户信息,修改用户订单统计
         //     2015-11-16
         $user_id = $order->user;
+        $order->_id = $id;
         if (!empty($user_id)) {
             $user = RUser::get($user_id);
         } else {
@@ -345,9 +346,7 @@ class ROrderController extends AdminController{
         $order->technicians = $technicians;
 
        // var_dump($order->technicians);exit;
-        $arr_order = array('cancel_time','refund_time','finish_time','status','booking_time','deal_time','remark', 'station', 'technicians');
-
-
+        $arr_order = array('_id','cancel_time','refund_time','finish_time','status','booking_time','deal_time','remark', 'station', 'technicians');
         $success = $order->save(true,$arr_order);
 
         // 通知保洁师

+ 1 - 0
www/protected/modules/o2o/models/ROrder.php

@@ -351,6 +351,7 @@ class ROrder extends MongoAr
 
             $order = $this->_id;
             $commisionObj = Commision::getByOrder($order);
+            
             // 检查Cmmmision信息是否已录入
             foreach ($this->technicians as $technician_id => $technician) {
 

+ 19 - 0
www/protected/modules/o2o/models/Recharge.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: PHP
+ * Date: 2016/9/26
+ * Time: 11:57
+ * 会员充值模型
+ */
+class Recharge extends MongoAr
+{
+    public $_id;
+    public $Denomination;//充值面额
+    public $time;
+    public $presentation;//赠送方式  1 赠送优惠券  2 返现
+    public $coupon = array();//赠送的优惠券
+    public $cash_back;//返现
+
+
+}

+ 5 - 10
www/protected/views/rOrder/index.php

@@ -238,7 +238,7 @@
                                             </div>
                                             <input name="technician_name" style="width: 250px;" id="setTechnician_content"/>
                                             <input name="technician" type="hidden" id="technician_id" value="0" />
-                                            <input name="tech_nums" type="hidden" id="tech_nums" value="1" />
+
                                             <a class='easyui-linkbutton' plain="true" iconCls="icon-add" onclick="add_extra();return false;">添加保洁师</a><br/>
                                             </div>
                                     </div>
@@ -996,14 +996,14 @@
             $('#admins_edit_info').html('');
             var technicians = data['technicians'];
             var tmp = '';
-            var value = 0;
+
             for (var j in technicians) {
                 tmp +='<div id="extra_add_info_'+technicians[j]['technician_id']+'" style="height:4px">'+technicians[j]['technician_name'];
                 /*tmp += '<a href="" onclick="delete_extra('+technicians[j]['technician_id']+');return false;">删除</a></div><br/>';*/
                 tmp += '<input type="hidden" id="extra_add_info_hidden_'+technicians[j]['technician_id']+'" name="extra_add_info_'+technicians[j]['technician_id']+'" value='+technicians[j]['technician_name']+'/></div><br/>';
-                value += 1;
+
             }
-            $('#tech_nums').val(value);
+
 
             var address_contact = '省:'+data['address']['province']+'<br />'+'市:'+data['address']['city']+'<br />'+'区:'+data['address']['area']+'<br />'+'地址:'+data['address']['poi']['name']+' '+data['address']['detail']+'<br />'+'姓名:'+data['address']['name']+'<br />'+'手机号:'+data['address']['mobile']+'<br />'+'<a href="javascript:void();" lat='+data['address']['position'][1]+' lng='+data['address']['position'][0]+' id="view_position">查看坐标</a>';
             $('#address_contact').html(address_contact);
@@ -1534,10 +1534,7 @@ function add_extra(){
         $output +="<a href ='' onclick='delete_extra("+setTechnician_id+");return false;'>删除</a></div><br/>";
         $output +="<input type='hidden' id='extra_add_info_hidden_"+setTechnician_id+"' name='extra_add_info_"+setTechnician_id+"' value='"+setTechnician_content+"' /></div>";
         $('#setTechnician_content').val('');
-        var nums = $('#tech_nums').val();
 
-        var value = nums+1;
-        $('#tech_nums').val(value);
 
         $("#extra_add_info").append($output);
 
@@ -1560,9 +1557,7 @@ function reset_add_extra(){
         $output +="<a href ='' onclick='reset_delete_extra("+resetTec+");return false;'>删除</a></div><br/>";
         $output +="<input type='hidden' id='reset_extra_add_info_hidden_"+resetTec+"' name='reset_extra_add_info_"+resetTec+"' value='"+resetTecName+"' />";
         $output += "<input type='hidden' id='reset_add' name='reset_add' value='1'>";
-        var nums = $('#tech_nums').val();
-        var value = nums+1;
-        $('#tech_nums').val(value);
+
         $("#reset_extra_add_info").append($output);
         $('#resetTecName').val('');
     }

Diferenças do arquivo suprimidas por serem muito extensas
+ 73 - 68
www/webapp/o2o/css/home.css


+ 1 - 1
www/webapp/o2o/dist/js/$.js

@@ -1 +1 @@
-define(["config","native","zepto"],function(e,t,n){return function(n){function i(e){var s=r.shift();s.data=e.data,n.autoAjax(s),r.length>0&&t.getSign(r[0].data,i)}n.extend(n,{getScript:function(e,t){var n=document.createElement("script");n.async="async",n.src=e,t&&(n.onload=t),document.getElementsByTagName("head")[0].appendChild(n)},autoAjax:function(t){t.no_sign=1;if(location.host=="wozhua.mobi")n.ajax(t);else{t.data.version=e.o2oVersion;var r=t.url;r.indexOf("?")==-1&&(r+="?"),r.charAt(r.length-1)!="?"&&(r+="&"),r+="callback=?",!t.data||(r.charAt(r.length-1)!="?"&&(r+=""),r+="&"+n.param(t.data)),n.ajaxJSONP({url:r,success:t.success?t.success:null,error:t.error?t.error:null})}},signAjax:function(n){if(e.isIOS||e.isAndroid){var s=n.data,o=n.success;n.success=function(e){o(e)},s.time||(s.time=(new Date).getTime()/1e3),r.push(n),r.length==1&&t.getSign(r[0].data,i)}else this.autoAjax(n)},newTouch:function(e,t,r){var i="tap";window.DocumentTouch&&document instanceof DocumentTouch||"ontouchstart"in window||(i="click"),r!==undefined?n(r).on(i,e,function(e){t.call(this,e)}):n(e).on(i,function(e){t.call(this,e)})}});var r=[]}(n),n});
+define(["config","native","zepto"],function(e,t,n){return function(n){function i(e){var s=r.shift();s.data=e.data,n.autoAjax(s),r.length>0&&t.getSign(r[0].data,i)}n.extend(n,{getScript:function(e,t){var n=document.createElement("script");n.async="async",n.src=e,t&&(n.onload=t),document.getElementsByTagName("head")[0].appendChild(n)},autoAjax:function(t){t.no_sign=1;if(location.host=="yiguanjia.me")n.ajax(t);else{t.data.version=e.o2oVersion;var r=t.url;r.indexOf("?")==-1&&(r+="?"),r.charAt(r.length-1)!="?"&&(r+="&"),r+="callback=?",!t.data||(r.charAt(r.length-1)!="?"&&(r+=""),r+="&"+n.param(t.data)),n.ajaxJSONP({url:r,success:t.success?t.success:null,error:t.error?t.error:null})}},signAjax:function(n){if(e.isIOS||e.isAndroid){var s=n.data,o=n.success;n.success=function(e){o(e)},s.time||(s.time=(new Date).getTime()/1e3),r.push(n),r.length==1&&t.getSign(r[0].data,i)}else this.autoAjax(n)},newTouch:function(e,t,r){var i="tap";window.DocumentTouch&&document instanceof DocumentTouch||"ontouchstart"in window||(i="click"),r!==undefined?n(r).on(i,e,function(e){t.call(this,e)}):n(e).on(i,function(e){t.call(this,e)})}});var r=[]}(n),n});

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
www/webapp/o2o/dist/js/config.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
www/webapp/o2o/dist/js/page/home.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
www/webapp/o2o/dist/js/panel/postReview.js


+ 232 - 216
www/webapp/o2o/js/page/home.js

@@ -1,242 +1,258 @@
 define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config'], function ($, template, IScroll, product, user, native, config) {
-  function back(event) {
-    event.preventDefault();
-    native.back();
-  }
-
-  return {
-    title: '壹管家上门服务',
-    body: '',
-    init: function (pageData, dtd) {
-      var $view = this;
-      var $doc = $(document);
-
-      var tpl = template('home/index', {
-        showNavBar: !config.isWX && !config.isChubao
-      });
-
-      $('.spa-page-body', $view).html(tpl);
-
-      setTimeout(function() {
-        pageData.scroll = new IScroll('#homeScroll', {
-          preventDefaultException: { className: /(^|\s)home-content(\s|$)/ }
-        });
-      }, 50);
-      //返回
-      $.newTouch('.back-button', function (event) {
-        back.call(this, event);
-      }, $view);
-
-      $view.on('tapBackButton', function(event) {
-        back.call(this, event);
-      });
-
-      //客服电话
-      $.newTouch('.service-telephone', function (event) {
+    function back(event) {
         event.preventDefault();
+        native.back();
+    }
 
-        native.call('4000328170');
-      }, $view);
+    return {
+        title: '壹管家上门服务',
+        body: '',
+        init: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
 
-      // SPA
-      $.newTouch('.btn-action-spa', function (event) {
-        event.preventDefault();
-        goProductPage(5);
-      }, $view);
+            var tpl = template('home/index', {
+                showNavBar: !config.isWX && !config.isChubao
+            });
 
-      // 美容
-      $.newTouch('.btn-action-groom', function (event) {
-        event.preventDefault();
+            $('.spa-page-body', $view).html(tpl);
 
-        goProductPage(3);
-      }, $view);
+            setTimeout(function () {
+                pageData.scroll = new IScroll('#homeScroll', {
+                    preventDefaultException: {className: /(^|\s)home-content(\s|$)/}
+                });
+            }, 50);
+            //返回
+            $.newTouch('.back-button', function (event) {
+                back.call(this, event);
+            }, $view);
 
-      // 剃毛
-      $.newTouch('.btn-action-shave', function (event) {
-        event.preventDefault();
-        goProductPage(2);
-      }, $view);
+            $view.on('tapBackButton', function (event) {
+                back.call(this, event);
+            });
 
-      // 洗澡
-      $.newTouch('.btn-action-bath', function (event) {
-        event.preventDefault();
-        goProductPage(1);
-      }, $view);
+            //客服电话
+            $.newTouch('.service-telephone', function (event) {
+                event.preventDefault();
 
-      // 洁牙
-      $.newTouch('.btn-action-jieya', function (event) {
-        event.preventDefault();
-        goProductPage(4);
-      }, $view);
+                native.call('4000328170');
+            }, $view);
 
-      // 训犬
-      $.newTouch('.btn-action-xunquan', function (event) {
-        event.preventDefault();
-        goProductPage(6);
-      }, $view);
+            // SPA
+            $.newTouch('.btn-action-spa', function (event) {
+                event.preventDefault();
+                goProductPage(5);
+            }, $view);
 
-      // 断尾
-      $.newTouch('.btn-action-duanwei', function (event) {
-        event.preventDefault();
-        goProductPage(7);
-      }, $view);
+            // 美容
+            $.newTouch('.btn-action-groom', function (event) {
+                event.preventDefault();
 
-      // 碳酸浴
-      $.newTouch('.btn-action-tansuanyun', function (event) {
-        event.preventDefault();
-        goProductPage(8);
-      }, $view);
+                goProductPage(3);
+            }, $view);
 
-      // 驱虫
-      $.newTouch('.btn-action-quchong', function (event) {
-        event.preventDefault();
-        goProductPage(11);
-      }, $view);
+            // 剃毛
+            $.newTouch('.btn-action-shave', function (event) {
+                event.preventDefault();
+                goProductPage(2);
+            }, $view);
 
-      // 药浴
-      $.newTouch('.btn-action-yaoyu', function (event) {
-        event.preventDefault();
-        goProductPage(12);
-      }, $view);
+            // 洗澡
+            $.newTouch('.btn-action-bath', function (event) {
+                event.preventDefault();
+                goProductPage(1);
+            }, $view);
 
-      // 染色
-      $.newTouch('.btn-action-ranse', function (event) {
-        event.preventDefault();
-        goProductPage(13);
-      }, $view);
+            //日常清洁=洁牙
+            $.newTouch('.btn-action-richang', function (event) {
+                event.preventDefault();
+                goProductPage(4);
+            }, $view);
+           /*  //洁牙
+            $.newTouch('.btn-action-jieya', function (event) {
+              event.preventDefault();
+              goProductPage(4);
+            }, $view);*/
 
-      // 助产
-      $.newTouch('.btn-action-zhuchan', function (event) {
-        event.preventDefault();
-        goComing(9);
-      }, $view);
+            // 训犬
+            $.newTouch('.btn-action-xunquan', function (event) {
+                event.preventDefault();
+                goProductPage(6);
+            }, $view);
 
-      // 我的预约
-      $.newTouch('.btn-action-my-order', function (event) {
-        event.preventDefault();
-        user.checkLogin(function () {
-          $doc.trigger('spa:navigate', {
-            hash: 'myOrder/1',
-            pushData: {
-              needReload: true
-            }
-          });
-        });
-      }, $view);
+            // 断尾
+            $.newTouch('.btn-action-duanwei', function (event) {
+                event.preventDefault();
+                goProductPage(7);
+            }, $view);
+            //除螨杀菌-碳酸浴
+            $.newTouch('.btn-action-tansuanyun', function (event) {
+                event.preventDefault();
+                goProductPage(8);
+            }, $view);
+            // 碳酸浴
+            /*$.newTouch('.btn-action-tansuanyun', function (event) {
+             event.preventDefault();
+             goProductPage(8);
+             }, $view);*/
+            //深度清洁=屈虫
+            $.newTouch('.btn-action-shendu', function (event) {
+                event.preventDefault();
+                goProductPage(11);
+            }, $view);
+            // 驱虫
+            /* $.newTouch('.btn-action-quchong', function (event) {
+             event.preventDefault();
+             goProductPage(11);
+             }, $view);*/
+            //其它-药浴
+            $.newTouch('.btn-action-qita', function (event) {
+                event.preventDefault();
+                goProductPage(12);
+            }, $view);
+            // 药浴
+           /* $.newTouch('.btn-action-yaoyu', function (event) {
+                event.preventDefault();
+                goProductPage(12);
+            }, $view);*/
 
-      // 优惠券
-      $.newTouch('.btn-action-coupon', function (event) {
-        event.preventDefault();
-        user.checkLogin(function () {
-          $doc.trigger('spa:navigate', {
-            hash: 'myCoupon'
-          });
-        });
-      }, $view);
-
-      // 招聘
-      $.newTouch('.btn-action-hire', function() {
-        event.preventDefault();
-        $doc.trigger('spa:navigate', {
-          hash: 'hire'
-        });
-      }, $view);
+            // 染色
+            $.newTouch('.btn-action-ranse', function (event) {
+                event.preventDefault();
+                goProductPage(13);
+            }, $view);
 
-      dtd.resolve();
+            // 助产
+            $.newTouch('.btn-action-zhuchan', function (event) {
+                event.preventDefault();
+                goComing(9);
+            }, $view);
 
+            // 我的预约
+            $.newTouch('.btn-action-my-order', function (event) {
+                event.preventDefault();
+                user.checkLogin(function () {
+                    $doc.trigger('spa:navigate', {
+                        hash: 'myOrder/1',
+                        pushData: {
+                            needReload: true
+                        }
+                    });
+                });
+            }, $view);
 
-      function goProductPage(type) {
-        user.checkLogin(function () {
-          if (!user['productVisit'][13]) { // 预期字段不足 先清除本地数据
-            localStorage.removeItem('user_productVisit');
-            localStorage.removeItem('user_productVisit-time');
-            user['productVisit'][13] = {
-              visited: false
+            // 优惠券
+            $.newTouch('.btn-action-coupon', function (event) {
+                event.preventDefault();
+                user.checkLogin(function () {
+                    $doc.trigger('spa:navigate', {
+                        hash: 'myCoupon'
+                    });
+                });
+            }, $view);
+
+            // 招聘
+            $.newTouch('.btn-action-hire', function () {
+                event.preventDefault();
+                $doc.trigger('spa:navigate', {
+                    hash: 'hire'
+                });
+            }, $view);
+            dtd.resolve();
+
+
+            function goProductPage(type) {
+                user.checkLogin(function () {
+                    if (!user['productVisit'][13]) { // 预期字段不足 先清除本地数据
+                        localStorage.removeItem('user_productVisit');
+                        localStorage.removeItem('user_productVisit-time');
+                        user['productVisit'][13] = {
+                            visited: false
+                        }
+                    }
+                    if (user['productVisit'][type]['visited']) {
+                        $doc.trigger('spa:navigate', {
+                            hash: 'placeOrder',
+                            pushData: {
+                                productType: type,
+                                serviceType: type,
+                                needReset: true
+                            }
+                        });
+                    } else {
+                        $doc.trigger('spa:navigate', {
+                            hash: 'product',
+                            pushData: {
+                                type: type,
+                                needReload: true,
+                                fromHome: true
+                            }
+                        });
+                        user.productVisit[type].visited = true;
+                        user.setCache('productVisit');
+                    }
+                });
             }
-          }
-          if (user['productVisit'][type]['visited']) {
-            $doc.trigger('spa:navigate', {
-              hash: 'placeOrder',
-              pushData: {
-                productType: type,
-                serviceType: type,
-                needReset: true
-              }
-            });
-          } else {
-            $doc.trigger('spa:navigate', {
-              hash: 'product',
-              pushData: {
-                type: type,
-                needReload: true,
-                fromHome:  true
-              }
-            });
-            user.productVisit[type].visited = true;
-            user.setCache('productVisit');
-          }
-        });
-      }
-
-      function goComing(type) {
-        user.checkLogin(function () {
-          $doc.trigger('spa:navigate', {
-            hash: 'coming',
-            pushData: {
-              productType: type
+
+            function goComing(type) {
+                user.checkLogin(function () {
+                    $doc.trigger('spa:navigate', {
+                        hash: 'coming',
+                        pushData: {
+                            productType: type
+                        }
+                    });
+                });
+            }
+
+            if (!user.activities['visited_offservice0126']) {
+                // showActivity();
+            }
+            function showActivity() {
+                var imgUrl = 'http://wozhua-others.qiniudn.com/20160126-offservice.png';
+                var d = new Image();
+                d.src = imgUrl;
+                d.onload = function () {
+                    $doc.trigger('spa:openpanel', ['activity', {
+                        content: imgUrl
+                    }]);
+                }
+            }
+        },
+        beforeopen: function (pageData, dtd) {
+            localStorage.removeItem('cart_products');
+            dtd.resolve();
+            native.switchPopGesture(true);
+        },
+        afteropen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+            if (!pageData.pushData.dontNeedReload) {
+                $doc.trigger('spa:openloader');
+                product.getListAll(user.id, function (res) {
+                    $doc.trigger('spa:closeloader');
+                    if (res.holiday) {
+                        var offDay = res.holiday;
+                        product.offDay = offDay;
+                    }
+                });
+            }
+            // 检测新用户
+            if (!user.isCheck.couponCheck) {
+                user.getCouponList(user.id, function (res) {
+                    if (res.success) {
+                        user.isCheck['couponCheck'] = true;
+                        user.setCache('isCheck');
+                    }
+                });
             }
-          });
-        });
-      }
-
-      if (!user.activities['visited_offservice0126']) {
-        // showActivity();
-      }
-      function showActivity () {
-        var imgUrl = 'http://wozhua-others.qiniudn.com/20160126-offservice.png';
-        var d = new Image();
-        d.src = imgUrl;
-        d.onload = function() {
-          $doc.trigger('spa:openpanel', ['activity', {
-            content: imgUrl
-          }]);
+            dtd.resolve();
+            //强制设置首页的上一页是空的,后面再调整框架
+            pageData.prevPage = $('.spa-page-empty');
+        },
+        beforeclose: function (pageData, dtd) {
+            dtd.resolve();
+            native.switchPopGesture(false);
         }
-      }
-    },
-    beforeopen: function(pageData, dtd) {
-      localStorage.removeItem('cart_products');
-      dtd.resolve();
-      native.switchPopGesture(true);
-    },
-    afteropen: function(pageData, dtd) {
-      var $view = this;
-      var $doc = $(document);
-      if (!pageData.pushData.dontNeedReload) {
-        $doc.trigger('spa:openloader');
-        product.getListAll(user.id, function(res) {
-          $doc.trigger('spa:closeloader');
-          if (res.holiday) {
-            var offDay = res.holiday;
-            product.offDay = offDay;
-          }
-        });
-      }
-      // 检测新用户
-      if (!user.isCheck.couponCheck) {
-        user.getCouponList(user.id, function(res) {
-          if (res.success) {
-            user.isCheck['couponCheck'] = true;
-            user.setCache('isCheck');
-          }
-        });
-      }
-      dtd.resolve();
-      //强制设置首页的上一页是空的,后面再调整框架
-      pageData.prevPage = $('.spa-page-empty');
-    },
-    beforeclose: function(pageData, dtd) {
-      dtd.resolve();
-      native.switchPopGesture(false);
     }
-  }
 })

+ 98 - 138
www/webapp/o2o/tpl/home/index.html

@@ -1,150 +1,110 @@
 {{ if showNavBar }}
 <header class="bar bar-nav">
-  <a class="left-button back-button">
-    <div class="icon icon-left-nav"></div>
-  </a>
-  <a class="right-button service-telephone">
-    <div></div>
-  </a>
-  <h1 class="title">壹管家宠物上门服务</h1>
+    <a class="left-button back-button">
+        <div class="icon icon-left-nav"></div>
+    </a>
+    <a class="right-button service-telephone">
+        <div></div>
+    </a>
+
+    <h1 class="title">壹管家宠物上门服务</h1>
 </header>
 {{ /if }}
-
 <div class="content">
-  <div class="box-container">
-    <div class="box-container box box-vertical">
-      <div id="homeScroll" class="scroll-container box-flex-1">
-        <div class="scroller">
-          <div class="home-content">
-            <div class="box main-service-box">
-              <div class="title-column-left width-percent-50">
-                <div class="title-container-square">
-                  <a class="btn btn-home-action btn-action-bath box box-pack-center">
-                    <div class="title-btn title-btn-top">洗澡</div>
-                    <div class="logo-bath"></div>
-                  </a>
-                </div>
-              </div>
-              <div class="title-column-right width-percent-50">
-                <div class="title-container-square" style="padding: 50% 0 0 0;">
-                  <a class="btn btn-home-action btn-action-groom box box-align-center">
-                    <div class="service-name">美容</div>
-                    <div class="logo-groom"></div>
-                  </a>
-                </div>
-                <div class="title-container-square" style="padding: 50% 0 0 0;">
-                  <a class="btn btn-home-action btn-action-shave box box-align-center">
-                    <div class="service-name">剃光</div>
-                    <div class="logo-shave"></div>
-                  </a>
+    <div class="box-container">
+        <div class="box-container box box-vertical">
+            <div id="homeScroll" class="scroll-container box-flex-1">
+                <div class="scroller">
+                    <div class="home-content">
+                        <div class="box main-service-box width-percent-100">
+                            <div class="title-column-left box-container">
+                                <div class="title-container-square">
+                                    <div class="the-main-figure">
+                                        <img src="http://odulvej8l.bkt.clouddn.com/Home_image.png" alt=""/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="clearfix"></div>
+                        <div class="global-msg">
+                            <div class="width-percent-25 global-msg-active">家庭保洁</div>
+                            <div class="width-percent-25">月子服务</div>
+                            <div class="width-percent-25">保姆服务</div>
+                            <div class="width-percent-25">家庭产品</div>
+                        </div>
+                        <div class="clearfix"></div>
+                        <div class="extra-service-box">
+                            <div class="box extra-service">
+                                <div class="width-percent-50">
+                                    <div class="extra-service-item">
+                                        <a class="btn-jieya btn-action-richang btn-action-coming">
+                                            <div class="logo logo-richang"></div>
+                                            <div class="extra-service-name">日常清洁</div>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="width-percent-50">
+                                    <div class="extra-service-item ">
+                                        <a class="btn-quchong btn-action-shendu btn-action-coming">
+                                            <div class="logo logo-shendu"></div>
+                                            <div class="extra-service-name">深度清洁</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="box extra-service">
+                                <div class="width-percent-50">
+                                    <div class="extra-service-item">
+                                        <a class="btn-chumanshajun btn-action-chumanshajun">
+                                            <div class="logo logo-chumanshajun"></div>
+                                            <div class="extra-service-name">除螨杀菌</div>
+                                            <span class="new"></span>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="width-percent-50">
+                                    <div class="extra-service-item">
+                                        <a class="btn-qita btn-action-yaoyu btn-action-coming">
+                                            <div class="logo logo-qita"></div>
+                                            <div class="extra-service-name">其它</div>
+                                        </a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>
             </div>
-            <div class="global-msg">※ 目前壹管家宠物上门服务只开通上海地区(除郊县)</div>
-            <div class="extra-service-box">
-              <div class="box extra-service">
-                <div class="width-percent-33">
-                  <div class="extra-service-item">
-                    <a class="btn-jieya btn-action-jieya btn-action-coming">
-                      <div class="logo logo-jieya"></div>
-                      <div class="extra-service-name">洁牙</div>
-                    </a>
-                  </div>
-                </div>
-                <div class="width-percent-33">
-                  <div class="extra-service-item ">
-                    <a class="btn-quchong btn-action-quchong btn-action-coming">
-                      <div class="logo logo-quchong"></div>
-                      <div class="extra-service-name">驱虫</div>
-                    </a>
-                  </div>
-                </div>
-                <div class="width-percent-33">
-                  <div class="extra-service-item">
-                    <a class="btn-spa btn-action-spa">
-                      <div class="logo logo-spa"></div>
-                      <div class="extra-service-name">SPA</div>
-                    </a>
-                  </div>
-                </div>
-              </div>
-              <div class="box extra-service">
-                <div class="width-percent-33">
-                  <div class="extra-service-item">
-                    <a class="btn-sheying btn-action-tansuanyun">
-                      <div class="logo logo-tansuanyu"></div>
-                      <div class="extra-service-name">碳酸浴</div>
-                      <span class="new"></span>
-                    </a>
-                  </div>
+            <div class="prevent-scroll">
+                <div class="box my-action">
+                    <!--首页-->
+                    <div class="width-percent-33">
+                        <div class="title-container-square">
+                            <a class="btn-home-action btn-action-my-order">
+                                <div class="logo logo-my-order"></div>
+                                <div class="name">首页</div>
+                            </a>
+                        </div>
+                    </div>
+                    <!--LOGO-->
+                    <div class="width-percent-33">
+                        <div class="title-container-square">
+                            <a class="btn-home-action btn-action-logo">
+                                <div class="logo logo-my-logo"></div>
+                            </a>
+                        </div>
+                    </div>
+                    <!--我的-->
+                    <div class="width-percent-33">
+                        <div class="title-container-square">
+                            <a class="btn-home-action btn-action-coupon">
+                                <div class="logo logo-coupon"></div>
+                                <div class="name">我的</div>
+                            </a>
+                        </div>
+                    </div>
                 </div>
-                <div class="width-percent-33">
-                  <div class="extra-service-item">
-                    <a class="btn-xunquan btn-action-xunquan btn-action-coming">
-                      <div class="logo logo-xunquan"></div>
-                      <div class="extra-service-name">训犬</div>
-                    </a>
-                  </div>
-                </div>
-                <div class="width-percent-33">
-                  <div class="extra-service-item">
-                    <a class="btn-yaoyu btn-action-yaoyu btn-action-coming">
-                      <div class="logo logo-yaoyu"></div>
-                      <div class="extra-service-name">药浴</div>
-                    </a>
-                  </div>
-                </div>
-              </div>
-              <div class="box extra-service">
-                <div class="width-percent-33">
-                  <div class="extra-service-item">
-                    <a class="btn-zhupei btn-action-duanwei btn-action-coming">
-                      <div class="logo logo-duanwei"></div>
-                      <div class="extra-service-name">断尾</div>
-                    </a>
-                  </div>
-                </div>
-                <div class="width-percent-33">
-                  <div class="extra-service-item">
-                    <a class="btn-jiyang btn-action-ranse btn-action-coming">
-                      <div class="logo logo-ranse"></div>
-                      <div class="extra-service-name">染色</div>
-                    </a>
-                  </div>
-                </div>
-                <div class="width-percent-33 btn-action-zhuchan">
-                  <div class="extra-service-item">
-                    <a class="btn-zhuchan btn-action-zhuchan btn-action-coming">
-                      <div class="logo logo-zhuchan"></div>
-                      <div class="extra-service-name">助产</div>
-                    </a>
-                  </div>
-                </div>
-              </div>
             </div>
-          </div>
         </div>
-      </div>
-      <div class="prevent-scroll">
-          <div class="box my-action">
-            <div class="width-percent-50">
-              <div class="title-container-square">
-                <a class="btn-home-action btn-action-my-order">
-                  <div class="logo logo-my-order"></div>
-                  <div class="name">我的预约</div>
-                </a>
-              </div>
-            </div>
-            <div class="width-percent-50">
-              <div class="title-container-square">
-                <a class="btn-home-action btn-action-coupon">
-                  <div class="logo logo-coupon"></div>
-                  <div class="name">我的优惠券</div>
-                </a>
-              </div>
-            </div>
-          </div>
-      </div>
     </div>
-  </div>
 </div>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff