bug修改

pages/activity/activity.vue

@@ -237,8 +237,8 @@
 		height: 36rpx;line-height: 36rpx;text-align: center;
 		background: linear-gradient(109deg, #FD5A04 0%, #FD0900 100%);
 		border-radius: 0rpx 10rpx 0rpx 10rpx;
-		position: absolute;
-		top: 0;right: 0;
+		position: absolute;font-weight: 500;
+		top: 0;right: 0;font-size: 24rpx;
 	}
 	.itemImg {
 		height: 280rpx;

pages/activity/jkDetail.vue

@@ -5,7 +5,11 @@
 			<img :src="mainImg" alt="" class="topimg" mode="widthFix">
 		</view>
 		<view class="cont" v-if="info">
-			<view class="name">{{info.activityName}}</view>
+			<view class="name">  
+			  <view class="ptNameBz" v-if="info.groupType">
+				  {{info.groupNumber}}人团
+			  </view>
+			 {{info.activityName}}</view>
 			<view class="name2">{{info.startTime.slice(0,10)}}~{{info.endTime.slice(0,10)}}</view> 
 			<view class="name3">{{info.activityContent}}</view>
 		</view>
@@ -417,6 +421,7 @@
 		   
 		   
 		},
+	
 		onPullDownRefresh(){
 			//this.getInfo();
 			this.queryActivityInfo();
@@ -428,6 +433,9 @@
 			this.bgmMusic.stop(()=>{
 			console.log('背景音乐停止了');
 			});
+			if (this.ticker) {
+			  clearInterval(this.ticker);
+			}
 		},
 		onUnload(){
 			this.bgmMusic.stop()
@@ -508,7 +516,7 @@
 				//console.log(sellingPoint)
 				this.shareShow=false;
 				uni.navigateTo({
-					url:'../shop/wp?img='+this.mainImg+'&name='+this.info.activityName+'&time='+time+'&sellingPoint='+sellingPoint+'&id='+this.collectingID+'&type=2'
+					url:'../shop/wp?img='+this.mainImg+'&name='+this.info.activityName+'&time='+time+'&sellingPoint='+sellingPoint+'&id='+this.collectingID+'&type=2'+'&groupType='+this.info.groupType
 				})
 			},
 			shareShowyc(){
@@ -1010,9 +1018,9 @@
 					//console.log('limitTimeFilter')
 					//https://blog.csdn.net/qq_39905409/article/details/104478623
 			      	if (val) {
-						console.log(val)
+						//console.log(val)
 			            let formateLimitTimes = that.$common.formateTimeStamp(val);
-			            let txt = `${formateLimitTimes.hour}: ${formateLimitTimes.min} :${formateLimitTimes.seconds} `;
+			            let txt = `${formateLimitTimes.hour} : ${formateLimitTimes.min} : ${formateLimitTimes.seconds} `;
 			           /* if (formateLimitTimes.day != '00') {
 			              txt = `${Number(formateLimitTimes.day)*24} 时 ${formateLimitTimes.min} 分   ${formateLimitTimes.seconds} 秒`;
 			            } */
@@ -1042,7 +1050,8 @@
 			
 			return {
 				title: this.info.activityName,
-				imageUrl:this.mainImg,
+				//imageUrl:this.mainImg,
+				imageUrl:'http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png',
 				path:url,
 				success(res){
 					uni.showToast({
@@ -1062,13 +1071,32 @@
 </script>
 
 <style scoped>
+.ptNameBz{
+	font-weight: 500;line-height: 34rpx;
+    font-size: 22rpx;height: 32rpx;
+	color: #FD0F00;margin-top: 6rpx;margin-right: 10rpx;
+	background: url('http://dmsphoto.66km.com.cn/thFiles/2AF1130F-C318-45D3-B057-FA0728B41046.png') no-repeat;
+	background-size: 100% 100%;
+	padding-left: 64rpx;padding-right: 4rpx;
+}
+.name{
+	display: flex;
+}
 .djsCont{
 	width: 638rpx;
-	height: 60vh;
+	height: 50vh;
 	background: #fff;
 	margin-top: 20vh;
 	margin-left:56rpx ;border-radius: 15rpx;
 }
+.djsCont .ptLine{
+	border-top:0;
+	border-bottom: 1px solid #EEEEEE;
+}
+.djsCont .bmTop{
+	border-bottom: 1px solid #EEEEEE;
+	padding: 24rpx;
+}
 .djsLineBox{
 	height: calc(60vh - 120rpx);
 	overflow-y: scroll;
@@ -1083,7 +1111,7 @@
 	color: #222222;font-size: 28rpx;line-height: 60rpx;
 }
 .DiffBNumber{
-	font-weight: 400;
+	font-weight: 400;text-align: right;
 	color: #222222;font-size: 26rpx;
 }
 .ptlineRight{
@@ -1094,10 +1122,11 @@
 }
 .ptBtn{
 	width: 137rpx;font-weight: 400;
-color: #FFFFFF;font-size: 28rpx;
+color: #FFFFFF;font-size: 26rpx;
 	height: 60rpx;text-align: center;
 	background: #E02E24;line-height: 60rpx;
 	border-radius: 6rpx;
+	margin-top: 4rpx;
 }
 .ptdjs{
 	font-weight: 400;
@@ -1124,9 +1153,15 @@ color: #FFFFFF;font-size: 28rpx;
 .separate{
 	width: 284rpx;margin-left: 30rpx;
 	height: 74rpx;
-	background: #F19D01;
+	background: #FFE4E2;
 	border-radius: 37rpx;
-	text-align: center;color: #ffffff;
+	text-align: center;color:#D53533;
+}
+.separate .separateTop{
+	color:#D53533;
+}
+.separate .separateTxt{
+	color:#D53533;
 }
 .groupBtn{
 	width: 284rpx;text-align: center;color: #ffffff;
@@ -1269,7 +1304,7 @@ color: #FFFFFF;font-size: 28rpx;
 	.bmTop{
 		display: flex;
 		justify-content: space-between;
-		padding: 40rpx 24rpx 10rpx 24rpx;
+		padding: 30rpx 24rpx 10rpx 24rpx;
 	}
 	.bmTitle{
 		font-weight: 500;
@@ -1671,12 +1706,9 @@ color: #FFFFFF;font-size: 28rpx;
 		padding-left: 0px;
 		padding-right: 0px;
 		box-sizing: border-box;
-		// font-size: 18px;
 		text-align: center;
 		text-decoration: none;
-		// line-height: 1;
 		line-height: 1.35;
-		// border-radius: 5px;
 		-webkit-tap-highlight-color: transparent;
 		overflow: hidden;
 		color: #000000;
@@ -1747,10 +1779,10 @@ color: #FFFFFF;font-size: 28rpx;
 			height: 60vh;
 		}
 		.groupBtnTxt{
-			color: #FFFFFF;font-size: 26rpx;
+			color: #FFFFFF;font-size: 26rpx;line-height: 26rpx;
 		}
 		.groupBtnTop{
 			font-weight: 500;font-size: 28rpx;
-			color: #FFFFFF;
+			color: #FFFFFF;padding-top: 2rpx;
 		}
 </style>

pages/index/index.vue

@@ -165,6 +165,7 @@
 					    </view>
 					</view>
 					<view class="hotName">{{item.activityName}}</view>
+					<view class="groupType" v-if="item.groupType">拼团</view>
 				</view>
 				
 			</view>
@@ -1463,7 +1464,15 @@
 		border-radius: 10rpx;
 		background: #FFFFFF;
 		overflow: hidden;
-		
+		position: relative;
+	}
+	.groupType{
+		width: 76rpx;color: #FFFFFF;
+		height: 36rpx;line-height: 36rpx;text-align: center;
+		background: linear-gradient(109deg, #FD5A04 0%, #FD0900 100%);
+		border-radius: 0rpx 10rpx 0rpx 10rpx;
+		position: absolute;font-weight: 500;
+		top: 0;right: 0;font-size: 24rpx;
 	}
 	.hotlinestate1{
 		width: 102rpx;

pages/shop/wp.vue

@@ -38,6 +38,8 @@
 				mpWxQr2:'',
 				mpWxQr3:'',
 				mpWxQr4:'',
+				ptImg:'http://dmsphoto.66km.com.cn/thFiles/18415D1D-563A-4488-9163-0A7D59A99961.png',
+				groupType:'',
 			}
 		},
 		computed: {
@@ -67,6 +69,9 @@
 			if(this.nickname.length>16){
 				this.nickname=this.nickname.substring(0,16)+'...'
 			}
+			if(opt.groupType){
+				this.groupType=opt.groupType
+			}
 			//console.log(this.nickname+this.nickname.length)
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();

pages/subPack/jkDetail.vue

@@ -5,7 +5,11 @@
 			<img :src="mainImg" alt="" class="topimg" mode="widthFix">
 		</view>
 		<view class="cont">
-			<view class="name">{{info.activityName}}</view>
+			<view class="name">
+			<view class="ptNameBz" v-if="info.groupType">
+							  {{info.groupNumber}}人团
+			</view>
+			{{info.activityName}}</view>
 			<view class="name2">{{info.startTime.slice(0,10)}}~{{info.endTime.slice(0,10)}}</view>
 			<view class="name3">{{info.activityContent}}</view>
 		</view>
@@ -55,9 +59,15 @@
 				<view class="ptmobilePhone">{{info.shareOpenGroup.firstMobilePhone}}</view>
 			</view>
 			<view class="DiffBNumber">还差 <span style="#FF0000">{{info.shareOpenGroup.groupNumber - info.shareGroupList.length}}</span> 人，赶快邀请好友来拼团吧</view>
-		    <view class="ptBtnBox">
+		    <view class="ptBtnBox" v-if="!ifMyself">
 				<view class="yqhypt" @click="jionPt">参与拼团</view>
 		    </view>
+			<view class="ptBtnBox" v-if="ifMyself">
+				<view class="seeTy" @click="seeTyshowBtn">查看全部团员</view>
+				<button open-type="share" class=" shareBtn" >
+				    <view class="yqhypt">邀请好友拼团</view>
+				</button>
+			</view>
 		</view>
 		<!-- //0拼团取消1拼团失败 2拼团中3拼团成功4自动成团 groupState -->
 		<view class="ptCont2" v-if="info.shareOpenGroup.groupState == 3||info.shareOpenGroup.groupState == 4||info.shareOpenGroup.groupState == 1||info.shareOpenGroup.groupState == 0">
@@ -67,7 +77,7 @@
 			</view>
 			<view class="groupStateBox " v-if="info.shareOpenGroup.groupState==1">
 				 <image src="../../static/img/icon_del_red.png" mode="" class="groupStateIcon"></image>
-				 <view class="groupStateTxt">拼团失败</view>
+				 <view class="groupStateTxt">未满人数,拼团失败</view>
 			</view>
 			<view class="ptmobilePhoneLine">
 				<image src="../../static/timg/icon_guan.png" mode="" class="vipIcon"></image>
@@ -378,6 +388,7 @@
 				 cyptNum:'',
 				 shareOpenID:'',
 				 shareName:'',
+				 ifMyself:'',
 			}
 		},
 		onLoad(opt) {
@@ -897,7 +908,12 @@
 						   });
 								   		 
 					}
-					
+					//console.log(this.userInfo)
+					this.info.shareGroupList.forEach(item=>{
+						if(item.openID==this.userInfo.openId){
+							this.ifMyself=true
+						}
+					})
 					
 				})
 			},
@@ -1040,7 +1056,8 @@
 				this.dh=0;
 				this.dm=0;
 				this.ds=0;
-				this.queryActivityInfo();
+				//this.queryActivityInfo();
+				this.info.state=3
 			    return
 			  }
 			
