修改二期Bug

pages/tabbar/my/staffDuan.vue

@@ -350,7 +350,6 @@
 						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;//待收货总数
-						this.myOrderList[3].num = res.data.order_count.completed;//已完成总数
 						this.is_worker = res.data.is_worker;//是否为职工账号，0否（客户）， 1是
 						this.is_doctor = res.data.is_doctor;//是否为医生，0否，1是
 						this.is_servicer = res.data.is_servicer;//是否为客服，0否，1是

pages/tabbar/pagehome/pagehome.vue

@@ -184,7 +184,22 @@
 			this.checkKT()//恒美课堂列表
 			this.isAutoPlay = true;
 		},
-		onShareAppMessage(res) {},
+		onShareAppMessage(res) {
+		    var ya = this;
+			this.$requst.post('user/record',{type:'content',action:'share'}).then(res=>{console.log('分享成功：',res);},error=>{})
+			let maiOjb = {
+				e:0,//内容分享
+				c:this.detailObj.id*1,
+				t:new Date().getTime()//当前时间戳
+			}
+			this.$toolAll.tools.maiDian(maiOjb)
+			var shareObj = {
+		　　　　	title: '成都恒美毛发', // 默认是小程序的名称(可以写slogan等)
+		　　　　	path: `/pagesB/problemDetail/problemDetail?id=${this.detailObj.id}&category_id=${this.category_id}&share_id=${uni.getStorageSync('userId')}&invite_code=${uni.getStorageSync('invite_code')}`, // 默认是当前页面，必须是以‘/’开头的完整路径
+		　　　　	imageUrl: ya.$http + ya.detailObj.share_img//自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG，不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
+		　	};
+		　　return shareObj;
+		},
 		onLoad(options) {
 			// 模拟首次加载列表数据
 			// setTimeout(()=>{

pages/tabbar/shop/shop.vue

@@ -17,7 +17,9 @@
 			<!-- 筛选结果 -->
 			<view v-if="isClick" class="pad-zy50 disac fw pad-x20">
 				<view class="col3 fon28 mar-s30">筛选：</view>
-				<view v-if="item!=null" v-for="(item,indexx) in shaiList" :key="indexx">{{item}} <view class="mar-z10" @tap="deleteSX(indexx)">×</view></view>
+				<view v-if="bingVal!=''">{{bingVal}}<view class="mar-z10" @tap="deleteSX(0)">×</view></view>
+				<view v-if="doctorVal!=''">{{doctorVal}}<view class="mar-z10" @tap="deleteSX(1)">×</view></view>
+				<view v-if="activityVal!=''">{{activityVal}}<view class="mar-z10" @tap="deleteSX(2)">×</view></view>
 			</view>
 			<view v-if="isXiao">
 				<view class="pad-zy30">
@@ -48,7 +50,86 @@
 		<view v-if="isXiao" @tap="isXiao=false" class="moban"></view>
 		<!-- 数据列表 -->
 		<view v-if="loading" :style="{marginTop:statusHNH+titleHeight+(isClick?52:0)+'px'}">
-			<shopList :dataList="dataList" v-if="dataList.length!=0"></shopList>
+			<view v-if="dataList.length!=0 && search_result" class="pad20 ">
+				<view style="width: 48.6%;float: left;" class="pad-x180">
+					<view v-if="index1%2==0" v-for="(item1,index1) in dataList" :key="index1" class="bacf radius15 mar-x20 animated fadeIn posir" @tap="goPage(item1.id,index1)">
+						<image :src="item1.imgSrc" 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">
+								<view class="radius10 colf mar-y10" style="padding: 6rpx 10rpx;" :style="{background:publicColor}">{{item1.disease_name}}</view>
+								<view class="radius10 colf" v-if="item1.isTuan" style="padding: 6rpx 10rpx;background: #F85050;">团购</view>
+								<view class="radius10 colf" v-if="item1.isPing" style="padding: 6rpx 10rpx;background: #F85050;">拼团活动</view>
+								<view class="radius10 colf" v-if="item1.isXian" style="padding: 6rpx 10rpx;background: #F85050;">限时促销</view>
+							</view>
+							<view class="disac">
+								<view class="fon28 bold" style="color: #F85050;margin-right: 8rpx;">
+									<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>
+											<view class="fon24 col3 mar-z10">{{item1.level_text}}</view>
+										</view>
+									</view>
+									<view v-else>
+										<span v-if="item1.isPing">拼团价</span>
+										<span v-if="item1.isXian">促销价</span>
+										￥{{item1.zhePrice}}
+									</view>
+								</view>
+								<view v-if="item1.isXian || item1.isPing || item1.isTuan" class="fon24" style="text-decoration: line-through;color: #C7C7C7;">￥{{item1.yuanPrice}}</view>
+							</view>
+							<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>
+								</view>
+							</view>
+							<view v-if="item1.isXian || item1.isPing || item1.isTuan" class="fon24 col80 mar-s20">结束时间：{{item1.activity_end_at}}</view>
+						</view>
+					</view>
+				</view>
+				<view style="width: 48.6%;float: right;" class="pad-x180">
+					<view v-if="index1%2!=0" v-for="(item1,index1) in dataList" :key="index1" class="bacf radius15 mar-x20 animated fadeIn posir" @tap="goPage(item1.id,index1)">
+						<image :src="item1.imgSrc" 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">
+								<view class="radius10 colf mar-y10" style="padding: 6rpx 10rpx;" :style="{background:publicColor}">{{item1.disease_name}}</view>
+								<view class="radius10 colf" v-if="item1.isTuan" style="padding: 6rpx 10rpx;background: #F85050;">团购</view>
+								<view class="radius10 colf" v-if="item1.isPing" style="padding: 6rpx 10rpx;background: #F85050;">拼团活动</view>
+								<view class="radius10 colf" v-if="item1.isXian" style="padding: 6rpx 10rpx;background: #F85050;">限时促销</view>
+							</view>
+							<view class="disac">
+								<view class="fon28 bold" style="color: #F85050;margin-right: 8rpx;">
+									<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>
+											<view class="fon24 col3 mar-z10">{{item1.level_text}}</view>
+										</view>
+									</view>
+									<view v-else>
+										<span v-if="item1.isPing">拼团价</span>
+										<span v-if="item1.isXian">促销价</span>
+										￥{{item1.zhePrice}}
+									</view>
+								</view>
+								<view v-if="item1.isTuan || item1.isPing || item1.isXian" class="fon24" style="text-decoration: line-through;color: #C7C7C7;">￥{{item1.yuanPrice}}</view>
+							</view>
+							<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>
+								</view>
+							</view>
+							<view v-if="item1.isXian || item1.isPing || item1.isTuan" class="fon24 col80 mar-s20">结束时间：{{item1.activity_end_at}}</view>
+						</view>
+					</view>
+				</view>
+				<!-- 弹框 -->
+				<pu-po :isShowT="isShowT" :contentVal="pu_content" @comfirmev="submitQu" @cancleev="isShowT=false"></pu-po>
+			</view>
 			<nothing-page v-if="dataList.length==0" :content="`暂无更多商品列表`"></nothing-page>
 		</view>
 		<!-- 底部tab -->
@@ -96,7 +177,14 @@
 				loading:false,
 				cartNum:0,
 				doctorList:[],
-				showDoctor:false
+				showDoctor:false,
+				timeList:[],//时间列表
+				zanArr:[],
+				timer:null,
+				search_result:false,
+				bingVal:'',
+				doctorVal:'',
+				activityVal:''
 			}
 		},
 		onShow() {
@@ -152,7 +240,6 @@
 					this.isXiao = false;
 				} else this.isXiao = true;
 				this.bingzList = [];
