Merge branch 'huipay-h5' into huipay-app-dev

pages/index/collectNotes/collectNotes.vue

@@ -90,8 +90,9 @@
 						<view class="width50 fotrt">{{statusList[item.status]}}</view>
 					</view>
 					<view class="alijusstart font14 paddtop5 fcor999">
-						<view class="width15 text1">{{item.salesmanName}}</view>
-						<view class="width85 fotrt">{{item.storeName}}</view>
+						<view class="width15 text1" v-if="userInfo.secUser.objectType == 2">{{item.salesmanName}}</view>
+						<view class="width85 text1" v-if="userInfo.secUser.objectType != 2">{{item.storeName}}</view>
+						<view class="width85 fotrt" v-if="userInfo.secUser.objectType == 2">{{item.storeName}}</view>
 					</view>
 					<view class="alijusstart font14 paddtop5 fcor999">
 						<view class="width70">{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
@@ -164,11 +165,11 @@
 			}
 			//业务员
 			if (this.userInfo.secUser.objectType == 3) {
-				this.getMerList(this.userInfo.secRole.id);
+				this.getMerList(this.userInfo.salesman.id);
 			}
 			//商户
 			if (this.userInfo.secUser.objectType == 4) {
-				this.getStoreListByMer(this.userInfo.secUser.id);
+				this.getStoreListByMer(this.userInfo.mer.id);
 			}
 			this.getTradeOrderList();
 		},