Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

taiyuan
2 parents 33e4c9d2 c39ab084
Showing 4 changed files with 117 additions and 244 deletions
packageC/pages/presell/list/list.js
packageC/pages/presell/list/list.json
packageC/pages/presell/list/list.wxml
packageC/pages/presell/list/list.wxss
-var e = getApp(), i = e.request, a = e.globalData.setting,os=a,ut = require("../../../../utils/util.js");
+var e = getApp(), i = e.request, os = e.globalData.setting, ut = require("../../../../utils/util.js");
 var regeneratorRuntime = require('../../../../utils/runtime.js');
 Page({
     data: {
-        url: a.imghost,
-        killtime: null,
-        currentPage: 1,
-        goodlist: null,
-        type:1,
-        timer:null,
-        ismore:1,  //是否可以加载更多
-        isshow:0,
-		ad_data:null,
-		max_sw_height:200,
+        url: os.imghost,
+        goodlist:[],
+        page: 1,
+        timer: null,
+        ismore: 1,  //是否可以加载更多
+        isshow: 0,
+        ad_data: null,
+        max_sw_height: 200,
     },
     //------初始化加载----------
-    onLoad: function(t) {
-		// wx.setNavigationBarTitle({ title: "商品秒杀",})
-        var  first_leader = t.first_leader;
-		var type=t.type;
-		if(type!=undefined){
-		    this.setData({type:type});
-        }
-
-		var th=this;
+    onLoad: function (t) {
+        var first_leader = t.first_leader;
+        var th = this;
         console.log("------------");
-        console.log(first_leader);		
-		getApp().getConfig();
+        console.log(first_leader);
+        getApp().getConfig();
         if (first_leader) {
             getApp().globalData.first_leader = first_leader;
@@ -39,205 +31,106 @@ Page({
                 }
             })
         }
-		
-		getApp().request.promiseGet("/api/weshop/ad/page?pid=701&store_id=" + os.stoid, {
-		  data: {
-		    enabled: 1
-		  }
-		}).then(res => {
-			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
-				var a = res.data.data.pageData;
-				var narr=[];
-				for(var i in a){
-					var tt = {
-					  'ad_code': os.imghost + a[i].ad_code,
-					  'media_link': '',
-					  'ad_weapplink':a[i].ad_weapplink
-					};
-					narr.push(tt);
-				}
-				th.setData({ad_data:narr});				
-			}					 			
-		})
-		
-    },
+        getApp().request.promiseGet("/api/weshop/ad/page?pid=1202&store_id=" + os.stoid, {
+            data: {
+                enabled: 1
+            }
+        }).then(res => {
+            if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+                var a = res.data.data.pageData;
+                var narr = [];
+                for (var i in a) {
+                    var tt = {
+                        'ad_code': os.imghost + a[i].ad_code,
+                        'media_link': '',
+                        'ad_weapplink': a[i].ad_weapplink
+                    };
+                    narr.push(tt);
+                }
+                th.setData({ad_data: narr});
+            }
+        })
-    onShow: function(t) {       
-       this.data.ismore=1;
-       this.data.is_timer=1;
-       this.data.currentPage=1;
-       var th=this;th.setData({goodlist:null,})
-       this.requestSalelist();
-       //设置全局定时器
-       th.data.timer=setInterval(function () {
-          th.countDown();
-       },1000);
+        //调用列表
+        this.get_list();
     },
-    onHide:function(){
-      //--清理定时器--
-      clearInterval(this.timer);
-      this.setData({isshow:0});
+    onShow: function (t) { },
+    //---小于10的格式化函数----
+    timeFormat(param) {
+        return param < 10 ? '0' + param : param;
     },
-   //---小于10的格式化函数----
-   timeFormat(param) {
-      return param < 10 ? '0' + param : param;
-   },
-
-  //----倒计时函数-----
-   countDown() {
-    if(!this.data.is_timer) return false;
-    var th=this;
-    // 获取当前时间，同时得到活动结束时间数组
-    let newTime =ut.gettimestamp();
-    var endTimeList = this.data.goodlist;
-    if(endTimeList==null) return null
-    // 对结束时间进行处理渲染到页面
-    for (var i = 0; i < endTimeList.length;i++){
-         var o = endTimeList[i];
-         var endTime = o.end_time;
-         if(th.data.type==0) endTime = o.start_time;
-         let obj = null;
-         // 如果活动未结束，对时间进行处理
-         if (endTime - newTime > 0){
-              let time = (endTime - newTime);
-              // 获取天、时、分、秒
-              let day = parseInt(time / (60 * 60 * 24));
-              let hou = parseInt(time % (60 * 60 * 24) / 3600);
-              let min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
-              let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60);
-              obj = {
-                day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec), hide: 1
-              }
-          }else{
-             //活动已结束，全部设置为'00'
-           obj = { day: '00', hou: '00', min: '00', sec: '00' }
-          }
-          var txt ="goodlist["+i+"].djs";
-          th.setData({ [txt]: obj});
-        }
-   },
-
-   async requestSalelist() {
-        //--没有更多就不调用--
-        if(!this.data.ismore) return false;
-        var e = this,th=e, i = "/api/ms/flash_sale/spikepage?page=" + e.data.currentPage;
-        var plist=null,alllist=th.data.goodlist;
-        if(!alllist) alllist=[];
-
-        await getApp().request.promiseGet(i,
-          {isShowLoading:1,data:{store_id:os.stoid,timetype:th.data.type,is_end:0,is_show:1}}
-        ).then(res=>{
-          plist=res.data.data.pageData;
-          console.log("是什么即将开始",plist);
-        });
-
-        if(plist.length<=0){
-
-          getApp().showWarning("没有更多数据");
-          th.data.ismore=0;
-          if(e.data.currentPage==1 && this.data.type==1){
-              setTimeout(function () {
-                  th.data.ismore=1;
-                  th.setData({type:0});
-                  th.requestSalelist();
-              },1000);
-          }
-          return false;
-        }
-
-        //--循环读取接口---
-        for(var i=0;i<plist.length;i++) {
-          var prom_id = plist[i].id;
-          await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-            os.stoid + "/1/" + prom_id, {}
-          ).then(res=>{
-             if(res.data.code==0){
-                plist[i].status=1;
-                if(res.data.data<=0) plist[i].status=3;
-             }
-          })
-          alllist.push(plist[i]);
-        }
-        e.data.currentPage++;
-        console.log("秒杀商品列表", alllist);
-        th.setData({goodlist:alllist,isshow:1});
-    },
-    onPullDownRefresh: function() {
-        this.reloadGoodList();
-    },
-    reloadGoodList: function() {
-       this.data.goodlist = null, this.data.currentPage = 1, this.requestSalelist();
+    onReachBottom: function () {
+        this.get_list();
     },
-    onReachBottom: function() {
-      this.requestSalelist();
+    //图片失败，默认图片
+    bind_bnerr2: function (e) {
+        var _errImg = e.target.dataset.errorimg;
+        var val = e.target.dataset.val;
+        if (val != undefined && val != null && val != 'null') {
+            var _errObj = {};
+            _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+            this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+        }
     },
-    //点击tab事件
-    tip:function(e){
-       var a=e.currentTarget.dataset.ty,th=this;th.data.ismore=1;
-       this.setData({type:a,goodlist:null});
-       this.reloadGoodList();
+
+    imageLoad: function (e) {
+        var imgwidth = e.detail.width;
+        var imgheight = e.detail.height;
+        //宽高比
+        var ratio = imgwidth / imgheight;
+        //计算的高度值
+        var viewHeight = 750 / ratio;
+        var hei = this.data.max_sw_height;
+        if (hei < viewHeight) {
+            this.setData({max_sw_height: viewHeight});
+        }
     },
-    //---------分享配置--------
-    onShareAppMessage: function (e) {
-        var curPage=this;
-        var pagePath = curPage.route; //当前页面url
-        if (pagePath.indexOf('/') != 0) {
-            pagePath = '/' + pagePath;
-        }
-        if(getApp().globalData.user_id){
+    //获取数据
+    get_list(){
+        var self = this;
+        if (this.data.loading) return false;
+        if (this.data.no_more) return false;
+        this.data.loading = 1;
-            if(pagePath.indexOf("?")>0){
-                pagePath+="&first_leader="+getApp().globalData.user_id;
-            }else{
-                pagePath+="?first_leader="+getApp().globalData.user_id;
-            }
+        var req = {
+            is_end: 0,
+            store_id: os.stoid,
+            page: this.data.page,
+            pageSize: 10,
+            timetype: 1
         }
-        console.log("11"+pagePath);
-        return {
-            title: "限时秒杀",
-            path:pagePath,
-        }
-    },
+        //调用接口获取数据
+        getApp().request.get("/api/weshop/marketing/marketingPresellList/page", {
+            data: req,
+            success: function (res) {
+                self.data.loading = 0;
+                if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
+                    var list = self.data.goodlist ? self.data.goodlist : [];
+                    var arr = res.data.data.pageData;
+                    //数组合起来
+                    for (var i in arr) {
+                        list.push(arr[i]);
+                    }
+                    self.data.page++;
+                    self.setData({goodlist: list});
+                    if (arr.length < 10) {
+                        self.setData({no_more: 1})
+                    }
+                } else {
+                    self.setData({no_more: 1})
+                }
+                self.setData({is_get: 1})
-    //图片失败，默认图片
-    bind_bnerr2: function (e) {
-       var _errImg = e.target.dataset.errorimg;
-       var val = e.target.dataset.val;
-       if(val!=undefined && val!=null && val!='null' ){
-          var _errObj = {};
-          _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
-          this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-       }
+            }
+        })
     },
-		
-		onShareTimeline() {
-			var store_name=getApp().globalData.config?getApp().globalData.config.store_name:'';
-			if(!store_name)
-			   store_name=getApp().globalData.setting.appName;
-			return {
-				title: '秒杀活动-' + store_name,
-			}
-		},
-		
-		imageLoad:function(e){
-		  var imgwidth = e.detail.width;
-		  var imgheight = e.detail.height;
-		  //宽高比
-		  var ratio = imgwidth / imgheight;
-		  //计算的高度值
-		  var viewHeight = 750 / ratio;
-		  var hei=this.data.max_sw_height;
-		
-		  if (hei< viewHeight) {
-		      this.setData({ max_sw_height: viewHeight });
-		   }
-		}
+
 });
@@ -2,6 +2,7 @@
     "navigationBarTitleText": "预售活动列表",
 		"enablePullDownRefresh": false,
     "usingComponents": {
-        "share_box": "/components/share_box/share_box"
+        "share_box": "/components/share_box/share_box",
+         "nodata": "/components/nodata/nodata"
     }
 }
 \ No newline at end of file
@@ -5,8 +5,7 @@
 <block wx:if="{{ad_data}}">
    <swiper class="swiper" circular="true"  autoplay="true"
-             indicator-dots="true" interval="2500"
-            style="height:{{max_sw_height}}rpx" >
+             indicator-dots="true" interval="2500" style="height:{{max_sw_height}}rpx" >
       <block wx:for="{{ad_data}}">    
           <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
@@ -32,71 +31,50 @@
 <view class="kill-list seckill_list"> 
-    <view class="kill-item" wx:for="{{goodlist}}" wx:if="{{item.djs.hide}}" >
+    <view class="kill-item" wx:for="{{goodlist}}">
         <navigator class="kill-pic rel" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-        <!-- <image class="abs xc-miaosha" src="{{url}}/miniapp/images/zms.png"></image> -->
             <image class="wh100" src="{{url+item.original_img}}" data-val="{{item.original_img}}"
                 data-errorimg="goodlist[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image>
         </navigator>
         <view class="kill-cont">
-            <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">{{item.title}}</navigator>
+            <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">{{item.act_name}}</navigator>
             <view class="flex-vertical xc-strip-frame">
             <view class="xc-strip-blank rel">
             <view class="flex-vertical rel total">
-             <view class="t-c abs xc-fill"style="width:{{type==1?(100-(item.buy_num+item.virtual) /(item.goods_num+item.virtual)*100)>3?(100-(item.buy_num+item.virtual) /(item.goods_num+item.virtual)*100):'3':'100'}}%;background:{{type==1?'#e4374d':'#059de5'}};">
-             </view>
-               <text class="fs20 white abs xc-fill-text" style="">已预售{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/(item.goods_num+item.virtual)*100,0):'100'}}%</text>
+               <view class="t-c abs xc-fill" style="width:{{215*(1-(item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty))}}rpx;background:#e4374d;"></view>
+               <text class="fs20 white abs xc-fill-text">已预售{{filters.toFix((item.buy_goodnum+item.virtual_qty)/(item.presell_sumqty+item.virtual_qty)*100,0)}}%</text>
             </view>
             </view>
-            <view class=" ml10 fs20 " wx:if="{{type==1}}">库存还剩{{item.buy_num+item.virtual}}件</view>  
-            <!-- <view class=" ml10 fs20 " wx:else> 已抢0件</view> -->
+            <view class=" ml10 fs20">库存还剩{{item.presell_sumqty-item.buy_goodnum}}件</view>
            </view>
             <view class="goods-num">
                 <view>
-										<view class="{{type==1?'xc-wc':'blue_c'}}"> 
-												<!-- <text>剩余:</text>
-                        <text class='tui-conutdown-box'> {{item.djs.day}}</text>天
-                        <text class='tui-conutdown-box'>{{item.djs.hou}}</text>时
-                        <text class='tui-conutdown-box'>{{item.djs.min}}</text>分
-                        <text class='tui-conutdown-box tui-countdown-bg'>{{item.djs.sec}}</text>秒 -->
-                    </view>
+				    <view class="{{type==1?'xc-wc':'blue_c'}}"></view>
                     <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
-                    <view class="fs28" style="line-height: 16px;">￥</view>
+                    <view class="fs28" style="line-height: 16px;">￥{{item.presell_price}}</view>
                     <text>{{item.price}}</text> 
                     <span class="underline fs20">零售价￥{{item.market_price}}</span></view>
                 </view>
                 <view class="kill-btn ">
                     <navigator url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">去抢购</navigator>
