Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/pages.json

@@ -276,7 +276,8 @@
 						"navigationStyle": "custom",
 						"navigationBarTitleText": " ", // 配件单物流
 						"enablePullDownRefresh": false,
-						"navigationBarBackgroundColor": "#F4F5F7"
+						"navigationBarBackgroundColor": "#F4F5F7",
+						"disableScroll": true
 					}
 				},
 				{

src/pages/mine/warehouse/express.vue

 <template>
 	<view class="parts-detail">
-		<u-navbar back-icon-color="#333333" background="#F4F5F7" title="物流信息" titleColor="#333333" :border-bottom="false" title-bold>
+		<u-navbar back-icon-color="#333333" background="#F4F5F7" title="物流信息" titleColor="#333333"
+			:border-bottom="false" title-bold>
 		</u-navbar>
 		<view class="content-view">
 			<view class="contacts-view">
-				<view><image class="image-view" :src="imageUrl"></image></view>
+				<view>
+					<image class="image-view" :src="imageUrl"></image>
+				</view>
 				<view class="right-view">
 					<view class="title-view">{{title}}</view>
 					<view>{{'物流公司：' + info.express.com}}</view>
@@ -15,7 +18,26 @@
 				</view>
 			</view>
 			<view class="record-view">
-				
+				<view class="express-record-list">
+					<view class="dashed-line-view"></view>
+					<view class="express-list">
+						<view v-for="(item, index) in logisticsRecords" :key="index" class="order-cell">
+							<view class="node-view">
+								<view :class="['node-border-view', {'first': index == 0}]">
+									<view :class="['node-middle-view', {'first': index == 0}]"></view>
+								</view>
+							</view>
+							<view class="right-view">
+								<view class="line-view-time">
+									<text>{{item.datetime}}</text>
+								</view>
+								<view class="line-view-context">
+									<text>{{item.context}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
 			</view>
 		</view>
 
@@ -26,7 +48,10 @@
 	export default {
 		data() {
 			return {
-				info: {items:[], express: []},
+				info: {
+					items: [],
+					express: []
+				},
 				logisticsRecords: [], // 物流
 			};
 		},
@@ -76,7 +101,6 @@
 			var pages = getCurrentPages();
 			if (pages.length >= 2) {
 				var page = pages[pages.length - 2];
-				console.log('-------page.info------', page.info)
 				this.info = page.info
 			}
 			this.getLogistics()
@@ -139,8 +163,8 @@
 						}
 					}
 					if (res.code == 200) {
-						if (res.data && res.data.records) {
-							this.logisticsRecords = res.data.records
+						if (res.data && res.data.expressInfo && res.data.expressInfo.records) {
+							this.logisticsRecords = res.data.expressInfo.records
 						}
 					} else {
 						console.log(res.message)
@@ -184,34 +208,116 @@
 				align-items: flex-start;
 				background-color: #FFFFFF;
 				border-radius: 12rpx;
+
 				.image-view {
 					width: 120rpx;
 					height: 120rpx;
 					border-radius: 12rpx;
 				}
+
 				.right-view {
 					font-size: 26rpx;
 					color: #333333;
 					padding-left: 30rpx;
 					width: 100%;
+
 					.title-view {
 						font-weight: bold;
 						font-size: 32rpx;
 					}
+
 					.number-view {
 						display: flex;
 						justify-content: space-between;
 						align-items: center;
+
 						.copy-view {
 							color: #2272FF;
 							padding-left: 30rpx;
+							flex-shrink: 0;
 						}
 					}
 				}
 			}
+
 			.record-view {
 				background-color: #FFFFFF;
 				border-radius: 12rpx;
+				padding: 30rpx 30rpx 0 30rpx;
+				position: relative;
+				display: flex;
+				justify-content: space-between;
+
+				.express-record-list {
+					position: relative;
+
+					.dashed-line-view {
+						position: absolute;
+						width: 2rpx;
+						border-left: 1px dashed #999999;
+						height: calc(100% - 64rpx);
+						top: 14rpx;
+						left: 11rpx;
+					}
+
+					.express-list {
+						width: 100%;
+
+						.order-cell {
+							margin-bottom: 50rpx;
+							display: flex;
+
+							.node-view {
+								margin-right: 18rpx;
+								flex-shrink: 0;
+								margin-top: 8rpx;
+								z-index: 1;
+
+								.node-border-view {
+									border: 2rpx solid #999999;
+									border-radius: 11rpx;
+									width: 22rpx;
+									height: 22rpx;
+									padding: 5rpx;
+									background-color: #FFFFFF;
+
+									&.first {
+										border: 2rpx solid #2272FF;
+									}
+
+									.node-middle-view {
+										width: 10rpx;
+										height: 10rpx;
+										background-color: #999999;
+										border-radius: 6rpx;
+
+										&.first {
+											background-color: #2272FF;
+										}
+									}
+								}
+							}
+
+							.right-view {
+								width: 100%;
+
+								.line-view-time {
+									font-size: 28rpx;
+									font-weight: bold;
+									color: #333333;
+									margin-bottom: 20rpx;
+								}
+
+								.line-view-context {
+									font-size: 26rpx;
+									color: #666666;
+								}
+							}
+
+						}
+					}
+				}
+
 			}
 		}
 

src/pages/mine/warehouse/partsDetail.vue

@@ -37,7 +37,7 @@
 				<view class="detail-info-view">
 					<view v-for="(value, key) in detailKey" :key="key" class="info-item">
 						<view class="detail-left-view">
-							<text>{{ value }}:</text>
+							<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)">
@@ -131,9 +131,9 @@
 			},
 			detailKey() { // 详情
 				return {
-					'orderNumber': '申请单号',
-					'createTime': '申请时间',
-					'deliveryTime': '发货时间',
+					'orderNumber': '申请单号：',
+					'createTime': '申请时间：',
+					'deliveryTime': '发货时间：',
 				}
 			}
 		},
@@ -208,6 +208,7 @@
 			.express-view {
 				color: #2272FF;
 				font-size: 26rpx;
+				margin-bottom: 6rpx;
 			}
 		}
 
@@ -279,7 +280,7 @@
 
 						.left-view {
 							display: flex;
-							align-items: center;
+							align-items: flex-start;
 
 							.image-view {
 								width: 120rpx;

src/pages/parts/application.vue

@@ -51,7 +51,6 @@
 </template>
 
 <script>
-import Utils from '@/utils/callUtils.js'
 import SelectParts from '@/components/select-parts/adjust.vue'
 export default {
 	components: {
@@ -96,11 +95,6 @@ export default {
 		this.orderId = e && Number(e.orderId) || 0
 		this.initData()
 	},
-	mounted() {
-	    Utils.$on('update-site',(site)=>{
-	        this.updateSite(site);
-	    })
-	},
 	methods: {
 		initData() {
 			this.loadMineAddress()
@@ -144,10 +138,11 @@ export default {
 					this.order.contactCityText,
 					this.order.contactCommunityText,
 				]
+				let address = region.join("") + (this.order.contactStreetText || '') + this.order.contactAddress
 				this.customer = {
 					name: this.order.contactName,
 					mobile: this.order.contactPhone,
-					address: region.join("") + this.order.contactStreetText + this.order.contactAddress,
+					address: address,
 					region: region,
 					code: [
 						this.order.contactProvince,
@@ -192,7 +187,11 @@ export default {
 			})
 		},
 		updateSite(site) {
-			console.log("updateSite", site)
+			if(this.curType) {
+				this.customer = site
+			} else {
+				this.mine = site
+			}
 		},
 		addParts() {
 			this.$u.route({