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

components/addaddress/shuru/shuru.js

@@ -6,7 +6,7 @@ Component({
     properties: {
         left: String,
         right: String,
-        ifarrow: Boolean
+        ifarrow: Boolean,
     },
 
     /**
@@ -20,6 +20,12 @@ Component({
      * 组件的方法列表
      */
     methods: {
-
-    }
+        get(e){
+            // console.log(e)
+            this.triggerEvent('myevent', e.detail.value)
+        },
+        choose(e){
+            
+        }
+    }   
 })

components/addaddress/shuru/shuru.wxml

@@ -1,11 +1,11 @@
 <view class="shuru">
     <view class="left">{{left}}</view>
-    <view class="right"wx:if="{{ifarrow}}">
+    <view class="right"wx:if="{{ifarrow}}" bindtap="choose">
         <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=""/>
+        <input type="text" placeholder-class="shurupla" class="shuru1" placeholder="{{right}}" value="" bindinput="get" no="0" data-left="{{left}}"/>
     </view>
     
 </view>

components/chooseaddr/address/address.js

@@ -4,6 +4,12 @@ Component({
    * 组件的属性列表
    */
   properties: {
+    username:String,
+    tel:String,
+    address:String,
+    isdefault:String,
+    youzheng:String,
+    addressid:String
 
   },
 
@@ -18,6 +24,12 @@ Component({
    * 组件的方法列表
    */
   methods: {
-
+    del(){
+      // console.log("del")
+      this.triggerEvent('delete')
+    },
+    setdefault(){
+      this.triggerEvent('default',this.data.addressid)
+    }
   }
 })

components/chooseaddr/address/address.scss

@@ -7,15 +7,27 @@
     padding-bottom: 27rpx;
     ;
     .left {
-        width: 551rpx;
+        width: 576rpx;
         height: 119rpx;
         .userinfo {
             color: #333333;
             font-size: 26rpx;
-            text-indent: 30rpx;
+            text-indent: 16xrpx;
             margin-top: 41rpx;
             display: flex;
             justify-content: space-between;
+            .username{
+                display: flex;
+                flex-wrap: nowrap;
+                .username1{
+                    width: 140rpx;
+                    overflow: hidden;
+                }
+                .tel{
+                    margin-right: 6rpx;
+
+                }
+            }
         }
         .addr {
             color: #999999;
@@ -32,6 +44,8 @@
                 border-radius: 50%;
                 background-color: #EAEAEA;
                 float: left;
+                margin-right: -14rpx;
+
             }
             .selected {
                 background-color: #47C877;
@@ -45,7 +59,7 @@
             }
             .path {
                 // float: left;
-                line-height: 39rpx;
+                line-height: 25rpx;
             }
         }
     }

components/chooseaddr/address/address.wxml

@@ -1,16 +1,30 @@
 <view class="address">
     <view class="left">
         <view class="userinfo">
-            <text class="username">于于宇  15698857895</text>
-            <text>邮政编码：677467</text>
+            <view class="username">
+                <view class="username1">{{username}}</view>
+                <view class="tel">{{tel}}</view>
+                  
+            </view>
+            <view>邮政编码：{{youzheng}}</view>
         </view>
-        <view class="addr">
-            <view class="select selected"></view>
+        <view class="addr" wx:if="{{isdefault=='1'}}">
+            <view class="select selected" bindtap="setdefault"></view>
             <!-- <view class="default"></view> -->
-            <view class="path">默认
-            中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区</view>
+            <view class="path">
+            <text>默认</text>   
+            {{address}}
+            </view>
+        </view>
+        <view class="addr" wx:else>
+            <view class="select" bindtap="setdefault"></view>
+            <!-- <view class="default"></view> -->
+            <view class="path">
+            <text>设为默认</text>   
+            {{address}}
+            </view>
         </view>
     </view>
     <view class="line"></view>
-    <view class="right">删除</view>
+    <view class="right" bindtap="del">删除</view>
 </view>

components/chooseaddr/address/address.wxss

@@ -8,19 +8,33 @@
 }
 
 .address .left {
-  width: 551rpx;
+  width: 576rpx;
   height: 119rpx;
 }
 
 .address .left .userinfo {
   color: #333333;
   font-size: 26rpx;
-  text-indent: 30rpx;
+  text-indent: 16xrpx;
   margin-top: 41rpx;
   display: flex;
   justify-content: space-between;
 }
 
+.address .left .userinfo .username {
+  display: flex;
+  flex-wrap: nowrap;
+}
+
+.address .left .userinfo .username .username1 {
+  width: 140rpx;
+  overflow: hidden;
+}
+
+.address .left .userinfo .username .tel {
+  margin-right: 6rpx;
+}
+
 .address .left .addr {
   color: #999999;
   font-size: 24rpx;
@@ -37,6 +51,7 @@
   border-radius: 50%;
   background-color: #EAEAEA;
   float: left;
+  margin-right: -14rpx;
 }
 
 .address .left .addr .selected {
@@ -51,7 +66,7 @@
 }
 
 .address .left .addr .path {
-  line-height: 39rpx;
+  line-height: 25rpx;
 }
 
 .address .line {