diff --git a/pages/index/index.vue b/pages/index/index.vue
index ae45320..d64ffe5 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,65 +1,68 @@
 <template>
-	<view :style="themeColor +';' + { backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="site-info-box"
-			v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
-			<view class="site-info">
-				<view class="img-box" v-if="siteInfo.logo_square">
-					<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
-				</view>
-				<view class="info-box" :style="{ color: '#ffffff' }">
-					<text class="font-size-base">{{ siteInfo.site_name }}</text>
-					<text>{{ followOfficialAccount.welcomeMsg }}</text>
+	<view :style="themeColor">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
+			class="page-img">
+			<view class="site-info-box"
+				v-if="$util.isWeiXin() && followOfficialAccount && followOfficialAccount.isShow && wechatQrcode">
+				<view class="site-info">
+					<view class="img-box" v-if="siteInfo.logo_square">
+						<image :src="$util.img(siteInfo.logo_square)" mode="aspectFill"></image>
+					</view>
+					<view class="info-box" :style="{ color: '#ffffff' }">
+						<text class="font-size-base">{{ siteInfo.site_name }}</text>
+						<text>{{ followOfficialAccount.welcomeMsg }}</text>
+					</view>
 				</view>
+				<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号'
+					}}</view>
 			</view>
-			<view class="dite-button" @click="officialAccountsOpen">{{ isEnEnv ? 'Follow Official Account' : '关注公众号' }}</view>
-		</view>
 
-		<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
 			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
 		</view> -->
 
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
-			:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<template v-slot:components>
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+				<template v-slot:components>
+					<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+						:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
+				</template>
+				<template v-slot:default>
+					<ns-copyright v-show="isShowCopyRight" />
+				</template>
+			</diy-index-page>
+
+			<view v-else class="bg-index"
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
 				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-					:haveTopCategory="true" :followOfficialAccount="followOfficialAccount" />
-			</template>
-			<template v-slot:default>
+					:followOfficialAccount="followOfficialAccount" />
 				<ns-copyright v-show="isShowCopyRight" />
-			</template>
-		</diy-index-page>
+			</view>
 
-		<view v-else class="bg-index"
-			:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-				:followOfficialAccount="followOfficialAccount" />
-			<ns-copyright v-show="isShowCopyRight" />
-		</view>
-
-		<template v-if="adv.advshow != -1">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					<view class="small-bot">
-						<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
+			<template v-if="adv.advshow != -1">
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+						<view class="small-bot">
+							<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
 							<view bindtap="adverclose">跳过</view>
 							<view class="time">{{clock}}s</view>
 						</view>
 						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
 							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
 						</view> -->
-						<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
-							indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
-							<swiper-item v-for="(item, index) in adv.list" :key="index">
-								<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
-									:src="$util.img(item.imageUrl)" width="100%"></image>
-								<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
-							</swiper-item>
-						</swiper>
-						<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
-							<i class="iconfont icon-round-close" style="color:#fff"></i>
+							<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
+								indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
+								<swiper-item v-for="(item, index) in adv.list" :key="index">
+									<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
+										:src="$util.img(item.imageUrl)" width="100%"></image>
+									<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
+								</swiper-item>
+							</swiper>
+							<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
+								<i class="iconfont icon-round-close" style="color:#fff"></i>
+							</view>
 						</view>
-					</view>
-					<!-- 	<view class="image-wrap">
+						<!-- 	<view class="image-wrap">
 						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
 							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
 								<view class="item">
@@ -69,76 +72,78 @@
 						</swiper>
 					</view>
 					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
+					</uni-popup>
+				</view>
+			</template>
+
+			<!-- 底部tabBar -->
+			<view class="page-bottom" v-if="openBottomNav">
+				<diy-bottom-nav @callback="callback" :name="name" />
+			</view>
+
+			<!-- 关注公众号弹窗 -->
+			<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
+				<uni-popup ref="officialAccountsPopup" type="center">
+					<view class="official-accounts-wrap">
+						<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
+						<text class="desc">关注了解更多</text>
+						<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+					</view>
 				</uni-popup>
 			</view>
-		</template>
 
-		<!-- 底部tabBar -->
-		<view class="page-bottom" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" :name="name" />
-		</view>
-
-		<!-- 关注公众号弹窗 -->
-		<view @touchmove.prevent class="official-accounts-inner" v-if="wechatQrcode">
-			<uni-popup ref="officialAccountsPopup" type="center">
-				<view class="official-accounts-wrap">
-					<image class="content" :src="$util.img(wechatQrcode)" mode="aspectFit"></image>
-					<text class="desc">关注了解更多</text>
-					<text class="close iconfont icon-round-close" @click="officialAccountsClose"></text>
+			<!-- 收藏 -->
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+				<view v-if="showTip" class="collectPopupWindow"
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+					<text @click="closeCollectPopupWindow">我知道了</text>
 				</view>
 			</uni-popup>
-		</view>
 
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow"
-				:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
-				<text @click="closeCollectPopupWindow">我知道了</text>
-			</view>
-		</uni-popup>
-
-		<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
-		<view @touchmove.prevent.stop class="choose-store">
-			<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
-				<view class="choose-store-popup">
-					<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
-					<view class="position-wrap">
-						<text class="iconfont icon-dizhi"></text>
-						<text class="address">{{ currentPosition }}</text>
-						<view class="reposition" @click="reposition"
-							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-							<text class="iconfont icon-dingwei"></text>
-							<text>重新定位</text>
-						</view>
-					</view>
-					<view class="store-wrap" v-if="nearestStore">
-						<text class="tag">当前门店</text>
-						<view class="store-name">{{ nearestStore.store_name }}</view>
-						<view class="address">{{ nearestStore.show_address }}</view>
-						<view class="distance" v-if="nearestStore.distance">
+			<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
+			<view @touchmove.prevent.stop class="choose-store">
+				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
+					<view class="choose-store-popup">
+						<view class="head-wrap" @click="closeChooseStorePopup">请确认门店</view>
+						<view class="position-wrap">
 							<text class="iconfont icon-dizhi"></text>
-							<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' : nearestStore.distance *
-								1000 +
-								'm' }}</text>
+							<text class="address">{{ currentPosition }}</text>
+							<view class="reposition" @click="reposition"
+								v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+								<text class="iconfont icon-dingwei"></text>
+								<text>重新定位</text>
+							</view>
+						</view>
+						<view class="store-wrap" v-if="nearestStore">
+							<text class="tag">当前门店</text>
+							<view class="store-name">{{ nearestStore.store_name }}</view>
+							<view class="address">{{ nearestStore.show_address }}</view>
+							<view class="distance" v-if="nearestStore.distance">
+								<text class="iconfont icon-dizhi"></text>
+								<text>{{ nearestStore.distance > 1 ? nearestStore.distance + 'km' :
+									nearestStore.distance *
+									1000 +
+									'm' }}</text>
+							</view>
+						</view>
+						<button type="primary" @click="enterStore">确认进入</button>
+						<view class="other-store" @click="chooseOtherStore"
+							v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
+							<text>选择其他门店</text>
+							<text class="iconfont icon-right"></text>
 						</view>
 					</view>
-					<button type="primary" @click="enterStore">确认进入</button>
-					<view class="other-store" @click="chooseOtherStore"
-						v-if="globalStoreConfig && globalStoreConfig.is_allow_change == 1">
-						<text>选择其他门店</text>
-						<text class="iconfont icon-right"></text>
-					</view>
-				</view>
-			</uni-popup>
+				</uni-popup>
+			</view>
+			<hover-nav></hover-nav>
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
+			<ns-login ref="login"></ns-login>
 		</view>
