From bb8cab35b3e25676158c6f35cd323c0c855f7297 Mon Sep 17 00:00:00 2001
From: liuye <yanran200830@163.com>
Date: Wed, 23 Nov 2022 14:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppPointsChange/AppPointsChange.vue |   7 +-
 src/apps/AppPointsChange/detail.vue          |   8 +-
 src/apps/AppPointsChange/order.vue           | 150 ++++++++++++++++++-
 3 files changed, 157 insertions(+), 8 deletions(-)

diff --git a/src/apps/AppPointsChange/AppPointsChange.vue b/src/apps/AppPointsChange/AppPointsChange.vue
index 78e8cb1f..7f70ee93 100644
--- a/src/apps/AppPointsChange/AppPointsChange.vue
+++ b/src/apps/AppPointsChange/AppPointsChange.vue
@@ -22,7 +22,7 @@
       <div class="type">
         <div class="type-item" :class="index == typeIndex ? 'active' : ''" v-for="(item, index) in typeList" :key="index" @click="typeClick(index)">{{item}}</div>
       </div>
-      <div class="item">
+      <div class="item" @click="toDetail()">
         <div class="left">
           <img src="./components/imgs/check-icon.png" alt="">
         </div>
@@ -96,6 +96,9 @@ export default {
     },
     typeClick(index) {
       this.typeIndex = index
+    },
+    toDetail() {
+      uni.navigateTo({url:'./detail'})
     }
   },
   onReachBottom() {
@@ -126,6 +129,7 @@ export default {
     font-size: 28px;
     color: #CA906A;
     .header-left {
+      line-height: 56px;
       span {
         display: inline-block;
         width: 40px;
@@ -137,6 +141,7 @@ export default {
         color: #fff;
         font-size: 30px;
         margin-right: 8px;
+        vertical-align: middle;
       }
     }
     .header-right {
diff --git a/src/apps/AppPointsChange/detail.vue b/src/apps/AppPointsChange/detail.vue
index 7be93602..969a8ab2 100644
--- a/src/apps/AppPointsChange/detail.vue
+++ b/src/apps/AppPointsChange/detail.vue
@@ -12,9 +12,9 @@
     </div>
     <div class="goods-btn status-lack">
       <div class="text">积分余额:438</div>
-      <!-- <div class="btn">立即兑换</div> -->
+      <div class="btn" @click="toOrder()">立即兑换</div>
       <!-- <div class="btn lack-btn">积分不足</div> -->
-      <div class="btn lack-btn">缺货</div>
+      <!-- <div class="btn lack-btn">缺货</div> -->
     </div>
   </div>
 </template>
@@ -40,7 +40,9 @@ export default {
     document.title = '商品详情'
   },
   methods: {
-
+    toOrder() {
+      uni.navigateTo({url:'./order'})
+    }
   },
 }
 </script>
diff --git a/src/apps/AppPointsChange/order.vue b/src/apps/AppPointsChange/order.vue
index 14f0f4ab..1793a3c5 100644
--- a/src/apps/AppPointsChange/order.vue
+++ b/src/apps/AppPointsChange/order.vue
@@ -1,6 +1,36 @@
 <template>
   <div class="order">
-
+    <div class="goods">
+      <div class="left">
+        <img src="./components/imgs/check-icon.png" alt="">
+      </div>
+      <div class="right">
+        <p>天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾天薇抽纸可湿水面巾纸1天薇抽纸天</p>
+        <div class="flex">
+          <h3>10<span>积分</span></h3>
+          <div class="num">
+            <u-number-box v-model="value" @change="valChange" :min="1" :max="200"></u-number-box>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="flex-item item-mar-b24">
+      <div class="label">备注</div>
+      <div class="value">
+        <u-input v-model="remark" type="text" maxlength="20" input-align="right" placeholder="0/20" height="44" />
+      </div>
+    </div>
+    <div class="flex-item border">
+      <div class="label">积分余额</div>
+      <div class="value color-333">484</div>
+    </div>
+    <div class="flex-item">
+      <div class="label">支付积分</div>
+      <div class="value color-ff6900">-10</div>
+    </div>
+    <div class="footer">
+      <div>提交订单</div>
+    </div>
   </div>
 </template>
 
@@ -11,7 +41,8 @@ export default {
   name: 'order',
   data() {
     return {
-
+      value: 1,
+      remark: ''
     }
   },
   computed: {
@@ -21,13 +52,124 @@ export default {
     document.title = '提交订单'
   },
   methods: {
-
+    valChange(e) {
+      console.log('当前值为: ' + e.value)
+    }
   },
 }
 </script>
 
 <style lang="scss" scoped>
+uni-page-body {
+  background-color: #f5f6f7;
+}
 .order {
-
+  .goods {
+    width: calc(100% - 32px);
+    background-color: #fff;
+    margin: 16px 0 16px 16px;
+    padding: 32px;
+    box-sizing: border-box;
+    display: flex;
+    border-radius: 32px;
+    .left {
+      img {
+        width: 176px;
+        height: 176px;
+      }
+    }
+    .right {
+      width: calc(100% - 176px);
+      padding-left: 24px;
+      box-sizing: border-box;
+      p {
+        width: 100%;
+        height: 80px;
+        line-height: 40px;
+        font-family: PingFangSC-Medium;
+        font-weight: 500;
+        font-size: 28px;
+        color: #333;
+        word-break: break-all;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        margin-bottom: 32px;
+      }
+      .flex {
+        display: flex;
+        justify-content: space-between;
+        .num {
+          margin-top: 12px;
+        }
+      }
+      h3 {
+        line-height: 60px;
+        font-family: PingFangSC-SNaNpxibold;
+        font-weight: 600;
+        font-size: 44px;
+        color: #FF6900;
+        span {
+          font-family: PingFangSC-Medium;
+          font-weight: 500;
+          font-size: 24px;
+        }
+      }
+    }
+  }
+  .flex-item {
+    display: flex;
+    justify-content: space-between;
+    width: calc(100% - 32px);
+    padding: 44px 32px;
+    line-height: 42px;
+    background-color: #fff;
+    box-sizing: border-box;
+    margin-left: 16px;
+    .label {
+      font-family: PingFangSC-Regular;
+      font-size: 30px;
+      color: #666;
+    }
+    .color-333{
+      color: #333;
+    }
+    .color-ff6900 {
+      color: #FF6900;
+    }
+  }
+  .item-mar-b24 {
+    border-radius: 32px;
+    margin-bottom: 24px;
+  }
+  .border {
+    border-bottom: 1px solid #ddd;
+  }
+  .footer{
+    width: 100%;
+    background: #FFF;
+    border-top: 1px solid #ddd;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    justify-content: space-between;
+    padding: 16px 32px;
+    box-sizing: border-box;
+    div {
+      width: 100%;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background-image: linear-gradient(90deg, #FFA044 0%, #FF8436 100%);
+      border-radius: 52px;
+      font-family: PingFangSC-Medium;
+      font-weight: 500;
+      font-size: 32px;
+      color: #FFF;
+    }
+  }
 }
 </style>