1

www/webapp/o2o/css/beautician.css

@@ -0,0 +1,157 @@
+.beautician-content .page-content {
+  padding-bottom: 0;
+}
+.beautician-content .recommend {
+  padding: 10px 10px 0 10px;
+}
+#beauticianScroll .table-view-divider {
+  font-size: 12px;
+  font-weight: 400;
+}
+
+#beauticianScroll .media-object {
+  width: 42px;
+  height: 42px;
+  overflow: hidden;
+  text-align: center;
+}
+#beauticianScroll .media-object img {
+  max-height: 100%;
+}
+#beauticianScroll .recommend-time {
+  font-size: 12px;
+}
+#beauticianScroll .favor-count {
+  margin-left: 10px;
+}
+#beauticianDetailScroll {
+  background: #fff;
+}
+#beauticianDetailScroll .page-content {
+  padding-top: 0;
+}
+#beauticianDetailScroll .tech-info {
+  padding-top: 15px;
+}
+#beauticianDetailScroll .tech-info img {
+  width: 100px;
+  border-radius: 50%;
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+#beauticianDetailScroll .name,
+#beauticianDetailScroll .favor {
+  text-align: center;
+  margin-bottom: 0;
+}
+#beauticianDetailScroll .name {
+  padding-top: 10px;
+  font-size: 20px;
+  margin-bottom: 0px;
+  color: #333;
+}
+#beauticianDetailScroll .desc {
+  padding: 10px;
+}
+#beauticianDetailScroll .recommend {
+  margin-bottom: 0;
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #faebcc;
+  padding: 10px;
+}
+
+.spa-page-beautician-detail #tech-comment .table-view-cell {
+  padding: 15px;
+}
+.spa-page-beautician-detail .user-info-container {
+  margin-bottom: 5px;
+}
+
+.spa-page-beautician-detail .user-info-btn {
+  display: inline-block;
+  padding-right: 10px;
+}
+
+.spa-page-beautician-detail .user-avatar {
+  width: 30px;
+  height: 30px;
+  border-radius: 15px;
+  margin-right: 10px;
+  vertical-align: middle;
+}
+
+.spa-page-beautician-detail .user-name {
+  display: inline-block;
+  vertical-align: middle;
+  color: #8bc34a;
+  font-size: 14px;
+}
+
+.spa-page-beautician-detail .star-label {
+  vertical-align: middle;
+}
+.spa-page-beautician-detail .img-preview-list {
+  font-size: 0;
+  margin-top: 10px;
+}
+.spa-page-beautician-detail .img-preview-list .width-percent-33 {
+  display: inline-block;
+  vertical-align: top;
+}
+.spa-page-beautician-detail .img-preview {
+  position: relative;
+}
+.img-count {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  width: 24px;
+  height: 18px;
+  line-height: 18px;
+  font-size: 12px;
+  text-align: center;
+  color: #fff;
+  background: rgba(0, 0, 0, 0.6);
+}
+.spa-page-beautician-detail .img-preview-list img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  width: 100%;
+  height: 100%;
+}
+.spa-page-beautician-detail .review-time {
+  font-size: 10px;
+  color: #999;
+  text-align: right;
+}
+
+.spa-page-beautician-detail .review-content {
+  margin-top: 6px;
+  font-size: 14px;
+  color: #333;
+  line-height: 20px;
+}
+
+.spa-page-beautician-detail .btn-more-container {
+  height: 64px;
+}
+
+.spa-page-beautician-detail .btn-more-review {
+  width:30%;
+  height: 38px;
+  line-height: 38px;
+  padding: 0;
+}
+.spa-page-beautician-detail .btn-more-container {
+  height: 64px;
+}
+
+.spa-page-beautician-detail .btn-more-review {
+  width:30%;
+  height: 38px;
+  line-height: 38px;
+  padding: 0;
+}

www/webapp/o2o/css/homeenterprise.css

