Commit 7a7226feae784d2d0995c2edd0de1041399b533f

Authored by 范牧
Exists in master

冲突合并

src/pages/cart/cart.vue
... ... @@ -7,7 +7,7 @@
7 7 <view class="card">
8 8 <view class="cardHeader">
9 9 <view v-bind:class="pIsoPen? 'partentChecked' : 'partentCheck'"
10   - @click="pChange(pIsoPen)">
  10 + @tap="pChange(pIsoPen)">
11 11 <span class="correct"></span>
12 12 </view>
13 13 <image src="../../static/store.png" mode="aspectFill"></image>
... ... @@ -17,32 +17,45 @@
17 17 <view class="cardBody" v-for="(item,index) in cartList" :key="item.cart_id"
18 18 @longpress="delCart(item.cart_id,index)">
19 19 <view v-bind:class="childIsOpen[index]? 'partentChecked':'partentCheck'"
20   - @click="Change(childIsOpen[index],index)">
  20 + @tap="Change(childIsOpen[index],index)">
21 21 <span class="correct"></span>
22 22 </view>
  23 + <view class="imageWrap">
  24 + <image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
  25 + </view>
23 26 <view class="goodInfo">
24   - <view class="imageWrap">
  27 +<!-- <view class="imageWrap">
25 28 <image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
26   - </view>
  29 + </view> -->
27 30 <view class="infoRight">
28 31 <view class="goodName" @tap="toGoods(item.pid,item.p_root_index)">{{item.p_name}}</view>
29   - <view class="describ" @tap="toshop(item.pid,item.p_root_index)">
30   - <text>
31   - <block v-for="tag in item.tag.prod_tag_fun" :key="tag.value">
32   - {{tag.label+`&nbsp;&nbsp;`}}
33   - </block>
34   - </text>
35   - <view class="icon"></view>
36   - </view>
  32 + <!-- <view class="describ"> -->
  33 + <uni-collapse accordion="true" >
  34 + <uni-collapse-item showAnimation='true'
  35 + :title="item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'/'+item.tag.prod_tag_fun[2].label+'...'" >
  36 + <text class="describ">
  37 + <block v-for="tag in item.tag.prod_tag_fun" :key="tag.value">
  38 + {{tag.label+`&nbsp;&nbsp;`}}
  39 + </block>
  40 + </text>
  41 +<!-- <text>
  42 + <block v-for="tag in item.tag.prod_tag_style" :key="tag.value">
  43 + {{tag.label+`&nbsp;&nbsp;`}}
  44 + </block>
  45 + </text> -->
  46 + </uni-collapse-item>
  47 + </uni-collapse>
  48 + <!-- <view v-bind:class="collapseList[index]? 'icon':'iconed'"></view> -->
  49 + <!-- </view> -->
37 50 <view class="priceBox">
38 51 <view class="price">¥{{item.nowPrice*item.num}}</view>
39   - <text>(限购{{maxCount}}副)</text>
  52 + <text class="maxCount">(限购{{maxCount}}副)</text>
40 53 <view class="counter">
41 54 <view class="btn" disabled="this.addDisabled" type="default"
42   - @click="counter(index,false,item.mp_id,item.sk_id,item.num,item.cart_id)">-</view>
  55 + @tap="counter(index,false,item.mp_id,item.sk_id,item.num,item.cart_id)">-</view>
43 56 <text>{{item.num}}</text>
44 57 <view class="btn" disabled="this.desDisabled" type="default"
45   - @click="counter(index,true,item.mp_id,item.sk_id,item.num,item.cart_id)">+</view>
  58 + @tap="counter(index,true,item.mp_id,item.sk_id,item.num,item.cart_id)">+</view>
46 59 </view>
47 60 </view>
48 61 </view>
... ... @@ -63,10 +76,12 @@
63 76 </template>
64 77  
65 78 <script>
  79 + import UniCollapse from '@/components/UniCollapse/UniCollapse.vue'
  80 + import UniCollapseItem from '@/components/UniCollapseItem/UniCollapseItem.vue'
