From 697c1032cd8689d4627c3ec26fec5ed8c558930e Mon Sep 17 00:00:00 2001
From: mullins <476823686@qq.com>
Date: Mon, 11 May 2020 16:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AEgit=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E5=A4=A7=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Predelivery/Predelivery.vue | 151 ---------------------------------
 src/pages/predelivery/predelivery.vue | 152 ++++++++++++++++++++++++++++++++++
 src/pages/refundment/refundWays.vue   | 152 ++++++++++++++++++++++++++++++++++
 3 files changed, 304 insertions(+), 151 deletions(-)
 delete mode 100644 src/pages/Predelivery/Predelivery.vue
 create mode 100644 src/pages/predelivery/predelivery.vue
 create mode 100644 src/pages/refundment/refundWays.vue

diff --git a/src/pages/Predelivery/Predelivery.vue b/src/pages/Predelivery/Predelivery.vue
deleted file mode 100644
index 5d486ff..0000000
--- a/src/pages/Predelivery/Predelivery.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-    <view class="container">
-        <view v-for="(items) in form" :key="items.key" class="order">
-            <view class="order_number">订单号：{{items.orderNum}}<span>待发货</span></view>
-            <view class="order_detail">
-                <view class="detail_img"><image v-bind:src="items.img"></image></view>
-                <view class="detail_zi">
-                    <view class="zi_name">{{items.name}}</view>
-                    <view class="zi_standard">规格：{{items.standard}}</view>
-                    <view class="zi_preprice">￥{{items.preprice}}<span>X{{items.number}}</span></view>
-                </view>
-            </view>
-            <view class="now_price">实付：<span>￥{{items.nowprice}}</span></view>
-            <view class="clear"></view>
-            <view class="button">
-                <view class="button1">申请退款</view>
-                <view class="button2">提醒发货</view>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-export default {
-    data(){
-        return{
-            form:[
-                {
-                    key: 0,
-                    name:'商品名称',
-                    standard:'玫瑰金/钛合金/防日光防紫外线/超薄超轻',
-                    img: '/static/img/detail/delivery.png',
-                    preprice: 180,
-                    number:1,
-                    orderNum: 2034867958596334,
-                    nowprice: 110,
-                }
-            ]
-
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-.container{
-    width: 100%;
-    height: 100%;
-    background: #F2F2F2;
-    height: 700px;
-    //要获取屏幕大小
-}
-.order{
-    background: #FFFFFF;
-    width: 90%;
-    height: 450rpx;
-    margin: 0 auto;
-    padding: 40rpx;
-    box-sizing: border-box;
-    border-radius: 5px;
-}
-.order_number{
-    color: #999999;
-    font-size: 12px;
-    font-family: "PingFangSC-Regular";
-    span{
-        font-family: PingFangSC-Regular;
-        font-size: 14px;
-        color: #FF6B4A;
-        letter-spacing: -0.26px;
-        line-height: 18px;
-        float: right;
-    }
-}
-.order_detail{
-    display: flex;
-    justify-content: space-around;
-    margin-top: 12px;
-}
-.detail_img image{
-    width: 188rpx;
-    height:  188rpx;
-}
-.detail_zi{
-    font-family: PingFangSC-Regular;
-    width: 55%;
-    height: 100%;
-    view{
-        margin-bottom: 20rpx;
-    }
-    .zi_name{
-        font-size: 14px;
-        color: #333333;
-        letter-spacing: -0.26px;
-        line-height: 18px;
-    }
-    .zi_standard{
-        font-size: 12px;
-        color: #999999 ;
-    }
-    .zi_preprice{
-        font-size: 14px;
-        color: #FF6B4A;
-        span{
-            float: right;
-            font-size: 12px;
-            color: #999999;
-        }
-    }
-}
-.now_price{
-    font-size: 14px;
-    color: #333333;
-    float: right;
-    span{
-        font-size: 14px;
-        color: #FF6B4A ;
-    }
-}
-.clear{
-    clear: both;
-}
-.button{
-    display: flex;
-    justify-content: flex-end;
-    margin-top: 14px;
-    view{
-        width: 156rpx;
-        height: 48rpx;
-        border-radius: 12px;
-        font-size: 12px;
-        text-align: center;
-        line-height: 20px;
-    }
-    .button1{
-        border: 1px solid #FF6B4A;
-        font-family: PingFangSC-Regular;
-        color: #FF6B4A;
-        letter-spacing: -0.23px;
-        margin-right: 30rpx;
-    }
-    .button2{
-        border: 1px solid #FF6B4A;
-        background: #FF6B4A;
-        font-family: PingFangSC-Regular;
-        color: #FFFFFF;
-        letter-spacing: -0.23px;
-
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/predelivery/predelivery.vue b/src/pages/predelivery/predelivery.vue
new file mode 100644
index 0000000..87274e2
--- /dev/null
+++ b/src/pages/predelivery/predelivery.vue
@@ -0,0 +1,152 @@
+<template>
+    <view class="container">
+        <view v-for="(items) in form" :key="items.key" class="order">
+            <view class="order_number">订单号：{{items.orderNum}}<span>待发货</span></view>
+            <view class="order_detail">
+                <view class="detail_img"><image v-bind:src="items.img"></image></view>
+                <view class="detail_zi">
+                    <view class="zi_name">{{items.name}}</view>
+                    <view class="zi_standard">规格：{{items.standard}}</view>
+                    <view class="zi_preprice">￥{{items.preprice}}<span>X{{items.number}}</span></view>
+                </view>
+            </view>
+            <view class="now_price">实付：<span>￥{{items.nowprice}}</span></view>
+            <view class="clear"></view>
+            <view class="button">
+                <view class="button1">申请退款</view>
+                <view class="button2">提醒发货</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data(){
+        return{
+            form:[
+                {
+                    key: 0,
+                    name:'商品名称',
+                    standard:'玫瑰金/钛合金/防日光防紫外线/超薄超轻',
+                    img: '/static/img/detail/delivery.png',
+                    preprice: 180,
+                    number:1,
+                    orderNum: 2034867958596334,
+                    nowprice: 110,
+                }
+            ]
+
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.container{
+    width: 100%;
+    height: 100%;
+    background: #F2F2F2;
+    height: 700px;
+    //要获取屏幕大小
+}
+
+.order{
+    background: #FFFFFF;
+    width: 90%;
+    height: 450rpx;
+    margin: 0 auto;
+    padding: 40rpx;
+    box-sizing: border-box;
+    border-radius: 5px;
+}
+.order_number{
+    color: #999999;
+    font-size: 12px;
+    font-family: "PingFangSC-Regular";
+    span{
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #FF6B4A;
+        letter-spacing: -0.26px;
+        line-height: 18px;
+        float: right;
+    }
+}
+.order_detail{
+    display: flex;
+    justify-content: space-around;
+    margin-top: 12px;
+}
+.detail_img image{
+    width: 188rpx;
+    height:  188rpx;
+}
+.detail_zi{
+    font-family: PingFangSC-Regular;
+    width: 55%;
+    height: 100%;
+    view{
+        margin-bottom: 20rpx;
+    }
+    .zi_name{
+        font-size: 14px;
+        color: #333333;
+        letter-spacing: -0.26px;
+        line-height: 18px;
+    }
+    .zi_standard{
+        font-size: 12px;
+        color: #999999 ;
+    }
+    .zi_preprice{
+        font-size: 14px;
+        color: #FF6B4A;
+        span{
+            float: right;
+            font-size: 12px;
+            color: #999999;
+        }
+    }
+}
+.now_price{
+    font-size: 14px;
+    color: #333333;
+    float: right;
+    span{
+        font-size: 14px;
+        color: #FF6B4A ;
+    }
+}
+.clear{
+    clear: both;
+}
+.button{
+    display: flex;
+    justify-content: flex-end;
+    margin-top: 14px;
+    view{
+        width: 156rpx;
+        height: 48rpx;
+        border-radius: 12px;
+        font-size: 12px;
+        text-align: center;
+        line-height: 20px;
+    }
+    .button1{
+        border: 1px solid #FF6B4A;
+        font-family: PingFangSC-Regular;
+        color: #FF6B4A;
+        letter-spacing: -0.23px;
+        margin-right: 30rpx;
+    }
+    .button2{
+        border: 1px solid #FF6B4A;
+        background: #FF6B4A;
+        font-family: PingFangSC-Regular;
+        color: #FFFFFF;
+        letter-spacing: -0.23px;
+
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/refundment/refundWays.vue b/src/pages/refundment/refundWays.vue
new file mode 100644
index 0000000..25f82f2
--- /dev/null
+++ b/src/pages/refundment/refundWays.vue
@@ -0,0 +1,152 @@
+<template>
+    <view class="container" v-bind:style="{height: curheight+'px'}">
+        <view class="refund" v-for="(items) in refund" :key="items.key">
+            <view class="detail">
+                <view class="detail_img"><image v-bind:src="items.img"></image></view>
+                <view class="detail2">
+                    <view class="detail_name">{{items.name}}</view>
+                    <view class="detail_standard">规格：{{items.standard}}</view>
+                    <view class="detail_price">
+                        <span>￥{{items.price}}</span>
+                        <span>X{{items.number}}</span>
+                    </view>
+                </view>
+            </view>
+            <view class="refund_price">
+                <span class="refund_price1">退款金额</span>
+                <span class="refund_price2">￥{{items.refundprice}}</span>
+            </view>
+            <view class="refund_reason">
+                <view>仅退款<image src="/static/img/detail/xiala.png"></image></view>
+            </view>
+            <view class="refund_reason">
+                <view>退款退货<image src="/static/img/detail/xiala.png"></image></view>
+            </view>
+            <view class="refund_reason">
+                <view>换货<image src="/static/img/detail/xiala.png"></image></view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    //获取浏览器高度
+    beforeMount(height){
+        var h = document.documentElement.clientHeight || document.body.clientHeight;
+        this.curheight = h-44; 
+        
+    },
+    data(){
+        return{
+            curheight:0,   //浏览器高度
+            refund:[
+                {
+                    key:0,
+                    img:'/static/img/detail/d1.png',
+                    name:'商品名称',
+                    standard:'玫瑰金/钛合金/防日光防紫外线/超薄超轻',
+                    price: 180,
+                    number: 1,
+                    refundprice: 110,
+                    refund_img:'/static/img/detail/refund_img.png',
+                }
+            ],
+        }   
+    }
+}
+</script>
+
+<style lang="scss">
+
+.container{
+    background: #F2F2F2;
+    padding-top: 10px;
+    box-sizing: border-box;
+}
+.refund{
+    width: 90%;
+    height: 300px;
+    margin: 0 auto;
+    background: #FFFFFF;
+    box-shadow: 0 0 10px 0 rgba(177,128,128,0.06);
+    border-radius: 8px;
+    padding: 14px;
+    box-sizing: border-box;
+}
+.detail{
+    display: flex;
+    justify-content: space-between;
+    font-family: PingFangSC-Regular;
+    margin-bottom: 20px;
+    .detail2{
+        width: 64%;
+        view{
+            margin-bottom: 8px;
+        }
+        .detail_name{
+            font-size: 14px;
+            color:#333333;
+        }
+        .detail_standard{
+            font-size: 12px;
+            color: #999999;
+        }
+        .detail_price{
+            font-size: 14px;
+            color: #999999;
+            display: flex;
+            justify-content: space-between;
+        }
+    }
+    .detail_img{
+        width: 188rpx;
+        height: 188rpx;
+        border-radius: 40px;
+        image{
+            width: 100%;
+            height: 100%;
+        }
+    }
+}
+
+.refund_price{
+    font-family: PingFangSC-Semibold;
+    font-size: 14px;
+    color: #333333;
+    letter-spacing: -0.26px;
+    line-height: 18px;
+    margin-bottom: 26px;
+    .refund_price1{
+        font-weight: bold;
+        margin-right: 16px;
+    }
+    .refund_price2{
+        color: #FF6B4A;
+    }
+}
+.refund_reason{
+    margin-top: 16px;
+    margin-bottom: 16px;
+    font-family: PingFangSC-Regular;
+    font-size: 12px;
+    color: #333333;
+    letter-spacing: -0.23px;
+    line-height: 18px;
+    view{
+        display: inline-block;
+        font-size: 12px;
+        color: #333333;
+        letter-spacing: -0.23px;
+        line-height: 18px;
+        width: 90%;
+        image{
+            width: 30rpx;
+            height: 24rpx;
+            float: right;
+        }
+    }
+}
+
+
+</style>
\ No newline at end of file
-- 
2.0.0