@@ -0,0 +1,79 @@
+#homestayScroll .prevent-scroll {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    background-color: #2a2400;
+}
+#homestayScroll .prevent-scroll .width-percent-33 .title-container-square {
+    padding: 20%;
+    position: relative;
+    text-align: center;
+}
+#homestayScroll .prevent-scroll .width-percent-33 .title-container-square a {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+#homestayScroll .prevent-scroll .width-percent-33 .title-container-square a .logo {
+    background-size: 65% 65%;
+    background-position: center center;
+    padding: 10%;
+    margin-top: 5px;
+    display: inline-block;
+    border-radius: 50%;
+}
+#homestayScroll .prevent-scroll .width-percent-33 .title-container-square a .name {
+    display: block;
+    margin-top: -5px;
+    font-size: 12px;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_home.png") no-repeat;
+    background-size: 100%;
+    background-position: center center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .name {
+    color: #fff;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(1) a .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_home_pre.png") no-repeat;
+    background-size: 90%;
+    background-position: center center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(1) a .name {
+    color: #b89400;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(2) a .logo {
+    border-radius: 50%;
+    display: inline-block;
+    padding: 25%;
+    background-size: 100%;
+    margin-top: -15px;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_butler.png") 0 0 no-repeat #2a2400;
+    background-size: 65% 65%;
+    background-position: center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(3) a .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_me_pre.png");
+    background-repeat: no-repeat;
+    background-size: 90%;
+    background-position: center center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(3) a .name {
+    color: #b89400;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_me.png");
+    background-repeat: no-repeat;
+    background-size: 100%;
+    background-position: center center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .name {
+    color: #fff;
+}

www/webapp/o2o/css/homestay.css

@@ -0,0 +1,79 @@
+#homestayScroll .prevent-scroll {
+	width: 100%;
+	position: fixed;
+	bottom: 0;
+	background-color: #2a2400;
+}
+#homestayScroll .prevent-scroll .width-percent-33 .title-container-square {
+	padding: 20%;
+	position: relative;
+	text-align: center;
+}
+#homestayScroll .prevent-scroll .width-percent-33 .title-container-square a {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+}
+#homestayScroll .prevent-scroll .width-percent-33 .title-container-square a .logo {
+	background-size: 65% 65%;
+	background-position: center center;
+	padding: 10%;
+	margin-top: 5px;
+	display: inline-block;
+	border-radius: 50%;
+}
+#homestayScroll .prevent-scroll .width-percent-33 .title-container-square a .name {
+	display: block;
+	margin-top: -5px;
+	font-size: 12px;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .logo {
+	border-radius: inherit;
+	background: url("http://odulvej8l.bkt.clouddn.com/tab_home.png") no-repeat;
+	background-size: 100%;
+	background-position: center center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .name {
+	color: #fff;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(1) a .logo {
+	border-radius: inherit;
+	background: url("http://odulvej8l.bkt.clouddn.com/tab_home_pre.png") no-repeat;
+	background-size: 90%;
+	background-position: center center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(1) a .name {
+	color: #b89400;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(2) a .logo {
+	border-radius: 50%;
+	display: inline-block;
+	padding: 25%;
+	background-size: 100%;
+	margin-top: -15px;
+	background: url("http://odulvej8l.bkt.clouddn.com/tab_butler.png") 0 0 no-repeat #2a2400;
+	background-size: 65% 65%;
+	background-position: center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(3) a .logo {
+	border-radius: inherit;
+	background: url("http://odulvej8l.bkt.clouddn.com/tab_me_pre.png");
+	background-repeat: no-repeat;
+	background-size: 90%;
+	background-position: center center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(3) a .name {
+	color: #b89400;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .logo {
+	border-radius: inherit;
+	background: url("http://odulvej8l.bkt.clouddn.com/tab_me.png");
+	background-repeat: no-repeat;
+	background-size: 100%;
+	background-position: center center;
+}
+#homestayScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .name {
+	color: #fff;
+}

www/webapp/o2o/css/main.css

@@ -1,12 +1,25 @@
 @import url("../../common/css/common.css");
 @import url("../../common/css/gird.css");
+@import url("./ratchetOverloading.css");
 @import url("./common.css");
 @import url("./home.css");
 @import url("./payAgreement.css");
+@import url("./product.css");
+@import url("./placeOrder.css");
+@import url("./myOrder.css");
+@import url("./mine.css");
+@import url("./secondary.css");
+@import url("./homestay.css");
+@import url("./homeenterprise.css");
 @import url("./bargain.css");
 @import url("./desc.css");
 @import url("./agreement.css");
+@import url("./review.css");
 @import url("./address.css");
 @import url("./pay.css");
 @import url("./append.css");
+@import url("./refund.css");
+@import url("./orderFinish.css");
+@import url("./orderDetail.css");
+@import url("./beautician.css");
 @import url("./month.css");

www/webapp/o2o/css/mine.css

@@ -0,0 +1,187 @@
+
+body {
+    font-family: "Microsoft Yahei" !important;
+}
+#mineScroll div .user {
+    position: relative;
+}
+#mineScroll div .user img {
+    width: 100%;
+}
+#mineScroll div .user .user-image {
+    position: absolute;
+    width: 4rem;
+    height: 4rem;
+    top: 4rem;
+    right: 0;
+    left: 0;
+    margin: 0 auto;
+    /*background: #fff;*/
+    border-radius: 50%;
+}
+#mineScroll div .user .user-image img{
+    border-radius: 50%;
+}
+#mineScroll div .user .user-name {
+    position: absolute;
+    top: 10rem;
+    right: 0;
+    left: 0;
+    color: #fff;
+    text-align: center;
+}
+#mineScroll div .user-balance {
+    margin-top: 1rem;
+    width: 100%;
+    line-height: 2rem;
+    text-align: center;
+}
+#mineScroll div .user-balance span {
+    top: -8px;
+}
+#mineScroll div .user-balance span img {
+    width: 8%;
+    margin: 0 3px -2% 0;
+}
+#mineScroll div .mine-type {
+    margin-top: 1rem;
+    width: 100%;
+    /*height: 250px;*/
+}
+#mineScroll div .mine-type div {
+    float: left;
+    padding-top: 5%;
+    padding-bottom: 5%;
+    text-align: center;
+    background: #ffffff;
+}
+#mineScroll div .mine-type div:nth-child(1),
+#mineScroll div .mine-type div:nth-child(2),
+#mineScroll div .mine-type div:nth-child(3) {
+    border-top: 1px solid #b7b7b7;
+}
+#mineScroll div .mine-type div:nth-child(1),
+#mineScroll div .mine-type div:nth-child(2),
+#mineScroll div .mine-type div:nth-child(4),
+#mineScroll div .mine-type div:nth-child(5) {
+    border-bottom: 1px solid #b7b7b7;
+    border-right: 1px solid #b7b7b7;
+}
+#mineScroll div .mine-type div:nth-child(3),
+#mineScroll div .mine-type div:nth-child(6) {
+    border-bottom: 1px solid #b7b7b7;
+}
+#mineScroll div .mine-type div img {
+    width: 50px;
+    height: 50px;
+}
+#mineScroll div .mine-type div .mine-text {
+    display: block;
+    width: 100%;
+    border: 0;
+    padding: 0;
+}
+/*当其最大宽度为320*/
+@media (max-width: 320px) {
+    #mineScroll div .user{
+        /*margin-top: -20%;*/
+    }
+    #mineScroll div .user .user-name {
+        top: 8rem;
+    }
+    #mineScroll div .user .user-image {
+        top: 3.6rem;
+    }
+    #mineScroll div .user-balance {
+        font-size: 1rem;
+        margin-top: 0.2rem;
+    }
+    #mineScroll div .mine-type{
+        margin-top:0.3rem;
+    }
+    #mineScroll div .mine-type div img {
+        width: 40px;
+        height: 40px;
+    }
+}
+/*当其最小宽度为360*/
+@media (min-width: 360px) {
+    #mineScroll div .user .user-name {
+        top: 9rem;
+    }
+    #mineScroll div .user-balance {
+        font-size: 1rem;
+        margin-top: 0.5rem;
+    }
+    #mineScroll div .mine-type div img {
+        /*width: 40px;
+        height: 40px;*/
+    }
+}
+/*最小高度为568*/
+@media (min-height: 568px) {
+    #mineScroll div .user {
+        margin-top: 0;
+    }
+    #mineScroll div .user .user-image{
+        top: 2.2rem;
+    }
+    #mineScroll div .user .user-name{
+        top: 7rem;
+    }
+
+}
+/*当其最小宽度为768*/
+@media (min-width: 768px) {
+    #mineScroll div .user {
+        margin-top: -2rem;
+    }
+    #mineScroll div .user .user-image {
+        top: 7rem;
+        width: 9rem;
+        height: 9rem;
+    }
+    #mineScroll div .user .user-name {
+        top: 19rem;
+        font-size: 2rem;
+    }
+    #mineScroll div .user-balance {
+        margin-top: 1rem;
+        line-height: 4rem;
+        text-align: center;
+        font-size: 2rem;
+    }
+    #mineScroll div .user-balance span {
+        top: -8px;
+    }
+    #mineScroll div .user-balance span img {
+        width: 7%;
+        margin-bottom: -2%;
+    }
+    #mineScroll div .mine-type div img {
+        width: 60px;
+        height: 60px;
+    }
+}
+@media(min-width:375px){
+    #mineScroll div .user .user-name{
+        top:8rem;
+        font-size: 1.1rem;
+    }
+}
+@media(min-width:414px){
+    #mineScroll div .user .user-name{
+        top:9rem;
+    }
+}
+
+
+@media (min-width: 768px) {
+    @media (min-width: 768px) {
+        #mineScroll .prevent-scroll .width-percent-33 .title-container-square a .name {
+            display: block;
+            margin-top: 5px;
+            font-size: 1.6rem;
+        }
+    }
+}

www/webapp/o2o/css/month.css

@@ -1,6 +1,7 @@
 .request {
-	width: 100%;
+	width: 60%;
 	position: fixed;
+	margin-left: calc(20% - 4px);
 	bottom: 0;
 }
 

www/webapp/o2o/css/myOrder.css

