mobile / yoho-miniapp-ufo · Commits

Go to a project

Authored by 肖亚东
Commit 21f36dc308bd888f5c225f969eab5bbb854ea589 2 parents c85bb831 333b34a8

Merge branch 'UFO_1.0.0' of http://git.yoho.cn/mobile/yoho-miniapp-ufo into UFO_1.0.0

Inline Side-by-side
Showing 3 changed files with 20 additions and 6 deletions
@@ -58,6 +58,7 @@ @@ -58,6 +58,7 @@
58 .order-action-unselected-button::after { 58 .order-action-unselected-button::after {
59 /* border-style: none; */ 59 /* border-style: none; */
60 border-radius: 0; 60 border-radius: 0;
  61 + border: 0;
61 } 62 }
62 .order-action-unselected-button { 63 .order-action-unselected-button {
63 height: 80rpx; 64 height: 80rpx;
@@ -66,7 +67,7 @@ @@ -66,7 +67,7 @@
66 font-size: 24rpx; 67 font-size: 24rpx;
67 color: #999999; 68 color: #999999;
68 background-color: #FFFFFF; 69 background-color: #FFFFFF;
69 - border: 1rpx solid #CCCCCC; 70 + border: 2rpx solid #CCCCCC;
70 border-radius: 0; 71 border-radius: 0;
71 padding-top: 10rpx; 72 padding-top: 10rpx;
72 padding-bottom: 10rpx; 73 padding-bottom: 10rpx;
@@ -62,9 +62,9 @@ @@ -62,9 +62,9 @@
62 </view> 62 </view>
63 <view class='order-detail-split-line'></view> 63 <view class='order-detail-split-line'></view>
64 </scroll-view> 64 </scroll-view>
65 -<view class='order-detail-bottom-action-view'> 65 +<view class='order-detail-bottom-action-view' wx:if='{{data.buttons.length > 0}}'>
66 <!-- <orderdetailaction id="orderdetailaction" buttons="{{buttons}}" order-code="orderCode" real-price="{{priceInfo.realPayPrice}}" product-id='{{goodsInfo.productId}}'/> --> 66 <!-- <orderdetailaction id="orderdetailaction" buttons="{{buttons}}" order-code="orderCode" real-price="{{priceInfo.realPayPrice}}" product-id='{{goodsInfo.productId}}'/> -->
67 -<view class='order-detail-bottom-realprice-view' wx:if='{{data.buttons.length >0}}'> 67 +<view class='order-detail-bottom-realprice-view' >
68 <text class='order-action-pay-amount-txt'>¥{{data.priceInfo.realPayPrice}}</text> 68 <text class='order-action-pay-amount-txt'>¥{{data.priceInfo.realPayPrice}}</text>
69 <text class='order-daction-pay-amount-title-txt'>实付金额</text> 69 <text class='order-daction-pay-amount-title-txt'>实付金额</text>
70 </view> 70 </view>
@@ -12,13 +12,22 @@ @@ -12,13 +12,22 @@
12 .order-detail-root { 12 .order-detail-root {
13 margin-right: 40rpx; 13 margin-right: 40rpx;
14 } 14 }
  15 +
  16 +.border-line {
  17 + position: relative;
  18 + top: 0;
  19 + width: 100%;
  20 + background-color: #eeeeee;
  21 + height: 2rpx;
  22 +}
  23 +
15 .order-detail-bottom-action-view { 24 .order-detail-bottom-action-view {
16 /* padding-left: 40rpx; */ 25 /* padding-left: 40rpx; */
17 /* padding-right: 40rpx; */ 26 /* padding-right: 40rpx; */
18 - width: calc( 100% - 80rpx ); 27 + width: 100%;
19 /* height: 140rpx; */ 28 /* height: 140rpx; */
20 - margin-left: 40rpx;  
21 - margin-right: 40rpx; 29 + /* margin-left: 40rpx;
  30 + margin-right: 40rpx; */
22 /* width: 100%; */ 31 /* width: 100%; */
23 display: flex; 32 display: flex;
24 position: fixed; 33 position: fixed;
@@ -29,10 +38,12 @@ @@ -29,10 +38,12 @@
29 background: #FFFFFF; 38 background: #FFFFFF;
30 padding-top: 20rpx; 39 padding-top: 20rpx;
31 padding-bottom: 20rpx; 40 padding-bottom: 20rpx;
  41 + border-top: 2rpx solid #eeeeee;
32 } 42 }
33 .order-detail-bottom-button-view { 43 .order-detail-bottom-button-view {
34 display: flex; 44 display: flex;
35 flex-direction: row; 45 flex-direction: row;
  46 + margin-right: 40rpx;
36 } 47 }
37 .order-detail-bottom-selected-button { 48 .order-detail-bottom-selected-button {
38 width: 224rpx; 49 width: 224rpx;
@@ -49,6 +60,7 @@ @@ -49,6 +60,7 @@
49 } 60 }
50 .order-detail-bottom-unselected-button::after { 61 .order-detail-bottom-unselected-button::after {
51 border-radius: 0; 62 border-radius: 0;
  63 + border: 0rpx;
52 } 64 }
53 .order-detail-bottom-unselected-button { 65 .order-detail-bottom-unselected-button {
54 width: 224rpx; 66 width: 224rpx;
@@ -68,6 +80,7 @@ @@ -68,6 +80,7 @@
68 .order-detail-bottom-realprice-view { 80 .order-detail-bottom-realprice-view {
69 display: flex; 81 display: flex;
70 flex-direction: column; 82 flex-direction: column;
  83 + margin-left: 40rpx;
71 } 84 }
72 .order-detail-split-line { 85 .order-detail-split-line {
73 background: #eeeeee; 86 background: #eeeeee;