From e5a37372b8f8bda29365732c562400aa05a7d3a0 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 22 May 2023 09:42:01 +0800
Subject: [PATCH] 12

---
 api/api.js                               |    3 +
 pages.json                               |   29 +-
 pages/index/index.vue                    | 2111 ++++------------------
 pages/index/index_two.vue                | 1757 ++++++++++++++++++
 pages/nongKe/gather/select_warehouse.vue |  350 +++-
 pages/store/home/index.vue               |    5 +-
 pages/users/login/index.vue              |    3 +-
 7 files changed, 2455 insertions(+), 1803 deletions(-)
 create mode 100644 pages/index/index_two.vue

diff --git a/api/api.js b/api/api.js
index 316cb46..586a609 100644
--- a/api/api.js
+++ b/api/api.js
@@ -18,6 +18,9 @@ export function getProductSpuAPI(id) {
 export function get_cloud_shop(street_code) {
   return request.get(`city/get_cloud_shop?street_code=${street_code}`, {}, { noAuth: true });
 }
+export function post_product_import(id) {
+  return request.post(`micro/product_import`,{ id: id }, { noAuth: true });
+}
 /**
  * 公共接口 ，优惠券接口 , 行业此讯 , 手机号码注册
  * 
diff --git a/pages.json b/pages.json
index 658635b..dc25e0a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,7 @@
 {
   "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
     {
-      "path": "pages/home/index",
+      "path": "pages/index/index",
       "style": {
         "navigationBarTitleText": "首页",
         "navigationStyle": "custom",
@@ -95,23 +95,7 @@
 
     }
   ],
-  "subPackages": [{
-      "root": "pages/index",
-      "name": "index",
-      "pages": [{
-        "path": "index",
-        "style": {
-          "navigationBarTitleText": "首页",
-          "navigationStyle": "custom",
-          // #ifdef APP-PLUS
-          "enablePullDownRefresh": true,
-          // #endif
-          "app-plus": {
-            "scrollIndicator": false //禁用原生导航栏
-          }
-        }
-      }]
-    },
+  "subPackages": [
     {
       "root": "pages/goods_cate",
       "name": "goods_cate",
@@ -905,13 +889,6 @@
             "navigationBarTitleText": "商户基本设置",
             "enablePullDownRefresh": false
           }
-        }, {
-          "path": "addGoods/addMyStore",
-          "style": {
-            "navigationBarTitleText": "",
-            "enablePullDownRefresh": false
-          }
-
         }
       ]
     },
@@ -1289,7 +1266,7 @@
     "borderStyle": "white",
     "backgroundColor": "#ffffff",
     "list": [{
-        "pagePath": "pages/home/index",
+        "pagePath": "pages/index/index",
         "iconPath": "static/tabbar_icon/a.png",
         "selectedIconPath": "static/tabbar_icon/a-a.png",
         "text": "泸州"
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3011f4d..b869105 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,1757 +1,364 @@
 <template>
-	<view :class="bgTabVal==2?'fullsize noRepeat':bgTabVal==1?'repeat ysize':'noRepeat ysize'"
-		:style="'background-color:'+bgColor+';background-image: url('+bgPic+');min-height:'+windowHeight+'px;'" id="home">
-		<skeleton :show="showSkeleton" :isNodes="isNodes" ref="skeleton" loading="chiaroscuro" selector="skeleton" bgcolor="transparent"></skeleton>
-		<view v-if="!errorNetwork" :style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
-			<view class="page-index skeleton" :class="{ bgf: navIndex > 0 }">
-				<block>
-					<!-- #ifdef H5 -->
-					<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled" @changeDiy="changeDiy"></homeComb>
-					<view v-for="(item, index) in styleConfig" :key="index">
-						<block v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
-							<component
-								:is="item.name"
-								:index="index"
-								:isFixed="isFixed"
-								:dataConfig="item"
-								:tempArr="tempArr"
-								:userInfo="userInfo"
-								:tabTitle="navTop"
-								:navIndex="navIndex"
-								@changeTab="changeTab"
-								@detail="goDetail"
-								v-show="navIndex == 0"
-							></component>
-						</block>
-						<block v-if="item.name == 'headerSerch'">
-							<headerSerch
-								:dataConfig="item"
-								:tempArr="tempArr"
-								:userInfo="userInfo"
-								:tabTitle="navTop"
-								@changeTab="changeTab"
-								@detail="goDetail"
-							></headerSerch>
-						</block>
-						<block v-if="item.name == 'shopList' && hide_mer_status != 1 && navIndex == 0">
-							<shopList :dataConfig="item"></shopList>
-						</block>
-						<block v-if="item.name == 'tabNav'">
-							<tabNav
-								:isFixed="isFixed"
-								:dataConfig="item"
-								:tempArr="tempArr"
-								:userInfo="userInfo"
-								:tabTitle="navTop"
-								@changeTab="changeTab"
-								@detail="goDetail"
-							></tabNav>
-						</block>
-						<block v-if="item.name == 'homeComb' && !smallPage">
-							<homeComb :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy"></homeComb>
-						</block>
-						<block v-if="item.name == 'hotRanking' && hot_ranking_switch != 0 && navIndex == 0">
-							<hotRanking :dataConfig="item"></hotRanking>
-						</block>
-					</view>				
-					<!-- #endif -->
-					<!-- #ifdef MP || APP-PLUS -->
-					<homeComb class="home-comb" v-if="smallPage" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy"	@bindHeight="bindHeighta"></homeComb>
-					<block v-for="(item, index) in styleConfig" :key="index" >
-						<view v-show="navIndex == 0">
-							<homeComb v-if="item.name == 'homeComb' && !smallPage" :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
-							<activeParty v-if="item.name == 'activeParty'" :dataConfig="item"></activeParty>
-							<bargain v-if="item.name == 'bargain'" :dataConfig="item"></bargain>
-							<blankPage v-if="item.name == 'blankPage'" :dataConfig="item"></blankPage>
-							<combination v-if="item.name == 'combination'" :dataConfig="item"></combination>
-							<topic v-if="item.name == 'topic'" :dataConfig="item"></topic>
-							<coupon v-if="item.name == 'coupon'" :dataConfig="item"></coupon>
-							<customerService v-if="item.name == 'customerService'" :dataConfig="item"></customerService>
-							<goodList v-if="item.name == 'goodList'" :dataConfig="item" @detail="goDetail"></goodList>
-							<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
-							<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item"></liveBroadcast>
-							<menus :class="isMenu ? 'transform-view' : ''" v-if="item.name == 'menus'" :dataConfig="item"></menus>
-							<news v-if="item.name == 'news'" :dataConfig="item"></news>
-							<presellList v-if="item.name == 'presellList'" :dataConfig="item"></presellList>
-							<plantList v-if="item.name == 'plantList'" :dataConfig="item"></plantList>
-							<hotRanking v-if="item.name == 'hotRanking' && hot_ranking_switch != 0" :dataConfig="item"></hotRanking>
-							<promotionList v-if="item.name == 'promotionList'" :dataConfig="item" @changeTab="changeTab" :tempArr="tempArr" @detail="goDetail"></promotionList>
-							<richText v-if="item.name == 'richText'" :dataConfig="item"></richText>
-							<seckill v-if="item.name == 'seckill'" :dataConfig="item"></seckill>
-							<swiperBg v-if="item.name == 'swiperBg'" :dataConfig="item"></swiperBg>
-							<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item"></pictureCube>
-							<titles v-if="item.name == 'titles'" :dataConfig="item"></titles>
-							<shopList v-if="item.name == 'shopList' && hide_mer_status != 1" :dataConfig="item"></shopList>
-						</view>
-						<headerSerch v-if="item.name == 'headerSerch'" :dataConfig="item" :userInfo="userInfo"></headerSerch>
-						<tabNav v-if="item.name == 'tabNav'" :dataConfig="item" class="tabNav" :tabTitle="navTop"
-						@bindHeight="bindHeighta" @changeTab="changeTab" :isFixed="isFixed"></tabNav>
-					</block>
-					<!-- #endif -->
-					<view class="main" v-show="navIndex == 0">
-						<!-- 首页推荐 -->
-						<view class="index-product-wrapper">
-							<!-- 首发新品 -->
-							<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :indexP="true" :isLogin="isLogin"></recommend>
-							<view class="loadingicon acea-row row-center-wrapper" v-if="hostProduct.length > 0">
-								<text class="loading iconfont icon-jiazai" :hidden="hotLoading == false"></text>
-								{{ hotTitle }}
-							</view>
-						</view>
-					</view>
-					<view v-show="navIndex == 0" class="loadingicon acea-row row-center-wrapper" v-if="tempArr.length && styleConfig[styleConfig.length - 1].name == 'promotionList'">
-						<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
-						{{ loadTitle }}
-					</view>
-				</block>
-				<!-- 分类页 -->
-				<view class="productList" v-if="navIndex > 0">
-					<view class="sort acea-row" v-if="sortList.length>0"  :style="{ marginTop: sortMarTop + 'px' }">
-						<navigator
-							hover-class="none"
-							v-if="index < 9"
-							:url="'/pages/columnGoods/goods_list/index?id=' + item.store_category_id + '&title=' + item.cate_name"
-							class="item"
-							v-for="(item, index) in sortList"
-							:key="item.store_category_id"
-						>
-							<view class="pictrue cate_pictrue">
-								<easy-loadimage :image-src="item.pic"></easy-loadimage>
-								<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
-							</view>
-							<view class="text">{{ item.cate_name }}</view>
-						</navigator>
-						<view class="item" @click="bindMore" v-if="sortList.length >= 9">
-							<view class="pictrues acea-row row-center-wrapper"><text class="iconfont icon-gengduo1"></text></view>
-							<view class="text" style="margin-top: 22rpx;">更多</view>
-						</view>
-					</view>	
-					<block v-if="sortProduct.length > 0">
-						<view class="list acea-row row-between-wrapper">
-							<navigator @tap="goDetails(item)" class="item" v-for="(item, index) in sortProduct" :key="item.product_id">
-								<view class="pictrue">
-									<easy-loadimage :image-src="item.image"></easy-loadimage>
-									<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
-								</view>
-								<view class="text">
-									<view class="name line1">
-										<text class="name_text line2">{{ item.store_name }}</text>
-									</view>
-									<view class="acea-row row-middle">
-										<view class="money font-color-red">
-											￥
-											<text class="num">{{ item.price }}</text>
-										</view>
-									</view>
-									<view class="item_tags acea-row">
-										<text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red">{{ item.merchant.type_name }}</text>
-										<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red">自营</text>
-										<text v-if="item.product_type != 0" :class="'font_bg-red type' + item.product_type">
-											{{ item.product_type == 1 ? '秒杀' : item.product_type == 2 ? '预售' : item.product_type == 3 ? '助力' : item.product_type == 4 ? '拼团' : '' }}
-										</text>
-										<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
-										<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
-									</view>
-								</view>
-							</navigator>
-							<view class="loadingicon acea-row row-center-wrapper" v-if="sortProduct.length > 0 || sortProductLoading">
-								<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
-								{{ loadTitle }}
-							</view>
-						</view>
-					</block>		
-					<block v-if="sortProduct.length == 0">
-						<view class="noCommodity">
-							<view class="pictrue" style="margin: 0 auto;">
-								<image src="/static/images/noCart.png"></image>
-								<view>暂无商品，去看点什么吧</view>
-							</view>
-							<recommend :hostProduct="hostProduct"></recommend>
-						</view>
-					</block>
-				</view>
-				<!-- #ifdef H5 -->
-				<a v-if="beian_sn" href="https://beian.miit.gov.cn/#/Integrated/index" class="copyRight">{{beian_sn}}</a>
-				<!-- #endif -->
-				<!-- #ifndef H5 -->
-				<view v-if="beian_sn" class="copyRight">{{beian_sn}}</view>
-				<!-- #endif -->
-				<view v-if="newData.status && newData.status.status" class="diyheight"></view>
-			</view>
-		</view>
-		<view v-else>
-			<view class="error-network">
-				<image src="/static/images/error-network.png"></image>
-				<view class="title">网络连接断开</view>
-				<view class="con">
-					<view class="label">请检查情况：</view>
-					<view class="item">· 在设置中是否已开启网络权限</view>
-					<view class="item">· 当前是否处于弱网环境</view>
-					<view class="item">· 版本是否过低，升级试试吧</view>
-				</view>
-				<view class="btn" @click="reconnect">重新连接</view>
-			</view>
-		</view>
-		<!-- #ifdef APP-PLUS -->
-		<view class="privacy-wrapper" v-if="privacyStatus">
-			<view class="privacy-box">
-				<view class="title">用户协议与隐私政策</view>
-				<view class="content">
-					请务必审慎阅读、充分理解“用户协议 与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个
-					人信息。你可以在“设置”中查看、变更、 删除个人信息并管理你的授权。
-					<br />
-					你可以阅读
-					<navigator url="/pages/users/user_about/index?from=sys_user_agree">《用户协议》</navigator>与<navigator url="/pages/users/user_about/index?from=sys_userr_privacy">《隐私政策》</navigator>
-					了解 详细信息。如你同意，请点击“我同意”开始接受我们的服务。
-				</view>
-				<view class="btn-box">
-					<view class="btn-item" @click="confirmApp">我同意</view>
-					<view class="btn" @click="closeModel">随便逛逛</view>
-				</view>
-			</view>
-		</view>
-		<!-- #endif -->
-		<!-- 发送给朋友图片 -->
-		<view class="share-box" v-if="isIntegral">
-			<!-- #ifndef H5 -->
-			<image src="/static/images/share-info.png" @click="closeShare"></image>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<image src="/static/images/share-info-wechat.png" @click="closeShare"></image>
-			<!-- #endif -->
-		</view>
-		<!-- 优惠券弹窗 -->
-		<view class="coupon_popups" v-if="showCoupon">
-			<view class="bg"></view>
-			<view class="con" :style="{ 'background-image': `url(${domain}/static/diy/couponWindow${keyColor}.png)` }">
-				<scroll-view scroll-y="true" >
-					<view v-for="(item, index) in couponArray" class="item">
-						<view class="left">
-							<view class="price">￥ <text>{{item.coupon_price}}</text></view>
-							<view class="max_price" v-if="item.use_min_price > 0">满{{item.use_min_price}}可用</view>
-							<view class="max_price" v-else>无门槛</view>
-						</view>
-						<view class="right">
-							<view class="time line1" v-if="item.coupon_type">有效期{{item.use_start_time}} - {{item.use_end_time}}</view>
-							<text class="coupon_type">{{couponTypeMsg[item.type] || '店铺券'}}</text>
-							<navigator :url="'/pages/columnGoods/goods_coupon_list/index?coupon_id='+item.coupon_id" class='bnt1 b-color' hover-class="none"><text class="title titleSize">{{item.title}}</text>
-							<view class="title titleColor">
-								有效期:{{item.use_start_time}}-{{item.use_end_time}}
-							</view>
-							</navigator>
-						</view>
-					</view>
-				</scroll-view>
-				<view class="text">优惠券已放入您的账户中，点击“优惠券”去使用</view>
-				<view class='iconfont icon-guanbi3' @click="showCoupon = false"></view>
-			</view>
-		</view>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize>
-		<!-- #ifndef H5 -->
-		<passwordPopup></passwordPopup>
-		<!-- #endif -->
-		<view class="foot" v-if="newData.status && newData.status.status">
-			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
-				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
-					@click="goRouter(item)">
-					<block v-if="item.link == activeRouter">
-						<image :src="item.imgList[0]"></image>
-						<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
-						</view>
-					</block>
-					<block v-else>
-						<image :src="item.imgList[1]"></image>
-						<view class="txt" :style="{color:newData.txtColor.color[0].item}">{{item.name}}</view>
-					</block>
-				</view>
-			</view>
-		</view>
-		<view v-if="overflow" class="overflow-mask" @touchmove.stop.prevent="() => {}"></view>
-	</view>
+  <view class="Circle_friends">
+    <view class="circle_friends_wrapper">
+
+      <zbpSwiper></zbpSwiper>
+
+      <view class="tabs_wrapper">
+        <u-tabs :list="tabsData.list" @click="tabsChange" lineColor="#F84221" keyName="cate_name"></u-tabs>
+      </view>
+
+      <view class="goods">
+        <block v-for="(item,index) in cateGoods" :key="index">
+          <view class="goods_item" @click="gogogo(item)">
+            <image class="goods_img" :src="item.image[0]" mode="aspectFill"></image>
+            <view class="botm">
+              <view class="title">{{item.title}}</view>
+              <view class="goods_info flex_a_c">
+                <view class="l_info flex_a_c">
+                  <image :src="(item.author && item.author.avatar) || '/static/images/f.png'" mode="aspectFill"
+                    class="g_img"></image>
+                  <view class="g_name">{{item.author && item.author.nickname}}</view>
+                </view>
+                <view class="nice_box" @click.stop="giveStart(item)">
+                  <text class="iconfont" :class="item.relevance_id ? 'icon-shoucang1' : 'icon-dianzan'"></text>
+                  <text class="collect">{{item.count_start}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+      <view class="empty_wrapper" v-if="emptyShow">
+        <u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
+      </view>
+    </view>
+
+    <u-picker :defaultIndex="[0,0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
+      @cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
+
+    <!-- <view class="bg_color"></view> -->
+
+    <!-- <m-tabbar native>
+      <template v-slot:tabbar_index_2>
+        <view class="custom_style">
+          <view class="custom_style_icon"></view>
+        </view>
+      </template>
+    </m-tabbar> -->
+  </view>
 </template>
+
 <script>
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
-var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
-let app = getApp();
-import { getUserInfo } from '@/api/user.js';
-import { getDiy, getPageDiy, getIndexData, getAppVersion ,getUserCoupons} from '@/api/api.js';
-import { getNavigation } from '@/api/public.js';
-// #ifdef MP-WEIXIN
-import { getTemlIds } from '@/api/api.js';
-import { SUBSCRIBE_MESSAGE, TIPS_KEY } from '@/config/cache';
-// #endif
-import { getShare, getconfig } from '@/api/public.js';
-import { goShopDetail } from '@/libs/order.js';
-import { mapGetters } from 'vuex';
-import { getProductslist, getProductHot, storeCategory } from '@/api/store.js';
-import { initiateAssistApi } from '@/api/activity.js';
-import { setVisit, spread } from '@/api/user.js';
-import recommend from '@/components/recommend';
-// #ifndef H5
-import passwordPopup from '@/components/passwordPopup';
-// #endif
-// #ifdef H5
-import mConfig from './component/index.js';
-// #endif
-import authorize from '@/components/Authorize';
-// #ifdef MP || APP-PLUS
-import activeParty from './component/activeParty';
-import headerSerch from './component/headerSerch';
-import homeComb from './component/homeComb';
-import coupon from './component/coupon';
-import bargain from './component/bargain';
-import blankPage from './component/blankPage';
-import combination from './component/combination';
-import customerService from './component/customerService';
-import goodList from './component/goodList';
-import guide from './component/guide';
-import liveBroadcast from './component/liveBroadcast';
-import menus from './component/menus';
-import news from './component/news';
-import topic from './component/topic';
-import presellList from './component/presellList';
-import plantList from './component/plantList';
-import pictureCube from './component/pictureCube'
-import shopList from './component/shopList';
-import richText from './component/richText';
-import seckill from './component/seckill';
-import swiperBg from './component/swiperBg';
-import tabNav from './component/tabNav';
-import titles from './component/titles';
-import hotRanking from "./component/hotRanking.vue";
-// #endif
-import { silenceBindingSpread, configMap, isWeixin } from '@/utils/index';
-import history from '@/mixins/history';
-import shareScence from '@/libs/spread';
-import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
-import {getNewPeopleCouponLst} from '@/api/activity.js'
-import { HTTP_REQUEST_URL } from '@/config/app';
-export default {
-	computed: configMap({hide_mer_status:0,recommend_switch:0,beian_sn:'',share_title:'',site_name:'',hot_ranking_switch:0,navigation: {}},
-	mapGetters(['isLogin','uid','keyColor'])),
-	mixins: [history],
-	components: {
-		easyLoadimage,
-		recommend,
-		authorize,
-		// #ifndef H5
-		passwordPopup,
-		// #endif
-		// #ifdef H5
-		...mConfig,
-		// #endif
-		// #ifdef MP || APP-PLUS
-		activeParty,
-		headerSerch,
-		homeComb,
-		bargain,
-		coupon,
-		blankPage,
-		combination,
-		customerService,
-		goodList,
-		guide,
-		liveBroadcast,
-		menus,
-		news,
-		topic,
-		presellList,
-		plantList,
-		pictureCube,
-		shopList,
-		richText,
-		seckill,
-		swiperBg,
-		tabNav,
-		titles,
-		hotRanking
-		// #endif
-	},
-	data() {
-		return {
-			domain: HTTP_REQUEST_URL,
-			couponTypeMsg:{
-				10: '通用券',
-				11: '品类券',
-				12: '跨店券'
-			},
-			styleConfig: [],
-			showSkeleton: true, //骨架屏显示隐藏
-			isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
-			privacyStatus: false,
-			errorNetwork: false,
-			userInfo: {},
-			loading: false,
-			isAuto: false, //没有授权的不会自动授权
-			isShowAuth: false, //是否隐藏授权
-			statusBarHeight: statusBarHeight,
-			navIndex: 0,
-			navTop: [],
-			subscribe: false,
-			followUrl: '',
-			followHid: true,
-			followCode: false,
-			sortList: [],
-			window: false,
-			navH: '',
-			couponList: [],
-			marTop: 0,
-			loadend: false,
-			loading: false,
-			loadTitle: '加载更多',
-			sortProduct: [],
-			where: {
-				pid: 0,
-				page: 1,
-				limit: 6
-			},
-			is_switch: true,
-			hostProduct: [],
-			hotPage: 1,
-			hotLimit: 30,
-			hotScroll: true,
-			hotLoading: false,
-			hotTitle: '加载更多',
-			explosiveMoney: [],
-			domOffsetTop: 50,
-			// #ifdef MP || APP-PLUS
-			isFixed: true,
-			// #endif
-			// #ifdef H5
-			isFixed: false,
-			// #endif
-			isScrolled: false,
-			scrolled: false,
-			goodScroll: true, //精品推荐开关
-			params: {
-				//精品推荐分页
-				page: 1,
-				limit: 10
-			},
-			tempArr: [], //精品推荐临时数组
-			numConfig: 0,
-			pageInfo: '', // 精品推荐全数据
-			swiperCur: 0,
-			d: '',
-			h: '',
-			m: '',
-			s: '',
-			sum_h: '',
-			sortMarTop: 0,
-			globalDatas: {},
-			// #ifdef MP || APP-PLUS
-			mpHeight: 108,
-			// #endif
-			// #ifndef MP || APP-PLUS
-			mpHeight: 0,
-			// #endif
-			currSpid: '',
-			_options:{},
-			isIntegral: false,
-			appUpdate: {},
-			sortMpTop: 0,
-			bgColor: '',
-			bgPic: '',
-			bgTabVal: '',
-			windowHeight: 0,
-			domHeight: 0,
-			isHeaderSerch: false,
-			showCoupon: false,
-			couponArray: [],
-			smallPage: false,
-			isMenu: false,
-			isScale: false,
-			homeCombData: {},
-			appScroll: 0,
-			footerStatus: false,
-			newData: {},
-			activeRouter: '',
-			countNum: 0,
-			overflow: false
-		};
-	},
-	/**
-	 * 用户点击右上角分享
-	 */
-	// #ifdef MP
-	onShareAppMessage: function() {
-		let that = this;
-		wx.showShareMenu({
-			withShareTicket: true,
-			menus: ['shareAppMessage', 'shareTimeline']
-		});
-		return {
-			title: that.share_title,
-			path: '/pages/index/index?spid=' + that.uid
-		};
-	},
-	onShareTimeline: function() {
-		let that = this;
-		return {
-			title: that.share_title,
-			query: {
-				spid: that.uid
-			},
-			imageUrl: ''
-		};
-	},
-	// #endif
-	onLoad(options) {
-		let that = this
-		this._options = options;
-		// #ifdef APP-PLUS
-		const pages = getCurrentPages();
-		const page = pages[pages.length - 1];
-		const currentWebview = page.$getAppWebview();
-		currentWebview.setStyle({
-		  pullToRefresh: {
-		    support: !that.isSupport,
-		    style: plus.os.name === 'Android' ? 'circle' : 'default'
-		  }
-		});
-		that.isSupport = !that.isSupport;
-		that.appVersionConfig(); //APP版本检测
-		// #endif
-		that.$nextTick(function() {
-			uni.getSystemInfo({
-				success: function(res) {
-					that.windowHeight = res.windowHeight;
-				}
-			});
-		})
-		that.pageLoad(options);
-	},
-	created(options) {
-		let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-		let curRoute = routes[routes.length - 1].route //获取当前页面路由
-		this.activeRouter = '/' + curRoute
-	},
-	onShow() {
-		let that = this
-		that.getConfig();
-		that.isIntegral = uni.getStorageSync('isIntegral')
-		// #ifdef APP-PLUS
-		if(that.appUpdate.openUpgrade == '1'){
-			that.alertAppUpdate();
-		}
-		// #endif
-		that.getNav()
-		that.loadCoupon()
-	},
-	onHide() {
-		uni.setStorageSync('isIntegral',false)
-	},
-	onReady() {
-
-	},
-	watch: {
-		globalDatas(nVal, oVal) {
-			// #ifdef H5
-			this.ShareInfo(nVal);
-			// #endif
-		},
-	},
-	onPullDownRefresh(){
-		this.overflow = true;
-		this.reconnect();
-	},
-	methods: {
-		loadCoupon(){
-			if(!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')){
-				getNewPeopleCouponLst().then(res => {
-					this.couponArray = res.data;
-					setTimeout(() => {
-						this.showCoupon = this.couponArray.length > 0;
-						uni.setStorageSync('show_coupon', '1')
-					}, 1500);
-				})
-			}
-		},	
-		pageLoad(options){
-			let that = this;
-			if (options.spid) {
-				that.currSpid = options.spid;
-				app.globalData.spid = options.spid;
-			}
-			// #ifdef APP-PLUS
-			try {
-				let val = uni.getStorageSync('privacyStatus') || true;
-				if (!val) {
-					this.privacyStatus = true;
-				}
-			} catch (e) {}
-			this.snycNetWork();
-			// #endif
-			// #ifdef MP
-			if (options.scene) {
-				let value = that.$util.getUrlParams(decodeURIComponent(options.scene));
-				if (value.id) options.id = value.id;
-				//记录推广人uid
-				if (value.spid) {
-					that.currSpid = value.spid;
-					app.globalData.spid = value.spid;
-				}
-			}
-			// #endif
-			shareScence(that.currSpid, that.isLogin);
-			this.isLogin && silenceBindingSpread();
-			this.getIndexConfig()
-			Promise.all([
-				this.diyData(0),
-			]);
-			if (this.isLogin) {
-				this.getUserInfo();
-				// #ifdef MP
-				this.getHistory();
-				// #endif
-			}
-		},
-		closeShare(){
-			uni.setStorageSync('isIntegral',false);
-			this.isIntegral = uni.getStorageSync('isIntegral');
-		},
-		bindHeighta(data) {
-			// #ifdef APP-PLUS
-			this.sortMpTop = data.top + data.height;
-			// #endif
-		},
-		// 重新链接
-		reconnect() {
-			uni.getNetworkType({
-				success: res => {
-					this.errorNetwork = res.networkType === 'none';
-					if(!this.errorNetwork){
-						this.pageLoad(this._options);
-					}else{
-						uni.stopPullDownRefresh();
-						that.overflow = false;
-					}
-				}
-			});
-		},
-		getNav(){
-			getNavigation().then(res => {
-				this.newData = res.data
-				if (this.newData.status && this.newData.status.status) {
-					uni.hideTabBar()
-				} else {
-					uni.showTabBar()
-				}
-			})
-		},
-		// #ifdef APP-PLUS
-		snycNetWork() {
-			uni.getNetworkType({
-				success: res => {
-					this.errorNetwork = res.networkType === 'none';
-				}
-			});
-		},
-		// 同意隐私协议
-		confirmApp() {
-			uni.setStorageSync('privacyStatus', true);
-			this.privacyStatus = false;
-		},
-		// 关闭 Model
-		closeModel() {
-			this.privacyStatus = false;
-		},
-		// #endif
-		// 对象转数组
-		objToArr(data) {
-			let obj = Object.keys(data).sort();
-			let m = obj.map(key => data[key]);
-			return m;
-		},
-		goRouter(item) {
-			var pages = getCurrentPages();
-			var page = (pages[pages.length - 1]).$page.fullPath;
-			if (item.link == page) return
-			uni.switchTab({
-				url: item.link,
-				fail(err) {
-					uni.redirectTo({
-						url: item.link
-					})
-				}
-			})
-		},
-		diyData(id) {
-			let that = this;
-			let data = {
-				id: id
-			}
-			that.styleConfig = []
-			getDiy(data).then(res => {
-				setTimeout(() => {
-					that.isNodes++;
-				}, 0);
-				that.errorNetwork = false
-				uni.setNavigationBarTitle({
-					title: res.data.title
-				});
-				let data = res.data;
-				if (data.is_bg_color) {
-					that.bgColor = data.color_picker
-				}
-				if (data.is_bg_pic) {
-					that.bgPic = data.bg_pic
-					that.bgTabVal = data.bg_tab_val
-				}
-				that.styleConfig = that.objToArr(res.data.value);
-				that.styleConfig.forEach((item, index, arr) => {
-					if (item.name == 'headerSerch' || item.name == 'homeComb') {
-						that.isHeaderSerch = true
-						if(item.name == 'homeComb'){
-							that.homeCombData = item
-							that.smallPage = true;
-						}
-					}
-					if (item.name == 'pageFoot') {
-						if (item.status && item.status.status) {
-							this.newData = item
-							setTimeout((e) => {
-								that.$set(that, 'footerStatus', true);
-							}, 50)
-						}
-						uni.setStorageSync('FOOTER_BAR', item.status && item.status.status ? true : false)
-						item.menuList.map((path, index) => {
-							if (path.link === '/pages/order_addcart/order_addcart') {
-								uni.setStorageSync('FOOTER_ADDCART', index)
-							}
-						})
-						arr.splice(index, 1);
-					}
-					if(item.name == 'menus'){
-						that.isMenu = true;
-					}
-					that.get_host_product()
-					uni.pageScrollTo({
-						scrollTop: 0,
-					})
-					uni.stopPullDownRefresh();
-					that.overflow = false;
-				});
-			});
-		},
-		changeDiy(id) {
-			let that = this;
-			if(id){
-				that.styleConfig = []
-				getPageDiy({id: id}).then(res => {
-					uni.setNavigationBarTitle({
-						title: res.data.title
-					});
-					that.isScale = true
-					let data = res.data;
-					if (data.is_bg_color) {
-						that.bgColor = data.color_picker
-					}
-					if (data.is_bg_pic) {
-						that.bgPic = data.bg_pic
-						that.bgTabVal = data.bg_tab_val
-					}
-					that.styleConfig = that.objToArr(res.data.value);
-					that.styleConfig.forEach((item, index, arr) => {
-						if (item.name == 'headerSerch' || item.name == 'homeComb' ||  item.name == 'tabNav') {
-							that.styleConfig.splice(index, 1);
-						}
-						if(item.name == 'menus'){
-							that.isMenu = true;
-						}
-					});
-					that.isHeaderSerch = true
-					that.isScale = true
-					uni.pageScrollTo({
-						scrollTop: 0,
-					})
-				}).catch(err => {
-					that.styleConfig = []
-				});
-			}else{
-				that.diyData(0)
-				that.isScale = false
-			}
-		},
-		// 微信登录回调
-		onLoadFun: function(e) {
-			this.isShowAuth = false;
-		},
-		// #ifdef APP-PLUS
-		appVersionConfig() {
-			var that = this;
-			//app升级
-			// 获取本地应用资源版本号
-			getAppVersion().then(res => {
-				that.$set(that.appUpdate, 'androidAddress', res.data.androidAddress);
-				that.$set(that.appUpdate, 'appVersion', res.data.appVersion);
-				that.$set(that.appUpdate, 'iosAddress', res.data.iosAddress);
-				that.$set(that.appUpdate, 'openUpgrade', res.data.openUpgrade);
-				plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-					let nowVersion = (inf.version).split('.').join('');
-					let appVersion = (res.data.appVersion).split('.').join('');
-					that.$set(that.appUpdate, 'alert', appVersion > nowVersion);
-					that.alertAppUpdate();
-				});
-			})
-		},
-		alertAppUpdate(){
-			if(this.appUpdate.alert) {
-				uni.getSystemInfo({
-					success: (res) => {
-						uni.showModal({
-							title: '更新提示',
-							content: '发现新版本，是否前去下载?',
-							showCancel: this.appUpdate.openUpgrade != '1',
-							cancelColor: '#eeeeee',
-							confirmColor: '#FF0000',
-							success:(response)=> {
-								if (response.confirm) {
-									switch (res.platform) {
-										case "android":
-											plus.runtime.openURL(this
-												.appUpdate
-												.androidAddress);
-											break;
-										case "ios":
-											plus.runtime.openURL(encodeURI(
-												this.appUpdate
-												.iosAddress));
-											break;
-									}
-								}
-							}
-						});
-					}
-				})
-			}
-		},
-		// #endif
-		getConfig() {
-			// 获取配置
-			getconfig()
-				.then(res => {
-					let self = this;
-					this.globalDatas = res.data;
-					uni.$emit('configData', res.data);
-				})
-				.catch(err => {});
-		},
-		// 分类页更多
-		bindMore() {
-			try {
-				uni.setStorageSync('storeIndex', this.navTop[this.navIndex].pid);
-				uni.switchTab({
-					url: '/pages/goods_cate/goods_cate'
-				});
-			} catch (e) {}
-		},
-		goDetails(item) {
-			goShopDetail(item, this.uid).then(res => {
-				if (this.isLogin) {
-					initiateAssistApi(item.activity_id)
-						.then(res => {
-							let id = res.data.product_assist_set_id;
-							uni.hideLoading();
-							uni.navigateTo({
-								url: '/pages/activity/assist_detail/index?id=' + id
-							});
-						})
-						.catch(err => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							});
-						});
-				} else {
-					this.isAuto = true;
-					this.isShowAuth = true
-				}
-			});
-		},
-		/**
-		 * 获取个人用户信息
-		 */
-		getUserInfo: function() {
-			let that = this;
-			getUserInfo().then(res => {
-				that.userInfo = res.data;
-			});
-		},
-		// 记录会员访问
-		setVisit() {
-			setVisit({
-				url: '/pages/index/index'
-			}).then(res => {
-				console.log(res);
-			});
-		},
-		// 导航分类切换
-		changeTab(e) {
-			let self = this;
-			if (this.navIndex == e.index) return;
-			this.navIndex = e.index;
-			if (e.index > 0) {
-				storeCategory({
-					pid: e.pid
-				}).then(res => {
-					this.sortList = res.data.length > 9 ? res.data.splice(0, 9) : res.data;
-					if (this.sortList.length > 0) {
-						this.where.pid = e.pid;
-						this.where.page = 1;
-						this.loadend = false;
-						this.loading = false;
-						this.sortProduct = [];
-						this.get_product_list();
-						uni.pageScrollTo({
-							scrollTop: 0,
-						})
-					}
-				});
-				self.sortMarTop = 10;
-			}
-		},
-		//分类产品
-		get_product_list: function() {
-			let that = this;
-			if (that.loading) return;
-			that.loading = true;
-			that.loadTitle = '';
-			getProductslist(that.where)
-				.then(res => {
-					let list = res.data.list;
-					let productList = that.$util.SplitArray(list, that.sortProduct);
-					let loadend = list.length < that.where.limit;
-					that.loadend = loadend;
-					that.loading = false;
-					that.loadTitle = loadend ? '已全部加载' : '加载更多';
-					that.$set(that, 'sortProduct', productList);
-					that.$set(that.where, 'page', that.where.page + 1);
-				})
-				.catch(err => {
-					that.loading = false;
-					that.loadTitle = '加载更多';
-				});
-		},
-		/**
-		 * 获取我的推荐
-		 */
-		get_host_product: function() {
-			let that = this;
-			let num = that.hotLimit;
-			if (!that.hotScroll) return;
-			if (that.hotLoading) return;
-			that.hotLoading = true;
-			that.hotTitle = '';
-			getProductHot(that.hotPage, that.hotLimit).then(res => {
-				let list = res.data.list;
-				let productList = that.$util.SplitArray(list, that.hostProduct);
-				let hotScroll = list.length <= num && list.length != 0;
-				that.hotScroll = hotScroll;
-				that.hotLoading = false;
-				that.hotTitle = !hotScroll ? '已全部加载' : '加载更多';
-				that.$set(that, 'hostProduct', productList);
-				that.$set(that, 'hotPage', that.hotPage + 1);
-			});
-		},
-		// 首页数据
-		getIndexConfig: function() {
-			let that = this;
-			getIndexData().then(res => {
-				res.data.category.unshift({
-					cate_name: '首页'
-				});
-				that.$set(that, 'navTop', res.data.category);
-				// #ifdef H5
-				that.subscribe = res.data.subscribe;
-				// #endif
-				// 小程序判断用户是否授权；
-				// #ifdef MP
-				uni.getSetting({
-					success(res) {
-						if (!res.authSetting['scope.userInfo']) {
-							that.window = that.couponList.length ? true : false;
-						} else {
-							that.window = false;
-						}
-					}
-				});
-				// #endif
-				// #ifndef MP
-				if (that.isLogin) {
-					that.window = false;
-				} else {
-					that.window = that.couponList.length ? true : false;
-				}
-				// #endif
-				that.reloadData();
-			});
-		},
-		reloadData() {
-			setTimeout(() => {
-				this.showSkeleton = false
-			}, 500)
-		},
-		// 授权关闭
-		authColse: function(e) {
-			this.isShowAuth = e;
-		},
-		// 首发新品详情
-		goDetail(item) {
-			if (item.activity && item.activity.type === '2' && !this.isLogin) {
-				// #ifdef H5
-				uni.showModal({
-					title: '提示',
-					content: '您未登录，请登录！',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: '/pages/users/login/index'
-							});
-						} else if (res.cancel) {
-						}
-					}
-				});
-				// #endif
-				// #ifdef MP
-				this.$set(this, 'isAuto', true);
-				this.$set(this, 'isShowAuth', true);
-				// #endif
-				return;
-			} else {
-				goShopDetail(item, this.uid).then(res => {
-					uni.navigateTo({
-						url: `/pages/goods_details/index?id=${item.id}`
-					});
-				});
-			}
-		},
-		//#ifdef H5
-		ShareInfo(datas) {
-			let data = this.storeInfo;
-			let href = location.href;
-			if (this.$wechat.isWeixin()) {
-				if (this.isLogin) {
-					href = href.indexOf('?') === -1 ? href + '?spid=' + this.uid : href + '&spid=' + this.uid;
-				} else {
-					href = href;
-				}
-				let configAppMessage = {
-					desc: datas.share_info,
-					title: datas.share_title,
-					link: href,
-					imgUrl: datas.share_pic
-				};
-				this.$wechat
-					.wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareAppMessage', 'onMenuShareTimeline'], configAppMessage)
-					.then(res => {
-						console.log(res, '=============================>>WXAPI');
-					})
-					.catch(err => {
-						console.log(err);
-					});
-			}
-		},
-		//#endif
-	},
-	mounted() {
-		let query = uni.createSelectorQuery().in(this);
-		query.select("#home").boundingClientRect();
-		query.exec(res => {
-			this.domHeight = res[0].height;
-		})
-	},
-	// 滚动到底部
-	onReachBottom() {
-		if (this.navIndex == 0) {
-			// 首页加载更多
-			this.get_host_product();
-		} else {
-			// 分类栏目加载更多
-			if (this.sortProduct.length > 0) {
-				this.get_product_list();
-			} else {
-				this.get_host_product();
-			}
-		}
-	},
-	// 滚动监听
-	onPageScroll(e) {
-		if (this.isHeaderSerch) {
-			let isScroll = false
-			this.appScroll = e.scrollTop
-			// #ifdef APP-PLUS
-			// isScroll = e.scrollTop > 50
-			// #endif
-			// #ifdef MP || H5
-			// isScroll = e.scrollTop > 50 && this.windowHeight - this.domHeight >= 50
-			// #endif
-			isScroll = e.scrollTop > 50
-			this.isScrolled = isScroll;
-		} else {
-			this.isScrolled = false
-		}
-		// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
-		uni.$emit('scroll');
-	}
-};
+  import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
+  import zbpSwiper from '@/components/zbpSwiper'
+  import { getSlideAPI } from '@/api/lihai.js'
+  import { graphicLstApi, getTopicList, graphicStartApi } from '@/api/community.js'
+  import { getIndexData, getDiy } from '@/api/api.js'
+  import { getGeocoder, merClassifly } from '@/api/store.js';
+  import { getArea, getStreet } from '@/api/article.js';
+  import { Toast } from '@/libs/uniApi'
+  export default {
+    components: {
+      mTabbar,
+      zbpSwiper
+    },
+    data() {
+      return {
+        bgColor: '',
+        showPicker: false,
+        columnData: [],
+        show: false,
+        swiper: {
+          url: [{
+            img: ''
+          }],
+          indicatorDots: true, // 显示面板指示点
+          vertical: false, // 滑动方向是否为纵向
+          autoplay: true, // 是否自动切换
+          interval: 2000, // 自动切换时间间隔
+          duration: 500 // 滑动动画时长
+        },
+        tabsData: {
+          list: [],
+          tabsActive: 0
+        },
+        where: {
+          category_id: 0,
+          page: 1,
+          limit: 30
+        },
+        currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
+        keyword: '',
+        location: '',
+        emptyShow: false,
+        street: '',
+        cateGoods: []
+      }
+    },
+    onPullDownRefresh() {
+      this.getCateList()
+      this.getGoods()
+      this.selfLocation()
+      this.Area()
+      uni.stopPullDownRefresh()
+    },
+    onLoad() {
+      this.getCateList()
+      this.getGoods()
+      this.selfLocation()
+      this.Area()
+    },
+    onShow() {},
+    methods: {
+      confirm(e) {
+        this.where.street_id = e.value[1].code
+        this.showPicker = false
+      },
+      changeHandler(e) {
+        const {
+          columnIndex,
+          value,
+          values,
+          index,
+          picker = this.$refs.uPicker
+        } = e;
+        if (columnIndex === 0) {
+          getStreet({
+            area_code: value[0]['code']
+          }).then(res => {
+            this.$refs.uPicker.setColumnValues(1, res.data);
+          });
+        }
+      },
+      Area() {
+        getArea({
+          city_code: 510500
+        }).then(res => {
+          this.$refs.uPicker.setColumnValues(0, res.data);
+          this.Street(res.data[0]['code']);
+        });
+      },
+      Street(code) {
+        getStreet({
+          area_code: code
+        }).then(res => {
+          this.$refs.uPicker.setColumnValues(1, res.data);
+        });
+      },
+      gogogo(item) {
+        if (this.tabsData.tabsActive == 1) {
+          uni.navigateTo({
+            //#ifdef APP
+            url: '/pages/short_video/appSwiper/index?id=' + item.community_id
+            //#endif
+            //#ifndef APP
+            url: '/pages/short_video/nvueSwiper/index?id=' + item.community_id
+            //#endif
+          })
+        } else {
+          uni.navigateTo({
+            url: '/pages/plantGrass/plant_detail/index?id=' + item.community_id
+          })
+        }
+      },
+      giveStart(item) {
+        let status = item.relevance_id ? 0 : 1
+        graphicStartApi(item.community_id, {
+          status: status
+        }).then(res => {
+          Toast(res.message)
+          this.getGoods()
+        })
+      },
+      dianji() {
+        this.show = !this.show
+      },
+      // 获取发现商品
+      getGoods: function() {
+        // 数据写死：默认社区数据 category_id=69&page=1&limit=30
+        graphicLstApi(this.where).then(res => {
+          this.cateGoods = res.data.list
+          res.data.list.length <= 0 ? this.emptyShow = true : this.emptyShow = false
+        })
+      },
+      /*获取分类列表*/
+      async getCateList() {
+        const {
+          data
+        } = await getTopicList()
+        this.tabsData.list = [{
+          cate_name: "推荐",
+          category_id: 0
+        }, {
+          cate_name: "视频",
+          category_id: -1,
+          children: []
+        }, ...data]
+      },
+      tabsChange(item) {
+        this.where.category_id = item.category_id
+        this.getGoods()
+        this.street_id = item.id
+        this.tabsData.tabsActive = item.index
+        if (item.index == 1) {
+          uni.navigateTo({
+            // #ifdef MP || H5
+            url: '/pages/short_video/nvueSwiper/index?id=' + this.cateGoods[0].community_id
+            // #endif
+            // #ifdef APP
+            url: `/pages/short_video/appSwiper/index?id=${this.cateGoods[0].community_id}`
+            // #endif
+          })
+        }
+      },
+      selfLocation() {
+        uni.getLocation({
+          type: 'gcj02',
+          success: (res) => {
+            let latitude, longitude;
+            latitude = res.latitude.toString();
+            longitude = res.longitude.toString();
+            getGeocoder({ lat: latitude, long: longitude }).then(res => {
+              this.$store.commit('setLocation', res.data)
+              this.street = res.data.address_component.street
+            }).catch(err => {
+              uni.showToast({
+                title: err,
+                icon: 'none'
+              })
+            })
+          },
+          fail: (err) => {
+            uni.showToast({
+              title: err.errMsg,
+              icon: 'none',
+              duration: 1000
+            });
+          }
+        });
+      },
+    }
+  }
 </script>
