Merge branch 'develop' into release/1.0
Showing
9 changed files
with
50 additions
and
32 deletions
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | <swipe class="swipe swipe-{{floor.length}}"> | 3 | <swipe class="swipe swipe-{{floor.length}}"> |
4 | <swipe-item v-for="item in floor" v-bind:style="{backgroundColor: item.bgColor}"> | 4 | <swipe-item v-for="item in floor" v-bind:style="{backgroundColor: item.bgColor}"> |
5 | <a href="{{item.url}}" title="{{item.title}}"> | 5 | <a href="{{item.url}}" title="{{item.title}}"> |
6 | - <img v-lazy="item.src | resize 750 365"> | 6 | + <img v-bind:src="item.src | resize 750 365"> |
7 | </a> | 7 | </a> |
8 | </swipe-item> | 8 | </swipe-item> |
9 | </swipe> | 9 | </swipe> |
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | <div class="list-item exchange-mode"> | 17 | <div class="list-item exchange-mode"> |
18 | <span>换货方式</span> | 18 | <span>换货方式</span> |
19 | <i class="icon icon-right right"></i> | 19 | <i class="icon icon-right right"></i> |
20 | - <select class="right" v-model="deliveryTpye"> | 20 | + <select class="right select-mode" v-model="deliveryTpye"> |
21 | <option v-for="mode in delivery" :value="mode.id">{{mode.name}}</option> | 21 | <option v-for="mode in delivery" :value="mode.id">{{mode.name}}</option> |
22 | </select> | 22 | </select> |
23 | </div> | 23 | </div> |
@@ -302,7 +302,7 @@ | @@ -302,7 +302,7 @@ | ||
302 | } | 302 | } |
303 | 303 | ||
304 | .exchange-info { | 304 | .exchange-info { |
305 | - margin: 30px 0; | 305 | + margin: 20px 0; |
306 | background-color: #fff; | 306 | background-color: #fff; |
307 | } | 307 | } |
308 | 308 | ||
@@ -327,6 +327,10 @@ | @@ -327,6 +327,10 @@ | ||
327 | .icon:before { | 327 | .icon:before { |
328 | vertical-align: -5px; | 328 | vertical-align: -5px; |
329 | } | 329 | } |
330 | + | ||
331 | + .select-mode { | ||
332 | + margin-right: 25px; | ||
333 | + } | ||
330 | } | 334 | } |
331 | 335 | ||
332 | </style> | 336 | </style> |
@@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
4 | <div class="field" @click="openFeatureSelector(product.productId)"> | 4 | <div class="field" @click="openFeatureSelector(product.productId)"> |
5 | 换货的颜色尺码 | 5 | 换货的颜色尺码 |
6 | <div class="right"> | 6 | <div class="right"> |
7 | - <span v-if="product.change">颜色:{{product.change.color}} 尺码:{{product.change.size}}</span> | 7 | + <span class="change" v-if="product.change">颜色:{{product.change.color}} 尺码:{{product.change.size}}</span> |
8 | <i class="icon icon-right"></i> | 8 | <i class="icon icon-right"></i> |
9 | </div> | 9 | </div> |
10 | </div> | 10 | </div> |
@@ -64,6 +64,7 @@ | @@ -64,6 +64,7 @@ | ||
64 | padding: 0 30px; | 64 | padding: 0 30px; |
65 | background-color: #fff; | 65 | background-color: #fff; |
66 | font-size: 32px; | 66 | font-size: 32px; |
67 | + | ||
67 | &:after { | 68 | &:after { |
68 | position: absolute; | 69 | position: absolute; |
69 | z-index: 1; | 70 | z-index: 1; |
@@ -78,6 +79,11 @@ | @@ -78,6 +79,11 @@ | ||
78 | .field .right { | 79 | .field .right { |
79 | color: #b0b0b0; | 80 | color: #b0b0b0; |
80 | } | 81 | } |
82 | + | ||
83 | + .change { | ||
84 | + display: inline-block; | ||
85 | + margin-right: 14px; | ||
86 | + } | ||
81 | } | 87 | } |
82 | 88 | ||
83 | </style> | 89 | </style> |
@@ -191,8 +191,6 @@ | @@ -191,8 +191,6 @@ | ||
191 | font-size: 32px; | 191 | font-size: 32px; |
192 | line-height: 90px; | 192 | line-height: 90px; |
193 | background: #fff; | 193 | background: #fff; |
194 | - border-top: 1px solid #eee; | ||
195 | - border-bottom: 1px solid #eee; | ||
196 | } | 194 | } |
197 | 195 | ||
198 | .return-amount-info { | 196 | .return-amount-info { |
@@ -205,7 +203,7 @@ | @@ -205,7 +203,7 @@ | ||
205 | .return-amount-item { | 203 | .return-amount-item { |
206 | position: relative; | 204 | position: relative; |
207 | width: 100%; | 205 | width: 100%; |
208 | - height: 90px; | 206 | + height: 88px; |
209 | 207 | ||
210 | &:after { | 208 | &:after { |
211 | content: ""; | 209 | content: ""; |
@@ -238,6 +236,7 @@ | @@ -238,6 +236,7 @@ | ||
238 | 236 | ||
239 | select { | 237 | select { |
240 | direction: rtl; | 238 | direction: rtl; |
239 | + margin-right: 24px; | ||
241 | } | 240 | } |
242 | } | 241 | } |
243 | } | 242 | } |
@@ -8,13 +8,13 @@ | @@ -8,13 +8,13 @@ | ||
8 | <slot name="type">退货原因</slot> | 8 | <slot name="type">退货原因</slot> |
9 | 9 | ||
10 | <span class="icon icon-right"></span> | 10 | <span class="icon icon-right"></span> |
11 | - <select v-model="product.reason.id" name="reason"> | 11 | + <select class="reason" v-model="product.reason.id" name="reason"> |
12 | <option v-for="reason in reasons" v-bind:value="reason.id" selected="{{reason.id === product.reason.id}}">{{reason.name}}</option> | 12 | <option v-for="reason in reasons" v-bind:value="reason.id" selected="{{reason.id === product.reason.id}}">{{reason.name}}</option> |
13 | </select> | 13 | </select> |
14 | </div> | 14 | </div> |
15 | <template v-if="specialReasons.indexOf(product.reason.id) !== -1"> | 15 | <template v-if="specialReasons.indexOf(product.reason.id) !== -1"> |
16 | <div class="remark"> | 16 | <div class="remark"> |
17 | - <textarea v-model="product.remark" rows="3" max-length="100" placeholder="原因说明"></textarea> | 17 | + <textarea v-model="product.remark" rows="4" max-length="100" placeholder="原因说明"></textarea> |
18 | </div> | 18 | </div> |
19 | <div class="image-list clearfix"> | 19 | <div class="image-list clearfix"> |
20 | <div class="image-item" v-for="image in imageListForShow"> | 20 | <div class="image-item" v-for="image in imageListForShow"> |
@@ -83,14 +83,14 @@ | @@ -83,14 +83,14 @@ | ||
83 | font-size: 32px; | 83 | font-size: 32px; |
84 | line-height: 90px; | 84 | line-height: 90px; |
85 | background: #f6f6f6; | 85 | background: #f6f6f6; |
86 | + | ||
86 | &:after { | 87 | &:after { |
87 | content: ""; | 88 | content: ""; |
88 | display: block; | 89 | display: block; |
89 | width: 100%; | 90 | width: 100%; |
90 | height: 30px; | 91 | height: 30px; |
91 | - border-top: 1px solid #eee; | ||
92 | - border-bottom: 1px solid #eee; | ||
93 | } | 92 | } |
93 | + | ||
94 | .tip { | 94 | .tip { |
95 | position: relative; | 95 | position: relative; |
96 | padding: 0 30px; | 96 | padding: 0 30px; |
@@ -115,15 +115,7 @@ | @@ -115,15 +115,7 @@ | ||
115 | width: 100%; | 115 | width: 100%; |
116 | height: 90px; | 116 | height: 90px; |
117 | background: #fff; | 117 | background: #fff; |
118 | - &:after { | ||
119 | - content: ""; | ||
120 | - position: absolute; | ||
121 | - left: 0; | ||
122 | - bottom: -1px; | ||
123 | - width: 690px; | ||
124 | - height: 0; | ||
125 | - border-bottom: 1px solid #eee; | ||
126 | - } | 118 | + |
127 | .icon, | 119 | .icon, |
128 | select { | 120 | select { |
129 | direction: rtl; | 121 | direction: rtl; |
@@ -132,14 +124,19 @@ | @@ -132,14 +124,19 @@ | ||
132 | line-height: 90px; | 124 | line-height: 90px; |
133 | color: #b0b0b0; | 125 | color: #b0b0b0; |
134 | } | 126 | } |
127 | + | ||
128 | + .reason { | ||
129 | + margin-right: 25px; | ||
130 | + } | ||
135 | } | 131 | } |
136 | .remark { | 132 | .remark { |
137 | margin-top: 20px; | 133 | margin-top: 20px; |
138 | padding: 0 30px; | 134 | padding: 0 30px; |
139 | background: #fff; | 135 | background: #fff; |
140 | - border-top: 1px solid #eee; | 136 | + height: 190px; |
137 | + | ||
141 | textarea { | 138 | textarea { |
142 | - margin-top: 30px; | 139 | + margin-top: 25px; |
143 | width: 100%; | 140 | width: 100%; |
144 | font-size: 24px; | 141 | font-size: 24px; |
145 | line-height: 40px; | 142 | line-height: 40px; |
@@ -149,16 +146,20 @@ | @@ -149,16 +146,20 @@ | ||
149 | } | 146 | } |
150 | .image-list { | 147 | .image-list { |
151 | padding: 30px; | 148 | padding: 30px; |
149 | + padding-top: 5px; | ||
152 | background: #fff; | 150 | background: #fff; |
151 | + | ||
153 | .image-item { | 152 | .image-item { |
154 | position: relative; | 153 | position: relative; |
155 | float: left; | 154 | float: left; |
156 | - margin-right: 20px; | ||
157 | - width: 150px; | ||
158 | - height: 150px; | 155 | + margin-right: 25px; |
156 | + width: 154px; | ||
157 | + height: 154px; | ||
158 | + | ||
159 | &:last-child { | 159 | &:last-child { |
160 | margin-right: 0; | 160 | margin-right: 0; |
161 | } | 161 | } |
162 | + | ||
162 | .icon-close { | 163 | .icon-close { |
163 | position: absolute; | 164 | position: absolute; |
164 | right: -20px; | 165 | right: -20px; |
@@ -18,10 +18,11 @@ | @@ -18,10 +18,11 @@ | ||
18 | <img :src="entity.brand.brandIco | resize 110 68"/> | 18 | <img :src="entity.brand.brandIco | resize 110 68"/> |
19 | 19 | ||
20 | <h2>{{entity.brand.brandName}}</h2> | 20 | <h2>{{entity.brand.brandName}}</h2> |
21 | - <a :href="entity.brand.brandDomain | brandUrl"> | ||
22 | - 进入店铺 | 21 | + <div class="brand-go"> |
22 | + <span>进入店铺</span> | ||
23 | <span class="icon icon-right"></span> | 23 | <span class="icon icon-right"></span> |
24 | - </a> | 24 | + </div> |
25 | + <a :href="entity.brand.brandDomain | brandUrl"></a> | ||
25 | </show-box> | 26 | </show-box> |
26 | 27 | ||
27 | <show-box v-if="intro.productDescBo"> | 28 | <show-box v-if="intro.productDescBo"> |
@@ -217,7 +218,7 @@ | @@ -217,7 +218,7 @@ | ||
217 | line-height: $lh; | 218 | line-height: $lh; |
218 | } | 219 | } |
219 | 220 | ||
220 | - a { | 221 | + .brand-go { |
221 | float: right; | 222 | float: right; |
222 | font-size: 28px; | 223 | font-size: 28px; |
223 | line-height: $lh; | 224 | line-height: $lh; |
@@ -227,6 +228,14 @@ | @@ -227,6 +228,14 @@ | ||
227 | .icon-right { | 228 | .icon-right { |
228 | margin-left: 30px; | 229 | margin-left: 30px; |
229 | } | 230 | } |
231 | + | ||
232 | + a { | ||
233 | + position: absolute; | ||
234 | + top: 0; | ||
235 | + right: 0; | ||
236 | + bottom: 0; | ||
237 | + left: 0; | ||
238 | + } | ||
230 | } | 239 | } |
231 | 240 | ||
232 | .product-detail-desc { | 241 | .product-detail-desc { |
-
Please register or login to post a comment