miniprogram / shengxian · 提交

转到一个项目

作者 王旭宇
提交 4dd0c35b9785f91d399c4f7531a3cd9ade2d53ce 1 个父辈 c8e60445

4545

内嵌 并排对比
正在显示 3 个修改的文件 包含 198 行增加 和 184 行删除
... ... @@ -1762,6 +1762,8 @@ padding-left: 30rpx
top:250rpx;
left: 0;
z-index: 999;
padding-bottom: 100rpx;
box-sizing: border-box
}
.swiperswiper{
height: 120rpx;
... ...
<!--pages/my/orderDetail/orderDetail.wxml-->
<view class='pages {{showad?"active":""}} {{couponFlag||deliverTime||chooseFlagAddress?"activity":""}}'>
<view class='scroll'>
<view class='banner'>
<view class='iconfont icon-fanhui' catchtap='get_back'></view>
<view class='coupons'>结算</view>
<view class='scroll'>
<view class='banner'>
<view class='iconfont icon-fanhui' catchtap='get_back'></view>
<view class='coupons'>结算</view>
</view>
<view class='content_item'>
<view class='item_list'>
<!-- <view class='expected_time' bindtap='chooseTime' wx:if='{{is_group==0}}'> -->
<picker mode="multiSelector" wx:if='{{is_group==0}}' class='flex_box' bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
<view class="picker_class">
<view class='zhanman'>
<view class='iconfont icon-time'></view>
<text class='hint' wx:if='{{timeflag}}'>选择时间</text>
<text class='hint' wx:else>{{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}</text>
<view class='centers'>送达</view>
</view>
<view class='iconfont icon-jinru add_left'></view>
</view>
</picker>
<!-- <view class='expected_time' bindtap='chooseTime' wx:else> -->
<view class='expected_time' wx:else>
<view class='iconfont icon-time'></view>
<text class='hint'>团购不可选择送达时间</text>
</view>
<view class='expected_time' bindtap='openAddress'>
<view class='iconfont icon-position'></view>
<text wx:if='{{addressFlag}}'>请选择收货地址</text>
<text wx:else class='centers'>{{address.name}}\t\t\t\t{{address.mobile}}\n{{address.poiname}}\t\t{{address.doorplate}}\t\t</text>
<view class='iconfont icon-jinru dec_left {{address_jinru?"active":""}}'></view>
</view>
</view>
<view class='content_item'>
<view class='item_list'>
<!-- <view class='expected_time' bindtap='chooseTime' wx:if='{{is_group==0}}'> -->
<view class='expected_time' wx:if='{{is_group==0}}' bindtap='changeTime'>
<picker mode="multiSelector" class='flex_box' bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
<view class='zhanman'>
<view class='iconfont icon-time'></view>
<text class='hint' wx:if='{{timeflag}}'>选择时间</text>
<text class='hint' wx:else>{{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}</text>
<view class='centers'>送达</view>
<view class='iconfont icon-jinru add_left'></view>
</view>
</picker>
</view>
<!-- <view class='expected_time' bindtap='chooseTime' wx:else> -->
<view class='expected_time' wx:else>
<view class='iconfont icon-time'></view>
<text class='hint'>团购不可选择送达时间</text>
</view>
<view class='expected_time' bindtap='openAddress'>
<view class='iconfont icon-position'></view>
<text wx:if='{{addressFlag}}'>请选择收货地址</text>
<text wx:else class='centers'>{{address.name}}\t\t\t\t{{address.mobile}}\n{{address.poiname}}\t\t{{address.doorplate}}\t\t</text>
<view class='iconfont icon-jinru dec_left {{address_jinru?"active":""}}'></view>
</view>
<view class='item_list1'>
<view class='list_title'>商品信息 </view>
<view class='content'>
<view class='content_list' wx:if='{{goodsList}}' wx:for="{{goodsList}}" wx:key="{{item.id}}">
<view class='content_detail'>
<view class='content_img'>
<image src='{{item.more.thumbnail}}'></image>
</view>
<view class='species'>
<view>{{item.title}}</view>
<view class='num'>×{{item.number}}</view>
</view>
</view>
<view class='item_list1'>
<view class='list_title'>商品信息 </view>
<view class='content'>
<view class='content_list' wx:if='{{goodsList}}' wx:for="{{goodsList}}" wx:key="{{item.id}}">
<view class='content_detail'>
<view class='content_img'>
<image src='{{item.more.thumbnail}}'></image>
</view>
<view class='species'>
<view>{{item.title}}</view>
<view class='num'>×{{item.number}}</view>
</view>
</view>
<view>
<view wx:if='{{packId==-1}}'>
<view wx:if='{{is_vip==1}}'>￥{{item.vip_price}}</view>
<view wx:else>￥{{item.price}}</view>
</view>
<view wx:else>￥{{item.price}}</view>
</view>
</view>
<!-- <view class='content_list' wx:if='{{num!=0}}'>
<view>
<view wx:if='{{packId==-1}}'>
<view wx:if='{{is_vip==1}}'>￥{{item.vip_price}}</view>
<view wx:else>￥{{item.price}}</view>
</view>
<view wx:else>￥{{item.price}}</view>
</view>
</view>
<!-- <view class='content_list' wx:if='{{num!=0}}'>
<view class='content_detail'>
<view class='content_img'>
<image src='{{gList.more.thumbnail}}'></image>
... ... @@ -67,154 +67,154 @@
</view>
<view>￥{{goodsTotalPrice}}</view>
</view> -->
</view>
</view>
</view>
</view>
<view>
<view class='item_list1'>
<view class='goods_detail'>
<view>原价</view>
<view>
<view class='item_list1'>
<view class='goods_detail'>
<view>原价</view>
<view>
<view wx:if='{{vip.priceData.amountOld!=""}}'>￥{{goodsTotalPrice}}</view>
<!-- {{vip.priceData.amountOld}} -->
</view>
</view>
<view class='goods_detail'>
<view>运费</view>
<view>￥{{vip.priceData.shipment_price}}</view>
</view>
<view class='goods_detail' bindtap='jump_coupon'>
<view>优惠券抵扣</view>
<view class='right'>
<view>-￥{{couponPrice}}</view>
<view class='iconfont icon-jinru icon-jinru-dec'></view>
</view>
</view>
<view class='goods_detail bottom'>
<view>可用{{vip.priceData.score}}积分抵用{{vip.priceData.scorePrice}}元</view>
<view>
<switch color="#FFDA44" class='daxiao_size' style='zoom:.6' bindchange='changeSwitch' data-scoreprice='{{vip.priceData.scorePrice}}'></switch>
</view>
</view>
</view>
<view class='total'>合计
<text class='moneys'>￥{{amount}}</text> </view>
<view wx:if='{{vip.priceData.amountOld!=""}}'>￥{{goodsTotalPrice}}</view>
<!-- {{vip.priceData.amountOld}} -->
</view>
<view class='item_list1'>
<view class='list_title'>升级尊享会员特权,本单更返￥{{vip.priceData.cashbackPrice}}</view>
<view class='contents' wx:for='{{vipList}}' wx:for-index='key' wx:for-item='value' wx:key='{{key}}'>
<view class='no_flex'>
<text class='jiange'>{{value.title}}</text>
<text class='jiange kuoda'>￥{{value.sale_price}}</text>
<view class='one_month'>({{value.remark}})</view>
<view class='iconfont icon-weixuanzhong xuanzhong {{vipId==value.id&&value.t?"active":""}}' bindtap='change_vip_id' data-id='{{value.id}}' data-index='{{key}}'></view>
</view>
</view>
</view>
<view class='goods_detail'>
<view>运费</view>
<view>￥{{vip.priceData.shipment_price}}</view>
</view>
<view class='goods_detail' bindtap='jump_coupon'>
<view>优惠券抵扣</view>
<view class='right'>
<view>-￥{{couponPrice}}</view>
<view class='iconfont icon-jinru icon-jinru-dec'></view>
</view>
<view class='no_padding_top'>
<view class='contents no_border_top'>
<view class='no_flex'>
<text class='jiange'>余额</text>
<text class='jiange kuoda'>￥{{vip.user.balance}}</text>
<view class='invest' bindtap='go_recharge'>余额充值</view>
<view class='yue_pay'>使用余额支付</view>
<view class='iconfont icon-weixuanzhong xuanzhong {{useBalance?"active":""}}' bindtap='useBalance'></view>
</view>
</view>
</view>
<view class='goods_detail bottom'>
<view>可用{{vip.priceData.score}}积分抵用{{vip.priceData.scorePrice}}元</view>
<view>
<switch color="#FFDA44" class='daxiao_size' style='zoom:.6' bindchange='changeSwitch' data-scoreprice='{{vip.priceData.scorePrice}}'></switch>
</view>
</view>
</view>
<view class='total'>合计
<text class='moneys'>￥{{amount}}</text> </view>
</view>
</view>
<view class='fixed_bottom'>
<view class='bottom_left'>
<view>
<view class='bottom_left_left' wx:if='{{useBalance}}'>余额支付</view>
<view class='bottom_left_left' wx:else>微信支付</view>
</view>
<view class='bottom_left_right'>￥{{last_total_price}}</view>
<view class='item_list1'>
<view class='list_title'>升级尊享会员特权,本单更返￥{{vip.priceData.cashbackPrice}}</view>
<view class='contents' wx:for='{{vipList}}' wx:for-index='key' wx:for-item='value' wx:key='{{key}}'>
<view class='no_flex'>
<text class='jiange'>{{value.title}}</text>
<text class='jiange kuoda'>￥{{value.sale_price}}</text>
<view class='one_month'>({{value.remark}})</view>
<view class='iconfont icon-weixuanzhong xuanzhong {{vipId==value.id&&value.t?"active":""}}' bindtap='change_vip_id' data-id='{{value.id}}' data-index='{{key}}'></view>
</view>
</view>
<view class='bottom_right' bindtap='settle_success'>去支付</view>
</view>
<view class='no_padding_top'>
<view class='contents no_border_top'>
<view class='no_flex'>
<text class='jiange'>余额</text>
<text class='jiange kuoda'>￥{{vip.user.balance}}</text>
<view class='invest' bindtap='go_recharge'>余额充值</view>
<view class='yue_pay'>使用余额支付</view>
<view class='iconfont icon-weixuanzhong xuanzhong {{useBalance?"active":""}}' bindtap='useBalance'></view>
</view>
</view>
</view>
</view>
</view>
<view class='fixed_bottom'>
<view class='bottom_left'>
<view>
<view class='bottom_left_left' wx:if='{{useBalance}}'>余额支付</view>
<view class='bottom_left_left' wx:else>微信支付</view>
</view>
<view class='bottom_left_right'>￥{{last_total_price}}</view>
</view>
</view>
<view class='bottom_right' bindtap='settle_success'>去支付</view>
</view>
</view>
<!-- 选取优惠券弹框 -->
<view class='chooseCoupon' wx:if='{{couponFlag}}'>
<view class='banner'>
<view class='iconfont icon-fanhui' bindtap='get_myss'> </view>
<view class='coupons'>我的优惠券</view>
</view>
<view class='item_list_boxs' wx:for='{{vip.newUserCoupon}}' wx:key='{{item.id}}' bindtap='closeCoupon' wx:for-index='index' data-index='{{index}}'>
<view class='item_lists'>
<view class='right_top_circle'>免运费券</view>
<view class='list_character'>
<view class='triangle' bindtap='openXiaLa' data-id='{{item.id}}'>
<view class='iconfont {{open&&id==item.id?"icon-xiangxia":"icon-xiangshang"}}'></view>
</view>
<view class='money'>
<text>￥</text>{{item.price}}
</view>
<view class='sale'>{{item.title}}</view>
<view class='data'>有效期至：{{item.end_time}}</view>
</view>
<view class='banner'>
<view class='iconfont icon-fanhui' bindtap='get_myss'> </view>
<view class='coupons'>我的优惠券</view>
</view>
<view class='item_list_boxs' wx:for='{{vip.newUserCoupon}}' wx:key='{{item.id}}' bindtap='closeCoupon' wx:for-index='index' data-index='{{index}}'>
<view class='item_lists'>
<view class='right_top_circle'>免运费券</view>
<view class='list_character'>
<view class='triangle' bindtap='openXiaLa' data-id='{{item.id}}'>
<view class='iconfont {{open&&id==item.id?"icon-xiangxia":"icon-xiangshang"}}'></view>
</view>
<view class='item_list_box' wx:if='{{id==item.id&&open}}'>
<view class='limit_values'>可使用商品，仅限{{item.limit_values}}</view>
<view class='money'>
<text>￥</text>{{item.price}}
</view>
<view class='sale'>{{item.title}}</view>
<view class='data'>有效期至：{{item.end_time}}</view>
</view>
</view>
<view class='item_list_box' wx:if='{{id==item.id&&open}}'>
<view class='limit_values'>可使用商品，仅限{{item.limit_values}}</view>
</view>
</view>
</view>
<!-- 支付成功弹框 -->
<view class='ad_box' bindtap='show_ad' wx:if='{{showad}}'>
<image src='{{imgUrl}}settle_ad.png' mode='widthFix' catchtap='goad'></image>
<view class='iconfont icon-quxiao' bindtap='jump_index'></view>
<image src='{{imgUrl}}settle_ad.png' mode='widthFix' catchtap='goad'></image>
<view class='iconfont icon-quxiao' bindtap='jump_index'></view>
</view>
<!-- 选择时间弹框 -->
<view class='choose_deliver_time' wx:if='{{deliverTime}}'>
<scroll-view scroll-y='true' class='deliver_box'>
<view class='banner'>
<view class='iconfont icon-fanhui' catchtap='get_my'></view>
<view class='coupons'>选择配送时间</view>
<scroll-view scroll-y='true' class='deliver_box'>
<view class='banner'>
<view class='iconfont icon-fanhui' catchtap='get_my'></view>
<view class='coupons'>选择配送时间</view>
</view>
<view class='time_quantumsss' wx:for='{{deliverList}}' wx:for-item='cell' wx:for-index='cellindex' wx:key='{{cellindex}}'>
<view class='time_quantum_leftsss'>
<view class='time_centersss'>
<view class='time_calendarsss'>{{cell.labelArray.date}}</view>
<view class='weeksss'>{{cell.labelArray.week}}</view>
</view>
<view class='time_quantumsss' wx:for='{{deliverList}}' wx:for-item='cell' wx:for-index='cellindex' wx:key='{{cellindex}}'>
<view class='time_quantum_leftsss'>
<view class='time_centersss'>
<view class='time_calendarsss'>{{cell.labelArray.date}}</view>
<view class='weeksss'>{{cell.labelArray.week}}</view>
</view>
</view>
<view class='time_quantum_rightsss'>
<view class='time_quantum_right_itemsss' wx:for='{{cell.children}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}' bindtap='choose_deliver_time' data-id='{{item.value}}' data-parent='{{cellindex}}' data-index='{{index}}'>
<view class='time_quantum_right_item_timesss'>{{item.label}}</view>
<view class='iconfont icon-weixuanzhong icon-weixuanzhongs {{deliverTimeId==item.value?"active":""}}'></view>
</view>
</view>
</view>
<view class='time_quantum_rightsss'>
<view class='time_quantum_right_itemsss' wx:for='{{cell.children}}' wx:for-item='item' wx:for-index='index' wx:key='{{index}}' bindtap='choose_deliver_time' data-id='{{item.value}}' data-parent='{{cellindex}}' data-index='{{index}}'>
<view class='time_quantum_right_item_timesss'>{{item.label}}</view>
<view class='iconfont icon-weixuanzhong icon-weixuanzhongs {{deliverTimeId==item.value?"active":""}}'></view>
</view>
</scroll-view>
</view>
</view>
</scroll-view>
</view>
<!-- 选择地址弹框 -->
<view class='choose_address' wx:if='{{chooseFlagAddress}}'>
<view class='banner'>
<view class='iconfont icon-fanhui' bindtap='get_mys'> </view>
<view class='coupons'>我的地址</view>
<view class='banner'>
<view class='iconfont icon-fanhui' bindtap='get_mys'> </view>
<view class='coupons'>我的地址</view>
</view>
<view class='hint_informations'>
<view class='hints'>提示</view>
<view>您需要修改或删除地址到
<text class='place_names'>个人中心</text> 修改
</view>
<view class='hint_informations'>
<view class='hints'>提示</view>
<view>您需要修改或删除地址到
<text class='place_names'>个人中心</text> 修改
</view>
</view>
<view class='content_itemaa'>
<view class='item_listaa' wx:for='{{addressList}}' wx:key="item.id" wx:for-index='index' bindtap='chooseAddress' data-index='{{index}}' data-id='{{item.id}}'>
<view>
<view class='addressaa'>{{item.poiname}}{{item.doorplate}}</view>
<view class='person_informationaa'>{{item.name}}{{item.mobile}}</view>
</view>
</view>
<view class='content_itemaa'>
<view class='item_listaa' wx:for='{{addressList}}' wx:key="item.id" wx:for-index='index' bindtap='chooseAddress' data-index='{{index}}' data-id='{{item.id}}'>
<view>
<view class='addressaa'>{{item.poiname}}{{item.doorplate}}</view>
<view class='person_informationaa'>{{item.name}}{{item.mobile}}</view>
</view>
</view>
</view>
<view class='bottom_btns' bindtap='addAddress'>
<view class='new_address_btns' bindtap='new_address'>新增收货地址</view>
</view>
</view>
<view class='bottom_btns' bindtap='addAddress'>
<view class='new_address_btns' bindtap='new_address'>新增收货地址</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -16,17 +16,25 @@ box-sizing: border-box;
.pages.activity{
overflow: hidden
}
.flex_box {
width: 100%;
}
.picker_class {
width: 100%;
display: flex;
justify-content: space-between;
align-items: center;
box-sizing: border-box;
position: relative;
}
.scroll{
width: 100%;
/* height: calc(100% - 600rpx); */
/* padding-bottom:120rpx; */
/* box-sizing: border-box */
}
.flex_box{
/* background: red; */
width: 100%;
display: flex
}
.user_guide{
font-size: 28rpx;
color: #222;
... ... @@ -101,7 +109,7 @@ box-sizing: border-box;
font-weight:500;
line-height:42rpx;
text-shadow:0px 10rpx 10rpx rgba(0, 0, 0, 0.05);
position: relative
position: relative;
}
.shipping_information {
... ... @@ -111,15 +119,17 @@ box-sizing: border-box;
.hint {
margin-right: 18rpx;
color:rgba(255,68,68,1);
float: left;
/* float: left; */
display: inline-block
}
.zhanman{
width: 100%;
/* width: 100%; */
height: 100%;
/* background: pink */
flex: 1;
}
.centers{
float: left;
/* float: left; */
display: inline-block;
color:rgba(34,34,34,1);
padding-right:16rpx;
box-sizing: border-box;
... ... @@ -141,6 +151,8 @@ box-sizing: border-box;
.add_left{
position: absolute;
right: 0rpx;
top: 50%;
transform: translateY(-50%)
}
.icon-time,.icon-position{
... ...