Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
SuperMan
Commits
df6ff320
Commit
df6ff320
authored
Mar 09, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
预览、优化团图片
parent
6ff4337f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
19 deletions
+18
-19
tripUtils.js
src/assets/utils/tripUtils.js
+6
-7
productQueryOne.vue
src/components/SalesModule/productQueryOne.vue
+1
-0
oneDayTrip.vue
src/components/TravelManager/TravelList/oneDayTrip.vue
+1
-1
OrderPreview.vue
src/components/scenicSpot/Singleticket/OrderPreview.vue
+8
-10
index.js
src/plug/index.js
+2
-1
No files found.
src/assets/utils/tripUtils.js
View file @
df6ff320
...
...
@@ -786,7 +786,7 @@ var tripUtils = {
if
(
B2BDomain
)
{
var
url
=
"http://"
+
B2BDomain
;
window
.
open
(
url
+
'/#/detail/
XXcsyIZsyIY%3D/
'
+
url
+
'/#/detail/'
+
encodeURIComponent
(
ConfigId
)
+
'/'
+
tcid
,
'_blank'
)
...
...
@@ -797,10 +797,9 @@ var tripUtils = {
if
(
B2BDomain
)
{
var
url
=
"http://"
+
B2BDomain
;
window
.
open
(
url
+
"/#/detail/XXcsyIZsyIY%3D/"
+
encodeURIComponent
(
ConfigId
)
+
"/"
+
tcid
,
url
+
"/#/detail/preview/"
+
tcid
+
"/0"
,
"_blank"
);
}
...
...
@@ -810,7 +809,7 @@ var tripUtils = {
if
(
B2BDomain
)
{
var
url
=
"http://"
+
B2BDomain
;
window
.
open
(
url
+
"/#/detail
s
/"
+-
encodeURIComponent
(
ConfigId
)
+
url
+
"/#/detail/"
+-
encodeURIComponent
(
ConfigId
)
+
"/"
+
tcid
,
"_blank"
...
...
@@ -821,7 +820,7 @@ var tripUtils = {
GetB2BUrl
(
B2BDomain
,
ConfigId
,
tcid
)
{
var
url
=
""
;
if
(
B2BDomain
)
{
url
=
"http://"
+
B2BDomain
+
"/#/detail
s
/"
+
url
=
"http://"
+
B2BDomain
+
"/#/detail/"
+
encodeURIComponent
(
ConfigId
)
+
"/"
+
tcid
;
...
...
src/components/SalesModule/productQueryOne.vue
View file @
df6ff320
...
...
@@ -801,6 +801,7 @@
</p>
<p
class=
"d12TC"
>
{{item.TCNUM}}({{item.TCID}})
</p>
<p>
{{item.LtName}}
</p>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"item.Title"
placement=
"top-start"
popper-class=
"max-w250"
>
<!-- <p class="d12p" @click="getJourney(item.ConfigID,item.LineName)" :title="item.Title">{{item.Title}}</p> -->
<p
class=
"d12p"
@
click=
"goB2Bdetail(item.ConfigID, item.TCID)"
:title=
"item.Title"
>
{{item.Title}}
</p>
...
...
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @
df6ff320
...
...
@@ -1359,7 +1359,7 @@
},
goB2B
(
ConfigId
,
tcid
)
{
var
B2BDomain
=
this
.
CurrentUserInfo
.
B2BDomain
;
this
.
$tripUtils
.
GotoB2B
OneDay
Page
(
B2BDomain
,
ConfigId
,
tcid
);
this
.
$tripUtils
.
GotoB2BPage
(
B2BDomain
,
ConfigId
,
tcid
);
},
goTeamBalance
(
id
,
OutBranchId
)
{
this
.
$router
.
push
({
...
...
src/components/scenicSpot/Singleticket/OrderPreview.vue
View file @
df6ff320
...
...
@@ -313,7 +313,7 @@
<span>
购买张数:
</span>
<div
style=
"display: flex;flex-direction: column;"
>
<
template
v-for=
"x in types"
>
<el-input-number
v-if=
"x.checked"
v-model=
"x.num"
@
change=
"changePeople"
:min=
"1"
label=
"购买数量"
<el-input-number
v-if=
"x.checked"
v-model=
"x.num"
@
change=
"changePeople"
:min=
"1"
label=
"购买数量"
style=
"margin-bottom: 10px;"
></el-input-number>
</
template
>
</div>
...
...
@@ -563,11 +563,12 @@
this
.
getNum
()
},
getNum
(){
this
.
types
.
forEach
(
x
=>
{
if
(
x
.
num
>
x
.
RemainingInventory
){
x
.
num
=
x
.
RemainingInventory
}
})
// 控制门票张数
// this.types.forEach(x=>{
// if(x.num>x.RemainingInventory){
// x.num = x.RemainingInventory
// }
// })
setTimeout
(()
=>
{
this
.
calcMoneyHandler
()
},
50
)
...
...
@@ -575,7 +576,7 @@
calcMoneyHandler
(){
this
.
msg
.
Money
=
0.0
let
Money
=
0
if
(
this
.
msg
.
MailingState
==
'2'
){
if
(
this
.
msg
.
MailingState
==
2
){
this
.
msg
.
MailingMoney
=
this
.
detailsObj
.
MailingMoney
}
else
{
this
.
msg
.
MailingMoney
=
0
...
...
@@ -588,9 +589,6 @@
this
.
msg
.
Money
=
Number
(
Money
)
+
Number
(
this
.
msg
.
MailingMoney
)
},
changeDetailListHandler
(
e
)
{
if
(
e
.
checked
)
{
e
.
num
=
1
}
e
.
checked
=
!
e
.
checked
this
.
isCheck
=
this
.
types
.
findIndex
(
x
=>
x
.
checked
)
>
-
1
if
(
this
.
isCheck
){
...
...
src/plug/index.js
View file @
df6ff320
...
...
@@ -121,7 +121,7 @@ export default {
domainUrl
=
"http://192.168.10.128"
;
domainUrl
=
"http://192.168.10.11:8083"
// 刘东电脑
// domainUrl = "http://192.168.10.123:8002";
//
domainUrl = "http://reborn.oytour.com";
domainUrl
=
"http://reborn.oytour.com"
;
let
crmLocalFileStreamDownLoadUrl
=
""
;
crmLocalFileStreamDownLoadUrl
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://crm.oytour.com"
:
"http://testcrm.oytour.com"
;
let
javaUrldo
=
""
;
...
...
@@ -1089,6 +1089,7 @@ export default {
// w : 宽
// h : 高
Vue
.
prototype
.
compressImg
=
function
(
path
,
type
,
w
,
h
)
{
if
(
!
path
||
path
==
''
)
return
''
let
url
=
this
.
domainManager
().
UploadUrl
;
let
poise
=
'm_filt'
;
w
=
w
?
w
:
''
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment