diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js index 87cbff55..56dd089d 100644 --- a/rc-busness/ajax/getData.js +++ b/rc-busness/ajax/getData.js @@ -131,11 +131,11 @@ export const mostAddClass = (id) => { /** * 筛选标签 */ - export const userstype = (mobile, pet,address) => { + export const userstype = (stype, pet,address) => { var data = { - + petType:0, } - return fetch('productSearchTag/query', data, 'POST' ) + return fetch('productSearchTag/query?petType=' + 0, data, 'POST' ) } /** * 登录 @@ -201,18 +201,62 @@ export const userque = (stype) => { //标品全部信息 -export const biaomessage = (stype) => { +export const biaomessage = (stype,name) => { console.log(stype); var data = { - petType:stype + petType:stype, + page:1, + row:10 } return fetch('product/query?petType='+stype, data, 'POST' ) } +export const searchchanpin = (stype,categoryName,tagUsedAge,tagFunction,tagBreed) => { + console.log(stype); + var data = { + petType:stype, + page:1, + row:10 + } + + // return fetch('product/query?petType='+stype+'&categoryName='+categoryName+'&tagUsedAge='+tagUsedAge+'&tagFunction='+tagFunction+'&tagBreed='+tagBreed, data, 'POST' ) +} + + +//查询订单 +export const userindent = (phoneNumber,orderNumber,) => { + var data = { + phoneNumber:'18112621098', + 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 = (orderNumber) => { + var data = { + + orderNumber:orderNumber, + } + return fetch('cancelOrder/', data, 'POST' ) +} + + export const biaomessa = (stype) => { console.log(stype); var data = { - name:stype + name:stype, + page:1, + row:10 } return fetch('product/query', data, 'POST' ) } @@ -356,7 +400,6 @@ export const goodsmessage = (productCode) => { //用户领取的优惠券 export const getdraw = (mobile,states) => { var data = { - channelSecurity:'H5@2021', mobile:mobile, status:states } @@ -403,17 +446,17 @@ export const goodsmessage = (productCode) => { //用户订单的查询 - 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 customerorders = (memberId,channelSecurity,mobile) => { + // var data = { + // productName:'幼猫全价粮', + // buyCount:'2', + // productId:'210352', + // payAmount:'517', + // memberId:'844350', + // phoneNumber:'18112621098', + // } + // return fetch('generateOrderWX', data, 'POST' ) + // } //地址的查询 diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 322a709d..36a54909 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -68,7 +68,7 @@ export default { align-items: center; height: 70px; background-color: white; - z-index: 994; + z-index: 9999 ; .rc-center{ display: none; } diff --git a/rc-busness/components/magnifier.vue b/rc-busness/components/magnifier.vue index 086bc708..d4c13783 100644 --- a/rc-busness/components/magnifier.vue +++ b/rc-busness/components/magnifier.vue @@ -14,7 +14,7 @@
@@ -92,17 +92,23 @@ export default { } }, created() { - - if (this.imgList && this.imgList.length) { - this.pictureList = this.imgList + let user= JSON.parse(localStorage.getItem("message")); + console.log(user); + if(user!==null){ + this.pictureList=user; } - this.middleImg = this.pictureList[0].url + if (user && user.length) { + this.pictureList = user + } + this.middleImg = this.pictureList[0].attachmentPath; + console.log(this.middleImg); // 计算缩略图的宽度,默认是显示4张图片,两边箭头的宽度和为50 // this.itemWidth = (this.middleImgWidth-30) / 2 }, mounted() { - console.log(this.parentmsg) + + this.ifadroind(); this.$nextTick(() => { @@ -236,7 +242,7 @@ this.ifadroind(); }, // 切换图片 tabPicture (item,index) { - this.middleImg = item.url + this.middleImg = item.attachmentPath this.$emit('changeName',item) console.log(item,index) }, diff --git a/rc-busness/components/rc-footer.vue b/rc-busness/components/rc-footer.vue index 18d7fa60..035d90a1 100644 --- a/rc-busness/components/rc-footer.vue +++ b/rc-busness/components/rc-footer.vue @@ -24,7 +24,7 @@ +
- 查看更多 + 查看更多
+ @@ -260,7 +258,7 @@ - +
查看更多
@@ -278,8 +276,8 @@

全价犬湿粮

- - + +
  • @@ -290,14 +288,16 @@ {{item.name}} {{item.price}}
- 立即购买 + 立即购买 -
+ +
查看更多
+ @@ -346,7 +346,7 @@ - +
查看更多
@@ -363,8 +363,8 @@

全价犬干粮

- - + +
  • @@ -375,13 +375,15 @@ {{item.name}} {{item.price}}
- 立即购买 + 立即购买 -
+ +
查看更多
+ @@ -426,7 +428,7 @@
{{item.title}} {{item.price}} - 立即购买 + 立即购买 @@ -460,14 +462,16 @@ {{item.productName}}
- 立即购买 + 立即购买 -
+ +
查看更多
+ @@ -512,11 +516,11 @@
{{item.title}} {{item.price}} - 立即购买 + 立即购买 - +
查看更多
@@ -571,7 +575,7 @@
--> -
+
  • @@ -579,7 +583,7 @@
-
+
回到顶部
@@ -589,6 +593,7 @@
diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue index 1398a5ca..93858ee7 100644 --- a/rc-busness/pages/myorder/userrecord.vue +++ b/rc-busness/pages/myorder/userrecord.vue @@ -211,7 +211,7 @@ export default { }); console.log(data); this.$router.push({ - path: "/personal/userpay", + path: "/personal/settlement", query: { wxdata:data.data }, @@ -228,6 +228,7 @@ export default { console.log(user); this.userid=user.data.id; let data = await deleteCart(user.data.id,productCode); + if(data){ this.$message({ type: 'warning', @@ -421,6 +422,9 @@ plus(num,index){ \ No newline at end of file diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 80cebcea..b845bd84 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -21,16 +21,17 @@
+
- 订单编号:{{ item.ordernumber }} + 订单编号:{{ item.orderNumber }}
- 订单状态: {{ item.orderstype }} + 订单状态: {{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}}
-
+
@@ -39,12 +40,12 @@
{{ item.usereat }}
- 规格:{{ item.num }} + 规格:{{ userlist.num }}
- 数量:{{ item.orderstype }}件 - ￥{{ item.userprice }} + 数量:{{ userlist.pcs}}件 + ￥{{ userlist.ecPrice }}
@@ -60,10 +61,11 @@ 查看订单
-
- {{item.buttontitle}} - 查看订单 -
+ +
@@ -71,12 +73,14 @@ @@ -265,7 +319,10 @@ export default { .rc-main { width: 92%; margin: 0 auto; - + .rc-usermaina{ + width: 100%; + height: 100%; + } .rc-headera { display: flex; justify-content: space-between; diff --git a/rc-busness/pages/personal/usermember.vue b/rc-busness/pages/personal/usermember.vue index e7c3b15d..c265e006 100644 --- a/rc-busness/pages/personal/usermember.vue +++ b/rc-busness/pages/personal/usermember.vue @@ -64,7 +64,39 @@ data(){ rcvalue:5000, uservalue:0, usrnewlist:[], - newlist:[], + newlist:[ + { + title: "产品试吃", + usereat:'每年4次免积分产品试吃', + ordernum: 0, + catimage: require("../../assets/image/usereat.png"), + }, + { + title: "成长工具", + usereat:'365天专属养宠工具', + ordernum: 1, + catimage: require("../../assets/image/rc-growth.png"), + }, + { + title: "1V1咨询", + usereat:'10年专业团队1v1咨询', + ordernum: 2, + catimage: require("../../assets/image/consult.png"), + }, + { + title: "知识课堂", + usereat:'行业大咖专业养宠知识', + ordernum: 3, + catimage: require("../../assets/image/rc-book.png"), + }, + { + title: "健康服务", + usereat:'每年积分兑换1次价值288元的免费体检及100元医院绝育券', + ordernum: 4, + catimage: require("../../assets/image/rc-health.png"), + }, + + ], newlista:[ { title: "产品试吃", @@ -216,11 +248,10 @@ methods:{ components:{ Myheader }, -mounted(){ +mounted(){ console.log(this.$refs.userblock); let userwidth=0; let user= JSON.parse(localStorage.getItem("userInfo")); - if(user!==null){ this.userid=user.data; let userlength=this.userid.availiblePoint.toString().length; diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index b3d97f48..a3070243 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -2,6 +2,7 @@
+
@@ -18,6 +19,7 @@ {{ userinformation }}
+
@@ -28,6 +30,7 @@ 请选择支付方式
+
- 商品价格: + 商品价格 ￥{{ item.rsp }} + ￥{{item.ecPrice}}
活动促销: - {{ item.basePrice }} + 全场商品限时优惠
立即领取
@@ -28,10 +29,14 @@ 立即购买
+
+
- 商品规格 +
+ 商品规格： +
@@ -41,7 +46,9 @@
- 商品数量: +
+ 商品数量： +
{{sales_num}}
- -
- 加入购物车 - 立即购买 -
+ +
@@ -88,6 +92,7 @@
+
+
+ 加入购物车 + 立即购买 +