-<style>
 
-</style>
-<style lang="scss" scoped>
-.bnt1{
-	color: red;
-}
-.overflow-mask{
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 1001;
-	width: 100%;
-	height: 100vh;
-	background: transparent;
-	transition: all .5s;
-}
-page {
-	display: flex;
-	flex-direction: column;
-}
-/deep/ .home-comb .my-main{
-	left: 0;
-	position: fixed;
-	top: 0;
-	width: 100%;
-	z-index: 30;
-}
-.main {
-	padding: 0 20rpx;
-}
-.colum0{
-	white-space: nowrap; 
-	display: flex;
-}
-.ysize {
-	background-size: 100%;
-}
-.fullsize {
-	background-size: 100% 100%;
-}
-.repeat {
-	background-repeat: repeat;
-}
-.noRepeat {
-	background-repeat: no-repeat;
-}
-.privacy-wrapper {
-	z-index: 999;
-	position: fixed;
-	left: 0;
-	top: 0;
-	bottom: 0;
-	right: 0;
-	width: 100%;
-	height: 100%;
-	background: #7f7f7f;
-	.privacy-box {
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%, -50%);
-		width: 560rpx;
-		padding: 50rpx 45rpx 0;
-		background: #fff;
-		border-radius: 20rpx;
-		.title {
-			text-align: center;
-			font-size: 32rpx;
-			text-align: center;
-			color: #333;
-			font-weight: 700;
-		}
-		.content {
-			margin-top: 20rpx;
-			line-height: 1.5;
-			font-size: 26rpx;
-			color: #666;
-			navigator {
-				display: inline-block;
-				color: #e93323;
-			}
-		}
-		.btn-box {
-			margin-top: 40rpx;
-			text-align: center;
-			font-size: 30rpx;
-			.btn-item {
-				height: 82rpx;
-				line-height: 82rpx;
-				background: linear-gradient(90deg, #f67a38 0%, #f11b09 100%);
-				color: #fff;
-				border-radius: 41rpx;
-			}
-			.btn {
-				padding: 30rpx 0;
-			}
-		}
-	}
-}
-.coupon_popups{
-	z-index: 999;
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	text-align: center;
-	.bg{
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		background-color: rgba(0,0,0,.5);
-	}
-	.con{
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		transform: translate(-50%,-50%);
-		width: 680rpx;
-		height:900rpx;
-		background-size: 100% 700rpx;
-		background-repeat: no-repeat;
-		scroll-view{
-			width: 610rpx;
-			height: 306rpx;
-			padding-top: 20rpx;
-			margin: 300rpx auto 0;
-		}
-		.item{
-			display: flex;
-			align-items: center;
-			width: 100%;
-			height: 164rpx;
-			background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABDgAAAFICAMAAACC1L7bAAAAilBMVEUAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////2N2iNAAAALXRSTlMA9xnrZyf0790ev4d1Egr7cl9TI+XNbVpAtKSUjX0NB6ucgnpDMdjRxUw7LdTK5bIiAAAF40lEQVR42uzcWW7CMBSF4UNImAIBEcpUKJQixt79b68qD1VLgNi8VHL+bxHH9tH1VUE+SeedVs1QkMmNAYGotTrzdNJWiSRtGe7J5aRnQFh2m1z3ndeGB05ycjYgOPNct2WLvuGRoZxMDAhPbbnSDQmPlDKpnCwMCNE+UsGxYSixl5MXA4JUP+lKbCgXyUHbgED1J/pjbHAwloONAcGKqfP8jVYqlTUNCNdQPxKDmw+V6hoQsEZOm+et0VOJHiUzwnbgjPQ3Uwlm6BC6WBcRZ6SHpa7QMqNimj19ezd42OqBLcO3CF/K2IG/5lR3Tbm8oQIuVd/S4CfmnYJqiyXtDJ5eM92QdAyohI6UG7zVB7qWpQZUxRufVJ4z6kb65dytG1AZR80NzzkMTkkkKY/XpAaqJWVqFICvmfiSBcDTp1hnDsDTiFX+AHzVCA4A3ggOAAQHgAKCA8D/Izi+2KmDAQAAAAZC/tYDGMB9CiJAHMARB9ATByAO4IgD6IkDEAdwxAH0xAGIAzjiAHriAMQBHHEAPXEA4gCOOICeOABxAEccQE8cgDiAIw6gJw5AHMARB9ATByAOxk4dDAAAADAQ8rcewADuUxDBEQfQEwcgDuCIA+iJAxAHcMQB9MQBiAM44gB64gDEARxxAD1xAOIAjjiAnjgAcQBHHEBPHIA4gCMOoCcOQBzAEQfQEwcgDuCIA+iJAxAHcMQB9MQBiAM44gB64gDEARxxAD1xAOIAjjiAnjgAcQBHHEBPHIA4gCMOoCcOQBzAEQfQEwcgDuCIA+iJAxAHcMQB9MQBjJ06GAAAAGAg5G89gAHcpyASB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cTB26mAAAACAgZC/9QAOYJ+CCMQBhDiAP3EA4gBCHMCfOABxACEO4E8cgDiAEAfwJw5AHECIA/gTByAOIMQB/IkDEAcQ4gD+xAGIAwhxAH/iAMQBhDiAP3EA4gBCHMCfOABxACEO4E8cgDiAEAfwJw5AHECIA/gTByAOIMQB/IkDEAcQ4gD+xAGIAwhxAH/iAMQBhDiAP3EA4gBCHMCfOABxACEOYOzUwQAAAAADIX/rAQzgPgVRTxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giIOxU4cEAIBAEMBAIUny/esR4BTqzBZi0CcOQBxAEAfQJw5AHEAQB9AnDkAcQBAH0CcOQBxAEAfQJw5AHEAQB9AnDkAcQBAH0CcOQBxAEAfQt+4AfNnrDK+dO8tNGIaiMHwSoBAKlERAQ4FQhnSQeve/vaoPRVWayTza/7cI2/ecKwNwMtDEAMDJRFMDACdb7Qz3WZ3SRJqX2fJ1YEBI9no23GGyGemP8sLZgYBkig3uLqpaLDk6EIy5tDY42iaqsTgZEISppJnBSZSqwdKAEAwlZhVHg1KNcrZiEICHQhK9ipOoVIucRVz476wfcWToLVOroQGeG8wlkXI42akF7zeE4BbyvRv6WS3UoaCVhd+m+jUy9JPqhmoFQRrHukkNfUzU7bgywF+fXJPONmpFZATvDSttAD1it6hQMwY/+O8pVcWV3aVOW/XBFyfw1TjXP8mXod1MvewN8NE6Vo3jmU2wdrlaEDXDb9HhqHqjF0OLWL1cDfDOKVGz5PBmaCKJdBQhWl9idUiy/QczSy31UxjgjYfpYxar6hufchGebA48QgAAAABJRU5ErkJggg==');
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-			margin-bottom: 20rpx;
-			border-radius: 20rpx;
-			position: relative;
-			.left{
-				width: 160rpx;
-				text-align: center;
-				&::after{
-					content: "";
-					display: block;
-					height: 110rpx;
-					border-right: 1px dashed #E6E6E6;
-					position: absolute;
-					left: 178rpx;
-					top: 25rpx;
-				}
-				.price{
-					color: #E93323;
-					font-size: 26rpx;
-					font-weight: bold;
-					text{
-						font-size: 46rpx;
-					}
-				}
-				.max_price{
-					color: #999999;
-					font-size: 18rpx;
-					margin-top: 8rpx;
-				}
-			}
-			.right{
-				width: 440rpx;
-				padding: 0 20rpx;
-				.title{
-					color: #333333;
-					font-size: 26rpx;
-				}
-				.time{
-					color: #999999;
-					font-size: 22rpx;
-					margin-top: 20rpx;
-				}
-				.bnt1{
-					.titleSize{
-						font-weight: 700;
-						font-size: 33rpx;
-					}
-					.titleColor{
-						margin-top: 20rpx;
-						color: #999999;
-					}
-				}
-				.coupon_type{
-					position: absolute;
-					color: #fff;
-					font-size: 15rpx;
-					width: 30rpx;
-					text-align: center;
-					height: auto;
-					background: #E93323;
-					top: 0;
-					right: 20rpx;
-					line-height: 26rpx;
-					padding: 5rpx 0 15rpx;
-					&::after{
-						content: "";
-						width: 0;
-						height: 0;
-						border-left: 14rpx solid transparent;
-						border-right: 14rpx solid transparent;
-						border-bottom: 14rpx solid #fff;
-						position: absolute;
-						bottom: -4rpx;
-						left: 2rpx;
-					}
-				}
-			}
-		}
-		.text{
-			width: 600rpx;
-			margin: 30rpx auto 0;
-			font-size: 20rpx;
-			color: #ffffff;
-		}
-		.icon-guanbi3{
-			color: #ffffff;
-			font-size: 70rpx;
-			position: absolute;
-			bottom: -80rpx;
-			left: 320rpx;
-		}
-	}
-}
-.item_tags{
-	margin-top: 8rpx;
-	display: flex;
-}
-.item_tags .tags_item {
-	display: inline-block;
-	font-size: 20rpx;
-	text-align: center;
-	border-radius: 5rpx;
-	padding: 0 4rpx;
-	line-height: 28rpx;
-	margin-right: 8rpx;
-}
-.item_tags .tags_item.ticket{
-	color: var(--view-theme);
-	border: 1px solid var(--view-theme);
-}
-.item_tags .tags_item.delivery{
-	color: #FF9000;
-	border: 1px solid #FF9000;
-}
-.copyRight{
-	margin: 60rpx auto 20rpx;
-	max-width: 690rpx;
-	font-size: 20rpx;
-	color: #707070;
-	text-decoration: none;
-}
-.share-box {
-	z-index: 1000;
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	height: 100%;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-.error-network {
-	position: fixed;
-	left: 0;
-	top: 0;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	width: 100%;
-	height: 100%;
-	padding-top: 40rpx;
-	background: #fff;
-	padding-top: 30%;
-	image {
-		width: 414rpx;
-		height: 336rpx;
-	}
-	.title {
-		position: relative;
-		top: -40rpx;
-		font-size: 32rpx;
-		color: #666;
-	}
-	.con {
-		font-size: 24rpx;
-		color: #999;
-		.label {
-			margin-bottom: 20rpx;
-		}
-		.item {
-			margin-bottom: 20rpx;
-		}
-	}
-	.btn {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		width: 508rpx;
-		height: 86rpx;
-		margin-top: 100rpx;
-		border: 1px solid #d74432;
-		color: #e93323;
-		font-size: 30rpx;
-		border-radius: 120rpx;
-	}
-}
-.area-row {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	display: block;
-	width: 100%;
-	text-align: center;
-}
-.page-index {
-	display: flex;
-	flex-direction: column;
-	min-height: 100%;
-	.page_content {
-		/* #ifdef MP || APP-PLUS */
-		padding-top: 270rpx;
-		/* #endif */
-		.page_bg{
-			background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
-		}
-		.nav {
-			padding: 0 0rpx 30rpx;
-			flex-wrap: wrap;
-			/* #ifdef MP */
-			margin-top: 0;
-			/* #endif */
-			/* #ifdef H5 */
-			margin-top: 0;
-			/* #endif */
-			.item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				width: 20%;
-				margin-top: 30rpx;
-				image {
-					width: 82rpx;
-					height: 82rpx;
-				}
-			}
-		}
-		.index-product-wrapper {
-			.nav-bd {
-				display: flex;
-				align-items: center;
-				.item {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					justify-content: center;
-					width: 25%;
-					.txt {
-						font-size: 32rpx;
-						color: #282828;
-					}
-					.label {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						width: 124rpx;
-						height: 32rpx;
-						margin-top: 5rpx;
-						font-size: 24rpx;
-						color: #999;
-					}
-					&.active {
-						color: $theme-color;
-						.label {
-							background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
-							border-radius: 16rpx;
-							color: #fff;
-						}
-					}
-				}
-			}
-			.list-box {
-				display: flex;
-				flex-wrap: wrap;
-				justify-content: space-between;
-				.item {
-					width: 345rpx;
-					margin-bottom: 20rpx;
-					background-color: #fff;
-					border-radius: 10px;
-					overflow: hidden;
-					image {
-						width: 100%;
-						height: 345rpx;
-					}
-					.text-info {
-						padding: 10rpx 20rpx 15rpx;
-						.title {
-							color: #222222;
-						}
-						.old-price {
-							margin-top: 8rpx;
-							font-size: 26rpx;
-							color: #aaaaaa;
-							text-decoration: line-through;
-							text {
-								margin-right: 2px;
-								font-size: 20rpx;
-							}
-						}
-						.price {
-							display: flex;
-							align-items: flex-end;
-							color: $theme-color;
-							font-size: 34rpx;
-							font-weight: 800;
-							text {
-								padding-bottom: 4rpx;
-								font-size: 24rpx;
-								font-weight: normal;
-							}
-							.txt {
-								display: flex;
-								align-items: center;
-								justify-content: center;
-								width: 28rpx;
-								height: 28rpx;
-								margin-left: 15rpx;
-								margin-bottom: 10rpx;
-								border: 1px solid $theme-color;
-								border-radius: 4rpx;
-								font-size: 22rpx;
-								font-weight: normal;
-							}
-						}
-					}
-				}
-				&.on {
-					display: flex;
-				}
-			}
-		}
-	}
-}
-.productList {
-	background-color: #f1f1f1;
-	min-height: 70vh;
-	.sort {
-		width: 710rpx;
-		max-height: 380rpx;
-		background: rgba(255, 255, 255, 1);
-		border-radius: 16rpx;
-		padding: 8rpx 0rpx 30rpx;
-		flex-wrap: wrap;
-		margin: 25rpx auto 0 auto;
-		.item {
-			width: 20%;
-			margin-top: 30rpx;
-			text-align: center;
-			.pictrues {
-				width: 90rpx;
-				height: 90rpx;
-				background: rgba(248, 248, 248, 1);
-				border-radius: 50%;
-				margin: 0 auto;
-			}
-			.easy-loadimage {
-				width: 90rpx;
-				height: 90rpx;
-				display: inline-block;
-			}
-			.text {
-				color: #272727;
-				font-size: 24rpx;
-				margin-top: 10rpx;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-			}
-		}
-	}
-}
-.productList .list {
-	padding: 0 20rpx;
-}
-.productList .list.on {
-	background-color: #fff;
-	border-top: 1px solid #f6f6f6;
-}
-.productList .list .item {
-	width: 345rpx;
-	margin-top: 20rpx;
-	background-color: #fff;
-	border-radius: 10rpx;
-	.name{
-		display: flex;
-		align-items: center;
-	}
-}
-.productList .list .item.on {
-	width: 100%;
-	display: flex;
-	border-bottom: 1px solid #f6f6f6;
-	padding: 30rpx 0;
-	margin: 0;
-}
-.productList .list .item .pictrue {
-	position: relative;
-	width: 100%;
-	height: 345rpx;
-}
-.productList .list .item .pictrue.on {
-	width: 180rpx;
-	height: 180rpx;
-}
-/deep/.productList .list .item .pictrue image,
-/deep/.productList .list .item .pictrue uni-image,
-/deep/.productList .list .item .pictrue .easy-loadimage{
-	width: 100%;
-	height: 100%;
-	border-radius: 10rpx 10rpx 0 0;
-}
-/deep/.productList .list .item .pictrue uni-image.origin-img{
-	border-radius: 10rpx 10rpx 0 0;
-}
-.productList .list .item .pictrue image.on {
-	border-radius: 6rpx;
-}
-.productList .list .item .text {
-	padding: 14rpx 17rpx 26rpx 17rpx;
-	font-size: 28rpx;
-	color: #212121;
-}
-.productList .list .item .text.on {
-	width: 508rpx;
-	padding: 0 0 0 22rpx;
-}
-.productList .list .item .text .money {
-	font-size: 26rpx;
-	font-weight: bold;
-	margin-top: 8rpx;
-}
-.productList .list .item .text .coupon {
-	background: rgba(255, 248, 247, 1);
-	border: 1px solid rgba(233, 51, 35, 1);
-	border-radius: 4rpx;
-	font-size: 20rpx;
-	margin-left: 18rpx;
-	padding: 1rpx 4rpx;
-}
-.productList .list .item .text .money.on {
-	margin-top: 50rpx;
-}
-.productList .list .item .text .money .num {
-	font-size: 34rpx;
-}
-.pictrue {
-	position: relative;
-	
-	.border-picture {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		border-radius: 10rpx 10rpx 0 0;
-		background: center/cover no-repeat;
-	}
-}
-.cate_pictrue,/deep/.cate_pictrue image,/deep/.cate_pictrue .easy-loadimage,/deep/.cate_pictrue uni-image{
-	width: 82rpx;
-	height: 82rpx;
-	margin: 0 auto;
-}
-.fixed {
-	z-index: 100;
-	position: fixed;
-	left: 0;
-	top: 0;
-	background-color: #fff;
-	box-shadow: 0 10rpx 20rpx -5rpx rgba(0, 0, 0, 0.06);
-}
-.diyheight{
-	height: 98rpx;
-	height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-	height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-}
-.page-footer {
-	position: fixed;
-	bottom: 0;
-	z-index: 30;
-	display: flex;
-	align-items: center;
-	justify-content: space-around;
-	width: 100%;
-	height: 98rpx;
-	height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-	height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-	box-sizing: border-box;
-	border-top: 1px solid #F3F3F3;
-	background-color: #fff;
-	box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
-	padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
-	padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
-	&.filter{
-		filter: blur(2rpx);
-	}
-	.foot-item {
-		display: flex;
-		width: max-content;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		position: relative;
-		.count-num {
-			position: absolute;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			width: 40rpx;
-			height: 40rpx;
-			top: 0rpx;
-			right: -15rpx;
-			color: #fff;
-			font-size: 20rpx;
-			background-color: #FD502F;
-			border-radius: 50%;
-			padding: 4rpx;
-		}
-	}
-	.foot-item image {
-		height: 50rpx;
-		width: 50rpx;
-		text-align: center;
-		margin: 0 auto;
-	}
-	.foot-item .txt {
-		font-size: 24rpx;
-	}
-}
-</style>
+<style lang="scss">
+  page {
+    // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+  }
+
+  .Circle_friends {
+    position: relative;
+    padding: 0 0 87.72rpx 0;
+    background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+  }
+
+  .circle_friends_wrapper {
+    position: relative;
+    z-index: 2;
+  }
+
+
+  .search_wrapper {
+    width: 694.74rpx;
+    margin: 0 auto;
+  }
+
+  .tabs_wrapper {
+    width: 694.74rpx;
+    margin: 0 auto;
+    margin-bottom: 21.05rpx;
+  }
+
+  .empty_wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .goods {
+    margin: 0 auto;
+    width: 694.74rpx;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+
+    .goods_item {
+      width: 342.11rpx;
+      height: 491.23rpx;
+      border-radius: 8px;
+      overflow: hidden;
+      background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      margin-bottom: 10.53rpx;
+
+      .goods_img {
+        width: 100%;
+        height: 294.74rpx;
+      }
+
+      .botm {
+        flex: 1;
+        padding: 0 14.04rpx;
+        padding-bottom: 21.05rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+
+        .title {
+          margin: 12px 0;
+          width: 100%;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 2;
+          -webkit-box-orient: vertical;
+        }
+
+        .goods_info {
+          justify-content: space-between;
+
+          .g_img {
+            width: 60rpx;
+            height: 60rpx;
+            border-radius: 50%;
+          }
+
+          .g_name {
+            margin-left: 8.77rpx;
+            width: 100.63rpx;
+            text-overflow: ellipsis;
+            /* 溢出显示省略号 */
+            overflow: hidden;
+            /* 溢出隐藏 */
+            white-space: nowrap;
+            /* 强制不换行 */
+          }
+
+          .nice_box {
+            display: flex;
+            align-items: center;
+
+            .isshow {
+              color: #FE3530 !important;
+            }
+
+            .iconfont {
+              font-size: 30rpx;
+            }
+
+            .icon-shoucang1 {
+              color: #F84221;
+            }
+
+            .collect {
+              font-size: 24rpx;
+              margin-left: 5rpx;
+            }
+          }
+        }
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/index/index_two.vue b/pages/index/index_two.vue
new file mode 100644
index 0000000..3011f4d
--- /dev/null
+++ b/pages/index/index_two.vue
@@ -0,0 +1,1757 @@
+<template>
+	<view :class="bgTabVal==2?'fullsize noRepeat':bgTabVal==1?'repeat ysize':'noRepeat ysize'"
+		:style="'background-color:'+bgColor+';background-image: url('+bgPic+');min-height:'+windowHeight+'px;'" id="home">
+		<skeleton :show="showSkeleton" :isNodes="isNodes" ref="skeleton" loading="chiaroscuro" selector="skeleton" bgcolor="transparent"></skeleton>
+		<view v-if="!errorNetwork" :style="{visibility: showSkeleton ? 'hidden' : 'visible'}">
+			<view class="page-index skeleton" :class="{ bgf: navIndex > 0 }">
+				<block>
+					<!-- #ifdef H5 -->
+					<homeComb v-if="smallPage" class="home-comb" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :userInfo="userInfo" :isFixed="isFixed" :isScrolled="isScrolled" @changeDiy="changeDiy"></homeComb>
+					<view v-for="(item, index) in styleConfig" :key="index">
+						<block v-if="item.name != 'headerSerch' && item.name != 'tabNav' && item.name != 'shopList' && item.name != 'homeComb' && item.name != 'hotRanking' && item.name != 'pageFoot'">
+							<component
+								:is="item.name"
+								:index="index"
+								:isFixed="isFixed"
+								:dataConfig="item"
+								:tempArr="tempArr"
+								:userInfo="userInfo"
+								:tabTitle="navTop"
+								:navIndex="navIndex"
+								@changeTab="changeTab"
+								@detail="goDetail"
+								v-show="navIndex == 0"
+							></component>
+						</block>
+						<block v-if="item.name == 'headerSerch'">
+							<headerSerch
+								:dataConfig="item"
+								:tempArr="tempArr"
+								:userInfo="userInfo"
+								:tabTitle="navTop"
+								@changeTab="changeTab"
+								@detail="goDetail"
+							></headerSerch>
+						</block>
+						<block v-if="item.name == 'shopList' && hide_mer_status != 1 && navIndex == 0">
+							<shopList :dataConfig="item"></shopList>
+						</block>
+						<block v-if="item.name == 'tabNav'">
+							<tabNav
+								:isFixed="isFixed"
+								:dataConfig="item"
+								:tempArr="tempArr"
+								:userInfo="userInfo"
+								:tabTitle="navTop"
+								@changeTab="changeTab"
+								@detail="goDetail"
+							></tabNav>
+						</block>
+						<block v-if="item.name == 'homeComb' && !smallPage">
+							<homeComb :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy"></homeComb>
+						</block>
+						<block v-if="item.name == 'hotRanking' && hot_ranking_switch != 0 && navIndex == 0">
+							<hotRanking :dataConfig="item"></hotRanking>
+						</block>
+					</view>				
+					<!-- #endif -->
+					<!-- #ifdef MP || APP-PLUS -->
+					<homeComb class="home-comb" v-if="smallPage" :isScale="isScale" :isMenu="isMenu" :dataConfig="homeCombData" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy"	@bindHeight="bindHeighta"></homeComb>
+					<block v-for="(item, index) in styleConfig" :key="index" >
+						<view v-show="navIndex == 0">
+							<homeComb v-if="item.name == 'homeComb' && !smallPage" :isMenu="isMenu" :dataConfig="item" :isFixed="isFixed" :isScrolled="isScrolled" :userInfo="userInfo" @changeDiy="changeDiy" @bindHeight="bindHeighta"></homeComb>
+							<activeParty v-if="item.name == 'activeParty'" :dataConfig="item"></activeParty>
+							<bargain v-if="item.name == 'bargain'" :dataConfig="item"></bargain>
+							<blankPage v-if="item.name == 'blankPage'" :dataConfig="item"></blankPage>
+							<combination v-if="item.name == 'combination'" :dataConfig="item"></combination>
+							<topic v-if="item.name == 'topic'" :dataConfig="item"></topic>
+							<coupon v-if="item.name == 'coupon'" :dataConfig="item"></coupon>
+							<customerService v-if="item.name == 'customerService'" :dataConfig="item"></customerService>
+							<goodList v-if="item.name == 'goodList'" :dataConfig="item" @detail="goDetail"></goodList>
+							<guide v-if="item.name == 'guide'" :dataConfig="item"></guide>
+							<liveBroadcast v-if="item.name == 'liveBroadcast'" :dataConfig="item"></liveBroadcast>
+							<menus :class="isMenu ? 'transform-view' : ''" v-if="item.name == 'menus'" :dataConfig="item"></menus>
+							<news v-if="item.name == 'news'" :dataConfig="item"></news>
+							<presellList v-if="item.name == 'presellList'" :dataConfig="item"></presellList>
+							<plantList v-if="item.name == 'plantList'" :dataConfig="item"></plantList>
+							<hotRanking v-if="item.name == 'hotRanking' && hot_ranking_switch != 0" :dataConfig="item"></hotRanking>
+							<promotionList v-if="item.name == 'promotionList'" :dataConfig="item" @changeTab="changeTab" :tempArr="tempArr" @detail="goDetail"></promotionList>
+							<richText v-if="item.name == 'richText'" :dataConfig="item"></richText>
+							<seckill v-if="item.name == 'seckill'" :dataConfig="item"></seckill>
+							<swiperBg v-if="item.name == 'swiperBg'" :dataConfig="item"></swiperBg>
+							<pictureCube v-if="item.name == 'pictureCube'" :dataConfig="item"></pictureCube>
+							<titles v-if="item.name == 'titles'" :dataConfig="item"></titles>
+							<shopList v-if="item.name == 'shopList' && hide_mer_status != 1" :dataConfig="item"></shopList>
+						</view>
+						<headerSerch v-if="item.name == 'headerSerch'" :dataConfig="item" :userInfo="userInfo"></headerSerch>
+						<tabNav v-if="item.name == 'tabNav'" :dataConfig="item" class="tabNav" :tabTitle="navTop"
+						@bindHeight="bindHeighta" @changeTab="changeTab" :isFixed="isFixed"></tabNav>
+					</block>
+					<!-- #endif -->
+					<view class="main" v-show="navIndex == 0">
+						<!-- 首页推荐 -->
+						<view class="index-product-wrapper">
+							<!-- 首发新品 -->
+							<recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :indexP="true" :isLogin="isLogin"></recommend>
+							<view class="loadingicon acea-row row-center-wrapper" v-if="hostProduct.length > 0">
+								<text class="loading iconfont icon-jiazai" :hidden="hotLoading == false"></text>
+								{{ hotTitle }}
+							</view>
+						</view>
+					</view>
+					<view v-show="navIndex == 0" class="loadingicon acea-row row-center-wrapper" v-if="tempArr.length && styleConfig[styleConfig.length - 1].name == 'promotionList'">
+						<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
+						{{ loadTitle }}
+					</view>
+				</block>
+				<!-- 分类页 -->
+				<view class="productList" v-if="navIndex > 0">
+					<view class="sort acea-row" v-if="sortList.length>0"  :style="{ marginTop: sortMarTop + 'px' }">
+						<navigator
+							hover-class="none"
+							v-if="index < 9"
+							:url="'/pages/columnGoods/goods_list/index?id=' + item.store_category_id + '&title=' + item.cate_name"
+							class="item"
+							v-for="(item, index) in sortList"
+							:key="item.store_category_id"
+						>
+							<view class="pictrue cate_pictrue">
+								<easy-loadimage :image-src="item.pic"></easy-loadimage>
+								<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
+							</view>
+							<view class="text">{{ item.cate_name }}</view>
+						</navigator>
+						<view class="item" @click="bindMore" v-if="sortList.length >= 9">
+							<view class="pictrues acea-row row-center-wrapper"><text class="iconfont icon-gengduo1"></text></view>
+							<view class="text" style="margin-top: 22rpx;">更多</view>
+						</view>
+					</view>	
+					<block v-if="sortProduct.length > 0">
+						<view class="list acea-row row-between-wrapper">
+							<navigator @tap="goDetails(item)" class="item" v-for="(item, index) in sortProduct" :key="item.product_id">
+								<view class="pictrue">
+									<easy-loadimage :image-src="item.image"></easy-loadimage>
+									<view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }" class="border-picture"></view>
+								</view>
+								<view class="text">
+									<view class="name line1">
+										<text class="name_text line2">{{ item.store_name }}</text>
+									</view>
+									<view class="acea-row row-middle">
+										<view class="money font-color-red">
+											￥
+											<text class="num">{{ item.price }}</text>
+										</view>
+									</view>
+									<view class="item_tags acea-row">
+										<text v-if="item.merchant.type_name && item.product_type == 0" class="font-bg-red">{{ item.merchant.type_name }}</text>
+										<text v-else-if="item.merchant.is_trader && item.product_type == 0" class="font-bg-red">自营</text>
+										<text v-if="item.product_type != 0" :class="'font_bg-red type' + item.product_type">
+											{{ item.product_type == 1 ? '秒杀' : item.product_type == 2 ? '预售' : item.product_type == 3 ? '助力' : item.product_type == 4 ? '拼团' : '' }}
+										</text>
+										<text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+										<text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
+									</view>
+								</view>
+							</navigator>
+							<view class="loadingicon acea-row row-center-wrapper" v-if="sortProduct.length > 0 || sortProductLoading">
+								<text class="loading iconfont icon-jiazai" :hidden="loading == false"></text>
+								{{ loadTitle }}
+							</view>
+						</view>
+					</block>		
+					<block v-if="sortProduct.length == 0">
+						<view class="noCommodity">
+							<view class="pictrue" style="margin: 0 auto;">
+								<image src="/static/images/noCart.png"></image>
+								<view>暂无商品，去看点什么吧</view>
+							</view>
+							<recommend :hostProduct="hostProduct"></recommend>
+						</view>
+					</block>
+				</view>
+				<!-- #ifdef H5 -->
+				<a v-if="beian_sn" href="https://beian.miit.gov.cn/#/Integrated/index" class="copyRight">{{beian_sn}}</a>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<view v-if="beian_sn" class="copyRight">{{beian_sn}}</view>
+				<!-- #endif -->
+				<view v-if="newData.status && newData.status.status" class="diyheight"></view>
+			</view>
+		</view>
+		<view v-else>
+			<view class="error-network">
+				<image src="/static/images/error-network.png"></image>
+				<view class="title">网络连接断开</view>
+				<view class="con">
+					<view class="label">请检查情况：</view>
+					<view class="item">· 在设置中是否已开启网络权限</view>
+					<view class="item">· 当前是否处于弱网环境</view>
+					<view class="item">· 版本是否过低，升级试试吧</view>
+				</view>
+				<view class="btn" @click="reconnect">重新连接</view>
+			</view>
+		</view>
+		<!-- #ifdef APP-PLUS -->
+		<view class="privacy-wrapper" v-if="privacyStatus">
+			<view class="privacy-box">
+				<view class="title">用户协议与隐私政策</view>
+				<view class="content">
+					请务必审慎阅读、充分理解“用户协议 与 隐私政策”各条款，包括但不限于：为了 向你提供即时通讯、内容分享等服务，我 们需要收集你的设备信息、操作日志等个
+					人信息。你可以在“设置”中查看、变更、 删除个人信息并管理你的授权。
+					<br />
+					你可以阅读
+					<navigator url="/pages/users/user_about/index?from=sys_user_agree">《用户协议》</navigator>与<navigator url="/pages/users/user_about/index?from=sys_userr_privacy">《隐私政策》</navigator>
+					了解 详细信息。如你同意，请点击“我同意”开始接受我们的服务。
+				</view>
+				<view class="btn-box">
+					<view class="btn-item" @click="confirmApp">我同意</view>
+					<view class="btn" @click="closeModel">随便逛逛</view>
+				</view>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- 发送给朋友图片 -->
+		<view class="share-box" v-if="isIntegral">
+			<!-- #ifndef H5 -->
+			<image src="/static/images/share-info.png" @click="closeShare"></image>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<image src="/static/images/share-info-wechat.png" @click="closeShare"></image>
+			<!-- #endif -->
+		</view>
+		<!-- 优惠券弹窗 -->
+		<view class="coupon_popups" v-if="showCoupon">
+			<view class="bg"></view>
+			<view class="con" :style="{ 'background-image': `url(${domain}/static/diy/couponWindow${keyColor}.png)` }">
+				<scroll-view scroll-y="true" >
+					<view v-for="(item, index) in couponArray" class="item">
+						<view class="left">
+							<view class="price">￥ <text>{{item.coupon_price}}</text></view>
+							<view class="max_price" v-if="item.use_min_price > 0">满{{item.use_min_price}}可用</view>
+							<view class="max_price" v-else>无门槛</view>
+						</view>
+						<view class="right">
+							<view class="time line1" v-if="item.coupon_type">有效期{{item.use_start_time}} - {{item.use_end_time}}</view>
+							<text class="coupon_type">{{couponTypeMsg[item.type] || '店铺券'}}</text>
+							<navigator :url="'/pages/columnGoods/goods_coupon_list/index?coupon_id='+item.coupon_id" class='bnt1 b-color' hover-class="none"><text class="title titleSize">{{item.title}}</text>
+							<view class="title titleColor">
+								有效期:{{item.use_start_time}}-{{item.use_end_time}}
+							</view>
+							</navigator>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="text">优惠券已放入您的账户中，点击“优惠券”去使用</view>
+				<view class='iconfont icon-guanbi3' @click="showCoupon = false"></view>
+			</view>
+		</view>
+		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse" :isGoIndex="false"></authorize>
+		<!-- #ifndef H5 -->
+		<passwordPopup></passwordPopup>
+		<!-- #endif -->
+		<view class="foot" v-if="newData.status && newData.status.status">
+			<view class="page-footer" id="target" :style="{'background-color':newData.bgColor.color[0].item}">
+				<view class="foot-item" v-for="(item,index) in newData.menuList" :key="index"
+					@click="goRouter(item)">
+					<block v-if="item.link == activeRouter">
+						<image :src="item.imgList[0]"></image>
+						<view class="txt" :style="{color:newData.activeTxtColor.color[0].item}">{{item.name}}
+						</view>
+					</block>
+					<block v-else>
+						<image :src="item.imgList[1]"></image>
+						<view class="txt" :style="{color:newData.txtColor.color[0].item}">{{item.name}}</view>
+					</block>
+				</view>
+			</view>
+		</view>
+		<view v-if="overflow" class="overflow-mask" @touchmove.stop.prevent="() => {}"></view>
+	</view>
+</template>
+<script>
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
+let app = getApp();
+import { getUserInfo } from '@/api/user.js';
+import { getDiy, getPageDiy, getIndexData, getAppVersion ,getUserCoupons} from '@/api/api.js';
+import { getNavigation } from '@/api/public.js';
+// #ifdef MP-WEIXIN
+import { getTemlIds } from '@/api/api.js';
+import { SUBSCRIBE_MESSAGE, TIPS_KEY } from '@/config/cache';
+// #endif
+import { getShare, getconfig } from '@/api/public.js';
+import { goShopDetail } from '@/libs/order.js';
+import { mapGetters } from 'vuex';
+import { getProductslist, getProductHot, storeCategory } from '@/api/store.js';
+import { initiateAssistApi } from '@/api/activity.js';
+import { setVisit, spread } from '@/api/user.js';
+import recommend from '@/components/recommend';
+// #ifndef H5
+import passwordPopup from '@/components/passwordPopup';
+// #endif
+// #ifdef H5
+import mConfig from './component/index.js';
+// #endif
+import authorize from '@/components/Authorize';
+// #ifdef MP || APP-PLUS
+import activeParty from './component/activeParty';
+import headerSerch from './component/headerSerch';
+import homeComb from './component/homeComb';
+import coupon from './component/coupon';
+import bargain from './component/bargain';
+import blankPage from './component/blankPage';
+import combination from './component/combination';
+import customerService from './component/customerService';
+import goodList from './component/goodList';
+import guide from './component/guide';
+import liveBroadcast from './component/liveBroadcast';
+import menus from './component/menus';
+import news from './component/news';
+import topic from './component/topic';
+import presellList from './component/presellList';
+import plantList from './component/plantList';
+import pictureCube from './component/pictureCube'
+import shopList from './component/shopList';
+import richText from './component/richText';
+import seckill from './component/seckill';
+import swiperBg from './component/swiperBg';
+import tabNav from './component/tabNav';
+import titles from './component/titles';
+import hotRanking from "./component/hotRanking.vue";
+// #endif
+import { silenceBindingSpread, configMap, isWeixin } from '@/utils/index';
+import history from '@/mixins/history';
+import shareScence from '@/libs/spread';
+import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue';
+import {getNewPeopleCouponLst} from '@/api/activity.js'
+import { HTTP_REQUEST_URL } from '@/config/app';
+export default {
+	computed: configMap({hide_mer_status:0,recommend_switch:0,beian_sn:'',share_title:'',site_name:'',hot_ranking_switch:0,navigation: {}},
+	mapGetters(['isLogin','uid','keyColor'])),
+	mixins: [history],
+	components: {
+		easyLoadimage,
+		recommend,
+		authorize,
+		// #ifndef H5
+		passwordPopup,
+		// #endif
+		// #ifdef H5
+		...mConfig,
+		// #endif
+		// #ifdef MP || APP-PLUS
+		activeParty,
+		headerSerch,
+		homeComb,
+		bargain,
+		coupon,
+		blankPage,
+		combination,
+		customerService,
+		goodList,
+		guide,
+		liveBroadcast,
+		menus,
+		news,
+		topic,
+		presellList,
+		plantList,
+		pictureCube,
+		shopList,
+		richText,
+		seckill,
+		swiperBg,
+		tabNav,
+		titles,
+		hotRanking
+		// #endif
+	},
+	data() {
+		return {
+			domain: HTTP_REQUEST_URL,
+			couponTypeMsg:{
+				10: '通用券',
+				11: '品类券',
+				12: '跨店券'
+			},
+			styleConfig: [],
+			showSkeleton: true, //骨架屏显示隐藏
+			isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
+			privacyStatus: false,
+			errorNetwork: false,
+			userInfo: {},
+			loading: false,
+			isAuto: false, //没有授权的不会自动授权
+			isShowAuth: false, //是否隐藏授权
+			statusBarHeight: statusBarHeight,
+			navIndex: 0,
+			navTop: [],
+			subscribe: false,
+			followUrl: '',
+			followHid: true,
+			followCode: false,
+			sortList: [],
+			window: false,
+			navH: '',
+			couponList: [],
+			marTop: 0,
+			loadend: false,
+			loading: false,
+			loadTitle: '加载更多',
+			sortProduct: [],
+			where: {
+				pid: 0,
+				page: 1,
+				limit: 6
+			},
+			is_switch: true,
+			hostProduct: [],
+			hotPage: 1,
+			hotLimit: 30,
+			hotScroll: true,
+			hotLoading: false,
+			hotTitle: '加载更多',
+			explosiveMoney: [],
+			domOffsetTop: 50,
+			// #ifdef MP || APP-PLUS
+			isFixed: true,
+			// #endif
+			// #ifdef H5
+			isFixed: false,
+			// #endif
+			isScrolled: false,
+			scrolled: false,
+			goodScroll: true, //精品推荐开关
+			params: {
+				//精品推荐分页
+				page: 1,
+				limit: 10
+			},
+			tempArr: [], //精品推荐临时数组
+			numConfig: 0,
+			pageInfo: '', // 精品推荐全数据
+			swiperCur: 0,
+			d: '',
+			h: '',
+			m: '',
+			s: '',
+			sum_h: '',
+			sortMarTop: 0,
+			globalDatas: {},
+			// #ifdef MP || APP-PLUS
+			mpHeight: 108,
+			// #endif
+			// #ifndef MP || APP-PLUS
+			mpHeight: 0,
+			// #endif
+			currSpid: '',
+			_options:{},
+			isIntegral: false,
+			appUpdate: {},
+			sortMpTop: 0,
+			bgColor: '',
+			bgPic: '',
+			bgTabVal: '',
+			windowHeight: 0,
+			domHeight: 0,
+			isHeaderSerch: false,
+			showCoupon: false,
+			couponArray: [],
+			smallPage: false,
+			isMenu: false,
+			isScale: false,
+			homeCombData: {},
+			appScroll: 0,
+			footerStatus: false,
+			newData: {},
+			activeRouter: '',
+			countNum: 0,
+			overflow: false
+		};
+	},
+	/**
+	 * 用户点击右上角分享
+	 */
+	// #ifdef MP
+	onShareAppMessage: function() {
+		let that = this;
+		wx.showShareMenu({
+			withShareTicket: true,
+			menus: ['shareAppMessage', 'shareTimeline']
+		});
+		return {
+			title: that.share_title,
+			path: '/pages/index/index?spid=' + that.uid
+		};
+	},
+	onShareTimeline: function() {
+		let that = this;
+		return {
+			title: that.share_title,
+			query: {
+				spid: that.uid
+			},
+			imageUrl: ''
+		};
+	},
+	// #endif
+	onLoad(options) {
+		let that = this
+		this._options = options;
+		// #ifdef APP-PLUS
+		const pages = getCurrentPages();
+		const page = pages[pages.length - 1];
+		const currentWebview = page.$getAppWebview();
+		currentWebview.setStyle({
+		  pullToRefresh: {
+		    support: !that.isSupport,
+		    style: plus.os.name === 'Android' ? 'circle' : 'default'
+		  }
+		});
+		that.isSupport = !that.isSupport;
+		that.appVersionConfig(); //APP版本检测
+		// #endif
+		that.$nextTick(function() {
+			uni.getSystemInfo({
+				success: function(res) {
+					that.windowHeight = res.windowHeight;
+				}
+			});
+		})
+		that.pageLoad(options);
+	},
+	created(options) {
+		let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+		let curRoute = routes[routes.length - 1].route //获取当前页面路由
+		this.activeRouter = '/' + curRoute
+	},
+	onShow() {
+		let that = this
+		that.getConfig();
+		that.isIntegral = uni.getStorageSync('isIntegral')
+		// #ifdef APP-PLUS
+		if(that.appUpdate.openUpgrade == '1'){
+			that.alertAppUpdate();
+		}
+		// #endif
+		that.getNav()
+		that.loadCoupon()
+	},
+	onHide() {
+		uni.setStorageSync('isIntegral',false)
+	},
+	onReady() {
+
+	},
+	watch: {
+		globalDatas(nVal, oVal) {
+			// #ifdef H5
+			this.ShareInfo(nVal);
+			// #endif
+		},
+	},
+	onPullDownRefresh(){
+		this.overflow = true;
+		this.reconnect();
+	},
+	methods: {
+		loadCoupon(){
+			if(!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')){
+				getNewPeopleCouponLst().then(res => {
+					this.couponArray = res.data;
+					setTimeout(() => {
+						this.showCoupon = this.couponArray.length > 0;
+						uni.setStorageSync('show_coupon', '1')
+					}, 1500);
+				})
+			}
+		},	
+		pageLoad(options){
+			let that = this;
+			if (options.spid) {
+				that.currSpid = options.spid;
+				app.globalData.spid = options.spid;
+			}
+			// #ifdef APP-PLUS
+			try {
+				let val = uni.getStorageSync('privacyStatus') || true;
+				if (!val) {
+					this.privacyStatus = true;
+				}
+			} catch (e) {}
+			this.snycNetWork();
+			// #endif
+			// #ifdef MP
+			if (options.scene) {
+				let value = that.$util.getUrlParams(decodeURIComponent(options.scene));
+				if (value.id) options.id = value.id;
+				//记录推广人uid
+				if (value.spid) {
+					that.currSpid = value.spid;
+					app.globalData.spid = value.spid;
+				}
+			}
+			// #endif
+			shareScence(that.currSpid, that.isLogin);
+			this.isLogin && silenceBindingSpread();
+			this.getIndexConfig()
+			Promise.all([
+				this.diyData(0),
+			]);
+			if (this.isLogin) {
+				this.getUserInfo();
+				// #ifdef MP
+				this.getHistory();
+				// #endif
+			}
+		},
+		closeShare(){
+			uni.setStorageSync('isIntegral',false);
+			this.isIntegral = uni.getStorageSync('isIntegral');
+		},
+		bindHeighta(data) {
+			// #ifdef APP-PLUS
+			this.sortMpTop = data.top + data.height;
+			// #endif
+		},
+		// 重新链接
+		reconnect() {
+			uni.getNetworkType({
+				success: res => {
+					this.errorNetwork = res.networkType === 'none';
+					if(!this.errorNetwork){
+						this.pageLoad(this._options);
+					}else{
+						uni.stopPullDownRefresh();
+						that.overflow = false;
+					}
+				}
+			});
+		},
+		getNav(){
+			getNavigation().then(res => {
+				this.newData = res.data
+				if (this.newData.status && this.newData.status.status) {
+					uni.hideTabBar()
+				} else {
+					uni.showTabBar()
+				}
+			})
+		},
+		// #ifdef APP-PLUS
+		snycNetWork() {
+			uni.getNetworkType({
+				success: res => {
+					this.errorNetwork = res.networkType === 'none';
+				}
+			});
+		},
+		// 同意隐私协议
+		confirmApp() {
+			uni.setStorageSync('privacyStatus', true);
+			this.privacyStatus = false;
+		},
+		// 关闭 Model
+		closeModel() {
+			this.privacyStatus = false;
+		},
+		// #endif
+		// 对象转数组
+		objToArr(data) {
+			let obj = Object.keys(data).sort();
+			let m = obj.map(key => data[key]);
+			return m;
+		},
+		goRouter(item) {
+			var pages = getCurrentPages();
+			var page = (pages[pages.length - 1]).$page.fullPath;
+			if (item.link == page) return
+			uni.switchTab({
+				url: item.link,
+				fail(err) {
+					uni.redirectTo({
+						url: item.link
+					})
+				}
+			})
+		},
+		diyData(id) {
+			let that = this;
+			let data = {
+				id: id
+			}
+			that.styleConfig = []
+			getDiy(data).then(res => {
+				setTimeout(() => {
+					that.isNodes++;
+				}, 0);
+				that.errorNetwork = false
+				uni.setNavigationBarTitle({
+					title: res.data.title
+				});
+				let data = res.data;
+				if (data.is_bg_color) {
+					that.bgColor = data.color_picker
+				}
+				if (data.is_bg_pic) {
+					that.bgPic = data.bg_pic
+					that.bgTabVal = data.bg_tab_val
+				}
+				that.styleConfig = that.objToArr(res.data.value);
+				that.styleConfig.forEach((item, index, arr) => {
+					if (item.name == 'headerSerch' || item.name == 'homeComb') {
+						that.isHeaderSerch = true
+						if(item.name == 'homeComb'){
+							that.homeCombData = item
+							that.smallPage = true;
+						}
+					}
+					if (item.name == 'pageFoot') {
+						if (item.status && item.status.status) {
+							this.newData = item
+							setTimeout((e) => {
+								that.$set(that, 'footerStatus', true);
+							}, 50)
+						}
+						uni.setStorageSync('FOOTER_BAR', item.status && item.status.status ? true : false)
+						item.menuList.map((path, index) => {
+							if (path.link === '/pages/order_addcart/order_addcart') {
+								uni.setStorageSync('FOOTER_ADDCART', index)
+							}
+						})
+						arr.splice(index, 1);
+					}
+					if(item.name == 'menus'){
+						that.isMenu = true;
+					}
+					that.get_host_product()
+					uni.pageScrollTo({
+						scrollTop: 0,
+					})
+					uni.stopPullDownRefresh();
+					that.overflow = false;
+				});
+			});
+		},
+		changeDiy(id) {
+			let that = this;
+			if(id){
+				that.styleConfig = []
+				getPageDiy({id: id}).then(res => {
+					uni.setNavigationBarTitle({
+						title: res.data.title
+					});
+					that.isScale = true
+					let data = res.data;
+					if (data.is_bg_color) {
+						that.bgColor = data.color_picker
+					}
+					if (data.is_bg_pic) {
+						that.bgPic = data.bg_pic
+						that.bgTabVal = data.bg_tab_val
+					}
+					that.styleConfig = that.objToArr(res.data.value);
+					that.styleConfig.forEach((item, index, arr) => {
+						if (item.name == 'headerSerch' || item.name == 'homeComb' ||  item.name == 'tabNav') {
+							that.styleConfig.splice(index, 1);
+						}
+						if(item.name == 'menus'){
+							that.isMenu = true;
+						}
+					});
+					that.isHeaderSerch = true
+					that.isScale = true
+					uni.pageScrollTo({
+						scrollTop: 0,
+					})
+				}).catch(err => {
+					that.styleConfig = []
+				});
+			}else{
+				that.diyData(0)
+				that.isScale = false
+			}
+		},
+		// 微信登录回调
+		onLoadFun: function(e) {
+			this.isShowAuth = false;
+		},
+		// #ifdef APP-PLUS
+		appVersionConfig() {
+			var that = this;
+			//app升级
+			// 获取本地应用资源版本号
+			getAppVersion().then(res => {
+				that.$set(that.appUpdate, 'androidAddress', res.data.androidAddress);
+				that.$set(that.appUpdate, 'appVersion', res.data.appVersion);
+				that.$set(that.appUpdate, 'iosAddress', res.data.iosAddress);
+				that.$set(that.appUpdate, 'openUpgrade', res.data.openUpgrade);
+				plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+					let nowVersion = (inf.version).split('.').join('');
+					let appVersion = (res.data.appVersion).split('.').join('');
+					that.$set(that.appUpdate, 'alert', appVersion > nowVersion);
+					that.alertAppUpdate();
+				});
+			})
+		},
+		alertAppUpdate(){
+			if(this.appUpdate.alert) {
+				uni.getSystemInfo({
+					success: (res) => {
+						uni.showModal({
+							title: '更新提示',
+							content: '发现新版本，是否前去下载?',
+							showCancel: this.appUpdate.openUpgrade != '1',
+							cancelColor: '#eeeeee',
+							confirmColor: '#FF0000',
+							success:(response)=> {
+								if (response.confirm) {
+									switch (res.platform) {
+										case "android":
+											plus.runtime.openURL(this
+												.appUpdate
+												.androidAddress);
+											break;
+										case "ios":
+											plus.runtime.openURL(encodeURI(
+												this.appUpdate
+												.iosAddress));
+											break;
+									}
+								}
+							}
+						});
+					}
+				})
+			}
+		},
+		// #endif
+		getConfig() {
+			// 获取配置
+			getconfig()
+				.then(res => {
+					let self = this;
+					this.globalDatas = res.data;
+					uni.$emit('configData', res.data);
+				})
+				.catch(err => {});
+		},
+		// 分类页更多
+		bindMore() {
+			try {
+				uni.setStorageSync('storeIndex', this.navTop[this.navIndex].pid);
+				uni.switchTab({
+					url: '/pages/goods_cate/goods_cate'
+				});
+			} catch (e) {}
+		},
+		goDetails(item) {
+			goShopDetail(item, this.uid).then(res => {
+				if (this.isLogin) {
+					initiateAssistApi(item.activity_id)
+						.then(res => {
+							let id = res.data.product_assist_set_id;
+							uni.hideLoading();
+							uni.navigateTo({
+								url: '/pages/activity/assist_detail/index?id=' + id
+							});
+						})
+						.catch(err => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							});
+						});
+				} else {
+					this.isAuto = true;
+					this.isShowAuth = true
+				}
+			});
+		},
+		/**
+		 * 获取个人用户信息
+		 */
+		getUserInfo: function() {
+			let that = this;
+			getUserInfo().then(res => {
+				that.userInfo = res.data;
+			});
+		},
+		// 记录会员访问
+		setVisit() {
+			setVisit({
+				url: '/pages/index/index'
+			}).then(res => {
+				console.log(res);
+			});
+		},
+		// 导航分类切换
+		changeTab(e) {
+			let self = this;
+			if (this.navIndex == e.index) return;
+			this.navIndex = e.index;
+			if (e.index > 0) {
+				storeCategory({
+					pid: e.pid
+				}).then(res => {
+					this.sortList = res.data.length > 9 ? res.data.splice(0, 9) : res.data;
+					if (this.sortList.length > 0) {
+						this.where.pid = e.pid;
+						this.where.page = 1;
+						this.loadend = false;
+						this.loading = false;
+						this.sortProduct = [];
+						this.get_product_list();
+						uni.pageScrollTo({
+							scrollTop: 0,
+						})
+					}
+				});
+				self.sortMarTop = 10;
+			}
+		},
+		//分类产品
+		get_product_list: function() {
+			let that = this;
+			if (that.loading) return;
+			that.loading = true;
+			that.loadTitle = '';
+			getProductslist(that.where)
+				.then(res => {
+					let list = res.data.list;
+					let productList = that.$util.SplitArray(list, that.sortProduct);
+					let loadend = list.length < that.where.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'sortProduct', productList);
+					that.$set(that.where, 'page', that.where.page + 1);
+				})
+				.catch(err => {
+					that.loading = false;
+					that.loadTitle = '加载更多';
+				});
+		},
+		/**
+		 * 获取我的推荐
+		 */
+		get_host_product: function() {
+			let that = this;
+			let num = that.hotLimit;
+			if (!that.hotScroll) return;
+			if (that.hotLoading) return;
+			that.hotLoading = true;
+			that.hotTitle = '';
+			getProductHot(that.hotPage, that.hotLimit).then(res => {
+				let list = res.data.list;
+				let productList = that.$util.SplitArray(list, that.hostProduct);
+				let hotScroll = list.length <= num && list.length != 0;
+				that.hotScroll = hotScroll;
+				that.hotLoading = false;
+				that.hotTitle = !hotScroll ? '已全部加载' : '加载更多';
+				that.$set(that, 'hostProduct', productList);
+				that.$set(that, 'hotPage', that.hotPage + 1);
+			});
+		},
+		// 首页数据
+		getIndexConfig: function() {
+			let that = this;
+			getIndexData().then(res => {
+				res.data.category.unshift({
+					cate_name: '首页'
+				});
+				that.$set(that, 'navTop', res.data.category);
+				// #ifdef H5
+				that.subscribe = res.data.subscribe;
+				// #endif
+				// 小程序判断用户是否授权；
+				// #ifdef MP
+				uni.getSetting({
+					success(res) {
+						if (!res.authSetting['scope.userInfo']) {
+							that.window = that.couponList.length ? true : false;
+						} else {
+							that.window = false;
+						}
+					}
+				});
+				// #endif
+				// #ifndef MP
+				if (that.isLogin) {
+					that.window = false;
+				} else {
+					that.window = that.couponList.length ? true : false;
+				}
+				// #endif
+				that.reloadData();
+			});
+		},
+		reloadData() {
+			setTimeout(() => {
+				this.showSkeleton = false
+			}, 500)
+		},
+		// 授权关闭
+		authColse: function(e) {
+			this.isShowAuth = e;
+		},
+		// 首发新品详情
+		goDetail(item) {
+			if (item.activity && item.activity.type === '2' && !this.isLogin) {
+				// #ifdef H5
+				uni.showModal({
+					title: '提示',
+					content: '您未登录，请登录！',
+					success: function(res) {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '/pages/users/login/index'
+							});
+						} else if (res.cancel) {
+						}
+					}
+				});
+				// #endif
+				// #ifdef MP
+				this.$set(this, 'isAuto', true);
+				this.$set(this, 'isShowAuth', true);
+				// #endif
+				return;
+			} else {
+				goShopDetail(item, this.uid).then(res => {
+					uni.navigateTo({
+						url: `/pages/goods_details/index?id=${item.id}`
+					});
+				});
+			}
+		},
+		//#ifdef H5
+		ShareInfo(datas) {
+			let data = this.storeInfo;
+			let href = location.href;
+			if (this.$wechat.isWeixin()) {
+				if (this.isLogin) {
+					href = href.indexOf('?') === -1 ? href + '?spid=' + this.uid : href + '&spid=' + this.uid;
+				} else {
+					href = href;
+				}
+				let configAppMessage = {
+					desc: datas.share_info,
+					title: datas.share_title,
+					link: href,
+					imgUrl: datas.share_pic
+				};
+				this.$wechat
+					.wechatEvevt(['updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareAppMessage', 'onMenuShareTimeline'], configAppMessage)
+					.then(res => {
+						console.log(res, '=============================>>WXAPI');
+					})
+					.catch(err => {
+						console.log(err);
+					});
+			}
+		},
+		//#endif
+	},
+	mounted() {
+		let query = uni.createSelectorQuery().in(this);
+		query.select("#home").boundingClientRect();
+		query.exec(res => {
+			this.domHeight = res[0].height;
+		})
+	},
+	// 滚动到底部
+	onReachBottom() {
+		if (this.navIndex == 0) {
+			// 首页加载更多
+			this.get_host_product();
+		} else {
+			// 分类栏目加载更多
+			if (this.sortProduct.length > 0) {
+				this.get_product_list();
+			} else {
+				this.get_host_product();
+			}
+		}
+	},
+	// 滚动监听
+	onPageScroll(e) {
+		if (this.isHeaderSerch) {
+			let isScroll = false
+			this.appScroll = e.scrollTop
+			// #ifdef APP-PLUS
+			// isScroll = e.scrollTop > 50
+			// #endif
+			// #ifdef MP || H5
+			// isScroll = e.scrollTop > 50 && this.windowHeight - this.domHeight >= 50
+			// #endif
+			isScroll = e.scrollTop > 50
+			this.isScrolled = isScroll;
+		} else {
+			this.isScrolled = false
+		}
+		// 传入scrollTop值并触发所有easy-loadimage组件下的滚动监听事件
+		uni.$emit('scroll');
+	}
+};
+</script>
+<style>
+
+</style>
+<style lang="scss" scoped>
+.bnt1{
+	color: red;
+}
+.overflow-mask{
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 1001;
+	width: 100%;
+	height: 100vh;
+	background: transparent;
+	transition: all .5s;
+}
+page {
+	display: flex;
+	flex-direction: column;
+}
+/deep/ .home-comb .my-main{
+	left: 0;
+	position: fixed;
+	top: 0;
+	width: 100%;
+	z-index: 30;
+}
+.main {
+	padding: 0 20rpx;
+}
+.colum0{
+	white-space: nowrap; 
+	display: flex;
+}
+.ysize {
+	background-size: 100%;
+}
+.fullsize {
+	background-size: 100% 100%;
+}
+.repeat {
+	background-repeat: repeat;
+}
+.noRepeat {
+	background-repeat: no-repeat;
+}
+.privacy-wrapper {
+	z-index: 999;
+	position: fixed;
+	left: 0;
+	top: 0;
+	bottom: 0;
+	right: 0;
+	width: 100%;
+	height: 100%;
+	background: #7f7f7f;
+	.privacy-box {
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		width: 560rpx;
+		padding: 50rpx 45rpx 0;
+		background: #fff;
+		border-radius: 20rpx;
+		.title {
+			text-align: center;
+			font-size: 32rpx;
+			text-align: center;
+			color: #333;
+			font-weight: 700;
+		}
+		.content {
+			margin-top: 20rpx;
+			line-height: 1.5;
+			font-size: 26rpx;
+			color: #666;
+			navigator {
+				display: inline-block;
+				color: #e93323;
+			}
+		}
+		.btn-box {
+			margin-top: 40rpx;
+			text-align: center;
+			font-size: 30rpx;
+			.btn-item {
+				height: 82rpx;
+				line-height: 82rpx;
+				background: linear-gradient(90deg, #f67a38 0%, #f11b09 100%);
+				color: #fff;
+				border-radius: 41rpx;
+			}
+			.btn {
+				padding: 30rpx 0;
+			}
+		}
+	}
+}
+.coupon_popups{
+	z-index: 999;
+	position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	text-align: center;
+	.bg{
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0,0,0,.5);
+	}
+	.con{
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%,-50%);
+		width: 680rpx;
+		height:900rpx;
+		background-size: 100% 700rpx;
+		background-repeat: no-repeat;
+		scroll-view{
+			width: 610rpx;
+			height: 306rpx;
+			padding-top: 20rpx;
+			margin: 300rpx auto 0;
+		}
+		.item{
+			display: flex;
+			align-items: center;
+			width: 100%;
+			height: 164rpx;
+			background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABDgAAAFICAMAAACC1L7bAAAAilBMVEUAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////2N2iNAAAALXRSTlMA9xnrZyf0790ev4d1Egr7cl9TI+XNbVpAtKSUjX0NB6ucgnpDMdjRxUw7LdTK5bIiAAAF40lEQVR42uzcWW7CMBSF4UNImAIBEcpUKJQixt79b68qD1VLgNi8VHL+bxHH9tH1VUE+SeedVs1QkMmNAYGotTrzdNJWiSRtGe7J5aRnQFh2m1z3ndeGB05ycjYgOPNct2WLvuGRoZxMDAhPbbnSDQmPlDKpnCwMCNE+UsGxYSixl5MXA4JUP+lKbCgXyUHbgED1J/pjbHAwloONAcGKqfP8jVYqlTUNCNdQPxKDmw+V6hoQsEZOm+et0VOJHiUzwnbgjPQ3Uwlm6BC6WBcRZ6SHpa7QMqNimj19ezd42OqBLcO3CF/K2IG/5lR3Tbm8oQIuVd/S4CfmnYJqiyXtDJ5eM92QdAyohI6UG7zVB7qWpQZUxRufVJ4z6kb65dytG1AZR80NzzkMTkkkKY/XpAaqJWVqFICvmfiSBcDTp1hnDsDTiFX+AHzVCA4A3ggOAAQHgAKCA8D/Izi+2KmDAQAAAAZC/tYDGMB9CiJAHMARB9ATByAO4IgD6IkDEAdwxAH0xAGIAzjiAHriAMQBHHEAPXEA4gCOOICeOABxAEccQE8cgDiAIw6gJw5AHMARB9ATByAOxk4dDAAAADAQ8rcewADuUxDBEQfQEwcgDuCIA+iJAxAHcMQB9MQBiAM44gB64gDEARxxAD1xAOIAjjiAnjgAcQBHHEBPHIA4gCMOoCcOQBzAEQfQEwcgDuCIA+iJAxAHcMQB9MQBiAM44gB64gDEARxxAD1xAOIAjjiAnjgAcQBHHEBPHIA4gCMOoCcOQBzAEQfQEwcgDuCIA+iJAxAHcMQB9MQBjJ06GAAAAGAg5G89gAHcpyASB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cTB26mAAAACAgZC/9QAOYJ+CCMQBhDiAP3EA4gBCHMCfOABxACEO4E8cgDiAEAfwJw5AHECIA/gTByAOIMQB/IkDEAcQ4gD+xAGIAwhxAH/iAMQBhDiAP3EA4gBCHMCfOABxACEO4E8cgDiAEAfwJw5AHECIA/gTByAOIMQB/IkDEAcQ4gD+xAGIAwhxAH/iAMQBhDiAP3EA4gBCHMCfOABxACEOYOzUwQAAAAADIX/rAQzgPgVRTxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giAPoiQMQB3DEAfTEAYgDOOIAeuIAxAEccQA9cQDiAI44gJ44AHEARxxATxyAOIAjDqAnDkAcwBEH0BMHIA7giIOxU4cEAIBAEMBAIUny/esR4BTqzBZi0CcOQBxAEAfQJw5AHEAQB9AnDkAcQBAH0CcOQBxAEAfQJw5AHEAQB9AnDkAcQBAH0CcOQBxAEAfQt+4AfNnrDK+dO8tNGIaiMHwSoBAKlERAQ4FQhnSQeve/vaoPRVWayTza/7cI2/ecKwNwMtDEAMDJRFMDACdb7Qz3WZ3SRJqX2fJ1YEBI9no23GGyGemP8sLZgYBkig3uLqpaLDk6EIy5tDY42iaqsTgZEISppJnBSZSqwdKAEAwlZhVHg1KNcrZiEICHQhK9ipOoVIucRVz476wfcWToLVOroQGeG8wlkXI42akF7zeE4BbyvRv6WS3UoaCVhd+m+jUy9JPqhmoFQRrHukkNfUzU7bgywF+fXJPONmpFZATvDSttAD1it6hQMwY/+O8pVcWV3aVOW/XBFyfw1TjXP8mXod1MvewN8NE6Vo3jmU2wdrlaEDXDb9HhqHqjF0OLWL1cDfDOKVGz5PBmaCKJdBQhWl9idUiy/QczSy31UxjgjYfpYxar6hufchGebA48QgAAAABJRU5ErkJggg==');
+			background-repeat: no-repeat;
+			background-size: 100% 100%;
+			margin-bottom: 20rpx;
+			border-radius: 20rpx;
+			position: relative;
+			.left{
+				width: 160rpx;
+				text-align: center;
+				&::after{
+					content: "";
+					display: block;
+					height: 110rpx;
+					border-right: 1px dashed #E6E6E6;
+					position: absolute;
+					left: 178rpx;
+					top: 25rpx;
+				}
+				.price{
+					color: #E93323;
+					font-size: 26rpx;
+					font-weight: bold;
+					text{
+						font-size: 46rpx;
+					}
+				}
+				.max_price{
+					color: #999999;
+					font-size: 18rpx;
+					margin-top: 8rpx;
+				}
+			}
+			.right{
+				width: 440rpx;
+				padding: 0 20rpx;
+				.title{
+					color: #333333;
+					font-size: 26rpx;
+				}
+				.time{
+					color: #999999;
+					font-size: 22rpx;
+					margin-top: 20rpx;
+				}
+				.bnt1{
+					.titleSize{
+						font-weight: 700;
+						font-size: 33rpx;
+					}
+					.titleColor{
+						margin-top: 20rpx;
+						color: #999999;
+					}
+				}
+				.coupon_type{
+					position: absolute;
+					color: #fff;
+					font-size: 15rpx;
+					width: 30rpx;
+					text-align: center;
+					height: auto;
+					background: #E93323;
+					top: 0;
+					right: 20rpx;
+					line-height: 26rpx;
+					padding: 5rpx 0 15rpx;
+					&::after{
+						content: "";
+						width: 0;
+						height: 0;
+						border-left: 14rpx solid transparent;
+						border-right: 14rpx solid transparent;
+						border-bottom: 14rpx solid #fff;
+						position: absolute;
+						bottom: -4rpx;
+						left: 2rpx;
+					}
+				}
+			}
+		}
+		.text{
+			width: 600rpx;
+			margin: 30rpx auto 0;
+			font-size: 20rpx;
+			color: #ffffff;
+		}
+		.icon-guanbi3{
+			color: #ffffff;
+			font-size: 70rpx;
+			position: absolute;
+			bottom: -80rpx;
+			left: 320rpx;
+		}
+	}
+}
+.item_tags{
+	margin-top: 8rpx;
+	display: flex;
+}
+.item_tags .tags_item {
+	display: inline-block;
+	font-size: 20rpx;
+	text-align: center;
+	border-radius: 5rpx;
+	padding: 0 4rpx;
+	line-height: 28rpx;
+	margin-right: 8rpx;
+}
+.item_tags .tags_item.ticket{
+	color: var(--view-theme);
+	border: 1px solid var(--view-theme);
+}
+.item_tags .tags_item.delivery{
+	color: #FF9000;
+	border: 1px solid #FF9000;
+}
+.copyRight{
+	margin: 60rpx auto 20rpx;
+	max-width: 690rpx;
+	font-size: 20rpx;
+	color: #707070;
+	text-decoration: none;
+}
+.share-box {
+	z-index: 1000;
+	position: fixed;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+.error-network {
+	position: fixed;
+	left: 0;
+	top: 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	width: 100%;
+	height: 100%;
+	padding-top: 40rpx;
+	background: #fff;
+	padding-top: 30%;
+	image {
+		width: 414rpx;
+		height: 336rpx;
+	}
+	.title {
+		position: relative;
+		top: -40rpx;
+		font-size: 32rpx;
+		color: #666;
+	}
+	.con {
+		font-size: 24rpx;
+		color: #999;
+		.label {
+			margin-bottom: 20rpx;
+		}
+		.item {
+			margin-bottom: 20rpx;
+		}
+	}
+	.btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 508rpx;
+		height: 86rpx;
+		margin-top: 100rpx;
+		border: 1px solid #d74432;
+		color: #e93323;
+		font-size: 30rpx;
+		border-radius: 120rpx;
+	}
+}
+.area-row {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+	width: 100%;
+	text-align: center;
+}
+.page-index {
+	display: flex;
+	flex-direction: column;
+	min-height: 100%;
+	.page_content {
+		/* #ifdef MP || APP-PLUS */
+		padding-top: 270rpx;
+		/* #endif */
+		.page_bg{
+			background: linear-gradient(180deg, #fff 0%, #f5f5f5 100%);
+		}
+		.nav {
+			padding: 0 0rpx 30rpx;
+			flex-wrap: wrap;
+			/* #ifdef MP */
+			margin-top: 0;
+			/* #endif */
+			/* #ifdef H5 */
+			margin-top: 0;
+			/* #endif */
+			.item {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				width: 20%;
+				margin-top: 30rpx;
+				image {
+					width: 82rpx;
+					height: 82rpx;
+				}
+			}
+		}
+		.index-product-wrapper {
+			.nav-bd {
+				display: flex;
+				align-items: center;
+				.item {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					width: 25%;
+					.txt {
+						font-size: 32rpx;
+						color: #282828;
+					}
+					.label {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 124rpx;
+						height: 32rpx;
+						margin-top: 5rpx;
+						font-size: 24rpx;
+						color: #999;
+					}
+					&.active {
+						color: $theme-color;
+						.label {
+							background: linear-gradient(90deg, $bg-star 0%, $bg-end 100%);
+							border-radius: 16rpx;
+							color: #fff;
+						}
+					}
+				}
+			}
+			.list-box {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+				.item {
+					width: 345rpx;
+					margin-bottom: 20rpx;
+					background-color: #fff;
+					border-radius: 10px;
+					overflow: hidden;
+					image {
+						width: 100%;
+						height: 345rpx;
+					}
+					.text-info {
+						padding: 10rpx 20rpx 15rpx;
+						.title {
+							color: #222222;
+						}
+						.old-price {
+							margin-top: 8rpx;
+							font-size: 26rpx;
+							color: #aaaaaa;
+							text-decoration: line-through;
+							text {
+								margin-right: 2px;
+								font-size: 20rpx;
+							}
+						}
+						.price {
+							display: flex;
+							align-items: flex-end;
+							color: $theme-color;
+							font-size: 34rpx;
+							font-weight: 800;
+							text {
+								padding-bottom: 4rpx;
+								font-size: 24rpx;
+								font-weight: normal;
+							}
+							.txt {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								width: 28rpx;
+								height: 28rpx;
+								margin-left: 15rpx;
+								margin-bottom: 10rpx;
+								border: 1px solid $theme-color;
+								border-radius: 4rpx;
+								font-size: 22rpx;
+								font-weight: normal;
+							}
+						}
+					}
+				}
+				&.on {
+					display: flex;
+				}
+			}
+		}
+	}
+}
+.productList {
+	background-color: #f1f1f1;
+	min-height: 70vh;
+	.sort {
+		width: 710rpx;
+		max-height: 380rpx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 16rpx;
+		padding: 8rpx 0rpx 30rpx;
+		flex-wrap: wrap;
+		margin: 25rpx auto 0 auto;
+		.item {
+			width: 20%;
+			margin-top: 30rpx;
+			text-align: center;
+			.pictrues {
+				width: 90rpx;
+				height: 90rpx;
+				background: rgba(248, 248, 248, 1);
+				border-radius: 50%;
+				margin: 0 auto;
+			}
+			.easy-loadimage {
+				width: 90rpx;
+				height: 90rpx;
+				display: inline-block;
+			}
+			.text {
+				color: #272727;
+				font-size: 24rpx;
+				margin-top: 10rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			}
+		}
+	}
+}
+.productList .list {
+	padding: 0 20rpx;
+}
+.productList .list.on {
+	background-color: #fff;
+	border-top: 1px solid #f6f6f6;
+}
+.productList .list .item {
+	width: 345rpx;
+	margin-top: 20rpx;
+	background-color: #fff;
+	border-radius: 10rpx;
+	.name{
+		display: flex;
+		align-items: center;
+	}
+}
+.productList .list .item.on {
+	width: 100%;
+	display: flex;
+	border-bottom: 1px solid #f6f6f6;
+	padding: 30rpx 0;
+	margin: 0;
+}
+.productList .list .item .pictrue {
+	position: relative;
+	width: 100%;
+	height: 345rpx;
+}
+.productList .list .item .pictrue.on {
+	width: 180rpx;
+	height: 180rpx;
+}
+/deep/.productList .list .item .pictrue image,
+/deep/.productList .list .item .pictrue uni-image,
+/deep/.productList .list .item .pictrue .easy-loadimage{
+	width: 100%;
+	height: 100%;
+	border-radius: 10rpx 10rpx 0 0;
+}
+/deep/.productList .list .item .pictrue uni-image.origin-img{
+	border-radius: 10rpx 10rpx 0 0;
+}
+.productList .list .item .pictrue image.on {
+	border-radius: 6rpx;
+}
+.productList .list .item .text {
+	padding: 14rpx 17rpx 26rpx 17rpx;
+	font-size: 28rpx;
+	color: #212121;
+}
+.productList .list .item .text.on {
+	width: 508rpx;
+	padding: 0 0 0 22rpx;
+}
+.productList .list .item .text .money {
+	font-size: 26rpx;
+	font-weight: bold;
+	margin-top: 8rpx;
+}
+.productList .list .item .text .coupon {
+	background: rgba(255, 248, 247, 1);
+	border: 1px solid rgba(233, 51, 35, 1);
+	border-radius: 4rpx;
+	font-size: 20rpx;
+	margin-left: 18rpx;
+	padding: 1rpx 4rpx;
+}
+.productList .list .item .text .money.on {
+	margin-top: 50rpx;
+}
+.productList .list .item .text .money .num {
+	font-size: 34rpx;
+}
+.pictrue {
+	position: relative;
+	
+	.border-picture {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		border-radius: 10rpx 10rpx 0 0;
+		background: center/cover no-repeat;
+	}
+}
+.cate_pictrue,/deep/.cate_pictrue image,/deep/.cate_pictrue .easy-loadimage,/deep/.cate_pictrue uni-image{
+	width: 82rpx;
+	height: 82rpx;
+	margin: 0 auto;
+}
+.fixed {
+	z-index: 100;
+	position: fixed;
+	left: 0;
+	top: 0;
+	background-color: #fff;
+	box-shadow: 0 10rpx 20rpx -5rpx rgba(0, 0, 0, 0.06);
+}
+.diyheight{
+	height: 98rpx;
+	height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+	height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+}
+.page-footer {
+	position: fixed;
+	bottom: 0;
+	z-index: 30;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	width: 100%;
+	height: 98rpx;
+	height: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+	height: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+	box-sizing: border-box;
+	border-top: 1px solid #F3F3F3;
+	background-color: #fff;
+	box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32);
+	padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/
+	padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/
+	&.filter{
+		filter: blur(2rpx);
+	}
+	.foot-item {
+		display: flex;
+		width: max-content;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		position: relative;
+		.count-num {
+			position: absolute;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 40rpx;
+			height: 40rpx;
+			top: 0rpx;
+			right: -15rpx;
+			color: #fff;
+			font-size: 20rpx;
+			background-color: #FD502F;
+			border-radius: 50%;
+			padding: 4rpx;
+		}
+	}
+	.foot-item image {
+		height: 50rpx;
+		width: 50rpx;
+		text-align: center;
+		margin: 0 auto;
+	}
+	.foot-item .txt {
+		font-size: 24rpx;
+	}
+}
+</style>
diff --git a/pages/nongKe/gather/select_warehouse.vue b/pages/nongKe/gather/select_warehouse.vue
index 65e822a..20acd1a 100644
--- a/pages/nongKe/gather/select_warehouse.vue
+++ b/pages/nongKe/gather/select_warehouse.vue
@@ -9,20 +9,28 @@
       </block>
     </view>
 
-    <view class="goods-wrapper wrapper" v-if="goods.length">
-      <block v-for="(item,index) in goods" :key="index">
-        <view class="item">
-          <view class="l_cont">
-            <image :src="item.image" mode="aspectFill"></image>
-          </view>
-          <view class="r_cont">
-            <text>{{item.store_name}}</text>
-            <view class="addBtn" @click="addGoods(item)">加入仓库</view>
-          </view>
-        </view>
-      </block>
-    </view>
-
+			<view class="list-box animated listA" :class="goods.length > 0 ? 'fadeIn on' : ''">
+				<view class="item" v-for="(item, index) in goods" :key="index" @click="addGoods(item)">
+					<view class="pictrue" :class="'cont'+conStyle">	
+						<easy-loadimage mode="widthFix" :image-src="item.image"></easy-loadimage>
+					</view>
+					<view class="text-info" style="display: flex; flex-direction: column; justify-content: space-between;">
+						<view>
+							<view  class="title">{{ item.store_name }}</view>
+							<view class="merchant_info">
+								<view v-if="item.merchant && item.merchant.type_name" :style="'background:'+labelColor" class="font-bg-red">{{item.merchant.type_name}}</view>
+							</view>
+						</view>
+						<view class="price acea-row" :style="'color:'+priceColor">
+							<view>
+								¥
+								<text>{{ item.price }}</text>
+							</view>
+							<view style="padding-left: 180rpx;font-size: 34rpx;font-weight: 550" >加入仓库</view>
+						</view>			
+					</view>
+				</view>
+			</view>
     <u-popup :show="editGoodsShow" @close="editGoodsClose" :round="18" mode="center">
       <view class="edit_goods_box">
         <view class="edit_name flex_a_c edit_name_no">
