调整客服绑定

components/auth-userInfo-mobile.vue

@@ -75,8 +75,7 @@
 			};
 		},
 		mounted() {
-			console.log(this.optionObj,'参数');
+			if(uni.getStorageSync('phone_active')==0){this.visible = true;}
-			if(uni.getStorageSync('is_active')!=1){this.visible = true;}
 			if(this.optionObj.invite_code!='' && this.optionObj.invite_code!=undefined){
 				this.loginEv(this.optionObj.invite_code);
 			} else if(this.optionObj.source_code!='' && this.optionObj.source_code!=undefined){

components/bottom-tab.vue

@@ -0,0 +1,56 @@
+<template>
+	<view class="posixzy disjbac bacf pad-zy32 btnBKS">
+		<view class="posir">
+			<image @tap="backHome" class="posia backH" src="/static/public/back-home-02.png" mode="aspectFill"></image>
+		</view>
+		<view class="disac fon26 colf">
+			<view @tap="lianK" class="disac posir lianShare" style="background-color: #3875F6; border-top-left-radius: 51rpx;border-bottom-left-radius: 51rpx;">
+				<image src="/static/public/bottom-customer.png" class="mar-zy20" style="width: 47rpx;height: 47rpx;" mode="aspectFill"></image>
+				<view>联系客服</view>
+				<button class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;" open-type="contact">客服</button>
+			</view>
+			<view class="disac posir lianShare" style="background-color: #38CE51;border-top-right-radius: 51rpx;border-bottom-right-radius: 51rpx;">
+				<image src="/static/public/bottom-shear.png" style="width: 47rpx;height: 47rpx;margin-left: 15rpx;margin-right: 8rpx;" mode="aspectFill">
+				</image>
+				<view>分享给好友</view>
+				<button class="posia" open-type="share" style="top: 0;right: 0;left: 0;bottom: 0;opacity: 0;">分享</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"bottom-tab",
+		data() {
+			return {
+				haveImg: true,
+			};
+		},
+		methods:{
+			backHome() {
+				uni.reLaunch({
+					url: '/pages/tabbar/pagehome/pagehome'
+				})
+			},
+			lianK() { //客服
+				this.$requst.post('user/rand-bind-service').then(res => {})
+				this.$toolAll.tools.closeTimer() //清空埋点倒计时
+				this.$requst.post('user/record', {
+					type: 'other',
+					action: 'ask',
+					id: 0
+				}).then(res => {}, error => {})
+				let maiOjb = {
+					e: 5, //内容咨询
+					t: new Date().getTime() //当前时间戳
+				}
+				this.$toolAll.tools.maiDian(maiOjb);
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>

components/foot-tab.vue

@@ -91,7 +91,7 @@
             };
         },
 		mounted() {
-			if(uni.getStorageSync('is_active')==0) this.isKef = false
+			if(uni.getStorageSync('phone_active')==0) this.isKef = false
 		},
         methods:{
 			cancleEv(e){

jsFile/tools.js

@@ -319,7 +319,7 @@ const tools = {
 	returnAuth(){//是否第一次授权
 		let auth = false
 		// if(uni.getStorageSync('is_active')==0 || uni.getStorageSync('phone_active')==0) {
-		if(uni.getStorageSync('is_active')==0) {
+		if(uni.getStorageSync('phone_active')==0) {
 			// this.showToast('您目前是游客，请授权登录')
 			// setTimeout(()=>{
 				uni.navigateTo({url:'/pages/login/login'})

pages/tabbar/my/staffDuan.vue

@@ -531,6 +531,13 @@
 						}
 						uni.setStorageSync('shareAll',res.data)
 						if(res.data.rules.length!=0){
+							// 判断是否有分配客服的权限
+							let isFen = res.data.rules.indexOf('customer-allot');
+							if(isFen!=-1){
+								uni.setStorageSync('isFen',true);
+							} else {
+								uni.setStorageSync('isFen',false);
+							}
 							let result = this.zanCyuanList.filter(item => res.data.rules.some(itemt => itemt===item.rule))
 							this.yuanList = result
 							uni.setStorageSync('rules',res.data.rules)

pages/tabbar/pagehome/pagehome.vue

@@ -130,11 +130,11 @@
 				refTime:'',
 				reNum:0,
 				bannerList:[],//轮播图
+				isAutoPlay:false,
 				jieDuan:false,
 				isNewRenderDone:false ,//锁的作用
 				isQuan:uni.getStorageSync('isQuan'),
 				quanImg:uni.getStorageSync('quanImg'),
-				isAutoPlay:false,
 			}
 		},
 		onPageScroll(e) {
@@ -302,6 +302,7 @@
 				this.isQuan = false;
 				uni.setStorageSync('isQuan',false);
 			},
+			// 顶部轮播查询事件
 			checkSwi(){
 				checkBanner({position:'home-banner'}).then(res=>{
 					if(res.code==0){

pages/tabbar/shop/shop.vue

@@ -2,8 +2,12 @@
 	<view>
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'商城'"  :statusBack="false" :statusTitle="true"></status-nav>
+		<!-- 自定义轮播 -->
+		<view :style="{marginTop:statusHNH+'px'}">
+			<swiper-pu :bannerList="bannerList" :isplay="isAutoPlay"></swiper-pu>
+		</view>
 		<!-- 搜索输入框 -->
-		<view class="search-input-box bacf poszy shop-nav-box" :style="{top: statusHNH+'px'}">
+		<view class="search-input-box bacf shop-nav-box" :style="{top: statusHNH+'px',position:positionMode}" style="padding-top: 10rpx;left: 0;right: 0;z-index: 3;">
 			<view class="disac pad-zy30 mar-s20">
 				<!-- 输入框 -->
 				<input class="width100 fon34 radius10" type="text" @confirm="searchEv" v-model="searchVal" placeholder="请输入商品名称"/>
@@ -49,7 +53,8 @@
 		</view>
 		<view v-if="isXiao" @tap="isXiao=false" class="moban"></view>
 		<!-- 数据列表 -->
-		<view v-if="loading" :style="{marginTop:statusHNH+titleHeight+(isClick?52:0)+'px'}">
+		<!-- <view v-if="loading" :style="{marginTop:statusHNH+titleHeight+(isClick?52:0)+'px'}"> -->
+		<view v-if="loading" :style="{marginTop:(gaodu==200?titleHeight : 0)+'px'}">
 			<view v-if="dataList.length!=0 && search_result" class="pad20 ">
 				<view style="width: 48.6%;float: left;" class="pad-x180">
 					<view v-if="index1%2==0" v-for="(item1,index1) in dataList" :key="index1" class="bacf radius15 mar-x20 animated fadeIn posir" @tap="goPage(item1.id,index1)">
@@ -152,10 +157,12 @@
 
 <script>
 	import shopList from '@/components/shop-list.vue';
-	import {cartNum} from '@/jsFile/publicAPI.js';
+	import swiperPu from '@/components/swiper-pu.vue';
+	import {cartNum,checkBanner} from '@/jsFile/publicAPI.js';
 	export default {
 		components:{
-			shopList
+			shopList,
+			swiperPu
 		},
 		data() {
 			return {
@@ -189,12 +196,32 @@
 				bingVal:'',
 				doctorVal:'',
 				activityVal:'',
+				bannerList:[],//轮播图
+				isAutoPlay:false,
 				optionObj:{},
+				positionMode:'sticky',
+				gaodu:0
 			}
 		},
+		onHide() {
+			this.isAutoPlay = false;
+		},
+		onUnload() {
+			this.isAutoPlay = false;
+		},
 		onShow() {
 			this.$toolAll.tools.isLogin();
 			this.cartNumEv();//查询购物车数量
+			this.isAutoPlay = true;
+		},
+		onPageScroll(e) {
+			if(e.scrollTop>=200){
+				this.positionMode = "fixed";
+				this.gaodu = 200;
+			} else {
+				this.positionMode = "sticky";
+				this.gaodu = 0;
+			}
 		},
 		onShareAppMessage() {
 			var shareObj = {
@@ -256,8 +283,31 @@
 					}
 				}
 			},error=>{})
+			// 调用查询轮播事件
+			this.checkSwi();
 		},
 		methods: {
+			// 顶部轮播查询事件
+			checkSwi(){
+				checkBanner({position:'home-banner'}).then(res=>{
+					if(res.code==0){
+						if(res.data.length!=0){
+							res.data.forEach(item=>{
+								let isVideo = false
+								if(item.type!='img') isVideo = true
+								let banObj = {
+									imgSrc:this.$http + item.src,
+									url:item.url,
+									isVideo:isVideo,
+									poster:this.$http + item.src,
+								}
+								this.bannerList.push(banObj)
+							})
+							console.log(this.bannerList);
+						}
+					}
+				})
+			},
 			chooseDoctor(index){//选择医生
 				this.shaiList = [];
 				this.doctor_name = this.doctorList[index].doctor_extra.name;
@@ -404,7 +454,8 @@
 										activity_end_at:item.activity_end_at,//限时结束时间
 										activity_group_cover:group_cover,//参团人的头像
 										activity_group_num:item.activity_group_num,//已经参团人数
-										activity_id:item.activity_id
+										activity_id:item.activity_id,
+										spu_type:item.spu_type//是否是虚拟商品
 									}
 									this.zanArr.push(obj)
 								})

pagesA/getReadyDan/getReadyDan.vue

@@ -7,7 +7,7 @@
 				<view class="bold">配送方式</view>
 				<view class="fon26 col3 disac">
 					<view @tap="expressEv(1)" :class="!isExpress?'activeT':'expressT'"  :style="{background:isExpress?'':publicColor}">自提</view>
-					<view @tap="expressEv(0)" :class="isExpress?'activeT':'expressT'" :style="{background:isExpress?publicColor:''}">快递</view>
+					<view v-if="!isVirtual" @tap="expressEv(0)" :class="isExpress?'activeT':'expressT'" :style="{background:isExpress?publicColor:''}">快递</view>
 				</view>
 			</view>
 			<!-- 地址信息 -->
@@ -231,7 +231,8 @@
 				checkGrounpId:0,
 				expressInfo:{
 					default_price:0
-				}
+				},
+				isVirtual:false//是否是虚拟商品
 			}
 		},
 		onShareAppMessage(res) {
@@ -259,7 +260,9 @@
 		onLoad(options) {
 			// 自提手机号
 			this.zPhone = uni.getStorageSync('phone');
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			// 判断是不是虚拟商品
+			options.isVirtual == "virtual" ? this.isVirtual = true : this.isVirtual = false 
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesA/integralManage/integralManage.vue

@@ -97,7 +97,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesA/member/member.vue

@@ -82,7 +82,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesA/myOrder/myOrder.vue

@@ -10,7 +10,7 @@
 				</view>
 			</scroll-view>
 		</view>
-		<view :style="{paddingTop:(statusHNH+12+chuTop)+'px'}" class="pad-sx20 pad-zy32">
+		<view :style="{paddingTop:(statusHNH+12+chuTop)+'px'}" class="pad-sx20 pad-zy32 pad-x180">
 			<view v-if="orderList.length!=0" v-for="(item,index) in orderList" :key="index" class="radius20 bacf pad20 mar-x20 order-item-box">
 				<view @tap="goDetail(item.id)" class="bbot disjbac pad-x20 mar-x20"><view class="fon28 col3 bold">{{item.isShop==0?'商城订单':'积分商城订单'}}</view>
 					<view v-if="item.is_only==0 && item.open_one==1 && item.is_group_make==1 && item.open_one_success==0" class="fon24 col9">{{item.group_make_end_at}}</view>
@@ -105,6 +105,8 @@
 				</view>
 			</view>
 		</view>
+		<!-- 底部tab -->
+		<foot-tab :titleList="titleList" :imgList="imgList" :newcurrent='-1'></foot-tab>
 	</view>
 </template>
 
@@ -148,7 +150,9 @@
 				zanArr:[],
 				timeList:[],
 				orderInfo:{},
-				checkGrounpId:0
+				checkGrounpId:0,
+				titleList:[],//tab标题
+				imgList:[],//tab图标
 			}
 		},
 		onShareAppMessage(res) {
@@ -193,6 +197,46 @@
 				this.chuTop = rect.height
 			}).exec()
 			options.index==undefined ? this.activeIndex = 0 : this.activeIndex = options.index;
+			this.$requst.post('index/mini-program-setting').then(res=>{
+				// log('数据：',res);
+				if(res.code==0){
+					if(res.data.length!=0){
+						if(res.data.footBar.length!=0){//底部导航
+							res.data.footBar.forEach(item=>{
+								let newName = item.name
+								let newObj = {
+									iconPath:this.$http + item.icon[0],
+									selectedIconPath:this.$http + item.icon[1],
+								}
+								if(item.key=="home"){
+									this.imgList[0] = newObj
+									this.titleList[0] = newName
+								}
+								if(item.key=="category"){
+									this.imgList[1] = newObj
+									this.titleList[1] = newName
+								}
+								if(item.key=="service"){
+									this.imgList[2] = newObj
+									this.titleList[2] = newName
+								}
+								if(item.key=="shop"){
+									this.imgList[3] = newObj
+									this.titleList[3] = newName
+								}
+								if(item.key=="my"){
+									this.imgList[4] = newObj
+									this.titleList[4] = newName
+								}
+							})
+							uni.setStorageSync('footTitle',this.titleList)
+							uni.setStorageSync('footimg',this.imgList)
+							this.titleList = uni.getStorageSync('footTitle')
+							this.imgList = uni.getStorageSync('footimg')
+						}
+					}
+				}
+			},error=>{})
 		},
 		methods: {
 			comeing(coding){

pagesA/peacockCoin/peacockCoin.vue

@@ -110,7 +110,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesA/pointsMall/pointsMall.vue

@@ -81,7 +81,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesA/ppointmentEv/ppointmentEv.vue

@@ -89,13 +89,13 @@
 				dataList:[],//日期
 				dataTD:[],//时间段
 				isShowT:false,
-				category:'',
 				lname:'',//联系人姓名
 				lphone:'',//联系方式
 				lmsg:'',//留言信息
 				isZhuan:false,
 				xialCurrent:0,
-				xialone:['植发','脱发'],
+				xialone:[],
+				category:'',
 				categoryT:'',
 				isZhuanT:false,
 				xialCT:0,
@@ -167,7 +167,6 @@
 						this.gtimeD(res.data.types[0].id,res.data.days[0].day)
 						// 预约类别
 						if(res.data.types.length!=0){
-							this.type_id = res.data.types[0].id
 							res.data.types.forEach(item=>{
 								let ycateObj = {
 									id:item.id,
@@ -176,6 +175,7 @@
 								}
 								this.xialone.push(ycateObj)
 							})
+							this.type_id = this.xialone[0].id
 							this.category = this.xialone[0].title
 						}
 						//预约日期

pagesA/shopCart/shopCart.vue

@@ -96,7 +96,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesA/signIn/signIn.vue

@@ -87,7 +87,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesA/suggestions/suggestions.vue

@@ -64,7 +64,9 @@
 			<pu-po :isShowT="isShowT" :isCenter="true" :contentVal="'提交成功！等待审核'" :comfrimVal="'好的'" @comfirmev="comfirmev"></pu-po>
 		</view>
 		<!-- 底部客服 -->
-		<public-customer :nright="20" :nbottom="100"></public-customer>
+		<!-- <public-customer :nright="20" :nbottom="100"></public-customer> -->
+		<!-- 底部tab -->
+		<foot-tab :titleList="titleList" :imgList="imgList" :newcurrent='-1'></foot-tab>
 	</view>
 </template>
 
@@ -84,6 +86,8 @@
 				xialCurrent:0,
 				xialone:[],
 				btnCon:'立即提交',
+				titleList:[],//tab标题
+				imgList:[],//tab图标
 			}
 		},
 		onShow() {
@@ -92,6 +96,46 @@
 		onLoad() {
 			this.checkCate();
 			this.tphone = uni.getStorageSync('phone');
+			this.$requst.post('index/mini-program-setting').then(res=>{
+				// log('数据：',res);
+				if(res.code==0){
+					if(res.data.length!=0){
+						if(res.data.footBar.length!=0){//底部导航
+							res.data.footBar.forEach(item=>{
+								let newName = item.name
+								let newObj = {
+									iconPath:this.$http + item.icon[0],
+									selectedIconPath:this.$http + item.icon[1],
+								}
+								if(item.key=="home"){
+									this.imgList[0] = newObj
+									this.titleList[0] = newName
+								}
+								if(item.key=="category"){
+									this.imgList[1] = newObj
+									this.titleList[1] = newName
+								}
+								if(item.key=="service"){
+									this.imgList[2] = newObj
+									this.titleList[2] = newName
+								}
+								if(item.key=="shop"){
+									this.imgList[3] = newObj
+									this.titleList[3] = newName
+								}
+								if(item.key=="my"){
+									this.imgList[4] = newObj
+									this.titleList[4] = newName
+								}
+							})
+							uni.setStorageSync('footTitle',this.titleList)
+							uni.setStorageSync('footimg',this.imgList)
+							this.titleList = uni.getStorageSync('footTitle')
+							this.imgList = uni.getStorageSync('footimg')
+						}
+					}
+				}
+			},error=>{})
 		},
 		methods: {
 			changeCate(e){

pagesB/aboutUs/aboutUs.vue

@@ -2,7 +2,7 @@
 	<view>
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'关于我们'" :whereCome="whereCome*1" :statusTitle="true"></status-nav>
-		<view :style="{paddingTop: statusHNH+'px'}" class="pad-zy32">
+		<view :style="{paddingTop: statusHNH+'px'}" class="pad-zy32 pad-x180">
 			<!-- 自定义轮播 -->
 			<view class="mar-s20">
 				<swiper-pu :isplay="isAutoPlay" :bannerList="bannerList" :newHeight="'200'" :newRadius="'10'" :newBottom="'5'"></swiper-pu>
@@ -27,22 +27,28 @@
 			</view>
 		</view>
 		<!-- 底部客服 -->
-		<public-customer :nbottom="100"></public-customer>
+		<!-- <public-customer :nbottom="100"></public-customer> -->
 		<!-- 返回顶部 -->
 		<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
 		<!-- 弹框授权 -->
 		<empower @buttonH="buttonH" :vision="vision" :isWhere="2"></empower>
 		<!-- 弹框 -->
 		<auth-phone v-if="isShowP"></auth-phone>
+		<!-- 底部导航 -->
+		<view class="posixzy">
+			<bottom-tab></bottom-tab>
+		</view>
 	</view>
 </template>
 
 <script>
 	import swiperPu from '@/components/swiper-pu.vue';
 	import {checkBanner} from '@/jsFile/publicAPI.js';
+	import bottomTab from '@/components/bottom-tab.vue';
 	export default {
 		components:{
-			swiperPu
+			swiperPu,
+			bottomTab
 		},
 		data() {
 			return {
@@ -105,7 +111,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;this.whereCome = 2;} else {this.$toolAll.tools.isLogin();}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;this.whereCome = 2;} else {this.$toolAll.tools.isLogin();}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/articleDetail/articleDetail.vue

@@ -113,7 +113,7 @@
 			this.checkDetail(options.id)
 			this.detailId = options.id
 			this.category_id = options.category_id
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;} else {this.$toolAll.tools.isLogin()}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;} else {this.$toolAll.tools.isLogin()}
 			console.log(options,'参数');
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);

pagesB/customerCheck/customerCheck.vue

@@ -86,7 +86,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/customerList/customerList.vue

@@ -40,7 +40,7 @@
 				<view class="posia col3 fon24 radius10 tc" style="left: 20rpx;bottom: 100rpx;">姓名：{{item.real_name || '暂无'}}</view>
 				<!-- 分配客服 -->
 				<!-- <view @tap="fenCustomer(index)" class="posia colf fon24 radius10 tc customer-btn" style="right: 20rpx;top: 80rpx;z-index: 1;" v-if="item.customer=='' || item.customer==null" :style="{background:publicColor}">分配客服</view> -->
-				<view @tap="fenCustomer(index)" class="posia colf fon24 radius10 tc customer-btn" style="right: 20rpx;top: 80rpx;z-index: 1;" :style="{background:publicColor}">分配客服</view>
+				<view @tap="fenCustomer(index)" class="posia colf fon24 radius10 tc customer-btn" style="right: 20rpx;top: 80rpx;z-index: 1;" v-if="isFen" :style="{background:publicColor}">分配客服</view>
 				<!-- 设置标签 -->
 				<view @tap="tuneUpTag(index)" v-if="item.isTag" class="posia colf fon24 radius10 tc customer-btn" style="right: 20rpx;bottom: 20rpx;z-index: 1;" :style="{background:publicColor}">设置标签</view>
 				<view class="fon24 col3 posia bold disac" style="bottom: 60rpx;left: 20rpx;right: 20rpx;"><text class="flexs">标签：</text>
@@ -127,6 +127,7 @@
 				tagIds:[],
 				tagVal:[],
 				tagStr:'',
+				isFen:uni.getStorageSync('isFen')
 			}
 		},
 		onPageScroll(e) {

pagesB/doctor/doctor.vue

@@ -14,7 +14,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="pad-zy20 mar-sx30">
+		<view class="pad-zy20 mar-sx30 pad-x180">
 			<!-- 列表 -->
 			<view class="fon28 col3 bold qdoctor disac">全部医生</view>
 			<view class="mar-s30" v-if="dataList.length!=0">
@@ -30,19 +30,25 @@
 			<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
 		</view>
 		<!-- 底部客服 -->
-		<public-customer :nbottom="100"></public-customer>
+		<!-- <public-customer :nbottom="120"></public-customer> -->
 		<!-- 弹框授权 -->
 		<empower @buttonH="buttonH" :vision="vision" :isWhere="2"></empower>
 		<!-- 弹框 -->
 		<auth-phone v-if="isShowP"></auth-phone>
+		<!-- 底部导航 -->
+		<view class="posixzy">
+			<bottom-tab></bottom-tab>
+		</view>
 	</view>
 </template>
 
 <script>
 	import listDoctor from '@/components/list-doctor.vue';
+	import bottomTab from '@/components/bottom-tab.vue';
 	export default {
 		components:{
-			listDoctor
+			listDoctor,
+			bottomTab
 		},
 		data() {
 			return {
@@ -87,7 +93,7 @@
 			
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;} else {this.$toolAll.tools.isLogin()}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;} else {this.$toolAll.tools.isLogin()}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/doctorDetail/doctorDetail.vue

@@ -4,7 +4,7 @@
 		<status-nav :titleVal="'医生'" :statusTitle="true"></status-nav>
 		<!-- 自定义二级分类 -->
 		<!-- 列表 -->
-		<view :style="{paddingTop: statusHNH+'px'}">
+		<view :style="{paddingTop: statusHNH+'px'}" class=" pad-x180">
 			<view v-if="isLoading" class="bacf mar-s20 pad-s20 pad-y32 pad-x40">
 				<view class="disjb">
 					<image class="radius10 flexs mar-z30" :src="doctorObj.doctor_extra.headimg || moImg" style="width: 300rpx;height: 300rpx;" mode="aspectFill"></image>
@@ -51,17 +51,25 @@
 			<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
 		</view>
 		<!-- 底部客服 -->
-		<public-customer :nbottom="100"></public-customer>
+		<!-- <public-customer :nbottom="100"></public-customer> -->
 		<!-- 弹框授权 -->
 		<empower @buttonH="buttonH" :vision="vision" :isWhere="2"></empower>
 		<!-- 弹框 -->
 		<auth-phone v-if="isShowP"></auth-phone>
+		<!-- 底部导航 -->
+		<view class="posixzy">
+			<bottom-tab></bottom-tab>
+		</view>
 	</view>
 </template>
 
 <script>
 	import {collectionEV,cancleCollectionEV} from '@/jsFile/publicAPI.js';
+	import bottomTab from '@/components/bottom-tab.vue';
 	export default {
+		components:{
+			bottomTab
+		},
 		data() {
 			return {
 				statusHNH:uni.getStorageSync('statusHNH'),
@@ -122,7 +130,7 @@
 		onLoad(options) {
 			this.doctorId = options.doctor_id;
 			this.checkDoD(this.doctorId)
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;} else {this.$toolAll.tools.isLogin()}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;} else {this.$toolAll.tools.isLogin()}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/myCollection/myCollection.vue

@@ -195,7 +195,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;} else {this.$toolAll.tools.isLogin()}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;} else {this.$toolAll.tools.isLogin()}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/mysharer/mysharer.vue

@@ -90,7 +90,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;} else {this.$toolAll.tools.isLogin()}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;} else {this.$toolAll.tools.isLogin()}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/orderDetail/orderDetail.vue

@@ -167,7 +167,7 @@
 			this.closeEv();
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;} else {this.$toolAll.tools.isLogin();}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;} else {this.$toolAll.tools.isLogin();}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/personalPoster/personalPoster.vue

@@ -4,7 +4,7 @@
 		<status-nav :titleVal="'二维码海报'" :statusTitle="true"></status-nav>
 		<!-- 自定义二级分类 -->
 		<!-- 列表 -->
-		<view :style="{paddingTop: statusHNH+'px'}" class="pad-zy20">
+		<view :style="{paddingTop: statusHNH+'px'}" class="pad-zy20 pad-x180">
 			<view class="tc mar-s20 col6 fon28">请选择海报背景后分享</view>
 			<view v-if="imgList.length!=0">
 				<view class="mar-s20 disjbac fw">
@@ -30,11 +30,13 @@
 		<!-- 弹框 -->
 		<pu-po :isShowT="imgList.length==0 && isHaib" :contentVal="'立即生成创意海报'" :clearVal="'暂不生成'" :comfrimVal="'立即生成'" @comfirmev="comfirmev" @cancleev="cancleev"></pu-po>
 		<!-- 底部客服 -->
-		<public-customer :nbottom="100"></public-customer>
+		<!-- <public-customer :nbottom="100"></public-customer> -->
 		<!-- 弹框授权 -->
 		<empower @buttonH="buttonH" :vision="vision" :isWhere="2"></empower>
 		<!-- 弹框 -->
 		<auth-phone v-if="isShowP"></auth-phone>
+		<!-- 底部tab -->
+		<foot-tab :titleList="titleList" :imgList="tabimgList" :newcurrent='-1'></foot-tab>
 	</view>
 </template>
 
@@ -53,6 +55,8 @@
 				haved:true,
 				vision:false,
 				isShowP:false,
+				titleList:[],//tab标题
+				tabimgList:[],//tab图标
 			}
 		},
 		onShareAppMessage() {
@@ -62,7 +66,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;} else {this.$toolAll.tools.isLogin() ;this.haved = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;} else {this.$toolAll.tools.isLogin() ;this.haved = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){
@@ -73,6 +77,46 @@
 			if(uni.getStorageSync('imgSrcList')!='') this.imgSrcList = uni.getStorageSync('imgSrcList')//弹框关闭
 			else this.imgList = []
 			this.checkPoster();
+			this.$requst.post('index/mini-program-setting').then(res=>{
+				// log('数据：',res);
+				if(res.code==0){
+					if(res.data.length!=0){
+						if(res.data.footBar.length!=0){//底部导航
+							res.data.footBar.forEach(item=>{
+								let newName = item.name
+								let newObj = {
+									iconPath:this.$http + item.icon[0],
+									selectedIconPath:this.$http + item.icon[1],
+								}
+								if(item.key=="home"){
+									this.tabimgList[0] = newObj
+									this.titleList[0] = newName
+								}
+								if(item.key=="category"){
+									this.tabimgList[1] = newObj
+									this.titleList[1] = newName
+								}
+								if(item.key=="service"){
+									this.tabimgList[2] = newObj
+									this.titleList[2] = newName
+								}
+								if(item.key=="shop"){
+									this.tabimgList[3] = newObj
+									this.titleList[3] = newName
+								}
+								if(item.key=="my"){
+									this.tabimgList[4] = newObj
+									this.titleList[4] = newName
+								}
+							})
+							uni.setStorageSync('footTitle',this.titleList)
+							uni.setStorageSync('footimg',this.tabimgList)
+							this.titleList = uni.getStorageSync('footTitle')
+							this.tabimgList = uni.getStorageSync('footimg')
+						}
+					}
+				}
+			},error=>{})
 		},
 		methods: {
 			loginEv(invite_code='',source='',channel=''){

pagesB/problemDetail/problemDetail.vue

@@ -52,7 +52,6 @@
 									<view class="fon24 col9">分享</view>
 									<button class="posia" open-type="share"
 										style="top: 0;right: 0;left: 0;bottom: 0;opacity: 0;">分享</button>
-									<!-- <button v-if="haveImg" class="posia" open-type="share" style="top: 0;right: 0;left: 0;bottom: 0;opacity: 0;">分享</button> -->
 								</view>
 								<view class="disac fc" @tap="tapConllection">
 									<image v-if="isDetailConllection" src="/static/public/yconllection.png"
@@ -68,33 +67,21 @@
 							<rich-text :nodes="detailInfo"></rich-text>
 						</view>
 					</view>
-					<!-- <view class="pad-zy20" v-show="cateCurrent==1"> -->
 					<view class="pad-zy20">
 						<view class="fon30 bold tc mar-sx40" :style="{color:publicColor}">相关推荐</view>
 						<!-- 相关推荐列表 -->
 						<list-pu @chooseLike="chooseLikex" @comfirmev="comfirmevx" :list="xgList"></list-pu>
 					</view>
 					<view class="tc fon28 bold" style="color: #fff;background-color: #3875f6;padding: 20rpx;" @tap="backEv">更多{{contentVal}}>></view>
-					<!-- <view class="tc fon28 bold" style="color: #3875f6;background-color: #CCCCCC;padding: 20rpx;" @tap="backEv">更多{{cateList[cateCurrent].title}}>></view> -->
 					<view class="pad-zy20">
 						<view class="fon30 bold tc mar-sx40" :style="{color:publicColor}">推荐医生</view>
 						<!-- 推荐医生列表 -->
 						<list-doctor v-if="dataList.length!=0" :list="dataList"></list-doctor>
 						<view v-if="dataList.length==0" class="disjcac fc" style="margin-top: 10%;">
 							<image class="zanw-img" src="/static/public/nothing.png" mode="aspectFill"></image>
-							<!-- <view class="fon24 col3">暂无推荐医生</view> -->
 						</view>
 					</view>
 				</view>
-				<!-- <view v-show="cateCurrent==index && isNum!=index" v-for="(item,index) in allArr" :key="index" class="pad-zy20">
-					<view v-if="item.length!=0">
-						<list-pu @chooseLike="chooseLike" @comfirmev="comfirmev" :list="item"></list-pu>
-					</view>
-					<view v-else class="disjcac fc" style="margin-top: 40%;">
-						<image class="zanw-img" src="/static/public/nothing.png" mode="aspectFill"></image>
-						<view class="fon24 col3">暂无内容</view>
-					</view>
-				</view> -->
 				<view v-if="cateCurrent!=isNum">
 					<view v-if="allList.length!=0" class="pad-zy20">
 						<list-pu @chooseLike="chooseLike" @comfirmev="comfirmev" :list="allList"></list-pu>
@@ -105,36 +92,16 @@
 					</view>
 				</view>
 			</view>
-			<view class="posixzy disjbac bacf pad-zy32 btnBKS">
-				<view class="posir">
-					<image @tap="backHome" class="posia backH" src="/static/public/back-home-02.png" mode="aspectFill"></image>
-				</view>
-				<view class="disac fon26 colf">
-					<view @tap="lianK" class="disac posir lianShare"
-						style="background-color: #3875F6; border-top-left-radius: 51rpx;border-bottom-left-radius: 51rpx;">
-						<image src="/static/public/bottom-customer.png" class="mar-zy20"
-							style="width: 47rpx;height: 47rpx;" mode="aspectFill"></image>
-						<view>联系客服</view>
-						<button v-if="haveImg" class="fon24 posia" style="opacity: 0;top: 0;left: 0;right: 0;bottom: 0;"
-							open-type="contact">客服</button>
-					</view>
-					<view @tap="shareEv" class="disac posir lianShare"
-						style="background-color: #38CE51;border-top-right-radius: 51rpx;border-bottom-right-radius: 51rpx;">
-						<image src="/static/public/bottom-shear.png"
-							style="width: 47rpx;height: 47rpx;margin-left: 15rpx;margin-right: 8rpx;" mode="aspectFill">
-						</image>
-						<view>分享给好友</view>
-						<button v-if="haveImg" class="posia" open-type="share"
-							style="top: 0;right: 0;left: 0;bottom: 0;opacity: 0;">分享</button>
-					</view>
-				</view>
-			</view>
 			<!-- 返回顶部 -->
 			<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
 			<!-- 弹框授权 -->
 			<empower @buttonH="buttonH" :vision="vision" :isWhere="2" @cancleEv="cancleEv"></empower>
 			<!-- 弹框 -->
 			<auth-phone v-if="isShowP"></auth-phone>
+			<!-- 底部导航 -->
+			<view class="posixzy">
+				<bottom-tab></bottom-tab>
+			</view>
 		</view>
 	</view>
 </template>
@@ -142,6 +109,7 @@
 <script>
 	import listDoctor from '@/components/list-doctor.vue';
 	import swiperPu from '@/components/swiper-pu.vue';
+	import bottomTab from '@/components/bottom-tab.vue';
 	import {
 		collectionEV,
 		cancleCollectionEV
@@ -150,6 +118,7 @@
 		components: {
 			listDoctor,
 			swiperPu,
+			bottomTab
 		},
 		data() {
 			return {
@@ -337,34 +306,6 @@
 			cancleEv(e) { //取消授权
 				if (e == 0) this.vision = false
 			},
-			backHome() {
-				uni.navigateTo({
-					url: '/pages/tabbar/pagehome/pagehome'
-				})
-			},
-			lianK() { //客服
-				if (this.haveImg) {
-					this.$requst.post('user/rand-bind-service').then(res => {})
-					this.$toolAll.tools.closeTimer() //清空埋点倒计时
-					this.$requst.post('user/record', {
-						type: 'other',
-						action: 'ask',
-						id: 0
-					}).then(res => {}, error => {})
-					let maiOjb = {
-						e: 5, //内容咨询
-						t: new Date().getTime() //当前时间戳
-					}
-					this.$toolAll.tools.maiDian(maiOjb);
-				} else {
-					this.vision = true
-				}
-			},
-			shareEv() {
-				if (this.haveImg == false) {
-					this.vision = true
-				}
-			},
 			checkDetail(newId) {
 				this.$requst.post('archives/detail', {
 					id: newId,

pagesB/searchPage/searchPage.vue

@@ -111,7 +111,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/sharingCenter/sharingCenter.vue

@@ -27,11 +27,13 @@
 		<!-- 弹框 -->
 		<pu-po :isShowT="isShowT" :contentVal="'暂未开放此功能，请耐心等候'" :isCenter="true" :comfrimVal="'好的'" @comfirmev="isShowT=false"></pu-po>
 		<!-- 底部客服 -->
-		<public-customer :nbottom="100"></public-customer>
+		<!-- <public-customer :nbottom="100"></public-customer> -->
 		<!-- 弹框授权 -->
 		<empower @buttonH="buttonH" :vision="vision" :isWhere="2"></empower>
 		<!-- 弹框 -->
 		<auth-phone v-if="isShowP"></auth-phone>
+		<!-- 底部tab -->
+		<foot-tab :titleList="titleList" :imgList="imgList" :newcurrent='-1'></foot-tab>
 	</view>
 </template>
 
@@ -51,6 +53,8 @@
 				imgSrcP:uni.getStorageSync('imgSrcP'),
 				vision:false,
 				isShowP:false,
+				titleList:[],//tab标题
+				imgList:[],//tab图标
 			}
 		},
 		onShareAppMessage(options) {
@@ -81,13 +85,53 @@
 		　　return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;} else {this.$toolAll.tools.isLogin()}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;} else {this.$toolAll.tools.isLogin()}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){
 				this.loginEv('',options.source_code,options.channel);
 			} 
 			uni.getStorageSync('shareAll')!='' ? this.dataList[1].num = uni.getStorageSync('shareAll').share_users.total : this.dataList[1].num = 0
+			this.$requst.post('index/mini-program-setting').then(res=>{
+				// log('数据：',res);
+				if(res.code==0){
+					if(res.data.length!=0){
+						if(res.data.footBar.length!=0){//底部导航
+							res.data.footBar.forEach(item=>{
+								let newName = item.name
+								let newObj = {
+									iconPath:this.$http + item.icon[0],
+									selectedIconPath:this.$http + item.icon[1],
+								}
+								if(item.key=="home"){
+									this.imgList[0] = newObj
+									this.titleList[0] = newName
+								}
+								if(item.key=="category"){
+									this.imgList[1] = newObj
+									this.titleList[1] = newName
+								}
+								if(item.key=="service"){
+									this.imgList[2] = newObj
+									this.titleList[2] = newName
+								}
+								if(item.key=="shop"){
+									this.imgList[3] = newObj
+									this.titleList[3] = newName
+								}
+								if(item.key=="my"){
+									this.imgList[4] = newObj
+									this.titleList[4] = newName
+								}
+							})
+							uni.setStorageSync('footTitle',this.titleList)
+							uni.setStorageSync('footimg',this.imgList)
+							this.titleList = uni.getStorageSync('footTitle')
+							this.imgList = uni.getStorageSync('footimg')
+						}
+					}
+				}
+			},error=>{})
 		},
 		methods: {
 			loginEv(invite_code='',source='',channel=''){

pagesB/shopDetail/shopDetail.vue

@@ -352,7 +352,7 @@
 				allList:[],
 				isactivity:0,//是不是活动商品0：不是，1：是
 				orderId:'',//商品id
-				timeout:null
+				timeout:null,
 			}
 		},
 		onReachBottom() { //触底事件
@@ -400,7 +400,7 @@
 			this.isAutoPlay = false;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){
+			if(uni.getStorageSync('phone_active')==0){
 				this.vision = true;
 				this.loginEv(options);
 			} else {
@@ -565,7 +565,7 @@
 				let newList = [params];
 				uni.setStorageSync('orderList',newList);
 				uni.navigateTo({
-					url:`/pagesA/getReadyDan/getReadyDan?isNei=${this.isNei}`
+					url:`/pagesA/getReadyDan/getReadyDan?isNei=${this.isNei}&isVirtual=${this.detailObj.spu_type}`
 				})
 			},
 			addCart(){//添加购物车事件

pagesB/shopSearch/shopSearch.vue

@@ -211,7 +211,7 @@
 			} else {
 				this.search_result = false;
 			}
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){

pagesB/userFootprint/userFootprint.vue

@@ -79,7 +79,7 @@
 			return shareObj;
 		},
 		onLoad(options) {
-			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
+			if(uni.getStorageSync('phone_active')==0){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
 			} else if(options.source_code!='' && options.source_code!=undefined){