diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 0c1a5e5d..b7300477 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -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,44 +56,40 @@ 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, pet,address) => { +export const isexistCart = (id) => { var data = { - memberId: id, + } - return fetch('getCartProductInfo?memberId='+id,data,'POST') + return fetch('getCartProductInfo', data, 'POST') } /** * 删除购物车 */ export const deleteCart = (memberId, productCode) => { - var data = { - memberId: memberId, - productCode:productCode - } - return fetch('cancelCartProductInfo',data,'POST') + return fetch('cancelCartProductInfo?memberId=' + memberId, productCode, 'POST') } /** * 购物车批量提交 */ export const mostAddClass = (id) => { - return fetch('/api/mostAddClass/', {id}) + return fetch('/api/mostAddClass/', { id }) } /** * 删除购物车 @@ -109,47 +105,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:'', @@ -184,10 +180,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) => { @@ -195,7 +191,7 @@ export const userque = (stype) => { console.log(stype); var data = { } - return fetch('goods', data, 'POST' ) + return fetch('goods', data, 'POST') } @@ -234,20 +230,14 @@ 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.substr(0,str.length-1); - var data = { - page:1, - row:10 + str = str + key + "=" + list[key] + "&"; } return fetch('product/query?petType='+usertype+str+queryTail, data, 'POST' ) @@ -265,19 +255,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') } @@ -285,21 +275,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) => { @@ -311,9 +301,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' ) } @@ -324,9 +314,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') } @@ -334,20 +324,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') } @@ -356,9 +346,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') } @@ -366,25 +356,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') } @@ -395,11 +385,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') } @@ -407,163 +397,173 @@ 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 - } - return fetch('coupon?type=fetch', data, 'POST' ) +//优惠券的插入 +export const inserdiscount = (mobile, couponId) => { + var data = { + mobile: mobile, + couponId: couponId } + return fetch('coupon?type=fetch', data, 'POST') +} - //优惠券的查询 - 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' ) +//优惠券的查询 +export const getdiscount = (memberId, channelSecurity, mobile) => { + var data = { + memberId: memberId, + mobile: mobile } - //用户所有的优惠券 - export const allConfig = (memberId,channelSecurity,mobile) => { - var data = { - } - return fetch('couponConfig?type=getAll', data, 'POST' ) - } - + return fetch('memberAddress?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 selectaddress = (memberId, pet,address) => { - var data = { - memberId:memberId, - } - return fetch('memberAddress?type=getAll', data, 'POST' ) +//可用的优惠券 +export const alldiscount = (memberId, channelSecurity, mobile) => { + var data = { + memberId: memberId, } + return fetch('couponConfig?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 getdraw = (mobile, states) => { + var data = { + mobile: mobile, + status: states } + 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 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 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 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') } diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index b65b75ee..a7b638fe 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -8,17 +8,38 @@ body{ .fade-leave-active { opacity: 0; } +.ts-no-data{ + text-align: center; + margin:3rem 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%; - margin-left: -1.56rem; - top: 50%; - margin-top: -3.75rem; background: url(../image/onloading.png) center center no-repeat; width: 3.12rem; background-size: contain; - height: 7.5rem; - z-index: 1000; + height: 3.12rem; animation: rolling 4s infinite; -webkit-animation:rolling 4s infinite; } @@ -48,8 +69,6 @@ body{ } //用户光点 .rc-screen-reader{ - width: 0.81rem; - height: 0.81rem; border-radius: 50%; position: absolute; background-color: red; @@ -59,6 +78,13 @@ body{ width: 0.37rem; height: 0.37rem; } +.rc-menu--xs .rc-screen-reader{ + left: 30%; +} +.rc-list__link.ts-login--xs .rc-screen-reader{ + left:16%; +} + img, picture { display: block; max-width: 100%; @@ -85,7 +111,8 @@ img, picture { li{ border: 1px solid #D7D7D7; display: inline-flex; - border-radius: 4px; + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; flex-direction: column; max-width:10rem; .rc-column @@ -117,7 +144,7 @@ img, picture { } img{ width:10rem; - height:10rem; + min-height:10rem; object-fit: contain; display: flex; margin: 0 auto; @@ -229,13 +256,12 @@ img, picture { right: 0; top: 30%; background: #FFFFFF; - box-shadow: 0px 0px .62rem rgba(0, 0, 0, 0.16); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.16); border-radius: .25rem; z-index:3; ul{ width: 60px; height: 181px; - box-shadow: 0px 0px 6px rgb(0 0 0 / 10%); background-color: white; display: flex; flex-direction: column; @@ -313,6 +339,9 @@ img, picture { html { //font-size:100px; } + .rc-list__link.ts-login--xs .rc-screen-reader{ + left:7%; + } .rc-md-up { display: none!important; } @@ -320,12 +349,10 @@ img, picture { width:100%; } .rc-top{ - margin-top: 74px; + margin-top: 90px; } .rc-list__header { - background: none; - padding: .5rem 0; - border-bottom: none; + } .ts-right-arr { border-bottom:1px solid #E1001A; @@ -416,8 +443,13 @@ img, picture { display:block; li{ max-width:20rem; + min-width:18.75rem; + width:22.8vw; //margin-right:.875rem; - margin-left:2.2vw; + margin-left:2vw; + padding-left:1px; + padding-right:1px; + box-sizing: border-box; .rc-column{ span{ font-size:1.875rem; @@ -432,7 +464,7 @@ img, picture { } } img{ - width:21.7vw; + width:100%; max-width:320px; min-width:160px; } @@ -539,35 +571,40 @@ img, picture { } h2{ font-size:20px; + padding-bottom:1rem; } .ts-scrollable { + padding-bottom:1rem; + scrollbar-width: thin; li { margin-left: 30px; width: 8.125rem; height: 2.5rem; - line-height: 40px; + //line-height: 40px; font-size: .875rem; + padding:.375rem; } - /* + &::-webkit-scrollbar{ - background:unset; - height:4px; + height: 6px; + width:50%; + background:transparent; } &::-webkit-scrollbar-thumb{ background-color:#d7d7d7; - height:2px; + border-radius:10px; + width:50%; } &::-webkit-scrollbar-track{ - background-color:ddd; - - height:2px; + //background-color:#ddd; + background-color:transparent; } &::-webkit-scrollbar-button{ background:unset; } - */ + /* */ } } @@ -589,10 +626,10 @@ img, picture { { .ts-product-list { display:flex; - justify-content: space-between; + //justify-content: space-between; li{ - margin-left:0; - margin-right:0; + //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 fc6f260e..24dc4cef 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -5,47 +5,98 @@ /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%; + } + &:first-child{ + margin-left:0; + } + &.active { img{ - border-radius: 50%; + border: 3px solid #E2001A; } - &.active { - img{ - border: 3px solid #E2001A; - } - color: #E2001A; - - } - &.unactive { - color: #444444; - img{ - border: 3px solid #D7D7D7; - } + color: #E2001A; + + } + &.unactive { + color: #444444; + img{ + border: 3px solid #D7D7D7; } } } } + .uservideo{ overflow: hidden; video{ - height:100%; - width:auto; + width:100%; + height: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; + justify-content: space-evenly; + img{ + width:4rem; + height:auto; + } + li{ + margin-top:1.875rem; + } } - .searchBara{ - position: fixed; + .ts-banner-swiper-container{ + margin-bottom:2.5rem; + } + .searchBara{ width: 100%; position: fixed; - top:66px; + top:3.75rem; background: white; - z-index: 9999; + z-index: 60; overflow-x: auto; white-space: nowrap; overflow-y:hidden; @@ -62,16 +113,14 @@ display: inline-block; margin-left: 0.20rem; text-align: center; - background: #F6F6F6; border-radius: 50%; opacity: 1; } - } - - .rc-login{ - width: 92%; - margin:0 auto; - } + } + .rc-login{ + width: 92%; + margin:0 auto; + } .userunlogin{ width: 100%; height: 0.60rem; @@ -101,9 +150,6 @@ } } - .van-swipe{ - z-index: 2; - } .rc-usermessage{ span{ font-size: 1rem; @@ -119,10 +165,12 @@ height: auto; object-fit: cover; } - + + .van-swipe{ + z-index: 2; + } .van-swipe-item { color: #fff; - height: 26.31rem; width: 100%; font-size: 0.20px; text-align: center; @@ -134,51 +182,43 @@ display: none; } #xxxFullScreen { - background-color: white; - margin-top: 0.40rem; - #swiper1 { - overflow: hidden; - } - .swiper-container{ - height: 6.45rem; - } - .swiper-container, .swiper-container2 { - width: 100%; - // overflow: visible !important; - height: 100%; - position: relative; - } - #swiper1 .swiper-container .swiper-wrapper .swiper-slide { - width: 17.25rem; - //height: 6.45rem !important; //Auto adaption - } - - /* 上一张 */ - #swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev { - margin-top: 0.05rem; - height: 100%; - - } - /* 下一张 */ - #swiper1 .swiper-container .swiper-wrapper .swiper-slide-next { - margin-top: 0.05rem; - height: 100%; - - } - .swiper-container .swiper-wrapper .swiper-slide-active { - height: 100%; - - } - .uservideo{ - width: 100%; - height:auto; - max-height: 15.68rem; - display: block; - video{ - max-width:100%; - max-height:100%; + background-color: white; + margin-top: 0.40rem; + .swiper-container{ + height: 6.45rem; + } + .swiper-container { + width: 100%; + height: 100%; + position: relative; + } + .swiper-container .swiper-wrapper .swiper-slide { + width: 17.25rem; + //height: 6.45rem !important; //Auto adaption + } + + /* 上一张 */ + swiper-container .swiper-wrapper .swiper-slide-prev { + margin-top: 0.05rem; + height: 100%; + } + /* 下一张 */ + .swiper-container .swiper-wrapper .swiper-slide-next { + margin-top: 0.05rem; + height: 100%; + } + .swiper-container .swiper-wrapper .swiper-slide-active { + height: 100%; + } + .uservideo{ + width: 100%; + height:auto; + display: block; + video{ + max-width:100%; + max-height:100%; + } } - } } .sw-center{ width: 100%; @@ -192,8 +232,9 @@ width: 100%; display: flex; flex-direction: column; - justify-content: center; + justify-content: flex-start; align-items: center; + vertical-align: top; } img{ width: 10rem; @@ -209,6 +250,7 @@ margin-top: 1.25rem; } p{ + color: #666666; font-size: .875rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; @@ -231,16 +273,14 @@ /* 中间的图片 */ .swiper-container .swiper-wrapper .swiper-slide-active { - height: 165px !important; + } .swiperWrap{ - height: 469px; - width: 100%; + height: 469px; + width: 100%; img{ - height: 469px; - width: 100%; - - + height: 469px; + width: 100%; } /deep/.swiper-pagination-bullet-active{ background: red; @@ -301,22 +341,22 @@ } } - .active { - font-size: 0.14rem; - img{ - border-width: 1px; - } - } - .unactive { - font-size: 0.14rem; - img{ - border-width: 1px; - } - } // .usermain{ // display: none; // } } +.active { + font-size: 0.14rem; + img{ + border-width: 1px; + } +} +.unactive { + font-size: 0.14rem; + img{ + border-width: 1px; + } +} @media screen and (min-width: 769px) @@ -324,14 +364,24 @@ .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; + img{ + margin:0 auto; + } + .ts-carousel-indicator{ + position:absolute; + bottom:.4rem; + } + } .van-swipe-item { color: #fff; height: 100%; @@ -350,15 +400,12 @@ object-fit: cover; #xxxFullScreen { background-color: white; // margin-top: 100px; - #swiper1 { - width: 100%; + #swiper1,#swiper2 { overflow: hidden; margin-top: 2.31rem; - - h2{ - padding-bottom: 5rem; - } - + } + h2{ + padding-bottom: 5rem; } .swiper-container2 { @@ -367,10 +414,10 @@ object-fit: cover; // overflow: visible !important; position: relative; } -#swiper1 .swiper-container .swiper-wrapper .swiper-slide { - width: 100%; - //height: 6.18rem; -} + #swiper1 .swiper-container .swiper-wrapper .swiper-slide { + width: 100%; + //height: 6.18rem; + } /* 上一张 */ #swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev { @@ -518,14 +565,18 @@ img{ display: block; } img{ - width: 10vw; - height: 10vw; + width:100%; + height: auto; + object-fit: contain; display: block; } li{ + width: 10vw; + max-width:11rem; cursor: pointer; font-size: 16px; text-align: center; + overflow:hidden; } } @@ -540,33 +591,7 @@ img{ } .usermain{ - .ul-dog{ - width: 100%; - display: flex; - justify-content: center; - flex-wrap: wrap; - flex-direction: row; - - span{ - margin-top: 2.5rem; - display: block; - } - img{ - width: 9.5rem; - height: 9.5rem; - display: block; - } - li{ - cursor: pointer; - font-size: 16px; - width: 9.875rem; - text-align: center; - height: 9.875rem; - background: #F6F6F6; - border-radius: 50%; - margin-left:3rem; - } - } + } .rc-main{ width: 100%; diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less index 8ba135c4..f302c4a0 100644 --- a/rc-busness/assets/css/login.less +++ b/rc-busness/assets/css/login.less @@ -1,7 +1,9 @@ .container{ - min-height:80vh; + min-height:100vh; height:100%; background-color:#f6f6f6; + display: flex; + flex-direction: column; } .ts-max-width--460{ border-radius: 3px; @@ -53,11 +55,13 @@ } .container { font-size: 0.1rem; + background-color:#fff; .van-field__body { border-bottom: 1px solid red; } .content { margin-top: 24px; + box-shadow: unset; } .userfoget { font-size: 14px; diff --git a/rc-busness/assets/pay/fail.png b/rc-busness/assets/pay/fail.png new file mode 100644 index 00000000..71821a9b Binary files /dev/null and b/rc-busness/assets/pay/fail.png differ diff --git a/rc-busness/assets/pay/wx.png b/rc-busness/assets/pay/wx.png new file mode 100644 index 00000000..7316a9d7 Binary files /dev/null and b/rc-busness/assets/pay/wx.png differ diff --git a/rc-busness/assets/pay/zfb.png b/rc-busness/assets/pay/zfb.png new file mode 100644 index 00000000..c68db2ab Binary files /dev/null and b/rc-busness/assets/pay/zfb.png differ diff --git a/rc-busness/assets/style/default.less b/rc-busness/assets/style/default.less new file mode 100644 index 00000000..530384c0 --- /dev/null +++ b/rc-busness/assets/style/default.less @@ -0,0 +1,78 @@ +* { + 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%; + } + } + \ No newline at end of file diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue new file mode 100644 index 00000000..8da3f31f --- /dev/null +++ b/rc-busness/components/addressInput.vue @@ -0,0 +1,357 @@ + + + + \ No newline at end of file diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 7c10461f..ab013a1b 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -6,6 +6,7 @@
  • @@ -75,16 +68,16 @@
    @@ -94,49 +87,49 @@
  • - 猫 + 猫
  • - 犬 + 犬
  • - 定制营养方案 + 定制营养方案