+
+
+
+
-
-
{{usertitle}}
@@ -90,12 +91,15 @@
-
-
- 全价猫湿粮
+ +
+
@@ -182,8 +185,8 @@
全价猫湿粮
@@ -124,7 +128,6 @@
-
+
+
@@ -275,12 +278,76 @@
-
+
+
全价猫干粮
+
+
+
+
+
-
-
+
+
+
+
+
-
+
+
+ {{dogtitle}}
+
+
+
+
+
+
+
+ ![]()
+ {{item.title}}
+
+ {{item.detail}}
+ {{item.price}} + 立即购买 +
+
+
+
+ ![]()
+ {{item.title}}
+
+
+
+
+
+ {{item.detail}}
+ {{item.price}} +
+ 立即购买
+
+
+
+
+
+
+
+ 全价犬湿粮
+
+
-
+
-
+
+ {{ item.title }} +
+
- @@ -374,11 +441,28 @@
+
+
+
+
+
+
+
-
+
-
全价犬干粮
+
-
+
-
+
+ {{ item.title }} +
+
- @@ -470,9 +554,9 @@
+
@@ -640,9 +724,19 @@
return{
useraindex:0,
usertitle:'明星猫粮',
+ dogtitle:'明星狗粮',
processinformation:[],
catshi:[],
+ userindex:0,
userstype:'',
+ onemao:false,
+ twomao:false,
+ threemao:false,
+ dogshow:false,
+ fourmao:false,
+ fivemao:false,
+ sixmao:false,
+ stypechange:true,
userunlogin:false,
searchBar:true,
usermessage:[],
@@ -670,24 +764,13 @@
gotop: false,
usersetting: `${settings.rbs}`,
activeIndex: 0,
+ activeIndex5:0,
+ activeIndex6:0,
activeInde2: 0,
activeInde3:0,
catproduct:true,
catfood:false,
- dogselection:[
- {
- title: "小型犬",
-
- },
- {
- title: "中型犬",
- },
- {
- title: "大型犬",
- },
-
- ],
selection:[
{
@@ -717,7 +800,7 @@ activeInde3:0,
{src:require("../assets/image/four.jpg"),link:""},
],
- doglist: [
+ userdoglist: [
{
title: "小型犬",
catimage: require("../assets/cat.png"),
@@ -759,44 +842,51 @@ activeInde3:0,
{
title: "明星猫粮",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
- catimage: require("../assets/cat.png"),
+ catimage: require("../assets/star-cat.png"),
price:'￥2'
},
{
title: "猫湿粮",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
-
price:'￥12',
- catimage: require("../assets/four.png"),
+ catimage: require("../assets/two.png"),
},
{
title: "猫干粮",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
price:'￥102',
- catimage: require("../assets/one.png"),
+ catimage: require("../assets/cat.png"),
},
- {
- title: "犬湿粮",
+ {
+ title: "明星狗粮",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
-
price:'￥112',
- catimage: require("../assets/two.png"),
+ catimage: require("../assets/six.png"),
},
- {
- title: "犬干粮",
+
+ {
+ title: "犬湿粮",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
price:'￥112',
catimage: require("../assets/three.png"),
+ },
+ {
+ title: "犬干粮",
+ detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
+
+ price:'￥112',
+ catimage: require("../assets/one.png"),
+
},
{
title: "处方用粮",
detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养',
price:'￥112',
- catimage: require("../assets/six.png"),
+ catimage: require("../assets/four.png"),
},
],
@@ -855,6 +945,38 @@ activeInde3:0,
price:'¥123.45',
},
+ ],
+
+ doglistvideo: [
+ {
+ title: "明星狗粮",
+ video:require("../assets/dog/one.mp4"),
+ catimage: require("../assets/dog/one.jpg"),
+ detail:'为10月龄及以上成犬量身打造的精准营养',
+ price:'¥123.45',
+ },
+ {
+ title: "狗湿粮",
+ video:require("../assets/dog/two.mp4"),
+ catimage: require("../assets/dog/two.jpg"),
+ detail:'为10月龄及以上英国成犬量身打造的精准营养',
+ price:'¥123.45',
+ },
+ {
+ title: "狗干粮",
+ video:require("../assets/dog/three.mp4"),
+ catimage: require("../assets/dog/three.jpg"),
+ detail:'为10月龄及以上英国犬成犬量身打造的精准营养',
+ price:'¥123.45',
+ },
+ {
+ title: "狗干粮",
+ video:require("../assets/dog/four.mp4"),
+ catimage: require("../assets/dog/four.jpg"),
+ detail:'为10月龄及以上英国成犬量身打造的精准营养',
+ price:'¥123.45',
+ },
+
],
fixedlist: [
{
@@ -967,13 +1089,27 @@ activeInde3:0,
Myfooter,
tabs,
unlogin,
+ // userswiper
},
created(){
vm=this;
},
+ watch:{
+},
mounted(){
+ const that = this
+ this.ifAdoid()
+ // window.onresize = () => {
+ // setTimeout(() => {
+ // this.ifAdoid()
+ // }, 500);
+
+ // }
+
+
+
this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
- let jump = document.querySelectorAll('.d_jump')
+
if(this.usermessage==null ||this.usermessage==undefined){
this.userunlogin=true
}
@@ -989,8 +1125,12 @@ vm=this;
window.removeEventListener('scroll', this.scrollToTop);
},
methods:{
- ifadroind(item,index,order){
- console.log(item,order);
+
+
+
+ ifAdoid(item,index){
+ console.log(index);
+ this.userindex=index;
var sUserAgent = navigator.userAgent.toLowerCase();
var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
@@ -1000,35 +1140,158 @@ vm=this;
var bIsAndroid = sUserAgent.match(/android/i) == "android";
var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
- this.activeIndex=index;
+
if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
console.log("当前是电脑打开")
- this.usertitle=item.title
- this.catlistvideo[order]=item;
- this.catproduct=true;
- console.log(this.catproduct);
+ this.stypechange=false;
+ console.log(this.usertitle)
+
+ // let catshiid=document.querySelectorAll('.selectionswitch');
+ // catshiid[this.userindex].style.display='none';
+ // catshiid[this.userindex].style.display='none';
+ this.catproduct=true;
+ this.onemao=false;
+ this.twomao=false;
+ this.threemao=false;
+ this.fourmao=false;
+ this.fivemao=false;
+ this.sixmao=false;
+ this.dogshow=false
+ // console.log(catshiid);
+ }else{
+ console.log("当前是手机打开")
+ this.stypechange=true;
+ this.onemao=true;
+ this.twomao=true;
+ this.threemao=true;
+ this.fourmao=true;
+ this.fivemao=true;
+ this.dogshow=true;
+ this.catproduct=true
+ this.sixmao=true;
+
+}
+ },
+
+ ifadroind(item,index,order){
+ console.log(item,index,order);
+
+
+ var sUserAgent = navigator.userAgent.toLowerCase();
+ var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
+ var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
+ var bIsMidp = sUserAgent.match(/midp/i) == "midp";
+ var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4";
+ var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb";
+ var bIsAndroid = sUserAgent.match(/android/i) == "android";
+ var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
+ var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
+
+ if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
+ console.log("当前是电脑打开啊啊啊")
+ if(item.title=='明星猫粮'){
+ this.catproduct=true;
+ this.twomao=false;
+ this.threemao=false;
+ this.fourmao=false;
+ this.fivemao=false;
+ this.dogshow=false;
+ this.sixmao=false;
+ this.onemao=false;
+ }
+ if(item.title=='猫湿粮'){
+ this.onemao=true;
+ this.dogshow=false;
+ console.log(this.onemao);
+ this.twomao=false;
+ this.threemao=false;
+ this.fourmao=false;
+ this.fivemao=false;
+ this.catproduct=false;
+
+
+
+ }if(item.title=='猫干粮'){
+ this.onemao=false;
+ this.twomao=true;
+ this.dogshow=false;
+ this.threemao=false;
+ this.fourmao=false;
+ this.chufang=false;
+ this.catproduct=false;
+ }
+
+ if(item.title=='犬干粮'){
+ this.onemao=false;
+ this.twomao=false;
+ this.threemao=false;
+ this.fourmao=true;
+ this.chufang=false;
+ this.dogshow=false;
+ this.catproduct=false;
+ }
+
+ if(item.title=='犬湿粮'){
+ this.onemao=false;
+ this.twomao=false;
+ this.threemao=true;
+ this.fourmao=false;
+ this.chufang=false;
+ this.catproduct=false;
+ this.dogshow=false;
+ }
+ if(item.title=='处方用粮'){
+ this.onemao=false;
+ this.twomao=false;
+ this.threemao=false;
+ this.fourmao=false;
+ this.fivemao=true;
+ this.dogshow=false;
+ this.catproduct=false;
+ }
+ if(item.title=='明星狗粮'){
+ this.onemao=false;
+ this.twomao=false;
+ this.threemao=false;
+ this.fourmao=false;
+ this.fivemao=false;
+ this.dogshow=true;
+ this.catproduct=false;
+ }
+ // this.usertitle=item.title
+ // this.catlistvideo[order]=item;
+ // this.catproduct=true;
+
}else{
this.catfood=true;
- this.catproduct=false;
+ // this.catproduct=false;
let userindex=index
console.log(item,index);
let mingxin=document.querySelector('.pageFullScreen');
+ let dogtop=document.querySelector('.oc-top');
+ console.log(dogtop);
console.log(mingxin.offsetTop);
+if(item.title=='犬湿粮'||item.title=='犬干粮'||item.title=='处方用粮'){
+ userindex=userindex-2
+}else{
+ userindex=userindex-1
+}
if(item.title=='明星猫粮'){
mingxin.scrollIntoView(true);
}else{
let catshiid=document.querySelectorAll('.selectionswitch');
-catshiid[userindex-1].scrollIntoView(true);
+catshiid[userindex].scrollIntoView(true);
}
+if(item.title=='明星狗粮')
+dogtop.scrollIntoView(true);
+ // if(item.title=="猫湿粮"){
+ // this.catproduct=false;
+ // this.catfood=true;
+ // }else if(item.title=="明星猫粮"){
+ // this.catproduct=true;
+ // this.catfood=false;
- if(item.title=="猫湿粮"){
- this.catproduct=false;
- this.catfood=true;
- }else if(item.title=="明星猫粮"){
- this.catproduct=true;
- this.catfood=false;
-
- }
+ // }
console.log("当前是手机打开")
}
@@ -1229,7 +1492,21 @@ catshiid[userindex-1].scrollIntoView(true);
},
selectGoods(item,index){
+ console.log(item,index);
+ this.activeIndex=index;
+ console.log(item.title);
this.ifadroind(item,index,this.useraindex)
+// this.ifAdoid(item,index);
+
+},
+quanshi(item,index){
+ console.log(item,index);
+ this.activeIndex5=index
+ console.log(this.activeIndex5);
+
+},
+userdoghot(item,index){
+ this.activeIndex6=index
},
selectGo(item,index){
From 5e49a44f2baed75f7dfa5a34b24fd8379eabbf0b Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 13 Jan 2022 12:17:01 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
rc-busness/assets/css/index.less | 3 +++
1 file changed, 3 insertions(+)
diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less
index 40a3ba08..b4d1b764 100644
--- a/rc-busness/assets/css/index.less
+++ b/rc-busness/assets/css/index.less
@@ -6,6 +6,9 @@
background-color: #E1001A;
}
@media screen and (max-width:768px){
+ .ul-dog{
+ display: none;
+ }
.searchBara{
position: fixed;
width: 100%;
From 25a06260a7548cf936ed5cf216e4a053c2988489 Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 13 Jan 2022 14:32:47 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=85=B6=E4=BB=96?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
rc-busness/pages/personal/discount.vue | 512 +++++++++++++++++++
rc-busness/pages/personal/integral.vue | 321 ++++++++++++
rc-busness/pages/personal/mypersonal.vue | 4 +-
rc-busness/pages/useraddress/addaddress.vue | 73 +++
rc-busness/pages/useraddress/editaddress.vue | 99 ++++
rc-busness/pages/useraddress/openaddress.vue | 295 +++++++++++
6 files changed, 1302 insertions(+), 2 deletions(-)
create mode 100644 rc-busness/pages/personal/discount.vue
create mode 100644 rc-busness/pages/personal/integral.vue
create mode 100644 rc-busness/pages/useraddress/addaddress.vue
create mode 100644 rc-busness/pages/useraddress/editaddress.vue
create mode 100644 rc-busness/pages/useraddress/openaddress.vue
diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue
new file mode 100644
index 00000000..046a7327
--- /dev/null
+++ b/rc-busness/pages/personal/discount.vue
@@ -0,0 +1,512 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue
new file mode 100644
index 00000000..f745c362
--- /dev/null
+++ b/rc-busness/pages/useraddress/openaddress.vue
@@ -0,0 +1,295 @@
+
+
处方用粮
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rc-busness/pages/personal/integral.vue b/rc-busness/pages/personal/integral.vue
new file mode 100644
index 00000000..aa1c3da0
--- /dev/null
+++ b/rc-busness/pages/personal/integral.vue
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ ￥{{ item.couponAmount }}
+
+ {{ item.couponName }}
+
+
+ {{ item.couponDesc }}
+
+
+
+
+
+
+
+
+ 有效期{{item.validFrom}}至
+ {{ item.validTo }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue
index a1967cae..e2e4c5b2 100644
--- a/rc-busness/pages/personal/mypersonal.vue
+++ b/rc-busness/pages/personal/mypersonal.vue
@@ -332,9 +332,9 @@ obligation(item,index){
return
}else{
- if(index==2){
+ if(item.title=='收货地址'){
this.$router.push({
- path: `/personal/useraddress/`
+ path: `/useraddress/openaddress/`
})
console.log('这是地址的跳转');
diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue
new file mode 100644
index 00000000..f062a62b
--- /dev/null
+++ b/rc-busness/pages/useraddress/addaddress.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+ -
+
- + {{item.title}} + +
-
+
+
- + {{item.startDate}} + {{item.changeValue}} + {{item.remark}} + + +
+
+
+
+
+
+
From 782738fc9ad3850449fcda08eb8444ae7cd8df3d Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 13 Jan 2022 14:54:23 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
rc-busness/assets/css/integral.less | 195 +++++++++++++++++++++++
rc-busness/pages/personal/integral.vue | 207 +------------------------
2 files changed, 198 insertions(+), 204 deletions(-)
create mode 100644 rc-busness/assets/css/integral.less
diff --git a/rc-busness/assets/css/integral.less b/rc-busness/assets/css/integral.less
new file mode 100644
index 00000000..6494a1bb
--- /dev/null
+++ b/rc-busness/assets/css/integral.less
@@ -0,0 +1,195 @@
+@media screen and (max-width:768px){
+ .rc-button{
+ width: 100%;
+ height: 80px;
+ background: #FFFFFF;
+box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 12px;
+
+.rc-order{
+width: 164px;
+ height: 48px;
+ border: 2px solid #E2001A;
+ border-radius: 30px;
+ background: #E2001A;
+ text-align: center;
+ align-items: center;
+ line-height: 48px;
+span{
+ font-size: 16px;
+ display: block;
+ color: #FFFFFF;
+
+}
+}
+ }
+.rc-usermain{
+ width: 92%;
+ margin: 0 auto;
+
+ ul{
+ height: 70px;
+ display: block;
+ border-bottom: 1px solid #D8D8D8;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ text-align: center;
+ font-size: 16px;
+ color: #444444;
+ li{
+ float: left;
+ width: 30%;
+
+
+ }
+ li:after{
+ // height: 2px;
+ // border: 1px solid red;
+ // display: block;
+ content:"|";
+ color: #707070;
+ margin-left: 5px;
+
+ }
+ li:last-child:after{
+ content:"";
+
+ }
+ }
+
+ ol{
+ li{
+ font-style: normal;
+ display: block;
+ height: 32px;
+ margin-top: 16px;
+ display: flex;
+ // justify-content: space-between;
+ align-items: center;
+ color: #666666;
+ font-size: 14px;
+ text-align: center;
+ i{
+ font-style: normal;
+ display: block;
+ width: 40%;
+ }
+ span{
+ font-style: normal;
+ display: block;
+ width: 36%;
+ }
+ em{
+ font-style: normal;
+ display: block;
+ width: 23%;
+ }
+
+
+ }
+ }
+
+
+}
+
+}
+
+@media screen and (min-width: 769px)
+{
+
+ .rc-button{
+ width: 100%;
+ height: 80px;
+ background: #FFFFFF;
+box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-top: 12px;
+ display: none;
+
+.rc-order{
+width: 164px;
+ height: 48px;
+ border: 2px solid #E2001A;
+ border-radius: 30px;
+ background: #E2001A;
+ text-align: center;
+ align-items: center;
+ line-height: 48px;
+span{
+ font-size: 16px;
+ display: block;
+ color: #FFFFFF;
+
+}
+}
+ }
+.rc-main{
+ width: 92%;
+ margin: 0 auto;
+ margin-top: 60px;
+
+ ul{
+ height: 64px;
+background: #F6F6F6;
+border: 1px solid #D7D7D7;
+opacity: 1;
+border-radius: 3px 3px 0px 0px;
+ display: block;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ text-align: center;
+ font-size: 16px;
+ color: #444444;
+ li{
+ float: left;
+ width: 42%;
+
+
+ }
+
+ }
+
+ ol{
+ li{
+ font-style: normal;
+ display: block;
+ height: 48px;
+ margin-top: 16px;
+ display: flex;
+ border: 1px solid #D7D7D7;
+ // justify-content: space-between;
+ align-items: center;
+ color: #666666;
+ font-size: 14px;
+ text-align: center;
+ i{
+ font-style: normal;
+ display: block;
+ width: 34%;
+ }
+ span{
+ font-style: normal;
+ display: block;
+ width: 34%;
+ }
+ em{
+ font-style: normal;
+ display: block;
+ width: 34%;
+ }
+
+
+ }
+ }
+
+
+}
+
+}
\ No newline at end of file
diff --git a/rc-busness/pages/personal/integral.vue b/rc-busness/pages/personal/integral.vue
index aa1c3da0..dd1a63ce 100644
--- a/rc-busness/pages/personal/integral.vue
+++ b/rc-busness/pages/personal/integral.vue
@@ -1,8 +1,8 @@
+
+
+
+
+
+
+
+
+
+
+ {{ item.recipient }}
+
+
+ {{ item.recipientPhone }}
+
+
+
+
+ {{ item.detailAddress }}
+
+
+
+
-
+
+
-
- {{item.title}} @@ -20,7 +20,6 @@