123

igirl-channel-web/app/front/vues/pages/companydetail/companydetail.css

@@ -11,10 +11,13 @@
 .companydetail-warpper>.jdindentdetail {
     margin: 0 auto;
 }
+.companydetail-warpper .jdindentdetail-flow{
+}
 
-.companydetail-warpper .jdindentdetail-flow {
-    border: 0;
+.companydetail-warpper .jdindentdetail-main-step-col{
+    transform: translateX(-45px);
 }
+
 .companydetail-warpper .jdindentdetail-flow .el-step.is-center .el-step__description{
     padding: 0;
 
@@ -30,10 +33,10 @@
     line-height: 17px;
     margin-bottom: 8px;
     margin-top: 15px;
-    font-size: 12px;
+    font-size: 14px;
 }
 .company-title>div{
-    height: 12px;
+    height: 14px;
     width: 2px;
     background: #3071FE;
     margin-right: 4px;

igirl-channel-web/app/front/vues/pages/companydetail/companydetail.html

@@ -42,7 +42,7 @@
 					</div> -->
 			<div class="company-title">
 				<div></div>
-				交付流程
+				申请进度
 			</div>
 			<div class="jdindentdetail-flow">
 				<div class="jdindentdetail-main-step-col">
@@ -129,7 +129,7 @@
 					</el-table-column>
 					<el-table-column prop="address" label="联系地址">
 					</el-table-column>
-				
+
 				</el-table>
 			</div>
 			<div class="company-title">
@@ -157,7 +157,7 @@
 				<div></div>
 				材料
 			</div>
-			<div class="companydetail-official">
+			<div class="companydetail-official" v-if="attachFiles.length>0">
 				<div v-for="(item, index) in attachFiles" :key="index">
 					<p>
 						<img :src="item.url" alt="">
@@ -165,6 +165,10 @@
 					<p>{{item.name}}</p>
 				</div>
 			</div>
+			<div v-else
+				style="width: 100%;height: 100px;line-height: 100px;text-align: center;border: 1px solid #EBEEF5;color: #909399">
+				暂无材料
+			</div>
 			<!-- <div class="company-title">
 				官方回执
 			</div>

igirl-channel-web/app/front/vues/pages/companydetail/companydetail.js

@@ -57,31 +57,34 @@
             this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then(d => {
                 console.log(d, ';;;;;;;;;;;;;;;;;;;;;;;');
                 this.$root.loading = false;
-                switch (d.data.orderDeliveryStatusName) {
-                    case '已下单':
-                        this.currentStep = 0;
-                        break;
-                    case '园区入驻审核':
-                        this.currentStep = 1;
-                        break;
-                    case '上传工商注册材料':
-                        this.currentStep = 2;
-                        break;
-                    case '工商审核环节':
-                        this.currentStep = 3;
-                        break;
-                    case '刻章环节':
-                        this.currentStep = 4;
-                        break;
-                    case '证件邮寄环节':
-                        this.currentStep = 5;
-                        break;
-                    case '已签收':
-                        this.currentStep = 6;
-                        break;
-                    default:
-                        break;
+                if (d.status == 0) {
+                    switch (d.data.orderDeliveryStatusName) {
+                        case '已下单':
+                            this.currentStep = 0;
+                            break;
+                        case '园区入驻审核':
+                            this.currentStep = 1;
+                            break;
+                        case '上传工商注册材料':
+                            this.currentStep = 2;
+                            break;
+                        case '工商审核环节':
+                            this.currentStep = 3;
+                            break;
+                        case '刻章环节':
+                            this.currentStep = 4;
+                            break;
+                        case '证件邮寄环节':
+                            this.currentStep = 5;
+                            break;
+                        case '已签收':
+                            this.currentStep = 6;
+                            break;
+                        default:
+                            break;
+                    }
                 }
+
             })
         },
         getDetail(){
@@ -91,7 +94,7 @@
             this.$root.loading = true;
             this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                 this.$root.loading = false;
-                if (d.status == 0) {
+                if (d.status == 0 && d.data.length > 0) {
                     this.companyName = d.data.companyName;
                     var enterpriseInfo = {};
                     enterpriseInfo.orgType = d.data.orgType;

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css

@@ -229,7 +229,9 @@
 .jdindentlist-null {
     width: 34.57%;
     height: 333px;
-    margin: 10.37% auto 0;
+    margin: 1.37% auto 0;
+    color: #C0C4CC;
+    font-size: 16px;
 }
 
 .jdindentlist-null>div:nth-child(1) img {
@@ -239,7 +241,7 @@
 
 .jdindentlist-null>p {
     text-align: center;
-    margin-top: 10px;
+    margin-top: 0;
 }
 
 

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

@@ -227,7 +227,7 @@
                         </div>
                         <p>您暂无订单</p>
                     </div>
-                    <div class="jdindentlist-list-page">
+                    <div class="jdindentlist-list-page" v-if="tableData.length > 0">
                         <el-pagination @current-change="handleSizeChange()" :current-page.sync="currentPage"
                             :page-size="20" layout="prev, pager, next,jumper" :total="countPage||1">
                         </el-pagination>
@@ -571,7 +571,7 @@
                         </div>
                         <p>您暂无订单</p>
                     </div>
-                    <div class="jdindentlist-list-page">
+                    <div class="jdindentlist-list-page" v-if="icbcData.length != 0">
                         <el-pagination @current-change="getIcbcList()" :current-page.sync="currentPage2" :page-size="20"
                             layout="prev, pager, next,jumper" :total="IndustryCountPage||1">
                         </el-pagination>