Merge remote-tracking branch 'origin/master'

src/layout/components/header.vue

@@ -42,7 +42,7 @@
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
           <!--          <img :src="avatar" class="user-avatar">-->
-          <div style="display: flex;align-items: center">
+          <div style="display: flex;align-items: center;cursor: pointer">
             <el-avatar :size="24" :src="circleUrl" />
             <div style="margin-left: 10px">{{ userName }}</div>
           </div>

src/views/activity/activityadd.vue

@@ -88,7 +88,7 @@
             <i class="el-icon-plus" style="width: 20px;height: 20px;margin-top: 10px;" />
             <div class="upload-trademark-title">上传图片</div>
           </div>
-          <div v-if="!imageUrl" slot="tip" class="el-upload__tip">支持文件格式：.jpg .gpeg .png.单个文件不能超过4M</div>
+          <div v-if="!imageUrl" slot="tip" class="el-upload__tip">支持文件格式：.jpg .gpeg .png.单个文件不能超过4M,推荐上传文件大小：110px*83px</div>
         </el-upload>
       </el-form-item>
       <el-form-item label="活动内容" prop="activityDetails">

src/views/activity/merchantactivity/index.vue

@@ -175,7 +175,7 @@
               @click="handleDetail(scope.row)"
             >详情</el-button>
             <el-button
-              v-if="scope.row.status === 0"
+              v-if="scope.row.status === 0 && scope.row.status === 0"
               size="mini"
               type="text"
               @click="handleUpdate(scope.row)"

src/views/activity/parkactivities/index.vue

@@ -355,7 +355,7 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-         rows: 10,
+        rows: 10,
         activityType: 0
       },
       // 表单参数

src/views/monitor/operLog/index.vue

 <template>
   <div class="app-container-operlog">
     <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true" label-width="68px">
-      <el-form-item label="系统模块" prop="title">
+      <el-form-item prop="title">
         <el-input
           v-model="queryParams.title"
-          placeholder="请输入系统模块"
+          placeholder="系统模块"
           clearable
           style="width: 170px"
           :maxlength="30"
@@ -12,11 +12,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户名称" prop="operName">
+      <el-form-item  prop="operName">
         <el-input
           v-model="queryParams.operName"
           style="width: 170px"
-          placeholder="请输入用户名称"
+          placeholder="用户名称"
           clearable
           :maxlength="30"
           size="small"
@@ -55,14 +55,14 @@
       <!--          />-->
       <!--        </el-select>-->
       <!--      </el-form-item>-->
-      <el-form-item label="操作月份">
+      <el-form-item>
         <el-date-picker
           v-model="queryParams.operTime"
           type="month"
           size="small"
           style="width: 170px"
           value-format="yyyy-MM"
-          placeholder="请选择月份"
+          placeholder="操作月份"
         />
       </el-form-item>
       <el-form-item>
@@ -102,7 +102,7 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column :show-overflow-tooltip="true" label="日志编号" width="100" align="center" prop="operId">
           <template slot-scope="scope">
-            {{ scope.row.operId || '-' }}
+            {{ scope.row.businessId || '-' }}
           </template>
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" label="系统模块" align="center" prop="systemMode">
@@ -117,7 +117,7 @@
         </el-table-column>
         <el-table-column label="请求地址" align="center" :show-overflow-tooltip="true" prop="operLocation">
           <template slot-scope="scope">
-            {{ scope.row.operLocation || '-' }}
+            {{ scope.row.operUrl || '-' }}
           </template>
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" label="请求方式" align="center" prop="requestMethod">

src/views/voucher/coupon/index.vue

@@ -383,13 +383,13 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-         rows: 10
+        rows: 10
         // status: undefined
       },
       // 领用详情查询条件
       usequeryParams: {
         page: 1,
-         rows: 10,
+        rows: 10,
         businessId: ''
         // status: undefined
       },
@@ -545,11 +545,11 @@ export default {
       this.dateRange = []
       this.queryParams = {
         page: 1,
-         rows: 10
+        rows: 10
       }
       this.usequeryParams = {
         page: 1,
-         rows: 10,
+        rows: 10,
         businessId: ''
       }
       // this.resetForm('queryForm')
@@ -732,6 +732,9 @@ export default {
 .el-switch .el-switch__label {
   width: 57px!important;
 }
+/deep/.el-dialog__wrapper .el-dialog .el-dialog__body {
+  max-height: 66vh !important;
+}
 </style>
 <style lang="scss">
 .app-container-dict {

src/views/work/index.vue

@@ -410,6 +410,9 @@ export default {
             align-items: center;
             flex-direction: column;
           }
+          .quickbutton:hover{
+            cursor: pointer;
+          }
         }
         .kuaijieimage{
           width: 36px;
@@ -431,7 +434,7 @@ export default {
           color: #D84848;
         }
         .more:hover{
-          cursor: default;
+          cursor: pointer;
         }
         .list{
           //padding: 24px 22px;
@@ -461,7 +464,7 @@ export default {
               text-overflow: ellipsis;
             }
             .title1:hover{
-              cursor: default;
+              cursor: pointer;
             }
             .time{
               font-size: 14px;