魏熙美 преди 6 години
родител
ревизия
64b5f035cf

+ 13
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java Целия файл

@@ -77,6 +77,11 @@ public class TaUser {
77 77
     /** 审核 状态 **/
78 78
     private String userVerifyStatus;
79 79
 
80
+    /**
81
+     * 人脸 图片
82
+     */
83
+    private String faceImg;
84
+
80 85
     public void setHouseList(List<TpBuildingOwnerInfo> houseList) {
81 86
         this.houseList = houseList;
82 87
     }
@@ -316,4 +321,12 @@ public class TaUser {
316 321
     public void setUserVerifyStatus(String userVerifyStatus) {
317 322
         this.userVerifyStatus = userVerifyStatus;
318 323
     }
324
+
325
+    public String getFaceImg() {
326
+        return faceImg;
327
+    }
328
+
329
+    public void setFaceImg(String faceImg) {
330
+        this.faceImg = faceImg;
331
+    }
319 332
 }

+ 2
- 1
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java Целия файл

@@ -336,7 +336,8 @@ public class TaUserServiceImpl implements ITaUserService {
336 336
         JSONObject jsonobject = JSONObject.parseObject(data);
337 337
         int errorCode = jsonobject.getInteger("errorCode");
338 338
         if (errorCode != 0) {
339
-            response.addError("海康电话已存在,推送海康电话修改失败");
339
+            log.error("海康电话已存在,推送海康电话修改失败");
340
+            response.addError("此手机号已注册");
340 341
             return response;
341 342
         }
342 343
 

+ 4
- 0
VUECODE/smart-operate-manage/src/views/community/user/index.vue Целия файл

@@ -118,9 +118,13 @@ export default {
118 118
     },
119 119
     handleSizeChange(val) {
120 120
       console.log(`每页 ${val} 条`)
121
+      this.formInline.pageSize = val
122
+      this.getData()
121 123
     },
122 124
     handleCurrentChange(val) {
123 125
       console.log(`当前页: ${val}`)
126
+      this.formInline.pageNum = val
127
+      this.getData()
124 128
     },
125 129
     searchData() { // 搜索
126 130
       this.formInline.pageNum = 1

+ 26
- 6
VUECODE/smart-property-manage/src/views/bill/statement/info/index.vue Целия файл

@@ -1,21 +1,26 @@
1 1
 <template>
2 2
   <div id="root">
3
-    <span>当前订单由以下收费单组成</span>
3
+    <span style="font-size: 15px;color: #606266;font-weight: bold;">当前订单由以下收费单组成</span>
4 4
     <div v-for="bill in list.billOrderList" class="content-div">
5 5
       <div class="title-div">
6 6
         <span>收费组名称 {{ bill.billName }}</span>
7
-        <span style="margin-left: 50px;">收费组编号 {{ bill.tpBillId }}</span>
7
+        <span style="margin-left: 300px;">
8
+          收费组编号
9
+          <router-link :to="{name: 'bill-info', query: { id: bill.tpBillId }}" tag="a" style="color: rgb(64, 158, 255);">
10
+            {{ bill.tpBillId }}
11
+          </router-link>
12
+        </span>
8 13
       </div>
9 14
       <div v-for="item in bill.billInvoiceList" class="table-div">
10
-        <table>
15
+        <table style="border-collapse: collapse; border-spacing: 0;">
11 16
           <tr>
12 17
             <td class="div-td">收费单号</td>
13
-            <td class="div-td">收费单说明</td>
18
+            <td class="div-td" style="width: 600px;">收费单说明</td>
14 19
             <td class="div-td">金额(元)</td>
15 20
           </tr>
16 21
           <tr>
17 22
             <td class="div-td">{{ item.id }}</td>
18
-            <td class="div-td">{{ item.billInvoiceExplain }}</td>
23
+            <td class="div-td" style="width: 600px;">{{ item.billInvoiceExplain }}</td>
19 24
             <td class="div-td">{{ item.payPrice / 100 }}</td>
20 25
           </tr>
21 26
         </table>
@@ -51,7 +56,7 @@ export default {
51 56
 
52 57
 <style scoped>
53 58
 #root {
54
-  width: 500px;
59
+  width: 900px;
55 60
   margin-left: auto;
56 61
   margin-right: auto;
57 62
   margin-top: 20px;
@@ -63,8 +68,23 @@ export default {
63 68
   border: 1px solid;
64 69
   width: 150px;
65 70
   text-align: center;
71
+  float: left;
72
+  font-size: 14px;
73
+  color: #606266;
74
+  line-height: 40px;
75
+  padding: 0 12px 0 0;
76
+  -webkit-box-sizing: border-box;
77
+  box-sizing: border-box;
66 78
 }
67 79
 .title-div {
68 80
   display: flex;
81
+  margin-top: 50px;
82
+  font-size: 15px;
83
+  color: #606266;
84
+  font-weight: bold;
69 85
 }
86
+.table-div {
87
+  margin-top: 20px;
88
+}
89
+
70 90
 </style>