Merge remote-tracking branch 'origin/master'

enterprise-manager-ui/admin/src/components/AreaSelect.vue

@@ -75,7 +75,7 @@
         </el-select>
       </el-col>
 
-      <el-col
+      <!-- <el-col
         :span="span"
         v-if="!hideCity && !hideArea && !hideStreet && !hideStreet"
       >
@@ -95,7 +95,7 @@
           >
           </el-option>
         </el-select>
-      </el-col>
+      </el-col> -->
     </el-row>
   </div>
 </template>

enterprise-manager-ui/admin/src/components/ImageUpload.vue

@@ -38,6 +38,9 @@
           </div>
         </div>
       </div>
+      <div slot="tip" class="el-upload__tip" v-if="slotP">
+        {{ slotP }}
+      </div>
     </el-upload>
     <el-upload
       :action="uploadImgUrl + '?prePath=' + prePath"
@@ -53,6 +56,9 @@
       v-else
     >
       <i class="el-icon-plus"></i>
+      <div slot="tip" class="el-upload__tip" v-if="slotP">
+        {{ slotP }}
+      </div>
     </el-upload>
     <el-dialog
       :visible.sync="dialogVisible"
@@ -75,6 +81,8 @@
 </template>
 
 <script>
+import { type } from "../assets/utils";
+
 export default {
   data() {
     return {
@@ -103,6 +111,10 @@ export default {
       type: Number,
       default: undefined,
     },
+    slotP: {
+      type: String,
+      default: "",
+    },
   },
   mounted() {
     // 判断是否为多图上传

enterprise-manager-ui/admin/src/views/Home.vue

@@ -128,18 +128,23 @@ export default {
       this.$post("/company/stat").then((res) => {
         const { data, code } = res;
         if (code == 1) {
-          this.enterpriseNums = data.enterpriseNums;
-          this.productNums = data.productNums;
-          this.staffNums = data.staffNums;
-          this.newsNums = data.newsNums;
-          this.feedbackNums = data.feedbackNums;
-          this.customerNums = data.customerNums;
+          data.enterpriseNums
+            ? (this.enterpriseNums = data.enterpriseNums)
+            : "--";
+          data.productNums ? (this.productNums = data.productNums) : "--";
+          data.staffNums ? (this.staffNums = data.staffNums) : "--";
+          data.newsNums ? (this.newsNums = data.newsNums) : "--";
+          data.feedbackNums ? (this.feedbackNums = data.feedbackNums) : "--";
+          data.customerNums ? (this.customerNums = data.customerNums) : "--";
 
           this.lineDayValue = data.accessStatList ? data.accessStatList : [];
           this.barDayValue = data.sendCardStaffList
             ? data.sendCardStaffList
             : [];
-          if (data.newsDistributionList.length > 0) {
+          if (
+            data.newsDistributionList &&
+            data.newsDistributionList.length > 0
+          ) {
             let arr = [];
             data.newsDistributionList.forEach((item) => {
               arr.push({
@@ -152,7 +157,10 @@ export default {
             this.xwfbDayValue = [];
           }
 
-          if (data.productDistributionList.length > 0) {
+          if (
+            data.productDistributionList &&
+            data.productDistributionList.length > 0
+          ) {
             let arr = [];
             data.productDistributionList.forEach((item) => {
               arr.push({
@@ -165,7 +173,10 @@ export default {
             this.cpfbDayValue = [];
           }
 
-          if (data.businessCardDistributionList.length > 0) {
+          if (
+            data.businessCardDistributionList &&
+            data.businessCardDistributionList.length > 0
+          ) {
             let arr = [];
             data.businessCardDistributionList.forEach((item) => {
               arr.push({

enterprise-manager-ui/admin/src/views/company/drawershow.vue

@@ -97,12 +97,20 @@
         <Field label="成立日期" prop="establishDate" v-model="form.establishDate" type="date" />-->
       <el-row>
         <Field :span="24" label="企业logo">
-          <imageUpload v-model="form.logoPath" prePath="/file/preview" />
+          <imageUpload
+            v-model="form.logoPath"
+            prePath="/file/preview"
+            :slotP="'请上传 67*67px 的图片'"
+          />
         </Field>
       </el-row>
       <el-row>
         <Field :span="24" label="企业背景图">
-          <imageUpload v-model="form.background" prePath="/file/preview" />
+          <imageUpload
+            v-model="form.background"
+            prePath="/file/preview"
+            :slotP="'请上传 365*166px 的图片'"
+          />
         </Field>
       </el-row>
       <el-row>
@@ -139,6 +147,7 @@
             prePath="/file/preview"
             :isList="true"
             ref="imgList"
+            :slotP="'请上传 390*220px 的图片'"
           />
         </Field>
       </el-row>

enterprise-manager-ui/admin/src/views/news/drawershow.vue

@@ -39,6 +39,7 @@
                 :isList="true"
                 :limit="9"
                 ref="imgList"
+                :slotP="'请上传2MB以内的图片'"
               />
             </Field>
 

enterprise-manager-ui/admin/src/views/product/drawershow.vue

@@ -81,6 +81,7 @@
               ><imageUpload
                 v-model="form.productFacePath"
                 prePath="/file/preview"
+                :slotP="'请上传 62*62px 的图片'"
               />
             </Field>
           </el-row>
@@ -100,6 +101,7 @@
                 prePath="/file/preview"
                 :isList="true"
                 ref="imgList"
+                :slotP="'请上传 390*220px 的图片'"
               />
             </Field>
           </el-row>

enterprise-manager-ui/admin/src/views/staff/drawershow.vue

@@ -44,7 +44,11 @@
         />
         <!-- <Field :span="20" label="员工状态" type="select" prop="staffStatus" v-model="form.staffStatus" :enum-data="dict.staffStatus" placeholder="请输入员工状态"/> -->
         <Field :span="20" label="头像" prop="photoPath" placeholder="请输入照片"
-          ><imageUpload v-model="form.photoPath" prePath="/file/preview" />
+          ><imageUpload
+            v-model="form.photoPath"
+            prePath="/file/preview"
+            :slotP="'请上传 62*62px 的2MB以内的图片'"
+          />
         </Field>
         <Field
           :span="20"