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

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

@@ -15,15 +15,15 @@
 					<u-th class="u-th">轮胎胎号</u-th>
 					<u-th class="u-th">失败原因</u-th>
 				</u-tr>
-				<u-tr class="u-tr" v-for="item in notBelongStoreBrandTyreNumbers">
+				<u-tr class="u-tr" v-for="item in notBelongStoreBrandTyreNumbers" :key="index">
 					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">非门店经营品牌</u-td>
 				</u-tr>
-				<u-tr class="u-tr" v-for="item in nonRegularTyreNumbers">
+				<u-tr class="u-tr" v-for="item in nonRegularTyreNumbers" :key="index">
 					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">非正规胎号</u-td>
 				</u-tr>
-				<u-tr class="u-tr" v-for="item in alreadyExistsTyreNumbers">
+				<u-tr class="u-tr" v-for="item in alreadyExistsTyreNumbers" :key="index">
 					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">库存中已存在</u-td>
 				</u-tr>

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

@@ -15,15 +15,15 @@
 					<u-th class="u-th">轮胎胎号</u-th>
 					<u-th class="u-th">失败原因</u-th>
 				</u-tr>
-				<u-tr class="u-tr" v-for="item in notBelongStoreBrandTyreNumbers">
+				<u-tr class="u-tr" v-for="item in notBelongStoreBrandTyreNumbers" :key="index">
 					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">非门店经营品牌</u-td>
 				</u-tr>
-				<u-tr class="u-tr" v-for="item in nonRegularTyreNumbers">
+				<u-tr class="u-tr" v-for="item in nonRegularTyreNumbers" :key="index">
 					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">非正规胎号</u-td>
 				</u-tr>
-				<u-tr class="u-tr" v-for="item in notScanInTyres">
+				<u-tr class="u-tr" v-for="item in notScanInTyres" :key="index">
 					<u-td class="u-td" style="font-size: 24rpx;">{{item}}</u-td>
 					<u-td class="u-td">未入库轮胎</u-td>
 				</u-tr>

pages/home/scancode/index.vue

@@ -32,7 +32,7 @@
 						<u-th class="u-th">规格</u-th>
 						<u-th class="u-th" width="15%">操作</u-th>
 					</u-tr>
-					<u-tr class="u-tr" :key="index" v-for="(item, index) in lisi">
+					<u-tr class="u-tr" v-for="(item, index) in lisi" :key="index">
 						<u-td class="u-td" width="30%">{{item.tireNumber}}</u-td>
 						<u-td class="u-td">{{item.maktx}}</u-td>
 						<u-td class="u-td" width="15%"><text @click="confirm(index)" style="color: #FA3534;">删除</text></u-td>

pages/me/Delivery-details/index.vue

@@ -21,7 +21,7 @@
 					<view>{{item.scanTime.slice(0,10)}}</view>
 				</view>
 				<u-line color="#f4f4f4"></u-line>
-				<view v-for="item2 in item.tyreMsgVOList">
+				<view v-for="item2 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">
@@ -32,7 +32,7 @@
 									{{item2.tyreCount}}条
 								</view>
 							</view>
-							<view class="details" v-for="item3 in item2.matnrMsgVOS">
+							<view class="details" v-for="item3 in item2.matnrMsgVOS" :key="index">
 								<view>
 									<view>物料描述</view>
 									<view>{{item3.maktx}}</view>

pages/me/Warehousing-details/index.vue

@@ -21,7 +21,7 @@
 					<view>{{item.scanTime.slice(0,10)}}</view>
 				</view>
 				<u-line color="#f4f4f4"></u-line>
-				<view v-for="item2 in item.tyreMsgVOList">
+				<view v-for="item2 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">
@@ -32,7 +32,7 @@
 									{{item2.tyreCount}}条
 								</view>
 							</view>
-							<view class="details" v-for="item3 in item2.matnrMsgVOS">
+							<view class="details" v-for="item3 in item2.matnrMsgVOS" :key="index">
 								<view>
 									<view>物料描述</view>
 									<view>{{item3.maktx}}</view>

pages/me/suppliers.vue

@@ -4,19 +4,14 @@
 		<view class="head">
 			<view class="behind"></view>
 			<view class="below">
-				<view class="content">
+				<view class="content" v-for="(item, index) in supplier_s" :key="index">
 					<view class="content_s">
 						<view class="title">
 							<view></view>
-							<h3>测试经销商的经营品牌</h3>
+							<h3>{{item.agentName}}的经营品牌</h3>
 						</view>
 						<view class="information_E">
-							<image src="../../static/sailun/anyu.png" mode=""></image>
-							<image src="../../static/sailun/heiqishi.png" mode=""></image>
-							<image src="../../static/sailun/anyu.png" mode=""></image>
-							<image src="../../static/sailun/heiqishi.png" mode=""></image>
-							<image src="../../static/sailun/anyu.png" mode=""></image>
-							<image src="../../static/sailun/heiqishi.png" mode=""></image>
+							<image v-for="(item2, index) in item.brandList" :key="index" :src="item2" mode=""></image>
 						</view>
 					</view>
 				</view>
@@ -35,7 +30,8 @@
 				return {
 					mobile: '经销商名称',
 					code: '张三',
-					code_s: '13412336446'
+					code_s: '13412336446',
+					supplier_s: []		//经销商信息
 				}
 			},
 			created(){
@@ -44,14 +40,17 @@
 			methods: {
 				supplier(){
 					request({
-						url: '/baseReq/getBrandList',
+						url: '/myapp/storeSelectAgent',
 						method: 'Post',
 						data: {
 							storeId: '3000',
 							userId: '123'
 						}
 					}).then(res => {
+						console.log(res.data.data)
 						console.log(res)
+						this.supplier_s = res.data.data
+						console.log(res.data.data[1].brandList[1])
 					}).catch(err => {
 						console.log(err)
 					}).finally(() => {
@@ -84,7 +83,7 @@
 		border-radius: 18px;
 		margin: 0 auto;
 		padding-top: 30rpx;
-		margin-top: -10rpx;
+		margin-top: 20rpx;
 		padding-bottom: 40rpx;
 
 		.content_s {
@@ -100,6 +99,7 @@
 				image{
 					width: 48%;
 					height: 100rpx;
+					margin-top: 20rpx;
 				}
 			}
 			.title {