From aa74df4e5aa9414b561e7e567a419411b6156803 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 27 Dec 2022 20:38:24 +0800
Subject: [PATCH] =?UTF-8?q?uniapp=EF=BC=9A=E5=A2=9E=E5=8A=A0=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=20confirm=20=E4=B8=8B=E5=8D=95=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-app/App.vue                 |  5 ++-
 yudao-ui-app/pages.json              |  6 +++
 yudao-ui-app/pages/order/confirm.vue | 63 ++++++++++++++++++++++++++++
 yudao-ui-app/styles/base.scss        |  5 +++
 4 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 yudao-ui-app/pages/order/confirm.vue
 create mode 100644 yudao-ui-app/styles/base.scss

diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue
index 8cc9e30f7..cf633af8a 100644
--- a/yudao-ui-app/App.vue
+++ b/yudao-ui-app/App.vue
@@ -23,7 +23,10 @@ export default {
 </script>
 
 <style lang="scss">
-/* 引入uView基础样式 */
+/** 引入全局基本样式 */
+@import 'styles/base.scss';
+
+/* 引入 uView 基础样式 */
 @import '@/uni_modules/uview-ui/index.scss';
 
 /*每个页面公共scss */
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index 71093ac94..a25d3f5d1 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -86,6 +86,12 @@
         "navigationBarTitleText": "订单详情"
       }
     },
+    {
+      "path": "pages/order/confirm",
+      "style": {
+        "navigationBarTitleText": "确认订单"
+      }
+    },
     {
       "path": "pages/address/list",
       "style": {
diff --git a/yudao-ui-app/pages/order/confirm.vue b/yudao-ui-app/pages/order/confirm.vue
new file mode 100644
index 000000000..878737284
--- /dev/null
+++ b/yudao-ui-app/pages/order/confirm.vue
@@ -0,0 +1,63 @@
+<template>
+  <view class="container">
+    <view class="confirm-con">
+      <!-- TODO 收货地址 -->
+      <navigator url="/pages/address/list?type=1">
+        <yd-address-select :address="address"></yd-address-select>
+      </navigator>
+
+      <!-- TODO 商品信息 -->
+      <view class="goods contain">
+        <yd-order-product :productList="productList"></yd-order-product>
+          <view class="item row-between">
+          <view>买家留言</view>
+          <u-input v-model="remark" :clearable="false"
+            placeholder="请添加备注（150 字以内）"></u-input>
+        </view>
+      </view>
+    </view>
+
+    <!-- TODO 优惠劵 -->
+
+    <!-- TODO 价格信息 -->
+
+    <!-- TODO 底部：提交订单 -->
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      address: { // 选中的收货地址
+        name: 'test',
+        mobile: '15601691300',
+        area: '奥特曼奥特曼'
+      },
+      productList: [{ // 购买的商品列表
+        coverUrl: '',
+        productTitle: '奥特曼',
+        sellPrice: 1024,
+        productCount: 2048,
+        totalPrice: 1024
+      }],
+      remark: '', // 备注
+      x
+    }
+  }
+}
+</script>
+
+<style>
+  .confirm-con {
+    overflow: hidden;
+    padding-bottom: calc(120rpx + env(safe-area-inset-bottom));
+  }
+
+  .contain {
+    border-radius: 14rpx;
+    margin: 20rpx 20rpx 0;
+    background-color: #fff;
+    overflow: hidden;
+  }
+</style>
diff --git a/yudao-ui-app/styles/base.scss b/yudao-ui-app/styles/base.scss
new file mode 100644
index 000000000..cadcbe311
--- /dev/null
+++ b/yudao-ui-app/styles/base.scss
@@ -0,0 +1,5 @@
+.row-between {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
\ No newline at end of file