-		<hover-nav></hover-nav>
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
-		<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
-		<ns-login ref="login"></ns-login>
 	</view>
 </template>
 
diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
index 14487e2..dc128d6 100644
--- a/pages_promotion/fenxiao/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -1,27 +1,33 @@
 <template>
-	<view class="fenxiao-index" :style="themeColor + ';' + { background: 'url(' + $util.img('public/uniapp/fenxiao/index/commissionFission-background.png') + ')',backgroundRepeat: 'no-repeat',backgroundSize:'100%' }">
-		<block v-if="info.fenxiao_id > 0">
-			<!-- 头部 -->
-			<view class="fenxiao-index-header" :class="{ 'not-level': !levelList.length }" >
-				<view class="member">
-					<view class="member-pic">
-						<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head" @error="info.headimg = $util.getDefaultImage().head" mode="aspectFill"/>
-						<!-- <text class="level-name ">{{ info.level_name }}</text> -->
-					</view>
-					<view class="member-info">
-						<view class="member-info-box">
-							<text class="name">{{ info.fenxiao_name }}</text>
-							<p class="level"  v-if="info.level_num > 0"><img :src="$util.img('public/uniapp/fenxiao/index/commissionFission-level.png')" alt="" class="level-icon">{{ info.level_name }}</p>
+	<view :style="themeColor">
+		<view class="fenxiao-index"
+			:style="{ background: 'url(' + $util.img('public/uniapp/fenxiao/index/commissionFission-background.png') + ')', backgroundRepeat: 'no-repeat', backgroundSize: '100%' }">
+			<block v-if="info.fenxiao_id > 0">
+				<!-- 头部 -->
+				<view class="fenxiao-index-header" :class="{ 'not-level': !levelList.length }">
+					<view class="member">
+						<view class="member-pic">
+							<image :src="info.headimg ? $util.img(info.headimg) : $util.getDefaultImage().head"
+								@error="info.headimg = $util.getDefaultImage().head" mode="aspectFill" />
+							<!-- <text class="level-name ">{{ info.level_name }}</text> -->
 						</view>
-						<view class="recommend">上级代理商：{{ info.parent_name?info.parent_name:'总店' }}</view>
-						<view class="recommend">已邀请成功：{{ teamNum.num }}人<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
-					</view>
-				<!-- 	<view class="promote-rules font-size-tag" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
+						<view class="member-info">
+							<view class="member-info-box">
+								<text class="name">{{ info.fenxiao_name }}</text>
+								<p class="level" v-if="info.level_num > 0"><img
+										:src="$util.img('public/uniapp/fenxiao/index/commissionFission-level.png')"
+										alt="" class="level-icon">{{ info.level_name }}</p>
+							</view>
+							<view class="recommend">上级代理商：{{ info.parent_name ? info.parent_name : '总店' }}</view>
+							<view class="recommend">已邀请成功：{{ teamNum.num }}人<text class="iconfont icon-right"
+									style="font-size: 24rpx;"></text></view>
+						</view>
+						<!-- 	<view class="promote-rules font-size-tag" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
 						<text class="iconfont icon-wenhao font-size-tag"></text>
 						推广规则
 					</view> -->
-				</view>
-			<!-- 	<view class="fenxiao-level-wrap" v-if="levelList.length">
+					</view>
+					<!-- 	<view class="fenxiao-level-wrap" v-if="levelList.length">
 					<image :src="$util.img('public/uniapp/fenxiao/index/level_icon.png')" mode="widthFix" class="level-icon"/>
 					<view class="level-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/level')">
 						<view class="title">{{ info.level_num > 0 ? info.level_name : '等级未解锁' }}</view>
@@ -29,22 +35,23 @@
 					</view>
 					<view class="btn" @click="$refs.taskPopup.open()" v-if="info.condition.last_level">做任务</view>
 				</view> -->
-			</view>
-
-			<view class="fenxiao-index-allmoney">
-				<view class="allmoney-top-money">
-					<view class="allmoney-top">
-						<view class="font-size-sub">可{{ fenxiaoWords.withdraw }}（元）</view>
-						<view class="withdrawal-record" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
-							提现明细
-							<text class="iconfont icon-right"></text>
-						</view>
-					</view>
-					<view class="total-commission price-font">{{ info.account }}</view>
 				</view>
 
-				<view class="allmoney-bottom">
-			<!-- 		<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
+				<view class="fenxiao-index-allmoney">
+					<view class="allmoney-top-money">
+						<view class="allmoney-top">
+							<view class="font-size-sub">可{{ fenxiaoWords.withdraw }}（元）</view>
+							<view class="withdrawal-record"
+								@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+								提现明细
+								<text class="iconfont icon-right"></text>
+							</view>
+						</view>
+						<view class="total-commission price-font">{{ info.account }}</view>
+					</view>
+
+					<view class="allmoney-bottom">
+						<!-- 		<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
 						<view class="title">总{{ fenxiaoWords.account }}</view>
 						<view class="money price-font">{{ info.total_commission | moneyFormat }}</view>
 					</view>
@@ -52,63 +59,73 @@
 						<view class="title">已提现{{ fenxiaoWords.account }}</view>
 						<view class="money price-font">{{ info.account_withdraw | moneyFormat }}</view>
 					</view> -->
-					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
-						<view class="title">提现中(元)<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
-						<view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view>
+						<view class="allmoney-all-wrap"
+							@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+							<view class="title">提现中(元)<text class="iconfont icon-right"
+									style="font-size: 24rpx;"></text></view>
+							<view class="money price-font">{{ info.account_withdraw_apply | moneyFormat }}</view>
+						</view>
+						<view class="allmoney-all-wrap"
+							@click="$util.redirectTo('/pages_promotion/fenxiao/order', { type: 1 })">
+							<view class="title">待入账(元)<text class="iconfont icon-right"
+									style="font-size: 24rpx;"></text></view>
+							<view class="money price-font">{{ info.in_progress_money | moneyFormat }}</view>
+						</view>
 					</view>
-					<view class="allmoney-all-wrap" @click="$util.redirectTo('/pages_promotion/fenxiao/order', { type: 1 })">
-						<view class="title">待入账(元)<text class="iconfont icon-right" style="font-size: 24rpx;"></text></view>
-						<view class="money price-font">{{ info.in_progress_money | moneyFormat }}</view>
+					<view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">提现
 					</view>
 				</view>
-				<view class="withdraw-btn" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')">提现
-				</view>
-			</view>
-			
-			<view class="fenxiao-index-allmoney" style="padding: 0;border-radius:24rpx;margin-top: 0;" @click="toPoster()">
-				<image :src="$util.img('public/uniapp/fenxiao/index/commissionFission-qrcode1.png')" mode="widthFix" style="width: 100%;border-radius:24rpx" />
-			</view>
 
-			<!-- 功能列表 -->
-			<view class="fenxiao-menu-list">
-				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/team')">
-					<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/down-line.png')" mode="widthFix"></image>
-					</view>
-					<view class="info">
-						<view class="title">我的粉丝</view>
-						<view class="desc">邀请的用户</view>
-					</view>
+				<view class="fenxiao-index-allmoney" style="padding: 0;border-radius:24rpx;margin-top: 0;"
+					@click="toPoster()">
+					<image :src="$util.img('public/uniapp/fenxiao/index/commissionFission-qrcode1.png')" mode="widthFix"
+						style="width: 100%;border-radius:24rpx" />
 				</view>
