From 288b19565662bb0f4507a723f2290795d5ff691a Mon Sep 17 00:00:00 2001
From: lfs3 <liangfengsi@0085.com>
Date: Thu, 12 Sep 2019 18:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=8A=A0=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/order-check.vue | 64 +++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/view/order-check.vue b/src/view/order-check.vue
index 33aecc3..910f3a5 100644
--- a/src/view/order-check.vue
+++ b/src/view/order-check.vue
@@ -14,10 +14,17 @@
       <div class="goods-container">
         <img :src="imghost+info.goodsImgUrl">
         <div class="goods-main-container">
-          <div class="name">{{info.goodsName}}</div>
+          <div class="title-box">
+            <div class="name">{{info.goodsName}}</div>
+            <div class="name">¥{{info.totalPrice?info.totalPrice/100:''}}</div>
+          </div>
           <div class="box">
             <div class="box-text">{{info.shortDesc}}</div>
-            <div class="box-price">¥{{info.totalPrice?info.totalPrice/100:''}}</div>
+            <div class="box-num">
+              <el-input-number v-model="num" :min="1" :max="10"></el-input-number>
+            </div>
+
+            <!-- <div class="box-price">¥{{info.totalPrice?info.totalPrice/100:''}}</div> -->
           </div>
           <div class="tag-box">
             <i class="tag" v-for="item in labelList" v-if="item.labelText">{{item.labelText}}</i>
@@ -93,6 +100,7 @@
 <script>
 import backHeader from "../components/back-header.vue";
 import orderApi from "../models/order-model.js";
+import { InlineXNumber } from "vux";
 var qs = require("qs");
 import Qs from "qs";
 export default {
@@ -102,17 +110,19 @@ export default {
         text: ""
       },
       agree: false,
-      goodsNo: ""
+      goodsNo: "",
+      num: 1
     };
   },
   components: {
-    "back-header": backHeader
+    "back-header": backHeader,
+    InlineXNumber
   },
   computed: {
     price() {
       let price = this.info.payPrice;
       let discount = this.info.primeCoupon ? this.info.primeCoupon.amount : 0;
-      return price / 100 - discount / 100;
+      return price*this.num / 100 - discount / 100;
     },
     labelList() {
       let str = this.info.smallLabel;
@@ -240,6 +250,7 @@ export default {
               goodsNo: goodsNo,
               couponNo: couponNo,
               goodsVersion: goodsVersion,
+              goodsNum:this.num,
               salesmanUniqueIdentity: this.$cookies.get("1hjz_mall_unique_id"),
               housingEstateId: estateId,
               remark: this.info.text
@@ -295,6 +306,9 @@ export default {
 .top {
   margin-bottom: 0.18rem;
 }
+.el-input-number {
+  width: 120px;
+}
 .item-top {
   height: 0.65rem;
   width: 100%;
@@ -340,11 +354,10 @@ export default {
 .goods-container {
   width: 100%;
   color: #333;
-  height: 1.6rem;
   background-color: white;
   display: flex;
   box-sizing: border-box;
-  padding: 0.16rem 0.37rem 0rem 0.22rem;
+  padding: 0.16rem 0.37rem 0.22rem 0.22rem;
   img {
     width: 1.28rem;
     height: 1.28rem;
@@ -355,20 +368,26 @@ export default {
     display: flex;
     flex-direction: column;
     padding-top: 0.06rem;
-    .name {
-      line-height: 1.2;
-      font-size: 0.3rem;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      display: -webkit-box;
-      -webkit-box-orient: vertical;
-      -webkit-line-clamp: 1;
-      word-wrap: break-word;
-      // margin-top: 0.1rem;
-      white-space: normal;
-      word-break: break-all;
-      margin-bottom: 0.15rem;
+    .title-box {
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-end;
+      .name {
+        line-height: 1.2;
+        font-size: 0.3rem;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 1;
+        word-wrap: break-word;
+        // margin-top: 0.1rem;
+        white-space: normal;
+        word-break: break-all;
+        margin-bottom: 0.15rem;
+      }
     }
+
     .box {
       display: flex;
       justify-content: space-between;
@@ -376,20 +395,17 @@ export default {
       margin-bottom: 0.15rem;
       .box-text {
         font-size: 0.24rem;
-        line-height: 1.1;
         text-overflow: ellipsis;
         overflow: hidden;
         display: -webkit-box;
         -webkit-box-orient: vertical;
-        -webkit-line-clamp: 1;
         word-wrap: break-word;
         white-space: normal;
         word-break: break-all;
         color: #999;
-        height: 0.24rem;
         margin-right: 0.2rem;
       }
-      .box-price {
+      .box-num {
         line-height: 1;
         font-weight: 400;
         font-size: 0.38rem;