Merge branch 'dev/v1.1.15_yf' of jianyu/web into feature/v1.1.15

apps/bigmember_pc/src/api/modules/pay.js

@@ -201,3 +201,13 @@ export function ajaxGetReportAccountInfo() {
     method: 'post'
   })
 }
+
+// 芝麻分析报告月卡季卡年卡权益扣除（生成报告）
+export function ajaxReportEquityDeduct(data) {
+  data = qs.stringify(data)
+  return request({
+    url: '/subscribepay/zmComboConsumption',
+    method: 'post',
+    data
+  })
+}

apps/bigmember_pc/src/assets/style/common.scss

@@ -162,8 +162,8 @@ input[type='number'] {
 
   &.checked {
     border: 0;
-    background: url('~@/assets/images/icon/icon-checked.png') no-repeat
-      center center;
+    background: url('~@/assets/images/icon/icon-checked.png') no-repeat center
+      center;
     background-size: 16px;
 
     &[disabled] {
@@ -199,8 +199,8 @@ input[type='number'] {
   }
 }
 
-a{
-  user-select: text!important;
+a {
+  user-select: text !important;
 }
 
 .use-badge {
@@ -215,7 +215,7 @@ a{
     line-height: 12px;
     color: #fff;
     padding: 2px 6px;
-    background-color: #FF3A20;
+    background-color: #ff3a20;
     border: 1px solid #fff;
     border-radius: 12px;
     border-bottom-left-radius: 0;
@@ -230,80 +230,84 @@ a{
 }
 
 /* 删除筛选提示框 */
-.filter-delete-messagebox{
+.filter-delete-messagebox {
   width: 420px;
   border-radius: 8px;
   padding: 32px;
-  .el-message-box__title{
-    color: #1D1D1D;
+  .el-message-box__title {
+    color: #1d1d1d;
   }
-  .el-message-box__header{
-    padding: 0!important;
+  .el-message-box__header {
+    padding: 0 !important;
   }
-  .el-message-box__content{
+  .el-message-box__content {
     padding: 20px 27px 32px;
   }
-  .el-message-box__message p{
+  .el-message-box__message p {
     font-size: 14px;
     color: #686868;
   }
-  .el-message-box__btns{
+  .el-message-box__btns {
     display: flex;
     flex-direction: row-reverse;
     justify-content: space-between;
   }
-  .btn-group.confirm-btn{
+  .btn-group.confirm-btn {
     background: #2cb7ca;
     margin-right: 52px;
     border: 0;
     color: #fff;
   }
-  .btn-group{
+  .btn-group {
     width: 132px;
     height: 36px;
     padding: 0;
     border-radius: 6px;
     font-size: 16px;
   }
-  .btn-group.confirm-btn:focus{
+  .btn-group.confirm-btn:focus {
     color: #fff;
   }
   .btn-group.confirm-btn:hover {
     color: #fff;
   }
 }
-.download-message-tip{
+.download-message-tip {
   border-radius: 8px !important;
-  width:380px !important;
-  &.el-message-box--center{
+  width: 380px !important;
+  &.el-message-box--center {
     padding-bottom: 32px;
   }
-  .el-message-box__header{
+  .el-message-box__header {
     padding: 32px 32px 20px 32px;
   }
   .el-message-box--center .el-message-box__header {
     padding-top: 32px;
   }
-  .el-message-box__message{
-    color:#686868;
+  .el-message-box__message {
+    color: #686868;
   }
-  .el-message-box__content{
-    padding:0 32px 32px;
+  .el-message-box__content {
+    padding: 0 32px 32px;
   }
   .el-message-box__btns {
     padding: 0 32px !important;
     display: flex !important;
     justify-content: space-between !important;
-    .el-button{
-      width:132px !important;
-      height:36px !important;
+    .el-button {
+      width: 132px !important;
+      height: 36px !important;
       border-radius: 6px !important;
-      font-size:16px !important;
+      font-size: 16px !important;
     }
   }
   &.btn-reverse {
-    .el-message-box__btns{
-      flex-direction:row-reverse !important;
+    .el-message-box__btns {
+      flex-direction: row-reverse !important;
     }
   }
 }
+
+.mt-16px {
+  margin-top: 16px;
+}

apps/bigmember_pc/src/router/router-interceptors.js

@@ -20,7 +20,7 @@ const powerCheckPathWhiteRegList = [
   /doc\/api/,
   /data_pack/,
   /giftrecord/,
-  /manage/,
+  /manage/
 ]
 // 权限控制白名单-路由名
 const powerCheckWhiteList = [
@@ -63,7 +63,8 @@ const powerCheckWhiteList = [
   'api-doc',
   'zhima',
   'ent_report_year',
-  'materialDetail'
+  'materialDetail',
+  'ZhiMaAnalysisReport'
 ]
 
 const regListCheck = function (regList, path) {