From 3b925b58f2a80c8c8fccec969d631205ee3e255d Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Mon, 22 Jul 2024 10:05:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=20=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/order/payModifyMs.vue | 24 +- my/order/paydingMs.vue | 1646 ++++++++++++++++++++++++++++++++ pages.json | 9 + pages/my/newseckill.vue | 75 +- pages/my/newseckilldetails.vue | 10 +- pages/videoCircle/index.vue | 1151 ++++++++++++++-------- pages/videoCircle/index111.vue | 762 --------------- pages/videoCircle/index22.vue | 451 +++++++++ 8 files changed, 2896 insertions(+), 1232 deletions(-) create mode 100644 my/order/paydingMs.vue delete mode 100644 pages/videoCircle/index111.vue create mode 100644 pages/videoCircle/index22.vue diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue index c23e962..813bb7f 100644 --- a/my/order/payModifyMs.vue +++ b/my/order/payModifyMs.vue @@ -289,28 +289,32 @@ goOrder() {//生成orderId let that = this console.log('asdasd',that.couponId) - // let payMoney =item.price; - // let payMoney = that.isVip ? item.memberPrice : item.price; let data = { userId: uni.getStorageSync('userId'), + groupNo:'', + isNewer:that.orderXm.isNewer==null?'0':that.orderXm.isNewer, + startTime:that.orderXm.startTime, + endTime:that.orderXm.endTime, couponId: that.couponId, - oldSumMoney: that.orderXm.oldPrice, - sumMoney: that.orderXm.price, - // oldSumMoney: that.mainData.oldPrice*that.detailData.length, - // sumMoney: that.mainData.price*that.detailData.length, + orders:'', ordersPackageList:[ {packageId: that.orderXm.id,num: that.number}, - ] + ], + // oldSumMoney: that.orderXm.oldPrice, + // sumMoney: that.orderXm.price, + // oldSumMoney: that.mainData.oldPrice*that.detailData.length, + // sumMoney: that.mainData.price*that.detailData.length, + } - that.$Request.postJson("/app/user/package/order/insertOrders", data).then(res => { + that.$Request.postJson("/app/user/package/order/insertFlashOrders", data).then(res => { that.showorder = false if (res.code == 0) { that.tordersId = res.data.ordersId; that.tpayMoney = res.data.payMoney; // that.showpay = true; - that.paySel = 1; + // that.paySel = 1; uni.navigateTo({ - url:'/my/order/paydingTc?ordersId='+ res.data.ordersId + url:'/my/order/paydingMs?ordersId='+ res.data.ordersId }) } else { that.$queue.showToast(res.msg) diff --git a/my/order/paydingMs.vue b/my/order/paydingMs.vue new file mode 100644 index 0000000..e628076 --- /dev/null +++ b/my/order/paydingMs.vue @@ -0,0 +1,1646 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index cca81fa..0f558ff 100644 --- a/pages.json +++ b/pages.json @@ -639,6 +639,15 @@ "titleNView": false } } + },{ + "path": "order/paydingMs", + "style": { + "navigationBarTitleText": "秒杀订单", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false + } + } },{ "path": "order/payModifyTcMyDaiB", "style": { diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue index 11eecd8..411d5f5 100644 --- a/pages/my/newseckill.vue +++ b/pages/my/newseckill.vue @@ -50,22 +50,24 @@ {{item.title}} + {{item.classifyName}} - - - 秒杀价￥ - {{item.price}} - - - 原价￥{{item.oldPrice}} - - + + ￥ + {{item.price}} + /{{item.serviceCount}}次 + ￥ + {{item.oldPrice}}/{{item.serviceCount}}次 - - {{item.startTime}} - - - 开抢 + + {{tag}} + + + + 已售{{item.sales}} + + + 查看 @@ -89,7 +91,8 @@ serviceTrue:true, page:1, limit:10, - titleNmae:'' + titleNmae:'', + tagsData:[] } }, onLoad(){ @@ -106,31 +109,20 @@ this.getData() } }, - getTimeInMilliseconds(timeString) { - return new Date(timeString).getTime(); - }, getData(){ let data = { + userId: this.myId, type: '112', page: this.page, limit: this.limit, title:this.searchValue, } - this.$Request.get('/app/massage/package/findAppActivityPage', data).then(res => { + this.$Request.get('/app/user/package/findMyPackageList', data).then(res => { if (res.code == 0) { - var newTime = new Date().getTime(); - var starTime; - var endTime; - for(var i=0;i=starTime&&newTime<=endTime){ - this.$set(res.data.list[i], 'btnShow', true) - }else{ - this.$set(res.data.list[i], 'btnShow', false) - } + this.dataList=res.data.records; + for(var i=0;i { + this.$Request.get('/app/user/package/findMyPackageList',params).then(res => { // 将请求的结果数组传递给z-paging - this.$refs.paging.complete(res.data.list); - var newTime = new Date().getTime(); - var starTime; - var endTime; - for(var i=0;i=starTime&&newTime<=endTime){ - this.$set(res.data.list[i], 'btnShow', true) - }else{ - this.$set(res.data.list[i], 'btnShow', false) - } - } - this.dataList=res.data.list; + this.$refs.paging.complete(res.data.records); }).catch(res => { // 如果请求失败写this.$refs.paging.complete(false); // 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理 @@ -186,7 +165,7 @@ }, itemClick(item) { uni.navigateTo({ - url:'/pages/my/newseckilldetails?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'index' + url:'/pages/my/newseckilldetails?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'my' }) } } diff --git a/pages/my/newseckilldetails.vue b/pages/my/newseckilldetails.vue index 87fad65..5981456 100644 --- a/pages/my/newseckilldetails.vue +++ b/pages/my/newseckilldetails.vue @@ -620,8 +620,16 @@ page: that.page, limit: that.limit, } - that.$Request.get('/app/user/package/detail/findMyPackageDetailList', data).then(res => { + that.$Request.get('/app/massage/package/getAppFlashDetail', data).then(res => { if (res.code == 0) { + var newTime = new Date().getTime(); + var starTime=this.getTimeInMilliseconds(res.data.startTime); + var endTime=this.getTimeInMilliseconds(res.data.endTime); + if(newTime>=starTime&&newTime<=endTime){ + this.$set(res.data, 'btnShow', true) + }else{ + this.$set(res.data, 'btnShow', false) + } that.mainData=res.data.mainData; that.detailData=res.data.detailData; that.contentImg=that.mainData.contentImg.split(","); diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue index da85e97..1e5ebd8 100644 --- a/pages/videoCircle/index.vue +++ b/pages/videoCircle/index.vue @@ -1,451 +1,780 @@ - + - + \ No newline at end of file + .likeNumActive{ + color: red; + } + .content{ + width: 620rpx; + z-index: 99; + position: absolute; + bottom: 50px; + /* justify-content: center; */ + padding: 15rpx; + flex-direction: column; + justify-content: flex-start; + color: #ffffff; + z-index: 12; + /* background-color: aqua; */ + } + .userName { + font-size: 30rpx; + color: #ffffff; + margin-top: 80upx; + } + .words { + margin-top: 10rpx; + font-size: 30rpx; + color: #ffffff; + } + .root{ + background-color: #000000; + } + diff --git a/pages/videoCircle/index111.vue b/pages/videoCircle/index111.vue deleted file mode 100644 index fca0ec7..0000000 --- a/pages/videoCircle/index111.vue +++ /dev/null @@ -1,762 +0,0 @@ - - - - - diff --git a/pages/videoCircle/index22.vue b/pages/videoCircle/index22.vue new file mode 100644 index 0000000..da85e97 --- /dev/null +++ b/pages/videoCircle/index22.vue @@ -0,0 +1,451 @@ + + + + + \ No newline at end of file