Skip to content

H
HotelProject
Commit 5417e298 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/zk123/hotelproject

parents 9712f7c0 bf5c04b3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1121 additions and 829 deletions
src/assets/css/common.css
View file @ 5417e298
......@@ -130,7 +130,6 @@
font-size: 12px;
border-collapse: collapse;
font-family: "Microsoft YaHei"!important;
min-width:1280px;
}
.myTable thead th {
......
src/assets/css/reset.css
View file @ 5417e298
......@@ -2,6 +2,11 @@
width: 200px!important;
}
.w100 {
width: 100px!important;
}
.el-input {
display: inline-block;
}
......
src/components/Home.vue
View file @ 5417e298
......@@ -2,190 +2,214 @@
<div class="Home">
<div class="banner" ref="banner">
<ul ref="scrollUl">
<li class="liItem" >
<li class="liItem" title="酒店列表" @click="goUrl('HotelList')">
<img src="../assets/img/b1.png" alt="">
<div>
<p class="f22"></p>
<p style="margin-top:10px">酒店管理</p>
<p class="f22"></p>
<p style="margin-top:10px">ホテル一覧</p>
</div>
</li>
<li class="liItem" >
<li class="liItem" title="酒店订单" @click="goUrl('HotelOrder')">
<img src="../assets/img/b2.png" alt="">
<div>
<p class="f22"></p>
<p style="margin-top:10px">订单管理</p>
<p class="f22"></p>
<p style="margin-top:10px">ホテル注文</p>
</div>
</li>
</ul>
</ul>
</div>
</div>
</template>
<script>
import moment from 'moment'
export default {
name: 'Home',
data () {
return {
stepTask:true,
}
},
created(){
},
mounted(){
this.width=this.$refs.banner.clientWidth;
let num= this.width /340;
if(num>7){
this.stepTask=false;
}
},
methods:{
},
}
import moment from 'moment'
export default {
name: 'Home',
data() {
return {
}
},
created() {},
mounted() {
},
methods: {
goUrl(path) {
this.$router.push({
path: path
})
},
},
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped>
.Zyprogress >>> svg path:first-child{
stroke: rgb(190, 239, 240)!important;
}
.Xzprogress >>> svg path:first-child{
stroke: rgb(255, 228, 213)!important;
}
.homeContent .assetsgk .Circle{
display: inline-block;
width:14px;
height:14px;
border-radius:50%;
margin-left:25px;
position: relative;
top:4px;
}
.homeContent .Active{
color:#089bab;
}
.navDiv .active{
width:35px!important;
}
.navDiv span{
width:15px;
display: inline-block;
margin:0 2px;
height: 4px;
background: #111111;
border-radius: 4px;
cursor: pointer;
}
.navDiv{
position: absolute;
bottom: 5px;
width:100%;
text-align: center;
}
.banner>ul{
width: 2141px;
position: relative;
}
.progressDiv >>> svg path:first-child{
stroke: #EBEBEB;
stroke-width: 6;
}
.chartTitle .el-select{
width:102px;
height:24px;
line-height:24px;
background:rgba(17,17,17,1);
border-radius:12px;
margin-left:30px;
position: relative;
}
.chartTitle{
padding: 20px 30px 0 30px;
}
.chartTitle .circle{
display: inline-block;
width:14px;
height:14px;
background:rgba(0,210,214,1);
border-radius:50%;
margin-right: 10px;
font-size: 14px;
}
.homeContent .zcState .ziItem .sl{
color:#A9B5C7;
}
.homeContent .zcState .ziItem{
font-size:12px;
color: #111111;
display: flex;
align-items: center;
width:100%;
padding: 25px;
box-sizing: border-box;
}
.homeContent .zcState{
margin-top: 30px;
width: 100%;
background:rgba(255,255,255,1);
border-radius:20px;
}
.homeContent .left{
width: 316px;
/* position: absolute; */
left: 30px;
top: 30px;
}
.homeContent .right{
width: calc(100% - 346px);
/* padding-left: 346px; */
box-sizing: border-box;
margin-left:26px;
}
.homeContent .right .firstDiv{
background: #fff;
border-radius: 20px;
}
.homeContent>div{
float: left;
}
.homeContent{
width: 100%;
padding: 30px;
box-sizing: border-box;
position: relative;
}
.banner{
padding-top: 20px;
position: relative;
overflow: hidden;
background: #fff;
}
.banner .liItem:first-child{
margin-left: 0;
}
.banner .liItem{
position: relative;
width: 340px;
height: 210px;
display: inline-block;
margin-left: -15px;
cursor: pointer;
}
.banner .liItem img{
width: 100%;
height: 100%;
position: absolute;
}
.banner .liItem div{
position: absolute;
color:#fff;
font-weight: 700;
top: 77px;
left: 54px;
font-family: 'muil';
}
.Zyprogress>>>svg path:first-child {
stroke: rgb(190, 239, 240) !important;
}
.Xzprogress>>>svg path:first-child {
stroke: rgb(255, 228, 213) !important;
}
.homeContent .assetsgk .Circle {
display: inline-block;
width: 14px;
height: 14px;
border-radius: 50%;
margin-left: 25px;
position: relative;
top: 4px;
}
.homeContent .Active {
color: #089bab;
}
.navDiv .active {
width: 35px !important;
}
.navDiv span {
width: 15px;
display: inline-block;
margin: 0 2px;
height: 4px;
background: #111111;
border-radius: 4px;
cursor: pointer;
}
.navDiv {
position: absolute;
bottom: 5px;
width: 100%;
text-align: center;
}
.banner>ul {
width: 2141px;
position: relative;
}
.progressDiv>>>svg path:first-child {
stroke: #EBEBEB;
stroke-width: 6;
}
.chartTitle .el-select {
width: 102px;
height: 24px;
line-height: 24px;
background: rgba(17, 17, 17, 1);
border-radius: 12px;
margin-left: 30px;
position: relative;
}
.chartTitle {
padding: 20px 30px 0 30px;
}
.chartTitle .circle {
display: inline-block;
width: 14px;
height: 14px;
background: rgba(0, 210, 214, 1);
border-radius: 50%;
margin-right: 10px;
font-size: 14px;
}
.homeContent .zcState .ziItem .sl {
color: #A9B5C7;
}
.homeContent .zcState .ziItem {
font-size: 12px;
color: #111111;
display: flex;
align-items: center;
width: 100%;
padding: 25px;
box-sizing: border-box;
}
.homeContent .zcState {
margin-top: 30px;
width: 100%;
background: rgba(255, 255, 255, 1);
border-radius: 20px;
}
.homeContent .left {
width: 316px;
/* position: absolute; */
left: 30px;
top: 30px;
}
.homeContent .right {
width: calc(100% - 346px);
/* padding-left: 346px; */
box-sizing: border-box;
margin-left: 26px;
}
.homeContent .right .firstDiv {
background: #fff;
border-radius: 20px;
}
.homeContent>div {
float: left;
}
.homeContent {
width: 100%;
padding: 30px;
box-sizing: border-box;
position: relative;
}
.banner {
padding-top: 20px;
position: relative;
overflow: hidden;
background: #fff;
}
.banner .liItem:first-child {
margin-left: 0;
}
.banner .liItem {
position: relative;
width: 340px;
height: 210px;
display: inline-block;
margin-left: -15px;
cursor: pointer;
}
.banner .liItem img {
width: 100%;
height: 100%;
position: absolute;
}
.banner .liItem div {
position: absolute;
color: #fff;
font-weight: 700;
top: 77px;
left: 54px;
font-family: 'muil';
}
</style>
src/components/assetsman/HotelInfo.vue
View file @ 5417e298
This diff is collapsed.
src/components/assetsman/HotelList.vue
View file @ 5417e298
<template>
<div class="assetsList">
<div class="routerTitle">
<span class="pageTitle">酒店列表</span>
<span class="pageTitle">ホテル一覧</span>
<span @click="morequery = !morequery" style="display:inline-flex;align-items:center;cursor: pointer;"
class="f12 cd6">
<span style="margin-right:5px">高级查询</span>
<span style="margin-right:5px">上位検索</span>
<img v-show="!morequery" style="width:12px;height:12px;" src="../../assets/img/more.png" alt="" />
<img v-show="morequery" class="roatImg" style="width:12px;height:12px" src="../../assets/img/more.png" alt="" />
</span>
......@@ -52,9 +52,12 @@
<span>{{ row.SHotelName }}</span>
</template>
</vxe-table-column>
<vxe-table-column field="SHotelAddress" title="ホテルの住所"></vxe-table-column>
<vxe-table-column field="Name" title="地域">
<template v-slot="{ row }">
<span>{{row.SCountryName}}-{{row.SProvinceName}}-{{row.SCityName}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="SHotelStar" title="ホテル星"></vxe-table-column>
<vxe-table-column field="SHotelInfo" title="ホテル案内"></vxe-table-column>
<vxe-table-column field="UpdateByName" title="修正者"></vxe-table-column>
<vxe-table-column field="Name" title="修正時間">
<template v-slot="{row}">
......@@ -93,7 +96,7 @@
total: 0,
msg: {
pageIndex: 1,
pageSize: 15,
pageSize: 10,
SHotelName: "", //酒店名称
Status: -1, //酒店状态
SCountryId: 651, //国家编号
......@@ -115,12 +118,13 @@
this.getList();
},
getList() {
this.loading=true;
this.apipost("scm_get_GetSCMHotelPageListService", this.msg,
res => {
this.loading=false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
console.log("this.dataList", this.dataList)
} else {
this.Error(res.data.message);
}
......
src/components/assetsman/HotelOrder.vue
View file @ 5417e298
This diff is collapsed.
src/components/global/Autologin.vue
View file @ 5417e298
<template>
<div class="Autologin">
<div class="gifContent">
<img src="../../assets/img/load.gif" alt="">
<img src="../../assets/img/load.gif" alt="">
</div>
</div>
</template>
<script>
export default {
name: 'login',
data(){
return{
export default {
name: 'login',
data() {
return {
}
},
created(){
let href = window.location.href;
let param = href.split('?')[1].split("&") ;
if(param){
let obj={};
obj.token=param[0].split('=')[1];
obj.SecretKey=param[1].split('=')[1];
localStorage.zcuserInfo = JSON.stringify(obj);
this.getUserInfo();
},
created() {
let href = window.location.href;
let param = href.split('?')[1].split("&");
if (param) {
let obj = {};
obj.token = param[0].split('=')[1];
obj.SecretKey = param[1].split('=')[1];
localStorage.scmAccount = JSON.stringify(obj);
this.getUserInfo();
}
},
mounted(){
},
methods:{
getUserInfo(){
this.apiJavaPost("/api/user/GetUserLoginMenu",{},
res => {
this.btnLoading=false;
if (res.data.resultCode === 1) {
let user=res.data.data;
var userJson = JSON.stringify(user);
localStorage.zcuserInfo = userJson;
this.$router.push({path: 'Home'})
} else {
this.Error(res.data.message);
this.$router.push({path: 'login'})
}
},
null
);
},
mounted() {},
methods: {
getUserInfo() {
},
},
}
</script>
},
}
</script>
<style>
.Autologin .gifContent{
.Autologin .gifContent {
width: 100%;
height: 100%;
position: fixed;
......@@ -61,5 +44,6 @@ export default {
display: flex;
align-items: center;
justify-content: center;
}
}
</style>
src/components/global/Login.vue
View file @ 5417e298
<template>
<div class="login">
<div class="loginContent">
<p class="f40 bold c11">SCM管理系统</p>
<p class="f40 bold c11">SCM管理システム</p>
<div style="margin:60px 0 50px 0">
<p>
<p title="账号">
<img style="width:16px;height:14px" src="../../assets/img/user.png" alt="">
账号</p>
<el-input v-model="userInfo.EmAccount" placeholder="请输入"></el-input>
アカウント</p>
<el-input v-model="userInfo.EmAccount" placeholder="口座に入力してください"></el-input>
</div>
<div>
<p>
<img style="width:16px;height:14px;margin-right:4px" src="../../assets/img/passwd.png" alt="">密码</p>
<el-input type="password" v-model="userInfo.EmPassword" placeholder="请输入内容"></el-input>
<p title="密码">
<img style="width:16px;height:14px;margin-right:4px" src="../../assets/img/passwd.png" alt="">パスワード</p>
<el-input type="password" v-model="userInfo.EmPassword" placeholder="暗証番号を入力してください"></el-input>
</div>
<div class="loginDiv">
<span v-loading="btnLoading" @click="Login">登录</span>
<span v-loading="btnLoading" @click="Login" title="登录">ログイン</span>
</div>
</div>
</div>
</template>
<script>
export default {
name: 'login',
data(){
return{
userInfo:{
EmAccount:'',
EmPassword:'',
Domain:'',
},
btnLoading:false,
export default {
name: 'login',
data() {
return {
userInfo: {
EmAccount: '',
EmPassword: '',
Domain: '',
},
btnLoading: false,
}
},
created(){
// let href = window.location.href;
// let param = href.split('?')[1].split("&") ;
// if(param){
// let obj={};
// obj.token=param[0].split('=')[1];
// obj.SecretKey=param[1].split('=')[1];
// localStorage.zcuserInfo = JSON.stringify(obj);
// this.getUserInfo();
// }
},
mounted(){
this.initData();
},
methods:{
getUserInfo(){
this.apiJavaPost("/api/user/GetUserLoginMenu",{},
res => {
this.btnLoading=false;
},
created() {
},
mounted() {
this.initData();
},
methods: {
getUserInfo() {
this.apiJavaPost("/api/user/GetUserLoginMenu", {},
res => {
this.btnLoading = false;
if (res.data.resultCode === 1) {
let user=res.data.data;
let user = res.data.data;
var userJson = JSON.stringify(user);
localStorage.zcuserInfo = userJson;
this.$router.push({path: 'Home'})
localStorage.scmAccount = userJson;
this.$router.push({
path: 'Home'
})
} else {
this.Error(res.data.message);
this.Error(res.data.message);
}
},
null
},
null
);
},
initData() {
......@@ -75,80 +66,88 @@ export default {
}
this.userInfo.Domain = window.location.hostname
},
Login(){
Login() {
if (this.userInfo.EmAccount == "") {
this.nameIsShow = true;
this.Error("请输入用户名");
return;
this.nameIsShow = true;
this.Error("口座に入力してください");
return;
} else if (this.userInfo.EmPassword == "") {
this.passwordIsShow = true;
this.Error("请输入密码");
return;
}
this.btnLoading=true;
this.apipost("scm_get_SCMLoginService",this.userInfo,
res => {
this.btnLoading=false;
this.passwordIsShow = true;
this.Error("暗証番号を入力してください");
return;
}
this.btnLoading = true;
this.apipost("scm_get_SCMLoginService", this.userInfo,
res => {
this.btnLoading = false;
if (res.data.resultCode === 1) {
let user=res.data.data;
let user = res.data.data;
var userJson = JSON.stringify(user);
localStorage.zcuserInfo = userJson;
this.$router.push({path: 'Home'})
localStorage.scmAccount = userJson;
this.$router.push({
path: 'Home'
})
} else {
this.Error(res.data.message);
this.Error(res.data.message);
}
},
null
},
null
);
},
},
}
</script>
},
}
</script>
<style>
.login .el-loading-mask{
border-radius: 24px;
}
.login{
position: absolute;
width: 100%;
height: 100%;
top: 0;
background-color: #F8FAFB;
background: url('../../assets/img/login.png') no-repeat;
background-size: 100% 100%;
font-family: "PingFang";
}
.login .loginContent{
position: absolute;
top: 20%;
left:15%;
width: 400px;
}
.login .loginContent .el-input__inner{
border: none;
border-bottom: 1px solid #CCCCCC;
border-radius: 0;
color:#333333;
padding:0;
}
.login .loginContent .el-input.is-active .el-input__inner,.login .loginContent .el-input__inner:focus{
border-bottom: 2px solid #089bab!important;
}
.loginDiv{
margin-top:50px;
}
.loginDiv span{
display: inline-block;
width:180px;
height:48px;
line-height:48px;
background:rgba(17,17,17,1);
border-radius:24px;
text-align: center;
color:#FFFFFF;
cursor: pointer;
}
.login .el-loading-mask {
border-radius: 24px;
}
.login {
position: absolute;
width: 100%;
height: 100%;
top: 0;
background-color: #F8FAFB;
background: url('../../assets/img/login.png') no-repeat;
background-size: 100% 100%;
font-family: "PingFang";
}
.login .loginContent {
position: absolute;
top: 20%;
left: 15%;
width: 400px;
}
.login .loginContent .el-input__inner {
border: none;
border-bottom: 1px solid #CCCCCC;
border-radius: 0;
color: #333333;
padding: 0;
}
.login .loginContent .el-input.is-active .el-input__inner,
.login .loginContent .el-input__inner:focus {
border-bottom: 2px solid #089bab !important;
}
.loginDiv {
margin-top: 50px;
}
.loginDiv span {
display: inline-block;
width: 180px;
height: 48px;
line-height: 48px;
background: rgba(17, 17, 17, 1);
border-radius: 24px;
text-align: center;
color: #FFFFFF;
cursor: pointer;
}
</style>
src/components/global/Nav.vue
View file @ 5417e298
This diff is collapsed.
src/components/global/index.vue
View file @ 5417e298
This diff is collapsed.
src/plugins/index.js
View file @ 5417e298
......@@ -12,7 +12,7 @@ export default {
//域名管理对象
Vue.prototype.domainManager = function () {
var domainUrl = "http://testapi.oytour.com"; //主域名
var domainUrl = "http://127.0.0.1"; //主域名
let locationName = window.location.hostname;
let javaUrldo = "";
javaUrldo = locationName.indexOf('zcyx') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://property.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.17:8087";
......@@ -21,7 +21,7 @@ export default {
//domainUrl = "http://127.0.0.1"
domainUrl = "http://testapi.oytour.com"
} else if (window.location.host.indexOf('oytour.com') != -1)
domainUrl = "http://property.oytour.com"
domainUrl = "http://reborn.oytour.com"
}
var obj = {
//主地址
......@@ -160,7 +160,7 @@ export default {
},
Vue.prototype.getLocalStorage = function () {
var localStorageData = window.localStorage["zcuserInfo"];
var localStorageData = window.localStorage["scmAccount"];
if (localStorageData !== undefined && localStorageData != 'undefined') {
return JSON.parse(localStorageData);
} else {
......@@ -234,6 +234,5 @@ export default {
value = value.replace(this.$commonUtils.Regex.isInteger, "");
item[filed] = value;
}
}
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment