Merge branch 'dev_oa_luo35' into dev

WXD-SEASON\season
2 parents 4105ae2e 56b201be
Showing 16 changed files with 1957 additions and 1498 deletions
components/diy_floatingWindow/diy_floatingWindow.wxss
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_scan/diy_scan.wxml
components/diy_scan/diy_scan.wxss
components/diy_service/diy_service.wxml
components/diy_service/diy_service.wxss
components/diy_top_nav/diy_top_nav.js
packageB/pages/zuhegou/index/index.js
packageB/pages/zuhegou/index/index.wxml
pages/index/index/index.js
pages/index/index/index.json
pages/index/index/index.wxml
pages/template/index.js
pages/template/index.json
pages/template/index.wxml
pages/template/index.wxss
 .custom-service {
-  width: 100rpx;
-  height: 100rpx;
+  width: 80rpx;
+  height: 80rpx;
   /* background-color: red; */
   border-radius: 50%;
   z-index: 100;
   line-height: 28rpx;
-  position: fixed;
+  /* position: fixed; */
   top: 50%;
   /* background-position: 50%; */
@@ -573,7 +573,7 @@ Component({
         }
       })
-      console.error(th.data.requestData);
+      // console.error(th.data.requestData);
       //-----------------------
       if (th.data.object.column_action_name) {
         if (th.data.object.style == 6 || th.data.object.style == 5) {
@@ -643,7 +643,7 @@ Component({
         },
         // 加购方法 hide
         hide_add_purchase(){
-          console.error('隐藏加购方法。。。。');
+          // console.error('隐藏加购方法。。。。');
           setTimeout(()=>{
             this.setData({
               add_purchase:false
@@ -3,7 +3,7 @@
        style="top:{{top}}px;left:{{left}}px; background-color:{{object.bg_color}}; opacity: 0.5 " bindtouchmove="setTouchMove">
     <view style="text-align: center;">
       <image class="cs-img" src="{{object.img}}"></image>
-      <view class="s_title"  wx:if="{{object.title!=''}}">
+      <view class="s_title" style="line-height: 14rpx;"  wx:if="{{object.title!=''}}">
           <text wx:if="{{object.word_color}}" style="color:{{object.word_color}}">{{object.title}}</text>
           <text wx:else >{{object.title}}</text>
       </view>
@@ -15,7 +15,7 @@
 <view  class="scan_view" disable-scroll="true"  bindtap='getScancode'  style="top:{{top}}px;left:{{left}}px;" bindtouchmove="setTouchMove">
     <view style="text-align: center;">
         <image class="cs-img" src="{{object.img}}"></image>
-        <view class="s_title"  wx:if="{{object.title!=''}}">
+        <view class="s_title" style="line-height: 14rpx;"  wx:if="{{object.title!=''}}">
             <text wx:if="{{object.word_color}}" style="color:{{object.word_color}}">{{object.title}}</text>
             <text wx:else>{{object.title}}</text>
         </view>
 .scan_view{
-	position: fixed;z-index: 100; left: 0; top: 0; width: 100rpx; height: 100rpx;
+	z-index: 100; left: 0; top: 0; width: 80rpx; height: 80rpx;
 	border-radius: 50%; background-color: rgba(125,125,2,0.5);box-shadow: #ccc 0px 0px 70px 1px;
 	display: flex;align-items: center;justify-content: center; color: #f8f8f8; 
 }
@@ -4,14 +4,14 @@
    <view  wx:if="{{userInfo}}" class="custom-service" bindtap="go_user" >
 	    <view style="text-align: center;">
 		  <image class="cs-img" src="{{object.img}}"></image>
-		  <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
+		  <view class="s_title" style="line-height: 14rpx;" wx:if="{{object.title!=''}}">{{object.title}}</view>
 		</view>
    </view>
    <button wx:else  class="custom-service" bindtap="click_contact"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
 	   <view style="text-align: center;">
          <image class="cs-img" src="{{object.img}}"></image>
-         <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
+         <view class="s_title" style="line-height: 14rpx;" wx:if="{{object.title!=''}}">{{object.title}}</view>
 	   </view>	 
     </button>	
 </block>
@@ -20,7 +20,7 @@
 	<view class="custom-service cart-ico new_split" bindtap="con_weixin">
 		<view style="text-align: center;">
 			<image class="cs-img" src="{{object.img}}"></image>
-			<view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
+			<view class="s_title" style="line-height: 14rpx;" wx:if="{{object.title!=''}}">{{object.title}}</view>
 		</view>
 	</view>
 </block>
@@ -29,7 +29,7 @@
 	<view class="custom-service cart-ico new_split" bindtap="contactService">
 		 <view style="text-align: center;">
 		    <image class="cs-img" src="{{object.img}}"></image>
-		    <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
+		    <view class="s_title" style="line-height: 14rpx;" wx:if="{{object.title!=''}}">{{object.title}}</view>
 		 </view>	
 	</view>
 </block>	
 \ No newline at end of file
-.custom-service{ width: 100rpx; height: 100rpx; border-radius: 50%; background-color: #fff;z-index: 100;
+.custom-service{ width: 80rpx; height: 80rpx; border-radius: 50%; background-color: #fff;z-index: 100;
   border: 1px solid #adadad;  box-shadow: 0 0 10px 2px #adadad; line-height: 28rpx;
- position: fixed; top: 40%; right: 2rpx; display: flex;align-items: center;justify-content: center;}
+  right: 2rpx; display: flex;align-items: center;justify-content: center;}
  .cs-img{ width: 36rpx; height: 36rpx;}
 .s_title{ font-size: 14rpx;}
 \ No newline at end of file
@@ -20,11 +20,11 @@ Component({
     },
     nav_frontColor:{
       type:String,
-      value:'#ffffff',
+      value:'#000',
     },
     nav_backgroundColor:{
       type:String,
-      value:'#ff7295',
+      value:'#ffffff',
     },
     is_share:{
       type:Boolean,
@@ -20,6 +20,7 @@ Page({
     showNum: false,
     haveAdded: false,
     imgDraw: {},
+    new_imgDraw:{},
     id: 0, //获得活动id
     page: 1, //第一页
     no_more: 0, //没有更多
@@ -38,6 +39,7 @@ Page({
     sec_pick_index: 0, //门店选择的下标，地区选择之后的内页
     userbuynum: false,//是否有超出购买次数，还是否可以购买。false 为可购买，true为不可购买
     sales_map: {},  //线下销售的map
+    fxShow:false,//分享是否显示
   },
   /**
@@ -614,6 +616,8 @@ Page({
                 th.get_head_temp(function () {
                   var txt = th.data.act.zhprice + "元" + th.data.act.zhbuyqty + "件";
                   var imgDraw = th.data.imgDraw;
+                  // console.error('头像地址1');
+                  // console.error(th.data.share_head);
                   imgDraw.views[0].url = th.data.share_head;
                   imgDraw.views[1].text = userInfo.nickname;
                   imgDraw.views[3].text = txt;
@@ -634,7 +638,14 @@ Page({
                       imgDraw.views[2].url = path22;
                       imgDraw.views[5].url = vpath;
                       th.setData({
-                        imgDraw: imgDraw
+                        // ['imgDraw.views[0].url']:imgDraw.views[0].url,
+                        // ['imgDraw.views[1].text']:imgDraw.views[1].text,
+                        // ['imgDraw.views[2].text']:imgDraw.views[2].text,
+                        // ['imgDraw.views[3].text']:imgDraw.views[3].text,
+                        // ['imgDraw.views[4].text']:imgDraw.views[4].url,
+                        imgDraw: imgDraw,
+                        new_imgDraw:imgDraw,
+                        fxShow:true
                       })
                     }
                   })
@@ -649,6 +660,8 @@ Page({
             th.get_head_temp(function () {
               var imgDraw = th.data.imgDraw;
               var txt = th.data.act.zhprice + "元" + th.data.act.zhbuyqty + "件";
+              // console.error('头像地址2');
+              // console.error(th.data.share_head);
               imgDraw.views[0].url = th.data.share_head;
               imgDraw.views[1].text = userInfo.nickname;
               imgDraw.views[2].text = txt;
@@ -670,7 +683,14 @@ Page({
                   var vpath = res.path;
                   imgDraw.views[4].url = vpath;
                   th.setData({
-                    imgDraw: imgDraw
+                    // ['imgDraw.views[0].url']:imgDraw.views[0].url,
+                    // ['imgDraw.views[1].text']:imgDraw.views[1].text,
+                    // ['imgDraw.views[2].text']:imgDraw.views[2].text,
+                    // ['imgDraw.views[3].text']:imgDraw.views[3].text,
+                    // ['imgDraw.views[4].url']:imgDraw.views[4].url,
+                    imgDraw: imgDraw,
+                    new_imgDraw:imgDraw,
+                    fxShow:true
                   })
                 }
               })
@@ -1442,7 +1462,9 @@ Page({
   },
   onImgOK(e) {
-    console.log(e.detail.path);
+    // console.error('绘制返回------------');
+    // console.error(e);
+    // console.log(e.detail.path);
     this.setData({
       myimg: e.detail.path,
     });
@@ -1541,7 +1563,8 @@ Page({
     //---获取分享图片的本地地址,头像和商品图片----
     var path2 = getApp().globalData.userInfo.head_pic;
     if (path2 == "") {
-      ee.data.share_head = "../../../../images/share/hui_hear_pic.png";
+      // ee.data.share_head = "../../../../images/share/hui_hear_pic.png";
+      ee.data.share_head = "https://mshopimg.yolipai.net//miniapp/images/no-head.jpg";
       tt();
     } else {
       path2 = path2.replace("http://thirdwx.qlogo.cn", "https://wx.qlogo.cn");
@@ -1555,7 +1578,8 @@ Page({
           tt();
         },
         fail: function () {
-          ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的
+          ee.data.share_head = "https://mshopimg.yolipai.net//miniapp/images/no-head.jpg";
+          // ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的
           tt();
         }
       });
@@ -98,7 +98,7 @@
         </view>
     </view>
     <!-- 分享 -->
-    <view wx:if="{{imgDraw}}" class="share-container" bindtap="share">
+    <view wx:if="{{imgDraw && fxShow}}" class="share-container" bindtap="share">
         <text class="iconfont icon-zhuanfa fs40"></text>
         <view class="fs22 c-8">分享</view>
     </view>
@@ -155,7 +155,9 @@
 </view>
-<painter style="position: absolute; top: -9999rpx;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/>
+
+  <painter style="position: absolute; top: -9999rpx;" palette="{{imgDraw}}" bind:imgOK="onImgOK"/>
+
 <!-- 活动异常提醒 -->
 <catch wx:if="{{error}}">{{error}}</catch>
 <warn id="warn"></warn>
 var e = function (e) {
-	return e && e.__esModule ? e : {
-		default: e
-	};
+  return e && e.__esModule ? e : {
+    default: e
+  };
 }(require("../../../utils/LoadMore.js")),
-	t = getApp(),
-	a = t.request,
-	o = t.globalData.setting,
-	os = o,
-	i = require("../../../utils/util.js"),
-	ut = i,
-	s = require("../../../utils/common.js"),
-	n = new e.default();
+  t = getApp(),
+  a = t.request,
+  o = t.globalData.setting,
+  os = o,
+  i = require("../../../utils/util.js"),
+  ut = i,
+  s = require("../../../utils/common.js"),
+  n = new e.default();
 var regeneratorRuntime = require('../../../utils/runtime.js');
 var api = require('../../../api/api.js');
 var d = getApp().globalData;
- 
+
 var full_screen = require('full_screen.js');
 Page({
-	data: {
-		url: o.imghost,
-		swiperimage: [{
-			image: "/miniapp/images/title.png",
-			nav_url: 0
-		}],
-		resourceUrl: o.resourceUrl,
-		logo: o.appLogo,
-		homeData: null,
-		saleGoods: null,
-		sale: {
-			countTime: {
-				hour: 0,
-				minute: 0,
-				second: 0
-			},
-			diffTime: 0,
-			good: null,
-		},
-		timer: null,
-		recommend: null,
-		scrollTop: 0,
-		currentPage: 1,
-		banner: null,
-
-		appdata: null,
-		saleGoods: null, //秒杀数据
-		pindGoods: null, //拼单数据
-		newGoods: null, //新商品
-		hotGoods: null, //hot商品
-		preGoods: null, //预售商品
-		//----控制是是否显示计时器---
-		is_timer: 1,
-		ishow: 0,
-		//是不是显示自定义模板
-		isTemplate: 0,
-		template_arr: null,
-		bgcolor_t: '',
-
-		banner_index: 0,
-		flash_index: 0,
-		pt_index: 0,
-
-		pt_timer_item: null,
-		pt_timer_arr: null,
-		pt_timer: null,
-		pt_timer_active: 0,
-		//看下商家是否开通会员权益
-		is_boot: 0,
-		gd_category: null,
-		is_no_more: 0,
-		max_sw_height: 0, //banner的最大高度
-		is_disgraceful: 0, //是否显示新人广告
-		new_image: "", //新人有礼弹窗图片
-		new_nav: "", //新人页面跳转地址
-		w_holiday_pop: 0,
-
-		showHongbao: false,
-		showHongbaoSmall: false,
-    goodsGroupArr:[], //商品模块列表
-		is_full_screen_show: 0,  //全屏显示
-		sec_show: 3,    //倒计时的秒数
-		full_ad: null,  //全屏广告
-		full_screen: 0, //全屏广告
-		is_ok_h5: 0,  //判断要不要显示关注二维码
-		mb_banner:{},//首页广告
-		container: null,
-		is_retail_price:0,
-	},
-	
-
-	onLoad: async function (tt) {
+  data: {
+    url: o.imghost,
+    swiperimage: [{
+      image: "/miniapp/images/title.png",
+      nav_url: 0
+    }],
+    resourceUrl: o.resourceUrl,
+    logo: o.appLogo,
+    homeData: null,
+    saleGoods: null,
+    sale: {
+      countTime: {
+        hour: 0,
+        minute: 0,
+        second: 0
+      },
+      diffTime: 0,
+      good: null,
+    },
+    timer: null,
+    recommend: null,
+    scrollTop: 0,
+    currentPage: 1,
+    banner: null,
+
+    appdata: null,
+    saleGoods: null, //秒杀数据
+    pindGoods: null, //拼单数据
+    newGoods: null, //新商品
+    hotGoods: null, //hot商品
+    preGoods: null, //预售商品
+    //----控制是是否显示计时器---
+    is_timer: 1,
+    ishow: 0,
+    //是不是显示自定义模板
+    isTemplate: 0,
+    template_arr: null,
+    bgcolor_t: '',
+
+    banner_index: 0,
+    flash_index: 0,
+    pt_index: 0,
+
+    pt_timer_item: null,
+    pt_timer_arr: null,
+    pt_timer: null,
+    pt_timer_active: 0,
+    //看下商家是否开通会员权益
+    is_boot: 0,
+    gd_category: null,
+    is_no_more: 0,
+    max_sw_height: 0, //banner的最大高度
+    is_disgraceful: 0, //是否显示新人广告
+    new_image: "", //新人有礼弹窗图片
+    new_nav: "", //新人页面跳转地址
+    w_holiday_pop: 0,
+
+    showHongbao: false,
+    showHongbaoSmall: false,
+    goodsGroupArr: [], //商品模块列表
+    is_full_screen_show: 0,  //全屏显示
+    sec_show: 3,    //倒计时的秒数
+    full_ad: null,  //全屏广告
+    full_screen: 0, //全屏广告
+    is_ok_h5: 0,  //判断要不要显示关注二维码
+    mb_banner: {},//首页广告
+    container: null,
+    is_retail_price: 0,
+    //满屏顶部导航参数------------
+    is_full_screen_navigation: false, //是否满屏
+    is_full_screen_navigation_index: -1, //广告轮播满屏下标
+    nav_title: '首页',
+    nav_frontColor: "#000",
+    nav_backgroundColor: "#fff",
+    nav_type: 1,  //导航类型
+    searchbox_transparent: 1, //搜索框背景是否透明
+    is_show_top:0, //是否置顶显示
+    // nav_but_color: '#32ACF9', //导航按钮颜色
+    // sele_pickup: null, //默认门店
+    // nav_bg_color:'#e823e8', //导航按钮颜色
+    //----------------
+  },
+
+
+  onLoad: async function (tt) {
     wx.offCopyUrl()
-		wx.showShareMenu({
-			withShareTicket:true,
-			menus:['shareAppMessage','shareTimeline']
-		  })
-		var th = this;
+    wx.showShareMenu({
+      withShareTicket: true,
+      menus: ['shareAppMessage', 'shareTimeline']
+    })
+    var th = this;
     var first_leader = tt.first_leader;
-      //群id
-    if(tt && tt.groupchat_id && tt.groupchat_id!='undefined' && tt.groupchat_id!='null'){
-      getApp().globalData.groupchat_id=tt.groupchat_id
+    //群id
+    if (tt && tt.groupchat_id && tt.groupchat_id != 'undefined' && tt.groupchat_id != 'null') {
+      getApp().globalData.groupchat_id = tt.groupchat_id
     }
-		if (!first_leader && tt.scene) {
-			var first_leader_str = decodeURIComponent(tt.scene);
-			var f_arr = first_leader_str.split("_");
-			first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null;
-			//注册门店
-			if (f_arr[1] && parseFloat(f_arr[1]) > 0) {
-				getApp().globalData.store_number = f_arr[1];
+    if (!first_leader && tt.scene) {
+      var first_leader_str = decodeURIComponent(tt.scene);
+      var f_arr = first_leader_str.split("_");
+      first_leader = f_arr[0] && parseFloat(f_arr[0]) > 0 ? f_arr[0] : null;
+      //注册门店
+      if (f_arr[1] && parseFloat(f_arr[1]) > 0) {
+        getApp().globalData.store_number = f_arr[1];
       }
       //企业微信群id
-			if (f_arr[2] && parseFloat(f_arr[2]) > 0) {
-				getApp().globalData.groupchat_id = f_arr[2];
+      if (f_arr[2] && parseFloat(f_arr[2]) > 0) {
+        getApp().globalData.groupchat_id = f_arr[2];
       }
-      
+
     }
     // console.error('群id------------------------------------------');
     // console.error(getApp().globalData.groupchat_id);
     // console.error('群id------------------------------------------2222222222222222222222');
     // getApp().globalData.groupchat_id=1
-		console.log("first_leader:"+first_leader,"onload");
-
-
-		getApp().getConfig(function (e) {
-			//--首页的问题--
-			if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) {
-				wx.setNavigationBarTitle({
-					title: getApp().globalData.config.store_name,
-				});
-			} else {
-				wx.setNavigationBarTitle({
-					title: getApp().globalData.setting.appName,
-				});
-			};
-		});
-
-
-		var th = this;
-		getApp().getConfig2(function (config2) {
-			var swithc_list = config2.switch_list;
-			var sw_arr = JSON.parse(swithc_list);
-			if(sw_arr.is_retail_price){
-				th.setData({is_retail_price:1});
-			}
-
-			if (config2 && config2.is_overdue == 1) {
-				getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => {
-					var o = res;
-					if (o.data.code == 0) {
-						var ob = { isout: 0, isbuy: 1 };
-						var arr = o.data.data.pageData;
-						var isbuy = 0;
-						//----如果数组不为空----
-						if (arr.length > 0) {
-							arr.forEach(function (val, ind) {
-								if (val.is_sy == 0 && val.type == 5) {
-									isbuy = 1;
-									var now = ut.gettimestamp();
-									if (now > val.end_time) ob.isout = 1;
-									return false;
-								}
-							})
-						}
-						ob.isbuy = isbuy;
-
-						var pages = getCurrentPages();             //获取加载的页面
-						var currentPage = pages[pages.length - 1];  //获取当前页面的对象
-
-						// console.log("当前路由");
-						// console.log(currentPage.route);
-
-
-						th.setappdata(ob);
-
-						if (ob.isbuy && !ob.isout) {
-							th.onload_init();
-						}
-					} else {
-						th.onload_init();
-					}
-				})
-			}
-			else {
-				th.onload_init();
-			}
-		})
-
-		if (first_leader) {
-			//--  user_id代过来免登录 --
-			getApp().globalData.first_leader = first_leader;
-			//调用接口判断是不是会员
-			getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
-				if (res.data.code == 0) {
-					getApp().globalData.guide_id = res.data.data.id;
-					getApp().globalData.guide_pick_id= res.data.data.pickup_id
-				}
-			})
-
-			if(!getApp().globalData.user_id){
-                ut.new_user_go(os.stoid,first_leader);
-			}
-
-		}
-
-		// 判断是否有红包活动
-		getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, {
-			data: {}
-		}).then(function (data) {
+    console.log("first_leader:" + first_leader, "onload");
+
+
+    getApp().getConfig(function (e) {
+      //--首页的问题--
+      if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) {
+        wx.setNavigationBarTitle({
+          title: getApp().globalData.config.store_name,
+        });
+      } else {
+        wx.setNavigationBarTitle({
+          title: getApp().globalData.setting.appName,
+        });
+      };
+      th.setData({
+        nav_title:getApp().globalData.config.store_name
+      })
+    });
+
+
+    var th = this;
+    getApp().getConfig2(function (config2) {
+      var swithc_list = config2.switch_list;
+      var sw_arr = JSON.parse(swithc_list);
+      if (sw_arr.is_retail_price) {
+        th.setData({ is_retail_price: 1 });
+      }
+
+      if (config2 && config2.is_overdue == 1) {
+        getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => {
+          var o = res;
+          if (o.data.code == 0) {
+            var ob = { isout: 0, isbuy: 1 };
+            var arr = o.data.data.pageData;
+            var isbuy = 0;
+            //----如果数组不为空----
+            if (arr.length > 0) {
+              arr.forEach(function (val, ind) {
+                if (val.is_sy == 0 && val.type == 5) {
+                  isbuy = 1;
+                  var now = ut.gettimestamp();
+                  if (now > val.end_time) ob.isout = 1;
+                  return false;
+                }
+              })
+            }
+            ob.isbuy = isbuy;
+
+            var pages = getCurrentPages();             //获取加载的页面
+            var currentPage = pages[pages.length - 1];  //获取当前页面的对象
+
+            // console.log("当前路由");
+            // console.log(currentPage.route);
+
+
+            th.setappdata(ob);
+
+            if (ob.isbuy && !ob.isout) {
+              th.onload_init();
+            }
+          } else {
+            th.onload_init();
+          }
+        })
+      }
+      else {
+        th.onload_init();
+      }
+    })
+
+    if (first_leader) {
+      //--  user_id代过来免登录 --
+      getApp().globalData.first_leader = first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+        if (res.data.code == 0) {
+          getApp().globalData.guide_id = res.data.data.id;
+          getApp().globalData.guide_pick_id = res.data.data.pickup_id
+        }
+      })
+
+      if (!getApp().globalData.user_id) {
+        ut.new_user_go(os.stoid, first_leader);
+      }
+
+    }
+
+    // 判断是否有红包活动
+    getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, {
+      data: {}
+    }).then(function (data) {
       let code = data.data.code;
       let resdata = data.data.data;
-			if (code == 0 && resdata.is_index) {
-
-				th.setData({
-					showHongbao: true,
-				});
-			} else if (code == -1) {
-				th.setData({
-					showHongbao: false,
-				});
-			};
-		});
-
-
-		// console.log(9090909);
-		//看一下商家是否开通了权益
-		//--初始化是否有打勾--
-		getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", {
-			data: {
-				storeId: os.stoid
-			}
-		}).then(res => {
-			if (res.data.data) {
-				var is_init = res.data.data.isBool;
-				th.setData({
-					is_boot: is_init
-				});
-
-				if (!is_init) {
-					th.setData({
-						swiperimage: []
-					});
-				}
-			}
-		})
-
-
-		var share_openid= tt.share_openid;
-		if(share_openid){
-			this.get_room_share_guide(share_openid);
-		}
-
-		//调用底部导航
-		//getApp().globalData.url=th.data.url
-		//t.editTabBar(th,o.stoid,th.data.url);
-
-	},
-
-
-	async get_room_share_guide(share_openid){
-
-		var url="/api/weshop/users/page";
-		var first_leader=0;
-
-		//调用接口判断是不是会员
-		await getApp().request.promiseGet(url, {
-			data:{stoid:os.stoid,weapp_openid:share_openid}
-		}).then(res => {
-			if (ut.ajax_ok(res)) {
-				first_leader=res.data.data.pageData[0].user_id;
-				// getApp().globalData.guide_id = res.data.data.id;
-			}
-		})
-		if(!first_leader) return false;
-
-		getApp().globalData.first_leader = first_leader;
-		//调用接口判断是不是会员
-		await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
-			if (res.data.code == 0) {
-				getApp().globalData.guide_id = res.data.data.id;
-				getApp().globalData.guide_pick_id= res.data.data.pickup_id
-			}
-		})
-
-	},
-
-
-	async onload_init() {
-		var th = this;
-		await this.init_load();
-		//显示的时候要开启计时器
-		this.data.is_timer = 1;
-		//如果是自定义模板
-		if (this.data.isTemplate) {
-			//---先获取会员---
-			//t.getUserFir(function () {
-			if (getApp().globalData.user_id) {
-				th.is_festival();
-				var new_nav = th.data.new_nav;
-				if (new_nav == "") {
-					th.is_new();
-				}
-				// sty
-				setTimeout(function () {
-					if (getApp().globalData.user_id) getApp().requestCardNum(th);
-				}, 500)
-			}
-
-			//});
-		} else {
-			await this.init_fir();
-			wx.setNavigationBarColor({
-				frontColor: '#ffffff', // 必写项
-				backgroundColor: '#ff7295', // 必写项
-			})
-		}
-
-		//--正再拼团中的处理--
-		var url = "/api/weshop/order/pageTuanNew?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
-		await getApp().request.promiseGet(url, {}).then(res => {
-			if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
-				th.data.pt_timer_arr = res.data.data.pageData;
-			}
-		})
-		if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) {
-			for (var i in th.data.pt_timer_arr) {
-				var p_item = th.data.pt_timer_arr[i];
-				await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, {
-					1: 1
-				}).then(res => {
-					th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic;
-					th.data.pt_timer_arr[i].nickname = res.data.data.nickname;
-				})
-			}
-			th.Interval_pt();
-		}
-
-		//---处理正在6个分类----
-		await getApp().request.promiseGet("/api/weshop/goodscategory/page", {
-			data: {
-				store_id: os.stoid,
-				pageSize: 5,
-				is_show: 1,
-				level: 1
-			}
-		}).then(res => {
-			if (res.data.data) {
-				var gd_category = res.data.data.pageData;
-				th.setData({
-					gd_category: gd_category
-				});
-			}
-		})
+      if (code == 0 && resdata.is_index) {
+
+        th.setData({
+          showHongbao: true,
+        });
+      } else if (code == -1) {
+        th.setData({
+          showHongbao: false,
+        });
+      };
+    });
+
+
+    // console.log(9090909);
+    //看一下商家是否开通了权益
+    //--初始化是否有打勾--
+    getApp().request.promiseGet("/api/weshop/users/grade/vip/init/get", {
+      data: {
+        storeId: os.stoid
+      }
+    }).then(res => {
+      if (res.data.data) {
+        var is_init = res.data.data.isBool;
+        th.setData({
+          is_boot: is_init
+        });
+
+        if (!is_init) {
+          th.setData({
+            swiperimage: []
+          });
+        }
+      }
+    })
+
+
+    var share_openid = tt.share_openid;
+    if (share_openid) {
+      this.get_room_share_guide(share_openid);
+    }
+
+    //调用底部导航
+    //getApp().globalData.url=th.data.url
+    //t.editTabBar(th,o.stoid,th.data.url);
+
+  },
+
+
+  async get_room_share_guide(share_openid) {
+
+    var url = "/api/weshop/users/page";
+    var first_leader = 0;
+
+    //调用接口判断是不是会员
+    await getApp().request.promiseGet(url, {
+      data: { stoid: os.stoid, weapp_openid: share_openid }
+    }).then(res => {
+      if (ut.ajax_ok(res)) {
+        first_leader = res.data.data.pageData[0].user_id;
+        // getApp().globalData.guide_id = res.data.data.id;
+      }
+    })
+    if (!first_leader) return false;
+
+    getApp().globalData.first_leader = first_leader;
+    //调用接口判断是不是会员
+    await getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+      if (res.data.code == 0) {
+        getApp().globalData.guide_id = res.data.data.id;
+        getApp().globalData.guide_pick_id = res.data.data.pickup_id
+      }
+    })
+
+  },
+
+
+  async onload_init() {
+    var th = this;
+    await this.init_load();
+    //显示的时候要开启计时器
+    this.data.is_timer = 1;
+    //如果是自定义模板
+    if (this.data.isTemplate) {
+      //---先获取会员---
+      //t.getUserFir(function () {
+      if (getApp().globalData.user_id) {
+        th.is_festival();
+        var new_nav = th.data.new_nav;
+        if (new_nav == "") {
+          th.is_new();
+        }
+        // sty
+        setTimeout(function () {
+          if (getApp().globalData.user_id) getApp().requestCardNum(th);
+        }, 500)
+      }
+
+      //});
+    } else {
+      await this.init_fir();
+      wx.setNavigationBarColor({
+        frontColor: '#ffffff', // 必写项
+        backgroundColor: '#ff7295', // 必写项
+      })
+      this.setData({
+        nav_frontColor: '#000', // 必写项
+        nav_backgroundColor: '#fff', // 必写项
+      })
+    }
+
+    //--正再拼团中的处理--
+    var url = "/api/weshop/order/pageTuanNew?pt_status=2&is_pt=1&store_id=" + os.stoid + "&pageSize=6&page=1"
+    await getApp().request.promiseGet(url, {}).then(res => {
+      if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
+        th.data.pt_timer_arr = res.data.data.pageData;
+      }
+    })
+    if (th.data.pt_timer_arr && th.data.pt_timer_arr.length > 0) {
+      for (var i in th.data.pt_timer_arr) {
+        var p_item = th.data.pt_timer_arr[i];
+        await getApp().request.promiseGet("/api/weshop/users/get/" + os.stoid + "/" + p_item.user_id, {
+          1: 1
+        }).then(res => {
+          th.data.pt_timer_arr[i].head_pic = res.data.data.head_pic;
+          th.data.pt_timer_arr[i].nickname = res.data.data.nickname;
+        })
+      }
+      th.Interval_pt();
+    }
+
+    //---处理正在6个分类----
+    await getApp().request.promiseGet("/api/weshop/goodscategory/page", {
+      data: {
+        store_id: os.stoid,
+        pageSize: 5,
+        is_show: 1,
+        level: 1
+      }
+    }).then(res => {
+      if (res.data.data) {
+        var gd_category = res.data.data.pageData;
+        th.setData({
+          gd_category: gd_category
+        });
+      }
+    })
   },
-  onReady(){
+  onReady() {
     console.log('渲染完成----')
     console.log(this.data.template_arr);
     console.log('....................');
   },
   //获取商品模块实例
-  newGoodsGroup(){
-    let arr=[]
+  newGoodsGroup() {
+    let arr = []
     if (this.data.template_arr.length == 0) {
       return
     }
-    this.data.template_arr.map((item,index)=>{
+    this.data.template_arr.map((item, index) => {
       if (item.ename == 'goodsGroup') {
         arr.push(`goodsGroup${index}`)
       }
     })
     if (arr.length > 0) {
       this.setData({
-        goodsGroupArr : arr
+        goodsGroupArr: arr
       })
-      arr.map(item=>{       
-        let a = '.'+item
+      arr.map(item => {
+        let a = '.' + item
         this[item] = this.selectComponent(a);
       })
     }
   },
-	//关闭新用户领取广告
-	close_disgraceful: function () {
-		var th = this;
-		th.setData({
-			is_disgraceful: 0
-		})
-	},
-
-	async onShow() {
-
-		//-- 看一下隐私政策要不要显示 --
-		var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
-		if (privacy_pop) {
-			privacy_pop.check_pri_show();
-		}
-
-		getApp().check_can_share();
-		if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-		  this.getTabBar().setData({
-			cartGoodsNum: getApp().globalData.cartGoodsNum
-		  })
-		}
-		var th = this;
-		//-- 登录回来判断弹框 --
-		var user_id = getApp().globalData.user_id;
-
-		if (!user_id) {
-			var userinfo = wx.getStorageSync('userinfo');
-			if (userinfo) user_id = userinfo.user_id
-		}
-
-		if (user_id) {
-			th.is_festival();
-			var new_nav = th.data.new_nav;
-			if (new_nav == "") {
-				th.is_new();
-			}
-		}
-
-		console.log(this.data.isTemplate, '首页');
-
-		if (!this.data.isTemplate) {
-            //timetype: 1 仅查询已预售 置空查询全部,
-			var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 };
-			if (user_id) {
-				pre_data.user_id = user_id;
-			}
-
-			getApp().request.get("/api/weshop/marketing/marketingPresellList/page", {
-				data: pre_data,
-				success: function (e) {
-					if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) {
+  //关闭新用户领取广告
+  close_disgraceful: function () {
+    var th = this;
+    th.setData({
+      is_disgraceful: 0
+    })
+  },
+
+  async onShow() {
+
+    //-- 看一下隐私政策要不要显示 --
+    var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
+    if (privacy_pop) {
+      privacy_pop.check_pri_show();
+    }
+
+    getApp().check_can_share();
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      this.getTabBar().setData({
+        cartGoodsNum: getApp().globalData.cartGoodsNum
+      })
+    }
+    var th = this;
+    //-- 登录回来判断弹框 --
+    var user_id = getApp().globalData.user_id;
+
+    if (!user_id) {
+      var userinfo = wx.getStorageSync('userinfo');
+      if (userinfo) user_id = userinfo.user_id
+    }
+
+    if (user_id) {
+      th.is_festival();
+      var new_nav = th.data.new_nav;
+      if (new_nav == "") {
+        th.is_new();
+      }
+    }
+
+    console.log(this.data.isTemplate, '首页');
+
+    if (!this.data.isTemplate) {
+      //timetype: 1 仅查询已预售 置空查询全部,
+      var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1, timetype: 3 };
+      if (user_id) {
+        pre_data.user_id = user_id;
+      }
+
+      getApp().request.get("/api/weshop/marketing/marketingPresellList/page", {
+        data: pre_data,
+        success: function (e) {
+          if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) {
             var pre_data = e.data.data.pageData;
             //当前时间戳
             var st = ut.gettimestamp();
@@ -452,968 +472,1071 @@ Page({
               //   pre_data[ind].status = 2;
               // }
             });
-						var arr = new Array();
-						//--三个三个一组---
-						for (var i = 0; i < pre_data.length; i += 3) {
-							arr.push(pre_data.slice(i, i + 3));
-						}
-						th.setData({
-							preGoods: arr
-						});
-					} else {
-						th.setData({
-							preGoods: null
-						});
-					}
-				}
-			})
-
-			// 获取幸运购活动列表
-			getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', {
-				data: {
-					store_id: getApp().globalData.setting.stoid,
-					is_end: 0,
-					timetype: 1,
-				}
-			}).then(res => {
-				if (res.data.code == 0) {
-					th.setData({
-						luckGo_list: res.data.data.pageData.slice(0, 3),
-					});
-				}
-			});
-
-			//-----秒杀-----
-			var flash_data = null;
-			var f_req = {
-				store_id: os.stoid,
-				timetype: 2,
-				is_end: 0,
-				is_show: 1,
-				pageSize: 9,
-				user_id: 0
-			};
-			if (user_id) f_req.user_id = user_id;
-			//--获取活动--
-			await getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
-				data: f_req,
-			}).then(res => {
-				var e = res;
-				if (e.data.code == 0) {
-					flash_data = e.data.data.pageData;
-					if (flash_data == null || flash_data.length <= 0) return false;
-
-					//当前时间戳
-					var nt = ut.gettimestamp();
-
-					flash_data.forEach(function (val, ind) {
-
-						if (val.user_price) val.price = val.user_price;
-						if (val.start_time > nt) {
-							flash_data[ind].status = 0;
-						} else if (val.end_time > nt) {
-							flash_data[ind].status = 1;
-						}
-
-						if (val.buy_num >= val.goods_num) {
-							flash_data[ind].status = 2;
-						}
-					});
-
-					var promisies = [];
-					for (const key in flash_data) {
-						if (Object.hasOwnProperty.call(flash_data, key)) {
-							const val = flash_data[key];
-							promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-								os.stoid + "/1/" + val.id,
-								{}
-							).then(res => {
-								if (res.data.code == 0) {
-									if (res.data.data <= 0) flash_data[key].status = 2;
-								};
-							});
-						}
-					}
-
-					Promise.all(promisies).then(() => {
-						var arr = new Array();
-						//--三个三个一组---
-						for (var i = 0; i < flash_data.length; i += 3) {
-							arr.push(flash_data.slice(i, i + 3));
-						}
-
-						th.setData({
-							saleGoods: arr
-						});
-					});
-
-
-
-				}
-			});
-
-		}
-
-
-
-
-
-
-
-
-
-		//优惠券要实时更新
-		getApp().getConfig2(function (e) {
-			var json_d = JSON.parse(e.switch_list);
-			th.setData({ is_closecoupon: json_d.is_closecoupon })
-			th.setData({ is_topstore: json_d.is_show_storeselect })
-			if (json_d.is_gz_h5) th.setData({ is_gz_h5: json_d.is_gz_h5 })
-		}, 1)
-
-		if (typeof this.getTabBar === 'function' && this.getTabBar()) {
-			var index = getApp().getPageIndex(this);
-			this.getTabBar().setData({
-				active: index //数字是当前页面在tabbar的索引
-			})
-
-
-			getApp().requestCardNum(this);
-		}
-
-		var th = this;
-
-		var show = getApp().globalData.isLoad_ad;
-
-		if (!show) {
-			setTimeout(function () {
-				full_screen.get_the_full_screen(th);
-			}, 800);
-			getApp().globalData.isLoad_ad = 1;
-			if (!th.data.f_hidden) {
-				setTimeout(function () {
-					th.setData({ f_hidden: 1 })
-					wx.hideLoading();
-				}, 960)
-			}
-		} else {
-			th.setData({ f_hidden: 1 })
-		}
-
-		setTimeout(function () {
-			const query = wx.createSelectorQuery();
-			query.select('#off_top').boundingClientRect();
-			query.exec((res) => {
-				if (res && res[0] && res[0].height > 0) {
-					th.setData({ is_ok_h5: 1 });
-				}
-			})
-		}, 3600);
-
-	},
-	//当隐藏的时候就关闭计时器
-	onHide: function () {
-		this.data.is_timer = 0;
-		if (this.data.pt_timer) clearInterval(this.data.pt_timer);
-		if (this.data.w_holiday_pop) clearInterval(this.data.w_holiday_pop);
-		if (this.data.full_screen) clearInterval(this.data.full_screen);
-		this.data.w_holiday_pop = 0;
-
-	},
-
-	//同步初始加载
-	async init_load() {
-		var th = this;
-		//因为营销版本的功能包含了自定义模板的功能，是同时的
-		//读取全局是否有弄自定义模板
-		await api.get_template_fir(o.stoid).then(res => {
-			var data = res.data.data;
-			if (data && data.length > 0) {
-				var temp_data = data[0];
-				var t_arr = JSON.parse(temp_data.json_str);
-        console.log('商品列表------------1')
-        console.log(t_arr)
-        console.log('商品列表------------2')
-				th.setData({
-					template_arr: t_arr,
-					isTemplate: 1,
-					bgcolor_t: temp_data.bkcolor
+            var arr = new Array();
+            //--三个三个一组---
+            for (var i = 0; i < pre_data.length; i += 3) {
+              arr.push(pre_data.slice(i, i + 3));
+            }
+            th.setData({
+              preGoods: arr
+            });
+          } else {
+            th.setData({
+              preGoods: null
+            });
+          }
+        }
+      })
+
+      // 获取幸运购活动列表
+      getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', {
+        data: {
+          store_id: getApp().globalData.setting.stoid,
+          is_end: 0,
+          timetype: 1,
+        }
+      }).then(res => {
+        if (res.data.code == 0) {
+          th.setData({
+            luckGo_list: res.data.data.pageData.slice(0, 3),
+          });
+        }
+      });
+
+      //-----秒杀-----
+      var flash_data = null;
+      var f_req = {
+        store_id: os.stoid,
+        timetype: 2,
+        is_end: 0,
+        is_show: 1,
+        pageSize: 9,
+        user_id: 0
+      };
+      if (user_id) f_req.user_id = user_id;
+      //--获取活动--
+      await getApp().request.promiseGet("/api/ms/flash_sale/spikepage", {
+        data: f_req,
+      }).then(res => {
+        var e = res;
+        if (e.data.code == 0) {
+          flash_data = e.data.data.pageData;
+          if (flash_data == null || flash_data.length <= 0) return false;
+
+          //当前时间戳
+          var nt = ut.gettimestamp();
+
+          flash_data.forEach(function (val, ind) {
+
+            if (val.user_price) val.price = val.user_price;
+            if (val.start_time > nt) {
+              flash_data[ind].status = 0;
+            } else if (val.end_time > nt) {
+              flash_data[ind].status = 1;
+            }
+
+            if (val.buy_num >= val.goods_num) {
+              flash_data[ind].status = 2;
+            }
+          });
+
+          var promisies = [];
+          for (const key in flash_data) {
+            if (Object.hasOwnProperty.call(flash_data, key)) {
+              const val = flash_data[key];
+              promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+                os.stoid + "/1/" + val.id,
+                {}
+              ).then(res => {
+                if (res.data.code == 0) {
+                  if (res.data.data <= 0) flash_data[key].status = 2;
+                };
+              });
+            }
+          }
+
+          Promise.all(promisies).then(() => {
+            var arr = new Array();
+            //--三个三个一组---
+            for (var i = 0; i < flash_data.length; i += 3) {
+              arr.push(flash_data.slice(i, i + 3));
+            }
+
+            th.setData({
+              saleGoods: arr
+            });
+          });
+
+
+
+        }
+      });
+
+    }
+
+
+
+
+
+
+
+
+
+    //优惠券要实时更新
+    getApp().getConfig2(function (e) {
+      var json_d = JSON.parse(e.switch_list);
+      th.setData({ is_closecoupon: json_d.is_closecoupon })
+      th.setData({ is_topstore: json_d.is_show_storeselect })
+      if (json_d.is_gz_h5) th.setData({ is_gz_h5: json_d.is_gz_h5 })
+    }, 1)
+
+    if (typeof this.getTabBar === 'function' && this.getTabBar()) {
+      var index = getApp().getPageIndex(this);
+      this.getTabBar().setData({
+        active: index //数字是当前页面在tabbar的索引
+      })
+
+
+      getApp().requestCardNum(this);
+    }
+
+    var th = this;
+
+    var show = getApp().globalData.isLoad_ad;
+
+    if (!show) {
+      setTimeout(function () {
+        full_screen.get_the_full_screen(th);
+      }, 800);
+      getApp().globalData.isLoad_ad = 1;
+      if (!th.data.f_hidden) {
+        setTimeout(function () {
+          th.setData({ f_hidden: 1 })
+          wx.hideLoading();
+        }, 960)
+      }
+    } else {
+      th.setData({ f_hidden: 1 })
+    }
+
+    setTimeout(function () {
+      const query = wx.createSelectorQuery();
+      query.select('#off_top').boundingClientRect();
+      query.exec((res) => {
+        if (res && res[0] && res[0].height > 0) {
+          th.setData({ is_ok_h5: 1 });
+        }
+      })
+    }, 3600);
+
+  },
+  //当隐藏的时候就关闭计时器
+  onHide: function () {
+    this.data.is_timer = 0;
+    if (this.data.pt_timer) clearInterval(this.data.pt_timer);
+    if (this.data.w_holiday_pop) clearInterval(this.data.w_holiday_pop);
+    if (this.data.full_screen) clearInterval(this.data.full_screen);
+    this.data.w_holiday_pop = 0;
+
+  },
+
+  //同步初始加载
+  async init_load() {
+    var th = this;
+    //因为营销版本的功能包含了自定义模板的功能，是同时的
+    //读取全局是否有弄自定义模板
+    await api.get_template_fir(o.stoid).then(res => {
+      var data = res.data.data;
+      if (data && data.length > 0) {
+        var temp_data = data[0];
+        var t_arr = JSON.parse(temp_data.json_str);
+
+        //增加判断是否是满屏
+        let is_full_screen_navigation = false
+        let is_full_screen_navigation_index = -1
+        let nav_but_color = "#32ACF9"
+        let left_arr = [] //左边悬浮
+        let right_arr=[] //右边悬浮
+        let floatw=null //悬浮窗口
+        if (t_arr) {
+          t_arr.map((item, index) => {
+            if (item && item.content && item.content.full_screen == 1 && !is_full_screen_navigation) {
+              is_full_screen_navigation = true
+              is_full_screen_navigation_index = index
+              try {
+                nav_but_color = item.content.data[0].but_color
+              } catch (error) { }
+            }
+            if (item.ename=='floatingWindow') {
+              floatw = item
+            }
+            if (item.ename=='backTop' || item.ename=='onlineService' || item.ename=='scan' || item.ename=='floatingWindow') {
+              right_arr.push(item)
+            }
+          })
+        }
+        if (floatw && floatw.content) {
+          let fi = right_arr.findIndex(ite=>ite.ename=='floatingWindow')
+          let datas={}
+          if (!floatw.content.data) { //兼容旧的悬浮窗口
+            datas.AppId= floatw.content.AppId
+           datas.feedId= floatw.content.feedId
+           datas.finderUserName= floatw.content.finderUserName
+           datas.img=floatw.content.img
+           datas.video_type= floatw.content.video_type
+           datas.wxapp_url= floatw.content.wxapp_url
+           datas.wxapp_url_title=floatw.content.wxapp_url_title
+           floatw.content.data=[datas]
+          }
+          if (floatw.content.loaction_index==1) {
+            right_arr.splice(fi,1,floatw)
+            // right_arr.unshift(floatw)
+          }else{
+            left_arr.unshift(floatw)
+            right_arr.splice(fi,1)
+          }
+        }
+        if (left_arr.length>0) {
+          let obj={
+            ename:'floatingBox',
+            content:left_arr,
+            loaction_index:0
+          }
+          t_arr.push(obj)
+        }
+        if (right_arr.length>0) {
+          let obj={
+            ename:'floatingBox',
+            content:right_arr,
+            loaction_index:1
+          }
+          t_arr.push(obj)
+        }
+
+
+        th.setData({
+          nav_but_color,
+          is_full_screen_navigation,
+          is_full_screen_navigation_index,
+          template_arr: t_arr,
+          isTemplate: 1,
+          bgcolor_t: temp_data.bkcolor
         });
-        setTimeout(()=>{
+        setTimeout(() => {
           th.newGoodsGroup()
-        },1000)
-				//---如果有设定顶部的颜色的时候--
-				if (temp_data.top_color && temp_data.top_color != 'null') {
-
-					var top_w_color = "#ffffff";
-					if (temp_data.top_word_color && temp_data.top_word_color == 'black') {
-						top_w_color = "#000000";
-					}
-					wx.setNavigationBarColor({
-						frontColor: top_w_color, // 必写项
-						backgroundColor: temp_data.top_color, // 必写项
-					})
-				}
-			}
-		})
-
-
-	},
-	//---读取数据内容---
-	async init_fir() {
-		console.log('init_fir');
-		var th = this;
-		//----广告----
-		var e = this;
-		await getApp().request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + o.stoid, {
-			data: {
-				enabled: 1
-			}
-		}).then(res => {
-
-			if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
-				var a = res.data.data.pageData;
-				var arr = new Array();
-				for (var i = 0; i < a.length; i++) {
-					var tt = {
-						'ad_code': o.imghost + a[i].ad_code,
-						'media_link': '',
-						'ad_weapplink': a[i].ad_weapplink
-					};
-					arr.push(tt);
-				}
-				if (arr.length > 0) e.setData({
-					banner: arr,
-				});
-
-				wx.stopPullDownRefresh();
-			}
-		})
-		let user_id = getApp().globalData.user_id;
+        }, 1000)
+        //---如果有设定顶部的颜色的时候--
+        if (temp_data.top_color && temp_data.top_color != 'null') {
+
+          var top_w_color = "#ffffff";
+          if (temp_data.top_word_color && temp_data.top_word_color == 'black') {
+            top_w_color = "#000000";
+          }
+          wx.setNavigationBarColor({
+            frontColor: top_w_color, // 必写项
+            backgroundColor: temp_data.top_color, // 必写项
+          })
+          th.setData({
+						// nav_frontColor: top_w_color, // 必写项
+						nav_backgroundColor: temp_data.top_color, // 必写项
+          })
+        }
+      }
+    })
+
+
+  },
+  //---读取数据内容---
+  async init_fir() {
+    console.log('init_fir');
+    var th = this;
+    //----广告----
+    var e = this;
+    await getApp().request.promiseGet("/api/weshop/ad/page?pid=2&store_id=" + o.stoid, {
+      data: {
+        enabled: 1
+      }
+    }).then(res => {
+
+      if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+        var a = res.data.data.pageData;
+        var arr = new Array();
+        for (var i = 0; i < a.length; i++) {
+          var tt = {
+            'ad_code': o.imghost + a[i].ad_code,
+            'media_link': '',
+            'ad_weapplink': a[i].ad_weapplink
+          };
+          arr.push(tt);
+        }
+        if (arr.length > 0) e.setData({
+          banner: arr,
+        });
+
+        wx.stopPullDownRefresh();
+      }
+    })
+    let user_id = getApp().globalData.user_id;
     //---首页广告-------
     await getApp().request.promiseGet("/api/weshop/ad/page?pids=300,301,302,303,304&store_id=" + o.stoid, {
-			data: {
-				enabled: 1
-			}
-		}).then(res => {
+      data: {
+        enabled: 1
+      }
+    }).then(res => {
       console.log('首页广告--------------------------');
       console.log(res);
-			if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
-				var a = res.data.data.pageData;
-				var obj = {};
-				for (var i = 0; i < a.length; i++) {
-					var tt = {
-						'ad_code': o.imghost + a[i].ad_code,
-						'media_link': '',
+      if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+        var a = res.data.data.pageData;
+        var obj = {};
+        for (var i = 0; i < a.length; i++) {
+          var tt = {
+            'ad_code': o.imghost + a[i].ad_code,
+            'media_link': '',
             'ad_weapplink': a[i].ad_weapplink,
-            'pid':a[i].pid
-					};
+            'pid': a[i].pid
+          };
           // arr.push(tt);
-          obj[a[i].pid]=tt
-				}
-				if (a.length > 0) e.setData({
-					mb_banner: obj,
-				});
-
-				wx.stopPullDownRefresh();
-			}
-		})
-
-
-		//----拼单-----
-		await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
-			data: {
-				store_id: os.stoid,
-				is_end: 0,
-				is_show: 1,
-				pageSize: 6,
-				user_id,
-			}
-		}).then(res => {
-			var e = res;
-			if (e.data.code == 0) {
-				var pd_data = e.data.data.pageData;
-
-				if (pd_data.length == 0) return;
-
-				//获取当前
-				var nt = ut.gettimestamp();
-				pd_data.forEach(function (val, ind) {
-					if (val.start_time > nt) pd_data[ind].status = 0;
-					else if (val.end_time > nt) pd_data[ind].status = 1;
-					if (val.buy_num >= val.goods_num) pd_data[ind].status = 2;
-				});
-
-				//获取当前时间，比较拼团中还在未开始
-				var timestamp = new Date().getTime();
-				var is_team_tepy;
-				for (var j = 0; j < pd_data.length; j++) {
-					pd_data[j].is_team_tepy = 1;
-					if (timestamp < pd_data[j].start_time * 1000) {
-						var is_team_tepy;
-						pd_data[j].is_team_tepy = 0;
-					}
-				}
-
-				var arr = new Array();
-				//--2个2个一组---
-				for (var i = 0; i < pd_data.length; i += 2) {
-
-					arr.push(pd_data.slice(i, i + 2));
-				}
-
-				th.setData({
-					pindGoods: arr
-				});
-				th.countDown2();
-			}
-		})
-
-		//------新品-------
-		await getApp().request.promiseGet("/api/weshop/goods/page?page=1", {
-			data: {
-				is_mainshow: 1,
-				isonsale: 1,
-				is_on_sale: 1,
-				store_id: o.stoid,
-				pageSize: 9,
-				is_new: 1,
-				orderField: "sort"
-			}
-		}).then(res => {
-			var e = res;
-			if (e.data.code == 0) {
-				var new_data = e.data.data.pageData;
-				var arr = new Array();
-				//--三个三个一组---
-				for (var i = 0; i < new_data.length; i += 3) {
-					arr.push(new_data.slice(i, i + 3));
-				}
-				th.setData({
-					newGoods: arr,
-				});
-			}
-		})
-
-		//------热卖-------
-		await getApp().request.promiseGet("/api/weshop/goods/page?page=1", {
-			data: {
-				is_mainshow: 1,
-				isonsale: 1,
-				is_on_sale: 1,
-				store_id: o.stoid,
-				pageSize: 9,
-				is_hot: 1,
-				orderField: "sort"
-			}
-		}).then(res => {
-			var e = res;
-			if (e.data.code == 0) {
-				var new_data = e.data.data.pageData;
-				var arr = new Array();
-				//--三个三个一组---
-				for (var i = 0; i < new_data.length; i += 3) {
-					arr.push(new_data.slice(i, i + 3));
-				}
-				console.log(arr);
-				th.setData({
-					hotGoods: arr,
-				});
-			}
-		})
-
-		//---调用信息---
-		// this.requestRecommend();
-		this.setData({
-			ishow: 1
-		});
-
-		//---先获取会员---
-		//t.getUserFir(function () {
-		if (getApp().globalData.user_id) {
-			th.is_festival();
-			var new_nav = th.data.new_nav;
-			if (new_nav == "") {
-				th.is_new();
-			}
-
-			// sty
-			setTimeout(function () {
-				if (getApp().globalData.user_id) getApp().requestCardNum(th);
-			}, 500)
-		}
-		//});
-
-		setTimeout(function () {
-			var goods_list = th.selectComponent("#goods_list"); //组件的id
-			goods_list.init();
-			goods_list.get_list();
-		}, 2000)
-	},
-
-	//--判断小程序是否过期--
-	setappdata: function (t) {
-		if (t && t.isout == 1)
-			wx.reLaunch({
-				url: "/packageD/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel,
-			});
-		if (t && t.isbuy == 0)
-			wx.reLaunch({
-				url: "/packageD/pages/error/error?msg=还未购买小程序",
-			});
-	},
-	//---加载更多是靠这个函数----
-	onReachBottom: function () {
+          obj[a[i].pid] = tt
+        }
+        if (a.length > 0) e.setData({
+          mb_banner: obj,
+        });
+
+        wx.stopPullDownRefresh();
+      }
+    })
+
+
+    //----拼单-----
+    await getApp().request.promiseGet("/api/weshop/teamlist/pageteam/2", {
+      data: {
+        store_id: os.stoid,
+        is_end: 0,
+        is_show: 1,
+        pageSize: 6,
+        user_id,
+      }
+    }).then(res => {
+      var e = res;
+      if (e.data.code == 0) {
+        var pd_data = e.data.data.pageData;
+
+        if (pd_data.length == 0) return;
+
+        //获取当前
+        var nt = ut.gettimestamp();
+        pd_data.forEach(function (val, ind) {
+          if (val.start_time > nt) pd_data[ind].status = 0;
+          else if (val.end_time > nt) pd_data[ind].status = 1;
+          if (val.buy_num >= val.goods_num) pd_data[ind].status = 2;
+        });
+
+        //获取当前时间，比较拼团中还在未开始
+        var timestamp = new Date().getTime();
+        var is_team_tepy;
+        for (var j = 0; j < pd_data.length; j++) {
+          pd_data[j].is_team_tepy = 1;
+          if (timestamp < pd_data[j].start_time * 1000) {
+            var is_team_tepy;
+            pd_data[j].is_team_tepy = 0;
+          }
+        }
+
+        var arr = new Array();
+        //--2个2个一组---
+        for (var i = 0; i < pd_data.length; i += 2) {
+
+          arr.push(pd_data.slice(i, i + 2));
+        }
+
+        th.setData({
+          pindGoods: arr
+        });
+        th.countDown2();
+      }
+    })
+
+    //------新品-------
+    await getApp().request.promiseGet("/api/weshop/goods/page?page=1", {
+      data: {
+        is_mainshow: 1,
+        isonsale: 1,
+        is_on_sale: 1,
+        store_id: o.stoid,
+        pageSize: 9,
+        is_new: 1,
+        orderField: "sort"
+      }
+    }).then(res => {
+      var e = res;
+      if (e.data.code == 0) {
+        var new_data = e.data.data.pageData;
+        var arr = new Array();
+        //--三个三个一组---
+        for (var i = 0; i < new_data.length; i += 3) {
+          arr.push(new_data.slice(i, i + 3));
+        }
+        th.setData({
+          newGoods: arr,
+        });
+      }
+    })
+
+    //------热卖-------
+    await getApp().request.promiseGet("/api/weshop/goods/page?page=1", {
+      data: {
+        is_mainshow: 1,
+        isonsale: 1,
+        is_on_sale: 1,
+        store_id: o.stoid,
+        pageSize: 9,
+        is_hot: 1,
+        orderField: "sort"
+      }
+    }).then(res => {
+      var e = res;
+      if (e.data.code == 0) {
+        var new_data = e.data.data.pageData;
+        var arr = new Array();
+        //--三个三个一组---
+        for (var i = 0; i < new_data.length; i += 3) {
+          arr.push(new_data.slice(i, i + 3));
+        }
+        console.log(arr);
+        th.setData({
+          hotGoods: arr,
+        });
+      }
+    })
+
+    //---调用信息---
+    // this.requestRecommend();
+    this.setData({
+      ishow: 1
+    });
+
+    //---先获取会员---
+    //t.getUserFir(function () {
+    if (getApp().globalData.user_id) {
+      th.is_festival();
+      var new_nav = th.data.new_nav;
+      if (new_nav == "") {
+        th.is_new();
+      }
+
+      // sty
+      setTimeout(function () {
+        if (getApp().globalData.user_id) getApp().requestCardNum(th);
+      }, 500)
+    }
+    //});
+
+    setTimeout(function () {
+      var goods_list = th.selectComponent("#goods_list"); //组件的id
+      goods_list.init();
+      goods_list.get_list();
+    }, 2000)
+  },
+
+  //--判断小程序是否过期--
+  setappdata: function (t) {
+    if (t && t.isout == 1)
+      wx.reLaunch({
+        url: "/packageD/pages/error/error?msg=该商城已到期，暂停浏览！\r\n可联系:" + getApp().globalData.config.store_tel,
+      });
+    if (t && t.isbuy == 0)
+      wx.reLaunch({
+        url: "/packageD/pages/error/error?msg=还未购买小程序",
+      });
+  },
+  //---加载更多是靠这个函数----
+  onReachBottom: function () {
     console.log('下拉加载2');
-		var goods_list = this.selectComponent("#goods_list"); //组件的id
-		if (goods_list) goods_list.get_list();
+    var goods_list = this.selectComponent("#goods_list"); //组件的id
+    if (goods_list) goods_list.get_list();
-		if (getApp().globalData.func_list) {
-			for (let i in getApp().globalData.func_list) {
-				let item = getApp().globalData.func_list[i];
-				item.re_show();
-			}
+    if (getApp().globalData.func_list) {
+      for (let i in getApp().globalData.func_list) {
+        let item = getApp().globalData.func_list[i];
+        item.re_show();
+      }
     }
-    
+
     //自定义时商品自动加载更多
     let goodsGroupArr = this.data.goodsGroupArr
-    if (this.data.isTemplate && goodsGroupArr.length >0) {
-        goodsGroupArr.map(item=>{
-           if(this[item]) this[item].automore()
-        })
+    if (this.data.isTemplate && goodsGroupArr.length > 0) {
+      goodsGroupArr.map(item => {
+        if (this[item]) this[item].automore()
+      })
     }
-	},
-
-	onPullDownRefresh: function (e) {
-		this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(),
-			this.requestRecommend();
-	},
-	requestRecommend() { },
-	requestHomePage() { },
-
-	onUnload: function () {
-		this.destroyActivityTimer();
-	},
-	setCountTime: function (e) {
-		e.diffTime || (e.diffTime = new Date().getTime() - 1e3 * e.server_time), this.setData({
-			"sale.diffTime": e.diffTime
-		}), this.setData({
-			"sale.good": e.flash_sale_goods[0]
-		}), this.destroyActivityTimer(), this.createActivityTimer();
-	},
-	createActivityTimer: function () {
-		var e = this.data.sale,
-			t = this;
-		this.data.timer = setInterval(function () {
-			var a = 1e3 * e.good.end_time - new Date().getTime() + e.diffTime,
-				o = i.transTime(a);
-			a <= 0 ? t.requestHomePage() : t.setData({
-				"sale.countTime": o
-			});
-		}, 1e3);
-	},
-	destroyActivityTimer: function () {
-		this.data.timer && (clearInterval(this.data.timer), this.data.timer = null);
-	},
-	onPageScroll: function (e) {
-		this.data.scrollTop = e.scrollTop;
-		var t = getCurrentPages();
-		"pages/index/index/index" == t[t.length - 1].route;
-		/*--(e.scrollTop > 10 ? wx.setNavigationBarColor({
-		  frontColor: "#ffffff",
-		  backgroundColor: "#f95959"
-		}) : wx.setNavigationBarColor({
-		  frontColor: "#000000",
-		  backgroundColor: "#eeeeee"
-		}));--*/
-	},
-	jumpSearch: function () {
-		wx.navigateTo({
-			url: "/packageG/pages/goods/search/search"
-		});
-	},
-	onShareAppMessage: function (e) {
-		getApp().globalData.no_clear = 1;
-		var url = "/pages/index/index/index";
-		var userInfo = getApp().globalData.userInfo;
-		//是分销商才带
-		if (userInfo) {
+  },
+
+  onPullDownRefresh: function (e) {
+    this.data.recommend = null, this.data.currentPage = 1, n.resetConfig(), this.requestHomePage(),
+      this.requestRecommend();
+  },
+  requestRecommend() { },
+  requestHomePage() { },
+
+  onUnload: function () {
+    this.destroyActivityTimer();
+  },
+  setCountTime: function (e) {
+    e.diffTime || (e.diffTime = new Date().getTime() - 1e3 * e.server_time), this.setData({
+      "sale.diffTime": e.diffTime
+    }), this.setData({
+      "sale.good": e.flash_sale_goods[0]
+    }), this.destroyActivityTimer(), this.createActivityTimer();
+  },
+  createActivityTimer: function () {
+    var e = this.data.sale,
+      t = this;
+    this.data.timer = setInterval(function () {
+      var a = 1e3 * e.good.end_time - new Date().getTime() + e.diffTime,
+        o = i.transTime(a);
+      a <= 0 ? t.requestHomePage() : t.setData({
+        "sale.countTime": o
+      });
+    }, 1e3);
+  },
+  destroyActivityTimer: function () {
+    this.data.timer && (clearInterval(this.data.timer), this.data.timer = null);
+  },
+  onPageScroll: function (e) {
+    //满屏模式监听
+    let num = e.scrollTop
+    if (this.data.is_full_screen_navigation) {
+      let nav_type = this.data.nav_type
+      if (num >= 100 && nav_type) {
+        this.setData({
+          nav_type: 0,
+          searchbox_transparent: 0,
+          nav_frontColor: '#000'
+        })
+        // this.data.nav_type = 0
+      }
+      if (num < 100 && !nav_type) {
+        this.setData({
+          nav_type: 1,
+          searchbox_transparent: 1,
+          nav_frontColor: '#000'
+        })
+        // this.data.nav_type = 1
+      }
+    }
+    
+    //-----------end-------
+    //是否显示置顶
+    if (num > 400) {
+      this.setData({
+        is_show_top:1
+      })
+    }else{
+      this.setData({
+        is_show_top:0
+      })
+    }
+    //----end------
+
+    this.data.scrollTop = e.scrollTop;
+    var t = getCurrentPages();
+    "pages/index/index/index" == t[t.length - 1].route;
+    /*--(e.scrollTop > 10 ? wx.setNavigationBarColor({
+      frontColor: "#ffffff",
+      backgroundColor: "#f95959"
+    }) : wx.setNavigationBarColor({
+      frontColor: "#000000",
+      backgroundColor: "#eeeeee"
+    }));--*/
+  },
+  jumpSearch: function () {
+    wx.navigateTo({
+      url: "/packageG/pages/goods/search/search"
+    });
+  },
+  onShareAppMessage: function (e) {
+    getApp().globalData.no_clear = 1;
+    var url = "/pages/index/index/index";
+    var userInfo = getApp().globalData.userInfo;
+    //是分销商才带
+    if (userInfo) {
       url += "?first_leader=" + userInfo.user_id;
       //群id分享
       if (getApp().globalData.groupchat_id) {
-        url+="&groupchat_id="+getApp().globalData.groupchat_id
+        url += "&groupchat_id=" + getApp().globalData.groupchat_id
       }
-		}else{
+    } else {
       //群id分享
       if (getApp().globalData.groupchat_id) {
-        url+="?groupchat_id="+getApp().globalData.groupchat_id
+        url += "?groupchat_id=" + getApp().globalData.groupchat_id
       }
     }
-		console.log("---首页---分享--");
-		var title = "商城首页"
-		//分享
-		if (getApp().globalData.config && getApp().globalData.config.store_name) {
-			title = getApp().globalData.config.store_name;
-		} else if (getApp().globalData.setting.appName) {
-			title = getApp().globalData.setting.appName;
+    console.log("---首页---分享--");
+    var title = "商城首页"
+    //分享
+    if (getApp().globalData.config && getApp().globalData.config.store_name) {
+      title = getApp().globalData.config.store_name;
+    } else if (getApp().globalData.setting.appName) {
+      title = getApp().globalData.setting.appName;
     }
-    
- 
-
-		var ob = {
-			title: title,
-			path: url,
-		};
-		console.log(ob);
-		return ob;
-	},
-
-	//图片失败，默认图片
-	bind_bnerr: function (e) {
-		var _errImg = e.target.dataset.errorimg;
-		var _errObj = {};
-		_errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg";
-		this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-	},
-
-	//图片失败，默认图片
-	bind_bnerr2: function (e) {
-		var _errImg = e.target.dataset.errorimg;
-		var _errurl = e.target.dataset.url;
-		var _errObj = {};
-		_errObj[_errImg] = "/miniapp/images/default_g_img.gif";
-		this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-
-	},
-	//图片失败，默认图片
-	bind_bnerr3: function (e) {
-		var _errImg = e.target.dataset.errorimg;
-		var _Img = e.target.dataset.img;
-		if (_Img != undefined) {
-			var _errObj = {};
-			_errObj[_errImg] = "/public/images/default_goods_image_240.gif";
-			this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
-		}
-	},
-
-
-	//秒杀倒计时
-	//---小于10的格式化函数----
-	timeFormat(param) {
-		return param < 10 ? '0' + param : param;
-	},
-
-	//----秒杀倒计时函数-----
-	countDown() {
-		if (!this.data.is_timer) return false;
-		var th = this;
-		// 获取当前时间，同时得到活动结束时间数组
-		var newTime = ut.gettimestamp();
-		var List = this.data.saleGoods;
-		for (var j = 0; j < List.length; j++) {
-			var endTimeList = List[j];
-			// 对结束时间进行处理渲染到页面
-			for (var i = 0; i < endTimeList.length; i++) {
-				var o = endTimeList[i];
-				var endTime = o.end_time
-				if (o.status == 0) endTime = o.start_time
-
-				var obj = null;
-				// 如果活动未结束，对时间进行处理
-				if (endTime - newTime > 0) {
-					var time = (endTime - newTime);
-					// 获取天、时、分、秒
-					var day = parseInt(time / (60 * 60 * 24));
-					var hou = parseInt(time % (60 * 60 * 24) / 3600);
-					var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
-					var 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)
-					}
-				} else {
-					//活动已结束，全部设置为'00'
-					obj = {
-						day: '00',
-						hou: '00',
-						min: '00',
-						sec: '00'
-					}
-				}
-				var txt = "saleGoods[" + j + "][" + i + "].djs";
-				th.setData({
-					[txt]: obj
-				});
-			}
-
-		}
-		setTimeout(th.countDown, 1000);
-	},
-
-	//----拼单倒计时函数-----
-	countDown2() {
-		if (!this.data.is_timer) return false;
-
-		var th = this;
-		// 获取当前时间，同时得到活动结束时间数组
-		var newTime = ut.gettimestamp();
-		var List = this.data.pindGoods;
-		for (var j = 0; j < List.length; j++) {
-			var endTimeList = List[j];
-			// 对结束时间进行处理渲染到页面
-			for (var i = 0; i < endTimeList.length; i++) {
-				var o = endTimeList[i];
-				var endTime = o.end_time;
-				if (o.status == 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)
-					}
-				} else {
-					//活动已结束，全部设置为'00'
-					obj = {
-						day: '00',
-						hou: '00',
-						min: '00',
-						sec: '00'
-					}
-				}
-				var txt = "pindGoods[" + j + "][" + i + "].djs";
-				th.setData({
-					[txt]: obj
-				});
-			}
-		}
-		setTimeout(th.countDown2, 1000);
-	},
-
-	bannerSwiperChange: function (e) {
-		var index = e.detail.current;
-		this.setData({
-			banner_index: index
-		});
-	},
-	flashSwiperChange: function (e) {
-		var index = e.detail.current;
-		this.setData({
-			flash_index: index
-		});
-	},
-	ptSwiperChange: function (e) {
-		var index = e.detail.current;
-		this.setData({
-			pt_index: index
-		});
-	},
-
-	Interval_pt() {
-		var th = this;
-		this.data.pt_timer = setInterval(function () {
-			var item = ut.get_rand_item(th.data.pt_timer_arr);
-			th.setData({
-				pt_timer_active: 1,
-				pt_timer_item: item
-			});
-			setTimeout(function () {
-				th.setData({
-					pt_timer_active: 0
-				});
-			}, 1500)
-		}, 4000);
-	},
-
-
-	//---扫一扫的函数---
-	getScancode: function () {
-		var _this = this;
-		getApp().globalData.no_clear = 1;
-		// 允许从相机和相册扫码
-		wx.scanCode({
-			success: (res) => {
-				var result = res.result;
-				wx.navigateTo({
-					url: "/packageG/pages/goods/search/search?s_key=" + result,
-				});
-			}
-		})
-	},
- //广告跳转
-  go_mb(e){
-    let url=e.currentTarget.dataset.url
+
+
+
+    var ob = {
+      title: title,
+      path: url,
+    };
+    console.log(ob);
+    return ob;
+  },
+
+  //图片失败，默认图片
+  bind_bnerr: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errObj = {};
+    _errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg";
+    this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+  },
+
+  //图片失败，默认图片
+  bind_bnerr2: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _errurl = e.target.dataset.url;
+    var _errObj = {};
+    _errObj[_errImg] = "/miniapp/images/default_g_img.gif";
+    this.setData(_errObj); //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+
+  },
+  //图片失败，默认图片
+  bind_bnerr3: function (e) {
+    var _errImg = e.target.dataset.errorimg;
+    var _Img = e.target.dataset.img;
+    if (_Img != undefined) {
+      var _errObj = {};
+      _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
+      this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
+    }
+  },
+
+
+  //秒杀倒计时
+  //---小于10的格式化函数----
+  timeFormat(param) {
+    return param < 10 ? '0' + param : param;
+  },
+
+  //----秒杀倒计时函数-----
+  countDown() {
+    if (!this.data.is_timer) return false;
+    var th = this;
+    // 获取当前时间，同时得到活动结束时间数组
+    var newTime = ut.gettimestamp();
+    var List = this.data.saleGoods;
+    for (var j = 0; j < List.length; j++) {
+      var endTimeList = List[j];
+      // 对结束时间进行处理渲染到页面
+      for (var i = 0; i < endTimeList.length; i++) {
+        var o = endTimeList[i];
+        var endTime = o.end_time
+        if (o.status == 0) endTime = o.start_time
+
+        var obj = null;
+        // 如果活动未结束，对时间进行处理
+        if (endTime - newTime > 0) {
+          var time = (endTime - newTime);
+          // 获取天、时、分、秒
+          var day = parseInt(time / (60 * 60 * 24));
+          var hou = parseInt(time % (60 * 60 * 24) / 3600);
+          var min = parseInt(time % (60 * 60 * 24) % 3600 / 60);
+          var 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)
+          }
+        } else {
+          //活动已结束，全部设置为'00'
+          obj = {
+            day: '00',
+            hou: '00',
+            min: '00',
+            sec: '00'
+          }
+        }
+        var txt = "saleGoods[" + j + "][" + i + "].djs";
+        th.setData({
+          [txt]: obj
+        });
+      }
+
+    }
+    setTimeout(th.countDown, 1000);
+  },
+
+  //----拼单倒计时函数-----
+  countDown2() {
+    if (!this.data.is_timer) return false;
+
+    var th = this;
+    // 获取当前时间，同时得到活动结束时间数组
+    var newTime = ut.gettimestamp();
+    var List = this.data.pindGoods;
+    for (var j = 0; j < List.length; j++) {
+      var endTimeList = List[j];
+      // 对结束时间进行处理渲染到页面
+      for (var i = 0; i < endTimeList.length; i++) {
+        var o = endTimeList[i];
+        var endTime = o.end_time;
+        if (o.status == 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)
+          }
+        } else {
+          //活动已结束，全部设置为'00'
+          obj = {
+            day: '00',
+            hou: '00',
+            min: '00',
+            sec: '00'
+          }
+        }
+        var txt = "pindGoods[" + j + "][" + i + "].djs";
+        th.setData({
+          [txt]: obj
+        });
+      }
+    }
+    setTimeout(th.countDown2, 1000);
+  },
+
+  bannerSwiperChange: function (e) {
+    var index = e.detail.current;
+    this.setData({
+      banner_index: index
+    });
+  },
+  flashSwiperChange: function (e) {
+    var index = e.detail.current;
+    this.setData({
+      flash_index: index
+    });
+  },
+  ptSwiperChange: function (e) {
+    var index = e.detail.current;
+    this.setData({
+      pt_index: index
+    });
+  },
+
+  Interval_pt() {
+    var th = this;
+    this.data.pt_timer = setInterval(function () {
+      var item = ut.get_rand_item(th.data.pt_timer_arr);
+      th.setData({
+        pt_timer_active: 1,
+        pt_timer_item: item
+      });
+      setTimeout(function () {
+        th.setData({
+          pt_timer_active: 0
+        });
+      }, 1500)
+    }, 4000);
+  },
+
+
+  //---扫一扫的函数---
+  getScancode: function () {
+    var _this = this;
+    getApp().globalData.no_clear = 1;
+    // 允许从相机和相册扫码
+    wx.scanCode({
+      success: (res) => {
+        var result = res.result;
+        wx.navigateTo({
+          url: "/packageG/pages/goods/search/search?s_key=" + result,
+        });
+      }
+    })
+  },
+  //广告跳转
+  go_mb(e) {
+    let url = e.currentTarget.dataset.url
+    getApp().goto(url);
+  },
+
+  //跳转到分类
+  go_cate: function () {
+    getApp().goto("/pages/goods/categoryList/categoryList");
+  },
+
+  // 幸运购跳转
+  go_url: function (e) {
+
+    var url = e.currentTarget.dataset.url;
     getApp().goto(url);
+
+  }, //
+
+  bind_bnerr_icon: function (e) {
+    var def = "/miniapp/images/no_cate_def.png";
+    var _err = e.currentTarget.dataset.err;
+    var ob = {};
+    ob[_err] = def;
+    this.setData(ob);
+  },
+
+  //跳转到分类的商品列表
+  go_cate2: function (t) {
+    var cid = t.currentTarget.dataset.cid;
+    var pid = t.currentTarget.dataset.pid;
+    var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid;
+    wx.navigateTo({
+      url: lurl
+    });
+  },
+  new_nav: function (e) {
+    var th = this;
+    var new_nav = th.data.new_nav;
+    getApp().goto(new_nav);
+  },
+  //跳转到权益
+  go_quanyi: function (t) {
+    var user_info = getApp().globalData.userInfo;
+    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+      wx.navigateTo({
+        url: '/packageE/pages/togoin/togoin',
+        //url: '/pages/getphone/getphone',
+      })
+      return false;
+    }
+    getApp().goto("/pages/user/userqy/userqy");
+  },
+
+  imageLoad: function (e) {
+    var imgwidth = e.detail.width;
+    var imgheight = e.detail.height;
+    //宽高比
+    var ratio = imgwidth / imgheight;
+    //计算的高度值
+    var viewHeight = 715 / ratio;
+    if (this.data.max_sw_height < viewHeight) this.setData({
+      max_sw_height: viewHeight
+    });
+  },
+  //判断该用户是否是新会员
+  is_new: function () {
+    var th = this;
+    wx.hideLoading();
+    getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", {
+      data: {
+        storeId: os.stoid,
+        userId: d.user_id
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var actid = res.data.data.id; //活动id
+        var giftBagId = res.data.data.giftBagId; //礼包id
+        var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId;
+        var new_image = res.data.data.imageurl;
+        var swiperimage = th.data.swiperimage;
+        var img = {
+          image: "/miniapp/images/newpeople/newpeople.png",
+          nav_url: new_nav
+        }
+        swiperimage.unshift(img);
+        th.setData({
+          swiperimage: swiperimage,
+          new_image: new_image,
+          new_nav: new_nav
+        })
+
+        getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/bound/judge", {
+          data: {
+            storeId: o.stoid,
+            userId: d.user_id
+          }
+        }).then(res => {
+          if (res.data.code == 0) {
+            th.setData({
+              is_disgraceful: 1
+            })
+          } else {
+            th.check_holiday_pop(); //节日的弹窗
+          }
+
+        })
+      } else {
+        th.check_holiday_pop(); //节日的弹窗
+      }
+
+    })
+
   },
