feat: 页面UI修改调整，接口对接

src/pages/mine/address/addSite.vue

@@ -31,13 +31,6 @@
 		<view class="bottom">
 			<button class="btn, bottom-btn" v-if="siteType=='select'" @click="$u.throttle(commitSite, 500)"><text class="button-text">提交</text></button>
 			<button class="btn, bottom-btn" v-else @click="show = true"><text class="button-text">保存</text></button>
-			<!-- <view class="default">
-				<view class="left">
-					<view class="set">设置默认地址</view>
-					<view class="tips">提醒：每次下单会默认推荐该地址</view>
-				</view>
-				<view class="right"><switch color="red" @change="setDefault" /></view>
-			</view> -->
 		</view>
 		<u-picker mode="region" v-model="showPicker" :default-region="region" @confirm="confirmRegion" />
 		<u-popup border-radius="12" width="690" height="520" v-model="show" mode="center">

src/pages/mine/warehouse/express.vue

@@ -11,14 +11,14 @@
 				</view>
 				<view class="right-view">
 					<view class="title-view">{{title}}</view>
-					<view>{{'物流公司：' + info.express.com}}</view>
+					<view>{{'物流公司：' + (info.express.com || '--')}}</view>
 					<view class="number-view">
-						<text>{{'物流单号：' + info.express.number}}</text>
+						<text>{{'物流单号：' + (info.express.number || '--')}}</text>
 						<text class="copy-view" @click="$u.throttle(handleClick, 500)">复制</text>
 					</view>
 				</view>
 			</view>
-			<view class="record-view">
+			<view class="record-view" v-if="hasRecords">
 				<view class="express-record-list">
 					<view class="dashed-line-view"></view>
 					<view class="express-list">
@@ -71,6 +71,9 @@
 					'1': '已取消'
 				}
 			},
+			hasRecords() {
+				return this.$u.test.isEmpty(this.logisticsRecords) ? false : true
+			},
 			imageUrl() {
 				let item = this.info.items[0] || {}
 				return item.images ? item.images.split(',').shift() : this.placeholderImage

src/pages/mine/warehouse/partsDetail.vue

@@ -4,14 +4,14 @@
 		</u-navbar>
 		<view class="title-text">
 			<text>{{title}}</text>
-			<view v-show="hasExpress" class="express-view" 
+			<view v-show="showExpress" class="express-view" 
 			@click="$u.throttle(handleClickExpress, 500)">
 				<text>查看物流信息</text>
 				<u-icon name="arrow-right"></u-icon>
 			</view>
 		</view>
 		<view class="content-view">
-			<view class="contacts-view">
+			<view class="contacts-view" v-if="hasExpress">
 				<image class="image-view" :src="shouhuodizhiImage"></image>
 				<view class="right-view">
 					<view class="contacts-top">
@@ -29,14 +29,16 @@
 				</view>
 				<view class="line-view"></view>
 				<view class="detail-info-view">
-					<view v-for="(value, key) in detailKey" :key="key"
-					class="info-item" v-show="showInfoItem">
-						<view class="detail-left-view">
-							<text>{{ value }}</text>
-							<text @longpress="handleLongpress(key, detail[key] )">{{ detail[key] }}</text>
+					<view v-for="(value, key) in detailKey" :key="key">
+						<view class="info-item" v-if="detail[key]">
+							<view class="detail-left-view">
+								<text>{{ value }}</text>
+								<text @longpress="handleLongpress(key, detail[key])">
+								{{ detail[key] }}</text>
+							</view>
+							<text class="copy-view" v-if="key == 'orderNumber'"
+							@click="$u.throttle(handleClickCopy, 500)">复制</text>
 						</view>
-						<text class="copy-view" v-if="key == 'orderNumber'" @click="$u.throttle(handleClickCopy, 500)">
-							复制</text>
 					</view>
 				</view>
 			</view>
@@ -86,10 +88,10 @@
 				return this.texts[this.info.status]
 			},
 			hasExpress() {
-				if(this.$u.test.isEmpty(this.info.express.number)) {
-					return false
-				}
-				return true
+				return this.$u.test.isEmpty(this.info.express) ? false : true
+			},
+			showExpress() {
+				return this.$u.test.isEmpty(this.info.express.number) ? false : true
 			},
 			buttonStyle() {
 				return {

src/pages/mine/warehouse/records.vue

@@ -2,23 +2,7 @@
 	<view class="ware-wrap">
 		<u-navbar back-icon-color="#333333" background="#FFFFFF" title="出库记录" titleColor="#333333"
 			:border-bottom="false" title-bold></u-navbar>
-<!-- 		<view class="content">
 			<view class="panel">
-				<view class="title">物料明细</view>
-				<view class="item-table">
-					<view class="item-header">
-						<view>物料名称</view>
-						<view>库存数量</view>
-					</view>
-					<u-divider half-width="315" border-color="#F4F5F7" height="2"></u-divider>
-					<view class="item-row" v-for="(item, index) in details" :key="index">
-						<view class="width-504 break">{{ item.skuName }}</view>
-						<view class="width-106 center">{{ item.systemStock }}</view>
-					</view>
-				</view>
-			</view> -->
-			<view class="panel">
-				<!-- <view class="title">操作记录</view> -->
 				<view class="item-table">
 					<view class="item-header">
 						<view class="width-132">订单编号</view>
@@ -50,7 +34,7 @@
 				total: 100,
 				search: {
 					pageNumber: 0,
-					pageSize: 20,
+					pageSize: 50,
 				},
 			};
 		},
