diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 9960ffe7..88f6404c 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -201,32 +201,27 @@ export const userque = (stype) => { //标品全部信息 -export const biaomessage = (stype,name) => { - console.log(stype); - if(stype.length>1){ - console.log("========"); - let list={}; - stype.map(item=>{ - console.log(item); - list=item - }) - var str = "?"; - for(var key in list){ - str = str + key + "=" + list[key] + "&"; - } - stype = str.substr(0,str.length-1); - var data = { - page:1, - row:10 - } - return fetch('product/query'+stype, data, 'POST' ) - }else{ - console.log('-=='); - return fetch('product/query?petType='+stype,data, 'POST' ) - - } - - +export const biaomessage = (stype,name,curPage,curRow) => { + if(!curPage) + curPage=1; + if(!curRow) + curRow=10; + let queryTail='&page='+curPage+'&rows='+curRow; + if(stype.length>1){ + let list={}; + stype.map(item=>{ + console.log(item); + list=item + }) + var str = "?"; + for(var key in list){ + str = str + key + "=" + list[key] + "&"; + } + stype = str.substr(0,str.length-1); + return fetch('product/query'+stype+queryTail, '', 'POST' ) + }else{ + return fetch('product/query?petType='+stype+queryTail, '', 'POST' ) + } } export const searchchanpin = (stype) => { diff --git a/rc-busness/assets/cat/1615961503766_wntaC9.jpg b/rc-busness/assets/cat/1615961503766_wntaC9.jpg deleted file mode 100644 index a366dffa..00000000 Binary files a/rc-busness/assets/cat/1615961503766_wntaC9.jpg and /dev/null differ diff --git a/rc-busness/assets/cat/1615961513806_QHcFm8.jpg b/rc-busness/assets/cat/1615961513806_QHcFm8.jpg deleted file mode 100644 index 80b5e099..00000000 Binary files a/rc-busness/assets/cat/1615961513806_QHcFm8.jpg and /dev/null differ diff --git a/rc-busness/assets/cat/1615961544810_9uoGJu.jpg b/rc-busness/assets/cat/1615961544810_9uoGJu.jpg deleted file mode 100644 index b6cc9818..00000000 Binary files a/rc-busness/assets/cat/1615961544810_9uoGJu.jpg and /dev/null differ diff --git a/rc-busness/assets/cat/1615961553480_B8cLSl.jpg b/rc-busness/assets/cat/1615961553480_B8cLSl.jpg deleted file mode 100644 index 306ff5b1..00000000 Binary files a/rc-busness/assets/cat/1615961553480_B8cLSl.jpg and /dev/null differ diff --git a/rc-busness/assets/cat/four.jpg b/rc-busness/assets/cat/four.jpg deleted file mode 100644 index 80b5e099..00000000 Binary files a/rc-busness/assets/cat/four.jpg and /dev/null differ diff --git a/rc-busness/assets/cat/four.mp4 b/rc-busness/assets/cat/four.mp4 deleted file mode 100644 index f83e784b..00000000 Binary files a/rc-busness/assets/cat/four.mp4 and /dev/null differ diff --git a/rc-busness/assets/cat/one.jpg b/rc-busness/assets/cat/one.jpg deleted file mode 100644 index a366dffa..00000000 Binary files a/rc-busness/assets/cat/one.jpg and /dev/null differ diff --git a/rc-busness/assets/cat/one.mp4 b/rc-busness/assets/cat/one.mp4 deleted file mode 100644 index 6a0558a8..00000000 Binary files a/rc-busness/assets/cat/one.mp4 and /dev/null differ diff --git a/rc-busness/assets/cat/three.jpg b/rc-busness/assets/cat/three.jpg deleted file mode 100644 index b6cc9818..00000000 Binary files a/rc-busness/assets/cat/three.jpg and /dev/null differ diff --git a/rc-busness/assets/cat/three.mp4 b/rc-busness/assets/cat/three.mp4 deleted file mode 100644 index 9f1795ba..00000000 Binary files a/rc-busness/assets/cat/three.mp4 and /dev/null differ diff --git a/rc-busness/assets/cat/two.jpg b/rc-busness/assets/cat/two.jpg deleted file mode 100644 index 306ff5b1..00000000 Binary files a/rc-busness/assets/cat/two.jpg and /dev/null differ diff --git a/rc-busness/assets/cat/two.mp4 b/rc-busness/assets/cat/two.mp4 deleted file mode 100644 index 732ab8ab..00000000 Binary files a/rc-busness/assets/cat/two.mp4 and /dev/null differ diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 17a3e939..7d860107 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -38,8 +38,7 @@ img, picture { flex-wrap: wrap; justify-content: space-evenly; &:after{ - content:""; - width:154px; + } li{ border: 1px solid #D7D7D7; @@ -369,17 +368,25 @@ img, picture { display:block; li{ max-width:20rem; - margin-right:.9rem; - margin-left:.9rem; + //margin-right:.875rem; + margin-left:2.2vw; .rc-column{ span{ font-size:1.875rem; height: 5.2rem; } } + &:nth-child(4n+1){ + margin-left:0; + } + &:nth-child(4n){ + //margin-right:0; + } } img{ width:20rem; + max-width:320px; + min-width:160px; } } .ts-right-arr { @@ -511,4 +518,15 @@ img, picture { .rc-xl-down { display: none!important; } +} +@media screen and (min-width: 769px) and (max-width: 1370px) +{ + .ts-product-list { + display:flex; + justify-content: space-between; + li{ + margin-left:0; + margin-right:0; + } + } } \ No newline at end of file diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less index b4d1b764..eeb5af6a 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -5,6 +5,36 @@ /deep/.van-swipe__indicator--active{ background-color: #E1001A; } +.rc-ma{ + .ul-zhuan{ + li{ + background: unset;; + img{ + border-radius: 50%; + } + &.active { + img{ + border: 3px solid #E2001A; + } + color: #E2001A; + + } + &.unactive { + color: #444444; + img{ + border: 3px solid #D7D7D7; + } + } + } + } +} +.uservideo{ + overflow: hidden; + video{ + height:100%; + width:auto; + } +} @media screen and (max-width:768px){ .ul-dog{ display: none; @@ -24,16 +54,14 @@ display: block; } img{ - width: 0.64rem; - height: 0.64rem; + width: 4rem; + height: 4rem; display: block; } li{ display: inline-block; margin-left: 0.20rem; - width: 0.64rem; text-align: center; - height: 0.64rem; background: #F6F6F6; border-radius: 50%; opacity: 1; @@ -260,12 +288,7 @@ li{ display: inline-block; margin-left: 1.25rem; - width: 4rem; text-align: center; - height: 4rem; - background: #F6F6F6; - border-radius: 50%; - opacity: 1; } } @@ -280,15 +303,16 @@ } } .active { - font-size: 0.14rem; - border: 1px solid red; - color: red; - + font-size: 0.14rem; + img{ + border-width: 1px; + } } .unactive { - font-size: 0.14rem; - color: #444444; - border: 1px solid #D7D7D7; + font-size: 0.14rem; + img{ + border-width: 1px; + } } // .usermain{ // display: none; @@ -411,35 +435,33 @@ object-fit: cover; margin-top: 1rem; } } -.uservideo{ -width: 35rem; -height: 31.6rem; -display: block; -border: 1px solid red; - -} -.userleft{ -position: absolute; -top: 50%; -left:0; -margin-top: -.72rem; -img{ - width: .69rem; - height: 1.38rem; - display: block; -} -} -.userright{ -position: absolute; -top: 50%; -right:0; -margin-top: -.72rem; -img{ - width: .69rem; - height: 1.375rem; - display: block; -} -} + .uservideo{ + width: 35rem; + height: 31.6rem; + display: block; + } + .userleft{ + position: absolute; + top: 50%; + left:0; + margin-top: -.72rem; + img{ + width: .69rem; + height: 1.38rem; + display: block; + } + } + .userright{ + position: absolute; + top: 50%; + right:0; + margin-top: -.72rem; + img{ + width: .69rem; + height: 1.375rem; + display: block; + } + } } } @@ -494,23 +516,19 @@ img{ flex-wrap: wrap; flex-direction: row; span{ - margin-top: 2.5rem; + margin-top: 1vw; display: block; } img{ - width: 9.5rem; - height: 9.5rem; + width: 10vw; + height: 10vw; display: block; } li{ cursor: pointer; font-size: 16px; - width: 9.875rem; text-align: center; - height: 9.875rem; - background: #F6F6F6; - border-radius: 50%; - margin-left:1.25rem; + margin-left:1.3vw; } } @@ -525,8 +543,6 @@ img{ } .usermain{ - margin-top: 2.5rem; - padding-bottom: 2.82rem; .ul-dog{ width: 100%; display: flex; @@ -593,17 +609,18 @@ margin-left: 2.5rem; } } } -.active { - font-size: 1rem; - border: 3px solid red; - color: red; - -} -.unactive { - font-size: 1rem; - color: #444444; - border: 1px solid #D7D7D7; -} + .active { + font-size: 1rem; + img{ + border-width: 3px; + } + } + .unactive { + font-size: 1rem; + img{ + border-width: 1px; + } + } .rc-maa{ ul{ width: 100%; @@ -635,15 +652,12 @@ border-radius: 50%; } - .userselection { - font-size: 0.16rem; - -color: #E2001A; - -} + .userselection { + font-size: 0.16rem; + color: #E2001A; + } .unselection { font-size: 0.16rem; - } .rc-usermessage{ span{ @@ -653,3 +667,14 @@ color: #E2001A; } } } + +@media screen and (min-width:600px) and (max-width:768px) +{ + .ul-zhuan{ + display: flex; + justify-content: space-evenly; + li{ + margin-left:0; + } + } +} \ No newline at end of file diff --git a/rc-busness/assets/dog/four.jpg b/rc-busness/assets/dog/four.jpg deleted file mode 100644 index d8058f8d..00000000 Binary files a/rc-busness/assets/dog/four.jpg and /dev/null differ diff --git a/rc-busness/assets/dog/four.mp4 b/rc-busness/assets/dog/four.mp4 deleted file mode 100644 index 466d701a..00000000 Binary files a/rc-busness/assets/dog/four.mp4 and /dev/null differ diff --git a/rc-busness/assets/dog/one.jpg b/rc-busness/assets/dog/one.jpg deleted file mode 100644 index 7e1e5dd3..00000000 Binary files a/rc-busness/assets/dog/one.jpg and /dev/null differ diff --git a/rc-busness/assets/dog/one.mp4 b/rc-busness/assets/dog/one.mp4 deleted file mode 100644 index fb30b38d..00000000 Binary files a/rc-busness/assets/dog/one.mp4 and /dev/null differ diff --git a/rc-busness/assets/dog/three.jpg b/rc-busness/assets/dog/three.jpg deleted file mode 100644 index d39f7747..00000000 Binary files a/rc-busness/assets/dog/three.jpg and /dev/null differ diff --git a/rc-busness/assets/dog/three.mp4 b/rc-busness/assets/dog/three.mp4 deleted file mode 100644 index 37740ea1..00000000 Binary files a/rc-busness/assets/dog/three.mp4 and /dev/null differ diff --git a/rc-busness/assets/dog/two.jpg b/rc-busness/assets/dog/two.jpg deleted file mode 100644 index 084f533f..00000000 Binary files a/rc-busness/assets/dog/two.jpg and /dev/null differ diff --git a/rc-busness/assets/dog/two.mp4 b/rc-busness/assets/dog/two.mp4 deleted file mode 100644 index e19212fc..00000000 Binary files a/rc-busness/assets/dog/two.mp4 and /dev/null differ diff --git a/rc-busness/assets/video/1615961488405_E5oNom.mp4 b/rc-busness/assets/video/1615961488405_E5oNom.mp4 deleted file mode 100644 index 6a0558a8..00000000 Binary files a/rc-busness/assets/video/1615961488405_E5oNom.mp4 and /dev/null differ diff --git a/rc-busness/assets/video/1615961503766_wntaC9.jpg b/rc-busness/assets/video/1615961503766_wntaC9.jpg deleted file mode 100644 index a366dffa..00000000 Binary files a/rc-busness/assets/video/1615961503766_wntaC9.jpg and /dev/null differ diff --git a/rc-busness/assets/video/1615961513806_QHcFm8.jpg b/rc-busness/assets/video/1615961513806_QHcFm8.jpg deleted file mode 100644 index 80b5e099..00000000 Binary files a/rc-busness/assets/video/1615961513806_QHcFm8.jpg and /dev/null differ diff --git a/rc-busness/assets/video/1615961523976_1IxIgJ.mp4 b/rc-busness/assets/video/1615961523976_1IxIgJ.mp4 deleted file mode 100644 index f83e784b..00000000 Binary files a/rc-busness/assets/video/1615961523976_1IxIgJ.mp4 and /dev/null differ diff --git a/rc-busness/assets/video/1615961537456_Yk1txa.mp4 b/rc-busness/assets/video/1615961537456_Yk1txa.mp4 deleted file mode 100644 index 9f1795ba..00000000 Binary files a/rc-busness/assets/video/1615961537456_Yk1txa.mp4 and /dev/null differ diff --git a/rc-busness/assets/video/1615961544810_9uoGJu.jpg b/rc-busness/assets/video/1615961544810_9uoGJu.jpg deleted file mode 100644 index b6cc9818..00000000 Binary files a/rc-busness/assets/video/1615961544810_9uoGJu.jpg and /dev/null differ diff --git a/rc-busness/assets/video/1615961553480_B8cLSl.jpg b/rc-busness/assets/video/1615961553480_B8cLSl.jpg deleted file mode 100644 index 306ff5b1..00000000 Binary files a/rc-busness/assets/video/1615961553480_B8cLSl.jpg and /dev/null differ diff --git a/rc-busness/assets/video/1615961564557_bKiaNb.mp4 b/rc-busness/assets/video/1615961564557_bKiaNb.mp4 deleted file mode 100644 index 732ab8ab..00000000 Binary files a/rc-busness/assets/video/1615961564557_bKiaNb.mp4 and /dev/null differ diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 0cbbca9e..7c10461f 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -379,21 +379,23 @@ - - diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index dd9674b2..b19137a5 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -3,76 +3,70 @@
{{item.detail}}
- {{item.price}} - 立即购买 -{{item.detail}}
+ {{item.price}} + 立即购买 +{{item.detail}}
@@ -81,637 +75,638 @@{{item.detail}}
+ {{item.price}} + 立即购买 +{{item.detail}}
+ {{item.price}}{{item.detail}}
- {{item.price}} - 立即购买 -{{item.detail}}
- {{item.price}} -