From d4ca5020a0529c8a71012d075180a4415eba13e2 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:00:10 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/useraddress.vue | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 28dd88a6..9ad14587 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -287,6 +287,7 @@ export default { let data = await userindent(mobile); this.activeIndex = stype; this.goldmedal = data; + this.alllist=[]; for (let i = 0; i < this.goldmedal.length; i++) { this.useralllist.push(this.goldmedal[i].orderDetailList[0]); this.alllist.push(this.goldmedal[i].orderDetailList[0]) @@ -294,7 +295,6 @@ export default { if(this.goldmedal[i].status==0){ console.log("+++++++++++++"); this.obligation.push(this.goldmedal[i].orderDetailList[0]); - }else if(this.goldmedal[i].status==1){ this.receiving.push(this.goldmedal[i].orderDetailList[0]); } @@ -383,6 +383,8 @@ export default { }); setTimeout(() => { this.indet(); + this.activeIndex=0; + this.useralllist=[]; }, 500); } @@ -391,6 +393,15 @@ export default { userpay(item, index) { if (item.status == 0) { this.canceldanhao(item.orderNumber); + setTimeout(() => { + this.indet(this.userdata); + this.useralllist=[]; + this.alllist=[]; + this.allmessage=[]; + this.obligation=[]; + this.receiving=[]; + this.pending=[]; + }, 500); } if (item.buttontitle == "立即支付") { this.$router.push({ @@ -411,8 +422,9 @@ export default { }, selectGoods(item, index) { let list=[] - this.activeIndex = index; + console.log(this.obligation) + debugger if(item.title=='待付款'){ list=this.obligation } @@ -427,7 +439,8 @@ export default { else if(item.title=='全部'){ list=this.alllist } - console.log(this.useralllist); + this.useralllist=[]; + console.log(this.useralllist,list); for (var i = 0; i < this.useralllist.length; i++) { this.useralllist[i].orderNumber =this.goldmedal[i].orderNumber; this.useralllist[i].status = this.goldmedal[i].status @@ -437,7 +450,7 @@ export default { this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length } this.useralllist=list - + }, userfind(item) { if(item.status==0){ From faa6511d6e8bba3b3d71aa4a0dffac5ccf32f5b9 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:05:00 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/useraddress.vue | 1 - rc-busness/pages/useraddress/openaddress.vue | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 9ad14587..3924d13c 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -424,7 +424,6 @@ export default { let list=[] this.activeIndex = index; console.log(this.obligation) - debugger if(item.title=='待付款'){ list=this.obligation } diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index 60fabf15..32894653 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -155,6 +155,12 @@ export default { async userdelete(item) { console.log(item.memberId); let data = await editdelete(this.userid, item.id); + if(data){ + this.$message({ + type: 'warning', + message: '删除成功' + }); + } this.editaddress(); console.log(data); }, From 2abc052087eee20d998e15c480fae293e751b3d2 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:40:23 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/discount.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index 0fdc6204..cf467876 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -44,7 +44,7 @@
- 立即使用 +
From 09ed52dcfc9e6438f4be4fe2c9d253b4b6392fc3 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:40:38 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/useraddress.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 3924d13c..df070707 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -288,6 +288,7 @@ export default { this.activeIndex = stype; this.goldmedal = data; this.alllist=[]; + this.useralllist=[]; for (let i = 0; i < this.goldmedal.length; i++) { this.useralllist.push(this.goldmedal[i].orderDetailList[0]); this.alllist.push(this.goldmedal[i].orderDetailList[0]) @@ -429,6 +430,7 @@ export default { } else if(item.title=='待收货'){ list=this.receiving + console.log(this.receiving); }else if(item.title=='待发货'){ this.useralllist=this.pending From bfa62a1cd9a43b5be154caa039648160e7ac0890 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sat, 22 Jan 2022 21:58:34 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/myorder/usertion.vue | 17 ++++++++++++++++- rc-busness/pages/personal/useraddress.vue | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 078eebc3..fe588980 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -146,6 +146,7 @@ diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue index 0eda6010..11801ff0 100644 --- a/rc-busness/pages/productdetails/productlist.vue +++ b/rc-busness/pages/productdetails/productlist.vue @@ -2,6 +2,7 @@
+
@@ -310,6 +311,7 @@ import Myheader from "~/components/header.vue"; import MyFooter from '~/components/rc-footer.vue' import FixRight from "~/components/fixed-right.vue"; +import tabs from "~/components/tabs.vue"; import { userstype, biaome, @@ -320,21 +322,27 @@ import { export default { data() { return { - value: "", - isLoading: false, - userstype: [], - activeIndex: "0", - allacindex: 0, - userishwo: true, - userishwo4: true, - userserachlist: [ - { - categoryName: [], //专区 - tagUsedAge: [], //年龄 - tagFunction: [], //功能 - tagBreed: [], //品种 - }, - ], + crumbs:[ + { + path:'/productdetails/productlist/', + title:'产品列表', + } + ], + value: "", + isLoading: false, + userstype: [], + activeIndex: "0", + allacindex: 0, + userishwo: true, + userishwo4: true, + userserachlist: [ + { + categoryName: [], //专区 + tagUsedAge: [], //年龄 + tagFunction: [], //功能 + tagBreed: [], //品种 + }, + ], activeIndex1: 0, activeIndexa: "-1", dialogInfo1: false, @@ -477,7 +485,8 @@ export default { components: { Myheader, MyFooter, - FixRight + FixRight, + tabs }, created() { this.routeParams=this.$route.query; From 0617f2461c21300b9255be9c88c50f62a97760e1 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Sun, 23 Jan 2022 11:32:06 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/useraddress.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index f6e67a72..ef04aee1 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -302,10 +302,11 @@ export default { }else if(this.goldmedal[i].status==1){ this.receiving.push(this.goldmedal[i].orderDetailList[0]); } - else if(this.goldmedal[i].status==4){ + else if(this.useralllist[i].status==2){ this.pending.push(this.goldmedal[i].orderDetailList[0]); } } + for (var i = 0; i < this.useralllist.length; i++) { this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber; this.useralllist[i].status = this.goldmedal[i].status; @@ -349,7 +350,7 @@ export default { // addressDetailInfo: orderAddress[0].detailAddress, // }, // }; - postData.push(oneProduct); + // postData.push(oneProduct); let res = await generateOrderWX(postData); let userPayData = { orderId: res.data, From 2ff3a5d25691980a0328944c44ee9f902871ddba Mon Sep 17 00:00:00 2001 From: summation Date: Sun, 23 Jan 2022 13:46:22 +0800 Subject: [PATCH 14/14] changemessage --- rc-busness/ajax/getData.js | 592 +++++++++--------- rc-busness/pages/personal/settlement.vue | 47 +- rc-busness/pages/personal/userpay.vue | 11 +- rc-busness/pages/productdetails/producted.vue | 3 +- 4 files changed, 333 insertions(+), 320 deletions(-) diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index c3cee47a..d57d9a1e 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,41 +56,42 @@ 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, leftAllotment) => { 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, + leftAllotment: leftAllotment } - return fetch('/insertCartProductInfo', data,'POST') + 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 deleteCart = ( productCode) => { +export const deleteCart = (productCode) => { var data = { - productCode:productCode + productCode: productCode } - return fetch('cancelCartProductInfo',data,'POST') + return fetch('cancelCartProductInfo', data, 'POST') } /** * 购物车批量提交 */ export const mostAddClass = (id) => { - return fetch('/api/mostAddClass/', {id}) + return fetch('/api/mostAddClass/', { id }) } /** * 删除购物车 @@ -106,68 +107,68 @@ 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:'', - realName:'', - gender:'', - email:'', - openId:'', - unionId:'', - birthday:'', - provinceId:'', - cityId:'', - districtId:'', - storeCode:'', - remark:'', - memberMark:'', - - remark:'' + mobile: mobile, + memberName: '', + realName: '', + gender: '', + email: '', + openId: '', + unionId: '', + birthday: '', + provinceId: '', + cityId: '', + districtId: '', + storeCode: '', + remark: '', + memberMark: '', + + remark: '' } - return fetch('member?type=add', data, 'POST' ) + return fetch('member?type=add', data, 'POST') } - //查询标品全部信息 +//查询标品全部信息 // export const userquery = (mobile, pet,address) => { // var data = { // channelId:"15", @@ -177,84 +178,84 @@ export const useredit = (mobile, pet,address) => { // return fetch('h5/brand/query', data, 'POST' ) // } //点击商品全部信息 -export const userquery = (stype, ) => { +export const userquery = (stype,) => { console.log(stype); var data = { - goodsName:stype + goodsName: stype } - return fetch('goods?petType='+stype, data, 'POST' ) + return fetch('goods?petType=' + stype, data, 'POST') } //处方信息 -export const userque = (stype, curPage,curRow) => { - if(!curPage) - curPage=1; - if(!curRow) - curRow=10; - let queryTail='page='+curPage+'&rows='+curRow; - if(stype) - queryTail = '?stype='+queryTail+'&'+queryTail; +export const userque = (stype, curPage, curRow) => { + if (!curPage) + curPage = 1; + if (!curRow) + curRow = 10; + let queryTail = 'page=' + curPage + '&rows=' + curRow; + if (stype) + queryTail = '?stype=' + queryTail + '&' + queryTail; else - queryTail = '?'+queryTail; + queryTail = '?' + queryTail; var data = { } - return fetch('goods'+queryTail, data, 'POST' ) + return fetch('goods' + queryTail, 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=>{ - console.log(item); - list=item - }) - var str = "?"; - 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' ) - } +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 + }) + var str = "?"; + 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') + } } -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, usertype); + + if (!curPage) + curPage = 1; + if (!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 - }) + list = item + }) var str = "&"; - for(var key in list){ + for (var key in list) { - str = str + key + "=" + list[key] + "&"; - } - str = str.substr(0,str.length-1); - var data = { - page:1, - row:10 + str = str + key + "=" + list[key] + "&"; } - - return fetch('product/query?petType='+usertype+str+queryTail, data, 'POST' ) + str = str.substr(0, str.length - 1); + var data = { + page: 1, + row: 10 + } + + return fetch('product/query?petType=' + usertype + str + queryTail, data, 'POST') } @@ -269,58 +270,58 @@ export const searchchanpin = (stype,usertype,curPage,curRow) => { //查询订单 -export const userindent = (phoneNumber,orderNumber,) => { - var data = { - phoneNumber:phoneNumber, - orderNumber:orderNumber, +export const userindent = (phoneNumber, orderNumber,) => { + var data = { + phoneNumber: phoneNumber, + 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') } //取消订单 -export const canceldanhao = (phoneNumber,orderNumber) => { +export const canceldanhao = (phoneNumber, orderNumber) => { var data = { - phoneNumber:phoneNumber, - orderNumber:orderNumber, + 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 + 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) => { - if(!curPage) - curPage=1; - if(!rows) - rows=10; - let queryTail='&page='+curPage+'&rows='+rows; - let username='&name='+stype +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, + name: stype, + rows: 10, + page: 1, } - return fetch('product/query?petType='+usertype+username+queryTail,data, 'POST' ) + return fetch('product/query?petType=' + usertype + username + queryTail, data, 'POST') } @@ -329,9 +330,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') } @@ -339,20 +340,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') } @@ -361,9 +362,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') } @@ -371,25 +372,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') } @@ -400,11 +401,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') } @@ -412,156 +413,156 @@ export const oncequery = (productCode) => { export const goodsmessage = (productCode) => { var data = { - productCode:productCode + productCode: productCode } - return fetch( "productMaster/query?productCode="+productCode, data, 'POST' ) + return fetch("productMaster/query?productCode=" + productCode, data, 'POST') } - //优惠券的插入 - export const inserdiscount = (mobile,couponId) => { - var data = { - mobile:mobile, - couponId:couponId - } - return fetch('coupon?type=fetch', data, 'POST' ) +//优惠券的插入 +export const inserdiscount = (mobile, couponId) => { + var data = { + mobile: mobile, + couponId: couponId } + return fetch('coupon?type=fetch', data, 'POST') +} - //优惠券的查询 - export const getdiscount = (memberId,channelSecurity,mobile) => { - var data = { - memberId:memberId, - mobile:mobile - } - return fetch('memberAddress?type=getAll', data, 'POST' ) - } - - //可用的优惠券 - export const alldiscount = (memberId,channelSecurity,mobile) => { - var data = { - memberId:memberId, - } - return fetch('couponConfig?type=getAll', data, 'POST' ) - } - - - //用户领取的优惠券 - export const getdraw = (mobile,states) => { - var data = { - mobile:mobile, - status:states - } - return fetch('coupon?type=getAll', data, 'POST' ) - } - - - //微信支付 - export const generateOrderWX = (list) => { - var data = [{ - - - }] - return fetch('generateOrderWX', list, 'POST' ) +//优惠券的查询 +export const getdiscount = (memberId, channelSecurity, mobile) => { + var data = { + memberId: memberId, + mobile: mobile } - //用户所有的优惠券 - export const allConfig = (memberId,channelSecurity,mobile) => { - var data = { - } - return fetch('couponConfig?type=getAll', data, 'POST' ) - } - + return fetch('memberAddress?type=getAll', data, 'POST') +} - //用户领取优惠券 - export const getConfig = (memberId,couponId) => { - var data = { - memberId:memberId, - couponId:couponId, - } - return fetch('coupon?type=fetch', data, 'POST' ) - } - - - //用户下的优惠券 - export const userConfig = (memberId,couponId) => { - var data = { - memberId:memberId, - couponId:couponId, - } - return fetch('coupon?type=fetch', data, 'POST' ) - } - - - - - //用户订单的查询 - // export const customerorders = (memberId,channelSecurity,mobile) => { - // var data = { - // productName:'幼猫全价粮', - // buyCount:'2', - // productId:'210352', - // payAmount:'517', - // memberId:'844350', - // phoneNumber:'18112621098', - // } - // return fetch('generateOrderWX', data, 'POST' ) - // } - - - //地址的查询 - export const selectaddress = (memberId, pet,address) => { - var data = { - memberId:memberId, - } - return fetch('memberAddress?type=getAll', data, 'POST' ) +//可用的优惠券 +export const alldiscount = (memberId, channelSecurity, mobile) => { + var data = { + memberId: memberId, } + return fetch('couponConfig?type=getAll', data, 'POST') +} - //地址的添加 //id/详细地址/ 收货人姓名/收货人电话号码/省份id/城市id/区域编码 - export const editaddress = (memberId, detailAddress,recipient,tel,provinceId,cityId,districtId) => { - - var data = { - memberId:844350, - provinceId:25, - cityId:36, - districtId:418, - detailAddress:'古美路1455弄46号302', - recipient:'蒋缘缘2', - recipientPhone:'13671516167', - zipCode:'214423', - default:false, - } - return fetch('memberAddress?type=add', memberId, 'POST' ) +//用户领取的优惠券 +export const getdraw = (mobile, states) => { + var data = { + mobile: mobile, + status: states } + return fetch('coupon?type=getAll', data, 'POST') +} - //删除 - export const editdelete = (memberId,ids) => { - var data = { - memberId:memberId, - ids:ids, - } - return fetch('memberAddress?type=delete', data, 'POST' ) - } - //地址的编辑 - export const editupdate = (userid,) => { - // var data = { - // memberId:userid, - // id:id, - // isDefault:isDefault, - // } - return fetch('memberAddress?type=update', userid, 'POST' ) - } +//微信支付 +export const generateOrderWX = (list) => { + var data = [{ + + + }] + return fetch('generateOrderWX', 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 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', 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) => { +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') } @@ -615,14 +616,17 @@ export const getOrderList = (user, status) => { - //购物车操作 - 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 = (data) => { - return fetch('generateOrderAlipay', data, 'POST' ) - } - \ No newline at end of file +//微信支付二维码 +export const updateOrderWX = (data) => { + return fetch('updateOrderWX', data, 'POST') +} + +//支付宝支付二维码 +export const generateOrderAlipay = (data) => { + return fetch('generateOrderAlipay', data, 'POST') +} diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index f3d7880d..e13cbf42 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -2,7 +2,7 @@
- +
@@ -97,7 +97,12 @@
- +
-
+
-
+

{{ item.recipient }}

{{ item.recipientPhone }}

-

{{ item.address }}

+

{{ item.address }}

- +
@@ -155,7 +163,7 @@ export default { data() { return { goldmedal: [], - dialogAddTitle:"", + dialogAddTitle: "", addressstype: null, orderstatus: "", userisdelivery: "待收货", @@ -213,7 +221,7 @@ export default { this.useraddress = data; }, editAddress(item) { - this.dialogAddTitle='修改收货地址' + this.dialogAddTitle = "修改收货地址"; this.editAddressData = { memberId: item.memberId, name: item.recipient, @@ -222,7 +230,7 @@ export default { id: item.id, cityId: item.cityId, districtId: item.districtId, - provinceId:item.provinceId, + provinceId: item.provinceId, provinceName: item.provinceName, cityName: item.cityName, districtName: item.districtName, @@ -231,7 +239,7 @@ export default { this.dialogAdd = true; }, addAddress() { - this.dialogAddTitle='新增收货地址' + this.dialogAddTitle = "新增收货地址"; this.editAddressData = {}; this.dialogAdd = true; }, @@ -239,9 +247,9 @@ export default { this.useraddress.forEach((item) => { if (item.id == cur.id) { item.isDefault = true; - item.checked=true + item.checked = true; } else { - item.checked=false + item.checked = false; item.isDefault = false; } }); @@ -250,9 +258,9 @@ export default { this.useraddress.forEach((item) => { if (item.id == cur.id) { item.isDefault = true; - item.checked=true + item.checked = true; } else { - item.checked=false + item.checked = false; item.isDefault = false; } }); @@ -344,7 +352,8 @@ export default { postData[0].orderAddress.addressUserName + " " + postData[0].orderAddress.addressPhoneNumber, - wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz", + // wxPay: "weixin://wxpay/bizpayurl?pr=4RJbokxzz", + wxPay: res.data, }; this.$router.push({ path: "/personal/userpay", @@ -352,7 +361,7 @@ export default { userPayData: JSON.stringify(userPayData), }, }); - }else{ + } else { this.$message({ type: "warning", message: res.msg, @@ -384,9 +393,7 @@ export default { \ No newline at end of file diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index 9f98275c..01a39aec 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -113,7 +113,8 @@ export default { computed: {}, mounted() { this.userPayData = JSON.parse(this.$route.query.userPayData); - this.qrtext=this.userPayData.wxPay + this.qrtext=this.userPayData.wxPay; + this.payOrderWX() }, methods: { closeDialogSuccess() { @@ -141,15 +142,15 @@ export default { } }, //支付监听 - async updateOrderWX() { + async payOrderWX() { let res = await updateOrderWX(); if (res.success) { this.qrtext = '成功加入群的二维码'; this.dialogSuccess = true; - clearInterval(this.time); - } else { + } else if (res.fail) { this.dialogFail = true; - clearInterval(this.time); + }else{ + this.payOrderWX() } }, }, diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index ec672f88..ef4ba19b 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -568,7 +568,8 @@ export default { item.picFile, item.productName, item.basePrice, - item.specifications + item.specifications, + item.leftAllotment ); if (data) { this.productlist = data;