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

taiyuan
2 parents 7ec1bb7c d56835df
Showing 5 changed files with 56 additions and 56 deletions
components/diy_advertising/diy_advertising.wxml
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/diy_goodsGroup.wxml
pages/togoin/togoin.js
utils/auth.js
@@ -11,10 +11,10 @@
         <block wx:if="{{item.src!=''}}">
             <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"
 						     wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
-                <image src="{{item.src}}" mode="widthFix"></image>
+                <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
             </navigator>
 			<view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-                <image src="{{item.src}}" mode="widthFix"></image>
+                <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
              </view>
         </block>
       </view>
@@ -35,11 +35,11 @@
         </block>
         <block wx:if="{{item.src!=''}}">
           <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"  wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
-            <image src="{{item.src}}" mode="widthFix"></image>
+            <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
           </navigator>
 					<view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-            <image src="{{item.src}}" mode="widthFix"></image>
+            <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
           </view>
         </block>
@@ -63,11 +63,11 @@
           </block>
           <block wx:if="{{item.src!=''}}">
             <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1"  wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
-              <image src="{{item.src}}" mode="widthFix"></image>
+              <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
             </navigator>
             <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-              <image src="{{item.src}}" mode="widthFix"></image>
+              <image src="{{item.src}}" mode="widthFix" lazy-load="true"></image>
             </view>
@@ -90,8 +90,8 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{item.src!=''}}">
-        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix" ></image></navigator>
-        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix"></image></view>
+        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></navigator>
+        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></view>
       </block>
     </view>
@@ -100,8 +100,8 @@
         <text>200*200</text>
       </block>
       <block wx:if="{{item.src!=''}}">
-        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix"></image></navigator>
-        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}"  mode="widthFix"></image></view>
+        <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}"><image src="{{item.src}}" mode="widthFix" lazy-load="true"></image></navigator>
+        <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else><image src="{{item.src}}"  mode="widthFix" lazy-load="true"></image></view>
       </block>
     </view>
@@ -119,10 +119,10 @@
     </block>
     <block wx:if="{{object.data[0].src!=''}}">
       <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">>
-        <image src="{{object.data[0].src}}"></image>
+        <image src="{{object.data[0].src}}" lazy-load="true"></image>
       </navigator>
       <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-        <image src="{{object.data[0].src}}"></image>
+        <image src="{{object.data[0].src}}" lazy-load="true"></image>
       </view>
     </block>
   </view>
@@ -134,11 +134,11 @@
       </block>
       <block wx:if="{{object.data[1].src!=''}}">
         <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
-           <image src="{{object.data[1].src}}"></image>
+           <image src="{{object.data[1].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[1].src}}"></image>
+          <image src="{{object.data[1].src}}" lazy-load="true"></image>
         </view>
@@ -150,10 +150,10 @@
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
         <navigator url="{{object.data[2].wxapp_imgurl}}"  class="s1_gk_a1"  wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[2].src}}"></image>
+          <image src="{{object.data[2].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[2].wxapp_imgurl}}"  class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[2].src}}"></image>
+          <image src="{{object.data[2].src}}" lazy-load="true"></image>
         </view>
@@ -172,11 +172,11 @@
       </block>
       <block wx:if="{{object.data[0].src!=''}}">
         <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
-           <image src="{{object.data[0].src}}"></image>
+           <image src="{{object.data[0].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[0].src}}"></image>
+          <image src="{{object.data[0].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -187,11 +187,11 @@
       </block>
       <block wx:if="{{object.data[1].src!=''}}">
         <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[1].src}}"></image>
+          <image src="{{object.data[1].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[1].src}}"></image>
+          <image src="{{object.data[1].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -205,11 +205,11 @@
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
          <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
-           <image src="{{object.data[2].src}}"></image>
+           <image src="{{object.data[2].src}}" lazy-load="true"></image>
          </navigator>
         <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[2].src}}"></image>
+          <image src="{{object.data[2].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -220,11 +220,11 @@
       </block>
       <block wx:if="{{object.data[3].src!=''}}">
         <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1"  wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[3].src}}"></image>
