From 7827d26b39519e3602d5311d697efcd893aa3348 Mon Sep 17 00:00:00 2001
From: 肖亚东 <allen.xiao@yoho.cn>
Date: Thu, 28 Mar 2019 15:32:41 +0800
Subject: [PATCH] UI变更以及验收问题修改
---
app/pages/product/detail/components/count-down-by-now/index.wxml | 14 +++++++++-----
app/pages/product/detail/components/count-down-by-now/index.wxss | 13 ++++++++++++-
app/pages/product/detail/detail.js | 34 +++++++++++++++++++++-------------
3 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/app/pages/product/detail/components/count-down-by-now/index.wxml b/app/pages/product/detail/components/count-down-by-now/index.wxml
index 29450f0..5596f47 100644
--- a/app/pages/product/detail/components/count-down-by-now/index.wxml
+++ b/app/pages/product/detail/components/count-down-by-now/index.wxml
@@ -1,10 +1,14 @@
<view wx:if="{{label}}" class="comp-count-dow-by-now">
<text class="tips">{{label}}</text>
- <!-- <text class="number">{{days}}</text>
- <text class="number">{{hours}}：</text>
- <text class="number">{{minutes}}：</text>
- <text class="number">{{seconds}}</text> -->
+ <text class="time">{{days}}</text>
+ <text class="text">天</text>
+ <text class="time">{{hours}}</text>
+ <text class="text">时</text>
+ <text class="time">{{minutes}}</text>
+ <text class="text">分</text>
+ <text class="time">{{seconds}}</text>
+ <text class="text">秒</text>
- <text class="time">{{fullContent}}</text>
+ <!-- <text class="time">{{fullContent}}</text> -->
</view>
diff --git a/app/pages/product/detail/components/count-down-by-now/index.wxss b/app/pages/product/detail/components/count-down-by-now/index.wxss
index ad8e9e9..3393022 100644
--- a/app/pages/product/detail/components/count-down-by-now/index.wxss
+++ b/app/pages/product/detail/components/count-down-by-now/index.wxss
@@ -22,9 +22,20 @@
.comp-count-dow-by-now .time {
display: inline-block;
- font-size: 72rpx;
+ font-size: 60rpx;
font-family: PingFang-SC-Heavy;
font-weight: bold;
color: #222222;
letter-spacing: -0.31px;
}
+
+.comp-count-dow-by-now .text {
+ font-family: PingFang-SC-Heavy;
+ font-weight: bold;
+ font-size: 20rpx;
+ color: #222222;
+ letter-spacing: -0.31px;
+ margin-top: 28rpx;
+ margin-left: 6rpx;
+ margin-right: 6rpx;
+}
\ No newline at end of file
diff --git a/app/pages/product/detail/detail.js b/app/pages/product/detail/detail.js
index 1dbb75e..589a694 100644
--- a/app/pages/product/detail/detail.js
+++ b/app/pages/product/detail/detail.js
@@ -403,6 +403,7 @@ Page(Object.assign({
isNew: res.data.isNew ? res.data.isNew : '',
currentTime: res.data.currentTime ? res.data.currentTime : '',
oldSaleTime: res.data.oldSaleTime ? res.data.oldSaleTime : '',
+ isApp: res.data.isApp=='Y' ? true : false,
});
} else {
return Promise.reject();
@@ -512,6 +513,15 @@ Page(Object.assign({
}
},
assistShare(e) {
+ if (this.data.isApp) {
+ wx.showModal({
+ title: '',
+ content: '请打开有货APP参与活动',
+ showCancel: false
+ })
+ return;
+ }
+
if (!app.getUid()) {
this.goLogin();
return;
@@ -667,19 +677,17 @@ Page(Object.assign({
3、限定球鞋每周免费送',
confirmText: '去关注',
showCancel: false,
- success(res) {
- if (res.confirm) {
- wx.setClipboardData({
- data: 'YOHOBUY有货',
- success(res) {
- wx.showToast({
- icon: 'none',
- title: '公众号“YOHOBUY有货”，已复制成功，打开微信去搜索关注吧！',
- duration: 3000
- });
- }
- })
- }
+ complete() {
+ wx.setClipboardData({
+ data: 'YOHOBUY有货',
+ complete() {
+ wx.showToast({
+ icon: 'none',
+ title: '公众号“YOHOBUY有货”，已复制成功，打开微信去搜索关注吧！',
+ duration: 3000
+ });
+ }
+ })
}
})
},
--
libgit2 0.24.0