@@ -45,7 +53,7 @@
         </view>
       </view>
     </u-popup>
-
+	<u-modal :show="addGoodsShow"  content='是否添加到你的仓库中?' @cancel="addGoodsclose()" @close="addGoodsclose()" @confirm="addGoodsopen()" :closeOnClickOverlay="true" :showCancelButton="true"></u-modal>
     <u-popup :show="searchGoodsShow" @close="searchGoodsClose" :round="18" mode="center">
       <view class="search_goods_box">
         <input type="text" v-model="searchGoodsName" class="searchGoods" placeholder="请输入商品名称">
@@ -64,7 +72,7 @@
 <script>
   import { productCreate } from '@/api/product.js'
   import { microSeachBarCode, microEadtProduct } from '@/api/store.js'
-  import { seachBarCodeAPI } from '@/api/api.js'
+  import { seachBarCodeAPI,post_product_import } from '@/api/api.js'
   import { Toast } from '@/libs/uniApi'
   export default {
     data() {
@@ -86,23 +94,37 @@
         editGoodsPrice: '',
         editGoodsStore: '',
         editGoodsShow: false, // 扫码修改商品信息
-        mer_id: 318,
+        mer_id: 0,
         searchGoodsShow: false,
-        searchGoodsName: '摩托',
-        goods: []
+        searchGoodsName: '',
+        goods: [],
+		item:[],
+		addGoodsShow:false
       }
     },
     onLoad(e) {
       this.mer_id = e.mer_id
-      this.searchGoodsClose()
     },
     onShow() {},
     methods: {
       addGoods(item) {
-        uni.navigateTo({
-          url: `/pages/product/addGoods/addMyStore?mer_id=${this.mer_id}&product_id=${item.product_id}`
-        })
+		  this.addGoodsShow=true
+		  this.item=item
       },
+	  addGoodsopen(){
+		  if(this.item){
+			  post_product_import(this.item.product_id).then(e=>{
+			  			if(e.status==200){
+							Toast(e.data.msg)
+							this.addGoodsShow=false
+						}
+			  })
+		  }
+		  this.item=[]
+	  },
+	  addGoodsclose(){
+		  this.addGoodsShow=false
+	  },
       openSearch() {},
       async searchGoodsClose() {
         const rq = {
@@ -110,6 +132,9 @@
           name: this.searchGoodsName
         }
         const { data } = await seachBarCodeAPI(rq).catch(err => Toast(err))
+		if(data.list.length ==0){
+			Toast("暂无搜索商品")
+		}
         this.goods = data.list
         this.searchGoodsShow = false
       },
@@ -282,4 +307,283 @@
       }
     }
   }
+  .list-box {
+  	display: flex;
+  	flex-wrap: wrap;
+  	justify-content: space-between;
+  	padding: 20rpx 28rpx 0;
+  	.item {
+  		width: 328rpx;
+  		margin-bottom: 20rpx;
+  		overflow: hidden;
+  		position: relative;
+  		&.on {
+  			border-radius: 0;
+  		}
+  		.pictrue_log {
+  			width: 92rpx;
+  			height: 44rpx;
+  			font-size: 26rpx;
+  			line-height: 44rpx;
+  		}
+  		.pictrue,/deep/image,/deep/.easy-loadimage,/deep/uni-image {
+  			width: 100%;
+  			display: block;
+  			position: relative;
+  			.border-picture {
+  				position: absolute;
+  				top: 0;
+  				left: 0;
+  				width: 100%;
+  				height: 100%;
+  				background: center/cover no-repeat;
+  			}
+  		}
+  		.picture1,/deep/.picture1 image,/deep/.picture1 .easy-loadimage,/deep/.picture1 uni-image {			
+  			height: 346rpx;
+  			position: relative;
+  			.border-picture {
+  				position: absolute;
+  				top: 0;
+  				left: 0;
+  				width: 100%;
+  				height: 100%;
+  				background: center/cover no-repeat;
+  			}
+  			.sell_out {
+  				display: flex;
+  				width: 150rpx;
+  				height: 150rpx;
+  				align-items: center;
+  				justify-content: center;
+  				border-radius: 100%;
+  				background: rgba(0,0,0,.6);
+  				color: #fff;
+  				font-size: 30rpx;
+  				position: absolute;
+  				top: 50%;
+  				left: 50%;
+  				margin: -75rpx 0 0 -75rpx;
+  				&::before{
+  					content: "";
+  					display: block;
+  					width: 140rpx;
+  					height: 140rpx;
+  					border-radius: 100%;
+  					border: 1px dashed #fff;
+  					position: absolute;
+  					top: 5rpx;
+  					left: 5rpx;
+  				}
+  			}
+  		}
+  		.cont1,/deep/.cont1 image,/deep/.cont1 .easy-loadimage,/deep/.cont1 uni-image,.cont1 .border-picture{
+  			border-radius: 16rpx;
+  		}
+  		.text-info {
+  			padding: 10rpx 20rpx 15rpx;
+  			.title {
+  				color: #222222;
+  				overflow:hidden; 
+  				text-overflow: ellipsis; 
+  				display: -webkit-box; 
+  				-webkit-line-clamp: 2; 
+  				-webkit-box-orient: vertical;
+  			}
+  			.old-price {
+  				margin-top: 4rpx;
+  				font-size: 26rpx;
+  				color: #999;
+  				text-decoration: line-through;
+  				text {
+  					margin-right: 2px;
+  					font-size: 20rpx;
+  				}
+  			}
+  			.price {
+  				display: flex;
+  				margin-top: 20rpx;
+  				font-size: 26rpx;
+  				align-items: center;
+  				text {
+  					font-size: 36rpx;
+  					font-weight: 550;
+  				}
+  				.ot-price{
+  					color: #aaa;
+  					font-size: 26rpx;
+  					text-decoration: line-through;
+  					margin-left: 6rpx;
+  					font-weight: normal;
+  					margin-top: 10rpx;
+  				}	
+  			}
+  		}
+  		.pictrue {
+  			position: relative;
+  		}		
+  		.border-picture {
+  			position: absolute;
+  			top: 0;
+  			left: 0;
+  			width: 100%;
+  			height: 100%;
+  			border-radius: 8rpx;
+  			background: center/cover no-repeat;
+  		}
+  	}
+  	.merchant_info{
+  		display: flex;
+  		align-items: center;
+  		margin-top: 20rpx;
+  		.merchant_type{
+  			color: #fff;
+  			line-height: 30rpx;
+  			padding: 0 10rpx;
+  			border-radius: 2rpx;
+  			font-size: 22rpx;
+  		}
+  		.txt {
+  			display: flex;
+  			align-items: center;
+  			justify-content: center;
+  			width: 56rpx;
+  			height: 28rpx;
+  			margin-left: 15rpx;
+  			border: 1px solid $theme-color;
+  			border-radius: 4rpx;
+  			font-size: 20rpx;
+  			font-weight: normal;
+  			&.delivery{
+  				margin-left: 0;
+  				color: #FF9000;
+  				border-color: #FF9000;
+  			}
+  		}
+  	}
+  	&.on {
+  		display: flex;
+  	}
+  	&.listA {
+  		.item {
+  			display: flex;
+  			width: 100%;
+  			.pictrue,/deep/image,/deep/.easy-loadimage,/deep/uni-image {
+  				width: 220rpx;
+  				height: 220rpx;		
+  			}
+  			.sell_out {
+  				display: flex;
+  				width: 110rpx;
+  				height: 110rpx;
+  				align-items: center;
+  				justify-content: center;
+  				border-radius: 100%;
+  				background: rgba(0,0,0,.6);
+  				color: #fff;
+  				font-size: 24rpx;
+  				position: absolute;
+  				top: 50%;
+  				left: 50%;
+  				margin: -55rpx 0 0 -55rpx;
+  				&::before{
+  					content: "";
+  					display: block;
+  					width: 100rpx;
+  					height: 100rpx;
+  					border-radius: 100%;
+  					border: 1px dashed #fff;
+  					position: absolute;
+  					top: 5rpx;
+  					left: 5rpx;
+  				}
+  			}
+  			.text-info {
+  				width: 490rpx;
+  			}
+  		}
+  	}
+  	&.listB {
+  		justify-content: inherit;
+  		.item {
+  			width: 31.3%;
+  			margin-right: 3.05%;
+  			.pictrue,/deep/image,/deep/.easy-loadimage,/deep/uni-image {
+  				height: 220rpx;	
+  			}
+  			.sell_out {
+  				display: flex;
+  				width: 110rpx;
+  				height: 110rpx;
+  				align-items: center;
+  				justify-content: center;
+  				border-radius: 100%;
+  				background: rgba(0,0,0,.6);
+  				color: #fff;
+  				font-size: 24rpx;
+  				position: absolute;
+  				top: 50%;
+  				left: 50%;
+  				margin: -55rpx 0 0 -55rpx;
+  				&::before{
+  					content: "";
+  					display: block;
+  					width: 100rpx;
+  					height: 100rpx;
+  					border-radius: 100%;
+  					border: 1px dashed #fff;
+  					position: absolute;
+  					top: 5rpx;
+  					left: 5rpx;
+  				}
+  			}
+  			&:nth-child(3n) {
+  				margin-right: 0;
+  			}
+  			.price{
+  				display: flex;	
+  				align-items: center;
+  				justify-content: center;
+  				font-size: 20rpx;
+  				text{
+  					font-size: 28rpx;
+  				}
+  			}
+  			.text-info{
+  				padding: 10rpx 4rpx;
+  			}
+  		}
+  	}
+  	&.listC{
+  		.item{
+  			width: 100%;
+  			.pictrue,/deep/image,/deep/.easy-loadimage,/deep/uni-image{
+  				height: 320rpx;			
+  			}
+  			.price{
+  				margin-top: 20rpx;
+  				font-size: 40rpx;
+  				display: flex;
+  				align-items: center;
+  				.old-price{
+  					font-weight: normal;
+  					font-size: 22rpx;
+  					margin-left: 10rpx;
+  				}
+  			}
+  		}
+  	}
+  	&.listS{
+  		.price{
+  			font-size: 40rpx;
+  			display: flex;
+  			align-items: baseline;
+  			.old-price{
+  				font-weight: normal;
+  				font-size: 22rpx;
+  				margin-left: 10rpx;
+  			}
+  		}
+  	}
+  }
 </style>
