换ubuntu
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
Component({
|
||||
properties: {
|
||||
},
|
||||
data: {
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
Component({
|
||||
properties: {
|
||||
},
|
||||
data: {
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
})
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {
|
||||
"message":"../../order/message/index"
|
||||
}
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {
|
||||
"message":"../../order/message/index"
|
||||
}
|
||||
}
|
||||
@@ -1,38 +1,38 @@
|
||||
.content {
|
||||
background-color: #fff;
|
||||
width: 750rpx;
|
||||
// height: ;
|
||||
padding-bottom: 33rpx;
|
||||
|
||||
.aggregate {
|
||||
display: flex;
|
||||
box-sizing: border-box;
|
||||
padding: 30rpx;
|
||||
justify-content: flex-end;
|
||||
font-size: 22rpx;
|
||||
color: #999;
|
||||
height: 78rpx;
|
||||
border-bottom: 1rpx solid #f2f2f2;
|
||||
|
||||
> text {
|
||||
color: #333;
|
||||
margin: 0 5rpx;
|
||||
}
|
||||
}
|
||||
.message {
|
||||
display: flex;
|
||||
padding: 0 30rpx;
|
||||
justify-content: space-between;
|
||||
font-size: 26rpx;
|
||||
color: #333;
|
||||
align-items: center;
|
||||
height: 77rpx;
|
||||
border-bottom: 1rpx solid #f2f2f2;
|
||||
}
|
||||
.leave {
|
||||
display: flex;
|
||||
height: 77rpx;
|
||||
padding: 0 30rpx;
|
||||
align-items: center;
|
||||
}
|
||||
.content {
|
||||
background-color: #fff;
|
||||
width: 750rpx;
|
||||
// height: ;
|
||||
padding-bottom: 33rpx;
|
||||
|
||||
.aggregate {
|
||||
display: flex;
|
||||
box-sizing: border-box;
|
||||
padding: 30rpx;
|
||||
justify-content: flex-end;
|
||||
font-size: 22rpx;
|
||||
color: #999;
|
||||
height: 78rpx;
|
||||
border-bottom: 1rpx solid #f2f2f2;
|
||||
|
||||
> text {
|
||||
color: #333;
|
||||
margin: 0 5rpx;
|
||||
}
|
||||
}
|
||||
.message {
|
||||
display: flex;
|
||||
padding: 0 30rpx;
|
||||
justify-content: space-between;
|
||||
font-size: 26rpx;
|
||||
color: #333;
|
||||
align-items: center;
|
||||
height: 77rpx;
|
||||
border-bottom: 1rpx solid #f2f2f2;
|
||||
}
|
||||
.leave {
|
||||
display: flex;
|
||||
height: 77rpx;
|
||||
padding: 0 30rpx;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
@@ -1,24 +1,24 @@
|
||||
<view class="content">
|
||||
<message></message>
|
||||
<view class="aggregate">
|
||||
共计1件商品 合计:
|
||||
<text>¥29.80</text>
|
||||
(含运费¥0.00)
|
||||
</view>
|
||||
<view class="message">
|
||||
<text>订单编号</text>
|
||||
<text>123456789123456789</text>
|
||||
</view>
|
||||
<view class="message">
|
||||
<text>下单时间</text>
|
||||
<text>2018-10-01 18:00:06</text>
|
||||
</view>
|
||||
<view class="message">
|
||||
<text>配送方式</text>
|
||||
<text>快递 免邮</text>
|
||||
</view>
|
||||
<view class="leave">
|
||||
<text>备注:</text>
|
||||
<input type="text" placeholder="填写你需要对我们说的" />
|
||||
</view>
|
||||
<view class="content">
|
||||
<message></message>
|
||||
<view class="aggregate">
|
||||
共计1件商品 合计:
|
||||
<text>¥29.80</text>
|
||||
(含运费¥0.00)
|
||||
</view>
|
||||
<view class="message">
|
||||
<text>订单编号</text>
|
||||
<text>123456789123456789</text>
|
||||
</view>
|
||||
<view class="message">
|
||||
<text>下单时间</text>
|
||||
<text>2018-10-01 18:00:06</text>
|
||||
</view>
|
||||
<view class="message">
|
||||
<text>配送方式</text>
|
||||
<text>快递 免邮</text>
|
||||
</view>
|
||||
<view class="leave">
|
||||
<text>备注:</text>
|
||||
<input type="text" placeholder="填写你需要对我们说的" />
|
||||
</view>
|
||||
</view>
|
||||
@@ -1 +1 @@
|
||||
.content{background-color:#fff;width:750rpx;padding-bottom:33rpx}.content .aggregate{display:flex;box-sizing:border-box;padding:30rpx;justify-content:flex-end;font-size:22rpx;color:#999;height:78rpx;border-bottom:1rpx solid #f2f2f2}.content .aggregate>text{color:#333;margin:0 5rpx}.content .message{display:flex;padding:0 30rpx;justify-content:space-between;font-size:26rpx;color:#333;align-items:center;height:77rpx;border-bottom:1rpx solid #f2f2f2}.content .leave{display:flex;height:77rpx;padding:0 30rpx;align-items:center}
|
||||
.content{background-color:#fff;width:750rpx;padding-bottom:33rpx}.content .aggregate{display:flex;box-sizing:border-box;padding:30rpx;justify-content:flex-end;font-size:22rpx;color:#999;height:78rpx;border-bottom:1rpx solid #f2f2f2}.content .aggregate>text{color:#333;margin:0 5rpx}.content .message{display:flex;padding:0 30rpx;justify-content:space-between;font-size:26rpx;color:#333;align-items:center;height:77rpx;border-bottom:1rpx solid #f2f2f2}.content .leave{display:flex;height:77rpx;padding:0 30rpx;align-items:center}
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
Component({
|
||||
properties: {
|
||||
},
|
||||
data: {
|
||||
steps: [
|
||||
{
|
||||
text: '步骤一',
|
||||
desc: '描述信息'
|
||||
},
|
||||
{
|
||||
text: '步骤二',
|
||||
desc: '描述信息'
|
||||
},
|
||||
{
|
||||
text: '步骤三',
|
||||
desc: '描述信息'
|
||||
},
|
||||
{
|
||||
text: '步骤四',
|
||||
desc: '描述信息'
|
||||
}
|
||||
]
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
Component({
|
||||
properties: {
|
||||
},
|
||||
data: {
|
||||
steps: [
|
||||
{
|
||||
text: '步骤一',
|
||||
desc: '描述信息'
|
||||
},
|
||||
{
|
||||
text: '步骤二',
|
||||
desc: '描述信息'
|
||||
},
|
||||
{
|
||||
text: '步骤三',
|
||||
desc: '描述信息'
|
||||
},
|
||||
{
|
||||
text: '步骤四',
|
||||
desc: '描述信息'
|
||||
}
|
||||
]
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
})
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {
|
||||
"van-steps": "../utils/dist/steps/index"
|
||||
}
|
||||
{
|
||||
"component": true,
|
||||
"usingComponents": {
|
||||
"van-steps": "../utils/dist/steps/index"
|
||||
}
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
.logistics{
|
||||
margin-top: 20rpx;
|
||||
background-color: #fff;
|
||||
.title{
|
||||
height: 84rpx;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
line-height: 84rpx;
|
||||
border-bottom: 2rpx solid #e5e5e5;
|
||||
padding-left: 29rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.schedule{
|
||||
width: 650rpx;
|
||||
margin-left: 50rpx;
|
||||
}
|
||||
.logistics{
|
||||
margin-top: 20rpx;
|
||||
background-color: #fff;
|
||||
.title{
|
||||
height: 84rpx;
|
||||
font-size: 28rpx;
|
||||
color: #333;
|
||||
line-height: 84rpx;
|
||||
border-bottom: 2rpx solid #e5e5e5;
|
||||
padding-left: 29rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.schedule{
|
||||
width: 650rpx;
|
||||
margin-left: 50rpx;
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
<view class="logistics">
|
||||
<view class="title">物流追踪</view>
|
||||
<van-steps steps="{{ steps }}" active="{{ 1 }}" direction="vertical" active-color="#47C877" class="schedule" />
|
||||
<view class="logistics">
|
||||
<view class="title">物流追踪</view>
|
||||
<van-steps steps="{{ steps }}" active="{{ 1 }}" direction="vertical" active-color="#47C877" class="schedule" />
|
||||
</view>
|
||||
@@ -1 +1 @@
|
||||
.logistics{margin-top:20rpx;background-color:#fff}.logistics .title{height:84rpx;font-size:28rpx;color:#333;line-height:84rpx;border-bottom:2rpx solid #e5e5e5;padding-left:29rpx;box-sizing:border-box}.logistics .schedule{width:650rpx;margin-left:50rpx}
|
||||
.logistics{margin-top:20rpx;background-color:#fff}.logistics .title{height:84rpx;font-size:28rpx;color:#333;line-height:84rpx;border-bottom:2rpx solid #e5e5e5;padding-left:29rpx;box-sizing:border-box}.logistics .schedule{width:650rpx;margin-left:50rpx}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Component({
|
||||
properties: {
|
||||
},
|
||||
data: {
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
Component({
|
||||
properties: {
|
||||
},
|
||||
data: {
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
})
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"component": true
|
||||
{
|
||||
"component": true
|
||||
}
|
||||
@@ -1,35 +1,35 @@
|
||||
.orderchooseaddr {
|
||||
background-color: #fff;
|
||||
width: 750rpx;
|
||||
height: 148rpx;
|
||||
margin: 0 auto;
|
||||
border-bottom: 20rpx solid #fbfbfb;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
.left {
|
||||
width: 572rpx;
|
||||
height: 80rpx;
|
||||
.userinfo {
|
||||
color: #333333;
|
||||
font-size: 26rpx;
|
||||
text-indent: 30rpx;
|
||||
margin-top: 41rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.addr {
|
||||
color: #999999;
|
||||
font-size: 24rpx;
|
||||
text-indent: 30rpx;
|
||||
margin-top: 32rpx;
|
||||
}
|
||||
}
|
||||
.right {
|
||||
width: 17rpx;
|
||||
height: 30rpx;
|
||||
background-color: #d3d3d3;
|
||||
margin: auto 0;
|
||||
margin-right: 19rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.orderchooseaddr {
|
||||
background-color: #fff;
|
||||
width: 750rpx;
|
||||
height: 148rpx;
|
||||
margin: 0 auto;
|
||||
border-bottom: 20rpx solid #fbfbfb;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
.left {
|
||||
width: 572rpx;
|
||||
height: 80rpx;
|
||||
.userinfo {
|
||||
color: #333333;
|
||||
font-size: 26rpx;
|
||||
text-indent: 30rpx;
|
||||
margin-top: 41rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.addr {
|
||||
color: #999999;
|
||||
font-size: 24rpx;
|
||||
text-indent: 30rpx;
|
||||
margin-top: 32rpx;
|
||||
}
|
||||
}
|
||||
.right {
|
||||
width: 17rpx;
|
||||
height: 30rpx;
|
||||
background-color: #d3d3d3;
|
||||
margin: auto 0;
|
||||
margin-right: 19rpx;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<view class="orderchooseaddr">
|
||||
<view class="left">
|
||||
<view class="userinfo">
|
||||
<text class="username">于于宇 15698857895</text>
|
||||
<text></text>
|
||||
</view>
|
||||
<view class="addr">中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区</view>
|
||||
</view>
|
||||
<view class="right"></view>
|
||||
<view class="orderchooseaddr">
|
||||
<view class="left">
|
||||
<view class="userinfo">
|
||||
<text class="username">于于宇 15698857895</text>
|
||||
<text></text>
|
||||
</view>
|
||||
<view class="addr">中国大陆 山东省 青岛市 即墨区 纯阳路 某某某小区</view>
|
||||
</view>
|
||||
<view class="right"></view>
|
||||
</view>
|
||||
@@ -1 +1 @@
|
||||
.orderchooseaddr{background-color:#fff;width:750rpx;height:148rpx;margin:0 auto;border-bottom:20rpx solid #fbfbfb;display:flex;justify-content:space-between}.orderchooseaddr .left{width:572rpx;height:80rpx}.orderchooseaddr .left .userinfo{color:#333333;font-size:26rpx;text-indent:30rpx;margin-top:41rpx;display:flex;justify-content:space-between}.orderchooseaddr .left .addr{color:#999999;font-size:24rpx;text-indent:30rpx;margin-top:32rpx}.orderchooseaddr .right{width:17rpx;height:30rpx;background-color:#d3d3d3;margin:auto 0;margin-right:19rpx}
|
||||
.orderchooseaddr{background-color:#fff;width:750rpx;height:148rpx;margin:0 auto;border-bottom:20rpx solid #fbfbfb;display:flex;justify-content:space-between}.orderchooseaddr .left{width:572rpx;height:80rpx}.orderchooseaddr .left .userinfo{color:#333333;font-size:26rpx;text-indent:30rpx;margin-top:41rpx;display:flex;justify-content:space-between}.orderchooseaddr .left .addr{color:#999999;font-size:24rpx;text-indent:30rpx;margin-top:32rpx}.orderchooseaddr .right{width:17rpx;height:30rpx;background-color:#d3d3d3;margin:auto 0;margin-right:19rpx}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Component({
|
||||
properties: {
|
||||
},
|
||||
data: {
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
Component({
|
||||
properties: {
|
||||
},
|
||||
data: {
|
||||
},
|
||||
methods: {
|
||||
}
|
||||
})
|
||||
@@ -1,3 +1,3 @@
|
||||
{
|
||||
"component": true
|
||||
{
|
||||
"component": true
|
||||
}
|
||||
@@ -1,29 +1,29 @@
|
||||
.payment {
|
||||
width: 750rpx;
|
||||
height: 98rpx;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
background-color: #fff;
|
||||
align-items: center;
|
||||
.price {
|
||||
font-size: 34rpx;
|
||||
margin-left: 74rpx;
|
||||
.title {
|
||||
color: #333;
|
||||
}
|
||||
.counts{
|
||||
color: #ff3838;
|
||||
}
|
||||
}
|
||||
.submit {
|
||||
width: 250rpx;
|
||||
height: 98rpx;
|
||||
background-color: #47c877;
|
||||
font-size: 30rpx;
|
||||
color: #fff;
|
||||
line-height: 98rpx;
|
||||
text-align: center;
|
||||
}
|
||||
.payment {
|
||||
width: 750rpx;
|
||||
height: 98rpx;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
background-color: #fff;
|
||||
align-items: center;
|
||||
.price {
|
||||
font-size: 34rpx;
|
||||
margin-left: 74rpx;
|
||||
.title {
|
||||
color: #333;
|
||||
}
|
||||
.counts{
|
||||
color: #ff3838;
|
||||
}
|
||||
}
|
||||
.submit {
|
||||
width: 250rpx;
|
||||
height: 98rpx;
|
||||
background-color: #47c877;
|
||||
font-size: 30rpx;
|
||||
color: #fff;
|
||||
line-height: 98rpx;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
<view class="payment">
|
||||
<view class="price">
|
||||
<text class="title">总付款:</text>
|
||||
<text class="counts">¥29</text>
|
||||
</view>
|
||||
<view class="submit">立即支付</view>
|
||||
<view class="payment">
|
||||
<view class="price">
|
||||
<text class="title">总付款:</text>
|
||||
<text class="counts">¥29</text>
|
||||
</view>
|
||||
<view class="submit">立即支付</view>
|
||||
</view>
|
||||
@@ -1 +1 @@
|
||||
.payment{width:750rpx;height:98rpx;position:fixed;bottom:0;display:flex;justify-content:space-between;background-color:#fff;align-items:center}.payment .price{font-size:34rpx;margin-left:74rpx}.payment .price .title{color:#333}.payment .price .counts{color:#ff3838}.payment .submit{width:250rpx;height:98rpx;background-color:#47c877;font-size:30rpx;color:#fff;line-height:98rpx;text-align:center}
|
||||
.payment{width:750rpx;height:98rpx;position:fixed;bottom:0;display:flex;justify-content:space-between;background-color:#fff;align-items:center}.payment .price{font-size:34rpx;margin-left:74rpx}.payment .price .title{color:#333}.payment .price .counts{color:#ff3838}.payment .submit{width:250rpx;height:98rpx;background-color:#47c877;font-size:30rpx;color:#fff;line-height:98rpx;text-align:center}
|
||||
|
||||
Reference in New Issue
Block a user