Skip to content

7
7-Eleven
Commit b978acbf by 高淑倩
Options

Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0

parents 3630ecdf 3a29edd5
Showing with 99 additions and 161 deletions
src/pages/logistics/logistics.js
...@@ -5,7 +5,20 @@ Page({ ...@@ -5,7 +5,20 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
logisData:[
{
name:'1111'
},
{
name: '2222'
},
{
name: '3333'
},
{
name: '4444'
}
]
}, },
/** /**
...@@ -16,19 +29,25 @@ Page({ ...@@ -16,19 +29,25 @@ Page({
}, },
/** /**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
onShow: function () { onShow: function () {
}, },
copy(e) {
wx.setClipboardData({
//准备复制的数据
data: e.currentTarget.dataset.content,
success: function (res) {
wx.showToast({
title: '复制成功',
icon: 'none'
});
}
});
},
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
*/ */
......
src/pages/logistics/logistics.wxml
...@@ -12,153 +12,47 @@ ...@@ -12,153 +12,47 @@
<!-- 物流时间轴 --> <!-- 物流时间轴 -->
<view class='expressRecord'> <view class='expressRecord'>
<view class='expressRecord-single-close' wx:for="{{logisData}}" wx:key="{{index}}">
<!-- 顶部收货地址 -->
<view class='expressRecord-getAddress'>
<view class='expressRecord-top'>
<view class='getAddress-icon'>
收
</view>
<view class='getAddress-text'>[收货地址] 广东省深圳市南山区 南山街道 亿利达大厦</view>
</view>
</view>
<!-- 顶部收货地址半个时间轴线 -->
<view class='noReach-online-top-close'></view>
<!-- 单个物流记录点时间轴：当前正在进行的物流状态 -->
<view class='expressRecord-single-close'>
<!-- 左边子容器 -->
<view class='expressRecord-single-noReach-online-top-close'> <view class='expressRecord-single-noReach-online-top-close'>
<!-- 正在进行的时间轴上半个时间线 --> <view class="online-top-close {{index ==0 ? 'online-top-closing' : ''}}" ></view>
<view class='online-top-closing'></view> <view class="dot-icon">
<!-- 正在进行的时间轴点 --> <!-- 订单提交成功 -->
<view class='dot-closing'></view> <!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/submit-order.png"></image> -->
<!-- 正在进行的时间轴下半个时间线 --> <!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/submit-order-primary.png"></image> -->
<view class='online-bottom'></view>
</view> <!-- 订单发货 -->
<!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/deliver.png"></image> -->
<!-- 右边子容器 --> <!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/deliver-success.png"></image> -->
<view class='expressRecord-text'>
<view class='expressRecord-statusing'>运输中</view> <!-- 运输 -->
<view class='expressRecord-status-addressing'>武汉转运中心公司 已发出，下一站 深圳转运中心</view> <!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/transport.png"></image> -->
</view> <!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/transport-success.png"></image> -->
<!-- 相对父级容器绝对定位的日期 --> <!-- 签收 -->
<view class='expressRecord-dating'> <!-- <image class="dot-icon-close" src="/assets/imgs/7_1_0/sign.png"></image> -->
<view class='expressRecord-date-text'> <!-- <image class="dot-icon-closing" src="/assets/imgs/7_1_0/sign-success.png"></image> -->
昨天
<!-- 交易完成 -->
<image class="dot-icon-closing" src="/assets/imgs/7_1_0/trade-success.png"></image>
</view> </view>
<view class='expressRecord-date-time'> <view class='dot-close' wx:if="{{false}}"></view>
20:39 <view class="online-bottom {{index == logisData.length-1 ? 'online-top-closing' : ''}}" ></view>
</view>
</view>
</view>
<!-- 单个物流记录点时间轴：已经过去的物流状态 -->
<view class='expressRecord-single-close'>
<view class='expressRecord-single-noReach-online-top-close'>
<view class='online-top-close'></view>
<view class='dot-close'></view>
<view class='online-bottom'></view>
</view> </view>
<view class='expressRecord-text'> <view class='expressRecord-text'>
<view class='expressRecord-status'></view> <view class='expressRecord-status'>111</view>
<view class='expressRecord-status-address'>武汉转运中心公司 已收入</view> <view class='expressRecord-status-address'>武汉转运中心公司 已收入</view>
</view> </view>
<view class='expressRecord-date'> <view class='expressRecord-date'>
<view class='expressRecord-date-text'> <view class='expressRecord-date-text'>
昨天 {{item.name}}
</view> </view>
<view class='expressRecord-date-time'> <view class='expressRecord-date-time'>
20:37 20:37
</view> </view>
</view> </view>
</view> </view>
<view class='expressRecord-single-close'>
<view class='expressRecord-single-noReach-online-top-close'>
<view class='online-top-close'></view>
<view class='dot-close'></view>
<view class='online-bottom'></view>
</view>
<view class='expressRecord-text'>
<view class='expressRecord-status'></view>
<view class='expressRecord-status-address'>湖北省孝感市汉川市公司 已打包</view>
</view>
<view class='expressRecord-date'>
<view class='expressRecord-date-text'>
昨天
</view>
<view class='expressRecord-date-time'>
14:37
</view>
</view>
</view>
<view class='expressRecord-single-close'>
<view class='expressRecord-single-noReach-online-top-close'>
<view class='online-top-close'></view>
<view class='dot-close'></view>
<view class='online-bottom'></view>
</view>
<view class='expressRecord-text'>
<view class='expressRecord-status'>已揽件</view>
<view class='expressRecord-status-address'>湖北省孝感市汉川市公司 已收件</view>
</view>
<view class='expressRecord-date'>
<view class='expressRecord-date-text'>
昨天
</view>
<view class='expressRecord-date-time'>
14:17
</view>
</view>
</view>
<view class='expressRecord-single-close'>
<view class='expressRecord-single-noReach-online-top-close'>
<view class='online-top-close'></view>
<view class='dot-close'></view>
<!-- 起始位置，下半个时间轴线不用 -->
<view class='online-bottom-start'></view>
</view>
<view class='expressRecord-text'>
<view class='expressRecord-status'>已发货</view>
<view class='expressRecord-status-address'>卖家发货</view>
</view>
<view class='expressRecord-date'>
<view class='expressRecord-date-text'>
昨天
</view>
<view class='expressRecord-date-time'>
13:50
</view>
</view>
</view>
</view> </view>
<view class="button-wrap"> <view class="button-wrap">
......
src/pages/logistics/logistics.wxss
...@@ -63,11 +63,12 @@ page{ ...@@ -63,11 +63,12 @@ page{
.expressRecord { .expressRecord {
width: 750rpx; width: 696rpx;
padding-top: 46rpx; padding-top: 46rpx;
padding-bottom: 200rpx; padding-bottom: 200rpx;
background: #fff; background: #fff;
margin: 0 auto; margin: 0 auto;
padding: 46rpx 0 200rpx 54rpx;
} }
.expressRecord-getAddress { .expressRecord-getAddress {
...@@ -104,7 +105,7 @@ page{ ...@@ -104,7 +105,7 @@ page{
.noReach-online-top-close { .noReach-online-top-close {
width: 1rpx; width: 1rpx;
height: 50rpx; height: 50rpx;
background: #d7d7d7; border-left: 1rpx dotted #808080;
margin-left: 95rpx; margin-left: 95rpx;
} }
...@@ -122,25 +123,24 @@ page{ ...@@ -122,25 +123,24 @@ page{
flex-direction: column; flex-direction: column;
} }
.online-top-closing {
width: 1rpx;
height: 50rpx;
background: #d7d7d7;
margin-left: 95rpx;
}
.online-top-close { .online-top-close {
width: 1rpx; width: 1rpx;
height: 50rpx; height: 50rpx;
background: #999; /* background: #999; */
margin-left: 95rpx; margin-left: 125rpx;
border-left: 1rpx dotted #808080;
/* margin-top: 9rpx; */
} }
.dot-closing { .dot-closing {
width: 10rpx; width: 10rpx;
height: 10rpx; height: 10rpx;
border-radius: 50%; border-radius: 50%;
margin-left: 90rpx; margin-left: 125rpx;
margin-top: 6rpx; margin-top: 6rpx;
margin-bottom: 6rpx; margin-bottom: 6rpx;
background: #fe4f33; background: #fe4f33;
...@@ -150,17 +150,34 @@ page{ ...@@ -150,17 +150,34 @@ page{
width: 10rpx; width: 10rpx;
height: 10rpx; height: 10rpx;
border-radius: 50%; border-radius: 50%;
margin-left: 90rpx; margin-left: 120rpx;
margin-top: 6rpx; margin-top: 6rpx;
margin-bottom: 6rpx; margin-bottom: 6rpx;
background: #999; background: #999;
} }
.dot-icon .dot-icon-close{
width: 26rpx;
height: 26rpx;
margin-left: 115rpx;
}
.dot-icon .dot-icon-closing{
width: 32rpx;
height: 32rpx;
margin-left: 110rpx;
margin-top: 5rpx;
}
.online-bottom { .online-bottom {
width: 1rpx; width: 1rpx;
height: 50rpx; height: 50rpx;
background: #999; /* background: #999; */
margin-left: 95rpx; margin-left: 125rpx;
border-left: 1rpx dotted #808080;
}
.online-top-closing {
border-left: none;
} }
.online-bottom-start { .online-bottom-start {
...@@ -171,7 +188,7 @@ page{ ...@@ -171,7 +188,7 @@ page{
} }
.expressRecord-text { .expressRecord-text {
margin-left: 30rpx; margin-left: 36rpx;
} }
.expressRecord-statusing { .expressRecord-statusing {
...@@ -192,7 +209,7 @@ page{ ...@@ -192,7 +209,7 @@ page{
.expressRecord-status-address { .expressRecord-status-address {
font-size: 22rpx; font-size: 22rpx;
color: #999; color: #808080;
} }
.expressRecord-dating { .expressRecord-dating {
...@@ -227,4 +244,5 @@ page{ ...@@ -227,4 +244,5 @@ page{
.expressRecord-date-time { .expressRecord-date-time {
font-size: 18rpx; font-size: 18rpx;
margin-top: 10rpx;
} }
src/pages/orderDetail/orderDetail.js
...@@ -15,12 +15,6 @@ Page({ ...@@ -15,12 +15,6 @@ Page({
}, },
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
...@@ -28,6 +22,19 @@ Page({ ...@@ -28,6 +22,19 @@ Page({
onShow: function () { onShow: function () {
}, },
copy(e) {
wx.setClipboardData({
//准备复制的数据
data: e.currentTarget.dataset.content,
success: function (res) {
wx.showToast({
title: '复制成功',
icon: 'none'
});
}
});
},
/** /**
* 生命周期函数--监听页面隐藏 * 生命周期函数--监听页面隐藏
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment