From 8dbd5c7e32aafc15ba9f17f92ddd917a5db0e3d6 Mon Sep 17 00:00:00 2001
From: wangkesi <wangkesi@3ncto.com>
Date: Thu, 18 Oct 2018 16:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js            | 10 +++---
 src/view/order-detail.vue      |  6 ++--
 src/view/service-card-list.vue | 57 ++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 src/view/service-card-list.vue

diff --git a/src/router/index.js b/src/router/index.js
index d09ffc8..78d552b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -61,11 +61,6 @@ let router = new Router({
             name: "分销海报",
             component: poster
         },
-        {
-            path: "/demo",
-            name: "demo",
-            component: demo
-        },
         {
             path: "/",
             redirect: "/home"
@@ -84,6 +79,11 @@ let router = new Router({
             path: "/order-list",
             name: "orderList",
             component: resolve => require(["@/view/order-list.vue"], resolve)
+        },
+        {
+            path: "/service-card-list",
+            component: resolve =>
+                require(["@/view/service-card-list.vue"], resolve)
         }
     ]
 });
diff --git a/src/view/order-detail.vue b/src/view/order-detail.vue
index 9eb0324..c3b3634 100644
--- a/src/view/order-detail.vue
+++ b/src/view/order-detail.vue
@@ -62,7 +62,7 @@
 						</div>
 						<span class="discount-name" v-if="info.primeCoupon">{{info.primeCoupon.couponName}}</span>
 					</div>
-					<div class="num">¥{{info.couponPrice?info.couponPrice/100:''}}</div>
+					<div class="num">¥{{info.couponPrice?info.couponPrice/100:0}}</div>
 				</div>
 			</div>
 			<div class="money-box-bottom" :class="{right:state!==0&&state!==10}">
@@ -149,7 +149,7 @@ export default {
                     orderNo: this.orderNo
                 })
                 .then(res => {
-					this.$vux.loading.hide();
+                    this.$vux.loading.hide();
                     if (res.code === 0 && res.response.data) {
                         this.authUrl = res.response.authUrl || "";
                         let info = res.response.data;
@@ -423,7 +423,7 @@ export default {
             .name {
                 font-size: 0.3rem;
                 overflow: hidden;
-				padding-top: 0.01rem;
+                padding-top: 0.01rem;
                 line-height: 1.2;
                 display: -webkit-box;
                 -webkit-box-orient: vertical;
diff --git a/src/view/service-card-list.vue b/src/view/service-card-list.vue
new file mode 100644
index 0000000..aa280f0
--- /dev/null
+++ b/src/view/service-card-list.vue
@@ -0,0 +1,57 @@
+<template>
+	<div class="service-card-list-whole">
+		<div class="item">
+			<div class="item-top">
+				<div class="item-top-left">
+					<div class="no">NO.56253526484759844156</div>
+					<div class="gift"></div>
+				</div>
+				<div class="address"></div>
+			</div>
+		</div>
+	</div>
+</template>
+<script>
+export default {
+    data() {
+        return {};
+    }
+};
+</script>
+<style lang="scss" scoped>
+.service-card-list-whole {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    padding-top: 0.36rem;
+    .item {
+        width: 6.92rem;
+        height: 3.84rem;
+        position: relative;
+        // background: linear-gradient(
+        //     -48deg,
+        //     rgba(255, 169, 67, 1) 0%,
+        //     rgba(255, 199, 112, 1) 100%
+        // );
+        box-shadow: 0.08rem 0.08rem 0.08rem 0 rgba(44, 44, 44, 0.15);
+        // border-radius: 0.08rem;
+        box-sizing: border-box;
+        padding: 0.2rem 0.3rem 0 0.4rem;
+		color:white;
+        .item-top {
+			display: flex;
+            .item-top-left {
+				flex-grow: 1;
+				display: flex;
+				.no{
+					font-size: 0.18rem;
+				}
+            }
+			.address{
+				flex-shrink: 0;
+			}
+        }
+    }
+}
+</style>