修改默认取件方式

commons/hengmei.css

@@ -19,6 +19,7 @@
 .reitem{width: 146rpx;height: 65rpx;border-radius: 20rpx;line-height: 65rpx;text-align: center;}
 .list-box{width: 48.4%;}
 .list-like-box{top: 18rpx;right: 18rpx;z-index: 1;}
+.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;}
@@ -107,7 +108,7 @@
 .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: 345rpx;height: 285rpx;border-top-left-radius: 10rpx;border-top-right-radius: 10rpx;}
+.doctorImg{width: 100%;height: 285rpx;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/cate-items/cate-pu.vue

@@ -9,7 +9,7 @@
 						borderRadius:newRadius+'px',
 						minWidth:isMinW ? newMinWidth+'px':'',
 						color : newCurrent==index ? activec:newcmo}" 
-					class="flexs cateitem" :class="(!isCenter && newcateList.length<=4)?'maright0':''"
+					class="flexs cateitem" :class="(!isCenter && newcateList.length<=3)?'maright0':''"
 					v-for="(item,index) in newcateList" :key="index">{{item.title}}</view>
 			</view>
 		</scroll-view>

components/list-doctor.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="disjb fw">
-		<view @tap="chooseDoctor(index)" class="radius10 dis fc bacf mar-x20" v-for="(item,index) in list" :key="index">
+		<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>
 			<view class="col3 mar-s10 mar-x20 mar-z10">
 				<view class="fon28 bold doctoritem disac">{{item.name}}</view>

components/list-pu.vue

@@ -16,17 +16,21 @@
 						<!-- 视频标题 -->
 						<view class="fon30 bold mar-x10 disac" :style="{fontSize:nFon+'px'}">
 							<view class="clips1">{{item.title}}</view>
-						<text v-if="item.isVideo && isVedio" :style="{fontSize:(nFon-2)+'px',marginLeft:nmarz+'px'}" style="border-radius: 5rpx;padding: 0 6rpx;text-align: center;" class="pbackc flexs">视频</text></view>
+							<!-- <text v-if="item.isVideo && isVedio" :style="{fontSize:(nFon-2)+'px',marginLeft:nmarz+'px'}" style="border-radius: 5rpx;padding: 0 6rpx;text-align: center;" class="pbackc flexs">视频</text> -->
+						</view>
 						<!-- 视频描述 -->
 						<view class="mar-x10 clips1 opc">{{item.content}}</view>
+						<view class="disjbac">
 							<view class="disac">
 								<!-- 发布者头像 -->
 								<image class="list-headimg" :src="item.head_img" mode="aspectFill"></image>
 								<!-- 发布者昵称 -->
 								<view class="clips1 opc">{{item.name}}</view>
 							</view>
+							<text v-if="item.isVideo && isVedio" :style="{fontSize:(nFon-2)+'px',marginLeft:nmarz+'px'}" style="border-radius: 5rpx;padding: 0 6rpx;text-align: center;" class="pbackc flexs">视频</text>
 						</view>
-					<image v-if="item.isVideo && isVedio" :style="{width:nWidth+'rpx',height:nHeight+'rpx'}" class="posia" style="top: 50%;left: 50%;transform: translate(-50%,-50%);" src="/static/public/video.png" mode=""></image>
+					</view>
+					<!-- <image v-if="item.isVideo && isVedio" :style="{width:nWidth+'rpx',height:nHeight+'rpx'}" class="posia" style="top: 50%;left: 50%;transform: translate(-50%,-50%);" src="/static/public/video.png" mode=""></image> -->
 				</view>
 			</view>
 			<!-- 右侧列表 -->
@@ -44,18 +48,21 @@
 						<!-- 视频标题 -->
 						<view class="fon30 bold mar-x10 disac" :style="{fontSize:nFon+'px'}">
 							<view class="clips1">{{item.title}}</view>
-							<text v-if="item.isVideo && isVedio" :style="{fontSize:(nFon-2)+'px',marginLeft:nmarz+'px'}" style="border-radius: 5rpx;padding: 0 6rpx;text-align: center;" class="pbackc flexs">视频</text>
+							<!-- <text v-if="item.isVideo && isVedio" :style="{fontSize:(nFon-2)+'px',marginLeft:nmarz+'px'}" style="border-radius: 5rpx;padding: 0 6rpx;text-align: center;" class="pbackc flexs">视频</text> -->
 						</view>
 						<!-- 视频描述 -->
 						<view class="mar-x10 clips1 opc">{{item.content}}</view>
