Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
group-buy-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
group-buy-ui
Commits
dcebf31a
Commit
dcebf31a
authored
Sep 26, 2021
by
Xuguangxing
Browse files
Options
Browse Files
Download
Plain Diff
fix
parents
09664a01
a8153151
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
47 additions
and
18 deletions
+47
-18
groupBuy.js
src/api/groupBuy.js
+8
-0
groupShare.vue
src/components/groupShare.vue
+7
-0
utils.service.js
src/service/utils.service.js
+12
-10
module.js
src/store/module.js
+2
-2
index.vue
src/views/goodsList/index.vue
+3
-2
List.vue
src/views/orderList/components/List.vue
+7
-3
index.vue
src/views/orderList/index.vue
+8
-1
No files found.
src/api/groupBuy.js
View file @
dcebf31a
...
@@ -60,5 +60,13 @@ export default {
...
@@ -60,5 +60,13 @@ export default {
},
},
getGroupShareInfo
(
orderNo
)
{
getGroupShareInfo
(
orderNo
)
{
return
http
.
get
(
`
${
talosHost
}
/api/kdsp/groupShareInfo?orderNo=
${
orderNo
}
`
);
return
http
.
get
(
`
${
talosHost
}
/api/kdsp/groupShareInfo?orderNo=
${
orderNo
}
`
);
},
getPlayBillUrl
(
m
)
{
return
http
.
get
(
`http://192.168.25.122/api/kdsp/playBill/getPlayBillUrl?m=
${
m
}
`
);
},
makePlayBillPicUrl
(
activityInfoId
)
{
return
http
.
get
(
`http://192.168.25.122/api/kdsp/activity/activity-info/makePlayBillPicUrl?activityInfoId=
${
activityInfoId
}
`
);
}
}
};
};
src/components/groupShare.vue
View file @
dcebf31a
...
@@ -66,6 +66,13 @@ export default {
...
@@ -66,6 +66,13 @@ export default {
// this.tipDialogMessage();
// this.tipDialogMessage();
// return;
// return;
// }
// }
// this.nativeBridge.openNewUrl({
// event: 'openNewUrl',
// data: {
// newUrl: `xyqb://myOrderDetail?orderNo=1442043384637345792&needLogin=1`
// }
// });
this
.
type
=
type
;
this
.
type
=
type
;
if
(
typeof
shareInfo
===
'
object
'
)
{
if
(
typeof
shareInfo
===
'
object
'
)
{
this
.
sharePicData
=
shareInfo
;
this
.
sharePicData
=
shareInfo
;
...
...
src/service/utils.service.js
View file @
dcebf31a
...
@@ -4,6 +4,7 @@ const jsBridge = new Bridge();
...
@@ -4,6 +4,7 @@ const jsBridge = new Bridge();
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
config
from
'
@/config
'
;
import
config
from
'
@/config
'
;
export
const
EventBus
=
new
Vue
();
export
const
EventBus
=
new
Vue
();
import
qs
from
'
qs
'
;
/**
/**
* 替换邮箱字符
* 替换邮箱字符
* @param {String} email 输入字符串
* @param {String} email 输入字符串
...
@@ -366,15 +367,16 @@ export function setAppTitleColor(bgcolor = '#fff') {
...
@@ -366,15 +367,16 @@ export function setAppTitleColor(bgcolor = '#fff') {
}
}
export
function
paramsParentheses
(
pointer
)
{
export
function
paramsParentheses
(
pointer
)
{
cons
t
params
=
pointer
.
$route
.
query
;
le
t
params
=
pointer
.
$route
.
query
;
const
path
=
pointer
.
$route
.
path
;
const
path
=
pointer
.
$route
.
path
;
let
tempString
=
''
;
params
.
vccToken
&&
delete
params
.
vccToken
;
for
(
let
key
in
params
)
{
const
paramsString
=
qs
.
stringify
(
params
);
let
option
=
`
${
key
}
=
${
params
[
key
]}
`
;
// for (let key in params) {
tempString
+=
`$
${
option
}
`
;
// let option = `${key}=${params[key]}`;
}
// tempString += `$${option}`;
if
(
tempString
.
length
)
{
// }
tempString
=
`
${
config
.
localHost
}${
path
}
!`
+
tempString
.
slice
(
1
);
// if (tempString.length) {
}
// tempString = `${config.localHost}${path}!` + tempString.slice(1);
return
tempString
;
// }
return
`
${
config
.
localHost
}${
path
}
?`
+
paramsString
;
}
}
src/store/module.js
View file @
dcebf31a
...
@@ -106,8 +106,8 @@ const mutations = {
...
@@ -106,8 +106,8 @@ const mutations = {
const
[
res
]
=
await
groupBuy
.
getScheme
({
const
[
res
]
=
await
groupBuy
.
getScheme
({
miniUrl
:
'
pages/groupbuy/webview
'
,
miniUrl
:
'
pages/groupbuy/webview
'
,
// miniUrl: 'pages/product/goodDetail',
// miniUrl: 'pages/product/goodDetail',
params
:
`from=group
b
uy&url=
${
encodeURIComponent
(
params
:
`from=group
B
uy&url=
${
encodeURIComponent
(
JSON
.
stringify
(
paramsParentheses
(
pointer
))
JSON
.
stringify
(
paramsParentheses
(
pointer
)
+
'
&vccToken={token}
'
)
)}
`
)}
`
});
});
const
url
=
res
;
const
url
=
res
;
...
...
src/views/goodsList/index.vue
View file @
dcebf31a
...
@@ -209,11 +209,12 @@ export default {
...
@@ -209,11 +209,12 @@ export default {
shareTitle
,
shareTitle
,
shareSubTitle
,
shareSubTitle
,
shareIconUrl
,
shareIconUrl
,
img
img
,
title
}
=
this
.
goodsTemp
;
}
=
this
.
goodsTemp
;
const
{
activityId
}
=
this
;
const
{
activityId
}
=
this
;
return
Promise
.
resolve
({
return
Promise
.
resolve
({
skuName
:
shareTitle
,
skuName
:
shareTitle
||
title
,
desc
:
shareSubTitle
,
desc
:
shareSubTitle
,
skuImg
:
shareIconUrl
||
img
,
skuImg
:
shareIconUrl
||
img
,
posterUrl
:
sharePosterTemplateUrl
,
posterUrl
:
sharePosterTemplateUrl
,
...
...
src/views/orderList/components/List.vue
View file @
dcebf31a
...
@@ -164,7 +164,9 @@ export default {
...
@@ -164,7 +164,9 @@ export default {
else
if
(
isWxMp
)
this
.
nativeBridge
=
new
MpBridge
();
else
if
(
isWxMp
)
this
.
nativeBridge
=
new
MpBridge
();
},
},
methods
:
{
methods
:
{
finishTimeChange
()
{},
finishTimeChange
()
{
this
.
$emit
(
'
finish-time
'
);
},
goGroupBuyList
(
itemInfo
)
{
goGroupBuyList
(
itemInfo
)
{
this
.
$router
.
replace
({
this
.
$router
.
replace
({
path
:
'
/groupBuy/list
'
,
path
:
'
/groupBuy/list
'
,
...
@@ -180,9 +182,11 @@ export default {
...
@@ -180,9 +182,11 @@ export default {
newUrl
:
`/pages/order/orderDetail?orderNo=
${
skuInfo
.
orderNo
}
`
newUrl
:
`/pages/order/orderDetail?orderNo=
${
skuInfo
.
orderNo
}
`
});
});
}
else
if
(
isApp
)
{
}
else
if
(
isApp
)
{
// alert(JSON)
this
.
nativeBridge
.
openNewUrl
({
this
.
nativeBridge
.
openNewUrl
({
newUrl
:
`http://orderDetail?orderNo=111111111 `
event
:
'
openNewUrl
'
,
data
:
{
newUrl
:
`xyqb://myOrderDetail?orderNo=
${
skuInfo
.
orderN
}
&needLogin=1`
}
});
});
}
}
},
},
...
...
src/views/orderList/index.vue
View file @
dcebf31a
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
:finished=
"item.finished"
:finished=
"item.finished"
@
load=
"handleLoad"
@
load=
"handleLoad"
@
option-click=
"handleOptionClick"
@
option-click=
"handleOptionClick"
@
finish-time=
"finishTimeChange"
/>
/>
</cr-tab>
</cr-tab>
</cr-tabs>
</cr-tabs>
...
@@ -68,6 +69,13 @@ export default {
...
@@ -68,6 +69,13 @@ export default {
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
finishTimeChange
()
{
// 倒计时结束之后刷新
this
.
setNavListData
(
'
list
'
,
[]);
this
.
setNavListData
(
'
finished
'
,
false
);
this
.
setNavListData
(
'
page
'
,
1
);
this
.
getList
();
},
getstatusQuery
()
{
getstatusQuery
()
{
const
{
status
}
=
this
.
$route
.
params
||
{};
const
{
status
}
=
this
.
$route
.
params
||
{};
status
&&
(
this
.
currentTab
=
Number
(
status
));
status
&&
(
this
.
currentTab
=
Number
(
status
));
...
@@ -102,7 +110,6 @@ export default {
...
@@ -102,7 +110,6 @@ export default {
pageSize
,
pageSize
,
status
status
});
});
// console.log(res.records);
if
(
res
?.
records
?.
length
)
{
if
(
res
?.
records
?.
length
)
{
this
.
setNavListData
(
'
loading
'
,
false
);
this
.
setNavListData
(
'
loading
'
,
false
);
list
=
[...
list
,
...
res
.
records
];
list
=
[...
list
,
...
res
.
records
];
...
...
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