Skip to content

U
uni-app-csh-user
Commit 456896f7 authored by 秦威威's avatar 秦威威
Browse files
Options

最新版

parent 98d6c7a7
Show whitespace changes
Inline Side-by-side
Showing with 647 additions and 591 deletions
common/request.js
View file @ 456896f7
......@@ -126,15 +126,20 @@ export default {
return true;
},
checkLoginExpired(res) {
uni.setStorageSync("token", "");
console.log(res, 'aaaaaaaa');
// uni.showToast({
// title: '请先登录',
// icon: "none"
// })
uni.navigateTo({
uni.clearStorageSync();
uni.hideLoading()
uni.showModal({
title: '提示',
content: '请先登录',
success(res) {
console.log(res)
if (res.confirm) {
uni.redirectTo({
url: '/pages/login/login'
});
})
}
}
})
return true;
},
//封装日志打印函数
......
common/uni.css
View file @ 456896f7
......@@ -10,50 +10,62 @@
font-size:28upx;
line-height:1.8;
} */
progress, checkbox-group{
progress,
checkbox-group {
width: 100%;
}
form {
width: 100%;
}
.uni-flex {
display: flex;
flex-direction: row;
}
.uni-flex-item {
flex: 1;
}
.uni-row {
flex-direction: row;
}
.uni-column {
flex-direction: column;
}
.uni-link{
color:#576B95;
font-size:26upx;
.uni-link {
color: #576B95;
font-size: 26upx;
}
.uni-center{
text-align:center;
.uni-center {
text-align: center;
}
.uni-inline-item{
.uni-inline-item {
display: flex;
flex-direction: row;
align-items:center;
align-items: center;
}
.uni-inline-item text{
.uni-inline-item text {
margin-right: 20upx;
}
.uni-inline-item text:last-child{
.uni-inline-item text:last-child {
margin-right: 0upx;
margin-left: 20upx;
}
/* page */
.uni-page-head{
padding:35upx;
.uni-page-head {
padding: 35upx;
text-align: center;
}
.uni-page-head-title {
display: inline-block;
padding: 0 40upx;
......@@ -64,127 +76,188 @@ form {
box-sizing: border-box;
border-bottom: 2upx solid #D8D8D8;
}
.uni-page-body {
width: 100%;
flex-grow: 1;
overflow-x: hidden;
}
.uni-padding-wrap{
width:690upx;
padding:0 30upx;
.uni-padding-wrap {
width: 690upx;
padding: 0 30upx;
}
.uni-word {
text-align: center;
padding:200upx 100upx;
padding: 200upx 100upx;
}
.uni-title {
font-size:30upx;
font-weight:500;
padding:20upx 0;
line-height:1.5;
font-size: 30upx;
font-weight: 500;
padding: 20upx 0;
line-height: 1.5;
}
.uni-text{
font-size:28upx;
.uni-text {
font-size: 28upx;
}
.uni-title text{
font-size:24upx;
color:#888;
.uni-title text {
font-size: 24upx;
color: #888;
}
.uni-text-gray{
.uni-text-gray {
color: #ccc;
}
.uni-text-small {
font-size:24upx;
font-size: 24upx;
}
.uni-common-mb{
margin-bottom:30upx;
.uni-common-mb {
margin-bottom: 30upx;
}
.uni-common-pb{
padding-bottom:30upx;
.uni-common-pb {
padding-bottom: 30upx;
}
.uni-common-pl{
padding-left:30upx;
.uni-common-pl {
padding-left: 30upx;
}
.uni-common-mt{
margin-top:30upx;
.uni-common-mt {
margin-top: 30upx;
}
/* 背景色 */
.uni-bg-red{
background:#F76260; color:#FFF;
.uni-bg-red {
background: #F76260;
color: #FFF;
}
.uni-bg-green{
background:#09BB07; color:#FFF;
.uni-bg-green {
background: #09BB07;
color: #FFF;
}
.uni-bg-blue{
background:#007AFF; color:#FFF;
.uni-bg-blue {
background: #007AFF;
color: #FFF;
}
/* 标题 */
.uni-h1 {font-size: 80upx; font-weight:700;}
.uni-h2 {font-size: 60upx; font-weight:700;}
.uni-h3 {font-size: 48upx; font-weight:700;}
.uni-h4 {font-size: 36upx; font-weight:700;}
.uni-h5 {font-size: 28upx; color: #8f8f94;}
.uni-h6 {font-size: 24upx; color: #8f8f94;}
.uni-bold{font-weight:bold;}
.uni-h1 {
font-size: 80upx;
font-weight: 700;
}
.uni-h2 {
font-size: 60upx;
font-weight: 700;
}
.uni-h3 {
font-size: 48upx;
font-weight: 700;
}
.uni-h4 {
font-size: 36upx;
font-weight: 700;
}
.uni-h5 {
font-size: 28upx;
color: #8f8f94;
}
.uni-h6 {
font-size: 24upx;
color: #8f8f94;
}
.uni-bold {
font-weight: bold;
}
/* 文本溢出隐藏 */
.uni-ellipsis {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
.uni-ellipsis {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
/* 竖向百分百按钮 */
.uni-btn-v{
padding:10upx 0;
.uni-btn-v {
padding: 10upx 0;
}
.uni-btn-v button {
margin: 20upx 0;
}
.uni-btn-v button{margin:20upx 0;}
/* 表单 */
.uni-form-item{
display:flex;
width:100%;
padding:10upx 0;
.uni-form-item {
display: flex;
width: 100%;
padding: 10upx 0;
}
.uni-form-item .title{
padding:10upx 25upx;
.uni-form-item .title {
padding: 10upx 25upx;
}
.uni-label {
width: 210upx;
word-wrap: break-word;
word-break: break-all;
text-indent:20upx;
text-indent: 20upx;
}
.uni-input {
height: 50upx;
padding: 15upx 25upx;
line-height:50upx;
font-size:28upx;
background:#FFF;
padding: 15upx 0;
line-height: 50upx;
font-size: 28upx;
background: #FFF;
flex: 1;
}
radio-group, checkbox-group{
width:100%;
radio-group,
checkbox-group {
width: 100%;
}
radio-group label, checkbox-group label{
padding-right:20upx;
radio-group label,
checkbox-group label {
padding-right: 20upx;
}
.uni-form-item .with-fun{
display:flex;
flex-wrap:nowrap;
background:#FFFFFF;
.uni-form-item .with-fun {
display: flex;
flex-wrap: nowrap;
background: #FFFFFF;
}
.uni-form-item .with-fun .uni-icon{
width:40px;
height:80upx;
line-height:80upx;
flex-shrink:0;
.uni-form-item .with-fun .uni-icon {
width: 40px;
height: 80upx;
line-height: 80upx;
flex-shrink: 0;
}
/* loadmore */
.uni-loadmore{
height:80upx;
line-height:80upx;
text-align:center;
padding-bottom:30upx;
.uni-loadmore {
height: 80upx;
line-height: 80upx;
text-align: center;
padding-bottom: 30upx;
}
/*数字角标*/
.uni-badge,
.uni-badge-default {
......@@ -197,55 +270,66 @@ radio-group label, checkbox-group label{
border-radius: 100px;
background-color: rgba(0, 0, 0, .15);
}
.uni-badge.uni-badge-inverted {
padding: 0 5px 0 0;
color: #929292;
background-color: transparent
}
.uni-badge-primary {
color: #fff;
background-color: #007aff
}
.uni-badge-blue.uni-badge-inverted,
.uni-badge-primary.uni-badge-inverted {
color: #007aff;
background-color: transparent
}
.uni-badge-green,
.uni-badge-success {
color: #fff;
background-color: #4cd964;
}
.uni-badge-green.uni-badge-inverted,
.uni-badge-success.uni-badge-inverted {
color: #4cd964;
background-color: transparent
}
.uni-badge-warning,
.uni-badge-yellow {
color: #fff;
background-color: #f0ad4e
}
.uni-badge-warning.uni-badge-inverted,
.uni-badge-yellow.uni-badge-inverted {
color: #f0ad4e;
background-color: transparent
}
.uni-badge-danger,
.uni-badge-red {
color: #fff;
background-color: #dd524d
}
.uni-badge-danger.uni-badge-inverted,
.uni-badge-red.uni-badge-inverted {
color: #dd524d;
background-color: transparent
}
.uni-badge-purple,
.uni-badge-royal {
color: #fff;
background-color: #8a6de9
}
.uni-badge-purple.uni-badge-inverted,
.uni-badge-royal.uni-badge-inverted {
color: #8a6de9;
......@@ -258,6 +342,7 @@ radio-group label, checkbox-group label{
width: 100%;
overflow: hidden;
}
.uni-collapse-content.uni-active {
height: auto;
}
......@@ -266,21 +351,25 @@ radio-group label, checkbox-group label{
.uni-card {
background: #fff;
border-radius: 8upx;
margin:20upx 0;
margin: 20upx 0;
position: relative;
box-shadow: 0 2upx 4upx rgba(0, 0, 0, .3);
}
.uni-card-content {
font-size: 30upx;
}
.uni-card-content.image-view{
.uni-card-content.image-view {
width: 100%;
margin: 0;
}
.uni-card-content-inner {
position: relative;
padding: 30upx;
}
.uni-card-footer,
.uni-card-header {
position: relative;
......@@ -290,12 +379,15 @@ radio-group label, checkbox-group label{
justify-content: space-between;
align-items: center;
}
.uni-card-header {
font-size: 36upx;
}
.uni-card-footer {
color: #6d6d72;
}
.uni-card-footer:before,
.uni-card-header:after {
position: absolute;
......@@ -308,18 +400,22 @@ radio-group label, checkbox-group label{
transform: scaleY(.5);
background-color: #c8c7cc;
}
.uni-card-header:after {
top: auto;
bottom: 0;
}
.uni-card-media {
justify-content: flex-start;
}
.uni-card-media-logo {
height: 84upx;
width: 84upx;
margin-right: 20upx;
}
.uni-card-media-body {
height: 84upx;
display: flex;
......@@ -327,15 +423,18 @@ radio-group label, checkbox-group label{
justify-content: space-between;
align-items: flex-start;
}
.uni-card-media-text-top {
line-height: 36upx;
font-size: 34upx;
}
.uni-card-media-text-bottom {
line-height: 30upx;
font-size: 28upx;
color: #8f8f94;
}
.uni-card-link {
color: #007AFF;
}
......@@ -348,6 +447,7 @@ radio-group label, checkbox-group label{
display: flex;
flex-direction: column;
}
.uni-list:after {
position: absolute;
z-index: 10;
......@@ -360,6 +460,7 @@ radio-group label, checkbox-group label{
transform: scaleY(.5);
background-color: #c8c7cc;
}
.uni-list::before {
position: absolute;
z-index: 10;
......@@ -372,6 +473,7 @@ radio-group label, checkbox-group label{
transform: scaleY(.5);
background-color: #c8c7cc;
}
.uni-list-cell {
position: relative;
display: flex;
......@@ -379,20 +481,25 @@ radio-group label, checkbox-group label{
justify-content: space-between;
align-items: center;
}
.uni-list-cell-hover {
background-color: #eee;
}
.uni-list-cell-pd {
padding: 22upx 30upx;
}
.uni-list-cell-left {
font-size:28upx;
font-size: 28upx;
padding: 0 30upx;
}
.uni-list-cell-db,
.uni-list-cell-right {
flex: 1;
}
.uni-list-cell::after {
position: absolute;
z-index: 3;
......@@ -405,19 +512,23 @@ radio-group label, checkbox-group label{
transform: scaleY(.5);
background-color: #c8c7cc;
}
.uni-list .uni-list-cell:last-child::after {
height: 0upx;
}
.uni-list-cell-last.uni-list-cell::after {
height: 0upx;
}
.uni-list-cell-divider {
position: relative;
display: flex;
color: #999;
background-color: #f7f7f7;
padding:15upx 20upx;
padding: 15upx 20upx;
}
.uni-list-cell-divider::before {
position: absolute;
right: 0;
......@@ -429,6 +540,7 @@ radio-group label, checkbox-group label{
transform: scaleY(.5);
background-color: #c8c7cc;
}
.uni-list-cell-divider::after {
position: absolute;
right: 0;
......@@ -440,8 +552,9 @@ radio-group label, checkbox-group label{
transform: scaleY(.5);
background-color: #c8c7cc;
}
.uni-list-cell-navigate {
font-size:30upx;
font-size: 30upx;
padding: 22upx 30upx;
line-height: 48upx;
position: relative;
......@@ -452,12 +565,15 @@ radio-group label, checkbox-group label{
justify-content: space-between;
align-items: center;
}
.uni-list-cell-navigate {
padding-right: 36upx;
}
.uni-navigate-badge {
padding-right: 50upx;
}
.uni-list-cell-navigate.uni-navigate-right:after {
font-family: uniicons;
content: '\e583';
......@@ -468,6 +584,7 @@ radio-group label, checkbox-group label{
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.uni-list-cell-navigate.uni-navigate-bottom:after {
font-family: uniicons;
content: '\e581';
......@@ -478,6 +595,7 @@ radio-group label, checkbox-group label{
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.uni-list-cell-navigate.uni-navigate-bottom.uni-active::after {
font-family: uniicons;
content: '\e580';
......@@ -488,23 +606,29 @@ radio-group label, checkbox-group label{
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.uni-collapse.uni-list-cell {
flex-direction: column;
}
.uni-list-cell-navigate.uni-active {
background: #eee;
}
.uni-list.uni-collapse {
box-sizing: border-box;
height: 0;
overflow: hidden;
}
.uni-collapse .uni-list-cell {
padding-left: 20upx;
}
.uni-collapse .uni-list-cell::after {
left: 52upx;
}
.uni-list.uni-active {
height: auto;
}
......@@ -518,18 +642,26 @@ radio-group label, checkbox-group label{
flex-direction: row;
padding: 22upx 30upx;
}
.uni-triplex-right,
.uni-triplex-left {
display: flex;
flex-direction: column;
}
.uni-triplex-left {
width: 84%;
}
.uni-triplex-left .uni-title{
padding:8upx 0;
.uni-triplex-left .uni-title {
padding: 8upx 0;
}
.uni-triplex-left .uni-text,
.uni-triplex-left .uni-text-small {
color: #999999;
}
.uni-triplex-left .uni-text, .uni-triplex-left .uni-text-small{color:#999999;}
.uni-triplex-right {
width: 16%;
text-align: right;
......@@ -543,25 +675,31 @@ radio-group label, checkbox-group label{
width: 100%;
flex-direction: row;
}
.uni-navigate-right.uni-media-list {
padding-right: 74upx;
}
.uni-pull-right {
flex-direction: row-reverse;
}
.uni-pull-right>.uni-media-list-logo {
margin-right: 0upx;
margin-left: 20upx;
}
.uni-media-list-logo {
height: 84upx;
width: 84upx;
margin-right: 20upx;
}
.uni-media-list-logo image {
height: 100%;
width: 100%;
}
.uni-media-list-body {
height: 84upx;
display: flex;
......@@ -571,11 +709,13 @@ radio-group label, checkbox-group label{
align-items: flex-start;
overflow: hidden;
}
.uni-media-list-text-top {
width: 100%;
line-height: 36upx;
font-size: 30upx;
}
.uni-media-list-text-bottom {
width: 100%;
line-height: 30upx;
......@@ -592,6 +732,7 @@ radio-group label, checkbox-group label{
flex-wrap: wrap;
border-top: 2upx solid #eee;
}
.uni-grid-9-item {
width: 250upx;
height: 200upx;
......@@ -604,13 +745,16 @@ radio-group label, checkbox-group label{
border-color: #eee;
box-sizing: border-box;
}
.no-border-right {
border-right: none;
}
.uni-grid-9-image {
width: 100upx;
height: 100upx;
}
.uni-grid-9-text {
width: 250upx;
line-height: 4upx;
......@@ -618,6 +762,7 @@ radio-group label, checkbox-group label{
text-align: center;
font-size: 30upx;
}
.uni-grid-9-item-hover {
background: rgba(0, 0, 0, 0.1);
}
......@@ -627,39 +772,47 @@ radio-group label, checkbox-group label{
flex: 1;
flex-direction: column;
}
.uni-uploader-head {
display: flex;
flex-direction: row;
justify-content: space-between;
}
.uni-uploader-info {
color: #B2B2B2;
}
.uni-uploader-body {
margin-top: 16upx;
}
.uni-uploader__files {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
.uni-uploader__file {
margin: 10upx;
width: 210upx;
height: 210upx;
}
.uni-uploader__img {
display: block;
width: 210upx;
height: 210upx;
}
.uni-uploader__input-box {
position: relative;
margin:10upx;
margin: 10upx;
width: 208upx;
height: 208upx;
border: 2upx solid #D9D9D9;
}
.uni-uploader__input-box:before,
.uni-uploader__input-box:after {
content: " ";
......@@ -670,21 +823,26 @@ radio-group label, checkbox-group label{
transform: translate(-50%, -50%);
background-color: #D9D9D9;
}
.uni-uploader__input-box:before {
width: 4upx;
height: 79upx;
}
.uni-uploader__input-box:after {
width: 79upx;
height: 4upx;
}
.uni-uploader__input-box:active {
border-color: #999999;
}
.uni-uploader__input-box:active:before,
.uni-uploader__input-box:active:after {
background-color: #999999;
}
.uni-uploader__input {
position: absolute;
z-index: 1;
......@@ -705,14 +863,17 @@ radio-group label, checkbox-group label{
color: #8f8f94;
font-size: 28upx;
}
.feedback-star-view.feedback-title {
justify-content: flex-start;
margin: 0;
}
.feedback-quick {
position: relative;
padding-right: 40upx;
}
.feedback-quick:after {
font-family: uniicons;
font-size: 40upx;
......@@ -724,9 +885,11 @@ radio-group label, checkbox-group label{
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.feedback-body {
background: #fff;
}
.feedback-textare {
height: 200upx;
font-size: 34upx;
......@@ -735,6 +898,7 @@ radio-group label, checkbox-group label{
box-sizing: border-box;
padding: 20upx 30upx 0;
}
.feedback-input {
font-size: 34upx;
height: 50upx;
......@@ -742,26 +906,33 @@ radio-group label, checkbox-group label{
padding: 15upx 20upx;
line-height: 50upx;
}
.feedback-uploader {
padding: 22upx 20upx;
}
.feedback-star {
font-family: uniicons;
font-size: 40upx;
margin-left: 6upx;
}
.feedback-star-view {
margin-left: 20upx;
}
.feedback-star:after {
content: '\e408';
}
.feedback-star.active {
color: #FFB400;
}
.feedback-star.active:after {
content: '\e438';
}
.feedback-submit {
background: #007AFF;
color: #FFFFFF;
......@@ -802,7 +973,7 @@ radio-group label, checkbox-group label{
position: relative;
display: flex;
flex-direction: row;
font-size:28upx;
font-size: 28upx;
padding: 22upx 30upx;
justify-content: space-between;
}
......@@ -823,16 +994,17 @@ radio-group label, checkbox-group label{
}
/* textarea */
.uni-textarea{
width:100%;
background:#FFF;
}
.uni-textarea textarea{
width:96%;
padding:18upx 2%;
line-height:1.6;
font-size:28upx;
height:150upx;
.uni-textarea {
width: 100%;
background: #FFF;
}
.uni-textarea textarea {
width: 96%;
padding: 18upx 2%;
line-height: 1.6;
font-size: 28upx;
height: 150upx;
}
/* tab bar */
......@@ -875,29 +1047,110 @@ radio-group label, checkbox-group label{
height: calc(100% - 100upx);
}
.uni-tab-bar-loading{
padding:20upx 0;
.uni-tab-bar-loading {
padding: 20upx 0;
}
/* comment */
.uni-comment{padding:5rpx 0; display: flex; flex-grow:1; flex-direction: column;}
.uni-comment-list{flex-wrap:nowrap; padding:10rpx 0; margin:10rpx 0; width:100%; display: flex;}
.uni-comment-face{width:70upx; height:70upx; border-radius:100%; margin-right:20upx; flex-shrink:0; overflow:hidden;}
.uni-comment-face image{width:100%; border-radius:100%;}
.uni-comment-body{width:100%;}
.uni-comment-top{line-height:1.5em; justify-content:space-between;}
.uni-comment-top text{color:#0A98D5; font-size:24upx;}
.uni-comment-date{line-height:38upx; flex-direction:row; justify-content:space-between; display:flex !important; flex-grow:1;}
.uni-comment-date view{color:#666666; font-size:24upx; line-height:38upx;}
.uni-comment-content{line-height:1.6em; font-size:28upx; padding:8rpx 0;}
.uni-comment-replay-btn{background:#FFF; font-size:24upx; line-height:28upx; padding:5rpx 20upx; border-radius:30upx; color:#333 !important; margin:0 10upx;}
.uni-comment {
padding: 5rpx 0;
display: flex;
flex-grow: 1;
flex-direction: column;
}
.uni-comment-list {
flex-wrap: nowrap;
padding: 10rpx 0;
margin: 10rpx 0;
width: 100%;
display: flex;
}
.uni-comment-face {
width: 70upx;
height: 70upx;
border-radius: 100%;
margin-right: 20upx;
flex-shrink: 0;
overflow: hidden;
}
.uni-comment-face image {
width: 100%;
border-radius: 100%;
}
.uni-comment-body {
width: 100%;
}
.uni-comment-top {
line-height: 1.5em;
justify-content: space-between;
}
.uni-comment-top text {
color: #0A98D5;
font-size: 24upx;
}
.uni-comment-date {
line-height: 38upx;
flex-direction: row;
justify-content: space-between;
display: flex !important;
flex-grow: 1;
}
.uni-comment-date view {
color: #666666;
font-size: 24upx;
line-height: 38upx;
}
.uni-comment-content {
line-height: 1.6em;
font-size: 28upx;
padding: 8rpx 0;
}
.uni-comment-replay-btn {
background: #FFF;
font-size: 24upx;
line-height: 28upx;
padding: 5rpx 20upx;
border-radius: 30upx;
color: #333 !important;
margin: 0 10upx;
}
/* swiper msg */
.uni-swiper-msg{width:100%; padding:12rpx 0; flex-wrap:nowrap; display:flex;}
.uni-swiper-msg-icon{width:50upx; margin-right:20upx;}
.uni-swiper-msg-icon image{width:100%; flex-shrink:0;}
.uni-swiper-msg swiper{width:100%; height:50upx;}
.uni-swiper-msg swiper-item{line-height:50upx;}
.uni-swiper-msg {
width: 100%;
padding: 12rpx 0;
flex-wrap: nowrap;
display: flex;
}
.uni-swiper-msg-icon {
width: 50upx;
margin-right: 20upx;
}
.uni-swiper-msg-icon image {
width: 100%;
flex-shrink: 0;
}
.uni-swiper-msg swiper {
width: 100%;
height: 50upx;
}
.uni-swiper-msg swiper-item {
line-height: 50upx;
}
/* product */
.uni-product-list {
......@@ -916,7 +1169,7 @@ radio-group label, checkbox-group label{
.image-view {
height: 330upx;
width: 330upx;
margin:12upx 0;
margin: 12upx 0;
}
.uni-product-image {
......@@ -929,16 +1182,16 @@ radio-group label, checkbox-group label{
word-break: break-all;
display: -webkit-box;
overflow: hidden;
line-height:1.5;
line-height: 1.5;
text-overflow: ellipsis;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
}
.uni-product-price {
margin-top:10upx;
margin-top: 10upx;
font-size: 28upx;
line-height:1.5;
line-height: 1.5;
position: relative;
}
......@@ -967,10 +1220,10 @@ radio-group label, checkbox-group label{
display: flex;
flex-direction: column;
position: relative;
}
}
.uni-timeline-item {
.uni-timeline-item {
display: flex;
flex-direction: row;
position: relative;
......@@ -978,18 +1231,18 @@ radio-group label, checkbox-group label{
box-sizing: border-box;
overflow: hidden;
}
}
.uni-timeline-item .uni-timeline-item-keynode {
.uni-timeline-item .uni-timeline-item-keynode {
width: 160upx;
flex-shrink: 0;
box-sizing: border-box;
padding-right: 20upx;
text-align: right;
line-height: 65upx;
}
}
.uni-timeline-item .uni-timeline-item-divider {
.uni-timeline-item .uni-timeline-item-divider {
flex-shrink: 0;
position: relative;
width: 30upx;
......@@ -997,53 +1250,53 @@ radio-group label, checkbox-group label{
top: 15upx;
border-radius: 50%;
background-color: #bbb;
}
}
.uni-timeline-item-divider::before,
.uni-timeline-item-divider::after {
.uni-timeline-item-divider::before,
.uni-timeline-item-divider::after {
position: absolute;
left: 15upx;
width: 1upx;
height: 100vh;
content: '';
background: inherit;
}
}
.uni-timeline-item-divider::before {
.uni-timeline-item-divider::before {
bottom: 100%;
}
}
.uni-timeline-item-divider::after {
.uni-timeline-item-divider::after {
top: 100%;
}
}
.uni-timeline-last-item .uni-timeline-item-divider:after {
.uni-timeline-last-item .uni-timeline-item-divider:after {
display: none;
}
}
.uni-timeline-first-item .uni-timeline-item-divider:before {
.uni-timeline-first-item .uni-timeline-item-divider:before {
display: none;
}
}
.uni-timeline-item .uni-timeline-item-content {
.uni-timeline-item .uni-timeline-item-content {
padding-left: 20upx;
}
}
.uni-timeline-last-item .bottom-border::after{
.uni-timeline-last-item .bottom-border::after {
display: none;
}
}
.uni-timeline-item-content .datetime{
.uni-timeline-item-content .datetime {
color: #CCCCCC;
}
}
/* 自定义节点颜色 */
.uni-timeline-last-item .uni-timeline-item-divider{
/* 自定义节点颜色 */
.uni-timeline-last-item .uni-timeline-item-divider {
background-color: #1AAD19;
}
}
/* uni-icon */
......@@ -1420,14 +1673,15 @@ radio-group label, checkbox-group label{
}
/* 分界线 */
.uni-divider{
.uni-divider {
height: 110upx;
display: flex;
align-items:center;
align-items: center;
justify-content: center;
position: relative;
}
.uni-divider__content{
.uni-divider__content {
font-size: 28upx;
color: #999;
padding: 0 20upx;
......@@ -1435,7 +1689,8 @@ radio-group label, checkbox-group label{
z-index: 101;
background: #F4F5F6;
}
.uni-divider__line{
.uni-divider__line {
background-color: #CCCCCC;
height: 1px;
width: 100%;
......@@ -1445,14 +1700,15 @@ radio-group label, checkbox-group label{
left: 0;
transform: translateY(50%);
}
.goodsNameTwoLine {
.goodsNameTwoLine {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}
}
image{
image {
will-change: transform
}
\ No newline at end of file
pages/car-info/car-info.vue
View file @ 456896f7
......@@ -2,7 +2,6 @@
<view class="car-info mg-lr-24">
<view class="car-type-num u-f u-f-jcsb u-f-aic mg-bot-24" @click="goPage">
<text class="light-gray fs28 fw400">车辆型号</text>
<!-- <text class="right-arrow"></text> -->
<image class="big_gray_right_arrow" src="../../static/common/big_gray_right_arrow.png" mode=""></image>
</view>
......@@ -116,7 +115,7 @@
data.vehicleMileage = this.vehicleMileage
// data.vehicleBrandId = this.vehicleBrandId
if(!this.plateNo) {
if (!this.plateNo) {
uni.showToast({
title: "请输入车牌号"
})
......
pages/car-type-select/car-type-select.vue
View file @ 456896f7
......@@ -4,7 +4,7 @@
<view class="car-brand-list">
<view>
<view class="car-brand u-f u-f-jcfs u-f-aic">
<image :src="carData.logo" class="mg-right-20"></image>
<image :src="carData.logo" class="mg-right-20" mode="widthFix"></image>
<text>{{carData.name}}</text>
</view>
<view class="fw400 fs26 light-black u-f u-f-jcfs u-f-aic" style="padding: 18rpx 0"
......@@ -245,8 +245,8 @@
margin-bottom: 74rpx;
image {
width: 108rpx;
height: 80rpx;
width: 100rpx;
height: auto;
}
}
......
pages/shop/shop.vue
View file @ 456896f7
<template>
<view style="display: flex;flex-direction: column;height:100vh;box-sizing: border-box;">
<u-navbar placeholder title="门店列表" leftIconSize='0' :bgColor="bgColor" :fixed="true">
<u-navbar placeholder title="门店" leftIconSize='0' :bgColor="bgColor" :fixed="true">
</u-navbar>
<view class="top-bgc"></view>
......@@ -16,13 +16,14 @@
<input confirm-type="search" class="nav-bar-input" v-model="searchText" type="text" placeholder="搜索"
@confirm="searchAction" />
</view>
<view v-if="!ishide">
<up-dropdown :duration="0" v-if="operateMenu.length" height="20">
<up-dropdown-item v-model="value1" :title="operateMenuTitle" :options="operateMenu"
@change="checkOperte"></up-dropdown-item>
<up-dropdown-item v-model="value2" :title="optionsTitle?optionsTitle:options[0].label"
:options="options" @change="checkGood"></up-dropdown-item>
</up-dropdown>
</view>
</view>
<view style="flex: 1;overflow-y: auto;margin-top: 20rpx;">
......@@ -95,6 +96,7 @@
},
data() {
return {
ishide: false,
value1: 1,
value2: 1,
options: [{
......@@ -170,9 +172,17 @@
getList(flag) {
console.log(uni.getStorageSync('curcity'));
var location = uni.getStorageSync('curcity')
// 获取当前时间的时间戳
let currentTime = new Date().getTime();
//monthIndex 是从 0 开始计数的
let time = new Date(2025, 7, 7, 23, 59, 59, 999).getTime();
console.log(currentTime);
console.log(time);
console.log(currentTime < time);
this.ishide = currentTime < time ? true : false
this.$http.post("/api/client/store/list", {
pageNum: this.pageNum,
pageSize: '20',
pageSize: this.ishide ? '1' : '20',
field: this.searchText,
storeTypeId: this.activeOperateMenu,
sortType: this.activeShopGood,
......
pagesA/check-car/check-car.vue
View file @ 456896f7
......@@ -143,7 +143,6 @@
title: '正在创建订单...',
mask: true
})
// 创建订单
let res = await this.$http.post('/api/client/order/createOrder', data, {
token: true,
......
pagesA/insurance-rescue/insurance-rescue.vue
View file @ 456896f7
......@@ -94,8 +94,8 @@
</view>
</view>
<view class="light-black">
<input disabled="true" v-model="FormData.vehicleInformation" class="uni-input my-input"
placeholder="请输入车辆型号" />
<text class="uni-input"
style="text-align: right;">{{FormData.vehicleInformation||'请输入车辆型号'}}</text>
</view>
</view>
<view class="form-input u-f u-f-jcsb u-f-aic fs28"
......@@ -115,7 +115,6 @@
</view>
</view>
<!-- <view class="height-box"></view> -->
<view class="fix-bot">
<view class="content u-f u-f-jcsb u-f-aic">
<view class="btn line-gradient-btn" @click="submitForm">
......@@ -290,7 +289,7 @@
this.cusServicePhonePhone = data
this.cusServicePhoneType = type
this.iscontentInfo = true
this.contentInfo =`我们已获取您的定位信息，会根据当前地址联系您【${this.formattedAddresses.recommend}】`
this.contentInfo = `我们已获取您的定位信息，会根据当前地址联系您【${this.formattedAddresses.recommend}】`
},
confirmOpen() {
......@@ -460,11 +459,11 @@
storeTypeId: this.FormData.carID || 4
}).then((res) => {
this.shopGood = res.data.data
console.log(this.activeShopGood,'this.activeShopGood');
console.log(this.activeShopGood, 'this.activeShopGood');
// if (this.activeShopGood == 1) {
console.log('this.actList', this.actList);
console.log('this.shopGood', this.shopGood);
if(this.shopGood.length){
if (this.shopGood.length) {
this.actList = this.shopGood[1].children
this.serviceTypeId = this.actList && this.actList[0].id
this.serviceTypeName = this.actList && this.actList[0].name
......@@ -669,6 +668,7 @@
.requeyCheck {
display: flex;
align-items: flex-start;
width: 140rpx;
image {
margin-left: -15rpx;
......
pagesB/good-product-detail/good-product-detail.vue
View file @ 456896f7
......@@ -509,7 +509,7 @@
this.storeId = option.storeId
this.getLocation()
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......
pagesB/home-shouhou-result/home-shouhou-result.vue
View file @ 456896f7
......@@ -4,7 +4,8 @@
<view v-if="status==1">
<view class="white-bg-wrap u-f-aic u-f-jcc mg-bot-26">
<view class="u-f u-f-fdc u-f-jcc u-f-aic">
<image style="height: 114rpx;width:114rpx;" src="../.././static/common/refuse.png" class="mg-bot-38"></image>
<image style="height: 114rpx;width:114rpx;" src="../.././static/common/refuse.png"
class="mg-bot-38"></image>
<text class="fs28 light-black fw400 mg-bot-26">正在退款中...</text>
<view class="fs24 light-black fw400">我们会已最快的速度完成退款，请等待</view>
</view>
......@@ -14,11 +15,11 @@
<view class="u-f u-f-jcsb u-f-aic mg-bot-20">
<view style="flex: 1">
<image class="border-radius-9 mg-right-10" :src="shopSureBillInfo.goodsImage"
style="width: 128rpx;height: 128rpx;"
:mode="'widthFix'"></image>
style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"></image>
</view>
<view class="u-f u-f-fdc" style="flex: 4">
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}</view>
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}
</view>
<view class="mg-bot-10 u-f u-f-aic u-f-jcfs">
<text class="light-gray fs24 mg-right-8">{{shopSureBillInfo.goodsSpecification}}</text>
</view>
......@@ -44,7 +45,7 @@
<text class="light-black">退款总额</text>
<view class="main-color">
<text class="fs24">￥</text>
<text class="fs32">{{shopSureBillInfo.goodsPrice}}</text>
<text class="fs32">{{shopSureBillInfo.actualAmount}}</text>
</view>
</view>
</view>
......@@ -69,11 +70,11 @@
<view class="u-f u-f-jcsb u-f-aic mg-bot-20">
<view style="flex: 1">
<image class="border-radius-9 mg-right-10" :src="shopSureBillInfo.goodsImage"
style="width: 128rpx;height: 128rpx;"
:mode="'widthFix'"></image>
style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"></image>
</view>
<view class="u-f u-f-fdc" style="flex: 4">
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}</view>
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}
</view>
<view class="mg-bot-10 u-f u-f-aic u-f-jcfs">
<text class="light-gray fs24 mg-right-8">{{shopSureBillInfo.goodsSpecification}}</text>
</view>
......@@ -107,11 +108,11 @@
<view class="u-f u-f-jcsb u-f-aic mg-bot-20">
<view style="flex: 1">
<image class="border-radius-9 mg-right-10" :src="shopSureBillInfo.goodsImage"
style="width: 128rpx;height: 128rpx;"
:mode="'widthFix'"></image>
style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"></image>
</view>
<view class="u-f u-f-fdc" style="flex: 4">
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}</view>
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}
</view>
<view class="mg-bot-10 u-f u-f-aic u-f-jcfs">
<text class="light-gray fs24 mg-right-8">{{shopSureBillInfo.goodsSpecification}}</text>
</view>
......@@ -146,11 +147,11 @@
<view class="u-f u-f-jcsb u-f-aic mg-bot-20">
<view style="flex: 1">
<image class="border-radius-9 mg-right-10" :src="shopSureBillInfo.goodsImage"
style="width: 128rpx;height: 128rpx;"
:mode="'widthFix'"></image>
style="width: 128rpx;height: 128rpx;" :mode="'widthFix'"></image>
</view>
<view class="u-f u-f-fdc" style="flex: 4">
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}</view>
<view class="fs28 light-black fw400 mg-bot-10 two-line-ellipsis">{{shopSureBillInfo.goodsName}}
</view>
<view class="mg-bot-10 u-f u-f-aic u-f-jcfs">
<text class="light-gray fs24 mg-right-8">{{shopSureBillInfo.goodsSpecification}}</text>
</view>
......@@ -200,7 +201,7 @@
},
onNavigationBarButtonTap(e) {
console.log(e);
if (e.index===0) {
if (e.index === 0) {
this.goToOrderCenter()
}
// e的返回格式为json对象：{"text":"测试","index":0}
......@@ -238,7 +239,7 @@
color: #ffffff;
text-align: center;
padding: 22rpx 0;
background: linear-gradient( 90deg, #FF4502 0%, #FF8903 100%);
background: linear-gradient(90deg, #FF4502 0%, #FF8903 100%);
border-radius: 41rpx 41rpx 41rpx 41rpx;
}
......@@ -248,17 +249,21 @@
.good-recomend {
margin-top: 70rpx;
.gr-title {
margin-bottom: 26rpx;
.left-line {
width: 165rpx;
height: 4rpx;
// background: url(../.././static/left-line.png) no-repeat center center;
}
.center-title {
color: #FF4502;
margin-right: 16rpx;
}
.right-line {
width: 165rpx;
height: 4rpx;
......@@ -267,27 +272,34 @@
}
}
.product-list {
margin: 0 24rpx;
.product-wrap {
width: calc(50% - 22rpx);
margin-bottom: 20rpx;
margin-right: 22rpx;
&:nth-child(2n) {
margin-right: 0;
}
.product-card {
flex: 1;
border-radius: 18rpx;
background-color: #ffffff;
.pc-image {
width: 100%;
height: 340rpx;
}
.pc-desc {
color: #333333;
height: 74rpx;
}
.pc-price {
margin-top: 10rpx;
color: #FF4502;
......
pagesB/request-refund/request-refund.vue
View file @ 456896f7
......@@ -56,8 +56,8 @@
v-model="applyContent" />
</view>
<view class="u-f u-f-aic u-f-jcc mg-bot-250">
<u-upload width="150rpx" height="150rpx" :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="1" multiple
:maxCount="10" :previewFullImage="true"></u-upload>
<u-upload width="150rpx" height="150rpx" :fileList="fileList" @afterRead="afterRead" @delete="deletePic"
name="1" multiple :maxCount="10" :previewFullImage="true"></u-upload>
</view>
</view>
......@@ -146,11 +146,12 @@
})
for (let i = 0; i < lists.length; i++) {
const result = await this.uploadFilePromise(lists[i].url)
console.log('LMG', result)
let item = this[`fileList`][fileListLen]
this[`fileList`].splice(fileListLen, 1, Object.assign(item, {
status: 'success',
message: '',
url: result.url
url: result
}))
fileListLen++
}
......@@ -184,8 +185,8 @@
try {
// 解析返回的数据
const data = JSON.parse(res.data);
if (data && data.data && data.data.url && data.data.url[0]) {
resolve(data.data.url[0]);
if (data.data.url != null) {
resolve(data.data.url);
} else {
reject(new Error('Invalid response format'));
}
......@@ -204,7 +205,7 @@
submitFeedback() {
let feedbackImage = []
this.fileList.map(item => {
feedbackImage.push(item.thumb)
feedbackImage.push(item.url)
})
// if (this.refundType=='请选择') {
......@@ -245,9 +246,8 @@
requestRefundType: this.refundType
})
}
uni.showLoading()
console.log('LMG', data)
this.$http.post('/api/client/order/requestRefund', data).then(res => {
uni.showToast({
icon: 'none',
......
pagesB/shop-goods-detail/shop-goods-detail.vue
View file @ 456896f7
......@@ -383,7 +383,7 @@
// 扫码进入的情况下调用下方函数
// option.share && this.goToSelfQuickBuy()
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......
pagesD/self-quick-buy/self-quick-buy.vue
View file @ 456896f7
......@@ -164,7 +164,7 @@
this.key = opt.key
this.handleScanCodeCarWash()
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......
pagesF/maintenance-detail/maintenance-detail.vue
View file @ 456896f7
......@@ -566,7 +566,7 @@
this.getStoreGoodDetail()
this.getReviewsList()
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......
pagesF/oil-quan-detail/oil-quan-detail.vue
View file @ 456896f7
......@@ -25,7 +25,8 @@
<image src="../.././static/common/shop_car.png" style="width: 100%;height: 100%;"></image>
</view> -->
<view class="swiper-num fw400 fs28" v-if="goodsDetail.goodsImageList">
{{current + 1}}/{{goodsDetail.goodsImageList.length ? goodsDetail.goodsImageList.length : 0}}</view>
{{current + 1}}/{{goodsDetail.goodsImageList.length ? goodsDetail.goodsImageList.length : 0}}
</view>
</view>
<view class="content-detail">
......@@ -41,7 +42,7 @@
<text>￥{{goodsDetail.goodsOriginalPrice}}</text>
</view>
</view>
<button open-type="share" class="u-f u-f-fdc u-f-jcc shareBtn" >
<button open-type="share" class="u-f u-f-fdc u-f-jcc shareBtn">
<image class="share-icon" :mode="'widthFix'" src="../.././static/common/share.png">
</image>
<text class="main-color fs22 fw400">分享</text>
......@@ -303,7 +304,7 @@
this.getCustomerService() // 获取客服信息
const token = uni.getStorageSync('token')
if (!token) {
if (!token && option.share != null) {
//沒有登录 先登录
uni.navigateTo({
url: '/pages/login/login?share=1'
......@@ -316,7 +317,7 @@
return {
title: '蚂蚁车生活', // 分享出去的标题
path: '/pagesF/oil-quan-detail/oil-quan-detail?id=' + this.goodsId + '&storeId=' + this
.storeId + '&share=1'// 分享出去的页面路径
.storeId + '&share=1' // 分享出去的页面路径
}
},
onShareTimeline() {
......
static/VehicleConditionReport/VehicleConditionReport.vue deleted 100644 → 0
View file @ 98d6c7a7
<template>
<view class="VehicleConditionReportIndex">
<u-navbar title="车况报告" leftIconColor="#000" rightIcon='../../static/common/white_left_arrrow.png' placeholder
leftIconSize='38rpx' autoBack="true">
</u-navbar>
<view class="content">
<view class="ConTitle">
您的爱车
</view>
<view class="myCar">
<view class="msgItem" v-for="(item,index) in myCarmsgList">
<view class="label">
{{item.label}}
</view>
<view class="name">
{{item.name}}
</view>
</view>
</view>
<view class="ConTitle">
保养状况
</view>
<view class="maintenanceStatus">
<view class="maintenanceStatusItem" v-for="(item,index) in maintenanceList">
<view class="label">
{{item.label}}
</view>
<view class="dispense" v-if="index==2">
{{item.name}}
</view>
<view class="name" v-else>
{{item.name}}
</view>
</view>
</view>
<view class="ConTitle">
保养提示
</view>
<view class="maintenanceHint">
{{hint}}
</view>
<view class="maintenancerecord">
保养记录
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
myCarmsgList: [{
label: "车辆品牌",
name: ""
}, {
label: "车辆型号",
name: ""
}, {
label: "车辆牌照",
name: ""
}, {
label: "上路时间",
name: ""
}, ],
maintenanceList: [{
label: "车辆最近保养日期",
name: ""
}, {
label: "建议保养日期",
name: "2024-05-06"
}, {
label: "无需保养",
name: ""
}, ],
hint: "",
}
},
onShow() {
this.getVehicleConditionReportData()
},
methods: {
getVehicleConditionReportData() {
this.$http.get('/api/client/maintain/vehicleConditionReport').then((res) => {
this.myCarmsgList[0].name = res.data.data.vehicleBrand
this.myCarmsgList[1].name = res.data.data.vehicleModel
this.myCarmsgList[2].name = res.data.data.plateNo
this.myCarmsgList[3].name = res.data.data.startTime
this.maintenanceList[0].name = res.data.data.maintainDate
this.maintenanceList[1].name = res.data.data.suggestedMainDate
this.maintenanceList[2].name = res.data.data.maintainStatus
this.hint = res.data.data.maintainReminder
console.log(res.data.data);
})
},
}
}
</script>
<style lang="scss">
.VehicleConditionReportIndex {
background-color: #fafbff;
min-height: 100vh;
padding-top: 30rpx;
box-sizing: border-box;
.content {
width: 702rpx;
margin: auto;
overflow: hidden;
.ConTitle {
margin-top: 30rpx;
margin-bottom: 16rpx;
padding-left: 12rpx;
font-weight: 400;
font-size: 28rpx;
color: #333333;
border-left: 6rpx #FF4502 solid;
}
.myCar {
padding: 30rpx 20rpx;
width: 702rpx;
height: 305rpx;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
box-sizing: border-box;
.msgItem {
display: flex;
margin-bottom: 31rpx;
align-items: center;
&:last-child {
margin-bottom: 0;
}
}
}
.maintenanceStatus {
padding: 30rpx 20rpx;
box-sizing: border-box;
width: 702rpx;
height: 245rpx;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
.maintenanceStatusItem {
display: flex;
margin-bottom: 31rpx;
align-items: center;
.dispense {
display: flex;
align-items: center;
justify-content: center;
margin-left: auto;
padding: 8rpx 10rpx;
width: 131rpx;
height: 41rpx;
background: #008636;
border-radius: 5rpx 5rpx 5rpx 5rpx;
font-weight: 400;
font-size: 26rpx;
color: #FFFFFF;
}
&:last-child {
margin-bottom: 0;
}
}
}
.maintenanceHint {
display: flex;
align-items: center;
justify-content: center;
padding: 20rpx 20rpx;
box-sizing: border-box;
width: 702rpx;
// height: 96rpx;
background: #FFFFFF;
border-radius: 18rpx 18rpx 18rpx 18rpx;
font-weight: 400;
font-size: 28rpx;
color: #333333;
}
.maintenancerecord {
display: flex;
align-items: center;
justify-content: center;
margin: auto;
margin-top: 110rpx;
width: 702rpx;
height: 80rpx;
background: linear-gradient(90deg, #FF4502 0%, #FF8903 100%);
border-radius: 41rpx 41rpx 41rpx 41rpx;
font-weight: 400;
font-size: 28rpx;
color: #FFFFFF;
}
.label {
font-weight: 400;
font-size: 28rpx;
color: #999999;
}
.name {
margin-left: auto;
text-align: end;
font-weight: 400;
font-size: 28rpx;
color: #333333;
}
}
}
</style>
\ No newline at end of file
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