-				
 				this.doctor_name = '';//清空医生列表
 				this.isClick = false;
 				this.activeIndex = index;
@@ -204,7 +291,7 @@
 					this.bingzList.unshift({name: '', title: "全部",isActive:true});
 				}
 			},
-			checkShopList(){
+			checkShopList(){//查询商品的收藏列表
 				let keyWord = this.searchVal;
 				if(this.shaiList.length!=0) keyWord = this.shaiList.filter(item=>item!=null).join(',');
 				let params = {
@@ -226,7 +313,13 @@
 					},
 					success: (res) => {
 						if(res.data.code==0){
+							clearInterval(this.timer);
+							// if(this.page==1) {
+								this.zanArr = [];
 								this.dataList = [];
+								this.timeList = [];
+							// }
+							this.total = res.data.total;
 							if(res.data.data.list.length!=0){
 								res.data.data.list.forEach(item=>{
 									let tuan = false,ping = false,xian = false,integral = false;
@@ -252,36 +345,89 @@
 										isIntegral:integral,//是否是积分
 										grade:'',
 										disease_name:item.disease_name,//病种名称
-										disease_id:item.disease_id,//病种ID
 										reponseTime:res.header.Date,//接口响应时间
 										activity_end_at:item.activity_end_at,//限时结束时间
 										activity_group_cover:group_cover,//参团人的头像
 										activity_group_num:item.activity_group_num,//已经参团人数
 									}
-									this.dataList.push(obj)
+									this.zanArr.push(obj)
 								})
+								this.zanArr.forEach((item,index)=>{
+									if(item.activity_end_at!='') {
+										let obj = {
+											id:item.id, 
+											reponseTime:item.reponseTime,
+											time:item.activity_end_at,
+											nIndex:index
+										}
+										this.timeList.push(obj);
+									}
+								})
+								if(this.timeList!=0){
+									this.$toolAll.tools.showToast('加载中...')
+									this.timer = setInterval(()=>{//定时器
+										if(this.timeList.length!=0){
+											this.timeList.forEach((item,index)=>{
+												if(item.id==this.zanArr[item.nIndex].id){
+													let endTime = new Date(this.timeList[index].time).getTime();//把结束时间转时间戳
+													this.timeList[index].reponseTime = new Date(this.timeList[index].reponseTime).getTime() + 1000;//请求接口的时间递增，即：开始时间
+													if(this.timeList[index].reponseTime - endTime >=0) {//如果开始时间的时间戳 - 结束时间的时间戳 >= 0 活动结束
+														this.zanArr[item.nIndex].activity_end_at = "活动已结束";
+													} else {
+														// 继续进行倒计时
+														this.zanArr[item.nIndex].activity_end_at = this.$toolAll.tools.dayTime(this.timeList[index].time,this.timeList[index].reponseTime);
+													}
+												}
+											})
+										}
+									},1000)
+									setTimeout(()=>{
+										this.dataList = this.zanArr;
+										this.search_result = true;
 										this.loading = true;
+									},1000)
+								} else {
+									this.dataList = this.zanArr;
+								}
+							} else {
+								this.search_result = true;
 							}
 						}
 					}
 				})
 			},
