Merge remote-tracking branch 'origin/gzb' into wzl

src/views/platformSection/regionManage/regionManage.vue

@@ -206,11 +206,9 @@
       <Form :label-width="65">
         <FormItem label="区域码">{{ viewInfo.regionCode }}</FormItem>
       </Form>
-      <Table
-        style="border: 1px solid #e8eaec; border-bottom: none"
-        :columns="viewInfo.columns"
-        :data="viewInfo.list"
-      ></Table>
+      <div class="table_wrap">
+        <Table :columns="viewInfo.columns" :data="viewInfo.list"></Table>
+      </div>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>

src/views/regionSection/applicationManage/applicationManage.vue

@@ -185,8 +185,8 @@
         >
           <FormItem label="应用名称" prop="appName" style="width: 100%">
             <Input
-                v-model="wallpaperInfo.appName"
-                placeholder="上传应用自动识别"
+              v-model="wallpaperInfo.appName"
+              placeholder="上传应用自动识别"
             ></Input>
           </FormItem>
           <FormItem label="分组" style="width: 100%" class="require">

src/views/regionSection/regionManage/adminManage.vue

@@ -680,7 +680,6 @@ export default {
             form.adminid = this.adminInfo.adminid;
             form.rversion = this.adminInfo.rversion;
           }
-          console.log(form);
           this.showLoading = true;
           api(form).then((data) => {
             this.showLoading = false;

src/views/regionSection/regionManage/regionManage.vue

@@ -209,11 +209,9 @@
       title="查看"
     >
       <div class="view_title">{{ viewInfo.regionName }}</div>
-      <Table
-        style="border: 1px solid #e8eaec; border-bottom: none"
-        :columns="viewInfo.columns"
-        :data="viewInfo.list"
-      ></Table>
+      <div class="table_wrap">
+        <Table :columns="viewInfo.columns" :data="viewInfo.list"></Table>
+      </div>
       <div slot="footer" style="text-align: center">
         <Button @click="viewInfo.show = false">关闭</Button>
       </div>
@@ -264,21 +262,21 @@
               </RadioGroup>
             </FormItem>
             <FormItem label="请求说明">
-              <Table
-                style="border: 1px solid #e8eaec; border-bottom: none"
-                :columns="columns1"
-                :data="request_list"
-              ></Table>
+              <div class="table_wrap" style="margin: 0">
+                <Table :columns="columns1" :data="request_list"></Table>
+              </div>
             </FormItem>
             <FormItem label="返回说明">
               <div style="line-height: 36px; margin-bottom: 10px">
                 以json格式返回数据
               </div>
-              <Table
-                style="border: 1px solid #e8eaec; border-bottom: none"
-                :columns="columns1"
-                :data="response_list"
-              ></Table>
+              <div class="table_wrap" style="margin: 0">
+                <Table
+                  row-key="id"
+                  :columns="columns1"
+                  :data="response_list"
+                ></Table>
+              </div>
             </FormItem>
           </div>
         </Form>
@@ -506,7 +504,8 @@ export default {
           title: "参数",
           key: "data",
           align: "center",
-          width: 180
+          width: 180,
+          tree: true
         },
         {
           title: "类型",
@@ -527,6 +526,18 @@ export default {
         }
       ],
       request_list: [
+        {
+          data: "authKey",
+          type: "string",
+          Required: "是",
+          comm: "认证秘钥"
+        },
+        {
+          data: "authType",
+          type: "int",
+          Required: "是",
+          comm: "认证类型：1账号2学号3手机号码4身份证号"
+        },
         {
           data: "loginname",
           type: "string",
@@ -542,76 +553,97 @@ export default {
       ],
       response_list: [
         {
+          id: 1,
           data: "code",
           type: "int",
           Required: "是",
           comm: "0正常，1错误"
         },
         {
+          id: 2,
           data: "msg",
           type: "string",
           Required: "是",
           comm: "成功/失败(有失败信息)"
         },
         {
-          data: "schoolid",
-          type: "int",
-          Required: "是",
-          comm: "学校ID"
-        },
-        {
-          data: "schoolname",
-          type: "string",
-          Required: "是",
-          comm: "学校名称"
-        },
-        {
-          data: "classid",
-          type: "int",
-          Required: "是",
-          comm: "班级ID"
-        },
-        {
-          data: "classname",
-          type: "string",
-          Required: "是",
-          comm: "班级名称"
-        },
-        {
-          data: "userid",
-          type: "int",
-          Required: "是",
-          comm: "用户ID"
-        },
-        {
-          data: "usename",
-          type: "string",
+          id: 3,
+          data: "obj",
+          type: "object",
           Required: "是",
-          comm: "用户姓名"
-        },
-        {
-          data: "userphone",
-          type: "string",
-          Required: "是",
-          comm: "手机号码"
-        },
-        {
-          data: "studentno",
-          type: "string",
-          Required: "是",
-          comm: "学号"
-        },
-        {
-          data: "loginname",
-          type: "string",
-          Required: "是",
-          comm: "账号"
-        },
-        {
-          data: "cardid",
-          type: "string",
-          Required: "是",
-          comm: "身份证号"
+          comm: "用户信息",
+          children: [
+            {
+              id: 4,
+              data: "schoolid",
+              type: "int",
+              Required: "是",
+              comm: "学校ID"
+            },
+            {
+              id: 5,
+              data: "schoolName",
+              type: "string",
+              Required: "是",
+              comm: "学校名称"
+            },
+            {
+              id: 6,
+              data: "classid",
+              type: "int",
+              Required: "是",
+              comm: "班级ID"
+            },
+            {
+              id: 7,
+              data: "classname",
+              type: "string",
+              Required: "是",
+              comm: "班级名称"
+            },
+            {
+              id: 8,
+              data: "userid",
+              type: "int",
+              Required: "是",
+              comm: "用户ID"
+            },
+            {
+              id: 9,
+              data: "usename",
+              type: "string",
+              Required: "是",
+              comm: "用户姓名"
+            },
+            {
+              id: 10,
+              data: "userphone",
+              type: "string",
+              Required: "是",
+              comm: "手机号码"
+            },
+            {
+              id: 11,
+              data: "studentno",
+              type: "string",
+              Required: "是",
+              comm: "学号"
+            },
+            {
+              id: 12,
+              data: "loginname",
+              type: "string",
+              Required: "是",
+              comm: "账号"
+            },
+            {
+              id: 13,
+              data: "cardid",
+              type: "string",
+              Required: "是",
+              comm: "身份证号"
+            }
+          ]
         }
       ]
     };

src/views/schoolSection/applicationManage/applicationList.vue

@@ -1341,7 +1341,6 @@ export default {
         if (res.code === 0) {
           this.searchForm.list = res.obj.data;
           this.searchForm.total = res.obj.total;
-          console.log(this.searchForm.list);
           if (document.querySelector(".section_main")) {
             document.querySelector(".section_main").scrollTop = 0;
           }