@@ -1062,6 +1079,15 @@
 			  this.dh=shengyuH;
 			  this.dm=shengyuM;
 			  this.ds=S;
+			  if(this.dh<10){
+			  		this.dh='0'+this.dh
+			  }
+			  if(this.dm<10){
+			  	 this.dm='0'+this.dm
+			  }
+			  if(this.ds<10){
+			  	 this.ds='0'+this.ds
+			  }
 			  setTimeout(_this.clock3, 500)
 			},
 			decryptPhoneNumber: function(e) {
@@ -1120,7 +1146,8 @@
 			} */
 			return {
 				title: this.info.activityName,
-				imageUrl:this.mainImg,
+				//imageUrl:this.mainImg,
+				imageUrl:'http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png',
 				path: 'pages/activity/jkDetail?id=' + this.collectingID+'&shareId='+this.userInfo.openId,
 				success(res){
 					uni.showToast({
@@ -1161,7 +1188,7 @@
 	color: #222222;font-size: 28rpx;line-height: 60rpx;
 }
 .DiffBNumber{
-	font-weight: 400;
+	font-weight: 400;text-align: right;
 	color: #222222;font-size: 26rpx;
 }
 .ptlineRight{
@@ -1172,7 +1199,7 @@
 }
 .ptBtn{
 	width: 137rpx;font-weight: 400;
-color: #FFFFFF;font-size: 28rpx;
+color: #FFFFFF;font-size: 26rpx;
 	height: 60rpx;text-align: center;
 	background: #E02E24;line-height: 60rpx;
 	border-radius: 6rpx;
@@ -1204,7 +1231,13 @@ color: #FFFFFF;font-size: 28rpx;
 	height: 74rpx;
 	background: #FFE4E2;
 	border-radius: 37rpx;
-	text-align: center;color: #D53533;
+	text-align: center;color:#D53533;
+}
+.separate .separateTop{
+	color:#D53533;
+}
+.separate .separateTxt{
+	color:#D53533;
 }
 .groupBtn{
 	width: 284rpx;text-align: center;color: #ffffff;
@@ -1218,13 +1251,13 @@ color: #FFFFFF;font-size: 28rpx;
 }
 .groupBtnTop{
 	font-weight: 500;font-size: 28rpx;
-	color: #FFFFFF;
+	color: #FFFFFF;padding-top: 2rpx;
 }
 .separateTxt{
 	color: #D53533;font-size: 26rpx;
 }
 .groupBtnTxt{
-	color: #FFFFFF;font-size: 26rpx;
+	color: #FFFFFF;font-size: 26rpx;line-height: 26rpx;
 }
 	.companyName{
 		font-size: 24rpx;
@@ -1635,6 +1668,7 @@ color: #FFFFFF;font-size: 28rpx;
 		line-height: 42rpx;
 		font-weight: 500;
 		font-size: 30rpx;
+		display: flex;
 	}
 	.name2{
 		color: #3C3C3C;
@@ -1966,4 +2000,12 @@ color: #FFFFFF;font-size: 28rpx;
 		.grouptk .maTitle{
 			padding-left: 24rpx;
 		}
+		.ptNameBz{
+			font-weight: 500;line-height: 34rpx;
+		    font-size: 22rpx;height: 32rpx;
+			color: #FD0F00;margin-top: 6rpx;margin-right: 10rpx;
+			background: url('http://dmsphoto.66km.com.cn/thFiles/2AF1130F-C318-45D3-B057-FA0728B41046.png') no-repeat;
+			background-size: 100% 100%;
+			padding-left: 64rpx;padding-right: 4rpx;
+		}
 </style>

pages/user/myOrder/activityOrderDetail.vue

@@ -45,7 +45,7 @@
 				<image src="../../../static/timg/icon_guan.png" mode="" class="vipIcon"></image>
 				<view class="ptmobilePhone">{{orderData.openGroup.firstMobilePhone}}</view>
 			</view>
-			<view class="DiffBNumber">还差 <span style="#FF0000">{{orderData.openGroup.groupNumber - orderData.groupList.length}}</span> 人，赶快邀请好友来拼团吧</view>
+			<view class="DiffBNumber">还差 <span style="color:#FF0000; ">{{orderData.openGroup.groupNumber - orderData.groupList.length}}</span> 人，赶快邀请好友来拼团吧</view>
 		    <view class="ptBtnBox">
 		    	<view class="seeTy" @click="seeTyshowBtn">查看全部团员</view>
 				 <button open-type="share" class=" shareBtn" >
@@ -94,10 +94,10 @@
 				 <image src="../../../static/img/icon_del_red.png" mode="" class="groupStateIcon"></image>
 				 <view class="groupStateTxt">拼团失败</view>
 			 </view>
-			 <view class="groupStateBox " v-if="orderData.data.groupState==0">
+			 <!-- <view class="groupStateBox " v-if="orderData.data.groupState==0">
 				 <image src="../../../static/img/icon_del_red.png" mode="" class="groupStateIcon"></image>
 				 <view class="groupStateTxt">拼团取消</view>
-			 </view>
+			 </view> -->
 			</view>
 			
 			
@@ -223,13 +223,14 @@
 
 		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
 
-		<view class="bottom" v-if="orderData.data.sheetState == 1||orderData.data.sheetState == 2">
-            <view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType==1">取消订单</view>
+		<view class="bottom" v-if="orderData.data.sheetState == 1">
+           <!-- <view class="cancel" @click="cancelBespeak" v-if="orderData.data.groupType==1">取消订单</view> -->
 			<view class="cancel" @click="cancelBespeak" v-if="!orderData.data.groupType">取消订单</view>
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
-		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.groupType">退款</view>
+		   <view class="cancel" @click="cancelOrder" v-if="orderData.data.payState==2">退款</view>
+		   <view class="cancel" @click="cancelBespeak" v-else>取消订单</view>
 		</view>
 
 
@@ -277,7 +278,7 @@
 	<view class="maBox" v-if="seeTyshow" @click="seeTyHide">
 		<view class="grouptk" @click.stop="">
 			<view class="maTop">
-				<view class="maTitle">全部团员</view>
+				<view class="maTitle maTitle2 ">全部团员</view>
 				<image  src="../../../static/img/icon_delete.png" mode=""
 					style="width: 26rpx;height: 26rpx;margin-left: 10rpx;" @click="seeTyHide"></image>
 			</view>
@@ -720,7 +721,33 @@
 					
 				})
 			},
+			getData2() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.$http('openOrderManagement/queryOpenSheet', {
+			
+					id: this.id,
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.orderData = res.data;
+					if (this.quanMaList) {
+						this.quanMaList = [];
+					}
+					let maList = this.orderData.OpenSheetQRCode;
+					if (maList) {
+						maList.forEach(item =>{
+							if (item.writeoffState==1) {
+								this.quanMaList.push(item.qrCode);
+							}
+						})
+					}
+					
+					
+				})
+			},
 			clock(){
+			  
 			  let _this = this
 			  let today = new Date() // 当前时间
 			  let h = today.getHours()
@@ -732,8 +759,8 @@
 				this.dh=0;
 				this.dm=0;
 				this.ds=0;
-				_this.getData();
-			    return
+				_this.getData2();
+			    return false
 			  }
 			
 			  let stopH = startTime.getHours()
