商品搜索和商品列表

yvan.ni
1 parent bc2acacf
Showing 5 changed files with 198 additions and 35 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
pages/goods/search/search.js
pages/goods/search/search.wxml
@@ -798,9 +798,14 @@ Page({
             });
           }
-          //-- 把商品的赋值 --
+          //-- 把商品的赋值,同时给活动赋值 --
           ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
-          if(ee.data.prom_type!=1 && ee.data.prom_type!=4  && ee.data.prom_type!=6 && ee.data.prom_type!=2)
+          if(t.data.data.prom_type && t.data.data.prom_id){
+              ee.data.prom_type=t.data.data.prom_type;
+              ee.data.prom_id=t.data.data.prom_id;
+          }
+
+         if(ee.data.prom_type!=1 && ee.data.prom_type!=4  && ee.data.prom_type!=6 && ee.data.prom_type!=2)
               ee.check_is_youhui(ee.data.gid);
           t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
@@ -42,7 +42,9 @@ Page({
         }
 	  var th=this;
-      a.init(this, "", "requestData");
+
+      //a.init(this, "", "requestData");
+
       var url = this.data.baseUrl;
 	  this.data.is_new=t.is_new;
 	  this.data.is_hot=t.is_hot;
@@ -171,10 +173,12 @@ Page({
       }  
       this.resetData(), this.requestGoodsList(url);
     },
-    requestGoodsList: function(t) {
-        var e = this;
+    requestGoodsList:function(t) {
+        if(this.data.loading) return false;
+        this.data.loading=1;
+        var e = this,th=e;
         this.data.requestUrl = t;
-			
+
 		//不是商品分组的，不是默认排序的	
 		if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){					
            t += "&orderField=" + e.data.tabname;
@@ -182,14 +186,94 @@ Page({
 		}
         t +="&page=" + e.data.currentPage;
-        a.request(t, 
-          function(t) {
-            e.setData({is_go:1});
-            e.data.currentPage++, null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)), 
-            wx.stopPullDownRefresh();
-         },
-          null, { is_mainshow: 1, isonsale: 1, store_id: oo.stoid}
-         );
+		getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid}}).then(async res=>{
+          th.data.loading=0;
+          e.setData({is_go:1});
+		  if(ut.ajax_ok(res)){
+              e.data.currentPage++;
+              if(!e.data.requestData) e.data.requestData=[];
+              for(let i in res.data.data.pageData){
+                  let item=res.data.data.pageData[i];
+                  item.original_img = th.data.url + item.original_img;
+
+                  var url="/api/weshop/activitylist/getGoodActInfo";
+                  var req_data={
+                      store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1
+                  };
+                  //获取商品的实际活动
+                  await getApp().request.promiseGet(url, {data:req_data}).then(res=>{
+                      if(res.data.code==0 && res.data.data && res.data.data.length==1){
+                          item.prom_type=res.data.data[0].prom_type;
+                          item.prom_id=res.data.data[0].act_id;
+                      }
+                  })
+
+                  var prom_type = item.prom_type; //0普通商品  1秒杀  6拼单 2团购 4积分购
+                  var prom_id=item.prom_id;
+                  var now=ut.gettimestamp();
+                  var url = "";
+                  switch (prom_type){
+                      case 1:
+                          var user_id=getApp().globalData.user_id;
+                          if(!user_id) user_id=0;
+                          url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id;
+                          break;
+                      case 2:
+                          url ="/api/weshop/goods/groupBuy/getActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id
+                          break;
+                      case 4:
+                          url ="/api/weshop/integralbuy/get/"+oo.stoid +"/"+prom_id;
+                          break;
+                      case 6:
+                          url = "/api/weshop/teamlist/get/" + oo.stoid + "/" + prom_id;
+                          break;
+                      case 8:
+                          var presell_id = prom_id;
+                          var url1 = "/api/weshop/marketing/marketingPresellList/list";
+                          var rd= {
+                              store_id: oo.stoid,
+                              presell_id: presell_id,
+                              goods_id: val.goods_id
+                          }
+                          //------获取预售从表----------
+                          await getApp().request.promiseGet(url1, {
+                              data: rd
+                          }).then(res => {
+                              if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                                  var arr = res.data.data[0];
+                                  item.prom_price = arr.luck_goods_price;
+                                  item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0);
+                              }
+                          })
+                          break;
+                      default:
+                          break
+                  }
+                  if(url!=null && url!=''){
+                      await getApp().request.promiseGet(url, {}).then(res => {
+                          var prom =null;
+                          if(res && res.data) prom=res.data.data;
+                          if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
+                              item.prom_price = res.data.data.price;
+                              if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
+                              var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
+                              var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;
+                              var vNum2=res.data.data.virtual?res.data.data.virtual:0;
+                              item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2);
+                          }else{
+                              item.prom_type=0;
+                              item.prom_id=0;
+                              item.prom_price=null;
+                          }
+                      })
+                  }
+
+                  e.data.requestData.push(item);
+                  e.setData({requestData: e.data.requestData})
+              }
+		  }
+		})
+        wx.stopPullDownRefresh();
     },
     onReachBottom: function() {
         a.canloadMore() && this.requestGoodsList(this.data.requestUrl);
@@ -62,7 +62,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 }}">
 				<view class="flex on">
 					<!-- 活动价 -->
 					<view class="price">