@@ -0,0 +1,115 @@
+.spa-page-my-order .order-type-control {
+  border-radius: 0;
+  border-left: 0;
+  border-right: 0;
+}
+
+.spa-page-my-order .order-type-control .control-item {
+  padding: 0;
+  line-height: 35px;
+  font-size: 0.71rem;
+}
+.spa-page-my-order .order-desc-line {
+  font-size: 0;
+}
+.spa-page-my-order .order-service-name {
+  margin-right: -50px;
+  position: relative;
+  padding-left: 41px;
+}
+.spa-page-my-order .order-append .order-desc-more {
+  color: #f37b1d;
+}
+.spa-page-my-order .order-append-price {
+  color: #f37b1d;
+  font-size: 12px;
+}
+.spa-page-my-order .order-service-name .order-desc-title {
+  position: absolute;
+  left: 0;
+}
+.spa-page-my-order .order-service-name .order-desc-more {
+  margin-left: 0;
+}
+.spa-page-my-order .order-desc-title {
+  font-size: 13px;
+  color: #999;
+  display: inline-block;
+  vertical-align: top;
+}
+
+.spa-page-my-order .order-desc-more {
+  font-size: 12px;
+  color: #767A92;
+  display: inline-block;
+  margin-left: 15px;
+  max-width: 285px;
+}
+.spa-page-my-order .order-precedence-status {
+  font-size: 12px;
+  color: #ea0d00;
+}
+.spa-page-my-order .order-status {
+  font-size: 12px;
+  color: #767a92;
+}
+
+.spa-page-my-order .order-status-pay {
+  font-size: 12px;
+  color: #f37b1d;
+}
+.spa-page-my-order .table-cell-accessory {
+  font-size: 0;
+}
+.order-btn {
+
+}
+.spa-page-my-order .order-btn {
+  display: inline-block;
+  padding-left: 0.6rem;
+  padding-right: 0.6rem;
+  font-size: 0.6rem;
+  height: 26px;
+  line-height: 26px;
+  /*color: white;*/
+  text-align: center;
+  vertical-align: top;
+  border-radius: 0px;
+  margin-left: 0.9rem;
+}
+.spa-page-my-order .order-btn.order-btn-review {
+  color: #fff;
+  background: #8bc34a;
+}
+.spa-page-my-order .btn-warning {
+  color: #f3781d;
+  border: 1px solid #f3781d;
+}
+
+.spa-page-my-order .btn-default {
+  color: #666;
+  border: 1px solid #666;
+}
+
+.spa-page-my-order .btn-warning:active {
+  background-color: #f39d00;
+}
+.spa-page-my-order .btn-more-orders {
+  width: 30%;
+  height: 38px;
+  line-height: 38px;
+  padding: 0;
+}
+
+.spa-page-my-order .list-content .table-view:last-child {
+  margin-bottom: 0;
+}
+/*.spa-page-my-order .btn-alert-info {
+  background: #d2d2d2;
+}*/
+.spa-page-my-order .order-number {
+  margin-right: -50px;
+  background: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgd2lkdGg9IjE2IiBoZWlnaHQ9IjI3IiB2aWV3Qm94PSIwIDAgMTYgMjciPgogIDxkZWZzPgogICAgPHN0eWxlPgogICAgICAuY2xzLTEgewogICAgICAgIGZpbGw6ICM5OTk7CiAgICAgICAgZmlsbC1ydWxlOiBldmVub2RkOwogICAgICB9CiAgICA8L3N0eWxlPgogIDwvZGVmcz4KICA8cGF0aCBkPSJNMS4yNzksMy41NDcgTDExLjEwMywxMy4zNzEgTDEuMTUwLDIzLjMyMyBMMS4xNTEsMjMuMzI0IEMwLjgyNiwyMy42NjEgMC42MjUsMjQuMTIwIDAuNjI1LDI0LjYyNSBDMC42MjUsMjUuNjYxIDEuNDY0LDI2LjUwMCAyLjUwMCwyNi41MDAgQzMuMDA2LDI2LjUwMCAzLjQ2NCwyNi4zMDAgMy44MDEsMjUuOTc1IEwzLjgwMiwyNS45NzUgTDE1LjA1MiwxNC43MjUgTDE1LjA1MSwxNC43MjUgQzE1LjQwNSwxNC4zODMgMTUuNjI1LDEzLjkwNSAxNS42MjUsMTMuMzc1IEMxNS42MjUsMTMuMzc0IDE1LjYyNSwxMy4zNzIgMTUuNjI1LDEzLjM3MSBDMTUuNjI1LDEzLjM3MCAxNS42MjUsMTMuMzY4IDE1LjYyNSwxMy4zNjcgQzE1LjYyNSwxMi44MzcgMTUuNDA1LDEyLjM1OCAxNS4wNTEsMTIuMDE4IEwxNS4wNTIsMTIuMDE3IEwzLjgwMiwwLjc2NyBMMy43OTcsMC43NzIgQzMuNDYwLDAuNDQ5IDMuMDAzLDAuMjUwIDIuNTAwLDAuMjUwIEMxLjQ2NCwwLjI1MCAwLjYyNSwxLjA5MCAwLjYyNSwyLjEyNSBDMC42MjUsMi42OTQgMC44NzgsMy4yMDMgMS4yNzksMy41NDcgWiIgY2xhc3M9ImNscy0xIi8+Cjwvc3ZnPgo=) no-repeat;
+  background-position: right center;
+  background-size: auto 60%;
+}

www/webapp/o2o/css/orderDetail.css

@@ -0,0 +1,92 @@
+.spa-page-my-order-detail .content {
+  background: #fff;
+}
+.spa-page-my-order-detail .table-view-cell {
+  padding-right: 15px;
+}
+.spa-page-my-order-detail .order-detail-item {
+  position: relative;
+  padding-left: 71px;
+  font-size: 14px;
+  line-height: 24px;
+  color: #666;
+}
+.spa-page-my-order-detail .item-name {
+  position: absolute;
+  left: 0;
+  font-size: 14px;
+}
+.spa-page-my-order-detail .order-label {
+  /*height: 22px;*/
+  color: #666;
+  line-height: 22px;
+  font-size: 14px;
+}
+.spa-page-my-order-detail .order-label {
+  position: relative;
+  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='100…ht='1'><rect fill='#c8c7cc' x='0' y='0' width='100%' height='0.5'/></svg>");
+  background-repeat: no-repeat;
+  background-position: 15px 100%;
+  border-bottom: 0;
+}
+.spa-page-my-order-detail .btn-group {
+  height: 22px;
+}
+.spa-page-my-order-detail .label-name {
+  max-width: 80%;
+  text-align: left;
+}
+.spa-page-my-order-detail .label-value {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+}
+.spa-page-my-order-detail .append-order {
+  color: #f37b1d;
+}
+.spa-page-my-order-detail .order-comment {
+  /*text-align: left;*/
+}
+.spa-page-my-order-detail .order-comment-label {
+  margin-right: 10px;
+}
+.spa-page-my-order-detail .service-count {
+  margin-left: 20px;
+}
+
+.spa-page-my-order-detail .order-btn {
+  display: inline-block;
+  padding-left: 0.6rem;
+  padding-right: 0.6rem;
+  font-size: 0.6rem;
+  height: 26px;
+  line-height: 26px;
+  /*color: white;*/
+  text-align: center;
+  vertical-align: top;
+  border-radius: 3px;
+  margin-left: 0.9rem;
+}
+.spa-page-my-order-detail .order-btn.order-btn-review {
+  color: #fff;
+  background: #8bc34a;
+}
+.spa-page-my-order-detail .btn-warning {
+  color: #f3781d;
+  border: 1px solid #f3781d;
+}
+
+.spa-page-my-order-detail .btn-default {
+  color: #666;
+  border: 1px solid #666;
+}
+
+.spa-page-my-order-detail .btn-warning:active {
+  background-color: #f39d00;
+}
+.spa-page-my-order-detail .btn-more-orders {
+  width: 30%;
+  height: 38px;
+  line-height: 38px;
+  padding: 0;
+}

