lianbingjie před 4 roky
rodič
revize
c2dba16947

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
qmx_page/css/app.f1cacde0.css


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
qmx_page/css/chunk-vendors.784fa8c1.css


+ 5 - 1
qmx_page/index.html

@@ -1 +1,5 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.f1cacde0.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.71d6de0d.js rel=preload as=script><link href=/js/chunk-vendors.7f2b39e7.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.f1cacde0.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.7f2b39e7.js></script><script src=/js/app.71d6de0d.js></script></body></html>
+<<<<<<< HEAD
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.f1cacde0.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.71d6de0d.js rel=preload as=script><link href=/js/chunk-vendors.7f2b39e7.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.f1cacde0.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.7f2b39e7.js></script><script src=/js/app.71d6de0d.js></script></body></html>
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>管理后台</title><link href=/css/app.6488de46.css rel=preload as=style><link href=/css/chunk-vendors.784fa8c1.css rel=preload as=style><link href=/js/app.4339f620.js rel=preload as=script><link href=/js/chunk-vendors.7f2b39e7.js rel=preload as=script><link href=/css/chunk-vendors.784fa8c1.css rel=stylesheet><link href=/css/app.6488de46.css rel=stylesheet></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=loading><div class=spinner><div class=rect1></div><div class=rect2></div><div class=rect3></div><div class=rect4></div><div class=rect5></div></div></div><div id=app></div><script src=/js/chunk-vendors.7f2b39e7.js></script><script src=/js/app.4339f620.js></script></body></html>
+>>>>>>> master

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
qmx_page/js/app.4339f620.js


+ 41 - 27
src/views/userManage/userDetail.vue

@@ -170,35 +170,36 @@
                         </Tabs>
                         </Tabs>
                     </div>
                     </div>
                 </Card>
                 </Card>
-
-                <Card v-if="infor == 4">
-                    <div slot="title" class="right-fund">基本信息</div>
-                    <div class="in-cards">
-                        <div class="l-cont">
-                            <p>姓名:{{datas5.name}}</p>
-                            <p class="par">邮箱:{{datas5.mail}}</p>
-                            <p>行业:{{datas5.industry}}</p>
+                <div v-if="infor == 4 && Object.keys(datas5).length !== 0">
+                    <Card>
+                        <div slot="title" class="right-fund">基本信息</div>
+                        <div class="in-cards">
+                            <div class="l-cont">
+                                <p>姓名:{{datas5.name || '-'}}</p>
+                                <p class="par">邮箱:{{datas5.mail || '-'}}</p>
+                                <p>行业:{{datas5.industry || '-'}}</p>
+                            </div>
+                            <div class="l-cont r-cont">
+                                <p>手机号:{{datas5.phone || '-'}}</p>
+                                <p class="par">地区:{{datas5.province || ''}}{{datas5.city || '-'}}</p>
+                                <p>受雇类型:{{datas5.hireType || '-'}}</p>
+                            </div>
                         </div>
                         </div>
-                        <div class="l-cont r-cont">
-                            <p>手机号:{{datas5.phone}}</p>
-                            <p class="par">地区:{{datas5.province}}{{datas5.city}}</p>
-                            <p>受雇类型:{{datas5.hireType}}</p>
+                    </Card>
+                    <Card style="marginTop: 20px">
+                        <div slot="title" class="right-fund">公司信息</div>
+                        <div class="in-cards b-cards">
+                            <p>公司名称:{{datas5.company || '-'}}</p>
+                            <p>公司类型:{{datas5.companyType || '-'}}</p>
+                            <p>职位:{{datas5.position || '-'}}</p>
+                            <p>公司规模:{{datas5.company_size || '-'}}</p>
+                            <p>业务范围:{{datas5.workScope || '-'}}</p>
+                            <p>合作需求:{{datas5.partnerNeeds || '-'}}</p>
+                            <p>是否同意剑鱼标讯将业务范围及合作需求提供给潜在合作伙伴搜索、查看:{{datas5.agree == true ? '是' : datas5.agree == false ? '否' : '-'}}</p>
                         </div>
                         </div>
-                    </div>
-                </Card>
-                <Card v-if="infor == 4" style="marginTop: 20px">
-                    <div slot="title" class="right-fund">公司信息</div>
-                    <div class="in-cards b-cards">
-                        <p>公司名称:{{datas5.company}}</p>
-                        <p>公司类型:{{datas5.companyType}}</p>
-                        <p>职位:{{datas5.position}}</p>
-                        <p>公司规模:{{datas5.company_size}}</p>
-                        <p>业务范围:{{datas5.workScope}}</p>
-                        <p>合作需求:{{datas5.partnerNeeds}}</p>
-                        <p>是否同意剑鱼标讯将业务范围及合作需求提供给潜在合作伙伴搜索、查看:{{datas5.agree?'是':'否'}}</p>
-                    </div>
-                </Card>
-
+                    </Card>
+                </div>
+                <Card class="no-msg" v-if="infor == 4 && Object.keys(datas5).length == 0"><span>该用户尚未留存过资料</span></Card>
                 <Card v-if="infor == 5">
                 <Card v-if="infor == 5">
                     <div slot="title" class="right-fund">订单记录</div>
                     <div slot="title" class="right-fund">订单记录</div>
                     <table-lists 
                     <table-lists 
@@ -936,5 +937,18 @@ export default {
             margin-bottom: 20px;
             margin-bottom: 20px;
         }
         }
     }
     }
+<<<<<<< HEAD
+=======
+    .no-msg {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        /deep/ .ivu-card-head {
+            display: none;
+        }
+    }
+>>>>>>> master
 }
 }
 </style>
 </style>

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů