liujq 3 years ago
parent
commit
6759f01f41

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-470bed2b.ab0cdaed.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-cd964c38.09ceb86c.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.5778ebfe.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-07fc91a6.33015e42.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-470bed2b.cdb2c8d3.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-cd964c38.ef91480f.js


+ 10 - 9
src/views/house/components/popup/PriceEdit.vue

@@ -7,11 +7,11 @@
       :visible.sync="isShow"
       :title="curObj.id ? '编辑成交价' : '新增成交价'"
       :fullscreen="false"
-      width="700px"
+      width="800px"
       custom-class="xl-dialog"
       center
     >
-      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="80px">
       </base-form>
       <div class="xl-form">
         <div class="xl-form-footer">
@@ -59,8 +59,8 @@ export default {
       }
       // if (!params.company) params.company = '贝壳'
       this.formData = [
-        { label: '面积', key: 'area', class: 'c-2', type: 'inputFont', appendFont: '㎡', changeHandle: this.priceChange, rules: 1},
-        { label: '层数', class: 'c-2', key: 'cur_layer', rules: [
+        { label: '面积', key: 'area', class: 'c-3', type: 'inputFont', appendFont: '㎡', changeHandle: this.priceChange, rules: 1},
+        { label: '层数', class: 'c-3', key: 'cur_layer', rules: [
           { validator: (rule, value, callback) => {
             if (Number(value) < 0 || isNaN(Number(value))) {
               callback(new Error('请输入数字'))
@@ -70,8 +70,7 @@ export default {
           }, trigger: 'blur' },
           { required: true, message: '请输入层数', trigger: 'blur' },
         ] },
-        { label: '签约中介', key: 'company', class: 'c-2', type: 'select', options: this.$dictData.zjjg, rules: 1}, 
-        { label: '总层数', class: 'c-2', key: 'layer', rules: [
+        { label: '总层数', class: 'c-3', key: 'layer', rules: [
           { validator: (rule, value, callback) => {
             if (Number(value) < 0 || isNaN(Number(value))) {
               callback(new Error('请输入数字'))
@@ -81,9 +80,10 @@ export default {
           }, trigger: 'blur' },
           { required: true, message: '请输入总层数', trigger: 'blur' },
         ] },
-        { label: '签约日期', key: 'sign_at', type: 'datePicker', type2: 'date', class: 'c-2', rules: 1},
-        { label: '单价', key: 'unit_price', class: 'c-2', type: 'inputFont', appendFont: '元', changeHandle: this.priceChange, rules: 1},
-        { label: '总价', key: 'price', class: 'c-2', type: 'inputFont', appendFont: '万元', rules: 1},
+        { label: '签约中介', key: 'company', class: 'c-3', type: 'select', options: this.$dictData.zjjg, rules: 1}, 
+        { label: '签约日期', key: 'sign_at', type: 'datePicker', type2: 'date', class: 'c-3', rules: 1},
+        { label: '单价', key: 'unit_price', class: 'c-3', type: 'inputFont', appendFont: '元', changeHandle: this.priceChange, rules: 1},
+        { label: '总价', key: 'price', class: 'c-3', type: 'inputFont', appendFont: '万元', rules: 1},
       ]
       this.setDefaultValue(params)
     },
@@ -119,6 +119,7 @@ export default {
 @import '../../../../styles/libEdit.scss';
 .lib-edit {
   padding-top: 0;
+  width: 700px;
   ::v-deep .el-date-editor.el-input {
     width: 100%;
   }

+ 6 - 4
src/views/user/components/popup/IndexEdit.vue

@@ -65,8 +65,9 @@ export default {
             remoteParams: { skey: 'name', api: `base.admroleslist`, opKey: 'name', opVal: 'id' },
             remoteOptions: remoteOptionsRoles
           },
-          { label: '邮箱', key: 'email' },
-          { label: '头像', key: 'avatar', type: 'upload' },
+          { label: '微信绑定ID', key: 'wx_user_id' },
+          // { label: '邮箱', key: 'email' },
+          // { label: '头像', key: 'avatar', type: 'upload' },
         ]
       } else {
         this.formData = [
@@ -77,8 +78,9 @@ export default {
             remoteParams: { skey: 'name', api: `base.admroleslist`, opKey: 'name', opVal: 'id' },
             remoteOptions: remoteOptionsRoles
           },
-          { label: '邮箱', key: 'email' },
-          { label: '头像', key: 'avatar', type: 'upload' },
+          { label: '微信绑定ID', key: 'wx_user_id' },
+          // { label: '邮箱', key: 'email' },
+          // { label: '头像', key: 'avatar', type: 'upload' },
         ]
       }
       this.setDefaultValue(params)

+ 2 - 1
src/views/user/index.vue

@@ -63,8 +63,9 @@ export default {
       rows: [
         { label: '昵称', prop: 'nickname' },
         { label: '账号', prop: 'username' },
-        { label: '头像', prop: 'avatar', type: 'img' },
+        // { label: '头像', prop: 'avatar', type: 'img' },
         { label: '角色', prop: 'role_name' },
+        { label: 'wxId', prop: 'wx_user_id' },
         { label: '更新人', prop: 'update_by' },
         { label: '更新时间', prop: 'update_at' },
         { label: '操作', width: 200, type: 'handle2', operations:

Some files were not shown because too many files changed in this diff