yangjun
/
sadjv3_jishi
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_jishi

This commit is contained in:
kbing1981 2024-07-01 20:16:00 +08:00
parent 4e7a24d5bd ad9b5e88fc
commit 7678aa99cd
9 changed files with 86 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
my/commission/index.vue
View File

@ -14,20 +14,30 @@
</view>
</view>
</view>
<view class="innerBottom">
<view class="innerBottom" style="height: 140px;">
<view class="innerBottomOfTop">
<view class="innerTimer">
{{this.homePageDataNum.fundRange}}
</view>
</view>
<view class="middleTop">
<view class="IntegralImport">
<!-- <view class="IntegralImport">
<view class="totalIntegralNumber">
{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
</view>
<view class="totalIntegral">
本期收益(元)
</view>
</view> -->
<view class="IntegralImport">
<view class="IntegralClassify">
<view class="" style="margin-top: -12px;font-weight: 700;">
{{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }}
</view>
<view class="IntegralClassifyInnerBottom">
本期收益(元)
</view>
</view>
</view>
<view class="line"></view>
<view class="innerBottomOfBottom">
@ -47,7 +57,7 @@
车费收益
</view>
</view>
<view class="IntegralClassify">
<!-- <view class="IntegralClassify">
<view class="">
{{this.homePageDataNum.valueStorageDeduction ? this.homePageDataNum.valueStorageDeduction : 0 }}
</view>
@ -62,14 +72,14 @@
<view class="IntegralClassifyInnerBottom">
渠道扣款
</view>
</view>
</view> -->
</view>
</view>
</view>
<uni-datetime-picker type="date" ref="dataPicker" :clear-icon="true" return-type="string"
@change="confirmSelectedDate" v-model="selectedDate" @maskClick="maskClick" />
</view>
<view id="IntegralStatisticsBottom" :style="{height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px'}">
<view id="IntegralStatisticsBottom" :style="{height:domNeedHeight == 0? 420 + 'px' : domNeedHeight + 'px',top:0}">
<view class="optionsDetail">
<!-- 父元素列表 -->
<cc-nodata title="暂无数据" v-if="noDataScrollStatus"

3
my/fund/index.vue
View File

@ -250,7 +250,7 @@
}
if (res && res.data && res.data.userMoneyDetailsList.records.length > 0) {
//有数据时
this.currentIncome = res.data?.income + "元";
this.currentIncome = res.data.income + "元";
for (let i = 0; i < res.data?.userMoneyDetailsList.records.length; i++) {
this.fundDetail.push(res.data?.userMoneyDetailsList.records[i]);
}
@ -262,6 +262,7 @@
this.loadingStatus = "loadmore";
}
} else {
this.currentIncome = "0元";
//无数据时
if (!isScroll) {
//如果isScroll为null时说明不在滚动

15
pages.json
View File

@ -163,6 +163,21 @@
"navigationBarTitleText": "网页"
}
},
{
"path": "pages/hetong/index",
"style": {
"navigationBarTitleText": "我的合同"
// "app-plus": {
// "titleNView": false
// }
}
},
{
"path": "pages/xingxiangzhao/index",
"style": {
"navigationBarTitleText": "生活照"
}
},
{
"path": "pages/order/index",

15
pages/index/addClock.vue
View File

@ -29,9 +29,10 @@
<view class="view-title">
<view class="view-title-left">
<span class="view-title-left-shuxian"></span>
<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
<span class="view-title-left-text" v-if="orderType == 2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
<span class="view-title-left-text" v-if="orderType == 3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
</view>
<view class="view-title-right">加钟{{isSfwc}}订单数量: {{listData.length}}</view>
<view class="view-title-right">订单数量: {{listData.length}}</view>
</view>
<!--本期加钟 充值 订单-->
<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
@ -46,15 +47,15 @@
</view>
<view class="mian-foot">
<view class="mian-foot-img">
<image src="../../my/static/bg6.png" mode=""></image>
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
</view>
<view class="mian-foot-list">
<view class="mian-foot-view">
<view class="mian-title">{{item.entryName}}</view>
<view class="mian-dingwei">
<!-- <view class="mian-dingwei">
<image src="../../static/index/dangqian2.png" mode=""></image>
<span class="shouyi-text">0.8km</span>
</view>
</view> -->
</view>
<view class="mian-foot-dan shouyi-text">
订单编号 : {{item.ordersNo}}
@ -85,7 +86,7 @@
</view>
<view class="mian-foot">
<view class="mian-foot-img">
<image src="../../my/static/bg6.png" mode=""></image>
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
</view>
<view class="mian-foot-list">
<view class="mian-foot-view">
@ -250,7 +251,7 @@
},
wangqi(){//往期 跳页
uni.navigateTo({
url:'/pages/index/previousAdditions?type=2'
url:'/pages/index/previousAdditions?type='+this.orderType
})
},
}

22
pages/index/game/workphoto.vue
View File

@ -5,8 +5,11 @@
:key="index">
<image :src="item" style="width: 100%;" mode="widthFix" @click="saveImg(item)"></image>
</view>
<view class="tabbar" style="background: linear-gradient(to right, #019c88, #2dbe93); border-radius: 50rpx;"
@click="goNav()" >重新上传</view>
</view>
<u-empty v-show="!photoList[0]" icon-size="180" text="暂无生活照片" mode="list"></u-empty>
<u-empty v-show="photoList.length==0" icon-size="180" text="暂无生活照片" mode="list"></u-empty>
</view>
</template>
@ -25,6 +28,11 @@
this.getDet()
},
methods: {
goNav(){
uni.navigateTo({
url:'/pages/xingxiangzhao/index'
})
},
// 详情
getDet() {
uni.showLoading({
@ -58,4 +66,16 @@
</script>
<style>
.tabbar {
width: 690upx;
height: 86upx;
background: #019c88;
border-radius: 8upx;
margin: 0 auto;
text-align: center;
line-height: 86upx;
color: #FFFFFF;
margin-top: 20rpx;
}
</style>

12
pages/index/index.vue
View File

@ -696,13 +696,6 @@ export default {
});
// this.getcity()
// 理疗师端首页是否弹框 380
this.$Request.get('/app/common/type/448').then(res => {
console.log('res448--->',res);
this.isJsjdsfxywl = res.data.value;
});
},
onShow() {
console.log(this.isLogin);
@ -719,6 +712,10 @@ export default {
}
});
// 理疗师端首页是否弹框 380
this.$Request.get('/app/common/type/448').then(res => {
this.isJsjdsfxywl = res.data.value;
});
this.$Request.get('/app/common/type/238').then(res => {
if (res.code == 0) {
// #ifdef MP-WEIXIN
@ -1001,6 +998,7 @@ export default {
},
stateSave() {
let materialPackageCountFlag = this.homeMaterialPackageList.some((item) => item.residue <= item.materialMinimum);
console.log(this.isTrue,materialPackageCountFlag,this.isJsjdsfxywl);
if (!this.isTrue && materialPackageCountFlag && this.isJsjdsfxywl == '是') {
this.$queue.showToast("当前剩余物料包数量不足，请检查");
return;

21
pages/index/previousAdditions.vue
View File

@ -33,15 +33,16 @@
<view class="view-title">
<view class="view-title-left">
<span class="view-title-left-shuxian"></span>
<span class="view-title-left-text">本期{{orderType=='2'?'已加钟':'已充值'}}订单</span>
<span class="view-title-left-text" v-if="orderType==2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
<span class="view-title-left-text" v-if="orderType==3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
</view>
<view class="view-title-right">加钟订单数量: {{listData.length}}</view>
<view class="view-title-right">订单数量: {{listData.length}}</view>
</view>
<!--本期加钟 充值 订单-->
<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
<view class="mian-list">
<view class="mian-list-top">
<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
<view class="mian-list-top-time">
<span>预约时间: </span>
<span>{{item.serveTime}}</span>
@ -49,15 +50,15 @@
</view>
<view class="mian-foot">
<view class="mian-foot-img">
<image src="../../my/static/bg6.png" mode=""></image>
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
</view>
<view class="mian-foot-list">
<view class="mian-foot-view">
<view class="mian-title">{{item.entryName}}</view>
<view class="mian-dingwei">
<!-- <view class="mian-dingwei">
<image src="../../static/index/dangqian2.png" mode=""></image>
<span class="shouyi-text">0.8km</span>
</view>
</view> -->
</view>
<view class="mian-foot-dan shouyi-text">
订单编号 : {{item.ordersNo}}
@ -80,7 +81,7 @@
<view class="mina-view" v-if="isSfwc=='0'" v-for="item in listData" :key="item.id" @click="goOder(item)">
<view class="mian-list">
<view class="mian-list-top">
<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
<view class="mian-list-top-biao">{{item.status=='3'?'待评价':'已完成'}}</view>
<view class="mian-list-top-time">
<span>预约时间: </span>
<span>{{item.serveTime}}</span>
@ -88,15 +89,15 @@
</view>
<view class="mian-foot">
<view class="mian-foot-img">
<image src="../../my/static/bg6.png" mode=""></image>
<image :src="item.massageImg?item.massageImg: '../../../static/logo.png'" mode=""></image>
</view>
<view class="mian-foot-list">
<view class="mian-foot-view">
<view class="mian-title">{{item.entryName}}</view>
<view class="mian-dingwei">
<!-- <view class="mian-dingwei">
<image src="../../static/index/dangqian2.png" mode=""></image>
<span class="shouyi-text">0.8km</span>
</view>
</view> -->
</view>
<view class="mian-foot-dan shouyi-text">
订单编号 : {{item.ordersNo}}

4
pages/index/previousPoints.vue
View File

@ -49,10 +49,10 @@
<view class="mian-foot-list">
<view class="mian-foot-view">
<view class="mian-title">{{item.entryName}}</view>
<view class="mian-dingwei">
<!-- <view class="mian-dingwei">
<image src="../../static/index/dangqian2.png" mode=""></image>
<span class="shouyi-text">{{item.km}}km</span>
</view>
</view> -->
</view>
<view class="mian-foot-dan shouyi-text">
订单编号 : {{item.ordersNo}}

8
pages/my/index.vue
View File

@ -168,7 +168,7 @@
证件资质
</view>
</view>
<view class="sdza" @click="goNfeedback()"
<view class="sdza" @click="goHetong()"
style="background: url(../../static/images/my/gyw06.png);background-size: cover;">
<image src="../../static/images/my/hetong.png"
style="width: 54rpx;height: 60rpx;margin-bottom: 4px;margin-top: 20px;"></image>
@ -415,6 +415,12 @@
url:'/my/feedback/index'
})
},
// 跳转合同页面
goHetong(){
uni.navigateTo({
url:'/pages/hetong/index'
})
},
getMyPageNum() {
let artificerId = uni.getStorageSync("artificerId");
console.log("artificerId--->",artificerId);