-				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
-					<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/jifenjiangli.png')" mode="widthFix"></image>
+
+				<!-- 功能列表 -->
+				<view class="fenxiao-menu-list">
+					<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/team')">
+						<view class="icon-wrap">
+							<image :src="$util.img('public/uniapp/fenxiao/index/down-line.png')" mode="widthFix">
+							</image>
+						</view>
+						<view class="info">
+							<view class="title">我的粉丝</view>
+							<view class="desc">邀请的用户</view>
+						</view>
 					</view>
-					<view class="info">
-						<view class="title">{{ fenxiaoWords.withdraw }}明细</view>
-						<view class="desc">累计{{ fenxiaoWords.account }}￥{{ info.total_commission | moneyFormat }}</view>
+					<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_list')">
+						<view class="icon-wrap">
+							<image :src="$util.img('public/uniapp/fenxiao/index/jifenjiangli.png')" mode="widthFix">
+							</image>
+						</view>
+						<view class="info">
+							<view class="title">{{ fenxiaoWords.withdraw }}明细</view>
+							<view class="desc">累计{{ fenxiaoWords.account }}￥{{ info.total_commission | moneyFormat }}
+							</view>
+						</view>
 					</view>
-				</view>
-				<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/order')">
-					<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/fenxiaodingdan.png')" mode="widthFix"></image>
+					<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/order')">
+						<view class="icon-wrap">
+							<image :src="$util.img('public/uniapp/fenxiao/index/fenxiaodingdan.png')" mode="widthFix">
+							</image>
+						</view>
+						<view class="info">
+							<view class="title">{{ fenxiaoWords.concept + '订单' }}</view>
+							<view class="desc">{{ fenxiaoWords.concept + '订单' }}明细</view>
+						</view>
 					</view>
-					<view class="info">
-						<view class="title">{{ fenxiaoWords.concept + '订单' }}</view>
-						<view class="desc">{{ fenxiaoWords.concept + '订单' }}明细</view>
+
+					<view class="menu-item" @click="toPoster()">
+						<view class="icon-wrap">
+							<image :src="$util.img('public/uniapp/fenxiao/index/friend.png')" mode="widthFix"></image>
+						</view>
+						<view class="info">
+							<view class="title">我的邀请码</view>
+							<view class="desc">邀好友赚好礼</view>
+						</view>
 					</view>
-				</view>
-				
-				<view class="menu-item" @click="toPoster()">
-					<view class="icon-wrap">
-						<image :src="$util.img('public/uniapp/fenxiao/index/friend.png')" mode="widthFix"></image>
-					</view>
-					<view class="info">
-						<view class="title">我的邀请码</view>
-						<view class="desc">邀好友赚好礼</view>
-					</view>
-				</view>
-			<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
+					<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
 					<view class="icon-wrap">
 						<image :src="$util.img('public/uniapp/fenxiao/index/code.png')" mode="widthFix"></image>
 					</view>
@@ -117,7 +134,7 @@
 						<view class="desc">邀好友赚好礼</view>
 					</view>
 				</view> -->
-			<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
+					<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/bill')">
 					<view class="icon-wrap">
 						<image :src="$util.img('public/uniapp/fenxiao/index/bill.png')" mode="widthFix"></image>
 					</view>
@@ -135,7 +152,7 @@
 						<view class="desc">{{ fenxiaoWords.concept }}商品</view>
 					</view>
 				</view> -->
-		<!-- 		<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', { type: 'profit' })">
+					<!-- 		<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', { type: 'profit' })">
 					<view class="icon-wrap">
 						<image :src="$util.img('public/uniapp/fenxiao/index/commission_rank.png')" mode="widthFix">
 						</image>
@@ -145,7 +162,7 @@
 						<view class="desc">您的排名为第{{ profitRanking }}位</view>
 					</view>
 				</view> -->
-			<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', { type: 'invited_num' })">
+					<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/ranking_list', { type: 'invited_num' })">
 					<view class="icon-wrap">
 						<image :src="$util.img('public/uniapp/fenxiao/index/promoter_rank.png')" mode="widthFix">
 						</image>
@@ -155,7 +172,7 @@
 						<view class="desc">您的排名为{{ invitedNumRanking }}位</view>
 					</view>
 				</view> -->
-			<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/level')" v-if="levelList.length">
+					<!-- 	<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/level')" v-if="levelList.length">
 					<view class="icon-wrap">
 						<image :src="$util.img('public/uniapp/fenxiao/index/team_reward.png')" mode="widthFix"></image>
 					</view>
@@ -164,9 +181,9 @@
 						<view class="desc">{{ fenxiaoWords.concept }}等级说明</view>
 					</view>
 				</view> -->
-			</view>
-			
-		<!-- 	<view class="fenxiao-team">
+				</view>
+
+				<!-- 	<view class="fenxiao-team">
 				<view class="fenxiao-index-other">
 					<view @click="$util.redirectTo('/pages_promotion/fenxiao/team')" class="all-money-item">
 						<view class="img-wrap">
@@ -190,397 +207,398 @@
 					</view>
 				</view>
 			</view> -->
-		</block>
-		<ns-copyright></ns-copyright>
-		<view class="empty" v-if="!info.fenxiao_id > 0 && showEmpty">
-			<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix"></image>
-			<text>您还不是{{ fenxiaoWords.fenxiao_name }}，请先提交申请</text>
-			<view @click="$util.redirectTo('/pages_promotion/fenxiao/apply')" class="color-base-bg">立即加入</view>
-		</view>
-		<loading-cover ref="loadingCover"></loading-cover>
-		<ns-login ref="login"></ns-login>
+			</block>
+			<ns-copyright></ns-copyright>
+			<view class="empty" v-if="!info.fenxiao_id > 0 && showEmpty">
+				<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix"></image>
+				<text>您还不是{{ fenxiaoWords.fenxiao_name }}，请先提交申请</text>
+				<view @click="$util.redirectTo('/pages_promotion/fenxiao/apply')" class="color-base-bg">立即加入</view>
+			</view>
+			<loading-cover ref="loadingCover"></loading-cover>
+			<ns-login ref="login"></ns-login>
 
-		<uni-popup ref="taskPopup" type="bottom">
-			<view class="task-popup popup-layer" v-if="levelInfo">
-				<view class="head-wrap">
-					<text>快速升级技巧</text>
-					<text class="iconfont icon-close" @click="$refs.taskPopup.close()"></text>
-				</view>
-				<view class="body-wrap">
-					<view class="equity-content" v-for="(item, index) in levelInfo.task" :key="index">
-						<text class="subordinate-consumption">
-							{{ item.title }}
-							<text class="iconfont icon-wenhao" @click="openTips(item)"></text>
-							<text class="incomplete">{{ item.progress == 100 ? '已完成' : '未完成' }}</text>
-						</text>
-						<view class="circle">
-							<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
+			<uni-popup ref="taskPopup" type="bottom">
+				<view class="task-popup popup-layer" v-if="levelInfo">
+					<view class="head-wrap">
+						<text>快速升级技巧</text>
+						<text class="iconfont icon-close" @click="$refs.taskPopup.close()"></text>
+					</view>
+					<view class="body-wrap">
+						<view class="equity-content" v-for="(item, index) in levelInfo.task" :key="index">
+							<text class="subordinate-consumption">
+								{{ item.title }}
+								<text class="iconfont icon-wenhao" @click="openTips(item)"></text>
+								<text class="incomplete">{{ item.progress == 100 ? '已完成' : '未完成' }}</text>
+							</text>
+							<view class="circle">
+								<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" />
+							</view>
+							<text class="zero">{{ item.value }}</text>
+							<text>/{{ item.condition }}</text>
+							<text class="to-complete-box" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
+								<text class="to-complete">{{ item.progress == 100 ? '已完成' : '去完成' }}</text>
+							</text>
 						</view>
-						<text class="zero">{{ item.value }}</text>
-						<text>/{{ item.condition }}</text>
-						<text class="to-complete-box" @click="$util.redirectTo('/pages_promotion/fenxiao/promote')">
-							<text class="to-complete">{{ item.progress == 100 ? '已完成' : '去完成' }}</text>
-						</text>
 					</view>
 				</view>
-			</view>
-		</uni-popup>
+			</uni-popup>
 
-		<uni-popup type="bottom" ref="tips">
-			<view class="popup">
-				<view class="popup-header">
-					<text class="tit">提示</text>
-					<text class="iconfont icon-close" @click="$refs.tips.close()"></text>
+			<uni-popup type="bottom" ref="tips">
+				<view class="popup">
+					<view class="popup-header">
+						<text class="tit">提示</text>
+						<text class="iconfont icon-close" @click="$refs.tips.close()"></text>
+					</view>
+					<view class="popup-body">
+						<view>{{ tips }}</view>
+						<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? '满足任意一条件即可升级' : '满足全部条件才能进行升级' }}</view>
+					</view>
 				</view>
-				<view class="popup-body">
-					<view>{{ tips }}</view>
-					<view v-if="levelInfo">{{ levelInfo.upgrade_type == 1 ? '满足任意一条件即可升级' : '满足全部条件才能进行升级' }}</view>
-				</view>
-			</view>
-		</uni-popup>
+			</uni-popup>
+		</view>
 	</view>
 </template>
 
 <script>
-	import fenxiaoWords from '@/common/js/fenxiao-words.js';
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import fenxiaoWords from '@/common/js/fenxiao-words.js';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
 
-	export default {
-		components: {
-			uniPopup
-		},
-		data() {
-			return {
-				info: {
-					fenxiao_name: '',
-					fenxiao_id: 0
-				},
-				showEmpty: false,
-				teamNum: {
-					fenxiao_num: 0,
-					member_num: 0
-				},
-				//初始化获取到的模板id
-				templateId: '',
-				tips: '',
-				profitRanking: 0,
-				invitedNumRanking: 0,
-				levelList: [],
-				poster:''
-			};
-		},
-		mixins: [fenxiaoWords],
-		onShow() {
-			if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '中心');
+export default {
+	components: {
+		uniPopup
+	},
+	data() {
+		return {
+			info: {
+				fenxiao_name: '',
+				fenxiao_id: 0
+			},
+			showEmpty: false,
+			teamNum: {
+				fenxiao_num: 0,
+				member_num: 0
+			},
+			//初始化获取到的模板id
+			templateId: '',
+			tips: '',
+			profitRanking: 0,
+			invitedNumRanking: 0,
+			levelList: [],
+			poster: ''
+		};
+	},
+	mixins: [fenxiaoWords],
+	onShow() {
+		if (this.fenxiaoWords && this.fenxiaoWords.concept) this.$langConfig.title(this.fenxiaoWords.concept + '中心');
 
-			if (this.storeToken) {
-				this.checkFenxiaoIsStart();
-			} else {
-				this.$nextTick(() => {
-					this.$refs.login.open('/pages_promotion/fenxiao/index');
+		if (this.storeToken) {
+			this.checkFenxiaoIsStart();
+		} else {
+			this.$nextTick(() => {
+				this.$refs.login.open('/pages_promotion/fenxiao/index');
+			});
+		}
+
+		this.getTemplateId();
+		this.getPoster();
+	},
+	onLoad() {
+		setTimeout(() => {
+			if (!this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
 				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
+				}, 2000);
 			}
-
-			this.getTemplateId();
-			this.getPoster();
+		}, 1000);
+		this.getFenxiaoLevel();
+	},
+	methods: {
+		toPoster() {
+			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster, templateId: this.templateId })
 		},
-		onLoad() {
-			setTimeout( () => {
-				if (!this.addonIsExist.fenxiao) {
-					this.$util.showToast({
-						title: '商家未开启分销',
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(() => {
-						this.$util.redirectTo('/pages/index/index', {}, 'redirectTo');
-					}, 2000);
+		/**
+		 * 获取分享海报
+		 */
+		getPoster() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/posterList',
+				success: res => {
+					if (res.code >= 0) {
+						this.poster = res.data.toString();
+						this.poster = encodeURIComponent(this.poster);
+					}
 				}
-			},1000);
-			this.getFenxiaoLevel();
+			});
 		},
-		methods: {
-			toPoster(){
-				this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster,templateId:this.templateId })
-			},
-			/**
-			 * 获取分享海报
-			 */
-			getPoster() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/posterList',
-					success: res => {
-						if (res.code >= 0) {
-							this.poster = res.data.toString();
-							this.poster = encodeURIComponent(this.poster);
-						}
-					}
-				});
-			},
-			/**
-			 * 检测分销是否开启
-			 */
-			checkFenxiaoIsStart() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/config/basics',
-					success: res => {
-						if (res.code == 0 && res.data) {
-							if (res.data.level > 0) {
-								this.getFenxiaoDetail();
-							} else {
-								this.$util.showToast({
-									title: '商家未开启分销',
-									mask: true,
-									duration: 2000
-								});
-								setTimeout(() => {
-									this.$util.redirectTo('/pages/member/index');
-								}, 2000);
-							}
-						}
-					}
-				});
-			},
-			// 获取分销商信息
-			getFenxiaoDetail() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/detail',
-					success: res => {
-						console.log(res)
-						if (res.data) {
-							if (res.data.status == -1) {
-								this.$util.showToast({
-									title: '当前分销商已冻结'
-								});
-								setTimeout(() => {
-									this.$util.redirectTo('/pages/member/index');
-								}, 2000);
-								return;
-							}
-							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-							this.info = res.data;
-							this.getTeamNum();
-							this.getRanking('invited_num');
-							this.getRanking('profit');
-							this.showEmpty = true;
+		/**
+		 * 检测分销是否开启
+		 */
+		checkFenxiaoIsStart() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/config/basics',
+				success: res => {
+					if (res.code == 0 && res.data) {
+						if (res.data.level > 0) {
+							this.getFenxiaoDetail();
 						} else {
-							this.$util.redirectTo('/pages_promotion/fenxiao/apply', {}, 'redirectTo');
+							this.$util.showToast({
+								title: '商家未开启分销',
+								mask: true,
+								duration: 2000
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/member/index');
+							}, 2000);
+						}
+					}
+				}
+			});
+		},
+		// 获取分销商信息
+		getFenxiaoDetail() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/detail',
+				success: res => {
+					console.log(res)
+					if (res.data) {
+						if (res.data.status == -1) {
+							this.$util.showToast({
+								title: '当前分销商已冻结'
+							});
+							setTimeout(() => {
+								this.$util.redirectTo('/pages/member/index');
+							}, 2000);
+							return;
 						}
-					},
-					fail: res => {
-						this.showEmpty = true;
 						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						this.info = res.data;
+						this.getTeamNum();
+						this.getRanking('invited_num');
+						this.getRanking('profit');
+						this.showEmpty = true;
+					} else {
+						this.$util.redirectTo('/pages_promotion/fenxiao/apply', {}, 'redirectTo');
 					}
-				});
-			},
-			//去提现
-			goTixian() {
-				this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply');
-			},
-			toLevel() {
-				this.$util.redirectTo('/pages_promotion/fenxiao/level');
-			},
-			close() {
-				this.$refs.taskPopup.close();
-			},
-			getTeamNum() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/teamnum',
-					success: res => {
-						if (res.code >= 0) {
-							this.teamNum = res.data;
-						}
-					}
-				});
-			},
-			/**
-			 * 获取分享海报模板id
-			 */
-			getTemplateId() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/posterTemplateIds',
-					success: res => {
-						if (res.code >= 0) {
-							this.templateId = [...res.data].join();
-						}
-					}
-				});
-			},
-			moneyFormat(money) {
-				if (isNaN(parseFloat(money))) return money;
-				return parseFloat(money).toFixed(2);
-			},
-			openTips(data) {
-				this.tips = data.tips;
-				this.$refs.tips.open();
-			},
-			getRanking(type) {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/fenxiao/ranking',
-					data: {
-						type: type
-					},
-					success: res => {
-						if (res.code >= 0) {
-							if (type == 'profit') this.profitRanking = res.data;
-							if (type == 'invited_num') this.invitedNumRanking = res.data;
-						}
-					}
-				});
-			},
-			getFenxiaoLevel() {
-				this.$api.sendRequest({
-					url: '/fenxiao/api/Level/lists',
-					success: res => {
-						if (res.code == 0 && res.data) {
-							this.levelList = res.data;
-						}
-					}
-				});
-			}
-		},
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				return false;
-			}
-			this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
-			return true;
-		},
-		watch: {
-			storeToken: function(nVal, oVal) {
-				if (nVal) {
-					this.checkFenxiaoIsStart();
+				},
+				fail: res => {
+					this.showEmpty = true;
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
 				}
-			}
+			});
 		},
-		computed: {
-			levelInfo() {
-				if (this.info && this.info.condition && this.info.condition.last_level) {
-					let level = this.info.condition.last_level;
-					level.task = [];
-					level.complete = 0;
-
-					if (level.one_fenxiao_order_num > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
-							tips: '分销商自己购买和自己推荐的直属会员购买的订单次数',
-							condition: level.one_fenxiao_order_num,
-							value: this.info.one_fenxiao_order_num,
-							progress: parseFloat(this.info.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ?
-								100 :
-								((parseFloat(this.info.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num)) * 100).toFixed(2)
-						};
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
+		//去提现
+		goTixian() {
+			this.$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply');
+		},
+		toLevel() {
+			this.$util.redirectTo('/pages_promotion/fenxiao/level');
+		},
+		close() {
+			this.$refs.taskPopup.close();
+		},
+		getTeamNum() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/teamnum',
+				success: res => {
+					if (res.code >= 0) {
+						this.teamNum = res.data;
 					}
-					if (level.one_fenxiao_total_order > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
-							tips: '分销商自己购买和推荐的直属会员购买的订单的总额',
-							condition: this.moneyFormat(level.one_fenxiao_total_order),
-							value: this.info.one_fenxiao_total_order,
-							progress: parseFloat(this.info.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ?
-								100 :
-								((parseFloat(this.info.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order)) * 100).toFixed(2)
-						};
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_fenxiao_order_money > 0) {
-						let task = {
-							title: '下级消费',
-							desc: '下级消费产生' + this.fenxiaoWords.account + '总额满' + this.moneyFormat(level
-								.one_fenxiao_order_money) + '元',
-							tips: '分销商自己购买和自己推荐的直属会员购买的订单' + this.fenxiaoWords.account + '总额',
-							condition: this.moneyFormat(level.one_fenxiao_order_money),
-							value: this.info.one_fenxiao_order_money,
-							progress: parseFloat(this.info.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ?
-								100 :
-								((parseFloat(this.info.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money)) * 100).toFixed(2)
-						};
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.order_num > 0) {
-						let task = {
-							title: '自身消费',
-							desc: '自身消费单数满' + level.order_num + '单',
-							tips: '分销商自己购买的订单次数',
-							condition: level.order_num,
-							value: this.info.order_num,
-							progress: parseFloat(this.info.order_num) > parseFloat(level.order_num) ? 100 : ((parseFloat(this.info.order_num) / parseFloat(level.order_num)) * 100).toFixed(2)
-						};
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.order_money > 0) {
-						let task = {
-							title: '自身消费',
-							desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
-							tips: '分销商自己购买的订单总额',
-							condition: this.moneyFormat(level.order_money),
-							value: this.info.order_money,
-							progress: parseFloat(this.info.order_money) > parseFloat(level.order_money) ?
-								100 :
-								((parseFloat(this.info.order_money) / parseFloat(level.order_money)) * 100).toFixed(2)
-						};
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_child_num > 0) {
-						let task = {
-							title: '邀请好友',
-							desc: '邀请好友人数达到' + level.one_child_num + '人',
-							tips: '分销商的直属下级会员人数（包含已经申请成为分销商的）',
-							condition: level.one_child_num,
-							value: this.info.one_child_num,
-							progress: parseFloat(this.info.one_child_num) > parseFloat(level.one_child_num) ?
-								100 :
-								((parseFloat(this.info.one_child_num) / parseFloat(level.one_child_num)) * 100).toFixed(2)
-						};
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					if (level.one_child_fenxiao_num > 0) {
-						let task = {
-							title: '邀请好友',
-							desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
-							tips: '分销商的直属下级分销商人数',
-							condition: level.one_child_fenxiao_num,
-							value: this.info.one_child_fenxiao_num,
-							progress: parseFloat(this.info.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ?
-								100 :
-								((parseFloat(this.info.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num)) * 100).toFixed(2)
-						};
-						if (task.progress == 100) level.complete += 1;
-						level.task.push(task);
-					}
-					level.task_num = level.upgrade_type == 1 ? 1 : level.task.length;
-					return level;
 				}
+			});
+		},
+		/**
+		 * 获取分享海报模板id
+		 */
+		getTemplateId() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/posterTemplateIds',
+				success: res => {
+					if (res.code >= 0) {
+						this.templateId = [...res.data].join();
+					}
+				}
+			});
+		},
+		moneyFormat(money) {
+			if (isNaN(parseFloat(money))) return money;
+			return parseFloat(money).toFixed(2);
+		},
+		openTips(data) {
+			this.tips = data.tips;
+			this.$refs.tips.open();
+		},
+		getRanking(type) {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/ranking',
+				data: {
+					type: type
+				},
+				success: res => {
+					if (res.code >= 0) {
+						if (type == 'profit') this.profitRanking = res.data;
+						if (type == 'invited_num') this.invitedNumRanking = res.data;
+					}
+				}
+			});
+		},
+		getFenxiaoLevel() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/Level/lists',
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.levelList = res.data;
+					}
+				}
+			});
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') {
+			return false;
+		}
+		this.$util.redirectTo('/pages/member/index', {}, 'reLaunch');
+		return true;
+	},
+	watch: {
+		storeToken: function (nVal, oVal) {
+			if (nVal) {
+				this.checkFenxiaoIsStart();
 			}
 		}
-	};
+	},
+	computed: {
+		levelInfo() {
+			if (this.info && this.info.condition && this.info.condition.last_level) {
+				let level = this.info.condition.last_level;
+				level.task = [];
+				level.complete = 0;
+
+				if (level.one_fenxiao_order_num > 0) {
+					let task = {
+						title: '下级消费',
+						desc: '下级消费单数满' + level.one_fenxiao_order_num + '单',
+						tips: '分销商自己购买和自己推荐的直属会员购买的订单次数',
+						condition: level.one_fenxiao_order_num,
+						value: this.info.one_fenxiao_order_num,
+						progress: parseFloat(this.info.one_fenxiao_order_num) > parseFloat(level.one_fenxiao_order_num) ?
+							100 :
+							((parseFloat(this.info.one_fenxiao_order_num) / parseFloat(level.one_fenxiao_order_num)) * 100).toFixed(2)
+					};
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.one_fenxiao_total_order > 0) {
+					let task = {
+						title: '下级消费',
+						desc: '下级消费金额满' + this.moneyFormat(level.one_fenxiao_total_order) + '元',
+						tips: '分销商自己购买和推荐的直属会员购买的订单的总额',
+						condition: this.moneyFormat(level.one_fenxiao_total_order),
+						value: this.info.one_fenxiao_total_order,
+						progress: parseFloat(this.info.one_fenxiao_total_order) > parseFloat(level.one_fenxiao_total_order) ?
+							100 :
+							((parseFloat(this.info.one_fenxiao_total_order) / parseFloat(level.one_fenxiao_total_order)) * 100).toFixed(2)
+					};
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.one_fenxiao_order_money > 0) {
+					let task = {
+						title: '下级消费',
+						desc: '下级消费产生' + this.fenxiaoWords.account + '总额满' + this.moneyFormat(level
+							.one_fenxiao_order_money) + '元',
+						tips: '分销商自己购买和自己推荐的直属会员购买的订单' + this.fenxiaoWords.account + '总额',
+						condition: this.moneyFormat(level.one_fenxiao_order_money),
+						value: this.info.one_fenxiao_order_money,
+						progress: parseFloat(this.info.one_fenxiao_order_money) > parseFloat(level.one_fenxiao_order_money) ?
+							100 :
+							((parseFloat(this.info.one_fenxiao_order_money) / parseFloat(level.one_fenxiao_order_money)) * 100).toFixed(2)
+					};
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.order_num > 0) {
+					let task = {
+						title: '自身消费',
+						desc: '自身消费单数满' + level.order_num + '单',
+						tips: '分销商自己购买的订单次数',
+						condition: level.order_num,
+						value: this.info.order_num,
+						progress: parseFloat(this.info.order_num) > parseFloat(level.order_num) ? 100 : ((parseFloat(this.info.order_num) / parseFloat(level.order_num)) * 100).toFixed(2)
+					};
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.order_money > 0) {
+					let task = {
+						title: '自身消费',
+						desc: '自身消费金额满' + this.moneyFormat(level.order_money) + '元',
+						tips: '分销商自己购买的订单总额',
+						condition: this.moneyFormat(level.order_money),
+						value: this.info.order_money,
+						progress: parseFloat(this.info.order_money) > parseFloat(level.order_money) ?
+							100 :
+							((parseFloat(this.info.order_money) / parseFloat(level.order_money)) * 100).toFixed(2)
+					};
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.one_child_num > 0) {
+					let task = {
+						title: '邀请好友',
+						desc: '邀请好友人数达到' + level.one_child_num + '人',
+						tips: '分销商的直属下级会员人数（包含已经申请成为分销商的）',
+						condition: level.one_child_num,
+						value: this.info.one_child_num,
+						progress: parseFloat(this.info.one_child_num) > parseFloat(level.one_child_num) ?
+							100 :
+							((parseFloat(this.info.one_child_num) / parseFloat(level.one_child_num)) * 100).toFixed(2)
+					};
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				if (level.one_child_fenxiao_num > 0) {
+					let task = {
+						title: '邀请好友',
+						desc: '邀请好友成为分销商人数达到' + level.one_child_fenxiao_num + '人',
+						tips: '分销商的直属下级分销商人数',
+						condition: level.one_child_fenxiao_num,
+						value: this.info.one_child_fenxiao_num,
+						progress: parseFloat(this.info.one_child_fenxiao_num) > parseFloat(level.one_child_fenxiao_num) ?
+							100 :
+							((parseFloat(this.info.one_child_fenxiao_num) / parseFloat(level.one_child_fenxiao_num)) * 100).toFixed(2)
+					};
+					if (task.progress == 100) level.complete += 1;
+					level.task.push(task);
+				}
+				level.task_num = level.upgrade_type == 1 ? 1 : level.task.length;
+				return level;
+			}
+		}
+	}
+};
 </script>
 
 <style lang="scss">
