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

调整页面

This commit is contained in:
曹磊 2024-09-10 10:15:05 +08:00
parent 1ffa2f69b9
commit e0b87e4983
15 changed files with 102 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
my/address/address.vue
View File

@ -87,7 +87,7 @@
// console.log("addressId",addressId) // console.log("addressId",addressId)
this.$queue.setData('EditAddress', addressId); this.$queue.setData('EditAddress', addressId);
if (this.isfa == 0) { if (this.isfa == 0) {
console.log('1111111')
}else if (this.isfa ==1 ) { }else if (this.isfa ==1 ) {
this.updateaddress() this.updateaddress()
}else if (this.isfa == 2) { }else if (this.isfa == 2) {

2
my/order/payModify.vue
View File

@ -608,7 +608,7 @@
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + 2 url: '../address/address?id=' + 2 +'&pageName=payModify'
}) })
} }

2
my/order/payModifyCi.vue
View File

@ -494,7 +494,7 @@
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + 2 url: '../address/address?id=' + 2 +'&pageName=payModifyCi'
}) })
} }

17
my/order/payModifyDzhifu.vue
View File

@ -56,15 +56,23 @@
</view> </view>
</view> </view>
<view class="add-content" @click="getAddressList()" >
<view v-if="!detailaddress">请选择地址</view> <!-- <view class="add-content" @click="getAddressList()" > 修改订单时先不让修改地址，客户要求修改时再放开，同时支付时后台修改订单接口要调整-->
<!-- <view v-if="!detailaddress">请选择地址</view>
<view class="Service-Address"> <view class="Service-Address">
{{province}}/{{city}}/{{district}}/{{detailaddress}} {{province}}/{{city}}/{{district}}/{{detailaddress}}
</view> </view>
<view class="Service-name"> <view class="Service-name">
<span>{{name}}</span> <span>{{name}}</span>
<span>{{mobile}}</span> <span>{{mobile}}</span>
</view> -->
<view class="add-content">
<view class="Service-Address">{{orderXm.address}}</view>
<view class="Service-name" >
<span>{{orderXm.userName}}</span>
<span>{{orderXm.phone ? orderXm.phone.substring(0,3) + '****' + orderXm.phone.substring(7,11) : ''}}</span>
</view> </view>
<!-- <view class="margin-right-xs"> <!-- <view class="margin-right-xs">
<view class="flex justify-between margin-top-lg"> <view class="flex justify-between margin-top-lg">
<view class="header-view-text">联系人</view> <view class="header-view-text">联系人</view>
@ -123,7 +131,8 @@
</view> --> </view> -->
</view> </view>
<view class="padding margin-top-sm header-view"> <view class="padding margin-top-sm header-view">
<view class="jusitify-line" @click="liliaoshi"> <!-- <view class="jusitify-line" @click="liliaoshi"> 修改订单时先不让修改技师，客户有要求时再打开-->
<view class="jusitify-line">
<view class="title-font" > <view class="title-font" >
<span v-if="jishiName">{{jishiName.technicianTypeName}}</span> <span v-if="jishiName">{{jishiName.technicianTypeName}}</span>
<span>技师</span> <span>技师</span>
@ -131,7 +140,7 @@
<view> <view>
<span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName?jishiName.artificerName:jishiName.artificer.artificerName}}</span> <span class="line-word-r value-font" v-if="jishiName">{{jishiName.artificerName?jishiName.artificerName:jishiName.artificer.artificerName}}</span>
<span class="line-word-r value-font" v-else>选择不同技师价格可能不一样哦~</span> <span class="line-word-r value-font" v-else>选择不同技师价格可能不一样哦~</span>
<span class="view-more"></span> <!-- <span class="view-more"></span> 修改订单时先不让修改技师，客户有要求时再打开-->
</view> </view>
</view> </view>
<!--<view class="liliao"> <!--<view class="liliao">

2
my/order/payModifyLiao.vue
View File

