瀏覽代碼

解决冲突

yin_yu820 2 年之前
父節點
當前提交
babe7e36b2
共有 1 個文件被更改,包括 20 次插入4 次删除
  1. 20 4
      src/views/tab_a/tabAll.vue

+ 20 - 4
src/views/tab_a/tabAll.vue

@@ -24,7 +24,7 @@
 		<div class="tabtitle1"></div>
 		<div class="tabtitle">我的待办</div>
 		<div class="tabtitle2">(</div>
-		<div class="tabtitle3">{{con1+con2}}</div>
+		<div class="tabtitle3">{{sum}}</div>
 		<div class="tabtitle4">)</div>
 		<van-icon name="ellipsis" class="tabtitle5" />
 	</div>
@@ -32,12 +32,12 @@
 	<div class="flexll">
 		<div class="ffl2" id="0" @click="goToBeDone($event)">
 			<div class="textRegular" >待处理</div>
-			<div class="textRed">{{con1}}</div>
+			<div class="textRed">{{sum1}}</div>
 		</div>
 		<div class="verticalLine"></div>
 		<div class="ffl2" id="1" @click="goToBeDone($event)">
 			<div class="textRegular" >已处理</div>
-			<div class="textBlue">{{con2}}</div>
+			<div class="textBlue">{{sum2}}</div>
 		</div>
 	</div>
 	<div class="hLine"></div>
@@ -87,6 +87,9 @@ import toBeDone from '@/api/toBeDone/toBeDone';
 				password2:"",
 				con1:0,
 				con2:0,
+				sum:"0",
+				sum1:"0",
+				sum2:"0",
 				BannerImgurls:['https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400','https://img1.baidu.com/it/u=2086445453,3056906789&fm=253&fmt=auto&app=138&f=GIF?w=1378&h=400']
 			}
 		},
@@ -95,7 +98,7 @@ import toBeDone from '@/api/toBeDone/toBeDone';
 			let id=this.$route.query.id;
 			window.xm.setNavigationBarTitle({ title: '智慧“和顺”'})
 			this.TokenLogin2();
-			this.dataNumber();
+			//this.dataNumber();
 		},
 
 		methods:{
@@ -197,6 +200,7 @@ import toBeDone from '@/api/toBeDone/toBeDone';
 						that.$store.commit('setUser',res.account);
 						that.getBannerImg();//获取轮播图
 						that.getSelectColor();//获取主题颜色
+						that.getStatistics();//获取待办事项数
 					});
 
 					//})//上线取消注释
@@ -204,11 +208,23 @@ import toBeDone from '@/api/toBeDone/toBeDone';
 				}else{
 					that.getBannerImg();//获取轮播图
 					that.getSelectColor();//获取主题颜色
+					that.getStatistics();//获取待办事项数
 				}
 
 
 			},
 
+			getStatistics(){
+				let that=this;
+				new userSets()
+				.Statistics()
+				.then((res) => {
+					that.sum=res[0].sum;
+					that.sum1=res[0].sum1;
+					that.sum2=res[0].sum2;
+				});
+			},
+
 			getBannerImg(){
 				new userSets()
 				.BannerImg({