Merge branch 'feature/12月迭代' into dev

src/components/layout/index.vue

@@ -7,7 +7,7 @@
         <div class="layout-title">
           <el-breadcrumb class="dm-breadcrumb" separator="/">
             <el-breadcrumb-item :to="{ path: '' }"><a href="/report/#/memberSummary">首页</a></el-breadcrumb-item>
-            <el-breadcrumb-item :class="{ 'no-link': !v.path }" v-for="(v, i) in breadcrumb" :key="i" :to="{ path: v.path }">{{ v.name }}</el-breadcrumb-item>
+            <el-breadcrumb-item :class="{ 'no-link': !v.path, 'can-link': v.path }" v-for="(v, i) in breadcrumb" :key="i" :to="{ path: v.path }">{{ v.name }}</el-breadcrumb-item>
           </el-breadcrumb>
           <h3>
             <div>
@@ -229,4 +229,9 @@ export default {
     margin-left: 10px;
   }
 }
+.can-link:hover {
+  span:first-child {
+    color: #1890ff !important;
+  }
+}
 </style>

src/views/recharge/account-detail.vue

@@ -22,12 +22,12 @@
           </el-table-column>
           <el-table-column label="操作" min-width="130">
             <template slot-scope="{ row }">
-              <el-button v-if="$getButtonLimit($buttonCode.marketingShowStore) && row.status == 1" :limit-code="$buttonCode.marketingShowStore" type="text" @click="showStore(row)">查看门店</el-button>
               <el-button v-if="$getButtonLimit($buttonCode.marketingAccountDetailRecord)" :limit-code="$buttonCode.marketingAccountDetailRecord" type="text" @click="toRecord(row)">记录</el-button>
               <template v-if="row.accountDepartId != 1 && $getButtonLimit($buttonCode.marketingUpdateStatus)">
                 <el-button type="text" v-if="row.status == 0" :limit-code="$buttonCode.marketingUpdateStatus" @click="updateStatus(row, 'open')">启用</el-button>
                 <el-button type="text" v-if="row.status == 1" :limit-code="$buttonCode.marketingUpdateStatus" @click="updateStatus(row, 'freeze')">停用</el-button>
               </template>
+              <el-button v-if="$getButtonLimit($buttonCode.marketingShowStore) && row.status == 1" :limit-code="$buttonCode.marketingShowStore" type="text" @click="showStore(row)">查看门店</el-button>
             </template>
           </el-table-column>
         </el-table>

src/views/recharge/board.vue

@@ -7,9 +7,9 @@
       计费部门筛选框规则：开启多账户计费模式时显示计费部门筛选框； && 超管和部门权限为可见所有的子账号显示计费部门筛选框；
   -->
   <section class="recharge">
-    <div class="dm-wrap">
+    <div class="dm-wrap" style="margin: 12px 24px">
       <div class="flex_between">
-        <h3 class="title">账户余额</h3>
+        <h3 class="title">账户概览</h3>
         <el-button v-if="$getButtonLimit($buttonCode.marketingAccountRule)" :limit-code="$buttonCode.marketingAccountRule" class="h32 ghost-btn" type="primary" @click="setRuleVisible = true">计费规则配置</el-button>
       </div>
       <div class="money_wrap">
@@ -38,11 +38,11 @@
         </div>
       </div>
     </div>
-    <div class="dm-wrap">
+    <div class="dm-wrap" style="margin: 12px 24px">
       <h3 class="title">今日消费</h3>
       <select-depart v-if="config.isMoreAccount && config.showAllDepartment" :data="deparment1" class="mb20" @load="() => load('one')" @getDepartId="id => getDepartId(id, 'one')" @remote-search="val => remoteSearch(val, 'one')" :loading="deparment1.loading" />
       <el-row class="recharge-today" :gutter="20" v-loading="loading1">
-        <el-col :span="8">
+        <el-col :span="8" style="padding: 0 2px">
           <div class="recharge-today-item border2 flex_between">
             <div class="text-center">
               <div class="icon-box">