@@ -31,7 +31,6 @@ Page({
     onLoad: function(t) {
         this.data.rq_data=t;
-
         //接受有没有导购的参数
         var first_leader=t.first_leader;
         if(first_leader){
@@ -95,7 +94,7 @@ Page({
        })
-       e.init(this, "", "requestData");
+       //e.init(this, "", "requestData");
        var url = this.data.baseUrl;
        //扫一扫过来，显示搜索的内容
@@ -112,9 +111,8 @@ Page({
        if (url != this.data.baseUrl) return this.requestSearch(url);
        this.openSearchModal();
-			 
-			 // 获取历史搜索记录
-			 this.getHistorySearch();
+        // 获取历史搜索记录
+		this.getHistorySearch();
     },
     changeTab: function(t) {
       var ord = t.currentTarget.dataset.href;
@@ -134,24 +132,100 @@ Page({
     //-----------真的调用地址进行搜索------------
     requestSearch: function(t) {
-        var a = this;
-	
+        if(this.data.loading) return false;
+        this.data.loading=1;
+        var e = this,th=e;
 		if(getApp().globalData.userInfo){
 			t += "&user_id=" + getApp().globalData.userInfo.user_id;
 		}
+        this.data.requestUrl = t;
+        getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid,orderField: e.data.tabname, orderType: e.data.adname, page: e.data.currentPage}}).then(async res=>{
+            th.data.loading=0;
+            if(ut.ajax_ok(res)){
+                if(!e.data.requestData) e.data.requestData=[];
+                for(let i in res.data.data.pageData){
+                    let item=res.data.data.pageData[i];
+                    item.original_img = th.data.url + item.original_img;
+
+                    var url="/api/weshop/activitylist/getGoodActInfo";
+                    var req_data={
+                        store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1
+                    };
+                    //获取商品的实际活动
+                    await getApp().request.promiseGet(url, {data:req_data}).then(res=>{
+                        if(res.data.code==0 && res.data.data && res.data.data.length==1){
+                            item.prom_type=res.data.data[0].prom_type;
+                            item.prom_id=res.data.data[0].act_id;
+                        }
+                    })
+
+                    var prom_type = item.prom_type; //0普通商品  1秒杀  6拼单 2团购 4积分购
+                    var prom_id=item.prom_id;
+                    var now=ut.gettimestamp();
+                    var url = "";
+                    switch (prom_type){
+                        case 1:
+                            var user_id=getApp().globalData.user_id;
+                            if(!user_id) user_id=0;
+                            url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id;
+                            break;
+                        case 2:
+                            url ="/api/weshop/goods/groupBuy/getActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id
+                            break;
+                        case 4:
+                            url ="/api/weshop/integralbuy/get/"+oo.stoid +"/"+prom_id;
+                            break;
+                        case 6:
+                            url = "/api/weshop/teamlist/get/" + oo.stoid + "/" + prom_id;
+                            break;
+                        case 8:
+                            var presell_id = prom_id;
+                            var url1 = "/api/weshop/marketing/marketingPresellList/list";
+                            var rd= {
+                                store_id: oo.stoid,
+                                presell_id: presell_id,
+                                goods_id: val.goods_id
+                            }
+                            //------获取预售从表----------
+                            await getApp().request.promiseGet(url1, {
+                                data: rd
+                            }).then(res => {
+                                if (res.data.code == 0 && res.data.data && res.data.data.length > 0) {
+                                    var arr = res.data.data[0];
+                                    item.prom_price = arr.luck_goods_price;
+                                    item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0);
+                                }
+                            })
+                            break;
+                        default:
+                            break
+                    }
+                    if(url!=null && url!=''){
+                        await getApp().request.promiseGet(url, {}).then(res => {
+                            var prom =null;
+                            if(res && res.data) prom=res.data.data;
+                            if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) {
+                                item.prom_price = res.data.data.price;
+                                if(res.data.data.user_price) item.prom_price=res.data.data.user_price;
+                                var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0;
+                                var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0;
+                                var vNum2=res.data.data.virtual?res.data.data.virtual:0;
+                                item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2);
+                            }else{
+                                item.prom_type=0;
+                                item.prom_id=0;
+                                item.prom_price=null;
+                            }
+                        })
+                    }
+                    th.data.requestData.push(item);
+                    e.setData({requestData: e.data.requestData});
+                    e.closeSearchModal();
+                }
+            }
+
+        })
-        this.data.requestUrl = t, 
-        //t += "&orderField=" + a.data.tabname;
-        //t += "&orderType=" + a.data.adname;    
-        //t += "&page=" + a.data.currentPage, 
-        e.request(t, function(t) {
-            a.data.currentPage++ , 
-            null == a.data.allData && (a.data.allData = t.data.data.pageData), 
-            a.closeSearchModal();
-          },
-          null, { is_mainshow: 1, isonsale: 1, store_id: oo.stoid, 
-            orderField: a.data.tabname, orderType: a.data.adname, page: a.data.currentPage}
-        );
     },
     onReachBottom: function() {
         this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl);
@@ -35,7 +35,7 @@
       <view class="item-cont">
         <view class="title ellipsis-2">{{item.goods_name}}</view>
         <!-- 判断是否有活动价，小程序没有有团购和拼单 -->
-        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_type!=2 && item.prom_id>0}}">
+        <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0}}">
           <!-- 活动价 -->
           <view class="price">
 			  <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>