From 066667dc4f08a992b773340da47afd4854fafb8c Mon Sep 17 00:00:00 2001
From: BigBoss <2280520255@qq.com>
Date: Wed, 6 May 2020 17:16:53 +0800
Subject: [PATCH] add refundProgress

---
 src/pages.json                              |  15 +-
 src/pages/addArddess/addArddess.vue         |   8 +-
 src/pages/index/index.vue                   |   2 +-
 src/pages/myOrder/myOrder.vue               |   2 +-
 src/pages/refund/refund.vue                 |  19 --
 src/pages/refundProgress/refundProgress.vue | 269 ++++++++++++++++++++++++++++
 src/pages/user/user.vue                     |  20 ++-
 7 files changed, 302 insertions(+), 33 deletions(-)
 delete mode 100644 src/pages/refund/refund.vue
 create mode 100644 src/pages/refundProgress/refundProgress.vue

diff --git a/src/pages.json b/src/pages.json
index e25f6fd..950342a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,18 +1,18 @@
 {
 	"pages": [ 
 		{
+            "path" : "pages/refundProgress/refundProgress",
+			"style": {
+				"navigationBarTitleText": "申请退款"
+			}
+        },
+		{
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "商城一览"
 				// "enablePullDownRefresh":true
 			}
 		},
-		{
-            "path" : "pages/refund/refund",
-			"style": {
-				"navigationBarTitleText": "申请退款"
-			}
-        },
         {
             "path" : "pages/myOrder/myOrder",
             "style" : {
@@ -51,6 +51,9 @@
 			"path": "pages/refundment/refundment"
 		},
 		{
+			"path": "pages/Predelivery/Predelivery"
+		},
+		{
 			"path": "pages/customerService/customerService"
 		},
 		{
diff --git a/src/pages/addArddess/addArddess.vue b/src/pages/addArddess/addArddess.vue
index 84c390d..1cb04c0 100644
--- a/src/pages/addArddess/addArddess.vue
+++ b/src/pages/addArddess/addArddess.vue
@@ -13,7 +13,7 @@
 				<text class="itemText">地区</text>
 				<view class="btn" v-if="pickerText===''"  @tap="openAddres">选择省/市/区</view>
 				<view class="btn" v-else @tap="openAddres">{{pickerText}}</view>
-				<simple-address ref="simpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onConfirm" themeColor="#007AFF"></simple-address>
+				<simple-address ref="SimpleAddress" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onConfirm" themeColor="#007AFF"></simple-address>
 			</view>
 			<view class="item,address" >
 				<text class="itemText">详细地址</text>
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-	import simpleAddress from '@/components/Simple-address/simple-address.vue';
+	import SimpleAddress from '@/components/Simple-address/Simple-address.vue';
 	export default {
 		data() {
 			return {
@@ -41,12 +41,12 @@
 			};
 		},
 		components: {
-			simpleAddress
+			SimpleAddress
 		},
 		methods: {
 			openAddres() {
 				this.cityPickerValueDefault = [0,0,1]
-				this.$refs.simpleAddress.open();
+				this.$refs.SimpleAddress.open();
 			},
 			onConfirm(e) {
 				this.pickerText = e.label;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 416b7b1..a716465 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-	import UniDrawer from "@/components/uni-drawer/uni-drawer.vue";
+	import UniDrawer from "@/components/Uni-drawer/Uni-drawer.vue";
 	import Card from "../../components/Card/Card.vue"
 	import HMfilterDropdown  from "../../components/HM-filterDropdown/HM-filterDropdown.vue";
 	import data from '@/common/data.js';//筛选菜单数据
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index 6a1da17..06c1da6 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -21,7 +21,7 @@
 	</view>
 </template>
 <script>
-	import OrderCard from './orderCard.vue'
+	import OrderCard from './OrderCard.vue'
 	export default {
 		components:{
 			'OrderCard':OrderCard
diff --git a/src/pages/refund/refund.vue b/src/pages/refund/refund.vue
deleted file mode 100644
index 8c3b35f..0000000
--- a/src/pages/refund/refund.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>
diff --git a/src/pages/refundProgress/refundProgress.vue b/src/pages/refundProgress/refundProgress.vue
new file mode 100644
index 0000000..9d115ab
--- /dev/null
+++ b/src/pages/refundProgress/refundProgress.vue
@@ -0,0 +1,269 @@
+<template>
+	<view class="content">
+		<view class="header" v-if="type===1">
+			<view class="header-left">
+				<view class="text1" >退款中</view>
+				<view class="text2">还剩00:56:27确认</view>
+			</view>
+			<image class="header-right" src="../../static/customerService-simle.png" mode="aspectFill"></image>
+		</view>
+		<view class="header" v-if="type===2">
+			<view class="header-left">
+				<view class="text1" >商家处理中</view>
+				<view class="text2">还剩00:56:27确认</view>
+			</view>
+			<image class="header-right" src="../../static/customerService-simle.png" mode="aspectFill"></image>
+		</view>
+		<view class="header" v-if="type===3">
+			<view class="header-left">
+				<view class="text1" >卖家已发货</view>
+				<view class="text2">还剩 00:56:27 确认</view>
+			</view>
+			<image class="header-right" src="../../static/customerService-simle.png" mode="aspectFill"></image>
+		</view>
+		<view class="orderInfoCard">
+			<view class="info">
+				<image src="../../static/img/detail/d1.png" mode="aspectFill"></image>
+				<view class="infoText">
+					<view class="orderName">商品名称商品名称商品名称</view>
+					<view class="orderDescrib">规格：玫瑰金 / 钛合金 / 防日光防紫外线</view>
+					<view class="infoText-bottom">
+						<view class="markPrice">￥188</view>
+						<view class="buy-num">X 1</view>
+					</view>
+				</view>
+			</view>
+			<view class="refund_price">
+				<text class="refund_price_title">退款金额</text>
+				<text class="refund_price_price">￥110</text>
+			</view>
+		</view>
+		<view class="application">
+			<view class="title">申请记录</view>
+			<view class="item">
+				<text class="text1">服务类型</text>
+				<text class="text2">退款</text>
+			</view>
+			<view class="item">
+				<text class="text1">换货原因</text>
+				<text class="text2">不想要了</text>
+			</view>
+			<view class="item">
+				<text class="text1">申请时间</text>
+				<text class="text2">2020-10-22 17:55:03</text>
+			</view>
+			<view class="item">
+				<text class="text1">货物编号</text>
+				<text class="text2">173549842184</text>
+			</view>
+			<view class="button">
+				<image src="../../static/customerService-horn.png" mode="aspectFill" style="width: 38rpx;height: 38rpx;"></image>
+				<text>联系客服</text>
+			</view>
+		</view>
+		<view class="btn-bar" v-if="type===1">
+			<view class="btn2">
+				退款进度
+			</view>
+		</view>
+		<view class="btn1" v-if="type===2">
+			修改申请
+		</view>
+		<view  v-if="type===3"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type:3
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{
+		background-color: #F2F2F2;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		.header{
+			width: 100%;
+			height: 142rpx;
+			background-color: #4A90E2;
+			color: #FFFFFF;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding:  0 60rpx;
+			box-sizing: border-box;	
+			.header-left{
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+				height: 92rpx;
+				width: 220rpx;
+				color: #FFFFFF;
+				.text1{
+					font-size: 36rpx;
+				}
+				.text2{
+					font-size: 24rpx;
+				}
+			}
+			.header-right{
+				height: 48rpx;
+				width: 48rpx;
+			}
+		}
+		.orderInfoCard{
+			height: 362rpx;
+			width: 670rpx;
+			background: #FFFFFF;
+			box-shadow: 0 0 10px 0 rgba(177,128,128,0.06);
+			border-radius: 8px;
+			margin-top: 20rpx;
+			margin-bottom: 20rpx;
+			padding: 40rpx 40rpx 60rpx 40rpx;
+			box-sizing: border-box;	
+			.info{
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 30rpx;
+				image{
+					height: 188rpx;
+					width: 188rpx;
+					margin-right: 24rpx;
+				}
+				.infoText{
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: flex-start;
+					height: 188rpx;
+				}
+				.orderName{
+					font-size: 14px;
+					color: #333333;
+				}
+				.orderDescrib{
+					font-size: 12px;
+					color: #999999;
+				}
+				.infoText-bottom{
+					display: flex;
+					flex-direction: row;
+					justify-content: space-between;
+					align-items: center;
+					width: 100%;
+					.markPrice{
+						font-size: 14px;
+						color: #FF6B4A;
+					}
+					.buy-num{
+						font-size: 12px;
+						color: #999999;
+					}
+				}
+			}
+			.refund_price{
+				text-align: right;
+				.refund_price_title{
+					font-size: 14px;
+					color: #333333;
+					margin-right: 40rpx;
+				}
+				.refund_price_price{
+					font-size: 14px;
+					color: #FF6B4A;
+				}
+			}
+		}
+		.application{
+			background: #FFFFFF;
+			box-shadow: 0 0 10px 0 rgba(177,128,128,0.06);
+			border-radius: 8px;
+			height: 532rpx;
+			width: 670rpx;
+			margin-bottom: 132rpx;
+			padding: 40rpx 40rpx 32rpx 36rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			.title{
+				font-size: 16px;
+				color: #333333;
+			}
+			.item{
+				font-size: 12px;
+				color: #999999;
+				.text1{
+					font-size: 12px;
+					color: #999999;
+					margin-right: 40rpx;
+				}
+				.text2{
+					font-size: 12px;
+					color: #B8B8B8;
+				}
+			}
+			.button{
+				display: flex;
+				justify-content: flex-start;
+				image{
+					margin-right: 20rpx;
+				}
+				font-size: 14px;
+				color: #333333;
+			}
+		}
+		.btn1{
+			position: fixed;
+			height: 112rpx;
+			width: 100%;
+			background-color: #FF6B4A;
+			color: #FFFFFF;
+			font-size: 32rpx;
+			left: 0;
+			bottom: 0;
+			font-size: 16px;
+			color: #FFFFFF;
+			line-height: 112rpx;
+			text-align: center;
+		}
+		.btn-bar{
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			height: 112rpx;
+			width: 100%;
+			background-color: #FFFFFF;
+			padding-right: 26rpx;
+			box-sizing: border-box;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			.btn2{
+				width: 204rpx;
+				height: 80rpx;
+				border: 1px solid #FF6B4A;
+				border-radius: 20px;
+				border-radius: 20px;
+				background-color: #FFFFFF;
+				font-size: 16px;
+				color: #FF6B4A;
+				line-height: 80rpx;
+				text-align: center;
+			}
+		}
+			
+	}
+</style>
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index 06d65fa..5f5948e 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -22,11 +22,11 @@
 					</view>
 				</view>
 				<view class="orderBody">
-					<view class="item,waitPay">
+					<view class="item,waitPay" @click=toMyOrderPaying>
 						<image src="../../static/waitPay.png" mode="aspectFill"></image>
 						<text>待付款</text>
 					</view>
-					<view class="item,waitDeliver">
+					<view class="item,waitDeliver" @click=toPredelivery>
 						<image src="../../static/waitDeliver.png" mode="aspectFill"></image>
 						<text>待发货</text>
 					</view>
@@ -98,6 +98,22 @@
 					fail: () => {},
 					complete: () => {}
 				});
+			},
+			toPredelivery(){
+				uni.navigateTo({
+					url: '../Predelivery/Predelivery',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
+			},
+			toMyOrderPaying(){
+				uni.navigateTo({
+					url: '../myorder-paying/myorder-paying',
+					success: res => {},
+					fail: () => {},
+					complete: () => {}
+				});
 			}
 		}
 	}
-- 
2.0.0