Authored by 李奇

order page style change

@@ -107,7 +107,7 @@ Page({ @@ -107,7 +107,7 @@ Page({
107 skus: [], 107 skus: [],
108 pids: [] 108 pids: []
109 }; 109 };
110 - this.loadEnsurePayment({productSku: this.orderData.productSku}); 110 + this.loadEnsurePayment({buyNumber: this.orderData.buyNumber, productSku: this.orderData.productSku});
111 111
112 yas.pageOpenReport(); 112 yas.pageOpenReport();
113 }, 113 },
@@ -15,10 +15,10 @@ @@ -15,10 +15,10 @@
15 <view class="name row">{{good.product_name}}</view> 15 <view class="name row">{{good.product_name}}</view>
16 <view class="row"> 16 <view class="row">
17 <view class="color"> 17 <view class="color">
18 - 颜色:{{good.color_name}} 18 + 颜色{{good.color_name}}
19 </view> 19 </view>
20 <view class="size"> 20 <view class="size">
21 - 尺码:{{good.size_name}} 21 + 尺码{{good.size_name}}
22 </view> 22 </view>
23 </view> 23 </view>
24 <view class="row price-wrap"> 24 <view class="row price-wrap">
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 ¥{{good.sales_price}} 29 ¥{{good.sales_price}}
30 </view> 30 </view>
31 <view class="count"> 31 <view class="count">
32 - ×{{good.buy_number}} 32 + × {{good.buy_number}}
33 </view> 33 </view>
34 </view> 34 </view>
35 </view> 35 </view>
@@ -6,7 +6,6 @@ @@ -6,7 +6,6 @@
6 position: relative; 6 position: relative;
7 display: block; 7 display: block;
8 background: #fff; 8 background: #fff;
9 - /* margin: 10rpx 0; */  
10 margin-bottom: 20rpx; 9 margin-bottom: 20rpx;
11 border-top: 1rpx solid #e0e0e0; 10 border-top: 1rpx solid #e0e0e0;
12 border-bottom: 1rpx solid #e0e0e0; 11 border-bottom: 1rpx solid #e0e0e0;
@@ -84,13 +83,18 @@ image { @@ -84,13 +83,18 @@ image {
84 } 83 }
85 84
86 .order-good .name { 85 .order-good .name {
87 - font-size: 25.2rpx;  
88 max-width: 70%; 86 max-width: 70%;
89 overflow: hidden; 87 overflow: hidden;
90 text-overflow: ellipsis; 88 text-overflow: ellipsis;
91 display: -webkit-box; 89 display: -webkit-box;
92 -webkit-line-clamp: 2; 90 -webkit-line-clamp: 2;
93 -webkit-box-orient: vertical; 91 -webkit-box-orient: vertical;
  92 + font-family: PingFang-SC-Regular;
  93 + font-size: 28rpx;
  94 + color: #444;
  95 + letter-spacing: -0.4rpx;
  96 + line-height: 34rpx;
  97 + min-height: 68rpx;
94 } 98 }
95 99
96 .order-good .row:nth-child(2) { 100 .order-good .row:nth-child(2) {
@@ -106,16 +110,20 @@ image { @@ -106,16 +110,20 @@ image {
106 overflow: hidden; 110 overflow: hidden;
107 white-space: nowrap; 111 white-space: nowrap;
108 vertical-align: bottom; 112 vertical-align: bottom;
  113 + font-family: PingFang-SC-Regular;
  114 + font-size: 24rpx;
  115 + color: #B0B0B0;
  116 + letter-spacing: -0.34rpx;
109 } 117 }
110 118
111 .order-good .row .size { 119 .order-good .row .size {
112 display: inline-block; 120 display: inline-block;
113 - max-width: 200rpx;  
114 - text-overflow: ellipsis;  
115 - overflow: hidden;  
116 - white-space: nowrap;  
117 vertical-align: bottom; 121 vertical-align: bottom;
118 padding-left: 20rpx; 122 padding-left: 20rpx;
  123 + font-family: PingFang-SC-Regular;
  124 + font-size: 24rpx;
  125 + color: #B0B0B0;
  126 + letter-spacing: -0.34rpx;
119 } 127 }
120 128
121 .order-good .color, .order-good .size { 129 .order-good .color, .order-good .size {
@@ -130,14 +138,17 @@ image { @@ -130,14 +138,17 @@ image {
130 } 138 }
131 139
132 .order-good .price { 140 .order-good .price {
133 - color: #e01; 141 + color: #d0021b;
134 } 142 }
135 143
136 .order-good .count { 144 .order-good .count {
137 display: block; 145 display: block;
138 - color: #999;  
139 text-align: right; 146 text-align: right;
140 - line-height: 40.5rpx; 147 + font-family: PingFang-SC-Regular;
  148 + font-size: 24rpx;
  149 + color: #B0B0B0;
  150 + letter-spacing: -0.34rpx;
  151 + margin-top: 40rpx;
141 } 152 }
142 153
143 .order .footer { 154 .order .footer {
@@ -133,67 +133,6 @@ image { @@ -133,67 +133,6 @@ image {
133 border: 0; 133 border: 0;
134 } 134 }
135 135
136 -.order-good .deps {  
137 - margin-left: 121.5rpx;  
138 -}  
139 -  
140 -.order-good .name {  
141 - font-size: 25.2rpx;  
142 - max-width: 70%;  
143 - overflow: hidden;  
144 - text-overflow: ellipsis;  
145 - display: -webkit-box;  
146 - -webkit-line-clamp: 2;  
147 - -webkit-box-orient: vertical;  
148 -}  
149 -  
150 -.order-good .row:nth-child(2) {  
151 - height: 40.5rpx;  
152 - line-height: 40.5rpx;  
153 - width: 90%;  
154 -}  
155 -  
156 -.order-good .row .color {  
157 - display: inline-block;  
158 - max-width: 200rpx;  
159 - text-overflow: ellipsis;  
160 - overflow: hidden;  
161 - white-space: nowrap;  
162 - vertical-align: bottom;  
163 -}  
164 -  
165 -.order-good .row .size {  
166 - display: inline-block;  
167 - max-width: 200rpx;  
168 - text-overflow: ellipsis;  
169 - overflow: hidden;  
170 - white-space: nowrap;  
171 - vertical-align: bottom;  
172 - padding-left: 20rpx;  
173 -}  
174 -  
175 -.order-good .color, .order-good .size {  
176 - color: #b6b6b6;  
177 -}  
178 -  
179 -.order-good .price-wrap {  
180 - position: absolute;  
181 - top: 0rpx;  
182 - right: 27rpx;  
183 - text-align: right;  
184 -}  
185 -  
186 -.order-good .price {  
187 - color: #e01;  
188 -}  
189 -  
190 -.order-good .count {  
191 - display: block;  
192 - color: #999;  
193 - text-align: right;  
194 - line-height: 40.5rpx;  
195 -}  
196 -  
197 .order-page .order .footer { 136 .order-page .order .footer {
198 text-align: right; 137 text-align: right;
199 border-top: 1rpx solid #e0e0e0; 138 border-top: 1rpx solid #e0e0e0;
1 -import Yas from '../../../common/yas'; 1 +import Yas from '../../common/yas';
2 2
3 const yas = new Yas(); 3 const yas = new Yas();
4 const router = global.router; 4 const router = global.router;