From 4bfd884a9bc3c74a055e3d9e844a8e1b2d92bd78 Mon Sep 17 00:00:00 2001 From: Admin <376654749@qq.com> Date: Thu, 20 Jan 2022 02:47:36 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!42=20:?= =?UTF-8?q?=201-19=20He'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/ajax/getData.js | 446 +++--- rc-busness/assets/pay/fail.png | Bin 12262 -> 0 bytes rc-busness/assets/pay/wx.png | Bin 4200 -> 0 bytes rc-busness/assets/pay/zfb.png | Bin 3661 -> 0 bytes rc-busness/assets/style/default.less | 78 - rc-busness/nuxt.config.js | 38 +- rc-busness/pages/address/address.vue | 127 -- rc-busness/pages/myorder/userrecord.vue | 1399 +++++++++-------- rc-busness/pages/personal/settlement.less | 414 ----- rc-busness/pages/personal/settlement.vue | 360 ++--- rc-busness/pages/personal/userpay.vue | 796 ++++++---- rc-busness/pages/productdetails/producted.vue | 719 ++++----- 12 files changed, 1916 insertions(+), 2461 deletions(-) delete mode 100644 rc-busness/assets/pay/fail.png delete mode 100644 rc-busness/assets/pay/wx.png delete mode 100644 rc-busness/assets/pay/zfb.png delete mode 100644 rc-busness/assets/style/default.less delete mode 100644 rc-busness/pages/address/address.vue delete mode 100644 rc-busness/pages/personal/settlement.less diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index b7300477..0c1a5e5d 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,40 +56,44 @@ export const getleckCourse = (name, offset) => { * 加入购物车 */ -export const postCourseId = (productCode, buyCount, memberId, mobile, productImg, productName, productPrice, specifications) => { +export const postCourseId = (productCode,buyCount,memberId, mobile,productImg,productName,productPrice,specifications) => { var data = { - buyCount: buyCount, + buyCount:buyCount, memberId: memberId, - mobile: mobile, - productCode: productCode, + mobile:mobile, + productCode:productCode, productImg: productImg, - productName: productName, - productPrice: productPrice, - specifications: specifications + productName:productName, + productPrice:productPrice, + specifications:specifications } - return fetch('/insertCartProductInfo', data, 'POST') + return fetch('/insertCartProductInfo', data,'POST') } /** * 是否存在购物车 */ -export const isexistCart = (id) => { + export const isexistCart = (id, pet,address) => { var data = { - + memberId: id, } - return fetch('getCartProductInfo', data, 'POST') + return fetch('getCartProductInfo?memberId='+id,data,'POST') } /** * 删除购物车 */ export const deleteCart = (memberId, productCode) => { - return fetch('cancelCartProductInfo?memberId=' + memberId, productCode, 'POST') + var data = { + memberId: memberId, + productCode:productCode + } + return fetch('cancelCartProductInfo',data,'POST') } /** * 购物车批量提交 */ export const mostAddClass = (id) => { - return fetch('/api/mostAddClass/', { id }) + return fetch('/api/mostAddClass/', {id}) } /** * 删除购物车 @@ -105,47 +109,47 @@ export const mostAddClass = (id) => { /** * 发送验证码 */ -export const sendMsg = (mobile, pet, address) => { + export const sendMsg = (mobile, pet,address) => { var data = { - phoneNumber: mobile, + phoneNumber:mobile, } - return fetch('sendMsg', data, 'POST') + return fetch('sendMsg', data, 'POST' ) } /** * 发送验证码数据 */ -export const vadatnmsg = (msgNum, hash, tamp) => { + export const vadatnmsg = (msgNum,hash,tamp) => { var data = { - msgNum: msgNum, - tamp: tamp, - hash: hash + msgNum:msgNum, + tamp:tamp, + hash:hash } - return fetch('validateNum', data, 'POST') + return fetch('validateNum', data, 'POST' ) } /** * 筛选标签 */ -export const userstype = (stype, pet, address) => { + export const userstype = (stype, pet,address) => { var data = { - petType: 0, + petType:0, } - return fetch('productSearchTag/query?petType=' + 0, data, 'POST') + return fetch('productSearchTag/query?petType=' + 0, data, 'POST' ) } /** * 登录 */ -export const userLongin = (mobile, pet, address) => { +export const userLongin = (mobile, pet,address) => { var data = { - id: '', - mobile: mobile, + id:'', + mobile:mobile, } - return fetch('member?type=get', data, 'POST') + return fetch('member?type=get', data, 'POST' ) } -//注册 -export const useredit = (mobile, pet, address) => { + //注册 +export const useredit = (mobile, pet,address) => { var data = { mobile:mobile, memberName:'', @@ -180,10 +184,10 @@ export const userquery = (stype) => { console.log(stype); var data = { - goodsName: stype + goodsName:stype } - return fetch('goods?goodsName=' + stype, data, 'POST') + return fetch('goods?goodsName='+stype, data, 'POST' ) } //商品全部信息 export const userque = (stype) => { @@ -191,7 +195,7 @@ export const userque = (stype) => { console.log(stype); var data = { } - return fetch('goods', data, 'POST') + return fetch('goods', data, 'POST' ) } @@ -230,14 +234,20 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => { curRow=10; let queryTail='&page='+curPage+'&rows='+curRow; console.log(stype); - let list = {}; - stype.map(item => { + let list={}; + stype.map(item=>{ console.log(item); list=item }) var str = "&"; for(var key in list){ - str = str + key + "=" + list[key] + "&"; + + str = str + key + "=" + list[key] + "&"; + } + str = str.substr(0,str.length-1); + var data = { + page:1, + row:10 } return fetch('product/query?petType='+usertype+str+queryTail, data, 'POST' ) @@ -255,19 +265,19 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => { //查询订单 -export const userindent = (phoneNumber, orderNumber,) => { - var data = { - phoneNumber: '18112621098', - orderNumber: orderNumber, +export const userindent = (phoneNumber,orderNumber,) => { + var data = { + phoneNumber:'18112621098', + orderNumber:orderNumber, } - return fetch('orderMaster/?type=query', data, 'POST') + return fetch('orderMaster/?type=query', data, 'POST' ) } //查询订单详情 export const userin = (orderNumber,) => { - var data = { - orderNumber: orderNumber, + var data = { + orderNumber:orderNumber, } - return fetch('orderMaster/?type=query', data, 'POST') + return fetch('orderMaster/?type=query', data, 'POST' ) } @@ -275,21 +285,21 @@ export const userin = (orderNumber,) => { //取消订单 export const canceldanhao = (orderNumber) => { var data = { - - orderNumber: orderNumber, + + orderNumber:orderNumber, } - return fetch('cancelOrder/', data, 'POST') + return fetch('cancelOrder/', data, 'POST' ) } export const biaomessa = (stype) => { console.log(stype); var data = { - name: stype, - page: 1, - row: 10 + name:stype, + page:1, + row:10 } - return fetch('product/query', data, 'POST') + return fetch('product/query', data, 'POST' ) } export const biaome = (usertype,stype,curPage,rows) => { @@ -301,9 +311,9 @@ export const biaome = (usertype,stype,curPage,rows) => { let username='&name='+stype console.log(stype); var data = { - name: stype, - rows: 10, - page: 1, + name:stype, + rows:10, + page:1, } return fetch('product/query?petType='+usertype+username+queryTail,data, 'POST' ) } @@ -314,9 +324,9 @@ export const biaome = (usertype,stype,curPage,rows) => { export const memberAccount = (stype) => { console.log(stype); var data = { - memberId: stype + memberId:stype } - return fetch('memberAccount?type=history', data, 'POST') + return fetch('memberAccount?type=history', data, 'POST' ) } @@ -324,20 +334,20 @@ export const memberAccount = (stype) => { export const ordermaster = (stype) => { console.log(stype); var data = { - - memberId: '223782' + + memberId:'223782' } - return fetch('memberAccount', data, 'POST') + return fetch('memberAccount', data, 'POST' ) } //微信支付 export const payOrderWX = (stype) => { console.log(stype); var data = { - - memberId: '223782' + + memberId:'223782' } - return fetch('memberAccount', data, 'POST') + return fetch('memberAccount', data, 'POST' ) } @@ -346,9 +356,9 @@ export const payOrderWX = (stype) => { export const insercar = (stype) => { console.log(stype); var data = { - petType: stype + petType:stype } - return fetch('product/insertCartProductInfo', data, 'POST') + return fetch('product/insertCartProductInfo', data, 'POST' ) } @@ -356,25 +366,25 @@ export const insercar = (stype) => { //查询猫狗商品信息 -export const catquery = (productCode, type) => { +export const catquery = (productCode,type) => { console.log(productCode); var data = { - - petType: 0 + + petType:0 } - return fetch('h5/product/query', data, 'POST') + return fetch('h5/product/query', data, 'POST' ) } //查询猫狗商品信息 -export const dogquery = (productCode, type) => { +export const dogquery = (productCode,type) => { console.log(productCode); var data = { - - petType: 1, - pet_type: 0 + + petType:1, + pet_type:0 } - return fetch('h5/product/query', data, 'POST') + return fetch('h5/product/query', data, 'POST' ) } @@ -385,11 +395,11 @@ export const dogquery = (productCode, type) => { export const oncequery = (productCode) => { var data = { - - productCode: productCode + + productCode:productCode } - return fetch("goodsByProductCode?productCode=" + productCode, data, 'POST') + return fetch( "goodsByProductCode?productCode="+productCode, data, 'POST' ) } @@ -397,173 +407,163 @@ export const oncequery = (productCode) => { export const goodsmessage = (productCode) => { var data = { - productCode: productCode + productCode:productCode } - return fetch("productMaster/query?productCode=" + productCode, data, 'POST') + return fetch( "productMaster/query?productCode="+productCode, data, 'POST' ) } -//优惠券的插入 -export const inserdiscount = (mobile, couponId) => { - var data = { - mobile: mobile, - couponId: couponId + //优惠券的插入 + export const inserdiscount = (mobile,couponId) => { + var data = { + mobile:mobile, + couponId:couponId + } + return fetch('coupon?type=fetch', data, 'POST' ) } - return fetch('coupon?type=fetch', data, 'POST') -} -//优惠券的查询 -export const getdiscount = (memberId, channelSecurity, mobile) => { - var data = { - memberId: memberId, - mobile: mobile + //优惠券的查询 + export const getdiscount = (memberId,channelSecurity,mobile) => { + var data = { + memberId:memberId, + mobile:mobile + } + return fetch('memberAddress?type=getAll', data, 'POST' ) + } + + //可用的优惠券 + export const alldiscount = (memberId,channelSecurity,mobile) => { + var data = { + memberId:memberId, + } + return fetch('couponConfig?type=getAll', data, 'POST' ) + } + + + //用户领取的优惠券 + export const getdraw = (mobile,states) => { + var data = { + mobile:mobile, + status:states + } + return fetch('coupon?type=getAll', data, 'POST' ) + } + + + //微信支付 + export const generateOrderWX = (list) => { + var data = [{ + + + }] + return fetch('generateOrderWX', list, 'POST' ) } - return fetch('memberAddress?type=getAll', data, 'POST') -} + //用户所有的优惠券 + export const allConfig = (memberId,channelSecurity,mobile) => { + var data = { + } + return fetch('couponConfig?type=getAll', data, 'POST' ) + } + -//可用的优惠券 -export const alldiscount = (memberId, channelSecurity, mobile) => { - var data = { - memberId: memberId, + //用户领取优惠券 + export const getConfig = (memberId,couponId) => { + var data = { + memberId:memberId, + couponId:couponId, + } + return fetch('coupon?type=fetch', data, 'POST' ) + } + + + //用户下的优惠券 + export const userConfig = (memberId,couponId) => { + var data = { + memberId:memberId, + couponId:couponId, + } + return fetch('coupon?type=fetch', data, 'POST' ) + } + + + + + //用户订单的查询 + // export const customerorders = (memberId,channelSecurity,mobile) => { + // var data = { + // productName:'幼猫全价粮', + // buyCount:'2', + // productId:'210352', + // payAmount:'517', + // memberId:'844350', + // phoneNumber:'18112621098', + // } + // return fetch('generateOrderWX', data, 'POST' ) + // } + + + //地址的查询 + export const selectaddress = (memberId, pet,address) => { + var data = { + memberId:memberId, + } + return fetch('memberAddress?type=getAll', data, 'POST' ) } - return fetch('couponConfig?type=getAll', data, 'POST') -} -//用户领取的优惠券 -export const getdraw = (mobile, states) => { - var data = { - mobile: mobile, - status: states + //地址的添加 //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码 + export const editaddress = (memberId, detailAddress,recipient,tel,provinceId,cityId,districtId) => { + var data = { + memberId:844350, + provinceId:25, + cityId:36, + districtId:418, + detailAddress:'古美路1455弄46号302', + recipient:'蒋缘缘2', + recipientPhone:'13671516167', + zipCode:'214423', + default:false, + } + return fetch('memberAddress?type=add', data, 'POST' ) } - return fetch('coupon?type=getAll', data, 'POST') -} + //删除 + export const editdelete = (memberId,ids) => { + var data = { + memberId:memberId, + ids:ids, + } + return fetch('memberAddress?type=delete', data, 'POST' ) + } -//微信支付 -export const generateOrderWX = (list) => { - return fetch('generateOrderWX', list, 'POST') -} -//微信支付返回 -export const updateOrderWX = (data) => { - return fetch('updateOrderWX', data, 'POST') -} -//支付宝支付 -export const generateOrderAlipay = (list) => { - return fetch('generateOrderAlipay', list, 'POST') -} - -//用户所有的优惠券 -export const allConfig = (memberId, channelSecurity, mobile) => { - var data = { - } - return fetch('couponConfig?type=getAll', data, 'POST') -} - - -//用户领取优惠券 -export const getConfig = (memberId, couponId) => { - var data = { - memberId: memberId, - couponId: couponId, - } - return fetch('coupon?type=fetch', data, 'POST') -} - - -//用户下的优惠券 -export const userConfig = (memberId, couponId) => { - var data = { - memberId: memberId, - couponId: couponId, - } - return fetch('coupon?type=fetch', data, 'POST') -} - - - - -//用户订单的查询 -// export const customerorders = (memberId,channelSecurity,mobile) => { -// var data = { -// productName:'幼猫全价粮', -// buyCount:'2', -// productId:'210352', -// payAmount:'517', -// memberId:'844350', -// phoneNumber:'18112621098', -// } -// return fetch('generateOrderWX', data, 'POST' ) -// } - -//地址的查询 -export const memberAddress = (type, data) => { - return fetch('memberAddress?type=' + type, data, 'POST') -} - - -//地址的查询 -export const selectaddress = (memberId, pet, address) => { - var data = { - memberId: memberId, - } - return fetch('memberAddress?type=getAll', data, 'POST') -} - - -//地址的添加 //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码 -export const editaddress = (memberId, detailAddress, recipient, tel, provinceId, cityId, districtId) => { - var data = { - memberId: 844350, - provinceId: 25, - cityId: 36, - districtId: 418, - detailAddress: '古美路1455弄46号302', - recipient: '蒋缘缘2', - recipientPhone: '13671516167', - zipCode: '214423', - default: false, - } - return fetch('memberAddress?type=add', data, 'POST') -} - -//删除 -export const editdelete = (memberId, ids) => { - var data = { - memberId: memberId, - ids: ids, - } - return fetch('memberAddress?type=delete', data, 'POST') -} - -//地址的编辑 -export const editupdate = (mobile, pet, address) => { - var data = { - - memberId: '3242', - id: '620111', - provinceId: '', - cityId: '', - districtId: '', - detailAddress: '江西省萍乡市', - recipient: '刘佳敏', - recipientPhone: '13407998521', - zipCode: '', - isDefault: '', - } - return fetch('memberAddress?type=update', data, 'POST') -} + //地址的编辑 + export const editupdate = (mobile, pet,address) => { + var data = { + + memberId:'3242', + id:'620111', + provinceId:'', + cityId:'', + districtId:'', + detailAddress:'江西省萍乡市', + recipient:'刘佳敏', + recipientPhone:'13407998521', + zipCode:'', + isDefault:'', + } + return fetch('memberAddress?type=update', data, 'POST' ) + } //修改密码 -export const userchange = (id, pet, address) => { +export const userchange = (id, pet,address) => { var data = { - id: id, + id:id, } - return fetch('member?type=update', data, 'POST') + return fetch('member?type=update', data, 'POST' ) } diff --git a/rc-busness/assets/pay/fail.png b/rc-busness/assets/pay/fail.png deleted file mode 100644 index 71821a9b81a294b89db107458d57e11eec7098cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12262 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 Jt7R>M{}0}}0Z;${ diff --git a/rc-busness/assets/pay/wx.png b/rc-busness/assets/pay/wx.png deleted file mode 100644 index 7316a9d7a3e4c17069e575e72f511572643d9db1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4200 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 diff --git a/rc-busness/assets/style/default.less b/rc-busness/assets/style/default.less deleted file mode 100644 index 530384c0..00000000 --- a/rc-busness/assets/style/default.less +++ /dev/null @@ -1,78 +0,0 @@ -* { - margin: 0; - padding: 0; -} - -html { - line-height: 160%; -} - -.rc_contline { - border-bottom: 3px solid #f6f6f6; - height: 0px; - margin: 0; - clear: both; -} - -.page_modules { - padding-top: 100px; -} - -.cont_modules { - margin: 0 auto; - max-width: 1400px; -} - -.inline_right { - display: flex; - justify-content: space-between; - width: 100%; -} - -.inline_mid { - display: flex; - justify-content: space-around; - width: 100%; -} - -.inline_left { - display: flex; - justify-content: space-evenly; - width: 100%; - -} - -.li_inline { - li { - display: inline-block; - vertical-align: middle; - } - -} - -.color_red { - color: #E2001A; -} - -.tc { - text-align: center; -} - -.tr { - text-align: right; -} -.el-dialog{ - width: 90%; - max-width: 440px; -} -#tns2-iw{ height: 90px;} -.rc-carousel:not(.rc-carousel--loaded){visibility:visible!important} -@media screen and (max-width: 768px) { - .el-message-box{ - width: 300px; - } - .el-dialog{ - width: 90%; - } - } - \ No newline at end of file diff --git a/rc-busness/nuxt.config.js b/rc-busness/nuxt.config.js index 9b2e9bfe..cc8a93f8 100644 --- a/rc-busness/nuxt.config.js +++ b/rc-busness/nuxt.config.js @@ -1,11 +1,11 @@ const trackingScript = 'var dataLayer = window.dataLayer = window.dataLayer || [];dataLayer.push({"user":{"sitecoreId":"00000000-0000-0000-0000-000000000000","locale":"zh-HK"},"session":{"id":"vvfwez43vfoomct4y3yqneqy"},"site":{"country":"HK","id":"RCGlobalMC1","environment":"prd"},"page":{"type":"Start of Life Page","hitTimestamp":"2020-10-16T16:26:21.7350880+00:00","topic":"Collecting your kitten and their first week with you","theme":"Cat"},"pet":{"specieId":"2"}});'; const assetsUrl = 'var assetsUrl="/royalcanin-cdn-assets-new/css_js/";var isInitialized=false;'; export default { - + // Global page headers: https://go.nuxtjs.dev/config-head head: { title: 'rc-busness', - + htmlAttrs: { lang: 'en', }, @@ -14,12 +14,12 @@ export default { // { src: '/js/flexible.js', type: 'text/javascript', charset: 'utf-8'}, { src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14053/index.js' }, //{ src: 'https://ocstest.royalcanin.com.cn:8081/livechat/chatapp/customer/branch/RoyalCanin/14054/index.js' }, - { innerHTML: trackingScript, type: 'text/javascript', charset: 'utf-8' }, - { innerHTML: assetsUrl, type: 'text/javascript', charset: 'utf-8' }, - { src: '/royalcanin-cdn-assets-new/css_js/royal-canin.min.bundle.js' }, - - ], - __dangerouslyDisableSanitizers: ['script', 'innerHTML'], + { innerHTML: trackingScript, type: 'text/javascript', charset: 'utf-8'}, + { innerHTML: assetsUrl, type: 'text/javascript', charset: 'utf-8'}, + { src: '/royalcanin-cdn-assets-new/css_js/royal-canin.min.bundle.js' }, + + ], + __dangerouslyDisableSanitizers: ['script', 'innerHTML'], meta: [ { charset: 'utf-8' }, @@ -29,8 +29,8 @@ export default { ], link: [ { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }, - { rel: 'stylesheet', id: 'royal-canin', href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.critical.css?v=8-10-0' }, - //{ rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.css?v=8-10-0'}, + { rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.critical.css?v=8-10-0'}, + //{ rel: 'stylesheet', id:'royal-canin' ,href: '/royalcanin-cdn-assets-new/css_js/royal-canin.styles.prefix.min.css?v=8-10-0'}, ] }, @@ -38,12 +38,10 @@ export default { css: [ 'vant/lib/index.css', 'element-ui/lib/theme-chalk/index.css', - '@/assets/style/default.less', { src:'@/assets/css/global.less'}, { src:'@/assets/css/royalcanin-custom.css'}, - { src: "swiper/css/swiper.css" } - + ], router: { middleware: ['metaTitle'] @@ -56,8 +54,8 @@ export default { '@/plugins/ElementUI', { src: '@/plugins/localStorage', ssr: false }, - - + + ], // Auto import components: https://go.nuxtjs.dev/config-components @@ -70,12 +68,12 @@ export default { // Modules: https://go.nuxtjs.dev/config-modules modules: [ '@nuxtjs/axios', - ['nuxt-tailvue', { toast: true }], - + ['nuxt-tailvue', {toast: true}], + ], - + styleResources: { - less: '/assets/style/default.less' // less文件路径 + less: '@/assets/style/less/default.less' // less文件路径 }, // Build Configuration: https://go.nuxtjs.dev/config-build build: { @@ -95,7 +93,7 @@ export default { // '^/api/': '/', // changeOrigin: true // }, - + // } // }, diff --git a/rc-busness/pages/address/address.vue b/rc-busness/pages/address/address.vue deleted file mode 100644 index 58b6837e..00000000 --- a/rc-busness/pages/address/address.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - - \ No newline at end of file diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue index 7c284dfa..3b1991bb 100644 --- a/rc-busness/pages/myorder/userrecord.vue +++ b/rc-busness/pages/myorder/userrecord.vue @@ -1,101 +1,108 @@ \ No newline at end of file diff --git a/rc-busness/pages/personal/settlement.less b/rc-busness/pages/personal/settlement.less deleted file mode 100644 index 72c8358a..00000000 --- a/rc-busness/pages/personal/settlement.less +++ /dev/null @@ -1,414 +0,0 @@ -ul li ol li em strong i { - list-style: none; - font-style: normal; -} - -.rc-header { - width: 100%; -} - - - -.settlement { - padding-top: 100px; -} - - -.rc-main { - width: 92%; - margin: 0 auto; - max-width: 1400px; - - .rc-userbottomm { - display: none; - } - - .rc-border { - width: 100%; - border-bottom: 1px solid #d7d7d7; - margin-top: 32px; - } - - .rc-receiving { - width: 100%; - height: 80px; - display: flex; - flex-direction: column; - - em { - font-style: normal; - color: #e1001a; - font-size: 26px; - } - - span { - color: #666666; - font-size: 16px; - display: block; - margin-top: 25px; - } - } - - .delivery { - display: flex; - flex-direction: column; - height: 140px; - display: flex; - justify-content: center; - - .viewdetails { - display: flex; - align-items: center; - justify-content: flex-end; - - span { - color: #444444; - font-size: 18px; - display: block; - margin-right: 8px; - } - - img { - width: 8px; - height: 16px; - } - } - - .to-delivery { - display: flex; - align-items: center; - font-style: normal; - - span { - display: block; - // margin-left: 16px; - font-size: 18px; - color: #333333; - } - - i { - font-style: normal; - margin-left: 8px; - display: block; - font-size: 18px; - color: #999999; - } - } - - .bo-delivery { - span { - font-size: 16px; - color: #666666; - display: block; - margin-top: 16px; - } - } - } - - .address-list { - display: flex; - - .mypersonal { - display: flex; - flex-direction: column; - justify-content: center; - border: 1px solid #808285; - height: 118px; - width: 320px; - padding: 15px; - color: #333333; - margin: 20px 40px 20px 0; - position: relative; - cursor: pointer; - - &.active { - border: 1px solid #E2001A; - } - - .edit { - position: absolute; - top: 5px; - right: 8px; - display: none; - cursor: pointer; - } - - &:hover { - .edit { - display: block; - } - } - - .my-delivery { - display: flex; - align-items: center; - font-style: normal; - - span { - display: block; - margin-left: 3px; - - } - - i { - font-style: normal; - margin-left: 3px; - display: block; - } - } - - .per-delivery { - span { - color: #666666; - display: block; - margin-top: 5px; - } - } - } - } - - - .rc-usermain { - display: flex; - padding: 20px 0; - - .rc-image { - border: 1px solid #d8d8d8; - margin-right: 20px; - - img { - width: 96px; - height: 96px; - display: block; - } - } - - .rc-right { - .rc-usercenter { - display: flex; - justify-content: center; - flex-direction: column; - - h3, - .price { - font-style: normal; - display: block; - font-size: 18px; - font-weight: bold; - margin-top: 17px; - color: #e1001a; - } - } - - display: flex; - justify-content: space-between; - width: 100%; - } - - .rc-userright { - display: flex; - flex-direction: column; - color: #666666; - font-size: 16px; - - span { - display: block; - margin-top: 16px; - font-size: 16px; - } - } - - .rc-userbottom { - display: flex; - width: 60%; - justify-content: space-between; - align-items: center; - - .price { - font-style: normal; - color: #e1001a; - font-size: 20px; - font-weight: bold; - } - - } - } - - .rc-merchandise { - - padding: 15px 0; - - &::after { - display: block; - content: ''; - clear: both; - } - - ul { - width: 25%; - display: flex; - flex-direction: column; - justify-content: space-between; - line-height: 40px; - float: right; - - i { - font-style: normal; - color: #666666; - } - - li { - list-style: none; - font-style: normal; - display: flex; - justify-content: space-between; - - span { - color: #333333; - } - } - - li .red { - color: #e1001a; - font-size: 20px; - font-style: normal; - } - } - } - - .rc-payment { - width: 100%; - margin-top: 80px; - - .u-trackingnumber { - display: flex; - align-items: center; - - i { - font-size: 18px; - font-style: normal; - margin-right: 16px; - } - - img { - width: 8px; - height: 16px; - } - } - - ul { - width: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; - line-height: 40px; - font-size: 18px; - - i { - font-style: normal; - color: #666666; - display: block; - } - - li { - list-style: none; - font-style: normal; - display: flex; - justify-content: space-between; - - span { - color: #333333; - } - } - } - } - - .rc-foot { - display: flex; - flex-direction: column; - - .rc-foo { - display: flex; - justify-content: flex-end; - flex-direction: column; - align-items: self-end; - - i { - font-style: normal; - color: #333333; - font-size: 20px; - margin-right: 20px; - } - - em { - font-style: normal; - color: #e1001a; - font-size: 26px; - } - - span { - display: block; - width: 164px; - margin-top: 36px; - background: #e2001a; - line-height: 48px; - text-align: center; - color: white; - font-size: 16px; - - height: 48px; - - border-radius: 30px; - } - } - } -} -.diallog_width{ - width: 100%; - max-width: 440px; -} -.el-dialog{ - width: 100%; -} -//手机端 -@media screen and (max-width: 768px) { - - .diallog_width{ - width: 100%; - - } - .rc-main { - .address-list { - display: contents; - - .mypersonal { - width: 100%; - height: auto; - } - } - .rc-usermain { - .rc-right { display: table} - } - .rc-merchandise{ - padding: 15px 0 120px; - ul{ - float: none; - width: 100%; - } - } - .rc-foot{ - .rc-foo{ - display: flex; - justify-content: space-around; - flex-direction: row; - align-items: self-end; - position: fixed; - bottom: 0; - background: #fff; - width: 100%; - padding: 10px; - } - } - } - -} \ No newline at end of file diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index f600c887..878947ec 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -1,5 +1,5 @@ @@ -113,18 +112,23 @@ export default { meta: {title: '订单结算'}, data() { return { - goldmedal: [], + goldmedal:[], addressstype: null, - orderstatus: "", - userisdelivery: "待收货", + orderstatus: '', + userisdelivery:'待收货', userdelivery: "派送中", - isshow: true, + isshow:true, leftico: require("../../assets/image/rc-left.png"), - orderNumber: "", - dialogAdd: false, - editAddressData: {}, - curAddress: {}, - saveType: "", + orderNumber:'', + + // delivery: [ + // { + // state: "派送中", + // time: "2021-11-21", + // address: "广州天河—刘某某【15124617917】正在派送中", + // }, + // ], + useraddress: [ { state: "李某某", @@ -166,166 +170,40 @@ export default { promotion: "￥167.00", payment: "￥0.00 ", }, + information: { + reference: "1111111111111111", + ordertime: "2012-12-01 11:20:00", + paymentmethod: "微信支付", + distribution: "快递", + trackingnumber: "11111111111111", + catimage: require("../../assets/image/rc-left.png"), + }, }; }, - computed: { - // 总价计算 - sumPrice() { - return this.goldmedal - .reduce((pre, cur) => { - console.log(pre); - return pre + cur.buyCount * cur.productPrice; - }, 0); - }, - }, methods: { - async getAddressList() { - let memberId = JSON.parse(localStorage.getItem("userInfo")).data.id; - let { data } = await memberAddress("getAll", { memberId: memberId }); - data.forEach((item) => { - item.address = - item.provinceName + - item.cityName + - item.districtName + - item.detailAddress; - }); - this.useraddress = data; - console.log(data); - }, - editAddress(item) { - this.editAddressData = { - memberId: item.memberId, - name: item.recipient, - tel: item.recipientPhone, - detailAddress: item.detailAddress, - id: item.id, - city: item.cityName, - districtId: item.districtName, - saveType: "edit", - }; - this.dialogAdd = true; - }, - addAddress() { - this.editAddressData = {}; - this.dialogAdd = true; - }, - selectAddress(cur) { - this.useraddress.forEach((item) => { - if (item.id == cur.id) { - item.isDefault = true; - } else { - item.isDefault = false; - } - }); - - }, - dialogCtrl(parm) { - this.dialogAdd = parm; - this.getAddressList(); - }, - async jiesuan() { - let orderAddress = this.useraddress.filter(item=>item.isDefault) - let postData =[] - this.goldmedal.forEach(item=>{ - let oneProduct={ - productName: item.productName, - buyCount: item.buyCount, - productId:item. productCode, - payAmount: item.productPrice, - memberId: item.memberId, - phoneNumber: item.mobile, - // couponId: "NGQ2022P12", - // couponTypeId: "4", - // couponName: "内购券", - // couponAmount: "0.3175", - // couponCode: "0007792402", - orderAddress: { - addressPhoneNumber:orderAddress[0].recipientPhone, - addressUserName:orderAddress[0].recipient, - addressProvinceName: orderAddress[0].provinceName, - addressCityName:orderAddress[0].cityName, - addressCountyName: orderAddress[0].districtName, - addressDetailInfo: orderAddress[0].detailAddress, - }, - } - postData.push(oneProduct) - }) - // let postData = [ - // { - // productName: this.goldmedal.productName, - // buyCount: "2", - // productId: "20030200", - // payAmount: "147.00", - // memberId: "844350", - // phoneNumber: "18112621098", - // couponId: "NGQ2022P12", - // couponTypeId: "4", - // couponName: "内购券", - // couponAmount: "0.3175", - // couponCode: "0007792402", - // orderAddress: { - // addressPhoneNumber:orderAddress[0].recipientPhone, - // addressUserName:orderAddress[0].recipient, - // addressProvinceName: orderAddress[0].provinceName, - // addressCityName:orderAddress[0].cityName, - // addressCountyName: orderAddress[0].districtName, - // addressDetailInfo: orderAddress[0].detailAddress, - // }, - // }, - // // { - // // productName: "幼猫全价粮", - // // buyCount: "2", - // // productId: "20030200", - // // payAmount: "147.00", - // // memberId: "844350", - // // phoneNumber: "18112621098", - // // couponId: "NGQ2022P12", - // // couponTypeId: "4", - // // couponName: "内购券", - // // couponAmount: "0.3175", - // // couponCode: "0007792402", - // // orderAddress: { - // // addressPhoneNumber: "13602898745", - // // addressUserName: "张三", - // // addressProvinceName: "江苏省", - // // addressCityName: "无锡市", - // // addressCountyName: "江阴市", - // // addressDetailInfo: "东苑一村", - // // }, - // // }, - // ]; - // let res = await generateOrderWX(postData); - // if (res.success) { - // let payData=res.data - let userPayData={ - postData:postData, - wxPay:'weixin://wxpay/bizpayurl?pr=4RJbokxzz' - - } +jiesuan(){ + // let userdata=this.$route.query.wxdata this.$router.push({ - path: "/personal/userpay", - query: { - userPayData: userPayData, - }, - }); - // } - }, - async canceldanhao(orderNumber) { - let data = await userin(orderNumber); - console.log(data); - // this.goldmedal=data; - console.log(this.goldmedal); - }, + path: "/personal/userpay", + query: { + wxdata:userdata + }, + + }); +}, + async canceldanhao(orderNumber){ + let data=await userin(orderNumber); + console.log(data); +// this.goldmedal=data; + console.log(this.goldmedal); +}, }, mounted() { - this.goldmedal = this.$route.query.list; - console.log(this.$route.query.list); - this.getAddressList(); - // this.addressstype = this.$route.query.stype; - // this.orderNumber = this.$route.query.orderNumber; - // this.canceldanhao(this.orderNumber); - // console.log(this.$refs.rccolor); - // this.$refs.rccolor.style.background = "gray"; + this.addressstype = this.$route.query.stype; + this.orderNumber=this.$route.query.orderNumber; + this.canceldanhao(this.orderNumber) + console.log(this.$refs.rccolor) + this.$refs.rccolor.style.background='gray'; }, components: { Myheader, diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index 2e3c85fb..a3070243 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -1,320 +1,578 @@ \ No newline at end of file diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 96b4f4c9..dc8b3529 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -73,222 +73,159 @@
+
+
+
+
+ 商品规格：
-
-
- -
-
- -
-
- - -
-
-
-
- -
-
-
-
-
-

