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

This commit is contained in:
Admin 2022-01-20 03:57:08 +00:00 committed by Gitee
commit 7837fadc8e
29 changed files with 1093 additions and 1835 deletions

View File

@ -31,13 +31,13 @@ export const courselist = (offset, courseId, type, sort, selectScreen = []) => {
courseId,
selectScreenStr
}
return fetch('/api/courselist', data)
return fetch( '/api/courselist', data)
}
/**
* 获取课程详情
*/
export const getDetail = (id) => {
fetch('/api/courseDetail/index/' + id)
fetch( '/api/courseDetail/index/' + id)
}
/**
@ -56,40 +56,44 @@ export const getleckCourse = (name, offset) => {
* 加入购物车
*/
export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications) => {
export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,productName,productPrice,specifications) => {
var data = {
buyCount: buyCount,
buyCount:buyCount,
memberId: memberId,
mobile: mobile,
productCode: productCode,
mobile:mobile,
productCode:productCode,
productImg: productImg,
productName: productName,
productPrice: productPrice,
specifications: specifications
productName:productName,
productPrice:productPrice,
specifications:specifications
}
return fetch('/insertCartProductInfo', data, 'POST')
return fetch('/insertCartProductInfo', data,'POST')
}
/**
* 是否存在购物车
*/
export const isexistCart = (id) => {
export const isexistCart = (id, pet,address) => {
var data = {
memberId: id,
}
return fetch('getCartProductInfo', data, 'POST')
return fetch('getCartProductInfo?memberId='+id,data,'POST')
}
/**
* 删除购物车
*/
export const deleteCart = (memberId, productCode) => {
return fetch('cancelCartProductInfo?memberId=' + memberId, productCode, 'POST')
var data = {
memberId: memberId,
productCode:productCode
}
return fetch('cancelCartProductInfo',data,'POST')
}
/**
* 购物车批量提交
*/
export const mostAddClass = (id) => {
return fetch('/api/mostAddClass/', { id })
return fetch('/api/mostAddClass/', {id})
}
/**
* 删除购物车
@ -105,47 +109,47 @@ export const mostAddClass = (id) => {
/**
* 发送验证码
*/
export const sendMsg = (mobile, pet, address) => {
export const sendMsg = (mobile, pet,address) => {
var data = {
phoneNumber: mobile,
phoneNumber:mobile,
}
return fetch('sendMsg', data, 'POST')
return fetch('sendMsg', data, 'POST' )
}
/**
* 发送验证码数据
*/
export const vadatnmsg = (msgNum, hash, tamp) => {
export const vadatnmsg = (msgNum,hash,tamp) => {
var data = {
msgNum: msgNum,
tamp: tamp,
hash: hash
msgNum:msgNum,
tamp:tamp,
hash:hash
}
return fetch('validateNum', data, 'POST')
return fetch('validateNum', data, 'POST' )
}
/**
* 筛选标签
*/
export const userstype = (stype, pet, address) => {
export const userstype = (stype, pet,address) => {
var data = {
petType: 0,
petType:0,
}
return fetch('productSearchTag/query?petType=' + 0, data, 'POST')
return fetch('productSearchTag/query?petType=' + 0, data, 'POST' )
}
/**
* 登录
*/
export const userLongin = (mobile, pet, address) => {
export const userLongin = (mobile, pet,address) => {
var data = {
id: '',
mobile: mobile,
id:'',
mobile:mobile,
}
return fetch('member?type=get', data, 'POST')
return fetch('member?type=get', data, 'POST' )
}
//注册
export const useredit = (mobile, pet, address) => {
//注册
export const useredit = (mobile, pet,address) => {
var data = {
mobile:mobile,
memberName:'',
@ -180,10 +184,10 @@ export const userquery = (stype) => {
console.log(stype);
var data = {
goodsName: stype
goodsName:stype
}
return fetch('goods?goodsName=' + stype, data, 'POST')
return fetch('goods?goodsName='+stype, data, 'POST' )
}
//商品全部信息
export const userque = (stype) => {
@ -191,7 +195,7 @@ export const userque = (stype) => {
console.log(stype);
var data = {
}
return fetch('goods', data, 'POST')
return fetch('goods', data, 'POST' )
}
@ -230,14 +234,20 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => {
curRow=10;
let queryTail='&page='+curPage+'&rows='+curRow;
console.log(stype);
let list = {};
stype.map(item => {
let list={};
stype.map(item=>{
console.log(item);
list=item
})
var str = "&";
for(var key in list){
str = str + key + "=" + list[key] + "&";
str = str + key + "=" + list[key] + "&";
}
str = str.substr(0,str.length-1);
var data = {
page:1,
row:10
}
return fetch('product/query?petType='+usertype+str+queryTail, data, 'POST' )
@ -255,19 +265,19 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => {
//查询订单
export const userindent = (phoneNumber, orderNumber,) => {
var data = {
phoneNumber: '18112621098',
orderNumber: orderNumber,
export const userindent = (phoneNumber,orderNumber,) => {
var data = {
phoneNumber:'18112621098',
orderNumber:orderNumber,
}
return fetch('orderMaster/?type=query', data, 'POST')
return fetch('orderMaster/?type=query', data, 'POST' )
}
//查询订单详情
export const userin = (orderNumber,) => {
var data = {
orderNumber: orderNumber,
var data = {
orderNumber:orderNumber,
}
return fetch('orderMaster/?type=query', data, 'POST')
return fetch('orderMaster/?type=query', data, 'POST' )
}
@ -275,21 +285,21 @@ export const userin = (orderNumber,) => {
//取消订单
export const canceldanhao = (orderNumber) => {
var data = {
orderNumber: orderNumber,
orderNumber:orderNumber,
}
return fetch('cancelOrder/', data, 'POST')
return fetch('cancelOrder/', data, 'POST' )
}
export const biaomessa = (stype) => {
console.log(stype);
var data = {
name: stype,
page: 1,
row: 10
name:stype,
page:1,
row:10
}
return fetch('product/query', data, 'POST')
return fetch('product/query', data, 'POST' )
}
export const biaome = (usertype,stype,curPage,rows) => {
@ -301,9 +311,9 @@ export const biaome = (usertype,stype,curPage,rows) => {
let username='&name='+stype
console.log(stype);
var data = {
name: stype,
rows: 10,
page: 1,
name:stype,
rows:10,
page:1,
}
return fetch('product/query?petType='+usertype+username+queryTail,data, 'POST' )
}
@ -314,9 +324,9 @@ export const biaome = (usertype,stype,curPage,rows) => {
export const memberAccount = (stype) => {
console.log(stype);
var data = {
memberId: stype
memberId:stype
}
return fetch('memberAccount?type=history', data, 'POST')
return fetch('memberAccount?type=history', data, 'POST' )
}
@ -324,20 +334,20 @@ export const memberAccount = (stype) => {
export const ordermaster = (stype) => {
console.log(stype);
var data = {
memberId: '223782'
memberId:'223782'
}
return fetch('memberAccount', data, 'POST')
return fetch('memberAccount', data, 'POST' )
}
//微信支付
export const payOrderWX = (stype) => {
console.log(stype);
var data = {
memberId: '223782'
memberId:'223782'
}
return fetch('memberAccount', data, 'POST')
return fetch('memberAccount', data, 'POST' )
}
@ -346,9 +356,9 @@ export const payOrderWX = (stype) => {
export const insercar = (stype) => {
console.log(stype);
var data = {
petType: stype
petType:stype
}
return fetch('product/insertCartProductInfo', data, 'POST')
return fetch('product/insertCartProductInfo', data, 'POST' )
}
@ -356,25 +366,25 @@ export const insercar = (stype) => {
//查询猫狗商品信息
export const catquery = (productCode, type) => {
export const catquery = (productCode,type) => {
console.log(productCode);
var data = {
petType: 0
petType:0
}
return fetch('h5/product/query', data, 'POST')
return fetch('h5/product/query', data, 'POST' )
}
//查询猫狗商品信息
export const dogquery = (productCode, type) => {
export const dogquery = (productCode,type) => {
console.log(productCode);
var data = {
petType: 1,
pet_type: 0
petType:1,
pet_type:0
}
return fetch('h5/product/query', data, 'POST')
return fetch('h5/product/query', data, 'POST' )
}
@ -385,11 +395,11 @@ export const dogquery = (productCode, type) => {
export const oncequery = (productCode) => {
var data = {
productCode: productCode
productCode:productCode
}
return fetch("goodsByProductCode?productCode=" + productCode, data, 'POST')
return fetch( "goodsByProductCode?productCode="+productCode, data, 'POST' )
}
@ -397,173 +407,163 @@ export const oncequery = (productCode) => {
export const goodsmessage = (productCode) => {
var data = {
productCode: productCode
productCode:productCode
}
return fetch("productMaster/query?productCode=" + productCode, data, 'POST')
return fetch( "productMaster/query?productCode="+productCode, data, 'POST' )
}
//优惠券的插入
export const inserdiscount = (mobile, couponId) => {
var data = {
mobile: mobile,
couponId: couponId
//优惠券的插入
export const inserdiscount = (mobile,couponId) => {
var data = {
mobile:mobile,
couponId:couponId
}
return fetch('coupon?type=fetch', data, 'POST' )
}
return fetch('coupon?type=fetch', data, 'POST')
}
//优惠券的查询
export const getdiscount = (memberId, channelSecurity, mobile) => {
var data = {
memberId: memberId,
mobile: mobile
//优惠券的查询
export const getdiscount = (memberId,channelSecurity,mobile) => {
var data = {
memberId:memberId,
mobile:mobile
}
return fetch('memberAddress?type=getAll', data, 'POST' )
}
//可用的优惠券
export const alldiscount = (memberId,channelSecurity,mobile) => {
var data = {
memberId:memberId,
}
return fetch('couponConfig?type=getAll', data, 'POST' )
}
//用户领取的优惠券
export const getdraw = (mobile,states) => {
var data = {
mobile:mobile,
status:states
}
return fetch('coupon?type=getAll', data, 'POST' )
}
//微信支付
export const generateOrderWX = (list) => {
var data = [{
}]
return fetch('generateOrderWX', list, 'POST' )
}
return fetch('memberAddress?type=getAll', data, 'POST')
}
//用户所有的优惠券
export const allConfig = (memberId,channelSecurity,mobile) => {
var data = {
}
return fetch('couponConfig?type=getAll', data, 'POST' )
}
//可用的优惠券
export const alldiscount = (memberId, channelSecurity, mobile) => {
var data = {
memberId: memberId,
//用户领取优惠券
export const getConfig = (memberId,couponId) => {
var data = {
memberId:memberId,
couponId:couponId,
}
return fetch('coupon?type=fetch', data, 'POST' )
}
//用户下的优惠券
export const userConfig = (memberId,couponId) => {
var data = {
memberId:memberId,
couponId:couponId,
}
return fetch('coupon?type=fetch', data, 'POST' )
}
//用户订单的查询
// export const customerorders = (memberId,channelSecurity,mobile) => {
// var data = {
// productName:'幼猫全价粮',
// buyCount:'2',
// productId:'210352',
// payAmount:'517',
// memberId:'844350',
// phoneNumber:'18112621098',
// }
// return fetch('generateOrderWX', data, 'POST' )
// }
//地址的查询
export const selectaddress = (memberId, pet,address) => {
var data = {
memberId:memberId,
}
return fetch('memberAddress?type=getAll', data, 'POST' )
}
return fetch('couponConfig?type=getAll', data, 'POST')
}
//用户领取的优惠券
export const getdraw = (mobile, states) => {
var data = {
mobile: mobile,
status: states
//地址的添加 //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码
export const editaddress = (memberId, detailAddress,recipient,tel,provinceId,cityId,districtId) => {
var data = {
memberId:844350,
provinceId:25,
cityId:36,
districtId:418,
detailAddress:'古美路1455弄46号302',
recipient:'蒋缘缘2',
recipientPhone:'13671516167',
zipCode:'214423',
default:false,
}
return fetch('memberAddress?type=add', data, 'POST' )
}
return fetch('coupon?type=getAll', data, 'POST')
}
//删除
export const editdelete = (memberId,ids) => {
var data = {
memberId:memberId,
ids:ids,
}
return fetch('memberAddress?type=delete', data, 'POST' )
}
//微信支付
export const generateOrderWX = (list) => {
return fetch('generateOrderWX', list, 'POST')
}
//微信支付返回
export const updateOrderWX = (data) => {
return fetch('updateOrderWX', data, 'POST')
}
//支付宝支付
export const generateOrderAlipay = (list) => {
return fetch('generateOrderAlipay', list, 'POST')
}
//用户所有的优惠券
export const allConfig = (memberId, channelSecurity, mobile) => {
var data = {
}
return fetch('couponConfig?type=getAll', data, 'POST')
}
//用户领取优惠券
export const getConfig = (memberId, couponId) => {
var data = {
memberId: memberId,
couponId: couponId,
}
return fetch('coupon?type=fetch', data, 'POST')
}
//用户下的优惠券
export const userConfig = (memberId, couponId) => {
var data = {
memberId: memberId,
couponId: couponId,
}
return fetch('coupon?type=fetch', data, 'POST')
}
//用户订单的查询
// export const customerorders = (memberId,channelSecurity,mobile) => {
// var data = {
// productName:'幼猫全价粮',
// buyCount:'2',
// productId:'210352',
// payAmount:'517',
// memberId:'844350',
// phoneNumber:'18112621098',
// }
// return fetch('generateOrderWX', data, 'POST' )
// }
//地址的查询
export const memberAddress = (type, data) => {
return fetch('memberAddress?type=' + type, data, 'POST')
}
//地址的查询
export const selectaddress = (memberId, pet, address) => {
var data = {
memberId: memberId,
}
return fetch('memberAddress?type=getAll', data, 'POST')
}
//地址的添加 //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码
export const editaddress = (memberId, detailAddress, recipient, tel, provinceId, cityId, districtId) => {
var data = {
memberId: 844350,
provinceId: 25,
cityId: 36,
districtId: 418,
detailAddress: '古美路1455弄46号302',
recipient: '蒋缘缘2',
recipientPhone: '13671516167',
zipCode: '214423',
default: false,
}
return fetch('memberAddress?type=add', data, 'POST')
}
//删除
export const editdelete = (memberId, ids) => {
var data = {
memberId: memberId,
ids: ids,
}
return fetch('memberAddress?type=delete', data, 'POST')
}
//地址的编辑
export const editupdate = (mobile, pet, address) => {
var data = {
memberId: '3242',
id: '620111',
provinceId: '',
cityId: '',
districtId: '',
detailAddress: '江西省萍乡市',
recipient: '刘佳敏',
recipientPhone: '13407998521',
zipCode: '',
isDefault: '',
}
return fetch('memberAddress?type=update', data, 'POST')
}
//地址的编辑
export const editupdate = (mobile, pet,address) => {
var data = {
memberId:'3242',
id:'620111',
provinceId:'',
cityId:'',
districtId:'',
detailAddress:'江西省萍乡市',
recipient:'刘佳敏',
recipientPhone:'13407998521',
zipCode:'',
isDefault:'',
}
return fetch('memberAddress?type=update', data, 'POST' )
}
//修改密码
export const userchange = (id, pet, address) => {
export const userchange = (id, pet,address) => {
var data = {
id: id,
id:id,
}
return fetch('member?type=update', data, 'POST')
return fetch('member?type=update', data, 'POST' )
}

View File

@ -1,212 +0,0 @@
@media screen and (max-width:768px){
.usercontend{
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
.rc-useaddress{
textarea{
display: none;
}
}
.rc-button{
display: flex;
justify-content: center;
font-size: 14px;
width: 100%;
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
height: 80px;
align-items: center;
padding:0 20px 0 20px;
span
{
width: 160px;
height: 48px;
border: 2px solid #E2001A;
border-radius: 30px;
display: flex;
align-items: center;
justify-content: center;
color: #E2001A;
}
em{
font-style: normal;
width: 164px;
height: 48px;
background: #E2001A;
cursor: pointer;
border-radius: 30px;
display: flex;
align-items: center;
justify-content: center;
color: #FFFFFF;
margin-left: 40px;
}
}
.rc-max-width--xl{
h2{
display: none;
}
}
}
.rc-max-width--xl{
margin-top: 16px;
input{
width: 258px;
height: 34px;
border: none;
border-bottom: 1px solid #808285;
color: #999999;
font-size: 16px;
margin-left: 2px;
}
span{
font-size: 16px;
font-weight: bold;
width: 22%;
text-align: center;
color: #333333;
margin-top: 2px;
}
.rc-people{
width: 100%;
display: flex;
align-items: center;
span{
text-align: left;
}
}
// .rc-phone{
// }
// .rc-address{
// }
// .rc-useaddress{
// }
}
}
@media screen and (min-width: 769px)
{
.usercontend{
display: flex;
align-items: center;
justify-content: center;
position: relative;
flex-direction: column;
.rc-button{
display: flex;
justify-content: center;
font-size: 14px;
width: 100%;
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
height: 80px;
align-items: center;
padding:0 20px 0 20px;
span
{
width: 160px;
height: 48px;
border: 2px solid #E2001A;
border-radius: 30px;
display: flex;
align-items: center;
justify-content: center;
color: #E2001A;
}
em{
font-style: normal;
width: 164px;
height: 48px;
background: #E2001A;
cursor: pointer;
border-radius: 30px;
display: flex;
align-items: center;
justify-content: center;
color: #FFFFFF;
margin-left: 40px;
}
}
h2{
font-size: 26px;
color: #333333;
text-align: center;
font-weight: bold;
}
.rc-useaddress{
display: flex;
align-items: center;
textarea{
width: 680px;
height: 118px;
background: #FFFFFF;
border: 1px solid #808285;
opacity: 1;
border-radius: 0px;
padding-top: 12px;
padding-left: 16px;
}
.userinput{
display: none;
}
}
}
.rc-max-width--xl{
margin-top: 16px;
input{
width: 680px;
height: 45px;
border: 1px solid #808285;
color: #999999;
font-size: 16px;
margin-left: 2px;
padding-left: 16px;
}
span{
font-size: 16px;
font-weight: bold;
width: 10%;
text-align: center;
color: #333333;
margin-top: 2px;
}
.rc-people{
width: 100%;
display: flex;
align-items: center;
}
// .rc-phone{
// }
// .rc-address{
// }
// .rc-useaddress{
// }
}
}

View File

@ -1,89 +0,0 @@
@media screen and (max-width:768px){
.rc-button{
display: flex;
justify-content: center;
font-size: 14px;
width: 100%;
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
height: 80px;
align-items: center;
position: absolute;
bottom: 0;
padding:0 20px 0 20px;
span
{
width: 160px;
height: 48px;
border: 2px solid #E2001A;
border-radius: 30px;
display: flex;
align-items: center;
justify-content: center;
color: #E2001A;
}
em{
font-style: normal;
width: 164px;
height: 48px;
background: #E2001A;
cursor: pointer;
border-radius: 30px;
display: flex;
align-items: center;
justify-content: center;
color: #FFFFFF;
margin-left: 40px;
}
}
.rc-max-width--xl{
margin-top: 16px;
input{
width: 258px;
height: 34px;
border: none;
border-bottom: 1px solid #808285;
color: #999999;
font-size: 16px;
margin-left: 2px;
}
span{
font-size: 16px;
font-weight: bold;
width: 22%;
text-align: center;
color: #333333;
margin-top: 2px;
}
.rc-people{
width: 100%;
display: flex;
align-items: center;
span{
text-align: left;
}
}
// .rc-phone{
// }
// .rc-address{
// }
// .rc-useaddress{
// }
}
}
@media screen and (min-width: 769px)
{
}

View File

@ -8,6 +8,30 @@ body{
.fade-leave-active {
opacity: 0;
}
.ts-mask{
width:100%;
height:100%;
position: fixed;
top:0;
left:0;
display:flex;
flex-direction: column;
justify-content: center;
align-items: center;
z-index:99;
.ts-mask-bg{
background-color:#000;
opacity:.6;
width:100%;
height:100%;
z-index:0;
position:absolute;
left:0;
top:0;
}
}
.userloding {
position: fixed;
left: 50%;
@ -378,15 +402,12 @@ img, picture {
}
.ts-scrollable{
li{
width: 6rem;
overflow: hidden;
// width: 4.125rem;
padding: 0 0.62rem;
height: 1.625rem;
margin-left: .5rem;
font-size:.75rem;
text-overflow:ellipsis;
white-space:nowrap;
line-height: 1.625rem;
line-height: 1.375rem;
}
&::-webkit-scrollbar{
display:none;
@ -398,7 +419,6 @@ img, picture {
/* pc端 */
@media screen and (min-width: 769px)
{
/deep/.van-tabs__wrap
{
max-width: 768px;

View File

@ -5,10 +5,29 @@
/deep/.van-swipe__indicator--active{
background-color: #E1001A;
}
.rc-ma{
.ul-zhuan{
li{
background: unset;;
.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{
background: unset;
img{
border-radius: 50%;
}
&.active {
img{
border-radius: 50%;
}
@ -35,6 +54,30 @@
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){
.ul-dog{
display: none;
@ -172,7 +215,6 @@
.uservideo{
width: 100%;
height:auto;
max-height: 15.68rem;
display: block;
video{
max-width:100%;
@ -219,6 +261,10 @@
-webkit-box-orient: vertical;
max-width: 60%;
text-align: center;
word-break: keep-all;
height: 2.625rem;
display: flex;
align-items: center;
}
em{
font-style: normal;
@ -324,14 +370,21 @@
.rc-selection{
display: none;
}
.sw-center{
display: none;
}
.useraimg{
width: 100%;
// height: 29.31rem;
object-fit: cover;
}
.sw-center{
display: none;
}
.useraimg{
width: 100%;
// height: 29.31rem;
object-fit: cover;
}
.ts-banner-swiper-container{
position:relative;
.ts-carousel-indicator{
position:absolute;
bottom:.4rem;
}
}
.van-swipe-item {
color: #fff;
height: 100%;

View File

@ -26,7 +26,10 @@ span{
}
}
}
.rc-max-width--xl{
.rc-usermain{
width: 92%;
margin: 0 auto;
ul{
height: 70px;
display: block;

View File

@ -9,18 +9,10 @@ ul li ol li em strong i {
//rc-main start
margin-top:.23rem;
.usersearch {
.ts-scrollable-container{
h2{
font-weight: bold;
color: #333333;
}
}
margin: 0 auto;
overflow: hidden;
}
//rc-main end
}
@ -32,53 +24,6 @@ ul li ol li em strong i {
.usercontentshow{
position: relative;
.rc-productcat {
display: flex;
align-items: center;
flex-wrap: nowrap;
ol{
display: flex;
align-items: center;
flex-flow: row;
.ts-standard-btn{
width: 7.87rem;
height: 2.25rem;
background: #FFFFFF;
border-radius: 6.25rem;
background: none;
display: flex;
align-items: center;
justify-content: center;
margin-left: 1rem;
color: #999999;
img {
height: 1rem;
}
span {
margin-left: 0.18rem;
}
}
}
.userrccat{
width: 32%;
height: 34px;
background: #ffffff;
border-radius: 100px;
display: flex;
align-items: center;
justify-content: center;
margin-left: 0;
font-size: 14px;
span {
margin-left: 3px;
}
img {
width: 24px;
height: 16px;
}
border: 2px solid #E2001A;
}
}
.userrccat{
width: 32%;
height: 34px;
@ -148,7 +93,48 @@ ul li ol li em strong i {
height: 617px;
background: white;
z-index: 999;
.rc-productcat {
display: flex;
align-items: center;
flex-wrap: nowrap;
.rc-cat {
width: 32%;
height: 34px;
background: #ffffff;
border-radius: 100px;
display: flex;
align-items: center;
justify-content: center;
margin-left: 0;
font-size: 14px;
span {
margin-left: 3px;
}
img {
width: 24px;
height: 16px;
}
}
.userrccat{
width: 32%;
height: 34px;
background: #ffffff;
border-radius: 100px;
display: flex;
align-items: center;
justify-content: center;
margin-left: 0;
font-size: 14px;
span {
margin-left: 3px;
}
img {
width: 24px;
height: 16px;
}
border: 2px solid #E2001A;
}
}
}
@ -233,7 +219,6 @@ ul li ol li em strong i {
justify-content: center;
font-size: .14rem;
margin-right:.2rem;
margin-left: 16px;
span {
margin-left: 3px;
}
@ -318,7 +303,6 @@ ul li ol li em strong i {
//pc端
@media screen and (min-width: 768px){
.userrccat{
width: 327px;
height: 48px;
@ -344,7 +328,6 @@ ul li ol li em strong i {
}
.online{
width:100%;
margin-top: 17px;
&.bold{
height:0.5rem;
margin-top: 5rem;
@ -395,13 +378,7 @@ ul li ol li em strong i {
}
.rc-bottom{
.rc-productcat {
ol{
display: flex;
align-items: center;
flex-flow: row;
}
.rc-productcat {
display: flex;
align-items: center;
flex-wrap: nowrap;
@ -508,7 +485,7 @@ border-radius: 30px;
margin-left: 16px;
}
span {
margin-left: 4px;
margin-left: 0px;
}
img {
width: 24px;
@ -565,38 +542,18 @@ border-radius: 30px;
}
*/
.ts-scrollable-container{
overflow-y: hidden;
overflow-x: clip;
width: 100%;
margin-top: 18px;
h2{
display: flex;
align-items: center;
width: 4%;
}
.ts-scrollable{
overflow-y: hidden;
overflow-x: clip;
width: 100%;
ol{
display: flex;
align-items: center;
}
.ts-standard-btn{
width: 237px;
height: 48px;
background: #FFFFFF;
border-radius: 30px;
background: none;
display: flex;
align-items: center;
justify-content: center;
margin-left: 40px;
img {
width: 24px;
height: 24px;
}
span {
margin-left: 8px;
}
}
}
}

View File

@ -14,6 +14,15 @@ ul li ol li em strong i {
position: relative;
margin-top: 5.25rem;
.usersearch {
width: 100%;
margin: 0 auto;
overflow: hidden;
margin-top: 20px;
.rc-padding--md{
padding: 0;
}
}
.active{
border: 2px solid #E2001A;
color: #E2001A;
@ -29,22 +38,6 @@ ul li ol li em strong i {
}
//手机端
@media screen and (max-width: 768px) {
.usersearch {
width: 100%;
margin: 0 auto;
overflow: hidden;
margin-top: 20px;
.ts-scrollable-container{
h2{
font-weight: bold;
color: #333333;
}
}
.rc-padding--md{
padding: 0;
}
}
.rc-button
{
display: flex;
@ -54,9 +47,6 @@ ul li ol li em strong i {
box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
height: 80px;
align-items: center;
position: absolute;
bottom: 0;
padding:0 20px 0 20px;
span
{
width: 160px;
@ -139,9 +129,8 @@ strong{
color: #333333;
margin-top: 1.5rem;
h2{
font-size: 16px;
font-size: 18px;
font-weight: bold;
color: #333333;
}
span {
font-size: 14px;
@ -179,9 +168,6 @@ strong{
// 我想搜
.usercontentshow{
position: relative;
.rc-column{
padding-bottom: 0;
}
.rc-productcat {
display: flex;
align-items: center;
@ -203,15 +189,13 @@ justify-content: center;
margin-left: 1rem;
color: #999999;
img {
width: 1.5rem;
height: 1rem;
}
span {
margin-left: 0.18rem;
}
}
li:first-child{
margin-left: 0;
}
}
//筛选
.userselect{
@ -236,7 +220,7 @@ margin-left: 0.18rem;
}
.ts-scrollable-container{
margin-top: 1rem;
margin-top: 0.93rem;
}
}
@ -252,7 +236,6 @@ margin-left: 0.18rem;
}
h2{
margin-left: 0;
font-weight: bold;
}
}
@ -292,10 +275,22 @@ border-radius: 100px;
.rc-bottom{
position: fixed;
background: white;
height: 617px;
bottom: 0;
left: 0;
z-index: 9;
ol li{
background: none;
width: 7.87rem;
height: 2.25rem;
background: #FFFFFF;
border-radius: 6.25rem;
background: none;
display: flex;
align-items: center;
justify-content: center;
margin-left: 1rem;
}
}
.rc-bottoma{
@ -381,25 +376,7 @@ border-radius: 100px;
}
//pc端
@media screen and (min-width: 768px){
.usersearch {
width: 100%;
margin: 0 auto;
overflow: hidden;
margin-top: 40px;
.ts-scrollable-container{
h2{
font-weight: bold;
color: #333333;
}
}
.rc-padding--md{
padding: 0;
}
}
.online{
margin-top: 47px;
}
/deep/.el-dialog__header {
padding: 0;
margin: 0;
@ -415,7 +392,6 @@ border-radius: 100px;
display: flex;
align-items: center;
width: 6%;
color: #333333;
}
.ts-scrollable{
// overflow-y: hidden;
@ -525,10 +501,9 @@ margin-left: 8px;
color: #333333;
margin-top: 12px;
h2 {
font-size: 26px;
font-weight: bold;
font-size: 18px;
color: #333333;
margin: 0;
margin-left: 12px;
}
span {
font-size: 14px;
@ -622,16 +597,13 @@ border-radius: 30px;
/deep/.van-search__content--square{
background: white;
}
/deep/.van-search{
padding-left: 0;
}
.van-search__content--square{
display: flex;
align-items: center;
justify-content: center;
background: white;
border: 1px solid #D7D7D7;
height: 50px;
height: 80px;
width: 1200px;
border-radius: 200px;
}
@ -676,11 +648,9 @@ border-radius: 30px;
}
.rc-product {
h2 {
font-size: 26px;
font-weight: bold;
font-size: 18px;
color: #333333;
margin: 0;
margin-left: 12px;
}
}
.rc-productcat {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -1,78 +0,0 @@
* {
margin: 0;
padding: 0;
}
html {
line-height: 160%;
}
.rc_contline {
border-bottom: 3px solid #f6f6f6;
height: 0px;
margin: 0;
clear: both;
}
.page_modules {
padding-top: 100px;
}
.cont_modules {
margin: 0 auto;
max-width: 1400px;
}
.inline_right {
display: flex;
justify-content: space-between;
width: 100%;
}
.inline_mid {
display: flex;
justify-content: space-around;
width: 100%;
}
.inline_left {
display: flex;
justify-content: space-evenly;
width: 100%;
}
.li_inline {
li {
display: inline-block;
vertical-align: middle;
}
}
.color_red {
color: #E2001A;
}
.tc {
text-align: center;
}
.tr {
text-align: right;
}
.el-dialog{
width: 90%;
max-width: 440px;
}
#tns2-iw{ height: 90px;}
.rc-carousel:not(.rc-carousel--loaded){visibility:visible!important}
@media screen and (max-width: 768px) {
.el-message-box{
width: 300px;
}
.el-dialog{
width: 90%;
}
}

View File

@ -10,10 +10,11 @@
<li @click="switchTab(1)">{{ returnValueArr[1]?returnValueArr[1].name:'请选择' }}</li>
<li @click="switchTab(2)">{{ returnValueArr[2]?returnValueArr[2].name:'请选择' }}</li>
</ul>
<div class="close" @click="hideAddress"></div>
</div>
<div class="ts-area-picker-values">
<ul>
<li v-for="(item, index) in curDisplayingCol" :key="item.id" @click="pickValue(item.id,item.name)" v-bind:class="{ active:(returnValue[curDisplayingColIndex]?returnValue.id==item.id:false) }">
<li v-for="(item, index) in curDisplayingCol" :key="item.id" @click="pickValue(item.id,item.name)" v-bind:class="{ active:(returnValueArr[curDisplayingColIndex]?returnValueArr[curDisplayingColIndex].id==item.id:false) }">
{{ item.name }}
</li>
</ul>
@ -23,7 +24,7 @@
<div class="ts-area-picker-mobile ts-mask" v-if="show">
<div class="ts-mask-bg"></div>
<van-picker
show-toolbar
show-toolbar
title="选择地区"
:columns="columns"
value-key="name"
@ -37,6 +38,7 @@
</template>
<script>
export default {
props:["defaultValues"],
data(){
return{
displayValue:"",
@ -70,6 +72,8 @@ export default {
let self=this;
// defaultValues : array[{id:"_ID_IN_columns_of_province",name:"_NAME_IN_columns"},{id:"_ID_IN_columns_of_city",name:"_NAME_IN_columns"},{id:"_ID_IN_columns_of_area",name:"_NAME_IN_columns"}]
let defaultValues = [{id:this.columns[0].values[0].id, name:this.columns[0].values[0].name},{id:this.columns[1].values[0].id, name:this.columns[1].values[0].name},{id:this.columns[2].values[0].id, name:this.columns[2].values[0].name}];
if(this.defaultValues)
defaultValues=this.defaultValues;
this.$children.forEach(function(vueComponent){
if(vueComponent._name=="<VanPicker>")
{
@ -141,11 +145,13 @@ export default {
let _self=this;
let provinceId='';
let areaId=undefined;
let validatedIndex=-1;
this.returnValueArr.forEach(function(obj,index){
switch(index){
case 0:
//Skipping province checking
provinceId = obj.id;
validatedIndex = 0;
break;
case 1:
//Checking City
@ -157,6 +163,7 @@ export default {
else
{
areaId = _self.returnValueArr[index].id;
validatedIndex=index;
}
//Checking City end
break;
@ -167,15 +174,18 @@ export default {
console.log('501 : error via checking validatePickedValues');
_self.returnValueArr[index]={};
}
else{
validatedIndex=index;
}
//Checking Area end
break;
default:
break;
}
});
return validatedIndex;
},
onConfirm(values) {
debugger;
//Get columns structure array here : values
let _self=this;
let returnVal=[];
@ -210,30 +220,33 @@ export default {
this.show=false;
},
switchTab(tabIndex){
let _self=this;
let areaTabLi=document.querySelectorAll(".ts-area-picker-tmp-value li");
if(tabIndex==0){
this.curDisplayingCol = this.columns[tabIndex].values;
}
else{
if(this.returnValueArr[tabIndex-1]){}
else{
tabIndex=tabIndex-1;
}
let lastValidatedTabIndex=this.validatePickedValues();
if(lastValidatedTabIndex<(tabIndex-1))
{
//TODO show warning here
let errorEle=document.querySelector(".ts-area-picker-values");
errorEle.classList.add("error");
setTimeout(function(){
errorEle.classList.remove("error");
},2000);
tabIndex=lastValidatedTabIndex+1;
}
this.curDisplayingColIndex=tabIndex;
let filteredData=this.columns[tabIndex].values;
if(tabIndex>0 && this.returnValueArr[tabIndex-1]) //pass
{
let pickedId = this.returnValueArr[tabIndex-1].id;
filteredData=this.fitlerValuesInArray(pickedId,this.columns[tabIndex].values);
}
this.curDisplayingCol=filteredData;
areaTabLi.forEach(function(ele,index){
if(tabIndex==index)
{
if(tabIndex==index){
ele.classList.add('active');
let filteredData=_self.columns[tabIndex].values;
if(_self.curDisplayingColIndex>0) //pass
{
let pickedId = _self.returnValueArr[_self.curDisplayingColIndex-1].id;
filteredData=_self.fitlerValuesInArray(pickedId,_self.columns[tabIndex].values);
}
_self.curDisplayingCol=filteredData;
}
else
ele.classList.remove('active');
@ -259,6 +272,7 @@ export default {
border-bottom:1px solid #D7D7D7;
padding:0 2.5rem;
box-sizing: border-box;
position:relative;
ul{
padding:0;
margin:0;
@ -276,8 +290,20 @@ export default {
}
}
}
.close{
position:absolute;
position: absolute;
right: 3rem;
top: 1.5rem;
cursor: pointer;
&:before,&:after{
background-color: #333;
}
}
}
.ts-area-picker-values{
width:100%;
height:100%;
ul{
padding:1rem 2.5rem 2rem 2.5rem;
margin:0;
@ -291,6 +317,30 @@ export default {
&.nth-child(6n){
margin-right:0;
}
&.active{
color:#E2001A;
border-bottom:4px solid #E2001A;
}
}
}
/deep/.van-picker__confirm,.close{
text-indent:-999rem;
position:relative;
&:after{
transform: rotate(45deg);
}
&:before{
transform: rotate(-45deg);
}
&:before,
&:after {
position: absolute;
content: ' ';
background-color: #E1001A;
left: 1.25rem;
bottom:-0.875rem;
width: 1px;
height: 1.375rem;
}
}
@media screen and (max-width:768px)
@ -309,26 +359,8 @@ export default {
border-bottom:1px solid #D8D8D8;
}
/deep/.van-picker__confirm{
text-indent:-999rem;
position:relative;
&:after{
transform: rotate(45deg);
}
&:before{
transform: rotate(-45deg);
}
&:before,
&:after {
position: absolute;
content: ' ';
background-color: #E1001A;
left: 1.25rem;
bottom:-0.875rem;
width: 1px;
height: 1.375rem;
}
display:block;
}
.ts-area-picker-mobile{
display:flex;
flex-direction: column;
@ -344,6 +376,9 @@ export default {
}
@media screen and (min-width:769px)
{
/deep/.van-picker__confirm{
display:none;
}
.ts-area-picker-mobile{
display:none;
}
@ -352,6 +387,19 @@ export default {
width:100%;
height:19.25rem;
border:1px solid #808285;
overflow:hidden;
}
.ts-area-picker-values{
}
}
@keyframes flash-error
{
from {
opacity:.6;
}
to {
opacity:.3;
}
}
</style>

View File

@ -220,7 +220,7 @@
<div class="rc-column rc-text--center rc-padding-y--none">
<span class="">法律声明 ©2021 ROYAL CANIN, Inc.</span>
<br/>
<a target='_blank' href='#privacy'><span class="">隐私声明</span></a>
<a target='_blank' href='https://royalcanin.com.cn/#privacy'><span class="">隐私声明</span></a>
&nbsp; | &nbsp;
<a target='_blank' href='#declaration'><span class="">法律声明</span></a>
</div>

View File

@ -1,19 +1,19 @@
const trackingScript = 'var dataLayer = window.dataLayer = window.dataLayer || [];dataLayer.push({"user":{"sitecoreId":"00000000-0000-0000-0000-000000000000","locale":"zh-HK"},"session":{"id":"vvfwez43vfoomct4y3yqneqy"},"site":{"country":"HK","id":"RCGlobalMC1","environment":"prd"},"page":{"type":"Start of Life Page","hitTimestamp":"2020-10-16T16:26:21.7350880+00:00","topic":"Collecting your kitten and their first week with you","theme":"Cat"},"pet":{"specieId":"2"}});';
const assetsUrl = 'var assetsUrl="/royalcanin-cdn-assets-new/css_js/";var isInitialized=false;';
export default {
// Global page headers: https://go.nuxtjs.dev/config-head
head: {
title: '皇家官方商城',
title: 'rc-busness',
htmlAttrs: {
lang: 'zh-cn',
lang: 'en',
},
script: [
//{ src: '/js/rem.js' },
// { src: '/js/flexible.js', type: 'text/javascript', charset: 'utf-8'},
{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14053/index.js' },//SOL
{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' },//订单
{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14053/index.js' },
//{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' },
{ innerHTML: trackingScript, type: 'text/javascript', charset: 'utf-8'},
{ innerHTML: assetsUrl, type: 'text/javascript', charset: 'utf-8'},
{ src: '/royalcanin-cdn-assets-new/css_js/royal-canin.min.bundle.js' },
@ -29,8 +29,8 @@ export default {
],
link: [
{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
{ rel: 'stylesheet', id: 'royal-canin', href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.critical.css?v=8-10-0' },
//{ rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.css?v=8-10-0'},
{ rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.critical.css?v=8-10-0'},
//{ rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.css?v=8-10-0'},
]
},
@ -38,12 +38,10 @@ export default {
css: [
'vant/lib/index.css',
'element-ui/lib/theme-chalk/index.css',
'@/assets/style/default.less',
{ src:'@/assets/css/global.less'},
{ src:'@/assets/css/royalcanin-custom.css'},
{ src: "swiper/css/swiper.css" }
],
router: {
middleware: ['metaTitle']
@ -56,8 +54,8 @@ export default {
'@/plugins/ElementUI',
{ src: '@/plugins/localStorage', ssr: false },
],
// Auto import components: https://go.nuxtjs.dev/config-components
@ -70,12 +68,12 @@ export default {
// Modules: https://go.nuxtjs.dev/config-modules
modules: [
'@nuxtjs/axios',
['nuxt-tailvue', { toast: true }],
['nuxt-tailvue', {toast: true}],
],
styleResources: {
less: '/assets/style/default.less' // less文件路径
less: '@/assets/style/less/default.less' // less文件路径
},
// Build Configuration: https://go.nuxtjs.dev/config-build
build: {
@ -95,7 +93,7 @@ export default {
// '^/api/': '/',
// changeOrigin: true
// },
// }
// },

View File

@ -1,127 +0,0 @@
<template>
<div>
<van-address-edit
:area-list="areaList"
:address-info="{
name: editAddressData.name,
tel: editAddressData.tel,
addressDetail: editAddressData.detailAddress,
areaCode: areaCode,
}"
show-delete
show-set-default
show-search-result
:search-result="searchResult"
@save="onSave"
@delete="onDelete"
/>
</div>
</template>
<script>
import { Toast } from "vant";
import { areaList } from "@vant/area-data";
var _ = require("lodash");
import { memberAddress } from "../../ajax/getData";
export default {
data() {
return {
areaList,
searchResult: [],
areaCode: "",
};
},
props: ["editAddressData"],
computed: {},
methods: {
async onSave(content) {
// Toast('save');
let provinceId = Number(content.areaCode.substring(0, 2)); //id
let cityId = Number(content.areaCode.substring(2, 4)); //id
let districtId = Number(content.areaCode.substring(4, 7)); //
//id / id/id/
let memberId = JSON.parse(localStorage.getItem("userInfo")).data.id;
let postData = {
memberId,
provinceId: 25,
cityId: 36,
districtId: 418,
// provinceId,
// cityId,
// districtId,
detailAddress: content.addressDetail,
recipient: content.name,
recipientPhone: content.tel,
default: content.default,
};
let saveType = this.editAddressData.saveType ? "update" : "add";
let data = await memberAddress(saveType, postData);
if (data) {
this.$message({
type: "warning",
message: data.msg,
});
if (data.code == "0") {
this.$emit("isClose", false);
}
}
},
async onDelete() {
// Toast("delete");
let postData = {
ids: this.editAddressData.id,
memberId: this.editAddressData.memberId,
};
let data = await memberAddress("delete", postData);
if (data) {
this.$message({
type: "warning",
message: data.msg,
});
if (data.code == "0") {
this.$emit("isClose", false);
}
}
},
async areaCodeInit() {
var city = this.editAddressData.city;
var district = this.editAddressData.district;
this.areaCode = "1310001";
// _.forEach(this.areaList.city_list, (o, c) => {
// if (o == city) {
// // let cityId = String(_.take(c, 2));
// let cityId = c.substring(0, 4);
// _.forEach(this.areaList.county_list, (i, a) => {
// if (i == district) {
// // let districtId = String(_.take(a, 2));
// let districtId = a.substring(0, 4);
// if (cityId == districtId) {
// this.areaCode = a;
// }
// }
// });
// }
// });
},
},
mounted() {
this.areaCodeInit();
},
};
</script>
<style>
.van-area {
width: 400px;
margin: 0 auto;
border: 1px solid #808285;
}
.van-popup {
background-color: transparent;
}
.van-overlay {
background-color: transparent;
}
.v-modal {
background: transparent;
}
</style>

View File

@ -6,14 +6,19 @@
<div class="rc-top"></div>
<unlogin></unlogin>
<!-- Suppose in header end -->
<van-swipe :autoplay="3000" class="rc-padding-bottom--md">
<van-swipe-item v-for="(banner, index) in showingBanners" :key="index">
<img :src="banner.src" class="useraimg"/>
</van-swipe-item>
</van-swipe>
<div class="online bold rc-md-down" id="fixed-catbar-seperator"></div>
<div class="ts-banner-swiper-container">
<swiper :options="headerSwiperOption">
<swiper-slide v-for="(banner, index) in showingBanners" :key="index">
<a :href="banner.link" target="_blank">
<img :src="banner.src" class="useraimg"/>
</a>
</swiper-slide>
</swiper>
<div id="homeBannerSwiperPagnation" class="swiper-pagination ts-carousel-indicator center"></div>
</div>
<div class="online bold rc-md-down"></div>
<div id="fixed-catbar-seperator"></div>
<div class="rc-max-width--xl">
<div class="usermain">
<div :class="searchBar?'rc-ma':'rc-ma searchBara'">
@ -105,7 +110,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.name}}</span>
<i>0.001{{item.price}}</i>
<i>{{item.ecPrice}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@ -159,7 +164,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.title}}</span>
<i>0.001{{item.price}}</i>
<i>{{item.ecPrice}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@ -193,7 +198,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.name}}</span>
<i>0.001{{item.price}}</i>
<i>{{item.ecPrice}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@ -250,7 +255,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.title}}</span>
<i>0.001{{item.price}}</i>
<i>{{item.ecPrice}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@ -355,7 +360,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.name}}</span>
<i>0.001{{item.price}}</i>
<i>{{item.ecPrice}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@ -415,7 +420,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.title}}</span>
<i>0.001{{item.price}}</i>
<i>{{item.ecPrice}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@ -470,7 +475,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.name}}</span>
<i>0.001{{item.price}}</i>
<i>{{item.ecPrice}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@ -529,7 +534,7 @@
<div class="rc-column">
<div class="rc-click" @click="selectproduce(item,index)">
<span>{{item.title}}</span>
<i>0.001{{item.price}}</i>
<i>{{item.ecPrice}}</i>
</div>
<strong class="ts-standard-btn ts-standard-btn--two rc-margin-y--md center" @click="selectproduce(item,index)">立即购买</strong>
</div>
@ -737,18 +742,22 @@
userserachlist:[{}],
doggan:[],
dogtype:[
{
title: "幼犬",
},
{
title: "成犬",
},
{
title: "老年犬",
},
],
{
title: "幼犬",
},
{
title: "成犬",
},
{
title: "老年犬",
},
{
title: "品种犬",
},
{
title: "亚健康",
}
],
anchor:'',
dogshi:[],
catlist:[],
@ -796,42 +805,38 @@
},
showingBanners:[],
userdoglist: [
{
title: "小型犬",
catimage: require("../assets/cat.png"),
},
{
title: "中型犬",
catimage: require("../assets/four.png"),
},
{
title: "大型犬",
catimage: require("../assets/one.png"),
},
],
discoun: [
{
title: "幼猫",
},
{
title: "成猫",
},
{
title: "老年猫",
},
{
title: "品种猫",
},
{
title: "亚健康猫",
},
],
{
title: "小型犬",
catimage: "/images/dog/small.png",
},
{
title: "中型犬",
catimage: "/images/dog/medium.png",
},
{
title: "大型犬",
catimage: "/images/dog/big.png",
},
],
discoun: [
{
title: "幼猫",
},
{
title: "成猫",
},
{
title: "老年猫",
},
{
title: "品种猫",
},
{
title: "亚健康猫"
},
],
discountlist: [
{
@ -1043,39 +1048,74 @@
// },
],
swiperOption: {
loop: true,
slidesPerView: 'auto',
centeredSlides: true,
speed:1000,
spaceBetween: 30,
// autoplay: true,
loopAdditionalSlides: 100,
pagination: {
el: '.swiper-pagination',
dynamicBullets: true
},
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev'
headerSwiperOption: {
loop: true,
slidesPerView: 'auto',
centeredSlides: true,
speed:1000,
spaceBetween: 0,
autoplay: true,
pagination: {
el: '#homeBannerSwiperPagnation'
},
paginationClickable: true,
loopAdditionalSlides: 100,
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev'
},
on: {
slideChange(Swiper) {
},
on: {
slideChange(Swiper) {
//console.log('onSlideChangeEnd',this);
// vm.ifadroind('','',this.realIndex);
vm.useraindex=this.realIndex;
},
tap() {
//console.log('onTap', this);
}
// slideChange() {
// console.log('onSlideChangeEnd', this);
// },
// tap() {
// console.log('onTap', this);
// }
}
},
tap() {
}
}
},
catStarProductswiperOption: {
loop: true,
slidesPerView: 'auto',
centeredSlides: true,
speed:1000,
spaceBetween: 30,
// autoplay: true,
loopAdditionalSlides: 100,
pagination: {
el: '#catStarSwiperPagnation',
},
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev'
},
on: {
slideChange(Swiper) {
vm.useraindex=this.realIndex;
},
tap() {
}
}
},
dogStarProductswiperOption: {
loop: true,
slidesPerView: 'auto',
centeredSlides: true,
speed:1000,
spaceBetween: 30,
// autoplay: true,
loopAdditionalSlides: 100,
pagination: {
el: '#dogStarSwiperPagnation',
},
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev'
},
on: {
slideChange(Swiper) {},
tap() {}
}
},
}
},
components:{
@ -1274,15 +1314,48 @@
//console.log("")
}
},
userdog(item,index){
heightToTop(ele){
//eleDOM
let root = document.body;
let height = 0;
do{
height += ele.offsetTop;
ele = ele.offsetParent;
}while( ele !== root )
return height;
},
userdogShi(){
this.activeIndex5=(this.activeIndex5?this.activeIndex5:0);
let apiDogSize=this.userdoglist[this.activeIndex5].title;
let apiDogFoodType=this.dogtype[this.quanshiCurIndex].title;
this.userstype=1;
let petType={
petType:1,
name:index,
categoryName:"皇家犬湿粮",
name:apiDogFoodType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
this.userserachlist.push(petType)
this.userserachlist.push(petType)
}
}
//TODO how to combine "apiName" here?
this.dogmessage(this.userserachlist,"Shi");
},
userdogGan(){
this.activeIndex6=(this.activeIndex6?this.activeIndex6:0);
let apiDogSize=this.userdoglist[this.activeIndex6].title;
let apiDogFoodType=this.dogtype[this.quanganCurIndex].title;
this.userstype=1;
let petType={
petType:1,
name:apiDogFoodType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
this.userserachlist.push(petType)
}
}
this.dogmessage(this.userserachlist)
@ -1364,23 +1437,34 @@
}
},
//
async dogmessage(stype) {
let data=[];
if(stype==undefined||stype==null){
data = await biaomessage(1);
}else{
data = await biaomessage(this.userserachlist);
}
if(data){
let userlist=[];
userlist=data.slice(0,6);
this.doglist=data;
this.doggan=userlist;
this.dogshi=userlist;
}
},
//
async dogmessage(stype,dataType) {
this.dataLoaded=false;
let data=[];
if(stype==undefined||stype==null){
data = await biaomessage(1,'',1,6);
}else{
data = await biaomessage(this.userserachlist,'',1,6);
}
if(data){
let userlist=[];
//userlist=data.slice(0,6);
if(dataType)
{
if(dataType=='Shi')
this.dogshi=data;
else if(dataType=='Gan')
this.doggan=data;
}
else
{
this.doglist=data;
//this.doggan=userlist;
//this.dogshi=userlist;
}
this.dataLoaded=true;
}
},
selectproduce(item,index){
if(item.productList[0]==undefined){
@ -1423,12 +1507,30 @@
userclick(item,index){
this.userquery(index)
},
//湿
catclick(item,index){
//
catclickGan(){
this.userstype=0;
this.maoganCurIndex=this.maoganCurIndex?this.maoganCurIndex:0;
let apiCatType=this.discoun[this.maoganCurIndex].title;
let petType={
petType:0,
name:index,
name:apiCatType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){
this.userserachlist.push(petType)
}
}
this.catmessage(this.userserachlist,'Gan')
},
catclickShi(){
this.userstype=0;
this.maoshiCurIndex=this.maoshiCurIndex?this.maoshiCurIndex:0;
let apiCatType=this.discoun[this.maoshiCurIndex].title;
let petType={
petType:0,
categoryName:"皇家猫湿粮",
name:apiCatType,
}
for(let i =0;i<this.userserachlist.length;i++){
if(!this.userserachlist.includes(petType)){

View File

@ -1,8 +1,8 @@
<template>
<div>
<Myheader></Myheader>
<div class="rc-top"></div>
<div class="rc-max-width--xl rc-main ">
<div class="rc-usermain ">
<ul>
<li v-for="(item,index) in userrecord" :key="index">
{{item.title}}
@ -20,13 +20,13 @@
</div>
<!-- <div class="rc-button">
<div class="rc-button">
<div class="rc-order">
<span>积分兑换</span>
</div>
</div> -->
</div>
</div>
</template>
@ -115,7 +115,6 @@ export default {
<style lang="less" scoped>
@import url("../../assets/css/integral.less");
@import url("@/assets/css/global.less");
</style>

View File

@ -342,7 +342,9 @@ obligation(item,index){
}else{
if(item.title=='收货地址'){
this.$router.push({ name: "useraddress-openaddress",})
this.$router.push({
path: `/useraddress/openaddress/`
})
console.log('这是地址的跳转');
}
@ -355,7 +357,7 @@ this.$router.push({ name: "useraddress-openaddress",})
this.$router.push({
path: `/personal/discount/`
})
console.log('这是地址的跳转');
}

View File

@ -1,414 +0,0 @@
ul li ol li em strong i {
list-style: none;
font-style: normal;
}
.rc-header {
width: 100%;
}
.settlement {
padding-top: 100px;
}
.rc-main {
width: 92%;
margin: 0 auto;
max-width: 1400px;
.rc-userbottomm {
display: none;
}
.rc-border {
width: 100%;
border-bottom: 1px solid #d7d7d7;
margin-top: 32px;
}
.rc-receiving {
width: 100%;
height: 80px;
display: flex;
flex-direction: column;
em {
font-style: normal;
color: #e1001a;
font-size: 26px;
}
span {
color: #666666;
font-size: 16px;
display: block;
margin-top: 25px;
}
}
.delivery {
display: flex;
flex-direction: column;
height: 140px;
display: flex;
justify-content: center;
.viewdetails {
display: flex;
align-items: center;
justify-content: flex-end;
span {
color: #444444;
font-size: 18px;
display: block;
margin-right: 8px;
}
img {
width: 8px;
height: 16px;
}
}
.to-delivery {
display: flex;
align-items: center;
font-style: normal;
span {
display: block;
// margin-left: 16px;
font-size: 18px;
color: #333333;
}
i {
font-style: normal;
margin-left: 8px;
display: block;
font-size: 18px;
color: #999999;
}
}
.bo-delivery {
span {
font-size: 16px;
color: #666666;
display: block;
margin-top: 16px;
}
}
}
.address-list {
display: flex;
.mypersonal {
display: flex;
flex-direction: column;
justify-content: center;
border: 1px solid #808285;
height: 118px;
width: 320px;
padding: 15px;
color: #333333;
margin: 20px 40px 20px 0;
position: relative;
cursor: pointer;
&.active {
border: 1px solid #E2001A;
}
.edit {
position: absolute;
top: 5px;
right: 8px;
display: none;
cursor: pointer;
}
&:hover {
.edit {
display: block;
}
}
.my-delivery {
display: flex;
align-items: center;
font-style: normal;
span {
display: block;
margin-left: 3px;
}
i {
font-style: normal;
margin-left: 3px;
display: block;
}
}
.per-delivery {
span {
color: #666666;
display: block;
margin-top: 5px;
}
}
}
}
.rc-usermain {
display: flex;
padding: 20px 0;
.rc-image {
border: 1px solid #d8d8d8;
margin-right: 20px;
img {
width: 96px;
height: 96px;
display: block;
}
}
.rc-right {
.rc-usercenter {
display: flex;
justify-content: center;
flex-direction: column;
h3,
.price {
font-style: normal;
display: block;
font-size: 18px;
font-weight: bold;
margin-top: 17px;
color: #e1001a;
}
}
display: flex;
justify-content: space-between;
width: 100%;
}
.rc-userright {
display: flex;
flex-direction: column;
color: #666666;
font-size: 16px;
span {
display: block;
margin-top: 16px;
font-size: 16px;
}
}
.rc-userbottom {
display: flex;
width: 60%;
justify-content: space-between;
align-items: center;
.price {
font-style: normal;
color: #e1001a;
font-size: 20px;
font-weight: bold;
}
}
}
.rc-merchandise {
padding: 15px 0;
&::after {
display: block;
content: '';
clear: both;
}
ul {
width: 25%;
display: flex;
flex-direction: column;
justify-content: space-between;
line-height: 40px;
float: right;
i {
font-style: normal;
color: #666666;
}
li {
list-style: none;
font-style: normal;
display: flex;
justify-content: space-between;
span {
color: #333333;
}
}
li .red {
color: #e1001a;
font-size: 20px;
font-style: normal;
}
}
}
.rc-payment {
width: 100%;
margin-top: 80px;
.u-trackingnumber {
display: flex;
align-items: center;
i {
font-size: 18px;
font-style: normal;
margin-right: 16px;
}
img {
width: 8px;
height: 16px;
}
}
ul {
width: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
line-height: 40px;
font-size: 18px;
i {
font-style: normal;
color: #666666;
display: block;
}
li {
list-style: none;
font-style: normal;
display: flex;
justify-content: space-between;
span {
color: #333333;
}
}
}
}
.rc-foot {
display: flex;
flex-direction: column;
.rc-foo {
display: flex;
justify-content: flex-end;
flex-direction: column;
align-items: self-end;
i {
font-style: normal;
color: #333333;
font-size: 20px;
margin-right: 20px;
}
em {
font-style: normal;
color: #e1001a;
font-size: 26px;
}
span {
display: block;
width: 164px;
margin-top: 36px;
background: #e2001a;
line-height: 48px;
text-align: center;
color: white;
font-size: 16px;
height: 48px;
border-radius: 30px;
}
}
}
}
.diallog_width{
width: 100%;
max-width: 440px;
}
.el-dialog{
width: 100%;
}
//手机端
@media screen and (max-width: 768px) {
.diallog_width{
width: 100%;
}
.rc-main {
.address-list {
display: contents;
.mypersonal {
width: 100%;
height: auto;
}
}
.rc-usermain {
.rc-right { display: table}
}
.rc-merchandise{
padding: 15px 0 120px;
ul{
float: none;
width: 100%;
}
}
.rc-foot{
.rc-foo{
display: flex;
justify-content: space-around;
flex-direction: row;
align-items: self-end;
position: fixed;
bottom: 0;
background: #fff;
width: 100%;
padding: 10px;
}
}
}
}

View File

@ -11,19 +11,17 @@
<div class="usercontentshow" ref="usercontent">
<div class="rc-product ts-scrollable-container">
<div class="rc-productcat ts-scrollable">
<ol>
<li
v-for="(item, index) in userproduct"
:key="index"
@click="selectGoods(item, index)"
:class="activeIndex == index ? 'active' : 'unactive'"
class="ts-standard-btn"
ref="userstandard"
>
<img :src="item.catimage" alt="" />
<span>{{ item.title }}</span>
</li>
</ol>
<div
class="rc-cat"
v-for="(item, index) in userproduct"
:key="index"
ref="userclicks"
@click="selectGoods(item, index)"
:class="activeIndex == index ? 'active' : 'unactive'"
>
<img :src="item.catimage" alt="" />
<span>{{ item.title }}</span>
</div>
</div>
</div>
<div class="online rc-md-up"></div>
@ -299,13 +297,11 @@
<em>确认</em>
</div>
</el-dialog>
<MyFooter></MyFooter>
</div>
</template>
<script>
import Myheader from "~/components/header.vue";
import MyFooter from '~/components/rc-footer.vue'
import {
userstype,
biaome,
@ -318,7 +314,7 @@ export default {
value: "",
isLoading: true,
userstype: [],
activeIndex: "-1",
activeIndex: "0",
allacindex: 0,
userishwo: true,
userishwo1: true,
@ -508,20 +504,16 @@ export default {
},
components: {
Myheader,
MyFooter
},
mounted() {
let stype = this.$route.query.stype;
this.$nextTick(() => {
this.$refs.userstandard[0].style.margin = 0 + "px";
});
this.userst();
// this.activeIndex = stype;
// if (stype !== "" && stype !== undefined) {
// this.onmessage(stype);
// } else {
// this.usetmessage();
// }
this.activeIndex = stype;
if (stype !== "" && stype !== undefined) {
this.onmessage(stype);
} else {
this.usetmessage();
}
},
methods: {
async usersearch(stype, usertype) {
@ -751,9 +743,6 @@ export default {
this.activeIndexa = index;
},
selectage(item, index) {
if(this.activeIndex=='-1'){
this.activeIndex=0;
}
let tagUsedAge = {};
this.activeIndexc = index;
this.userishwo1 = !this.userishwo1;
@ -777,9 +766,6 @@ export default {
},
selectagc(item, index) {
// let tagFunction = {};
if(this.activeIndex=='-1'){
this.activeIndex=0;
}
this.activeIndexd = index;
this.userishwo2 = !this.userishwo2;
if (item.checked == false) {
@ -810,9 +796,6 @@ export default {
this.usersearch(this.userserachlist, this.activeIndex1);
},
selectagd(item, index) {
if(this.activeIndex=='-1'){
this.activeIndex=0;
}
let tagBreed = {};
this.activeIndexe = index;
this.userishwo3 = !this.userishwo3;
@ -835,9 +818,6 @@ export default {
this.usersearch(this.userserachlist, this.activeIndex1);
},
selectproduct(item, index) {
if(this.activeIndex=='-1'){
this.activeIndex=0;
}
this.activeIndexb = index;
// console.log(this.userishwo=!this.userishwo)
if (item.checked == false) {

View File

@ -1,137 +1,81 @@
<template>
<div>
<Myheader></Myheader>
<div class="rc-top"></div>
<div class="usercontend">
<div class="rc-max-width--xl">
<h2>新增收货地址</h2>
<div class="rc-max-width--xl rc-people">
<span>收货人:</span>
<input type="text" placeholder="请输入收货人姓名">
</div>
<div class="rc-max-width--xl rc-phone">
<span>手机号码:</span>
<input type="text" placeholder="请输入11位手机号码">
</div>
<div class="rc-max-width--xl rc-address">
<span>所在地区:</span>
<input type="text" placeholder="请选择所在地区">
</div>
<div class="rc-max-width--xl rc-useaddress">
<span>详细地址:</span>
<input type="text" placeholder="小区、门牌号等" class="userinput">
<textarea rows="10" cols="30" placeholder="请输入详细地址">
</textarea>
</div>
</div>
<div class="rc-button">
<span @click="openclose()">取消</span>
<em @click="openclose()">确认</em>
</div>
</div>
<!-- <div class="rc-button">
<div class="rc-footbutton" @click="onAdd()">
<span>新增收货地址</span>
</div>
</div> -->
<MyFooter></MyFooter>
</div>
<van-address-edit
:area-list="areaList"
show-postal
show-delete
show-set-default
show-search-result
:search-result="searchResult"
:area-columns-placeholder="['请选择', '请选择', '请选择']"
@save="onSave"
@delete="onDelete"
@change-detail="onChangeDetail"
/>
</template>
<script>
import Myheader from '~/components/header.vue'
import MyFooter from '~/components/rc-footer.vue'
import { editaddress } from "../../ajax/getData";
import { Toast } from 'vant';
import { areaList } from '@vant/area-data';
export default {
data() {
return {
chosenAddressId: "1",
checked: true,
userid: null,
usermessage:null,
list: [
{
id: 1,
name: "张三",
tel: "13000000000",
address: "浙江省杭州市西湖区文三路 138 号",
isDefault: true,
},
{
id: 2,
name: "李四",
tel: "1310000000",
address: "浙江省杭州市拱墅区莫干山路 50 号",
},
{
id: 3,
name: "李四",
tel: "1310000000",
address: "浙江省杭州市拱墅区莫干山路 50 号",
},
],
};
data(){
return{
areaList,
searchResult: [],
userid:null,
addressdetail:'',
}
},
methods: {
onEdit(item, index) {
// let userid = item.id;
console.log(item);
this.$router.push({
path: "/useraddress/editaddress",
query: {
id: item,
},
});
methods:{
async onSave(content) {
// Toast('save');
console.log(content);
let recipient=content.name;
let tel=content.tel;
let provinceId=Number(content.areaCode.substring(0,2)+'0000')//id
let cityId=Number(content.areaCode.substring(0,4)+'00') //id
let districtId=Number(content.areaCode);//
console.log(provinceId,cityId,districtId);
console.log(content.areaCode.substring(0,2)+'0000');//
console.log(content.areaCode.substring(0,4)+'00'); //id
console.log(content.areaCode) //
//id / id/id/
let data = await editaddress(this.userid,this.addressdetail,recipient,tel,provinceId,cityId,districtId);
if(data){
this.$message({
type: 'warning',
message: '地址保存成功'
});
}
console.log(data);
},
onAdd(item, index) {
// let userid = item.id;
// console.log(item);
this.$router.push({
path: "/useraddress/addaddress",
// query: {
// id: userid,
// },
});
onDelete() {
Toast('delete');
},
onChangeDetail(val){
this.addressdetail=val;
}
//
// async userdelete(item) {
// console.log(item.memberId);
// let data = await editdelete(this.userid, item.id);
// this.editaddress(this.usermessage);
// console.log(data);
// },
//
// async editaddress(user) {
// user.data.id=844350
// let data = await selectaddress(user.data.id);
// this.list=data.data;
// console.log(this.list);
// console.log(data);
// },
},
components: {
Myheader,
MyFooter
},
mounted(){
let user= JSON.parse(localStorage.getItem("userInfo"));
// this.userid=user.data.id;
this.userid=3242
mounted() {
//
// this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
// this.editaddress(this.usermessage);
// this.userid = this.usermessage.data.id;
},
};
components:{
},
}
</script>
<style lang="less" scoped >
@import url("../../assets/css/global.less");
@import url("../../assets/css/addaddress.less");
</style>
<style>
</style>

View File

@ -1,131 +1,99 @@
<template>
<div>
<Myheader></Myheader>
<div class="rc-top"></div>
<van-address-edit
:area-list="areaList"
show-postal
show-set-default
show-search-result
:search-result="searchResult"
:address-info="AddressInfo"
:area-columns-placeholder="['请选择', '请选择', '请选择']"
@save="onSave"
@change-detail="onChangeDetail"
>
<!-- <div class="main">
<span>我的</span>
<div class="rc-max-width--xl rc-main">
<div class="rc-max-width--xl rc-people">
<span>收货人:</span>
<input type="text" placeholder="李某某">
</div>
<div class="rc-max-width--xl rc-phone">
<span>手机号码:</span>
<input type="text" placeholder="15279944631">
</div>
<div class="rc-max-width--xl rc-address">
<span>所在地区:</span>
<input type="text" placeholder="请选择所在地区">
</div>
<div class="rc-max-width--xl rc-useaddress">
<span>详细地址:</span>
<input type="text" placeholder="天河客运站">
</div>
</div>
<!-- <div class="rc-button">
<div class="rc-footbutton" @click="onAdd()">
<span>新增收货地址</span>
</div>
</div> -->
<div class="rc-button">
<span @click="openclose()">取消</span>
<em @click="openclose()">确认</em>
</div>
<!-- <MyFooter></MyFooter> -->
</div>
</div> -->
</van-address-edit>
</template>
<script>
import Myheader from '~/components/header.vue'
import MyFooter from '~/components/rc-footer.vue'
import { Toast } from 'vant';
import { areaList } from '@vant/area-data';
import { editupdate } from "../../ajax/getData";
export default {
data() {
return {
chosenAddressId: "1",
checked: true,
userid: null,
usermessage:null,
list: [
{
id: 1,
name: "张三",
tel: "13000000000",
address: "浙江省杭州市西湖区文三路 138 号",
isDefault: true,
},
{
id: 2,
name: "李四",
tel: "1310000000",
address: "浙江省杭州市拱墅区莫干山路 50 号",
},
{
id: 3,
name: "李四",
tel: "1310000000",
address: "浙江省杭州市拱墅区莫干山路 50 号",
},
],
};
data(){
return{
areaList,
searchResult: [],
AddressInfo:{//
name:'',//
tel:'',//
province:'',//
city:'',//
country:'',//
address:'',
areaCode:'',//codeID
addressDetail:'',//
isDefault:false,//
},
}
},
methods: {
onEdit(item, index) {
// let userid = item.id;
console.log(item);
this.$router.push({
path: "/useraddress/editaddress",
query: {
id: item,
},
});
methods:{
valf(){
setTimeout(()=>{
let s=this.$route.query.id;
console.log(s);
this.AddressInfo.name= s.recipient,
this.AddressInfo.tel=s.recipientPhone,
this.AddressInfo.province=s.name
this.AddressInfo.city=s.name
this.AddressInfo.addressDetail=s.detailAddress
this.AddressInfo.isDefault=s.isDefault,
this.AddressInfo.country='江西省'
this.AddressInfo.address='江西省'
},100)
},
async onSave(content) {
let data = await editupdate(this.tel);
console.log(data);
console.log(content);
// Toast('save');
console.log(content.areaCode.substring(0,2)+'0000');//
console.log(content.areaCode.substring(0,4)+'00'); //id
console.log(content.areaCode) //
},
onAdd(item, index) {
// let userid = item.id;
// console.log(item);
this.$router.push({
path: "/useraddress/addaddress",
// query: {
// id: userid,
// },
});
onDelete() {
Toast('delete');
},
onChangeDetail(val){
//
// async userdelete(item) {
// console.log(item.memberId);
// let data = await editdelete(this.userid, item.id);
// this.editaddress(this.usermessage);
// console.log(data);
// },
//
// async editaddress(user) {
// user.data.id=844350
// let data = await selectaddress(user.data.id);
// this.list=data.data;
// console.log(this.list);
// console.log(data);
// },
console.log(this.searchResult);
console.log(val);
}
},
components: {
Myheader,
MyFooter,
mounted(){
this.valf();
this.searchResult = [
{
name: '黄龙万科中心',
address: '杭州市西湖区',
},
];
},
components:{
},
mounted() {
//
// this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
// this.editaddress(this.usermessage);
// this.userid = this.usermessage.data.id;
},
};
}
</script>
<style lang="less" scoped >
@import url("../../assets/css/global.less");
@import url("../../assets/css/editaddress.less");
</style>
<style>
</style>

View File

@ -8,24 +8,24 @@
<div class="usercontshow usermain" >
<div class="rc-cat" >
<div class="rc-center">
<div class=" rc-title">
<div class="rc-header">
<em>
{{ item.name }}
{{ item.recipient }}
</em>
<span>
{{ item.tel }}
{{ item.recipientPhone }}
</span>
</div>
<div class="rc-address">
<span>
{{ item.address }}
{{ item.detailAddress }}
</span>
</div>
<div class="rc-footer">
<div class="rc-foot">
<img src="../../assets/image/userselect.png" alt="">
<span>设置为默认收货地址</span>
<!-- <van-switch v-model="checked" /> -->
</div>
<div class="rc-right">
<span @click="onEdit(item, index)">编辑</span>
@ -97,9 +97,14 @@ export default {
areaList,
};
},
methods: {
methods: {
onAdd() {
Toast("新增地址");
this.$router.push({ path: "/useraddress/addaddress" });
},
onEdit(item, index) {
// let userid = item.id;
let userid = item.id;
console.log(item);
this.$router.push({
path: "/useraddress/editaddress",
@ -108,35 +113,22 @@ export default {
},
});
},
onAdd(item, index) {
// let userid = item.id;
// console.log(item);
this.$router.push({
path: "/useraddress/addaddress",
// query: {
// id: userid,
// },
});
//
async userdelete(item) {
console.log(item.memberId);
let data = await editdelete(this.userid, item.id);
this.editaddress(this.usermessage);
console.log(data);
},
//
// async userdelete(item) {
// console.log(item.memberId);
// let data = await editdelete(this.userid, item.id);
// this.editaddress(this.usermessage);
// console.log(data);
// },
//
// async editaddress(user) {
// user.data.id=844350
// let data = await selectaddress(user.data.id);
// this.list=data.data;
// console.log(this.list);
// console.log(data);
// },
async editaddress(user) {
user.data.id=844350
let data = await selectaddress(user.data.id);
this.list=data.data;
console.log(this.list);
console.log(data);
},
},
components: {
Myheader,
@ -145,14 +137,178 @@ export default {
mounted() {
//
// this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
// this.editaddress(this.usermessage);
// this.userid = this.usermessage.data.id;
this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
this.editaddress(this.usermessage);
this.userid = this.usermessage.data.id;
},
};
</script>
<style lang="less" scoped >
@import url("../../assets/css/global.less");
@import url("../../assets/css/openaddress.less");
.rc-main {
width: 93%;
margin: 0 auto;
margin-top: 8px;
}
//
@media screen and(min-width: 320px) and(max-width:768px) {
.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;
.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: 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;
padding-bottom: 20px;
margin-top: 8px;
.rc-right {
span {
border-bottom: 1px solid #666666;
}
span:first-child {
margin-right: 16px;
}
}
}
}
//pc
@media screen and (min-width: 768px) and (max-width: 1920px) {
.usermain{
width: 90%;
margin: 0 auto;
}
.rc-main{
width: 45%;
height: 164px;
margin-top: 60px;
background: #FFFFFF;
border: 1px solid #D7D7D7;
opacity: 1;
border-radius: 3px;
margin-left: 40px;
float: left;
.rc-center{
margin-top: 24px;
margin-left: 24px;
}
}
.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: 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;
padding-bottom: 20px;
margin-top: 8px;
.rc-right {
span {
border-bottom: 1px solid #666666;
}
span:first-child {
margin-right: 16px;
}
}
}
}
</style>

View File

@ -34,7 +34,7 @@
v-for="(item, index) in searchdata"
:key="index"
@click="selectsearch(item, index)"
:class="activeIndexa == index"
:class="activeIndexa == index ? 'active' : 'unactive'"
>
{{ item.title }}
</li>
@ -219,13 +219,12 @@
</li>
</ol>
</div>
</div>
</div>
<div class="rc-button">
<div class="rc-button">
<span @click="openclose()">取消</span>
<em @click="openclose()">确认</em>
</div>
</div>
</div>
</div>
</div>
<el-dialog :visible.sync="dialogInfo1" hegight="700px" v-if="!isadrond">
@ -313,13 +312,11 @@
</el-dialog>
</div>
<!-- rc-main end -->
<MyFooter></MyFooter>
</div>
</template>
<script>
import Myheader from "~/components/header.vue";
import MyFooter from '~/components/rc-footer.vue'
import { biaome, userstype, searchchanpin } from "../../ajax/getData";
export default {
data() {
@ -523,7 +520,6 @@ export default {
},
components: {
Myheader,
MyFooter
},
mounted() {
this.usetmessage();
@ -599,13 +595,9 @@ export default {
if (element.name == "品种") {
pinzhong.push(element);
this.catageb = pinzhong;
this.catageb=this.catageb.sort((n1,n2)=>{
return n1.sort-n2.sort;
})
this.catageb.forEach((element) => {
element.checked = false;
});
// console.log(this.catageb);
}
if (element.name == "功能") {
gonneg.push(element);
@ -613,7 +605,6 @@ export default {
this.catagea.forEach((element) => {
element.checked = false;
});
console.log(this.catagea);
}
if (element.name == "年龄") {
age.push(element);
@ -840,9 +831,6 @@ export default {
this.usetmessage(item.title);
},
selectage(item, index) {
if(this.activeIndex=='-1'){
this.activeIndex=0;
}
// debugger;
// this.userishwo1 = !this.userishwo1;
let tagUsedAge = {};
@ -875,9 +863,6 @@ export default {
this.activeIndexc = index;
},
selectagc(item, index) {
if(this.activeIndex=='-1'){
this.activeIndex=0;
}
// let tagFunction = {
// petType: this.activeIndex1,
// tagFunction: item.tagName,
@ -901,9 +886,6 @@ export default {
this.activeIndexd = index;
},
selectagd(item, index) {
if(this.activeIndex=='-1'){
this.activeIndex=0;
}
let tagBreed = {};
if (item.checked == false) {
item.checked = true;
@ -934,10 +916,6 @@ export default {
},
selectproduct(item, index) {
this.activeIndexb = index;
console.log(this.activeIndex);
if(this.activeIndex=='-1'){
this.activeIndex=0;
}
if (item.checked == false) {
item.checked = true;
this.$refs.chosebox[index].className = "active";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 KiB

After

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 286 KiB