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

pages/me/Settlement-center/index.vue

@@ -88,7 +88,6 @@
 						console.log(res.data)
 						this.datalist = res.data.data
 						this.Arry.length = this.datalist.length
-						// this.checkboxList.length = this.datalist.length
 						for(var i=0;i<this.datalist.length;i++){
 							this.Arry[i] = []
 							this.checkboxList[i] = false
@@ -133,8 +132,6 @@
 			checkboxChange(e,index,dataArr){
 				console.log(e)
 				let newArr = []
-				// this.Arry.length = this.datalist.length
-				// this.Arry[index] = []
 				console.log(this.Arry)
 				e.detail.value.forEach((item) =>{
 					var obj = {
@@ -144,7 +141,6 @@
 						"kunnr": JSON.parse(item).kunnr,
 						'userId':this.$store.state.storeInfo.userId
 					}
-					// let obj = JSON.parse(item)
 					console.log(obj)
 					newArr.push(obj)
 				})
@@ -216,7 +212,7 @@
 					for(var i=0;i<e.storegentBrandList.length;i++){
 						if( e.storegentBrandList[i].usableMoney !=0){
 							var obj = {
-								"storeId": "3000",
+								"storeId": this.$store.state.storeInfo.storeId,
 								"amount": e.storegentBrandList[i].usableMoney,
 								"brandCode": e.storegentBrandList[i].brandCode,
 								"kunnr": e.storegentBrandList[i].agentId

pages/msg/System-message/index.vue

@@ -3,7 +3,7 @@
 	<view class="header">
 		<view class="content" v-for="(item,index) in orderList" @click="inDetails" :key="index">
 			<view class="content-one">
-				<text class="content-one-first">{{item.msgTitle}} {{item.sendUserId}}</text>
+				<text class="content-one-first">{{item.msgTitle}}</text>
 				<text class="content-one-second">{{item.data}}</text>
 			</view>
 			<!-- 中间的虚线 -->