fe / xianyu-ufo-app-web · Commits

Go to a project

Authored by baoss
Commit fdb0f1cca79c771f0a21356128a8ee303d78f9d7 2 parents 3ea2a715 13c8672d

Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

Inline Side-by-side
Showing 5 changed files with 61 additions and 56 deletions
@@ -191,7 +191,6 @@ export default { @@ -191,7 +191,6 @@ export default {
191 } 191 }
192 192
193 .change-bid-price-wrapper { 193 .change-bid-price-wrapper {
194 - position: absolute;  
195 width: 600px; 194 width: 600px;
196 background-color: #fff; 195 background-color: #fff;
197 transform: scale(0.9); 196 transform: scale(0.9);
@@ -48,7 +48,16 @@ export default { @@ -48,7 +48,16 @@ export default {
48 border-color: #f5f5f5; 48 border-color: #f5f5f5;
49 } 49 }
50 50
  51 + /deep/ input::-webkit-input-placeholder {
  52 + font-size: 0.9rem;
  53 + padding: 0.2rem;
  54 + bottom: 0.4rem;
  55 + }
  56 +
51 /deep/ .cube-input-field { 57 /deep/ .cube-input-field {
  58 + font-family: "DINAlternate-Bold", "ufofont", "PingFang-SC-Regular", sans-serif;
  59 + padding: 0.25rem;
  60 + font-size: 1rem;
52 color: #000; 61 color: #000;
53 } 62 }
54 } 63 }
@@ -4,44 +4,42 @@ @@ -4,44 +4,42 @@
4 </div> 4 </div>
5 <div v-else> 5 <div v-else>
6 <LayoutApp title="选择地址" :show-back="true" :back-action="goBack"> 6 <LayoutApp title="选择地址" :show-back="true" :back-action="goBack">
7 - <CubeScroll class="main-container" ref="scroll" :options="scrollOpts">  
8 - <div class="user-list">  
9 - <div  
10 - v-for="(item, index) in addressList"  
11 - :key="index"  
12 - class="item"  
13 - @click="toOrderPage(item)"  
14 - >  
15 - <slot name="item" :data="item">  
16 - <div class="user-item"> 7 + <div class="user-list">
  8 + <div
  9 + v-for="(item, index) in addressList"
  10 + :key="index"
  11 + class="item"
  12 + @click="toOrderPage(item)"
  13 + >
  14 + <slot name="item" :data="item">
  15 + <div class="user-item">
  16 + <div
  17 + :class="{
  18 + 'uncheck-item': item.address_id !== selectedAddressId,
  19 + 'check-item': item.address_id === selectedAddressId
  20 + }"
  21 + ></div>
  22 + <div class="user-info">
  23 + <div class="extra">
  24 + <p class="name">{{ item.consignee }}</p>
  25 + <p class="mobile">{{ item.mobile }}</p>
  26 + <div v-if="item.is_default === 'Y'" class="tag-btn">默认</div>
  27 + <div v-if="item.tag_code && item.tag" class="tag-btn">{{ item.tag }}</div>
17 <div 28 <div
18 - :class="{  
19 - 'uncheck-item': item.address_id !== selectedAddressId,  
20 - 'check-item': item.address_id === selectedAddressId  
21 - }"  
22 - ></div>  
23 - <div class="user-info">  
24 - <div class="extra">  
25 - <p class="name">{{ item.consignee }}</p>  
26 - <p class="mobile">{{ item.mobile }}</p>  
27 - <div v-if="item.is_default === 'Y'" class="tag-btn">默认</div>  
28 - <div v-if="item.tag_code && item.tag" class="tag-btn">{{ item.tag }}</div>  
29 - <div  
30 - class="option-btn"  
31 - :data-item="JSON.stringify(item)"  
32 - :data-add="0"  
33 - @click="toEditorPage"  
34 - >编辑</div>  
35 - </div>  
36 - <p class="address">{{ item.area }}{{ item.address }}</p>  
37 - </div> 29 + class="option-btn"
  30 + :data-item="JSON.stringify(item)"
  31 + :data-add="0"
  32 + @click="toEditorPage"
  33 + >编辑</div>
38 </div> 34 </div>
39 - </slot>  
40 - <div class="border-line"></div> 35 + <p class="address">{{ item.area }}{{ item.address }}</p>
  36 + </div>
41 </div> 37 </div>
42 - </div>  
43 - <div class="add-btn" :data-add="1" @click="toEditorPage">新增地址</div>  
44 - </CubeScroll> 38 + </slot>
  39 + <div class="border-line"></div>
  40 + </div>
  41 + </div>
  42 + <div class="add-btn" :data-add="1" @click="toEditorPage">新增地址</div>