www/webapp/o2o/css/orderFinish.css

@@ -0,0 +1,19 @@
+.spa-page-order-done img {
+  width: 100%;
+}
+
+.spa-page-order-done .box {
+  margin-top: 1.8rem;
+}
+.spa-page-order-done .box-flex-1 {
+  padding: 0 0.6rem;
+}
+.spa-page-order-done .btn-default {
+  background: #9a9a9a;
+  color: #fff;
+}
+.spa-page-order-done .btn-success {
+  background: #8bc34a;
+  color: #fff;
+  border-color: #8bc34a;
+}

www/webapp/o2o/css/refund.css

@@ -0,0 +1,117 @@
+
+.spa-page-refund .order-service-name {
+  margin-right: -50px;
+  position: relative;
+  padding-left: 41px;
+}
+.spa-page-refund .order-service-name .order-desc-title {
+  position: absolute;
+  left: 0;
+}
+.spa-page-refund .order-service-name .order-desc-more {
+  margin-left: 0;
+}
+.spa-page-refund .order-desc-title {
+  font-size: 13px;
+  color: #999;
+  display: inline-block;
+  vertical-align: top;
+}
+
+.spa-page-refund .order-desc-more {
+  font-size: 12px;
+  color: #767A92;
+  display: inline-block;
+  margin-left: 15px;
+  max-width: 285px;
+}
+.spa-page-refund .order-precedence-status {
+  font-size: 12px;
+  color: #ea0d00;
+}
+.spa-page-refund .order-status {
+  font-size: 12px;
+  color: #767a92;
+}
+
+.spa-page-refund .order-status-pay {
+  font-size: 12px;
+  color: orange;
+}
+.spa-page-refund .table-cell-accessory {
+  font-size: 0;
+}
+.btn-main {
+  background-color: rgba(146,118,3,1)!important;
+}
+.spa-page-refund .order-btn {
+  display: inline-block;
+  padding-left: 0.6rem;
+  padding-right: 0.6rem;
+  font-size: 0.6rem;
+  height: 26px;
+  line-height: 26px;
+  color: white;
+  text-align: center;
+  vertical-align: top;
+  border-radius: 3px;
+  margin-left: 0.9rem;
+}
+
+.spa-page-refund .btn-warning {
+  background-color: orange;
+}
+
+.spa-page-refund .btn-default {
+  background-color: #9a9a9a;
+}
+
+.spa-page-refund .btn-warning:active {
+  background-color: #f39d00;
+}
+.spa-page-refund .btn-more-orders {
+  width: 30%;
+  height: 38px;
+  line-height: 38px;
+  padding: 0;
+}
+
+.spa-page-refund .list-content .table-view:last-child {
+  margin-bottom: 0;
+}
+.spa-page-refund .tip {
+  font-size: 0.7rem;
+  height: 2.2rem;
+  line-height: 2.2rem;
+  padding: 0 15px;
+}
+.spa-page-refund .btn-box,
+.spa-page-refund-success .btn-box {
+  text-align: center;
+  margin-top: 3rem;
+}
+.spa-page-refund-success .btn-box .btn,
+.spa-page-refund .btn-box .btn {
+  display: inline-block;
+  width: 13.5rem;
+  background: #fa7353;
+  border: 3px;
+  font-size: 0.9rem;
+  color: #fff;
+  line-height: 2.2rem;
+  padding: 0;
+}
+.spa-page-refund-success .text-center {
+  padding-top: 2.5rem;
+}
+.spa-page-refund-success .title-msg {
+  font-size: 0.9rem;
+  margin-bottom: 1rem;
+}
+.spa-page-refund .order-append-price {
+  font-size: 12px;
+  color: #767A92;
+}
+.spa-page-refund .order-desc-line {
+  font-size: 0;
+}

www/webapp/o2o/css/review.css

