销售订单

pages/my-order/order-page.nvue

 <template>
-	<view class="page-news">
-		<uni-list ref="list" class="listview" :enableBackToTop="true" :scroll-y="true" @scrolltolower="loadMore()">
-			<uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
+	<view class="">
+		<list ref="list" class="page-news" loadmoreoffset='100' @loadmore="scrolltolower"
+		:show-scrollbar='false'>
+			<!-- <uni-refresh class="refresh" @refresh="onrefresh" @pullingdown="onpullingdown"
 				:display="refreshing ? 'show' : 'hide'">
 				<div class="refresh-view">
 					<image class="refresh-icon" :src="refreshIcon" :style="{width: (refreshing || pulling) ? 0: '32px'}"
@@ -10,16 +11,19 @@
 						:contentText="loadingMoreText"></uni-load-more>
 					<text class="loading-text">{{refreshText}}</text>
 				</div>
-			</uni-refresh>
-			<uni-cell v-for="(item, index) in dataList" :key="item.id">
+			</uni-refresh> -->
+			<refresh @refresh="refresh" :display="refreshing ? 'show' : 'hide'">
+				<!-- <loading-indicator></loading-indicator> -->
+			</refresh>
+			<cell v-for="(item, index) in dataList" :key="item.id">
 				<order-item :newsItem="item" @click.native="goDetail(item)"></order-item>
-			</uni-cell>
-			<uni-cell v-if="isLoading || dataList.length > 4">
+			</cell>
+			<cell v-if="isLoading || dataList.length > 4">
 				<view class="loading-more">
 					<text class="loading-more-text">{{loadingText}}</text>
 				</view>
-			</uni-cell>
-		</uni-list>
+			</cell>
+		</list>
 		<no-data class="no-data" v-if="isNoData" @retry="loadMore"></no-data>
 	</view>
 </template>
