Merge remote-tracking branch 'origin/newStyle' into newStyle

src/views/EnterpriseAppeal/AppealMessageAdd.vue

@@ -283,7 +283,13 @@ export default {
         // 将弹窗位置放前
         this.$confirm('是否确认提交，提交后将不可更改。', '提交成功', {
           // 提示成功
-          type: 'success'
+          type: 'success',
+          cancelButtonText: '关闭',
+          cancelButtonClass: 'cancelBtn',
+          closeOnClickModal: false,
+          closeOnPressEscape: false,
+          confirmButtonClass: 'confirmBtn',
+          showClose: false
           // showCancelButton: true
         }).then(() => {
           addMessage(this.form).then(() => {

src/views/PolicyDirect/components/policySearchDetails.vue

@@ -23,7 +23,7 @@
         </div>
         <div class="right">
           <div class="collect-button" @click="changeStar">
-            <el-icon :class="otherInfo.star ? ['el-icon-star-on', 'icon-active'] : ['el-icon-star-off', 'icon-default']" />
+            <img alt="收藏按钮图片" :src="otherInfo.star ? alreadyCollection : collection" class="star-icon">
             <div class="collect-text"><span v-if="otherInfo.star">已</span>收藏</div>
           </div>
         </div>
@@ -37,8 +37,8 @@
             </template>
             <template v-else>
               <!--需要申报并且在截止期内并且是已发布状态-->
-<!--              v-if="info.isDeclare === '0' && info.status === '1' && info.onTheDeadline"-->
               <el-button
+                v-if="info.isDeclare === '0' && info.status === '1' && info.onTheDeadline"
                 class="declare-button"
                 :type="'primary'"
                 @click="handleAddDeclare"
@@ -378,6 +378,10 @@ export default {
       Declared,
       // 暂无数据图片,
       ZanWuShuJu,
+      // 收藏图片
+      collection: require('@/assets/image/zhengce_shoucang@2x.png'),
+      // 已收藏图片
+      alreadyCollection: require('@/assets/image/zhengce_yishoucang@2x.png'),
       // 回到顶部图片
       gobackTop: require('@/assets/image/icom_top.png'),
       // 指标通过
@@ -1040,7 +1044,7 @@ export default {
     margin: auto;
     .breadcrumb {
       width: 100%;
-      padding: 8px 80px 8px 20px;
+      padding: 8px 52px 8px 20px;
       background-color: white;
       margin-bottom: 12px;
       display: flex;
@@ -1082,29 +1086,23 @@ export default {
       }
       .right {
         width: 90px;
+        margin-right: 11px;
         vertical-align: middle;
         .collect-button {
           cursor: pointer;
           display: flex;
           justify-content: end;
           align-items: center;
-          .icon-default {
-            color: #F18F18;
-            font-size: 24px;
+          .star-icon {
             width: 24px;
             height: 24px;
           }
-          .icon-active {
-            color: #F18F18;
-            font-size: 26px;
-            width: 26px;
-            height: 26px;
-          }
           .collect-text {
             margin-left: 10px;
             font-size: 15px;
             height: 15px;
             color: #333333;
+            width: 47px;
           }
         }
       }