DaMowang 3 سال پیش
والد
کامیت
5520423dbd
3فایلهای تغییر یافته به همراه90 افزوده شده و 133 حذف شده
  1. 2 2
      src/pages/sign/index.vue
  2. 3 4
      src/pages/to-pay-list/index.vue
  3. 85 127
      src/pages/xghc-addrress/userAddress.vue

+ 2 - 2
src/pages/sign/index.vue

@@ -91,14 +91,14 @@ export default {
             nextSign:0, //剩余签到时间 秒
         };
     },
-    onShow: function() {
+    onShow() {
         this.timer = '00:00:00'
         this.userinfo = uni.getStorageSync("userinfo")
         
         this.loadData()
         this.goodsDay()
     },
-    onHide: function() {
+    onHide() {
         clearInterval(tim)
     },
     methods: {

+ 3 - 4
src/pages/to-pay-list/index.vue

@@ -113,15 +113,14 @@ export default {
     },
     onLoad(e) {
         this.Data = e
-        this.loadData(e);
-        this.loadAddress();
 
         this.userinfo = uni.getStorageSync('userinfo');
         // 1零售 2批发 3精品 4今日值买
         this.modularName = e.type == 1 ? "零售专区" : e.type == 2 ? "批发专区" : e.type == 3 ? "精品专区" : "今日值买"
     },
-    mounted() {
-        // this.$refs.popup.open('top');
+    onShow(){
+        this.loadData(this.Data);
+        this.loadAddress();
     },
     methods: {
         loadData(da) {

+ 85 - 127
src/pages/xghc-addrress/userAddress.vue

@@ -9,7 +9,7 @@
                 <form @submit="formSubmit" v-if="isadd">
                     <view class='addAddress'>
                         <view class="pad30">
-                            <view class='default acea-row row-middle borderRadius15'>
+                            <view class='default acea-row borderRadius15'>
                                 <uni-easyinput type="textarea" v-model="addressValue" placeholder="粘贴地址信息,自动拆分姓名、电话和地址" @blur="identify()" placeholder-class='placeholder' />
                             </view>
                         </view>
@@ -17,29 +17,33 @@
                             <view class='list borderRadius15'>
                                 <view class='item acea-row row-between-wrapper'>
                                     <view class='name'>姓名</view>
-                                    <input type='text' placeholder='请输入姓名' name='real_name' v-model="userAddress.real_name" placeholder-class='placeholder' />
+                                    <!-- <view class="address"> -->
+                                        <input type='text' placeholder='请输入姓名' v-model="userAddress.real_name" placeholder-class='placeholder' />
+                                    <!-- </view> -->
                                 </view>
                                 <view class='item acea-row row-between-wrapper'>
                                     <view class='name'>联系电话</view>
-                                    <input type='number' placeholder='请输入联系电话' name="phone" v-model='userAddress.phone' placeholder-class='placeholder' pattern="\d*" />
+                                    <!-- <view class="address"> -->
+                                        <input type='number' placeholder='请输入联系电话' v-model='userAddress.phone' placeholder-class='placeholder' />
+                                    <!-- </view> -->
                                 </view>
                                 <view class='item acea-row row-between-wrapper'>
                                     <view class='name'>所在地区</view>
-                                    <view class="address acea-row row-between">
-                                        <input type='text' placeholder='请填写具体地址' name='region' placeholder-class='placeholder' v-model='userAddress.region' class="detail" />
-                                    </view>
+                                    <!-- <view class="address"> -->
+                                        <input type='text' placeholder='请填写具体地址' v-model='userAddress.region' placeholder-class='placeholder' />
+                                    <!-- </view> -->
                                 </view>
                                 <view class='item acea-row row-between-wrapper'>
                                     <view class='name'>详细地址</view>
-                                    <view class="address">
-                                        <input type='text' placeholder='请填写具体地址' name='detail' placeholder-class='placeholder' v-model='userAddress.detail' class="detail" />
-                                    </view>
+                                    <!-- <view class="address"> -->
+                                        <input type='text' placeholder='请填写具体地址' v-model='userAddress.detail' placeholder-class='placeholder' />
+                                    <!-- </view> -->
                                 </view>
-                                <view class='item acea-row row-between-wrapper'>
+                                <view class='item acea-row'>
                                     <view class='name'>详细地址</view>
-                                    <view class="address">
+                                    <!-- <view class="address"> -->
                                         <uni-data-checkbox v-model="is_default" :localdata="range"></uni-data-checkbox>
-                                    </view>
+                                    <!-- </view> -->
                                 </view>
                             </view>
                         </view>
@@ -203,147 +207,101 @@ export default {
     height: 70vh;
     background-color: #f5f5f5;
     border-radius: 30rpx 30rpx 0 0;
-    // overflow: auto;
+    overflow: hidden;
 }
 
 .tit {
-    padding: 20rpx 0;
+    height: 100rpx;
+    line-height: 100rpx;
 	background: #fff;
-	margin-bottom: 20rpx;
     border-radius: 30rpx 30rpx 0 0;
+    color: #333;
 	.cancel{
 		padding: 0 30rpx;
-		color: #333;
 	}
 
     .close {
         float: right;
 		padding: 0 30rpx;
-		color: #333;
     }
 }
 
 .s_con{
+    height: calc(100% - 100rpx);
     overflow-y: auto;
-}
-
-.pad30 {
-    padding: 0 30rpx
-}
+    padding-top: 20rpx;
 
-.p_center {
-    text-align: center;
-}
-
-.acea-row {
-    display: flex;
-}
-
-.row-middle {
-    align-items: center
-}
-
-.row-between-wrapper {
-    align-items: center;
-    justify-content: space-between
-}
-
-.borderRadius15 {
-    border-radius: 15rpx !important;
-}
-
-.fontcolor {
-    color: var(--view-theme);
-}
-
-.addAddress .list {
-    background-color: #fff;
-}
-
-.addAddress .list .item {
-    padding: 30rpx;
-    border-top: 1rpx solid #eee;
-    position: relative;
-}
-
-.addAddress .list .item .detail {
-    width: 368rpx;
-}
-
-.addAddress .list .item .location {
-    position: absolute;
-    right: 46rpx;
-    top: 50%;
-    margin-top: -40rpx !important;
-    font-size: 24rpx;
-    text-align: center;
-}
+    .pad30 {
+        padding: 0 30rpx
+    }
 
-.addAddress .list .item .icon-dizhi {
-    font-size: 36rpx !important;
-}
+    .p_center {
+        text-align: center;
+    }
 
-.addAddress .list .item .name {
-    width: 195rpx;
-    font-size: 30rpx;
-    color: #333;
-}
+    .acea-row {
+        display: flex;
+    }
 
-.addAddress .list .item .address {
-    flex: 1;
-}
+    .row-middle {
+        align-items: center
+    }
 
-.addAddress .list .item .address .addressCon {
-    width: 360rpx;
-}
+    .row-between-wrapper {
+        align-items: center;
+        justify-content: space-between
+    }
 
-.addAddress .list .item .address .addressCon .tip {
-    font-size: 21rpx;
-    margin-top: 4rpx;
+    .borderRadius15 {
+        border-radius: 15rpx !important;
+    }
 }
 
-.addAddress .list .item input {
-    /* // width: 475rpx; */
-    flex: 1;
-    font-size: 30rpx;
+.addAddress {
+    width: 100%;
+    .list {
+        background-color: #fff;
+        .item {
+            padding: 30rpx;
+            border-top: 1rpx solid #eee;
+            // position: relative;
+            .icon-dizhi {
+                font-size: 36rpx !important;
+            }
+            .name {
+                width: 180rpx;
+                font-size: 30rpx;
+                color: #333;
+            }
+            .address {
+                flex: 1;
+            }
+            input {
+                flex: 1;
+                font-size: 0 30rpx;
+            }
+        }
+    }
+    .default {
+        padding: 30rpx;
+        background-color: #fff;
+    }
+    .keepBnt {
+        width: 690rpx;
+        height: 86rpx;
+        border-radius: 50rpx;
+        text-align: center;
+        line-height: 86rpx;
+        margin: 50rpx auto;
+        font-size: 32rpx;
+        color: #fff;
+    }
 }
 
 .placeholder {
     color: #ccc;
 }
 
-.addAddress .list .item .picker {
-    width: 430rpx;
-    font-size: 30rpx;
-}
-
-.addAddress .list .item .iconfont {
-    font-size: 30rpx;
-    margin-top: 4rpx;
-}
-
-.addAddress .default {
-    padding: 30rpx;
-    /* height: 90rpx; */
-    background-color: #fff;
-}
-
-.addAddress .default checkbox {
-    margin-right: 15rpx;
-}
-
-.addAddress .keepBnt {
-    width: 690rpx;
-    height: 86rpx;
-    border-radius: 50rpx;
-    text-align: center;
-    line-height: 86rpx;
-    margin: 50rpx auto;
-    font-size: 32rpx;
-    color: #fff;
-}
-
-
 .mt-22 {
     margin-top: 22rpx;
 }
@@ -369,7 +327,6 @@ export default {
 }
 
 .swipeAction {
-    // padding: 20rpx 30rpx;
     font-size: 28rpx;
 
     .addressLi {
@@ -377,7 +334,6 @@ export default {
             width: 80rpx;
             height: 80rpx;
             display: flex;
-            // justify-content: center;
             align-items: center;
 
             .iconfont {
@@ -404,7 +360,6 @@ export default {
         }
 
         .name {
-            // font-weight: bold;
             font-size: 32rpx;
             margin-right: 10rpx;
         }
@@ -412,12 +367,13 @@ export default {
         .address {
             font-size: 24rpx;
             color: #999;
+            padding: 0;
         }
     }
 
     .swipeAction_item {
-        background: #fff;
-        margin-bottom: 20rpx;
+        // background: #fff;
+        // margin-bottom: 20rpx;
     }
 
     .btns {
@@ -447,6 +403,8 @@ export default {
 
 ::v-deep .uni-swipe_box {
     padding: 20rpx 30rpx;
+    background: #fff;
+    margin-bottom: 20rpx;
 }
 
 .defaultAddress{