@ -495,7 +495,7 @@
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + 2 url: '../address/address?id=' + 2 +'&pageName=payModifyLiao'
}) })
} }

6
my/order/payModifyMs.vue
View File

@ -528,8 +528,12 @@
// uni.hideLoading(); // uni.hideLoading();
}); });
} else { } else {
let pageUrl = '../address/address?id=' + this.orderXm.type
if(this.orderXm.type == 2){
pageUrl = pageUrl +'&pageName=payModifyMs'
}
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + this.orderXm.type url: pageUrl
}) })
} }

2
my/order/payModifyQy.vue
View File

@ -496,7 +496,7 @@
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + 2 url: '../address/address?id=' + 2 +'&pageName=payModifyQy'
}) })
} }

6
my/order/payModifyTc.vue
View File

@ -549,8 +549,12 @@
// uni.hideLoading(); // uni.hideLoading();
}); });
} else { } else {
let pageUrl = '../address/address?id=' + this.orderXm.type
if(this.orderXm.type == 2){
pageUrl = pageUrl +'&pageName=payModifyTc'
}
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + this.orderXm.type url: pageUrl
}) })
} }

2
my/order/payShengji.vue
View File

@ -232,7 +232,7 @@
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">升级差额</view> <view class="line-word title-font">升级差额</view>
<view class="line-word-r value-font" style="color: #019c88;">￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(0)}}</view> <view class="line-word-r value-font" style="color: #019c88;">￥{{(order.priceMarkup - order.oldPriceMarkup).toFixed(2)}}</view>
</view> </view>
<view class="flex justify-between jusitify-line"> <view class="flex justify-between jusitify-line">
<view class="line-word title-font">会员减免</view> <view class="line-word title-font">会员减免</view>

6
my/order/paydingMs.vue
View File

@ -288,8 +288,12 @@
// uni.hideLoading(); // uni.hideLoading();
}); });
} else { } else {
let pageUrl = '../address/address?id=' + this.orderXm.type
if(this.orderXm.type == 2){
pageUrl = pageUrl +'&pageName=paydingMs'
}
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + this.orderXm.type url: pageUrl
}) })
} }

6
my/order/paydingPt.vue
View File

@ -288,8 +288,12 @@
// uni.hideLoading(); // uni.hideLoading();
}); });
} else { } else {
let pageUrl = '../address/address?id=' + this.orderXm.type
if(this.orderXm.type == 2){
pageUrl = pageUrl +'&pageName=paydingPt'
}
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + this.orderXm.type url: pageUrl
}) })
} }

6
my/order/paydingTc.vue
View File

@ -298,8 +298,12 @@
// uni.hideLoading(); // uni.hideLoading();
}); });
} else { } else {
let pageUrl = '../address/address?id=' + this.orderXm.type
if(this.orderXm.type == 2){
pageUrl = pageUrl +'&pageName=paydingTc'
}
uni.navigateTo({ uni.navigateTo({
url: '../address/address?id=' + this.orderXm.type url: pageUrl
}) })
} }

31
pages/my/fuwuGengduo.vue
View File

@ -46,10 +46,10 @@
<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="" class="item-img"></image>
<view class="item-view"> <view class="item-view">
<view class="item-view-title"> <view class="view-cata">
{{item.title}} <view class="item-view-title">{{item.title}}</view>
<span v-if="item.levelName" class="xiaoer item-view-biao">{{item.levelName}}</span>
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span></span> <span></span>
<span>￥{{item.price}}</span> <span>￥{{item.price}}</span>
@ -226,8 +226,18 @@
this.$Request.get("/app/massage/package/findPackageAndMassagePage", params).then(res => { this.$Request.get("/app/massage/package/findPackageAndMassagePage", params).then(res => {
for (var i = 0; i < res.data.list.length; i++) { for (var i = 0; i < res.data.list.length; i++) {
res.data.list[i].tagsData = res.data.list[i].labels.split(','); res.data.list[i].tagsData = res.data.list[i].labels.split(',');
if(res.data.list[i].level == 3){
res.data.list[i].levelName = "资深"
}
if(res.data.list[i].level == 4){
res.data.list[i].levelName = "金牌"
}
if(res.data.list[i].level == 5){
res.data.list[i].levelName = "专家"
}
} }
this.$refs.paging.complete(res.data.list); this.$refs.paging.complete(res.data.list);
console.log(res.data.list);
}).catch(res => { }).catch(res => {
this.$refs.paging.complete(false); this.$refs.paging.complete(false);
}) })
@ -453,9 +463,11 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.item-view-biao { .item-view-biao{
padding: 1px 2px; padding: 1px 5px;
border-radius: 6rpx; border-radius: 15rpx 3rpx 15rpx 3rpx;
width: 50px;
text-align: center;
} }
.tuina { .tuina {
@ -684,4 +696,11 @@
justify-content: space-between; justify-content: space-between;
background: #fff; background: #fff;
} }
.view-cata{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
</style> </style>

29
pages/my/fuwuxiangm.vue
View File

@ -46,10 +46,10 @@
<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="" class="item-img"></image>
<view class="item-view"> <view class="item-view">
<view class="item-view-title"> <view class="view-cata">
{{item.title}} <view class="item-view-title">{{item.title}}</view>
<span v-if="item.levelName" class="xiaoer item-view-biao">{{item.levelName}}</span>
</view> </view>
<view class="item-view-bottom-qian"> <view class="item-view-bottom-qian">
<span></span> <span></span>
<span>￥{{item.price}}</span> <span>￥{{item.price}}</span>
@ -226,6 +226,15 @@
this.$Request.get('/app/massage/package/findPackageAndMassagePage', params).then(res => { this.$Request.get('/app/massage/package/findPackageAndMassagePage', params).then(res => {
for (var i = 0; i < res.data.list.length; i++) { for (var i = 0; i < res.data.list.length; i++) {
res.data.list[i].tagsData = res.data.list[i].labels.split(','); res.data.list[i].tagsData = res.data.list[i].labels.split(',');
if(res.data.list[i].level == 3){
res.data.list[i].levelName = "资深"
}
if(res.data.list[i].level == 4){
res.data.list[i].levelName = "金牌"
}
if(res.data.list[i].level == 5){
res.data.list[i].levelName = "专家"
}
} }
this.$refs.paging.complete(res.data.list); this.$refs.paging.complete(res.data.list);
}).catch(res => { }).catch(res => {
@ -452,9 +461,11 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.item-view-biao { .item-view-biao{
padding: 1px 2px; padding: 1px 5px;
border-radius: 6rpx; border-radius: 15rpx 3rpx 15rpx 3rpx;
width: 50px;
text-align: center;
} }
.tuina { .tuina {
@ -683,4 +694,10 @@
justify-content: space-between; justify-content: space-between;
background: #fff; background: #fff;
} }
.view-cata{
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
</style> </style>

10
pages/order/index.vue
View File

@ -492,6 +492,15 @@
}) })
}, },
goNav(url,item,text) { goNav(url,item,text) {
if(item["technicianType"] == 3){
item["technicianTypeName"] = "资深"
}
if(item["technicianType"] == 4){
item["technicianTypeName"] = "金牌"
}
if(item["technicianType"] == 5){
item["technicianTypeName"] = "专家"
}
this.$queue.setData('xiangmu',item); this.$queue.setData('xiangmu',item);
this.$queue.setData('getJishi','') this.$queue.setData('getJishi','')
console.log(item); console.log(item);
@ -545,6 +554,7 @@
this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => { this.$Request.get('/app/artificer/selectAppOrdersList', data).then(res => {
if (res.code == 0) { if (res.code == 0) {
console.log(res.data.list);
uni.hideLoading(); uni.hideLoading();
if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表 if (this.page == 1) this.goods = []; //如果是第一页需手动制空列表
this.goods = [...this.goods, ...res.data.list]; //追加新数据 this.goods = [...this.goods, ...res.data.list]; //追加新数据