From 73d560e0c63bf542deacc9aa9e83677832974485 Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Sat, 11 Jan 2020 17:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/orderconfirm/input/input.js        | 24 ++++++++++++
 components/orderconfirm/input/input.json      |  4 ++
 components/orderconfirm/input/input.scss      | 21 ++++++++++
 components/orderconfirm/input/input.wxml      |  4 ++
 components/orderconfirm/input/input.wxss      |  1 +
 .../orderchooseway/orderchooseway.js          |  3 ++
 components/orderconfirm/time/time.js          | 39 +++++++++++++++++++
 components/orderconfirm/time/time.json        |  4 ++
 components/orderconfirm/time/time.scss        | 17 ++++++++
 components/orderconfirm/time/time.wxml        |  6 +++
 components/orderconfirm/time/time.wxss        | 18 +++++++++
 pages/orderconfirm/orderconfirm.js            |  9 ++++-
 pages/orderconfirm/orderconfirm.json          |  4 +-
 pages/orderconfirm/orderconfirm.wxml          |  9 +++--
 14 files changed, 158 insertions(+), 5 deletions(-)
 create mode 100644 components/orderconfirm/input/input.js
 create mode 100644 components/orderconfirm/input/input.json
 create mode 100644 components/orderconfirm/input/input.scss
 create mode 100644 components/orderconfirm/input/input.wxml
 create mode 100644 components/orderconfirm/input/input.wxss
 create mode 100644 components/orderconfirm/time/time.js
 create mode 100644 components/orderconfirm/time/time.json
 create mode 100644 components/orderconfirm/time/time.scss
 create mode 100644 components/orderconfirm/time/time.wxml
 create mode 100644 components/orderconfirm/time/time.wxss

diff --git a/components/orderconfirm/input/input.js b/components/orderconfirm/input/input.js
new file mode 100644
index 0000000..0256367
--- /dev/null
+++ b/components/orderconfirm/input/input.js
@@ -0,0 +1,24 @@
+// components/orderconfirm/orderyf/orderyf.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    title:String,
+    placeholder:String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})
diff --git a/components/orderconfirm/input/input.json b/components/orderconfirm/input/input.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/orderconfirm/input/input.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/orderconfirm/input/input.scss b/components/orderconfirm/input/input.scss
new file mode 100644
index 0000000..78ad6b8
--- /dev/null
+++ b/components/orderconfirm/input/input.scss
@@ -0,0 +1,21 @@
+.orderyf {
+    width: 690rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    display: flex;
+    border-bottom: 2rpx solid #EAEAEA;
+    margin: 0 auto;
+    justify-content: space-between;
+    font-size: 28rpx;
+    align-items: center;
+    .left {
+        margin-left: 31rpx
+    }
+    .right {
+        margin-right: 20rpx;
+        width: 450rpx;
+        height: 35rpx;
+        font-size: 25rpx;
+        text-align: right;
+    }
+}
\ No newline at end of file
diff --git a/components/orderconfirm/input/input.wxml b/components/orderconfirm/input/input.wxml
new file mode 100644
index 0000000..a82edc9
--- /dev/null
+++ b/components/orderconfirm/input/input.wxml
@@ -0,0 +1,4 @@
+<view class="orderyf">
+    <view class="left">{{title}}</view>
+    <input class="right" placeholder="{{placeholder}}"></input>
+</view>
\ No newline at end of file
diff --git a/components/orderconfirm/input/input.wxss b/components/orderconfirm/input/input.wxss
new file mode 100644
index 0000000..cc85e35
--- /dev/null
+++ b/components/orderconfirm/input/input.wxss
@@ -0,0 +1 @@
+.orderyf{width:690rpx;height:96rpx;line-height:96rpx;display:flex;border-bottom:2rpx solid #EAEAEA;margin:0 auto;justify-content:space-between;font-size:28rpx;align-items:center}.orderyf .left{margin-left:31rpx}.orderyf .right{margin-right:20rpx;width:450rpx;height:35rpx;font-size:25rpx;text-align:right}
diff --git a/components/orderconfirm/orderchooseway/orderchooseway.js b/components/orderconfirm/orderchooseway/orderchooseway.js
index 8a81710..0149854 100644
--- a/components/orderconfirm/orderchooseway/orderchooseway.js
+++ b/components/orderconfirm/orderchooseway/orderchooseway.js
@@ -23,11 +23,14 @@ Component({
       this.setData({
         id:0
       })
+      this.triggerEvent("tab",{id:0})
     },
     b(){
       this.setData({
         id:1
       })
+      this.triggerEvent("tab",{id:1})
+
     }
   }
 })
