Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/trade/order/index.vue

@@ -309,6 +309,9 @@ export default {
             }
         },
         calcMoney(){
+            if(!localStorage.userInfo){
+                return this.$message.error('请登录！')
+            }
             this.chosenObj.etCount = this.chosenObj.etbzcCount + this.chosenObj.etzc
             // console.log(this.chosenObj.etbzcCount + '----------'+ this.chosenObj.etzc)
             // console.log(this.priceFlight.childNoNeedPrice)

src/components/trade/order/indexTwo.vue

@@ -334,7 +334,7 @@
                   </div>
                 </el-col>
             </el-row>
-            <div class="no-login" v-if="!this.customer || !localStorage.userInfo">
+            <div class="no-login" v-if="!this.customer ">
                 需要你登录以后才能预定哦！登录后还能享受更加优惠的价格，<span class="link" @click="goLogin">立即登录吧</span>
             </div>
         </div>