From 9d0737234b0d3f839f36c0e04312b6cf42ea1b9c Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Tue, 25 Jan 2022 15:06:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/discount.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rc-busness/assets/css/discount.less b/rc-busness/assets/css/discount.less index d210896d..aaec28f8 100644 --- a/rc-busness/assets/css/discount.less +++ b/rc-busness/assets/css/discount.less @@ -88,6 +88,9 @@ font-style: normal; font-size: 14px; color: #e1001a; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis } .rc-userfont { overflow: hidden; @@ -254,6 +257,9 @@ margin-top: 30px; font-style: normal; font-size: 16px; color: #e1001a; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis } .rc-userfont { overflow: hidden; From 8d777154142a6152eaffe9f52cbe13a5dff8097d Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Tue, 25 Jan 2022 19:58:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/global.less | 10 +-- rc-busness/assets/css/login.less | 57 ++++++++++++++++- rc-busness/assets/css/royalcanin-standard.css | 3 - rc-busness/components/header.vue | 2 + rc-busness/config/index.js | 9 +++ rc-busness/pages/index.vue | 23 +++++-- rc-busness/pages/personal/userpay.vue | 2 +- rc-busness/pages/productdetails/producted.vue | 36 +++++++++-- rc-busness/pages/userlogin/login.vue | 60 +++++++++++++++--- rc-busness/static/images/paysucess.jpg | Bin 0 -> 61643 bytes ...royal-canin.styles.prefix.min.critical.css | 2 +- 11 files changed, 171 insertions(+), 33 deletions(-) create mode 100644 rc-busness/static/images/paysucess.jpg diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index f34e1a19..4bdbade1 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -62,15 +62,15 @@ input[type=checkbox]{ border:none; //border: 1px solid #d7d7d7; border-radius: 3px; - width: 1.5rem; - height: 1.5rem; + width: 1rem; + height: 1rem; -webkit-appearance:none; &:before { top: 0; left: 0; content: ""; - width: 1.5rem; - height: 1.5rem; + width: 1rem; + height: 1rem; position: absolute; display: inline-block; background-color: #fff; @@ -83,7 +83,7 @@ input[type=checkbox]{ } label { input[type=checkbox] { - top:.375rem; + // top:.375rem; } } diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less index b8f5fc74..02bfcbf3 100644 --- a/rc-busness/assets/css/login.less +++ b/rc-busness/assets/css/login.less @@ -14,6 +14,7 @@ } .usecheck label{ display:flex; + align-items: center; input{ margin-right:.687rem; } @@ -48,10 +49,10 @@ .usecheck{ display: flex; text-align: left; - width: 335px; margin: 0 auto; align-items: center; margin-top: 18px; + border-bottom: 1px solid #d7d7d7; } .container { @@ -106,6 +107,20 @@ border: none; outline: none; } + .rc-one-column { + font-size: 12px; + strong{ + font-size: 12px; + margin-left: 6px; + font-weight: bold; + } + i{ + font-style: normal; + color: #E1001A; + font-weight: bold; + } + + } .rc-center { font-size: 30px; color: #333333; @@ -142,14 +157,50 @@ } // /* 最小768px最大1920 *pc端/ @media screen and (min-width: 769px) { + .rc-one-column{ + display: flex; + align-items: center; + flex-direction: column; + .rc-one-column { + font-size: 12px; + .rc-text--left{ + strong{ + font-size: 12px; + margin-left: 6px; + font-weight: bold; + } + + + } + i{ + font-style: normal; + color: #E1001A; + font-weight: bold; + } + } + + } .usecheck{ display: flex; text-align: left; - width: 395px; margin: 0 auto; align-items: center; margin-top: 18px; - + border-bottom: 1px solid #d7d7d7 + } + .usecheck label{ + display: flex; + align-items: center; + i{ + font-style: normal; + color: #E1001A; + font-weight: bold; + } + } + .rc-one-column strong{ + font-size: 12px; + margin-left: 6px; + font-weight: bold; } /deep/ .van-field-one{ diff --git a/rc-busness/assets/css/royalcanin-standard.css b/rc-busness/assets/css/royalcanin-standard.css index ca12180a..2809c94f 100644 --- a/rc-busness/assets/css/royalcanin-standard.css +++ b/rc-busness/assets/css/royalcanin-standard.css @@ -22019,9 +22019,6 @@ li:last-child .edge .rc-tab--view-control:focus,li:last-child } @media (max-width: 1024px) { - .rc-xl-up,.xl-up { - display: none !important; - } .rc-flex-direction--reverse--xl-down { -webkit-box-orient: vertical; diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 57c8bf29..03921b0e 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -56,6 +56,8 @@ --> + + diff --git a/rc-busness/config/index.js b/rc-busness/config/index.js index 0f6fbc74..f7969b57 100644 --- a/rc-busness/config/index.js +++ b/rc-busness/config/index.js @@ -2,4 +2,13 @@ module.exports={ //图片路径地址 rbs:'http://47.96.75.242:10086/royalcanin/', + //成猫肝脏全价处方量 + hotcat:'https://detail.tmall.com/item.htm?spm=a1z10.3-b-s.w4011-22642828081.211.262fb910fpPRF5&id=614604022166&rn=5eba1d0b816544b39888beddbf21d03a&abbucket=19&skuId=4624275223532', + //成猫优纤易消化全价处方粮 + hotcat1:"https://detail.tmall.com/item.htm?spm=a1z10.3-b-s.w4011-22642828081.75.6070b910aVqaCe&id=614817599199&rn=7413968dc827a6cae94ffaf684c78384&abbucket=19&skuId=4798969553513", + + //成猫肠道全价处方粮(适中能量) + hotcat2:'https://detail.tmall.com/item.htm?spm=a1z10.3-b-s.w4011-22642828081.150.6070b910aVqaCe&id=620738193181&rn=7413968dc827a6cae94ffaf684c78384&abbucket=19&skuId=4938650051548', + //成猫肠道全价处方粮 + hotcat3:'https://detail.tmall.com/item.htm?spm=a1z10.3-b-s.w4011-22642828081.51.6070b910aVqaCe&id=618722103730&rn=7413968dc827a6cae94ffaf684c78384&abbucket=19&skuId=4910398135159', } diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index ad41d59d..7bab2db7 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -75,7 +75,7 @@
微信扫一扫,识别二维码
加入社群0元试用商品随单发放
diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 4627a29c..8aa6d15c 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -106,7 +106,13 @@