jinsy 7 роки тому
батько
коміт
b608a98ba5

+ 4 - 1
frontend/saas-portal-web/src/components/conenter/addenterprise.vue

@@ -20,7 +20,7 @@
                         </li>
                         <li>
                             <span class="qy-biaoti">所属行业</span>
-                            <select @change="industry" ref="qyindustry" class="industry border" style="padding-left:5px" name="selectAge" id="selectAge">   
+                            <select @change="industry" @click="colors" ref="qyindustry" class="industry border" style="padding-left:5px;color: #BCC8D8;" name="selectAge" id="selectAge">    
                                 <option value="" disabled selected hidden>请选择所属行业</option>
                                 <option value="贸易零售">贸易零售</option>
                                 <option value="制造加工">制造加工</option>
@@ -176,6 +176,9 @@ import { setTimeout, clearTimeout } from 'timers';
             tabwatch(i){
                 this.nowindex = i;
             },
+            colors(){
+                this.$refs.qyindustry.style.color = 'black'
+            },
             // 行业
             industry(){
                 this.$refs.qyindustry.style.border = '1px solid #1E88F5'

+ 3 - 1
frontend/saas-portal-web/src/components/conenter/company.vue

@@ -86,7 +86,7 @@
                 <!-- 中 -->
                 <div class="gs-xqleft">
                     <!-- 点击查看企业详情 -->
-                    <p class="gs-qynema xs" @click= "getEnterpriseInfo(d)">{{d.name}}</p>
+                    <p class="gs-qynema"><span @click= "getEnterpriseInfo(d)" class="xs">{{d.name}}</span></p>
                 </div>
                 <!-- 下 -->
                 <div class="gs-xqright over">
@@ -258,6 +258,7 @@
             },
             // 取消默认企业
             hideDefaultWin(i){
+                this.$store.state.isloading = true;
                 let token = this.mytoken.token;
                 this.$ajax({
                     url: this.$url.api+'/api/account/accountCenter/unBind/defaultCompany',
@@ -271,6 +272,7 @@
                     }
                 })
                 .then(res=>{
+                    // this.$store.state.isloading = false;
                     if (res.data.success) {
                         this.$router.go(0);
                     }

+ 2 - 2
frontend/saas-portal-web/src/components/conenter/details.vue

@@ -19,7 +19,7 @@
             </div>
             <div class="gs-worp qy-worp" style="width:100%">
                 <div class="qy-title">
-                    <span>saas服务管理员信息</span>
+                    <span>管理员信息</span>
                 </div>
                 <div class="qy-conent">
                     <ul>
@@ -78,7 +78,7 @@
             </div>
             <div class="gs-worp qy-worp" style="width: 100%">
                 <div class="qy-title">
-                    <span>saas服务管理员信息</span>
+                    <span>管理员信息</span>
                 </div>
                 <div class="qy-conent">
                     <ul>

+ 11 - 12
frontend/saas-portal-web/src/components/conenter/home.vue

@@ -81,7 +81,7 @@
       </div>
 
       <!-- 体验弹窗 -->
-      <div class="tiyan" v-if="isexperience">
+      <div class="tiyan" v-show="isexperience">
         <img @click="Closeexperience" class="tc-on ty-out" src="/static/img/qiye/x.png" alt="" />
         <div><img class="ty-logo" src="/static/img/assets/dalogo@2x.png" alt=""></div>
         <div class="ty-phone over">
@@ -89,7 +89,7 @@
             <span><img style="margin: 6px 8px 10px 15px;" src="/static/img/assets/phone.png" alt=""></span>
             <input ref="typhone" type="text" placeholder="请输入您的11位手机号">
           </div>
-          <div class="left" style="margin-left: 8px;"><button @click="openexperience">立即申请试用</button></div>
+          <div class="left" style="margin-left: 8px;"><button @click="openexperience">立即体验</button></div>
         </div>
         <div style="text-align: left;">
           <span class="Caution" ref="Caution"></span>
@@ -410,22 +410,21 @@
       },
       //体验
       experience(){
-        this.isexperience = true;
-        setTimeout(()=>{
-          if (this.account) {
-            this.$refs.typhone.value = this.account.mobile;
-            this.openexperience();
-          }
-        },10)
+        if (this.account) {
+          let mobile = this.account.mobile;
+          this.openexperience(mobile);
+        } else {
+          this.isexperience = true;
+        }
       },
       //关闭体验
       Closeexperience(){
         this.isexperience = false;
       },
       //进入体验
-      openexperience(){
-        let me = this
-        let phone = this.$refs.typhone.value;
+      openexperience(mobile){
+        let me = this;
+        let phone = this.$refs.typhone.value || mobile;
         let reg = new RegExp('^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$')
         if (phone == '') {
           this.$refs.Caution.innerHTML = '号码不能为空'

+ 1 - 1
frontend/saas-portal-web/src/components/conenter/invitation.vue

@@ -205,7 +205,7 @@ import { setTimeout } from 'timers';
             role(){
                 let companyId = this.enterprise.companyId;
                 this.$ajax({
-                    url: this.$url.api+'/api/account/role/list'+`?id=${companyId}`,
+                    url: this.$url.api+'/api/account/role/list/'+companyId,
                     headers:{
                         "Authorization":Session.getToken(),
                     }

+ 1 - 0
frontend/saas-portal-web/static/css/gongsi.css

@@ -25,6 +25,7 @@ input::-webkit-input-placeholder {
     min-width: 96px !important;
     padding: 0 !important;
     text-align: center !important;
+    margin-top: 0px !important;
 }
 /* 弹窗 -----------------------------------------------*/
 .tanchuang {