\ No newline at end of file
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 42d52ff..875655e 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -451,7 +451,7 @@
   import { HTTP_REQUEST_URL } from '@/config/app';
   import mConfig from '../component/index.js';
   // #ifdef MP || APP-PLUS
-  import activeParty from '../../index/component/activeParty';
+  import activeParty from '@/pages/index/component/activeParty';
   import coupon from '../../index/component/coupon';
   import bargain from '../../index/component/bargain';
   import blankPage from '../../index/component/blankPage';
@@ -1120,6 +1120,9 @@
       },
       // 商铺底部切换
       tab: function(param) {
+		if(this.tabActive==param){
+			return false;
+		}
         this.goods = []
         this.tabActive = param;
         this.goodsLoading = this.loadend = this.loading = false
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index 0dbe729..b568b0b 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -199,6 +199,7 @@
 			  // #ifdef MP
 			  //用户没有绑定openid，授权并绑定
 			  if (data.user.wechat_user_id === 0) {
+				  let that=this
 				  wx.getUserInfo({
 					success: function (res) {
 					  const encryptedData = res.encryptedData
@@ -206,7 +207,7 @@
 					  wx.login({
 						  success (res) {
 							if (res.code) {
-								bindMp({code: res.code, iv: iv, encryptedData: encryptedData}).then(res => {
+								bindMp({code: res.code, iv: iv, encryptedData: encryptedData,phone: that.account}).then(res => {
 									// console.log(res);
 								})
 							} else {