1.调整样式

yj-dev
杨杰 3 years ago
parent 708c666f70
commit 79b6dd46cd
  1. 24
      pages.json
  2. 61
      pages/login/login.vue
  3. 40
      pages/order/confirmation.vue
  4. 58
      pages/tabBar/user/user.vue
  5. 33
      pages/user/order_details/order_details.vue
  6. 90
      pages/user/order_list/order_list.vue
  7. 36
      static/css/login.scss
  8. BIN
      static/img/adresw.png
  9. BIN
      static/img/jingbi.png
  10. BIN
      static/img/logo2.jpg
  11. BIN
      static/img/order1.png
  12. BIN
      static/img/order2.png
  13. BIN
      static/img/order3.png
  14. BIN
      static/img/order4.png
  15. BIN
      static/img/order5.png
  16. 12
      uni.scss

@ -19,6 +19,17 @@
}] }]
} }
} }
},{
"path": "pages/login/login",
"style": {
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"bounce": "none", //
"softinputNavBar": "none"
}
}
}, { }, {
"path": "pages/goods/refuel-succes/refuel-succes", "path": "pages/goods/refuel-succes/refuel-succes",
"style": { "style": {
@ -175,18 +186,7 @@
} }
} }
}, },
{
"path": "pages/login/login",
"style": {
"navigationBarBackgroundColor": "#0083f5",
"backgroundColorTop": "#0083f5",
"navigationBarTextStyle": "white",
"app-plus": {
"bounce": "none", //
"softinputNavBar": "none"
}
}
},
{ {
"path": "pages/login/register", "path": "pages/login/register",
"style": { "style": {

File diff suppressed because one or more lines are too long

@ -1,25 +1,6 @@
<template> <template>
<view> <view>
<!-- 收货地址 -->
<!-- <view class="addr" @tap="selectAddress">
<view class="icon">
<image src="../../static/img/addricon.png" mode=""></image>
</view>
<view class="right">
<view class="tel-name">
<view class="name">
{{recinfo.name}}
</view>
<view class="tel">
{{recinfo.tel}}
</view>
</view>
<view class="addres">
{{recinfo.address.region.label}}
{{recinfo.address.detailed}}
</view>
</view>
</view> -->
<view class="width90 font14 fcor666">卡券信息</view> <view class="width90 font14 fcor666">卡券信息</view>
<!-- 购买商品列表 --> <!-- 购买商品列表 -->
<view class="buy-list"> <view class="buy-list">
@ -51,25 +32,6 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 提示-备注 -->
<!-- <view class="order">
<view class="row">
<view class="left">
积分 :
</view>
<view class="right">
已扣除{{int}}积分抵扣{{deduction|toFixed}}
</view>
</view>
<view class="row">
<view class="left">
备注 :
</view>
<view class="right">
<input placeholder="选填,备注内容" v-model="note" />
</view>
</view>
</view> -->
<!-- 明细 --> <!-- 明细 -->
<view class="detail"> <view class="detail">

File diff suppressed because one or more lines are too long

@ -399,39 +399,6 @@
'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo '&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1 .highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1
}) })
//
// let paymentOrder = [];
// let goodsid = [];
// let len = this.buylist.length;
// for (let i = 0; i < len; i++) {
// paymentOrder.push(this.buylist[i]);
// goodsid.push(this.buylist[i].id);
// }
// if (paymentOrder.length == 0) {
// uni.showToast({
// title: '',
// icon: 'none'
// });
// return;
// }
// //UI
// uni.showLoading({
// title: '...'
// })
// setTimeout(() => {
// uni.setStorage({
// key: 'paymentOrder',
// data: paymentOrder,
// success: () => {
// uni.hideLoading();
// uni.redirectTo({
// url: "../pay/payment/payment?amount=" + this.sumPrice
// })
// }
// })
// }, 1000)
}, },
// //
selectAddress() { selectAddress() {

File diff suppressed because one or more lines are too long

@ -1,5 +1,5 @@
page { page {
background: linear-gradient(to bottom, #0083f5 0%, #0083f5 100%); background: #f7f7f7;
height: 100%; height: 100%;
} }
.icon { .icon {
@ -8,24 +8,29 @@ page {
.logo { .logo {
background-color: #0083F5; background-color: #0083F5;
width: 100%; width: 100%;
height: 45vw; height: 60vw;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 0px 0px 50px 50px;
.img { .img {
width: 25%; width: 25%;
height: 25vw; height: 25vw;
image { image {
width: 100%; width: 100%;
border-radius: 100%; border-radius: 16rpx;
} }
} }
} }
.form { .form {
width: 86%; width: 90%;
padding: 0 7%; margin-left: 5%;
border-radius: 8px;
font-size: 30upx; font-size: 30upx;
position: absolute;
background-color: #FFFFFF;
top: 375rpx;
.username, .username,
.password, .password,
.code { .code {
@ -33,28 +38,33 @@ page {
height: 90upx; height: 90upx;
display: flex; display: flex;
align-items: center; align-items: center;
border-radius: 45upx;
background-color: rgba($color: #ffffff, $alpha: 0.1); background-color: rgba($color: #ffffff, $alpha: 0.1);
border-bottom: 1px solid #f6f6f6;
padding: 0 45upx; padding: 0 45upx;
margin-bottom: 26upx; margin-bottom: 26upx;
margin-top: 30px;
input { input {
width: 100%; width: 90%;
margin-left: 5%;
height: 50upx; height: 50upx;
color: rgba($color: #ffffff, $alpha: 0.8); font-size: 16px;
color: #333333;
font-weight: 200; font-weight: 200;
} }
} }
.btn { .btn {
color: #0083f5; color: #FFFFFF;
width: 100%; background-color: #0083f5;
margin-top: 50rpx; width: 90%;
margin-left: 5%;
margin-top: 100rpx;
margin-bottom: 50rpx;
height: 90rpx; height: 90rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border-radius: 45rpx; border-radius: 45rpx;
background-color: #fff;
font-size: 40rpx; font-size: 40rpx;
} }
} }
@ -74,7 +84,7 @@ page {
content: " "; content: " ";
width: 1upx; width: 1upx;
height: 50upx; height: 50upx;
background-color: #fff; background-color: #333333;
position: absolute; position: absolute;
z-index: 3; z-index: 3;
margin-right: 100%; margin-right: 100%;

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

@ -117,7 +117,7 @@ $uni-font-size-paragraph:30upx;
// 字体加粗 // 字体加粗
.fontwig6{ .fontwig6{
font-weight: 600; font-weight: bold;
} }
/* 字体间距 */ /* 字体间距 */
.fontspec { .fontspec {
@ -271,6 +271,11 @@ $uni-font-size-paragraph:30upx;
margin-left: 2%; margin-left: 2%;
} }
.width94 {
width: 94%;
margin-left: 3%;
}
.width80 { .width80 {
width: 80%; width: 80%;
@ -607,6 +612,11 @@ $uni-font-size-paragraph:30upx;
display: inline-block; display: inline-block;
} }
.aliitem{
align-items: center;
display: flex;
}
.font12{ .font12{
font-size: 12px; font-size: 12px;
} }
Loading…
Cancel
Save