From 27ad0dc2bdeea2576984a7b5df413f3bff9b5c2d Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Tue, 30 Jul 2024 09:58:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=20=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9C=88=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/msg/im.vue | 23 +- pages/my/miaoShaOderDrtail.vue | 18 +- pages/my/orderDetailsList.vue | 632 +++++++++++++++++++-------------- pages/my/pinTuanOderDrtail.vue | 18 +- pages/videoCircle/index.vue | 7 +- 5 files changed, 398 insertions(+), 300 deletions(-) diff --git a/pages/msg/im.vue b/pages/msg/im.vue index f611134..02f3503 100644 --- a/pages/msg/im.vue +++ b/pages/msg/im.vue @@ -345,10 +345,10 @@ this.$queue.showToast('请输入聊天内容'); return; } - // if (this.chatId == '' || this.chatId == undefined) { - // this.$queue.showToast('网络较差，请稍后再试'); - // return; - // } + if (this.chatId == '' || this.chatId == undefined) { + this.$queue.showToast('网络较差，请稍后再试'); + return; + } let userId = this.$queue.getData('userId'); let avatar = this.$queue.getData('avatar'); let phone = this.$queue.getData('phone'); @@ -356,18 +356,6 @@ if (!phone) { phone = this.$queue.getData('userName'); } - console.log("this.byUserId",this.byUserId) - // if(this.textMsg!=''){ - // const isRich = this.isRichText(this.textMsg); // 返回 true - // if(isRich==true){ - // this.textMsg = this.replaceEmoji(this.textMsg); - // }else{ - // this.content=this.textMsg - // } - // } - - - // console.log('this.content=============>',isRich) let data = { content: this.content, messageType: type, @@ -378,7 +366,6 @@ if(data.messageType==2){ data.width="100" } - console.log("data",data) data = JSON.stringify(data); let that = this; @@ -398,13 +385,11 @@ type: type, userId: userId } - console.log(data,'data99999999999999999') // that.ListItem.push(data); setTimeout(() => { that.hideDrawer(); that.getTimeOrListItem1(); }, 50); - console.log(that.content); }, fail(err) { console.log(err); diff --git a/pages/my/miaoShaOderDrtail.vue b/pages/my/miaoShaOderDrtail.vue index 894ac4f..8225b1b 100644 --- a/pages/my/miaoShaOderDrtail.vue +++ b/pages/my/miaoShaOderDrtail.vue @@ -181,11 +181,19 @@ // this.showpay = true }, xiangqing(item){ - uni.navigateTo({ - url:'/pages/my/myMsOderDrtail?mainId='+item.mainId+'&id='+item.id+ - '&massageTypeId='+item.massageTypeId+ - '&status='+item.status - }) + if(item.status=='1'){ + item.id=this.mainData.id + uni.navigateTo({ + url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'秒杀' + }) + }else{ + uni.navigateTo({ + url:'/pages/my/myMsOderDrtail?mainId='+item.mainId+'&id='+item.id+ + '&massageTypeId='+item.massageTypeId+ + '&status='+item.status + }) + } + }, detail(item){ if(item.status=='1'){ diff --git a/pages/my/orderDetailsList.vue b/pages/my/orderDetailsList.vue index ac74ab7..8486d77 100644 --- a/pages/my/orderDetailsList.vue +++ b/pages/my/orderDetailsList.vue @@ -1,85 +1,101 @@ @@ -87,26 +103,26 @@ export default { data() { return { - loadingType:0, + loadingType: 0, myId: '', // v-model绑定的这个变量不要在分页请求结束中自己赋值！！！ dataList: [], tabList: [], - typeData:'105', + typeData: '105', tabIndex: 0, - searchValue:'', - serviceTrue:true, - page:1, - limit:10, - titleNmae:'', - classifyId:'', - previousPage:{} + searchValue: '', + serviceTrue: true, + page: 1, + limit: 10, + titleNmae: '', + classifyId: '', + previousPage: {} } }, - onLoad(e){ - var that=this; - that.previousPage=e; - that.isVIP=this.$queue.getData('isVIP'); + onLoad(e) { + var that = this; + that.previousPage = e; + that.isVIP = this.$queue.getData('isVIP'); that.myId = uni.getStorageSync('userId'); // that.getData() }, @@ -128,15 +144,15 @@ // },1000) // } // }, - input(res) {//搜索 输入框 - this.searchValue=res; + input(res) { //搜索 输入框 + this.searchValue = res; }, - searchBtn(){//搜索按钮 - if(this.searchValue!=""){ + searchBtn() { //搜索按钮 + if (this.searchValue != "") { this.getData() } }, - getData(){ + getData() { // this.$Request.get("/app/artificer/selectAppOrdersList", { // page:this.page, // limit:this.limit, @@ -151,29 +167,41 @@ // } // } // }); - this.$refs.paging.reload(true); + this.$refs.paging.reload(true); }, - queryList(pageNo, pageSize) { - const params = { - page: pageNo, - limit: pageSize, - userPackageId:this.previousPage.id, - title:this.searchValue - } - this.$Request.get('/app/artificer/selectAppOrdersList',params).then(res => { - this.$refs.paging.complete(res.data.list); - }).catch(res => { - this.$refs.paging.complete(false); - }) - }, - backImg(){//返回上一页 - if(this.previousPage.name=='次卡'){ + queryList(pageNo, pageSize) { + const params = { + page: pageNo, + limit: pageSize, + userPackageId: this.previousPage.id, + title: this.searchValue + } + this.$Request.get('/app/artificer/selectAppOrdersList', params).then(res => { + this.$refs.paging.complete(res.data.list); + }).catch(res => { + this.$refs.paging.complete(false); + }) + }, + backImg() { //返回上一页 + if (this.previousPage.name == '次卡') { uni.reLaunch({ - url:'/pages/my/cikarDrtail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my' + url: '/pages/my/cikarDrtail?id=' + this.previousPage.id + '&limit=' + 10 + '&page=' + 1 + + '&name=' + 'my' }) - }else{ + }else if (this.previousPage.name == '疗程'){ uni.reLaunch({ - url:'/pages/my/fuwuliaochengDetail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my' + url: '/pages/my/fuwuliaochengDetail?id=' + this.previousPage.id + '&limit=' + 10 + + '&page=' + 1 + '&name=' + 'my' + }) + }else if (this.previousPage.name == '秒杀'){ + uni.reLaunch({ + url: '/pages/my/miaoShaOderDrtail?id=' + this.previousPage.id + '&limit=' + 10 + + '&page=' + 1 + '&name=' + 'my' + }) + }else if (this.previousPage.name == '拼团'){ + uni.reLaunch({ + url: '/pages/my/pinTuanOderDrtail?id=' + this.previousPage.id + '&limit=' + 10 + + '&page=' + 1 + '&name=' + 'my' }) } }, @@ -191,41 +219,50 @@ + + .head-title { + font-weight: bold; + font-size: 32rpx; + color: #333333; + } + + .title-font { + font-size: 30rpx; + color: #666666; + } + + .value-font { + font-size: 30rpx; + color: #333333; + } + + .margin-left-xs { + font-size: 32rpx; + font-weight: bold; + color: #111111; + } + + /deep/.margin-top-sm { + margin-top: 3px; + } + + .status-button { + font-weight: bold; + color: #019c88; + font-size: 31rpx; + } + + .status-button-a { + font-weight: bold; + color: #ff932a; + } + + .status-button-b { + font-weight: bold; + color: #7446fc; + } + + .status-button-d { + font-weight: bold; + color: #888888; + } + + .status-button-e { + font-weight: bold; + color: #999999; + } + + .status-button-f { + font-weight: bold; + color: #019c88; + } + + .status-button-g { + font-weight: bold; + color: #e04f3c; + } + + .status-button-h { + font-weight: bold; + color: #965fb9; + } + + .status-button-i { + font-weight: bold; + color: #002ea4; + } + + .status-button-g { + font-weight: bold; + color: #43b943; + } + + .status-button-h { + font-weight: bold; + color: #1bcada; + } + + .status-num { + margin-right: 15rpx; + } + \ No newline at end of file diff --git a/pages/my/pinTuanOderDrtail.vue b/pages/my/pinTuanOderDrtail.vue index 4678395..9b9723e 100644 --- a/pages/my/pinTuanOderDrtail.vue +++ b/pages/my/pinTuanOderDrtail.vue @@ -181,11 +181,19 @@ // this.showpay = true }, xiangqing(item){ - uni.navigateTo({ - url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+ - '&massageTypeId='+item.massageTypeId+ - '&status='+item.status - }) + if(item.status=='1'){ + item.id=this.mainData.id + uni.navigateTo({ + url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'拼团' + }) + }else{ + uni.navigateTo({ + url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+ + '&massageTypeId='+item.massageTypeId+ + '&status='+item.status + }) + } + }, detail(item){ if(item.status=='1'){ diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue index 993e9c9..b3ca000 100644 --- a/pages/videoCircle/index.vue +++ b/pages/videoCircle/index.vue @@ -2,7 +2,7 @@ - + @@ -109,6 +109,7 @@ > --> + @@ -117,11 +118,13 @@ let audo = uni.createInnerAudioContext() audo.loop = true import douyinScrollview from '@/components/douyin-scrollview/douyin-scrollview.vue' + import empty from '@/components/empty.vue' import CComment from "@/components/XJ-comment/index"; export default { components:{ douyinScrollview, - CComment + CComment, + empty }, data() { return {