Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan…

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb

igirl-channel-jdweb/app/front/vues/pages/bycnoticeindex/bycnoticeindex.css

@@ -49,10 +49,8 @@
 .bycnoticeindex .search-warp-row button:nth-of-type(1) {
     border: 1px solid #dcdfe6;
     width: 60px;
-    height: 32px;
     font-family: PingFangSC-Regular;
     font-size: 14px;
-    color: #fff;
     letter-spacing: 0;
     line-height: 20px;
 
@@ -61,7 +59,6 @@
 .bycnoticeindex .search-warp-row button:nth-of-type(2) {
     border: 1px solid #dcdfe6;
     width: 58px;
-    height: 32px;
     font-family: PingFangSC-Regular;
     font-size: 14px;
     color: #333333;
@@ -115,10 +112,10 @@
     padding-right: 5px;
 }
 
-.bycnoticeindex .el-table th>.cell{
+.bycnoticeindex .el-table th>.cell {
     font-weight: 500;
 }
 
 .bycnoticetm-table-header {
-    background:#f7f8fc;
+    background: #f7f8fc;
 }
\ No newline at end of file

igirl-channel-jdweb/app/front/vues/pages/bycnoticeindex/bycnoticeindex.html

@@ -93,7 +93,7 @@
         </el-table>
         <el-footer class="footer-row" v-if="total>0">
           <el-pagination background :page-size="size" :currentPage="page" layout="prev, pager, next" :total="total"
-            @current-change="handleSizeChange" style="padding-top:15px">
+            @current-change="handleCurrentChange" style="padding-top:15px">
           </el-pagination>
         </el-footer>
       </div>

igirl-channel-jdweb/app/front/vues/pages/jdindentlist/jdindentlist.html

@@ -311,7 +311,7 @@
 
         </el-tab-pane>
 
-        <el-tab-pane label="工商订单" name="second">
+        <el-tab-pane label="工商订单" name="second" v-if="0">
             <div class="jdindentlist">
                 <div class="jdindentlist-inquire">
                     <div class="jdindentlist-inquire-form">

igirl-channel-jdweb/app/front/vues/pages/selftmreg/selftmreg.js

@@ -1266,8 +1266,10 @@
               payStatus: "dfk"
             }
           };
+          this.$root.loading = true;
           var jdObj = that.$root.copyParams(obj, "subTmOrder", "/action/tmOrder/springBoard", "yes", "yes");
           that.$root.postReq("/web/trademark/tmqueryCtl/doPost", jdObj).then(function (d) {
+            this.$root.loading = false;
             console.log(`///////////////////////////////`, d);
             if (d.status == 0) {
               that.$message.warning("操作成功");
@@ -1277,6 +1279,7 @@
               that.$message.warning(d.msg);
             }
           }).catch(function (e) {
+            this.$root.loading = false;
             that.$message.warning("操作失败");
           });