Merge branch 'master' of http://git.luyuan.tk/pplokijuhyg/deguodaigou into pplok

README.md

@@ -38,3 +38,10 @@
     - order/tab 切换列表
     - order/commodity 商品信息操作
     - order/message 商品信息
+
+- pages/chooseaddr/chooseaddr 选择地址 <br>
+    - chooseaddr/address  地址列表（单个）
+    - chooseaddr/addradd  添加按钮
+
+- pages/addaddress/addaddress 选择地址 <br>
+    - addaddress/shuru  添加地址的输入的每一项

app.json

@@ -1,5 +1,7 @@
 {
   "pages": [
+    "pages/addaddress/addaddress",
+    "pages/chooseaddr/chooseaddr",
     "pages/order/order",
     "pages/orderconfirm/orderconfirm",
     "pages/message/message",
@@ -18,4 +20,5 @@
   },
   "style": "v2",
   "sitemapLocation": "sitemap.json"
+
 }

components/addaddress/shuru/shuru.js

@@ -0,0 +1,25 @@
+// components/addaddress/shuru/shuru.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        left: String,
+        right: String,
+        ifarrow: Boolean
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

components/addaddress/shuru/shuru.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/addaddress/shuru/shuru.scss

@@ -0,0 +1,32 @@
+.shuru {
+    width: 670rpx;
+    height: 100rpx;
+    border-bottom: 2rpx solid #E8E8E8;
+    margin: 0 auto;
+    display: flex;
+    justify-content: space-between;
+    line-height: 100rpx;
+    font-size: 28rpx;
+    .left {
+        color: #333333;
+    }
+    .right {
+        margin: auto 0;
+        display: flex;
+        .shuru1 {
+            width: 280rpx;
+            text-align: right;
+        }
+        .shurupla {
+            color: #999999;
+            font-size: 28rpx;
+        }
+        .arrow {
+            width: 14rpx;
+            height: 25rpx;
+            background-color: #999999;
+            margin: auto 0;
+            margin-left: 27rpx;
+        }
+    }
+}

components/addaddress/shuru/shuru.wxml

@@ -0,0 +1,11 @@
+<view class="shuru">
+    <view class="left">{{left}}</view>
+    <view class="right"wx:if="{{ifarrow}}">
+        <text class="shurupla">{{right}}</text>
+        <view class="arrow"></view>
+    </view>
+    <view class="right" wx:else>
+        <input type="text" placeholder-class="shurupla" class="shuru1" placeholder="{{right}}" value=""/>
+    </view>
+    
+</view>

components/addaddress/shuru/shuru.wxss

@@ -0,0 +1,37 @@
+.shuru {
+  width: 670rpx;
+  height: 100rpx;
+  border-bottom: 2rpx solid #E8E8E8;
+  margin: 0 auto;
+  display: flex;
+  justify-content: space-between;
+  line-height: 100rpx;
+  font-size: 28rpx;
+}
+
+.shuru .left {
+  color: #333333;
+}
+
+.shuru .right {
+  margin: auto 0;
+  display: flex;
+}
+
+.shuru .right .shuru1 {
+  width: 280rpx;
+  text-align: right;
+}
+
+.shuru .right .shurupla {
+  color: #999999;
+  font-size: 28rpx;
+}
+
+.shuru .right .arrow {
+  width: 14rpx;
+  height: 25rpx;
+  background-color: #999999;
+  margin: auto 0;
+  margin-left: 27rpx;
+}

components/chooseaddr/addradd/addradd.js

@@ -0,0 +1,23 @@
+// components/chooseaddr/addradd/addradd.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        text: String
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

components/chooseaddr/addradd/addradd.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/chooseaddr/addradd/addradd.wxml

@@ -0,0 +1 @@
+<view class="btn" >{{text}}</view>

components/chooseaddr/addradd/addradd.wxss

@@ -0,0 +1,11 @@
+.btn {
+    width: 650rpx;
+    height: 98rpx;
+    background: #09BB07;
+    border-radius: 10rpx;
+    margin: 0 auto;
+    font-size: 36rpx;
+    color: white;
+    line-height: 98rpx;
+    text-align: center;
+}

components/chooseaddr/address/address.js

@@ -0,0 +1,23 @@
+// components/chooseaddr/address/address.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

components/chooseaddr/address/address.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/chooseaddr/address/address.scss

@@ -0,0 +1,65 @@
+.address {
+    width: 690rpx;
+    height: 192rpx;
+    border-bottom: 2rpx solid #EAEAEA;
+    display: flex;
+    justify-content: space-between;
+    padding-bottom: 27rpx;
+    ;
+    .left {
+        width: 551rpx;
+        height: 119rpx;
+        .userinfo {
+            color: #333333;
+            font-size: 26rpx;
+            text-indent: 30rpx;
+            margin-top: 41rpx;
+            display: flex;
+            justify-content: space-between;
+        }
+        .addr {
+            color: #999999;
+            font-size: 24rpx;
+            text-indent: 30rpx;
+            margin-top: 32rpx;
+            width: 551rpx;
+            margin-left: 20rpx;
+            // display: flex;
+            .select {
+                width: 26rpx;
+                height: 26rpx;
+                margin: auto 0;
+                border-radius: 50%;
+                background-color: #EAEAEA;
+                float: left;
+            }
+            .selected {
+                background-color: #47C877;
+            }
+            .default {
+                // margin-left: 12rpx;
+                font-size: 24rpx;
+                text-indent: 16rpx;
+                line-height: 60rpx;
+                float: left;
+            }
+            .path {
+                // float: left;
+                line-height: 39rpx;
+            }
+        }
+    }
+    .line {
+        width: 2rpx;
+        height: 75rpx;
+        background: rgba(211, 211, 211, 1);
+        margin: auto 0;
+    }
+    .right {
+        color: #666666;
+        font-size: 24rpx;
+        line-height: 192rpx;
+        margin-left: 30rpx;
+        margin-right: 21rpx;
+    }
+}

