Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
viitto
mallapp
Commits
df698d07
Commit
df698d07
authored
Jun 28, 2020
by
zhangjianguo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
a52407a0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
67 additions
and
19 deletions
+67
-19
goods.vue
pages/goods/goods.vue
+2
-1
index.vue
pages/index/index.vue
+33
-11
refunds.vue
pages/order/after-sale/refunds.vue
+3
-3
index.vue
pages/order/index/index.vue
+3
-3
order-detail.vue
pages/order/order-detail.vue
+1
-1
api.js
plugin/api.js
+25
-0
No files found.
pages/goods/goods.vue
View file @
df698d07
...
@@ -313,9 +313,10 @@ export default {
...
@@ -313,9 +313,10 @@ export default {
this
.
setting
=
uni
.
getStorageSync
(
"basedata"
).
mall
.
setting
this
.
setting
=
uni
.
getStorageSync
(
"basedata"
).
mall
.
setting
},
},
onShareAppMessage
(
res
)
{
onShareAppMessage
(
res
)
{
let
u
=
uni
.
getStorageSync
(
"mall_UserInfo"
);
return
{
return
{
title
:
this
.
g
.
app_share_title
!=
null
&&
this
.
g
.
app_share_title
!=
''
?
this
.
g
.
app_share_title
:
this
.
g
.
name
,
title
:
this
.
g
.
app_share_title
!=
null
&&
this
.
g
.
app_share_title
!=
''
?
this
.
g
.
app_share_title
:
this
.
g
.
name
,
path
:
"/pages/goods/goods?id="
+
this
.
id
,
path
:
"/pages/goods/goods?id="
+
this
.
id
+
"&user_id="
+
u
.
UserId
?
u
.
UserId
:
0
,
imageUrl
:
this
.
g
.
app_share_pic
!=
null
&&
this
.
g
.
app_share_pic
!=
''
?
this
.
g
.
app_share_pic
:
this
.
g
.
pic_url
[
0
].
pic_url
,
imageUrl
:
this
.
g
.
app_share_pic
!=
null
&&
this
.
g
.
app_share_pic
!=
''
?
this
.
g
.
app_share_pic
:
this
.
g
.
pic_url
[
0
].
pic_url
,
};
};
},
},
...
...
pages/index/index.vue
View file @
df698d07
<
template
>
<
template
>
<view
class=
"content"
>
<view
class=
"content"
:style=
"
{ 'padding-bottom': showtabs==ture? '100rpx':0 }"
>
<u-tabs
<u-tabs
v-if=
"myPageData.home_pages.navs.length > 1"
v-if=
"myPageData.home_pages.navs.length > 1"
name=
"name"
name=
"name"
...
@@ -153,15 +153,10 @@ export default {
...
@@ -153,15 +153,10 @@ export default {
if
(
options
&&
options
.
user_id
){
if
(
options
&&
options
.
user_id
){
uni
.
setStorageSync
(
"pid"
,
{
pid
:
options
.
user_id
});
uni
.
setStorageSync
(
"pid"
,
{
pid
:
options
.
user_id
});
}
}
if
(
options
&&
options
.
scene
){
//兼容之前小程序的调转
if
(
options
&&
options
.
scene
){
//兼容之前小程序的调转
if
(
options
.
scene
==
'share'
&&
options
.
params
){
this
.
getjump
(
options
.
scene
)
setTimeout
(()
=>
{
uni
.
navigateTo
({
url
:
options
.
params
.
path
+
'?id='
+
options
.
params
.
id
,
});
},
500
)
}
}
}
...
@@ -180,7 +175,7 @@ export default {
...
@@ -180,7 +175,7 @@ export default {
onShareAppMessage
(
res
)
{
onShareAppMessage
(
res
)
{
return
{
return
{
title
:
this
.
setting
.
share_title
?
this
.
setting
.
share_title
:
uni
.
getStorageSync
(
"basedata"
).
mall
.
name
,
title
:
this
.
setting
.
share_title
?
this
.
setting
.
share_title
:
uni
.
getStorageSync
(
"basedata"
).
mall
.
name
,
path
:
"/pages/index/index?user_id="
+
uni
.
getStorageSync
(
'mall_UserInfo'
)
?
uni
.
getStorageSync
(
'mall_UserInfo'
).
UserId
:
''
,
path
:
"/pages/index/index?user_id="
+
uni
.
getStorageSync
(
'mall_UserInfo'
)
?
uni
.
getStorageSync
(
'mall_UserInfo'
).
UserId
:
0
,
imageUrl
:
this
.
setting
.
share_pic
?
this
.
setting
.
share_pic
:
''
,
imageUrl
:
this
.
setting
.
share_pic
?
this
.
setting
.
share_pic
:
''
,
};
};
},
},
...
@@ -193,6 +188,33 @@ export default {
...
@@ -193,6 +188,33 @@ export default {
},
},
methods
:
{
methods
:
{
getjump
(
scene
){
let
a
=
'YZnsGuRojCKBkb1siP3VwkhkPFvh-D'
//测试数据
this
.
request
(
{
url
:
""
,
data
:
{
r
:
"api/default/qr-code-parameter"
,
token
:
scene
,
}
},
res
=>
{
console
.
log
(
res
.
data
.
detail
.
path
)
uni
.
setStorageSync
(
"pid"
,
{
pid
:
res
.
data
.
detail
.
user_id
?
res
.
data
.
detail
.
user_id
:
0
});
//存储上级的id
let
objurl
=
this
.
ObjectToUrl
(
res
.
data
.
detail
.
data
)
uni
.
navigateTo
({
url
:
'/'
+
res
.
data
.
detail
.
path
+
'?'
+
objurl
,
});
}
);
},
ObjectToUrl
(
e
,
t
)
{
var
n
=
""
;
for
(
var
i
in
e
)
n
+=
"&"
+
i
+
"="
+
(
t
?
encodeURIComponent
(
e
[
i
])
:
e
[
i
]);
return
n
.
substr
(
1
);
},
init
()
{
init
()
{
this
.
request2
(
this
.
request2
(
{
{
...
@@ -273,7 +295,7 @@ export default {
...
@@ -273,7 +295,7 @@ export default {
flex-direction
:
column
;
flex-direction
:
column
;
/* align-items: center;
/* align-items: center;
justify-content: center; */
justify-content: center; */
padding-bottom
:
100
rpx
;
}
}
.content
.tips_t
{
.content
.tips_t
{
position
:
fixed
;
position
:
fixed
;
...
...
pages/order/after-sale/refunds.vue
View file @
df698d07
...
@@ -195,7 +195,7 @@ export default {
...
@@ -195,7 +195,7 @@ export default {
let
that
=
this
let
that
=
this
let
totelPrice
=
that
.
good
.
Final_Price
let
totelPrice
=
that
.
good
.
Final_Price
if
(
val
.
target
.
value
>
totelPrice
){
if
(
val
.
target
.
value
>
totelPrice
){
console
.
log
(
'进入'
)
that
.
forms
.
Refund
=
totelPrice
that
.
forms
.
Refund
=
totelPrice
}
}
...
@@ -219,7 +219,7 @@ export default {
...
@@ -219,7 +219,7 @@ export default {
if
(
!
that
.
submitStatus
)
{
if
(
!
that
.
submitStatus
)
{
that
.
submitStatus
=
true
;
that
.
submitStatus
=
true
;
let
msg
=
""
;
let
msg
=
""
;
console
.
log
(
that
.
forms
)
if
(
that
.
forms
.
Remark
==
""
)
{
if
(
that
.
forms
.
Remark
==
""
)
{
msg
=
"亲,请描述一下你遇到的问题吧"
;
msg
=
"亲,请描述一下你遇到的问题吧"
;
}
else
if
(
that
.
forms
.
Refund
<
0
){
}
else
if
(
that
.
forms
.
Refund
<
0
){
...
@@ -235,7 +235,7 @@ export default {
...
@@ -235,7 +235,7 @@ export default {
data
:
that
.
forms
data
:
that
.
forms
},
},
(
res
)
=>
{
(
res
)
=>
{
console
.
log
(
res
);
if
(
res
.
resultCode
==
1
)
{
if
(
res
.
resultCode
==
1
)
{
uni
.
showModal
({
uni
.
showModal
({
content
:
"提交售后申请成功,稍后客服专员将与您取得联系。"
,
content
:
"提交售后申请成功,稍后客服专员将与您取得联系。"
,
...
...
pages/order/index/index.vue
View file @
df698d07
...
@@ -144,13 +144,13 @@
...
@@ -144,13 +144,13 @@
v-if="item.OrderStatus == '4'"
v-if="item.OrderStatus == '4'"
>评价晒单</u-button
>评价晒单</u-button
> -->
> -->
<u-button
<
!-- <
u-button
shape="circle"
shape="circle"
size="medium"
size="medium"
:custom-style="customStyle"
:custom-style="customStyle"
v-if="item.OrderStatus == '6'"
v-if="item.OrderStatus == '6'"
>待处理</u-button
>待处理</u-button
>
>
-->
<u-button
<u-button
shape=
"circle"
shape=
"circle"
size=
"medium"
size=
"medium"
...
@@ -492,7 +492,7 @@ export default {
...
@@ -492,7 +492,7 @@ export default {
},
},
confirm
()
{
//取消订单
confirm
()
{
//取消订单
let
that
=
this
let
that
=
this
that
.
showModal
=
false
;
//
that.showModal = false;
if
(
that
.
Cancelmsg
.
Type
==
2
&&
that
.
Cancelmsg
.
Remark
==
''
){
if
(
that
.
Cancelmsg
.
Type
==
2
&&
that
.
Cancelmsg
.
Remark
==
''
){
uni
.
showToast
({
uni
.
showToast
({
title
:
'备注不能为空'
,
title
:
'备注不能为空'
,
...
...
pages/order/order-detail.vue
View file @
df698d07
...
@@ -440,7 +440,7 @@ export default {
...
@@ -440,7 +440,7 @@ export default {
},
},
confirm
()
{
confirm
()
{
let
that
=
this
let
that
=
this
that
.
showModal
=
false
;
//
that.showModal = false;
if
(
that
.
Cancelmsg
.
Type
==
2
&&
that
.
Cancelmsg
.
Remark
==
''
){
if
(
that
.
Cancelmsg
.
Type
==
2
&&
that
.
Cancelmsg
.
Remark
==
''
){
uni
.
showToast
({
uni
.
showToast
({
title
:
'备注不能为空'
,
title
:
'备注不能为空'
,
...
...
plugin/api.js
View file @
df698d07
export
default
{
export
default
{
install
(
Vue
,
options
)
{
install
(
Vue
,
options
)
{
Vue
.
prototype
.
host
=
"https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
// Vue.prototype.host2 = "http://192.168.0.110:8200"
// Vue.prototype.host2 = "http://192.168.0.110:8200"
Vue
.
prototype
.
host2
=
"https://mallApi.oytour.com"
Vue
.
prototype
.
host2
=
"https://mallApi.oytour.com"
// Vue.prototype.host2 = "http://192.168.2.16:8088"
// Vue.prototype.host2 = "http://192.168.2.16:8088"
// Vue.prototype.host2 = "http://192.168.2.65"
// Vue.prototype.host2 = "http://192.168.2.65"
Vue
.
prototype
.
request
=
function
(
param
,
success
,
failed
)
{
//网络请求
uni
.
request
({
url
:
this
.
host
+
"&r="
+
param
.
data
.
r
,
method
:
param
.
method
||
"GET"
,
header
:
param
.
header
||
{
'content-type'
:
"application/json"
},
data
:
param
.
data
,
success
:
res
=>
{
if
(
res
.
data
.
code
!=
0
&&
res
.
data
.
msg
!=
"商品未上架"
)
{
}
typeof
success
==
"function"
&&
success
(
res
.
data
);
},
fail
:
(
e
)
=>
{
console
.
log
(
"网络请求fail:"
+
JSON
.
stringify
(
e
));
uni
.
showModal
({
content
:
""
+
res
.
errMsg
});
typeof
failed
==
"function"
&&
failed
(
res
.
data
);
}
});
}
Vue
.
prototype
.
request2
=
function
(
param
,
success
,
failed
)
{
Vue
.
prototype
.
request2
=
function
(
param
,
success
,
failed
)
{
//网络请求
//网络请求
uni
.
request
({
uni
.
request
({
...
...
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