+			goPage(id,index){//进入商品详情事件
+				uni.navigateTo({
+					url:`/pagesB/shopDetail/shopDetail?id=${id}&isIntegral=${this.dataList[index].isIntegral}`
+				})
+			},
 			chooseBing(index){//小分类选择事件
 				this.bingzList.forEach(item=>{
 					item.isActive = false;
 				})
 				this.bingzList[index].isActive = true;
-				this.shaiList[this.activeIndex] = this.bingzList[index].title;
+				
 				// 病种id
-				if(this.activeIndex===0) {this.disease_id = this.bingzList[index].id;}
+				if(this.activeIndex===0) {
+					this.disease_id = this.bingzList[index].id;
+					this.bingVal = this.bingzList[index].title;
+				}
 				// 医生职位
-				if(this.activeIndex===1) {this.doctor_role = this.bingzList[index].name;} 
+				if(this.activeIndex===1) {
+					this.doctor_role = this.bingzList[index].name;
+					this.doctorVal = this.bingzList[index].title;
+				} 
 				// 活动type
-				if(this.activeIndex===2) {this.activity = this.bingzList[index].name;}
+				if(this.activeIndex===2) {
+					this.activity = this.bingzList[index].name;
+					this.activityVal = this.bingzList[index].title;
+				}
 			},
 			chongz(){//重置
 				this.isClick = false;
-				this.shaiList = []
+				this.bingVal = '';
+				this.doctorVal = '';
+				this.activityVal = '';
 			},
 			shaix(){//筛选
 				this.isXiao = false
@@ -289,8 +435,19 @@
 				this.checkShopList();
 			},
 			deleteSX(index){//删除筛选
-				this.shaiList.splice(index,1);
+				if(index==0) {
-				if(this.shaiList.length==0){
+					this.disease_id = '';
+					this.bingVal = '';
+				} 
+				if(index==1) {
+					this.doctor_role = '';
+					this.doctorVal = '';
+				} 
+				if(index==2) {
+					this.activity = '';
+					this.activityVal = '';
+				} 
+				if(this.activity=='' && this.doctorVal == '' && this.activityVal == ''){
 					this.isClick = false;
 				}
 				this.checkShopList();

pagesA/coupon/coupon.vue

@@ -41,7 +41,7 @@
 					<yz-qr ref="qrPath" :text="text" :size="size" :colorDark="colorDark" :colorLight="colorLight"></yz-qr>
 				</view>
 				<view class="fon24 col3 mar-s40 mar-x20">工作人员扫码使用体验券</view>
-				<image @tap.stop="isTY=false" src="/static/public/closequan.png" class="posia quan-tk-btn" mode=""></image>
+				<image @tap.stop="closeQuanEv" src="/static/public/closequan.png" class="posia quan-tk-btn" mode=""></image>
 			</view>
 		</view>
 	</view>
@@ -163,10 +163,14 @@
 								this.isTY = false;
 								clearInterval(this.timer);
 								this.checkAllList(0);
-							} else this.$toolAll.tools.showToast(res.msg);
+							}
 						})
 					},3000)
 				}
