From b85e305ade2fe1dfebb3c65a57f9af7a41a97659 Mon Sep 17 00:00:00 2001 From: "Mr.jiang" <714156421@qq.com> Date: Fri, 19 Jul 2024 15:13:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- my/order/payModifyMs.vue | 2100 ++++++++++++++++++++++++++++ pages.json | 43 + pages/index/index.vue | 2 +- pages/my/index.vue | 19 +- pages/my/newcika.vue | 447 ------ pages/my/newreservation.vue | 487 ------- pages/my/newseckill.vue | 69 +- pages/my/newseckilldetails.vue | 195 +-- pages/shop/index.vue | 2 +- pages/videoCircle/index - 副本.vue | 451 ------ pages/videoCircle/index.vue | 1113 ++++++--------- pages/videoCircle/index111.vue | 762 ++++++++++ 12 files changed, 3434 insertions(+), 2256 deletions(-) create mode 100644 my/order/payModifyMs.vue delete mode 100644 pages/my/newcika.vue delete mode 100644 pages/my/newreservation.vue delete mode 100644 pages/videoCircle/index - 副本.vue create mode 100644 pages/videoCircle/index111.vue diff --git a/my/order/payModifyMs.vue b/my/order/payModifyMs.vue new file mode 100644 index 0000000..c23e962 --- /dev/null +++ b/my/order/payModifyMs.vue @@ -0,0 +1,2100 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 6535019..cca81fa 100644 --- a/pages.json +++ b/pages.json @@ -53,6 +53,7 @@ } } }, + { "path": "pages/cooperate/index", "style": { @@ -64,6 +65,39 @@ } } }, + { + "path": "pages/my/newseckill", + "style": { + "navigationBarTitleText": "秒杀", + "enablePullDownRefresh": true, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/my/newseckilldetails", + "style": { + "navigationBarTitleText": "秒杀详情", + "enablePullDownRefresh": true, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/my/newTeaml", + "style": { + "navigationBarTitleText": "团购", + "enablePullDownRefresh": true, + "navigationStyle": "custom", + "app-plus": { + "titleNView": false + } + } + }, { "path": "pages/cooperate/hehuo", "style": { @@ -596,6 +630,15 @@ "titleNView": false } } + },{ + "path": "order/payModifyMs", + "style": { + "navigationBarTitleText": "秒杀订单", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false + } + } },{ "path": "order/payModifyTcMyDaiB", "style": { diff --git a/pages/index/index.vue b/pages/index/index.vue index bd21223..8101589 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -97,7 +97,7 @@ 服务疗程 - + 限时秒杀 diff --git a/pages/my/index.vue b/pages/my/index.vue index 7758020..85bb8cb 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -100,14 +100,14 @@ 服务疗程 - - - 企业预约 - - + 新人拼团 + + + 秒杀 + @@ -606,6 +606,11 @@ }) } }, + miaoshao(){ + uni.navigateTo({ + url:'/pages/my/newseckill' + }) + }, meServe(item){ if (this.userId) { if(item=="服务套餐"){ @@ -620,10 +625,6 @@ uni.navigateTo({ url:'/pages/my/fuwuliaocheng' }) - }else if(item=="企业"){ - uni.navigateTo({ - url:'/pages/shop/index?text='+item - }) } } else { uni.showModal({ diff --git a/pages/my/newcika.vue b/pages/my/newcika.vue deleted file mode 100644 index 5d8984c..0000000 --- a/pages/my/newcika.vue +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - diff --git a/pages/my/newreservation.vue b/pages/my/newreservation.vue deleted file mode 100644 index bc19c2e..0000000 --- a/pages/my/newreservation.vue +++ /dev/null @@ -1,487 +0,0 @@ - - - - - - diff --git a/pages/my/newseckill.vue b/pages/my/newseckill.vue index fdfb536..11eecd8 100644 --- a/pages/my/newseckill.vue +++ b/pages/my/newseckill.vue @@ -49,21 +49,23 @@ - 【好价】传统中式学位推拿 + {{item.title}} - 已抢50% - 已售1万+ - - 秒杀价￥ - 27 - .8 + {{item.price}} + + 原价￥{{item.oldPrice}} + + + + + {{item.startTime}} - 抢 + 开抢 @@ -104,17 +106,31 @@ this.getData() } }, + getTimeInMilliseconds(timeString) { + return new Date(timeString).getTime(); + }, getData(){ let data = { - userId: this.myId, - type: this.typeData, + type: '112', page: this.page, limit: this.limit, title:this.searchValue, } - this.$Request.get('/app/user/package/findMyPackageList', data).then(res => { + this.$Request.get('/app/massage/package/findAppActivityPage', data).then(res => { if (res.code == 0) { - this.dataList=res.data.records; + 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; } }) }, @@ -130,15 +146,28 @@ // 这里的pageNo和pageSize会自动计算好，直接传给服务器即可 // 模拟请求服务器获取分页数据，请替换成自己的网络请求 const params = { - userId: this.myId, + // userId: this.myId, page: pageNo, limit: pageSize, - type: this.typeData, + type: '112', title:'' } - this.$Request.get('/app/user/package/findMyPackageList',params).then(res => { + this.$Request.get('/app/massage/package/findAppActivityPage',params).then(res => { // 将请求的结果数组传递给z-paging - this.$refs.paging.complete(res.data.records); + 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; }).catch(res => { // 如果请求失败写this.$refs.paging.complete(false); // 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理 @@ -157,7 +186,7 @@ }, itemClick(item) { uni.navigateTo({ - url:'/pages/my/cikarDrtail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'my' + url:'/pages/my/newseckilldetails?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+'index' }) } } @@ -169,6 +198,7 @@ display: flex; flex-direction: row; padding: 20rpx 0; + align-items: center; } .pace-text{ font-size: 24rpx; @@ -183,7 +213,8 @@ } .pace{ - width: 60%; + /* width: 60%; */ + padding: 0px 5px; height: 30rpx; border-radius: 30rpx; background: #f5f5f5; @@ -213,7 +244,7 @@ font-size: 24rpx; } .seckill-rob{ - width: 120rpx; + width: 80px; height: 50rpx; background: linear-gradient(90deg, #fb2d30, #fc2e37); border-radius: 5rpx 8rpx 30rpx 8rpx ; diff --git a/pages/my/newseckilldetails.vue b/pages/my/newseckilldetails.vue index 971cffa..87fad65 100644 --- a/pages/my/newseckilldetails.vue +++ b/pages/my/newseckilldetails.vue @@ -8,12 +8,12 @@ - 券后￥ - 234.00 + 秒杀价￥ + {{mainData.price}} - 优惠前 - ￥688.00 + 原价 + ￥{{mainData.oldPrice}} @@ -26,65 +26,24 @@ - {{mainData.title}}至尊级精油SPA + {{mainData.title}} - + - 精油开背 - 增强免疫 - 调节 + {{item}} - - - - @@ -108,51 +67,12 @@ - - - - - ￥234.00 - 秒杀 @@ -255,30 +175,12 @@ // #endif }, methods:{ - details(item){//详情 - if(item.usedQuantity){ - item.id=this.mainData.id - uni.navigateTo({ - url:'/pages/my/orderDetailsList?id='+item.id+'&mainId='+this.mainId+'&name='+'疗程' - }) - }else{ - uni.showToast({ - icon:'error', - title:'服务疗程尚未使用，无订单信息！' - }) - } - }, goumai(item){//立即购买 - if(item.unUsedQuantity>'0'){ - uni.navigateTo({ - url:'/pages/my/myCiLiaoDetail?id='+item.massageTypeId+'&mainId='+this.mainId+'&name='+'疗程' - }) - }else{ - uni.showToast({ - icon:'error', - title:'服务疗程已使用完成，无订单信息！' - }) - } + this.$queue.setData('mainData',item) + this.$queue.setData('youhui',''); + uni.navigateTo({ + url:'/my/order/payModifyMs?ordersId='+item.id + }) }, goNav(e) { uni.navigateTo({ @@ -685,24 +587,31 @@ }); }, - + getTimeInMilliseconds(timeString) { + return new Date(timeString).getTime(); + }, getData(){ var that=this; if(that.dataList.name=='index'){ let data = { - mainId: that.dataList.id, + id: that.dataList.id, page: that.page, limit: that.limit, } - that.$Request.get('/app/massage/packageDetail/findAppPage', data).then(res => { + that.$Request.get('/app/massage/package/getAppFlashDetail', data).then(res => { if (res.code == 0) { - that.mainData=res.mainData; - that.detailData=res.detailData.list; - that.backgroundImageUrl=res.mainData.packageImg - that.contentImg=res.mainData.contentImg.split(","); - that.liaoTime=that.detailData[0].intervalDaysStr; - that.serviceCount=that.detailData[0].serviceCount; - that.labels=that.mainData.labels.split(',') + 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; + that.backgroundImageUrl=res.data.packageImg + that.contentImg=res.data.contentImg.split(","); + that.labels=res.data.labels.split(','); } }) }else{ @@ -728,6 +637,34 @@ } \ No newline at end of file diff --git a/pages/videoCircle/index.vue b/pages/videoCircle/index.vue index fca0ec7..da85e97 100644 --- a/pages/videoCircle/index.vue +++ b/pages/videoCircle/index.vue @@ -1,551 +1,204 @@ - + - + + \ No newline at end of file diff --git a/pages/videoCircle/index111.vue b/pages/videoCircle/index111.vue new file mode 100644 index 0000000..fca0ec7 --- /dev/null +++ b/pages/videoCircle/index111.vue @@ -0,0 +1,762 @@ + + + + +