@@ -755,6 +782,15 @@
 			  this.dh=shengyuH;
 			  this.dm=shengyuM;
 			  this.ds=S;
+			  if(this.dh<10){
+				  this.dh='0'+this.dh
+			  }
+			  if(this.dm<10){
+			  	 this.dm='0'+this.dm
+			  }
+			  if(this.ds<10){
+			  	 this.ds='0'+this.ds
+			  }
 			 
 			  setTimeout(_this.clock, 1000)
 			},
@@ -785,6 +821,7 @@
 			return {
 				title: this.orderData.data.sheetContent,
 				//imageUrl:this.mainImg,
+				imageUrl:'http://dmsphoto.66km.com.cn/thFiles/83074F71-F5C9-4C8E-B23F-2D195788960B.png',
 				path: 'pages/subPack/jkDetail?id=' + this.orderData.openSheetDetail[0].itemId+'&shareId='+this.userInfo.openId+'&groupID='+this.orderData.data.groupID+'&shareName='+this.userInfo.nickName,
 				success(res){
 					uni.showToast({
@@ -844,7 +881,8 @@
 color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
 }
 .grouptk .maTitle{
-	padding-left: 24rpx;
+	 padding-left: 4rpx; 
+	 color: #333333;font-weight: 500;
 }
 .ptCont{
 	width: 702rpx;
@@ -883,23 +921,25 @@ color: #3C3C3C;font-size: 26rpx;line-height: 32rpx;
 color: #764D49;font-size: 26rpx;padding-top:20rpx;
 }
 .vipIcon{
-	width: 32rpx;height: 32rpx;
+	width: 32rpx;height: 32rpx;margin-right: 8rpx;
 }
 .seeTy{
 	width: 260rpx;line-height: 62rpx;text-align: center;
 	height: 62rpx;color: #FF0000;
 	border-radius: 36rpx;font-size: 26rpx;
 	border: 2rpx solid #FF0000;
+	margin-right: 15rpx;
 }
 .ptBtnBox{
 	display: flex;
-	justify-content: space-around;
+	justify-content: center;
 }
 .yqhypt{
 	width: 260rpx;color: #FFFFFF;line-height: 66rpx;text-align: center;
 	height: 66rpx;font-size: 26rpx;
 	background: linear-gradient(132deg, #FD5C05 0%, #FD0323 100%);
 	border-radius: 36rpx;
+	margin-left: 15rpx;
 }
 	.box {
 		min-height: 100vh;
@@ -1561,34 +1601,32 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	}
 	
 	.tuiBtns {
-		display: flex;
+		display: flex;justify-content: space-around;
 		padding: 40rpx 20rpx 10rpx;
 	
 	}
 	.btn {
-		width: 288rpx;
-		height: 98rpx;
+		width: 250rpx;
+		height: 70rpx;
 		background: #F4F5F7;
 		border-radius: 10rpx;
-		margin-right: 22rpx;
-	
-	
-		font-size: 30rpx;
+		font-size: 28rpx;
 		font-weight: 500;
 		color: #3C3C3C;
-		line-height: 98rpx;
+		line-height: 70rpx;
 		text-align: center;
 	}
 	
 	.btn2 {
-		width: 288rpx;
-		height: 98rpx;
+		width: 250rpx;
+		height: 70rpx;
 		background: #3F90F7;
 		border-radius: 10rpx;
-		font-size: 30rpx;
+		font-size: 28rpx;
 		font-weight: 500;
 		color: #FFFFFF;
-		line-height: 98rpx;
+		line-height: 70rpx;
 		text-align: center;
 	}
+	
 </style>

pages/user/myOrder/mallOrderDetail.vue

@@ -196,6 +196,9 @@
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}"  @click="pay">立即支付</view>
 		</view>
+		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
+		    <view class="cancel" @click="cancelOrder" >退款</view>
+		</view>
 
 
 		<!-- 券码 -->
@@ -237,6 +240,64 @@
 		</view>
 	</view>
 
+<!-- 退款原因 -->
+	<view class="tuikuanBox" v-if="isShowTui==true">
+		<view class="tuikuan">
+			<view class="tuiTop">
+				<view class="tuiTitle">退款</view>
+				<image @click="isShowTuiHide" src="../../../static/img/icon_delete.png" mode=""
+					style="width: 26rpx; height: 26rpx;"></image>
+	
+			</view>
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="../../static/img/icon_star.png" mode="" class="star"></image>
+					退款原因
+				</view>
+				<view class="contlineRight carModelRight" @click="">
+	
+					<picker class="carModel" @change="bindChange" mode="selector" :value="index"
+						:range="tuicauseList" range-key="contents">
+						<view class="uni-input">{{tuicauseList[index].contents}}</view>
+						<!-- <view class="uni-input noColor" v-else>请选择</view> -->
+					</picker>
+					<image src="../../static/img/little_rightArrow.png" mode="" class="contlineRightJt"></image>
+				</view>
+			</view>
+	
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="../../static/img/icon_star.png" mode="" class="star"></image>
+					退款金额
+				</view>
+				<view class="contlineRight carModelRight" @click="cktime">
+					<span class="carModel">{{orderData.data.realMoney}}</span>
+	
+				</view>
+			</view>
+	
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="" mode="" class="star"></image>
+					补充描述
+				</view>
+	
+				<view class="contlineRight">
+					<textarea placeholder-style="color:#999999" placeholder="请输入" v-model="tuikuanContent"
+						class="contlineRightInput" maxlength="-1" auto-height="true" @confirm="feedDone" />
+				</view>
+			</view>
+	
+			<view class="tuiBtns">
+				<view class="btn" @click="isShowTuiHide">取消</view>
+				<view class="btn2" @click="goTui">确认退款</view>
+			</view>
+	
+		</view>
+	</view>
+
+
+
 	</view>
 </template>
 
@@ -277,6 +338,10 @@
 				authorizShow:false,
 				userInfo:'',
 				ext:'',
+				isShowTui:false,
+				index:0,
+				tuicauseList: [],
+				tuikuanContent: '',
 			}
 		},
 		onLoad(opt) {
@@ -289,7 +354,8 @@
 			
 			if(this.userInfo){
 				if (this.id) {
-					this.getData()
+					this.getData();
+					this.getTuiKuanData()
 				}
 			}else{
 				this.$common.automaticlogin().then(val => {
@@ -297,7 +363,8 @@
 					this.wxOpenData=this.$store.state.wxOpenData;
 					this.themeColor = uni.getStorageSync("themeColor");
 					if (this.id) {
-						this.getData()
+						this.getData();
+						this.getTuiKuanData()
 					}
 					if(!this.userInfo){
 						this.authorizShow=true
@@ -310,6 +377,52 @@
 		
 
 		methods: {
+			cancelOrder(){
+				this.isShowTui=true;
+			},
+			goTui(){
+				var that=this;
+				uni.showLoading({
+					title: '加载中'
+				})
+				let yuanyin = this.tuicauseList[this.index].contents
+				that.$http('openMallOrder/cancelOrder', {
+				    realMoney:that.orderData.data.realMoney,
+					sheetId: that.id,
+					refundReason:yuanyin,
+					refundComment:this.tuikuanContent,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					// var list = res.data.Items
+					this.isShowTui=false;
+					uni.showToast({
+						title: '取消成功',
+						icon: 'none',
+						duration: 2000
+					});
+					setTimeout(function() {
+						that.getData();
+					}, 1000);
+				})
+			},
+			isShowTuiHide(){
+				this.isShowTui=false;
+			},
+			bindChange(e) {
+				console.log(e);
+				this.index = e.detail.value
+			},
+			getTuiKuanData() {
+				console.log("退款原因")
+				this.$http('openMallOrder/getOpenReason', {
+			
+					// id: this.id,
+				}, 'GET').then(res => {
+				
+					this.tuicauseList = res.data;
+			
+				})
+			},
 			isShowMaSHow(){
 				 this.isShowMa=true
 			},
@@ -1077,4 +1190,125 @@
 			margin-top: 62rpx;
 			margin-left:71rpx;
 		}
+		.tuikuanBox {
+				width: 100%;
+				height: 100vh;
+				background: rgba(0, 0, 0, 0.4);
+				position: fixed;
+				left: 0;
+				top: 0;
+				z-index: 999;
+			}
+			
+			.tuikuan {
+				width: 638rpx;
+				height: 664rpx;
+				background: #ffffff;
+				margin: 0 36rpx;
+				margin-top: 50%;
+				border-radius: 24rpx;
+				padding: 30rpx 20rpx;
+			}
+			
+			.tuiTop {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 36rpx;
+			}
+			
+			.tuiTitle {
+				width: 56rpx;
+				height: 40rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #3C3C3C;
+				line-height: 40rpx;
+			
+			}
+			
+			.contLine {
+				display: flex;
+				justify-content: space-between;
+				font-size: 28rpx;
+				padding: 30rpx 0;
+				border-bottom: 1px solid #EEEEEE;
+			}
+			
+			.contlineLeft {
+				color: #666666;
+				line-height: 40rpx;
+				align-items: center;
+			}
+			
+			.star {
+				width: 14rpx;
+				height: 14rpx;
+				padding-bottom: 5rpx;
+			}
+			
+			.carModel {
+				width: 350rpx;
+				text-align: left;
+			}
+			
+			.noColor {
+				color: #CCCCCC;
+			}
+			
+			.carModelRight {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+			}
+			
+			.contlineRight {
+				color: #333333;
+				line-height: 40rpx;
+			
+				width: 400rpx;
+				text-align: right;
+			}
+			
+			.contlineRightInput {
+				color: #333333;
+				text-align: left;
+				font-size: 28rpx;
+				min-height: 182rpx;
+				width: 400rpx;
+			}
+			
+			.contlineRightJt {
+				width: 30rpx;
+				height: 30rpx;
+			
+			}
+			
+			.tuiBtns {
+				display: flex;justify-content: space-around;
+				padding: 40rpx 20rpx 10rpx;
+			
+			}
+			.btn {
+				width: 250rpx;
+				height: 70rpx;
+				background: #F4F5F7;
+				border-radius: 10rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #3C3C3C;
+				line-height: 70rpx;
+				text-align: center;
+			}
+			
+			.btn2 {
+				width: 250rpx;
+				height: 70rpx;
+				background: #3F90F7;
+				border-radius: 10rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 70rpx;
+				text-align: center;
+			}
 </style>

pages/user/myOrder/myOrder.vue

@@ -35,7 +35,7 @@
 					<view class="renNickName">{{item.NickName?item.NickName:''}}</view>
 				 </view>
 				<view class="itemName">{{item.CreateTime}}</view>
-                <view class="itemName">{{item.ShopName}}</view>
+                <view class="itemName" style="padding-top: 2rpx;padding-bottom: 0;">{{item.ShopName}}</view>
 				
 			</view>
 

pages/user/myOrder/paintOrderDetail.vue

@@ -175,6 +175,10 @@
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
 			<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="pay">立即支付</view>
 		</view>
+		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
+		    <view class="cancel" @click="cancelOrder" v-if="orderData.data.payState==2">退款</view>
+			<view class="cancel" @click="cancelBespeak" v-else>取消订单</view>
+		</view>
 
 
 		<!-- 券码 -->
@@ -217,6 +221,63 @@
 	</view>
 
 
+<!-- 退款原因 -->
+	<view class="tuikuanBox" v-if="isShowTui==true">
+		<view class="tuikuan">
+			<view class="tuiTop">
+				<view class="tuiTitle">退款</view>
+				<image @click="isShowTuiHide" src="../../../static/img/icon_delete.png" mode=""
+					style="width: 26rpx; height: 26rpx;"></image>
+	
+			</view>
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="../../static/img/icon_star.png" mode="" class="star"></image>
+					退款原因
+				</view>
+				<view class="contlineRight carModelRight" @click="">
+	
+					<picker class="carModel" @change="bindChange" mode="selector" :value="index"
+						:range="tuicauseList" range-key="contents">
+						<view class="uni-input">{{tuicauseList[index].contents}}</view>
+						<!-- <view class="uni-input noColor" v-else>请选择</view> -->
+					</picker>
+					<image src="../../static/img/little_rightArrow.png" mode="" class="contlineRightJt"></image>
+				</view>
+			</view>
+	
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="../../static/img/icon_star.png" mode="" class="star"></image>
+					退款金额
+				</view>
+				<view class="contlineRight carModelRight" @click="cktime">
+					<span class="carModel">{{orderData.data.realMoney}}</span>
+	
+				</view>
+			</view>
+	
+			<view class="contLine">
+				<view class="contlineLeft">
+					<image src="" mode="" class="star"></image>
+					补充描述
+				</view>
+	
+				<view class="contlineRight">
+					<textarea placeholder-style="color:#999999" placeholder="请输入" v-model="tuikuanContent"
+						class="contlineRightInput" maxlength="-1" auto-height="true" @confirm="feedDone" />
+				</view>
+			</view>
+	
+			<view class="tuiBtns">
+				<view class="btn" @click="isShowTuiHide">取消</view>
+				<view class="btn2" @click="goTui">确认退款</view>
+			</view>
+	
+		</view>
+	</view>
+
+
 	</view>
 </template>
 
@@ -258,6 +319,10 @@
                 userInfo:'',
                 ext:'',
                 wxOpenData:'',
+				isShowTui:false,
+				index:0,
+				tuicauseList: [],
+				tuikuanContent: '',
 			}
 		},
 		onLoad(opt) {
@@ -269,7 +334,8 @@
             this.ext=this.$common.getExtStoreId();
             if(this.userInfo){
             	if (this.id) {
-            		this.getData()
+            		this.getData();
+					this.getTuiKuanData()
             	}
             }else{
             	this.$common.automaticlogin().then(val => {
@@ -277,7 +343,8 @@
             		this.wxOpenData=this.$store.state.wxOpenData;
             		this.themeColor = uni.getStorageSync("themeColor");
             		if (this.id) {
-            			this.getData()
+            			this.getData();
+						this.getTuiKuanData()
             		}
 					if(!this.userInfo){
 						this.authorizShow=true
@@ -290,6 +357,52 @@
 		
 
 		methods: {
+			cancelOrder(){
+				this.isShowTui=true;
+			},
+			goTui(){
+				var that=this;
+				uni.showLoading({
+					title: '加载中'
+				})
+				let yuanyin = this.tuicauseList[this.index].contents
+				that.$http('openMallOrder/cancelOrder', {
+				    realMoney:that.orderData.data.realMoney,
+					sheetId: that.id,
+					refundReason:yuanyin,
+					refundComment:this.tuikuanContent,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					// var list = res.data.Items
+					this.isShowTui=false;
+					uni.showToast({
+						title: '取消成功',
+						icon: 'none',
+						duration: 2000
+					});
+					setTimeout(function() {
+						that.getData();
+					}, 1000);
+				})
+			},
+			isShowTuiHide(){
+				this.isShowTui=false;
+			},
+			bindChange(e) {
+				console.log(e);
+				this.index = e.detail.value
+			},
+			getTuiKuanData() {
+				console.log("退款原因")
+				this.$http('openMallOrder/getOpenReason', {
+			
+					// id: this.id,
+				}, 'GET').then(res => {
+				
+					this.tuicauseList = res.data;
+			
+				})
+			},
 			isShowMaSHow(){
 				 this.isShowMa=true
 			},
@@ -1064,4 +1177,125 @@
 			margin-top: 62rpx;
 			margin-left:71rpx;
 		}
+		.tuikuanBox {
+				width: 100%;
+				height: 100vh;
+				background: rgba(0, 0, 0, 0.4);
+				position: fixed;
+				left: 0;
+				top: 0;
+				z-index: 999;
+			}
+			
+			.tuikuan {
+				width: 638rpx;
+				height: 664rpx;
+				background: #ffffff;
+				margin: 0 36rpx;
+				margin-top: 50%;
+				border-radius: 24rpx;
+				padding: 30rpx 20rpx;
+			}
+			
+			.tuiTop {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 36rpx;
+			}
+			
+			.tuiTitle {
+				width: 56rpx;
+				height: 40rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #3C3C3C;
+				line-height: 40rpx;
+			
+			}
+			
+			.contLine {
+				display: flex;
+				justify-content: space-between;
+				font-size: 28rpx;
+				padding: 30rpx 0;
+				border-bottom: 1px solid #EEEEEE;
+			}
+			
+			.contlineLeft {
+				color: #666666;
+				line-height: 40rpx;
+				align-items: center;
+			}
+			
+			.star {
+				width: 14rpx;
+				height: 14rpx;
+				padding-bottom: 5rpx;
+			}
+			
+			.carModel {
+				width: 350rpx;
+				text-align: left;
+			}
+			
+			.noColor {
+				color: #CCCCCC;
+			}
+			
+			.carModelRight {
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+			}
+			
+			.contlineRight {
+				color: #333333;
+				line-height: 40rpx;
+			
+				width: 400rpx;
+				text-align: right;
+			}
+			
+			.contlineRightInput {
+				color: #333333;
+				text-align: left;
+				font-size: 28rpx;
+				min-height: 182rpx;
+				width: 400rpx;
+			}
+			
+			.contlineRightJt {
+				width: 30rpx;
+				height: 30rpx;
+			
+			}
+			
+			.tuiBtns {
+				display: flex;justify-content: space-around;
+				padding: 40rpx 20rpx 10rpx;
+			
+			}
+			.btn {
+				width: 250rpx;
+				height: 70rpx;
+				background: #F4F5F7;
+				border-radius: 10rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #3C3C3C;
+				line-height: 70rpx;
+				text-align: center;
+			}
+			
+			.btn2 {
+				width: 250rpx;
+				height: 70rpx;
+				background: #3F90F7;
+				border-radius: 10rpx;
+				font-size: 28rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+				line-height: 70rpx;
+				text-align: center;
+			}
 </style>

utils/request.js

@@ -9,7 +9,7 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
- //const baseUrl='http://192.168.0.124:20187/'
+//const baseUrl='http://192.168.0.124:20187/'
 //wx2c6f04c0dcd15984正式  wx33053a645546ec31
 //测试地址
 //const webUrl = 'http://dms.32che.cn/'