Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/components/navs/hor-big-one.vue

@@ -25,7 +25,7 @@
         </q-menu>
       </q-btn>
       <template v-if="LoginUser.accountId>0">
-        <q-btn-dropdown style="color: #444;font-weight:bold;" class="q-ml-lg desktop-only"
+        <q-btn-dropdown style="color: #444;font-weight:bold;" class="q-ml-lg"
           icon="iconfont iconicon-unlogin" :label="LoginUser.name" unelevated>
           <div class="row no-wrap q-pa-md">
             <div class="column">

src/pages/login.vue

 <style>
-  .login-box{
+  .login-box {
     max-width: 420px;
     padding: 50px 40px;
     margin: 40px auto;
     background-color: #fff;
     border-radius: 5px;
     background-clip: padding-box;
-    box-shadow: 0 2px 4px 0 rgba(10,8,8,.5);
+    box-shadow: 0 2px 4px 0 rgba(10, 8, 8, .5);
   }
-  .login-box .tw_logo{
-    margin:0 auto 20px;
+
+  .login-box .tw_logo {
+    margin: 0 auto 20px;
     display: block;
-    height:45px;
-    width:auto;
+    height: 45px;
+    width: auto;
   }
-  .login-box .tip-text{
+
+  .login-box .tip-text {
     font-size: 16px;
     margin-bottom: 15px;
     color: #999;
     text-align: center;
   }
-  .login-box .tip-text a{
-    color:#00afff;
+
+  .login-box .tip-text a {
+    color: #00afff;
   }
-  .login_row{
-    width:100%;
-    margin:0 -15px 0 -15px;
+
+  .login_row {
+    width: 100%;
+    margin: 0 -15px 0 -15px;
   }
-  .form-group{
+
+  .form-group {
     position: relative;
     margin-bottom: 15px;
   }
-  .login_labelName{
-    margin-bottom:10px;
-    font-size:15px;
+
+  .login_labelName {
+    margin-bottom: 10px;
+    font-size: 15px;
   }
+
   /* .login_pwd{
     padding-right:40px;
   } */
-  .form-group i{
+  .form-group i {
     position: absolute;
-    right:6px;
-    bottom:0;
-    z-index:2;
-    width:46px;
-    height:46px;
+    right: 6px;
+    bottom: 0;
+    z-index: 2;
+    width: 46px;
+    height: 46px;
     text-align: center;
     line-height: 46px;
-    color:#999;
-    font-size:28px;
+    color: #999;
+    font-size: 28px;
     cursor: pointer;
   }
-  .login-box .q-field__control{
-    height:46px;
+
+  .login-box .q-field__control {
+    height: 46px;
   }
+
 </style>
 <template>
   <div class="login">
     <div class="login-box">
-      <img :src="logo" class="tw_logo"/>
+      <img :src="logo" class="tw_logo" />
       <p class="tip-text">
         還沒有帳號嗎？立即<a style="cursor:pointer;" @click="CommonJump('/register',{})">免費加入</a>
       </p>
       <div class="login_row">
         <div class="form-group">
           <div class="login_labelName">電子郵件</div>
-          <q-input outlined v-model="loginMsg.account" class="bg-grey-1"/>
+          <q-input outlined v-model="loginMsg.account" class="bg-grey-1" />
         </div>
         <div class="form-group">
           <div class="login_labelName">密碼</div>
-          <q-input v-if="flag==1" outlined v-model="loginMsg.password" type="text" ref="pwd" class="bg-grey-1 login_pwd"/>
-          <q-input v-if="flag==2" outlined v-model="loginMsg.password" type="password" ref="pwd" class="bg-grey-1 login_pwd"/>
+          <q-input v-if="flag==1" outlined v-model="loginMsg.password" type="text" ref="pwd"
+            class="bg-grey-1 login_pwd" />
+          <q-input v-if="flag==2" outlined v-model="loginMsg.password" type="password" ref="pwd"
+            class="bg-grey-1 login_pwd" />
           <i class="iconfont iconyanjing_xianshi" v-if="flag==1" @click="flag=2"></i>
           <i class="iconfont iconbiyan" v-if="flag==2" @click="flag=1"></i>
         </div>
         <div>
-          <q-btn color="primary" unelevated style="width:100%;height:50px;margin-top:20px;" filled label="登入" @click="login" />
+          <q-btn color="primary" unelevated style="width:100%;height:50px;margin-top:20px;" filled label="登入"
+            @click="login" />
         </div>
       </div>
     </div>
@@ -95,8 +107,8 @@
           account: "",
           password: ""
         },
-        logo:'',
-        flag:2
+        logo: '',
+        flag: 2
       };
     },
     created() {
@@ -105,7 +117,7 @@
     mounted() {
       var jObj = JSON.parse(localStorage.getItem('groupinfo'));
       this.loginMsg.RB_Group_Id = jObj.GroupId;
-       //获取网站基础配置
+      //获取网站基础配置
       if (localStorage.baseifo) {
         var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
         this.logo = jObj.Config.Logo;
@@ -113,13 +125,38 @@
     },
     methods: {
       login() {
+        if (this.loginMsg.account == '') {
+          this.$q.notify({
+            type: 'negative',
+            message: '请输入账号',
+            position: 'top',
+            timeout: 2000, // 以毫秒为单位; 0意味着没有超时
+          })
+          return;
+        }
+        if (this.loginMsg.password == '') {
+          this.$q.notify({
+            type: 'negative',
+            message: '请输入密码',
+            position: 'top',
+            timeout: 2000, // 以毫秒为单位; 0意味着没有超时
+          })
+          return;
+        }
         this.apipost(
           "b2b_post_Login", this.loginMsg,
           res => {
             if (res.data.resultCode == 1) {
               var jsonData = JSON.stringify(res.data.data);
               window.localStorage.setItem("b2bUser", jsonData);
-              this.CommonJump('/index',{})
+              this.CommonJump('/index', {})
+            } else {
+              this.$q.notify({
+                type: 'negative',
+                message: res.data.message,
+                position: 'top',
+                timeout: 2000, // 以毫秒为单位; 0意味着没有超时
+              })
             }
           },
           err => {}

src/pages/usercenter/demandinfo.vue

@@ -16,8 +16,8 @@
     align-items: center;
     background-color: #00afff;
   }
-  .header_content{
-    flex-basis: 60%;
+  .deman_Header{
+    flex-basis: 100%;
     padding: 30px;
     color: #fff;
     font-weight: 600;
@@ -71,7 +71,7 @@
     <div class="order_detail">
       <div class="order_content">
         <div class="order_header">
-          <div class="header_content">
+          <div class="deman_Header">
             <div class="tour_code">需求單號：{{InfoData.Id}}</div>
             <div class="tour_name">
               {{InfoData.TripTitle}}