{{ item.productName }}

-
-
-
-
-
-
- 商品价格： - ￥{{ item.rsp }} - ￥{{ item.ecPrice }} - -
-
-
- 活动促销： - 全场商品限时优惠 -
- 立即领取 -
-
-
-
-
-
-
- -
-
-
-
- 商品规格： -
- - - {{ item.specifications }} - -
-
-
-
-
商品数量：
- - {{ sales_num }} - -
-
-
-
-
-
-
-
- 加入购物车 - 立即购买 -
-
-
    -
  • - 服务说明：当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解) -
    • -
  • - 商品运费：全场包邮(港澳除外) -
    • + + {{ item.specifications }} + +
+
+
+
+
商品数量：
+ + {{sales_num}} + +
+
+
+
+
+
+
+
+
    +
  • + 服务说明：当天14点前完成付款即日安排发货;当天14点后完成付款次日安排发货(周日及国家法定节假日顺延至下一个工作日发货,活动期间发货或有延迟敬请理解) +
    • +
  • + 商品运费：全场包邮(港澳除外) +
    • -
  • - 商品编号：{{ item.brandCode }} -
    • -
+
  • + 商品编号：{{ item.brandCode }} +
    • + +
    +
    + 加入购物车 + 立即购买 +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
      +
    • + + {{userfixed.title}} +
      • +
    +
    + + 回到顶部 +
    +
    + + + +
    +
    + +
    +
    +
    + ￥{{ item.couponAmount }}
    -
    -
    -
    -
    - -
    - -
    -
    -
      -
    • - - {{ userfixed.title }} -
      • -
    -
    - - 回到顶部 -
    -
    - - - -
    -
    - -
    -
    -
    ￥
    -

    -
    -
    - - {{ item.special }} - -
    - 有效期 - {{ item.starttime }} -
    -
    - 立即领取 +
    + + {{ item.couponDesc }} + +
    + 有效期 + {{ item.validTo }} +
    +
    + 立即领取 +
    + +
    -
    -
    - - -
    -
    - -
    -
    -

    温馨提示

    - 请先点击下方进行登录/注册 -
    - -
    - 立即登录 -
    -     -
    -     -
    - 加入购物车 - 立即购买 + +
    + + + +
    +
    + +
    +
    +

    温馨提示

    + 请先点击下方进行登录/注册 + +
    + +
    + 立即登录 + +
    +
    + + +     +
    + 加入购物车 + 立即购买 +