超值增配bug修复+功能优化（测试环境）

496_dongfengqichen/pages/mountings/mountings.wxml

@@ -10,11 +10,11 @@
           <image class="newImages9-5" src="{{imgUrl+'/newImages9/5.png'}}"></image>
         </view>
         <view class="phases-group" wx:for="{{dateList}}" wx:key="index" bindtap="dateChange" data-index="{{index}}">
-          <view class="date-text date-choose" wx:if="{{index == 0}}">{{item.activity_date_show}}</view>
-          <view class="date-text" wx:else>{{item.activity_date_show}}</view>
-          <image class="newImages9-11" wx:if="{{index == 0}}" src="{{imgUrl+'/newImages9/11.png'}}"></image>
-          <view class="phases-state" wx:elif="{{index == 1}}">即将开始</view>
-          <view class="phases-state" wx:else>敬请期待</view>
+          <view class="date-text {{dateList[index]['activity_date']==dateChoose?'date-choose':''}}">{{item.activity_date_show}}</view>
+          <!-- <image class="newImages9-11" wx:if="{{index == 0}}" src="{{imgUrl+'/newImages9/11.png'}}"></image> -->
+          <view class="phases-state {{dateList[index]['activity_date']==dateChoose?'phases-state-bg':''}}" wx:if="{{index == 0}}">抢购中</view>
+          <view class="phases-state {{dateList[index]['activity_date']==dateChoose?'phases-state-bg':''}}" wx:elif="{{index == 1}}">即将开始</view>
+          <view class="phases-state {{dateList[index]['activity_date']==dateChoose?'phases-state-bg':''}}" wx:else>敬请期待</view>
         </view>
       </view>
       <view class="goods-frame">

496_dongfengqichen/pages/mountings/mountings.wxss

@@ -81,6 +81,12 @@ view{
   font-weight:500;
   color:rgba(89,87,87,1);
 }
+.phases-state-bg{
+  padding: 5rpx 11rpx;
+  background-image: linear-gradient(to right,#ff134e,#ff4006);
+  color: #FFFFFF;
+  border-radius: 20rpx;
+}
 .goods-frame{
   padding: 59rpx 21rpx 38rpx;
 }

496_dongfengqichen/pages/mountingsDetail/mountingsDetail.js

@@ -94,17 +94,25 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    
+    if(this.data.ismore){
+      this.data.page++;
+      this.getFriendBargainList();
+    }
   },
 
   /**
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
+    let goodsMsg = {
+      sku_id:this.data.goodsMsg.sku_id,
+      activity_token:this.data.goodsMsg.activity_token,
+      sku_name:this.data.goodsMsg.activity_token
+    }
     return {
       title: "我正在以超低价购买"+this.data.goodsMsg.sku_name+"！有你帮忙还能更便宜！快来帮我！",
       imageUrl: this.data.imgUrl+'/newImages9/13.png',
-      path: "/pages/mountingsDetail/mountingsDetail?bargainType=2&datas="+JSON.stringify(this.data.goodsMsg)
+      path: "/pages/mountingsDetail/mountingsDetail?bargainType=2&datas="+JSON.stringify(goodsMsg)
     }
   },
   ruleShowControl(){//控制活动规则的显示与隐藏
@@ -226,9 +234,9 @@ Page({
   getActivityJoinDetail(){//获取砍价活动进度详情
     app.wxRequest(app.globalData.urlRoot + "bargain/getActivityJoinDetail", {activity_token:this.data.goodsMsg.activity_token}, res => {
       if (res.code == 200) {
+        res.data.surplus = (res.data.gap_money-res.data.success_money)/100;
         res.data.gap_money = res.data.gap_money/100;
         res.data.success_money = res.data.success_money/100;
-        res.data.surplus = res.data.gap_money-res.data.success_money;
         res.data.percent = Math.ceil((1-res.data.surplus/res.data.gap_money)*100);
         this.setData({
           activityJoinDetail:res.data
@@ -243,11 +251,5 @@ Page({
         })
       }
     }, this);
-  },
-  lookMore(){
-    if(this.data.ismore){
-      this.data.page++;
-      this.getFriendBargainList();
-    }
   }
 })

496_dongfengqichen/pages/mountingsDetail/mountingsDetail.wxml

@@ -1,7 +1,7 @@
 <!--pages/mountingsDetail/mountingsDetail.wxml-->
 <view class="all">
-  <view>
-    <scroll-view class="main" scroll-y="{{true}}" bindscrolltolower="lookMore">
+  <view class="main">
+    <!-- <scroll-view class="main" scroll-y="{{true}}" bindscrolltolower="lookMore"> -->
       <view class="banner-group">
         <swiper indicator-dots="true" style="width:750rpx;height:556rpx;">
           <swiper-item wx:for="{{goodsDetail.sku_banner}}" wx:key="index">
@@ -87,7 +87,8 @@
         <image class="closeXieyi" bindtap="ruleShowControl" src="{{imgUrl+'/images/closeXieyi.png'}}"></image>
         <image class="newImages9-12" src="{{imgUrl+'/newImages9/12.png'}}"></image>
       </view>
-    </scroll-view>
+      <view class="bottom-cushion"></view>
+    <!-- </scroll-view> -->
   </view>
   <tabBar></tabBar>
 </view>

496_dongfengqichen/pages/mountingsDetail/mountingsDetail.wxss

@@ -8,10 +8,9 @@ image{
 view{
   -webkit-overflow-scrolling: touch;
 }
-.main{
+/* .main{
   height: calc(100vh - 120rpx);
-  overflow: auto;
-}
+} */
 .banner-group{
   position: relative;
   width: 750rpx;
@@ -112,7 +111,7 @@ view{
 }
 .bargain-group{
   width:694rpx;
-  height:330rpx;
+  padding-bottom:30rpx;
   border-radius: 20rpx;
   margin: 0 auto;
   background-color: white;
@@ -217,7 +216,7 @@ view{
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  bottom: 0;
+  bottom: -3rpx;
   width: 0;
   height: 0;
   border: 20rpx solid transparent;
@@ -370,9 +369,11 @@ view{
   color:rgba(52,84,128,1);
   line-height:36rpx;
 }
-
+.bottom-cushion{
+  width: 100%;
+  height: 120rpx;
+}
 
 .wx-swiper-dots{
   margin-bottom: 110rpx;
 }
-