Merge branch 'feature/act-code' into dev

index.html

@@ -13,7 +13,7 @@
   <meta charset="utf-8">
   <link rel="shortcut icon" href="./favicon.ico" />
   <title>好办管理平台</title>
-  <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.75.css" />
+  <link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.76.css" />
   <!--好办后台3.0--> 
   <!-- <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.css" />  -->
   <script src="//at.alicdn.com/t/font_1628375_vcg1gtmx7lb.js"></script>

src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue

@@ -36,7 +36,7 @@
         <div v-if="codeInfo.statusFlag != 2 && codeInfo.statusFlag" class="flex" style="padding-top:20px;">
           <el-button v-if="codeInfo.hmType == 2 && codeInfo.statusFlag == 1" icon="el-icon-download" type="primary" style="width:120px;margin-right: 12px;" @click="downloadQR">下载二维码</el-button>
           <el-button type="primary" plain style="width:98px;" @click="modifyCode">编辑</el-button>
-          <el-button class="button-discard" type="danger" plain :style="codeInfo.hmType == 2 && useMemberList.length > 0 ? '' : 'border-color: #F5222D;'" @click="discardCode" :disabled="codeInfo.hmType == 2 && useMemberList.length > 0">作废</el-button>
+          <el-button class="button-discard specter" type="danger" plain :style="codeInfo.hmType == 2 && useMemberList.length > 0 ? '' : 'border-color: #F5222D;'" @click="discardCode" :disabled="codeInfo.hmType == 2 && useMemberList.length > 0">作废</el-button>
         </div>
       </div>
     </div>

src/views/salesleads/components/dataDetail.vue

@@ -44,9 +44,7 @@
       </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="{ row }">
-          {{ row }}
-          <el-button type="text" @click="lookRecords(row)" v-if="row.hmId && $getButtonLimit($buttonCode.recordCode)" :limit-code="$buttonCode.recordCode">查看记录</el-button>
-          <el-button type="text" @click="lookRecords(row)" v-else-if="row.hmId && $getButtonLimit($buttonCode.recordLink)" :limit-code="$buttonCode.recordLink">查看记录</el-button>
+          <el-button type="text" @click="lookRecords(row)">查看记录</el-button>
         </template>
       </el-table-column>
     </el-table>

static/css/public.css

@@ -1161,11 +1161,7 @@ button.el-button--primary.is-plain:focus {
     background-color: #2f54ed;
     border-color: #2f54ed;
 }
-button.el-button--danger.is-plain {
-    color: #F5222D;
-    background: #fff;
-    border-color: #c4c6cf;
-}
+ 
 
 /* 拖拽 */
 .sortable-chosen.sortable-ghost .li-cell {