Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshop-uniapp

pages/activity/DargainDetails/index.vue

@@ -267,7 +267,10 @@
       // 查看商品
       openAlone: function () {
         this.$yrouter.push({
-          path: "/detail/" + this.goodsDetail.productId
+          path: "/pages/shop/GoodsCon/index",
+          query: {
+            id: this.goodsDetail.productId
+          }
         });
       },
       // 砍价完成，去支付

pages/activity/SeckillDetails/index.vue

@@ -10,8 +10,8 @@
       <view class="acea-row row-middle">
         <view class="times">
           <view>距秒杀结束仅剩</view>
-          <count-down :isDay="false" :tipText="false" :dayText="false" :hourText="' : '" :minuteText="' : '"
-            :secondText="false" :datatime="datatime"></count-down>
+          <count-down :isDay="false" :tipText="' '" :dayText="' '" :hourText="' : '" :minuteText="' : '"
+            :secondText="' '" :datatime="datatime"></count-down>
         </view>
         <view class="iconfont icon-jiantou"></view>
       </view>