45 </LayoutApp> 43 </LayoutApp>
46 </div> 44 </div>
47 </template> 45 </template>
@@ -156,19 +154,6 @@ export default { @@ -156,19 +154,6 @@ export default {
156 </script> 154 </script>
157 155
158 <style lang="scss" scoped> 156 <style lang="scss" scoped>
159 -/deep/ {  
160 - .cube-scroll-content {  
161 - min-height: 100%;  
162 - }  
163 -  
164 - .cube-scroll-list-wrapper {  
165 - overflow: auto;  
166 - }  
167 -  
168 - .cube-loading-spinners {  
169 - margin: auto;  
170 - }  
171 -}  
172 157
173 .father-img { 158 .father-img {
174 position: absolute; 159 position: absolute;
@@ -186,6 +171,7 @@ export default { @@ -186,6 +171,7 @@ export default {
186 } 171 }
187 172
188 .user-list { 173 .user-list {
  174 + display: block;
189 background-color: white; 175 background-color: white;
190 176
191 .border-line { 177 .border-line {
@@ -255,14 +241,14 @@ export default { @@ -255,14 +241,14 @@ export default {
255 241
256 .option-btn { 242 .option-btn {
257 display: block; 243 display: block;
258 - width: 65px;  
259 - line-height: 44px; 244 + width: 80px;
  245 + line-height: 50px;
260 letter-spacing: -0.29px; 246 letter-spacing: -0.29px;
261 color: black; 247 color: black;
262 font-size: 24px; 248 font-size: 24px;
263 position: absolute; 249 position: absolute;
264 - right: 40px;  
265 - text-align: right; 250 + right: 30px;
  251 + text-align: center;
266 } 252 }
267 } 253 }
268 254
1 <template> 1 <template>
2 <LayoutApp :title="title" :show-back="true"> 2 <LayoutApp :title="title" :show-back="true">
3 - <div class="pane-body"> 3 + <div class="pane-body" ref="paneBody">
4 <FormItem> 4 <FormItem>
5 <CInput 5 <CInput
6 label="收货人" 6 label="收货人"
@@ -71,6 +71,7 @@ @@ -71,6 +71,7 @@
71 ></Radio> 71 ></Radio>
72 </div> 72 </div>
73 </div> 73 </div>
  74 + <div class="white-space"></div>
74 <div :class="submitClass" @touchend="onSubmit">确 认</div> 75 <div :class="submitClass" @touchend="onSubmit">确 认</div>
75 76
76 <AddressAct 77 <AddressAct
@@ -279,12 +280,15 @@ export default { @@ -279,12 +280,15 @@ export default {
279 chooseArea() { 280 chooseArea() {
280 this.isShowProvince = true; 281 this.isShowProvince = true;
281 282
  283 + this.$refs.paneBody.style.overflow = 'hidden';
  284 +
282 this.$refs.addressAct.parentHandleclick({ 285 this.$refs.addressAct.parentHandleclick({
283 areaCode: this.area_code 286 areaCode: this.area_code
284 }); 287 });
285 }, 288 },
286 popHidden() { 289 popHidden() {
287 let that = this; 290 let that = this;
  291 + this.$refs.paneBody.style.overflow = 'auto';
288 that.isShowProvince = false; 292 that.isShowProvince = false;
289 }, 293 },
290 modifyAddressAct(info) { 294 modifyAddressAct(info) {
@@ -402,6 +406,13 @@ export default { @@ -402,6 +406,13 @@ export default {
402 } 406 }
403 } 407 }
404 408
  409 +.white-space {
  410 + position: relative;
  411 + display: block;
  412 + overflow: hidden;
  413 + height: 120px;
  414 +}
  415 +
405 .wrapper-tag { 416 .wrapper-tag {
406 margin: 30px 0; 417 margin: 30px 0;
407 418
@@ -449,7 +460,7 @@ export default { @@ -449,7 +460,7 @@ export default {
449 background-color: #cccccc; 460 background-color: #cccccc;
450 color: white; 461 color: white;
451 border-radius: 40px; 462 border-radius: 40px;
452 - position: absolute; 463 + position: fixed;
453 left: 32px; 464 left: 32px;
454 right: 32px; 465 right: 32px;
455 bottom: 24px; 466 bottom: 24px;
@@ -509,7 +509,7 @@ export default { @@ -509,7 +509,7 @@ export default {
509 align-items: center; 509 align-items: center;
510 510
511 &.active { 511 &.active {
512 - font-size: 36px; 512 + font-size: 30px;
513 color: #000; 513 color: #000;
514 font-weight: bold; 514 font-weight: bold;
515 } 515 }