-	@import './public/css/index.scss';
+@import './public/css/index.scss';
 </style>
 <style scoped lang="scss">
-	/deep/ .uni-popup__wrapper {
-		height: auto;
-	}
+/deep/ .uni-popup__wrapper {
+	height: auto;
+}
 
-	/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box,
-	.uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box {
-		background: none;
-		max-height: unset !important;
-		overflow-y: hidden !important;
-	}
+/deep/ .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box,
+.uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box {
+	background: none;
+	max-height: unset !important;
+	overflow-y: hidden !important;
+}
 
-	/deep/ .uni-popup__wrapper {
-		border-radius: 20rpx 20rpx 0 0;
-	}
+/deep/ .uni-popup__wrapper {
+	border-radius: 20rpx 20rpx 0 0;
+}
 </style>
\ No newline at end of file
diff --git a/pages_promotion/fenxiao/promote.vue b/pages_promotion/fenxiao/promote.vue
index dc8c637..e634a8d 100644
--- a/pages_promotion/fenxiao/promote.vue
+++ b/pages_promotion/fenxiao/promote.vue
@@ -1,54 +1,58 @@
 <template>
-	<view class="fenxiao-promote" :style="themeColor + ';' + { backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
-		<view class="my-earnings">
-			<view class="earnings-head-wrap">
-				<view class="earnings-head">
-					<image class="name" :src="$util.img('public/uniapp/fenxiao/promote/my_earnings.png')" mode="aspectFit"></image>
-					<image class="money-bg" :src="$util.img('public/uniapp/fenxiao/promote/money.png')" mode="aspectFill"></image>
-					<view class="content">
-						累计收益
-						<text class="money-text">{{ detailData.total_commission }}</text>
-						元
-					</view>
-				</view>
-			</view>
-			<view class="earnings-body">
-				<view class="earnings-tab">
-					<text :class="{ active: tabIndex == 0 }" @click="tabCut(0)">已邀请好友</text>
-					<text :class="{ active: tabIndex == 1 }" @click="tabCut(1)">已下单好友</text>
-				</view>
-				<scroll-view scroll-y="true" class="earnings-content-wrap" @scrolltolower="getTeam()">
-					<view class="earnings-list" v-if="promote.list.length">
-						<view class="earnings-item" v-for="(item, index) in promote.list" :key="index">
-							<image
-								class="item-img"
-								:src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
-								@error="item.headimg = $util.getDefaultImage().head"
-								mode="aspectFill"
-							></image>
-							<view class="item-content">
-								<view class="item-name multi-hidden">{{ item.nickname }}</view>
-							</view>
+	<view :style="themeColor">
+		<view class="fenxiao-promote"
+			:style="{ backgroundImage: 'url(' + $util.img('public/uniapp/fenxiao/promote/promote_bg.png') + ')' }">
+			<view class="my-earnings">
+				<view class="earnings-head-wrap">
+					<view class="earnings-head">
+						<image class="name" :src="$util.img('public/uniapp/fenxiao/promote/my_earnings.png')"
+							mode="aspectFit"></image>
+						<image class="money-bg" :src="$util.img('public/uniapp/fenxiao/promote/money.png')"
+							mode="aspectFill"></image>
+						<view class="content">
+							累计收益
+							<text class="money-text">{{ detailData.total_commission }}</text>
+							元
 						</view>
 					</view>
