1、医生列表、医生详情图片更改；2、订单列表、订单详情状态修改；3、进入分类选中分类调整；4、病种列表点赞、收藏调整；5、商品详情活动结束判断

App.vue

@@ -2,6 +2,9 @@
 	import toolAll from '@/jsFile/tools.js';
 	import requst from '@/jsFile/requst.js';
 	export default {
+		globalData:{
+			outside:true//是否外界进来,默认是
+		},
 		onLaunch: function() {
 			// 检测当前运行环境并缓存域名
 			toolAll.tools.currentContext();

commons/hengmei.css

@@ -22,7 +22,7 @@
 .list-like-box>image:first-child {opacity: 0.5;}
 .list-like-box>image{width: 69rpx;height: 69rpx;}
 .list-cont-box{bottom: 10rpx;left: 0rpx;right: 0; padding-top: 100rpx; background:-webkit-linear-gradient(bottom,rgba(0,0,0,0.79),rgba(255,255,255,0));padding-left: 22rpx;padding-right: 22rpx;padding-bottom: 18rpx;border-bottom-left-radius: 30rpx;border-bottom-right-radius: 30rpx;}
-.list-cont-box15{bottom: 10rpx;left: 0rpx;right: 0; padding-top: 100rpx; background:-webkit-linear-gradient(bottom,rgba(0,0,0,0.79),rgba(255,255,255,0));padding-left: 22rpx;padding-right: 22rpx;padding-bottom: 18rpx;border-bottom-left-radius: 15rpx;border-bottom-right-radius: 15rpx;}
+.list-cont-box15{bottom: 8rpx;left: 0rpx;right: 0; padding-top: 100rpx; background:-webkit-linear-gradient(bottom,rgba(0,0,0,0.79),rgba(255,255,255,0));padding-left: 22rpx;padding-right: 22rpx;padding-bottom: 18rpx;border-bottom-left-radius: 15rpx;border-bottom-right-radius: 15rpx;}
 .list-headimg{width: 28rpx;height: 28rpx;margin-right: 6rpx;border-radius: 100%;}
 .home-quan-box{background: rgba(0,0,0,.54);position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 11;display: flex;justify-content: center;flex-direction: column;align-items: center;}
 .home-quan-box image:first-child{width: 542rpx;height: 600rpx;}
@@ -33,7 +33,7 @@
 .cateActive{background-color: #F5F5F5;border-radius: 10rpx 0rpx 0rpx 10rpx;padding: 20rpx 10rpx;text-align: center;margin-left: 10rpx;}
 .cate-tu-item{padding: 16rpx 20rpx;background-color: #DFDFDF;}
 .cate-box{position: fixed;top: 0;left: 0;bottom: 140rpx;background-color: #FFFFFF;}
-.list-min{min-height: 260rpx;}
+.list-min{min-height: 360rpx;}
 .cate-box .fon26 .mar-s20:first-child {margin-top: 50rpx;}
 /* 搜索 */
 .search-input-box{width: 100%;padding-bottom: 20rpx;}
@@ -66,6 +66,9 @@
 .gao-m{width: 43rpx;height: 43rpx;z-index: 1;}
 .gao-next-box{width: 50rpx;position: relative;z-index: 1;justify-content: flex-end;}
 .gao-next-box image{width: 35rpx;height: 35rpx;z-index: 1;}
+
+/* 病种列表 */
+.problem-input{border: 2rpx solid #E0E0E0;padding: 0rpx 20rpx;height: 80rpx;line-height: 80rpx;}
 /* 暂无内容时，显示的图片大小 */
 .zanw-img{width: 474rpx;height: 273rpx;}
 /* 修改资料页面 */
@@ -108,7 +111,10 @@
 .xial-box{top: 80rpx;left: 0;right: 0;z-index: 4;border: 2rpx solid #E0E0E0;}
 .xial-item-box{max-height: 400rpx;overflow-y: scroll; overflow-x: hidden;}
 .doctorx{margin: 0 15rpx;height: 18rpx;border: 2rpx solid #E6E6E6;}
-.doctorImg{width: 100%;height: 285rpx;border-top-left-radius: 10rpx;border-top-right-radius: 10rpx;}
+.doctorImg{width: 100%;
+/* height: 285rpx; */
+height: 380rpx; 
+border-top-left-radius: 10rpx;border-top-right-radius: 10rpx;}
 .isTop{background-color: #FFFFFF;box-shadow: 0rpx 3rpx 10rpx rgba(0,0,0,.6);}
 .isTops{position: sticky;left: 0;right: 0;z-index: 2;}
 .isTopf{position: fixed;left: 0;right: 0;z-index: 2;}

components/auth/auth-userInfo-mobileInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view v-if="showAuth">
 		<!-- 用户信息授权 -->
-		<view @touchmove.stop.prevent="moveHandle" :class="isAnimation==2?'card-box-userinfo':''" class="auth-box">
+		<view v-if="showUserInfo" @touchmove.stop.prevent="moveHandle" :class="isAnimation==2?'card-box-userinfo':''" class="auth-box">
 			<view :class="isAnimation==1?'card-box-userinfo':''">
 				<view class="auth-top">
 					<image :src="appletImg" mode=""></image>
@@ -11,7 +11,7 @@
 						<view>是否选择授权登录</view>
 					</view>
 				</view>
-				<view class="auth-center">申请 获取你的昵称、头像、地区及性别</view>
+				<view class="auth-center">申请 获取你的昵称、头像</view>
 				<view class="auth-bottom">
 					<view @tap="chooseBtn" :class="noAuthBtn?'isNyin':'noyin'" class="btn btn-no">暂不授权</view>
 					<view :class="yesAuthBtn?'isOyin':'noyin'" class="btn btn-yes">
@@ -63,7 +63,8 @@
 				isAnimation:0, // 动画
 				showAuth:false, // 是否显示授权弹框
 				currentPage:'', // 当前页面路径
-				showMobile:false // 是否显示手机授权弹框
+				showMobile:true ,// 是否显示手机授权弹框
+				showUserInfo:false
 			};
 		},
 		destroyed() {
@@ -82,6 +83,11 @@
 				this.loginEv(currentPage.options);
 				this.showAuth = true;
 			}
+			let pagesArr = getCurrentPages();
+			console.log(pagesArr.length,'获取页面栈大小');
+			if(pagesArr.length==1) {
+				uni.setStorageSync('outside',6);
+			}
 		},
 		methods:{
 			loginEv(data){
@@ -168,25 +174,31 @@
 							// 如果手机号不存在，调起手机号授权弹框
 							this.showMobile = true;
 						}
-					} else this.$toolAll.tools.showToast(res.msg);
+					}
-				},error => {this.$toolAll.tools.showToast(error.msg)})
+				})
 			},
 			getphonenumber(e){//授权绑定手机号
-				if(e.detail.errMsg=="getPhoneNumber:ok"){
+				wx.login({
-					this.$requst.post('user/bind-phone',{iv:e.detail.iv,encryptedData:e.detail.encryptedData}).then(res=>{
+					success:(res)=>{
-						if(res.code==0){
+						this.$requst.post('user/login',{code:res.code}).then(result => {
-							this.$toolAll.tools.showToast('手机号绑定成功','success');
+							if(e.detail.errMsg=="getPhoneNumber:ok"){
-							uni.setStorageSync('phone_active',1);//是否第一次授权
+								this.$requst.post('user/bind-phone',{openid:result.data.openid, session_key:result.data.session_key, iv:e.detail.iv,encryptedData:e.detail.encryptedData}).then(res=>{
-							uni.setStorageSync('outside',6);//表示外界进来授权的
+									if(res.code==0){
-							this.showAuth = false; // 关闭手机号授权弹框
+										this.$toolAll.tools.showToast('手机号绑定成功','success');
-							uni.reLaunch({ // 重新进入当前页面
+										this.showUserInfo = true;
-								url:uni.getStorageSync('urlparams')
+										this.showMobile = false;
-							})
+										uni.setStorageSync('phone_active',1);//是否第一次授权
-						} else this.$toolAll.tools.showToast(res.msg);
+										uni.setStorageSync('outside',6);//表示外界进来授权的
-					},error=>{this.$toolAll.tools.showToast(error.msg)})
+										// this.showAuth = false; // 关闭手机号授权弹框
-				} else {
+										// uni.reLaunch({ // 重新进入当前页面
-					// console.log('用户拒绝');
+										// 	url:uni.getStorageSync('urlparams')
-				}
+										// })
+									}
+								})
+							}
+						})
+					}
+				})
 			},
 		}
 	}

components/foot-tab.vue

@@ -98,7 +98,7 @@
 					uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
 						break;
 					case 1:
