|
|
@@ -90,34 +90,39 @@
|
|
|
</view>
|
|
|
<uni-popup ref="popup" background-color="#fff" type="bottom">
|
|
|
<view class="content" v-if="type=='0'" v-for="(item,index) in addressList" :key="index">
|
|
|
- <view class="one">
|
|
|
- <view class="one_1">
|
|
|
- <view class="name">
|
|
|
- <text>{{item.name}},</text>{{item.phone}}
|
|
|
- </view>
|
|
|
- <view class="address">
|
|
|
- <text>{{item.province}}</text><text>{{item.city}}</text>
|
|
|
- <text>{{item.area}}</text><text>{{item.address}}</text>
|
|
|
+ <scroll-view scroll-y="true" class="scroll-view">
|
|
|
+ <view class="one">
|
|
|
+ <view class="one_1">
|
|
|
+ <view class="name">
|
|
|
+ <text>{{item.name}},</text>{{item.phone}}
|
|
|
+ </view>
|
|
|
+ <view class="address">
|
|
|
+ <text>{{item.province}}</text><text>{{item.city}}</text>
|
|
|
+ <text>{{item.area}}</text><text>{{item.address}}</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
+ <text class="iconfont icon-jiantouyou"></text>
|
|
|
</view>
|
|
|
- <text class="iconfont icon-jiantouyou"></text>
|
|
|
- </view>
|
|
|
- <view class="two">
|
|
|
- <view class="two_1">
|
|
|
- <checkbox-group @change="toCheckbox">
|
|
|
- <label>
|
|
|
- <checkbox :value="item._id" :checked="item.checked" style="transform:scale(0.7)" />选择地址
|
|
|
- </label>
|
|
|
- </checkbox-group>
|
|
|
- </view>
|
|
|
- <view class="two_2">
|
|
|
- <text class="text" v-if="item.is_default=='1'">默认</text>
|
|
|
- <text @click="toDel(item)" class="iconfont icon-del"></text>
|
|
|
+ <view class="two">
|
|
|
+ <view class="two_1">
|
|
|
+ <checkbox-group @change="toCheckbox">
|
|
|
+ <label>
|
|
|
+ <checkbox :value="item._id" :checked="item.checked" style="transform:scale(0.7)" />
|
|
|
+ 选择地址
|
|
|
+ </label>
|
|
|
+ </checkbox-group>
|
|
|
+ </view>
|
|
|
+ <view class="two_2">
|
|
|
+ <text class="text" v-if="item.is_default=='1'">默认</text>
|
|
|
+ <text @click="toDel(item)" class="iconfont icon-del"></text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </scroll-view>
|
|
|
</view>
|
|
|
<view class="content" v-else>
|
|
|
- <discount :Style="Style" :couponList="couponList" @toDiscount="toDiscount"></discount>
|
|
|
+ <scroll-view scroll-y="true" class="scroll-view">
|
|
|
+ <discount :Style="Style" :couponList="couponList" @toDiscount="toDiscount"></discount>
|
|
|
+ </scroll-view>
|
|
|
</view>
|
|
|
</uni-popup>
|
|
|
</mobile-frame>
|
|
|
@@ -513,11 +518,14 @@
|
|
|
.content {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
- max-height: 100vw;
|
|
|
- min-height: 100vw;
|
|
|
- overflow-y: auto;
|
|
|
+ height: 760rpx;
|
|
|
+ overflow-x: hidden;
|
|
|
background-color: var(--f5Color);
|
|
|
|
|
|
+ .scroll_view_style {
|
|
|
+ height: 100%;
|
|
|
+ }
|
|
|
+
|
|
|
.one {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
zs