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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_user

This commit is contained in:
kbing1981 2024-07-04 20:01:41 +08:00
parent 5bd8d6ed5f 5cb8291e0b
commit cfcc8d3ef8
6 changed files with 110 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
my/order/pay.vue
View File

@ -794,7 +794,7 @@
classifyId:item.classifyId,
ordersId:that.order.ordersId,
massageTypeId:that.order.massageTypeId,
userPackageDetailId:that.order.userPackageDetailId,
// userPackageDetailId:that.order.userPackageDetailId,
ordersMassageList:[
{massageId: item.massageTypeId,num: 1},
],

4
my/order/payShengji.vue
View File

@ -4,13 +4,13 @@
<view style="color: red;font-size:26rpx">(订单已超时)</view>
</view>
<view class="padding-bottom u-skeleton">
<view class="bgImg u-skeleton-fillet" v-if="order.ordersMassageList && order.ordersMassageList.length > 0"
<view class="bgImg u-skeleton-fillet"
style="padding: 0 29rpx;">
<view class="head-top">
<view class="pay-title" style="">服务项目</view>
<view class="flex justify-around">
<view class="" style="width: 160upx;height: 160upx;">
<image :src="order.oldOrdersMassageList[0].massageType.massageImg"
<image :src="order.oldOrdersMassageList[0].massageType?order.oldOrdersMassageList[0].massageType.massageImg:order.oldOrdersMassageList[0].userPackageDetail.massageImg"
style="width: 100%;height: 100%;border-radius: 19upx;"></image>
</view>
<view class="u-flex-1 margin-left-sm">

2
my/wallet/index.vue
View File

@ -608,7 +608,7 @@
if(that.getList.text=='my'&&that.getList.artificerId){
that.textMoney='是否确定为技师'+ that.getJishi.artificerName +'充值'+'吗？'
}else{
that.textMoney='是否确定为充值!'
that.textMoney='是否确定充值!'
}
uni.showModal({
title: '提示',

126
pages.json
View File

@ -370,14 +370,20 @@
"style": {
"navigationBarTitleText": "紧急求助",
"navigationBarBackgroundColor": "#3FCB46",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "pages/my/userinfo",
"style": {
"navigationBarTitleText": "个人信息"
"navigationBarTitleText": "个人信息",
"app-plus": {
"titleNView": false
}
}
},
// #ifdef H5
@ -395,33 +401,48 @@
{
"path": "pages/public/login",
"style": {
"navigationBarTitleText": "登录"
"navigationBarTitleText": "登录",
"app-plus": {
"titleNView": false
}
}
},
// #endif
{
"path": "pages/public/bind",
"style": {
"navigationBarTitleText": "绑定手机号"
"navigationBarTitleText": "绑定手机号",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "pages/public/forgetPwd",
"style": {
"navigationBarTitleText": "重置密码"
"navigationBarTitleText": "重置密码",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "pages/public/loginphone",
"style": {
"navigationBarTitleText": "登录"
"navigationBarTitleText": "登录",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "pages/public/loginmsg",
"style": {
"navigationBarTitleText": "登录"
"navigationBarTitleText": "登录",
"app-plus": {
"titleNView": false
}
}
},
{
@ -751,7 +772,10 @@
{
"path": "renzheng/index",
"style": {
"navigationBarTitleText": "月嫂认证"
"navigationBarTitleText": "月嫂认证",
"app-plus": {
"titleNView": false
}
}
},
//#ifdef MP-WEIXIN
@ -790,38 +814,56 @@
"path": "wallet/teammoneydetail",
"style": {
"navigationBarTitleText": "商家收益",
"enablePullDownRefresh": true
"enablePullDownRefresh": true,
"app-plus": {
"titleNView": false
}
}
},
{
"path": "gonghui/index",
"style": {
"navigationBarTitleText": "我的商家"
"navigationBarTitleText": "我的商家",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "gonghui/therapist",
"style": {
"navigationBarTitleText": "商家技师"
"navigationBarTitleText": "商家技师",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "wallet/yinhangka",
"style": {
"navigationBarTitleText": "银行卡账号"
"navigationBarTitleText": "银行卡账号",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "wallet/zhifubao",
"style": {
"navigationBarTitleText": ""
"navigationBarTitleText": "",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "wallet/cashList",
"style": {
"navigationBarTitleText": "提现记录",
"enablePullDownRefresh": true
"enablePullDownRefresh": true,
"app-plus": {
"titleNView": false
}
}
},
{
@ -839,7 +881,10 @@
"path": "wallet/usermoneydetail",
"style": {
"navigationBarTitleText": "收益明细",
"enablePullDownRefresh": true
"enablePullDownRefresh": true,
"app-plus": {
"titleNView": false
}
}
},
{
@ -935,43 +980,65 @@
{
"path": "publish/index",
"style": {
"navigationBarTitleText": "我的发布"
"navigationBarTitleText": "我的发布",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "publish/type",
"style": {
"navigationBarTitleText": "发布类型"
"navigationBarTitleText": "发布类型",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "publish/yaoqing",
"style": {
"navigationBarTitleText": "分享好友"
"navigationBarTitleText": "分享好友",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "publish/download",
"style": {
"navigationBarTitleText": "APP下载"
"navigationBarTitleText": "APP下载",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "publish/editor",
"style": {
"navigationBarTitleText": "个人发布"
"navigationBarTitleText": "个人发布",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "publish/firm",
"style": {
"navigationBarTitleText": "企业发布"
"navigationBarTitleText": "企业发布",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "setting/customer",
"style": {
"navigationBarTitleText": "在线客服"
"navigationBarTitleText": "在线客服",
"app-plus": {
"titleNView": false
}
}
},
{
@ -1065,19 +1132,28 @@
{
"path": "takeOrder/index",
"style": {
"navigationBarTitleText": "我的接单"
"navigationBarTitleText": "我的接单",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "takeOrder/takeDetail",
"style": {
"navigationBarTitleText": "接单详情"
"navigationBarTitleText": "接单详情",
"app-plus": {
"titleNView": false
}
}
},
{
"path": "setting/chat",
"style": {
"navigationBarTitleText": "联系客服"
"navigationBarTitleText": "联系客服",
"app-plus": {
"titleNView": false
}
}
}
]

3
pages/index/index.vue
View File

@ -227,6 +227,7 @@
</swiper>
</view>
</view>
<view style="width: 100%;height: 700px;"></view>
<!-- 经验筛选 -->
<u-select v-model="Cityshow" style="height: auto;" :list="cityList" @confirm="getCity"></u-select>
</view>
@ -1343,7 +1344,7 @@
display: flex;
flex-direction: column;
background: linear-gradient(180deg,rgba(238, 250, 246,0.6),rgba(255, 255, 255,0.9));
margin: 20rpx 0px 230px 0px;
margin: 20rpx 0px 0px 0px;
}
.index-fujin-jie-id{
height: 30rpx;

5
pages/my/fuwuGengduo.vue
View File

@ -169,14 +169,14 @@
<style scoped>
/deep/.refresh-body{
height: 100% !important;
height: 845px !important;
background-color: #f7f7f7;
margin-top: 35px;
}
.content-view{
width: 100%;
height: 100vh;
overflow: auto;
overflow: hidden;
}
.item-view-bottom-btn{
text-align: center;
@ -426,6 +426,7 @@
justify-content: space-between;
position: fixed;
background-color: #fff;
z-index: 999;
}
</style>