fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit 8aea592c6a692fa94832f3f3b52dad3755766fdc 1 parent 17bcf469

式样调整

Inline Side-by-side
Showing 5 changed files with 46 additions and 213 deletions
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 帮助中心 70 帮助中心
71 <span class="num"><span class="icon icon-right"></span></span> 71 <span class="num"><span class="icon icon-right"></span></span>
72 </a> 72 </a>
73 - <a class="list-item" href="/home/onlineService"> 73 + <a class="list-item" href="/home/online-service">
74 在线客服 74 在线客服
75 <span class="num"><span class="icon icon-right"></span></span> 75 <span class="num"><span class="icon icon-right"></span></span>
76 </a> 76 </a>
@@ -29,7 +29,8 @@ @@ -29,7 +29,8 @@
29 height: 35px; 29 height: 35px;
30 margin-right: 15px; 30 margin-right: 15px;
31 margin-top: 80px; 31 margin-top: 80px;
32 - background: resolve("home/fav/fav-del.png"); 32 + background: resolve("home/fav/fav-del.png");
  33 + background-size: 100%;
33 } 34 }
34 } 35 }
35 36
@@ -151,9 +152,10 @@ @@ -151,9 +152,10 @@
151 list-style: none; 152 list-style: none;
152 153
153 li { 154 li {
154 - height: 130px; 155 + height: 135px;
155 overflow: hidden; 156 overflow: hidden;
156 margin-top: 20px; 157 margin-top: 20px;
  158 + border-bottom: 1px solid #e0e0e0;
157 } 159 }
158 160
159 .fav-del { 161 .fav-del {
@@ -168,7 +170,8 @@ @@ -168,7 +170,8 @@
168 height: 35px; 170 height: 35px;
169 margin-right: 15px; 171 margin-right: 15px;
170 margin-top: 35px; 172 margin-top: 35px;
171 - background: resolve("home/fav/fav-del.png"); 173 + background: resolve("home/fav/fav-del.png");
  174 + background-size: 100%;
172 } 175 }
173 } 176 }
174 177
@@ -193,11 +196,10 @@ @@ -193,11 +196,10 @@
193 .fav-info-list { 196 .fav-info-list {
194 color: #444; 197 color: #444;
195 font-size: 24px; 198 font-size: 24px;
196 - border-bottom: 1px solid #e0e0e0;  
197 - padding-bottom: 20px; 199 + padding-bottom: 10px;
198 margin-right: 10px; 200 margin-right: 10px;
199 margin-top: 35px; 201 margin-top: 35px;
200 - height: 125px; 202 + height: 100px;
201 overflow: hidden; 203 overflow: hidden;
202 position: relative; 204 position: relative;
203 205
@@ -3,167 +3,8 @@ @@ -3,167 +3,8 @@
3 @import "feedback"; 3 @import "feedback";
4 @import "fav"; 4 @import "fav";
5 @import "about-us"; 5 @import "about-us";
6 -.my-page {  
7 - color: #444;  
8 - background: #f0f0f0;  
9 -  
10 - a {  
11 - color: #000;  
12 - }  
13 -  
14 - .user-info {  
15 - display: block;  
16 - position: relative;  
17 - padding: 0 30px;  
18 - color: #000;  
19 - font-size: 34px;  
20 - line-height: 138px;  
21 - height: 469px;  
22 - background-size: cover;  
23 - background: resolve("home/header-bg.png");  
24 - text-align: center;  
25 -  
26 - .user-avatar {  
27 - display: inline-block;  
28 - position: relative;  
29 - top: 90px;  
30 - width: 200px;  
31 - height: 200px;  
32 - border-radius: 50%;  
33 - border: 6px solid #a7a8a9;  
34 - background: resolve("home/user-icon.png");  
35 - background-size: 100%;  
36 - }  
37 -  
38 - .username {  
39 - display: inline-block;  
40 - padding: 0 16px;  
41 - text-overflow: ellipsis;  
42 - overflow: hidden;  
43 - white-space: nowrap;  
44 - font-size: 32px;  
45 - max-width: 260px;  
46 - }  
47 - }  
48 -  
49 - .login-btn {  
50 - display: inline-block;  
51 - top: 40px;  
52 - left: 194px;  
53 - width: 244px;  
54 - height: 82px;  
55 - line-height: 82px;  
56 - color: #fff;  
57 - border: 4px solid #fff;  
58 - margin: 150px auto;  
59 - }  
60 -  
61 - .my-order {  
62 - margin-bottom: 30px;  
63 - border-top: 1px solid #e0e0e0;  
64 - border-bottom: 1px solid #e0e0e0;  
65 - background: #fff;  
66 -  
67 - .order-title {  
68 - display: block;  
69 - padding: 0 29px;  
70 - font-size: 34px;  
71 - line-height: 88px;  
72 -  
73 - span {  
74 - color: #e0e0e0;  
75 - float: right;  
76 - }  
77 -  
78 - &.highlight {  
79 - background: #eee;  
80 - }  
81 -  
82 - .read-order {  
83 - font-size: 30px;  
84 - }  
85 - }  
86 -  
87 - .order-type {  
88 - padding: 20px 30px;  
89 - text-align: center;  
90 - border-top: 1px solid #e0e0e0;  
91 -  
92 - .type-item {  
93 - position: relative;  
94 - float: left;  
95 - color: #444;  
96 - font-size: 24px;  
97 - line-height: 1.5;  
98 - width: 170px;  
99 -  
100 - &.highlight {  
101 - background: #eee;  
102 - }  
103 -  
104 - .num {  
105 - position: absolute;  
106 - top: -24px;  
107 - right: 36px;  
108 - width: 72px;  
109 - height: 72px;  
110 - font-size: 34px;  
111 - line-height: 72px;  
112 - color: #fff;  
113 - background: #f03d35;  
114 - text-align: center;  
115 - border-radius: 50%;  
116 - transform: scale(0.5);  
117 - }  
118 - }  
119 - }  
120 - }  
121 -  
122 - .group-list {  
123 - margin-bottom: 30px;  
124 - border-top: 1px solid #e0e0e0;  
125 - border-bottom: 1px solid #e0e0e0;  
126 - background: #fff;  
127 -  
128 - .list-item {  
129 - display: block;  
130 - position: relative;  
131 - padding: 0 30px;  
132 - font-size: 34px;  
133 - line-height: 90px;  
134 - overflow: hidden;  
135 -  
136 - &.highlight {  
137 - background: #eee;  
138 - }  
139 -  
140 - &:after {  
141 - content: "";  
142 - position: absolute;  
143 - right: 0;  
144 - bottom: 0;  
145 - width: 100%;  
146 - height: 0;  
147 - border-top: 1px solid #f0f0f0;  
148 - }  
149 -  
150 - &:last-child:after {  
151 - content: none;  
152 - }  
153 - }  
154 -  
155 - .icon {  
156 - margin-right: 5px;  
157 - font-size: 34px;  
158 - vertical-align: top;  
159 - }  
160 -  
161 - .num {  
162 - color: #b0b0b0;  
163 - float: right;  
164 - }  
165 - }  
166 -}  
167 @import "order"; 6 @import "order";
168 @import "coin"; 7 @import "coin";
169 -/*@import "order-detail";*/  
  8 +/*@import "order-detail";*/
  9 +
  10 +
@@ -26,8 +26,6 @@ @@ -26,8 +26,6 @@
26 <script> 26 <script>
27 const $ = require('yoho-jquery'); 27 const $ = require('yoho-jquery');
28 const tip = require('common/tip'); 28 const tip = require('common/tip');
29 - const modal = require('common/modal');  
30 - const loading = require('common/loading');  
31 29
32 module.exports = { 30 module.exports = {
33 props: ['brandUrl'], 31 props: ['brandUrl'],
@@ -74,26 +72,23 @@ @@ -74,26 +72,23 @@
74 }, 72 },
75 delItem(index, id) { 73 delItem(index, id) {
76 let _this = this; 74 let _this = this;
77 - $.modal.confirm('', '确定刪除该收藏吗？', function() {  
78 - this.hide();  
79 - $.ajax({  
80 - method: 'post',  
81 - url: '/home/favorite/favdel',  
82 - data: {  
83 - favId: id,  
84 - type: 'brand'  
85 - }  
86 - }).then(function(data) {  
87 - if (data.code === 200) {  
88 - _this.brandData.splice(index, 1);  
89 - } else if (data.code === 400) {  
90 - $.modal.alert(data.message, '出错了！');  
91 - } else {  
92 - $.modal.alert('', '刪除收藏失败');  
93 - }  
94 - }).fail(function() {  
95 - $.modal.alert('', '网络错误');  
96 - }); 75 + $.ajax({
  76 + method: 'post',
  77 + url: '/home/favorite/favdel',
  78 + data: {
  79 + favId: id,
  80 + type: 'brand'
  81 + }
  82 + }).then(function(data) {
  83 + if (data.code === 200) {
  84 + _this.brandData.splice(index, 1);
  85 + } else if (data.code === 400) {
  86 + tip(data.message);
  87 + } else {
  88 + tip('刪除收藏失败');
  89 + }
  90 + }).fail(function() {
  91 + tip('网络错误');
97 }); 92 });
98 } 93 }
99 } 94 }
@@ -34,8 +34,6 @@ @@ -34,8 +34,6 @@
34 <script> 34 <script>
35 const $ = require('yoho-jquery'); 35 const $ = require('yoho-jquery');
36 const tip = require('common/tip'); 36 const tip = require('common/tip');
37 - const modal = require('common/modal');  
38 - const loading = require('common/loading');  
39 37
40 module.exports = { 38 module.exports = {
41 props: ['productUrl'], 39 props: ['productUrl'],
@@ -81,26 +79,23 @@ @@ -81,26 +79,23 @@
81 }, 79 },
82 delItem(index, id) { 80 delItem(index, id) {
83 let _this = this; 81 let _this = this;
84 - $.modal.confirm('', '确定刪除该收藏吗？', function() {  
85 - this.hide();  
86 - $.ajax({  
87 - method: 'post',  
88 - url: '/home/favorite/favdel',  
89 - data: {  
90 - favId: id,  
91 - type: 'product'  
92 - }  
93 - }).then(function(data) {  
94 - if (data.code === 200) {  
95 - _this.productData.splice(index, 1);  
96 - } else if (data.code === 400) {  
97 - $.modal.alert(data.message, '出错了！');  
98 - } else {  
99 - $.modal.alert('', '刪除收藏失败');  
100 - }  
101 - }).fail(function() {  
102 - $.modal.alert('', '网络错误');  
103 - }); 82 + $.ajax({
  83 + method: 'post',
  84 + url: '/home/favorite/favdel',
  85 + data: {
  86 + favId: id,
  87 + type: 'product'
  88 + }
  89 + }).then(function(data) {
  90 + if (data.code === 200) {
  91 + _this.productData.splice(index, 1);
  92 + } else if (data.code === 400) {
  93 + tip(data.message);
  94 + } else {
  95 + tip('刪除收藏失败');
  96 + }
  97 + }).fail(function() {
  98 + tip('网络错误');
104 }); 99 });
105 } 100 }
106 } 101 }