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

taiyuan
2 parents 06a92134 73c8498c
Showing 12 changed files with 77 additions and 60 deletions
components/full_screen/full_screen.js
components/full_screen/full_screen.wxml
components/full_screen/full_screen.wxss
components/goods_list/goods_list.js
images/banner.jpg
pages/goods/goodsList/goodsList.js
pages/goods/goodsList/goodsList.wxml
pages/goods/search/search.js
pages/goods/search/search.wxml
pages/index/index/index.js
pages/index/index/index.wxml
pages/index/index/index.wxss
@@ -21,28 +21,23 @@ Component({
 		clearInterval(this.data.full_screen);
 	},
   },
- 
-  ready: function () {
-	  var th=this;
-	  setTimeout(function(){
-		 th.setData({hidden:1,}) 
-	  },2600)
-  },
- 
+
+  ready: function () {},
   properties: {},
   methods: {
     close_full_screen(){
-    	this.setData({is_full_screen_show:0,sec_show:0,is_full_screen_men:0});
+    	this.setData({is_full_screen_show:0,sec_show:0});
     },
     //-- 跳转到满屏广告的链接 --
     go_full_ad(){
     	if(!this.data.full_ad) return false;
     	if(!this.data.full_ad.ad_weapplink) return false;
     	getApp().goto(this.data.full_ad.ad_weapplink);
-		this.setData({is_full_screen_show:0,is_full_screen_men:0});
     },   
     get_the_full_screen(){		
-		if(this.data.full_ad) return false;		
+		if(this.data.full_ad) {			
+			return false;		
+		}
     	var th=this;
     	//获取全屏的广告
     	getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
@@ -53,8 +48,7 @@ Component({
     			 th.setData({
     				 is_full_screen_show:1,
     				 full_ad:res.data.data.pageData[0],		 
-    			 })
-				 
+    			 })				 
 				 //--定时关闭--
 				 th.data.full_screen=setInterval(function(){
 				 	 if(!th.data.sec_show) {
@@ -65,16 +59,8 @@ Component({
 				 	 th.data.sec_show--;
 				 	 th.setData({sec_show:th.data.sec_show});		 
 				 },1000)
-				 
-				 
-				 setTimeout(function(){
-					 th.setData({is_full_screen_men:0});
-				 },1000)
-    		 }else{
-				 th.setData({
-				     is_full_screen_men:0
-				 })
-			 }				
+							
+    		 }	
     	})
     }
   },
 <!-- 全屏控制 -->
-<view hidden="{{!is_full_screen_men || hidden}}" class="full_screen" style="background-color: #fff;"></view>
 <view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
 	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
 </view>
@@ -8,8 +8,6 @@
 	background-size: 100% 100%;
 	background-repeat: no-repeat;
 }
