洪海涛 8 年 前
コミット
6edda6c28a

+ 1 - 1
www/protected/modules/o2o/views/advisory/enterprise.php

@@ -105,7 +105,7 @@
     <!--我的-->
     <div class="width-percent-33">
       <div class="title-container-square">
-        <a class="btn-home-action btn-action-coupon">
+        <a class="btn-home-action btn-action-coupon" href="/index.php?r=o2o/web/index">
           <div class="logo logo-coupon"style="margin-bottom: 0.5rem;"></div>
           <div class="name">我的</div>
         </a>

+ 2 - 2
www/webapp/common/css/common.css

@@ -190,7 +190,7 @@
 	width: 100%;
 	position: fixed;
 	bottom: 0;
-	background-color: #2f004e;
+	background-color: #2a2400;
 }
 
 .prevent-scroll .width-percent-33 .title-container-square {
@@ -250,7 +250,7 @@
 	padding: 25%;
 	background-size: 100%;
 	margin-top: -15px;
-	background:url(http://odulvej8l.bkt.clouddn.com/tab_butler.png) 0 0 no-repeat #2f004e;
+	background:url(http://odulvej8l.bkt.clouddn.com/tab_butler.png) 0 0 no-repeat #2a2400;
 	background-size: 75% 75%;
 	background-position: center;
 }

+ 47 - 0
www/webapp/moonclub/css/address.css

@@ -0,0 +1,47 @@
+.spa-page-address-list .username {
+	display: inline-block;
+	font-size: 14px;
+}
+
+.spa-page-address-list .mobile {
+	display: inline-block;
+	margin-left: 20px;
+	font-size: 14px;
+	font-size: 14px;
+}
+
+.spa-page-address-list .address {
+	font-size: 12px;
+}
+.spa-page-address-list .btn-block {
+	margin-bottom:0!important;
+}
+.spa-page-address-poisition .search-form {
+	position: relative;
+}
+.spa-page-address-poisition .search-city {
+	position: absolute;
+	left: 15px;
+	line-height: 40px;
+}
+.spa-page-address-poisition #search-text {
+	padding-right: 80px;
+	padding-left: 60px;
+}
+.spa-page-address-poisition .search-form .search-btn {
+	position: absolute;
+	right: 0;
+	top: 0;
+	bottom: 15px;
+	width: 80px;
+	background: #8bc34a;
+	color: #fff;
+	border: none;
+}
+.spa-page-address-poisition .search-form .search-btn:active {
+	outline: 0;
+}
+.spa-page-address-detail .btn-delete {
+	line-height: 44px;
+	z-index: 20;
+}

+ 9 - 0
www/webapp/moonclub/css/agreement.css

@@ -0,0 +1,9 @@
+.spa-page-agreement .content {
+	background-color: white;
+}
+
+.spa-page-agreement .page-content {
+	font-size: 14px;
+	color: #333;
+	padding: 15px;
+}

ファイルの差分が大きいため隠しています
+ 29 - 0
www/webapp/moonclub/css/append.css


+ 79 - 0
www/webapp/moonclub/css/bargain.css

@@ -0,0 +1,79 @@
+#bargainScroll .prevent-scroll {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    background-color: #2a2400;
+}
+#bargainScroll .prevent-scroll .width-percent-33 .title-container-square {
+    padding: 20%;
+    position: relative;
+    text-align: center;
+}
+#bargainScroll .prevent-scroll .width-percent-33 .title-container-square a {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+#bargainScroll .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%;
+}
+#bargainScroll .prevent-scroll .width-percent-33 .title-container-square a .name {
+    display: block;
+    margin-top: -5px;
+    font-size: 12px;
+}
+#bargainScroll .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;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .name {
+    color: #fff;
+}
+#bargainScroll .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;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(1) a .name {
+    color: #b89400;
+}
+#bargainScroll .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;
+}
+#bargainScroll .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;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(3) a .name {
+    color: #b89400;
+}
+#bargainScroll .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;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .name {
+    color: #fff;
+}

+ 157 - 0
www/webapp/moonclub/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;
+}

+ 2 - 0
www/webapp/moonclub/css/common.css