diff --git a/components/orderconfirm/time/time.js b/components/orderconfirm/time/time.js
new file mode 100644
index 0000000..506dc48
--- /dev/null
+++ b/components/orderconfirm/time/time.js
@@ -0,0 +1,39 @@
+// components/orderconfirm/orderyf/orderyf.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    price: String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    date: "",
+    start:""
+  },
+  created(){
+    this.setData({
+      date:this.getCurTime(),
+      start:this.getCurTime()
+    })
+  }, 
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    bindDateChange: function (e) {
+      console.log('picker发送选择改变，携带值为', e.detail.value)
+      this.setData({
+        date: e.detail.value
+      })
+    },
+    getCurTime() {
+      var date = new Date();
+      return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate();
+
+    }
+  }
+})
diff --git a/components/orderconfirm/time/time.json b/components/orderconfirm/time/time.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/components/orderconfirm/time/time.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/orderconfirm/time/time.scss b/components/orderconfirm/time/time.scss
new file mode 100644
index 0000000..95c2833
--- /dev/null
+++ b/components/orderconfirm/time/time.scss
@@ -0,0 +1,17 @@
+.orderyf {
+    width: 690rpx;
+    height: 96rpx;
+    line-height: 96rpx;
+    display: flex;
+    border-bottom: 2rpx solid #EAEAEA;
+    margin: 0 auto;
+    justify-content: space-between;
+    font-size: 28rpx;
+    .left {
+        margin-left: 31rpx
+    }
+    .right {
+        margin-right: 20rpx;
+        ;
+    }
+}
\ No newline at end of file
diff --git a/components/orderconfirm/time/time.wxml b/components/orderconfirm/time/time.wxml
new file mode 100644
index 0000000..c4337f0
--- /dev/null
+++ b/components/orderconfirm/time/time.wxml
@@ -0,0 +1,6 @@
+<picker mode="date" value="{{date}}" bindchange="bindDateChange" start="{{start}}">
+    <view class="orderyf">
+        <view class="left">收货时间</view>
+        <view class="right">{{date == "" ? '请选择提货时间': date}}</view>
+    </view>
+</picker>
\ No newline at end of file
diff --git a/components/orderconfirm/time/time.wxss b/components/orderconfirm/time/time.wxss
new file mode 100644
index 0000000..a63eeb0
--- /dev/null
+++ b/components/orderconfirm/time/time.wxss
@@ -0,0 +1,18 @@
+.orderyf {
+  width: 690rpx;
+  height: 96rpx;
+  line-height: 96rpx;
+  display: flex;
+  border-bottom: 2rpx solid #EAEAEA;
+  margin: 0 auto;
+  justify-content: space-between;
+  font-size: 28rpx;
+}
+
+.orderyf .left {
+  margin-left: 31rpx;
+}
+
+.orderyf .right {
+  margin-right: 20rpx;
+}
diff --git a/pages/orderconfirm/orderconfirm.js b/pages/orderconfirm/orderconfirm.js
index 1349fcf..d54354c 100644
--- a/pages/orderconfirm/orderconfirm.js
+++ b/pages/orderconfirm/orderconfirm.js
@@ -6,7 +6,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    list: {}
+    list: {},
+    fs:0
   },
 
   /**
@@ -122,5 +123,11 @@ Page({
       })
     })
 
+  },
+  tab(a){
+    console.log(a.detail.id)
+    this.setData({
+      fs:a.detail.id
+    })
   }
 })
\ No newline at end of file
diff --git a/pages/orderconfirm/orderconfirm.json b/pages/orderconfirm/orderconfirm.json
index 49d4ef6..4ef9342 100644
--- a/pages/orderconfirm/orderconfirm.json
+++ b/pages/orderconfirm/orderconfirm.json
@@ -7,6 +7,8 @@
         "chooseaddr": "/components/orderconfirm/orderchooseaddr/orderchooseaddr",
         "orderyf": "/components/orderconfirm/orderyf/orderyf",
         "agree": "/components/orderconfirm/orderagreement/orderagreement",
-        "bottom": "/components/orderconfirm/orderbottom/orderbottom"
+        "bottom": "/components/orderconfirm/orderbottom/orderbottom",
+        "inputs": "/components/orderconfirm/input/input",
+        "time":"/components/orderconfirm/time/time"
     }
 }
\ No newline at end of file
diff --git a/pages/orderconfirm/orderconfirm.wxml b/pages/orderconfirm/orderconfirm.wxml
index 6d02361..c6a9109 100644
--- a/pages/orderconfirm/orderconfirm.wxml
+++ b/pages/orderconfirm/orderconfirm.wxml
@@ -1,9 +1,12 @@
 <view class="orderconfirm">
     <shopinfo wx:for="{{list.cartList}}" title="{{item.goods_name}}" price="{{item.goods_price}}" spec="{{item.spec_key_name?item.spec_key_name:'默认规格'}}" img="{{item.image}}"></shopinfo>
     <!-- <shopinfo></shopinfo> -->
-    <chooseway></chooseway>
-    <chooseaddr name="{{list.addressList.consignee}}" addr="{{list.addressList.province? list.addressList.province + list.addressList.city + list.addressList.address:''}}" number="{{list.addressList.zipcode}}" phone="{{list.addressList.mobile}}"></chooseaddr>
-    <orderyf price="{{list.express_price}}"></orderyf>
+    <chooseway bind:tab="tab"></chooseway>
+    <chooseaddr wx:if="{{fs == 0}}" name="{{list.addressList.consignee}}" addr="{{list.addressList.province? list.addressList.province + list.addressList.city + list.addressList.address:''}}" number="{{list.addressList.zipcode}}" phone="{{list.addressList.mobile}}"></chooseaddr>
+    <orderyf wx:if="{{fs == 0}}" price="{{list.express_price}}"></orderyf>
+    <time wx:if="{{fs == 1}}"></time>
+    <inputs wx:if="{{fs == 1}}" title="提货姓名" placeholder="请输入姓名"></inputs>
+    <inputs wx:if="{{fs == 1}}" title="联系手机" placeholder="请输入手机号"></inputs>
     <agree></agree>
     <view class="bottom">
           <bottom price="{{list.totalPrice.total_fee}}" bind:sub="sub"></bottom>