Merge branch 'dev' into 'test'

Dev See merge request !1131

Merge branch 'dev' into 'test'
Dev See merge request !1131
后端研发-苏明海
2 parents c12364d3 40aa3f2c
Showing 27 changed files with 214 additions and 65 deletions
components/diy_picMax/diy_picMax.js
components/diy_picMax/diy_picMax.wxml
packageA/pages/checkin/checkin.wxml
packageA/pages/checkin/checkin.wxss
packageA/pages/myGiftDetails/myGiftDetails.js
packageA/pages/myGiftDetails/myGiftDetails.wxml
packageA/pages/profile/profile.js
packageA/pages/profile/profile.wxml
packageB/pages/user/collect_list/collect_list.js
packageB/pages/user/collect_list/collect_list.wxml
packageC/pages/presell/goodsInfo/goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
pages/activity/seckill_list/seckill_list.js
pages/activity/seckill_list/seckill_list.wxml
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
pages/goods/com_screen.js
pages/goods/goodsList/goodsList.js
+var  ut = require("../../utils/util.js");
 Component({
   properties: {
     object: {
@@ -10,7 +11,8 @@ Component({
     // 这里是一些组件内部数据
     someData: {},
     pic_height: 0,//图片组合的高度
-    is_yspan: 0,  //是否要严格按照比例来实现 
+    is_yspan: 0,  //是否要严格按照比例来实现
+    is_time_show:0
   },
   ready: function () {
     //-- console.log(this.data.object.data) --
@@ -25,6 +27,26 @@ Component({
     })
     this.setData({ pic_height: height, is_yspan: is_yspan })
+
+
+    var start_time=this.properties.object.start_time;
+    var end_time=this.properties.object.end_time;
+
+    if(start_time && end_time) {
+
+      var start_time = Date.parse(new Date(start_time.replace(/-/g, '/'))) / 1000;
+      var end_time = Date.parse(new Date(end_time.replace(/-/g, '/'))) / 1000;
+      var now = ut.gettimestamp();
+
+
+      if (start_time < now && end_time > now) {
+        this.setData({is_time_show: 1});
+      }
+    }else{
+      this.setData({is_time_show: 1});
+    }
+
+
   },
   methods: {
     //-- 智能跳转到页面 --
 <!-- 图片组合 -->
+<block wx:if="{{is_time_show}}">
 <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs>
 <!-- 如果有纵向合并的时候，要求要按照绝对布局来实现 -->
 <block wx:if="{{is_yspan}}">
@@ -49,4 +50,5 @@
 		</view>
 		<view class="picMax-clear"></view>
 	</view>
+</block>
 </block>
 \ No newline at end of file
@@ -79,7 +79,7 @@
 				<view class="date">
 					<block wx:for="{{dateArr}}" wx:for-index="index" wx:for-item="item" wx:key="key">
 						<!-- <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{index+1==day?'today':''}} {{index+1==day&&isClock?'clockOn':''}}" ><view class="day">{{item}}</view></view> -->
-						<view style="{{index ==0?'margin-left:calc(100%/7 * 0);':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}">
+						<view style="width:calc(100% / 7) ; line-height: 80rpx;{{index ==0?'margin-left:calc(100%/7 * 0);':''}}" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}">
 							<view class="day">{{item.num}}</view>
 						</view>
 					</block>
@@ -93,17 +93,17 @@
 	<view class="jfbuy-container">
 		<block wx:if="{{ad_data}}">
-			<swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500">
+			<swiper class="swiper" style="height: {{max_sw_height}}rpx;" circular="true" autoplay="true" indicator-dots="true" interval="2500">
 				<block wx:for="{{ad_data}}">
 					<navigator url="{{item.ad_weapplink}}" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
-						<swiper-item>
-							<image src="{{item.ad_code}}" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
+						<swiper-item class="swiper-item">
+							<image src="{{item.ad_code}}" data-index="{{index}}" mode="widthFix" bindload="imageLoad" class="slide-image" lazy-load="true" />
 						</swiper-item>
 					</navigator>
 					<view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url">
-						<swiper-item>
-							<image src="{{item.ad_code}}" class="slide-image" mode="widthFix" lazy-load="true" />
+						<swiper-item class="swiper-item">
+							<image src="{{item.ad_code}}" class="slide-image" mode="widthFix" bindload="imageLoad" lazy-load="true" />
 						</swiper-item>
 					</view>
 				</block>
@@ -192,7 +192,7 @@ page,
 .jfbuy-container {
-	padding: 60rpx 40rpx 40rpx;
+	padding: 60rpx 25rpx 40rpx;
 }
 .jfbuy {
 	/* border: 2rpx solid black; */
@@ -394,4 +394,17 @@ page,
 }
 .pop_up_no .close_img{
 	width:60rpx; height:60rpx;position:absolute; right:-15px; top:-15rpx;
- }
 \ No newline at end of file
+ }
+ .swiper {
+  width: 700rpx;
+  height: 300rpx;
+  /* background: #cccc; */
+ }
+ .swiper-item {
+  display: flex;
+  align-items: center;
+ }
+ .slide-image {
+  width: 100%;
+  height: 100%;
+ }
@@ -38,6 +38,14 @@ Page({
 			showBtn: showBtn,
 		})
+	  getApp().getConfig2(function (e) {
+		  var json_d = JSON.parse(e.switch_list);
+		  self.setData({
+			  bconfig: e,
+			  is_retail_price: json_d.is_retail_price || 0
+		  });
+	  })
+
 		// console.log('options', options);
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
@@ -36,7 +36,7 @@
 					</block>
 				</view>
-				<view class="fs22 c-a4 line-through mgl10">{{filter.toFix(details.oldprice,2)}}</view>
+				<view class="fs22 c-a4 line-through mgl10">{{is_retail_price?'零售价：':''}}{{filter.toFix(details.oldprice,2)}}</view>
 			</view>
 			<view class="fs24 c-a4" wx:if="{{!is_not_start}}">已售{{details.salenum+details.virtualsales}}件</view>
 		</view>
@@ -1144,7 +1144,13 @@ Page({
 			//-- 需要推荐人 --
 			if(this.data.reg_info.introducer_state){
-				let tjrname = this.data.referee || this.data.fir_user.mobile;
+
+                var tj= this.data.fir_user?this.data.fir_user.mobile:'';
+                if(!tj){
+                    tj=this.data.user['fromuser_id']?this.data.user['fromuser_id']:'';
+                }
+
+				let tjrname = this.data.referee || tj;
 				if (tjrname == "" || tjrname == null) {
 				  //app.my_warnning("请输入推荐人", 0, this);
 				  //return false;
@@ -34,7 +34,7 @@
                             class="user-txt-right f1 pdl20 t-r" />
                 </block>
-                <block v-else>
+                <block wx:else>
                      <input bindinput="getReferee" bindblur="" disabled="{{user['fromuser_id']}}"
                            value="{{user['fromuser_id']?user['fromuser_id']:''}}"  data-name="推荐人" class="user-txt-right f1 pdl20 t-r" placeholder="请输入推荐人手机号码或卡号"/>
                 </block>
@@ -26,12 +26,28 @@ Page({
     total_collects: 0,
     is_goods: 0,
     pageSize: 8, //分页数量
-    isdelete: 0
+    isdelete: 0,
+
+    is_retail_price:0
   },
   onLoad: function() {
+    var th=this;
+
     o.init(this, "", "collects"),
       this.requestCollectList();
+
+
+    getApp().getConfig2(function(rs){
+      //计算等级价相关
+      var swithc_list=rs.switch_list;
+      var sw_arr=JSON.parse(swithc_list);
+      if(sw_arr.is_retail_price){
+        th.setData({is_retail_price:1});
+      }
+
+    });
+
   },
   requestCollectList: function() {
     var th = this;
@@ -49,10 +49,10 @@
                   <view class="fs40">{{item.prom_price?item.prom_price:item.final_price}}</view>
                 </view>
                 <!-- 原价 -->
-<!--                <view class="flex fs24 line through xc-ash">-->
-<!--                  <view>零售价:</view>-->
-<!--                  <view>￥{{item.market_price}}</view>-->
-<!--                </view>-->
+                <view wx:if="{{is_retail_price}}"  class="flex fs24 line through xc-ash">
+                  <view>零售价:</view>
+                  <view>￥{{item.market_price}}</view>
+                </view>
               </view>
               <view class="money_right flex line" wx:if="{{!editEd}}">
@@ -311,7 +311,7 @@ Page({
       }
       //-- 如果有room_id的获取 --
       if (gid_str.length > 2 && gid_str[3]) {
-        room_id = gid_str[2];
+        room_id = gid_str[3];
         room_user_share = 1;
       }
     }
@@ -379,7 +379,7 @@ Page({
         is_closecoupon: json_d.is_closecoupon,
         is_newsales_rules: json_d.is_newsales_rules
       });
-      ee.init(gid);
+      // ee.init(gid);
       //------几人评价-------
       //n.init(th, "", "comments");
@@ -569,12 +569,16 @@ Page({
           is_share: 0,
         },
       }).then(res1 => {
+        console.log('优惠券+++++++++++++++++');
+        console.log(res1);
         fir_quan = res1.data.data.pageData;
       })
     }
     //过滤不是本商品的单品优惠券-------------------
     if (fir_quan.length > 0) {
-      let goodInfo = ee.data.data || {}
+      let goodInfo = th.data.data || {}
+      console.log('商品++++++++++++++++++++++');
+      console.log(goodInfo);
       for (let index = fir_quan.length - 1; index >= 0; index--) {
         if (fir_quan[index].useobjecttype == 20) { //判断是单品优惠券
           if (fir_quan[index].useobjectno != goodInfo.goods_sn) {
@@ -583,6 +587,7 @@ Page({
         }
       }
     }
+    
     let arr = []
     let length = fir_quan.length
     if (length <= 3) {
@@ -787,7 +792,7 @@ Page({
               sele_g: t.data.data,
               userInfo: getApp().globalData.userInfo,
             });
-
+            ee.init(gid);
             //获取门店
             ee.get_sto();
             ee.get_sku(o.stoid, t.data.data, gid);
@@ -846,7 +851,7 @@ Page({
       ee.data.enterAddressPage && (this.data.enterAddressPage = !1);
     })
-
+   
   },
   enterAddress: function () {
@@ -2769,6 +2774,7 @@ Page({
       this.saveImageToPhotosAlbumDef()
     }
   },
+
   //--定义的保存图片方法，分享团---
   saveImageToPhotosAlbum: function () {
     //--先判断会员状态--
@@ -3133,19 +3139,18 @@ Page({
       var app = getApp();
       var unit = that.data.screenWidth / 750 * 1.35;  //基础单位，
       var path2 = that.data.data.original_img;
-      var scene = th.data.gid + "";
-      scene += "." + th.data.sele_g.prom_type + "." + th.data.sele_g.prom_id;
-      var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
-      if (user_id > 0) {
-          scene += "_" + user_id;
-      }
-      //-- 如果不是会员分享过来的要分享给别人 --
-      if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
-          //固定房间是第3个字符
-          if (!user_id) scene += "_0";
-          scene += "_" + getApp().globalData.room_id;
-      }
+    var scene = th.data.gid + "_"+th.data.presellList.id;
+    var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0;
+    if (user_id > 0) {
+      scene += "_" + user_id;
+    }
+    //-- 如果不是会员分享过来的要分享给别人 --
+    if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) {
+      //固定房间是第3个字符
+      if (!user_id) scene += "_0";
+      scene += "_" + getApp().globalData.room_id;
+    }
     ///二微码
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
@@ -4837,20 +4842,24 @@ Page({
       }
     })
+    // console.log('是否继续查询', gnext)
     if (!gnext) {
       return false;
     }
+    // console.log('继续查询')
     var userInfo = getApp().globalData.userInfo;
-    var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 };
+    // timetype: 1,
+    var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 };
     if (userInfo) {
       pre_data.user_id = userInfo.user_id;
     }
     await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", {
       data: pre_data,
     }).then(e => {
+      // console.log('查询marketingPresellList', e)
       if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) {
-
+        // console.log('匹配resellList')
         th.data.all_pre_goods = e.data.data.pageData;
         var idx = e.data.data.pageData.findIndex(function (ele) {
           return ele.id == th.data.presellList.id;
@@ -83,7 +83,7 @@
             <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view>
 <!--            <view class="word-line fs26 xc-qtunit-price">-->
 <!--              零售价￥{{filters.toFix(data.market_price,2)}}-->
-<!--            </view>-->
+<!--            </view>--> 
           </view>
@@ -148,6 +148,24 @@
         </view>
         <view class="t_gz" wx:if="{{is_show_gz==1}}">{{prom_act.remark}}</view>
       </view>
+              <!-- 许程 7.24暂时注释 -->
+      <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}">
+          <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
+            <view class="cx-sizs fs30">领券</view>
+            <view class="flex ai_c f1 pdh20">
+              <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="id">
+                <view class="circle xc-circular xc-one"></view>
+                <view class="xc-coupon t-c four-level-word">
+                  满{{item.condition}}减{{item.money}}
+                </view>
+                <view class="circle xc-circular xc-two"></view>
+              </view>
+            </view>
+            <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
+              <text class="bg_jj"></text>
+            </view>
+          </view>
+        </view>
       <!-- 门店收货地址 -->
       <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
         <view class="address_frame" bindtap="choice_store" data-ind="0">
@@ -84,9 +84,9 @@ Page({
   onShow: function (t) {
-      getApp().check_can_share();
+    getApp().check_can_share();
     this.data.is_timer = 1;
-    this.data.currentPage = 1;
+    //this.data.currentPage = 1;不能清空未1
     var th = this;
     //设置全局定时器
     th.data.timer = setInterval(function () {
@@ -68,7 +68,7 @@
                     </view>
                     <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
                     <view class="fs28" style="line-height: 16px;">￥</view>
-                    <text>{{item.price}}--{{is_retail_price}}--</text>
+                    <text>{{item.price}}</text>
                     <span  wx:if="{{is_retail_price}}" class="underline fs20">零售价￥{{item.market_price}}</span>
                     </view>
@@ -566,7 +566,7 @@ Page({
                             })
                           }else{
-                            if(prom && !item.is_integral_normal && !item.is_pd_normal){
+                            if(prom && !item.is_integral_normal && !item.is_pd_normal && prom[0].prom_type!=5){
                               th.disInvalid(item);
                               continue;
                             }
@@ -440,7 +440,7 @@ Page({
             }).then(res1 => {
                if(res1.data.code==0){
-                   get_gd=res.data.data;
+                   get_gd=res1.data.data;
                }
             })
             distr_t=pick.distr_type || get_gd.distr_type;
@@ -669,7 +669,8 @@ Page({
                         }
                     }
                     //-- 判断一下，获取搭配购的消息 --
-                    if(item1.prom_type==0 || item1.prom_type==5){
+                    if((item1.prom_type==0 || item1.prom_type==5) && (!carr[i].collocationList || !carr[i].collocationList.length))  {
+
                        await th.set_collection(item1,carr,i);
                     }
                 }
@@ -1088,7 +1089,7 @@ Page({
                     }
                     //-- 判断是不是可以收藏 --
-                    if(gd.prom_type ==5){
+                    if(gd.prom_type ==5 && !th.data.all_collocation_list.length){
                         await th.set_collection(gd);
                     }
@@ -5632,6 +5633,8 @@ Page({
              item.goods_num=1;
              item.goods_price=item.price;
              item.is_collocation=1;
+             item.prom_type=5;
+
              var coll_arr=[];
              if(this.data.collocation_goods && this.data.collocation_goods.length){
@@ -92,7 +92,8 @@ Page({
             var json_d = JSON.parse(e.switch_list);
             th.setData({
                 bconfig: e,
-                sys_switch: json_d
+                sys_switch: json_d,
+                is_retail_price: json_d.is_retail_price || 0
             });
         })
@@ -64,7 +64,7 @@
     </view>
     <view class="top_foot data-v-3a5b7e36">
       <view class="top_foot_price data-v-3a5b7e36">
-        <text class="data-v-3a5b7e36">{{giftPosPrice+"元"}}</text>
+        <text class="data-v-3a5b7e36"> {{is_retail_price?'零售价：':''}}{{giftPosPrice+"元"}}</text>
       </view>
       <view class="top_foot_qty data-v-3a5b7e36">
         <text class="data-v-3a5b7e36" wx:if="{{!flag}}">{{"已售:"+giftQty+"件"}}</text>
@@ -9,9 +9,22 @@ module.exports = {
 		var url = th.data.requestUrl;
 		if (th.data.tabname!=ob.value){
-			th.setData({ tabname: ob.value, adname: "desc" });
+
+			var txt='desc';
+            if(ob.value=='sort') txt='asc'
+			th.setData({ tabname: ob.value, adname:txt });
+		}
+		th.resetData();
+
+		//开始点击分类
+		if(th.requestGoodsList) {
+			//-- 开始点击分类 --
+			th.requestGoodsList(url);
+		}else if(th.requestSearch){
+			//-- 重新开始搜索 --
+			th.requestSearch(url);
 		}
-		th.resetData(), th.requestGoodsList(url);
+
 	},
 	//-- 获取列表 --
@@ -168,6 +181,11 @@ module.exports = {
 		//进行筛选
 		this.set_screen(url,th);
+		th.setData({
+			tabname:"sort",   //排序的字段
+			adname:"asc",        //升降的字段
+		})
+
 		//开始点击分类
 		if(th.requestGoodsList) {
 			//-- 开始点击分类 --
@@ -291,7 +291,7 @@ Page({
         if(!user_id) user_id=0;
 		//不是商品分组的，不是默认排序的	
-		if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){					
+		if(t.indexOf("group_id")==-1 ){
            t += "&orderField=" + e.data.tabname;
            t += "&orderType=" + e.data.adname; 
 		}
@@ -31,7 +31,7 @@
 			<navigator class="nav-item">
 				<picker bindchange="bind_pk_sort"  value="{{index}}" range="{{more_sort_arr}}" range-key="name">
-				<text  bindtap="changeTab"  wx:if="{{tabname=='on_time'}}">新品</text>
+				<text wx:if="{{tabname=='on_time'}}">新品</text>
 				<text wx:elif="{{tabname=='comment_count'}}">评论</text>
 				<text wx:else>综合</text>
 				</picker>
@@ -46,9 +46,9 @@
 		<block wx:if="{{!openSearchModal}}">
 		<view class="nav flex">
-		  <navigator bindtap="changeTab" class="nav-item f1" >
+		  <navigator class="nav-item f1" >
               <picker bindchange="bind_pk_sort"  value="{{index}}" range="{{more_sort_arr}}" range-key="name">
-                  <text  bindtap="changeTab"  wx:if="{{tabname=='on_time'}}">新品</text>
+                  <text  wx:if="{{tabname=='on_time'}}">新品</text>
                   <text wx:elif="{{tabname=='comment_count'}}">评论</text>
                   <text wx:else>综合</text>
               </picker>
@@ -71,6 +71,9 @@
               <view class="flex-center width state" wx:if="{{item.status==0}}" data-taskId="{{item.helpTaskId}}" bindtap="go_to_task">
                 <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view>
               </view>
+              <view class="flex-center width " wx:if="{{item.status==3}}">
+                <view class="ellipsis-1">已失效</view>
+              </view>
               <view class="flex-center width state" wx:if="{{item.status==2}}">
                 <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view>
               </view>
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
 <view class="container" style="background-color:#{{bg_color ? bg_color:'d01119'}}">
-	<view class="top-back"  style="background-color:#{{bg_color ? bg_color:'d01119'}};padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
+	<view class="top-back"  style="background-color:#{{bg_color ? bg_color:'d01119'}};padding-bottom:40rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
 	<!-- <view class="top-back" style="padding-bottom:{{is_user_task!=null&&is_user_task.status==0?50:0}}rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> -->
 	  <!-- 助力活动头部 -->
 	  <view class="top-frame">
@@ -55,18 +55,18 @@
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
 	    就选它了
 	  </view>
-	  <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"
+	  <view wx:if="{{  is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
 	    好友拆一拆
 	  </view>
     <!-- 任务超时失效 -->
-    <view class="invalid" wx:if="{{ is_user_task!=null && is_user_task.status==0 && invalidTime !=0}}">
+    <view class="invalid fs28" wx:if="{{   is_user_task!=null && is_user_task.status==0 && invalidTime !=0}}">
       <text>距离失效:</text>
       <view class="invalid_info" wx:if="{{invalidState}}"><text>{{invalidObj.h}}</text>:<text>{{invalidObj.m}}</text>:<text>{{invalidObj.s}}</text></view>
       <view class="invalid_info" wx:else>该任务已失效</view>
     </view>
-	  <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"
+	  <view wx:if="{{ is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"
 		style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
 	   立即兑换
 	  </view>
@@ -104,9 +104,10 @@
 	          <view class="ellipsis-1">{{item.helpTaskName}}
 	          </view>
 	        </view>
-	        <view class="flex-center width state">
+	        <view class="flex-center width " style="{{item.status !=3 ? ' text-decoration: underline;' :''}}">
 	          <view class="ellipsis-1">
 	            <text wx:if="{{item.status==0}}" bindtap="go_task"  data-taskid="{{item.helpTaskId}}">{{item.zlHelpNum}}/{{item.helpNum}}</text>
+	            <text wx:if="{{item.status==3}}" >已失效</text>
 	            <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text>
 	            <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskingid="{{item.id}}" data-taskid="{{item.helpTaskId}}">领取礼包 </text>
 	          </view>
@@ -219,7 +219,7 @@ Page({
 			rq.get("/api/weshop/order/waitlist", {
 				isShowLoading: 0,
 				data: {
-					user_id: app_d.user_id
+					user_id: app_d.user_id,isdel:0
 				},
 				success: function (su) {
 					s.setData({
@@ -481,6 +481,35 @@ Page({
       }
     });
   },
+
+  //-----删除订单(完成和带评价的)-----
+  deleteOrderData_: function(t) {
+        var th = this;
+        var order_id = t.currentTarget.dataset.order_id;
+        var index = t.currentTarget.dataset.index;
+        var up_data={order_id: order_id,isdel:1};
+
+
+        wx.showModal({
+            title: "是否删除订单？",
+            success: function(tt) {
+                tt.confirm && rq.put("/api/weshop/order/updatebyId", {
+                    data: up_data,
+                    success: function(t) {
+                        for (var e = 0; e < th.data.orderList.length; e++)
+                            if (th.data.orderList[e].order_id == order_id) {
+                                th.data.orderList.splice(e, 1), th.setData({
+                                    orderList: th.data.orderList
+                                });
+                                break;
+                            }
+                    }
+                })
+            }
+        });
+    },
+
+
   //-----删除订单-----
   deleteSerOrderData: function(t) {
     var th = this;
@@ -74,10 +74,10 @@
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
 					<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
 					<view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
 					<view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
@@ -95,10 +95,10 @@
 				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view>
 				<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view>
 				<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>      
-					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
         </view>
 				<view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view>
-					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
         </view>
 				<view wx:if="{{item.pay_status == 0 && item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
 					<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
@@ -112,10 +112,10 @@
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view>
 					<view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view>
 					<view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
 					<view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
           </view>
 					<view wx:if="{{item.order_status==3 && item.pt_status!=6}}"  class="flex-center" >已取消<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
@@ -310,7 +310,7 @@
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}"  ></image>
         </view>
 				<view wx:if="{{item.order_status == 2}}" class="flex-center">已评价<view class="lin"></view>
-						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>        
+						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>
         </view>
 				<view wx:if="{{item.order_status == 3}}" class="c-a9" class="flex-center">已取消<view class="lin"></view>
 						<image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData"  data-index="{{index}}"    data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image>