+			},
+			closeQuanEv(){
+				this.isTY = false;
+				clearInterval(this.timer);
 			}
 		}
 	}

pagesA/getReadyDan/getReadyDan.vue

@@ -213,7 +213,6 @@
 		},
 		onShow() {
 			this.$toolAll.tools.isLogin();
-			this.checkexpress();//查询快递
 			this.checkChoose();//检测地址
 			uni.removeStorageSync('orderInfo');
 			setTimeout(()=>{
@@ -221,6 +220,7 @@
 			},2000)
 		},
 		onLoad(options) {
+			this.checkexpress();//查询快递
 			this.checkeList();//查询订单列表
 			this.checkOrderDetail();//查询订单信息
 			this.isNei = options.isNei;
@@ -532,7 +532,6 @@
 									if(item.is_default==1){
 										this.expressInfo = item;
 										this.expressInfo.default_price = this.expressInfo.default_price/100;
-										this.quanEv(0);//查询优惠券列表
 									}
 								})
 								this.totalEv();
@@ -546,11 +545,11 @@
 			expressEv(index){//快递自取切换事件
 				if(index==0) {
 					this.isExpress = true;
+					// this.checkexpress();
 				}
 				if(index==1) {
 					this.isExpress = false;
 				}
-				this.checkexpress();
 			},
 			totalEv(){//合计运算
 				if(this.isNei!=3 && this.isExpress){//普通商品，有运费
@@ -595,6 +594,7 @@
 					this.allNum += item.num;
 				})
 				this.zanAllPrice = this.$toolAll.tools.addXiaoShu(this.allPrice);
+				this.quanEv(0);//查询优惠券列表
 			},
 			quanEv(index){//调起优惠券弹框事件
 				if(this.payFS[1].isActive){

pagesA/myOrder/myOrder.vue

@@ -27,7 +27,8 @@
 						</view>
 						<view class="disjbac mar-s10">
 							<view class="colf8 fon32 bold"><span v-if="item.isShop==0">￥</span><span v-else>积分：</span>{{itemc.price}}<span class="fon28 col6 mar-z20 font4">x{{itemc.num}}</span></view>
-							<view @tap.stop="make(index,indexc)" v-if="item.orderStatus == 3 && item.virtual_check==0" class="order-btn">线下核销</view>
+							<view @tap.stop="make(index,indexc)" v-if="item.orderStatus == 3 && item.virtual_check==0 && itemc.check_type=='frontend'" class="order-btn">线下核销</view>
+							<view v-if="item.orderStatus == 3 && item.virtual_check==0 && itemc.check_type!='frontend'" class="order-btn" style="background-color: #CCCCCC;">线上核销</view>
 						</view>
 					</view>
 				</view>
@@ -65,7 +66,7 @@
 					<view class=" mar-s40 mar-x20">工作人员扫码核销订单</view>
 					<view>订单未完成前请勿出示二维码</view> 
 				</view>
-				<image @tap.stop="isHeyan=false" src="/static/public/closequan.png" class="posia heyan-close" mode=""></image>
+				<image @tap.stop="closeEv" src="/static/public/closequan.png" class="posia heyan-close" mode=""></image>
 			</view>
 		</view>
 		<!-- 取消订单弹框 -->
@@ -130,7 +131,8 @@
 				text: 'hello',
 				size: 162,
 				colorDark: '#000000',
-				colorLight: '#ffffff'
+				colorLight: '#ffffff',
+				timer:null
 			}
 		},
 		onReachBottom() {
@@ -142,6 +144,9 @@
 				this.isZanw = false
 			}
 		},
