Merge branch 'dev_info' into test-new

src/pages/main/demandDevelop/index.vue

@@ -1085,10 +1085,10 @@ export default {
       }).then(
         ({
           data: {
-            body: { data, count },
+            body: { data,count },
           },
         }) => {
-          this.total = count;
+          this.total = count
           this.tableData = data;
         }
       );
@@ -1291,10 +1291,8 @@ export default {
     },
     // 分页
     currchange(v) {
-      this.page = v
+      this.page = v;
       this.handleInit()
-      // this.pageSize = v;
-      // this.getList(this.params, this.pageSize);
     },
     //申请  // 打开弹出层
     dialogCheck(type, data) {

src/pages/main/demandDevelop/ywStanding.vue

@@ -133,11 +133,12 @@ export default {
       }).then(
         ({
           data: {
-            body: { data, count },
+            body: { data,count },
           },
         }) => {
           this.total = count;
           this.tableData = data;
+          this.total = count
         }
       );
     },