@@ -61,7 +61,7 @@
             </div>
           </div>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" style="padding: 0 2px">
           <div class="recharge-today-item border2 flex_between">
             <div class="text-center">
               <div class="icon-box color2">
@@ -80,7 +80,7 @@
             </div>
           </div>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="8" style="padding: 0 2px">
           <div class="recharge-today-item border2 flex_between">
             <div class="text-center">
               <div class="icon-box color3">
@@ -101,7 +101,7 @@
         </el-col>
       </el-row>
     </div>
-    <div class="dm-wrap">
+    <div class="dm-wrap" style="margin: 12px 24px">
       <div class="pb22">
         <div slot="header" class="clearfix">
           <el-date-picker :pickerOptions="pickerOptions" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="consumeRecord('two')"></el-date-picker>

src/views/recharge/components/add-depart.vue

@@ -124,7 +124,7 @@ export default {
     border: 1px solid #adc6ff;
     color: #1890ff;
     text-align: center;
-    line-height: 18px;
+    line-height: 16px;
     font-size: 12px;
     margin-left: 5px;
   }

src/views/recharge/components/set-rule-dialog.vue

 <template>
-  <el-drawer :visible.sync="visible" direction="rtl" :before-close="beforeClose" size="600px" custom-class="drawer">
+  <el-drawer :visible.sync="visible" direction="rtl" :before-close="beforeClose" size="600px" custom-class="drawer" :modal="false">
     <template v-slot:title>
       <h2>计费规则配置</h2>
     </template>
@@ -236,6 +236,8 @@ h2 {
       margin-right: 9px;
       color: #1890ff;
       display: block;
+      position: relative;
+      top: 3px;
     }
   }
   .icon-type-title {

src/views/recharge/components/view-store.vue

@@ -2,7 +2,7 @@
   <el-dialog title="查看门店" :visible.sync="visible" width="740px" custom-class="store" @close="onClose">
     <div class="alert">
       <i class="iconfont icon-warning-circle-fill"></i>
-      <span class="ml10">若要修改门店请前往【企业管理-权限管理-用户列表】进行修改</span>
+      <span class="font12 ml10">若要修改门店请前往【企业管理-权限管理-用户列表】进行修改。</span>
       <el-button :limit-code="$buttonCode.marketingToUserList" type="text" class="ml10" @click="toUserList">立即前往</el-button>
     </div>
     <el-input class="mt20 mb20 w260" v-model="search" clearable prefix-icon="el-icon-search" placeholder="请输入门店名称或code" @change="onSearch" />
@@ -14,7 +14,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <dm-pagination small class="dm-pagination" @current-change="handleCurrentChange" :current-page="tableData.currentPage" :page-size="tableData.pageSize" layout="prev, pager, next" :total="tableData.total" hide-on-single-page />
+    <dm-pagination small class="dm-pagination" @current-change="handleCurrentChange" :current-page="tableData.currentPage" :page-size="tableData.pageSize" layout="prev, pager, next" :total="tableData.total" />
   </el-dialog>
 </template>
 
@@ -108,6 +108,7 @@ export default {
 <style scoped lang="scss">
 .store {
   height: 513px;
+  max-height: 600px;
   .alert {
     display: flex;
     align-items: center;
@@ -124,4 +125,7 @@ export default {
 .w260 {
   width: 260px;
 }
+.font12 {
+  font-size: 12px;
+}
 </style>

src/views/recharge/consume.vue

@@ -265,7 +265,7 @@
           <template slot-scope="scope"> ¥ {{ scope.row.trafficCost }} </template>
         </el-table-column>
       </el-table> -->
-      <dm-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total" hide-on-single-page></dm-pagination>
+      <dm-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
     </div>
     <!--导出数据-->
     <el-dialog title="导出数据" :visible.sync="exportDialog.dialogVisible" width="500">

src/views/recharge/record.vue

@@ -49,7 +49,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <dm-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total" hide-on-single-page></dm-pagination>
+    <dm-pagination v-show="tableList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
   </section>
 </template>
 <script>