t

src/components/Common/BaseForm.vue

@@ -198,7 +198,7 @@
       >
         <el-upload
           class="img-upload"
-          :action="`${requireUrl}/adm/upload/cloudpub`"
+          :action="`${requireUrl}/adm/upload/cloud`"
           :data="{logic_type: 'estate', token}"
           name="upload"
           ref="cui"
@@ -228,7 +228,7 @@
         <el-upload
           class="img-upload"
           :disabled="item.disabled || false"
-          :action="`${requireUrl}/adm/upload/cloudpub`"
+          :action="`${requireUrl}/adm/upload/cloud`"
           :data="{logic_type: 'estate', token}"
           name="upload"
           :show-file-list="false"
@@ -251,7 +251,7 @@
         <el-upload
           class="img-upload"
           :disabled="item.disabled || false"
-          :action="`${requireUrl}/adm/upload/cloudpub`"
+          :action="`${requireUrl}/adm/upload/cloud`"
           :data="{logic_type: 'estate', token}"
           name="upload"
           :show-file-list="false"

src/components/Common/CropperImg.vue

@@ -127,7 +127,7 @@ export default {
           newData.append('upload', data, 'honglou.jpg')
           const options = this.curObj.options || {}
           const SY = options.SY
-          let apiUrl = process.env.VUE_APP_BASE_API + '/adm/upload/cloudpub'
+          let apiUrl = process.env.VUE_APP_BASE_API + '/adm/upload/cloud'
           if (SY === 1) {
             apiUrl = process.env.VUE_APP_BASE_API + '/adm/upload/cloud'
           }

src/layout/components/Sidebar/Logo.vue

@@ -24,7 +24,7 @@ export default {
   },
   data() {
     return {
-      title: '麦达科技',
+      title: '房票科技',
       logo: require('@/assets/logo.png'),
     }
   }

src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '麦达科技',
+  title: '房票科技',
 
   /**
    * @type {boolean} true | false

src/views/cust/components/popup/IndexRecord.vue

@@ -14,7 +14,7 @@
         <div class="si-row">
           <div class="si-col">昵称：{{dtlObj.name}}</div>
           <div class="si-col">手机号：{{dtlObj.phone}}</div>
-          <div class="si-col">性别：{{dtlObj.sex}}</div>
+          <div class="si-col">性别：{{sexObj[dtlObj.sex]}}</div>
         </div>
         <div class="si-row">
           <div class="si-col">客户状态：{{reportStateStr}}</div>
@@ -87,9 +87,11 @@ export default {
       reportFlow: [],
       dtlObj: {},
       isStateShow: false,
+      sexObj: {},
     }
   },
   mounted() {
+    this.sexObj = arrToObj(this.$dictData.sex)
     this.listConfig = {
       rows: [
         { label: '客户状态', prop: 'report_state', type: 'tag', tags: arrToObj(this.$dictData.report_state	), tagTypeObj: {'1': 'success', '2': 'warning', '3': 'danger'}},

src/views/cust/index.vue

@@ -14,26 +14,31 @@
       @currentChange="pageHandle"
       @sizeChange="sizeChange"
       :operationsDefaultLength="6"
-      :insertSlotArr="[2]"
+      :insertSlotArr="[7]"
     >
-      <div slot="OI2">
+      <div slot="OI7">
         <el-table-column
           width="140"
           label="保护期止"
           align="center"
         >
           <template slot-scope="scope">
-            <div v-if="+new Date() > +new Date(scope.row.lock_at)">
-              <div style="color: #f00">{{scope.row.lock_at}}</div>
-              <el-tag type="danger" size="mini">已过期</el-tag>
-            </div>
-            <div v-else-if="(+new Date(scope.row.lock_at) - +new Date()) < 86400000">
-              <div style="color: #e6a23c">{{scope.row.lock_at}}</div>
-              <el-tag type="warning" size="mini">1天内过期</el-tag>
-            </div>
-            <div v-else>
+            <template v-if="scope.row.report_state === '1' && scope.row.report_step === '1'">
+              <div v-if="+new Date() > +new Date(scope.row.lock_at)">
+                <div style="color: #f00">{{scope.row.lock_at}}</div>
+                <el-tag type="danger" size="mini">已过期</el-tag>
+              </div>
+              <div v-else-if="(+new Date(scope.row.lock_at) - +new Date()) < 86400000">
+                <div style="color: #e6a23c">{{scope.row.lock_at}}</div>
+                <el-tag type="warning" size="mini">1天内过期</el-tag>
+              </div>
+              <div v-else>
+                <div>{{scope.row.lock_at}}</div>
+              </div>
+            </template>
+            <template v-else>
               <div>{{scope.row.lock_at}}</div>
-            </div>
+            </template>
           </template>
         </el-table-column>
       </div>
@@ -94,14 +99,13 @@ export default {
   mounted() {
     this.listConfig = {
       rows: [
-        { label: '报备时间', prop: 'create_at' },
-        // { label: '保护期止', prop: 'lock_at' },
-        { label: '报备楼盘', prop: 'estate_name'},
-        { label: '电话', prop: 'phone' },
         { label: '姓名', prop: 'name' },
-        { label: '性别', prop: 'sex', type: 'tag', tags: arrToObj(this.$dictData.sex), tagTypeObj: {'male': 'primary', 'female': 'danger'} },
+        { label: '电话', prop: 'phone' },
         { label: '客户状态', prop: 'report_state', type: 'tag', tags: arrToObj(this.$dictData.report_state	), tagTypeObj: {'1': 'success', '2': 'warning', '3': 'danger'}},
-        { label: '报备进度', prop: 'report_step', type: 'flag', flags: arrToObj(this.$dictData.report_step	) },
+        { label: '报备进度', prop: 'report_step', type: 'tag', tags: arrToObj(this.$dictData.report_step	), tagTypeObj: {'1': 'info', '2': 'success', '3': 'success'} },
+        { label: '报备楼盘', prop: 'estate_name'},
+        { label: '报备时间', prop: 'create_at' },
+        { label: '性别', prop: 'sex', type: 'tag', tags: arrToObj(this.$dictData.sex), tagTypeObj: {'male': 'primary', 'female': 'danger'} },
         { label: '备注', prop: 'remark', fullShow: true },
         { label: '报备人', prop: 'create_by' },
         { label: '操作', width: 90, type: 'handle2', operations:

src/views/login/index.vue

@@ -3,7 +3,7 @@
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">
 
       <div class="title-container">
-        <h3 class="title">麦达房地产管理系统</h3>
+        <h3 class="title">房票科技管理系统</h3>
       </div>
 
       <el-form-item prop="username">
@@ -97,8 +97,8 @@ export default {
     }
     return {
       loginForm: {
-        username: '18702530370',
-        password: '123456'
+        username: '',
+        password: ''
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', validator: validateUsername }],