components/chooseaddr/address/address.wxml

@@ -0,0 +1,16 @@
+<view class="address">
+    <view class="left">
+        <view class="userinfo">
+            <text class="username">于于宇  15698857895</text>
+            <text>邮政编码：677467</text>
+        </view>
+        <view class="addr">
+            <view class="select selected"></view>
+            <!-- <view class="default"></view> -->
+            <view class="path">默认
+            中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区</view>
+        </view>
+    </view>
+    <view class="line"></view>
+    <view class="right">删除</view>
+</view>

components/chooseaddr/address/address.wxss

@@ -0,0 +1,70 @@
+.address {
+  width: 690rpx;
+  height: 192rpx;
+  border-bottom: 2rpx solid #EAEAEA;
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 27rpx;
+}
+
+.address .left {
+  width: 551rpx;
+  height: 119rpx;
+}
+
+.address .left .userinfo {
+  color: #333333;
+  font-size: 26rpx;
+  text-indent: 30rpx;
+  margin-top: 41rpx;
+  display: flex;
+  justify-content: space-between;
+}
+
+.address .left .addr {
+  color: #999999;
+  font-size: 24rpx;
+  text-indent: 30rpx;
+  margin-top: 32rpx;
+  width: 551rpx;
+  margin-left: 20rpx;
+}
+
+.address .left .addr .select {
+  width: 26rpx;
+  height: 26rpx;
+  margin: auto 0;
+  border-radius: 50%;
+  background-color: #EAEAEA;
+  float: left;
+}
+
+.address .left .addr .selected {
+  background-color: #47C877;
+}
+
+.address .left .addr .default {
+  font-size: 24rpx;
+  text-indent: 16rpx;
+  line-height: 60rpx;
+  float: left;
+}
+
+.address .left .addr .path {
+  line-height: 39rpx;
+}
+
+.address .line {
+  width: 2rpx;
+  height: 75rpx;
+  background: lightgray;
+  margin: auto 0;
+}
+
+.address .right {
+  color: #666666;
+  font-size: 24rpx;
+  line-height: 192rpx;
+  margin-left: 30rpx;
+  margin-right: 21rpx;
+}

pages/addaddress/addaddress.js

@@ -0,0 +1,66 @@
+// pages/addaddress/addaddress.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/addaddress/addaddress.json

@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "shuru": "/components/addaddress/shuru/shuru",
+        "addradd": "/components/chooseaddr/addradd/addradd"
+    }
+}

pages/addaddress/addaddress.scss

@@ -0,0 +1,8 @@
+.addaddress {
+    background-color: white;
+    .btn1 {
+        position: fixed;
+        bottom: 102rpx;
+        left: 50rpx;
+    }
+}

pages/addaddress/addaddress.wxml

@@ -0,0 +1,10 @@
+<view class="addaddress">
+    <shuru left="收件人" right="姓名需和身份证一致"></shuru>
+    <shuru left="手机号" right="请填入常用的手机号码"></shuru>
+    <shuru left="国家" right="CN中国大陆" ifarrow="{{true}}"></shuru>
+     <shuru left="城市信息" right="北京市 北京市 东城区" ifarrow="{{true}}"></shuru>
+   <shuru left="街道地址" right="街道地址"></shuru>
+    <shuru left="邮政编码" right="邮政编码"></shuru>
+    <shuru left="身份证号" right="可为空，部分商品需要"></shuru>
+<addradd text="保存地址" class="btn1"></addradd>
+</view>

pages/addaddress/addaddress.wxss

@@ -0,0 +1,9 @@
+.addaddress {
+  background-color: white;
+}
+
+.addaddress .btn1 {
+  position: fixed;
+  bottom: 102rpx;
+  left: 50rpx;
+}

pages/chooseaddr/chooseaddr.js

@@ -0,0 +1,66 @@
+// pages/chooseaddr/chooseaddr.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/chooseaddr/chooseaddr.json

@@ -0,0 +1,6 @@
+{
+    "usingComponents": {
+        "address": "/components/chooseaddr/address/address",
+        "addradd": "/components/chooseaddr/addradd/addradd"
+    }
+}

pages/chooseaddr/chooseaddr.scss

@@ -0,0 +1,10 @@
+.chooseaddress {
+    .addr {
+        margin-left: 30rpx;
+    }
+    .btn1 {
+        position: fixed;
+        bottom: 149rpx;
+        left: 50rpx;
+    }
+}

pages/chooseaddr/chooseaddr.wxml

@@ -0,0 +1,14 @@
+<view class="chooseaddress">
+    <view class="addr">
+        <address></address>
+    </view>
+    <view class="addr">
+        <address></address>
+    </view>
+    <view class="addr">
+        <address></address>
+    </view>
+    <view class="btn1">
+        <addradd text="添加地址"></addradd>
+    </view>
+</view>

pages/chooseaddr/chooseaddr.wxss

@@ -0,0 +1,9 @@
+.chooseaddress .addr {
+  margin-left: 30rpx;
+}
+
+.chooseaddress .btn1 {
+  position: fixed;
+  bottom: 149rpx;
+  left: 50rpx;
+}