diff --git a/rc-busness/assets/css/discount.less b/rc-busness/assets/css/discount.less
index e32d841b..5265bf0a 100644
--- a/rc-busness/assets/css/discount.less
+++ b/rc-busness/assets/css/discount.less
@@ -152,7 +152,9 @@ margin-top: 8px;
}
@media screen and (min-width: 769px){
-
+.online{
+ margin-top: 30px;
+}
.allmain{
.rs-dis{
@@ -162,6 +164,7 @@ margin-top: 8px;
}
}
+
.active {
font-size: 14px;
color: #E2001A;
diff --git a/rc-busness/assets/css/product-list.less b/rc-busness/assets/css/product-list.less
index 9e4fc65b..3490328c 100644
--- a/rc-busness/assets/css/product-list.less
+++ b/rc-busness/assets/css/product-list.less
@@ -11,12 +11,15 @@ ul li ol li em strong i {
.usersearch {
margin: 0 auto;
overflow: hidden;
+
}
//rc-main end
}
//手机端
@media screen and (max-width: 768px) {
+
+
.usercontentshow{
position: relative;
}
@@ -234,6 +237,19 @@ ul li ol li em strong i {
//pc端
@media screen and (min-width: 768px){
+ .usersearch {
+ margin: 0 auto;
+ overflow: hidden;
+ margin-top: 5rem;
+ }
+ .online{
+ width:100%;
+ &.bold{
+ height:0.5rem;
+ margin-top: 5rem;
+ background:#f6f6f6;
+ }
+ }
/deep/.el-dialog {
width: 920px;
height: 570px;
diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue
index 0c68d45c..bc4b7994 100644
--- a/rc-busness/pages/personal/discount.vue
+++ b/rc-busness/pages/personal/discount.vue
@@ -29,7 +29,7 @@
- ¥{{item.couponTypeId=='4'?(item.discount) *10:item.couponAmount}}
+ ¥{{item.couponTypeId=='4'?parseInt(((item.discount) *10))+ '折':item.couponAmount}}
{{ item.couponName }}
@@ -40,7 +40,7 @@
有效期
{{item.validFrom}}至
- {{ item.validTo }}
+ {{item.validTo}}
@@ -196,6 +196,10 @@ export default {
if(data){
console.log(data);
this.newlist=data.data;
+ this.newlist.forEach(element=>{
+ element.validFrom=element.validFrom.slice(0,10)
+ element.validTo=element.validTo.slice(0,10)
+ })
console.log(this.newlist);
}
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index b845bd84..c9a878dc 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -1,6 +1,7 @@
-
+
diff --git a/rc-busness/static/images/cat/1615961503766_wntaC9.jpg b/rc-busness/static/images/cat/1615961503766_wntaC9.jpg
new file mode 100644
index 00000000..a366dffa
Binary files /dev/null and b/rc-busness/static/images/cat/1615961503766_wntaC9.jpg differ
diff --git a/rc-busness/static/images/cat/four.jpg b/rc-busness/static/images/cat/four.jpg
new file mode 100644
index 00000000..80b5e099
Binary files /dev/null and b/rc-busness/static/images/cat/four.jpg differ
diff --git a/rc-busness/static/images/cat/four.mp4 b/rc-busness/static/images/cat/four.mp4
new file mode 100644
index 00000000..f83e784b
Binary files /dev/null and b/rc-busness/static/images/cat/four.mp4 differ
diff --git a/rc-busness/static/images/cat/one.jpg b/rc-busness/static/images/cat/one.jpg
new file mode 100644
index 00000000..a366dffa
Binary files /dev/null and b/rc-busness/static/images/cat/one.jpg differ
diff --git a/rc-busness/static/images/cat/one.mp4 b/rc-busness/static/images/cat/one.mp4
new file mode 100644
index 00000000..6a0558a8
Binary files /dev/null and b/rc-busness/static/images/cat/one.mp4 differ