-                    <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==1 && type==1}}">马上抢</navigator>
-                    <navigator class="huise"url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}" wx:if="{{item.status==3 && type==1}}">已抢光</navigator> -->
                 </view>
             </view>
         </view>
     </view>
-    <!-- <view style="height:120rpx"></view> -->
 </view>
-<!-- <view class="kill-time xc-seckill-bottom">
-    <view class="theader" >
-        <view bindtap='tip' data-ty="1" class="xc-border-right flex-center timeac left {{type==1?'active':''}}">
-        <image class="xc-bottom"
-        src="{{url}}{{type==1?'/miniapp/images/fire-red.png':'/miniapp/images/fire-black.png'}}"></image>
-        火热进行中</view>
-        <view bindtap='tip' data-ty="0"  class=" flex-center timeac right {{type==0?'active':''}}">
-        <image class="xc-bottom"
-        src="{{url}}{{type==0?'/miniapp/images/clock-rad.png':'/miniapp/images/clock-black.png'}}"></image>
-        即将开始</view>
-    </view>
-</view> -->
-<view class="no-more" wx:if="{{goodlist.length==0}}">没有相关内容</view>
+<nodata wx:if="{{goodlist.length==0 && is_get}}" nodataContainer="t-c"></nodata>
+<view class="no-more" wx:elif="{{no_more}}">-- 没有更多 --</view>
+
+ <view style="height:10rpx"></view>
 </view>
-<!-- <share_box id="share"></share_box> -->
+
@@ -138,10 +138,11 @@ padding-top: 4rpx;
 }
 .no-more {
-    font-size: 30rpx;
+    font-size: 26rpx;
     line-height: 2;
     text-align: center;
-    color: #333;
+    color: #666;
+    margin-top: 10rpx;
 }
 .kill-btn>navigator.huise{background-color: #999;}
@@ -165,7 +166,7 @@ margin-left: 45rpx;
 }
 .total{
   width:215rpx;height:26rpx;border-radius:20rpx;
-  background: #ffe3e2;
+  background: #aaa;
 }
 .xc-buttom-money{
   align-items: baseline;