-					existMobile!='' ? uni.reLaunch({url:'/pages/tabbar/cate/cate'}) : this.goLogin();
+					existMobile!='' ? uni.reLaunch({url:'/pages/tabbar/cate/cate?index=0'}) : this.goLogin();
 						break;
 					case 2:
 					if(existMobile!=''){

components/list-doctor.vue

@@ -1,32 +1,16 @@
 <template>
 	<view class="disjb fw">
 		<view @tap="chooseDoctor(index)" class="radius10 dis fc bacf mar-x20" style="width: 48.6%;" v-for="(item,index) in list" :key="index">
-			<image :src="item.imgSrc" class="doctorImg" mode="aspectFill"></image>
+			<image :src="item.imgSrc" class="doctorImg radius10" mode="aspectFill" lazy-load></image>
-			<view class="col3 mar-s10 mar-x20 mar-z10">
+			<!-- <view class="col3 mar-s10 mar-x20 mar-z10">
 				<view class="fon28 bold doctoritem disac">{{item.name}}</view>
-				<!-- <view class="fon26 mar-sx10 disac">
-					<view>从业{{item.cyear}}年</view>
-					<view v-if="item.bmen!=''" class="doctorx"></view>
-					<view>{{item.bmen}}</view>
-				</view>
-				<view class="fon26 mar-x10">职称：{{item.zcheng}}</view> -->
-				<!-- <view class="fon24 disac">
-					<view class="flexs">擅长：</view>	
-					<scroll-view scroll-x style="width: 250rpx;">
-						<view class="disac">
-							<view class="flexs" v-for="(itemt,indext) in item.goodAt" :key="indext">
-								<text class="bold mar-y10 pcol">{{itemt.disease_name}}</text>
-							</view>
-						</view>
-					</scroll-view>
-				</view> -->
 				<view class="fon24 disac fw mar-s10" style="width: 166px;">
 					<view class="flexs">擅长：</view>	
 					<view class="flexs" v-for="(itemt,indext) in item.goodAt" :key="indext">
 						<text class="bold mar-y10 pcol">{{itemt.disease_name}}</text>
 					</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>

components/list-pu.vue

@@ -5,16 +5,15 @@
 			<view class="list-box">
 				<view @tap="goDetail(index)" v-if="index%2==0" :class="radiu?'radius15 mar-x10':'radius30 mar-x30'" class="posir colf  zou" v-for="(item,index) in list" :key="index">
 					<!-- 背景图 -->
-					<image :class="radiu?'radius15':'radius30'" class=" width100 list-min" :src="item.main_img" mode="widthFix"></image>
+					<image lazy-load :class="radiu?'radius15':'radius30'" class=" width100 list-min" :src="item.main_img" mode="widthFix"></image>
-					<view class="posia disjbac fon24" :style="{borderRadius: radiu ? '15rpx 15rpx 0 0' : '30rpx 30rpx 0 0',padding:radiu ? '10rpx' : '17rpx 25rpx'  }" style="background-color: rgba(56,117,246,.8);top: 0;left: 0;right: 0;">
+					<view class="posia fon24 colf" style="right: 10rpx;bottom: 160rpx;z-index: 1;">
-						<view @tap.stop="chooseLike(index)" class="disac" style="width: 48%;justify-content: flex-start;">
+						<view @tap.stop="praiseEv(index)" class="disjcac fc">
-							<image :style="{width: radiu ?'30rpx':'40rpx',height: radiu ?'30rpx':'40rpx'}" :src="['/static/public/cnllection-no.png','/static/public/yconllection.png'][item.is_collected]" mode="aspectFill"></image>
+							<image lazy-load :style="{width: radiu ?'40rpx':'60rpx',height: radiu ?'40rpx':'60rpx'}" :src="['/static/public/list-nlike.png','/static/public/detail-like.png'][item.is_liked]" mode="aspectFill"></image>
-							<view class="mar-z10">{{['收藏','已收藏'][item.is_collected]}}</view>
+							<view>{{item.likes>100 ? '99+':item.likes}}</view>
 						</view>
-						<view style="width: 2rpx;height: 30rpx;background-color: #FFFFFF;"></view>
+						<view @tap.stop="chooseLike(index)" class="disjcac fc mar-s10">
-						<view @tap.stop="praiseEv(index)" class="disac" style="width: 48%;justify-content: flex-end;">
+							<image lazy-load :style="{width: radiu ?'40rpx':'60rpx',height: radiu ?'40rpx':'60rpx'}" :src="['/static/public/cnllection-no.png','/static/public/yconllection.png'][item.is_collected]" mode="aspectFill"></image>
-							<image :style="{width: radiu ?'30rpx':'40rpx',height: radiu ?'30rpx':'40rpx'}" :src="['/static/public/list-nlike.png','/static/public/detail-like.png'][item.is_liked]" mode="aspectFill"></image>
+							<view>{{item.collects>100 ? '99+':item.collects}}</view>
-							<view class="mar-z10">{{['喜欢',item.likes][item.is_liked]}}</view>
 						</view>
 					</view>
 					<!-- <view class="posia list-like-box" @tap.stop="chooseLike(index)"> -->
@@ -34,7 +33,7 @@
 						<view class="disjbac">
 							<view class="disac">
 								<!-- 发布者头像 -->
-								<image class="list-headimg" :src="item.head_img" mode="aspectFill"></image>
+								<image lazy-load class="list-headimg" :src="item.head_img" mode="aspectFill"></image>
 								<!-- 发布者昵称 -->
 								<view class="clips1 opc">{{item.name}}</view>
 							</view>
@@ -48,16 +47,15 @@
 			<view class="list-box">
 				<view @tap="goDetail(index)" v-if="index%2!=0" :class="radiu?'radius15 mar-x10':'radius30 mar-x30'" class="posir colf  zou" v-for="(item,index) in list" :key="index">
 					<!-- 背景图 -->
-					<image :class="radiu?'radius15':'radius30'" class="width100 list-min" :src="item.main_img" mode="widthFix"></image>
+					<image  lazy-load :class="radiu?'radius15':'radius30'" class="width100 list-min" :src="item.main_img" mode="widthFix"></image>
-					<view class="posia disjbac fon24" :style="{borderRadius: radiu ? '15rpx 15rpx 0 0' : '30rpx 30rpx 0 0',padding:radiu ? '10rpx' : '17rpx 25rpx'}" style="background-color: rgba(56,117,246,.8);top: 0;left: 0;right: 0;">
+					<view class="posia fon24 colf" style="right: 10rpx;bottom: 160rpx;z-index: 1;">
-						<view @tap.stop="chooseLike(index)" class="disac" style="width: 48%;justify-content: flex-start;">
+						<view @tap.stop="praiseEv(index)" class="disjcac fc">
-							<image :style="{width: radiu ?'30rpx':'40rpx',height: radiu ?'30rpx':'40rpx'}" :src="['/static/public/cnllection-no.png','/static/public/yconllection.png'][item.is_collected]" mode="aspectFill"></image>
+							<image lazy-load :style="{width: radiu ?'40rpx':'60rpx',height: radiu ?'40rpx':'60rpx'}" :src="['/static/public/list-nlike.png','/static/public/detail-like.png'][item.is_liked]" mode="aspectFill"></image>
-							<view class="mar-z10">{{['收藏','已收藏'][item.is_collected]}}</view>
+							<view>{{item.likes>100 ? '99+':item.likes}}</view>
 						</view>
-						<view style="width: 2rpx;height: 30rpx;background-color: #FFFFFF;"></view>
+						<view @tap.stop="chooseLike(index)" class="disjcac fc mar-s10">
-						<view @tap.stop="praiseEv(index)" class="disac" style="width: 48%;justify-content: flex-end;">
+							<image lazy-load :style="{width: radiu ?'40rpx':'60rpx',height: radiu ?'40rpx':'60rpx'}" :src="['/static/public/cnllection-no.png','/static/public/yconllection.png'][item.is_collected]" mode="aspectFill"></image>
-							<image :style="{width: radiu ?'30rpx':'40rpx',height: radiu ?'30rpx':'40rpx'}" :src="['/static/public/list-nlike.png','/static/public/detail-like.png'][item.is_liked]" mode="aspectFill"></image>
+							<view>{{item.collects>100 ? '99+':item.collects}}</view>
-							<view class="mar-z10">{{['喜欢',item.likes][item.is_liked]}}</view>
 						</view>
 					</view>
 					<!-- <view class="posia list-like-box" @tap.stop="chooseLike(index)"> -->
@@ -77,7 +75,7 @@
 						<view class="disjbac">
 							<view class="disac">
 								<!-- 发布者头像 -->
-								<image class="list-headimg" :src="item.head_img" mode="aspectFill"></image>
+								<image lazy-load class="list-headimg" :src="item.head_img" mode="aspectFill"></image>
 								<!-- 发布者昵称 -->
 								<view class="clips1 opc">{{item.name}}</view>
 							</view>

components/nothing-page.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="nothing">
 		<view class="nothing-box">
-			<image :src="imgSrc" mode="aspectFill"></image>
+			<image lazy-load :src="imgSrc" mode="aspectFill"></image>
 			<view class="nothing-con">{{content}}</view>
 		</view>
 	</view>

components/shop-list.vue

@@ -2,7 +2,7 @@
 	<view class="pad20 shop_list_box">
 		<view style="width: 48.6%;float: left;">
 			<view v-if="index1%2==0" v-for="(item1,index1) in newList" :key="index1" class="bacf radius15 mar-x20 animated fadeIn" @tap="goPage(item1.id,index1)">
-				<image :src="item1.imgSrc" mode="aspectFill" style="width: 100%;border-top-left-radius: 15rpx;border-top-right-radius: 15rpx;height: 325rpx;"></image>
+				<image :src="item1.imgSrc" mode="aspectFill" lazy-load style="width: 100%;border-top-left-radius: 15rpx;border-top-right-radius: 15rpx;height: 325rpx;"></image>
 				<view class="pad-zy20 pad-s10 pad-x30">
 					<view class="fon28 bold col3 clips2">{{item1.title}}</view>
 					<view class="disac fon20 mar-sx20" v-if="!item1.isIntegral">
@@ -16,7 +16,7 @@
 							<view v-if="item1.isIntegral" class="mar-s20">
 								<view>积分:{{item1.integral}}</view>
 								<view class="disac mar-s20" v-if="item1.grade!=0">
-									<image src="/static/public/huiy.png" style="width: 40rpx;height: 33rpx;" mode=""></image>
+									<image lazy-load src="/static/public/huiy.png" style="width: 40rpx;height: 33rpx;" mode=""></image>
 									<view class="fon24 col3 mar-z10">{{item1.level_text}}</view>
 								</view>
 							</view>
@@ -31,7 +31,7 @@
 					<view v-if="item1.isPing" class="disjbac mar-s20">
 						<view class="fon24 col80">已拼团{{item1.activity_group_num}}组</view>
 						<view class="disac">
-							<image v-for="(itemm,indexm) in item1.activity_group_cover" :key="indexm" :src="itemm" mode="" style="width: 40rpx;height: 40rpx;border-radius: 100%;margin-left: -20rpx;"></image>
+							<image lazy-load v-for="(itemm,indexm) in item1.activity_group_cover" :key="indexm" :src="itemm" mode="" style="width: 40rpx;height: 40rpx;border-radius: 100%;margin-left: -20rpx;"></image>
 						</view>
 					</view>
 					<view v-if="item1.isXian || item1.isPing || item1.isTuan" class="fon24 col80 mar-s20">结束时间：{{item1.activity_end_at}}</view>
@@ -40,7 +40,7 @@
 		</view>
 		<view style="width: 48.6%;float: right;">
 			<view v-if="index1%2!=0" v-for="(item1,index1) in newList" :key="index1" class="bacf radius15 mar-x20 animated fadeIn" @tap="goPage(item1.id,index1)">
-				<image :src="item1.imgSrc" mode="aspectFill" style="width: 100%;border-top-left-radius: 15rpx;border-top-right-radius: 15rpx;height: 325rpx;"></image>
+				<image :src="item1.imgSrc" lazy-load mode="aspectFill" style="width: 100%;border-top-left-radius: 15rpx;border-top-right-radius: 15rpx;height: 325rpx;"></image>
 				<view class="pad-zy20 pad-s10 pad-x30">
 					<view class="fon28 bold col3 clips2">{{item1.title}}</view>
 					<view class="disac fon20 mar-sx20" v-if="!item1.isIntegral">
@@ -54,7 +54,7 @@
 							<view v-if="item1.isIntegral" class="mar-s20">
 								<view>积分:{{item1.integral}}</view>
 								<view class="disac mar-s20" v-if="item1.grade!=0">
-									<image src="/static/public/huiy.png" style="width: 40rpx;height: 33rpx;" mode=""></image>
+									<image lazy-load src="/static/public/huiy.png" style="width: 40rpx;height: 33rpx;" mode=""></image>
 									<view class="fon24 col3 mar-z10">{{item1.level_text}}</view>
 								</view>
 							</view>
@@ -69,7 +69,7 @@
 					<view v-if="item1.isPing" class="disjbac mar-s20">
 						<view class="fon24 col80">已拼团{{item1.activity_group_num}}组</view>
 						<view class="disac">
-							<image v-for="(itemm,indexm) in item1.activity_group_cover" :key="indexm" :src="itemm" mode="" style="width: 40rpx;height: 40rpx;border-radius: 100%;margin-left: -20rpx;"></image>
+							<image lazy-load v-for="(itemm,indexm) in item1.activity_group_cover" :key="indexm" :src="itemm" mode="" style="width: 40rpx;height: 40rpx;border-radius: 100%;margin-left: -20rpx;"></image>
 						</view>
 					</view>
 					<view v-if="item1.isXian || item1.isPing || item1.isTuan" class="fon24 col80 mar-s20">结束时间：{{item1.activity_end_at}}</view>

components/status-nav.vue

@@ -3,7 +3,7 @@
         <view :style="{height:statusBarHeight+'px',background:backgroudColor}"></view>
         <view class="status-nav" :style="{background:backgroudColor}">
             <!-- 返回键 -->
-			<view @tap="backEvent" v-if="statusBack" style="height: 33rpx;width: 80rpx;flex-shrink: 0;position: absolute;">
+			<view @tap="backEvent" v-if="statusBack" style="height: 33rpx;width: 120rpx;flex-shrink: 0;position: absolute;">
 				<image v-if="backColor==0" class="tab-back" src="/static/public/backBlackm.png"></image>
 				<image v-if="backColor==1" class="tab-back" src="/static/public/videoBack.png"></image>
 			</view>
@@ -73,8 +73,8 @@
         },
 		methods:{
 			backEvent(){//返回事件
-				if(uni.getStorageSync('outside')*1==6){
+				if(getApp().globalData.outside){
-					this.whereCome = uni.getStorageSync('outside')*1;
+					this.whereCome = 6;
 				}
 				switch (this.whereCome){
 					case 0:

components/swiper-pu.vue

@@ -4,8 +4,8 @@
 			<swiper :current="bcurrent" @change="changeBanner" :style="{height: newHeight+'px'}" :autoplay="isplay" :circular="true" :interval="3000" :duration="500">
 				<swiper-item v-for="(item,index) in bannerList" :key="index">
 					<view @tap="chooseImg(index)" class="posir">
-						<image :style="{borderRadius:newRadius+'px',height:newHeight+'px'}" class="img" :src="item.imgSrc" mode="aspectFill"></image>
+						<image lazy-load :style="{borderRadius:newRadius+'px',height:newHeight+'px'}" class="img" :src="item.imgSrc" mode="aspectFill"></image>
-						<image @tap.stop="playVideo(index)" v-if="item.isVideo && isVedio" class="posia" style="top: 50%;left: 50%;transform: translate(-50%,-50%);width: 126rpx;height: 126rpx;z-index: 1;" src="/static/public/video.png" mode=""></image>
+						<image lazy-load @tap.stop="playVideo(index)" v-if="item.isVideo && isVedio" class="posia" style="top: 50%;left: 50%;transform: translate(-50%,-50%);width: 126rpx;height: 126rpx;z-index: 1;" src="/static/public/video.png" mode=""></image>
 					</view>
 				</swiper-item>
 			</swiper>

jsFile/requst.js

@@ -83,7 +83,7 @@ const request = (method, url, options) => {
 			data: dataObj(url, options),
 			header: headers,
 			success: res => {
-				console.log('反的结果===>',res);
+				console.log(`${url}返的结果===>`,res);
 				if (res.statusCode == 200) {
 					if (res.data.code == 0) {
 						resolve(res.data)

jsFile/tools.js

@@ -329,6 +329,7 @@ const tools = {
 		// #ifdef MP-WEIXIN
 			let hInfo = wx.getAccountInfoSync();
 			// console.log(hInfo.envVersion);//develop:开发版	trial：体验版	release：正式版
+			// if(hInfo.miniProgram.envVersion == "develop"){
 			if(hInfo.miniProgram.envVersion == "develop" || hInfo.miniProgram.envVersion == "trial"){
 				// (开发版,体验版)-配置全局域名
 				uni.setStorageSync('hostapi','https://hengmei.scdxtc.cn/api/');
@@ -392,6 +393,12 @@ const tools = {
 				})
 			},
 		});
+	},
+	// 禁止小程序使用分享
+	disableShareEv(){
+		wx.hideShareMenu({
+			menus: ['shareAppMessage', 'shareTimeline']
+		})
 	}
 }
 

pages.json

@@ -3,13 +3,13 @@
 		{
 		    "path" : "pages/tabbar/pagehome/pagehome",
 		    "style" :{}
-		},
+		},{
-		{
 		    "path" : "pages/login/login",
 		    "style" :{
 				"navigationBarTextStyle":"black"  //状态栏字体颜色
 			}
-		},{
+		},
+		{
 		    "path" : "pages/tabbar/my/staffDuan",
 		    "style" :{}
 		},{
@@ -275,6 +275,15 @@
                     "enablePullDownRefresh": false
                 }
                 
+                }
+                ,{
+                    "path" : "problemList/problemList",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
                 }
             ]
 		}

pages/login/login.vue

@@ -1,24 +1,18 @@
 <template>
 	<view>
 		<status-nav :titleVal="'登录'" :tabcolor="'rgba(244, 244, 244,1)'" :whereCome="1*1" :statusTitle="true" :backgroudColor="'rgba(244, 244, 244,1)'"></status-nav>
-		<view class='login-header'>
+		<!-- <view class='login-header'>
 			<image class="infoImg" :style="{boxShadow: '0px 0px 20px '+ publicColor}" mode="aspectFit" :src="userInfo.avatarUrl || imgSrc"></image>
 			<view class="logo-name">恒美植发</view>
 		</view>
 		<view class="login-box">
 			<button class='login-btn' :style="{background:publicColor}" type='primary' @click="bindGetUserInfo">微信授权</button>
-			<!--新版登录方式-->
-			<!-- <button v-if="canIGetUserProfile" class='login-btn' type='primary' @click="bindGetUserInfo">授权登录</button> -->
-			<!--旧版登录方式-->
-			<!-- <button v-else class='login-btn' type='primary' open-type="getUserInfo" withCredentials="true" lang="zh_CN" @getuserinfo="bindGetUserInfo">授权登录</button> -->
 			<view class="xie-box">登录代表您已同意<text @tap="goXie" class="xieCon">《用户服务协议》</text></view>
 		</view>
-		<!-- 弹框 -->
 		<view v-if="isShowP" class="disjcac posAll">
 			<view class="bacf radius20 width100 tank-box">
 				<view class="tc tank-box-itemone">请授权绑定手机号</view>
 				<view class="fon28 colf pad-x30 pad-zy30 tc disjb">
-					<!-- <view @tap="refuse" class="pad-sx10 radius10 tank-btn" style="background-color: rgba(230, 230, 230,1);color: #000000;">暂不绑定</view> -->
 					<view class="pad-sx10 radius10 tank-btn" style="background-color: rgba(230, 230, 230,1);color: #000000;">暂不绑定</view>
 					<view :style="{background:publicColor}" class="pad-sx10 radius10 tank-btn posir">
 						立即绑定
@@ -26,6 +20,28 @@
 					</view>
 				</view>
 			</view>
+		</view> -->
+		<view class='login-header'>
+			<image class="infoImg" :style="{boxShadow: '0px 0px 20px '+ publicColor}" mode="aspectFit" :src="userInfo.avatarUrl || imgSrc"></image>
+			<view class="logo-name">恒美植发</view>
+		</view>
+		<view class="login-box">
+			<view>
+				<button class='login-btn' open-type="getPhoneNumber" @getphonenumber="getphonenumber" :style="{background:publicColor}" type='primary'>手机号授权登录</button>
+			</view>
+			<view class="xie-box">登录代表您已同意<text @tap="goXie" class="xieCon">《用户服务协议》</text></view>
+		</view>
+		<view v-if="isShowP" class="disjcac posAll">
+			<view class="bacf radius20 width100 tank-box">
+				<view class="tc tank-box-itemone">微信授权</view>
+				<view class="fon28 colf pad-x30 pad-zy30 tc disjb">
+					<view class="pad-sx10 radius10 tank-btn" style="background-color: rgba(230, 230, 230,1);color: #000000;">暂不绑定</view>
+					<view :style="{background:publicColor}" class="pad-sx10 radius10 tank-btn posir">
+						立即授权
+						<button @click="bindGetUserInfo" class="posia syxzo">立即授权</button>
+					</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -65,18 +81,24 @@
 			},
 			getphonenumber(e){//授权绑定手机号
 				let ya = this;
-				if(e.detail.errMsg=="getPhoneNumber:ok"){
+				wx.login({
-					this.$requst.post('user/bind-phone',{iv:e.detail.iv,encryptedData:e.detail.encryptedData}).then(res=>{
+					success:(res)=>{
-						console.log('手机号信息：',res);
+						this.$requst.post('user/login',{code:res.code}).then(result => {
-						if(res.code==0){
+							if(e.detail.errMsg=="getPhoneNumber:ok"){
-							this.$toolAll.tools.showToast('手机号绑定成功','success');
+								this.$requst.post('user/bind-phone',{openid: result.data.openid,session_key:result.data.session_key, iv:e.detail.iv,encryptedData:e.detail.encryptedData}).then(res=>{
-							uni.setStorageSync('bindPhone',false)
+									console.log('手机号信息：',res);
-							uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
+									if(res.code==0){
-						} else this.$toolAll.tools.showToast(res.msg);
+										this.$toolAll.tools.showToast('手机号绑定成功');
-					},error=>{})
+										this.isShowP = true;
-				} else {
+										// uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
-					// console.log('取消授权手机号')
+									} else this.$toolAll.tools.showToast(res.msg);
-				}
+								},error=>{})
+							} else {
+								// console.log('取消授权手机号')
+							}
+						})
+					}
+				})
 			},
 			goXie(){
 				uni.navigateTo({
@@ -137,13 +159,13 @@
 						uni.setStorageSync('phone_active',res.data.phone_active)//是否第一次授权
 						uni.setStorageSync('invite_code',res.data.invite_code)
 						uni.hideToast()
-						if(res.data.phone_active!=1){
+						// if(res.data.phone_active!=1){
-							this.isShowP = true;
+						// 	this.isShowP = true;
-						} else {
+						// } else {
 							uni.reLaunch({
 								url:'/pages/tabbar/pagehome/pagehome'
 							})
-						}
+						// }
 					}
 				},error => {})
 			}

pages/tabbar/cate/cate.vue

@@ -189,8 +189,10 @@
 		onReachBottom() {//触底事件
 			if(this.total!=this.dataList.length){
 				this.page++
-				if(!this.isHot){
+				if(this.ccurrent==0){
 					this.checkCate(this.category_id)//调用自主预约列表事件
+				} else {
+					this.otherEv(this.cateList[this.ccurrent].children[0].id)
 				}
 			} else {
 				if(this.isZanw) this.$toolAll.tools.showToast('暂无更多列表','none',1000)
@@ -205,6 +207,7 @@
 		},
 		onLoad(options) {
 			this.optionObj = options;
+			this.ccurrent = options.index*1;
 			// 调用tools.js中的种植埋点事件
 			this.$toolAll.tools.plantPoint(7);
 			this.checkSwi()
@@ -285,6 +288,7 @@
 				// console.log(this.dataList[e].is_collected);
 				if(this.dataList[e].is_collected==0){
 					this.dataList[e].is_collected = 1
+					this.dataList[e].collects++;
 					// 调用收藏事件
 					collectionEV({action:'collect',archive_id:this.dataList[e].id})
 				}
@@ -302,6 +306,7 @@
 			comfirmev(e){//确认取消收藏事件
 				this.dataList[e].is_collected = 0
 				this.$toolAll.tools.showToast('正在取消...','loading')
+				this.dataList[e].collects--;
 				// 调用取消收藏事件
 				cancleCollectionEV({action:'collect',archive_id:this.dataList[e].id})	
 			},
@@ -327,7 +332,12 @@
 							sort:this.cateList[0].sort
 						}
 						this.cateList.unshift(reObj)
-						this.checkCate(this.category_id)//调用分类列表事件
+						if(this.ccurrent==0){
+							this.checkCate(this.category_id)//调用热门分类列表事件
+						} else {
+							this.chooseCate(this.ccurrent);
+							this.otherEv(this.cateList[this.ccurrent].children[0].id);//调用其他分类列表事件
+						}
 						if(this.cateList.length!=0){
 							setTimeout(()=>{
 								const query = wx.createSelectorQuery()
@@ -339,7 +349,7 @@
 						}
 						setTimeout(()=>{this.isLoading = true},500)
 					}
-				},error=>{})
+				})
 			},
 			checkCate(category_id){//分类列表事件
 				this.dataShopList = [];
@@ -438,6 +448,7 @@
 				},error=>{})
 			},
 			chooseCate(index){//分类选中事件
+				this.page = 1;
 				this.ccurrent = index
 				if(this.ccurrent!=0){
 					// this.checkData(this.cateList[index].id);

pages/tabbar/pagehome/pagehome.vue

@@ -167,6 +167,8 @@
 			this.$toolAll.tools.plantPoint(6);
 			this.checkKT();//恒美课堂列表
 			this.isAutoPlay = true;
+			// 进入首页修改全局判断是否是分享进来的
+			getApp().globalData.outside = false;
 		},
 		onLoad(options) {
 			if(options.q!=undefined){
@@ -219,9 +221,6 @@
 				this.quanImg= uni.getStorageSync('quanImg');
 				this.quanId = uni.getStorageSync('quanId');
 			},3000)
-			setTimeout(()=>{
-				this.checkUserInfo();
-			},10000)
 		},
 		methods: {
 			loginEv(option){
@@ -242,13 +241,6 @@
 					},
 				});
 			},
-			checkUserInfo(){
-				this.$requst.post('user/info').then(res=>{
-					if(res.data.phone_active!=0){
-						uni.setStorageSync('phone_active',res.data.phone_active);
-					}
-				})
-			},
 			checkQ(){//查询优惠券
 				this.$requst.post('user/home-coupon').then(res=>{
 					if(res.data.has_coupon==1){
@@ -476,7 +468,6 @@
 				if(this.dataList[e].is_liked==0){
 					this.dataList[e].is_liked = 1;
 					this.dataList[e].likes++;
-					if(this.dataList[e].likes>1000) this.dataList[e].likes = '999+'
 					// 调用收藏事件
 					collectionEV({action:'like',archive_id:this.dataList[e].id})
 				}
@@ -485,6 +476,7 @@
 				// console.log(this.dataList[e].is_collected);
 				if(this.dataList[e].is_collected==0){
 					this.dataList[e].is_collected = 1
+					this.dataList[e].collects++;
 					// 调用收藏事件
 					collectionEV({action:'collect',archive_id:this.dataList[e].id})
 				}
@@ -492,6 +484,7 @@
 			comfirmev(e){//确认取消收藏事件
 				this.dataList[e].is_collected = 0
 				this.$toolAll.tools.showToast('正在取消...','loading')
+				this.dataList[e].collects--;
 				// 调用取消收藏事件
 				cancleCollectionEV({action:'collect',archive_id:this.dataList[e].id})	
 			},

pages/tabbar/shop/shop.vue

@@ -3,7 +3,7 @@
 		<!-- 状态栏 -->
 		<status-nav :titleVal="'商城'"  :statusBack="false" :statusTitle="true"></status-nav>
 		<view class="bacf shop-nav-box" :style="{marginTop:statusHNH+'px'}">
-			<view class="disac pad-zy30 mar-sx20">
+			<view class="disac pad-zy30 mar-sx20 pad-s20">
 				<!-- 输入框 -->
 				<input class="width100 fon34 radius10" type="text" @confirm="searchEv" v-model="searchVal" placeholder="请输入商品名称"/>
 				<!-- 搜索 -->

pagesA/getReadyDan/getReadyDan.vue

@@ -41,7 +41,7 @@
 			<view class="bacf radius20 mar-s20 pad-sx27-zy20">
 				<view class="bold">订单信息</view>
 				<view v-for="(item,index) in orderList" :key="index" class="fon26 col3 disjbac pad-sx50 disjbac bbot">
-					<image @tap="goShopDetail(item.id)" :src="item.imgSrc" class="flexs order-image" mode="aspectFill"></image>
+					<image lazy-load @tap="goShopDetail(item.id)" :src="item.imgSrc" class="flexs order-image" mode="aspectFill"></image>
 					<view class="width100 disjb fw" style="height: 166rpx;">
 						<view>
 							<view @tap="goShopDetail(item.id)" class="fon28 col3 bold clips2">{{item.title}}</view>
@@ -82,10 +82,6 @@
 						<image src="/static/public/nextM.png" class="xiaDan-next" mode="aspectFill"></image>
 					</view>
 				</view>
-				<!-- <view class="fon28 col3 disjbac">
-					<view>立减优惠</view>
-					<view class="colf8 bold">-￥{{delPrice}}.00</view>
-				</view> -->
 			</view>
 			<!-- 快递费用 -->
 			<view v-if="isExpress" class="bacf radius20 mar-s20 disjbac pad-sx27-zy20">
@@ -195,7 +191,6 @@
 					id:0,
 					youPrice:0
 				},//优惠券
-				delPrice:0,//立减优惠（限时活动的）
 				allPrice:0,//合计
 				allNum:0,//总数量
 				zanAllPrice:0,//暂存合计
@@ -223,8 +218,6 @@
 				ntype:'money',//默认money孔雀币转钱 coin钱转孔雀币
 				times:0,//点击次数
 				isCurrent:2,
-				vision:false,
-				isShowP:false,
 				isfen:false,
 				checkGrounpId:0,
 				expressInfo:{
@@ -234,47 +227,17 @@
 				payType:''//支付方式 wechat=微信支付;coin=孔雀币;hybrid=混合支付
 			}
 		},
-		onShareAppMessage(res) {
-		    var ya = this;
-			this.$requst.post('user/record',{type:'content',action:'share',id:this.orderList[0].id}).then(res=>{console.log('分享成功：',res);},error=>{})
-			// 调用tools.js中的种植埋点事件
-			this.$toolAll.tools.plantPoint(4,this.orderList[0].id);
-			if(ya.addressInfo.share_img==null) ya.addressInfo.share_img = ya.addressInfo.cover;
-			var shareObj = {
-		　　　　	title: `${ya.orderList[0].title}`, // 默认是小程序的名称(可以写slogan等)
-		　　　　	path: `/pagesB/shopDetail/shopDetail?id=${this.orderList[0].id}&category_id=${this.orderList[0].category_id}&share_id=${this.checkGrounpId}&invite_code=${uni.getStorageSync('invite_code')}&shareCate=${this.orderList[0].cateNum}&checkGrounpId=${this.orderList[0].checkGrounpId}`, // 默认是当前页面，必须是以‘/’开头的完整路径
-		　　　　	imageUrl: ya.orderList[0].imgSrc//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
-		　	};
-		　　return shareObj;
-		},
 		onShow() {
+			// 禁止分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin();
 			this.checkChoose();//检测地址
 			uni.removeStorageSync('orderInfo');
 		},
 		onLoad(options) {
-			// 自提手机号
-			this.zPhone = uni.getStorageSync('phone');
-			// 判断是不是虚拟商品
-			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){
-				this.loginEv('',options.source_code,options.channel);
-			} 
-			this.checkexpress();//查询快递
-			this.checkeList(options.isNei);//查询订单列表
-			this.checkOrderDetail();//查询订单信息
-			this.isNei = options.isNei;
-			if(this.isNei==3) {
-				this.payFS[0].isActive = false;
-				this.payFS[2].isActive = true;
-				this.isCurrent = 1;
-			} 
 			// wechat=微信支付;coin=孔雀币;hybrid=混合支付
 			this.payType = uni.getStorageSync('payType'); 
-			// this.payType = 'hybrid';
+			// this.payType = 'coin';
 			if(this.payType=='wechat') {
 				this.payFS = [{title:'微信支付',isActive:true,num:0}]
 			} else if(this.payType=='coin'){
@@ -285,38 +248,21 @@
 					{title:'孔雀币',isActive:false,num:0}
 				]
 			}
+			// 自提手机号
+			this.zPhone = uni.getStorageSync('phone');
+			// 判断是不是虚拟商品
+			options.isVirtual == "virtual" ? this.isVirtual = true : this.isVirtual = false 
+			this.checkexpress();//查询快递
+			this.checkeList(options.isNei);//查询订单列表
+			this.checkOrderDetail();//查询订单信息
+			this.isNei = options.isNei;
+			if(this.isNei==3) {
+				this.payFS[0].isActive = false;
+				this.payFS[2].isActive = true;
+				this.isCurrent = 1;
+			} 
 		},
 		methods: {
-			loginEv(invite_code='',source='',channel=''){
-				uni.login({
-					provider: 'weixin',
-					success: (res)=> {
-						if (res.code) {
-							var params = {
-								code:res.code,
-								invite_code:invite_code,//用户邀请码
-								source_code:source,
-								channel:channel
-							}
-							this.$requst.post('user/login',params).then(res => {
-								if(res.data.token!=''){
-									if(res.data.is_active==0) {
-										this.haveImg = false;
-										this.vision = true;
-									}
-								}
-							},error => {})
-						}
-					},
-				});
-			},
-			buttonH(e){//授权成功
-				this.haveImg = e
-				if(e) {
-					this.vision = false
-					this.isShowP = true
-				} 
-			},
 			checkChoose(){
 				if(uni.getStorageSync('chooseAddress')==''){
 					this.checkAddress();//查询地址
@@ -339,6 +285,17 @@
 					if(res.code==0){
 						if(this.ntype=='money'){
 							this.coin_price = res.data.amount/100;
+							if(this.payType=='coin'){
+								// 只有孔雀币支付方式
+								if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣
+									this.allPrice = 0;
+									this.zf_kqPrice = this.zanAllPrice*1;
+								} else {//孔雀币不足以抵扣
+									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
+									this.zf_kqPrice = this.coin_price;
+								}
+								this.isKq = true;
+							}
 						} else {
 							this.zf_kqPrice = res.data.amount;
 							this.isKq = true;
@@ -361,12 +318,14 @@
 						return;
 					}
 				} else {//孔雀币
-					if(!this.payFS[0].isActive && !this.payFS[1].isActive){
+					if(this.payType!='coin'){
-						this.$toolAll.tools.showToast('请选择支付方式')
+						if(!this.payFS[0].isActive && !this.payFS[1].isActive){
-						this.allPrice = this.zanAllPrice;
+							this.$toolAll.tools.showToast('请选择支付方式')
-						this.isKq = false;
+							this.allPrice = this.zanAllPrice;
-						this.zf_kqPrice = this.payFS[1].num;
+							this.isKq = false;
-						return;
+							this.zf_kqPrice = this.payFS[1].num;
+							return;
+						}
 					}
 				}
 				if(this.payFS[index].title=='微信支付'){
@@ -404,62 +363,78 @@
 					}
 				}
 				if(this.payFS[index].title=='孔雀币') {
-					if(this.youQuan.youPrice!=0){
+					if(this.payType!='coin'){
-						this.payFS[1].isActive = false;
+						if(this.youQuan.youPrice!=0){
-						this.$toolAll.tools.showToast('无法使用孔雀币支付');
+							this.payFS[1].isActive = false;
-					} else {
+							this.$toolAll.tools.showToast('无法使用孔雀币支付');
-						if(this.coin_price!=0){
-							//选择了微信支付+选择了孔雀币
-							if(this.payFS[0].isActive && this.payFS[1].isActive) {
-								if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣
-									this.ntype = 'coin';
-									this.obtainCoin(this.zanAllPrice*100);
-									this.allPrice = 0;
-								} else {//孔雀币不足以抵扣
-									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
-									this.zf_kqPrice = this.payFS[1].num;
-								}
-								return;
-							}
-							//选择了微信支付+取消了孔雀币
-							if(this.payFS[0].isActive && !this.payFS[1].isActive) {
-								this.isKq = false;
-								this.zf_kqPrice = 0;
-								// 如果优惠券金额等：0
-								if(this.youQuan.youPrice==0){
-									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice)*1).toFixed(2);
-								} else {
-									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.youQuan.youPrice)*1).toFixed(2);
-								}
-								return;
-							}
-							//取消了微信支付+选择了孔雀币
-							if(!this.payFS[0].isActive && this.payFS[1].isActive){
-								if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣应付款
-									this.ntype = 'coin'
-									this.obtainCoin(this.allPrice*100);
-									this.allPrice = 0;
-								}
-								if(this.zanAllPrice - this.coin_price>0){//孔雀币不足以抵扣应付款
-									this.$toolAll.tools.showToast('孔雀币不足')
-									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
-									this.zf_kqPrice = this.payFS[1].num;
-								}
-								return;
-							}
-							//取消了微信支付+取消了孔雀币
-							if(!this.payFS[0].isActive && !this.payFS[1].isActive){
-								this.isKq = false;
-								this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice)*1).toFixed(2);
-								return;
-							}
 						} else {
-							this.$toolAll.tools.showToast('暂无可用孔雀币');
+							if(this.coin_price!=0){
-							this.payFS[index].isActive = false;
+								//选择了微信支付+选择了孔雀币
+								if(this.payFS[0].isActive && this.payFS[1].isActive) {
+									if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣
+										this.ntype = 'coin';
+										this.obtainCoin(this.zanAllPrice*100);
+										this.allPrice = 0;
+									} else {//孔雀币不足以抵扣
+										this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
+										this.zf_kqPrice = this.payFS[1].num;
+									}
+									return;
+								}
+								//选择了微信支付+取消了孔雀币
+								if(this.payFS[0].isActive && !this.payFS[1].isActive) {
+									this.isKq = false;
+									this.zf_kqPrice = 0;
+									// 如果优惠券金额等：0
+									if(this.youQuan.youPrice==0){
+										this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice)*1).toFixed(2);
+									} else {
+										this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.youQuan.youPrice)*1).toFixed(2);
+									}
+									return;
+								}
+								//取消了微信支付+选择了孔雀币
+								if(!this.payFS[0].isActive && this.payFS[1].isActive){
+									if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣应付款
+										this.ntype = 'coin'
+										this.obtainCoin(this.allPrice*100);
+										this.allPrice = 0;
+									}
+									if(this.zanAllPrice - this.coin_price>0){//孔雀币不足以抵扣应付款
+										this.$toolAll.tools.showToast('孔雀币不足')
+										this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
+										this.zf_kqPrice = this.payFS[1].num;
+									}
+									return;
+								}
+								//取消了微信支付+取消了孔雀币
+								if(!this.payFS[0].isActive && !this.payFS[1].isActive){
+									this.isKq = false;
+									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice)*1).toFixed(2);
+									return;
+								}
+							} else {
+								this.$toolAll.tools.showToast('暂无可用孔雀币');
+								this.payFS[index].isActive = false;
+							}
+						}
+					} else {
+						if(!this.payFS[index].isActive) {
+							this.isKq = false;
+							this.zf_kqPrice = 0;
+							this.allPrice = this.zanAllPrice;
+						} else {
+							// 只有孔雀币支付方式
+							if(this.zanAllPrice - this.coin_price<=0){//孔雀币足以抵扣
+								this.ntype = 'coin';
+								this.obtainCoin(this.zanAllPrice*100);
+								this.allPrice = 0;
+							} else {//孔雀币不足以抵扣
+								this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
+								this.zf_kqPrice = this.payFS[0].num;
+							}
 						}
 					}
-				}
-				if(this.payFS[index].title=='积分') {
 					
 				}
 			},
@@ -520,13 +495,11 @@
 					this.$toolAll.tools.showToast('请添加微信支付方式');
 				} else if(this.isNei != 3 && !this.payFS[0].isActive && !this.payFS[1].isActive){
 					this.$toolAll.tools.showToast('请选择支付方式')
-				} else if(this.payFS[0].title=='孔雀币'){
+				} else if(this.payType=='coin' && this.allPrice*1 > this.coin_price*1){
-					if(this.allPrice*1 > this.coin_price*1){
-						this.$toolAll.tools.showToast('孔雀币不足');
-					}
-				} else if(this.isNei != 3 && !this.payFS[0].isActive && this.allPrice*1 > this.coin_price*1){
 					this.$toolAll.tools.showToast('孔雀币不足');
-				} else{
+				} else if(this.payType=='hybrid' && this.isNei != 3 && !this.payFS[0].isActive && this.allPrice*1 > this.coin_price*1){
+					this.$toolAll.tools.showToast('孔雀币不足');
+				} else {
 					if(this.times==0){
 						this.times++;
 						if(this.allPrice==0){
@@ -666,18 +639,15 @@
 				}
 			},
 			totalEv(){//合计运算
-				if(this.isNei!=3 && this.isExpress && !this.payFS[1].isActive){//普通商品，有运费
+				if(this.isNei!=3) {
-					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice;//合计 = 总价 - 优惠券 - 立减券 + 快递费
+					// 商品订单合计
-				}
+					this.allPrice = this.zanAllPrice - this.youQuan.youPrice;
-				if(this.isNei!=3 && !this.isExpress){//普通商品无运费
+					if(this.payType=='coin'){
-					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice;//合计 = 总价 - 优惠券 - 立减券
+						this.obtainCoin(this.payFS[0].num);
-				}
+					}
-				// this.allPrice = parseInt(this.$toolAll.tools.addXiaoShu(this.allPrice));
+				} else {
-				if(this.isNei ==3 && this.isExpress){//积分商品，有运费
+					// 积分订单合计
-					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice;//合计 = 总价 - 优惠券 - 立减券 + 快递费
+					this.allPrice = this.zanAllPrice;
-				}
-				if(this.isNei ==3 && !this.isExpress){//积分商品，有运费
-					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice;//合计 = 总价 - 优惠券 - 立减券
 				}
 				this.loading = true;
 			},
@@ -696,9 +666,15 @@
 				}
 				this.$requst.post('order/prepare-info',parmas).then(res=>{
 					if(res.code==0){
-						this.payFS[1].num = res.data.account.coin;
 						this.obtainCoin(res.data.account.coin);
-						this.payFS[2].num = res.data.account.score;
+						if(this.payType=='coin'){
+							this.payFS[0].num = res.data.account.coin;
+						} else if(this.payType=='wechat'){
+							
+						} else {
+							this.payFS[1].num = res.data.account.coin;
+							this.payFS[2].num = res.data.account.score;
+						}
 					} else this.$toolAll.tools.showToast(res.msg);
 				})
 			},
@@ -708,7 +684,7 @@
 					this.allPrice += item.price*item.num;
 					this.allNum += item.num;
 				})
-				if(isJfen==3){
+				if(isJfen==3){// 是积分商品
 					this.zanAllPrice = this.allPrice;
 				} else {
 					this.zanAllPrice = this.$toolAll.tools.addXiaoShu(this.allPrice);
@@ -717,17 +693,19 @@
 				this.totalEv();
 			},
 			quanEv(index){//调起优惠券弹框事件
-				if(this.payFS[1].isActive){
+				if(this.payType!='coin' && this.payType!='wechat'){
-					this.$toolAll.tools.showToast('无法使用优惠券减免');
+					if(this.payFS[1].isActive){
-					// this.allPrice = this.$toolAll.tools.addXiaoShu(this.zanAllPrice*1 + this.expressInfo.default_price*1);
+						this.$toolAll.tools.showToast('无法使用优惠券减免');
-				} else {
+						// this.allPrice = this.$toolAll.tools.addXiaoShu(this.zanAllPrice*1 + this.expressInfo.default_price*1);
-					if(index==1){
+					} else {
-						this.showQuan = true
+						if(index==1){
+							this.showQuan = true
+						}
+						this.youQuan.id = 0;
+						this.youQuan.youPrice = 0;
+						this.allPrice = (this.zanAllPrice*1 - this.expressInfo.default_price*1).toFixed(2);
+						this.checkQuan();//查询可用优惠券事件
 					}
-					this.youQuan.id = 0;
-					this.youQuan.youPrice = 0;
-					this.allPrice = (this.zanAllPrice*1 - this.expressInfo.default_price*1).toFixed(2);
-					this.checkQuan();//查询可用优惠券事件
 				}
 			},
 			checkQuan(){//查询可用优惠券事件

pagesA/integralManage/integralManage.vue

@@ -49,8 +49,6 @@
 				<button class="posia-op" open-type="share"></button>
 			</view>
 		</view>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -87,6 +85,8 @@
 			}
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin();
 		},
 		onLoad(options) {

pagesA/my-diary/my-diary.vue

@@ -7,7 +7,7 @@
 				<view class="clips1">{{item.title}}</view>
 				<view class="mar-s20 fon24 col9">{{item.content}}</view>
 				<view class="disac fw mar-s20">
-					<image class="diary-img mar-x10" @tap="preImg(index,index1)" :src="item1" v-for="(item1,index1) in item.imgArr" :key="index1" mode="aspectFill"></image>
+					<image lazy-load class="diary-img mar-x10" @tap="preImg(index,index1)" :src="item1" v-for="(item1,index1) in item.imgArr" :key="index1" mode="aspectFill"></image>
 				</view>
 				<view class="disjbac mar-s20">
 					<view class="fon28 pcol bold">{{item.doctorName}}</view>

pagesA/myAddress/myAddress.vue

@@ -86,8 +86,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -118,6 +116,8 @@
 			}
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin()
 		},
 		onLoad(options) {

pagesA/myOrder/myOrder.vue

@@ -18,11 +18,11 @@
 				</view>
 				<view @tap="goDetail(item.id)" class="disjbac fon24">
 					<view class="col3">订单号：{{item.orderNum}}</view>
-					<view v-if="item.virtual_check==0" class="bold" :class="(item.orderStatus==1 || item.orderStatus==2 || item.orderStatus==3) ? 'colf8':'col9'">{{['','待付款','待发货','待核验','待收货','交易完成'][item.orderStatus]}}</view>
+					<view v-if="item.virtual_check==0" class="bold" :class="(item.orderStatus==1 || item.orderStatus==2 || item.orderStatus==3) ? 'colf8':'col9'">{{item.status_text}}</view>
-					<view v-if="item.virtual_check==1" class="bold col9">已核验</view>
+					<view v-if="item.virtual_check==1" class="bold col9">{{item.status_text}}</view>
 				</view>
 				<view v-for="(itemc,indexc) in item.childrenList" :key="indexc" class="fon26 col3 disjbac pad-sx50 disjbac bbot posir" :style="{paddingBottom:itemc.is_virtual!=0?'70rpx':'50rpx'}">
-					<image @tap="goDetail(item.id)" :src="itemc.imgSrc" class="flexs" mode="aspectFill"></image>
+					<image lazy-load @tap="goDetail(item.id)" :src="itemc.imgSrc" class="flexs" mode="aspectFill"></image>
 					<view @tap="goDetail(item.id)" class="width100 disjb fc" style="height: 166rpx;">
 						<view>
 							<view class="fon28 col3 bold clips2">{{itemc.title}}</view>
@@ -107,8 +107,6 @@
 		</view>
 		<!-- 底部tab -->
 		<foot-tab :titleList="titleList" :imgList="imgList" :newcurrent='-1'></foot-tab>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -158,12 +156,7 @@
 			}
 		},
 		onShareAppMessage(res) {
-			var shareObj = {
+		　　return false;
-		　　　　	title: ``, // 默认是小程序的名称(可以写slogan等)
-		　　　　	path: `/pagesA/myOrder/myOrder?invite_code=${uni.getStorageSync('invite_code')}&index=${this.activeIndex}`, // 默认是当前页面，必须是以‘/’开头的完整路径
-		　　　　	imageUrl: ''//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
-		　	};
-		　　return shareObj;
 		},
 		onReachBottom() {
 			if(this.total!=this.orderList.length){
@@ -178,6 +171,8 @@
 			this.closeEv();
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin();
 			if(uni.getStorageSync('phone_active')!=0){
 				this.checkZT(this.activeIndex);
@@ -308,7 +303,7 @@
 								if(item.status=="paid") {
 								 	statusNum = 2;
 								}
-								// if(item.status=="check") 
+								if(item.status=="check")  statusNum = 3;
 								if(item.status=="shipped") statusNum = 4;
 								if(item.status=="completed") statusNum = 5;
 								let nprice = '';
@@ -347,10 +342,11 @@
 									is_only:item.is_only,//是否单独购买,1、单独购买
 									virtual_check:item.virtual_check,
 									open_one:item.open_one,
-									is_group_make:item.is_group_make,
 									open_one_success:item.open_one_success,
+									is_group_make:item.is_group_make,
 									group_make_end_at:item.group_make_end_at,
-									group_id:item.group_id
+									group_id:item.group_id,
+									status_text:item.status_text//订单状态文字描述
 								}
 								this.zanArr.push(obj);
 							})
@@ -399,7 +395,7 @@
 							if(index==0) {
 								this.orderList = this.zanList;
 							} else if(index==3){
-								console.log(1234);
+								
 							} else {
 								this.orderList = this.zanList.filter(item=>{
 									return item.orderStatus==index;

pagesA/nodifyData/nodifyData.vue

@@ -61,8 +61,6 @@
 		<simple-address ref="simpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onConfirm" themeColor="#007AFF"></simple-address>
 		<!-- 底部客服 -->
 		<public-customer :nbottom="100"></public-customer>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -115,6 +113,8 @@
 			}
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin()
 		},
 		onUnload() {
@@ -153,9 +153,6 @@
 			}
 		},
 		methods: {
-			cancleEv(){
-				uni.setStorageSync('bindPhone',false)
-			},
 			updataInfo(){//修改资料事件
 				let params = {
 					real_name:this.dataList[5].content,//姓名

pagesA/peacockCoin/peacockCoin.vue

@@ -55,8 +55,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -100,6 +98,8 @@
 			}
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin();
 		},
 		onLoad(options) {

pagesA/shopCart/shopCart.vue

@@ -16,7 +16,7 @@
 							<image v-if="item.isActive" src="/static/public/chooseFS.png" class="flexs chooseDX" mode=""></image>
 							<image v-else src="/static/public/cancle-FS.png" class="flexs chooseDX" mode=""></image>
 						</view>
-						<image @tap="chooseItem(index)" :src="item.imgSrc" class="order-image mar-z25 flexs" mode="aspectFill"></image>
+						<image lazy-load @tap="chooseItem(index)" :src="item.imgSrc" class="order-image mar-z25 flexs" mode="aspectFill"></image>
 						<view class="width100 disjbac fc" style="height: 166rpx;">
 							<view class="width100">
 								<view @tap="goShoptDetail(item.spu_id,item.spu_activity_id)" class="fon28 col3 bold clips2">{{item.title}}</view>
@@ -236,7 +236,7 @@
 					})
 				} 
 				if(this.cartList.length > 0) {
-					console.log(this.isAllEqual(this.newList));
+					// console.log(this.isAllEqual(this.newList));
 					if(this.isAllEqual(this.newList) || this.newList.length==1){
 						uni.setStorageSync('orderList',this.newList);
 						if(this.newList.length==0){

pagesA/signIn/signIn.vue

@@ -5,10 +5,10 @@
 		<view v-if="loading" :style="{paddingTop: statusHNH+'px'}" class=" fon28 col3">
 			<view style="position: sticky;z-index: 3;background: #FFFFFF;padding-bottom: 20rpx;" :style="{top:statusHNH+'px'}">
 				<view class="posir">
-					<image class="posia width100" src="/static/public/sign-01.png" mode="widthFix"></image>
+					<image lazy-load class="posia width100" src="/static/public/sign-01.png" mode="widthFix"></image>
 					<view class="posir tc pad-sx20" style="z-index: 5;">
-						<image v-if="isSigin==0" @tap="siginEv" src="/static/public/sign-02.png" mode="" class="sigin-img"></image>
+						<image lazy-load v-if="isSigin==0" @tap="siginEv" src="/static/public/sign-02.png" mode="" class="sigin-img"></image>
-						<image v-else src="/static/public/sigined.png" mode="" class="sigin-img"></image>
+						<image lazy-load v-else src="/static/public/sigined.png" mode="" class="sigin-img"></image>
 						<view class="fon20 colf mar-s20">在连续签到可获得积分</view>
 						<view class="disjcac mar-sx30">
 							<image src="/static/public/sign-03.png" class="sigin-success" mode=""></image>

pagesB/articleDetail/articleDetail.vue

@@ -85,6 +85,7 @@
 				page:1,
 				total:'',//总数
 				isZanw:true,
+				shareImg:''//分享图
 			}
 		},
 		onShareAppMessage(res) {
@@ -95,7 +96,7 @@
 			var shareObj = {
 		　　　　	title: `${ya.detailObj.title}`, // 默认是小程序的名称(可以写slogan等)
 		　　　　	path: `/pagesB/articleDetail/articleDetail?id=${this.detailId}&share_id=${uni.getStorageSync('userId')}&invite_code=${uni.getStorageSync('invite_code')}`, // 默认是当前页面，必须是以‘/’开头的完整路径
-		　　　　	imageUrl: ''//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
+		　　　　	imageUrl: this.shareImg//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
 		　	};
 		　　return shareObj;
 		},
@@ -189,7 +190,8 @@
 				this.$requst.post('archives/detail',{id:id}).then(res=>{
 					// console.log('详情：',res);
 					if(res.code==0){
-						this.detailObj = res.data.detail
+						this.detailObj = res.data.detail;
+						this.shareImg = this.$http + this.detailObj.share_img;
 						this.content = this.$toolAll.tools.escape2Html(res.data.detail.content)
 						uni.hideToast()
 						this.isLoading = true

pagesB/customerList/customerList.vue

@@ -23,7 +23,7 @@
 			</view>
 			<!-- 列表 -->
 			<view v-if="dataList.length!=0" class="dis bacf radius10 pad20 mar-x20 posir" v-for="(item,index) in dataList" :key="index">
-				<image class="mar-y20 flexs" :src="item.imgSrc" style="width: 98rpx;height: 98rpx;" mode="aspectFill"></image>
+				<image lazy-load class="mar-y20 flexs" :src="item.imgSrc" style="width: 98rpx;height: 98rpx;" mode="aspectFill"></image>
 				<view class="fon24 col3 width100 mar-x40" style="margin-bottom: 120rpx;">
 					<view class="bold disjbac">
 						<view class="fon28 clips1">{{item.name}}</view>

pagesB/doctorDetail/doctorDetail.vue

@@ -6,17 +6,11 @@
 		<!-- 列表 -->
 		<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">
+				<view class="disjb pad-z30">
-					<image class="radius10 flexs mar-z30" :src="doctorObj.doctor_extra.headimg || moImg" style="width: 300rpx;height: 300rpx;" mode="aspectFill"></image>
+					<image class="radius10" :src="doctorObj.doctor_extra.headimg || moImg" mode="widthFix" lazy-load></image>
+					<!-- <image class="radius10 flexs mar-z30" :src="doctorObj.doctor_extra.headimg || moImg" style="width: 300rpx;height: 300rpx;" mode="aspectFill"></image>
 					<view class="pad-z20 width100">
 						<view class="fon28 bold col3">{{doctorObj.doctor_extra.name}}</view>
-						<!-- <view class="disac col80 fon24" style="margin: 6rpx 0;">
-							<view>{{['未知','男','女'][doctorObj.gender]}}</view>
-							<view class="doctorx"></view>
-							<view>从业{{parseFloat(doctorObj.doctor_extra.work_time)}}年</view>
-							<view v-if="doctorObj.doctor_extra.dept_name!='' && doctorObj.doctor_extra.dept_name!=undefined" class="doctorx"></view>
-							<view>{{doctorObj.doctor_extra.dept_name}}</view>
-						</view> -->
 						<view class="col80 fon24">
 							<view class="flexs">擅长领域：</view>
 							<view class="dis fw">
@@ -25,7 +19,7 @@
 								</view>
 							</view>
 						</view>
-					</view>
+					</view> -->
 				</view>
 				<view class="mar-z32">
 					<view class="bbot mar-s30"></view>
@@ -46,10 +40,6 @@
 			<view class="mar-zy32 mar-s20" v-if="dataList.length!=0"><list-pu @chooseLike="chooseLike" @praise="praiseEv" @comfirmev="comfirmev" :list="dataList"></list-pu></view>
 			<view style="margin-top: 8%;" v-if="dataList.length==0"><list-pu :list="dataList" @praise="praiseEv"></list-pu></view>
 		</view>
-		<view class="pad-zy20 mar-sx30">
-			<!-- 返回顶部 -->
-			<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
-		</view>
 		<!-- 底部客服 -->
 		<!-- <public-customer :nbottom="100"></public-customer> -->
 		<!-- 用户信息授权，手机号授权 -->
@@ -72,16 +62,8 @@
 			return {
 				statusHNH:uni.getStorageSync('statusHNH'),
 				publicColor:uni.getStorageSync('publicColor'),//主题颜色
-				cateList:[
+				cateList:[],
-					// {title:'问题'},
+				dataList:[],
-					// {title:'案例日记'},
-					// {title:'效果模拟'},
-					// {title:'科普视频'},
-				],
-				dataList:[
-					
-				],
-				showTop:false,
 				newCurrent:0,
 				category_id:0,//栏目ID
 				moImg:'/static/public/logo.png',
@@ -105,7 +87,6 @@
 			return shareObj;
 		},
 		onPageScroll(e) {
-		    e.scrollTop > 360 ? this.showTop = true : this.showTop = false
 			if((this.chuTop - this.statusHNH) - e.scrollTop*1 <= 0) this.isTop = true
 			else this.isTop = false
 		},
@@ -140,7 +121,8 @@
 			chooseLike(e){//收藏事件
 				// console.log(this.dataList[e].is_collected);
 				if(this.dataList[e].is_collected==0){
-					this.dataList[e].is_collected = 1
+					this.dataList[e].is_collected = 1;
+					this.dataList[e].collects++;
 					// 调用收藏事件
 					collectionEV({action:'collect',archive_id:this.dataList[e].id})
 				}
@@ -157,7 +139,8 @@
 			},
 			comfirmev(e){//确认取消收藏事件
 				this.dataList[e].is_collected = 0
-				this.$toolAll.tools.showToast('正在取消...','loading')
+				this.$toolAll.tools.showToast('正在取消...','loading');
+				this.dataList[e].collects--;
 				// 调用取消收藏事件
 				cancleCollectionEV({action:'collect',archive_id:this.dataList[e].id})	
 			},
@@ -182,25 +165,23 @@
 				this.$requst.post('archives/hot',params).then(res=>{
 					if(res.code==0){
 						// 栏目类别
-						if(uni.getStorageSync('cateList')==''){//首次渲染栏目
+						if(res.data.category.length!=0){
-							if(res.data.category.length!=0){
+							res.data.category.forEach((item,index)=>{
-								res.data.category.forEach((item,index)=>{
+								let cateObj = {
-									let cateObj = {
+									id:item.id,//栏目ID 
-										id:item.id,//栏目ID 
+									title:item.title,//栏目名称
-										title:item.title,//栏目名称
+									active:item.active,//是否选中
-										active:item.active,//是否选中
+									model_id:item.model_id,//模型ID
-										model_id:item.model_id,//模型ID
+									model_name:item.model_name,//模型标识
-										model_name:item.model_name,//模型标识
+									sort:item.sort,
-										sort:item.sort,
 									
-									}
+								}
+								if(item.title=='日记分享') {
+									this.cateList.unshift(cateObj)
+								} else {
 									this.cateList.push(cateObj)
-								})
+								}
-								uni.setStorageSync('cateList',this.cateList)
+							})
-							}
-						} else {
-							//获取缓存中的栏目
-							this.cateList = uni.getStorageSync('cateList')
 						}
 						// 获取列表
 						if(this.page==1) {
@@ -240,12 +221,6 @@
 				this.category_id = this.cateList[index].id
 				this.checkConList(this.category_id)
  			},
-			backTop(){//回到顶部事件
-			    uni.pageScrollTo({
-			        scrollTop: 0,
-			        duration: 300
-			    });
-			},
 		}
 	}
 </script>

pagesB/messagecenter/messagecenter.vue

@@ -31,8 +31,6 @@
 		<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
 		<!-- 底部客服 -->
 		<public-customer :nbottom="100"></public-customer>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -68,6 +66,8 @@
 			}
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin();
 		},
 		onLoad(options) {

pagesB/myCollection/myCollection.vue

@@ -27,7 +27,7 @@
 						<view class="pad20">
 							<view style="width: 48.6%;float: left;">
 								<view v-if="index1%2==0" v-for="(item1,index1) in shopList" :key="index1" class="bacf radius15 mar-x20 animated fadeIn posir" @tap="goPage(item1.id,index1)">
-									<image :src="item1.imgSrc" mode="aspectFill" style="width: 100%;border-top-left-radius: 15rpx;border-top-right-radius: 15rpx;height: 325rpx;"></image>
+									<image lazy-load :src="item1.imgSrc" mode="aspectFill" style="width: 100%;border-top-left-radius: 15rpx;border-top-right-radius: 15rpx;height: 325rpx;"></image>
 									<view class="posia list-like-box" @tap.stop="chooseLike(index1)">
 										<image class="animated" src="/static/public/like.png" mode="aspectFill"></image>
 									</view>
@@ -59,7 +59,7 @@
 										<view v-if="item1.isPing" class="disjbac mar-s20">
 											<view class="fon24 col80">已拼团{{item1.activity_group_num}}组</view>
 											<view class="disac">
-												<image v-for="(itemm,indexm) in item1.activity_group_cover" :key="indexm" :src="itemm" mode="" style="width: 40rpx;height: 40rpx;border-radius: 100%;margin-left: -20rpx;"></image>
+												<image lazy-load v-for="(itemm,indexm) in item1.activity_group_cover" :key="indexm" :src="itemm" mode="" style="width: 40rpx;height: 40rpx;border-radius: 100%;margin-left: -20rpx;"></image>
 											</view>
 										</view>
 										<view v-if="item1.isXian || item1.isPing || item1.isTuan" class="fon24 col80 mar-s20">结束时间：{{item1.activity_end_at}}</view>
@@ -68,7 +68,7 @@
 							</view>
 							<view style="width: 48.6%;float: right;">
 								<view v-if="index1%2!=0" v-for="(item1,index1) in shopList" :key="index1" class="bacf radius15 mar-x20 animated fadeIn posir" @tap="goPage(item1.id,index1)">
-									<image :src="item1.imgSrc" mode="aspectFill" style="width: 100%;border-top-left-radius: 15rpx;border-top-right-radius: 15rpx;height: 325rpx;"></image>
+									<image lazy-load :src="item1.imgSrc" mode="aspectFill" style="width: 100%;border-top-left-radius: 15rpx;border-top-right-radius: 15rpx;height: 325rpx;"></image>
 									<view class="posia list-like-box" @tap.stop="chooseLike(index1)">
 										<image class="animated" src="/static/public/like.png" mode="aspectFill"></image>
 									</view>
@@ -100,7 +100,7 @@
 										<view v-if="item1.isPing" class="disjbac mar-s20">
 											<view class="fon24 col80">已拼团{{item1.activity_group_num}}组</view>
 											<view class="disac">
-												<image v-for="(itemm,indexm) in item1.activity_group_cover" :key="indexm" :src="itemm" mode="" style="width: 40rpx;height: 40rpx;border-radius: 100%;margin-left: -20rpx;"></image>
+												<image lazy-load v-for="(itemm,indexm) in item1.activity_group_cover" :key="indexm" :src="itemm" mode="" style="width: 40rpx;height: 40rpx;border-radius: 100%;margin-left: -20rpx;"></image>
 											</view>
 										</view>
 										<view v-if="item1.isXian" class="fon24 col80 mar-s20">结束时间：{{item1.activity_end_at}}</view>
@@ -122,8 +122,6 @@
 		<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
 		<!-- 底部客服 -->
 		<public-customer :nbottom="100"></public-customer>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -179,6 +177,8 @@
 			clearInterval(this.collectionTime);
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin()
 			if(uni.getStorageSync('phone_active')!=0){
 				this.checkConList(this.category_id);

pagesB/mysharer/mysharer.vue

@@ -39,8 +39,6 @@
 		<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
 		<!-- 底部客服 -->
 		<public-customer :nbottom="100"></public-customer>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -80,6 +78,8 @@
 			}
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin()
 		},
 		onLoad(options) {

pagesB/orderDetail/orderDetail.vue

@@ -8,13 +8,13 @@
 				<view class="bacf radius20 mar-s20 fon28" style="padding: 27rpx 20rpx;">
 					<view class="disjbac">
 						<view class="bold">{{['商城订单','积分商城订单'][orderInfo.is_score]}}</view>
-						<view v-if="orderInfo.status=='waiting'" class="colf8 bold">待付款</view>
+						<view v-if="orderInfo.status=='waiting'" class="colf8 bold">{{orderInfo.status_text}}</view>
-						<view v-if="orderInfo.status=='paid' && orderInfo.has_virtual!=1" class="colf8 bold">待发货</view>
+						<view v-if="orderInfo.status=='paid' && orderInfo.has_virtual!=1" class="colf8 bold">{{orderInfo.status_text}}</view>
-						<view v-if="orderInfo.status=='shipped' && orderInfo.has_virtual!=1" class="colf8 bold">待收货</view>
+						<view v-if="orderInfo.status=='shipped' && orderInfo.has_virtual!=1" class="colf8 bold">{{orderInfo.status_text}}</view>
-						<view v-if="orderInfo.status=='completed'" class="col9 bold">已完成</view>
+						<view v-if="orderInfo.status=='completed'" class="col9 bold">{{orderInfo.status_text}}</view>
-						<view v-if="orderInfo.virtual_check==0 && orderInfo.has_virtual==1" class="colf8 bold">待核验</view>
+						<view v-if="orderInfo.virtual_check==0 && orderInfo.has_virtual==1" class="colf8 bold">{{orderInfo.status_text}}</view>
-						<view v-if="orderInfo.virtual_check==1 && orderInfo.has_virtual==1" class="col9 bold">已核验</view>
+						<view v-if="orderInfo.virtual_check==1 && orderInfo.has_virtual==1" class="col9 bold">{{orderInfo.status_text}}</view>
-						<view v-if="orderInfo.status=='closed'" class="col9 bold">订单已取消</view>
+						<view v-if="orderInfo.status=='closed'" class="col9 bold">{{orderInfo.status_text}}</view>
 					</view>
 					<view class="bold col3 mar-s40 mar-x20">订单号：{{orderInfo.coding}}</view>
 					<view class="fon24 col9" v-if="orderInfo.is_only==0 && orderInfo.open_one==1 && orderInfo.is_group_make==1 && orderInfo.open_one_success==0 ">{{daoTime}}</view>
@@ -109,8 +109,6 @@
 				</view>
 			</block>
 		</view>
-		<!-- 用户信息授权，手机号授权 -->
-		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
 	</view>
 </template>
 
@@ -146,20 +144,12 @@
 				timerDao:null,
 			}
 		},
-		onShareAppMessage(res) {
-		    var ya = this;
-			// 调用tools.js中的种植埋点事件
-			this.$toolAll.tools.plantPoint(6);
-			var shareObj = {
-		　　　　	title: '成都恒美毛发', // 默认是小程序的名称(可以写slogan等)
-		　　　　	path: `/pagesB/orderDetail/orderDetail?invite_code=${uni.getStorageSync('invite_code')}` // 默认是当前页面，必须是以‘/’开头的完整路径
-		　	};
-		　　return shareObj;
-		},
 		onUnload() {
 			this.closeEv();
 		},
 		onShow() {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.$toolAll.tools.isLogin();
 		},
 		onLoad(options) {

pagesB/personalPoster/personalPoster.vue

@@ -8,7 +8,7 @@
 			<view class="tc mar-s20 col6 fon28">请选择海报背景后分享</view>
 			<view v-if="imgList.length!=0">
 				<view class="mar-s20 disjbac fw">
-					<image @tap="chooseImg(index)" v-for="(item,index) in imgList" :key="index" class="width100 radius20 mar-x20" :src="item" style="width: 48.5%;max-height: 474rpx" mode="aspectFill" lazy-load></image>
+					<image lazy-load @tap="chooseImg(index)" v-for="(item,index) in imgList" :key="index" class="width100 radius20 mar-x20" :src="item" style="width: 48.5%;max-height: 474rpx" mode="aspectFill" lazy-load></image>
 				</view>
 			</view>
 			<view v-else class="disjcac fc" style="margin-top: 50%;">
@@ -17,7 +17,7 @@
 			</view>
 			<!-- 预览弹框 -->
 			<view v-if="showBtn" @tap.stop="showBtn=false" class="posAll disjcac fc pad-zy50" style="z-index: 11;">
-				<image :src="imgSrc" @tap.stop="showBtn=true" class="radius20" style="width: 80%;" mode="widthFix"></image>
+				<image lazy-load :src="imgSrc" @tap.stop="showBtn=true" class="radius20" style="width: 80%;" mode="widthFix"></image>
 				<!-- 分享按钮 -->
 				<view @tap.stop="shareEv" class="disjcac radius20 posixzy" style="height: 90rpx;margin: 20rpx 80rpx;background-color: #38CE51;line-height: 90rpx;bottom: 40rpx;">
 					<view class="disac">

pagesB/problemDetail/problemDetail.vue

@@ -29,7 +29,7 @@
 						<view class="disjbac">
 							<view class="disac">
 								<!-- 发布者头像 -->
-								<image class="flexs" :src="fabImg || '/static/public/logo.png'"
+								<image lazy-load class="flexs" :src="fabImg || '/static/public/logo.png'"
 									style="width: 60rpx;height: 60rpx;border-radius: 100%;" mode="aspectFill"></image>
 								<view class="mar-z10">
 									<!-- 发布者昵称 -->
@@ -72,7 +72,7 @@
 						<!-- 相关推荐列表 -->
 						<list-pu @chooseLike="chooseLikex" @praise="praisexgEv" @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: #fff;background-color: #3875f6;padding: 20rpx;" @tap="gopage(cateCurrent)">更多{{contentVal}}>></view>
 					<view class="pad-zy20">
 						<view class="fon30 bold tc mar-sx40" :style="{color:publicColor}">推荐医生</view>
 						<!-- 推荐医生列表 -->
@@ -217,6 +217,12 @@
 			}
 		},
 		methods: {
+			// 去更多列表页
+			gopage(index){
+				uni.navigateTo({
+					url:`/pagesB/problemList/problemList?title=${this.cateList[index].title}&category_id=${this.cateList[index].id}`
+				})
+			},
 			chooseLike(e) { //收藏事件
 				// console.log(this.dataList[e].is_collected);
 				if (this.allList[e].is_collected == 0) {

pagesB/problemList/problemList.vue

@@ -0,0 +1,184 @@
+<template>
+	<view>
+		<!-- 状态栏 -->
+		<status-nav :titleVal="titleStr" :statusTitle="true"></status-nav>
+		<!-- 输入框 -->
+		<view class="search-input-box bacf" :style="{paddingTop: statusHNH+'px'}">
+			<view class="disac pad-zy30 mar-s20">
+				<!-- 输入框 -->
+				<input @confirm="searchEv" class="width100 fon34 radius10 problem-input" type="text" v-model="searchVal" placeholder="请输入内容..."/>
+				<!-- 搜索 -->
+				<view @tap="searchEv" class="flexs mar-z30 radius10 pad-zy40 fon34 colf" style="height: 80rpx;line-height: 80rpx;" :style="{background:publicColor}">搜索</view>
+			</view>
+		</view>
+		<view class="pad-zy20 mar-s20">
+			<!-- 列表 -->
+			<view v-if="dataList.length!=0">
+				<list-pu @chooseLike="chooseLike" @praise="praiseEv" @comfirmev="comfirmevl" :list="dataList"></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>
+		<!-- 弹框 -->
+		<pu-po :isShowT="isShowT" @comfirmev="comfirmev" @cancleev="cancleev"></pu-po>
+		<!-- 返回顶部 -->
+		<!-- <back-top :showTop="showTop" @backTop="backTop"></back-top> -->
+		<!-- 用户信息授权，手机号授权 -->
+		<auth-userInfo-mobileInfo></auth-userInfo-mobileInfo>
+	</view>
+</template>
+
+<script>
+	import cateTu from '@/components/cate-items/cate-tu.vue';
+	import {collectionEV,cancleCollectionEV} from '@/jsFile/publicAPI.js';
+	export default {
+		components:{
+			cateTu
+		},
+		data() {
+			return {
+				titleStr:'',//标题
+				statusHNH:uni.getStorageSync('electric_nav_height'),
+				searchVal:'',//输入框的值
+				publicColor:uni.getStorageSync('publicColor'),//主题颜色
+				isShowT:false,//是否显示弹框
+				cateList:[//所以二级分类
+					
+				],
+				dataList:[//小课堂数据列表
+					
+				],
+				showTop:false,//是否显示返回顶部
+				newCurrent:0,
+				page:1,
+				size:10,
+				total:'',//总数
+				isZanw:true,
+				category_id:'',//栏目ID
+			}
+		},
+		onReachBottom() {//触底事件
+			if(this.total!=this.dataList.length){
+				this.page++
+				this.searchEv()//调用自主预约列表事件
+			} else {
+				if(this.isZanw) this.$toolAll.tools.showToast('暂无更多列表','none',1000)
+				this.isZanw = false
+			}
+		},
+		onShareAppMessage() {
+			return {
+				title:this.titleStr,
+				path:`/pagesB/problemList/problemList?category_id=${this.category_id}&title=${this.titleStr}`
+			}
+		},
+		onLoad(options) {
+			this.category_id = options.category_id;//病种id
+			this.titleStr = options.title;//标题
+			if(uni.getStorageSync('phone_active')!=0){
+				this.searchEv()
+			}
+		},
+		onShow() {
+			this.$toolAll.tools.isLogin()
+		},
+		methods: {
+			chooseLike(e){//收藏事件
+				if(this.dataList[e].is_collected==0){
+					this.dataList[e].is_collected = 1
+					// 调用收藏事件
+					collectionEV({action:'collect',archive_id:this.dataList[e].id})
+				}
+			},
+			praiseEv(e){ // 点赞事件
+				if(this.dataList[e].is_liked==0){
+					this.dataList[e].is_liked = 1;
+					this.dataList[e].likes++;
+					if(this.dataList[e].likes>1000) this.dataList[e].likes = '999+'
+					// 调用收藏事件
+					collectionEV({action:'like',archive_id:this.dataList[e].id})
+				}
+			},
+			comfirmevl(e){//确认取消收藏事件
+				this.dataList[e].is_collected = 0
+				this.$toolAll.tools.showToast('正在取消...','loading')
+				// 调用取消收藏事件
+				cancleCollectionEV({action:'collect',archive_id:this.dataList[e].id})	
+			},
+			searchEv(){//搜索事件
+				this.$toolAll.tools.showToast('搜索中...')
+				this.$requst.post('archives/category',{page:this.page,size:this.size,category_id:this.category_id,keyword:this.searchVal}).then(res=>{
+					// console.log('搜索提交：',res);
+					if(res.code==0){
+						uni.hideToast()
+						if(uni.getStorageSync('cateList')==''){//首次渲染栏目
+							if(res.data.category.length!=0){
+								res.data.category.forEach((item,index)=>{
+									let cateObj = {
+										id:item.id,//栏目ID 
+										title:item.title,//栏目名称
+										active:item.active,//是否选中
+										model_id:item.model_id,//模型ID
+										model_name:item.model_name,//模型标识
+										sort:item.sort
+									}
+									this.cateList.push(cateObj)
+								})
+								uni.setStorageSync('cateList',this.cateList)
+							}
+						} else {
+							//获取缓存中的栏目
+							this.cateList = uni.getStorageSync('cateList')
+						}
+						// 获取列表
+						if(this.page==1) this.dataList = []
+						this.total = res.data.list.total
+						if(res.data.list.list.length!=0){
+							res.data.list.list.forEach(item=>{
+								let fabImg = '';
+								if(item.published_headimgurl!='' && item.published_headimgurl!=null) fabImg = this.$http + item.published_headimgurl;
+								let tObj = {
+									category_id:item.category_id,//栏目ID
+									id:item.id,
+									is_collected:item.is_collected,//是否已收藏
+									collects:item.collects,//收藏量
+									views:item.views,//查看量
+									main_img:this.$http + item.cover,//封面图
+									video:this.$http + item.video,//视频地址
+									title:item.title,//标题
+									content:item.subtitle,//副标题
+									head_img: fabImg || '/static/public/logo.png',//发布者头像
+									name:item.published_by || '恒美植发',//发布者昵称
+									isVideo:item.video.includes(".mp4"),//是否是视频
+									likes:item.likes,//点赞数量
+									is_liked:item.is_liked//是否已点赞
+								}
+								this.dataList.push(tObj);
+							})
+						}
+						let obj = {
+							content:this.searchVal
+						}
+					}
+				})
+			},
+			cancleev(){//取消事件
+				this.isShowT = false
+			},
+			chooseTwo(index){//二级分类选择
+				// console.log('二级分类：',index);
+				this.isZanw = true
+				this.page = 1
+				this.newCurrent = index
+				this.category_id = this.cateList[index].id
+				this.searchEv()
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>

pagesB/searchPage/searchPage.vue

@@ -136,7 +136,8 @@
 			chooseLike(e){//收藏事件
 				// console.log(this.dataList[e].is_collected);
 				if(this.dataList[e].is_collected==0){
-					this.dataList[e].is_collected = 1
+					this.dataList[e].is_collected = 1;
+					this.dataList[e].collects++;
 					// 调用收藏事件
 					collectionEV({action:'collect',archive_id:this.dataList[e].id})
 				}
@@ -153,7 +154,8 @@
 			},
 			comfirmevl(e){//确认取消收藏事件
 				this.dataList[e].is_collected = 0
-				this.$toolAll.tools.showToast('正在取消...','loading')
+				this.$toolAll.tools.showToast('正在取消...','loading');
+				this.dataList[e].collects--;
 				// 调用取消收藏事件
 				cancleCollectionEV({action:'collect',archive_id:this.dataList[e].id})	
 			},

pagesB/shopDetail/shopDetail.vue

@@ -64,8 +64,8 @@
 							</view>
 						</view>
 						<view class="pad-x30 pad-s10 borbot" v-if="isNei==0 || isNei==1 ||isNei==2">
-							<view class="fon36 colf bold pbackc tc pad-sx20 radius45" v-if="daoTime!='活动已结束'">倒计时：{{daoTime}}</view>
+							<view class="fon36 colf bold pbackc tc pad-sx20 radius45" v-if="daoTime!='活动已结束' && detailObj.is_close==0">倒计时：{{daoTime}}</view>
-							<view class="fon36 colf bold pbackc tc pad-sx20 radius45" v-else>{{daoTime}}</view>
+							<view class="fon36 colf bold pbackc tc pad-sx20 radius45" v-else>{{[daoTime,'活动已结束'][detailObj.is_close]}}</view>
 						</view>
 						<!-- 规格 -->
 						<view class="dis tc mar-s20 fon28">
@@ -177,8 +177,8 @@
 					<image @tap="backHome" class="posia backH" src="/static/public/back-home-02.png" mode="aspectFit"></image>
 				</view>
 				<view class="disac fon26 colf">
-					<view @tap="showTK = true" class="disjcac lianShare addCart-btn"><span v-if="isNei!=1">加入购物车</span><span v-else>单独购买</span></view>
+					<view @tap="tuneUp" class="disjcac lianShare addCart-btn"><span v-if="isNei!=1">加入购物车</span><span v-else>单独购买</span></view>
-					<view @tap="showTK = true" class="disjcac lianShare mai-btn"><span v-if="isNei!=1">立即购买</span><span v-else>发起拼团</span></view>
+					<view @tap="tuneUp" class="disjcac lianShare mai-btn"><span v-if="isNei!=1">立即购买</span><span v-else>发起拼团</span></view>
 				</view>
 			</view>
 			<!-- 购物车 -->
@@ -404,6 +404,14 @@
 			}
 		},
 		methods: {
+			// 调起弹框
+			tuneUp(){
+				if(this.detailObj.is_close==0){
+					this.showTK = true;
+				} else {
+					this.$toolAll.tools.showToast('该商品活动已结束')
+				}
+			},
 			// 数量输入事件
 			inputNum(e){
 				clearTimeout(this.timeout);
@@ -589,7 +597,8 @@
 			chooseLike(e) { //收藏事件
 				// console.log(this.dataList[e].is_collected);
 				if (this.allList[e].is_collected == 0) {
-					this.allList[e].is_collected = 1
+					this.allList[e].is_collected = 1;
+					this.dataList[e].collects++;
 					// 调用收藏事件
 					collectionEV({
 						action: 'collect',
@@ -599,7 +608,8 @@
 			},
 			comfirmev(e) { //确认取消收藏事件
 				this.allList[e].is_collected = 0;
-				this.$toolAll.tools.showToast('正在取消...', 'loading')
+				this.$toolAll.tools.showToast('正在取消...', 'loading');
+				this.dataList[e].collects--;
 				// 调用取消收藏事件
 				cancleCollectionEV({
 					action: 'collect',

pagesB/video/playVideo.nvue

@@ -34,6 +34,8 @@
 			this.videoContext = uni.createVideoContext('myVideo', this)
 		},
 		onLoad(options) {
+			// 禁用小程序分享
+			this.$toolAll.tools.disableShareEv();
 			this.videoSrc = options.src
 			this.posterSrc = options.posterSrc
 		},