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

订单页面调整

This commit is contained in:
曹磊 2024-07-26 14:50:20 +08:00
parent c0753f1fcb
commit 4f6f6abaf5
13 changed files with 606 additions and 484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pages/my/cika.vue
View File

@ -28,10 +28,10 @@
<!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 --> <!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 -->
<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 --> <!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
<template #refresher="{refresherStatus}" > <!-- <template #refresher="{refresherStatus}" >-->
<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view --> <!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
<custom-refresher :status="refresherStatus" /> <!-- <custom-refresher :status="refresherStatus" />-->
</template> <!-- </template>-->
<!-- 自定义没有更多数据view --> <!-- 自定义没有更多数据view -->
<template #loadingMoreNoMore > <template #loadingMoreNoMore >
<!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view --> <!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view -->
@ -100,12 +100,11 @@
}, },
onLoad(){ onLoad(){
this.myId = uni.getStorageSync('userId') this.myId = uni.getStorageSync('userId')
this.getData() // this.getData()
}, },
methods: { methods: {
input(res) {//搜索 输入框 input(res) {//搜索 输入框
this.searchValue=res; this.searchValue=res;
console.log('----input:', res)
}, },
searchBtn(){//搜索按钮 searchBtn(){//搜索按钮
if(this.searchValue!=""){ if(this.searchValue!=""){
@ -113,21 +112,22 @@
} }
}, },
getData(){ getData(){
let data = { // let data = {
userId: this.myId, // userId: this.myId,
type: this.typeData, // type: this.typeData,
page: this.page, // page: this.page,
limit: this.limit, // limit: this.limit,
title:this.searchValue, // title:this.searchValue,
} // }
this.$Request.get('/app/user/package/findMyPackageList', data).then(res => { // this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
if (res.code == 0) { // if (res.code == 0) {
this.dataList=res.data.records; // this.dataList=res.data.records;
for(var i=0;i<this.dataList.length;i++){ // for(var i=0;i<this.dataList.length;i++){
this.dataList[i].tagsData=this.dataList[i].labels.split(','); // this.dataList[i].tagsData=this.dataList[i].labels.split(',');
} // }
} // }
}) // })
this.$refs.paging.reload(true);
}, },
tabChange(index) { tabChange(index) {
this.tabIndex = index; this.tabIndex = index;
@ -145,10 +145,13 @@
page: pageNo, page: pageNo,
limit: pageSize, limit: pageSize,
type: this.typeData, type: this.typeData,
title:'' title:this.searchValue,
} }
this.$Request.get('/app/user/package/findMyPackageList',params).then(res => { this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
// 将请求的结果数组传递给z-paging // 将请求的结果数组传递给z-paging
for(var i=0;i<res.data.records.length;i++){
res.data.records[i].tagsData=res.data.records[i].labels.split(',');
}
this.$refs.paging.complete(res.data.records); this.$refs.paging.complete(res.data.records);
}).catch(res => { }).catch(res => {
// 如果请求失败写this.$refs.paging.complete(false); // 如果请求失败写this.$refs.paging.complete(false);
@ -157,7 +160,6 @@
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
}) })
}, },
backImg(){//返回上一页 backImg(){//返回上一页
uni.reLaunch({ uni.reLaunch({
url:'/pages/my/index' url:'/pages/my/index'

42
pages/my/fuwuliaocheng.vue
View File

@ -28,10 +28,10 @@
<!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 --> <!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 -->
<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 --> <!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
<template #refresher="{refresherStatus}"> <!-- <template #refresher="{refresherStatus}">-->
<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view --> <!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
<custom-refresher :status="refresherStatus" /> <!-- <custom-refresher :status="refresherStatus" />-->
</template> <!-- </template>-->
<!-- 自定义没有更多数据view --> <!-- 自定义没有更多数据view -->
<template #loadingMoreNoMore> <template #loadingMoreNoMore>
<!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view --> <!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view -->
@ -112,21 +112,22 @@
} }
}, },
getData(){ getData(){
let data = { // let data = {
userId: this.myId, // userId: this.myId,
type: this.typeData, // type: this.typeData,
page: this.page, // page: this.page,
limit: this.limit, // limit: this.limit,
title:this.searchValue, // title:this.searchValue,
} // }
this.$Request.get('/app/user/package/findMyPackageList', data).then(res => { // this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
if (res.code == 0) { // if (res.code == 0) {
this.dataList=res.data.records; // this.dataList=res.data.records;
for(var i=0;i<this.dataList.length;i++){ // for(var i=0;i<this.dataList.length;i++){
this.dataList[i].tagsData=this.dataList[i].labels.split(','); // this.dataList[i].tagsData=this.dataList[i].labels.split(',');
} // }
} // }
}) // })
this.$refs.paging.reload(true);
}, },
tabChange(index) { tabChange(index) {
this.tabIndex = index; this.tabIndex = index;
@ -144,10 +145,13 @@
page: pageNo, page: pageNo,
limit: pageSize, limit: pageSize,
type: this.typeData, type: this.typeData,
title:'' title:this.searchValue,
} }
this.$Request.get('/app/user/package/findMyPackageList',params).then(res => { this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
// 将请求的结果数组传递给z-paging // 将请求的结果数组传递给z-paging
for(var i=0;i<res.data.records.length;i++){
res.data.records[i].tagsData=res.data.records[i].labels.split(',');
}
this.$refs.paging.complete(res.data.records); this.$refs.paging.complete(res.data.records);
}).catch(res => { }).catch(res => {
// 如果请求失败写this.$refs.paging.complete(false); // 如果请求失败写this.$refs.paging.complete(false);

1
pages/my/fuwuxiangm.vue
View File

@ -121,7 +121,6 @@
}, },
input(res) {//搜索 输入框 input(res) {//搜索 输入框
this.searchValue=res; this.searchValue=res;
console.log('----input:', res)
}, },
searchBtn(){//搜索按钮 searchBtn(){//搜索按钮
if(this.searchValue!=""){ if(this.searchValue!=""){

4
pages/my/index.vue
View File

@ -106,11 +106,11 @@
</view> </view>
<view class="my-serve-list" @click="tuangou()"> <view class="my-serve-list" @click="tuangou()">
<image src="../../static/my-liaocheng2.png" mode=""></image> <image src="../../static/my-liaocheng2.png" mode=""></image>
<span class="my-serve-list-text">新人拼团</span> <span class="my-serve-list-text">拼团</span>
</view> </view>
<view class="my-serve-list" @click="miaoshao()"> <view class="my-serve-list" @click="miaoshao()">
<image src="../../static/my-liaocheng3.png" mode=""></image> <image src="../../static/my-liaocheng3.png" mode=""></image>
<span class="my-serve-list-text">秒杀</span> <span class="my-serve-list-text">限时秒杀</span>
</view> </view>
</view> </view>
</view> </view>

128
pages/my/indextaociliaoList.vue
View File

@ -1,7 +1,8 @@
<!-- 自定义下拉刷新与上拉加载演示(vue) --> <!-- 自定义下拉刷新与上拉加载演示(vue) -->
<template> <template>
<view class="content-view"> <view class="content-view">
<view class="tab-view"> <z-paging ref="paging" v-model="dataList" @query="queryList">
<template #top>
<view class="service-head-top"> <view class="service-head-top">
<view class="service-head-top-left"> <view class="service-head-top-left">
<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image> <image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
@ -20,13 +21,12 @@
<view class="fenlei"> <view class="fenlei">
<z-tabs class="z-tabs-fenlei":list="tabList" @change="tabChange" @changeClick="changeClick"/> <z-tabs class="z-tabs-fenlei":list="tabList" @change="tabChange" @changeClick="changeClick"/>
</view> </view>
</view> </template>
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0" style="padding-bottom: 100px;"> <template #loadingMoreNoMore >
<template slot="content"> <custom-nomore />
<view style="height: 10rpx;"></view> </template>
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)"> <view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)">
<image :src="item.packageImg" mode="" class="item-img"></image>
<image :src="item.packageImg" mode="aspectFill" class="item-img"></image>
<view class="item-view"> <view class="item-view">
<view class="view-cata"> <view class="view-cata">
<view class="item-view-title">{{item.title}}</view> <view class="item-view-title">{{item.title}}</view>
@ -55,17 +55,11 @@
</view> </view>
</view> </view>
</view> </view>
</template> </z-paging>
</t-refresh>
<empty v-if="dataList.length==0"></empty>
</view> </view>
</template> </template>
<script> <script>
import empty from '@/components/empty.vue'
import tRefresh from "@/components/t-refresh/t-refresh.vue"
export default { export default {
components:{tRefresh,empty},
data() { data() {
return { return {
loadingType:0, loadingType:0,
@ -88,16 +82,16 @@
this.typeData=e.type this.typeData=e.type
this.getName=e.name; this.getName=e.name;
this.myId = uni.getStorageSync('userId') this.myId = uni.getStorageSync('userId')
this.getData(); // this.getData();
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.typeData=='104'?'服务套餐':this.typeData=='105'?'项目次卡':'服务疗程', title: this.typeData=='104'?'服务套餐':this.typeData=='105'?'项目次卡':'服务疗程',
}) })
this.tabNav() this.tabNav()
}, },
onPullDownRefresh: function() { // onPullDownRefresh: function() {
this.page = 1; // this.page = 1;
this.getData() // this.getData()
}, // },
methods: { methods: {
tabNav(){ tabNav(){
let data = { let data = {
@ -113,30 +107,21 @@
} }
}) })
}, },
changeClick(index,item){
this.classifyId=item.id
this.searchValue=''
this.page = 1;
this.dataList = []
this.getData()
},
// 加载更多 // 加载更多
loadMore: async function() { // loadMore: async function() {
//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中 // //loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
if(this.loadingType==0){ // if(this.loadingType==0){
this.loadingType=2 // this.loadingType=2
//模拟数据请求 // //模拟数据请求
setTimeout(()=>{ // setTimeout(()=>{
this.page++; // this.page++;
this.loadingType=0; // this.loadingType=0;
this.getData() // this.getData()
},1000) // },1000)
} // }
}, // },
input(res) {//搜索 输入框 input(res) {//搜索 输入框
this.searchValue=res; this.searchValue=res;
console.log('----input:', res)
}, },
searchBtn(){//搜索按钮 searchBtn(){//搜索按钮
if(this.searchValue!=""){ if(this.searchValue!=""){
@ -145,26 +130,51 @@
} }
}, },
getData(){ getData(){
var that=this; // var that=this;
that.$Request.get("/app/massage/package/findPage", { // that.$Request.get("/app/massage/package/findPage", {
type:that.typeData, // type:that.typeData,
page:that.page, // page:that.page,
limit:that.limit, // limit:that.limit,
title:that.searchValue, // title:that.searchValue,
classifyId:that.classifyId // classifyId:that.classifyId
}).then(res => { // }).then(res => {
if (res.code == 0) { // if (res.code == 0) {
if (res.data) { // if (res.data) {
if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表 // if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
this.dataList = [...this.dataList, ...res.data.list]; //追加新数据 // this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
for(var i=0;i<this.dataList.length;i++){ // for(var i=0;i<this.dataList.length;i++){
var tagsData=this.dataList[i].labels.split(','); // var tagsData=this.dataList[i].labels.split(',');
this.dataList[i].tagsData = tagsData; // this.dataList[i].tagsData = tagsData;
// }
// uni.stopPullDownRefresh()
// }
// }
// });
this.$refs.paging.reload(true);
},
queryList(pageNo, pageSize) {
const params = {
page: pageNo,
limit: pageSize,
type:this.typeData,
title:this.searchValue,
classifyId:this.classifyId
} }
uni.stopPullDownRefresh() this.$Request.get('/app/massage/package/findPage',params).then(res => {
for(var i=0;i<res.data.list.length;i++){
res.data.list[i].tagsData=res.data.list[i].labels.split(',');
} }
} this.$refs.paging.complete(res.data.list);
}); }).catch(res => {
this.$refs.paging.complete(false);
})
},
changeClick(index,item){
this.classifyId=item.id
this.searchValue=''
this.page = 1;
this.dataList = []
this.getData()
}, },
backImg(){//返回上一页 backImg(){//返回上一页
uni.reLaunch({ uni.reLaunch({
@ -188,8 +198,6 @@
url:'/pages/my/fuwuliaochengDetail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon url:'/pages/my/fuwuliaochengDetail?id='+item.id+'&limit='+this.limit+'&page='+this.page+'&name='+this.getName+'&isCanCoupon='+item.isCanCoupon
}) })
} }
} }
} }
} }