@@ -68,16 +52,8 @@
 		methods: {
 			getData() {
 				let self = this
-				// self.initDetails()
 				self.loadAccess()
 			},
-			// async initDetails() {
-			// 	let self = this
-			// 	let res = await self.$u.api.listBystock()
-			// 	if(res && res.code == 200) {
-			// 		self.details = res.data
-			// 	}
-			// },
 			loadRecord() {
 				if(this.status == 'nomore') return ;
 				this.status = 'loading';

src/pages/mine/warehouse/return.vue

@@ -170,7 +170,7 @@
 			overflow: auto;
 
 			.load-more-view {
-				margin-bottom: 20rpx;
+				margin-bottom: 68rpx;
 			}
 			.loading-view {
 				width: 100%;

src/pages/parts/addParts.vue

@@ -120,6 +120,7 @@ export default {
     }
   },
   onLoad(e) {
+	getApp().trackPage('选择配件页')
     if (e.categaryId) {
       this.categoryId = e.categaryId
       this.getBrandList()

src/pages/parts/application.vue

@@ -80,6 +80,7 @@ export default {
 		},
 	},
 	onLoad(e) {
+		getApp().trackPage('备件申请页')
 		this.orderId = e && Number(e.orderId) || 0
 		this.applyType = e && Number(e.applyType) || 0
 		this.initData()
@@ -235,6 +236,8 @@ export default {
 	flex-direction: column;
 	.content {
 		margin-bottom: 240rpx;
+		height: 100%;
+		overflow-y: auto;
 		.card {
 			margin: 20rpx 30rpx;
 			padding: 30rpx;

src/pages/parts/nodes.vue

@@ -53,8 +53,14 @@
 					this.returnNo = e.returnNo
 				}
 			}
+			getApp().trackPage(this.title)
 		},
 		computed: {
+			title() {
+				if (this.nodeInfo.type == 'parts') return '配件申请结果页'
+				if (this.nodeInfo.type == 'return') return '返件结果页'
+				return '配件申请结果页'
+			},
 			nodeInfo() {
 				return this.nodes[this.curType]
 			},

src/pages/parts/returnParts.vue

@@ -42,6 +42,7 @@
 			}
 		},
 		onLoad() {
+			getApp().trackPage("退返件页")
 			this.receiveData()
 		},
 		computed: {
@@ -87,17 +88,17 @@
 				}
 				if(this.curWay == 0) {
 					const params = {
-						parts: this.parts,
+						parts: JSON.stringify(this.parts),
 						expressCom: this.expressCom,
 						expressNumber: this.expressNumber
 					}
 					this.$u.api.returnParts(params).then((res) => {
-						if(res.code == 200) {
+						if(res.code == 200 && res.data) {
 							this.$u.route({
 								url: 'pages/parts/nodes',
 								params: {
 									type: 1,
-									returnNo: res.batchNumber
+									returnNo: res.data.batchNumber
 								}
 							})
 						}