+          <image src="{{object.data[3].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[3].src}}"></image>
+          <image src="{{object.data[3].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -242,11 +242,11 @@
       </block>
       <block wx:if="{{object.data[0].src!=''}}">
         <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[0].src}}"></image>
+          <image src="{{object.data[0].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[0].src}}"></image>
+          <image src="{{object.data[0].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -258,10 +258,10 @@
       </block>
       <block wx:if="{{object.data[1].src!=''}}">
         <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[1].src}}"></image>
+          <image src="{{object.data[1].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[1].src}}"></image>
+          <image src="{{object.data[1].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -276,11 +276,11 @@
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
         <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
-           <image src="{{object.data[2].src}}"></image>
+           <image src="{{object.data[2].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[2].src}}"></image>
+          <image src="{{object.data[2].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -291,11 +291,11 @@
       </block>
       <block wx:if="{{object.data[3].src!=''}}">
         <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[3].src}}"></image>
+          <image src="{{object.data[3].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[3].src}}"></image>
+          <image src="{{object.data[3].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -315,11 +315,11 @@
       </block>
       <block wx:if="{{object.data[0].src!=''}}">
         <navigator url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[0].wxapp_imgurl,'plugin')>=0}}">
-            <image src="{{object.data[0].src}}" ></image>
+            <image src="{{object.data[0].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[0].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-				  <image src="{{object.data[0].src}}" ></image>
+				  <image src="{{object.data[0].src}}" lazy-load="true"></image>
         </view>
       </block>
@@ -330,11 +330,11 @@
       </block>
       <block wx:if="{{object.data[1].src!=''}}">
         <navigator url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[1].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[1].src}}" ></image>
+          <image src="{{object.data[1].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[1].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[1].src}}" ></image>
+          <image src="{{object.data[1].src}}" lazy-load="true"></image>
         </view>
       </block>
     </view>
@@ -348,11 +348,11 @@
       </block>
       <block wx:if="{{object.data[2].src!=''}}">
         <navigator url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[2].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[2].src}}" ></image>
+          <image src="{{object.data[2].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[2].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[2].src}}" ></image>
+          <image src="{{object.data[2].src}}" lazy-load="true"></image>
         </view>
@@ -364,11 +364,11 @@
       </block>
       <block wx:if="{{object.data[3].src!=''}}">
         <navigator url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[3].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[3].src}}" ></image>
+          <image src="{{object.data[3].src}}" lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[3].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[3].src}}" ></image>
+          <image src="{{object.data[3].src}}" lazy-load="true"></image>
         </view>
       </block>
     </view>
@@ -383,11 +383,11 @@
       </block>
       <block wx:if="{{object.data[4].src!=''}}">
         <navigator url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(object.data[4].wxapp_imgurl,'plugin')>=0}}">
-          <image src="{{object.data[4].src}}" style='height:492rpx'></image>
+          <image src="{{object.data[4].src}}" style='height:492rpx' lazy-load="true"></image>
         </navigator>
         <view data-url="{{object.data[4].wxapp_imgurl}}" class="s1_gk_a1" bindtap="go_url" wx:else>
-          <image src="{{object.data[4].src}}" style='height:492rpx'></image>
+          <image src="{{object.data[4].src}}" style='height:492rpx' lazy-load="true"></image>
         </view>
       </block>
@@ -411,14 +411,14 @@
         <navigator url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" wx:if="{{g_filter.has_char(item.wxapp_imgurl,'plugin')>=0}}">
           <swiper-item>
-               <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" />
+               <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"   class="slide-image" mode="widthFix" lazy-load="true"/>
                <view class="title" wx:if="{{title}}">{{item.title}}</view>
           </swiper-item>
         </navigator>
         <view data-url="{{item.wxapp_imgurl}}" class="s1_gk_a1" style="height:{{max_sw_height}}rpx" bindtap="go_url" wx:else>
           <swiper-item>
-              <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" />
+              <image src="{{item.src}}"  bindload="imageLoad"  data-index="{{index}}"  class="slide-image" mode="widthFix" lazy-load="true"/>
               <view class="title" wx:if="{{title}}">{{item.title}}</view>
           </swiper-item>
         </view>