+						<view class="disjbac">
 							<view class="disac">
 								<!-- 发布者头像 -->
 								<image class="list-headimg" :src="item.head_img" mode="aspectFill"></image>
 								<!-- 发布者昵称 -->
 								<view class="clips1 opc">{{item.name}}</view>
 							</view>
+							<text v-if="item.isVideo && isVedio" :style="{fontSize:(nFon-2)+'px',marginLeft:nmarz+'px'}" style="border-radius: 5rpx;padding: 0 6rpx;text-align: center;" class="pbackc flexs">视频</text>
 						</view>
-					<image v-if="item.isVideo && isVedio" :style="{width:nWidth+'rpx',height:nHeight+'rpx'}" class="posia" style="top: 50%;left: 50%;transform: translate(-50%,-50%);" src="/static/public/video.png" mode=""></image>
+					</view>
+					<!-- <image v-if="item.isVideo && isVedio" :style="{width:nWidth+'rpx',height:nHeight+'rpx'}" class="posia" style="top: 50%;left: 50%;transform: translate(-50%,-50%);" src="/static/public/video.png" mode=""></image> -->
 				</view>
 			</view>
 		</view>

components/swiper-pu.vue

@@ -116,6 +116,6 @@
 	.banner-box{position: relative;}
 	.img{width:100%;}
 	.dot-box{position: absolute;bottom: 36rpx;display: flex;justify-content: center;width: 100%;}
-	.dotActive{width: 22rpx;height: 12rpx;margin-right: 10rpx;border-radius: 20rpx; background-color: rgba(56, 117, 246, 1);}
+	.dotActive{width: 22rpx;height: 12rpx;margin-right: 10rpx;border-radius: 20rpx; background-color: rgba(56, 117, 246, .5);}
-	.dotMo{width: 12rpx;height: 12rpx;margin-right: 10rpx;border-radius: 100%;background-color: rgba(191, 191, 191, 1);}
+	.dotMo{width: 12rpx;height: 12rpx;margin-right: 10rpx;border-radius: 100%;background-color: rgba(191, 191, 191, 0.5);}
 </style>

jsFile/tools.js

@@ -291,6 +291,7 @@ const tools = {
 						language:obj.language
 					}
 					uni.request({
+						// url: `https://hengmei.scdxtc.cn/api/user/login`,
 						url: `https://hm.hmzfyy.cn/api/user/login`,
 						method: 'post',
 						data: params,
@@ -383,6 +384,7 @@ const tools = {
 	},
 	isVedio(){//是否显示视频内容
 		uni.request({
+			// url: `https://hengmei.scdxtc.cn/api/index/base-config`,
 			url: `https://hm.hmzfyy.cn/api/index/base-config`,
 			method: 'get',
 			header: {

pages/tabbar/cate/cate.vue

@@ -412,6 +412,7 @@
 					is_hot:1
 				}
 				uni.request({
+					// url:`https://hengmei.scdxtc.cn/api/spu/list`,
 					url:`https://hm.hmzfyy.cn/api/spu/list`,
 					data:params,
 					method:'post',

pages/tabbar/my/staffDuan.vue

@@ -107,7 +107,7 @@
 						<view class="disac fc posir">
 							<image :src="itemf.src" class="icon-img" mode="aspectFill"></image>
 							<view class="mar-s20 mar-x10">{{itemf.title}}</view>
-							<view v-if="indexf==4 && itemf.num!=0" class="posia red-num">{{itemf.num}}</view>
+							<view v-if="itemf.title=='消息通知' && itemf.num!=0" class="posia red-num">{{itemf.num}}</view>
 						</view>
 					</view>
 				</view>
@@ -192,7 +192,7 @@
 					{src:'/static/public/quan60.png',title:'优惠券'},
 					{src:'/static/public/kong60.png',title:'孔雀币'},
 					{src:'/static/public/scor60.png',title:'积分管理'},
-					{src:'/static/public/signIn.png',title:'签到记录'},
+					{src:'/static/public/signIn.png',title:'积分签到'},
 				],
 				toolsList:[
 					{src:'/static/public/staff-yue60.png',title:'自助预约',num:''},
@@ -201,8 +201,8 @@
 					{src:'/static/public/staff-share.png',title:'分享中心',num:''},
 					{src:'/static/public/staff-msg60.png',title:'消息通知',num:''},
 					{src:'/static/public/diary.png',title:'我的日记',num:''},
-					{src:'/static/public/staff-tou60.png',title:'投诉与建议',num:''},
 					{src:'/static/public/staff-about60.png',title:'关于我们',num:''},
+					{src:'/static/public/staff-tou60.png',title:'投诉与建议',num:''},
 				],
 				isQrcode:false,//是否显示我的二维码
 				userInfo:{},//用户信息
@@ -415,20 +415,16 @@
 				if(index==7){uni.navigateTo({url:'/pagesA/signIn/signIn'})}
 			},
 			goPageTwo(index){//自助预约、个人海报、收藏、分享中心、消息通知、我的日记、投诉与建议、关于我们、专属客服
-				if(index!=8){
 				let newUrl = ''
-					if(index==0) newUrl = '/pagesA/makeAnPppointment/makeAnPppointment'
+				if(this.toolsList[index].title=='自助预约') newUrl = '/pagesA/makeAnPppointment/makeAnPppointment'
-					if(index==1) newUrl = '/pagesB/personalPoster/personalPoster'
+				if(this.toolsList[index].title=='个人海报') newUrl = '/pagesB/personalPoster/personalPoster'
-					if(index==2) newUrl = '/pagesB/myCollection/myCollection'
+				if(this.toolsList[index].title=='收藏') newUrl = '/pagesB/myCollection/myCollection'
-					if(index==3) newUrl = '/pagesB/sharingCenter/sharingCenter'
+				if(this.toolsList[index].title=='分享中心') newUrl = '/pagesB/sharingCenter/sharingCenter'
-					if(index==4) newUrl = '/pagesB/messagecenter/messagecenter?comeNum=0'
+				if(this.toolsList[index].title=='消息通知') newUrl = '/pagesB/messagecenter/messagecenter?comeNum=0'
-					if(index==5) newUrl = '/pagesA/my-diary/my-diary'
+				if(this.toolsList[index].title=='我的日记') newUrl = '/pagesA/my-diary/my-diary'
-					if(index==6) newUrl = '/pagesA/suggestions/suggestions'
+				if(this.toolsList[index].title=='关于我们') newUrl = '/pagesB/aboutUs/aboutUs'
-					if(index==7) newUrl = '/pagesB/aboutUs/aboutUs'
+				if(this.toolsList[index].title=='投诉与建议') newUrl = '/pagesA/suggestions/suggestions'
-					uni.navigateTo({
+				if(this.toolsList[index].title=='专属客服'){
-						url:newUrl
-					})
-				} else {
 					this.$requst.post('user/my-service').then(res=>{
 						if(res.code==0){
 							this.customerInfo = res.data;
@@ -438,6 +434,10 @@
 							this.zCustomer = true;
 						}
 					})
+				} else {
+					uni.navigateTo({
+						url:newUrl
+					})
 				}
 			},
 			closeCustomer(){
@@ -511,6 +511,7 @@
 						this.tongList[2].num = res.data.continuity_sign;//个人连续签到
 						this.tongList[3].num = res.data.share_users.total;//分享人总数
 						this.toolsList[4].num = res.data.unread_messages;//消息总数
+						this.toolsList[5].num = res.data.unread_messages;//消息总数
 						this.myOrderList[0].num = res.data.order_count.waiting;//待支付总数
 						this.myOrderList[1].num = res.data.order_count.paid;//待发货总数
 						this.myOrderList[2].num = res.data.order_count.shipped;//待收货总数
@@ -519,7 +520,7 @@
 						this.is_servicer = res.data.is_servicer;//是否为客服，0否，1是
 						this.is_staff = res.data.is_staff;//是否为普通员工，0否，1是
 						if(res.data.customer_service!=0 && this.toolsList.length==8){
-							this.toolsList.push({src:'/static/public/customer-check.png',title:'专属客服',num:''})
+							this.toolsList.unshift({src:'/static/public/customer-check.png',title:'专属客服',num:''})
 						}
 						uni.setStorageSync('shareAll',res.data)
 						if(res.data.rules.length!=0){

pages/tabbar/pagehome/pagehome.vue

@@ -56,7 +56,7 @@
 				</view>
 				<!-- 恒美小课堂 -->
 				<view v-if="isLoading" class="mar-zy30 mar-s40">
-					<view class="col2c fon36 bold">恒美小课堂</view>
+					<!-- <view class="col2c fon36 bold">恒美小课堂</view> -->
 					<!-- 自定义二级分类 -->
 					<view class="mar-s50 mar-x30">
 						<cate-pu :activeb="publicColor" :newcateList="ktList" :isMinW="true" :newCurrent="newCurrent*1" @choosecateEv="choosecateEv" :newbmo="'#E0E0E0'"></cate-pu>

pages/tabbar/shop/shop.vue

@@ -311,6 +311,7 @@
 					disease_id:this.disease_id//病种ID
 				}
 				uni.request({
+					// url:`https://hengmei.scdxtc.cn/api/spu/list`,
 					url:`https://hm.hmzfyy.cn/api/spu/list`,
 					data:params,
 					method:'post',

pagesA/getReadyDan/getReadyDan.vue

@@ -6,8 +6,8 @@
 			<view class="bacf radius20 mar-s20 disjbac pad-sx27-zy20">
 				<view class="bold">配送方式</view>
 				<view class="fon26 col3 disac">
-					<view @tap="expressEv(0)" :class="isExpress?'activeT':'expressT'" :style="{background:isExpress?publicColor:''}">快递</view>
 					<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>
 			</view>
 			<!-- 地址信息 -->
@@ -94,7 +94,7 @@
 			</view>
 			<view class="disjbac posixzy bacf pad-zy32" style="height: 124rpx;line-height: 124rpx;">
 				<!-- 去支付 -->
-				<view class="fon36 colf8 bold" v-if="isNei!=3">合计：￥{{allPrice<0?0:allPrice}}<span v-if="isKq">+{{zf_kqPrice}}孔雀币</span></view>
+				<view class="fon36 colf8 bold" v-if="isNei!=3">合计：￥{{allPrice<0?0:allPrice}}<span v-if="isKq">+{{zf_kqPrice}}孔雀币</span><span v-if="isExpress && expressInfo.default_price!=0" style="font-size: 24rpx;color: #000;">+ ￥{{expressInfo.default_price}}</span></view>
 				<view class="fon40 colf8 bold dis" v-else><span class="col3 fon28">合计积分：</span>{{allPrice}}<span v-if="isExpress && expressInfo.default_price!=0">+ ￥{{expressInfo.default_price}}</span></view>
 				<view @tap="goPayment" v-if="isNei!=3" class="goPayment">去支付</view>
 				<view @tap="isDui=true" v-else class="goPayment">去兑换</view>
@@ -186,7 +186,7 @@
 			return {
 				statusHNH:uni.getStorageSync('statusHNH'),
 				publicColor:uni.getStorageSync('publicColor'),//主题颜色
-				isExpress:true,
+				isExpress:false,
 				switchQuan:true,
 				showQuan:false,//是否显示优惠券弹框
 				isDui:false,
@@ -229,6 +229,9 @@
 				isShowP:false,
 				isfen:false,
 				checkGrounpId:0,
+				expressInfo:{
+					default_price:0
+				}
 			}
 		},
 		onShareAppMessage(res) {
@@ -252,11 +255,10 @@
 			this.$toolAll.tools.isLogin();
 			this.checkChoose();//检测地址
 			uni.removeStorageSync('orderInfo');
-			setTimeout(()=>{
-				if(this.addressInfo==''){this.$toolAll.tools.showToast('请完善收件人信息','none',1500);}
-			},2000)
 		},
 		onLoad(options) {
+			// 自提手机号
+			this.zPhone = uni.getStorageSync('phone');
 			if(uni.getStorageSync('is_active')!=1){this.vision = true;}
 			if(options.invite_code!='' && options.invite_code!=undefined){
 				this.loginEv(options.invite_code);
@@ -403,7 +405,7 @@
 									this.obtainCoin(this.zanAllPrice*100);
 									this.allPrice = 0;
 								} else {//孔雀币不足以抵扣
-									this.allPrice = this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price).toFixed(2);
+									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
 									this.zf_kqPrice = this.payFS[1].num;
 								}
 								return;
@@ -411,10 +413,12 @@
 							//选择了微信支付+取消了孔雀币
 							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).toFixed(2);
+									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice)*1).toFixed(2);
 								} else {
-									this.allPrice = this.$toolAll.tools.addXiaoShu(this.zanAllPrice-this.youQuan.youPrice).toFixed(2);
+									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.youQuan.youPrice)*1).toFixed(2);
 								}
 								return;
 							}
@@ -424,9 +428,10 @@
 									this.ntype = 'coin'
 									this.obtainCoin(this.allPrice*100);
 									this.allPrice = 0;
-								} else {//孔雀币不足以抵扣应付款
+								}
+								if(this.zanAllPrice - this.coin_price>0){//孔雀币不足以抵扣应付款
 									this.$toolAll.tools.showToast('孔雀币不足')
-									this.allPrice = this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price).toFixed(2);
+									this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice - this.coin_price)*1).toFixed(2);
 									this.zf_kqPrice = this.payFS[1].num;
 								}
 								return;