@@ -50,9 +54,9 @@
 			orderItem
 		},
 		props: {
-			nid: {
-				type: String,
-				default: ''
+			condition: {
+				type: Object,
+				default: () => {}
 			},
 			dateRange: {
 				type: Object,
@@ -83,22 +87,6 @@
 					contentnomore: ''
 				},
 				refreshIcon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAB5QTFRFcHBw3Nzct7e39vb2ycnJioqK7e3tpqam29vb////D8oK7wAAAAp0Uk5T////////////ALLMLM8AAABxSURBVHja7JVBDoAgDASrjqj//7CJBi90iyYeOHTPMwmFZrHjYyyFYYUy1bwUZqtJIYVxhf1a6u0R7iUvWsCcrEtwJHp8MwMdvh2amHduiZD3rpWId9+BgPd7Cc2LIkPyqvlQvKxKBJ//Qwq/CacAAwDUv0a0YuKhzgAAAABJRU5ErkJggg==",
-				condition: {
-					USER_BP: '50000215',
-					ROLE: 'WLY001',
-					PROCESS_TYPE: [{
-						"SIGN": "I",
-						"OPTION": "EQ",
-						LOW: '',
-						HIGH: ''
-					}],
-					POSTING_DATE: [{
-						"SIGN": "I",
-						"OPTION": "BT",
-						LOW: '',
-						HIGH: ''
-					}]
-				},
 				page: {
 					"PAGE": "1",
 					"PAGESIZE": "10",
@@ -116,7 +104,6 @@
 		},
 		created() {
 			this.pullTimer = null;
-			this.condition.USER_BP = this.userInfo.code
 			this._isWidescreen = false;
 			// this.loadData(true)
 		},
@@ -128,89 +115,15 @@
 
 				this.isLoading = true;
 				this.isNoData = false;
-
-				this.condition.PROCESS_TYPE[0].LOW = this.nid
-				let POSTING_DATE = []
-				let PROCESS_TYPE = []
-				let dateParams = dateRange || this.dateRange
-				if (dateParams && dateParams.start) {
-					this.condition.POSTING_DATE[0].LOW = dateParams.start
-					this.condition.POSTING_DATE[0].HIGH = dateParams.end
-					POSTING_DATE = this.condition.POSTING_DATE
-				} else {
-					POSTING_DATE = []
-				}
-				// if (this.condition.POSTING_DATE[0].LOW === '') {
-				// 	POSTING_DATE = []
-				// } else {
-				// 	POSTING_DATE = this.condition.POSTING_DATE
-				// }
-
-				if (this.condition.PROCESS_TYPE[0].LOW === '') {
-					PROCESS_TYPE = [{
-							"SIGN": "I",
-							"OPTION": "EQ",
-							LOW: 'ZS01',
-						},
-						{
-							"SIGN": "I",
-							"OPTION": "EQ",
-							LOW: 'ZS02',
-						},
-						{
-							"SIGN": "I",
-							"OPTION": "EQ",
-							LOW: 'V013',
-						}
-					]
-				} else {
-					if (this.nid === 'V013') {
-						PROCESS_TYPE = [{
-							"SIGN": "I",
-							"OPTION": "EQ",
-							LOW: 'ZS02',
-						}]
-					} else {
-						PROCESS_TYPE = this.condition.PROCESS_TYPE
-					}
-				}
-
-				console.log('load---------', this.nid, PROCESS_TYPE)
-
 				const params = {
 					...this.condition,
-					PROCESS_TYPE,
-					POSTING_DATE,
 					...this.page
 				}
-				if (this.nid === 'V013') {
-					params.ZZFLD00002J = [{
-						"SIGN": "I",
-						"OPTION": "EQ",
-						LOW: 'V013',
-					}]
-				} else if (this.nid === 'ZS02'){
-					params.ZZFLD00002J = [
-					    {
-					        "SIGN": "E",
-					        "OPTION": "EQ",
-					        "LOW": "V013"
-					    },
-					    {
-					        "SIGN": "E",
-					        "OPTION": "EQ",
-					        "LOW": "V014"
-					    },
-					    {
-					        "SIGN": "E",
-					        "OPTION": "EQ",
-					        "LOW": "V015"
-					    }
-					]
-				} else {
-					delete params['ZZFLD00002J']
-				}
-
+				!params.object_id.low && delete params.object_id
+				!params.posting_date.low && delete params.posting_date
+				!params.process_type.low && delete params.process_type
+				!params.status.low && delete params.status
+				
 				apiGetSalesOrder(params).then((res) => {
 					console.log('loadData', res)
 					const {
@@ -343,28 +256,28 @@
 	}
 
 	.page-news {
-		flex: 1;
-		flex-direction: column;
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
+		// flex: 1;
+		// flex-direction: column;
+		// position: absolute;
+		// left: 0;
+		// top: 0;
+		// right: 0;
+		// bottom: 0;
 	}
 
 	.listview {
-		position: absolute;
-		left: 0;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex-direction: column;
-		/* #endif */
-		/* #ifndef MP-ALIPAY */
-		flex-direction: column;
-		/* #endif */
+		// position: absolute;
+		// left: 0;
+		// top: 0;
+		// right: 0;
+		// bottom: 0;
+		// /* #ifndef APP-NVUE */
+		// display: flex;
+		// flex-direction: column;
+		// /* #endif */
+		// /* #ifndef MP-ALIPAY */
+		// flex-direction: column;
+		// /* #endif */
 	}
 
 	.refresh {

pages/purchase-main/purchase-main.nvue

@@ -371,6 +371,8 @@
 	}
 
 	.uni-input {
+		line-height: 100%;
+		height: 100%;
 		font-size: 14px;
 		color: $text-base-color;
 	}

pages/purchase-plan/purchase-plan.nvue

@@ -567,6 +567,8 @@
 	}
 
 	.uni-input-text {
+		height: 96rpx;
+		line-height: 96rpx;
 		font-size: 14px;
 		color: #888;
 		text-overflow: ellipsis;

pages/usercenter/usercenter.nvue

@@ -179,7 +179,7 @@
 			logOut() {
 				apiLogOut().then((res) => {
 					uni.setStorageSync('lifeData', {});
-					uni.redirectTo({
+					uni.reLaunch({
 						url: "/pages/login/login"
 					})
 				}).catch(() => {

servers/api.helper.js

@@ -100,7 +100,7 @@ class Request {
 								duration: 2000,
 								icon: 'none'
 							})
-							uni.navigateTo({
+							uni.reLaunch({
 								url: "/pages/login/login"
 							})
 						}else{