@@ -0,0 +1,86 @@
+/* post */
+.spa-panel-post-review .review-container {
+	padding: 15px 15px 5px;
+	width: 100%;
+	background-color: white;
+}
+
+.spa-panel-post-review .review-star-container {
+	margin-bottom: 20px;
+	font-size: 14px;
+	color: #999;
+}
+
+.spa-panel-post-review .review-content-container {
+	position: relative;
+}
+.spa-panel-post-review .review-img-content {
+  /*height: 60px;*/
+  font-size: 0;
+  /*line-height: 20px;*/
+  /*margin-bottom: 0;*/
+}
+.spa-panel-post-review .review-img-content .width-percent-25 {
+  display: inline-block;
+  vertical-align: top;
+  margin-bottom: 10px;
+}
+.spa-panel-post-review .img-preview {
+  position: relative;
+  height: 60px;
+  width: 60px;
+  margin-left: auto;
+  margin-right: auto;
+}
+.spa-panel-post-review .img-preview img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 100%;
+  max-height: 100%;
+}
+.spa-panel-post-review .img-preview .btn-preview-close {
+  position: absolute;
+  right: -10px;
+  top: -10px;
+  z-index: 10;
+  width: 20px;
+  height: 20px;
+  background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSLlm77lvaIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB3aWR0aD0iMTAyNHB4IiBoZWlnaHQ9IjEwMjRweCIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMTAyNCAxMDI0IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KICA8cGF0aCBmaWxsPSIjMjcyNjM2IiBkPSJNNTMxLjkzNzg4MiAyODAuMDYyMTE4bS00NzEuNzAyNTg4IDBhNy44MzEgNy44MzEgMCAxIDAgOTQzLjQwNTE3NiAwIDcuODMxIDcuODMxIDAgMSAwIC05NDMuNDA1MTc2IDBaTTcxMC43NzY0NzEgMTI3LjQyNTg4MiA1NjguNjIxMTc2IDI2OS41MjA5NDEgNzEwLjcxNjIzNSA0MTEuNjE2QzcyNi45MTk1MjkgNDI3Ljc1OTA1OSA3MjYuOTE5NTI5IDQ1NC4wMjE2NDcgNzEwLjcxNjIzNSA0NzAuMjI0OTQxIDY5NC41MTI5NDEgNDg2LjM2OCA2NjguMzEwNTg4IDQ4Ni4zNjggNjUyLjEwNzI5NCA0NzAuMjI0OTQxTDUxMC4wMTIyMzUgMzI4LjEyOTg4MiAzNjcuOTE3MTc2IDQ3MC4yMjQ5NDFDMzUxLjc3NDExOCA0ODYuNDI4MjM1IDMyNS41MTE1MjkgNDg2LjQyODIzNSAzMDkuMzA4MjM1IDQ3MC4yMjQ5NDEgMjkzLjE2NTE3NiA0NTQuMDgxODgyIDI5My4xNjUxNzYgNDI3LjgxOTI5NCAzMDkuMzA4MjM1IDQxMS42MTZMNDUxLjQwMzI5NCAyNjkuNTIwOTQxIDMwOS4zMDgyMzUgMTI3LjQyNTg4MkMyOTMuMTA0OTQxIDExMS4yMjI1ODggMjkzLjE2NTE3NiA4NC45NiAzMDkuMzA4MjM1IDY4LjgxNjk0MSAzMjUuNTcxNzY1IDUyLjYxMzY0NyAzNTEuNzEzODgyIDUyLjYxMzY0NyAzNjcuOTc3NDEyIDY4LjgxNjk0MUw1MTAuMDcyNDcxIDIxMC45NzIyMzUgNjUyLjE2NzUyOSA2OC44NzcxNzZDNjY4LjMxMDU4OCA1Mi42NzM4ODIgNjk0LjUxMjk0MSA1Mi43MzQxMTggNzEwLjcxNjIzNSA2OC44NzcxNzYgNzI2Ljg1OTI5NCA4NS4wMjAyMzUgNzI2Ljg1OTI5NCAxMTEuMjIyNTg4IDcxMC43NzY0NzEgMTI3LjQyNTg4Mkw3MTAuNzc2NDcxIDEyNy40MjU4ODJaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLCA4MTIpIHNjYWxlKDEsIC0xKSIvPgo8L3N2Zz4K);
+  background-repeat: no-repeat;
+  background-size: cover;
+}
+.spa-panel-post-review .img-upload-btn {
+  position: relative;
+  display: block;
+  height: 60px;
+  width: 60px;
+  margin-left: auto;
+  margin-right: auto;
+  overflow: hidden;
+  background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0i5Zu+5bGCXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgNDAgMjgiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDQwIDI4IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnIGlkPSJYTUxJRF8yXyI+DQoJPHJlY3QgaWQ9IlhNTElEXzhfIiB4PSI0LjUyMiIgeT0iMS41NyIgZmlsbD0iIzhFOEU5MyIgd2lkdGg9IjMuMDQ3IiBoZWlnaHQ9IjEuNTg0Ii8+DQoJPGNpcmNsZSBpZD0iWE1MSURfN18iIGZpbGw9IiM4RThFOTMiIGN4PSIyMC4xNDgiIGN5PSIxNi4yMzQiIHI9IjYuOTY0Ii8+DQoJPHBhdGggaWQ9IlhNTElEXzNfIiBmaWxsPSIjOEU4RTkzIiBkPSJNMzcuNTc1LDMuOTY2aC04LjQwNmwtMy44NzItMy45NTFoLTkuODMxbC00LjE0OSwzLjk1MUgyLjcyDQoJCWMtMS4xNCwwLTIuMDczLDAuOTMzLTIuMDczLDIuMDczdjE5LjkwM2MwLDEuMTQsMC45MzMsMi4wNzMsMi4wNzMsMi4wNzNoMzQuODU0YzEuMTQsMCwyLjA3My0wLjkzMywyLjA3My0yLjA3M1Y2LjAzOQ0KCQlDMzkuNjQ4LDQuODk5LDM4LjcxNSwzLjk2NiwzNy41NzUsMy45NjZ6IE0yMC4xNDgsMjQuOTA3Yy00Ljc5LDAtOC42NzMtMy44ODMtOC42NzMtOC42NzNjMC00Ljc5LDMuODgzLTguNjczLDguNjczLTguNjczDQoJCXM4LjY3MywzLjg4Myw4LjY3Myw4LjY3M0MyOC44MjEsMjEuMDI0LDI0LjkzOCwyNC45MDcsMjAuMTQ4LDI0LjkwN3ogTTMxLjMzNCw5LjEyNmgtMS43MDZWNy40MmgxLjcwNlY5LjEyNnoiLz4NCjwvZz4NCjwvc3ZnPg0K) no-repeat;
+  background-size: 40px 40px;
+  background-position: center center;
+  border: 1px solid #eaeaea;
+}
+
+.spa-panel-post-review .img-upload-btn input {
+  position: absolute;
+  width: 60px;
+  height: 60px;
+  overflow: hidden;
+  opacity: 0;
+}
+
+.spa-panel-post-review .review-content {
+	font-size: 16px;
+	max-height: 120px;
+	padding: 10px;
+	margin-bottom: 0;
+}
+
+.spa-panel-post-review .star-item {
+	width: 24px;
+	height: 24px;
+	margin-right: 8px;
+}

www/webapp/o2o/css/secondary.css