-	//跳转到分类
-	go_cate: function () {
-		getApp().goto("/pages/goods/categoryList/categoryList");
-	},
-
-	// 幸运购跳转
-	go_url: function (e) {
-
-		var url = e.currentTarget.dataset.url;
-		getApp().goto(url);
-
-	}, //
-
-	bind_bnerr_icon: function (e) {
-		var def = "/miniapp/images/no_cate_def.png";
-		var _err = e.currentTarget.dataset.err;
-		var ob = {};
-		ob[_err] = def;
-		this.setData(ob);
-	},
-
-	//跳转到分类的商品列表
-	go_cate2: function (t) {
-		var cid = t.currentTarget.dataset.cid;
-		var pid = t.currentTarget.dataset.pid;
-		var lurl = "/pages/goods/goodsList/goodsList?cat_id=" + cid + "&pid=" + pid;
-		wx.navigateTo({
-			url: lurl
-		});
-	},
-	new_nav: function (e) {
-		var th = this;
-		var new_nav = th.data.new_nav;
-		getApp().goto(new_nav);
-	},
-	//跳转到权益
-	go_quanyi: function (t) {
-		var user_info = getApp().globalData.userInfo;
-		if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-			wx.navigateTo({
-				url: '/packageE/pages/togoin/togoin',
-				//url: '/pages/getphone/getphone',
-			})
-			return false;
-		}
-		getApp().goto("/pages/user/userqy/userqy");
-	},
-
-	imageLoad: function (e) {
-		var imgwidth = e.detail.width;
-		var imgheight = e.detail.height;
-		//宽高比
-		var ratio = imgwidth / imgheight;
-		//计算的高度值
-		var viewHeight = 715 / ratio;
-		if (this.data.max_sw_height < viewHeight) this.setData({
-			max_sw_height: viewHeight
-		});
-	},
-	//判断该用户是否是新会员
-	is_new: function () {
-		var th = this;
-		wx.hideLoading();
-		getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/judge", {
-			data: {
-				storeId: os.stoid,
-				userId: d.user_id
-			}
-		}).then(res => {
-			if (res.data.code == 0) {
-				var actid = res.data.data.id; //活动id
-				var giftBagId = res.data.data.giftBagId; //礼包id
-				var new_nav = "/pages/giftpack/newvipgift/newvipgift?actId=" + actid + '&' + 'actType=' + 1 + '&' + 'giftBagId=' + giftBagId;
-				var new_image = res.data.data.imageurl;
-				var swiperimage = th.data.swiperimage;
-				var img = {
-					image: "/miniapp/images/newpeople/newpeople.png",
-					nav_url: new_nav
-				}
-				swiperimage.unshift(img);
-				th.setData({
-					swiperimage: swiperimage,
-					new_image: new_image,
-					new_nav: new_nav
-				})
-
-				getApp().request.promiseGet("/api/weshop/marketing/newpeople/act/bound/judge", {
-					data: {
-						storeId: o.stoid,
-						userId: d.user_id
-					}
-				}).then(res => {
-					if (res.data.code == 0) {
-						th.setData({
-							is_disgraceful: 1
-						})
-					} else {
-						th.check_holiday_pop(); //节日的弹窗
-					}
-
-				})
-			} else {
-				th.check_holiday_pop(); //节日的弹窗
-			}
-
-		})
-
-	},
-
-	is_festival: function (e) {
-		var th = this;
-		var url = "/api/weshop/marketing/holiday/act/judge";
-		getApp().request.promiseGet(url, {
-			data: {
-				storeId: os.stoid,
-				userId: d.user_id
-			}
-		}).then(res => {
-			if (res.data.code == 0) {
-				var actid = res.data.data.id; //活动id
-				var giftBagId = res.data.data.gifBagId; //礼包id
-				var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId;
-				var swiperimage = th.data.swiperimage;
-				var actBoundImg = res.data.data.actBoundImg ? res.data.data.actBoundImg : '/miniapp/images/default_g_img.gif';
-
-				th.data.holiday_image = res.data.data.actImg;
-				th.data.holiday_url = nav_url;
-
-				var img = {
-					image: actBoundImg,
-					nav_url: nav_url,
-					id: res.data.data.id,
-					type: 'festival'
-				}
-
-				for (var i in swiperimage) {
-					var item = swiperimage[i];
-					if (item.id == img.id && item.type == img.type) {
-						return false;
-					}
-				}
-
-				swiperimage.unshift(img);
-				th.setData({
-					swiperimage: swiperimage,
-					new_nav: nav_url
-				})
-			}
-		})
-	},
-
-	//弹出节日有礼
-	check_holiday_pop: function () {
-		var th = this;
-		getApp().waitfor2(th, 'w_holiday_pop', 'holiday_image', function () {
-			//等到结果才显示
-			if (th.data.holiday_image) {
-				th.setData({
-					new_image: th.data.holiday_image,
-					new_nav: th.data.holiday_url,
-					is_disgraceful: 1
-				})
-			}
-		})
-	},
-
-	go_ad: function (e) {
-		var url = e.currentTarget.dataset.url;
-		if (!url || url == '') return;
-		if (url[0] != '/') url = '/' + url;
-		getApp().goto(url);
-	},
-
-	//导航跳转
-	nav_goto: function (e) {
-		var url = e.currentTarget.dataset.url;
-		if (!url || url == '') return;
-		if (url[0] != '/') url = '/' + url;
-		getApp().goto(url);
-		if (this.data.showHongbao) {
-			this.setData({
-				showHongbao: false,
-				showHongbaoSmall: true, //显示抢红包小图标
-			});
-		}
-	},
-
-	//----跳转到搭配购买----
-	go_test: function () {
-		wx.navigateTo({ url: "/packageA/pages/goods_share/goods_share", })
-	},
-	onShareTimeline() {
-        getApp().globalData.no_clear=1;
-        var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
-        if (!store_name){
-			store_name = getApp().globalData.setting.appName;
-		}
-        var user_id=getApp().globalData.user_id;
-        if(!user_id) user_id=0;
-        var url=''
-        //群id分享
-        if (getApp().globalData.groupchat_id) {
-          url+="&groupchat_id="+getApp().globalData.groupchat_id
+  is_festival: function (e) {
+    var th = this;
+    var url = "/api/weshop/marketing/holiday/act/judge";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: os.stoid,
+        userId: d.user_id
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        var actid = res.data.data.id; //活动id
+        var giftBagId = res.data.data.gifBagId; //礼包id
+        var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId;
+        var swiperimage = th.data.swiperimage;
+        var actBoundImg = res.data.data.actBoundImg ? res.data.data.actBoundImg : '/miniapp/images/default_g_img.gif';
+
+        th.data.holiday_image = res.data.data.actImg;
+        th.data.holiday_url = nav_url;
+
+        var img = {
+          image: actBoundImg,
+          nav_url: nav_url,
+          id: res.data.data.id,
+          type: 'festival'
         }
-        return {
-            title: '首页-' + '-' + store_name,
-            query: 'first_leader='+user_id+url
+
+        for (var i in swiperimage) {
+          var item = swiperimage[i];
+          if (item.id == img.id && item.type == img.type) {
+            return false;
+          }
         }
-    },
-	// 关闭首页抢红包主弹窗，显示侧边栏抢红包小图标
-	closeHongbao() {
-		this.setData({
-			showHongbao: false, //关闭抢红包主弹窗
-			showHongbaoSmall: true, //显示抢红包小图标
-		});
-	},
-
-	/*-- 全屏广告 --*/
-	close_full_screen() {
-		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.close_full_screen();
-	},
-
-	go_pre: function (e) {
-		var userInfo = getApp().globalData.userInfo;
-		if (!userInfo) {
-			getApp().goto("/packageE/pages/togoin/togoin");
-			return false;
-		}
-		var url = e.currentTarget.dataset.url;
-		getApp().goto(url);
-	},
+        swiperimage.unshift(img);
+        th.setData({
+          swiperimage: swiperimage,
+          new_nav: nav_url
+        })
+      }
+    })
+  },
+
+  //弹出节日有礼
+  check_holiday_pop: function () {
+    var th = this;
+    getApp().waitfor2(th, 'w_holiday_pop', 'holiday_image', function () {
+      //等到结果才显示
+      if (th.data.holiday_image) {
+        th.setData({
+          new_image: th.data.holiday_image,
+          new_nav: th.data.holiday_url,
+          is_disgraceful: 1
+        })
+      }
+    })
+  },
+
+  go_ad: function (e) {
+    var url = e.currentTarget.dataset.url;
+    if (!url || url == '') return;
+    if (url[0] != '/') url = '/' + url;
+    getApp().goto(url);
+  },
+
+  //导航跳转
+  nav_goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    if (!url || url == '') return;
+    if (url[0] != '/') url = '/' + url;
+    getApp().goto(url);
+    if (this.data.showHongbao) {
+      this.setData({
+        showHongbao: false,
+        showHongbaoSmall: true, //显示抢红包小图标
+      });
+    }
+  },
+
+  //----跳转到搭配购买----
+  go_test: function () {
+    wx.navigateTo({ url: "/packageA/pages/goods_share/goods_share", })
+  },
+  onShareTimeline() {
+    getApp().globalData.no_clear = 1;
+    var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : '';
+    if (!store_name) {
+      store_name = getApp().globalData.setting.appName;
+    }
+    var user_id = getApp().globalData.user_id;
+    if (!user_id) user_id = 0;
+    var url = ''
+    //群id分享
+    if (getApp().globalData.groupchat_id) {
+      url += "&groupchat_id=" + getApp().globalData.groupchat_id
+    }
+    return {
+      title: '首页-' + '-' + store_name,
+      query: 'first_leader=' + user_id + url
+    }
+  },
+
+  // 关闭首页抢红包主弹窗，显示侧边栏抢红包小图标
+  closeHongbao() {
+    this.setData({
+      showHongbao: false, //关闭抢红包主弹窗
+      showHongbaoSmall: true, //显示抢红包小图标
+    });
+  },
+
+  /*-- 全屏广告 --*/
+  close_full_screen() {
+    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.close_full_screen();
+  },
+
+  go_pre: function (e) {
+    var userInfo = getApp().globalData.userInfo;
+    if (!userInfo) {
+      getApp().goto("/packageE/pages/togoin/togoin");
+      return false;
+    }
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
+  },
   //视频号跳转
-  nv_void(){
+  nv_void() {
     // getApp().openChannelsActivity()
     wx.getChannelsLiveInfo({
-      finderUserName:'sphYA5FuPCZxHaw',
-      success:(res)=>{
+      finderUserName: 'sphYA5FuPCZxHaw',
+      success: (res) => {
         console.log(res)
       },
-      fail:(error)=>{
+      fail: (error) => {
         console.log(error)
       }
     })
   },
-  getchir(){
+  getchir() {
     const child = this.selectComponent('.goodsg');
     console.log('子组件--------111111------')
     console.log(child)
@@ -2,6 +2,7 @@
     "usingComponents": {
         "goods_recommend":"/components/goods_list/goods_list",
         "nav": "/components/diy_nav/diy_nav",
+        "top_nav": "/components/diy_top_nav/diy_top_nav",
         "advertising":"/components/diy_advertising/diy_advertising",
         "groupbuy": "/components/diy_groupbuy/diy_groupbuy",
         "goodsGroup":  "/components/diy_goodsGroup/diy_goodsGroup",
@@ -28,8 +29,10 @@
 		"mp-dialog": "weui-miniprogram/dialog/dialog",
     "mp-sticky": "/components/mp-sticky/mp-sticky",
     "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow",
+    "floatingBox": "/components/diy_floatingBox/diy_floatingBox",
 		"privacy_pop": "/components/privacy_pop/privacy_pop"
     },
   "enablePullDownRefresh": false,
-  "onReachBottomDistance":300
+  "onReachBottomDistance":300,
+  "navigationStyle":"custom"
 }
 \ No newline at end of file
@@ -23,6 +23,8 @@
   </block>
   <view class="top-bar">
+    <top_nav nav_type="{{0}}" nav_frontColor="{{'#fff'}}" nav_backgroundColor="{{'#ff7295'}}" nav_title="{{nav_title}}"></top_nav>
+
     <!-- 顶部关注公众号 -->
     <view id="off_top" wx:if="{{is_gz_h5}}">
       <official-account></official-account>
@@ -48,6 +50,7 @@
       </view>
     </view>
   </view>
+  <top_nav nav_type="{{-1}}" nav_frontColor="{{nav_frontColor}}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{nav_title}}"></top_nav>
   <!-- 如果有关注，要顶开位置，不能注释 -->
   <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px;;flex-shrink:0"></view>
@@ -137,23 +140,23 @@
     <view class="mb_box">
       <view class="mb_top">
         <view class="mb_top_item" data-url="{{mb_banner['300'].ad_weapplink}}" wx:if="{{mb_banner['300']}}" catchtap="go_mb">
-            <image src="{{mb_banner['300'].ad_code}}" style="max-width: 100%;max-height: 360rpx;"></image>
+          <image src="{{mb_banner['300'].ad_code}}" style="max-width: 100%;max-height: 360rpx;"></image>
         </view>
         <view class="mb_top_item">
           <view wx:if="{{mb_banner['301']}}" data-url="{{mb_banner['301'].ad_weapplink}}" catchtap="go_mb">
-              <image src="{{mb_banner['301'].ad_code}}" style="max-width: 100%;max-height: 180rpx;"></image>
+            <image src="{{mb_banner['301'].ad_code}}" style="max-width: 100%;max-height: 180rpx;"></image>
           </view>
           <view wx:if="{{mb_banner['302']}}" data-url="{{mb_banner['302'].ad_weapplink}}" catchtap="go_mb">
-              <image src="{{mb_banner['302'].ad_code}}" style="max-width: 100%;max-height: 180rpx;"></image>
+            <image src="{{mb_banner['302'].ad_code}}" style="max-width: 100%;max-height: 180rpx;"></image>
           </view>
         </view>
       </view>
       <view class="mb_bottom">
         <view wx:if="{{mb_banner['303']}}" data-url="{{mb_banner['303'].ad_weapplink}}" catchtap="go_mb">
-            <image src="{{mb_banner['303'].ad_code}}" style="max-width: 100%;max-height:200rpx;"></image>
+          <image src="{{mb_banner['303'].ad_code}}" style="max-width: 100%;max-height:200rpx;"></image>
         </view>
         <view wx:if="{{mb_banner['304']}}" data-url="{{mb_banner['304'].ad_weapplink}}" catchtap="go_mb">
-            <image src="{{mb_banner['304'].ad_code}}" style="max-width: 100%;max-height: 200rpx;"></image>
+          <image src="{{mb_banner['304'].ad_code}}" style="max-width: 100%;max-height: 200rpx;"></image>
         </view>
       </view>
     </view>
@@ -412,14 +415,13 @@
   <!--是否是自定义-->
   <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}; padding-bottom: 10rpx">
     <!-- 置顶层 -->
-    <view class="dis_top" style="position:fixed">
-      <!-- 关注公众号的显示 -->
-      <view id="off_top" wx:if="{{is_gz_h5}}">
+    <!-- <view class="dis_top" style="position:fixed"> -->
+    <!-- 关注公众号的显示 -->
+    <!-- <view id="off_top" wx:if="{{is_gz_h5}}">
         <official-account></official-account>
       </view>
       <block wx:for="{{template_arr}}">
         <block wx:if="{{item.content.is_top==1}}">
-          <!--如果是搜索框的时候 -->
           <block wx:if="{{item.ename=='searchbox'}}">
             <searchbox object="{{item.content}}"></searchbox>
           </block>
@@ -428,19 +430,87 @@
           </block>
         </block>
       </block>
-    </view>
+    </view> -->
     <!-- 撑开层 -->
-    <view>
+    <!-- <view>
       <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px;flex-shrink:0"></view>
       <block wx:for="{{template_arr}}">
         <block wx:if="{{item.content.is_top==1}}">
-          <!-- <view style="height:88rpx"></view> -->
           <view style="height:{{item.content.style==1 ? 110 : 88}}rpx"></view>
         </block>
+      </block> 
+
+    </view> -->
+
+    <block wx:if="{{is_full_screen_navigation}}">
+      <view class="dis_top" style="position: fixed;">
+        <top_nav nav_type="{{nav_type}}" nav_frontColor="{{nav_frontColor}}" nav_backgroundColor="{{nav_backgroundColor ? '#fff' :'#fff'}}" nav_title="{{nav_title}}"></top_nav>
+
+        <!-- <js_store_select bindup_storid="get_new_storid" id="js_store_select" transparent="{{searchbox_transparent}}" bgcoler="{{nav_backgroundColor  ? '#fff' :'#fff'}}" anclor="{{nav_but_color}}" ></js_store_select> -->
+
+        <block wx:for="{{template_arr}}">
+          <block wx:if="{{item.content.is_top==1}}">
+            <!--如果是搜索框的时候 -->
+            <block wx:if="{{item.ename=='searchbox'}}">
+              <searchbox object="{{item.content}}" transparent="{{searchbox_transparent}}" nav_backgroundColor="{{nav_backgroundColor  ? '#fff' :'#fff'}}"></searchbox>
+            </block>
+            <!-- <block wx:if="{{item.ename=='store_select'}}">
+              <store_select object="{{item.content}}"></store_select>
+            </block> -->
+          </block>
+        </block>
+      </view>
+      <block wx:for="{{template_arr}}">
+        <!--广告组合-->
+        <block wx:if="{{item.ename=='advertising' && item.content.full_screen==1 && is_full_screen_navigation_index==index}}">
+          <advertising object="{{item.content}}" bindbutColorEvent="bindbut_color_event_fn" is_full_screen_navigation_index="{{is_full_screen_navigation_index}}"></advertising>
+        </block>
       </block>
+    </block>
+
+    <block wx:else>
+      <!-- 置顶层 -->
+      <view class="dis_top" style="position:fixed">
+        <top_nav nav_type="{{0}}" nav_frontColor="{{nav_frontColor}}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{nav_title}}"></top_nav>
+        <!-- 关注公众号的显示 -->
+        <view id="off_top" wx:if="{{is_gz_h5}}">
+          <official-account></official-account>
+        </view>
+
+        <!-- <js_store_select id="js_store_select" bindup_storid="get_new_storid"  transparent="{{0}}" bgcoler="{{nav_backgroundColor}}" anclor="{{nav_but_color}}" ></js_store_select> -->
+
+        <block wx:for="{{template_arr}}">
+          <block wx:if="{{item.content.is_top==1}}">
+            <!--如果是搜索框的时候 -->
+            <block wx:if="{{item.ename=='searchbox'}}">
+              <searchbox object="{{item.content}}"></searchbox>
+            </block>
+            <!--            <block wx:if="{{item.ename=='store_select'}}">-->
+            <!--              <store_select object="{{item.content}}"></store_select>-->
+            <!--            </block>-->
+
+          </block>
+        </block>
+      </view>
+
+      <!-- 撑开层 -->
+      <view>
+        <!-- 顶部导航撑开层 -->
+        <top_nav nav_type="{{-1}}" nav_frontColor="{{nav_frontColor}}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{nav_title}}"></top_nav>
+        <!-- 即时零售，门店选择撑开层 -->
+        <!-- <view style="width: 100%;height: 88rpx;"></view> -->
+        <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px;flex-shrink:0"></view>
+        <block wx:for="{{template_arr}}">
+          <block wx:if="{{item.content.is_top==1}}">
+            <view style="height:{{item.content.style==1 ? 110 : 88 }}rpx"></view>
+          </block>
+        </block>
+
+      </view>
+    </block>
+
-    </view>
     <block wx:for="{{template_arr}}" wx:key="index">
       <view>
@@ -453,13 +523,12 @@
           <shopname object="{{item.content}}"></shopname>
         </block>
         <!--广告组合-->
-        <block wx:if="{{item.ename=='advertising'}}">
+        <block wx:if="{{item.ename=='advertising'  && item.content.full_screen!=1}}">
           <advertising object="{{item.content}}"></advertising>
         </block>
         <!--商品分组-->
         <block wx:if="{{item.ename=='goodsGroup' || item.ename=='goodsGroupNew'}}">
           <goodsGroup class="{{'goodsGroup' + index}}" object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}"></goodsGroup>
-
         </block>
         <!--通知-->
         <block wx:if="{{item.ename=='notice'}}">
@@ -490,16 +559,28 @@
         </block>
         <!-- 热区切图 -->
         <block wx:if="{{item.ename=='heatCutDiagram'}}">
-          <heat_img object="{{item.content}}" ></heat_img>
+          <heat_img object="{{item.content}}"></heat_img>
         </block>
         <!--标题-->
         <block wx:if="{{item.ename=='title'}}">
           <title object="{{item.content}}"></title>
         </block>
+        <!--悬浮集-->
+        <block wx:if="{{item.ename=='floatingBox'}}">
+          <floatingBox farr="{{item.content}}" is_show_top="{{is_show_top}}" loaction_index="{{item.loaction_index}}"></floatingBox>
+        </block>
         <!--悬浮窗口-->
-        <block wx:if="{{item.ename=='floatingWindow'}}">
+        <!-- <block wx:if="{{item.ename=='floatingWindow'}}">
           <floatingWindow object="{{item.content}}"></floatingWindow>
-        </block>
+        </block> -->
+        <!--在线上客服-->
+        <!-- <block wx:if="{{item.ename=='onlineService'}}">
+          <service object="{{item.content}}"></service>
+        </block> -->
+        <!--扫一扫-->
+        <!-- <block wx:if="{{item.ename=='scan'}}">
+          <scan object="{{item.content}}"></scan>
+        </block> -->
         <!--辅助空白-->
         <block wx:if="{{item.ename=='white'}}">
           <assist object="{{item.content}}"></assist>
@@ -508,14 +589,7 @@
         <block wx:if="{{item.ename=='picMix'}}">
           <picMax object="{{item.content}}"></picMax>
         </block>
-        <!--在线上客服-->
-        <block wx:if="{{item.ename=='onlineService'}}">
-          <service object="{{item.content}}"></service>
-        </block>
-        <!--扫一扫-->
-        <block wx:if="{{item.ename=='scan'}}">
-          <scan object="{{item.content}}"></scan>
-        </block>
+
         <!-- 门店选择 -->
         <block wx:if="{{item.ename=='store_select' && item.content.is_top!=1}}">
           <store_select object="{{item.content}}"></store_select>
@@ -526,8 +600,8 @@
           <presell object="{{item.content}}"></presell>
         </block>
         <block wx:if="{{item.ename=='presaleNew'}}">
-        <diy_public object="{{item.content}}" prom_type="8"></diy_public>
-      </block>
+          <diy_public object="{{item.content}}" prom_type="8"></diy_public>
+        </block>
         <!-- 团购 -->
         <block wx:if="{{item.ename=='groupbuy'}}">
           <groupbuy object="{{item.content}}"></groupbuy>
@@ -4,81 +4,115 @@ var t = getApp(),
   os = t.globalData.setting,
   ut = require("../../utils/util.js"),
   com = require("../../utils/common.js");
-  var regeneratorRuntime = require('../../utils/runtime.js');
-  var api = require('../../api/api.js');
-  var appd = getApp().globalData;
+var regeneratorRuntime = require('../../utils/runtime.js');
+var api = require('../../api/api.js');
+var appd = getApp().globalData;
 Page({
   data: {
     url: os.imghost,
-    temp_id:0,
-    goodsGroupArr:[]
+    temp_id: 0,
+    goodsGroupArr: [],
+    //满屏顶部导航参数------------
+    is_full_screen_navigation: false, //是否满屏
+    is_full_screen_navigation_index: -1, //广告轮播满屏下标
+    nav_title: '首页',
+    nav_frontColor: "#000",
+    nav_backgroundColor: "#fff",
+    nav_type: 1,  //导航类型
+    searchbox_transparent: 1, //搜索框背景是否透明
+
+    nav_but_color: '#32ACF9', //导航按钮颜色
+    sele_pickup: null, //默认门店
+    // nav_bg_color:'#e823e8', //导航按钮颜色
+    //----------------
+    is_show_top: 0, //是否置顶显示
   },
-  onLoad: function(e) {
+  onLoad: function (e) {
     var th = this;
-	this.data.temp_id=e.scene;
-	if(!this.data.temp_id)  
-	     this.data.temp_id=e.sence;	
-	if(!this.data.temp_id)  wx.showModal({ title:"未读取到模板ID" ,})
-
-      var first_leader = e.first_leader;
-      if (first_leader) {
-          //--  user_id代过来免登录 --
-          getApp().globalData.first_leader = first_leader;
-          //调用接口判断是不是会员
-          getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
-              if (res.data.code == 0) {
-                  getApp().globalData.guide_id = res.data.data.id;
-                  getApp().globalData.guide_pick_id= res.data.data.pickup_id
-              }
-          })
-      }
+    this.data.temp_id = e.scene;
+    if (!this.data.temp_id)
+      this.data.temp_id = e.sence;
+    if (!this.data.temp_id) wx.showModal({ title: "未读取到模板ID", })
+
+    var first_leader = e.first_leader;
+    if (first_leader) {
+      //--  user_id代过来免登录 --
+      getApp().globalData.first_leader = first_leader;
+      //调用接口判断是不是会员
+      getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
+        if (res.data.code == 0) {
+          getApp().globalData.guide_id = res.data.data.id;
+          getApp().globalData.guide_pick_id = res.data.data.pickup_id
+        }
+      })
+
+    }
+
+    getApp().getConfig(function (e) {
+      //--首页的问题--
+      if (getApp().globalData.config && getApp().globalData.config.store_name != undefined && getApp().globalData.config.store_name != null) {
+        wx.setNavigationBarTitle({
+          title: getApp().globalData.config.store_name,
+        });
+        th.setData({
+          nav_title: getApp().globalData.config.store_name
+        })
+      } else {
+        wx.setNavigationBarTitle({
+          title: getApp().globalData.setting.appName,
+        });
+        th.setData({
+          nav_title: getApp().globalData.setting.appName,
+        })
+      };
+    });
+
-   				
   },
   async onShow() {
-      getApp().check_can_share();
+    getApp().check_can_share();
     var th = this;
     await this.init_load();
     //如果是自定义模板
     if (this.data.isTemplate) {
-      
-    } 
+
+    }
   },
   //获取商品模块实例
-  newGoodsGroup(){
-    let arr=[]
+  newGoodsGroup() {
+    let arr = []
     if (this.data.template_arr.length == 0) {
       return
     }
-    this.data.template_arr.map((item,index)=>{
+    this.data.template_arr.map((item, index) => {
       if (item.ename == 'goodsGroup') {
         arr.push(`goodsGroup${index}`)
       }
     })
     if (arr.length > 0) {
       this.setData({
-        goodsGroupArr : arr
+        goodsGroupArr: arr
       })
-      arr.map(item=>{       
-        let a = '.'+item
+      arr.map(item => {
+        let a = '.' + item
         this[item] = this.selectComponent(a);
       })
     }
   },
   //当隐藏的时候就关闭计时器
-  onHide: function() {
-   
+  onHide: function () {
+
   },
   //同步初始加载
   async init_load() {
     var th = this;
     //因为营销版本的功能包含了自定义模板的功能，是同时的
     //读取全局是否有弄自定义模板
-    await getApp().request.promiseGet("/api/weshop/store_module/get/"+th.data.temp_id+"/4",{1:1} ).then(res => {
+    await getApp().request.promiseGet("/api/weshop/store_module/get/" + th.data.temp_id + "/4", { 1: 1 }).then(res => {
       var data = res.data.data;
       if (data) {
         var temp_data = data;
@@ -86,114 +120,228 @@ Page({
           title: temp_data.page_title,
         });
         var t_arr = JSON.parse(temp_data.json_str);
+        //增加判断是否是满屏
+        let is_full_screen_navigation = false
+        let is_full_screen_navigation_index = -1
+        let nav_but_color = "#32ACF9"
+        let left_arr = [] //左边悬浮
+        let right_arr=[] //右边悬浮
+        let floatw=null //悬浮窗口
+        if (t_arr) {
+          t_arr.map((item, index) => {
+            if (item && item.content && item.content.full_screen == 1 && !is_full_screen_navigation) {
+              is_full_screen_navigation = true
+              is_full_screen_navigation_index = index
+              try {
+                nav_but_color = item.content.data[0].but_color
+              } catch (error) { }
+            }
+            if (item.ename=='floatingWindow') {
+              floatw = item
+            }
+            if (item.ename=='backTop' || item.ename=='onlineService' || item.ename=='scan' || item.ename=='floatingWindow') {
+              right_arr.push(item)
+            }
+          })
+        }
+        if (floatw && floatw.content) {
+          let fi = right_arr.findIndex(ite=>ite.ename=='floatingWindow')
+          let datas={}
+          if (!floatw.content.data) { //兼容旧的悬浮窗口
+            datas.AppId= floatw.content.AppId
+           datas.feedId= floatw.content.feedId
+           datas.finderUserName= floatw.content.finderUserName
+           datas.img=floatw.content.img
+           datas.video_type= floatw.content.video_type
+           datas.wxapp_url= floatw.content.wxapp_url
+           datas.wxapp_url_title=floatw.content.wxapp_url_title
+           floatw.content.data=[datas]
+          }
+          if (floatw.content.loaction_index==1) {
+            right_arr.splice(fi,1,floatw)
+            // right_arr.unshift(floatw)
+          }else{
+            left_arr.unshift(floatw)
+            right_arr.splice(fi,1)
+          }
+        }
+        if (left_arr.length>0) {
+          let obj={
+            ename:'floatingBox',
+            content:left_arr,
+            loaction_index:0
+          }
+          t_arr.push(obj)
+        }
+        if (right_arr.length>0) {
+          let obj={
+            ename:'floatingBox',
+            content:right_arr,
+            loaction_index:1
+          }
+          t_arr.push(obj)
+        }
+ 
         th.setData({
-          share_title:temp_data.page_title,
+          nav_but_color,
+          is_full_screen_navigation,
+          is_full_screen_navigation_index,
+          share_title: temp_data.page_title,
           template_arr: t_arr,
           isTemplate: 1,
           bgcolor_t: temp_data.bkcolor
         });
-        setTimeout(()=>{
+        setTimeout(() => {
           th.newGoodsGroup()
-        },1000)
+        }, 1000)
         //---如果有设定顶部的颜色的时候--
-        if(temp_data.top_color && temp_data.top_color!='null' ){
+        if (temp_data.top_color && temp_data.top_color != 'null') {
-            var top_w_color="#ffffff";
-            if(temp_data.top_word_color && temp_data.top_word_color=='black'){
-                top_w_color="#000000";
-            }
+          var top_w_color = "#ffffff";
+          if (temp_data.top_word_color && temp_data.top_word_color == 'black') {
+            top_w_color = "#000000";
+          }
           wx.setNavigationBarColor({
             frontColor: top_w_color, // 必写项
             backgroundColor: temp_data.top_color, // 必写项
           })
+          th.setData({
+            // nav_frontColor: top_w_color, // 必写项
+            nav_backgroundColor: temp_data.top_color, // 必写项
+          })
         }
-        
+
       }
     })
-	
- 
+
+
+  },
+  //广告轮播满屏按钮颜色传递方法
+  bindbut_color_event_fn(even) {
+    let nav_but_color = even.detail.but_color
+    this.setData({
+      nav_but_color
+    })
   },
+  onPageScroll: function (e) {
+    //满屏模式监听
+    let num = e.scrollTop
+    if (this.data.is_full_screen_navigation) {
+      let nav_type = this.data.nav_type
+      if (num >= 100 && nav_type) {
+        this.setData({
+          nav_type: 0,
+          searchbox_transparent: 0,
+          nav_frontColor: '#000'
+        })
+        // this.data.nav_type = 0
+      }
+      if (num < 100 && !nav_type) {
+        this.setData({
+          nav_type: 1,
+          searchbox_transparent: 1,
+          nav_frontColor: '#000'
+        })
+        // this.data.nav_type = 1
+      }
+    }
+    //-----------end-------
+    //是否显示置顶
+    if (num > 400) {
+      this.setData({
+        is_show_top: 1
+      })
+    } else {
+      this.setData({
+        is_show_top: 0
+      })
+    }
+    //----end------
+
+    // this.data.scrollTop = e.scrollTop;
+    // var t = getCurrentPages();
+    // "pages/index/index/index" == t[t.length - 1].route;
-  onPullDownRefresh: function(e) {
-  
   },
+  onPullDownRefresh: function (e) {
-  
-  onShareAppMessage:async function(e) {
-      var th=this;
-      getApp().globalData.no_clear=1;
-      getApp().getConfig(await function(e){
-          th.setData({
-              store_config:e
-          })
-      }.bind(this))
+  },
-      var url= `pages/template/index?sence=`+this.data.temp_id;
-      var userInfo = getApp().globalData.userInfo;
-      //是分销商才带
-      if (userInfo) {
-          url += "&first_leader=" + userInfo.user_id;
-      }
-      var ob = {
-          title: this.data.share_title,
-          path: url,
-          //imageUrl:this.data.url+this.data.store_config.store_logo,
-      };
-      return ob;
+  onShareAppMessage: async function (e) {
+    var th = this;
+    getApp().globalData.no_clear = 1;
+    getApp().getConfig(await function (e) {
+      th.setData({
+        store_config: e
+      })
+    }.bind(this))
+
+    var url = `pages/template/index?sence=` + this.data.temp_id;
+    var userInfo = getApp().globalData.userInfo;
+    //是分销商才带
+    if (userInfo) {
+      url += "&first_leader=" + userInfo.user_id;
+    }
+
+    var ob = {
+      title: this.data.share_title,
+      path: url,
+      //imageUrl:this.data.url+this.data.store_config.store_logo,
+    };
+    return ob;
   },
   /**
   * 用户分享朋友圈
   */
-  async onShareTimeline(){
+  async onShareTimeline() {
-    var th=this;
-    getApp().globalData.no_clear=1;
-    getApp().getConfig(await function(e){
+    var th = this;
+    getApp().globalData.no_clear = 1;
+    getApp().getConfig(await function (e) {
       th.setData({
-        store_config:e
+        store_config: e
       })
     }.bind(this))
-    var {share_title,temp_id,store_config} = this.data;
-    var url= `sence=${temp_id}`;
+    var { share_title, temp_id, store_config } = this.data;
+    var url = `sence=${temp_id}`;
-      var userInfo = getApp().globalData.userInfo;
-      //是分销商才带
-      if (userInfo) {
-          url += "&first_leader=" + userInfo.user_id;
-      }
+    var userInfo = getApp().globalData.userInfo;
+    //是分销商才带
+    if (userInfo) {
+      url += "&first_leader=" + userInfo.user_id;
+    }
     var ob = {
-        title:share_title,
-        query:url,
-        //imageUrl:this.data.url+store_config.store_logo,
+      title: share_title,
+      query: url,
+      //imageUrl:this.data.url+store_config.store_logo,
     };
     console.log(ob);
     return ob;
-},
-    //---加载更多是靠这个函数----
-    onReachBottom: function() {
-       if(getApp().globalData.func_list)
-       {
-            for(let i in getApp().globalData.func_list){
-            	let item=getApp().globalData.func_list[i];
-            	item.re_show();
-            }
-       }
-
-        //自定义时商品自动加载更多
-      let goodsGroupArr = this.data.goodsGroupArr
-      if (this.data.isTemplate && goodsGroupArr.length >0) {
-          goodsGroupArr.map(item=>{
-            this[item].automore()
-          })
+  },
+  //---加载更多是靠这个函数----
+  onReachBottom: function () {
+    if (getApp().globalData.func_list) {
+      for (let i in getApp().globalData.func_list) {
+        let item = getApp().globalData.func_list[i];
+        item.re_show();
       }
-    },
+    }
+
+    //自定义时商品自动加载更多
+    let goodsGroupArr = this.data.goodsGroupArr
+    if (this.data.isTemplate && goodsGroupArr.length > 0) {
+      goodsGroupArr.map(item => {
+        this[item].automore()
+      })
+    }
+  },
+
+
-    
-  
 });
 \ No newline at end of file
@@ -4,6 +4,7 @@
     "usingComponents": {
         "goods_recommend":"/components/goods_list/goods_list",
         "nav": "/components/diy_nav/diy_nav",
+        "top_nav": "/components/diy_top_nav/diy_top_nav",
         "advertising":"/components/diy_advertising/diy_advertising",
         "groupbuy": "/components/diy_groupbuy/diy_groupbuy",
         "goodsGroup":  "/components/diy_goodsGroup/diy_goodsGroup",
@@ -24,8 +25,10 @@
 		"service": "/components/diy_service/diy_service",
     "scan": "/components/diy_scan/diy_scan",
     "floatingWindow": "/components/diy_floatingWindow/diy_floatingWindow",
+    "floatingBox": "/components/diy_floatingBox/diy_floatingBox",
         "presell": "/components/diy_pregoods/diy_pregoods"
-    },
+    }, 
   "enablePullDownRefresh": false,
-  "onReachBottomDistance":300
+  "onReachBottomDistance":300,
+  "navigationStyle":"custom"
 }
 \ No newline at end of file
 <view class="container" style="background-color:{{bgcolor_t}}">
+
+
+  <block wx:if="{{is_full_screen_navigation}}">
+    <view class="dis_top" style="position: fixed;">
+      <top_nav nav_type="{{nav_type}}" nav_frontColor="{{nav_frontColor}}" nav_backgroundColor="{{nav_backgroundColor ? '#fff' :'#fff'}}" nav_title="{{nav_title}}"></top_nav>
+
+      <!-- <js_store_select bindup_storid="get_new_storid" id="js_store_select" transparent="{{searchbox_transparent}}" bgcoler="{{nav_backgroundColor  ? '#fff' :'#fff'}}" anclor="{{nav_but_color}}" ></js_store_select> -->
+
+      <block wx:for="{{template_arr}}">
+        <block wx:if="{{item.content.is_top==1}}">
+          <!--如果是搜索框的时候 -->
+          <block wx:if="{{item.ename=='searchbox'}}">
+            <searchbox object="{{item.content}}" transparent="{{searchbox_transparent}}" nav_backgroundColor="{{nav_backgroundColor  ? '#fff' :'#fff'}}"></searchbox>
+          </block>
+          <!-- <block wx:if="{{item.ename=='store_select'}}">
+              <store_select object="{{item.content}}"></store_select>
+            </block> -->
+        </block>
+      </block>
+    </view>
+    <block wx:for="{{template_arr}}">
+      <!--广告组合-->
+      <block wx:if="{{item.ename=='advertising' && item.content.full_screen==1 && is_full_screen_navigation_index==index}}">
+        <advertising object="{{item.content}}" bindbutColorEvent="bindbut_color_event_fn" is_full_screen_navigation_index="{{is_full_screen_navigation_index}}"></advertising>
+      </block>
+    </block>
+  </block>
+
+  <block wx:else>
+    <!-- 置顶层 -->
+    <view class="dis_top" style="position:fixed">
+      <top_nav nav_type="{{0}}" nav_frontColor="{{nav_frontColor}}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{nav_title}}"></top_nav>
+      <!-- 关注公众号的显示 -->
+      <view id="off_top" wx:if="{{is_gz_h5}}">
+        <official-account></official-account>
+      </view>
+
+      <!-- <js_store_select id="js_store_select" bindup_storid="get_new_storid"  transparent="{{0}}" bgcoler="{{nav_backgroundColor}}" anclor="{{nav_but_color}}" ></js_store_select> -->
+
+      <block wx:for="{{template_arr}}">
+        <block wx:if="{{item.content.is_top==1}}">
+          <!--如果是搜索框的时候 -->
+          <block wx:if="{{item.ename=='searchbox'}}">
+            <searchbox object="{{item.content}}"></searchbox>
+          </block>
+          <!--            <block wx:if="{{item.ename=='store_select'}}">-->
+          <!--              <store_select object="{{item.content}}"></store_select>-->
+          <!--            </block>-->
+
+        </block>
+      </block>
+    </view>
+
+    <!-- 撑开层 -->
+    <view>
+      <!-- 顶部导航撑开层 -->
+      <top_nav nav_type="{{-1}}" nav_frontColor="{{nav_frontColor}}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{nav_title}}"></top_nav>
+      <!-- 即时零售，门店选择撑开层 -->
+      <!-- <view style="width: 100%;height: 88rpx;"></view> -->
+      <view wx:if="{{is_gz_h5 && is_ok_h5}}" style="height: 84px;flex-shrink:0"></view>
+      <block wx:for="{{template_arr}}">
+        <block wx:if="{{item.content.is_top==1}}">
+          <view style="height:{{item.content.style==1 ? 110 : 88 }}rpx"></view>
+        </block>
+      </block>
+
+    </view>
+  </block>
+
+
   <block wx:for="{{template_arr}}" wx:key="{{index}}">
     <view>
       <!--导航-->
@@ -10,10 +80,10 @@
         <shopname object="{{item.content}}"></shopname>
       </block>
       <!--广告组合-->
-      <block wx:if="{{item.ename=='advertising'}}">
+      <block wx:if="{{item.ename=='advertising' && item.content.full_screen!=1}}">
         <advertising object="{{item.content}}"></advertising>
       </block>
-      <!--商品分组--> 
+      <!--商品分组-->
       <block wx:if="{{item.ename=='goodsGroup' || item.ename=='goodsGroupNew'}}">
         <goodsGroup class="{{'goodsGroup' + index}}" object="{{item.content}}"></goodsGroup>
       </block>
@@ -33,7 +103,7 @@
         <mvideo object="{{item.content}}"></mvideo>
       </block>
       <!--搜索-->
-      <block wx:if="{{item.ename=='searchbox'}}">
+      <block wx:if="{{item.ename=='searchbox' && item.content.is_top!=1}}">
         <searchbox object="{{item.content}}"></searchbox>
       </block>
       <!--天天拼单-->
@@ -49,7 +119,7 @@
       </block>
       <!-- 热区切图 -->
       <block wx:if="{{item.ename=='heatCutDiagram'}}">
-        <heat_img object="{{item.content}}" ></heat_img>
+        <heat_img object="{{item.content}}"></heat_img>
       </block>
       <!-- <block wx:if="{{item.ename=='seckillNew'}}">
         <diy_public object="{{item.content}}" prom_type="1"></diy_public>
@@ -62,22 +132,27 @@
       <block wx:if="{{item.ename=='white'}}">
         <assist object="{{item.content}}"></assist>
       </block>
-      <!--悬浮窗口-->
-      <block wx:if="{{item.ename=='floatingWindow'}}">
-        <floatingWindow object="{{item.content}}"></floatingWindow>
-      </block>
-      <!--图片组合--> 
+
+      <!--图片组合-->
       <block wx:if="{{item.ename=='picMix'}}">
         <picMax object="{{item.content}}"></picMax>
       </block>
-	  <!--在线上客服-->
-	  <block wx:if="{{item.ename=='onlineService'}}">
-	    <service object="{{item.content}}"></service>
-	  </block>
-	  <!--扫一扫-->
-	  <block wx:if="{{item.ename=='scan'}}">
-	     <scan object="{{item.content}}"></scan>
-	  </block>
+      <!--悬浮集-->
+      <block wx:if="{{item.ename=='floatingBox'}}">
+        <floatingBox farr="{{item.content}}" is_show_top="{{is_show_top}}" loaction_index="{{item.loaction_index}}"></floatingBox>
+      </block>
+      <!--悬浮窗口-->
+      <!-- <block wx:if="{{item.ename=='floatingWindow'}}">
+        <floatingWindow object="{{item.content}}"></floatingWindow>
+      </block> -->
+      <!--在线上客服-->
+      <!-- <block wx:if="{{item.ename=='onlineService'}}">
+        <service object="{{item.content}}"></service>
+      </block> -->
+      <!--扫一扫-->
+      <!-- <block wx:if="{{item.ename=='scan'}}">
+        <scan object="{{item.content}}"></scan>
+      </block> -->
       <!-- 预售 -->
       <block wx:if="{{item.ename=='presale'}}">
@@ -86,22 +161,22 @@
       <block wx:if="{{item.ename=='presaleNew'}}">
         <diy_public object="{{item.content}}" prom_type="8"></diy_public>
       </block>
-	  <!-- 团购 -->
-	  <block wx:if="{{item.ename=='groupbuy'}}">
-	       <groupbuy object="{{item.content}}"></groupbuy>
-	  </block>
-    <block wx:if="{{item.ename=='groupbuyNew'}}">
+      <!-- 团购 -->
+      <block wx:if="{{item.ename=='groupbuy'}}">
+        <groupbuy object="{{item.content}}"></groupbuy>
+      </block>
+      <block wx:if="{{item.ename=='groupbuyNew'}}">
         <diy_public object="{{item.content}}" prom_type="2"></diy_public>
       </block>
       <!-- 幸运购 -->
-    <block wx:if="{{item.ename=='luckyactivity'}}">
-          <luckyGo object="{{item.content}}"></luckyGo>
-        </block>
-        <block wx:if="{{item.ename=='luckyactivityNew'}}">
-          <!-- <luckyGo object="{{item.content}}"></luckyGo> -->
-          <diy_public object="{{item.content}}" prom_type="9"></diy_public>
-        </block>
+      <block wx:if="{{item.ename=='luckyactivity'}}">
+        <luckyGo object="{{item.content}}"></luckyGo>
+      </block>
+      <block wx:if="{{item.ename=='luckyactivityNew'}}">
+        <!-- <luckyGo object="{{item.content}}"></luckyGo> -->
+        <diy_public object="{{item.content}}" prom_type="9"></diy_public>
+      </block>
     </view>
   </block>
 </view>
@@ -15,6 +15,13 @@
   width: 50rpx;
   height: 45rpx;
 }
+.dis_top {
+	position: sticky;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 100000;
+}
 .logo {
   width: 48rpx;