xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 18:26:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sit-Carl' of https://gitee.com/carl_Ming_1/smart-admin into sit-Carl-V3

Browse Source
This commit is contained in:
Carl 2022-01-20 14:49:03 +08:00
commit 248fd9cc5b
7 changed files with 416 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
rc-busness/assets/css/index.less
View File

@ -5,10 +5,29 @@
/deep/.van-swipe__indicator--active{ /deep/.van-swipe__indicator--active{
background-color: #E1001A; background-color: #E1001A;
} }
.rc-ma{
.ul-zhuan{ .ts-carousel-indicator{
/deep/.swiper-pagination-bullet{
margin-left:.5rem;
}
/deep/.swiper-pagination-bullet-active{
background:#E2001A;
}
&.center{
width:100%;
text-align: center;
}
}
.ts-position-identifier{
}
.ul-zhuan,.ul-dog{
li{ li{
background: unset;; background: unset;
img{
border-radius: 50%;
}
&.active {
img{ img{
border: 3px solid #E2001A; border: 3px solid #E2001A;
} }
@ -31,6 +50,30 @@
width:auto; width:auto;
} }
} }
.ul-dog{
width: 100%;
display: flex;
justify-content: center;
flex-wrap: wrap;
flex-direction: row;
span{
margin-top: .5rem;
display: block;
}
img{
width: 9.5rem;
height: auto;
display: block;
}
li{
cursor: pointer;
font-size: 16px;
text-align: center;
margin-top:3rem;
margin-left:3rem;
}
}
@media screen and (max-width:768px){ @media screen and (max-width:768px){
.ul-dog{ .ul-dog{
justify-content: space-evenly; justify-content: space-evenly;
@ -174,7 +217,6 @@
.uservideo{ .uservideo{
width: 100%; width: 100%;
height:auto; height:auto;
max-height: 15.68rem;
display: block; display: block;
video{ video{
max-width:100%; max-width:100%;
@ -222,6 +264,10 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
max-width: 60%; max-width: 60%;
text-align: center; text-align: center;
word-break: keep-all;
height: 2.625rem;
display: flex;
align-items: center;
} }
em{ em{
font-style: normal; font-style: normal;
@ -330,11 +376,18 @@
.sw-center{ .sw-center{
display: none; display: none;
} }
.useraimg{ .useraimg{
width: 100%; width: 100%;
// height: 29.31rem; // height: 29.31rem;
object-fit: cover; object-fit: cover;
} }
.ts-banner-swiper-container{
position:relative;
.ts-carousel-indicator{
position:absolute;
bottom:.4rem;
}
}
.van-swipe-item { .van-swipe-item {
color: #fff; color: #fff;
height: 100%; height: 100%;

303
rc-busness/assets/css/openaddress.less
View File

@ -1,11 +1,310 @@
@media screen and (max-width:768px){
.rc-margin-bottom--lg{
margin: 0;
}
@media screen and (max-width:768px){
.online{
width:100%;
background:#d7d7d7;
margin-top:1.5rem;
height:.06rem;
&.bold{
height:8px;
background:#f6f6f6;
}
}
.useredit{
display: none;
}
.rc-button{
display: flex;
align-items: center;
justify-content: center;
width: 375px;
height: 80px;
background: #FFFFFF;
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
opacity: 1;
border-radius: 0px;
}
.rc-footbutton {
width: 164px;
height: 48px;
border: 2px solid #E2001A;
opacity: 1;
border-radius: 30px;
background: #E2001A;
display: flex;
justify-content: center;
align-items: center;
font-size: 16px;
color: #FFFFFF;
}
.rc-max-width--xl{
padding: 24px 20px 24px 20px;
.rc-title {
display: flex;
align-items: center;
color: #333333;
font-size: 14px;
em {
font-style: normal;
font-size: 14px;
}
span {
display: block;
margin-left: 8px;
}
}
.rc-center{
padding-top: 24px;
}
}
.rc-address {
margin-top: 8px;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
font-size: 14px;
color: #333333;
}
.rc-footer {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 20px;
display: flex;
align-items: center;
.rc-right {
span {
border-bottom: 1px solid #666666;
}
span:first-child {
margin-right: 16px;
}
}
img{
width: 43px;
}
.rc-foot{
display: flex;
align-items: center;
color: #333333;
font-size: 14px;
span{
margin-left: 8px;
}
}
}
} }
@media screen and (min-width: 769px) @media screen and (min-width: 769px)
{ {
.usercontend {
display:inline-block;
}
.usercontshow{
.rc-button{
display: none;
}
}
.usercontend{
margin-top: 40px;
}
.online{
display: none;
}
.rc-button{
display: none;
}
.useredit{
width: 680px;
height: 164px;
background: #FFFFFF;
border: 1px solid #D7D7D7;
opacity: 1;
border-radius: 3px;
display: flex;
align-items: center;
justify-content: center;
img{
width: 31px;
height: 31px;
}
span{
color: #333333;
font-size: 18px;
}
}
.usercontend{
.useradd{
width: 680px;
height: 164px;
background: #FFFFFF;
border-radius: 3px;
img{
width: 31px;
height: 31px;
display: block;
}
}
}
.rc-max-width--xl{
.rc-center{
margin-top: 24px;
margin-left: 24px;
}
.rc-cat{
width: 640px;
border: 1px solid #D7D7D7;
border-radius: 3px;
position: relative;
margin-left: 40px;
height: 164px;
}
.rc-title {
display: flex;
align-items: center;
color: #333333;
font-size: 20px;
em {
font-style: normal;
}
span {
display: block;
margin-left: 32px;
font-size: 20px;
}
}
.rc-footer {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 20px;
display: flex;
align-items: center;
.rc-right {
position: absolute;
right: 24px;
top: 24px;
span {
border-bottom: 1px solid #666666;
}
span:first-child {
margin-right: 16px;
}
}
img{
width: 43px;
}
.rc-foot{
display: flex;
align-items: center;
color: #333333;
font-size: 16px;
margin-top: 16px;
span{
margin-left: 8px;
}
}
}
}
.rc-max-width--xl{
.rc-button {
height: 80px;
background: #ffffff;
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
opacity: 1;
display: flex;
align-items: center;
justify-content: center;
display: block;
.rc-footbutton {
width: 164px;
height: 48px;
border: 2px solid #e2001a;
opacity: 1;
border-radius: 30px;
display: flex;
align-items: center;
background: #e2001a;
span {
display: block;
text-align: center;
color: white;
font-size: 16px;
width: 100%;
}
}
}
.rc-header {
display: flex;
align-items: center;
color: #333333;
em {
font-style: normal;
font-size: 14px;
}
span {
display: block;
margin-left: 8px;
}
}
.rc-address {
margin-top: 16px;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
line-clamp: 2;
-webkit-box-orient: vertical;
font-size: 20px;
color: #333333;
}
.rc-footer {
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: 20px;
margin-top: 8px;
.rc-right {
span {
border-bottom: 1px solid #666666;
}
span:first-child {
margin-right: 16px;
}
}
}
}
} }

0
rc-busness/assets/image/Forms-Switch-On@3x.png → rc-busness/assets/image/userred.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

4
rc-busness/components/addressInput.vue
View File

@ -90,6 +90,7 @@ export default {
}, },
pickValue(pickId,pickName){ pickValue(pickId,pickName){
let areaObj={id:pickId,name:pickName}; let areaObj={id:pickId,name:pickName};
console.log(pickId,pickName);
this.returnValueArr[this.curDisplayingColIndex]=areaObj; this.returnValueArr[this.curDisplayingColIndex]=areaObj;
this.validatePickedValues(); this.validatePickedValues();
@ -114,6 +115,9 @@ export default {
onChange(picker,values) { //values = [{id:this.columns[0].id, name:this.columns[0].name},{id:this.columns[1].id, name:this.columns[1].name},{id:this.columns[3].id, name:this.columns[3].name}]; onChange(picker,values) { //values = [{id:this.columns[0].id, name:this.columns[0].name},{id:this.columns[1].id, name:this.columns[1].name},{id:this.columns[3].id, name:this.columns[3].name}];
//Support single choice only , index = 0 province, index = 1 city, index = 2 area //Support single choice only , index = 0 province, index = 1 city, index = 2 area
let curSelection={'province':'','city':'','area':''}; let curSelection={'province':'','city':'','area':''};
// console.log(picker,values);
this.$emit('getmenu',values)
this.$emit("closeDialog");
if(!values) if(!values)
return; return;
let _self=this; let _self=this;

1
rc-busness/pages/personal/mypersonal.vue
View File

@ -342,6 +342,7 @@ obligation(item,index){
}else{ }else{
if(item.title=='收货地址'){ if(item.title=='收货地址'){
this.$router.push({ this.$router.push({
path: `/useraddress/openaddress/` path: `/useraddress/openaddress/`
}) })

15
rc-busness/pages/useraddress/addaddress.vue
View File

@ -25,6 +25,8 @@
</textarea> </textarea>
</div> </div>
<addressInput @getmenu="onGetMenu" @closeDialog = "handleClose1" :dialogInfo1="dialogInfo1"></addressInput>
</div> </div>
<div class="rc-button"> <div class="rc-button">
<span @click="openclose()">取消</span> <span @click="openclose()">取消</span>
@ -38,6 +40,8 @@
</div> --> </div> -->
<MyFooter></MyFooter> <MyFooter></MyFooter>
</div> </div>
</template> </template>
@ -46,6 +50,7 @@
import Myheader from '~/components/header.vue' import Myheader from '~/components/header.vue'
import MyFooter from '~/components/rc-footer.vue' import MyFooter from '~/components/rc-footer.vue'
import addressInput from '~/components/addressInput.vue'
export default { export default {
data() { data() {
return { return {
@ -53,6 +58,7 @@ export default {
checked: true, checked: true,
userid: null, userid: null,
usermessage:null, usermessage:null,
dialogInfo1:false,
list: [ list: [
{ {
id: 1, id: 1,
@ -77,6 +83,12 @@ export default {
}; };
}, },
methods: { methods: {
onGetMenu(values){
console.log(values,+'111111');
},
handleClose1(){
this.dialogInfo1 = false
},
onEdit(item, index) { onEdit(item, index) {
// let userid = item.id; // let userid = item.id;
console.log(item); console.log(item);
@ -119,7 +131,8 @@ export default {
}, },
components: { components: {
Myheader, Myheader,
MyFooter MyFooter,
addressInput
}, },
mounted() { mounted() {

38
rc-busness/pages/useraddress/openaddress.vue
View File

@ -1,8 +1,12 @@
<template> <template>
<div> <div>
<Myheader></Myheader> <Myheader></Myheader>
<div class="usermain"> <div class="rc-top"></div>
<div class="rc-main" v-for="(item, index) in list" :key="index"> <div class="online bold"></div>
<div class="usercontshow rc-max-width--xl">
<div class="usercontend" v-for="(item, index) in list" :key="index">
<div class="usercontshow usermain" >
<div class="rc-cat" >
<div class="rc-center"> <div class="rc-center">
<div class=" rc-title"> <div class=" rc-title">
<em> <em>
@ -19,7 +23,7 @@
</div> </div>
<div class="rc-footer"> <div class="rc-footer">
<div class="rc-foot"> <div class="rc-foot">
<img src="../../assets/image/userselect.png" alt=""> <img :src="item.isDefault?require('../../assets/image/userred.png'):require('../../assets/image/userselect.png')" @click="changeadddress(item,index)"/>
<span>设置为默认收货地址</span> <span>设置为默认收货地址</span>
</div> </div>
@ -32,21 +36,35 @@
</div> </div>
</div>
<div class="online bold rc-md-down"></div>
<!-- <div class="usercontend useradd">
<img src="../../assets/image/userselect.png" alt="">
<span>添加收货地址</span>
</div> -->
</div>
<div class="usercontshow useredit">
<img src="../../assets/image/userselect.png" alt="">
<span>添加收货地址</span>
</div> </div>
<div class="rc-button"> <div class="rc-button">
<div class="rc-footbutton" @click="onAdd()"> <div class="rc-footbutton" @click="onAdd()">
<span>新增收货地址</span> <span>新增收货地址</span>
</div> </div>
</div> </div>
</div> </div>
<MyFooter></MyFooter>
</div>
</template> </template>
<script> <script>
import { areaList } from "@vant/area-data"; import Myheader from '~/components/header.vue'
import { selectaddress } from "../../ajax/getData"; import MyFooter from '~/components/rc-footer.vue'
import { editdelete } from "../../ajax/getData";
import Myheader from "~/components/header.vue";
import { Toast } from "vant";
export default { export default {
data() { data() {
return { return {
@ -75,7 +93,6 @@ export default {
address: "浙江省杭州市拱墅区莫干山路 50 号", address: "浙江省杭州市拱墅区莫干山路 50 号",
}, },
], ],
areaList,
}; };
}, },
methods: { methods: {
@ -121,6 +138,7 @@ export default {
}, },
components: { components: {
Myheader, Myheader,
MyFooter
}, },
mounted() { mounted() {