@@ -0,0 +1,308 @@
+#secondaryScroll {
+    /*底部导航栏*/
+}
+#secondaryScroll .secondary-content {
+    /*.secondary-type{
+        margin-top: 1rem;
+        width: 100%;
+        height: 100%;
+        div {
+          float: left;
+          padding-top: 5%;
+          padding-bottom: 5%;
+          text-align: center;
+          background: #ffffff;
+
+          &:nth-child(1),&:nth-child(3),&:nth-child(5),&:nth-child(7){
+            border-bottom: 1px solid;
+            border-right:1px solid;
+          }
+          img {
+            width: 50px;
+            height: 50px;
+          }
+          .mine-text {
+            display: block;
+            width: 100%;
+            border: 0;
+            padding: 0;
+          }
+        }
+      }*/
+}
+#secondaryScroll .secondary-content .secondary-head {
+    position: relative;
+    text-align: center;
+}
+#secondaryScroll .secondary-content .secondary-head img {
+    width: 100%;
+}
+#secondaryScroll .secondary-content .secondary-head img:nth-child(2) {
+    width: 5rem;
+    position: absolute;
+    left: 50%;
+    margin-left: -2.5rem;
+    bottom: -2.3rem;
+}
+#secondaryScroll .secondary-content .secondary-list .products-list {
+    margin: 0;
+    list-style: none;
+    padding-left: 0;
+}
+#secondaryScroll .secondary-content .secondary-list .products-list li {
+    padding-top: 0.4rem;
+    text-align: center;
+    width: 50%;
+    float: left;
+}
+#secondaryScroll .secondary-content .secondary-list .products-list li img {
+    width: 50px;
+    height: 50px;
+}
+#secondaryScroll .secondary-content .secondary-list .products-list li div {
+    border-bottom: 3px solid #a8a8a8;
+    width: 5rem;
+    margin: 0 auto;
+    padding-bottom: 0.3rem;
+}
+#secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(1),
+#secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(3),
+#secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(5),
+#secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(7) {
+    border-bottom: 1px solid #b7b7b7;
+    border-right: 1px solid #b7b7b7;
+}
+#secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(2),
+#secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(4),
+#secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(6),
+#secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(8) {
+    border-bottom: 1px solid #b7b7b7;
+}
+#secondaryScroll .prevent-scroll {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    background-color: #2a2400;
+}
+#secondaryScroll .prevent-scroll .width-percent-33 .title-container-square {
+    padding: 20%;
+    position: relative;
+    text-align: center;
+}
+#secondaryScroll .prevent-scroll .width-percent-33 .title-container-square a {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+#secondaryScroll .prevent-scroll .width-percent-33 .title-container-square a .logo {
+    background-size: 65% 65%;
+    background-position: center center;
+    padding: 10%;
+    margin-top: 5px;
+    display: inline-block;
+    border-radius: 50%;
+}
+#secondaryScroll .prevent-scroll .width-percent-33 .title-container-square a .name {
+    display: block;
+    margin-top: -5px;
+    font-size: 12px;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_home.png") no-repeat;
+    background-size: 100%;
+    background-position: center center;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .name {
+    color: #fff;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(1) a .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_home_pre.png") no-repeat;
+    background-size: 90%;
+    background-position: center center;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(1) a .name {
+    color: #b89400;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(2) a .logo {
+    border-radius: 50%;
+    display: inline-block;
+    padding: 25%;
+    background-size: 100%;
+    margin-top: -15px;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_butler.png") 0 0 no-repeat #2a2400;
+    background-size: 65% 65%;
+    background-position: center;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(3) a .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_me_pre.png");
+    background-repeat: no-repeat;
+    background-size: 90%;
+    background-position: center center;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(3) a .name {
+    color: #b89400;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_me.png");
+    background-repeat: no-repeat;
+    background-size: 100%;
+    background-position: center center;
+}
+#secondaryScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .name {
+    color: #fff;
+}
+@media (min-width: 768px) {
+    #secondaryScroll .prevent-scroll .width-percent-33 .title-container-square a .name {
+        display: block;
+        margin-top: 5px;
+        font-size: 1.6rem;
+    }
+}
+/*媒体查询*/
+@media (min-width: 414px) {
+    #secondaryScroll .secondary-content .secondary-head {
+        position: relative;
+        text-align: center;
+    }
+    #secondaryScroll .secondary-content .secondary-head img {
+        width: 100%;
+    }
+    #secondaryScroll .secondary-content .secondary-head img:nth-child(2) {
+        width: 7rem;
+        position: absolute;
+        left: 50%;
+        margin-left: -3.5rem;
+        bottom: -3.4rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list {
+        /*margin: 0;
+              list-style: none;
+              padding-left: 0;*/
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li {
+        /*padding-top:0.4rem;
+                text-align: center;
+                width: 50%;
+                float: left;*/
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li img {
+        width: 2.7rem;
+        height: 2.7rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li div {
+        border-bottom: 3px solid #a8a8a8;
+        width: 6rem;
+        margin: 0 auto;
+        padding-bottom: 0.3rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(1),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(3),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(5),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(7) {
+        border-bottom: 1px solid #b7b7b7;
+        border-right: 1px solid #b7b7b7;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(2),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(4),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(6),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(8) {
+        border-bottom: 1px solid #b7b7b7;
+    }
+}
+@media (min-width: 768px) {
+    #secondaryScroll .secondary-content .secondary-head {
+        position: relative;
+        text-align: center;
+    }
+    #secondaryScroll .secondary-content .secondary-head img {
+        width: 100%;
+    }
+    #secondaryScroll .secondary-content .secondary-head img:nth-child(2) {
+        width: 8rem;
+        position: absolute;
+        left: 50%;
+        margin-left: -4rem;
+        bottom: -3.9rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list {
+        /*margin: 0;
+              list-style: none;
+              padding-left: 0;*/
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li {
+        /*padding-top:0.4rem;
+                text-align: center;
+                width: 50%;
+                float: left;*/
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li img {
+        width: 5rem;
+        height: 5rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li div {
+        border-bottom: 3px solid #a8a8a8;
+        width: 6rem;
+        margin: 0 auto;
+        padding-bottom: 0.3rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(1),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(3),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(5),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(7) {
+        border-bottom: 1px solid #b7b7b7;
+        border-right: 1px solid #b7b7b7;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(2),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(4),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(6),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(8) {
+        border-bottom: 1px solid #b7b7b7;
+    }
+}
+@media (max-height: 480px) {
+    #secondaryScroll .secondary-content .secondary-list .products-list {
+        height: 420px ;
+    }
+}
+@media (min-height: 568px) {
+    #secondaryScroll .secondary-content .secondary-list .products-list li img {
+        width: 1.5rem;
+        height: 1.5rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(2),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(4),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(6),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(8) {
+        border-bottom: 1px solid #b7b7b7;
+    }
+}
+@media (min-height: 667px) {
+    #secondaryScroll .secondary-content .secondary-list .products-list li img {
+        width: 2.3rem;
+        height: 2.3rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(2),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(4),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(6),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(8) {
+        border-bottom: 1px solid #b7b7b7;
+    }
+}
+@media (min-height: 700px) {
+    #secondaryScroll .secondary-content .secondary-list .products-list li img {
+        width: 2.8rem;
+        height: 2.8rem;
+    }
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(2),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(4),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(6),
+    #secondaryScroll .secondary-content .secondary-list .products-list li:nth-child(8) {
+        border-bottom: 1px solid #b7b7b7;
+    }
+}

www/webapp/o2o/js/model/product.js

@@ -9,6 +9,168 @@ define(['base', '$', 'api'], function (base, $, api) {
 		Product.instance = this;
 		this.storagePrefix = 'product_';//存储前缀
 		/*图片压缩*/
+		this.allList = [
+			{
+				id: "57e0dffc9f5160dd048b4568",
+				name: "日常清洁",
+				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE-%E6%94%B9.jpg',
+				desc: [{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_01.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_02.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_03.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_04.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_05.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_06.jpg"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "1",
+				type_str: "日常清洁",
+				extra: [
+					{
+						type: "一室一卫",
+						price: "98"
+					},
+					{
+						type: "两室一卫",
+						price: "118"
+					},
+					{
+						type: "两室两卫",
+						price: "138"
+					},
+					{
+						type: "三室两卫",
+						price: "158"
+					},
+					{
+						type: "四室三卫",
+						price: "228"
+					},
+					{
+						type: "200-250平米",
+						price: "298"
+					},
+					{
+						type: "200-300平米",
+						price: "398"
+					},
+					{
+						type: "三层别墅",
+						price: "498"
+					},
+					{
+						type: "四层别墅",
+						price: "598"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: ""
+			},
+			{
+				id: "57e0e0189f5160dc048b4568",
+				name: "深度清洁",
+				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%B7%B1%E5%BA%A6%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_01.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_02.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_03.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%B7%B1%E5%BA%A6%E8%AF%A6%E6%83%85%E9%A1%B51128_04.jpg"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "2",
+				type_str: "深度清洁",
+				extra: [
+					{
+						type: "卧室清洁",
+						price: "188"
+					},
+					{
+						type: "客厅清洁",
+						price: "288"
+					},
+					{
+						type: "厨房清洁",
+						price: "388"
+					},
+					{
+						type: "卫生间清洁",
+						price: "188"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: ""
+			},
+			{
+				id: "57e0e0369f5160b1048b456b",
+				name: "除螨杀菌",
+				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/1128%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C%E9%A6%96%E5%9B%BE.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_01.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_02.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_03.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_04.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_05.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_06.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_07.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_08.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_09.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E9%99%A4%E8%9E%A8%E6%9D%80%E8%8F%8C_10.jpg"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "3",
+				type_str: "除螨杀菌",
+				extra: [
+					{
+						type: "儿童床",
+						price: "80"
+					},
+					{
+						type: "布艺窗帘",
+						price: "100"
+					},
+					{
+						type: "整床除螨",
+						price: "180"
+					},
+					{
+						type: "整套布艺沙发",
+						price: "160"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: ""
+			},
+			{
+				id: "57e0e04e9f5160af048b456b",
+				name: "家电清洗",
+				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/4%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97%E9%A6%96%E5%9B%BE.jpg',
+				desc: [{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/4%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97%E9%A6%96%E5%9B%BE.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_1%28720+1165%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_2%28720+844%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_3%28720+1129%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_4%28720+1204%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_5%28720+1246%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_6%28720+1257%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_7%28720+674%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5%E6%B8%85%E6%B4%97_8%28720+786%29.jpg"}],
+				status: 1,
+				is_extra: 0,
+				order: 0,
+				type: "4",
+				type_str: "家电清洗",
+				extra: [
+					{
+						type: "微波炉",
+						price: "60"
+					},
+					{
+						type: "洗衣机",
+						price: "100"
+					},
+					{
+						type: "油烟机",
+						price: "120"
+					},
+					{
+						type: "挂式空调",
+						price: "100"
+					},
+					{
+						type: "立式空调",
+						price: "130"
+					},
+					{
+						type: "冰箱-单开门",
+						price: "100"
+					},
+					{
+						type: "冰箱-双开门",
+						price: "130"
+					}
+				],
+				action_user: "",
+				action_time: "",
+				action_log: ""
+			}
+		];
 		// this.allList=[];
 		//列出所有的产品
 		Product.prototype.getListAll = function (userID,callback) {

www/webapp/o2o/js/page/home.js

@@ -208,8 +208,6 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 		afteropen: function (pageData, dtd) {
 			var $view = this;
 			var $doc = $(document);
-
-
 			/*setTimeout(function () {
 			 /!*设置页面高度*!/
 			 var homeBox = $('.home-box');
@@ -251,18 +249,10 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 						// autoplayDisableOnInteraction: false
 					});
 				}, 200);
-				var imgHeight=function () {
-					setTimeout(function () {
-						$('.btn-banner-recharge').height($('.swiper-img').height());
-						console.log("成功被调用");
-					},500);
-				};
 				setTimeout(function () {
 					pageData.scroll = new IScroll('#homeScroll');
-					imgHeight();
 				}, 500);
 
-
 				// 目前的作用只是供后端判断，该用户是否为新用户，所以没有回调。
 				product.getListAll(user.id);
 				address.getList({

www/webapp/o2o/js/page/month/one.js

@@ -30,8 +30,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 			//预约
 			$.newTouch('.appointment', function (event) {
 				event.preventDefault();
-				// window.location.href = '/index.php?r=o2o/advisory/month';
-				// window.location.href = 'commontest.yiguanjia.me/index.php?r=o2o/advisory/month';
+				window.location.href = '/index.php?r=o2o/advisory/month';
 			}, $view);
 			// 咨询
 			$.newTouch('.im', function (event) {

www/webapp/o2o/tpl/hire/index.html

@@ -1,39 +0,0 @@
-{{ if showNavBar }}
-<header class="bar bar-nav">
-	<a class="left-button back-button">
-		<div class="icon icon-left-nav"></div>
-	</a>
-	<h1 class="title">招贤纳士</h1>
-</header>
-{{ /if }}
-<div class="content" id="placeOrderScroll">
-	<div class="top-content">
-		<p>招募上门宠物保洁师</p>
-	</div>
-	<div class="page-content">
-		<div class="logo-box">
-			<div class="logo"></div>
-			<h2>壹管家宠物</h2>
-			<h3>专业宠物服务平台</h3>
-		</div>
-		<div class="des">
-			<p>岗位职责</p>
-			<p>资深保洁师：独立操作各种宠物造型的修剪工作。</p>
-			<p>保洁师助理：独立完成宠物洗澡工作。</p>
-			<br>
-
-			<p class="bold">公司福利</p>
-			<p class="bold">1.远高于传统美容店的底薪。</p>
-			<p class="bold">2.全上海各区都有宿舍，就近安排住宿。</p>
-			<p class="bold">3.完善的晋升机制，对业绩考评优秀的保洁师，公司将统一组织培训深造、考级。</p>
-			<br>
-			{{ if !showNavBar }}
-            <p class="bold">联系电话: <a href="tel:021-62109097">021-62109097</a> </p>
-			{{ else }}
-			<p class="bold">联系电话: <a class="service-telephone">021-62109097</a> </p>
-			{{ /if }}
-			<br>
-		</div>
-	</div>
-</div>
-

www/webapp/o2o/tpl/home/index.html

@@ -19,14 +19,14 @@
 						<div class="swiper-container">
 							<div class="swiper-wrapper">
 								<div class="swiper-slide btn-banner-recharge">
-									<img class="swiper-img" src="http://odulvej8l.bkt.clouddn.com/banner.jpg" alt="">
+									<img class="lazy" src="http://odulvej8l.bkt.clouddn.com/banner.jpg" alt="">
 								</div>
 							</div>
 							<div class="pagination"></div>
 						</div>
 
 						<div class="box">
-							<img src="http://odulvej8l.bkt.clouddn.com/40456740739231372%28BAT%29.jpg" alt="">
+							<img src="http://odulvej8l.bkt.clouddn.com/%E6%9C%88%E5%AD%90.jpg" alt="">
 							<div class="box-package">
 								<div class="month-one"></div>
 								<div class="month-two"></div>
@@ -35,14 +35,10 @@
 							</div>
 							<div class="characteristic"></div>
 						</div>
+						</div>
 					</div>
-<<<<<<< HEAD
-				<div style="width: 100%;padding-bottom: 13%;"></div>
-=======
->>>>>>> 3a981d9326a5fcd6ab7acd4da316b414932ad6c7
+				<div style="width: 100%;"></div>
 				</div>
-				<div style="width: 100%;padding-bottom: 15%;position: absolute;bottom: 0;right: 0;"></div>
-			</div>
 			<div class="box-footer">
 				<div class="appointment"></div>
 				<div class="im"></div>
@@ -51,49 +47,49 @@
 			<div style="position: fixed;width: 100%;bottom: 0;"><img src="http://odulvej8l.bkt.clouddn.com/footer.png"
 			                                                         style="display: block;width: 100%;" alt=""></div>
 			<!--<div style="position: fixed;width: 100%;bottom: 0;"><img style="width: 100%;display: block;" src="http://odulvej8l.bkt.clouddn.com/footer.png" alt=""></div>-->
-			<!--<div class="prevent-scroll">
-				<div class="box my-action">
-					&lt;!&ndash;首页&ndash;&gt;
-					<div class="width-percent-33">
-						<div class="title-container-square">
-							<a class="btn-home-action btn-action-my-order appointment">
-								<div class="logo logo-my-order"></div>
-								<div class="name">预约</div>
-							</a>
+				<!--<div class="prevent-scroll">
+					<div class="box my-action">
+						&lt;!&ndash;首页&ndash;&gt;
+						<div class="width-percent-33">
+							<div class="title-container-square">
+								<a class="btn-home-action btn-action-my-order appointment">
+									<div class="logo logo-my-order"></div>
+									<div class="name">预约</div>
+								</a>
+							</div>
 						</div>
-					</div>
-					&lt;!&ndash;LOGO&ndash;&gt;
-					<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>
+						&lt;!&ndash;LOGO&ndash;&gt;
+						<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>
-					&lt;!&ndash;我的&ndash;&gt;
-					<div class="width-percent-33">
-						<div class="title-container-square">
-							<a class="btn-home-action appointment">
-								<div class="logo im"></div>
-								<div class="name">咨询</div>
-							</a>
+						&lt;!&ndash;我的&ndash;&gt;
+						<div class="width-percent-33">
+							<div class="title-container-square">
+								<a class="btn-home-action appointment">
+									<div class="logo im"></div>
+									<div class="name">咨询</div>
+								</a>
+							</div>
 						</div>
 					</div>
-				</div>
-			</div>-->
-			<!--弹框-->
-			<!--				<div class="popup-box">
-								<div class="popup close"></div>
-								<div class="popup-img"></div>
-								<div class="popup-close close"><div class="nav-li-box">
-									<div class="nav-li">
-										<hr class="navli-1 rotatel">
-										&lt;!&ndash;<hr class="navli-3 nav-li-hr-3">&ndash;&gt;
-										<hr class="navli-2 rotater">
-									</div>
-								</div></div>
-							</div>-->
+				</div>-->
+				<!--弹框-->
+				<!--				<div class="popup-box">
+									<div class="popup close"></div>
+									<div class="popup-img"></div>
+									<div class="popup-close close"><div class="nav-li-box">
+										<div class="nav-li">
+											<hr class="navli-1 rotatel">
+											&lt;!&ndash;<hr class="navli-3 nav-li-hr-3">&ndash;&gt;
+											<hr class="navli-2 rotater">
+										</div>
+									</div></div>
+								</div>-->
+			</div>
 		</div>
 	</div>
-</div>
 </div>

www/webapp/o2o/tpl/module/pay/pay.js

@@ -1,58 +0,0 @@
-
-    var urlParam = {};
-    if (location.search.length > 1) {
-        for (var aItKey, nKeyId = 0, aCouples = location.search.substr(1).split("&"); nKeyId < aCouples.length; nKeyId++) {
-            aItKey = aCouples[nKeyId].split("=");
-            urlParam[decodeURIComponent(aItKey[0])] = aItKey.length > 1 ?  decodeURIComponent(aItKey[1]) : "";
-        }
-    }
-    // var amount = urlParam.amount,
-    //     created = urlParam.created,
-    //     body = urlParam.body;
-
-    // amount = amount / 100;
-    // created = new Date(parseInt(created) * 1000).toLocaleString();
-
-    // $('#order-name').text(body);
-    // $('#order-time').text(created)
-    // $('#order-result').text(amount+'元');
-
-    //调用微信JS api 支付
-    function jsApiCall() {
-        WeixinJSBridge.invoke(
-            'getBrandWCPayRequest', {
-                "appId": urlParam.appId,
-                "nonceStr": urlParam.nonceStr,
-                "package": 'prepay_id='+urlParam["package"],
-                "signType": urlParam.signType,
-                "timeStamp": urlParam.timeStamp,
-                "paySign": urlParam.paySign
-            },function(res){
-                if(res.err_msg == "get_brand_wcpay_request:ok" ) {
-                    $('#wx-pay').hide();
-                    $('#result').show();
-                    location.href = '/o2o/web/index#product';
-                } else if (res.err_msg == "get_brand_wcpay_request:cancel"){
-                    alert('取消支付');
-                } else {
-                    alert('支付失败');
-                    location.href = '/o2o/web/index#success';
-                }
-            }
-        );
-    }
-
-    function callpay() {
-        if (typeof WeixinJSBridge == "undefined"){
-            if( document.addEventListener ){
-                document.addEventListener('WeixinJSBridgeReady', jsApiCall, false);
-            } else if (document.attachEvent) {
-                document.attachEvent('WeixinJSBridgeReady', jsApiCall);
-                document.attachEvent('onWeixinJSBridgeReady', jsApiCall);
-            }
-        } else {
-            jsApiCall();
-        }
-    }
-
-

www/webapp/o2o/tpl/month/four.html

@@ -10,10 +10,10 @@
 <div class="content">
 	<div class="box-container">
 		<div class="box-container box box-vertical">
-			<div id="monthFourScroll" class="scroll-container box-flex-1" style="background: rgb(125,104,143);">
+			<div id="monthFourScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 				<div class="scroller">
 					<img
-						src="http://odulvej8l.bkt.clouddn.com/52%E5%A4%A9%E5%8E%8B%E7%BC%A9%281%29.jpg"
+						src="http://odulvej8l.bkt.clouddn.com/52%E5%A4%A9%E5%8E%8B%E7%BC%A9.jpg"
 						style="width: 100%;">
 				</div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>

www/webapp/o2o/tpl/month/one.html

@@ -10,10 +10,10 @@
 <div class="content">
 	<div class="box-container">
 		<div class="box-container box box-vertical">
-			<div id="monthOneScroll" class="scroll-container box-flex-1" style="background: rgb(125,104,143);">
+			<div id="monthOneScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 				<div class="scroller">
 					<img
-						src="http://odulvej8l.bkt.clouddn.com/26%E5%A4%A9%E8%87%B3%E6%83%A0%E5%8E%8B%E7%BC%A9%281%29.jpg"
+						src="http://odulvej8l.bkt.clouddn.com/26%E5%A4%A9%E8%87%B3%E6%83%A0%E5%8E%8B%E7%BC%A9.jpg"
 						style="width: 100%;">
 				</div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>

www/webapp/o2o/tpl/month/three.html

@@ -10,10 +10,10 @@
 <div class="content">
 	<div class="box-container">
 		<div class="box-container box box-vertical">
-			<div id="monthThreeScroll" class="scroll-container box-flex-1" style="background: rgb(125,104,143);">
+			<div id="monthThreeScroll" class="scroll-container box-flex-1" style="background: #7f6b8e;">
 				<div class="scroller">
 					<img
-						src="http://odulvej8l.bkt.clouddn.com/42%E5%A4%A9%E5%8E%8B%E7%BC%A9%281%29.jpg"
+						src="http://odulvej8l.bkt.clouddn.com/42%E5%A4%A9%E5%8E%8B%E7%BC%A9.jpg"
 						style="width: 100%;">
 				</div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>

www/webapp/o2o/tpl/month/two.html

@@ -10,10 +10,10 @@
 <div class="content">
 	<div class="box-container">
 		<div class="box-container box box-vertical">
-			<div id="monthTwoScroll" class="scroll-container box-flex-1" style="background:rgb(125,104,143);">
+			<div id="monthTwoScroll" class="scroll-container box-flex-1" style="background:#7f6b8e;">
 				<div class="scroller">
 					<img
-						src="http://odulvej8l.bkt.clouddn.com/26%E5%A4%A9-%E8%87%B3%E6%82%A6%E5%8E%8B%E7%BC%A9%281%29.jpg"
+						src="http://odulvej8l.bkt.clouddn.com/26%E5%A4%A9-%E8%87%B3%E6%82%A6%E5%8E%8B%E7%BC%A9.jpg"
 						style="width: 100%;">
 				</div>
 				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>