1

pages/shop/confirm.vue

@@ -195,6 +195,7 @@
 						this.orderData=res.data
 						this.unifiedPay(res.data)
 					}else{
+							this.isgo=true;
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',
@@ -516,7 +517,7 @@
 	display: flex;
 }
 .numJj{
-	width: 52rpx;
+	width: 60rpx;
 	height: 44rpx;
 	background: #F4F5F7;
 	border-radius: 0px 6rpx 6rpx 0px;	

pages/shop/goodsDetail.vue

@@ -695,7 +695,7 @@
 	font-size: 24rpx;
 }
 .numJj{
-	width: 52rpx;
+	width: 60rpx;
 	height: 44rpx;
 	background: #F4F5F7;
 	border-radius: 0px 6rpx 6rpx 0px;	

pages/subPack/maintainItem.vue

@@ -646,7 +646,7 @@ color: #666E80;
 	font-size: 24rpx;
 }
 .numJj{
-	width: 44rpx;
+	width: 52rpx;
 	height: 44rpx;
 	background: #ffffff;
 	border-radius: 0px 6rpx 6rpx 0px;	

pages/subPack/refund.vue

@@ -47,7 +47,7 @@
 		  </view>
 	 	 <view class="goodsline flex" >
 	 	 		 <view class="goodsLeft">退款方式</view>
-	 	 		 <view class="goodRight" style="font-size: 26rpx;font-weight: 500;color: #222222;">原路退回</view>
+	 	 		 <view class="goodRight" style="font-size: 28rpx;font-weight: 500;color: #222222;">原路退回</view>
 	 	 </view>
 	 </view>
 	 <view class="goodsBox">
@@ -724,7 +724,7 @@
 	width: 610rpx;padding: 22rpx;
 	margin-bottom: 10rpx;
 	line-height: 30rpx;
-	height: 200rpx;
+	height: 180rpx;
 }
 .textareaNum{
 	font-size: 24rpx;
@@ -911,7 +911,7 @@ border-radius: 16rpx;
 	padding-left: 32rpx;
 }
 .Btn{
-	width: 467rpx;
+	width: 400rpx;
 	height: 86rpx;text-align: center;
 	line-height: 86rpx;
 	background: #FCD903;

pages/subPack/refundDetail.vue

@@ -1,9 +1,9 @@
 <template>
 <view class="box">
  <view class="cont">
-	 <view class="topBox goodsBox" v-if="data.openSheetRefund.refundState == 1 || data.openSheetRefund.refundState == 3">
-		 <view class="topState">
-			 <view class="tsTop">
+	 <view class="topBox goodsBox" v-if="data.openSheetRefund.refundState == 1 ">
+		 <view class="topState" >
+			 <view class="tsTop" v-if="data.openSheetRefund.refundState == 1">
 				 <view class="tsYd"></view>
 				 <view class="tsHx"></view>
 				 <view class="tsYd"></view>
@@ -12,7 +12,7 @@
 				 <view class="tsHx tsHx2"></view>
 				 <view class="tsYd tsYd2"></view>
 			 </view>
-			 <view class="tsM">
+			 <view class="tsM" v-if="data.openSheetRefund.refundState == 1">
 				 <view class="tsMline">发起退款</view>
 				 <view class="tsMline">商家处理</view>
 				 <view class="tsMline tsMline2">商家退款</view>
@@ -22,9 +22,15 @@
 				 <span>请等待</span><span style="color: #EC0F0A;">商家处理</span>
 			 </view>
 			 <view class="txTxt2"  v-if="data.openSheetRefund.refundState == 1">已发起退款申请</view>
-			 <view class="txTxt" v-if="data.openSheetRefund.refundState == 3">
-			 	<span>商家</span><span style="color: #EC0F0A;">拒绝退款</span>
-			 </view>
+			
+		 </view>
+	 </view>
+	 <view class="goodsBox topBox"  v-if="data.openSheetRefund.refundState == 3">
+		 <view class="txTxt" style="padding-top: 0;">
+		 	<span>商家</span><span style="color: #EC0F0A;">拒绝退款</span>
+		 </view>
+		 <view class="txTxt2">
+		 				 您的退款申请已被商家拒绝
 		 </view>
 	 </view>
 	 <view class="goodsBox topBox" v-if="data.openSheetRefund.refundState == 2">
@@ -32,35 +38,42 @@
 		 <view class="tksuccess">
 			 <view class="tksuccessYx">
 				 <view class="tksuccessTxt">原路退回</view>
-				 <view class="tksuccessPrice">¥<span style="font-size: 36rpx;">{{data.openSheetRefund.money}}</span> </view>
+				 <view class="tksuccessPrice">¥<span style="font-size: 36rpx;">{{data.openSheetRefund.realMoney}}</span> </view>
 			 </view>
 			 <view class="tksuccessTime">{{data.openSheetRefund.reAccountTime}}</view>
 		 </view>
 	 </view>
 	 <!-- 退款关闭-->
 	 <view class="goodsBox topBox" v-if="data.openSheetRefund.refundState == 4||data.openSheetRefund.refundState == 5">
-	 	<view class="tkTopTitle">退款关闭</view>
+	 	<view class="tkTopTitle" v-if="data.openSheetRefund.refundState == 4">退款失败</view>	 
+		<view class="tkTopTitle" v-if="data.openSheetRefund.refundState == 5">退款关闭</view>
 	 	<view class="tkErr" v-if="data.openSheetRefund.refundState == 4">退款失败</view>	 
 		<view class="tkErr" v-if="data.openSheetRefund.refundState == 5">用户已取消退款</view>	 
 	 </view>
 	 <!-- 退款关闭-->
+	 <view class="goodsBox topBox" v-if="data.openSheetRefund.refundState ==6">
+	 	<view class="tkTopTitle" >待退款到账</view>	 
+	 		
+	 	<view class="tkErr" >等待商家退款</view>	 
+	 </view>
 	 <view class="itemBox flex">
 		 </image>
 		 <image class="itemIMg"  src="../../static/timg/noimg.png" mode=""></image>
 		 <view class="itemRight">
-		 	<view class="itemName">{{data.openSheetRefund.itemName}}</view>
+		 	<view class="itemName" v-if="data.openSheet.sheetType!=5">{{data.openSheetRefund.itemName}}</view>
+			<view class="itemName" v-if="data.openSheet.sheetType==5">钣喷</view>
 			<view class="priceBox">
 				<view class="price">¥{{data.openSheet.realMoney}}</view>
 			</view>
 		 </view>
 	 </view>
 
-	 <view class="goodsBox">
+	 <view class="goodsBox" v-if="data">
 	 	 <view class="goodsline flex" v-if="data.openSheetRefund.couponCount==1" >
 	 	 		 <view class="goodsLeft">退款券号</view>
 	 	 		 <view class="goodRight" style="display: flex;">
 	 	 				<image @click="copy(data.openSheetRefund.couponCode)" src="../../static/img2/copy.png" mode="" class="copyIcon"></image>
-						<span>{{data.openSheetRefund.couponCode}}</span>
+						<span v-if="data.openSheetRefund.couponCode">{{data.openSheetRefund.couponCode}}</span>
 	 	 		 </view>
 	 	 </view>
 		 <view class="goodsline flex" v-if="data.openSheetRefund.couponCount!=1">
@@ -108,19 +121,19 @@
 				 </view>
 		 </view>
 	 </view>
-	 <view class="goodsBox">
+	 <view class="goodsBox2">
 		<view class="goodsline flex" >
 				 <view class="goodsLeft">订单编号</view>
 				 <view class="goodRight" style="display: flex;">
 						<image  @click="copy(data.openSheetRefund.sheetCode)" src="../../static/img2/copy.png" mode="" class="copyIcon"></image>
-								<span>{{data.openSheetRefund.sheetCode}}</span>
+								<span v-if="data">{{data.openSheetRefund.sheetCode}}</span>
 				 </view>
 		</view>
 		<view class="goodsline flex" >
 				 <view class="goodsLeft">退款编号</view>
 				 <view class="goodRight" style="display: flex;">
 						<image  @click="copy(data.openSheetRefund.code)" src="../../static/img2/copy.png" mode="" class="copyIcon"></image>
-								<span>{{data.openSheetRefund.code}}</span>
+								<span v-if="data">{{data.openSheetRefund.code}}</span>
 				 </view>
 		</view>
 		
@@ -173,7 +186,7 @@
 			if(opt.id){
 				this.id=opt.id
 			}
-			
+			//this.id='CC691F61-C7BF-44F2-8F50-4F69480DB599'
 			this.userInfo=this.$store.state.userInfo;
 			this.ext=this.$common.getExtStoreId();
 			if(this.userInfo){
@@ -315,14 +328,14 @@
 	font-size: 36rpx;
 	color: #222222;
 	line-height: 50rpx;
-	padding-top: 20rpx;
+	padding-top: 30rpx;
 }
 .txTxt2{
 	font-size: 24rpx;
 	color: #9A9A9A;
 	line-height: 33rpx;
 	padding-top: 8rpx;
-	padding-bottom: 20rpx;
+	/* padding-bottom: 20rpx; */
 }
 .tsYd{
 	width: 12rpx;
@@ -605,10 +618,15 @@ margin-top: 10rpx;
 	line-height: 38rpx;
 }
 .goodsBox{
-	padding:18rpx 24rpx 30rpx 18rpx;font-size: 28rpx;
+	padding:18rpx 24rpx 24rpx 24rpx;font-size: 28rpx;
 color: #222222;background: #FFFFFF;margin-top: 20rpx;
 border-radius: 16rpx;
 }
+.goodsBox2{
+	padding:18rpx 24rpx 18rpx 24rpx;font-size: 28rpx;
+	color: #222222;background: #FFFFFF;margin-top: 20rpx;
+	border-radius: 16rpx;
+}
 .goodsline{
 	justify-content: space-between;
 	padding: 18rpx 0;
@@ -624,8 +642,8 @@ border-radius: 16rpx;
 .tkErr{
 	font-size: 26rpx;
 	color: #9A9A9A;
-	padding-bottom: 10rpx;
-	padding-bottom: 20rpx;
+	/* padding-bottom: 10rpx;
+	padding-bottom: 20rpx; */
 }
 .codeLine{
 	font-size: 26rpx;

pages/user/myOrder/activityOrderDetail.vue

@@ -212,12 +212,12 @@
 				<view class="informationTxt">单位：</view>
 				<view class="informationNum">{{orderData.data.unit}}</view>
 			</view>
-			<view class="informationLine">
+			<view class="informationLine" v-if="orderData">
 				<view class="informationTxt">报名时间：</view>
 				<view class="informationNum">{{orderData.data.createTime}}</view>
 			</view>
 			
-			<view class="informationLine NoBorder">
+			<view class="informationLine NoBorder" v-if="orderData">
 				<view class="informationTxt">订单单号：</view>
 				<view class="informationNum">{{orderData.data.code}}<span class="codeCopy"
 						@click="copy(orderData.data.code)">复制</span></view>
@@ -1081,9 +1081,11 @@
 			  let H = D - shengyuH * 60 * 60 * 1000 // 除去天、小时的毫秒数
 			  let shengyuM = parseInt(H / (60 * 1000)) // 除去天的毫秒数转换成分钟
 			  let M = H - shengyuM * 60 * 1000// 除去天、小时、分的毫秒数
-			  let S = parseInt((shenyu - shengyuD * 60 * 60 * 24 * 1000 - shengyuH * 60 * 60 * 1000 - shengyuM * 60 * 1000) / 1000)// 除去天、小时、分的毫秒数转化为秒
+			  //let S = parseInt((shenyu - shengyuD * 60 * 60 * 24 * 1000 - shengyuH * 60 * 60 * 1000 - shengyuM * 60 * 1000) / 1000)// 除去天、小时、分的毫秒数转化为秒
+			  let S = parseInt((shenyu - shengyuH * 60 * 60 * 1000 - shengyuM * 60 * 1000) / 1000)// 除去天、小时、分的毫秒数转化为秒
 			 //console.log(S)
-			 // this.daojishi = '报名倒计时:' + shengyuD + '天' + shengyuH + '小时' + shengyuM + '分' + S + '秒'
+			// var daojishi = '报名倒计时:' + shengyuD + '天' + shengyuH + '小时' + shengyuM + '分' + S + '秒'
+			// console.log(daojishi)
 			  // setTimeout("clock()",500);
 			  this.dh=shengyuH;
 			  this.dm=shengyuM;
@@ -1400,7 +1402,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 
 
 	.detailedTitle {
-		padding: 23rpx 20rpx;
+		padding: 23rpx 20rpx 23rpx 0;
 		display: flex;
 		text-align: center;
 		align-content: flex-start;
@@ -1502,13 +1504,13 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 		display: flex;
 		justify-content: space-between;
 		font-size: 26rpx;
-		padding: 20rpx;
+		padding: 20rpx 0;
 		align-items: center;
 		padding-bottom: 0;
 	}
 
 	.salePrice {
-		    padding-left: 20rpx;
+		  /*  padding-left: 20rpx; */
 		    padding-top: 15rpx;
 		font-size: 26rpx;
 		font-weight: 500;
@@ -2093,7 +2095,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	}
 	.tkSeeD{
 		font-weight: 400;
-		font-size: 26rpx;
+		font-size: 28rpx;
 		color: #9A9A9A;
 		line-height: 40rpx;
 	}
@@ -2102,7 +2104,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	}
 	.tkRow{
 		display: flex;
-		font-size: 26rpx;
+		font-size: 28rpx;
 		padding-top: 18rpx;
 		
 	}

pages/user/myOrder/mallOrderDetail.vue

@@ -144,7 +144,7 @@
 		</view>
 
 		<!-- 套餐内容 -->
-		<view class="information" v-if="SheetType==3">
+		<view class="information tcinformation" v-if="SheetType==3">
 			<view class="detailedTitle">套餐内容</view>
 			<!-- 项目 -->
 			<view class="itemBox" v-if="orderData.projectList.length>0">
@@ -202,7 +202,7 @@
 		<!-- 订单信息 -->
 		<view class="information">
 		<!-- 	<view class="detailedTitle">订单信息</view> -->
-			<view class="informationLine">
+			<view class="informationLine" v-if="orderData">
 				<view class="informationTxt">订单单号：</view>
 				<view class="informationNum" style="    display: flex;">
 				<image src="../../../static/img2/copy.png" mode="" @click="copy(orderData.data.code)" class="copyIcon"></image>
@@ -556,6 +556,7 @@
 		onLoad(opt) {
 			this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
+			//this.id='2D524C99-BE6F-4E63-93FC-B76172C118E0'
 			this.SheetType = opt.SheetType
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.userInfo=this.$store.state.userInfo;
@@ -1153,7 +1154,7 @@
 
 
 	.detailedTitle {
-		padding: 23rpx 20rpx;
+		padding: 23rpx 20rpx 23rpx 0;
 		display: flex;
 		text-align: center;
 		align-content: flex-start;
@@ -1255,7 +1256,7 @@
 		display: flex;
 		justify-content: space-between;
 		font-size: 26rpx;
-		padding: 0 20rpx;
+		/* padding: 0 20rpx; */
 	}
 
 	.salePrice {
@@ -1291,7 +1292,7 @@
 	}
 
 	.goodsName {
-		padding: 20rpx 20rpx 15rpx;
+		padding: 20rpx 20rpx 15rpx 0;
 
 		color: #333333;
 		font-size: 26rpx;
@@ -1804,7 +1805,7 @@
 }
 .tkSeeD{
 	font-weight: 400;
-	font-size: 26rpx;
+	font-size: 28rpx;
 	color: #9A9A9A;
 	line-height: 40rpx;
 }
@@ -1813,7 +1814,7 @@
 }
 .tkRow{
 	display: flex;
-	font-size: 26rpx;
+	font-size: 28rpx;
 	padding-top: 18rpx;
 	
 }
@@ -1877,4 +1878,7 @@
 .xiahuaxian{
 	text-decoration: line-through;
 }
+.tcinformation{
+	padding: 0 0 30rpx 0;
+}
 </style>

pages/user/myOrder/myOrder.vue

@@ -52,7 +52,7 @@
 					</view>
 					<view class="bottom" v-if="item.SheetState == 1">
 						<view class="cancel" @click.stop="cancelBespeak(item)">取消订单</view>
-						<view class="defer"  @click.stop="pay(item)">立即支付</view>
+						<view class="defer" v-if="item.PayType == 1"  @click.stop="pay(item)">立即支付</view>
 					</view>
 				</view>
 			</view>
@@ -69,7 +69,8 @@
 					<view class="afterSalesLineCont">
 						<image src="../../../static/timg/noimg.png" class="afterSalesLineImg" mode=""></image>
 					    <view class="shCont">
-							<view class="shCOntName">{{item.ItemName}}</view>
+							<view class="shCOntName" v-if="item.sheetType!=5">{{item.ItemName}}</view>
+							<view class="shCOntName" v-if="item.sheetType==5">钣喷</view>
 							<view class="shContMS">共 {{item.CouponCount}} 件商品</view>
 							<view class="shContMS">退款：¥{{item.Money}}</view>
 						</view>

pages/user/myOrder/paintOrderDetail.vue

@@ -238,7 +238,7 @@
 		<view class="bottom" v-if="orderData.data.sheetState == 1">
 
 			<view class="cancel" @click="cancelBespeak">取消订单</view>
-			<view class="defer"  @click="pay">立即支付</view>
+			<view class="defer"  @click="pay" v-if="orderData.data.payType==1">立即支付</view>
 			<!-- :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" -->
 		</view>
 		<view class="bottom" v-if="orderData.data.sheetState == 2||orderData.data.sheetState == 5">
@@ -522,7 +522,7 @@
 		onLoad(opt) {
 			 this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 			this.id = opt.id
-			
+			//this.id='CC691F61-C7BF-44F2-8F50-4F69480DB599'
 			 this.themeColor = uni.getStorageSync("themeColor");
              this.userInfo=this.$store.state.userInfo;
             this.ext=this.$common.getExtStoreId();
@@ -622,7 +622,7 @@
 			},
 			refundDetail(item){
 				uni.navigateTo({
-					url:'../../subPack/refundDetail?id='+item.id
+					url:'../../subPack/refundDetail?id='+item.refundSheetID
 				})
 			},
 			xsHide(){
@@ -1114,7 +1114,7 @@
 
 
 	.detailedTitle {
-		padding: 23rpx 20rpx;
+		padding: 23rpx 20rpx 23rpx 0;
 		display: flex;
 		text-align: center;
 		align-content: flex-start;
@@ -1761,7 +1761,7 @@
 }
 .tkSeeD{
 	font-weight: 400;
-	font-size: 26rpx;
+	font-size: 28rpx;
 	color: #9A9A9A;
 	line-height: 40rpx;
 }
@@ -1770,7 +1770,7 @@
 }
 .tkRow{
 	display: flex;
-	font-size: 26rpx;
+	font-size: 28rpx;
 	padding-top: 18rpx;
 	
 }

utils/request.js

@@ -11,7 +11,7 @@ console.log(extConfig)
 //const baseUrl=extConfig.url+'/'
 const baseUrl='http://api2.dms.66km.com.cn/'
 //const baseUrl='http://dms.66km.com.cn/'
-//const baseUrl='http://192.168.1.9:20187/' 
+//const baseUrl='http://192.168.1.18:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'
 //const baseUrl='https://apidms.66km.com/'
 //京猫虎