Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front into test

src/pages/main/terminal/advcheck.vue

@@ -28,7 +28,7 @@
                             <el-button size="mini" type="primary" @click="dialogCheck(scope.row,1)">查看</el-button>
                             <el-button size="mini" type="danger" v-if="userInfo.loginName != scope.row.opName"
                                 @click="dialogCheck(scope.row,2)">审核</el-button>
-                            <el-button v-if="scope.row.advType == '02'&&scope.row.sts!='2'" size="mini" type="primary" @click="advSure(scope.row)">归档
+                            <el-button v-if="scope.row.advType == '01'&&scope.row.sts!='2'" size="mini" type="primary" @click="advSure(scope.row)">归档
                             </el-button>
                         </template>
                     </el-table-column>

src/pages/main/terminal/advertisement.vue

@@ -15,10 +15,7 @@
                         <i class="el-icon-time"></i>
                         <span>待审批 <em>{{info.approvalNum||0}}</em></span>
                     </div>
-                    <!-- <div class="adv-tit" @click="jumpadv('1')">
-                        <i class="el-icon-loading"></i>
-                        <span>设计中 <em>{{info.designNum||0}}</em></span>
-                    </div> -->
+
                     <div class="adv-tit" @click="jumpadv('2')">
                         <i class="el-icon-notebook-1"></i>
                         <span>定稿 <em>{{info.designNum||0}}</em></span>