7
pages/my/miaoShaOderDrtail.vue
View File

@ -90,7 +90,7 @@
</view> </view>
<view class="detail-foot-title"> <view class="detail-foot-title">
服务项目{{index+1}} 服务项目
</view> </view>
</view> </view>
<view style="height: 70rpx;"></view> <view style="height: 70rpx;"></view>
@ -239,6 +239,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
} }
.detail-view-img{ .detail-view-img{
width: 80px; width: 80px;
@ -251,6 +252,8 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 5px;
height: 100px;
} }
/deep/uni-checkbox .uni-checkbox-input{ /deep/uni-checkbox .uni-checkbox-input{
width: 26px; width: 26px;
@ -594,7 +597,7 @@
margin-left: 5px; margin-left: 5px;
} }
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #F95900; color: #FF1200;
} }
.header-bottom-money-zhen span:nth-child(1){ .header-bottom-money-zhen span:nth-child(1){
font-size: 26rpx; font-size: 26rpx;

19
pages/my/newTeaml.vue
View File

@ -28,10 +28,10 @@
<!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 --> <!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 -->
<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 --> <!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
<template #refresher="{refresherStatus}" > <!-- <template #refresher="{refresherStatus}" >-->
<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view --> <!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
<custom-refresher :status="refresherStatus" /> <!-- <custom-refresher :status="refresherStatus" />-->
</template> <!-- </template>-->
<!-- 自定义没有更多数据view --> <!-- 自定义没有更多数据view -->
<template #loadingMoreNoMore > <template #loadingMoreNoMore >
<!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view --> <!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view -->
@ -49,7 +49,7 @@
</view> </view>
<view class="item-view" v-if="text=='index'"> <view class="item-view" v-if="text=='index'">
<view class="view-cata"> <view class="view-cata">
<view class="item-view-title">{{item.title}}</view> <view class="item-view-title">{{item.title}}1111</view>
</view> </view>
<view class="shop_label" v-if="item.tagsData!=''"> <view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span> <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
@ -83,9 +83,12 @@
<span>￥</span> <span>￥</span>
<span>{{item.oldPrice}}</span> <span>{{item.oldPrice}}</span>
</view> </view>
<view class="shop_label" v-if="item.tagsData"> <view class="shop_label" v-if="item.tagsData!=''">
<span v-for="tag in item.tagsData" :key="tag">{{tag}}</span> <span v-for="tag in item.tagsData" :key="tag">{{tag}}</span>
</view> </view>
<view class="shop_label" v-else>
<span>助眠解压</span>
</view>
<view class="item-view-bottom"> <view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span> <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
@ -184,8 +187,7 @@
if(this.text=='index'){//首页进来的秒杀列表接口 if(this.text=='index'){//首页进来的秒杀列表接口
this.$Request.get('/app/massage/package/findAppActivityPage',params).then(res => { this.$Request.get('/app/massage/package/findAppActivityPage',params).then(res => {
for(var i=0;i<res.data.list.length;i++){ for(var i=0;i<res.data.list.length;i++){
var tagsData=res.data.list[i].labels.split(','); res.data.list[i].tagsData=res.data.list[i].labels.split(',');
res.data.list[i].tagsData = tagsData;
} }
this.$refs.paging.complete(res.data.list); this.$refs.paging.complete(res.data.list);
}).catch(res => { }).catch(res => {
@ -193,6 +195,9 @@
}) })
}else{ }else{
this.$Request.get('/app/user/package/findMyPackageList',params).then(res => { this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
for(var i=0;i<res.data.records.length;i++){
res.data.records[i].tagsData=res.data.records[i].labels.split(',');
}
this.$refs.paging.complete(res.data.records); this.$refs.paging.complete(res.data.records);
}).catch(res => { }).catch(res => {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);

22
pages/my/newseckill.vue
View File

@ -66,8 +66,7 @@
<!-- <span>/{{item.serviceCount}}次</span> --> <!-- <span>/{{item.serviceCount}}次</span> -->
<span>￥{{item.oldPrice}}</span> <span>￥{{item.oldPrice}}</span>
</view> </view>
<view class="item-view-bottom" v-if="text=='index'">
<view class="item-view-bottom">
<view class="item-view-xiangmu"> <view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span> <span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
</view> </view>
@ -78,6 +77,14 @@
开抢 开抢
</view> </view>
</view> </view>
<view class="item-view-bottom" v-if="text=='my'">
<view class="item-view-xiangmu">
<span>已售</span><span>{{item.sales}} <!-- | 好评{{item.esteemRate}}% --></span>
</view>
<view class="item-view-bottom-btn">
预约
</view>
</view>
</view> </view>
</view> </view>
</z-paging> </z-paging>
@ -182,6 +189,10 @@
}) })
}else{ }else{
this.$Request.get('/app/user/package/findMyPackageList',params).then(res => { this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
console.log(res.data.records);
for(var i=0;i<res.data.records.length;i++){
res.data.records[i].tagsData=res.data.records[i].labels.split(',');
}
this.$refs.paging.complete(res.data.records); this.$refs.paging.complete(res.data.records);
}).catch(res => { }).catch(res => {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
@ -384,12 +395,15 @@
} }
.item-view-xiangmu span:nth-child(2){ .item-view-xiangmu span:nth-child(2){
font-weight: normal; font-weight: normal;
color: #666666; color: #333333;
font-size: 30rpx;
} }
.item-view-xiangmu span:nth-child(1){ .item-view-xiangmu span:nth-child(1){
font-weight: normal; font-weight: normal;
color: #999; color: #666666;
margin-right: 5rpx; margin-right: 5rpx;
font-size: 30rpx;
} }
.shop_label{ .shop_label{
display: flex; display: flex;

251
pages/my/orderDetailsList.vue
View File

@ -1,6 +1,8 @@
<!-- 自定义下拉刷新与上拉加载演示(vue) --> <!-- 自定义下拉刷新与上拉加载演示(vue) -->
<template> <template>
<view class="content-view"> <view class="content-view">
<z-paging ref="paging" v-model="dataList" @query="queryList">
<template #top>
<view class="service-head-top"> <view class="service-head-top">
<view class="service-head-top-left"> <view class="service-head-top-left">
<image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image> <image @click="backImg" src="../../static/fanhui.png" mode="widthFix"></image>
@ -15,85 +17,74 @@
</view> </view>
</view> </view>
</view> </view>
<t-refresh ref="refresh" v-if="dataList.length>0" @refresh="refresh" @loadMore="loadMore" :loadingType="loadingType" :tPadding="0"> </template>
<template slot="content"> <template #loadingMoreNoMore>
<!-- 升级订单 --> <custom-nomore />
<view class="item" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)"> </template>
<view class="flex justify-between st-title"> <view class="pay-margin bg ding-view" v-for="(item,index) in dataList" :key="index" @click="itemClick(item)" style="border-radius: 20rpx;padding: 36rpx;">
<view class="flex justify-between">
<view class="flex align-center profile-img"> <view class="flex align-center profile-img">
<image src="../../static/logo.png" style="width: 55rpx;height: 55rpx;border: 1px solid#d7f2ee;border-radius: 50%;"> <image src="../../static/logo.png" 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 class="text-green"><span>{{item.ordersNo}}</span></view> <view v-if="item.status ==1"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-a">待支付</span></view>
<!-- <view class="text-green" v-if="item.status ==2"><span>{{item.ordersNo}}</span><span>待服务</span></view> <view v-if="item.status ==2"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-b">待服务</span></view>
<view class="text-green" v-if="item.status ==3"><span>{{item.ordersNo}}</span><span>待评价</span></view> <view v-if="item.status ==3"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-c">待评价</span></view>
<view class="text-green" v-if="item.status ==4"><span>{{item.ordersNo}}</span><span>已取消</span></view> <view v-if="item.status ==4"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-d">已取消</span></view>
<view class="text-green" v-if="item.status ==5"><span>{{item.ordersNo}}</span><span>已完成</span></view> <view v-if="item.status ==5"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-e">已完成</span></view>
<view class="text-green" v-if="item.status ==6"><span>{{item.ordersNo}}</span><span>服务中</span></view> <view v-if="item.status ==6"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-f">服务中</span></view>
<view class="text-green" v-if="item.status ==7"><span>{{item.ordersNo}}</span><span>技师出发</span></view> <view v-if="item.status ==7"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">技师出发</span></view>
<view class="text-green" v-if="item.status ==8"><span>{{item.ordersNo}}</span><span>技师到达</span></view> <view v-if="item.status ==8"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-i">技师到达</span></view>
<view class="text-green" v-if="item.status ==9"><span>{{item.ordersNo}}</span><span>待确认</span></view> <view v-if="item.status ==9"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-g">待确认</span></view>
<view class="text-green" v-if="item.status ==10"><span>{{item.ordersNo}}</span><span>待补单</span></view> --> <view v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> -->
</view> </view>
<view class="margin-top-sm"></view> <view class="margin-top-sm" style="width: 100%;height: 1rpx;background: #f7f7f7;"></view>
<view class=" u-flex" 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="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image> <image :src="item.ordersMassageList[0].massageType.massageImg" mode="square" 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" style="width: 560rpx;"> <view class="text-bold u-line-1">
<view class="text-lg" <view class="text-lg"
style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{item.entryName}} {{item.entryName}}
</view> </view>
</view> </view>
<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;"> <view class="u-font-13 u-tips-color justify-between title-font" style="margin-top: 14rpx;">
预约时间：{{item.serveTime}} <text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text>
</view> </view>
<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;"> <view class="flex-sub u-font-13">
实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text> <text class="title-font">实付金额：</text><text class="text-xl text-bold" style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
</view> </view>
</view> </view>
</view> </view>
<view class=" u-flex" 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="" style="height: 155rpx;width: 155rpx;flex: 0 0 155rpx;"></image> <image :src="item.ordersMassageList[0].userPackageDetail.massageImg" mode="square" 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" style="width: 560rpx;"> <view class="text-bold u-line-1">
<view class="text-lg" <view class="text-lg"
style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"> style="font-size: 32rpx;margin-top: 0rpx;display: inline-block;width: 470rpx; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
{{item.entryName}} {{item.entryName}}
</view> </view>
</view> </view>
<view class="u-font-12 u-tips-color flex justify-between" style="margin-top: 6rpx;"> <view class="u-font-13 u-tips-color justify-between title-font" style="margin-top: 14rpx;">
预约时间：{{item.serveTime}} <text class="title-font">预约时间：</text><text class="value-font">{{item.serveTime}}</text>
</view> </view>
<view class="flex-sub u-font-12 margin-top-xs" style="color: #999999;"> <view class="flex-sub u-font-13">
实付：<text class="text-df" style="color: #FF1200;">￥</text><text class="text-xl text-bold" style="color: #FF1200;">{{item.payMoneyTotal}}</text> <text class="title-font">实付金额：</text><text class="text-xl text-bold" style="color: #FF1200;">￥{{item.payMoneyTotal}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</z-paging>
</template>
</t-refresh>
<empty v-if="dataList.length==0"></empty>
</view> </view>
</template> </template>
<script> <script>
import empty from '@/components/empty.vue'
import tRefresh from "@/components/t-refresh/t-refresh.vue"
export default { export default {
components:{tRefresh,empty},
data() { data() {
return { return {
loadingType:0, loadingType:0,
@ -117,26 +108,26 @@
that.previousPage=e; that.previousPage=e;
that.isVIP=this.$queue.getData('isVIP'); that.isVIP=this.$queue.getData('isVIP');
that.myId = uni.getStorageSync('userId'); that.myId = uni.getStorageSync('userId');
that.getData() // that.getData()
},
onPullDownRefresh: function() {
this.page = 1;
this.getData();
}, },
// onPullDownRefresh: function() {
// this.page = 1;
// this.getData();
// },
methods: { methods: {
// 加载更多 // 加载更多
loadMore: async function() { // loadMore: async function() {
//loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中 // //loadingType: 0.数据未加载完 1.数据全部加载完了 2.数据加载中
if(this.loadingType==0){ // if(this.loadingType==0){
this.loadingType=2 // this.loadingType=2
//模拟数据请求 // //模拟数据请求
setTimeout(()=>{ // setTimeout(()=>{
this.page++; // this.page++;
this.loadingType=0; // this.loadingType=0;
this.getData() // this.getData()
},1000) // },1000)
} // }
}, // },
input(res) {//搜索 输入框 input(res) {//搜索 输入框
this.searchValue=res; this.searchValue=res;
}, },
@ -146,20 +137,34 @@
} }
}, },
getData(){ getData(){
this.$Request.get("/app/artificer/selectAppOrdersList", { // this.$Request.get("/app/artificer/selectAppOrdersList", {
page:this.page, // page:this.page,
limit:this.limit, // limit:this.limit,
title:this.searchValue, // title:this.searchValue,
userPackageId:this.previousPage.id // userPackageId:this.previousPage.id
}).then(res => { // }).then(res => {
if (res.code == 0) { // if (res.code == 0) {
if (res.data) { // if (res.data) {
if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表 // if (this.page == 1) this.dataList = []; //如果是第一页需手动制空列表
this.dataList = [...this.dataList, ...res.data.list]; //追加新数据 // this.dataList = [...this.dataList, ...res.data.list]; //追加新数据
uni.stopPullDownRefresh() // uni.stopPullDownRefresh()
// }
// }
// });
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(){//返回上一页 backImg(){//返回上一页
if(this.previousPage.name=='次卡'){ if(this.previousPage.name=='次卡'){
@ -171,7 +176,6 @@
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'
}) })
} }
}, },
clear(res) { clear(res) {
this.getData() this.getData()
@ -186,7 +190,16 @@
} }
</script> </script>
<style scoped> <style lang="scss" scoped>
.pay-margin{
margin: 20rpx 20rpx;
}
.bg {
background-color: #FFFFFF;
}
.profile-img{
margin-top: -20rpx;
}
.st-title{ .st-title{
padding-top:20rpx; padding-top:20rpx;
} }
@ -197,21 +210,19 @@
align-items: center; align-items: center;
} }
/deep/.justify-between{ /deep/.justify-between{
align-items: center; height: 54rpx;
} }
.ding-view{ .ding-view{
position: relative; position: relative;
} }
.text-green span:nth-child(1){ .text-green span:nth-child(1){
font-weight: 400; font-size: 30rpx;
font-size: 25rpx; color: #333333;
color: #7D7D7D;
margin-right: 10px; margin-right: 10px;
} }
.text-green span:nth-child(2){ .text-green span:nth-child(2){
font-weight: 400; font-size: 30rpx;
font-size: 25rpx; color: #333333;
color: #7D7D7D;
margin-right: 10px; margin-right: 10px;
} }
.header-bottom-title-liao{ .header-bottom-title-liao{
@ -377,9 +388,9 @@
width: 95%; width: 95%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 140px; height: 200px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 21rpx; border-radius: 20rpx;
padding: 0px 12px; padding: 0px 12px;
margin: 20rpx auto 0px auto; margin: 20rpx auto 0px auto;
} }
@ -405,7 +416,7 @@
width:100%; width:100%;
} }
/deep/.zp-paging-container-content{ /deep/.zp-paging-container-content{
width: 95%; width: 100%;
margin: 0 auto; margin: 0 auto;
} }
.fenlei{ .fenlei{
@ -500,5 +511,73 @@
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{
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;
}
</style> </style>

6
pages/my/pinTuanOderDrtail.vue
View File

@ -90,7 +90,7 @@
</view> </view>
<view class="detail-foot-title"> <view class="detail-foot-title">
服务项目{{index+1}} 服务项目
</view> </view>
</view> </view>
<view style="height: 70rpx;"></view> <view style="height: 70rpx;"></view>
@ -251,6 +251,8 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 5px;
height: 100px;
} }
/deep/uni-checkbox .uni-checkbox-input{ /deep/uni-checkbox .uni-checkbox-input{
width: 26px; width: 26px;
@ -594,7 +596,7 @@
margin-left: 5px; margin-left: 5px;
} }
.header-bottom-money-zhen span{ .header-bottom-money-zhen span{
color: #F95900; color: #FF1200;
} }
.header-bottom-money-zhen span:nth-child(1){ .header-bottom-money-zhen span:nth-child(1){
font-size: 26rpx; font-size: 26rpx;

2
pages/my/serviceOderDrtail.vue
View File

@ -699,6 +699,8 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 5px;
height: 100px;
} }
/deep/uni-checkbox .uni-checkbox-input{ /deep/uni-checkbox .uni-checkbox-input{
width: 26px; width: 26px;

47
pages/my/servicePackage.vue
View File

@ -28,10 +28,10 @@
<!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 --> <!-- 注意注意注意！！字节跳动小程序中自定义下拉刷新不支持slot-scope，将导致custom-refresher无法显示 -->
<!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 --> <!-- 如果是字节跳动小程序，请参照sticky-demo.vue中的写法，此处使用slot-scope是为了减少data中无关变量声明，降低依赖 -->
<template #refresher="{refresherStatus}"> <!-- <template #refresher="{refresherStatus}">-->
<!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view --> <!-- 此处的custom-refresh为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，下拉刷新就显示什么view -->
<custom-refresher :status="refresherStatus" /> <!-- <custom-refresher :status="refresherStatus" />-->
</template> <!-- </template>-->
<!-- 自定义没有更多数据view --> <!-- 自定义没有更多数据view -->
<template #loadingMoreNoMore> <template #loadingMoreNoMore>
<!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view --> <!-- 此处的custom-nomore为demo中自定义的组件，非z-paging的内置组件，请在实际项目中自行创建。这里插入什么view，没有更多数据就显示什么view -->
@ -100,7 +100,7 @@
}, },
onLoad(){ onLoad(){
this.myId = uni.getStorageSync('userId') this.myId = uni.getStorageSync('userId')
this.getData() // this.getData()
}, },
methods: { methods: {
input(res) {//搜索 输入框 input(res) {//搜索 输入框
@ -112,21 +112,22 @@
} }
}, },
getData(){ getData(){
let data = { // let data = {
userId: this.myId, // userId: this.myId,
type: this.typeData, // type: this.typeData,
page: this.page, // page: this.page,
limit: this.limit, // limit: this.limit,
title:this.searchValue, // title:this.searchValue,
} // }
this.$Request.get('/app/user/package/findMyPackageList', data).then(res => { // this.$Request.get('/app/user/package/findMyPackageList', data).then(res => {
if (res.code == 0) { // if (res.code == 0) {
this.dataList=res.data.records; // this.dataList=res.data.records;
for(var i=0;i<this.dataList.length;i++){ // for(var i=0;i<this.dataList.length;i++){
this.dataList[i].tagsData=this.dataList[i].labels.split(','); // this.dataList[i].tagsData=this.dataList[i].labels.split(',');
} // }
} // }
}) // })
this.$refs.paging.reload(true);
}, },
tabChange(index) { tabChange(index) {
this.tabIndex = index; this.tabIndex = index;
@ -144,10 +145,13 @@
page: pageNo, page: pageNo,
limit: pageSize, limit: pageSize,
type: this.typeData, type: this.typeData,
title:'' title:this.searchValue,
} }
this.$Request.get('/app/user/package/findMyPackageList',params).then(res => { this.$Request.get('/app/user/package/findMyPackageList',params).then(res => {
// 将请求的结果数组传递给z-paging // 将请求的结果数组传递给z-paging
for(var i=0;i<res.data.records.length;i++){
res.data.records[i].tagsData=res.data.records[i].labels.split(',');
}
this.$refs.paging.complete(res.data.records); this.$refs.paging.complete(res.data.records);
}).catch(res => { }).catch(res => {
// 如果请求失败写this.$refs.paging.complete(false); // 如果请求失败写this.$refs.paging.complete(false);
@ -182,7 +186,7 @@
margin-top: 10rpx; margin-top: 10rpx;
} }
.shop_label span{ .shop_label span{
background: #f3f3f3; background: linear-gradient(90deg, #ffefde, #fff7ef);
height: 34rpx; height: 34rpx;
line-height: 34rpx; line-height: 34rpx;
border-radius: 8rpx; border-radius: 8rpx;
@ -190,6 +194,7 @@
font-size: 22rpx; font-size: 22rpx;
margin-right: 8rpx; margin-right: 8rpx;
margin-bottom: 8rpx; margin-bottom: 8rpx;
color: #f68607;
} }
.img-span{ .img-span{
padding: 2px 5px; padding: 2px 5px;

1
pages/order/index.vue
View File

@ -29,7 +29,6 @@
<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 ==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 ==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 v-if="item.status ==10"><span class="status-num">{{item.ordersNo}}</span><span class="status-button-h">待补单</span></view>
<!-- <view class="u-tips-color">{{item.createTime}}</view> --> <!-- <view class="u-tips-color">{{item.createTime}}</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>