From 8e8db3506783c914900b5e495c421814d02a267e Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 15 Jul 2019 19:46:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/appmini/old/weixin/app.json            |  4 +-
 .../weixin/pages/goods-detail/goods-detail.js |  2 +-
 .../pages/goods-detail/goods-detail.wxml      | 21 ++++++++-
 .../pages/goods-detail/goods-detail.wxss      | 43 ++++++++++++++++---
 4 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index f325a2101..a9afed06a 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,5 +1,5 @@
 {
-  "pages": [
+  "pages": ["pages/goods-detail/goods-detail",
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
@@ -8,7 +8,7 @@
     "pages/login/login",
     "pages/paytips/paytips",
     "pages/goods-search/goods-search",
-    "pages/goods-detail/goods-detail",
+    
     "pages/goods-comment/goods-comment",
     "pages/goods-attribute/goods-attribute",
     "pages/buy/buy",
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index bde266ed1..99b44fdc5 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -40,7 +40,7 @@ Page({
   },
 
   onLoad(params) {
-    //params['goods_id']=2;
+    params['goods_id']=2;
     this.setData({params: params});
     this.init();
   },
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
index f356259cf..a5ff5c536 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
@@ -26,9 +26,28 @@
     </view>
   </block>
 
+  <!-- 标题 -->
+  <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
+
+  <!-- 秒杀 -->
+  <view class="limitedtimediscount">
+    <view class="countdown">
+      <text class="text-title"> 限时秒杀</text>
+      <view class="time-right fr">
+        <view class="timer-hours minutes fr">14</view>
+        <view class="ds fr">秒</view>
+        <view class="timer-hours millisecond fr">7</view>
+        <view class="ds fr">分</view>
+        <view class="timer-hours seconds fr">08</view>
+        <view class="ds fr">时</view>
+        <view class="timer-hours hours fr">650</view>
+        <view class="timer-title fr">距离结束还有</view>
+      </view>
+    </view>
+  </view>
+
   <!-- 基础信息 -->
   <view class="goods-base bg-white">
-    <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
     <view class="goods-price single-text">
       <view class="goods-share tc" bindtap="popup_share_event">
         <image src="/images/goods-detail-share-icon.png" mode="scaleToFill" class="dis-block" />
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
index 2f14d449e..79013b433 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
@@ -168,17 +168,17 @@
 .goods-buy-nav .dis-block {
   margin-top: -10rpx;
 }
+.goods-title {
+  font-size: 32rpx;
+  line-height: 44rpx;
+  font-weight: 500;
+}
 .goods-base {
     padding: 15rpx 10rpx;
 }
 .goods-base button {
   background: #fff;
 }
-.goods-base .goods-title {
-    font-size: 32rpx;
-    line-height: 44rpx;
-    font-weight: 500;
-}
 .goods-base .goods-share {
   position: absolute;
   top: 0;
@@ -252,4 +252,37 @@
 .goods-video-submit image {
   width: 80rpx;
   height: 80rpx;
+}
+
+
+/*
+ * 限时秒杀
+ */
+.limitedtimediscount {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQIAAAAgAQMAAADDkuSaAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExUReQ5POlVO+6K1q8AAACiSURBVDjLhZK7EYMwEETlISCkBJUCnUEplOISXIJDQgcEHg9o/Vt5ZOZu9eKXvL0LIbOECg3OFSMiVYwRWKVwwouLMtq3gUkY/cfYhIEvi2gls9+aEa3kLlqJndwVBga/lSTRSm6i1U2OByNNfivZRCu5Wnf9Z/BbyS5ajfUb0ygfO9pGkTzaBh6i9bB+6xr5sXvf2EUrWUVrsX6UBkTrL/kJzQQAijmza5AAAAAASUVORK5CYII=) right top no-repeat #f23030;
+  background-size: cover;
+  padding: 10rpx;
+  height: 56rpx;
+  overflow: hidden;
+  margin-top: 10rpx;
+}
+.limitedtimediscount .countdown {
+  color: #fff;
+  line-height: 56rpx;
+}
+.limitedtimediscount .countdown .timer-title {
+  margin-right: 10rpx;
+}
+.limitedtimediscount .countdown .timer-hours {
+  padding: 0 6rpx;
+  -moz-border-radius: 8rpx;
+  border-radius: 8rpx;
+  color: #ffe500;
+  min-width: 35rpx;
+  text-align: center;
+  font-weight: bold;
+  font-size: 32rpx;
+}
+.limitedtimediscount .countdown .ds {
+  padding: 0 4rpx;
 }
\ No newline at end of file
-- 
GitLab