|
|
@@ -171,30 +171,46 @@
|
|
|
</button>
|
|
|
</view>
|
|
|
</u-popup>
|
|
|
-
|
|
|
+
|
|
|
<u-popup :show="selfTakeShow" @close="selfTakeShow = false">
|
|
|
- <view class="list_1 flex-col">
|
|
|
- <view class="list-items_1 flex-col" v-for="(item, index) in selfTakeList" :key="index" @click="modifySelfTake(item.id)">
|
|
|
- <view class="group_14 flex-row justify-between">
|
|
|
- <view class="text-group_8 flex-col">
|
|
|
- <text class="text_26" >{{item.name}}</text>
|
|
|
- <text class="text_27" >距您{{item.distanceDesc}}</text>
|
|
|
- </view>
|
|
|
- <view class="image-text_5 flex-row justify-between">
|
|
|
- <text class="text-group_9">{{item.address}}</text>
|
|
|
- <image
|
|
|
- class="icon_3"
|
|
|
- referrerpolicy="no-referrer"
|
|
|
- src="http://www.gzzzyd.com/groupon/order_details/距离@2x.png"
|
|
|
- />
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="group_15 flex-row">
|
|
|
- <view class="tag_1 flex-col">
|
|
|
- <text class="text_28">营业时间: {{item.busStartTimeDesc}}-{{item.busEndTimeDesc}}</text>
|
|
|
- </view>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ <view class="box_3 flex-col">
|
|
|
+ <image @click="selfTakeShow = false"
|
|
|
+ class="icon_2"
|
|
|
+ referrerpolicy="no-referrer"
|
|
|
+ src="/static/images/X.png"
|
|
|
+ />
|
|
|
+ <text class="text_25">切换取货点</text>
|
|
|
+
|
|
|
+ <scroll-view scroll-y="true" class="scroll-y">
|
|
|
+
|
|
|
+
|
|
|
+ <view class="list_1 flex-col">
|
|
|
+ <view @click="clickSelfTake(item)"
|
|
|
+ class="list-items_1 flex-col"
|
|
|
+ v-for="(item, index) in selfTakeList"
|
|
|
+ :key="index">
|
|
|
+ <view class="group_14 flex-row justify-between">
|
|
|
+ <view class="flex-col">
|
|
|
+ <text class="text_26" >{{item.name}}</text>
|
|
|
+ <text class="text_27" >{{item.address}}</text>
|
|
|
+ </view>
|
|
|
+ <view class="flex-row justify-between">
|
|
|
+ <text class="text-group_9" >距您{{item.distanceDesc}}</text>
|
|
|
+ <image class="icon_3"
|
|
|
+ src="http://www.gzzzyd.com/groupon/order_details/距离@2x.png"/>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="group_15 flex-row">
|
|
|
+ <view class="tag_1 flex-col">
|
|
|
+ <text class="text_28">营业时间: {{item.busStartTimeDesc}}-{{item.busEndTimeDesc}}</text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </scroll-view>
|
|
|
</view>
|
|
|
</u-popup>
|
|
|
</view>
|
|
|
@@ -274,6 +290,13 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
|
|
|
+ clickSelfTake(item){
|
|
|
+ this.selfTakeShow =false;
|
|
|
+ //item 选中的自提点
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
+
|
|
|
cancelOrder() {
|
|
|
let _this = this;
|
|
|
uni.showModal({
|
|
|
@@ -353,6 +376,9 @@ export default {
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
+
|
|
|
+ @import "/static/css/common.css";
|
|
|
+
|
|
|
/deep/uni-checkbox[disabled] .uni-checkbox-input {
|
|
|
background-color: #eee;
|
|
|
}
|
|
|
@@ -1121,85 +1147,114 @@ export default {
|
|
|
font-size: 28rpx !important;
|
|
|
}
|
|
|
|
|
|
-.list_1 {
|
|
|
- height: 301px;
|
|
|
- margin: 12px 8px 0 0;
|
|
|
+.scroll-y{
|
|
|
+ height: 600rpx;
|
|
|
}
|
|
|
|
|
|
-.list-items_1 {
|
|
|
- background-color: rgba(255, 255, 255, 1);
|
|
|
- border-radius: 4px;
|
|
|
- margin-bottom: 8px;
|
|
|
- padding: 12px 12px 12px 12px;
|
|
|
-}
|
|
|
+ .box_3 {
|
|
|
+ background-color: rgba(250, 250, 250, 1);
|
|
|
+ border-radius: 4px 4px 0px 0px;
|
|
|
+ padding: 16rpx 16rpx 40rpx 32rpx;
|
|
|
+ }
|
|
|
|
|
|
-.group_14 {
|
|
|
- width: 319px;
|
|
|
-}
|
|
|
+ .icon_2 {
|
|
|
+ width: 32rpx;
|
|
|
+ height: 32rpx;
|
|
|
+ margin-left: 670rpx;
|
|
|
+ }
|
|
|
|
|
|
-.text-group_8 {
|
|
|
-}
|
|
|
+ .text_25 {
|
|
|
+ overflow-wrap: break-word;
|
|
|
+ color: rgba(17, 17, 17, 1);
|
|
|
+ font-size: 32rpx;
|
|
|
+ font-family: PingFangSC-Medium;
|
|
|
+ font-weight: 500;
|
|
|
+ text-align: left;
|
|
|
+ white-space: nowrap;
|
|
|
+ line-height: 44rpx;
|
|
|
+ margin: 0 278rpx 0 264rpx;
|
|
|
+ }
|
|
|
|
|
|
-.text_26 {
|
|
|
- overflow-wrap: break-word;
|
|
|
- color: rgba(17, 17, 17, 1);
|
|
|
- font-size: 14px;
|
|
|
- font-weight: NaN;
|
|
|
- text-align: left;
|
|
|
- white-space: nowrap;
|
|
|
- line-height: 20px;
|
|
|
- margin-right: 92px;
|
|
|
-}
|
|
|
+ .list_1 {
|
|
|
+ height: 602rpx;
|
|
|
+ margin: 24rpx 16rpx 0 0;
|
|
|
+ }
|
|
|
|
|
|
-.text_27 {
|
|
|
- overflow-wrap: break-word;
|
|
|
- color: rgba(153, 153, 153, 1);
|
|
|
- font-size: 12px;
|
|
|
- font-weight: NaN;
|
|
|
- text-align: left;
|
|
|
- white-space: nowrap;
|
|
|
- line-height: 17px;
|
|
|
- margin-top: 8px;
|
|
|
-}
|
|
|
+ .list-items_1 {
|
|
|
+ background-color: rgba(255, 255, 255, 1);
|
|
|
+ border-radius: 4px;
|
|
|
+ margin-bottom: 16rpx;
|
|
|
+ padding: 24rpx 24rpx 24rpx 24rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .group_14 {
|
|
|
+ width: 638rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ .text_26 {
|
|
|
+ overflow-wrap: break-word;
|
|
|
+ color: rgba(17, 17, 17, 1);
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-weight: NaN;
|
|
|
+ text-align: left;
|
|
|
+ white-space: nowrap;
|
|
|
+ line-height: 40rpx;
|
|
|
+ margin-right: 184rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .text_27 {
|
|
|
+ overflow-wrap: break-word;
|
|
|
+ color: rgba(153, 153, 153, 1);
|
|
|
+ font-size: 24rpx;
|
|
|
+ font-weight: NaN;
|
|
|
+ text-align: left;
|
|
|
+ white-space: nowrap;
|
|
|
+ line-height: 34rpx;
|
|
|
+ margin-top: 16rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ .text-group_9 {
|
|
|
+ overflow-wrap: break-word;
|
|
|
+ color: rgba(102, 102, 102, 1);
|
|
|
+ font-size: 20rpx;
|
|
|
+ font-weight: NaN;
|
|
|
+ text-align: left;
|
|
|
+ white-space: nowrap;
|
|
|
+ line-height: 36rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .icon_3 {
|
|
|
+ width: 34rpx;
|
|
|
+ height: 34rpx;
|
|
|
+ margin-left: 10rpx;
|
|
|
+ /*margin: 4rpx 0 4rpx 4rpx;*/
|
|
|
+ }
|
|
|
+
|
|
|
+ .group_15 {
|
|
|
+ margin: 8rpx 390rpx 0 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ .tag_1 {
|
|
|
+ background-color: rgba(255, 247, 248, 1);
|
|
|
+ border-radius: 4px;
|
|
|
+ padding: 8rpx 24rpx 8rpx 26rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .text_28 {
|
|
|
+ overflow-wrap: break-word;
|
|
|
+ color: rgba(153, 153, 153, 1);
|
|
|
+ font-size: 20rpx;
|
|
|
+ font-weight: NaN;
|
|
|
+ text-align: left;
|
|
|
+ white-space: nowrap;
|
|
|
+ line-height: 28rpx;
|
|
|
+ }
|
|
|
|
|
|
-.image-text_5 {
|
|
|
- width: 65px;
|
|
|
- margin: 2px 0 25px 0;
|
|
|
-}
|
|
|
|
|
|
-.text-group_9 {
|
|
|
- overflow-wrap: break-word;
|
|
|
- color: rgba(102, 102, 102, 1);
|
|
|
- font-size: 10px;
|
|
|
- font-weight: NaN;
|
|
|
- text-align: left;
|
|
|
- white-space: nowrap;
|
|
|
- line-height: 18px;
|
|
|
-}
|
|
|
|
|
|
-.icon_3 {
|
|
|
- width: 14px;
|
|
|
- height: 14px;
|
|
|
- margin: 2px 0 2px 0;
|
|
|
-}
|
|
|
|
|
|
-.group_15 {
|
|
|
- margin: 4px 195px 0 0;
|
|
|
-}
|
|
|
|
|
|
-.tag_1 {
|
|
|
- background-color: rgba(255, 247, 248, 1);
|
|
|
- border-radius: 4px;
|
|
|
- padding: 4px 12px 4px 13px;
|
|
|
-}
|
|
|
|
|
|
-.text_28 {
|
|
|
- overflow-wrap: break-word;
|
|
|
- color: rgba(153, 153, 153, 1);
|
|
|
- font-size: 10px;
|
|
|
- font-weight: NaN;
|
|
|
- text-align: left;
|
|
|
- white-space: nowrap;
|
|
|
- line-height: 14px;
|
|
|
-}
|
|
|
</style>
|
zhanghui