66 81 import store from '@/store';
67 82  
68 83 export default {
69   -
  84 + components: {UniCollapse,UniCollapseItem},
70 85 data() {
71 86 return {
72 87 totalPrice: 0,
... ... @@ -137,52 +152,52 @@
137 152  
138 153 methods: {
139 154 // 跳转到对应的选购页面
140   - toshop(id,type){
141   - console.log('===',id,type)
142   - switch(type){
143   - case 1:
144   - uni.navigateTo({
145   - url: `../detailsChoiceArgs/detailsChoiceArgs?oderId=`+id+`&goodType=`+type,
146   - success: res => {},
147   - fail: () => {},
148   - complete: () => {}
149   - });
150   - break;
151   - case 2:
152   - uni.navigateTo({
153   - url: `../detailStandard/detailStandard_k?oderId=`+id+`&goodType=`+type,
154   - success: res => {},
155   - fail: () => {},
156   - complete: () => {}
157   - });
158   - break;
159   - case 3||4:
160   - uni.navigateTo({
161   - url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
162   - success: res => {},
163   - fail: () => {},
164   - complete: () => {}
165   - });
166   - break;
167   - // case 4:
168   - // uni.navigateTo({
169   - // url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
170   - // success: res => {},
171   - // fail: () => {},
172   - // complete: () => {}
173   - // });
174   - case 5:
175   - uni.navigateTo({
176   - url: `../purchaseLenses/purchaseLenses?oderId=`+id+`&goodType=`+type,
177   - success: res => {},
178   - fail: () => {},
179   - complete: () => {}
180   - });
181   - break;
182   - default :
183   - break
184   - }
185   - },
  155 + // toshop(id,type){
  156 + // console.log('===',id,type)
  157 + // switch(type){
  158 + // case 1:
  159 + // uni.navigateTo({
  160 + // url: `../detailsChoiceArgs/detailsChoiceArgs?oderId=`+id+`&goodType=`+type,
  161 + // success: res => {},
  162 + // fail: () => {},
  163 + // complete: () => {}
  164 + // });
  165 + // break;
  166 + // case 2:
  167 + // uni.navigateTo({
  168 + // url: `../detailStandard/detailStandard_k?oderId=`+id+`&goodType=`+type,
  169 + // success: res => {},
  170 + // fail: () => {},
  171 + // complete: () => {}
  172 + // });
  173 + // break;
  174 + // case 3||4:
  175 + // uni.navigateTo({
  176 + // url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
  177 + // success: res => {},
  178 + // fail: () => {},
  179 + // complete: () => {}
  180 + // });
  181 + // break;
  182 + // // case 4:
  183 + // // uni.navigateTo({
  184 + // // url: `../detailStandard/detailStandard_sun?oderId=`+id+`&goodType=`+type,
  185 + // // success: res => {},
  186 + // // fail: () => {},
  187 + // // complete: () => {}
  188 + // // });
  189 + // case 5:
  190 + // uni.navigateTo({
  191 + // url: `../purchaseLenses/purchaseLenses?oderId=`+id+`&goodType=`+type,
  192 + // success: res => {},
  193 + // fail: () => {},
  194 + // complete: () => {}
  195 + // });
  196 + // break;
  197 + // default :
  198 + // break
  199 + // }
  200 + // },
186 201 toGoods(id,type){
187 202 uni.navigateTo({
188 203 url: `../frameDetail/frameDetail?oderId=`+id,
... ... @@ -353,17 +368,19 @@
353 368 box-sizing: border-box;
354 369  
355 370 .partentCheck{
356   - width: 16px;
357   - height: 16px;
358   - border-radius: 18px;
359   - border: 1px solid #CFCFCF;
360   - background-color: #FFFFFF;
  371 + width: 16px;
  372 + height: 16px;
  373 + border-radius: 22px;
  374 + border: 1px solid #CFCFCF;
  375 + background-color: #FFFFFF;
  376 + margin: 6px;
361 377 }
362 378 .partentChecked{
363   - width: 18px;
364   - height: 18px;
365   - border-radius: 18px;
366   - background-color: #FF6B4A;
  379 + width: 18px;
  380 + height: 18px;
  381 + border-radius: 22px;
  382 + background-color: #FF6B4A;
  383 + margin: 6px;
367 384 .correct {
368 385 display: inline-block;
369 386 position: relative;
... ... @@ -403,6 +420,7 @@
403 420 display: flex;
404 421 align-items: center;
405 422 justify-content: flex-start;
  423 + margin-bottom: 20rpx;
406 424 image{
407 425 height: 32rpx;
408 426 width: 32rpx;
... ... @@ -418,20 +436,22 @@
418 436 }
419 437 .cardBody{
420 438 width: 100%;
421   - height: 300rpx;
  439 + min-height: 300rpx;
422 440 display: flex;
423 441 align-items: center;
424 442 justify-content: space-between;
425 443 .goodInfo{
426   - width: 95%;
  444 + width: 390rpx;
427 445 display: flex;
428 446 flex-direction: row;
429 447 justify-content: flex-start;
430 448 padding-left: 6px;
  449 +
431 450 .imageWrap{
432 451 height: 188rpx;
433 452 width: 188rpx;
434 453 margin-right: 28rpx;
  454 +
435 455 image{
436 456 border-radius: 4px;
437 457 height: 188rpx;
... ... @@ -443,7 +463,7 @@
443 463 flex-direction: column;
444 464 align-items: flex-start;
445 465 justify-content: space-between;
446   - height: 240rpx;
  466 + min-height: 240rpx;
447 467 .goodName{
448 468 display: -webkit-box;
449 469 -webkit-box-orient: vertical;
... ... @@ -455,55 +475,49 @@
455 475 }
456 476 .describ{
457 477 width: 100%;
458   - height: 80rpx;
459   - box-sizing: border-box;
460   - padding: 10rpx;
  478 + // min-height: 80rpx;
  479 + // box-sizing: border-box;
  480 + // padding: 10rpx;
461 481 font-size: 20rpx;
462 482 letter-spacing: -0.23px;
463 483 text-align: justify;
464 484 color: #999999;
465   - background: #F9F9F9;
466   - display: flex;
467   - justify-content: center;
468   - align-items: center;
469   - text{
470   - text-overflow: -o-ellipsis-lastline;
471   - overflow: hidden;
472   - text-overflow: ellipsis;
473   - display: -webkit-box;
474   - -webkit-line-clamp: 2;
475   - line-clamp: 2;
476   - -webkit-box-orient: vertical;
477   - }
478   - // .icon{
479   - // transform: rotate(90deg);
480   - // height: 13px;
481   - // width: 20px;
482   -
  485 + // background: #F9F9F9;
  486 + // display: flex;
  487 + // justify-content: center;
  488 + // align-items: center;
  489 + // text{
  490 + // text-overflow: -o-ellipsis-lastline;
  491 + // overflow: hidden;
  492 + // text-overflow: ellipsis;
  493 + // display: -webkit-box;
  494 + // -webkit-line-clamp: 2;
  495 + // line-clamp: 2;
  496 + // -webkit-box-orient: vertical;
  497 + // }
  498 + // .icon {
  499 + // width: 0;
  500 + // height: 0;
  501 + // border-left: 5px transparent;
  502 + // border-right: 5px transparent;
  503 + // border-top: 5px #979797;
  504 + // border-bottom: 0 transparent;
  505 + // border-style: solid;
  506 + // position: relative;
  507 + // margin-left: 10px;
  508 + // // transform: scaleY(-1);
  509 + // }
  510 + // .icon::after{
  511 + // content: '';
  512 + // position: absolute;
  513 + // top: -6.5px;
  514 + // left: -5px;
  515 + // border-left: 5px transparent;
  516 + // border-right: 5px transparent;
  517 + // border-top: 5px #FFFFFF;
  518 + // border-bottom: 0 transparent;
  519 + // border-style: solid;
483 520 // }
484   - .icon{
485   - width: 0;
486   - height: 0;
487   - border-left: 5px transparent;
488   - border-right: 5px transparent;
489   - border-top: 5px #979797;
490   - border-bottom: 0 transparent;
491   - border-style: solid;
492   - position: relative;
493   - margin-left: 10px;
494   - // transform: scaleY(-1);
495   - }
496   - .icon::after{
497   - content: '';
498   - position: absolute;
499   - top: -6.5px;
500   - left: -5px;
501   - border-left: 5px transparent;
502   - border-right: 5px transparent;
503   - border-top: 5px #FFFFFF;
504   - border-bottom: 0 transparent;
505   - border-style: solid;
506   - }
507 521 }
508 522 .priceBox{
509 523 display: flex;
... ... @@ -513,6 +527,10 @@
513 527 width: 100%;
514 528 font-size: 14px;
515 529 color: #999999;
  530 + .maxCount{
  531 + color: #999999;
  532 + font-size: 24rpx;
  533 + }
516 534 .price{
517 535 color: #FF6B4A;
518 536 font-size: 28rpx;
... ...
src/pages/newOpticsData/newOpticsData.vue
... ... @@ -4,19 +4,18 @@
4 4 <template >
5 5 <view class="goods-form">
6 6 <view class="p1">
7   - <image src="../../static/img/myOpticsData/dataWrite.png" mode="aspectFit"></image>
  7 + <image class="image2" src="../../static/img/myOpticsData/dataWrite.png" mode="aspectFit"></image>
8 8 填写验光数据
9 9 </view>
10 10 <text class="p2">没有验光数据?请到线下眼镜店验光哦~</text>
11   - <view class="use_name">
12   - <text>验光单取名:</text>
13   - <input type="text" @change="handleInput"
14   - placeholder="请输入名称" maxlength="30" :value="name" />
15   - </view>
16   - <view class="use_pd">
17   - <text>瞳距:</text>
18   - <input type="number" @change="handleInputPd"
19   - placeholder="请输入瞳距,单位cm" maxlength="20" :value="pd" />
  11 + <view class="picker">
  12 + <view class="picker-choice">
  13 + <view class="choice-left">
  14 + <text class="pd">验光单取名:</text>
  15 + </view>
  16 + <input type="text" @change="handleInput" class="input"
  17 + placeholder="请输入名称" maxlength="20" :value="name" />
  18 + </view>
20 19 </view>
21 20 <view class="picker" >
22 21 <view class="picker-choice">
... ... @@ -25,14 +24,22 @@
25 24 <text class="p12">{{pickerInfoList[0].nameE}}</text>
26 25 </view>
27 26 <text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
28   - <text class="p14">{{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}</text>
29   - <picker @change="bindPickerChange01" :value="pickerInfoList[0].nameIndex1" :range="pickerInfoList[0].nameArray1">
  27 + <!-- <text class="p14">{{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}</text> -->
  28 + <picker @change="bindPickerChange01" :value="pickerInfoList[0].nameIndex1" :range="pickerInfoList[0].nameArray1">
  29 + <view class="p14">
  30 + {{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}
30 31 <image src="../../static/detail-tabicon.png" ></image>
  32 + </view>
  33 + <!-- <image src="../../static/detail-tabicon.png" ></image> -->
31 34 </picker>
32 35 <text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
33   - <text class="p14">{{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}</text>
  36 + <!-- <text class="p14">{{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}</text> -->
34 37 <picker @change="bindPickerChange02" :value="pickerInfoList[0].nameIndex2" :range="pickerInfoList[0].nameArray2">
  38 + <view class="p14">
  39 + {{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}
35 40 <image src="../../static/detail-tabicon.png" ></image>
  41 + </view>
  42 + <!-- <image src="../../static/detail-tabicon.png" ></image> -->
36 43 </picker>
37 44 </view>
38 45 </view>
... ... @@ -43,14 +50,22 @@
43 50 <text class="p12">{{pickerInfoList[1].nameE}}</text>
44 51 </view>
45 52 <text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
46   - <text class="p14">{{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}</text>
  53 + <!-- <text class="p14">{{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}</text> -->
47 54 <picker @change="bindPickerChange11" :value="pickerInfoList[1].nameIndex1" :range="pickerInfoList[1].nameArray1">
48   - <image src="../../static/detail-tabicon.png" ></image>
  55 + <view class="p14">
  56 + {{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}
  57 + <image src="../../static/detail-tabicon.png" ></image>
  58 + </view>
  59 + <!-- <image src="../../static/detail-tabicon.png" ></image> -->
49 60 </picker>
50 61 <text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
51   - <text class="p14">{{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}</text>
  62 + <!-- <text class="p14">{{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}</text> -->
52 63 <picker @change="bindPickerChange12" :value="pickerInfoList[1].nameIndex2" :range="pickerInfoList[1].nameArray2">
53   - <image src="../../static/detail-tabicon.png" ></image>
  64 + <view class="p14">
  65 + {{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}
  66 + <image src="../../static/detail-tabicon.png" ></image>
  67 + </view>
  68 + <!-- <image src="../../static/detail-tabicon.png" ></image> -->
54 69 </picker>
55 70 </view>
56 71 </view>
... ... @@ -61,59 +76,62 @@
61 76 <text class="p12">{{pickerInfoList[2].nameE}}</text>
62 77 </view>
63 78 <text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
64   - <text class="p14">{{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}}</text>
65 79 <picker @change="bindPickerChange21" :value="pickerInfoList[2].nameIndex1" :range="pickerInfoList[2].nameArray1">
66   - <image src="../../static/detail-tabicon.png" ></image>
  80 + <view class="p14">
  81 + {{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}}
  82 + <image src="../../static/detail-tabicon.png" ></image>
  83 + </view>
67 84 </picker>
68 85 <text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
69   - <text class="p14">{{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}</text>
  86 + <!-- <text class="p14">{{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}</text> -->
70 87 <picker @change="bindPickerChange22" :value="pickerInfoList[2].nameIndex2" :range="pickerInfoList[2].nameArray2">
71   - <image src="../../static/detail-tabicon.png" ></image>
  88 + <view class="p14">
  89 + {{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}
  90 + <image src="../../static/detail-tabicon.png" ></image>
  91 + </view>
  92 + <!-- <image src="../../static/detail-tabicon.png" ></image> -->
72 93 </picker>
73 94 </view>
74 95 </view>
75   -<!-- <view class="picker" >
  96 + <view class="picker">
76 97 <view class="picker-choice">
77 98 <view class="choice-left">
78   - <text class="p11">{{pickerInfoList[3].nameC}}</text>
79   - <text class="p12">{{pickerInfoList[3].nameE}}</text>
  99 + <text class="pd">瞳距:</text>
80 100 </view>
81   - <text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
82   - <text class="p14">{{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}</text>
83   - <picker @change="bindPickerChange31" :value="pickerInfoList[3].nameIndex1" :range="pickerInfoList[3].nameArray1">
84   - <image src="../../static/detail-tabicon.png" ></image>
85   - </picker>
86   - <text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
87   - <text class="p14">{{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}</text>
88   - <picker @change="bindPickerChange32" :value="pickerInfoList[3].nameIndex2" :range="pickerInfoList[3].nameArray2">
89   - <image src="../../static/detail-tabicon.png" ></image>
90   - </picker>
  101 + <input type="digit" @change="handleInputPd" class="input"
  102 + placeholder="请输入瞳距,单位cm" maxlength="20" :value="pd" />
91 103 </view>
92   - </view> -->
  104 + </view>
93 105 <view class="picker" >
94 106 <view class="picker-choice">
95 107 <view class="choice-left">
96 108 <text class="p11">{{pickerInfoList[3].nameC}}</text>
97 109 </view>
98 110 <text class="p13-date">年&nbsp;&nbsp;&nbsp;(Y)</text>
99   - <text class="p14" style="width: 34px;">{{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}</text>
100 111 <picker @change="bindPickerChange41" :value="pickerInfoList[3].nameIndex1" :range="pickerInfoList[3].nameArray1">
101   - <image src="../../static/detail-tabicon.png" ></image>
  112 + <view class="p14" style="width: 30px;">
  113 + {{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}
  114 + <image src="../../static/detail-tabicon.png" ></image>
  115 + </view>
102 116 </picker>
103 117 <text class="p13-date">月&nbsp;&nbsp;&nbsp;(M)</text>
104   - <text class="p14" style="width: 30px;">{{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}</text>
105 118 <picker @change="bindPickerChange42" :value="pickerInfoList[3].nameIndex2" :range="pickerInfoList[3].nameArray2">
106   - <image src="../../static/detail-tabicon.png" ></image>
  119 + <view class="p14" style="width: 30px;">
  120 + {{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}
  121 + <image src="../../static/detail-tabicon.png" ></image>
  122 + </view>
107 123 </picker>
108 124 <text class="p13-date">日&nbsp;&nbsp;&nbsp;(D)</text>
109   - <text class="p14" style="width: 30px;">{{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}}</text>
110 125 <picker @change="bindPickerChange43" :value="pickerInfoList[3].nameIndex3" :range="pickerInfoList[3].nameArray3">
111   - <image src="../../static/detail-tabicon.png" ></image>
  126 + <view class="p14" style="width: 30px;">
  127 + {{pickerInfoList[3].nameArray3[pickerInfoList[3].nameIndex3]}}
  128 + <image src="../../static/detail-tabicon.png" ></image>
  129 + </view>
112 130 </picker>
113 131 </view>
114 132 </view>
115 133 <view class="confirm">
116   - <image :src="confirm ? tabicon[0] : tabicon[1]" @click="changeConfirm"></image>
  134 + <image class="image1" :src="confirm ? tabicon[0] : tabicon[1]" @tap="changeConfirm"></image>
117 135 <text>确认以上输入信息来源于我的验光数据!</text>
118 136 </view>
119 137 </view>
... ... @@ -428,47 +446,18 @@
428 446 text-align: justify;
429 447 line-height: 24px;
430 448 margin: 4px 0;
431   -
  449 +
432 450 }
433 451 .p2 {
434 452 font-size: 12px;
435 453 color: #999999;
436 454 letter-spacing: -0.23px;
437   - margin-bottom: 18rpx;
  455 + margin-bottom: 32rpx;
438 456 }
439   - .use_pd{
440   - display: flex;
441   - height: 48rpx;
442   - line-height: 48rpx;
443   - margin-left: -298rpx;
444   - margin-top: 30rpx;
445   - margin-bottom: 40rpx;
446   - align-items: center;
447   - justify-content: center;
448   - text{
449   - font-size: 14px;
450   - color: #333333;
451   - margin-right: 44rpx;
452   - }
453   - }
454   - .use_name{
455   - display: flex;
456   - height: 48rpx;
457   - line-height: 48rpx;
458   - margin-left: -220rpx;
459   - margin-top: 20rpx;
460   - align-items: center;
461   - justify-content: center;
462   - // text-align: center;
463   - text{
464   - font-size: 14px;
465   - color: #333333;
466   - margin-right: 44rpx;
467   - }
468   - }
469   - image{
470   - width: 28rpx;
471   - height: 26rpx;
  457 + .image2{
  458 + width: 42rpx;
  459 + height: 34rpx;
  460 + margin-right: 12rpx;
472 461 }
473 462 .confirm {
474 463 display: flex;
... ... @@ -477,8 +466,10 @@
477 466 color: #666666;
478 467 letter-spacing: -0.23px;
479 468 width: 684rpx;
480   - image{
  469 + .image1{
481 470 margin-right:25rpx;
  471 + width: 42rpx;
  472 + height: 38rpx;
482 473 }
483 474 }
484 475 .picker{
... ... @@ -487,18 +478,26 @@
487 478 justify-content: center;
488 479 align-items: center;
489 480 width: 100%;
490   - image{
491   - width: 10px;
492   - height: 10px;
493   - margin-right: 5px;
494   - }
  481 +
495 482 .picker-choice{
496 483 display: flex;
497 484 width: 684rpx;
498 485 align-items: center;
499 486 margin-bottom: 40rpx;
  487 + .input{
  488 + border-bottom: 1px solid #CFCFCF;
  489 + height: 40rpx;
  490 + }
500 491 .choice-left{
501 492 width: 210rpx;
  493 + .pd{
  494 + font-size: 14px;
  495 + color: #333333;
  496 + letter-spacing: -0.26px;
  497 + text-align: justify;
  498 + line-height: 24px;
  499 + margin-right: 44rpx;
  500 + }
502 501 .p11 {
503 502 font-size: 14px;
504 503 color: #333333;
... ... @@ -529,16 +528,29 @@
529 528 letter-spacing: -0.19px;
530 529 margin-right: 5px;
531 530 }
532   - .p14 {
533   - font-size: 14px;
534   - color: #666666;
535   - letter-spacing: -0.26px;
536   - text-align: center;
537   - width: 124rpx;
538   - border-bottom: 1px solid #CFCFCF;
  531 + picker{
  532 + width: 144rpx;
539 533 height: 40rpx;
540   -
  534 + display: flex;
  535 + position: relative;
  536 + .p14 {
  537 + font-size: 14px;
  538 + color: #666666;
  539 + letter-spacing: -0.26px;
  540 + text-align: center;
  541 + width: 124rpx;
  542 + border-bottom: 1px solid #CFCFCF;
  543 + height: 38rpx;
  544 + }
  545 + image{
  546 + width: 20rpx;
  547 + height: 20rpx;
  548 + position: absolute;
  549 + right: 20rpx;
  550 + top: 8rpx;
  551 + }
541 552 }
  553 +
542 554  
543 555 }
544 556 }
... ...