bug修复

496_dongfengqichen/pages/mountings/mountings.js

     }, this)
   },
   joinActivity(e){
-    let state = e.target.dataset.state;
     let index = e.target.dataset.index;
+    let state = this.data.dataList[index].state;
     if(state==-1){//我要砍价
       if(this.data.isAddress){
         this.beginBargain(this.data.dataList[index]);
       }
     }else if(state==0){//查看详情
       wx.navigateTo({
-        url: '/pages/mountingsDetail/mountingsDetail?datas='+JSON.stringify(this.data.dataList[index]),
+        url: '/pages/mountingsDetail/mountingsDetail?sku_id='+this.data.dataList[index]['sku_id']+"&activity_token="+this.data.dataList[index]['activity_token'],
       })
     }else if(state==1){//已经成功
       wx.reLaunch({
       if (res.code == 200) {
         data.activity_token = res.data.activity_token;
         wx.navigateTo({
-          url: '/pages/mountingsDetail/mountingsDetail?datas='+JSON.stringify(data),
+          url: '/pages/mountingsDetail/mountingsDetail?sku_id='+data.sku_id+'&activity_token='+res.data.activity_token,
         })
       }else{
         wx.showToast({
     var index = e.currentTarget.dataset.index;
     if(this.data.dateChoose != this.data.dateList[index]['activity_date']){
       this.setData({
+        dataList:[],
         dateChoose:this.data.dateList[index]['activity_date']
       })
-      this.getActivityList();
     }
+    this.getActivityList();
   }
 })

496_dongfengqichen/pages/mountings/mountings.wxml

                 <view wx:if="{{item.state==-1}}" class="after-discount">{{item.goods_final_content}}</view>
                 <!-- <view wx:if="{{item.state!=-1}}" class="after-discount" style="color:#2B2B2B;">券后：￥<text style="font-size:37rpx;">{{item.goods_final_price2}}</text></view> -->
                 <view wx:if="{{item.state!=-1}}" class="after-discount" style="color:#2B2B2B;">{{item.goods_final_content}}</view>
-                <image wx:if="{{item.state==-1 && dateChoose==dateList[0]['activity_date']}}" bindtap="joinActivity" data-index="{{index}}" data-state="{{item.state}}" class="newImages9-6" src="{{imgUrl+'/newImages9/6.png'}}"></image>
-                <image wx:if="{{item.state==0 && dateChoose==dateList[0]['activity_date']}}" bindtap="joinActivity" data-index="{{index}}" data-state="{{item.state}}" class="newImages9-6" src="{{imgUrl+'/newImages9/7.png'}}"></image>
-                <image wx:if="{{item.state==1 && dateChoose==dateList[0]['activity_date']}}" bindtap="joinActivity" data-index="{{index}}" data-state="{{item.state}}" class="newImages9-6" src="{{imgUrl+'/newImages9/8.png'}}"></image>
-                <image wx:if="{{item.state==-2 && dateChoose==dateList[0]['activity_date']}}" bindtap="joinActivity" data-index="{{index}}" data-state="{{item.state}}" class="newImages9-6" src="{{imgUrl+'/newImages9/9.png'}}"></image>
-                <image wx:if="{{dateChoose!=dateList[0]['activity_date']}}" class="newImages9-6" src="{{imgUrl+'/newImages9/25.png'}}"></image>
+                <image wx:if="{{dateChoose!==dateList[0]['activity_date']}}" class="newImages9-6" src="{{imgUrl+'/newImages9/25.png'}}"></image>
+                <image wx:elif="{{item.state==0}}" bindtap="joinActivity" data-index="{{index}}" class="newImages9-6" src="{{imgUrl+'/newImages9/7.png'}}"></image>
+                <image wx:elif="{{item.state==1}}" bindtap="joinActivity" data-index="{{index}}" class="newImages9-6" src="{{imgUrl+'/newImages9/8.png'}}"></image>
+                <image wx:elif="{{item.state==-2}}" bindtap="joinActivity" data-index="{{index}}" class="newImages9-6" src="{{imgUrl+'/newImages9/9.png'}}"></image>
+                <image wx:elif="{{item.state==-1}}" bindtap="joinActivity" data-index="{{index}}" class="newImages9-6" src="{{imgUrl+'/newImages9/6.png'}}"></image>
                 <view class="newImages9-6 btns" wx:if="{{!userInfoData && item.state==-1}}">
                   <button style="min-height:0rpx;width:100%;height:100%;" open-state="getUserInfo" bindgetuserinfo="getUserWxMsg"></button>
                 </view>

496_dongfengqichen/pages/mountingsDetail/mountingsDetail.js

     page:1,
     count:10,
     ismore:true,//是否还有更多数据
+    right_pic_W:0,
   },
 
   /**
         bargainType:2
       })
     }
-    if(options.datas){
-      this.data.goodsMsg = JSON.parse(options.datas);
+    if(options.sku_id){
+      this.data.goodsMsg.sku_id = options.sku_id;
+    }
+    if(options.activity_token){
+      this.data.goodsMsg.activity_token = options.activity_token;
     }
     app.globalData.nowPage = 3;
     if (app.globalData.openid) {
    * 用户点击右上角分享
    */
   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+"！有你帮忙还能更便宜！快来帮我！",
+      title: "我正在以超低价购买"+this.data.goodsDetail.sku_name+"！有你帮忙还能更便宜！快来帮我！",
       imageUrl: this.data.imgUrl+'/newImages9/13.png',
-      path: "/pages/mountingsDetail/mountingsDetail?bargainType=2&datas="+JSON.stringify(goodsMsg)
+      path: "/pages/mountingsDetail/mountingsDetail?bargainType=2&sku_id="+this.data.goodsMsg.sku_id+"&activity_token="+this.data.goodsMsg.activity_token
     }
   },
   ruleShowControl(){//控制活动规则的显示与隐藏
     let signStr = openid+activity_token+timestamp+fixedString
     let sign = md5.hexMD5(signStr)
     app.wxRequest(app.globalData.urlRoot + "bargain/bargainByFriend", {activity_token:activity_token,timestamp:timestamp,sign:sign}, res => {
-      console.log(res);
       if (res.code == 200) {
         this.setData({
           friendHelpMoney:res.data.bargainMoney/100
         })
+        this.data.friendBargain = [];
+        this.data.page = 1;
+        this.getFriendBargainList();
+        this.getActivityJoinDetail();
         this.helpFriend();
       }else{
         wx.showToast({
   getGoodsDetail(){//获取商品详情
     app.wxRequest(app.globalData.urlRoot + "bargain/getGoodsDetail", {sku_id:this.data.goodsMsg.sku_id}, res => {
       if (res.code == 200) {
-        this.setData({
-          goodsDetail:res.data
+        wx.getImageInfo({
+          src:res.data.goods_detail_right_pic,
+          success:(params)=>{
+            let scale = 75/params.height;
+            this.setData({
+              right_pic_W:params.width*scale
+            })
+            this.setData({
+              goodsDetail:res.data
+            })
+          }
         })
       }else{
         wx.showToast({

496_dongfengqichen/pages/mountingsDetail/mountingsDetail.wxml

                 <view class="original-price">{{goodsDetail.goods_origin_content}}</view>
               </view>
             </view>
-            <image wx:if="{{goodsDetail.goods_detail_right_pic}}" class="newImages9-test3" src="{{goodsDetail.goods_detail_right_pic}}" mode="aspectFit"></image>
+            <image style="width:{{right_pic_W}}rpx;" wx:if="{{goodsDetail.goods_detail_right_pic}}" class="newImages9-test3" src="{{goodsDetail.goods_detail_right_pic}}" mode="aspectFit"></image>
           </view>
         </view>
       </view>