-
-
 .skip_box{
         float: right;  margin-top: 10rpx;  margin-right: 10rpx;
         background-color: gainsboro;  width: 120rpx;
@@ -37,7 +37,7 @@ Component({
       getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
 		isShowLoading:false,  
         success: function (e) {
-			if(e.code==0 && e.data && e.data.data){
+			if(e.data.code==0 && e.data && e.data.data){
 				getApp().globalData.userInfo = e.data.data;
 				getApp().getConfig2(function (e) {
 				  var swithc_list = e.switch_list;
@@ -66,6 +66,10 @@ Page({
  
 	  if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; }
 	  if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; }
+	  
+	  if(getApp().globalData.userInfo){
+		  url += "&user_id=" + getApp().globalData.userInfo.user_id;
+	  }
  
 	  //优惠活动的凑单
 	  if(t.prom_type==3){
@@ -28,7 +28,7 @@
       </view>
  
     </navigator>
-    <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">
+    <navigator bindtap="changeTab" class="nav-item" data-href="final_price" data-ad="{{adname}}">
       价格
       <view class="ico-dg" wx:if="{{tabname=='final_price'}}">
         <image class="wh100" src="{{iurl}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
@@ -107,6 +107,7 @@ Page({
        if (0 != t.brand_id && t.brand_id!=undefined){ url += "&brand_id=" + t.brand_id;}
        if (0 != t.nation_id && t.nation_id!=undefined) { url += "&nation_id=" + t.nation_id;}
        if (0 != t.max_price && t.max_price!=undefined) { url += "&min_pirce=" + t.min_pirce + "&max_price=" + t.max_price;}
+	      
        if (url != this.data.baseUrl) return this.requestSearch(url);
        this.openSearchModal();
  
@@ -132,6 +133,10 @@ Page({
     //-----------真的调用地址进行搜索------------
     requestSearch: function(t) {
         var a = this;
+	
+		if(getApp().globalData.userInfo){
+			t += "&user_id=" + getApp().globalData.userInfo.user_id;
+		}
  
         this.data.requestUrl = t, 
         //t += "&orderField=" + a.data.tabname;
@@ -13,7 +13,7 @@
         <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
       </view>
     </navigator>
-    <navigator bindtap="changeTab" class="nav-item" data-href="prom_price" data-ad="{{adname}}">价格
+    <navigator bindtap="changeTab" class="nav-item" data-href="final_price" data-ad="{{adname}}">价格
       <view class="ico-dg" wx:if="{{tabname=='final_price'}}">
         <image class="wh100" src="{{url}}/miniapp/images/dg.png" wx:if="{{adname=='desc'}}"></image>
         <image class="wh100" src="{{url}}/miniapp/images/up_s.png" wx:if="{{adname=='asc'}}"></image>
@@ -248,16 +248,33 @@ Page({
  
         var th = this;	
  
-		var show=getApp().globalData.isLoad_ad;
-		var userInfo=getApp().globalData.userInfo;
+		var show=getApp().globalData.isLoad_ad;	
+		setTimeout(function(){
+			//user没有及时更新
+			var userInfo=getApp().globalData.userInfo;
+			if(!userInfo || !userInfo.user_id) userInfo=null;
+			//有加载过一次首页，就显示
+			if(show || userInfo || getApp().globalData.user_id){
+			            setTimeout(function(){
+			   			   var full_screen = th.selectComponent("#full_screen"); //组件的id
+			   			   full_screen.get_the_full_screen();
+			   		    },800)	
+			   			//动画效果
+			   			if(!th.data.f_hidden){
+			   				wx.showLoading({
+			   					title:'加载中..'
+			   				});
+			   				setTimeout(function(){						
+			   					th.setData({f_hidden:1})
+			   					wx.hideLoading();
+			   				},960)	
+			   			}			   
+			}else{
+			   getApp().globalData.isLoad_ad=1;	
+			}	
+		},500)
+		
  
-		//有加载过一次首页，就显示
-		if(show || userInfo || getApp().globalData.user_id){
-		   var full_screen = th.selectComponent("#full_screen"); //组件的id
-		   full_screen.get_the_full_screen();		   
-		}else{
-		   getApp().globalData.isLoad_ad=1;	
-		}	
  
   },
   //当隐藏的时候就关闭计时器
@@ -371,7 +388,6 @@ Page({
         flash_data = e.data.data.pageData;
         if (flash_data == null || flash_data.length <= 0) return false;
  
-
         //当前时间戳
         var nt = ut.gettimestamp();
  
@@ -506,17 +522,17 @@ Page({
 		  th.is_new();
 		}
  
-      setTimeout(function () {
-        if (getApp().globalData.user_id) getApp().requestCardNum(th);
-      },500)
+       setTimeout(function () {
+          if (getApp().globalData.user_id) getApp().requestCardNum(th);
+       },500)
  
     });
-
-    var goods_list = this.selectComponent("#goods_list"); //组件的id
-    goods_list.init();
+    
     setTimeout(function() {
-      goods_list.get_list();
-    }, 300)
+	   var goods_list = th.selectComponent("#goods_list"); //组件的id
+	   goods_list.init();	
+       goods_list.get_list();
+    }, 2000)
   },
  
   //--判断小程序是否过期--
-<!-- <import src="../../tabbar/tabbar.wxml" /> -->
-<!-- <template is="tabBar" data="{{tabBar}}"/> -->
+<!-- <view hidden="{{f_hidden}}" class="full_screen" style="background-color: #fff;"></view> -->
+<full_screen id="full_screen"></full_screen>
 <!--普通界面-->
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
+
 <view class="container rel" wx:if="{{ishow}}">
   <block wx:if="{{banner}}">
     <image class="xc-top-img abs" src="{{url}}/miniapp/images/top-img.png"></image>
@@ -295,6 +296,8 @@
  
 </view>
  
+
+<block wx:if="{{f_hidden}}">
 <!--是否是自定义-->
 <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}">
   <!-- 置顶层 -->	
@@ -390,6 +393,8 @@
   </block>
 </view>
  
+</block>
+
 <!-- 蒙尘 -->
 <block wx:if="{{is_disgraceful}}">
   <view class="disgraceful">
@@ -397,13 +402,12 @@
     <view class="newreceive flex-center">
       <view>
         <navigator bindtap="new_nav">
-          <view class="flex-level">
-            <image class="receive" src="{{url}}{{new_image==''?'/miniapp/images/newpeople/newreceive.png':new_image}}"></image>
+          <view class="flex-level" style="position: relative;">
+             <image class="receive" src="{{url}}{{new_image==''?'/miniapp/images/newpeople/newreceive.png':new_image}}"></image>
+			 <image class="close" src="{{url}}/miniapp/images/plus/Close.png" catchtap="close_disgraceful" style="margin-top: -70rpx; right: -60rpx;"></image>
           </view>
         </navigator>
-        <view class="flex-level">
-          <image class="close" src="{{url}}/miniapp/images/plus/Close.png" bindtap="close_disgraceful"></image>
-        </view>
+        <view class="flex-level"></view>
       </view>
     </view>
   </view>
@@ -418,8 +422,6 @@
 		</view>
 	</view>
 </block>
-
-
  
 <block wx:if="{{showHongbaoSmall}}">
 	<view>
@@ -427,9 +429,6 @@
 	</view>
 </block>
  
-<!-- <hongbao id="hongbao" bind:closeHongbao="closeHongbao" wx:if="{{showHongbao}}" url="{{url}}"></hongbao> -->
-<full_screen id="full_screen"></full_screen>
-
  
  
  
@@ -966,4 +966,14 @@ page {
 	/* transform: translateY(-50%); */
 	z-index: 10000;
 }
-.dis_top{position: fixed; top: 0; left: 0; width: 100%; z-index: 100000;}
 \ No newline at end of file
+.dis_top{position: fixed; top: 0; left: 0; width: 100%; z-index: 100000;}
+.full_screen{
+	position: fixed;left: 0;top: 0;
+	z-index: 1000000000000;
+	background-color: rgba(0,0,0,0.4);
+	width: 100%;
+	height: 100%;
+	background-position: center;
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+}