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

src/views/regionSection/regionManage/regionManage.vue

@@ -472,6 +472,16 @@ export default {
           key: "regionName",
           align: "center"
         },
+        {
+          title: "区域码",
+          key: "regionCode",
+          align: "center"
+        },
+        {
+          title: "sso单点登录",
+          key: "sso",
+          align: "center"
+        },
         {
           title: "创建人",
           key: "createname",
@@ -538,6 +548,12 @@ export default {
           Required: "是",
           comm: "认证类型：1账号2学号3手机号码4身份证号"
         },
+        {
+          data: "timestamp",
+          type: "int",
+          Required: "是",
+          comm: "当前时间戳"
+        },
         {
           data: "loginname",
           type: "string",
@@ -549,6 +565,18 @@ export default {
           type: "string",
           Required: "是",
           comm: "认证密码"
+        },
+        {
+          data: "sign",
+          type: "string",
+          Required: "是",
+          comm: "签名"
+        },
+        {
+          data: "mac",
+          type: "string",
+          Required: "是",
+          comm: "设备"
         }
       ],
       response_list: [
@@ -642,6 +670,13 @@ export default {
               type: "string",
               Required: "是",
               comm: "身份证号"
+            },
+            {
+              id: 14,
+              data: "usersex",
+              type: "int",
+              Required: "是",
+              comm: "性别0未知1男2女"
             }
           ]
         }
@@ -739,7 +774,10 @@ export default {
       }).then((data) => {
         this.showLoading = false;
         if (data.code === 0) {
-          this.searchForm.list = data.obj.data;
+          this.searchForm.list = data.obj.data.map((v) => {
+            v.sso = v.sso === 1 ? "平台" : "自定义";
+            return v;
+          });
           this.searchForm.total = data.obj.total;
         } else {
           this.$Message.error(data.msg);