@@ -152,6 +152,7 @@ ul, li {
 
 .page-content {
 	padding: 15px 0;
+	/*background: #efeff4;*/
 }
 
 /* picker */
@@ -225,6 +226,7 @@ ul, li {
 
 .coupon-items {
 	background: #efeff4;
+	margin-bottom: 13%;
 }
 
 .coupon-info {

+ 254 - 0
www/webapp/moonclub/css/desc.css

@@ -0,0 +1,254 @@
+.spa-page-desc {
+	font-size: 13px;
+	color: #333333;
+}
+
+.spa-page-desc .advantage {
+	padding: 15px;
+}
+
+.spa-page-desc .advantage-title {
+	width: 100%;
+	text-align: center;
+	font-size: 16px;
+	font-weight: bold;
+	position: relative;
+	height: 44px;
+	line-height: 44px;
+	overflow: hidden;
+}
+
+.spa-page-desc .advantage-title-self {
+	background-color: #8bc34a;
+	width: 50%;
+	color: #ffffff;
+	border-radius: 22px 0 0 22px;
+}
+
+.spa-page-desc .advantage-title-blank {
+	position: absolute;
+	left: 44%;
+	top: -50%;
+	z-index: 1;
+	transform: rotate(-66deg);
+	-webkit-transform: rotate(23deg);
+	width: 12%;
+	height: 200%;
+	background-color: #efeff4;
+}
+
+.spa-page-desc .advantage-title-sign {
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	z-index: 2;
+	-webkit-transform: translate(-50%, -50%);
+	transform: translate(-50%, -50%);
+}
+
+.spa-page-desc .advantage-title-other {
+	background-color: #cdced0;
+	width: 50%;
+	color: #666666;
+	border-radius: 0 22px 22px 0;
+}
+
+.spa-page-desc .advantage-detail {
+	border-radius: 6px;
+	margin: 20px 0;
+	overflow: hidden;
+}
+
+.spa-page-desc .advantage-detail ul {
+	padding: 0;
+	margin: 0;
+}
+
+.spa-page-desc .advantage-detail-cell {
+	position: relative;
+	height: 44px;
+	line-height: 44px;
+	text-align: left;
+	font-size: 13px;
+	color: #ffffff;
+}
+
+.spa-page-desc .advantage-detail-cell .cell-left,
+.spa-page-desc .advantage-detail-cell .cell-right {
+	padding-left: 10px;
+	width: 50%;
+}
+
+.spa-page-desc .advantage-detail-cell .cell-arrow {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+	background-repeat: no-repeat;
+	background-size: cover;
+	width: 5px;
+	height: 8px;
+}
+
+.spa-page-desc .advantage-detail-cell:nth-child(odd) .cell-left {
+	background-color: #9ccc65;
+}
+
+.spa-page-desc .advantage-detail-cell:nth-child(even) .cell-left {
+	background-color: #84ba47;
+}
+
+.spa-page-desc .advantage-detail-cell:nth-child(odd) .cell-right {
+	background-color: #d4d5d7;
+}
+
+.spa-page-desc .advantage-detail-cell:nth-child(even) .cell-right {
+	background-color: #c3c4c6;
+}
+
+.spa-page-desc .advantage-detail-cell:nth-child(odd) .cell-arrow {
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAARCAMAAAA8P6bpAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAYFBMVEWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGWczGX///8CoIk/AAAAHnRSTlMAnwrPJO9P/ocDvhbkO/pvqQyspWzjOLwVhEwhngiqTKsIAAAAAWJLR0QfBQ0QvQAAAE5JREFUCNdFzksSgCAMA1BQUfyhooDf3P+Y7pKu3nQ6TYytDAd1I8O1Mjrf08AwyphmGWGRgXWTEeWd+3DwPmX+KSdzL+a6Wz0f9nw/8gc1xArT3KJM0wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNS0xOFQwMzowODo0MCswMDowMNGYU3kAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDUtMThUMDM6MDg6NDArMDA6MDCgxevFAAAAAElFTkSuQmCC);
+}
+
+.spa-page-desc .advantage-detail-cell:nth-child(even) .cell-arrow {
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAARCAMAAAA8P6bpAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAYFBMVEWEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukeEukf////06S1NAAAAHnRSTlMAnwrPJO9P/ocDvhbkO/pvqQyspWzjOLwVhEwhngiqTKsIAAAAAWJLR0QfBQ0QvQAAAE5JREFUCNdFzksSgCAMA1BQUfyhooDf3P+Y7pKu3nQ6TYytDAd1I8O1Mjrf08AwyphmGWGRgXWTEeWd+3DwPmX+KSdzL+a6Wz0f9nw/8gc1xArT3KJM0wAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNS0xOFQwMzoyMDozOSswMDowMAV+5oYAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTUtMDUtMThUMDM6MjA6MzkrMDA6MDB0I146AAAAAElFTkSuQmCC);
+}
+
+.spa-page-desc .group-title {
+	height: 32px;
+	line-height: 32px;
+	color: #ffffff;
+	background-color: #8bc34a;
+	padding-left: 15px;
+	font-size: 16px;
+	width: 112px;
+	border-radius: 0 16px 16px 0;
+	font-weight: bold;
+}
+
+.spa-page-desc .group-detail {
+	background-color: white;
+	padding: 15px;
+}
+
+.spa-page-desc .product-title {
+	color: #333333;
+	font-size: 16px;
+}
+
+.spa-page-desc .price-table {
+	border-width: 1px;
+	border-color: #e3f1d4;
+	border-style: solid;
+	width: 100%;
+	background-color: rgba(232, 243, 219, 0.6);
+	margin: 15px 0;
+}
+
+.spa-page-desc .price-table th, .spa-page-desc .price-table td {
+	width: 20%;
+	text-align: center;
+	height: 40px;
+	border-width: 0 1px 1px 0;
+	border-color: #deeecb;
+	border-style: solid;
+}
+
+.spa-page-desc .price-table tr td:last-child, .spa-page-desc .price-table tr th:last-child {
+	border-right-width: 0;
+}
+
+.spa-page-desc .price-table tr:last-child td, .spa-page-desc .price-table tr:last-child th {
+	border-bottom-width: 0;
+}
+
+.spa-page-desc .price-table th {
+	color: #a2cf6e;
+	font-size: 12px;
+}
+
+.spa-page-desc .price-table td {
+	color: #333333;
+	font-size: 12px;
+}
+
+.spa-page-desc .price-table .pet-type {
+	font-size: 15px;
+}
+
+.spa-page-desc .product-desc {
+	color: #666666;
+	font-size: 10px;
+	margin-bottom: 10px;
+}
+
+/* process */
+
+.spa-page-desc .process ul {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+}
+
+.spa-page-desc .process-box {
+	width: 100%;
+}
+
+.spa-page-desc .process-line {
+	width: 20px;
+	position: relative;
+}
+
+.spa-page-desc .process ul li:first-child .line {
+	top: 20px;
+}
+
+.spa-page-desc .process ul li:last-child .line {
+	height: 20px;
+}
+
+.spa-page-desc .process-line .line {
+	width: 1px;
+	height: 100%;
+	background-color: #8bc34a;
+	position: absolute;
+	top: 0;
+	right: 13px;
+	z-index: 1;
+}
+
+.spa-page-desc .process-line .arrow {
+	width: 6px;
+	height: 9px;
+	position: absolute;
+	top: 16px;
+	right: 0;
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAASCAYAAABvqT8MAAAAzklEQVQoU5WSTQ6CMBBGOwgFExMTNwLRpWdQ8SD+7eGybKvGLjRGEyMrvMDYEjGkgoNdz5t5802BtXxpmjrhpL+ENvWnh/C9Lk8AMSSBe36cosW2gMzVzRsBIQQfjOwVACyqFrVAVcFU/gKuuZx1LNyUCo1AoTC218Ag+hVEMeGc7QLXc2KdApUa3J77yALVGZFTxUVKfwOaumSH0OGQqAh9asonJSml2xuiWprNyaWrBZRi7eHeirFSDMjDlQVNdyE/n6lIAuZhWwEaKhVfsaBQAjKbP8QAAAAASUVORK5CYII=) no-repeat;
+	background-size: cover;
+}
+
+.spa-page-desc .process-line .circle {
+	width: 7px;
+	height: 7px;
+	border: 1px solid #8bc34a;
+	border-radius: 50%;
+	position: absolute;
+	top: 17px;
+	right: 10px;
+	z-index: 2;
+	background: white;
+}
+
+.spa-page-desc .process-step {
+	background-color: rgba(232, 243, 219, 0.6);
+	border-radius: 5px;
+	padding: 10px;
+	margin-bottom: 10px;
+}
+
+/* notes */
+
+.spa-page-desc .notes .group-detail {
+	padding-bottom: 30px;
+}

ファイルの差分が大きいため隠しています
+ 39 - 0
www/webapp/moonclub/css/hire.css


+ 0 - 4
www/webapp/moonclub/css/home.css

@@ -317,8 +317,4 @@ body {
 	/*display: inline-block;*/
 	padding-top: 13.33%;
 	/*background-color: #fa0090;*/
-}
-
-.box-container{
-	height: 100%;
 }

+ 79 - 0
www/webapp/moonclub/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;
+}

+ 79 - 0
www/webapp/moonclub/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;
+}

