Showing
16 changed files
with
89 additions
and
49 deletions
1 | -// export const API_HOST = 'https://api.yoho.cn'; | ||
2 | -// export const SERVICE_HOST = 'https://api.yoho.cn'; | 1 | +export const API_HOST = 'https://api.yoho.cn'; |
2 | +export const SERVICE_HOST = 'https://api.yoho.cn'; | ||
3 | export const APP_REPORT_HOST = 'https://app.yoho.cn/collect/v3'; | 3 | export const APP_REPORT_HOST = 'https://app.yoho.cn/collect/v3'; |
4 | export const LOG_EVENT_HOST = 'https://analysis.yohobuy.com/yas_mobile'; | 4 | export const LOG_EVENT_HOST = 'https://analysis.yohobuy.com/yas_mobile'; |
5 | 5 | ||
6 | // export const ACTIVITY_HOST = 'http://192.168.102.49:6006'; | 6 | // export const ACTIVITY_HOST = 'http://192.168.102.49:6006'; |
7 | -export const ACTIVITY_HOST = 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com' | ||
8 | -// export const ACTIVITY_HOST = 'https://action.yoho.cn'; | 7 | +// export const ACTIVITY_HOST = 'http://172.16.10.53:6006' |
8 | +// export const ACTIVITY_HOST = 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com'; | ||
9 | +export const ACTIVITY_HOST = 'https://action.yoho.cn'; | ||
9 | 10 | ||
10 | // export const API_HOST = 'http://dev-api.yohops.com:9999'; | 11 | // export const API_HOST = 'http://dev-api.yohops.com:9999'; |
11 | // export const SERVICE_HOST = 'http://dev-api.yohops.com:9999/'; | 12 | // export const SERVICE_HOST = 'http://dev-api.yohops.com:9999/'; |
@@ -13,8 +14,8 @@ export const ACTIVITY_HOST = 'http://yoho-activity-platform.test3.ingress.dev.yo | @@ -13,8 +14,8 @@ export const ACTIVITY_HOST = 'http://yoho-activity-platform.test3.ingress.dev.yo | ||
13 | // export const API_HOST = 'http://api-test1.yohops.com:9999'; | 14 | // export const API_HOST = 'http://api-test1.yohops.com:9999'; |
14 | // export const SERVICE_HOST = 'http://api-test1.yohops.com:9999/'; | 15 | // export const SERVICE_HOST = 'http://api-test1.yohops.com:9999/'; |
15 | 16 | ||
16 | -export const API_HOST = 'http://api-test3.dev.yohocorp.com'; | ||
17 | -export const SERVICE_HOST = 'http://api-test3.dev.yohocorp.com'; | 17 | +// export const API_HOST = 'http://api-test3.dev.yohocorp.com'; |
18 | +// export const SERVICE_HOST = 'http://api-test3.dev.yohocorp.com'; | ||
18 | 19 | ||
19 | // export const API_HOST = 'http://api-test2.dev.yohocorp.com'; | 20 | // export const API_HOST = 'http://api-test2.dev.yohocorp.com'; |
20 | // export const SERVICE_HOST = 'http://api-test2.dev.yohocorp.com'; | 21 | // export const SERVICE_HOST = 'http://api-test2.dev.yohocorp.com'; |
@@ -93,13 +93,10 @@ Component({ | @@ -93,13 +93,10 @@ Component({ | ||
93 | }, | 93 | }, |
94 | 94 | ||
95 | goList() { | 95 | goList() { |
96 | - if(getCurrentPages().length === 1) { | ||
97 | - router.go('index'); | ||
98 | - } else { | ||
99 | - wx.navigateBack({ | ||
100 | - delta: getCurrentPages().length - 1 | ||
101 | - }) | ||
102 | - } | 96 | + wx.navigateTo({ |
97 | + url: '/pages/zeroSell/index?reload=0', | ||
98 | + | ||
99 | + }) | ||
103 | 100 | ||
104 | }, | 101 | }, |
105 | 102 |
@@ -9,11 +9,14 @@ | @@ -9,11 +9,14 @@ | ||
9 | <time-countdown class="product_countdown" wx:if="{{product.status === 2}}" endTime="{{product.end_time}}"></time-countdown> | 9 | <time-countdown class="product_countdown" wx:if="{{product.status === 2}}" endTime="{{product.end_time}}"></time-countdown> |
10 | </view> | 10 | </view> |
11 | 11 | ||
12 | + | ||
13 | + <view class="avatarcontainer"> | ||
12 | <view class="avatars" wx:if="{{product.status === 2 && avatars.length > 0}}"> | 14 | <view class="avatars" wx:if="{{product.status === 2 && avatars.length > 0}}"> |
13 | <avatars list="{{avatars}}"></avatars> | 15 | <avatars list="{{avatars}}"></avatars> |
14 | </view> | 16 | </view> |
15 | - | ||
16 | <image class="product_image" src="{{product.cover_img}}"></image> | 17 | <image class="product_image" src="{{product.cover_img}}"></image> |
18 | + | ||
19 | + </view> | ||
17 | <view class="product_name" >{{product.name}}</view> | 20 | <view class="product_name" >{{product.name}}</view> |
18 | <view class="product_price" >{{product.price}}</view> | 21 | <view class="product_price" >{{product.price}}</view> |
19 | <view wx:if="{{product.status !== 2}}" class="product_time">{{helper.formatTime(product.start_time, product.end_time)}}</view> | 22 | <view wx:if="{{product.status !== 2}}" class="product_time">{{helper.formatTime(product.start_time, product.end_time)}}</view> |
@@ -55,13 +55,12 @@ | @@ -55,13 +55,12 @@ | ||
55 | .product_countdown { | 55 | .product_countdown { |
56 | display: inline-block; | 56 | display: inline-block; |
57 | height: 92rpx; | 57 | height: 92rpx; |
58 | - margin-top: 40rpx; | ||
59 | - margin-bottom: 40rpx; | 58 | + margin-top: 44rpx; |
59 | + margin-bottom: 36rpx; | ||
60 | } | 60 | } |
61 | 61 | ||
62 | .countdown_label { | 62 | .countdown_label { |
63 | width: 60rpx; | 63 | width: 60rpx; |
64 | - height: 56rpx; | ||
65 | font-family: PingFang-SC-Regular; | 64 | font-family: PingFang-SC-Regular; |
66 | font-size: 20rpx; | 65 | font-size: 20rpx; |
67 | color: #222222; | 66 | color: #222222; |
@@ -69,6 +68,9 @@ | @@ -69,6 +68,9 @@ | ||
69 | text-align: center; | 68 | text-align: center; |
70 | display: inline-block; | 69 | display: inline-block; |
71 | margin-right: 16rpx; | 70 | margin-right: 16rpx; |
71 | + vertical-align: text-top; | ||
72 | + position: relative; | ||
73 | + top: -2rpx; | ||
72 | } | 74 | } |
73 | 75 | ||
74 | .countdown_labeltext { | 76 | .countdown_labeltext { |
@@ -80,5 +82,11 @@ | @@ -80,5 +82,11 @@ | ||
80 | text-align: center; | 82 | text-align: center; |
81 | margin-left: auto; | 83 | margin-left: auto; |
82 | margin-right: auto; | 84 | margin-right: auto; |
83 | - margin-bottom: 38rpx; | 85 | + left: calc(50% - 180rpx); |
86 | + top: 36rpx; | ||
87 | + position: absolute; | ||
88 | +} | ||
89 | + | ||
90 | +.avatarcontainer { | ||
91 | + position: relative; | ||
84 | } | 92 | } |
1 | <!--pages/zeroSell/components/timeCountDown/time-countdown.wxml--> | 1 | <!--pages/zeroSell/components/timeCountDown/time-countdown.wxml--> |
2 | <block wx:for="{{formatTime}}" wx:key=""> | 2 | <block wx:for="{{formatTime}}" wx:key=""> |
3 | <view class="num-wrapper"> | 3 | <view class="num-wrapper"> |
4 | - <text>{{item}}</text> | ||
5 | - <view class="mask"></view> | 4 | + <view class="mask"></view> |
5 | + <text class="num-text">{{item}}</text> | ||
6 | + <view class="mask-left"></view> | ||
7 | + <view class="mask-right"></view> | ||
6 | </view> | 8 | </view> |
7 | <view class="number-seprator" wx:if="{{index !== 3}}"> | 9 | <view class="number-seprator" wx:if="{{index !== 3}}"> |
8 | : | 10 | : |
@@ -2,10 +2,10 @@ | @@ -2,10 +2,10 @@ | ||
2 | display: inline-block; | 2 | display: inline-block; |
3 | position: relative; | 3 | position: relative; |
4 | width: 72rpx; | 4 | width: 72rpx; |
5 | - height: 72rpx; | ||
6 | - font-size: 56rpx; | ||
7 | - line-height: 72rpx; | ||
8 | - background: black; | 5 | + height: 84rpx; |
6 | + font-size: 50rpx; | ||
7 | + line-height: 84rpx; | ||
8 | + background: #444; | ||
9 | color: white; | 9 | color: white; |
10 | font-weight: bolder; | 10 | font-weight: bolder; |
11 | } | 11 | } |
@@ -22,11 +22,33 @@ | @@ -22,11 +22,33 @@ | ||
22 | left: 0; | 22 | left: 0; |
23 | opacity: 0.4; | 23 | opacity: 0.4; |
24 | background-color: black; | 24 | background-color: black; |
25 | + z-index: 0; | ||
26 | +} | ||
27 | + | ||
28 | +.num-text { | ||
29 | + z-index: 99; | ||
30 | +} | ||
31 | +.mask-left { | ||
32 | + position: absolute; | ||
33 | + width:3.5rpx; | ||
34 | + height: 8rpx; | ||
35 | + top: calc(50% - 4rpx); | ||
36 | + left: 0; | ||
37 | + background-color: white; | ||
38 | +} | ||
39 | + | ||
40 | +.mask-right { | ||
41 | + position: absolute; | ||
42 | + width:3.5rpx; | ||
43 | + height: 8rpx; | ||
44 | + top: calc(50% - 4rpx); | ||
45 | + right: 0; | ||
46 | + background-color: white; | ||
25 | } | 47 | } |
26 | 48 | ||
27 | .number-seprator { | 49 | .number-seprator { |
28 | - font-size: 56rpx; | ||
29 | - line-height: 72rpx; | 50 | + font-size: 50rpx; |
51 | + line-height: 84rpx; | ||
30 | color: black; | 52 | color: black; |
31 | display: inline; | 53 | display: inline; |
32 | } | 54 | } |
@@ -44,15 +44,16 @@ Page(Object.assign({ | @@ -44,15 +44,16 @@ Page(Object.assign({ | ||
44 | bannerUrl: null | 44 | bannerUrl: null |
45 | }, | 45 | }, |
46 | 46 | ||
47 | - onLoad() { | 47 | + onLoad(options) { |
48 | this.service = new ZeroSellService(); | 48 | this.service = new ZeroSellService(); |
49 | this.commonService = new CommonService(); | 49 | this.commonService = new CommonService(); |
50 | 50 | ||
51 | this._init(); | 51 | this._init(); |
52 | 52 | ||
53 | new app.WeToast(); | 53 | new app.WeToast(); |
54 | - | 54 | + if(!(options && +options.reload === 0)) { |
55 | this._getResouceCode() | 55 | this._getResouceCode() |
56 | + } | ||
56 | this._getBottomBanner() | 57 | this._getBottomBanner() |
57 | }, | 58 | }, |
58 | 59 |
@@ -2,8 +2,8 @@ | @@ -2,8 +2,8 @@ | ||
2 | <view class="list-top-blank"></view> | 2 | <view class="list-top-blank"></view> |
3 | 3 | ||
4 | <tabs-pane name="进行中"> | 4 | <tabs-pane name="进行中"> |
5 | + <image class="topgif" src="./images/yoluck.gif"/> | ||
5 | <view class="productList"> | 6 | <view class="productList"> |
6 | - <image class="topgif" src="./images/yoluck.gif"/> | ||
7 | <block wx:for="{{list[0].products}}" wx:key="{{item.id}}"> | 7 | <block wx:for="{{list[0].products}}" wx:key="{{item.id}}"> |
8 | <product-item product="{{item}}" class="product"></product-item> | 8 | <product-item product="{{item}}" class="product"></product-item> |
9 | </block> | 9 | </block> |
@@ -146,7 +146,7 @@ Page({ | @@ -146,7 +146,7 @@ Page({ | ||
146 | let pCtx = wx.createCanvasContext('productDetailCanvas', this); | 146 | let pCtx = wx.createCanvasContext('productDetailCanvas', this); |
147 | 147 | ||
148 | pCtx.setFillStyle('white'); | 148 | pCtx.setFillStyle('white'); |
149 | - pCtx.setStrokeStyle('black') | 149 | + pCtx.setStrokeStyle('white') |
150 | pCtx.fillRect(0, 0, windowWidth, screenHeight); | 150 | pCtx.fillRect(0, 0, windowWidth, screenHeight); |
151 | 151 | ||
152 | this.drawRect(pCtx, windowWidth, screenHeight); | 152 | this.drawRect(pCtx, windowWidth, screenHeight); |
@@ -172,34 +172,36 @@ Page({ | @@ -172,34 +172,36 @@ Page({ | ||
172 | } | 172 | } |
173 | }); | 173 | }); |
174 | 174 | ||
175 | - pCtx.drawImage('./images/Group@2x.png', 20 * scale, 286 * scale, 334 * scale, 68 * scale); | 175 | + pCtx.drawImage('./images/Group@2x.png', 15 * scale, 306 * scale, 346 * scale, 68 * scale); |
176 | 176 | ||
177 | this.drawLongText(this.data.product_name, pCtx, 187.5 * scale, 412 * scale, '#444444', 20, 20); | 177 | this.drawLongText(this.data.product_name, pCtx, 187.5 * scale, 412 * scale, '#444444', 20, 20); |
178 | 178 | ||
179 | // pCtx.drawImage('./images/y@2x.png', 128.5 * scale, 465 * scale, 60 * scale, 25 * scale); | 179 | // pCtx.drawImage('./images/y@2x.png', 128.5 * scale, 465 * scale, 60 * scale, 25 * scale); |
180 | 180 | ||
181 | pCtx.setFillStyle('#D0021B') | 181 | pCtx.setFillStyle('#D0021B') |
182 | - pCtx.setFontSize(12) | 182 | + // pCtx.setFontSize(12) |
183 | + // pCtx.setFontWeight('bold') | ||
184 | + pCtx.font = '12px SanFranciscoText-Bold' | ||
183 | pCtx.fillText('¥', 128.5 * scale, 465 * scale) | 185 | pCtx.fillText('¥', 128.5 * scale, 465 * scale) |
184 | 186 | ||
185 | pCtx.setFillStyle('#D0021B') | 187 | pCtx.setFillStyle('#D0021B') |
186 | pCtx.setFontSize(26) | 188 | pCtx.setFontSize(26) |
187 | - pCtx.fillText('0', 143 * scale, 465 * scale) | 189 | + pCtx.fillText('0', 142 * scale, 465 * scale) |
188 | 190 | ||
189 | 191 | ||
190 | pCtx.setFillStyle('#b0b0b0'); | 192 | pCtx.setFillStyle('#b0b0b0'); |
191 | // pCtx.setTextAlign('center'); | 193 | // pCtx.setTextAlign('center'); |
192 | - const fontSize = 18; | 194 | + const fontSize = 12; |
193 | pCtx.setFontSize(fontSize); | 195 | pCtx.setFontSize(fontSize); |
194 | let text = `${this.data.product_price}`; | 196 | let text = `${this.data.product_price}`; |
195 | - pCtx.fillText(text, 205 * scale, 465 * scale); | 197 | + pCtx.fillText(text, 190 * scale, 465 * scale); |
196 | 198 | ||
197 | let textRect = {width: 70}; | 199 | let textRect = {width: 70}; |
198 | if (pCtx.measureText) { | 200 | if (pCtx.measureText) { |
199 | textRect = pCtx.measureText(text); | 201 | textRect = pCtx.measureText(text); |
200 | } | 202 | } |
201 | 203 | ||
202 | - this.drawLine(pCtx, (205 * scale) - (30 * scale), (465 - 15/2) * scale, textRect.width); | 204 | + this.drawLine(pCtx, (195 * scale) - (30 * scale), (465 - 10/2) * scale, textRect.width); |
203 | pCtx.setFillStyle('black') | 205 | pCtx.setFillStyle('black') |
204 | pCtx.fillRect(47 * scale, 562 * scale, 280 * scale, 90 * scale) | 206 | pCtx.fillRect(47 * scale, 562 * scale, 280 * scale, 90 * scale) |
205 | // this.drawRoundedRect(this.Rect(25 * scale, 562* scale, 280 * scale, 90 * scale), 0, pCtx); | 207 | // this.drawRoundedRect(this.Rect(25 * scale, 562* scale, 280 * scale, 90 * scale), 0, pCtx); |
@@ -220,7 +222,7 @@ Page({ | @@ -220,7 +222,7 @@ Page({ | ||
220 | }, | 222 | }, |
221 | 223 | ||
222 | drawRoundedRect: function(rect, r, ctx) { | 224 | drawRoundedRect: function(rect, r, ctx) { |
223 | - ctx.setLineWidth(1) | 225 | + ctx.setLineWidth(0.5) |
224 | ctx.setStrokeStyle('rgba(0,0,0,0.1)'); | 226 | ctx.setStrokeStyle('rgba(0,0,0,0.1)'); |
225 | ctx.strokeRect(rect.x, rect.y, rect.width, rect.height); | 227 | ctx.strokeRect(rect.x, rect.y, rect.width, rect.height); |
226 | // ctx.stroke(); | 228 | // ctx.stroke(); |
@@ -291,7 +293,7 @@ Page({ | @@ -291,7 +293,7 @@ Page({ | ||
291 | 293 | ||
292 | drawRect: function (ctx, width, height) { | 294 | drawRect: function (ctx, width, height) { |
293 | ctx.beginPath() | 295 | ctx.beginPath() |
294 | - ctx.setStrokeStyle('black') | 296 | + ctx.setStrokeStyle('white') |
295 | const lineWidth = 6; | 297 | const lineWidth = 6; |
296 | 298 | ||
297 | ctx.setLineWidth(lineWidth) | 299 | ctx.setLineWidth(lineWidth) |
@@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
24 | height: 1000rpx; | 24 | height: 1000rpx; |
25 | background-color: white; | 25 | background-color: white; |
26 | flex-direction: column; | 26 | flex-direction: column; |
27 | - border: 6rpx solid black; | 27 | + /* border: 6rpx solid black; */ |
28 | } | 28 | } |
29 | 29 | ||
30 | .snapshoot { | 30 | .snapshoot { |
@@ -45,15 +45,16 @@ | @@ -45,15 +45,16 @@ | ||
45 | .content { | 45 | .content { |
46 | width: 500rpx; | 46 | width: 500rpx; |
47 | margin: 0 20rpx; | 47 | margin: 0 20rpx; |
48 | - border: 4rpx solid #b0b0b0; | 48 | + border: 2rpx solid #b0b0b0; |
49 | } | 49 | } |
50 | 50 | ||
51 | .center { | 51 | .center { |
52 | - width: 530rpx; | 52 | + width: 535rpx; |
53 | text-align: center; | 53 | text-align: center; |
54 | font-size: 0; | 54 | font-size: 0; |
55 | position: relative; | 55 | position: relative; |
56 | - left: -15rpx; | 56 | + left: -16rpx; |
57 | + margin-top: 30rpx; | ||
57 | } | 58 | } |
58 | 59 | ||
59 | .product-qrcode { | 60 | .product-qrcode { |
@@ -99,9 +100,9 @@ | @@ -99,9 +100,9 @@ | ||
99 | 100 | ||
100 | .price { | 101 | .price { |
101 | display: inline; | 102 | display: inline; |
102 | - vertical-align: 8rpx; | ||
103 | color: #b0b0b0; | 103 | color: #b0b0b0; |
104 | text-decoration:line-through; | 104 | text-decoration:line-through; |
105 | + font-size: 24rpx; | ||
105 | } | 106 | } |
106 | 107 | ||
107 | .price0 { | 108 | .price0 { |
@@ -116,6 +117,7 @@ | @@ -116,6 +117,7 @@ | ||
116 | color: #D0021B; | 117 | color: #D0021B; |
117 | letter-spacing: -0.18px; | 118 | letter-spacing: -0.18px; |
118 | text-align: center; | 119 | text-align: center; |
120 | + font-weight: bold; | ||
119 | } | 121 | } |
120 | 122 | ||
121 | .textZero { | 123 | .textZero { |
-
Please register or login to post a comment