Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-shell-uniapp

pages/index/index.vue

@@ -397,7 +397,8 @@
 					uni.setStorage({
 						key: 'userData',
 						data: {
-							headImage: res.extra.auth2.merchantImg,
+							// headImage: res.extra.auth2.merchantImg,
+							headImage: res.extra.auth2.logo,
 							userName: res.data.name,
 							userId: res.data.userId,
 							tenantName: res.data.tenantName,

pagesMedia/liveOption.vue

@@ -137,6 +137,7 @@
 					this.defaultList = [{
 						url: res.data.imgUrl
 					}]
+					this.checkList.forEach(v=>v.checked = false)
 					res.data.liveWeek.split(',').forEach(site => {
 						this.checkList[parseInt(site) - 1].checked = true
 					})