Merge remote-tracking branch 'origin/dev' into dev

pagesB/Serviceevaluation/Serviceevaluation.vue

@@ -105,7 +105,7 @@
 				parentId: '',
 				orderStatus: 'NOT_EVALUATED', //状态
 				evaluatedata: {}, //列表
-				total: '',
+				total: 0,
 				cardNo: '', //身份证号
 				region: '', //地区
 				pageNum: 1,
@@ -160,8 +160,8 @@
 					.pageSize).then(res => {
 					if (res.rows) {
 						res.rows.forEach(e => {
-							// e.leadThumbnailUrl = baseurl + e.leadThumbnailUrl
 							this.evaluatedata.push(e)
+							this.total = res.total
 						})
 
 					}
@@ -303,10 +303,7 @@
 				getAppletOrderList(this.parentId, this.orderStatus, this.cardNo, this.region, this.pageNum, this
 					.pageSize).then(res => {
 					this.evaluatedata = res.rows
-					console.log(this.evaluatedata, '000')
 					this.total = res.total
-					console.log(this.total, '10')
-					// console.log(this.baseurl+this.evaluatedata[0].pictureUrl,'000')
 
 				})
 

pagesB/confirmation/confirmation.scss

@@ -113,6 +113,7 @@
 			font-weight: 500;
 			position: fixed;
 			bottom:0;
+			z-index: 999;
 			.btnleft {
 				font-size: 30rpx;
 				font-weight: 500;

pagesB/consulted/consulted.vue

@@ -82,14 +82,14 @@
 				<span>预约金额</span><span>￥{{list.totalPrice}}</span>
 
 			</view>
-			<view class="doctordetailstwo">
+			<!-- <view class="doctordetailstwo">
 				<view class="doctorphonetwo">
 					备注
 				</view>
 				<view class="phonetwo advicetwo" v-if="list.remark">
 					·{{list.remark}}
 				</view>
-			</view>
+			</view> -->
 
 		</view>
 		<view class="bottom">

pagesB/myevaluation/myevaluation.vue

@@ -49,10 +49,11 @@
 				baseurl: '',
 				cardNo: '', //身份证号
 				region: '', //地区
-				getPageNum:1,
+				pageNum:1,
-				getPageSize:20,
+				pageSize:20,
 				userinfo:{},
 				rateval: '', //评价星棵树
+				total: 0,
 			}
 		},
 		onShow() {
@@ -67,7 +68,6 @@
 
 		},
 		onReachBottom() { //下滑加载
-
 			if (this.evaluatedata.length >= this.total) {
 
 			} else {
@@ -76,9 +76,9 @@
 					.pageSize).then(res => {
 					if (res.rows) {
 						res.rows.forEach(e => {
-							// e.leadThumbnailUrl = baseurl + e.leadThumbnailUrl
 							this.evaluatedata.push(e)
 						})
+						this.total = res.total
 
 					}
 
@@ -90,8 +90,9 @@
 		methods: {
 			// 列表
 			getlist() {
-				getAppletOrderList(this.parentId, this.orderStatus, this.cardNo, this.region,this.getPageNum,this.getPageSize).then(res => {
+				getAppletOrderList(this.parentId, this.orderStatus, this.cardNo, this.region,this.pageNum,this.pageSize).then(res => {
 					this.evaluatedata=res.rows
+					this.total = res.total
 					// console.log(this.evaluatedata.length)
 
 				})