文案修改

src/components/parts/returnCell.vue

@@ -4,7 +4,7 @@
 		<view class="title-view">
 			<text class="title-text">{{title}}</text>
 			<view>
-				<text>返件时间：</text>
+				<text>退件时间：</text>
 				<text>{{info.createTime}}</text>
 			</view>
 		</view>
@@ -17,7 +17,7 @@
 		<view class="line-view"></view>
 		<view class="info-item">
 			<view>
-				<text>返件编号：</text>
+				<text>退件编号：</text>
 				<text @longpress="handleLongpress">{{info.number}}</text>
 			</view>
 			<text class="copy-view" @click="$u.throttle(handleLongpress, 500)">复制</text>
@@ -53,7 +53,7 @@
 		},
 		computed: {
 			title() {
-				return this.info.finished ? '已返件' : '返件中'
+				return this.info.finished ? '退件完成' : '退件中'
 			},
 			total() { // 合计
 				var i = 0

src/pages.json

@@ -267,16 +267,18 @@
 					"path": "warehouse/index",
 					"style": {
 						"navigationStyle": "custom",
-						"navigationBarTitleText": "我的配件",
-						"enablePullDownRefresh": false
+						"navigationBarTitleText": "配件订单",
+						"enablePullDownRefresh": false,
+						"disableScroll": true
 					}
 				},
 				{
 					"path": "warehouse/spare",
 					"style": {
 						"navigationStyle": "custom",
-						"navigationBarTitleText": "我的备件",
-						"enablePullDownRefresh": false
+						"navigationBarTitleText": "备件库",
+						"enablePullDownRefresh": false,
+						"disableScroll": true
 					}
 				},
 				{
@@ -284,7 +286,8 @@
 					"style": {
 						"navigationStyle": "custom",
 						"navigationBarTitleText": "返件信息",
-						"enablePullDownRefresh": false
+						"enablePullDownRefresh": false,
+						"disableScroll": true
 					}
 				},
 				{

src/pages/index/mine.vue

@@ -160,7 +160,7 @@
 					},
 					{
 						pathName: 'warehouse/records',
-						title: '出入记录',
+						title: '出库记录',
 						value: '',
 						icon: process.uniEnv.qn_base_url + 'churuku.png',
 						imageStyle: 'width:50rpx;height:54rpx'

src/pages/mine/warehouse/index.vue

@@ -14,27 +14,25 @@
 				bar-width="44" :offset="[0,0]" :list="list" count="total" :current="currentIndex" @change="change"
 				:is-scroll="false" font-size="28" bold></u-tabs>
 		</view>
-		<view class="tab-view">
-			<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring
-				refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @scroll="scroll"
-				:scroll-top="scrollTop" refresher-background="#F4F5F7" @refresherpulling="triggered = true"
-				@refresherrefresh="onRefresh" @refresherrestore="onRestore" enable-back-to-top>
-				<view class="loading-view" v-if="!loaded">
-					<u-loading mode="flower"></u-loading>
+		<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring
+			refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @scroll="scroll"
+			:scroll-top="scrollTop" refresher-background="#F4F5F7" @refresherpulling="triggered = true"
+			@refresherrefresh="onRefresh" @refresherrestore="onRestore" enable-back-to-top>
+			<view class="loading-view" v-if="!loaded">
+				<u-loading mode="flower"></u-loading>
+			</view>
+			<NoOrder v-else-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无配件信息"
+				:customStyle="noPartsCustomStyle" />
+			<template v-else>
+				<view v-for="(item, index) in partsList" :key="item.id">
+					<AppliedCell @operate="handleOperate" :info="item" @action="handleClickCell" @express="handleClickExpress"></AppliedCell>
 				</view>
-				<NoOrder v-else-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无配件信息"
-					:customStyle="noPartsCustomStyle" />
-				<template v-else>
-					<view v-for="(item, index) in partsList" :key="item.id">
-						<AppliedCell @operate="handleOperate" :info="item" @action="handleClickCell" @express="handleClickExpress"></AppliedCell>
-					</view>
-					<view class="load-more-view">
-						<u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 2" :status="loadStatus"
-							bgColor="#F4F5F7"></u-loadmore>
-					</view>
-				</template>
-			</scroll-view>
-		</view>
+				<view class="load-more-view">
+					<u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 2" :status="loadStatus"
+						bgColor="#F4F5F7"></u-loadmore>
+				</view>
+			</template>
+		</scroll-view>
 		<view class="fixed-button">
 			<ApplyButton :type="buttonType" @click="handleClickApply" />
 		</view>
@@ -281,9 +279,9 @@
 			margin-bottom: 30rpx;
 		}
 
-		.tab-view {
-			height: 100%;
-			overflow: auto;
+		// .tab-view {
+		// 	height: 100%;
+		// 	overflow: auto;
 
 			.load-more-view {
 				margin-bottom: 20rpx;
@@ -297,7 +295,7 @@
 				margin-top: 300rpx;
 				position: absolute;
 			}
-		}
+		// }
 
 		.fixed-button {
 			position: fixed;

src/pages/mine/warehouse/spare.vue

 <template>
 	<!-- 我的备件 -->
 	<view class="ware-house-spare">
-		<u-navbar back-icon-color="#333333" background="#FFFFFF" title="我的备件" titleColor="#333333"
+		<u-navbar back-icon-color="#333333" background="#FFFFFF" title="备件库" titleColor="#333333"
 			:border-bottom="false" title-bold></u-navbar>
 		<view class="search-view">
 			<u-search v-model="keyword" :action-text="searchButtonText" @search="handleClickSearch" @clear="handleClear"