From 9f7ce41eaceabafd2242e0ff95f0a4d0048d4a95 Mon Sep 17 00:00:00 2001 From: lin <342011128@qq.com> Date: Thu, 24 Mar 2022 17:05:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.添加PC端订单支付 弹出支付二维码 2.添加确认订单的面包屑 从购物车和其他方向进去的不同显示 3.修改移动端按钮和合计样式显示问题 4.添加购物车的全选功能 5.添加支付页面面包屑功能 6.修改订单详情页 添加面包屑和分割线 7.添加购物车数量编辑的保存 --- rc-busness/ajax/getData.js | 830 +++++------ rc-busness/ajax/util.js | 2 +- rc-busness/assets/css/orderquantity.less | 7 +- rc-busness/assets/css/settlement.less | 1182 ++++++++------- rc-busness/assets/css/usertion.less | 1277 ++++++++--------- rc-busness/components/tabs.vue | 12 +- rc-busness/config/async/env.js | 1 + rc-busness/pages/myorder/userrecord.vue | 82 +- rc-busness/pages/myorder/usertion.vue | 26 +- rc-busness/pages/personal/settlement.less | 8 +- rc-busness/pages/personal/settlement.vue | 80 +- rc-busness/pages/personal/useraddress.vue | 105 +- rc-busness/pages/personal/userpay.vue | 48 +- rc-busness/pages/productdetails/producted.vue | 7 +- 14 files changed, 1930 insertions(+), 1737 deletions(-) diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 9e54f698..8f4e0e21 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -7,100 +7,103 @@ export const syncClass = classId => fetch('/api/listhome/' + classId) /** * 筛选条件下拉的展示请求 -*/ + */ export const filter = () => fetch('/api/listhome/filter/data') /** * 获取课程列表 -*/ + */ export const courselist = (offset, courseId, type, sort, selectScreen = []) => { - var selectScreenStr = '' - // 过滤请求数组 - selectScreen.forEach(function (element) { - for (var i = 0; i < element.classlist.length; i++) { - if (element.classlist[i].status) { - selectScreenStr += element.classlist[i].id + '/' - } - } - }) - var data = { - offset, - limit: '15', - type, - sort, - courseId, - selectScreenStr - } - return fetch( '/api/courselist', data) + var selectScreenStr = '' + // 过滤请求数组 + selectScreen.forEach(function(element) { + for (var i = 0; i < element.classlist.length; i++) { + if (element.classlist[i].status) { + selectScreenStr += element.classlist[i].id + '/' + } + } + }) + var data = { + offset, + limit: '15', + type, + sort, + courseId, + selectScreenStr + } + return fetch('/api/courselist', data) } /** * 获取课程详情 */ export const getDetail = (id) => { - fetch( '/api/courseDetail/index/' + id) + fetch('/api/courseDetail/index/' + id) } /** * 模糊查询 */ export const getleckCourse = (name, offset) => { - let data = { - limit: '15', - offset, - name - } - return fetch('/api/getleckCourse', data) + let data = { + limit: '15', + offset, + name + } + return fetch('/api/getleckCourse', data) } /** * 加入购物车 */ -export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications, leftAllotment, basePiont) => { - var data = { - buyCount:buyCount, - memberId: memberId, - mobile:mobile, - productCode:productCode, - productImg: productImg, - productName: productName, - productPrice: productPrice, - specifications: specifications, - leftAllotment: leftAllotment, - basePiont: basePiont - } - return fetch('insertCartProductInfo', data,'POST') +export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, + specifications, leftAllotment, basePiont) => { + var data = { + buyCount: buyCount, + memberId: memberId, + mobile: mobile, + productCode: productCode, + productImg: productImg, + productName: productName, + productPrice: productPrice, + specifications: specifications, + leftAllotment: leftAllotment, + basePiont: basePiont + } + return fetch('insertCartProductInfo', data, 'POST') } /** * 是否存在购物车 */ - export const isexistCart = (id, pet,address) => { - var data = { } - return fetch('getCartProductInfo?memberId='+id,data,'POST') +export const isexistCart = (id, pet, address) => { + var data = {} + return fetch('getCartProductInfo?memberId=' + id, data, 'POST') } /** * 支付监听 */ export const monitorOrderNotify = (OrderNumber) => { - var data = {} - return fetch('monitorOrderNotify?OrderNumber=' + OrderNumber, data, 'POST') + var data = {} + return fetch('monitorOrderNotify?OrderNumber=' + OrderNumber, data, 'POST') } /** * 删除购物车 */ -export const deleteCart = ( productCode) => { - var data = { - productCode - } - return fetch('cancelCartProductInfo',productCode,'POST') +export const deleteCart = (productCode) => { + var data = { + productCode + } + return fetch('cancelCartProductInfo', productCode, 'POST') } /** * 购物车批量提交 */ export const mostAddClass = (id) => { - return fetch('/api/mostAddClass/', {id}) + return fetch('/api/mostAddClass/', { + id + }) } /** * 删除购物车 @@ -116,79 +119,79 @@ export const mostAddClass = (id) => { /** * 发送验证码 */ - export const sendMsg = (mobile, pet,address) => { - var data = { - phoneNumber:mobile, - } - return fetch('sendMsg', data, 'POST' ) +export const sendMsg = (mobile, pet, address) => { + var data = { + phoneNumber: mobile, + } + return fetch('sendMsg', data, 'POST') } /** * 发送验证码数据 */ - export const vadatnmsg = (msgNum,hash,tamp) => { - var data = { - msgNum:msgNum, - tamp:tamp, - hash:hash - } - return fetch('validateNum', data, 'POST' ) +export const vadatnmsg = (msgNum, hash, tamp) => { + var data = { + msgNum: msgNum, + tamp: tamp, + hash: hash + } + return fetch('validateNum', data, 'POST') } /** * 筛选标签 */ - export const userstype = (stype, pet,address) => { - var data = { - petType:0, - } - return fetch('productSearchTag/query?petType=' + 0, data, 'POST' ) +export const userstype = (stype, pet, address) => { + var data = { + petType: 0, + } + return fetch('productSearchTag/query?petType=' + 0, data, 'POST') } /** * 登录 */ -export const userLongin = (mobile, pet,address) => { - var data = { - id:'', - mobile:mobile, - } - return fetch('member?type=get', data, 'POST' ) +export const userLongin = (mobile, pet, address) => { + var data = { + id: '', + mobile: mobile, + } + return fetch('member?type=get', data, 'POST') } - /** +/** * 登录和注册 */ export const userregOrLogin = (mobile) => { - var data = { - id:'', - mobile:mobile, - } - return fetch('regOrLogin?phoneNumber='+ mobile , data, 'POST' ) + var data = { + id: '', + mobile: mobile, + } + return fetch('regOrLogin?phoneNumber=' + mobile, data, 'POST') } - //注册 -export const useredit = (mobile, pet,address) => { - var data = { - mobile:mobile, - memberName:'', - realName:'', - gender:'', - email:'', - openId:'', - unionId:'', - birthday:'', - provinceId:'', - cityId:'', - districtId:'', - storeCode:'', - remark:'', - memberMark:'', - - remark:'' - } - return fetch('member?type=add', data, 'POST' ) +//注册 +export const useredit = (mobile, pet, address) => { + var data = { + mobile: mobile, + memberName: '', + realName: '', + gender: '', + email: '', + openId: '', + unionId: '', + birthday: '', + provinceId: '', + cityId: '', + districtId: '', + storeCode: '', + remark: '', + memberMark: '', + + remark: '' + } + return fetch('member?type=add', data, 'POST') } - //查询标品全部信息 +//查询标品全部信息 // export const userquery = (mobile, pet,address) => { // var data = { // channelId:"15", @@ -200,85 +203,84 @@ export const useredit = (mobile, pet,address) => { //点击商品全部信息 export const userquery = (stype, ) => { - console.log(stype); - var data = { - goodsName:stype + console.log(stype); + var data = { + goodsName: stype - } - return fetch('goods?petType='+stype, data, 'POST' ) + } + return fetch('goods?petType=' + stype, data, 'POST') } //处方信息 -export const userque = (goodsName, petType, curPage,curRow) => { - if(!curPage) - curPage=1; - if(!curRow) - curRow=10; - let queryTail='&page='+curPage+'&rows='+curRow; - let query='?0'; - if(goodsName) - query += '&goodsName='+goodsName; - if(petType!==undefined && petType!=='') { - query += '&petType='+petType; - } - query += queryTail; - var data = { - } - return fetch('goods'+query, data, 'POST' ) +export const userque = (goodsName, petType, curPage, curRow) => { + if (!curPage) + curPage = 1; + if (!curRow) + curRow = 10; + let queryTail = '&page=' + curPage + '&rows=' + curRow; + let query = '?0'; + if (goodsName) + query += '&goodsName=' + goodsName; + if (petType !== undefined && petType !== '') { + query += '&petType=' + petType; + } + query += queryTail; + var data = {} + return fetch('goods' + query, data, 'POST') } //标品全部信息 -export const biaomessage = (stype,name,curPage,curRow) => { - if(!curPage) - curPage=1; - if(!curRow) - curRow=10; - let queryTail='&page='+curPage+'&rows='+curRow; - if(stype.length>1){ - let list={}; - stype.map(item=>{ +export const biaomessage = (stype, name, curPage, curRow) => { + if (!curPage) + curPage = 1; + if (!curRow) + curRow = 10; + let queryTail = '&page=' + curPage + '&rows=' + curRow; + if (stype.length > 1) { + let list = {}; + stype.map(item => { console.log(item); - list=item + list = item }) var str = "?"; - for(var key in list){ + for (var key in list) { str = str + key + "=" + list[key] + "&"; } - stype = str.substr(0,str.length-1); - return fetch('product/query'+stype+queryTail, '', 'POST' ) - }else{ - return fetch('product/query?petType='+stype+queryTail, '', 'POST' ) + stype = str.substr(0, str.length - 1); + return fetch('product/query' + stype + queryTail, '', 'POST') + } else { + return fetch('product/query?petType=' + stype + queryTail, '', 'POST') } } -export const searchchanpin = (stype,usertype,curPage,curRow) => { +export const searchchanpin = (stype, usertype, curPage, curRow) => { - console.log(stype,usertype); - - if(!curPage) - curPage=1; - if(!curRow) - curRow=10; - let queryTail='&page='+curPage+'&rows='+curRow; - console.log(stype); - let list={}; - stype.map(item=>{ - console.log(item); - list=item - }) - var str = "&"; - for(var key in list){ + console.log(stype, usertype); - 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' ) + if (!curPage) + curPage = 1; + if (!curRow) + curRow = 10; + let queryTail = '&page=' + curPage + '&rows=' + curRow; + console.log(stype); + 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 + } + + return fetch('product/query?petType=' + usertype + str + queryTail, data, 'POST') } @@ -293,108 +295,108 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => { //查询订单 -export const userindent = (phoneNumber,orderNumber,page,rows) => { - var data = {}; - if(phoneNumber) { - data.phoneNumber = phoneNumber; - } - if(orderNumber) { - data.orderNumber = orderNumber; - } - let url='orderMaster/?type=query'; - if(page && rows) { - url = url+"&page="+page+"&rows="+rows; - } - return fetch(url, data, 'POST' ) +export const userindent = (phoneNumber, orderNumber, page, rows) => { + var data = {}; + if (phoneNumber) { + data.phoneNumber = phoneNumber; + } + if (orderNumber) { + data.orderNumber = orderNumber; + } + let url = 'orderMaster/?type=query'; + if (page && rows) { + url = url + "&page=" + page + "&rows=" + rows; + } + return fetch(url, data, 'POST') } //查询订单详情 -export const userin = (orderNumber,) => { - var data = { - orderNumber:orderNumber, - } - return fetch('orderMaster/?type=query', data, 'POST' ) +export const userin = (orderNumber, ) => { + var data = { + orderNumber: orderNumber, + } + return fetch('orderMaster/?type=query', data, 'POST') } //取消订单 -export const canceldanhao = (phoneNumber,orderNumber) => { - var data = { - phoneNumber:phoneNumber, - orderNumber:orderNumber, +export const canceldanhao = (phoneNumber, orderNumber) => { + var data = { + phoneNumber: phoneNumber, + 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 - } - return fetch('product/query', data, 'POST' ) + console.log(stype); + var data = { + name: stype, + page: 1, + row: 10 + } + return fetch('product/query', data, 'POST') } -export const biaome = (usertype,stype,curPage,rows) => { - if(!curPage) - curPage=1; - if(!rows) - rows=10; - let queryTail='&page='+curPage+'&rows='+rows; - let username='&name='+stype - console.log(stype); - var data = { - name:stype, - rows:10, - page:1, - } - return fetch('product/query?petType='+usertype+username+queryTail,data, 'POST' ) +export const biaome = (usertype, stype, curPage, rows) => { + if (!curPage) + curPage = 1; + if (!rows) + rows = 10; + let queryTail = '&page=' + curPage + '&rows=' + rows; + let username = '&name=' + stype + console.log(stype); + var data = { + name: stype, + rows: 10, + page: 1, + } + return fetch('product/query?petType=' + usertype + username + queryTail, data, 'POST') } //会员积分 export const memberAccount = (stype) => { - console.log(stype); - var data = { - memberId:stype - } - return fetch('memberAccount?type=history', data, 'POST' ) + console.log(stype); + var data = { + memberId: stype + } + return fetch('memberAccount?type=history', data, 'POST') } //查询订单信息 export const ordermaster = (stype) => { - console.log(stype); - var data = { - - memberId:'223782' - } - return fetch('memberAccount', data, 'POST' ) + console.log(stype); + var data = { + + memberId: '223782' + } + return fetch('memberAccount', data, 'POST') } //微信支付 export const payOrderWX = (stype) => { - console.log(stype); - var data = { - - memberId:'223782' - } - return fetch('memberAccount', data, 'POST' ) + console.log(stype); + var data = { + + memberId: '223782' + } + return fetch('memberAccount', data, 'POST') } export const insercar = (stype) => { - console.log(stype); - var data = { - petType:stype - } - return fetch('product/insertCartProductInfo', data, 'POST' ) + console.log(stype); + var data = { + petType: stype + } + return fetch('product/insertCartProductInfo', data, 'POST') } @@ -402,36 +404,35 @@ export const insercar = (stype) => { //查询猫狗商品信息 -export const catquery = (productCode,type) => { - console.log(productCode); - var data = { - - petType:0 +export const catquery = (productCode, type) => { + console.log(productCode); + var data = { - } - return fetch('h5/product/query', data, 'POST' ) + petType: 0 + + } + return fetch('h5/product/query', data, 'POST') } //查询猫狗商品信息 -export const dogquery = (productCode,type) => { - console.log(productCode); - var data = { - - petType:1, - pet_type:0 +export const dogquery = (productCode, type) => { + console.log(productCode); + var data = { - } - return fetch('h5/product/query', data, 'POST' ) + petType: 1, + pet_type: 0 + + } + return fetch('h5/product/query', data, 'POST') } //查询商品信息 export const productQuery = (productCode) => { let url = 'product/query'; - if(productCode) { - url += '?productCode='+encodeURI(productCode); + if (productCode) { + url += '?productCode=' + encodeURI(productCode); } - var data = { - } - return fetch(url, data, 'POST' ) + var data = {} + return fetch(url, data, 'POST') } @@ -441,173 +442,172 @@ export const productQuery = (productCode) => { //查询单个商品 export const oncequery = (productCode) => { - var data = { - - productCode:productCode + var data = { - } - return fetch( "goodsByProductCode?productCode="+productCode, data, 'POST' ) + productCode: productCode + + } + return fetch("goodsByProductCode?productCode=" + productCode, data, 'POST') } //查询单个商品 export const goodsmessage = (productCode) => { - var data = { - productCode:productCode + var data = { + 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) => { +export const getdiscount = (memberId, channelSecurity, mobile) => { var data = { - memberId:memberId, - mobile:mobile + memberId: memberId, + mobile: mobile } - return fetch('memberAddress?type=getAll', data, 'POST' ) + return fetch('memberAddress?type=getAll', data, 'POST') } //可用的优惠券 export const alldiscount = (paramsObj) => { var data = paramsObj; - return fetch('couponConfig?type=getAll', data, 'POST' ) + return fetch('couponConfig?type=getAll', data, 'POST') } //用户领取的优惠券 export const getdraw = (paramsObj) => { var data = paramsObj; - return fetch('coupon?type=getAll', data, 'POST' ) + return fetch('coupon?type=getAll', data, 'POST') } - //微信支付 - export const generateOrderWX = (list,payType) => { +//微信支付 +export const generateOrderWX = (list, payType) => { //Dictionary : 1: scan qrcode, 2:redirect 3: raise local app - if(payType==1) - return fetch('generateOrderWX', list, 'POST' ) + if (payType == 1) + return fetch('generateOrderWX', list, 'POST') else - return fetch('generateOrderWXH5', list, 'POST' ) - } + return fetch('generateOrderWXH5', list, 'POST') +} - //再次支付 - export const repayOrde = (ordernumber,payType) => { - //Dictionary : 1: scan qrcode, 2:redirect 3: raise local app - if(payType==1) - return fetch('repayOrderWX?orderNo='+ordernumber,'', 'POST' ) - else - return fetch('repayOrderWXH5?orderNo='+ordernumber,'', 'POST' ) +//再次支付 +export const repayOrde = (ordernumber, payType) => { + //Dictionary : 1: scan qrcode, 2:redirect 3: raise local app + if (payType == 1) + return fetch('repayOrderWX?orderNo=' + ordernumber, '', 'POST') + else + return fetch('repayOrderWXH5?orderNo=' + ordernumber, '', '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, } - //用户所有的优惠券 - export const allConfig = (memberId,channelSecurity,mobile) => { - var data = { - } - return fetch('couponConfig?type=getAll', data, 'POST' ) - } - + return fetch('coupon?type=fetch', 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 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 customerorders = (memberId,channelSecurity,mobile) => { +// var data = { +// productName:'幼猫全价粮', +// buyCount:'2', +// productId:'210352', +// payAmount:'517', +// memberId:'844350', +// phoneNumber:'18112621098', +// } +// return fetch('generateOrderWX', 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', memberId, 'POST' ) - } +//地址的查询 +export const selectaddress = (memberId, pet, address) => { + var data = { + memberId: memberId, + } + return fetch('memberAddress?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 = (userid,) => { - // var data = { - // memberId:userid, - // id:id, - // isDefault:isDefault, - // } - return fetch('memberAddress?type=update', userid, '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', memberId, 'POST') +} + +//删除 +export const editdelete = (memberId, ids) => { + var data = { + memberId: memberId, + ids: ids, + } + return fetch('memberAddress?type=delete', data, 'POST') +} + +//地址的编辑 +export const editupdate = (userid, ) => { + // var data = { + // memberId:userid, + // id:id, + // isDefault:isDefault, + // } + return fetch('memberAddress?type=update', userid, 'POST') +} //修改密码 -export const userchange = (id, pet,address) => { - var data = { - id:id, - } - return fetch('member?type=update', data, 'POST' ) +export const userchange = (id, pet, address) => { + var data = { + id: id, + } + return fetch('member?type=update', data, 'POST') } @@ -616,10 +616,10 @@ export const userchange = (id, pet,address) => { */ export const getCartList = (user) => { - var data = { - user - } - return fetch('/api/cartList', data) + var data = { + user + } + return fetch('/api/cartList', data) } /** @@ -627,13 +627,13 @@ export const getCartList = (user) => { */ export const submitOrder = (phone, id, total, oldOrder) => { - var data = { - phone, - id, - total, - oldOrder - } - return fetch('/api/submitOrder', data) + var data = { + phone, + id, + total, + oldOrder + } + return fetch('/api/submitOrder', data) } /** @@ -641,46 +641,52 @@ export const submitOrder = (phone, id, total, oldOrder) => { */ export const paySuccess = (id, uers) => { - var data = { - id, - uers - } - return fetch('/api/paySuccess', data) + var data = { + id, + uers + } + return fetch('/api/paySuccess', data) } /** * 请求订单列表 */ export const getOrderList = (user, status) => { - var data = { - user, - status - } - return fetch('/api/getOrderList', data) + var data = { + user, + status + } + return fetch('/api/getOrderList', data) } - //购物车操作 - export const memberAddress = (type,data) => { - return fetch('memberAddress?type='+type, data, 'POST' ) - } +//购物车操作 +export const memberAddress = (type, data) => { + return fetch('memberAddress?type=' + type, data, 'POST') +} - - //支付宝支付二维码 - export const generateOrderAlipay = (orderNo, payType) => { - //Dictionary : 1: PC, 2: Mobile - let url = 'generateOrderAlipayPC'; - if(payType == 2) { - url = 'generateOrderAlipayPhone' - } - var data = { - //orderNo:orderNo - } - url = url+"?orderNo="+orderNo; - return fetch(url, data, 'POST') - //let ret = { "code": 1, "msg": "操作成功!", "success": true, "data": "
\n\n\n
\n" }; - //ret = JSON.parse(ret); - //return ret; +//购物车操作 +export const changeCartNumber = (data) => { + return fetch('updateCartCount', data, 'POST') +} + + + + +//支付宝支付二维码 +export const generateOrderAlipay = (orderNo, payType) => { + //Dictionary : 1: PC, 2: Mobile + let url = 'generateOrderAlipayPC'; + if (payType == 2) { + url = 'generateOrderAlipayPhone' } - \ No newline at end of file + var data = { + //orderNo:orderNo + } + url = url + "?orderNo=" + orderNo; + return fetch(url, data, 'POST') + //let ret = { "code": 1, "msg": "操作成功!", "success": true, "data": "
\n\n\n
\n" }; + //ret = JSON.parse(ret); + //return ret; +} diff --git a/rc-busness/ajax/util.js b/rc-busness/ajax/util.js index c94e65de..4671e8b7 100644 --- a/rc-busness/ajax/util.js +++ b/rc-busness/ajax/util.js @@ -56,7 +56,7 @@ let util = { message = '请返回支付宝继续当前订单的支付'; break; case "3": - message = '请返回手机网页端继续当前订单的支付'; + message = '请返回手机网页端继续当前订单的支付或扫描二维码进行支付'; break; default: message = '订单已过期，请重新下单'; diff --git a/rc-busness/assets/css/orderquantity.less b/rc-busness/assets/css/orderquantity.less index b78087ff..076a1efe 100644 --- a/rc-busness/assets/css/orderquantity.less +++ b/rc-busness/assets/css/orderquantity.less @@ -463,7 +463,12 @@ } - + .qrcode{ + margin: 0 auto; + display: flex; + justify-content: center; + align-items: center; + } } \ No newline at end of file diff --git a/rc-busness/assets/css/settlement.less b/rc-busness/assets/css/settlement.less index 07d11a18..2f715122 100644 --- a/rc-busness/assets/css/settlement.less +++ b/rc-busness/assets/css/settlement.less @@ -1,636 +1,608 @@ ul li ol li em strong i { - list-style: none; - font-style: normal; + list-style: none; + font-style: normal; } //手机端 @media screen and (max-width: 768px) { - .rc-button{ - position: fixed; - bottom: 0; - width: 100%; - height: 0.8rem; - background-color: white; - display: flex; - justify-content: space-between; - align-items: center; - box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); - .rc-left{ - margin-left: 0.20rem; - } - span{ - font-size: 14px; + .rc-button { + position: fixed; + bottom: 0; + width: 100%; + height: 0.8rem; + background-color: white; + display: flex; + justify-content: space-between; + align-items: center; + box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + .rc-left { + margin-left: 0.2rem; + } + span { + font-size: 14px; -color: #333333; - } - em{ - font-style: normal; - font-size: 0.18rem; - color: #E1001A; - } - strong{ - display: flex; - align-items: center; - justify-content: center; - height: 0.48rem; - background: #E2001A; - border-radius: 0.30rem; - color: white; - width: 1rem; - margin-right: 0.2rem -; - } - } - .rc-main { - width: 92%; - margin: 0 auto; - .rc-userbottom{ - display: none; - } - .viewdetails{ - display: none; - } - .rc-foo{ - display: none; - } - .rc-receiving { - width: 100%; - height: 80px; - display: flex; - align-items: center; - em { - font-style: normal; - color: #e1001a; - font-size: 22px; - } - span { - color: #666666; - font-size: 12px; - display: block; - margin-left: 18px; - width: 62%; + color: #333333; + } + em { + font-style: normal; + font-size: 0.18rem; + color: #e1001a; + } + strong { + display: flex; + align-items: center; + justify-content: center; + height: 0.48rem; + background: #e2001a; + border-radius: 0.3rem; + color: white; + width: 1rem; + margin-right: 0.2rem; + } + } + .rc-main { + width: 92%; + margin: 0 auto; + .rc-userbottom { + display: none; + } + .viewdetails { + display: none; + } + .rc-foo { + display: none; + } + .rc-receiving { + width: 100%; + height: 80px; + display: flex; + align-items: center; + em { + font-style: normal; + color: #e1001a; + font-size: 22px; + } + span { + color: #666666; + font-size: 12px; + display: block; + margin-left: 18px; + width: 62%; + } + } + .delivery { + display: flex; + flex-direction: column; + height: 80px; + .to-delivery { + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 3px; + } + i { + font-style: normal; + margin-left: 8px; + display: block; + } + } + .bo-delivery { + span { + font-size: 14px; - } - } - .delivery { - display: flex; - flex-direction: column; - height: 80px; - .to-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 3px; - } - i { - font-style: normal; - margin-left: 8px; - display: block; - } - } - .bo-delivery { - span { - font-size: 14px; + color: #666666; + display: block; + margin-top: 8px; + } + } + } - color: #666666; - display: block; - margin-top: 8px; - } - } - } + .mypersonal { + display: flex; + flex-direction: column; + justify-content: center; + height: 80px; + .my-delivery { + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + } + i { + font-style: normal; + margin-left: 8px; + display: block; + } + } + .per-delivery { + span { + font-size: 14px; - .mypersonal { - display: flex; - flex-direction: column; - justify-content: center; - height: 80px; - .my-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - } - i { - font-style: normal; - margin-left: 8px; - display: block; - } - } - .per-delivery { - span { - font-size: 14px; + color: #666666; + display: block; + margin-top: 8px; + } + } + } - color: #666666; - display: block; - margin-top: 8px; - } - } - } + .rc-usermain { + display: flex; + .rc-image { + border: 1px solid #d8d8d8; + margin-top: 17px; + height: 96px; + img { + width: 96px; + height: 96px; + display: block; + } + } - .rc-usermain { - display: flex; - .rc-image { - border: 1px solid #d8d8d8; - margin-top: 17px; - height: 96px; - img { - width: 96px; - height: 96px; - display: block; - } - } + .rc-right { + .rc-userbottomm { + display: none; + } + display: flex; + flex-direction: column; + width: 100%; + margin-left: 16px; + justify-content: center; + em { + font-style: normal; + display: block; + font-size: 16px; + margin-top: 18px; + font-weight: bold; - .rc-right { - .rc-userbottomm { - display: none; - } - display: flex; - flex-direction: column; - width: 100%; - margin-left: 16px; - justify-content: center; - em { - font-style: normal; - display: block; - font-size: 16px; - margin-top: 18px; - font-weight: bold; + color: #e1001a; + } + } + .rc-userright { + display: flex; + flex-direction: column; + color: #666666; + font-size: 14px; + span { + display: block; + margin-top: 16px; + } + } + .rc-userbottom { + display: flex; + justify-content: space-between; + margin-top: 8px; + span { + color: #666666; + font-size: 14px; + } + i { + font-style: normal; + color: #e1001a; + font-size: 18px; + font-weight: bold; + } + .rc-bottom { + display: none; + } + } + .rc-bottomm { + display: flex; + align-items: center; + justify-content: flex-end; + margin-top: 24px; + span { + display: block; + width: 130px; + display: flex; + align-items: center; + line-height: 40px; + text-align: center; + color: #e2001a; + height: 40px; + font-size: 12px; + border: 2px solid #e2001a; + justify-content: center; + border-radius: 30px; + font-weight: bold; + } + span:last-child { + margin-left: 15px; + } + } + } - color: #e1001a; - } - } - .rc-userright { - display: flex; - flex-direction: column; - color: #666666; - font-size: 14px; - span { - display: block; - margin-top: 16px; - } - } - .rc-userbottom { - display: flex; - justify-content: space-between; - margin-top: 8px; - span { - color: #666666; - font-size: 14px; - } - i { - font-style: normal; - color: #e1001a; - font-size: 18px; - font-weight: bold; - } - .rc-bottom{ - display: none; - } - } - .rc-bottomm { - display: flex; - align-items: center; - justify-content: flex-end; - margin-top: 24px; - span { - display: block; - width: 130px; - display: flex; - align-items: center; - line-height: 40px; - text-align: center; - color: #e2001a; - height: 40px; - font-size: 12px; - border: 2px solid #e2001a; - justify-content: center; - border-radius: 30px; - font-weight: bold; - } - span:last-child { - margin-left: 15px; - } - } - } + .rc-merchandise { + width: 100%; + margin-top: 32px; + ul { + width: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + line-height: 26px; + i { + font-style: normal; + color: #666666; + font-size: 14px; + } + li { + list-style: none; + font-style: normal; + display: flex; + justify-content: space-between; + align-items: baseline; + span { + font-size: 14px; - .rc-merchandise { - width: 100%; - margin-top: 32px; + color: #333333; + } + } + li:last-child { + i { + color: #e1001a; + font-size: 16px; + font-style: normal; + } + } + } + .ts-right-arr { + line-height: 1rem; + height: 1.5rem; + } + } - ul { - width: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - line-height: 26px; - i { - font-style: normal; - color: #666666; - font-size: 14px; - } - li { - list-style: none; - font-style: normal; - display: flex; - justify-content: space-between; - align-items: baseline; - span { - font-size: 14px; + .rc-payment { + width: 100%; + margin-top: 32px; + .u-trackingnumber { + display: flex; + align-items: center; + i { + font-size: 14px; + 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: 26px; + i { + font-style: normal; + color: #666666; + font-size: 14px; + } + li { + list-style: none; + font-style: normal; + display: flex; + justify-content: space-between; + span { + font-size: 14px; - color: #333333; - - } - } - li:last-child { - i { - color: #e1001a; - font-size: 16px; - font-style: normal; - } - } - } - .ts-right-arr { - line-height:1rem; - height:1.5rem; - } - } - - - .rc-payment{ - width: 100%; - margin-top: 32px; - .u-trackingnumber{ - display: flex; - align-items: center; - i { - font-size: 14px; - 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: 26px; - i { - font-style: normal; - color: #666666; - font-size: 14px; - } - li { - list-style: none; - font-style: normal; - display: flex; - justify-content: space-between; - span { - font-size: 14px; - - color: #333333; - - } - } - - } - } - - } + color: #333333; + } + } + } + } + } } //pc端 @media screen and (min-width: 768px) and (max-width: 1920px) { + .rc-main { + width: 92%; + margin: 0 auto; + .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; + } + } - .rc-main { - width: 92%; - margin: 0 auto; - .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; - } - } - } + .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; + } + } + } - .mypersonal { - display: flex; - flex-direction: column; - height: 140px; - justify-content: center; - .my-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 3px; - font-size: 18px; - color: #333333; - } - i { - font-style: normal; - margin-left: 8px; - display: block; - font-size: 18px; - color: #333333; - } - } - .per-delivery { - span { - font-size: 18px; - color: #666666; - display: block; - margin-top: 16px; - } - } - } + .mypersonal { + display: flex; + flex-direction: column; + height: 140px; + justify-content: center; + .my-delivery { + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 3px; + font-size: 18px; + color: #333333; + } + i { + font-style: normal; + margin-left: 8px; + display: block; + font-size: 18px; + color: #333333; + } + } + .per-delivery { + span { + font-size: 18px; + color: #666666; + display: block; + margin-top: 16px; + } + } + } - .rc-usermain { - display: flex; - .rc-image { - border: 1px solid #d8d8d8; - margin-top: 17px; - img { - width: 96px; - height: 96px; - display: block; - } - } + .rc-usermain { + display: flex; + .rc-image { + border: 1px solid #d8d8d8; + margin-top: 17px; + img { + width: 96px; + height: 96px; + display: block; + } + } - .rc-right { - .rc-bottomm{ - display: none; - } - .rc-usercenter{ - display: flex; - justify-content: center; - flex-direction: column; - em { - font-style: normal; - display: block; - font-size: 18px; - font-weight: bold; - margin-top: 17px; - color: #e1001a; - } - } - - display: flex; - - width: 100%; - margin-left: 16px; - - - } - .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; + .rc-right { + .rc-bottomm { + display: none; + } + .rc-usercenter { + display: flex; + justify-content: center; + flex-direction: column; + em { + font-style: normal; + display: block; + font-size: 18px; + font-weight: bold; + margin-top: 17px; + color: #e1001a; + } + } - width: 80%; - justify-content: space-between; - align-items: center; - margin-left: 119px; - span { - color: #E1001A; - font-size: 20px; - } - i { - font-style: normal; - color: #e1001a; - font-size: 20px; - font-weight: bold; - } - .rc-bottom { - display: flex; - align-items: center; - justify-content: flex-end; - margin-top: 24px; - span { - display: block; - width: 164px; - display: flex; - align-items: center; - line-height: 40px; - text-align: center; - color: #e2001a; - height: 40px; - border: 2px solid #e2001a; - justify-content: center; - border-radius: 30px; - font-weight: bold; - font-size: 14px; - } - - } + display: flex; - } - } + width: 100%; + margin-left: 16px; + } + .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; - .rc-merchandise { - width: 100%; - margin-top: 32px; + width: 80%; + justify-content: space-between; + align-items: center; + margin-left: 119px; + span { + color: #e1001a; + font-size: 20px; + } + i { + font-style: normal; + color: #e1001a; + font-size: 20px; + font-weight: bold; + } + .rc-bottom { + display: flex; + align-items: center; + justify-content: flex-end; + margin-top: 24px; + span { + display: block; + width: 164px; + display: flex; + align-items: center; + line-height: 40px; + text-align: center; + color: #e2001a; + height: 40px; + border: 2px solid #e2001a; + justify-content: center; + border-radius: 30px; + font-weight: bold; + font-size: 14px; + } + } + } + } - ul { - width: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - line-height: 40px; - font-size: 18px; - i { - font-style: normal; - color: #666666; - - } - li { - list-style: none; - font-style: normal; - display: flex; - justify-content: space-between; - span { - color: #333333; - - } - } - li:last-child { - i { - color: #e1001a; - font-size: 20px; - font-style: normal; - } - } - } - } + .rc-merchandise { + width: 100%; + margin-top: 32px; + ul { + width: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + line-height: 40px; + font-size: 18px; + i { + font-style: normal; + color: #666666; + } + li { + list-style: none; + font-style: normal; + display: flex; + justify-content: space-between; + span { + color: #333333; + } + } + li:last-child { + i { + 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 { - + .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; - 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; + height: 48px; - } - 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; - } - - } - } - - } - -} \ No newline at end of file + border-radius: 30px; + } + } + } + } +} diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less index a853383b..a6409569 100644 --- a/rc-busness/assets/css/usertion.less +++ b/rc-busness/assets/css/usertion.less @@ -1,677 +1,654 @@ ul li ol li em strong i { - list-style: none; - font-style: normal; - } - .rc-main{ - margin: 0; - padding: 0; - } - - .ts-button-container { - cursor: pointer; - display:flex; - flex-direction:row; - } - //手机端 -@media screen and (max-width: 768px) { - .online{ - margin: 0; - &.bold{ - height: 0.5rem; - } - } - // 订单状态 - .rc-receiving { - width: 100%; - display: flex; - align-items: center; - // margin: 1rem 1.25rem; - em { - font-style: normal; - color: #e1001a; - font-size: 1.375rem; - font-weight: bold; - } - span { - color: #666666; - font-size: 0.875rem; - display: block; - margin-left: 1.125rem; - width: 62%; - margin-top: 0.5rem; + list-style: none; + font-style: normal; +} +.rc-main { + margin: 0; + padding: 0; +} - } - } - .ts-button-container { +.ts-button-container { + cursor: pointer; + display: flex; + flex-direction: row; +} +//手机端 +@media screen and (max-width: 768px) { + .online { + margin: 0; + &.bold { + height: 0.5rem; + } + } + // 订单状态 + .rc-receiving { + width: 100%; + display: flex; + align-items: center; + // margin: 1rem 1.25rem; + em { + font-style: normal; + color: #e1001a; + font-size: 1.375rem; + font-weight: bold; + } + span { + color: #666666; + font-size: 0.875rem; + display: block; + margin-left: 1.125rem; + width: 62%; + margin-top: 0.5rem; + } + } + .ts-button-container { justify-content: space-evenly; align-items: center; box-shadow: 0px -5px 6px rgba(0, 0, 0, 0.1); - } - //快递列表 - .delivery { - display: flex; - flex-direction: column; - margin: 1rem 1.25rem; - .to-delivery { - img{ - width: 1rem; - height: 1rem; - object-fit: contain; - } - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 0.18rem; - color: #333333; - font-size: 1rem; - font-weight: 500; - } - i { - font-style: normal; - margin-left: 0.5rem; - display: block; - color: #999999; - font-size: 0.75rem; - margin-top: 0.31rem; - } - } - .bo-delivery { - span { - font-size: 0.87rem; - color: #666666; - display: block; - margin-top: 0.5rem; - } - } - } - //地址列表 - .mypersonal{ - .my-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - font-size: 0.87rem; - color: #333333; - } - i { - font-style: normal; - display: block; - font-size: 0.87rem; - color: #333333; - margin-left: .5rem; - } - } - .per-delivery { - span { - font-size:0.875rem; - color: #666666; - display: block; - margin-top: 0.43rem; - } - } - } - .rc-main { - .rc-userbottom{ - display: none; - } - .viewdetails{ - display: none; - } - .rc-foo{ - display: none; - } - + } + //快递列表 + .delivery { + display: flex; + flex-direction: column; + margin: 1rem 1.25rem; + .to-delivery { + img { + width: 1rem; + height: 1rem; + object-fit: contain; + } + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 0.18rem; + color: #333333; + font-size: 1rem; + font-weight: 500; + } + i { + font-style: normal; + margin-left: 0.5rem; + display: block; + color: #999999; + font-size: 0.75rem; + margin-top: 0.31rem; + } + } + .bo-delivery { + span { + font-size: 0.87rem; + color: #666666; + display: block; + margin-top: 0.5rem; + } + } + } + //地址列表 + .mypersonal { + .my-delivery { + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + font-size: 0.87rem; + color: #333333; + } + i { + font-style: normal; + display: block; + font-size: 0.87rem; + color: #333333; + margin-left: 0.5rem; + } + } + .per-delivery { + span { + font-size: 0.875rem; + color: #666666; + display: block; + margin-top: 0.43rem; + } + } + } + .rc-main { + .rc-userbottom { + display: none; + } + .viewdetails { + display: none; + } + .rc-foo { + display: none; + } - .rc-usermain { - display: flex; - .rc-image { - border: 1px solid #d8d8d8; - margin-top: 17px; - height: 96px; - img { - width: 96px; - height: 96px; - display: block; - object-fit: contain; - } - } + .rc-usermain { + display: flex; + .rc-image { + border: 1px solid #d8d8d8; + margin-top: 17px; + height: 96px; + img { + width: 96px; + height: 96px; + display: block; + object-fit: contain; + } + } - .rc-right { - .rc-userbottomm { - display: none; - } - display: flex; - flex-direction: column; - width: 100%; - margin-left: 16px; - justify-content: center; - em { - font-style: normal; - display: block; - font-size: 16px; - margin-top: 18px; - font-weight: bold; + .rc-right { + .rc-userbottomm { + display: none; + } + display: flex; + flex-direction: column; + width: 100%; + margin-left: 16px; + justify-content: center; + em { + font-style: normal; + display: block; + font-size: 16px; + margin-top: 18px; + font-weight: bold; - color: #e1001a; - } - } - .rc-userright { - display: flex; - flex-direction: column; - color: #666666; - font-size: 14px; - span { - display: block; - margin-top: 16px; - } - } - .rc-userbottom { - display: flex; - justify-content: space-between; - margin-top: 8px; - span { - color: #666666; - font-size: 14px; - } - i { - font-style: normal; - color: #e1001a; - font-size: 18px; - font-weight: bold; - } - .rc-bottom{ - display: none; - } - } - .rc-bottomm { - display: flex; - align-items: center; - justify-content: flex-end; - margin-top: 24px; - span { - display: block; - width: 130px; - display: flex; - align-items: center; - line-height: 40px; - text-align: center; - color: #e2001a; - height: 40px; - font-size: 12px; - border: 2px solid #e2001a; - justify-content: center; - border-radius: 30px; - font-weight: bold; - } - span:last-child { - margin-left: 15px; - } - } - } + color: #e1001a; + } + } + .rc-userright { + display: flex; + flex-direction: column; + color: #666666; + font-size: 14px; + span { + display: block; + margin-top: 16px; + } + } + .rc-userbottom { + display: flex; + justify-content: space-between; + margin-top: 8px; + span { + color: #666666; + font-size: 14px; + } + i { + font-style: normal; + color: #e1001a; + font-size: 18px; + font-weight: bold; + } + .rc-bottom { + display: none; + } + } + .rc-bottomm { + display: flex; + align-items: center; + justify-content: flex-end; + margin-top: 24px; + span { + display: block; + width: 130px; + display: flex; + align-items: center; + line-height: 40px; + text-align: center; + color: #e2001a; + height: 40px; + font-size: 12px; + border: 2px solid #e2001a; + justify-content: center; + border-radius: 30px; + font-weight: bold; + } + span:last-child { + margin-left: 15px; + } + } + } + .rc-merchandise { + width: 100%; + margin-top: 24px; + padding-right: 0.7rem; + padding-left: 0.7rem; - .rc-merchandise { - width: 100%; - margin-top: 24px; - padding-right: 0.7rem; - padding-left: 0.7rem; + ul { + width: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + line-height: 30px; + i { + font-style: normal; + color: #666666; + font-size: 14px; + } + li { + list-style: none; + font-style: normal; + display: flex; + justify-content: space-between; + span { + font-size: 14px; - ul { - width: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - line-height: 30px; - i { - font-style: normal; - color: #666666; - font-size: 14px; - } - li { - list-style: none; - font-style: normal; - display: flex; - justify-content: space-between; - span { - font-size: 14px; + color: #333333; + } + } + li:last-child { + i { + color: #e1001a; + font-size: 16px; + font-style: normal; + } + } + } + .useruantity { + padding-right: 20px; + } + } - color: #333333; - - } - } - li:last-child { - i { - color: #e1001a; - font-size: 16px; - font-style: normal; - } - } - } - .useruantity{ - padding-right: 20px; - } - } + .rc-payment { + padding-right: 0.7rem; + padding-left: 0.7rem; + width: 100%; + margin-top: 32px; + .u-trackingnumber { + display: flex; + align-items: center; + i { + font-size: 14px; + 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: 26px; + i { + font-style: normal; + color: #666666; + font-size: 14px; + } + li { + list-style: none; + font-style: normal; + display: flex; + justify-content: space-between; + span { + font-size: 14px; - - .rc-payment{ - padding-right: 0.7rem; - padding-left: 0.7rem; - width: 100%; - margin-top: 32px; - .u-trackingnumber{ - display: flex; - align-items: center; - i { - font-size: 14px; - 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: 26px; - i { - font-style: normal; - color: #666666; - font-size: 14px; - } - li { - list-style: none; - font-style: normal; - display: flex; - justify-content: space-between; - span { - font-size: 14px; - - color: #333333; - - } - } - - } - } - - } + color: #333333; + } + } + } + } + } } - - //pc端 -@media screen and (min-width: 769px){ - - .ts-button-container{ - .ts-standard-btn{ - &:first-child{ - margin-right:1rem; - } - } - } - //快递列表 - .delivery { - display: flex; - flex-direction: column; - margin: 1rem 1.25rem; - .to-delivery { - margin-top: 20px; - img{ - width: 24px; - height: 24px; - object-fit: contain; - } - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 16px; - color: #333333; - font-size: 18px; - font-weight: 500; - } - i { - font-style: normal; - margin-left: 0.5rem; - display: block; - color: #999999; - font-size: 0.75rem; - margin-top: 0.31rem; - } - } - .bo-delivery { - margin-top: 16px; - span { - font-size: 0.87rem; - color: #666666; - display: block; - margin-top: 16px; - } - } - } - .rc-main { - margin: 0 auto; - margin-top: 90px; - - .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; - 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; - } - } - } - - .mypersonal { - display: flex; - flex-direction: column; - height: 140px; - justify-content: center; - .my-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 3px; - font-size: 18px; - color: #333333; - } - i { - font-style: normal; - margin-left: 8px; - display: block; - font-size: 18px; - color: #333333; - } - } - .per-delivery { - span { - font-size: 18px; - color: #666666; - display: block; - margin-top: 16px; - } - } - } - - .rc-usermain { - display: flex; - .rc-image { - border: 1px solid #d8d8d8; - margin-top: 17px; - img { - width: 96px; - height: 96px; - object-fit: contain; - display: block; - } - } - - .rc-right { - .rc-bottomm{ - display: none; - } - .rc-usercenter{ - display: flex; - justify-content: center; - flex-direction: column; - em { - font-style: normal; - display: block; - font-size: 18px; - font-weight: bold; - margin-top: 17px; - color: #e1001a; - width:16rem; +@media screen and (min-width: 769px) { + .ts-button-container { + .ts-standard-btn { + &:first-child { + margin-right: 1rem; + } } - } - - display: flex; - - width: 100%; - margin-left: 16px; - justify-content: end; - - } - .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; + } + //快递列表 + .delivery { + display: flex; + flex-direction: column; + margin: 1rem 1.25rem; + .to-delivery { + margin-top: 20px; + img { + width: 24px; + height: 24px; + object-fit: contain; + } + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 16px; + color: #333333; + font-size: 18px; + font-weight: 500; + } + i { + font-style: normal; + margin-left: 0.5rem; + display: block; + color: #999999; + font-size: 0.75rem; + margin-top: 0.31rem; + } + } + .bo-delivery { + margin-top: 16px; + span { + font-size: 0.87rem; + color: #666666; + display: block; + margin-top: 16px; + } + } + } + .rc-main { + margin: 0 auto; + // margin-top: 90px; + margin-top: 0; + + .notop{ + margin-top: 0; + } + + .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; + 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; + } + } - width: 80%; - justify-content: space-between; - align-items: center; - margin-left: 119px; - span { - color: #E1001A; - font-size: 20px; - } - i { - font-style: normal; - color: #e1001a; - font-size: 20px; - font-weight: bold; - } - .rc-bottom { - display: flex; - align-items: center; - justify-content: flex-end; - margin-top: 24px; - span { - display: block; - width: 164px; - display: flex; - align-items: center; - line-height: 40px; - text-align: center; - color: #e2001a; - height: 40px; - border: 2px solid #e2001a; - justify-content: center; - border-radius: 30px; - font-weight: bold; - font-size: 14px; - } - - } + .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; + } + } + } - } - } + .mypersonal { + display: flex; + flex-direction: column; + height: 140px; + justify-content: center; + .my-delivery { + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 3px; + font-size: 18px; + color: #333333; + } + i { + font-style: normal; + margin-left: 8px; + display: block; + font-size: 18px; + color: #333333; + } + } + .per-delivery { + span { + font-size: 18px; + color: #666666; + display: block; + margin-top: 16px; + } + } + } - .rc-merchandise { - width: 100%; - margin-top: 32px; + .rc-usermain { + display: flex; + .rc-image { + border: 1px solid #d8d8d8; + margin-top: 17px; + img { + width: 96px; + height: 96px; + object-fit: contain; + display: block; + } + } - ul { - width: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - line-height: 40px; - font-size: 18px; - i { - font-style: normal; - color: #666666; - - } - li { - list-style: none; - font-style: normal; - display: flex; - justify-content: space-between; - span { - color: #333333; - - } - } - li:last-child { - i { - color: #e1001a; - font-size: 20px; - font-style: normal; - } - } - } - } + .rc-right { + .rc-bottomm { + display: none; + } + .rc-usercenter { + display: flex; + justify-content: center; + flex-direction: column; + em { + font-style: normal; + display: block; + font-size: 18px; + font-weight: bold; + margin-top: 17px; + color: #e1001a; + width: 16rem; + } + } + display: flex; - .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 { - + width: 100%; + margin-left: 16px; + justify-content: end; + } + .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; - 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; + width: 80%; + justify-content: space-between; + align-items: center; + margin-left: 119px; + span { + color: #e1001a; + font-size: 20px; + } + i { + font-style: normal; + color: #e1001a; + font-size: 20px; + font-weight: bold; + } + .rc-bottom { + display: flex; + align-items: center; + justify-content: flex-end; + margin-top: 24px; + span { + display: block; + width: 164px; + display: flex; + align-items: center; + line-height: 40px; + text-align: center; + color: #e2001a; + height: 40px; + border: 2px solid #e2001a; + justify-content: center; + border-radius: 30px; + font-weight: bold; + font-size: 14px; + } + } + } + } - } - em{ - font-style: normal; - color: #E1001A; - font-size: 26px; + .rc-merchandise { + width: 100%; + margin-top: 32px; - } - } - } + ul { + width: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; + line-height: 40px; + font-size: 18px; + i { + font-style: normal; + color: #666666; + } + li { + list-style: none; + font-style: normal; + display: flex; + justify-content: space-between; + span { + color: #333333; + } + } + li:last-child { + i { + color: #e1001a; + font-size: 20px; + font-style: normal; + } + } + } + } - } - - - - -} \ No newline at end of file + .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; + .online{ + margin-bottom: 20px; + } + .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; + } + } + } + } +} diff --git a/rc-busness/components/tabs.vue b/rc-busness/components/tabs.vue index 00cc39ba..e12d9442 100644 --- a/rc-busness/components/tabs.vue +++ b/rc-busness/components/tabs.vue @@ -3,7 +3,7 @@ {{ this.homepageName }} - {{ item.title }} @@ -29,7 +29,9 @@ export default { '/personal/useraddress/':'我的订单', '/myorder/userrecord/':'购物车', '/useraddress/openaddress/':'收货地址', - '/personal/discount/':'优惠券' + '/personal/discount/':'优惠券', + '/productdetails/producted' : '产品详情', + '/personal/useraddress' : '我的订单' }, }; }, @@ -55,7 +57,7 @@ export default { if(this.crumbs && this.crumbs.length>0) { this.crumbs.forEach(function(ele,index){ - let displayObj= {path:'',title:''}; + let displayObj= {path:'',title:'',query : {}}; if(ele.path) { displayObj.path = ele.path; for(let path in _self.nameMapping) { @@ -68,6 +70,10 @@ export default { if(ele.title) { displayObj.title = ele.title; } + + if(ele.query) { + displayObj.query = ele.query; + } _self.displayData.push(displayObj); }); } diff --git a/rc-busness/config/async/env.js b/rc-busness/config/async/env.js index 8ff9739b..f0a8185f 100644 --- a/rc-busness/config/async/env.js +++ b/rc-busness/config/async/env.js @@ -8,6 +8,7 @@ let baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/' if (process.env.NODE_ENV === 'development') { baseUrl = 'http://47.96.75.242:10086/royalcanin/royalcanin/'; + // baseUrl = 'http://192.168.10.127:10086/royalcanin/royalcanin/'; } else if (process.env.NODE_ENV === 'production') { baseUrl = 'https://shop.royalcanin.com.cn/royalcanin/royalcanin/royalcanin/'; } diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue index d1124221..d2654be4 100644 --- a/rc-busness/pages/myorder/userrecord.vue +++ b/rc-busness/pages/myorder/userrecord.vue @@ -35,7 +35,7 @@
- +
@@ -49,7 +49,7 @@
  • - +
    • @@ -61,9 +61,12 @@
    -
    @@ -99,8 +102,8 @@ import Myheader from '~/components/header.vue'; import MyFooter from '~/components/rc-footer.vue'; import tabs from '@/components/tabs.vue'; -import { mapMutations,mapState } from 'vuex'; -import { isexistCart, generateOrderWX, deleteCart } from '../../ajax/getData'; +import { mapMutations, mapState } from 'vuex'; +import { isexistCart, generateOrderWX, deleteCart,changeCartNumber } from '../../ajax/getData'; export default { middleware: 'metaTitle', meta: { title: '购物车' }, @@ -167,15 +170,14 @@ export default { }; }, mounted() { - if(this.userInfo && this.loginState){ + if (this.userInfo && this.loginState) { this.carmessage(); // this.checkIsLogin(); } - }, watch: { - userInfo(newVal){ - if(newVal && this.loginState){ + userInfo(newVal) { + if (newVal && this.loginState) { this.carmessage(); } } @@ -186,14 +188,31 @@ export default { MyFooter }, methods: { + /* 监听全选功能 */ + async toggleCheckAll(e){ + for (var i = 0; i < this.cartData.length; i++) { + this.$set(this.cartData[i],'checked',this.checkAllFlag); + } + }, + /* 监听单选 */ + async checkRadio(state){ + /* 判断是否全选 */ + let checkCart = this.cartData.filter(val=>{ + return val.checked; + }); + this.checkAllFlag = checkCart.length == this.cartData.length; + }, + //请求猫 ...mapMutations(['checkIsLogin']), async carmessage() { let user = this.userInfo; - console.log(user); this.userid = user.id; let data = await isexistCart(user.id); - console.log(data,'datadata'); + for (var i = 0; i < data.length; i++) { + let item = data[i]; + data.startBuyCount = item.buyCount; + } this.cartData = data; // this.goldmedal = data; }, @@ -280,6 +299,7 @@ export default { } this.cartData[index].buyCount = parseInt(this.cartData[index].buyCount) + 1; + this.saveCartNumber(this.cartData[index]) }, // 数量减方法 sub(num, index) { @@ -288,6 +308,26 @@ export default { } else { this.cartData[index].buyCount = parseInt(this.cartData[index].buyCount) - 1; } + + this.saveCartNumber(this.cartData[index]) + }, + /* 保存购物车数量 */ + async saveCartNumber(cartInfo){ + if(!cartInfo.buyCount || cartInfo.buyCount <= 0){ + return this.$messageToast('数量不正确','error'); + } + if (cartInfo.buyCount >= cartInfo.leftAllotment) { + cartInfo.buyCount = cartInfo.startBuyCount; + return this.$messageToast('已达到本品最大购买上限','error'); + } + + let { code } = await changeCartNumber({ + buyCount : cartInfo.buyCount, + id : cartInfo.id, + }); + if(code == 1){ + cartInfo.startBuyCount = cartInfo.buyCount; + } }, // 求总价 @@ -354,7 +394,8 @@ export default { this.$router.push({ path: '/personal/settlement', query: { - list: JSON.stringify(list) + list: JSON.stringify(list), + type: 'cart' } // params: { test:'222'}, }); @@ -420,8 +461,8 @@ export default { return this.cartData.filter(item => item.checked == true).length; }, ...mapState({ - userInfo : state => state.user.userInfo, - loginState : state => state.login.loginState, + userInfo: state => state.user.userInfo, + loginState: state => state.login.loginState }) } }; @@ -451,6 +492,15 @@ export default { height: 24px; display: block; } + + .check-all-main{ + display: flex; + justify-content: center; + align-items: center; + span{ + margin-left: 10px; + } + } span { font-style: normal; diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 38470413..e1df219a 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -2,8 +2,11 @@
    -
    -
    + + + +
    +
    {{ item.status == '0' ? '待付款' : item.status == '1' ? '待收货' : item.status == '2' ? '已完成' : item.status == '3' ? '已取消' : '异常订单' }} {{ orderstatus }} @@ -81,7 +84,7 @@
    - +
      @@ -110,9 +113,10 @@
    - +
    +
    合计金额: ￥{{ usersalesAmount }} @@ -146,6 +150,7 @@