修改.vue中的 rem为rpx,修改部分页面错误样式,授权页增加微信和app的判断

This commit is contained in:
gaoxs
2020-03-19 19:05:50 +08:00
parent 3fa8054983
commit 2a2c544991
47 changed files with 922 additions and 898 deletions

View File

@ -43,7 +43,7 @@
<!--物流跟踪-->
<view style="margin-bottom:5px;">
<view class="bg-white" style="width: 92%; margin-left: 4%;margin: auto;padding-left: 15px;padding-right: 15px;padding-top: 10px">
<view style="font-size: .26rem;color: #111111; margin: 5px 0">
<view style="font-size: 26rpx;color: #111111; margin: 5px 0">
物流跟踪
<!--物流跟踪-->
</view>
@ -182,24 +182,24 @@
};
</script>
<style scoped>
<style scoped lang="less">
.no-express {
margin: 1.5rem 0;
margin: 1.5*100rpx 0;
}
.no-express image {
width: 6rem;
width: 6*100rpx;
margin: 0 auto;
display: block;
}
.message-text {
font-family: MicrosoftYaHei;
font-size: 1rem;
font-size: 1*100rpx;
font-weight: normal;
font-stretch: normal;
line-height: 3rem;
letter-spacing: 0rem;
line-height: 3*100rpx;
letter-spacing: 0*100rpx;
color: #333333;
width: 50%;
}
@ -209,8 +209,8 @@
}
.img2 {
width: 0.81rem;
height: 0.8rem;
width: 0.81*100rpx;
height: 0.8*100rpx;
float: right;
}
@ -225,7 +225,7 @@
white-space: normal;
word-wrap: break-word;
word-break: break-all;
font-size: 1rem;
font-size: 1*100rpx;
}
.addressshow1 {
@ -239,11 +239,11 @@
white-space: normal;
word-wrap: break-word;
word-break: break-all;
font-size: 1rem;
font-size: 1*100rpx;
}
.orderTitle {
font-size: 1rem;
font-size: 1*100rpx;
color: #333333;
height: auto;
overflow: hidden;
@ -254,11 +254,11 @@
white-space: normal;
word-wrap: break-word;
word-break: break-all;
height: 2.5rem;
height: 2.5*100rpx;
}
.orderDetail {
font-size: 0.26rem;
font-size: 0.26*100rpx;
color: #666666;
text-align: left;
}
@ -271,7 +271,7 @@
.pay-button {
width: 88%;
height: 2.6rem;
height: 2.6*100rpx;
position: relative;
background-color: red;
color: white;
@ -281,7 +281,7 @@
ul view {
list-style: none;
font-size: 0.24rem;
font-size: 0.24*100rpx;
}
ul {}
@ -294,8 +294,8 @@
.track-list view {
position: relative;
padding: 0 0 0.5rem 5px;
line-height: 0.3rem;
padding: 0 0 0.5*100rpx 5px;
line-height: 0.3*100rpx;
border-left: 1px solid #d9d9d9;
color: #999;
}
@ -312,8 +312,8 @@
position: absolute;
left: -6.5px;
border-radius: 50%;
width: 0.2rem;
height: 0.2rem;
width: 0.2*100rpx;
height: 0.2*100rpx;
top: 4px;
background-color: #b2b2b2;
}
@ -321,11 +321,11 @@
.track-list view.active .node-icon {
background-position: 0-72px;
background-color: #ea7c0a;
width: 0.3rem;
width: 0.3*100rpx;
z-index: 2;
height: 0.3rem;
height: 0.3*100rpx;
position: absolute;
left: -0.19rem;
left: -0.19*100rpx;
top: 0;
border-radius: 50%;
}
@ -346,8 +346,8 @@
display: inline-block;
vertical-align: top;
color: #999;
left: 0.2rem;
top: 0.04rem;
left: 0.2*100rpx;
top: 0.04*100rpx;
}
.track-list view.first .time {
@ -364,7 +364,7 @@
.track-list view.finall {
position: relative;
padding: 0px 0 0.5rem 5px;
padding: 0px 0 0.5*100rpx 5px;
line-height: 18px;
border-color: white;
border-left: 1px solid #ffffff;
@ -375,7 +375,7 @@
width: 1px;
position: absolute;
left: -1.5px;
height: 0.5rem;
height: 0.5*100rpx;
background-color: #d9d9d9;
}
</style>
</style>

View File

@ -332,20 +332,21 @@ export default {
};
</script>
<style scoped>
<style scoped lang="less">
.noCart {
margin-top: 0.17rem;
padding-top: 0.1rem;
margin-top: 0.17*100rpx;
padding-top: 0.1*100rpx;
}
.noCart .pictrue {
width: 4rem;
height: 3rem;
margin: 0.7rem auto 0.5rem auto;
width: 4*100rpx;
height: 3*100rpx;
overflow: hidden;
margin: 0.7*100rpx auto 0.5*100rpx auto;
}
.noCart .pictrue image{
width: 100%;
height: 100%;
width: 4*100rpx;
height: 3*100rpx;
}
</style>

View File

@ -294,7 +294,7 @@
}
};
</script>
<style scoped>
<style scoped lang="less">
.geoPage {
position: fixed;
width: 100%;
@ -305,31 +305,31 @@
.order-details .writeOff {
background-color: #fff;
margin-top: 0.13rem;
padding-bottom: 0.3rem;
margin-top: 0.13*100rpx;
padding-bottom: 0.3*100rpx;
}
.order-details .writeOff .title {
font-size: 0.3rem;
font-size: 0.3*100rpx;
color: #282828;
height: 0.87rem;
height: 0.87*100rpx;
border-bottom: 1px solid #f0f0f0;
padding: 0 0.3rem;
line-height: 0.87rem;
padding: 0 0.3*100rpx;
line-height: 0.87*100rpx;
}
.order-details .writeOff .grayBg {
background-color: #f2f5f7;
width: 5.9rem;
height: 3.84rem;
border-radius: 0.2rem 0.2rem 0 0;
margin: 0.5rem auto 0 auto;
padding-top: 0.55rem;
width: 5.9*100rpx;
height: 3.84*100rpx;
border-radius: 0.2*100rpx 0.2*100rpx 0 0;
margin: 0.5*100rpx auto 0 auto;
padding-top: 0.55*100rpx;
}
.order-details .writeOff .grayBg .pictrue {
width: 2.9rem;
height: 2.9rem;
width: 2.9*100rpx;
height: 2.9*100rpx;
margin: 0 auto;
}
@ -340,8 +340,8 @@
}
.order-details .writeOff .gear {
width: 5.9rem;
height: 0.3rem;
width: 5.9*100rpx;
height: 0.3*100rpx;
margin: 0 auto;
}
@ -353,78 +353,78 @@
.order-details .writeOff .num {
background-color: #f0c34c;
width: 5.9rem;
height: 0.84rem;
width: 5.9*100rpx;
height: 0.84*100rpx;
color: #282828;
font-size: 0.48rem;
font-size: 0.48*100rpx;
margin: 0 auto;
border-radius: 0 0 0.2rem 0.2rem;
border-radius: 0 0 0.2*100rpx 0.2*100rpx;
text-align: center;
padding-top: 0.04rem;
padding-top: 0.04*100rpx;
}
.order-details .writeOff .rules {
margin: 0.46rem 0.3rem 0 0.3rem;
border-top: 0.01rem solid #f0f0f0;
padding-top: 0.1rem;
margin: 0.46*100rpx 0.3*100rpx 0 0.3*100rpx;
border-top: 0.01*100rpx solid #f0f0f0;
padding-top: 0.1*100rpx;
}
.order-details .writeOff .rules .item {
margin-top: 0.15rem;
margin-top: 0.15*100rpx;
}
.order-details .writeOff .rules .item .rulesTitle {
font-size: 0.28rem;
font-size: 0.28*100rpx;
color: #282828;
}
.order-details .writeOff .rules .item .rulesTitle .iconfont {
font-size: 0.3rem;
font-size: 0.3*100rpx;
color: #333;
margin-right: 0.08rem;
margin-top: 0.05rem;
margin-right: 0.08*100rpx;
margin-top: 0.05*100rpx;
}
.order-details .writeOff .rules .item .info {
font-size: 0.28rem;
font-size: 0.28*100rpx;
color: #999;
margin-top: 0.05rem;
margin-top: 0.05*100rpx;
}
.order-details .writeOff .rules .item .info .time {
margin-left: 0.2rem;
margin-left: 0.2*100rpx;
}
.order-details .map {
height: 0.86rem;
font-size: 0.3rem;
height: 0.86*100rpx;
font-size: 0.3*100rpx;
color: #282828;
line-height: 0.86rem;
border-bottom: 0.01rem solid #f0f0f0;
margin-top: 0.13rem;
line-height: 0.86*100rpx;
border-bottom: 1rpx solid #f0f0f0;
margin-top: 0.13*100rpx;
background-color: #fff;
padding: 0 0.3rem;
padding: 0 0.3*100rpx;
}
.order-details .map .place {
font-size: 0.26rem;
width: 1.76rem;
height: 0.5rem;
border-radius: 0.25rem;
line-height: 0.5rem;
font-size: 0.26*100rpx;
width: 1.76*100rpx;
height: 0.5*100rpx;
border-radius: 0.25*100rpx;
line-height: 0.5*100rpx;
text-align: center;
}
.order-details .map .place .iconfont {
font-size: 0.27rem;
height: 0.27rem;
line-height: 0.27rem;
margin: 0.02rem 0.03rem 0 0;
font-size: 0.27*100rpx;
height: 0.27*100rpx;
line-height: 0.27*100rpx;
margin: 0.02*100rpx 0.03*100rpx 0 0;
}
.order-details .address .name .iconfont {
font-size: 0.34rem;
margin-left: 0.1rem;
font-size: 0.34*100rpx;
margin-left: 0.1*100rpx;
}
</style>
<script>
@ -495,7 +495,7 @@
},
methods: {
copyClipboard,
showChang: function() {
showChang: function() {
// 这里判断是不是微信小程序
if (isWeixin()) {
let config = {
@ -630,4 +630,4 @@
}
}
};
</script>
</script>

View File

@ -153,7 +153,7 @@
ref="mychild"></AddressWindow>
</view>
</template>
<style scoped>
<style scoped lang="less">
.order-submission .wrapper .shipping select {
color: #999;
padding-right: 0.15*100rpx;
@ -569,4 +569,4 @@
}
}
};
</script>
</script>