Authored by hongyong.zhao

ui fix

// export const API_HOST = 'https://api.yoho.cn';
// export const SERVICE_HOST = 'https://api.yoho.cn';
export const API_HOST = 'https://api.yoho.cn';
export const SERVICE_HOST = 'https://api.yoho.cn';
export const APP_REPORT_HOST = 'https://app.yoho.cn/collect/v3';
export const LOG_EVENT_HOST = 'https://analysis.yohobuy.com/yas_mobile';
// export const ACTIVITY_HOST = 'http://192.168.102.49:6006';
export const ACTIVITY_HOST = 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com'
// export const ACTIVITY_HOST = 'https://action.yoho.cn';
// export const ACTIVITY_HOST = 'http://172.16.10.53:6006'
// export const ACTIVITY_HOST = 'http://yoho-activity-platform.test3.ingress.dev.yohocorp.com';
export const ACTIVITY_HOST = 'https://action.yoho.cn';
// export const API_HOST = 'http://dev-api.yohops.com:9999';
// 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
// export const API_HOST = 'http://api-test1.yohops.com:9999';
// export const SERVICE_HOST = 'http://api-test1.yohops.com:9999/';
export const API_HOST = 'http://api-test3.dev.yohocorp.com';
export const SERVICE_HOST = 'http://api-test3.dev.yohocorp.com';
// export const API_HOST = 'http://api-test3.dev.yohocorp.com';
// export const SERVICE_HOST = 'http://api-test3.dev.yohocorp.com';
// export const API_HOST = 'http://api-test2.dev.yohocorp.com';
// export const SERVICE_HOST = 'http://api-test2.dev.yohocorp.com';
... ...
... ... @@ -93,13 +93,10 @@ Component({
},
goList() {
if(getCurrentPages().length === 1) {
router.go('index');
} else {
wx.navigateBack({
delta: getCurrentPages().length - 1
wx.navigateTo({
url: '/pages/zeroSell/index?reload=0',
})
}
},
... ...
... ... @@ -58,7 +58,7 @@
.container {
width: 600rpx;
height: 64rpx;
background-color: black;
background-color: #222;
text-align: center;
margin: 0 auto;
}
\ No newline at end of file
... ...
... ... @@ -15,4 +15,6 @@
height: 30rpx;
vertical-align: middle;
margin-right: 10rpx;
position: relative;
top: -2rpx;
}
\ No newline at end of file
... ...
... ... @@ -39,6 +39,6 @@
padding: 8rpx;
bottom: 20rpx;
right: 30rpx;
border: 1rpx solid black;
color: black;
color: white;
background-color: #222;
}
\ No newline at end of file
... ...
... ... @@ -10,7 +10,7 @@
}
.step {
padding-top: 20rpx;
padding-top: 23rpx;
}
.step-image {
... ...
... ... @@ -9,11 +9,14 @@
<time-countdown class="product_countdown" wx:if="{{product.status === 2}}" endTime="{{product.end_time}}"></time-countdown>
</view>
<view class="avatarcontainer">
<view class="avatars" wx:if="{{product.status === 2 && avatars.length > 0}}">
<avatars list="{{avatars}}"></avatars>
</view>
<image class="product_image" src="{{product.cover_img}}"></image>
</view>
<view class="product_name" >{{product.name}}</view>
<view class="product_price" >{{product.price}}</view>
<view wx:if="{{product.status !== 2}}" class="product_time">{{helper.formatTime(product.start_time, product.end_time)}}</view>
... ...
... ... @@ -55,13 +55,12 @@
.product_countdown {
display: inline-block;
height: 92rpx;
margin-top: 40rpx;
margin-bottom: 40rpx;
margin-top: 44rpx;
margin-bottom: 36rpx;
}
.countdown_label {
width: 60rpx;
height: 56rpx;
font-family: PingFang-SC-Regular;
font-size: 20rpx;
color: #222222;
... ... @@ -69,6 +68,9 @@
text-align: center;
display: inline-block;
margin-right: 16rpx;
vertical-align: text-top;
position: relative;
top: -2rpx;
}
.countdown_labeltext {
... ... @@ -80,5 +82,11 @@
text-align: center;
margin-left: auto;
margin-right: auto;
margin-bottom: 38rpx;
left: calc(50% - 180rpx);
top: 36rpx;
position: absolute;
}
.avatarcontainer {
position: relative;
}
\ No newline at end of file
... ...
... ... @@ -11,8 +11,7 @@
}
.ok {
border: 4rpx solid #444444;
background: black;
background: #222;
}
.cancel {
... ...
... ... @@ -18,6 +18,7 @@
font-size: 32rpx;
color: #B0B0B0;
background-color: white;
font-weight: bold;
}
.active {
... ...
<!--pages/zeroSell/components/timeCountDown/time-countdown.wxml-->
<block wx:for="{{formatTime}}" wx:key="">
<view class="num-wrapper">
<text>{{item}}</text>
<view class="mask"></view>
<text class="num-text">{{item}}</text>
<view class="mask-left"></view>
<view class="mask-right"></view>
</view>
<view class="number-seprator" wx:if="{{index !== 3}}">
:
... ...
... ... @@ -2,10 +2,10 @@
display: inline-block;
position: relative;
width: 72rpx;
height: 72rpx;
font-size: 56rpx;
line-height: 72rpx;
background: black;
height: 84rpx;
font-size: 50rpx;
line-height: 84rpx;
background: #444;
color: white;
font-weight: bolder;
}
... ... @@ -22,11 +22,33 @@
left: 0;
opacity: 0.4;
background-color: black;
z-index: 0;
}
.num-text {
z-index: 99;
}
.mask-left {
position: absolute;
width:3.5rpx;
height: 8rpx;
top: calc(50% - 4rpx);
left: 0;
background-color: white;
}
.mask-right {
position: absolute;
width:3.5rpx;
height: 8rpx;
top: calc(50% - 4rpx);
right: 0;
background-color: white;
}
.number-seprator {
font-size: 56rpx;
line-height: 72rpx;
font-size: 50rpx;
line-height: 84rpx;
color: black;
display: inline;
}
\ No newline at end of file
... ...
... ... @@ -44,15 +44,16 @@ Page(Object.assign({
bannerUrl: null
},
onLoad() {
onLoad(options) {
this.service = new ZeroSellService();
this.commonService = new CommonService();
this._init();
new app.WeToast();
if(!(options && +options.reload === 0)) {
this._getResouceCode()
}
this._getBottomBanner()
},
... ...
... ... @@ -2,8 +2,8 @@
<view class="list-top-blank"></view>
<tabs-pane name="进行中">
<view class="productList">
<image class="topgif" src="./images/yoluck.gif"/>
<view class="productList">
<block wx:for="{{list[0].products}}" wx:key="{{item.id}}">
<product-item product="{{item}}" class="product"></product-item>
</block>
... ...
... ... @@ -146,7 +146,7 @@ Page({
let pCtx = wx.createCanvasContext('productDetailCanvas', this);
pCtx.setFillStyle('white');
pCtx.setStrokeStyle('black')
pCtx.setStrokeStyle('white')
pCtx.fillRect(0, 0, windowWidth, screenHeight);
this.drawRect(pCtx, windowWidth, screenHeight);
... ... @@ -172,34 +172,36 @@ Page({
}
});
pCtx.drawImage('./images/Group@2x.png', 20 * scale, 286 * scale, 334 * scale, 68 * scale);
pCtx.drawImage('./images/Group@2x.png', 15 * scale, 306 * scale, 346 * scale, 68 * scale);
this.drawLongText(this.data.product_name, pCtx, 187.5 * scale, 412 * scale, '#444444', 20, 20);
// pCtx.drawImage('./images/y@2x.png', 128.5 * scale, 465 * scale, 60 * scale, 25 * scale);
pCtx.setFillStyle('#D0021B')
pCtx.setFontSize(12)
// pCtx.setFontSize(12)
// pCtx.setFontWeight('bold')
pCtx.font = '12px SanFranciscoText-Bold'
pCtx.fillText('¥', 128.5 * scale, 465 * scale)
pCtx.setFillStyle('#D0021B')
pCtx.setFontSize(26)
pCtx.fillText('0', 143 * scale, 465 * scale)
pCtx.fillText('0', 142 * scale, 465 * scale)
pCtx.setFillStyle('#b0b0b0');
// pCtx.setTextAlign('center');
const fontSize = 18;
const fontSize = 12;
pCtx.setFontSize(fontSize);
let text = `${this.data.product_price}`;
pCtx.fillText(text, 205 * scale, 465 * scale);
pCtx.fillText(text, 190 * scale, 465 * scale);
let textRect = {width: 70};
if (pCtx.measureText) {
textRect = pCtx.measureText(text);
}
this.drawLine(pCtx, (205 * scale) - (30 * scale), (465 - 15/2) * scale, textRect.width);
this.drawLine(pCtx, (195 * scale) - (30 * scale), (465 - 10/2) * scale, textRect.width);
pCtx.setFillStyle('black')
pCtx.fillRect(47 * scale, 562 * scale, 280 * scale, 90 * scale)
// this.drawRoundedRect(this.Rect(25 * scale, 562* scale, 280 * scale, 90 * scale), 0, pCtx);
... ... @@ -220,7 +222,7 @@ Page({
},
drawRoundedRect: function(rect, r, ctx) {
ctx.setLineWidth(1)
ctx.setLineWidth(0.5)
ctx.setStrokeStyle('rgba(0,0,0,0.1)');
ctx.strokeRect(rect.x, rect.y, rect.width, rect.height);
// ctx.stroke();
... ... @@ -291,7 +293,7 @@ Page({
drawRect: function (ctx, width, height) {
ctx.beginPath()
ctx.setStrokeStyle('black')
ctx.setStrokeStyle('white')
const lineWidth = 6;
ctx.setLineWidth(lineWidth)
... ...
... ... @@ -24,7 +24,7 @@
height: 1000rpx;
background-color: white;
flex-direction: column;
border: 6rpx solid black;
/* border: 6rpx solid black; */
}
.snapshoot {
... ... @@ -45,15 +45,16 @@
.content {
width: 500rpx;
margin: 0 20rpx;
border: 4rpx solid #b0b0b0;
border: 2rpx solid #b0b0b0;
}
.center {
width: 530rpx;
width: 535rpx;
text-align: center;
font-size: 0;
position: relative;
left: -15rpx;
left: -16rpx;
margin-top: 30rpx;
}
.product-qrcode {
... ... @@ -99,9 +100,9 @@
.price {
display: inline;
vertical-align: 8rpx;
color: #b0b0b0;
text-decoration:line-through;
font-size: 24rpx;
}
.price0 {
... ... @@ -116,6 +117,7 @@
color: #D0021B;
letter-spacing: -0.18px;
text-align: center;
font-weight: bold;
}
.textZero {
... ...