From 41e0c0dc7169e521a439ce879b2cea06a899da8f Mon Sep 17 00:00:00 2001 From: lnn19986213 <1667908750@qq.com> Date: Fri, 26 Jan 2024 17:20:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pagesA/my/My.vue | 22 +- src/pagesA/my/myCollection.vue | 4 +- src/pagesB/ConfirmOrder/fictitiousOrder.vue | 220 ++++++++++++------ src/pagesB/ConfirmOrder/purchaseDetail.vue | 8 + src/pagesB/MyOrder/MyOrder.vue | 10 +- src/pagesB/MyOrder/fictitiousDetail.vue | 110 ++++++++- .../PersonalCenter/ReEditSingleInfo.vue | 4 +- src/pagesB/improveData/improveData.vue | 8 +- src/pagesB/literFamily/ActJianDetail.vue | 14 +- src/pagesB/literFamily/literFamily.vue | 6 +- src/pagesC/AwardWinningWork/AwardDetail.vue | 2 +- .../AwardWinningWork/AwardWinningWork.vue | 9 +- src/pagesC/ShoppingCart/ShoppingCart.vue | 3 +- 13 files changed, 318 insertions(+), 102 deletions(-) diff --git a/src/pagesA/my/My.vue b/src/pagesA/my/My.vue index 68756d2..da6cce7 100644 --- a/src/pagesA/my/My.vue +++ b/src/pagesA/my/My.vue @@ -12,12 +12,21 @@ - {{ userName }} - - + + + {{ userName }} + + + + + + + + - - + + + {{ association }} @@ -153,6 +162,7 @@ titleHeight: 90, isAdmin: null, isVillageAdmin: null, + association: '', }; }, onReady() { @@ -185,6 +195,7 @@ this.userId = res.data.id; this.yhsf = res.data.yhsf; this.point = res.data.point; + this.association = res.data.association.name this.getCol(); } }) @@ -414,6 +425,7 @@ color: #251b1d; font-size: 40rpx; font-weight: 600; + .sf_textA { width: 146rpx; diff --git a/src/pagesA/my/myCollection.vue b/src/pagesA/my/myCollection.vue index f4cd4c7..b3b42ae 100644 --- a/src/pagesA/my/myCollection.vue +++ b/src/pagesA/my/myCollection.vue @@ -204,9 +204,7 @@ }); }) }else { - this.http.request('/works/details', { - id: this.sonId - }, "GET").then(res => { + this.http.request('/works/details/' + this.sonId, {}, "GET").then(res => { if (res.code == 200) { if(!res.data.isColl){ this.list.splice(this.sonNum,1) diff --git a/src/pagesB/ConfirmOrder/fictitiousOrder.vue b/src/pagesB/ConfirmOrder/fictitiousOrder.vue index e176ea4..b269534 100644 --- a/src/pagesB/ConfirmOrder/fictitiousOrder.vue +++ b/src/pagesB/ConfirmOrder/fictitiousOrder.vue @@ -38,18 +38,30 @@ - 默认地址 + 默认地址: - 4564864afdvsdag645sdf - + {{item.addName}} + {{item.addDet}} + - + - + + + + + 确认 + + + - 合计： {{total}}积分 + 合计： {{total}}积分 立即支付 @@ -64,11 +76,18 @@ data() { return { load: true, - data:[], + data: [], total: 0, point: '', value1: '', addressList: [], + addName: '', + addDet: '', + addressId: '', + showAddList: false, + radiovalue1: '', + radiolist1: [], + changeNum: null, }; }, onLoad(option) { @@ -77,15 +96,35 @@ }, onShow() { this.total = 0 + this.radiolist1 = [] this.getTotal() this.getUserInfo() this.getAddress() }, - methods:{ + methods: { getAddress() { this.http.request('/address/list', {}, "GET").then(res => { if (res.code == 200) { this.addressList = res.data + this.addressList.forEach(item => { + if (item.isDefault) { + this.addName = item.userName + this.addressId = item.id + this.addDet = item.province + item.city + item.area + item.userAddress + } + this.radiolist1.push({ + id: item.id, + label: item.userName + '：' + item.province + item.city + item + .area + item.userAddress + }) + }) + this.data.forEach(ele => { + if (ele.sendWay == '3') { + ele.addressId = this.addressId, + ele.addName = this.addName + ele.addDet = this.addDet + } + }) } }).catch(e => { uni.showToast({ @@ -94,7 +133,7 @@ }); }) }, - getUserInfo(){ + getUserInfo() { let _this = this this.http.request('/user/userInfo', {}, "GET").then(res => { if (res.code == 200) { @@ -108,57 +147,90 @@ }); }) }, - getTotal(){ + getTotal() { let _this = this - this.data.forEach(function(item){ - + this.data.forEach(function(item) { + let num = item.count * item.money _this.total += num }) }, - pay(){ - if(this.total > this.point){ + pay() { + if (this.total > this.point) { uni.navigateTo({ - url:'/pagesB/ConfirmOrder/purchaseDetail?success=1' + '&id=' + this.data[0].id + '&num=' + this.data.length + url: '/pagesB/ConfirmOrder/purchaseDetail?success=1' + '&id=' + this.data[0].id + '&num=' + + this.data.length }) - }else{ - let data = [] - this.data.forEach(function(item){ - data.push({ - goodsId: item.goodsId, - count: item.count, - addressId: item.addressId, - remark: item.remark, - shopCarId: item.shopCarId, - }) - }) - this.http.request('/order/newOrder', data, "POST").then(res => { - if (res.code == 200) { - uni.navigateTo({ - url:'/pagesB/ConfirmOrder/purchaseDetail?success=0' + '&id=' + this.data[0].id + '&num=' + this.data.length + } else { + let arr = [] + console.log(this.data) + let can = true + this.data.forEach(function(item) { + if (item.sendWay == '2' && item.remark == '') { + uni.showToast({ + title: '请填写买家联系方式', + icon: "none", + }); + can = false + return + } else { + arr.push({ + goodsId: item.goodsId, + count: item.count, + addressId: item.addressId, + remark: item.remark, + shopCarId: item.shopCarId, }) } - }).catch(e => { - uni.showToast({ - title: e.data.message, - icon: "none", - }); }) + if(can){ + this.http.request('/order/newOrder', arr, "POST").then(res => { + if (res.code == 200) { + uni.navigateTo({ + url:'/pagesB/ConfirmOrder/purchaseDetail?success=0' + '&id=' + this.data[0].id + '&num=' + this.data.length + }) + } + }).catch(e => { + uni.showToast({ + title: e.data.message, + icon: "none", + }); + }) + } + } + }, + close() { + this.showAddList = false + }, + selectFormB(form) { + this.addressList.forEach(item => { + if (item.id == form) { + this.data[this.changeNum].addressId = item.id + this.data[this.changeNum].addName = item.userName + this.data[this.changeNum].addDet = item.province + item.city + item.area + item.userAddress + } + }) + }, + changeAddress(val) { + this.showAddList = true + this.changeNum = val } } } + \ No newline at end of file diff --git a/src/pagesB/ConfirmOrder/purchaseDetail.vue b/src/pagesB/ConfirmOrder/purchaseDetail.vue index a7876f3..45f98aa 100644 --- a/src/pagesB/ConfirmOrder/purchaseDetail.vue +++ b/src/pagesB/ConfirmOrder/purchaseDetail.vue @@ -11,6 +11,9 @@ 查看订单 + + 返回 + @@ -49,6 +52,11 @@ }, returnBack() { uni.navigateBack() + }, + toShop() { + uni.redirectTo({ + url: "/pagesC/shop/Shop?typesOf=1" + }); } } } diff --git a/src/pagesB/MyOrder/MyOrder.vue b/src/pagesB/MyOrder/MyOrder.vue index 1ba9059..df8d40e 100644 --- a/src/pagesB/MyOrder/MyOrder.vue +++ b/src/pagesB/MyOrder/MyOrder.vue @@ -186,12 +186,9 @@ size: this.size }, "GET").then(res => { if (res.code == 200) { - console.log(1) res.data.records.forEach(function(item) { let data = JSON.parse(item.quickPhoto) - item.quickPhoto = data - console.log(2,item.quickPhoto) if (item.quickPhoto.domainInfo.file) { let fileArr = item.quickPhoto.domainInfo.file.split(',') let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1) @@ -206,7 +203,6 @@ let img = item.quickPhoto.shopInfo.images.split(',') item.quickPhoto.shopInfo.images = img[0] }) - console.log(3) this.orderList = res.data.records this.load = false } @@ -281,7 +277,7 @@ item.quickPhoto.domainInfo.file = '../../static/fileImg/pdfS.png' } } - let img = JSON.parse(item.quickPhoto.shopInfo.images) + let img = item.quickPhoto.shopInfo.images.split(',') item.quickPhoto.shopInfo.images = img[0] }) this.orderList = res.data.records @@ -317,7 +313,7 @@ item.quickPhoto.domainInfo.file = '../../static/fileImg/pdfS.png' } } - let img = JSON.parse(item.quickPhoto.shopInfo.images) + let img = item.quickPhoto.shopInfo.images.split(',') item.quickPhoto.shopInfo.images = img[0] _this.orderList.push(item) }) @@ -350,7 +346,7 @@ //详情 toDetail(val) { uni.navigateTo({ - url: "/pagesB/MyOrder/fictitiousDetail?id=" + val + url: "/pagesB/MyOrder/fictitiousDetail?id=" + val + '&cho=' + this.cho }) }, //评价 diff --git a/src/pagesB/MyOrder/fictitiousDetail.vue b/src/pagesB/MyOrder/fictitiousDetail.vue index 12265cd..fe0c9b4 100644 --- a/src/pagesB/MyOrder/fictitiousDetail.vue +++ b/src/pagesB/MyOrder/fictitiousDetail.vue @@ -4,6 +4,7 @@ + @@ -22,8 +23,13 @@ + + + + - + 取货链接 @@ -38,6 +44,31 @@ 提取码：{{item.pass}} + + + 买家联系方式 + + + {{det.remark}} + + + + + 买家收货地址 + + + {{addName}} + + + {{addDet}} + + + + + + + + @@ -51,10 +82,16 @@ id: '', item:{}, det: {}, + sendWay: '', + state: '', + courierNum: '', + addName: '', + addDet: '', }; }, onLoad(o) { this.id = o.id + this.cho = o.cho }, onShow() { this.getData() @@ -76,7 +113,11 @@ } this.item.url = res.data.quickPhoto.panUrl this.item.pass = res.data.quickPhoto.panCode + this.sendWay = res.data.domain.sendWay this.det = res.data + this.state = res.data.state + this.addName = res.data.userName + this.addDet = res.data.province + res.data.city + res.data.area + res.data.userAddress this.load = false } }).catch(e => { @@ -114,6 +155,41 @@ } }); }, + next() { + this.http.request('/order/confirm?orderId=' + this.id, {}, "POST").then(res => { + if (res.code == 200) { + uni.showToast({ + title: '收货成功', + icon: "none", + }); + this.getData() + } + }).catch(e => { + uni.showToast({ + title: e.data.message, + icon: "none", + }); + }) + }, + toOut() { + this.http.request('/order/send', { + courierNum: this.courierNum, + orderId:this.id + }, "GET").then(res => { + if (res.code == 200) { + uni.showToast({ + title: '发货成功', + icon: "none", + }); + this.getData() + } + }).catch(e => { + uni.showToast({ + title: e.data.message, + icon: "none", + }); + }) + }, } } @@ -203,4 +279,36 @@ padding: 32rpx; box-sizing: border-box; } + + .operation { + display: flex; + justify-content: space-between; + align-items: center; + padding: 32rpx 32rpx 48rpx; + position: fixed; + left: 0; + bottom: 0; + right: 0; + background-color: #FFFFFF; + box-shadow: 0px -4px 10px 1px rgba(192, 192, 192, 0.12); + + .next { + width: calc(100% - 48rpx); + height: 80rpx; + line-height: 80rpx; + + background-color: #99241B; + color: #fff; + font-size: 32rpx; + font-weight: 600; + + border: none; + + button { + &::after { + border: none; + } + } + } + } diff --git a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue index f08919c..75986f0 100644 --- a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue +++ b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue @@ -29,14 +29,14 @@ - + - + diff --git a/src/pagesB/improveData/improveData.vue b/src/pagesB/improveData/improveData.vue index 5a1a632..d38724d 100644 --- a/src/pagesB/improveData/improveData.vue +++ b/src/pagesB/improveData/improveData.vue @@ -70,7 +70,7 @@ - *密码 + 密码 @@ -364,14 +364,10 @@ userData: {}, rules: { 'userInfo.pasw': [{ - required: true, - message: '请设置登录密码', - trigger: ['blur', 'change'] - }, { min: 6, max: 20, message: '密码需由长度不小于12位的大小写英文、数字及特殊符号组成!', - trigger: ['blur', 'change'] + trigger: ['change'] },], 'userInfo.serverInstrutor': [{ type: 'string', diff --git a/src/pagesB/literFamily/ActJianDetail.vue b/src/pagesB/literFamily/ActJianDetail.vue index 0ce12a6..703ed0e 100644 --- a/src/pagesB/literFamily/ActJianDetail.vue +++ b/src/pagesB/literFamily/ActJianDetail.vue @@ -4,7 +4,7 @@ - + {{ currentNum + 1 }}/{{ list.length }} @@ -17,10 +17,7 @@ {{actDetObj.title}} - - - {{actDetObj.record}} - + @@ -41,6 +38,11 @@ + + + + + @@ -129,7 +131,7 @@ .work_desc { width: 94%; - margin: 10px 3%; + margin: 10px 3% 20px; font-size: 12px; font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; diff --git a/src/pagesB/literFamily/literFamily.vue b/src/pagesB/literFamily/literFamily.vue index 861fc48..009f1ab 100644 --- a/src/pagesB/literFamily/literFamily.vue +++ b/src/pagesB/literFamily/literFamily.vue @@ -158,6 +158,10 @@ this.http.request('/culturalCreativity/list', {}, "GET").then(res => { if (res.code == 200) { this.list2 = res.data.records.splice(0,3) + this.list2.forEach(item => { + let img = item.image.split(',')[0] + item.image = img + }) this.load = false } }).catch(e => { @@ -278,7 +282,7 @@ } .layout { - padding: 0 16px; + padding: 0 16px 16px; box-sizing: border-box; .activityColumn { diff --git a/src/pagesC/AwardWinningWork/AwardDetail.vue b/src/pagesC/AwardWinningWork/AwardDetail.vue index 6aef476..0716fe3 100644 --- a/src/pagesC/AwardWinningWork/AwardDetail.vue +++ b/src/pagesC/AwardWinningWork/AwardDetail.vue @@ -4,7 +4,7 @@ - + {{ currentNum + 1 }}/{{ list.length }} diff --git a/src/pagesC/AwardWinningWork/AwardWinningWork.vue b/src/pagesC/AwardWinningWork/AwardWinningWork.vue index 593d4da..97be298 100644 --- a/src/pagesC/AwardWinningWork/AwardWinningWork.vue +++ b/src/pagesC/AwardWinningWork/AwardWinningWork.vue @@ -17,7 +17,6 @@ {{v.name}} - @@ -80,6 +79,10 @@ associationId: this.associationId }, "GET").then(res => { if (res.code == 200) { + res.data.records.forEach(item => { + let img = item.image.split(',')[0] + item.image = img + }) this.fightVirusList = res.data.records this.load = false } @@ -140,15 +143,17 @@ background-color: #F4F5F7; } .layout{ - padding: 0 24rpx; + padding: 0 24rpx 16px; box-sizing: border-box; .reward { // padding: 24rpx; + width: 702rpx; display: flex; flex-wrap: wrap; justify-content: space-between; .reward_itm { + width: 340rpx; margin-top: 20rpx; box-sizing: border-box; border-radius: 16rpx; diff --git a/src/pagesC/ShoppingCart/ShoppingCart.vue b/src/pagesC/ShoppingCart/ShoppingCart.vue index 27f4dc5..a15c8af 100644 --- a/src/pagesC/ShoppingCart/ShoppingCart.vue +++ b/src/pagesC/ShoppingCart/ShoppingCart.vue @@ -285,7 +285,8 @@ userImg: item.goods.shopInfo.images, mType: '1', money: item.goods.pointPrice, - count: item.count + count: item.count, + remark: '', }) } })