Skip to content

S
SuperMan
Commit 0251e0e8 authored by 罗超's avatar 罗超
Browse files
Options

修改地接酒店操作搜索条件

parent 4bea2ae8
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 88 deletions
package.json
View file @ 0251e0e8
......@@ -8,7 +8,7 @@
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev",
"lint": "eslint --ext .js,.vue src",
"serve" : "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
"serve": "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
"build": "node --max-old-space-size=4096 build/build.js"
},
"dependencies": {
......@@ -28,6 +28,7 @@
"js-md5": "^0.7.3",
"jspdf": "^1.4.1",
"lrz": "^4.9.40",
"moment": "^2.24.0",
"node-sass": "^4.11.0",
"pdfjs-dist": "^2.0.489",
"pinyin": "^2.8.3",
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 0251e0e8
......@@ -370,6 +370,7 @@
//1-只查询有库存的酒店
IsMoreThanZero:0,
Country: "651",
IsAllHotel:1,
sDate:obj.CheckInDateStr
}, res => {
if (res.data.resultCode == 1) {
......
src/plug/index.js
View file @ 0251e0e8
......@@ -117,10 +117,10 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
domainUrl = "http://192.168.2.65:8025"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //214主域名
// domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.0.119:8082";
// domainUrl = "http://192.168.2.106:8082";
domainUrl = "http://192.168.2.106:8082";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......
yarn.lock
View file @ 0251e0e8
......@@ -46,11 +46,11 @@
esutils "^2.0.2"
js-tokens "^3.0.0"
"@babel/runtime@^7.0.0-beta.56":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
"@babel/runtime@^7.0.0":
version "7.4.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
dependencies:
regenerator-runtime "^0.12.0"
regenerator-runtime "^0.13.2"
"@babel/template@7.0.0-beta.44":
version "7.0.0-beta.44"
......@@ -84,17 +84,17 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
"@riophae/vue-treeselect@0.0.36":
version "0.0.36"
resolved "https://registry.yarnpkg.com/@riophae/vue-treeselect/-/vue-treeselect-0.0.36.tgz#308dd6dfaf5fa550a2a64f881374666c9b01a962"
"@riophae/vue-treeselect@0.0.38":
version "0.0.38"
resolved "https://registry.yarnpkg.com/@riophae/vue-treeselect/-/vue-treeselect-0.0.38.tgz#13af5dfcd732a9f41fa96f99821108e72666dd4f"
dependencies:
"@babel/runtime" "^7.0.0-beta.56"
"@babel/runtime" "^7.0.0"
babel-helper-vue-jsx-merge-props "^2.0.3"
easings-css "^1.0.0"
fuzzysearch "^1.0.3"
google-material-color "^1.3.1"
is-promise "^2.1.0"
lodash "^4.0.0"
material-colors "^1.2.6"
watch-size "^2.0.0"
"@types/node@^10.11.7":
......@@ -195,7 +195,7 @@ ajv-keywords@^3.1.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0:
version "5.5.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
......@@ -480,7 +480,7 @@ aws-sign2@~0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
aws4@^1.6.0, aws4@^1.8.0:
aws4@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
......@@ -499,7 +499,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
esutils "^2.0.2"
js-tokens "^3.0.2"
babel-core@^6.22.1, babel-core@^6.26.0:
babel-core@^6.26.0, babel-core@^6.26.3:
version "6.26.3"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
dependencies:
......@@ -968,7 +968,7 @@ babel-plugin-transform-vue-jsx@^3.5.0:
dependencies:
esutils "^2.0.2"
babel-preset-env@^1.3.2:
babel-preset-env@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
dependencies:
......@@ -1711,7 +1711,7 @@ combined-stream@1.0.6:
dependencies:
delayed-stream "~1.0.0"
combined-stream@~1.0.5, combined-stream@~1.0.6:
combined-stream@~1.0.6:
version "1.0.7"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
dependencies:
......@@ -2984,7 +2984,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
assign-symbols "^1.0.0"
is-extendable "^1.0.1"
extend@3, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.1, extend@~3.0.2:
extend@3, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
......@@ -3208,7 +3208,7 @@ forever-agent@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
form-data@~2.3.1, form-data@~2.3.2:
form-data@~2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
dependencies:
......@@ -3446,12 +3446,6 @@ globule@^1.0.0:
lodash "~4.17.10"
minimatch "~3.0.2"
google-material-color@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/google-material-color/-/google-material-color-1.3.1.tgz#98082d4ed86af43bb3ab11c49a81eb99caca1056"
dependencies:
lodash "^2.4.1"
google-translate-api@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/google-translate-api/-/google-translate-api-2.3.0.tgz#626730a123da0d57af3735dd707cda71cee919c7"
......@@ -3518,13 +3512,6 @@ har-schema@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
har-validator@~5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
dependencies:
ajv "^5.1.0"
har-schema "^2.0.0"
har-validator@~5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
......@@ -4420,9 +4407,9 @@ less-loader@^4.1.0:
loader-utils "^1.1.0"
pify "^3.0.0"
less@^3.0.1:
version "3.8.1"
resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
less@^3.9.0:
version "3.9.0"
resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
dependencies:
clone "^2.1.2"
optionalDependencies:
......@@ -4524,10 +4511,6 @@ lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
lodash@^2.4.1:
version "2.4.2"
resolved "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@latest, lodash@~4.17.10:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
......@@ -4608,6 +4591,10 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"
material-colors@^1.2.6:
version "1.2.6"
resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
math-expression-evaluator@^1.2.14:
version "1.2.17"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
......@@ -4986,9 +4973,9 @@ node-pre-gyp@^0.10.0:
semver "^5.3.0"
tar "^4"
node-sass@^4.8.3:
version "4.9.3"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
node-sass@^4.11.0:
version "4.11.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
......@@ -5005,7 +4992,7 @@ node-sass@^4.8.3:
nan "^2.10.0"
node-gyp "^3.8.0"
npmlog "^4.0.0"
request "2.87.0"
request "^2.88.0"
sass-graph "^2.2.4"
stdout-stream "^1.4.0"
"true-case-path" "^1.0.2"
......@@ -5109,10 +5096,6 @@ number-is-nan@^1.0.0:
version "1.4.4"
resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
oauth-sign@~0.8.2:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
oauth-sign@~0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
......@@ -6018,7 +6001,7 @@ qs@6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
qs@^6.4.0, qs@~6.5.1, qs@~6.5.2:
qs@^6.4.0, qs@~6.5.2:
version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
......@@ -6221,9 +6204,9 @@ regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
regenerator-runtime@^0.12.0:
version "0.12.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
regenerator-runtime@^0.13.2:
version "0.13.2"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
regenerator-transform@^0.10.0:
version "0.10.1"
......@@ -6308,32 +6291,7 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"
request@2.87.0:
version "2.87.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
dependencies:
aws-sign2 "~0.7.0"
aws4 "^1.6.0"
caseless "~0.12.0"
combined-stream "~1.0.5"
extend "~3.0.1"
forever-agent "~0.6.1"
form-data "~2.3.1"
har-validator "~5.0.3"
http-signature "~1.2.0"
is-typedarray "~1.0.0"
isstream "~0.1.2"
json-stringify-safe "~5.0.1"
mime-types "~2.1.17"
oauth-sign "~0.8.2"
performance-now "^2.1.0"
qs "~6.5.1"
safe-buffer "^5.1.1"
tough-cookie "~2.3.3"
tunnel-agent "^0.6.0"
uuid "^3.1.0"
request@^2.55.0, request@^2.83.0, request@^2.87.0:
request@^2.55.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
version "2.88.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
dependencies:
......@@ -7244,12 +7202,6 @@ tough-cookie@^2.2.0, tough-cookie@~2.4.3:
psl "^1.1.24"
punycode "^1.4.1"
tough-cookie@~2.3.3:
version "2.3.4"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
dependencies:
punycode "^1.4.1"
tr46@~0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
......@@ -7527,7 +7479,7 @@ uuid@^2.0.1:
version "2.0.3"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
uuid@^3.0.1, uuid@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
......@@ -7585,9 +7537,9 @@ vue-draggable-resizable@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/vue-draggable-resizable/-/vue-draggable-resizable-1.7.2.tgz#00f1116ff7979f40f825b308efd6dbfbd604ff4b"
vue-easytable@^1.7.1:
version "1.7.1"
resolved "http://registry.npm.taobao.org/vue-easytable/download/vue-easytable-1.7.1.tgz#fc228448e4dd963ee9b5bad97c20a4af9c13db61"
vue-easytable@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/vue-easytable/-/vue-easytable-1.7.2.tgz#b5d1e54f7a6b38ba41d826dbfd105db48ece3568"
dependencies:
nprogress "^0.2.0"
vue "^2.2.6"
......@@ -7702,7 +7654,7 @@ vue-waterfall-easy@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/vue-waterfall-easy/-/vue-waterfall-easy-2.4.1.tgz#76a6182d367d8ac512eaf03a0b71cd3f80cc008e"
vue-websocket@^0.2.2:
vue-websocket@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/vue-websocket/-/vue-websocket-0.2.3.tgz#49b5b094fd0069ec4c1e1b1c0a873697feacc32f"
dependencies:
......
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