my/order/revenueDetails.vue

@@ -27,16 +27,14 @@
 						</view>
 						<view class="mian-time" v-if="order && order.ordersMassageList">
 							服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
+							x{{order.ordersMassageList[0].num}}
 						</view>
 						
 						<view class="mian-money">
 							<view class="mian-money-title">项目价格：</view>
 							<view class="mian-money-num">
 								<span class="fuhao">￥</span>
-								<span class="number">
-									{{order.massagePrice}}
-									<span style="font-size: 12px;color: #666;">x{{order.ordersMassageList[0].num}}</span>
-								</span>
+								<span class="number">{{order.payMoney}}</span>
 							</view>
 						</view>
 					</view>
@@ -54,7 +52,7 @@
 								{{order.userName}}
 								{{order.phone ? order.phone.substring(0,3) + '****' + order.phone.substring(7,11) : ''}}
 							</span>
-							<!-- <image src="../../static/index/dianhua.png" mode=""></image> -->
+							<image src="../../static/index/dianhua.png" mode=""></image>
 						</view>
 					</view>
 					<view class="mian-top-foot-view" style="margin-top: 5px;">
@@ -103,7 +101,7 @@
 					<span class="mian-view-list-text">70.00%</span>
 				</view> -->
 			</view>
-			<view class="mian-view" v-if="order.status != 9">
+			<view class="mian-view">
 				<view class="mian-view-list">
 					<span class="mian-view-list-title">是否加钟</span>
 					<span class="mian-view-list-text">{{order.addNum!=''?'是':'否'}}</span>
@@ -121,7 +119,7 @@
 					<span class="mian-view-list-text">￥{{order.addMoney}}</span>
 				</view>
 			</view>
-			<view class="mian-view" v-if="order.status != 9">
+			<view class="mian-view">
 				<view class="mian-view-list">
 					<span class="mian-view-list-title">是否改价</span>
 					<span class="mian-view-list-text">{{order.isSupplement!=''?'是':'否'}}</span>
@@ -139,7 +137,7 @@
 					<span class="mian-view-list-text">￥{{order.gjcePrice}}</span>
 				</view>
 			</view>
-			<view class="mian-content" style="margin-bottom: 10px;"  v-if="order.status != 9">
+			<view class="mian-content" style="margin-bottom: 10px;">
 				<view class="mian-content-list">
 					<span class="mian-content-list-title">是否提前结束</span>
 					<span class="mian-content-list-text">{{order.earlyFinishReason!=''?'是':'否'}}</span>
@@ -293,7 +291,7 @@
 				<!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> -->
 			</view>
 		</view>
-		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
+		<u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton>
 		<!-- #ifndef H5 -->
 		<image src="../../static/images/index/jinji.png" class="bj_view" @tap="goBaoJing"></image>
 		<!-- #endif -->

pages/index/index.vue

@@ -720,7 +720,7 @@ export default {
 		if (this.userId) {
 			console.log(this.userId, "dwdwadwdawd============>");
 			this.isLogin = true
-			// this.getJinRiOrder();
+			this.getJinRiOrder();
 			this.getUserInfo()
 			this.getFb()
 
@@ -754,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() {

pages/order/index.vue

@@ -358,10 +358,6 @@
 					that.longitude = res.longitude
 				}
 			});
-			this.mescroll.resetUpScroll()
-			this.upCallback({
-				num: this.num
-			});
 		},
 		onShow() {
 			let that = this;
@@ -380,10 +376,12 @@
 				this.visitor = 0
 				this.avatar = '../../static/logo.png'
 			}
-			// setTimeout(d => {
-			// 	this.mescroll.resetUpScroll()
-			// }, 1000)
-			
+			setTimeout(d => {
+				this.mescroll.resetUpScroll()
+			}, 1000)
+			this.upCallback({
+				num: this.num
+			});
 		},
 		watch: {
 			isTrue(newValue) {
@@ -619,7 +617,6 @@
 			},
 			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
 			upCallback(page) {
-				console.log('upCallback-->',page);
 				// debugger;
 				if (!this.isLogin) {
 					uni.hideLoading();