add handbonus

pages/components/blocks/tabs/tabs.js

@@ -7,6 +7,9 @@ Component({
   properties: {
     tabs: {
       type: Array
+    },
+    num: {
+      type: Number
     }
   },
 
@@ -14,13 +17,8 @@ Component({
    * 组件的初始数据
    */
   data: {
-    secIndex: 0
+    secIndex: 0 
   },
-
-  ready() {
-     
-  },
-
   /**
    * 组件的方法列表
    */

pages/components/blocks/tabs/tabs.wxml

@@ -1,15 +1,9 @@
 
 <view>
-  <scroll-view class="scroll-view_H" scroll-x="true" style="width: 100%">
-    <view 
-      wx:for="{{tabs}}" 
-      wx:key="tabsIndex" 
-      wx:for-index="tabsIndex" 
-      class="scroll-view-item_H {{tabsIndex==secIndex ? 'active':''}}" 
-      bindtap="secTabs" 
-      data-id="{{tabsIndex}}"
-      data-item="{{item}}">
-      {{item.name}}
+  <view class="scroll-view_auto">
+    <view wx:for="{{tabs}}" wx:key="tabsIndex" wx:for-index="tabsIndex" class="scroll-view-item_auto {{tabsIndex==secIndex ? 'active':''}}"
+      bindtap="secTabs" data-id="{{tabsIndex}}" data-item="{{item}}">
+      <text class="scroll-view_name">{{item.name}}</text>
     </view>
-  </scroll-view>
+  </view>
 </view>

pages/components/blocks/tabs/tabs.wxss

@@ -18,6 +18,8 @@
   font-size: 28rpx;
   color: #777777;
   background: #2b2b2b;
+
+
 }
 .scroll-view-item_H:after {
   content: '';
@@ -34,3 +36,56 @@
 .scroll-view-item_H.active:after {
   background: #fff;
 }
+
+
+
+.scroll-view_auto {
+  display: flex;
+  z-index: 10;
+  align-items:center;
+  overflow-x: auto;
+  position: fixed;
+  top: 80rpx;
+  left: 0;
+  width: 100%;
+  white-space: nowrap;
+  background:#2b2b2b;
+}
+.scroll-view-item_auto {
+  display: inline-block;
+  position: relative;
+  padding: 10rpx 28rpx;
+  min-width: 56rpx;
+  height: 40rpx;
+  font-size: 28rpx;
+  color: #777777;
+  background: #2b2b2b;
+  text-align: center;
+
+  flex-grow: 1;
+  flex-shrink: 0;
+}
+.scroll-view-item_auto.active .scroll-view_name {
+  color: #fff
+}
+.scroll-view-item_auto.active .scroll-view_name:after {
+  background: #fff;
+}
+
+
+.scroll-view_name {
+  display: inline-block;
+  position: relative;
+}
+.scroll-view_name:after {
+  content: '';
+  position: absolute;
+  left: -10rpx;
+  right: -10rpx;
+  bottom: -8rpx;
+  /* width: 70%; */
+  height: 4rpx;
+  /* left: 15%; */
+  background: transparent;
+}
+

pages/confirmOrder/confirmOrder.wxml

@@ -54,7 +54,7 @@
         <!-- <view>{{bl_item}}</view> -->
         <image class="order_content_img" src="{{bl_item['goods_summary']['goods_image_url']}}"></image>
         <view class="order_content_middle over_hidden">
-          <view class="l_height42 ft_bold one_line_hidden">{{bl_item['goods_summary']['goods_mobile_name']}}</view>
+          <view class="l_height42 one_line_hidden">{{bl_item['goods_summary']['goods_mobile_name']}}</view>
           <view class="order_letter_pro one_line_hidden">{{bl_item['goods_summary']['goods_spec']}}</view>
           <view>
             <text class="f30 col333 ft_bold mr10"><text class="f24 mr6">¥</text>{{bl_item['bl_goods_price']}}</text>
@@ -68,7 +68,7 @@
       <view class="order_goods_content vux-1px-b">
         <image class="order_content_img" src="{{item['goods_summary']['goods_image_url']}}"></image>
         <view class="order_content_middle over_hidden">
-          <view class="l_height42 ft_bold one_line_hidden">{{item['goods_summary']['goods_mobile_name']}}</view>
+          <view class="l_height42 one_line_hidden">{{item['goods_summary']['goods_mobile_name']}}</view>
           <view class="order_letter_pro one_line_hidden">{{item['goods_summary']['goods_spec']}}</view>
           <view>
             <text class="f30 col333 ft_bold mr10" wx:if="{{item['goods_summary']['act_type'] == 0}}"><text class="f24 mr6">¥</text>{{item['goods_summary']['bonus_price']}}</text>

pages/confirmOrder/confirmOrder.wxss

@@ -11,6 +11,7 @@
   background: #fff;
   flex-wrap: wrap;
   padding: 16rpx 100rpx 16rpx 0;
+  position: relative;
 }
 .address_none {
   display: -webkit-flex;
@@ -33,6 +34,8 @@
   height: 30rpx;
   position: absolute;
   right: 30rpx;
+  top: 50%;
+  margin-top: -15rpx;
 }
 .payment_method {
   display: -webkit-flex;

pages/details/details.wxss

@@ -188,6 +188,7 @@
   position: relative;
   text-align: center;
   height: 42rpx;
+  line-height: 42rpx;
   font-size: 30rpx;
   color: #333333;
 }
@@ -195,16 +196,18 @@
   position: absolute;
   top: 0;
   right: 0;
-  display: flex;
-  align-items: center;
+  /* display: flex; */
+  /* align-items: center; */
   width: 140rpx;
   height: 42rpx;
+  line-height: 42rpx;
   font-size: 24rpx;
   color: #333333;
 }
 .all_comments_icon {
   position: absolute;
   right: 0;
+  top: 5rpx;
   margin-left: 10rpx;
   width: 16rpx;
   height: 30rpx;

pages/handOutBonus/handOutBonus.wxml

@@ -28,16 +28,16 @@
   <view class="bonus_cell_type" wx:else>群里每人收到固定金额，<text class="col1e5992" catchtap="secBonusType" data-type="pin">改为拼手气红包</text></view>
 
 
-  <view class="balance_cell mt20" style="min-height: 112rpx;height: auto;">
+  <view class="balance_cell mt20" style="min-height: 100rpx;height: auto;">
     <view>留言</view>
     <view class="right_cell">
-      <textarea class="message_input" placeholder="" auto-height bindinput="bindKeyInput" bindinput="blessInput" bindfocus="blessFocus" bindblur="blessBlur" value="{{tempBless}}"/>
+      <textarea maxlength="30" class="message_input" placeholder="" auto-height bindinput="bindKeyInput" bindinput="blessInput" bindfocus="blessFocus" bindblur="blessBlur" value="{{tempBless}}"/>
       </view>
   </view>
 
   <view class="bonus_total">¥<text class="ml10">{{total}}</text></view>
   <view class="share_btn {{btnFlag ? 'can_share' : ''}}" catchtap="checkBonus">发红包</view>
-  <view class="f24 mb20 text_center">未领取的红包,将于24小时后发起退款</view>
+  <view class="f24 mb20 text_center col666">未领取的红包,将于24小时后发起退款</view>
  
 
   <view class="real_share_box {{canShare?'show_popup':''}}" catchtap="close"> </view>

pages/handOutBonus/handOutBonus.wxss

@@ -10,7 +10,7 @@
   padding-bottom: 10rpx;
   height: 48rpx;
   line-height: 48rpx;
-  font-size: 36rpx;
+  font-size: 30rpx;
   font-weight: bold;
   color: #333;
 }
@@ -18,7 +18,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  height: 112rpx;
+  height: 100rpx;
   padding-left: 30rpx;
   font-size: 30rpx;
   background: #fff;
@@ -38,7 +38,6 @@
 }
 .icon_pin {
   position: relative;
-  top: 2rpx;
   margin-left: 4rpx;
   width: 30rpx;
   height: 30rpx;

pages/index/index.wxml

@@ -3,10 +3,12 @@
   <bonusTips wx:if="{{tipsFlag}}" tipsDatas="{{tipsDatas}}" bind:closeTips="closeTips"></bonusTips>
   <view style="height: 140rpx;overflow: hidden;background:#2b2b2b;">
       <searchBox></searchBox>
-      <tabs tabs="{{tabs}}" bind:myevent="onMyEvent"></tabs>
+      <block wx:if="{{tabs.length}}">
+        <tabs tabs="{{tabs}}" bind:myevent="onMyEvent" num="123"></tabs>
+      </block>
   </view>
   <!-- <view class='clear_fixed'></view>  -->
   <blockList prop_special="{{prop_special}}" summery="{{summery}}" special_datas="{{special_datas}}"> </blockList>
-  <image class="free_bonus" wx:if="{{daliy_bonus}}" catchtap="freeBonus" src="../../image/finger.png"></image>
+  <image class="free_bonus" wx:if="{{daliy_bonus}}" catchtap="freeBonus" src="../../image/shidian.png"></image>
   <image bindtap='backTop' style="display:{{isScroll?'block':'none'}}" mode='widthFix' class='back_top_btn' src='../../image/back_top.png'></image> 
 </view>

pages/index/index.wxss

@@ -25,8 +25,8 @@
 .free_bonus {
   position: fixed;
   z-index: 99;
-  right: 0;
-  bottom: 300rpx;
-  width: 64rpx;
-  height: 64rpx;
+  right: 4rpx;
+  bottom: 228rpx;
+  width: 86rpx;
+  height: 108rpx;
 }

pages/shareBonus/shareBonus.js

@@ -296,7 +296,7 @@ Page({
       renderCount
     })
     setTimeout(() => {
-      this.countTime(send_start_date)
+      this.countTime(params, send_start_date)
     }, 1000);
 
   },

pages/shareBonus/shareBonus.wxml

@@ -26,7 +26,7 @@
       <view class="line_h30">独家运营70多个知名化妆品品牌的天猫官方旗舰店</view>
       <view class="flex_center ht30">
         <image src="../../image/bonus/icon_logo.png" class="icon_logo"></image>
-        <view style="position: relative;top: 6rpx;">上海丽人丽妆化妆品股份有限公司</view>
+        <view style="position: relative;">上海丽人丽妆化妆品股份有限公司</view>
       </view>
     </view>
   </view>

pages/shopCart/shopCart.wxml

@@ -1,5 +1,5 @@
 <import src="../components/template/loadAnimation/loadAnimation.wxml" />
-<view style="background: #fff;">
+<view>
   <template is="shopcartLoad" wx:if="{{loadAnimation}}" />
   <bonusTips wx:if="{{tipsFlag}}" tipsDatas="{{tipsDatas}}" bind:closeTips="closeTips"></bonusTips>
   <view wx:if="{{summary.length <= 0}}">
@@ -105,8 +105,8 @@
 
   <!-- 猜你喜欢 -->
   <block wx:if="{{canShow}}">
-    <view wx:if="{{prop_special.length}}" class="mt30 mb10">
-      <!-- <view class="text_center l_height42 f30 col333">-猜你喜欢-</view> -->
+    <view wx:if="{{prop_special.length}}" class="mt30">
+      <view class="text_center l_height42 f30 col333">-猜你喜欢-</view>
       <blockList prop_special="{{prop_special}}" summery="{{summery}}" special_datas="{{special_datas}}"> </blockList>
     </view>
   </block>

pages/shopCart/shopCart.wxss

@@ -133,7 +133,7 @@
 .goods_name {
   font-size: 30rpx;
   color: #333;
-  font-weight: bold;
+  /* font-weight: bold; */
   line-height: 42rpx;
 }
 .goods_spec{

pages/special/special.js

@@ -55,7 +55,11 @@ Page({
   onReady: function () {
   
   },
-
+  backHome: function () {
+    wx.reLaunch({
+      url: '/pages/index/index',
+    })
+  },
   /**
    * 生命周期函数--监听页面显示
    */

pages/special/special.wxml

@@ -1,4 +1,5 @@
 <!--pages/special/special.wxml-->
 <view>
+  <image src="../../image/back-home.png" class="ball-top" catchtap='backHome'></image>
   <blockList prop_special="{{special_datas.special_list}}" summery="{{summery}}" special_datas="{{special_datas}}"> </blockList>
 </view>

pages/special/special.wxss

@@ -1 +1,10 @@
-/* pages/special/special.wxss */
+/* pages/special/special.wxss */
+.ball-top {
+  position: fixed;
+  right: 22rpx;
+  bottom: 130rpx;
+  width: 106rpx;
+  height: 106rpx;
+  border-radius: 100%;
+  z-index: 999;
+}