diff --git a/my/commission/index.vue b/my/commission/index.vue index 5e9a8e5..ffdf94b 100644 --- a/my/commission/index.vue +++ b/my/commission/index.vue @@ -14,20 +14,30 @@ - + {{this.homePageDataNum.fundRange}} - + + + + + {{this.homePageDataNum.totalRevenue ? this.homePageDataNum.totalRevenue : 0 }} + + + 本期收益(元) + + @@ -47,7 +57,7 @@ 车费收益 - + - + 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时说明不在滚动 diff --git a/pages.json b/pages.json index 14ffd1f..b167bf1 100644 --- a/pages.json +++ b/pages.json @@ -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", diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue index c43f6f3..da6ba9a 100644 --- a/pages/index/addClock.vue +++ b/pages/index/addClock.vue @@ -29,9 +29,10 @@ - 本期{{orderType=='2'?'已加钟':'已充值'}}订单 + 本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单 + 本期{{isSfwc=='1'?'已充值':'未充值'}}订单 - 加钟{{isSfwc}}订单数量: {{listData.length}} + 订单数量: {{listData.length}} @@ -46,15 +47,15 @@ - + {{item.entryName}} - + 订单编号 : {{item.ordersNo}} @@ -85,7 +86,7 @@ - + @@ -250,7 +251,7 @@ }, wangqi(){//往期 跳页 uni.navigateTo({ - url:'/pages/index/previousAdditions?type=2' + url:'/pages/index/previousAdditions?type='+this.orderType }) }, } diff --git a/pages/index/game/workphoto.vue b/pages/index/game/workphoto.vue index 8e521a3..794ce97 100644 --- a/pages/index/game/workphoto.vue +++ b/pages/index/game/workphoto.vue @@ -5,8 +5,11 @@ :key="index"> + + 重新上传 - + @@ -25,6 +28,11 @@ this.getDet() }, methods: { + goNav(){ + uni.navigateTo({ + url:'/pages/xingxiangzhao/index' + }) + }, // 详情 getDet() { uni.showLoading({ @@ -58,4 +66,16 @@ \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index cc85f60..b6947dc 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -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; diff --git a/pages/index/previousAdditions.vue b/pages/index/previousAdditions.vue index 6f83780..713c3c5 100644 --- a/pages/index/previousAdditions.vue +++ b/pages/index/previousAdditions.vue @@ -33,15 +33,16 @@ - 本期{{orderType=='2'?'已加钟':'已充值'}}订单 + 本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单 + 本期{{isSfwc=='1'?'已充值':'未充值'}}订单 - 加钟订单数量: {{listData.length}} + 订单数量: {{listData.length}} - {{item.status=='3'?'已完成':'待评价'}} + {{item.status=='3'?'待评价':'已完成'}} 预约时间: {{item.serveTime}} @@ -49,15 +50,15 @@ - + {{item.entryName}} - + 订单编号 : {{item.ordersNo}} @@ -80,7 +81,7 @@ - {{item.status=='3'?'已完成':'待评价'}} + {{item.status=='3'?'待评价':'已完成'}} 预约时间: {{item.serveTime}} @@ -88,15 +89,15 @@ - + {{item.entryName}} - + 订单编号 : {{item.ordersNo}} diff --git a/pages/index/previousPoints.vue b/pages/index/previousPoints.vue index 114fcb2..df75801 100644 --- a/pages/index/previousPoints.vue +++ b/pages/index/previousPoints.vue @@ -49,10 +49,10 @@ {{item.entryName}} - + 订单编号 : {{item.ordersNo}} diff --git a/pages/my/index.vue b/pages/my/index.vue index 113e00d..ee77739 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -168,7 +168,7 @@ 证件资质 - @@ -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);