@@ -260,6 +260,7 @@ Component({
 	//---卡的初始化----
 	card_init: function() {
 	  var th = this,os=getApp().globalData.setting;
+	  if(!getApp().globalData.user_id) return false;  
 	  getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
 		isShowLoading:false,  
 	    success: function(e) {
@@ -389,12 +390,12 @@ Component({
     //--- 设置 ---
     set_good:async function(goods){
 		var now=ut.gettimestamp();		
-		var th=this;
-		for(var i in goods){
+		var th=this;		
+		if(!goods || goods.length==0) return false;	
+		for(var i in goods){		
 			var val=goods[i];
 			var item = {};
 			var prom_id = null;
-			console.log(val.goodsid);
 			//app.request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + val.goods_id, {}).then(res => {
 			item.goods_name = val.goods_name;
@@ -422,7 +423,7 @@ Component({
 			  url = "/api/ms/flash_sale/get/" + os.stoid + "/" + prom_id;
 			}
-			if(url!=null){
+			if(url!=null && url!=''){
 			 await getApp().request.promiseGet(url, {}).then(res => {
 			    var prom =null;
 			    if(res && res.data) res.data.data;
@@ -19,7 +19,7 @@
                     <view class='zs_top rel'>
                         <image class='zs_t_img' src="{{item.goods_img}}"
                                data-errorimg="goods_array[{{index}}].goods_img"
-                               binderror="bind_bnerr3"
+                               binderror="bind_bnerr3" lazy-load="true" 
                         ></image>
                         <block wx:if="{{object.goodicon==3}}">
@@ -166,7 +166,7 @@
             <view class="zs_goods_ban">
                 <view class='zs_goods_2l'>
                     <view class='zs_top_2l rel'>
-                        <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                        <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" 
                                    binderror="bind_bnerr3"></image>
                         <block wx:if="{{object.goodicon==3}}">
                             <image class='{{g_filter.get_class(object.column,object.position)}}'
@@ -313,7 +313,7 @@
                 <view class="zs_goods_san">
                     <view class='zs_goods_3l {{g_filter.get_border_type(object.big_order_type)}}'>
                         <view class='zs_top_3l rel'>                       
-                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                            <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" 
                                        binderror="bind_bnerr3"></image>
                             <block wx:if="{{object.goodicon==3}}">
                                 <image class='{{g_filter.get_class(object.column,object.position)}}'
@@ -459,7 +459,7 @@
                 <view class='zs_top_x'>
                     <!--<image class='zs_t_img_x'></image>-->
                     <block>
-                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
+                        <image class='zs_t_img_x' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"  lazy-load="true" 
                                binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image>
                     </block>
@@ -628,7 +628,7 @@
             <view class='one'>
               <view class='sp_top'>
                 <view class='s_img' style="position: relative;">
-                  <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image>
+                  <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true"></image>
 				  <block wx:if="{{object.goodicon==3}}">
 				      <image class='{{g_filter.get_class(object.column,object.position)}}'
@@ -12,6 +12,7 @@ Page({
 	first_leader:'',   //-- 邀请人 --
   },
   onLoad: function (options) {
+	   getApp().globalData.isLoad_ad=1;	
 	   //--判断是否有接受到邀请人的ID--
 	   if(options.first_leader){
 	      this.setData({first_leader:options.first_leader});
@@ -221,9 +221,7 @@ module.exports = {
           var a = wx.getStorageSync("wx_user_info");
           var userInfo = a.userInfo;
           if (userInfo==undefined){ 
-			   //判断本地是数据是否正确
-			   if(n.globalData.wxapp_buy_obj && n.globalData.wxapp_buy_obj.isbuy==1 && n.globalData.wxapp_buy_obj.isout==0 )  n.goto("/pages/togoin/togoin");
-                                                    
+			    n.goto("/pages/togoin/togoin");                                               
             }else{
               a && void 0 != a ? (n.globalData.wechatUser = a, o.login(t, a, e)) : o.goGetUserInfo();
             }