-					<view class="earnings-empty" v-else>暂无已邀请好友，快去邀请吧</view>
-				</scroll-view>
+				</view>
+				<view class="earnings-body">
+					<view class="earnings-tab">
+						<text :class="{ active: tabIndex == 0 }" @click="tabCut(0)">已邀请好友</text>
+						<text :class="{ active: tabIndex == 1 }" @click="tabCut(1)">已下单好友</text>
+					</view>
+					<scroll-view scroll-y="true" class="earnings-content-wrap" @scrolltolower="getTeam()">
+						<view class="earnings-list" v-if="promote.list.length">
+							<view class="earnings-item" v-for="(item, index) in promote.list" :key="index">
+								<image class="item-img"
+									:src="item.headimg ? $util.img(item.headimg) : $util.getDefaultImage().head"
+									@error="item.headimg = $util.getDefaultImage().head" mode="aspectFill"></image>
+								<view class="item-content">
+									<view class="item-name multi-hidden">{{ item.nickname }}</view>
+								</view>
+							</view>
+						</view>
+						<view class="earnings-empty" v-else>暂无已邀请好友，快去邀请吧</view>
+					</scroll-view>
+				</view>
 			</view>
-		</view>
-		<view class="activity-rules">
-			<image class="rules-name" :src="$util.img('public/uniapp/fenxiao/promote/activity_rules.png')" mode="aspectFit"></image>
-			<view class="content" v-if="promoteContent.content"><rich-text :nodes="promoteContent.content"></rich-text></view>
-			<view class="rules-empty" v-else>暂无活动规则</view>
-		</view>
-		<view class="active-btn"><button type="primary" @click="toPoster()">邀请好友</button></view>
-		<ns-copyright></ns-copyright>
-		<ns-login ref="login"></ns-login>
-		<loading-cover ref="loadingCover"></loading-cover>
+			<view class="activity-rules">
+				<image class="rules-name" :src="$util.img('public/uniapp/fenxiao/promote/activity_rules.png')"
+					mode="aspectFit"></image>
+				<view class="content" v-if="promoteContent.content"><rich-text
+						:nodes="promoteContent.content"></rich-text></view>
+				<view class="rules-empty" v-else>暂无活动规则</view>
+			</view>
+			<view class="active-btn"><button type="primary" @click="toPoster()">邀请好友</button></view>
+			<ns-copyright></ns-copyright>
+			<ns-login ref="login"></ns-login>
+			<loading-cover ref="loadingCover"></loading-cover>
 
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+		</view>
 	</view>
 </template>
 
