yangjun
/
sadjv3_user
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:dce03f774c37be1b89d68bf09149af11d056194d
Branches Tags
yangjun:master
..
compare: yangjun:cd270c2a3a22a4da5ea93a1a8c8cad2d5b97440d
Branches Tags
yangjun:master

No commits in common. "dce03f774c37be1b89d68bf09149af11d056194d" and "cd270c2a3a22a4da5ea93a1a8c8cad2d5b97440d" have entirely different histories.
dce03f774c ... cd270c2a3a

5 changed files with 300 additions and 398 deletions
Show Stats Expand all files Collapse all files

23
pages/msg/im.vue
View File

@ -345,10 +345,10 @@
this.$queue.showToast('请输入聊天内容'); this.$queue.showToast('请输入聊天内容');
return; return;
} }
if (this.chatId == '' || this.chatId == undefined) { // if (this.chatId == '' || this.chatId == undefined) {
this.$queue.showToast('网络较差，请稍后再试'); // this.$queue.showToast('网络较差，请稍后再试');
return; // return;
} // }
let userId = this.$queue.getData('userId'); let userId = this.$queue.getData('userId');
let avatar = this.$queue.getData('avatar'); let avatar = this.$queue.getData('avatar');
let phone = this.$queue.getData('phone'); let phone = this.$queue.getData('phone');
@ -356,6 +356,18 @@
if (!phone) { if (!phone) {
phone = this.$queue.getData('userName'); 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 = { let data = {
content: this.content, content: this.content,
messageType: type, messageType: type,
@ -366,6 +378,7 @@
if(data.messageType==2){ if(data.messageType==2){
data.width="100" data.width="100"
} }
console.log("data",data)
data = JSON.stringify(data); data = JSON.stringify(data);
let that = this; let that = this;
@ -385,11 +398,13 @@
type: type, type: type,
userId: userId userId: userId
} }
console.log(data,'data99999999999999999')
// that.ListItem.push(data); // that.ListItem.push(data);
setTimeout(() => { setTimeout(() => {
that.hideDrawer(); that.hideDrawer();
that.getTimeOrListItem1(); that.getTimeOrListItem1();
}, 50); }, 50);
console.log(that.content);
}, },
fail(err) { fail(err) {
console.log(err); console.log(err);

8
pages/my/miaoShaOderDrtail.vue
View File

@ -181,19 +181,11 @@
// this.showpay = true // this.showpay = true
}, },
xiangqing(item){ xiangqing(item){
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({ uni.navigateTo({
url:'/pages/my/myMsOderDrtail?mainId='+item.mainId+'&id='+item.id+ url:'/pages/my/myMsOderDrtail?mainId='+item.mainId+'&id='+item.id+
'&massageTypeId='+item.massageTypeId+ '&massageTypeId='+item.massageTypeId+
'&status='+item.status '&status='+item.status
}) })
}
}, },
detail(item){ detail(item){
if(item.status=='1'){ if(item.status=='1'){

140
pages/my/orderDetailsList.vue
View File

@ -9,8 +9,8 @@
<span>{{previousPage.name}}</span> <span>{{previousPage.name}}</span>
</view> </view>
<view> <view>
<uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" <uni-search-bar @service="serviceTrue" @confirm="search" :cancelext="'取消'" v-model="searchValue" @input="input"
@input="input" @clear="clear"> @clear="clear">
</uni-search-bar> </uni-search-bar>
<view class="search-btn" @click="searchBtn"> <view class="search-btn" @click="searchBtn">
搜索 搜索
@ -21,41 +21,28 @@
<template #loadingMoreNoMore> <template #loadingMoreNoMore>
<custom-nomore /> <custom-nomore />
</template> </template>
<view class="pay-margin bg ding-view" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)" <view class="pay-margin bg ding-view" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)" style="border-radius: 20rpx;padding: 36rpx;">
style="border-radius: 20rpx;padding: 36rpx;">
<view class="flex justify-between"> <view class="flex justify-between">
<view class="flex align-center profile-img"> <view class="flex align-center profile-img">
<image src="../../static/logo.png" <image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;">
</image> </image>
<view class="margin-left-xs ">{{item.artificerName}}</view> <view class="margin-left-xs ">{{item.artificerName}}</view>
</view> </view>
<view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span <view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-a">待支付</span></view>
class="status-button-a">待支付</span></view> <view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-b">待服务</span></view>
<view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span <view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-c">待评价</span></view>
class="status-button-b">待服务</span></view> <view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-d">已取消</span></view>
<view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span <view v-if="item.status ==5"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-e">已完成</span></view>
class="status-button-c">待评价</span></view> <view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-f">服务中</span></view>
<view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span <view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">技师出发</span></view>
class="status-button-d">已取消</span></view> <view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view>
<view v-if="item.status ==5"><span class="status-num">{{item.ordersNo}}</span><span <view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view>
class="status-button-e">已完成</span></view> <view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
<view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-f">服务中</span></view>
<view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-h">技师出发</span></view>
<view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-i">技师到达</span></view>
<view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-g">待确认</span></view>
<view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span
class="status-button-h">待补单</span></view>
</view> </view>
<view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view> <view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
<view class="u-flex u-p-t-30" v-if="item.ordersMassageList[0].userPackageDetail==null"> <view class="u-flex u-p-t-30" v-if="item.ordersMassageList[0].userPackageDetail==null">
<view class="u-m-r-10"> <view class="u-m-r-10">
<image :src="item.ordersMassageList[0].massageType.massageImg" mode="square" <image :src="item.ordersMassageList[0].massageType.massageImg" mode="square" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
</view> </view>
<view class="u-flex-1" style="margin-left: 20rpx;"> <view class="u-flex-1" style="margin-left: 20rpx;">
<view class="text-bold u-line-1"> <view class="text-bold u-line-1">
@ -68,15 +55,13 @@
<text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text> <text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text>
</view> </view>
<view class="flex-sub u-font-13"> <view class="flex-sub u-font-13">
<text class="title-font">实付金额：</text><text class="text-xl text-bold" <text class="title-font">实付金额：</text><text class="text-xl text-bold" style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
</view> </view>
</view> </view>
</view> </view>
<view class="u-flex u-p-t-30" v-else> <view class="u-flex u-p-t-30" v-else>
<view class="u-m-r-10"> <view class="u-m-r-10">
<image :src="item.ordersMassageList[0].userPackageDetail.massageImg" mode="square" <image :src="item.ordersMassageList[0].userPackageDetail.massageImg" mode="square" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image>
</view> </view>
<view class="u-flex-1" style="margin-left: 20rpx;"> <view class="u-flex-1" style="margin-left: 20rpx;">
<view class="text-bold u-line-1"> <view class="text-bold u-line-1">
@ -89,8 +74,7 @@
<text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text> <text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text>
</view> </view>
<view class="flex-sub u-font-13"> <view class="flex-sub u-font-13">
<text class="title-font">实付金额：</text><text class="text-xl text-bold" <text class="title-font">实付金额：</text><text class="text-xl text-bold" style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -185,23 +169,11 @@
backImg(){//返回上一页 backImg(){//返回上一页
if(this.previousPage.name=='次卡'){ if(this.previousPage.name=='次卡'){
uni.reLaunch({ uni.reLaunch({
url: '/pages/my/cikarDrtail?id=' + this.previousPage.id + '&limit=' + 10 + '&page=' + 1 + url:'/pages/my/cikarDrtail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my'
'&name=' + 'my'
}) })
}else if (this.previousPage.name == '疗程'){ }else{
uni.reLaunch({ uni.reLaunch({
url: '/pages/my/fuwuliaochengDetail?id=' + this.previousPage.id + '&limit=' + 10 + url:'/pages/my/fuwuliaochengDetail?id='+this.previousPage.id+'&limit='+10+'&page='+1+'&name='+'my'
'&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'
}) })
} }
}, },
@ -222,46 +194,37 @@
.pay-margin{ .pay-margin{
margin: 20rpx 20rpx; margin: 20rpx 20rpx;
} }
.bg { .bg {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.profile-img{ .profile-img{
margin-top: -20rpx; margin-top: -20rpx;
} }
.st-title{ .st-title{
padding-top:20rpx; padding-top:20rpx;
} }
.dingdan-cont{ .dingdan-cont{
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
/deep/.justify-between{ /deep/.justify-between{
height: 54rpx; height: 54rpx;
} }
.ding-view{ .ding-view{
position: relative; position: relative;
} }
.text-green span:nth-child(1){ .text-green span:nth-child(1){
font-size: 30rpx; font-size: 30rpx;
color: #333333; color: #333333;
margin-right: 10px; margin-right: 10px;
} }
.text-green span:nth-child(2){ .text-green span:nth-child(2){
font-size: 30rpx; font-size: 30rpx;
color: #333333; color: #333333;
margin-right: 10px; margin-right: 10px;
} }
.header-bottom-title-liao{ .header-bottom-title-liao{
display: inline-block; display: inline-block;
padding: 0 7px; padding: 0 7px;
@ -277,23 +240,19 @@
border-bottom-right-radius: 20px; border-bottom-right-radius: 20px;
color: #fff; color: #fff;
} }
/deep/.refresh-body .content{ /deep/.refresh-body .content{
background-color: #f7f7f7; background-color: #f7f7f7;
} }
/deep/.refresh-body{ /deep/.refresh-body{
height: 100% !important; height: 100% !important;
border-top: 2px solid #f7f7f7; border-top: 2px solid #f7f7f7;
} }
.content-view{ .content-view{
width: 100%; width: 100%;
height: 100vh; height: 100vh;
overflow: auto; overflow: auto;
background-color: #f7f7f7; background-color: #f7f7f7;
} }
.item-view-bottom-btn{ .item-view-bottom-btn{
text-align: center; text-align: center;
width: 131rpx; width: 131rpx;
@ -305,7 +264,6 @@
font-size: 24rpx; font-size: 24rpx;
color: #FFFFFF; color: #FFFFFF;
} }
.item-view-bottom-qian span:nth-child(4){ .item-view-bottom-qian span:nth-child(4){
font-weight: bold; font-weight: bold;
font-size: 31rpx; font-size: 31rpx;
@ -313,25 +271,21 @@
text-decoration-line: line-through; text-decoration-line: line-through;
margin-left: 5px; margin-left: 5px;
} }
.item-view-bottom-qian span:nth-child(1){ .item-view-bottom-qian span:nth-child(1){
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
color: #F95900; color: #F95900;
} }
.item-view-bottom-qian span:nth-child(2){ .item-view-bottom-qian span:nth-child(2){
font-weight: bold; font-weight: bold;
font-size: 36.81rpx; font-size: 36.81rpx;
color: #F95900; color: #F95900;
} }
.item-view-bottom-qian span:nth-child(3){ .item-view-bottom-qian span:nth-child(3){
font-weight: 400; font-weight: 400;
font-size: 25rpx; font-size: 25rpx;
color: #F95900; color: #F95900;
} }
.item-view-bottom{ .item-view-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
@ -339,7 +293,6 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.item-view-jianjie{ .item-view-jianjie{
font-weight: 400; font-weight: 400;
font-size: 22rpx; font-size: 22rpx;
@ -347,43 +300,35 @@
margin:5px 0px; margin:5px 0px;
display: -webkit-box; display: -webkit-box;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-webkit-line-clamp: 2; -webkit-line-clamp: 2; /* 显示的行数，可以根据需要修改 */
/* 显示的行数，可以根据需要修改 */
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.item-view-biao{ .item-view-biao{
padding: 1px 2px; padding: 1px 2px;
border-radius: 6rpx; border-radius: 6rpx;
} }
.tuina{ .tuina{
background-color:#d1f2df; background-color:#d1f2df;
color: #17984d; color: #17984d;
} }
.xiaoer{ .xiaoer{
background-color:#f1f8d7; background-color:#f1f8d7;
color: #58b314; color: #58b314;
} }
.taishi{ .taishi{
background-color:#e5d5c6; background-color:#e5d5c6;
color: #805d39; color: #805d39;
} }
.kangfu{ .kangfu{
background-color:#fcf3da; background-color:#fcf3da;
color: #ff8600; color: #ff8600;
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #666666;
margin-left: 5px; margin-left: 5px;
} }
.item-view-xiangmu{ .item-view-xiangmu{
width: 100%; width: 100%;
display: flex; display: flex;
@ -392,7 +337,6 @@
font-size: 21rpx; font-size: 21rpx;
margin-top: 5px; margin-top: 5px;
} }
.item-view-title-text{ .item-view-title-text{
display: inline-block; display: inline-block;
width: 100px; width: 100px;
@ -403,7 +347,6 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.item-view-title{ .item-view-title{
width: 100%; width: 100%;
display: flex; display: flex;
@ -411,7 +354,6 @@
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.item-view{ .item-view{
width: 55%; width: 55%;
height: 100%; height: 100%;
@ -419,14 +361,12 @@
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
} }
.item-img{ .item-img{
width: 285rpx; width: 285rpx;
height: 120px; height: 120px;
border-radius: 14rpx; border-radius: 14rpx;
position: relative; position: relative;
} }
.img-span{ .img-span{
padding: 2px 5px; padding: 2px 5px;
font-weight: 400; font-weight: 400;
@ -440,12 +380,10 @@
margin-bottom: 5px; margin-bottom: 5px;
margin-right: 5px; margin-right: 5px;
} }
.item-img image{ .item-img image{
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.item { .item {
width: 95%; width: 95%;
display: flex; display: flex;
@ -473,24 +411,20 @@
width: 100%; width: 100%;
background-color: #eeeeee; background-color: #eeeeee;
} }
/deep/.zp-paging-container{ /deep/.zp-paging-container{
background-color: #f7f7f7; background-color: #f7f7f7;
width:100%; width:100%;
} }
/deep/.zp-paging-container-content{ /deep/.zp-paging-container-content{
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;
} }
.fenlei{ .fenlei{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.index-fenl-title{ .index-fenl-title{
width: 81rpx; width: 81rpx;
text-align: center; text-align: center;
@ -502,7 +436,6 @@
font-size: 34rpx; font-size: 34rpx;
color:#019C88; color:#019C88;
} }
.index-fenl-title-bottom{ .index-fenl-title-bottom{
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@ -512,11 +445,9 @@
border-radius: 7rpx; border-radius: 7rpx;
background: linear-gradient(-48deg,rgba(1, 156, 136, 0.35),rgba(45, 196, 142, 0.35)); background: linear-gradient(-48deg,rgba(1, 156, 136, 0.35),rgba(45, 196, 142, 0.35));
} }
/deep/.uni-searchbar__cancel{ /deep/.uni-searchbar__cancel{
display: none; display: none;
} }
.search-btn{ .search-btn{
text-align: center; text-align: center;
line-height: 28px; line-height: 28px;
@ -526,15 +457,12 @@
top: 25rpx; top: 25rpx;
height: 29px !important; height: 29px !important;
} }
/deep/.uni-searchbar__box-icon-search,.search-btn{
/deep/.uni-searchbar__box-icon-search,
.search-btn {
width: 110rpx; width: 110rpx;
height: 50rpx; height: 50rpx;
background: #18A689; background: #18A689;
border-radius: 31rpx; border-radius: 31rpx;
} }
/deep/.uni-searchbar__box{ /deep/.uni-searchbar__box{
height: 30px; height: 30px;
border-radius: 30px !important; border-radius: 30px !important;
@ -547,19 +475,16 @@
position: relative; position: relative;
margin-top: 4rpx; margin-top: 4rpx;
} }
/deep/.uni-searchbar{ /deep/.uni-searchbar{
width: 240px; width: 240px;
border-radius: 31rpx; border-radius: 31rpx;
} }
.service-head-top-left image{ .service-head-top-left image{
width: 20px; width: 20px;
height: 20rpx; height: 20rpx;
margin-right:5px; margin-right:5px;
margin-left: 10rpx; margin-left: 10rpx;
} }
.service-head-top-left span{ .service-head-top-left span{
width: 180rpx; width: 180rpx;
height: 60rpx; height: 60rpx;
@ -570,14 +495,12 @@
color: #171717; color: #171717;
margin-top: 16rpx; margin-top: 16rpx;
} }
.service-head-top-left{ .service-head-top-left{
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.service-head-top{ .service-head-top{
width: 100%; width: 100%;
height: 51px; height: 51px;
@ -588,89 +511,72 @@
background: linear-gradient(60deg,rgba(115, 212, 183, 0.2),rgba(227, 251, 244, 0.1),rgba(193, 236, 223, 0.35)); background: linear-gradient(60deg,rgba(115, 212, 183, 0.2),rgba(227, 251, 244, 0.1),rgba(193, 236, 223, 0.35));
border-bottom:1rpx solid #c4ede1; border-bottom:1rpx solid #c4ede1;
} }
.head-title{ .head-title{
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
} }
.title-font{ .title-font{
font-size: 30rpx; font-size: 30rpx;
color: #666666; color: #666666;
} }
.value-font{ .value-font{
font-size: 30rpx; font-size: 30rpx;
color: #333333; color: #333333;
} }
.margin-left-xs{ .margin-left-xs{
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
} }
/deep/.margin-top-sm{ /deep/.margin-top-sm{
margin-top: 3px; margin-top: 3px;
} }
.status-button{ .status-button{
font-weight: bold; font-weight: bold;
color: #019c88; color: #019c88;
font-size: 31rpx; font-size: 31rpx;
} }
.status-button-a{ .status-button-a{
font-weight: bold; font-weight: bold;
color: #ff932a; color: #ff932a;
} }
.status-button-b{ .status-button-b{
font-weight: bold; font-weight: bold;
color: #7446fc; color: #7446fc;
} }
.status-button-d{ .status-button-d{
font-weight: bold; font-weight: bold;
color: #888888; color: #888888;
} }
.status-button-e{ .status-button-e{
font-weight: bold; font-weight: bold;
color: #999999; color: #999999;
} }
.status-button-f{ .status-button-f{
font-weight: bold; font-weight: bold;
color: #019c88; color: #019c88;
} }
.status-button-g{ .status-button-g{
font-weight: bold; font-weight: bold;
color: #e04f3c; color: #e04f3c;
} }
.status-button-h{ .status-button-h{
font-weight: bold; font-weight: bold;
color: #965fb9; color: #965fb9;
} }
.status-button-i{ .status-button-i{
font-weight: bold; font-weight: bold;
color: #002ea4; color: #002ea4;
} }
.status-button-g{ .status-button-g{
font-weight: bold; font-weight: bold;
color: #43b943; color: #43b943;
} }
.status-button-h{ .status-button-h{
font-weight: bold; font-weight: bold;
color: #1bcada; color: #1bcada;
} }
.status-num{ .status-num{
margin-right: 15rpx; margin-right: 15rpx;
} }

8
pages/my/pinTuanOderDrtail.vue
View File

@ -181,19 +181,11 @@
// this.showpay = true // this.showpay = true
}, },
xiangqing(item){ xiangqing(item){
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({ uni.navigateTo({
url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+ url:'/pages/my/pTuanOderDrtail?mainId='+item.mainId+'&id='+item.id+
'&massageTypeId='+item.massageTypeId+ '&massageTypeId='+item.massageTypeId+
'&status='+item.status '&status='+item.status
}) })
}
}, },
detail(item){ detail(item){
if(item.status=='1'){ if(item.status=='1'){

7
pages/videoCircle/index.vue
View File

@ -2,7 +2,7 @@
<view> <view>
<!-- 视频 id 切记是字符串类型 --> <!-- 视频 id 切记是字符串类型 -->
<!-- <image v-if="isShowAixin" src="@/static/img/index/aixining.png" :style="'position: fixed; margin-left: '+ aixinLeft +'px; margin-top: '+ aixinTop +'px; width: 70px; height: 65px; transform: rotate('+ Rotate +'deg);'"></image> --> <!-- <image v-if="isShowAixin" src="@/static/img/index/aixining.png" :style="'position: fixed; margin-left: '+ aixinLeft +'px; margin-top: '+ aixinTop +'px; width: 70px; height: 65px; transform: rotate('+ Rotate +'deg);'"></image> -->
<swiper v-if="dataList.length>0" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px; background-color: #000000;'" :vertical="true" @animationfinish="animationfinish" @change="change" :current="current" :indicator-dots="false" :duration="duration"> <swiper :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px; background-color: #000000;'" :vertical="true" @animationfinish="animationfinish" @change="change" :current="current" :indicator-dots="false" :duration="duration">
<swiper-item v-for="(list,index) in dataList" :key="index"> <swiper-item v-for="(list,index) in dataList" :key="index">
<view v-if="Math.abs(k-index)<=1"> <view v-if="Math.abs(k-index)<=1">
<view> <view>
@ -109,7 +109,6 @@
></douyin-scrollview> --> ></douyin-scrollview> -->
</view> </view>
</uni-popup> </uni-popup>
<empty v-if="dataList.length==0"></empty>
</view> </view>
</template> </template>
@ -118,13 +117,11 @@
let audo = uni.createInnerAudioContext() let audo = uni.createInnerAudioContext()
audo.loop = true audo.loop = true
import douyinScrollview from '@/components/douyin-scrollview/douyin-scrollview.vue' import douyinScrollview from '@/components/douyin-scrollview/douyin-scrollview.vue'
import empty from '@/components/empty.vue'
import CComment from "@/components/XJ-comment/index"; import CComment from "@/components/XJ-comment/index";
export default { export default {
components:{ components:{
douyinScrollview, douyinScrollview,
CComment, CComment
empty
}, },
data() { data() {
return { return {