|
@@ -44,9 +44,10 @@
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
- <view class="flex freight" v-if="info.memo != ''">
|
|
|
|
- <text style="margin-right: 30rpx;">留言:</text>
|
|
|
|
|
|
+ <view class="freight" v-if="info.memo != ''">
|
|
|
|
+ <text style="margin: 0 30rpx 0 60rpx;">留言:</text>
|
|
<text>{{info.memo}}</text>
|
|
<text>{{info.memo}}</text>
|
|
|
|
+ <!-- <u-input type="text" :value="info.memo" border="none" disabled disabledColor="#fff" fontSize="14" color="#333333"/> -->
|
|
</view>
|
|
</view>
|
|
|
|
|
|
<view class="detail-info">
|
|
<view class="detail-info">
|
|
@@ -365,25 +366,21 @@
|
|
}
|
|
}
|
|
|
|
|
|
.logistics {
|
|
.logistics {
|
|
- @include btn
|
|
|
|
- border: 1px solid #bbbbbb;
|
|
|
|
|
|
+ @include btn border: 1px solid #bbbbbb;
|
|
color: #414141;
|
|
color: #414141;
|
|
}
|
|
}
|
|
|
|
|
|
.logisticsCancel {
|
|
.logisticsCancel {
|
|
- @include btn
|
|
|
|
- border: 2rpx solid $uni-bg-color;
|
|
|
|
|
|
+ @include btn border: 2rpx solid $uni-bg-color;
|
|
}
|
|
}
|
|
|
|
|
|
.confirm {
|
|
.confirm {
|
|
- @include btn
|
|
|
|
- border: 2rpx solid rgba(236, 112, 9, 100);
|
|
|
|
|
|
+ @include btn border: 2rpx solid rgba(236, 112, 9, 100);
|
|
color: rgba(236, 112, 9, 100);
|
|
color: rgba(236, 112, 9, 100);
|
|
}
|
|
}
|
|
|
|
|
|
.confirmPay {
|
|
.confirmPay {
|
|
- @include btn
|
|
|
|
- background-color: $uni-bg-color;
|
|
|
|
|
|
+ @include btn background-color: $uni-bg-color;
|
|
border: 2rpx solid $uni-bg-color;
|
|
border: 2rpx solid $uni-bg-color;
|
|
color: #FFFFFF;
|
|
color: #FFFFFF;
|
|
}
|
|
}
|
|
@@ -394,11 +391,12 @@
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
.freight {
|
|
.freight {
|
|
- margin-bottom: 20rpx;
|
|
|
|
- background-color: #fff;
|
|
|
|
- justify-content: space-between;
|
|
|
|
- padding: 20rpx 16rpx;
|
|
|
|
- }
|
|
|
|
|
|
+ margin-bottom: 20rpx;
|
|
|
|
+ background-color: #fff;
|
|
|
|
+ // justify-content: space-between;
|
|
|
|
+ padding: 20rpx 16rpx;
|
|
|
|
+ }
|
|
|
|
+
|
|
.detail {
|
|
.detail {
|
|
margin: 10rpx;
|
|
margin: 10rpx;
|
|
padding-bottom: 160rpx;
|
|
padding-bottom: 160rpx;
|