@@ -434,7 +439,7 @@
 							//取消了微信支付+取消了孔雀币
 							if(!this.payFS[0].isActive && !this.payFS[1].isActive){
 								this.isKq = false;
-								this.allPrice = this.$toolAll.tools.addXiaoShu(this.zanAllPrice).toFixed(2);
+								this.allPrice = (this.$toolAll.tools.addXiaoShu(this.zanAllPrice)*1).toFixed(2);
 								return;
 							}
 						} else {
@@ -474,18 +479,17 @@
 				} else {
 					this.jsPrice = this.allPrice;
 				}
-				
 				let parmas = {
 					sku_list: nsku_list,//商品单号和数量数组
 					total: this.allPrice*100,//总金额
-					address_id: this.addressInfo.id,//地址ID
+					address_id: this.addressInfo.id || 0,//地址ID
-					express_code: this.expressInfo.code,//快递编码
+					express_code: this.expressInfo.code || 0,//快递编码
 					coupon_id: this.youQuan.id,//优惠券ID
 					coupon_price: this.youQuan.youPrice*100,//优惠券可用
 					pick_self: self,//是否自提0 快递， 1自提
 					pick_self_phone: nphone,//联系电话
 					original_total: this.zanAllPrice*100,//原价总金额
-					freight: this.expressInfo.default_price,//快递费
+					freight: this.expressInfo.default_price || 0,//快递费
 					remarks: "",//备注
 					is_only:is_only,//是否是单独购买0 不是单独购买1，2是单独购买
 					is_score:is_score,//是否是积分商品0 不是积分商品，1是积分商品
@@ -501,7 +505,7 @@
 					this.focusEv();
 				} else if(this.isNei == 3 && !this.payFS[2].isActive){//积分判断条件
 					this.$toolAll.tools.showToast('请选择积分付款方式');
-				} else if(this.isNei == 3 && this.expressInfo.default_price!=0){//积分判断条件
+				} else if(this.isNei == 3 && this.expressInfo.default_price!=0 && this.expressInfo.default_price!=undefined && !this.payFS[0].isActive){//积分判断条件
 					this.$toolAll.tools.showToast('请添加微信支付方式');
 				} else if(this.isNei != 3 && !this.payFS[0].isActive && !this.payFS[1].isActive){
 					this.$toolAll.tools.showToast('请选择支付方式')
@@ -516,6 +520,7 @@
 							this.$toolAll.tools.showToast('正在调起支付','loading',1500);
 						}
 						uni.request({
+							// url:`https://hengmei.scdxtc.cn/api/order/create`,
 							url:`https://hm.hmzfyy.cn/api/order/create`,
 							data:parmas,
 							method:'post',
@@ -556,11 +561,10 @@
 								if(res.code==0){
 									this.suseeceEv(info.coding);
 								} else this.$toolAll.tools.showToast(res.msg);
-								
 							})
 						},
-						fail() {
+						fail:()=> {
-							this.times = 0;
+							this.$toolAll.tools.showToast('取消支付');
 							uni.navigateTo({
 								url:'/pagesA/myOrder/myOrder'
 							})
@@ -606,6 +610,10 @@
 							res.data.forEach(item=>{
 								if(item.is_default==1) {
 									this.addressInfo = item;
+								} else {
+									if(res.data.length==1){
+										this.addressInfo = item;
+									}
 								}
 							})
 							this.userPphone = this.$toolAll.tools.hideMPhone(this.addressInfo.phone);
@@ -635,22 +643,24 @@
 			expressEv(index){//快递自取切换事件
 				if(index==0) {
 					this.isExpress = true;
-					// this.checkexpress();
+					this.checkexpress();
+					if(this.addressInfo==''){this.$toolAll.tools.showToast('请完善收件人信息','none',1500);}
 				}
 				if(index==1) {
 					this.isExpress = false;
+					this.expressInfo.default_price = 0;
 				}
 			},
 			totalEv(){//合计运算
-				if(this.isNei!=3 && this.isExpress){//普通商品，有运费
+				if(this.isNei!=3 && this.isExpress && !this.payFS[1].isActive){//普通商品，有运费
-					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice + this.expressInfo.default_price;//合计 = 总价 - 优惠券 - 立减券 + 快递费
+					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice;//合计 = 总价 - 优惠券 - 立减券 + 快递费
 				}
 				if(this.isNei!=3 && !this.isExpress){//普通商品无运费
 					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice;//合计 = 总价 - 优惠券 - 立减券
 				}
-				this.allPrice = this.$toolAll.tools.addXiaoShu(this.allPrice);
+				this.allPrice = parseInt(this.$toolAll.tools.addXiaoShu(this.allPrice));
 				if(this.isNei ==3 && this.isExpress){//积分商品，有运费
-					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice + this.expressInfo.default_price;//合计 = 总价 - 优惠券 - 立减券 + 快递费
+					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice;//合计 = 总价 - 优惠券 - 立减券 + 快递费
 				}
 				if(this.isNei ==3 && !this.isExpress){//积分商品，有运费
 					this.allPrice = this.zanAllPrice - this.youQuan.youPrice - this.delPrice;//合计 = 总价 - 优惠券 - 立减券
@@ -679,6 +689,7 @@
 				})
 			},
 			checkeList(isJfen){
+				this.allPrice = this.allPrice*1;
 				this.orderList.forEach(item=>{
 					this.allPrice += item.price*item.num;
 					this.allNum += item.num;
@@ -689,6 +700,7 @@
 					this.zanAllPrice = this.$toolAll.tools.addXiaoShu(this.allPrice);
 				}
 				this.quanEv(0);//查询优惠券列表
+				this.totalEv();
 			},
 			quanEv(index){//调起优惠券弹框事件
 				if(this.payFS[1].isActive){

pagesA/peacockCoin/peacockCoin.vue

@@ -45,7 +45,8 @@
 			<view v-if="isTiX" @tap="isTiX=false" class="disjcac tc tx-tk-box">
 				<view class="bacf width100 radius20 pad30 mar-zy85" @tap.stop="isTiX=true">
 					<view class="fon28 bold col34">孔雀币提现</view>
-					<view class="fon28 mar-sx30 col34 font5">兑换比例{{kqbl}}孔雀币兑换{{whatPrice}}元人民币</view>
+					<view class="fon28 mar-s30 col34 font5">兑换比例{{kqbl}}孔雀币兑换{{whatPrice}}元人民币</view>
+					<view class="fon24 mar-s10 mar-x30 colf8 font5">最低提现金额为：{{limit_price}}元。</view>
 					<input type="number" v-model="kNum" placeholder="请输入孔雀币" class="width100 radius10"/>
 					<view class="disjbac">
 						<view @tap.stop="confrimT" class="tk-btn pbackc">立即提现</view>
@@ -89,6 +90,8 @@
 				isZanw:true,
 				vision:false,
 				isShowP:false,
+				realPrice:0,//实际的钱
+				limit_price:0//最低限制金额
 			}
 		},
 		onReachBottom() {
@@ -142,11 +145,14 @@
 					this.isShowP = true
 				} 
 			},
-			confrimT(){//确定提现事件
+			confrimT(){//确定提现事件、
+				this.realPrice = this.whatPrice / this.kqbl * this.kNum;
 				if(this.kNum=='' || this.kNum<=0){
 					this.$toolAll.tools.showToast('请输入孔雀币数量');
-				} else if(this.kNum>this.dangKQ){
+				} else if(this.kNum > this.dangKQ){
 					this.$toolAll.tools.showToast('请输入正确的孔雀币数量');
+				} else if((this.limit_price - this.realPrice) > 0 ){
+					this.$toolAll.tools.showToast(`最低提现${this.limit_price}元`);
 				} else {
 					if(this.times==0){
 						this.times++;
@@ -194,6 +200,7 @@
 						this.dangKQ = res.data.coin;//当前孔雀币
 						this.shenHZ = res.data.withdrawal_ing;//审核中的孔雀币
 						this.yiTKQ = res.data.withdrawald;//已提孔雀币
+						this.limit_price = res.data.limit_price*1;//限制金额
 						this.kqbl = res.data.withdrawal_proportion.coin;//孔雀币比例
 						this.whatPrice = res.data.withdrawal_proportion.money;//兑换后的钱
 					}

pagesA/shopCart/shopCart.vue

@@ -26,7 +26,7 @@
 								<view class="order-item-price"><span v-if="item.is_score!=1">￥</span><span v-else>积分：</span>{{item.price}}</view>
 								<view class="fon26 col3 disac bold cart-input-box">
 									<image @tap="deladdEvent(index , 0)" src="/static/public/del.png" mode=""></image>
-									<input type="text" v-model="item.num"/>
+									<input type="text" @input="inputNum($event,index)" v-model="item.num"/>
 									<image @tap="deladdEvent(index , 1)" src="/static/public/add.png" mode=""></image>
 								</view>
 							</view>
@@ -82,6 +82,7 @@
 				isScore:'',
 				vision:false,
 				isShowP:false,
+				timeout:null
 			}
 		},
 		onShow() {
@@ -108,6 +109,16 @@
 			},
 		},
 		methods: {
+			// 数量输入事件
+			inputNum(e,index){
+				clearTimeout(this.timeout);
+				let str = e.detail.value;
+				this.timeout = setTimeout(()=>{
+					if(str=='' || str==0){
+						this.cartList[index].num = 1;
+					}
+				},500)
+			},
 			loginEv(invite_code='',source='',channel=''){
 				uni.login({
 					provider: 'weixin',

pagesA/signIn/signIn.vue

@@ -25,7 +25,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="mar-s20 fon28 col3 bold mar-z50">签到记录</view>
+				<view class="mar-s20 fon28 col3 bold mar-z50">积分签到</view>
 			</view>
 			<!-- 获取列表，提现列表 -->
 			<view class="pad-zy30">
@@ -39,7 +39,7 @@
 							<view class="fon36 bold pcol">+{{item.num}}</view>
 						</view>
 					</scroll-view>
-					<view v-else class="fon24 col6 tc pad-s50">暂无签到记录</view>
+					<view v-else class="fon24 col6 tc pad-s50">暂无积分签到</view>
 				</view>
 			</view>
 		</view>

pagesB/customerList/customerList.vue

@@ -39,7 +39,8 @@
 				<!-- 真实姓名 -->
 				<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;" 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="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>

pagesB/messagecenter/messagecenter.vue

@@ -76,7 +76,7 @@
 		onReachBottom() {
 			if(this.total!=this.dataList.length){
 				this.page++
-				this.checkList()//调用自主预约列表事件
+				this.checkMsg()//调用自主预约列表事件
 			} else {
 				if(this.isZanw) this.$toolAll.tools.showToast('暂无更多消息','none',1000)
 				this.isZanw = false

pagesB/myCollection/myCollection.vue

@@ -237,6 +237,7 @@
 				if(index==1){
 					this.isWen = false;
 					uni.request({
+						// url:`https://hengmei.scdxtc.cn/api/spu/collection`,
 						url:`https://hm.hmzfyy.cn/api/spu/collection`,
 						data:{page:this.page,size:this.size},
 						method:'post',

pagesB/shopDetail/shopDetail.vue

@@ -150,13 +150,19 @@
 					<!-- 医生 -->
 					<view v-if="doctorList.length!=0" class="pad20 bacf mar-zy20 radius20 mar-s20">
 						<view class="fon28 col3 bold">医生</view>
-						<view @tap="goDoctor(item.id)" v-for="(item,index) in doctorList" :key="index" class="disjbac posir pad-sx20">
+						<!-- <view @tap="goDoctor(item.id)" v-for="(item,index) in doctorList" :key="index" class="disjbac posir pad-sx20">
 							<image :src="item.imgSrc" mode="aspectFill" class="flexs big-img"></image>
 							<view class="disjbac width100 mar-z20 pad-sx20">
 								<view class="fon28 col3 width50">{{item.name}}</view>
 								<view class="fon24 width50 col7D">擅长：{{item.goodAt}}</view>
 							</view>
 							<view v-if="(doctorList.length-1)!=index" class="duan-xian"></view>
+						</view> -->
+						<!-- 推荐医生列表 -->
+						<list-doctor v-if="doctorList.length!=0" :list="doctorList"></list-doctor>
+						<view v-if="doctorList.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>
 					<!-- 产品推荐 -->
@@ -236,7 +242,7 @@
 						<view class="col3">购买数量：</view>
 						<view class="fon26 col3 disac bold">
 							<image @tap="buyNum!=1?buyNum--:''" src="/static/public/del.png" class="del-btn" mode=""></image>
-							<input type="text" v-model="buyNum" class="num-input"/>
+							<input type="text" @input="inputNum" v-model="buyNum" class="num-input"/>
 							<image @tap="buyNum++" src="/static/public/add.png" class="add-btn" mode=""></image>
 						</view>
 					</view>
@@ -345,7 +351,8 @@
 				isZanw:true,
 				allList:[],
 				isactivity:0,//是不是活动商品0：不是，1：是
-				orderId:''//商品id
+				orderId:'',//商品id
+				timeout:null
 			}
 		},
 		onReachBottom() { //触底事件
@@ -418,6 +425,16 @@
 			}
 		},
 		methods: {
+			// 数量输入事件
+			inputNum(e){
+				clearTimeout(this.timeout);
+				let str = e.detail.value;
+				this.timeout = setTimeout(()=>{
+					if(str=='' || str==0){
+						this.buyNum = 1;
+					}
+				},500)
+			},
 			sharePin(id,u_id){
 				// id:商品id
 				this.$requst.post('spu/group-list',{id:id}).then(res=>{
@@ -479,6 +496,7 @@
 			},
 			checkPTList(id){//查询正在拼团的人数
 				uni.request({
+					// url:`https://hengmei.scdxtc.cn/api/spu/group-list`,
 					url:`https://hm.hmzfyy.cn/api/spu/group-list`,
 					data:{id:id},
 					method:'post',
@@ -533,7 +551,7 @@
 					imgSrc:this.$http + this.detailObj.cover,
 					coding:this.skuDetail.coding,
 					price:nprice,
-					num:this.buyNum,
+					num:this.buyNum || 1,
 					title:this.detailObj.name,
 					sku_name:this.skuDetail.title,
 					is_score:this.detailObj.is_score,
@@ -658,6 +676,7 @@
 			checkDetail(newId,is_activity){
 				console.log(newId,is_activity,'参数');
 				uni.request({
+					// url:`https://hengmei.scdxtc.cn/api/spu/detail`,
 					url:`https://hm.hmzfyy.cn/api/spu/detail`,
 					data:{id:newId,is_activity:is_activity},
 					method:'post',
@@ -768,10 +787,14 @@
 							if(res.data.data.doctor.length!=0){
 								res.data.data.doctor.forEach(item=>{
 									let docObj = {
-										id:item.id,
+										id: item.id,
-										imgSrc:item.headimg,
+										imgSrc: item.headimg != null ? item.headimg : '',
-										name:item.name,
+										name: item.name,
-										goodAt:item.skill
+										cyear: parseFloat(item.work_time),
+										bmen: item.dept_name,
+										zcheng: '主任医师',
+										goodAt: item.diseases,
+										show_detail: item.show_detail
 									}
 									this.doctorList.push(docObj);
 								})
@@ -798,6 +821,7 @@
 					disease_id:''//病种ID
 				}
 				uni.request({
+					// url:`https://hengmei.scdxtc.cn/api/spu/list`,
 					url:`https://hm.hmzfyy.cn/api/spu/list`,
 					data:params,
 					method:'post',

pagesB/shopSearch/shopSearch.vue

@@ -272,6 +272,7 @@
 					size:this.size,
 				}
 				uni.request({
+					// url:`https://hengmei.scdxtc.cn/api/spu/list`,
 					url:`https://hm.hmzfyy.cn/api/spu/list`,
 					data:params,
 					method:'post',