+ 22 - 1
www/webapp/moonclub/css/main.css

@@ -1,4 +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("./common.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");

+ 187 - 0
www/webapp/moonclub/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;
+        }
+    }
+}

+ 18 - 0
www/webapp/moonclub/css/month.css

@@ -0,0 +1,18 @@
+.request {
+	width: 100%;
+	position: fixed;
+	bottom: 0;
+}
+
+.request div {
+	width: 50%;
+	color: #fff;
+	line-height: 30px;
+	border-radius: 5px;
+	text-align: center;
+	float: left;
+	display: inline-block;
+	padding: 5px 35px;
+	border: 1px solid rgba(0, 0, 0, 0.11);
+	background-color: rgba(255, 182, 233, 0.83);
+}

+ 115 - 0
www/webapp/moonclub/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%;
+}

+ 92 - 0
www/webapp/moonclub/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;
+}

+ 19 - 0
www/webapp/moonclub/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;
+}

ファイルの差分が大きいため隠しています
+ 169 - 0
www/webapp/moonclub/css/placeOrder.css


ファイルの差分が大きいため隠しています
+ 64 - 0
www/webapp/moonclub/css/product.css


ファイルの差分が大きいため隠しています
+ 44 - 0
www/webapp/moonclub/css/ratchetOverloading.css


+ 117 - 0
www/webapp/moonclub/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;
+}

+ 86 - 0
www/webapp/moonclub/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;
+}

+ 308 - 0
www/webapp/moonclub/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;
+    }
+}

ファイルの差分が大きいため隠しています
+ 0 - 0
www/webapp/moonclub/dist/css/main.css


ファイルの差分が大きいため隠しています
+ 0 - 0
www/webapp/o2o/dist/css/main.css


ファイルの差分が大きいため隠しています
+ 0 - 5
www/webapp/o2o/js/build/template.js


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません