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
091e64c5
Commit
091e64c5
authored
Jun 28, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
d60836fa
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
23 deletions
+46
-23
tripUtils.js
src/assets/utils/tripUtils.js
+11
-0
b2b_dialog.vue
src/components/WebSet/plug-in/b2b_dialog.vue
+5
-3
b2blink_dialog.vue
src/components/WebSet/plug-in/b2blink_dialog.vue
+3
-2
banner_dialog.vue
src/components/WebSet/plug-in/banner_dialog.vue
+2
-2
group_dialog.vue
src/components/WebSet/plug-in/group_dialog.vue
+11
-2
other_dialog.vue
src/components/WebSet/plug-in/other_dialog.vue
+1
-0
picture_dialog.vue
src/components/WebSet/plug-in/picture_dialog.vue
+13
-14
No files found.
src/assets/utils/tripUtils.js
View file @
091e64c5
...
...
@@ -796,6 +796,17 @@ var tripUtils = {
);
}
},
//获取B2B连接
GetB2BUrl
(
B2BDomain
,
ConfigId
,
tcid
)
{
var
url
=
""
;
if
(
B2BDomain
)
{
url
=
"http://"
+
B2BDomain
+
"/#/detailTwo/"
+
encodeURIComponent
(
ConfigId
)
+
"/"
+
tcid
;
}
return
url
;
},
//跳转到B2C页面
GotoB2CPage
(
B2BDomain
,
ConfigId
,
tcid
)
{
if
(
B2BDomain
)
{
...
...
src/components/WebSet/plug-in/b2b_dialog.vue
View file @
091e64c5
...
...
@@ -147,7 +147,8 @@
<el-row>
<el-col
:span=
"24"
>
<el-form-item>
<el-button
type=
"primary"
size=
"small"
@
click=
"isShowTripDailog=true,clickIndex=index"
>
选择行程
</el-button>
<el-button
type=
"primary"
size=
"small"
@
click=
"isShowTripDailog=true,clickIndex=index"
>
选择行程
</el-button>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -190,6 +191,7 @@
if
(
item
.
ImgCover
&&
item
.
ImgCover
.
length
>
0
)
{
imgUrl
=
item
.
ImgCover
[
0
].
Url
;
}
var
LinkUrl
=
this
.
$tripUtils
.
GetB2BUrl
(
this
.
getLocalStorage
().
B2BDomain
,
item
.
ConfigId
,
item
.
TCID
);
var
obj
=
{
StartDate
:
item
.
StartDate
,
imgUrl
:
imgUrl
,
...
...
@@ -198,6 +200,7 @@
Title
:
item
.
Title
,
DayNum
:
item
.
DayNum
,
Price
:
item
.
B2BPrice
,
LinkUrl
:
LinkUrl
,
};
this
.
plugData
.
Details
[
this
.
clickIndex
].
TripImageUrl
=
obj
.
imgUrl
;
this
.
plugData
.
Details
[
this
.
clickIndex
].
Price
=
obj
.
Price
;
...
...
@@ -208,8 +211,7 @@
}
},
},
mounted
()
{
},
mounted
()
{},
};
</
script
>
src/components/WebSet/plug-in/b2blink_dialog.vue
View file @
091e64c5
...
...
@@ -90,6 +90,7 @@
if
(
item
.
ImgCover
&&
item
.
ImgCover
.
length
>
0
)
{
imgUrl
=
item
.
ImgCover
[
0
].
Url
;
}
var
LinkUrl
=
this
.
$tripUtils
.
GetB2BUrl
(
this
.
getLocalStorage
().
B2BDomain
,
item
.
ConfigId
,
item
.
TCID
);
var
obj
=
{
StartDate
:
item
.
StartDate
,
imgUrl
:
imgUrl
,
...
...
@@ -98,6 +99,7 @@
Title
:
item
.
Title
,
DayNum
:
item
.
DayNum
,
Price
:
item
.
B2BPrice
,
LinkUrl
:
LinkUrl
,
};
this
.
plugData
.
TripImage
=
obj
.
imgUrl
;
this
.
plugData
.
TripTitle
=
obj
.
Title
;
...
...
@@ -107,8 +109,7 @@
},
},
mounted
()
{
},
mounted
()
{},
};
</
script
>
src/components/WebSet/plug-in/banner_dialog.vue
View file @
091e64c5
...
...
@@ -107,10 +107,10 @@
</el-col>
<el-col
:span=
"12"
>
<el-form-item
:label=
"'標題'+' '+(index+1)"
>
<el-input
type=
"text"
v-model=
"
plugData
.LinkTitle"
></el-input>
<el-input
type=
"text"
v-model=
"
item
.LinkTitle"
></el-input>
</el-form-item>
<el-form-item
label=
"連結網址"
v-if=
"plugData.Type==2"
>
<el-input
type=
"text"
v-model=
"
plugData
.LinkUrl"
></el-input>
<el-input
type=
"text"
v-model=
"
item
.LinkUrl"
></el-input>
</el-form-item>
</el-col>
</el-row>
...
...
src/components/WebSet/plug-in/group_dialog.vue
View file @
091e64c5
...
...
@@ -31,7 +31,8 @@
<el-table-column
label=
"操作"
>
<
template
slot-scope=
"scope"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('system.table_delete')"
placement=
"top-start"
>
<el-button
type=
"danger"
style=
"padding:6px;"
icon=
"el-icon-delete"
circle
@
click=
"deleteData(scope.$index)"
></el-button>
<el-button
type=
"danger"
style=
"padding:6px;"
icon=
"el-icon-delete"
circle
@
click=
"deleteData(scope.$index)"
></el-button>
</el-tooltip>
</
template
>
</el-table-column>
...
...
@@ -81,6 +82,11 @@
if
(
item
.
SurplusYSeat
)
{
totalSeat
+=
item
.
SurplusYSeat
;
}
var
flightStatus
=
false
;
if
(
item
.
flightList
&&
item
.
flightList
.
length
>
0
)
{
flightStatus
=
item
.
flightList
[
0
].
FlightState
==
1
;
}
var
LinkUrl
=
this
.
$tripUtils
.
GetB2BUrl
(
this
.
getLocalStorage
().
B2BDomain
,
item
.
ConfigId
,
item
.
TCID
);
var
obj
=
{
StartDate
:
item
.
StartDate
,
TCNUM
:
item
.
TCNUM
,
...
...
@@ -88,7 +94,10 @@
Title
:
item
.
Title
,
DayNum
:
item
.
DayNum
,
Price
:
item
.
B2BPrice
,
Seat
:
totalSeat
Seat
:
totalSeat
,
LinkUrl
:
LinkUrl
,
Substitute
:
item
.
IsSubstitution
>
0
,
FlightStatus
:
flightStatus
,
};
this
.
plugData
.
GroupSelfItems
.
push
(
obj
);
});
...
...
src/components/WebSet/plug-in/other_dialog.vue
View file @
091e64c5
...
...
@@ -178,6 +178,7 @@
var
str
=
x
.
data
.
FilePath
;
var
imgUrl
=
this
.
domainManager
().
ViittoFileUrl
+
str
;
this
.
plugData
.
DownLoadList
[
this
.
checkIndex
].
LinkUrl
=
imgUrl
;
this
.
plugData
.
DownLoadList
[
this
.
checkIndex
].
LinkTitle
=
fileName
;
});
},
//上传图片
...
...
src/components/WebSet/plug-in/picture_dialog.vue
View file @
091e64c5
...
...
@@ -134,14 +134,14 @@
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"行程名稱"
>
<el-input
type=
"text"
v-model=
"item.TripTitle
2
"
></el-input>
<el-input
type=
"text"
v-model=
"item.TripTitle"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"連結網址"
>
<el-input
type=
"text"
v-model=
"item.LinkUrl
2
"
maxlength=
"200"
></el-input>
<el-input
type=
"text"
v-model=
"item.LinkUrl"
maxlength=
"200"
></el-input>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -168,19 +168,19 @@
<el-row>
<el-col
:span=
"24"
>
<el-form-item
:label=
"'行程名稱'+' '+(index+1)"
>
<el-input
type=
"text"
v-model=
"item.TripTitle
2
"
></el-input>
<el-input
type=
"text"
v-model=
"item.TripTitle"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
>
<el-form-item
label=
"價格"
>
<el-input
type=
"text"
v-model=
"item.Price
2
"
></el-input>
<el-input
type=
"text"
v-model=
"item.Price"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
label=
"連結網址"
>
<el-input
type=
"text"
v-model=
"item.LinkUrl
2
"
maxlength=
"200"
></el-input>
<el-input
type=
"text"
v-model=
"item.LinkUrl"
maxlength=
"200"
></el-input>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -191,9 +191,7 @@
<el-row
v-for=
"(item,index) in plugData.Details"
:key=
"index"
style=
"margin-bottom:20px;"
>
<el-col
:span=
"8"
>
<div
class=
"webSliderDiv webImg_radius"
>
<img
v-if=
"item.ImageUrl"
:src=
"item.ImageUrl"
style=
"width:auto;"
class=
"web_imgUrl"
alt=
""
/>
</div>
</el-col>
<el-col
:span=
"16"
>
...
...
@@ -209,12 +207,12 @@
</el-col>
<el-col
:span=
"24"
>
<el-form-item
:label=
"'行程名稱'+' '+(index+1)"
>
<el-input
type=
"text"
v-model=
"item.TripTitle
2
"
></el-input>
<el-input
type=
"text"
v-model=
"item.TripTitle"
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
label=
"連結網址"
>
<el-input
type=
"text"
v-model=
"item.LinkUrl
2
"
maxlength=
"200"
></el-input>
<el-input
type=
"text"
v-model=
"item.LinkUrl"
maxlength=
"200"
></el-input>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -260,6 +258,7 @@
if
(
item
.
ImgCover
&&
item
.
ImgCover
.
length
>
0
)
{
imgUrl
=
item
.
ImgCover
[
0
].
Url
;
}
var
LinkUrl
=
this
.
$tripUtils
.
GetB2BUrl
(
this
.
getLocalStorage
().
B2BDomain
,
item
.
ConfigId
,
item
.
TCID
);
var
obj
=
{
StartDate
:
item
.
StartDate
,
imgUrl
:
imgUrl
,
...
...
@@ -268,20 +267,20 @@
Title
:
item
.
Title
,
DayNum
:
item
.
DayNum
,
Price
:
item
.
B2BPrice
,
LinkUrl
:
LinkUrl
,
};
console
.
log
(
"plugData.Type"
,
this
.
plugData
.
Type
);
console
.
log
(
"obj"
,
obj
);
console
.
log
(
"this.plugData.Details[this.checkIndex]"
,
this
.
plugData
.
Details
[
this
.
checkIndex
]);
if
(
this
.
plugData
.
Type
==
1
||
this
.
plugData
.
Type
==
2
||
this
.
plugData
.
Type
==
3
)
{
if
(
this
.
plugData
.
Type
==
1
||
this
.
plugData
.
Type
==
2
||
this
.
plugData
.
Type
==
3
||
this
.
plugData
.
Type
==
4
||
this
.
plugData
.
Type
==
5
||
this
.
plugData
.
Type
==
6
)
{
this
.
plugData
.
Details
[
this
.
checkIndex
].
ImageUrl
=
obj
.
imgUrl
;
this
.
plugData
.
Details
[
this
.
checkIndex
].
Price
=
obj
.
Price
;
this
.
plugData
.
Details
[
this
.
checkIndex
].
TripTitle
=
obj
.
Title
;
this
.
plugData
.
Details
[
this
.
checkIndex
].
DayNum
=
obj
.
DayNum
;
this
.
plugData
.
Details
[
this
.
checkIndex
].
LinkUrl
=
obj
.
LinkUrl
;
}
else
{
this
.
plugData
.
Details
[
this
.
checkIndex
].
ImageUrl
=
obj
.
imgUrl
;
this
.
plugData
.
Details
[
this
.
checkIndex
].
Price2
=
obj
.
Price
;
this
.
plugData
.
Details
[
this
.
checkIndex
].
TripTitle2
=
obj
.
Title
;
this
.
plugData
.
Details
[
this
.
checkIndex
].
DayNum2
=
obj
.
DayNum
;
this
.
plugData
.
Details
[
this
.
checkIndex
].
LinkUrl
=
obj
.
LinkUrl
;
}
this
.
$refs
.
chooseTrip
.
clearData
();
});
...
...
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