+		onUnload() {
+			this.closeEv();
+		},
 		onShow() {
 			this.$toolAll.tools.isLogin();
 			this.checkZT(this.activeIndex);
@@ -159,12 +164,33 @@
 			make(index,index2){
 				this.isHeyan = true;
 				this.text = `${this.orderList[index].orderNum},${this.orderList[index].childrenList[index2].id}`;
+				let params = {
+					order_coding:this.orderList[index].orderNum,
+					id:this.orderList[index].childrenList[index2].id,
+					not_check_num:this.orderList[index].childrenList[index2].not_check_num
+				}
+				this.timer = setInterval(()=>{
+					this.$requst.post('order/check-result',params).then(res=>{
+						if(res.code==0){
+							if(res.data.result==1){
+								this.isHeyan = false;
+								this.$toolAll.tools.showToast('已完成');
+								this.checkList(this.activeIndex);
+								clearInterval(this.timer);
+							}
+						}
+					})
+				},3000)
 				// var that = this;
 				// setTimeout(function() {
 				// 	that.canvasQrPath = that.$refs.qrPath.canvasQrPath;
 				// 	console.log('获取二维码地址:', that.canvasQrPath)
 				// }, 1000)
 			},
+			closeEv(){
+				this.isHeyan = false;
+				clearInterval(this.timer);
+			},
 			checkZT(index){
 				if(index==0){this.tag=""}
 				if(index==1){this.tag="waiting"}
@@ -218,6 +244,8 @@
 										sku_name:items.sku_name,
 										price:childrenPrice,
 										num:items.num,
+										not_check_num:items.not_check_num,
+										check_type:items.check_type
 									}
 									nchildren.push(objs);
 								})

pagesB/orderDetail/orderDetail.vue

@@ -55,7 +55,8 @@
 							<view class="orderDetail-sku">{{item.sku_name}}</view>
 							<view class="disjbac mar-s10">
 								<view class="colf8 fon32 bold"><span v-if="orderInfo.is_score==0">￥{{item.price/100}}</span><span v-else>积分：{{item.score}}</span><span class="fon28 col6 mar-z20 font4">x{{item.num}}</span></view>
-								<view @tap.stop="make(index)" v-if="orderInfo.virtual_check==0 && orderInfo.has_virtual==1" class="order-btn">线下核销</view>
+								<view @tap.stop="make(index)" v-if="orderInfo.virtual_check==0 && orderInfo.has_virtual==1 && item.check_type=='frontend'" class="order-btn">线下核销</view>
+								<view v-if="orderInfo.virtual_check==0 && orderInfo.has_virtual==1 && item.check_type!='frontend'" class="order-btn" style="background-color: #CCCCCC;">线上核销</view>
 							</view>
 						</view>
 					</view>
@@ -101,7 +102,7 @@
 							<view class=" mar-s40 mar-x20">工作人员扫码核销订单</view>
 							<view>订单未完成前请勿出示二维码</view> 
 						</view>
-						<image @tap.stop="isHeyan=false" src="/static/public/closequan.png" class="posia heyan-close" mode=""></image>
+						<image @tap.stop="closeEv" src="/static/public/closequan.png" class="posia heyan-close" mode=""></image>
 					</view>
 				</view>
 			</block>
@@ -135,9 +136,13 @@
 				text: 'hello',
 				size: 162,
 				colorDark: '#000000',
-				colorLight: '#ffffff'
+				colorLight: '#ffffff',
+				timer:null
 			}
 		},
+		onUnload() {
+			this.closeEv();
+		},
 		onShow() {
 			this.$toolAll.tools.isLogin();
 		},
@@ -148,6 +153,27 @@
 			make(index){
 				this.isHeyan = true;
 				this.text = `${this.orderInfo.coding},${this.orderInfo.skus[index].id}`;
+				let params = {
+					order_coding:this.orderInfo.coding,
+					id:this.orderInfo.skus[index].id,
+					not_check_num:this.orderInfo.skus[index].not_check_num
+				}
+				this.timer = setInterval(()=>{
+					this.$requst.post('order/check-result',params).then(res=>{
+						if(res.code==0){
+							if(res.data.result==1){
+								this.isHeyan = false;
+								this.$toolAll.tools.showToast('已完成');
+								this.checkInfo(this.orderInfo.id);
+								clearInterval(this.timer);
+							}
+						}
+					})
+				},3000)
+			},
+			closeEv(){
+				this.isHeyan = false;
+				clearInterval(this.timer);
 			},
 			cancleEv(){//取消订单
 				this.times++;