diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 2947de6..c6c4349 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -27,14 +27,16 @@
服务时长: {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
- x{{order.ordersMassageList[0].num}}
项目价格:
¥
- {{order.payMoney}}
+
+ {{order.massagePrice}}
+ x{{order.ordersMassageList[0].num}}
+
@@ -52,7 +54,7 @@
{{order.userName}}
{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
-
+
-->
-
+
是否加钟
{{order.addNum!=''?'是':'否'}}
@@ -119,7 +121,7 @@
¥{{order.addMoney}}
-
+
是否改价
{{order.isSupplement!=''?'是':'否'}}
@@ -137,7 +139,7 @@
¥{{order.gjcePrice}}
-
+
是否提前结束
{{order.earlyFinishReason!=''?'是':'否'}}
@@ -291,7 +293,7 @@
-
+
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b3dbbda..8d5afaa 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -80,10 +80,15 @@
当前等级
{{ currentGrade ? currentGrade : "A0" }}
- {{ currentWholeIncome ? currentWholeIncome : 0 }}
- /{{ totalIncomeRange ? totalIncomeRange : 4000 }}
+
+
-
+ 当前业绩:{{ currentWholeIncome ? currentWholeIncome : 0 }}
+
+
+
@@ -715,7 +720,7 @@ export default {
if (this.userId) {
console.log(this.userId, "dwdwadwdawd============>");
this.isLogin = true
- this.getJinRiOrder();
+ // this.getJinRiOrder();
this.getUserInfo()
this.getFb()
@@ -749,7 +754,7 @@ export default {
this.avatar = '../../static/logo.png'
clearInterval(this.time);
}
- if (this.isLogin) this.getJinRiOrder();
+ // if (this.isLogin) this.getJinRiOrder();
this.getcity()
},
destroyed() {
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 59e3dc0..9f53155 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -358,6 +358,10 @@
that.longitude = res.longitude
}
});
+ this.mescroll.resetUpScroll()
+ this.upCallback({
+ num: this.num
+ });
},
onShow() {
let that = this;
@@ -376,12 +380,10 @@
this.visitor = 0
this.avatar = '../../static/logo.png'
}
- setTimeout(d => {
- this.mescroll.resetUpScroll()
- }, 1000)
- this.upCallback({
- num: this.num
- });
+ // setTimeout(d => {
+ // this.mescroll.resetUpScroll()
+ // }, 1000)
+
},
watch: {
isTrue(newValue) {
@@ -617,6 +619,7 @@
},
/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
upCallback(page) {
+ console.log('upCallback-->',page);
// debugger;
if (!this.isLogin) {
uni.hideLoading();