Merge branch 'test' of git.echepei.com:sailun/sailun-tbr-web into test

pages/home/Scan-code-out/index.vue

@@ -108,14 +108,6 @@
 			},
 			Submit() {
 				this.show = true;
-				let data = {
-						storeId:this.$store.state.storeInfo.storeId,
-						userId:this.$store.state.storeInfo.userId,
-						scanAddress: this.whole.address, //地址
-						longitude: this.whole.degree.x,
-						latitude: this.whole.degree.y,
-						materialList: this.datalist
-					}
 				request({
 					url: '/storeScan/storeScanOutTyres',
 					method: 'Post',

pages/home/monthly-policy/monthly-policy.vue

@@ -33,7 +33,7 @@
 						// storeId: this.$store.state.storeInfo.storeId,
 					}
 				}).then(res => {
-					console.log(res)
+					// console.log(res)
 					if (res.data.code == 0) {
 						_this.contentDetail = res.data.data.contentDetail;
 					}

pages/me/Delivery-details/index.vue

@@ -40,7 +40,7 @@
 				<view v-for="(item2,index) in item.tyreMsgVOList" :key="index">
 					<u-collapse>
 						<u-collapse-item style="margin-left: 10rpx;">
-							<view class="u-flex u-row-between" style="width: 100%;" slot="title">
+							<view class="u-flex u-row-between u-font-28" style="width: 100%;" slot="title">
 								<view>
 									{{item2.tireModel}}
 								</view>
@@ -49,20 +49,20 @@
 								</view>
 							</view>
 							<view class="details" v-for="(item3,index) in item2.matnrMsgVOS" :key="index">
-								<view>
+								<view class="u-font-25">
 									<view>物料描述</view>
 									<view>{{item3.maktx}}</view>
 								</view>
-								<view>
+								<view class="u-font-25">
 									<view>轮胎胎号</view>
 									<view>{{item3.tyreNum}}</view>
 								</view>
-								<view>
+								<view class="u-font-25">
 									<view>参加活动</view>
 									<view v-if="item3.satisfyActivity == 1">参加</view>
 									<view v-else>不参加</view>
 								</view>
-								<view>
+								<view class="u-font-25">
 									<view>创建时间</view>
 									<view>{{item3.createDate}}</view>
 								</view>

pages/me/Warehousing-details/index.vue

@@ -40,7 +40,7 @@
 				<view v-for="(item2,index) in item.tyreMsgVOList" :key="index">
 					<u-collapse>
 						<u-collapse-item style="margin-left: 10rpx;">
-							<view class="u-flex u-row-between" style="width: 100%;" slot="title">
+							<view class="u-flex u-row-between u-font-28" style="width: 100%;" slot="title">
 								<view>
 									{{item2.tireModel}}
 								</view>
@@ -49,20 +49,20 @@
 								</view>
 							</view>
 							<view class="details" v-for="(item3,index) in item2.matnrMsgVOS" :key="index">
-								<view>
+								<view class="u-font-25">
 									<view>物料描述</view>
 									<view>{{item3.maktx}}</view>
 								</view>
-								<view>
+								<view class="u-font-25">
 									<view>轮胎胎号</view>
 									<view>{{item3.tyreNum}}</view>
 								</view>
-								<view>
+								<view class="u-font-25">
 									<view>参加活动</view>
 									<view v-if="item3.satisfyActivity == 1">参加</view>
 									<view v-else>不参加</view>
 								</view>
-								<view>
+								<view class="u-font-25">
 									<view>创建时间</view>
 									<view>{{item3.createDate}}</view>
 								</view>

pages/me/Write-off-management/index.vue

@@ -22,7 +22,7 @@
 							{{res.createTime}}
 						</view>
 					</view>
-					<view class="order-two">
+					<view class="order-two" v-if="res.agentAuditTime != null">
 						<view class="">
 							审核时间
 						</view>
@@ -112,6 +112,8 @@
 						this.orderList = this.orderList.concat(res.data.data.records)
 						// 页数
 						this.pages = res.data.data.pages
+						
+						this.orderList = this.orderList.concat(res.data.data.records)
 						for (let i = 0; i < res.data.data.records.length; i++) {
 							if (res.data.data.records[i].status == 0) {
 								this.b2bStatus = "待审核"