@@ -68,11 +72,11 @@ export default {
 			isPay: 0,
 			detailData: {},
 			templateId: '',
-			poster:'',
+			poster: '',
 		};
 	},
 	onShow() {
-		setTimeout( () => {
+		setTimeout(() => {
 			if (!this.addonIsExist.fenxiao) {
 				this.$util.showToast({
 					title: '商家未开启分销',
@@ -83,7 +87,7 @@ export default {
 					this.$util.redirectTo('/pages/index/index');
 				}, 2000);
 			}
-		},1000);
+		}, 1000);
 
 		if (this.storeToken) {
 			this.getTeam();
@@ -100,8 +104,8 @@ export default {
 		this.getPoster();
 	},
 	methods: {
-		toPoster(){
-			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster,templateId:this.templateId })
+		toPoster() {
+			this.$util.redirectTo('/pages_promotion/fenxiao/promote_code', { poster: this.poster, templateId: this.templateId })
 		},
 		tabCut(index) {
 			this.tabIndex = index;
@@ -213,14 +217,17 @@ export default {
 	background-color: #ff2d46;
 	background-size: 100%;
 	background-repeat: no-repeat;
+
 	.my-earnings,
 	.activity-rules {
 		background-color: #fff;
 		border-radius: 30rpx;
 	}
+
 	.my-earnings {
 		margin-top: 230rpx;
 		padding-bottom: 40rpx;
+
 		.earnings-head-wrap {
 			background-color: #fff7f5;
 			height: 160rpx;
@@ -228,33 +235,40 @@ export default {
 			border-bottom-left-radius: 0;
 			border-bottom-right-radius: 0;
 		}
+
 		.earnings-head {
 			position: relative;
 			padding-top: 60rpx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
+
 			.name {
 				position: absolute;
 				width: 384rpx;
 				height: 74rpx;
 				top: -22rpx;
 			}
+
 			.content {
 				font-size: $font-size-tag;
 			}
+
 			.money-bg {
 				width: 80rpx;
 				height: 80rpx;
 			}
+
 			.money-text {
 				margin: 0 6rpx;
 				font-size: 40rpx;
 				line-height: 1;
 			}
 		}
+
 		.earnings-body {
 			padding: 0 30rpx;
+
 			.earnings-tab {
 				display: flex;
 				justify-content: space-around;
@@ -263,9 +277,11 @@ export default {
 				font-size: 30rpx;
 				color: #e93224;
 				margin-bottom: 10rpx;
+
 				text.active {
 					position: relative;
 					font-weight: bold;
+
 					&::after {
 						position: absolute;
 						content: '';
@@ -278,35 +294,43 @@ export default {
 					}
 				}
 			}
+
 			.earnings-content-wrap {
 				max-height: 440rpx;
 			}
+
 			.earnings-item {
 				display: flex;
 				align-items: center;
 				margin-bottom: 20rpx;
+
 				&:last-child {
 					margin-bottom: 0;
 				}
+
 				.item-img {
 					width: 90rpx;
 					height: 90rpx;
 					margin-right: 20rpx;
 					flex-shrink: 0;
 				}
+
 				.item-time {
 					font-size: $font-size-tag;
 					color: $color-tip;
 				}
+
 				.item-name {
 					line-height: 1.3;
 				}
+
 				.money {
 					margin-left: auto;
 					color: #f9b124;
 				}
 			}
 		}
+
 		.earnings-empty {
 			display: flex;
 			align-items: center;
@@ -315,10 +339,12 @@ export default {
 			font-size: 30rpx;
 		}
 	}
+
 	.activity-rules {
 		position: relative;
 		margin-top: 60rpx;
 		min-height: 300rpx;
+
 		.rules-name {
 			position: absolute;
 			width: 384rpx;
@@ -327,9 +353,11 @@ export default {
 			left: 50%;
 			transform: translateX(-50%);
 		}
+
 		.content {
 			padding: 70rpx 20rpx 0;
 		}
+
 		.rules-empty {
 			padding-top: 140rpx;
 			text-align: center;
diff --git a/pages_tool/index/diy.vue b/pages_tool/index/diy.vue
index 96d4250..fe93e58 100644
--- a/pages_tool/index/diy.vue
+++ b/pages_tool/index/diy.vue
@@ -1,94 +1,104 @@
 <template>
-	<view :style="themeColor + ';' + { backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true"/>
-		</view>
-
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl" :scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" :haveTopCategory="true"/>
-			<ns-copyright v-show="isShowCopyRight"/>
-		</diy-index-page>
-
-		<view v-else class="bg-index" :style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"/>
-			<ns-copyright v-show="isShowCopyRight"/>
-		</view>
-
-		<template v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					<view class="image-wrap">
-						<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle" @click="uniPopupWindowFn()" mode="aspectFit"/>
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
-				</uni-popup>
+	<view :style="themeColor">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }"
+			class="page-img">
+			<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
+				:style="{ backgroundImage: bgImg }">
+				<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />
 			</view>
-		</template>
 
-		<!-- 底部tabBar -->
-		<view class="page-bottom" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" :name="name"/>
-		</view>
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+					:haveTopCategory="true" />
+				<ns-copyright v-show="isShowCopyRight" />
+			</diy-index-page>
 
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow" :style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit"/>
-				<text @click="closeCollectPopupWindow">我知道了</text>
+			<view v-else class="bg-index"
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" />
+				<ns-copyright v-show="isShowCopyRight" />
 			</view>
-		</uni-popup>
 
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
+			<template
+				v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+						<view class="image-wrap">
+							<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle"
+								@click="uniPopupWindowFn()" mode="aspectFit" />
+						</view>
+						<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
+					</uni-popup>
+				</view>
+			</template>
+
+			<!-- 底部tabBar -->
+			<view class="page-bottom" v-if="openBottomNav">
+				<diy-bottom-nav @callback="callback" :name="name" />
+			</view>
+
+			<!-- 收藏 -->
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+				<view v-if="showTip" class="collectPopupWindow"
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+					<text @click="closeCollectPopupWindow">我知道了</text>
+				</view>
+			</uni-popup>
+
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+		</view>
 	</view>
 </template>
 
 <script>
-	import uniPopup from '@/components/uni-popup/uni-popup.vue';
-	import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
-	import diyJs from '@/common/js/diy.js';
-	import microPageJs from './public/js/diy.js';
+import uniPopup from '@/components/uni-popup/uni-popup.vue';
+import nsNavbar from '@/components/ns-navbar/ns-navbar.vue';
+import diyJs from '@/common/js/diy.js';
+import microPageJs from './public/js/diy.js';
 
-	export default {
-		components: {
-			uniPopup,
-			nsNavbar
-		},
-		mixins: [diyJs, microPageJs]
-	};
+export default {
+	components: {
+		uniPopup,
+		nsNavbar
+	},
+	mixins: [diyJs, microPageJs]
+};
 </script>
 
 <style lang="scss">
-	@import '@/common/css/diy.scss';
+@import '@/common/css/diy.scss';
 </style>
 
 <style scoped>
-	.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		background: none !important;
-	}
+.wap-floating>>>.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	background: none !important;
+}
 
-	/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
-		border-radius: 0;
-	}
+/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+	border-radius: 0;
+}
 
-	.choose-store>>>.goodslist-uni-popup-box {
-		width: 80%;
-	}
+.choose-store>>>.goodslist-uni-popup-box {
+	width: 80%;
+}
 
-	/deep/ .placeholder {
-		height: 0;
-	}
+/deep/ .placeholder {
+	height: 0;
+}
 
-	/deep/::-webkit-scrollbar {
-		width: 0;
-		height: 0;
-		background-color: transparent;
-		display: none;
-	}
+/deep/::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	background-color: transparent;
+	display: none;
+}
 
-	/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
-		max-height: unset !important;
-	}
+/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	max-height: unset !important;
+}
 </style>
\ No newline at end of file
diff --git a/pages_tool/member/index.vue b/pages_tool/member/index.vue
index 5f4c847..3a99b48 100644
--- a/pages_tool/member/index.vue
+++ b/pages_tool/member/index.vue
@@ -1,64 +1,66 @@
 <template>
-	<view :style="themeColor + ';' + { backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
-		<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
-			:style="{ backgroundImage: bgImg }">
-			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />
-		</view>
-
-		<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
-			:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
-				:haveTopCategory="true" />
-			<ns-copyright v-show="isShowCopyRight" />
-		</diy-index-page>
-
-		<view v-else class="bg-index"
-			:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
-			<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" />
-			<ns-copyright v-show="isShowCopyRight" />
-
-			<view class="foot">
-				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">{{ isEnEnv ? 'Privacy Policy' : '隐私协议'}}</view>
-				<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">{{ isEnEnv ? 'Registration Agreement' : '注册协议'}}</view>
+	<view :style="themeColor">
+		<view :style="{ backgroundColor: bgColor, minHeight: openBottomNav ? 'calc(100vh - 55px)' : '' }" class="page-img">
+			<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch"
+				:style="{ backgroundImage: bgImg }">
+				<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="true" />
 			</view>
-		</view>
 
-		<template
-			v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
-			<view @touchmove.prevent.stop>
-				<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
-					<view class="image-wrap">
-						<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle"
-							@click="uniPopupWindowFn()" mode="aspectFit" />
-					</view>
-					<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
-				</uni-popup>
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
+				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
+					:haveTopCategory="true" />
+				<ns-copyright v-show="isShowCopyRight" />
+			</diy-index-page>
+
+			<view v-else class="bg-index"
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
+				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop" />
+				<ns-copyright v-show="isShowCopyRight" />
+
+				<view class="foot">
+					<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=0')">{{ isEnEnv ? 'Privacy Policy' : '隐私协议'}}</view>
+					<view class="item" @click="tourl('/pages_tool/agreement/contenr?type=1')">{{ isEnEnv ? 'Registration Agreement' : '注册协议'}}</view>
+				</view>
 			</view>
-		</template>
 
-		<!-- 底部tabBar -->
-		<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
-			<diy-bottom-nav @callback="callback" />
-		</view>
+			<template
+				v-if="diyData.global && diyData.global.popWindow && diyData.global.popWindow.count != -1 && diyData.global.popWindow.imageUrl">
+				<view @touchmove.prevent.stop>
+					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
+						<view class="image-wrap">
+							<image :src="$util.img(diyData.global.popWindow.imageUrl)" :style="popWindowStyle"
+								@click="uniPopupWindowFn()" mode="aspectFit" />
+						</view>
+						<text class="iconfont icon-round-close" @click="closePopupWindow"></text>
+					</uni-popup>
+				</view>
+			</template>
 
-		<!-- 收藏 -->
-		<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
-			<view v-if="showTip" class="collectPopupWindow"
-				:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
-				<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
-				<text @click="closeCollectPopupWindow">我知道了</text>
+			<!-- 底部tabBar -->
+			<view id="tab-bar" :class="{ hide: bottomNavHidden }" v-if="openBottomNav">
+				<diy-bottom-nav @callback="callback" />
 			</view>
-		</uni-popup>
 
-		<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
-		<ns-new-gift ref="nsNewGift"></ns-new-gift>
+			<!-- 收藏 -->
+			<uni-popup ref="collectPopupWindow" type="top" class="wap-floating wap-floating-collect">
+				<view v-if="showTip" class="collectPopupWindow"
+					:style="{ marginTop: (collectTop + statusBarHeight) * 2 + 'rpx' }">
+					<image :src="$util.img('public/uniapp/index/collect2.png')" mode="aspectFit" />
+					<text @click="closeCollectPopupWindow">我知道了</text>
+				</view>
+			</uni-popup>
+
+			<ns-birthday-gift ref="birthdayGift"></ns-birthday-gift>
+			<ns-new-gift ref="nsNewGift"></ns-new-gift>
 
 
-		<hover-nav></hover-nav>
-		<!-- #ifdef MP-WEIXIN -->
-		<!-- 小程序隐私协议 -->
-		<privacy-popup ref="privacyPopup"></privacy-popup>
-		<!-- #endif -->
+			<hover-nav></hover-nav>
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+		</view>
 	</view>
 </template>