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

src/common/api/order.js

@@ -184,6 +184,11 @@ let orderApiFun = function(vm){
 	let fileList = async (params = {}) => await vm.$u.get(prefix + 'config/' + vm.vuex_token + '/finish/file', params);
 	// 订单配件列表
 	let applyList = async (params = {}) => await vm.$u.get(prefix + 'parts/' + vm.vuex_token + '/orders', params);
+	// 返件列表
+	let returnedParts  = async (params = {}) => await vm.$u.get(prefix + 'parts/' + vm.vuex_token + '/return', params);
+	// 备件仓列表
+	let reserveList  = async (params = {}) => await vm.$u.get(prefix + 'parts/' + vm.vuex_token + '/items/reserve', params);
+	
 	const orderApi = {
 		listByRecommendOrder,
 		listOrderCount,
@@ -228,7 +233,9 @@ let orderApiFun = function(vm){
 		fileLabel,
 		fileList,
 		completeNextStep,
-		applyList
+		applyList,
+		returnedParts,
+		reserveList
 	}
 	return orderApi
 }

src/components/order/bottomButtons.vue

@@ -133,12 +133,12 @@
 				flex-direction: column;
 				width: 100%;
 				&.image {
-					margin-right: 40rpx;
+					margin-right: 22rpx;
 				}
 
 				&.text {
-					width: 400rpx;
-					margin-left: 40rpx;
+					width: 360rpx;
+					margin-left: 18rpx;
 					&.one {
 						width: 600rpx;
 						margin-left: 0rpx;

src/pages/mine/address/index.vue

@@ -58,9 +58,9 @@ export default {
 		toAddSite(title){
 			this.$u.route({
 				url: 'pages/mine/address/addSite',
-				params: {
-					title: title
-				}
+				// params: {
+				// 	title: title
+				// }
 			})
 		}
 	}

src/pages/mine/warehouse/records.vue

 <template>
 	<view class="ware-wrap">
-		<w-navbar title="操作记录" :background="{backgroundColor: '#F4F5F7'}"></w-navbar>
-		<view class="content">
+		<w-navbar title="" :background="{backgroundColor: '#F4F5F7'}"></w-navbar>
+<!-- 		<view class="content">
 			<view class="panel">
 				<view class="title">物料明细</view>
 				<view class="item-table">
@@ -15,9 +15,9 @@
 						<view class="width-106 center">{{ item.systemStock }}</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<view class="panel">
-				<view class="title">操作记录</view>
+				<!-- <view class="title">操作记录</view> -->
 				<view class="item-table">
 					<view class="item-header">
 						<view class="width-132">订单编号</view>