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
0e73da29
Commit
0e73da29
authored
Sep 26, 2023
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
no message
parents
f4eb07b8
ecb92346
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
583 additions
and
229 deletions
+583
-229
style4.vue
components/cats/style4.vue
+13
-0
style44.vue
components/cats/style44.vue
+62
-6
goodsku.vue
components/goods/goodsku.vue
+8
-0
goodsku2.vue
components/goods/goodsku2.vue
+34
-15
pay.vue
components/pay/pay.vue
+0
-2
submit2Pay.vue
components/pay/submit2Pay.vue
+95
-40
pages.json
pages.json
+1
-3
address2.vue
pages/address/address2.vue
+0
-5
cart.vue
pages/cart/cart.vue
+41
-1
goods.vue
pages/goods/goods.vue
+147
-89
order-submit2.vue
pages/order-submit/order-submit2.vue
+147
-52
index.vue
pages/order/index/index.vue
+4
-1
webbox.vue
pages/webbox/webbox.vue
+25
-8
api.js
plugin/api.js
+6
-7
No files found.
components/cats/style4.vue
View file @
0e73da29
...
...
@@ -46,6 +46,9 @@
<div
v-if=
"u.TenantId!=27"
class=
"price"
:style=
"
{ color: mainColor }">
{{
cx
.
price_content
}}
</div>
<view
v-if=
"u.TenantId!=27"
class=
"origin"
>
{{
cx
.
original_price_content
}}
</view>
<div
v-if=
"u.TenantId!=27"
class=
"sell"
>
{{
cx
.
sales
}}
</div>
</div>
...
...
@@ -69,6 +72,9 @@
<view
class=
"vip2"
:style=
"
{ color: mainColor }">
{{
cx
.
price_content
}}
</view>
<view
v-if=
"cx.original_price_content && cx.original_price > 0"
class=
"origin"
:style=
"
{ color: mainColor }">
{{
cx
.
original_price_content
}}
</view>
<div
@
click
.
stop=
"showSkuHandler(cx)"
class=
"right"
>
<!-- todo 点击加入购物车-->
...
...
@@ -248,6 +254,13 @@
</
script
>
<
style
>
.origin
{
font-family
:
"oswald"
;
font-size
:
28
rpx
;
color
:
#999
;
text-decoration
:
line-through
;
margin-left
:
10
rpx
;
}
.vip2
{
font-size
:
16px
;
margin-right
:
10
rpx
;
...
...
components/cats/style44.vue
View file @
0e73da29
...
...
@@ -52,14 +52,14 @@
<!-- 内容 -->
</view>
<!-- 新增分类科目结束 -->
<view
class=
"catstyle4"
style=
"height: 100%;"
>
<view
class=
"catstyle4"
style=
"height: 100%;
margin-bottom: 20rpx;
"
>
<!--
<div
class=
"left-slider"
>
<sidebar
:active=
"tid"
name=
"Name"
:active-color=
"mainColor"
:border=
"false"
:list=
"d"
@
change=
"changeHandler"
@
change2=
"changeHandler2"
></sidebar>
</div>
-->
<div
class=
"right-slider"
>
<scroll-view
:scroll-y=
"true"
@
scrolltolower=
"lower"
:enable-back-to-top=
"true"
:enable-flex=
"true"
:style=
"
{ height: '100%' }
">
style=
"height:calc(100vh - 35rpx);
"
>
<div
class=
"adbox"
v-if=
"d[tid].advert_pic"
@
click=
"clickHandler(d[tid].advert_url)"
>
<image
mode=
"aspectFit"
:src=
"d[tid].advert_url"
style=
"width: 100%; height: 100%;"
/>
</div>
...
...
@@ -75,7 +75,7 @@
</image>
</div>
<div
class=
"good-info"
>
<div
class=
"good-name"
>
<div
class=
"good-name"
:class=
"[cx.edudata.ClassCondition.length>0?'good-namee2':'']"
>
<view
v-if=
"cx.marketingLogo.iswords && cx.marketingLogo.iswords==1&& cx.marketingLogo.words!=''"
class=
"Logo"
:style=
"
{color: cx.marketingLogo.wordsColor,
...
...
@@ -90,7 +90,16 @@
{{
cx
.
freeShippingFullMoneyPinkage
>
0
&&
cx
.
freeShippingFullNumPinkage
==
0
?
cx
.
freeShippingFullMoneyPinkage
+
'元包邮'
:
''
}}
{{
cx
.
freeShippingFullMoneyPinkage
==
0
&&
cx
.
freeShippingFullNumPinkage
>
0
?
cx
.
freeShippingFullNumPinkage
+
'件包邮'
:
''
}}
</view>
<view
class=
"The-title"
>
{{
cx
.
name
}}
</view>
<view
v-if=
"cx.edudata.ClassCondition.length>0"
class=
"limit"
@
touchstart=
"mouseover()"
@
touchend=
"mouseLeave()"
>
<u-icon
name=
"lock"
size=
"44"
:color=
"mainColor"
/>
<view
class=
"limit-box"
v-show=
"limitShow"
>
此课程有报名限制,请点击详情查看
</view>
</view>
</div>
<div
class=
"goodprice"
>
<div
class=
"left"
>
...
...
@@ -164,6 +173,9 @@
<div
v-if=
"u.TenantId!=27"
class=
"price"
:style=
"
{ color: mainColor }">
{{
cx
.
price_content
}}
</div>
<view
v-if=
"u.TenantId!=27 && cx.price_content !== cx.original_price_content"
class=
"origin"
>
{{
cx
.
original_price_content
}}
</view>
<div
v-if=
"u.TenantId!=27"
class=
"sell"
>
{{
cx
.
sales
}}
</div>
</div>
<div
v-if=
"u.TenantId!=27"
@
click
.
stop=
"showSkuHandler(cx)"
class=
"right"
>
...
...
@@ -186,6 +198,9 @@
<view
class=
"vip2"
:style=
"
{ color: mainColor }">
{{
cx
.
price_content
}}
</view>
<view
v-if=
"cx.original_price_content && cx.original_price > 0 &&cx.original_price>cx.level_price && cx.price_content !== cx.original_price_content"
class=
"origin"
>
{{
cx
.
original_price_content
}}
</view>
<div
@
click
.
stop=
"showSkuHandler(cx)"
class=
"right"
>
<!-- todo 点击加入购物车-->
...
...
@@ -195,7 +210,7 @@
</view>
</
template
>
</div>
<u-divider
v-if=
"isover"
:margin-top=
"20"
:margin-bottom=
"20"
>
没有更多商品了
</u-divider>
<u-divider
class=
"The-tail"
v-if=
"isover"
:margin-top=
"20"
:margin-bottom=
"20"
bg-color=
"transparent"
>
没有更多商品了
</u-divider>
</scroll-view>
</div>
<
template
v-if=
"u&&u.TenantId==27"
>
...
...
@@ -222,6 +237,7 @@
props
:
[
"d"
,
"h"
],
data
()
{
return
{
limitShow
:
false
,
ind
:
1
,
show
:
false
,
Theclass
:
[{
...
...
@@ -294,6 +310,14 @@
// this.u = uni.getStorageSync('mall_UserInfo5')
},
methods
:
{
// 鼠标移进时间
mouseover
(){
// console.log('44444')
this
.
limitShow
=
true
},
mouseLeave
()
{
this
.
limitShow
=
false
},
remaining
(
i
)
{
this
.
$nextTick
(
function
()
{
i
.
show
=
!
i
.
show
...
...
@@ -513,6 +537,7 @@
);
},
lower
(
e
)
{
// console.log('4444')
if
(
this
.
msg
.
pageIndex
<
this
.
page_count
)
{
if
(
!
this
.
loading
)
{
this
.
msg
.
pageIndex
++
;
...
...
@@ -533,7 +558,38 @@
};
</
script
>
<
style
>
<
style
>
.origin
{
font-family
:
"oswald"
;
font-size
:
24
rpx
;
color
:
#999
;
text-decoration
:
line-through
;
margin
:
0
10
rpx
;
}
/* .The-tail >>> .u-divider{
background-color: transparent !important;
} */
.The-title
{
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
}
.limit
{
/* position: relative; */
}
.limit-box
{
position
:
absolute
;
right
:
0px
;
font-size
:
12px
;
color
:
#fff
;
background-color
:
rgba
(
0
,
0
,
0
,
0.6
);
padding
:
10px
;
border-radius
:
10
rpx
;
}
.good-namee2
{
display
:
flex
!important
;
position
:
relative
;
}
.rema3
{
margin-bottom
:
8
rpx
;
}
...
...
components/goods/goodsku.vue
View file @
0e73da29
...
...
@@ -16,6 +16,7 @@
</view>
</view>
</view>
<scroll-view
scroll-y
class=
"sku-box"
>
<view
class=
"sku-item"
v-for=
"(x, i) in g.attr_groups"
:key=
"i"
>
<view
class=
"sku-title"
>
{{
x
.
attr_group_name
}}
</view>
...
...
@@ -491,6 +492,13 @@
</
script
>
<
style
>
.origin
{
font-family
:
"oswald"
;
font-size
:
14px
;
color
:
#999
;
text-decoration
:
line-through
;
margin-left
:
10
rpx
;
}
.goodsku
{
position
:
relative
;
padding
:
10px
;
...
...
components/goods/goodsku2.vue
View file @
0e73da29
...
...
@@ -9,6 +9,10 @@
<text
class=
"small"
>
¥
</text>
<text>
{{
goodprice
}}
</text>
</view>
<view
class=
"origin"
v-if=
"good_original_price && good_original_price >0 && good_original_price > goodprice"
>
<text
class=
"small"
>
¥
</text>
<text>
{{
good_original_price
}}
</text>
</view>
<view
class=
"amount amount2"
>
可报名额
{{
goodamount
}}
人
</view>
<view
class=
"sku_close"
>
<u-icon
name=
"cross"
color=
"#9F9F9F"
@
click=
"cloGood()"
size=
"40"
/>
...
...
@@ -31,17 +35,15 @@
说明:以下物品需与当前课程绑定购买
</text>
</text>
</view>
<view
class=
"val3 sku-chi2"
:style=
"
{
background: y.attr_id == x.checkId ? mc : '#eee',
color: y.attr_id == x.checkId ? '#FFF' : '#333'
}" v-if="notes" v-for="(item, index) in g.goodsRelevanceList" :key="index">
}"
v-if="notes" v-for="(item, index) in g.goodsRelevanceList" :key="index">
<text>
{{
item
.
RelevanceName
}}
</text>
<text>
¥
</text>
<text>
{{
item
.
RelevancePrice
}}
</text>
</view>
<view
class=
"btn-box"
v-if=
"g.totalStock>0&& g.status==1 && (g.form_id == -1 || g.form_id ==0)"
>
<view
style=
"flex: 1;"
v-if=
"optionType != 1"
>
...
...
@@ -114,6 +116,7 @@
notes
:
true
,
goodimage
:
''
,
goodprice
:
''
,
good_original_price
:
0.00
,
goodamount
:
''
,
mc
:
''
,
fu
:
''
,
...
...
@@ -182,7 +185,6 @@
GoodsId
:
this
.
good
.
id
}
},
res
=>
{
this
.
g
=
res
.
data
.
goods
;
this
.
g
.
totalStock
=
0
;
...
...
@@ -193,43 +195,52 @@
this
.
mc
=
this
.
$uiConfig
.
mainColor
;
this
.
fu
=
this
.
$uiConfig
.
secondary
;
this
.
secondary
=
this
.
$uiConfig
.
secondary
;
var
jjxkt_original_price
=
0
;
//原价
if
(
this
.
g
.
jjxkt_original_price
&&
this
.
g
.
jjxkt_original_price
>
0
)
{
jjxkt_original_price
=
this
.
g
.
jjxkt_original_price
;
}
this
.
skuObj
=
this
.
skued
.
id
?
this
.
skued
:
null
;
if
(
this
.
skuObj
)
{
this
.
goodimage
=
this
.
skuObj
.
pic_url
||
this
.
g
.
cover_pic
;
this
.
goodamount
=
this
.
skuObj
.
stock
;
// var tempGoodprice = (parseFloat(this.skuObj.price) * parseFloat(this.g.attr_groups[0].service_time)).toFixed(2);
// var tempGoodprice = (this.skuObj.price).toFixed(2);
if
(
this
.
g
.
goodsRelevanceList
&&
this
.
g
.
goodsRelevanceList
.
length
>
0
)
{
this
.
$nextTick
(()
=>
{
this
.
g
.
goodsRelevanceList
.
forEach
(
item
=>
{
// tempGoodprice += parseFloat(item.RelevancePrice).toFixed(2)
this
.
goodprice
=
(
parseFloat
(
this
.
skuObj
.
price
)
+
parseFloat
(
item
.
RelevancePrice
)).
toFixed
(
2
)
.
RelevancePrice
)).
toFixed
(
2
);
//计算原价
if
(
jjxkt_original_price
>
0
)
{
this
.
good_original_price
=
(
parseFloat
(
jjxkt_original_price
)
+
parseFloat
(
item
.
RelevancePrice
)).
toFixed
(
2
);
}
});
})
}
else
{
this
.
$nextTick
(()
=>
{
this
.
goodprice
=
(
parseFloat
(
this
.
g
.
price
)).
toFixed
(
2
);
this
.
good_original_price
=
(
parseFloat
(
jjxkt_original_price
)).
toFixed
(
2
);
})
}
// this.goodprice = tempGoodprice
}
else
{
this
.
goodimage
=
this
.
g
.
cover_pic
;
// var tempGoodprice = (this.g.price).toFixed(2);
this
.
goodamount
=
this
.
g
.
goods_stock
;
if
(
this
.
g
.
goodsRelevanceList
&&
this
.
g
.
goodsRelevanceList
.
length
>
0
)
{
this
.
$nextTick
(()
=>
{
this
.
g
.
goodsRelevanceList
.
forEach
(
item
=>
{
// tempGoodprice += parseFloat(item.RelevancePrice).toFixed(2)
this
.
goodprice
=
(
parseFloat
(
this
.
g
.
price
)
+
parseFloat
(
item
.
RelevancePrice
)).
toFixed
(
2
)
.
RelevancePrice
)).
toFixed
(
2
);
//计算原价
if
(
jjxkt_original_price
>
0
)
{
this
.
good_original_price
=
(
parseFloat
(
jjxkt_original_price
)
+
parseFloat
(
item
.
RelevancePrice
)).
toFixed
(
2
);
}
});
})
}
else
{
this
.
$nextTick
(()
=>
{
this
.
goodprice
=
(
parseFloat
(
this
.
g
.
price
)).
toFixed
(
2
);
this
.
good_original_price
=
(
parseFloat
(
jjxkt_original_price
)).
toFixed
(
2
);
})
}
}
...
...
@@ -554,6 +565,14 @@
</
script
>
<
style
>
.origin
{
font-family
:
"oswald"
;
font-size
:
14px
;
color
:
#999
;
text-decoration
:
line-through
;
margin-left
:
10
rpx
;
}
.amount2
{
margin-top
:
40
rpx
;
}
...
...
components/pay/pay.vue
View file @
0e73da29
...
...
@@ -32,8 +32,6 @@ export default {
return
{
show
:
true
,
orderInfo
:
{},
};
},
created
()
{
...
...
components/pay/submit2Pay.vue
View file @
0e73da29
...
...
@@ -14,7 +14,8 @@
<img
style=
"width:50rpx;height:50rpx;margin-right:10px"
:src=
"item.src"
alt=
""
/>
<span
style=
"position:relative;top:-7px"
>
{{
item
.
Name
}}
</span>
</p>
-->
<u-radio-group
v-model=
"payment"
:size=
"36"
:active-color=
'mc'
@
change=
"radioChange"
:wrap=
"true"
>
<u-radio-group
v-model=
"payment"
:size=
"36"
:active-color=
'mc'
@
change=
"radioChange"
:wrap=
"true"
>
<u-radio
shape=
"circle"
:name=
"0"
:wrap=
"true"
>
<img
style=
"width:50rpx;height:50rpx;margin-right:10px"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/wx.png"
alt=
""
/>
...
...
@@ -55,7 +56,9 @@
</view>
<view
class=
"Alipay-text4"
@
click=
"send()"
style=
"margin-bottom: 86rpx;"
>
去发送
<button
open-type=
"contact"
send-message-title=
"支付"
style=
"position: absolute;left: 0;top: 0;width: 100%;height: 100%;opacity: 0;"
:show-message-card=
"true"
>
0
</button>
<button
open-type=
"contact"
send-message-title=
"支付"
style=
"position: absolute;left: 0;top: 0;width: 100%;height: 100%;opacity: 0;"
:show-message-card=
"true"
>
0
</button>
</view>
...
...
@@ -84,7 +87,8 @@
props
:
[
'payInfo'
,
'isAlipay'
,
'StuId'
,
'TeacherIds'
],
data
()
{
return
{
url
:
''
,
times
:
null
,
url
:
''
,
AlipayMask
:
false
,
mc
:
{},
payment
:
0
,
...
...
@@ -109,9 +113,21 @@
};
},
created
()
{
console
.
log
(
wx
)
// console.log(wx)
this
.
getDataInfo
();
this
.
u
=
uni
.
getStorageSync
(
'mall_UserInfo'
)
this
.
mc
=
this
.
$uiConfig
.
mainColor
;
this
.
TimingState
();
this
.
times
=
setInterval
(()
=>
{
this
.
TimingState
();
},
30000
);
},
onShow
()
{
this
.
TimingState
();
this
.
times
=
setInterval
(()
=>
{
this
.
TimingState
();
},
30000
);
},
wacth
:
{
payInfo
:
{
...
...
@@ -122,6 +138,52 @@
}
},
methods
:
{
// 定时查询状态
TimingState
()
{
let
that
=
this
this
.
request2
({
url
:
'/api/AppletOrder/GetAppletMyOrderInfo'
,
data
:
{
OrderId
:
this
.
payInfo
.
OrderId
,
NewUserId
:
0
}
},
(
res
)
=>
{
if
(
res
.
data
.
OrderStatus
==
5
)
{
clearInterval
(
this
.
times
);
uni
.
navigateTo
({
url
:
`/pages/order-submit/pay-success2?payInfo=
${
JSON
.
stringify
(
that
.
payInfo
)}
&StuId=
${
that
.
StuId
}
&TeacherIds=
${
that
.
TeacherIds
}
`
// url: '/pages/order-submit/pay-success2?payInfo='+JSON.stringify(that.payInfo)
});
that
.
pay
=
false
}
// console.log('状态',res.data.OrderStatus)
}
);
},
// 微信支付一开始的请求
getDataInfo
()
{
let
that
=
this
;
// console.log("要发送的参数",that.payInfo)
let
msg
=
{
OpenId
:
that
.
payInfo
.
OpenId
,
OrderId
:
that
.
payInfo
.
OrderId
,
OrderPayType
:
that
.
payInfo
.
OrderPayType
,
GoodsName
:
that
.
payInfo
.
GoodsName
};
this
.
request2
(
{
url
:
'/api/WeChatPay/GetPayInfo'
,
data
:
msg
},
res
=>
{
if
(
res
.
resultCode
==
1
)
{
this
.
orderInfo
=
JSON
.
parse
(
res
.
data
);
}
uni
.
hideNavigationBarLoading
();
}
);
},
radioChange
(
e
)
{
if
(
e
==
0
)
{
this
.
payType
=
'wx_lite'
...
...
@@ -135,7 +197,6 @@
},
// 支付宝发送发送
send
()
{
},
copy
()
{
uniCopy
({
...
...
@@ -159,8 +220,11 @@
closePay
()
{
this
.
$emit
(
'closePay'
);
},
// 支付宝支付
Pay
()
{
// if (this.payment == 0) {
if
(
this
.
payType
==
'wx_lite'
)
{
this
.
wxPay
()
}
else
{
let
msg
=
{
'pay_channel'
:
this
.
payType
,
//网页打开支付宝支付:alipay_wap 支付宝正扫:alipay_qr 支付宝app:alipay 微信小程序:wx_lite 微信公众号:wx_pub
...
...
@@ -182,7 +246,7 @@
if
(
res
.
data
!=
''
)
{
if
(
this
.
payType
!=
'wx_lite'
)
{
this
.
aliPay
(
res
.
data
)
this
.
AlipayMask
=
true
this
.
AlipayMask
=
true
this
.
pay
=
false
}
else
{
this
.
wxPay
(
JSON
.
parse
(
res
.
data
))
...
...
@@ -193,14 +257,9 @@
icon
:
'error'
})
}
// uni.hideNavigationBarLoading();
}
);
// }
// else {
// this.AlipayMask = true
// this.pay = false
// }
}
},
// 支付宝支付
...
...
@@ -212,21 +271,22 @@
// 微信支付
wxPay
(
payData
)
{
let
that
=
this
let
orderInfo
=
this
.
orderInfo
;
uni
.
showLoading
({
title
:
'支付中...'
})
wx
.
requestPayment
({
"timeStamp"
:
payData
.
timeStamp
,
//时间戳,自1970年以来的秒数
"nonceStr"
:
payData
.
nonceStr
,
//随机串
"package"
:
payData
.
package
,
"signType"
:
payData
.
signType
,
//微信签名方式:
"paySign"
:
payData
.
paySign
,
//微信签名
'success'
:
function
(
res
)
{
uni
.
requestPayment
({
provider
:
'wxpay'
,
timeStamp
:
that
.
orderInfo
.
timeStamp
,
nonceStr
:
that
.
orderInfo
.
nonceStr
,
package
:
that
.
orderInfo
.
package
,
signType
:
that
.
orderInfo
.
signType
,
paySign
:
that
.
orderInfo
.
sign
,
success
:
function
(
res
)
{
uni
.
hideLoading
()
if
(
that
.
u
&&
that
.
u
.
TenantId
==
27
)
{
uni
.
navigateTo
({
url
:
`/pages/order-submit/pay-success2?payInfo=
${
JSON
.
stringify
(
that
.
payInfo
)}
&StuId=
${
that
.
StuId
}
&TeacherIds=
${
that
.
TeacherIds
}
`
// url: '/pages/order-submit/pay-success2?payInfo='+JSON.stringify(that.payInfo)
});
that
.
pay
=
false
}
else
{
...
...
@@ -236,22 +296,15 @@
});
that
.
pay
=
false
}
// uni.showToast({
// title:'支付成功'
// })
},
'fail'
:
function
(
res
)
{
fail
:
function
(
res
)
{
uni
.
hideLoading
()
uni
.
navigateTo
({
// url: `/pages/order-submit/pay-success2?payInfo=${JSON.stringify(that.payInfo)}&StuId=${that.StuId}&TeacherIds=${that.TeacherIds}`
url
:
'/pages/order/index/index?status=1'
});
that
.
pay
=
false
},
'complete'
:
function
(
res
)
{
// uni.showToast({
// title:res.errMsg
// })
complete
:
function
(
res
)
{
}
})
},
...
...
@@ -260,7 +313,7 @@
</
script
>
<
style
>
.fangs
{
.fangs
{
font-size
:
26
rpx
;
font-family
:
PingFang
SC
;
font-weight
:
bold
;
...
...
@@ -268,9 +321,11 @@
margin-right
:
10
rpx
;
width
:
60
rpx
;
}
.item-box
{
.item-box
{
position
:
relative
;
}
.Alipay-box
{
/* height: 930rpx; */
background
:
#FFFFFF
;
...
...
pages.json
View file @
0e73da29
...
...
@@ -256,9 +256,6 @@
},{
"path"
:
"pay-success2"
},
{
"path"
:
"pay-success2"
},
{
"path"
:
"order-submit"
},
{
...
...
@@ -897,6 +894,7 @@
//
}
//
]
//
}
],
"globalStyle"
:
{
"navigationBarTextStyle"
:
"black"
,
"navigationBarTitleText"
:
""
,
...
...
pages/address/address2.vue
View file @
0e73da29
...
...
@@ -214,11 +214,6 @@
that
.
requestJJSWAdmin
(
testCmd
,
postMsg
,
(
res
)
=>
{
if
(
res
.
data
.
Code
==
1
)
{
// uni.showToast({
// title: '提交成功',
// icon: 'exception',
// duration: 2000
// });
uni
.
navigateBack
({
delta
:
1
});
...
...
pages/cart/cart.vue
View file @
0e73da29
...
...
@@ -73,8 +73,19 @@
v-if=
"item.MarketingLogo.iswords&&item.MarketingLogo.iswords==2&& item.MarketingLogo.ico!=''"
mode=
"heightFix"
:src=
"item.MarketingLogo.ico"
style=
" height: 12px;margin-right: 5px"
/>
<view
class=
"The-box"
>
<view
class=
"The-title"
>
{{
item
.
GoodsName
}}
</view>
<view
v-if=
"item.EduData.ClassCondition.length>0"
class=
"limit"
@
touchstart=
"mouseover()"
@
touchend=
"mouseLeave()"
>
<u-icon
name=
"lock"
size=
"44"
:color=
"mc"
/>
<view
class=
"limit-box"
v-show=
"limitShow"
>
此课程有报名限制,请点击详情查看
</view>
</view>
</view>
</view>
<view
style=
"width: 440rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"
v-if=
"IsEducation!=1"
>
...
...
@@ -241,6 +252,7 @@
export
default
{
data
()
{
return
{
limitShow
:
false
,
isloading
:
false
,
pageTitle
:
'购物车'
,
navHeight
:
0
,
...
...
@@ -321,6 +333,13 @@
});
},
methods
:
{
mouseover
(){
// console.log('44444')
this
.
limitShow
=
true
},
mouseLeave
()
{
this
.
limitShow
=
false
},
remaining
(
i
)
{
this
.
$nextTick
(
function
()
{
i
.
show
=
!
i
.
show
...
...
@@ -723,6 +742,26 @@
</
script
>
<
style
>
.limit
{
/* position: relative; */
}
.limit-box
{
position
:
absolute
;
right
:
0px
;
font-size
:
12px
;
color
:
#fff
;
background-color
:
rgba
(
0
,
0
,
0
,
0.6
);
padding
:
10px
;
border-radius
:
10
rpx
;
}
.The-box
{
display
:
flex
;
}
.The-title
{
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
}
.rema
{
display
:
flex
;
flex-wrap
:
wrap
;
...
...
@@ -899,6 +938,7 @@
width
:
440
rpx
;
height
:
150
rpx
;
margin-left
:
20
rpx
;
position
:
relative
;
}
.cartStyle
.item-r-n2
{
...
...
pages/goods/goods.vue
View file @
0e73da29
This diff is collapsed.
Click to expand it.
pages/order-submit/order-submit2.vue
View file @
0e73da29
This diff is collapsed.
Click to expand it.
pages/order/index/index.vue
View file @
0e73da29
...
...
@@ -97,6 +97,7 @@
<auth
v-if=
"showAuth"
@
changeuserinfo=
"reloadUserinfo"
@
gbAuth=
'goback'
></auth>
<payCom
v-if=
"payBtn&&u.TenantId!=27"
:payInfo=
"payInfo"
@
closePay=
"closePay"
></payCom>
<submit2PayCom
v-if=
"payBtn&&u.TenantId==27"
:payInfo=
"payInfo"
:isAlipay=
"isAlipay"
:StuId=
'StuId'
:TeacherIds=
'TeacherIds'
@
closePay=
"closePay"
></submit2PayCom>
<u-popup
v-model=
"payExit"
mode=
"center"
:mask-close-able=
"false"
>
<view
style=
"background:#fff;width:500rpx"
>
<view
style=
"padding:10px 0 0 10px"
>
提交失败
</view>
...
...
@@ -322,6 +323,8 @@
this
.
Cancelmsg
.
OrderId
=
e
.
OrderId
;
this
.
Cancelmsg
.
Type
=
e
.
OrderStatus
==
1
?
1
:
2
;
},
// 待付款立即支付
payment
(
e
)
{
let
list
=
[]
this
.
payInfo
.
OrderId
=
e
.
OrderId
;
...
...
pages/webbox/webbox.vue
View file @
0e73da29
<
template
>
<web-view
:src=
"url"
v-if=
"!showPhone"
></web-view>
<view
v-else
class=
"indexassembly"
>
<web-view
:src=
"url"
></web-view>
<
!--
<
view
v-else
class=
"indexassembly"
>
<u-popup
v-model=
"showPhone"
mode=
"center"
length=
"auto"
>
<view
style=
"width: 70vw;"
class=
"mask"
>
<view
...
...
@@ -21,12 +21,14 @@
</view>
</view>
</u-popup>
</view>
</view>
-->
</
template
>
<
script
>
export
default
{
data
()
{
return
{
info
:{},
show
:
false
,
showPhone
:
true
,
showLogin
:
true
,
//多次点击
...
...
@@ -44,11 +46,19 @@
this
.
getCode
()
},
onLoad
:
function
(
option
)
{
//option为object类型,会序列化上个页面传递的参数
this
.
url
=
decodeURIComponent
(
option
.
u
)
if
(
option
.
auth
){
//
this.url = decodeURIComponent(option.u)
if
(
option
.
auth
||
option
.
limit
){
this
.
showPhone
=
true
if
(
option
.
limit
)
{
this
.
info
=
option
.
limit
// console.log('参数',this.info)
let
limiturls
=
`https://jj.kookaku.com?limit=
${
this
.
info
}
`
this
.
url
=
decodeURIComponent
(
limiturls
)
console
.
log
(
'要跳转的链接'
,
this
.
url
)
}
}
else
{
this
.
showPhone
=
false
this
.
url
=
decodeURIComponent
(
option
.
u
)
// this.showPhone =false
}
},
methods
:
{
...
...
@@ -133,8 +143,15 @@
(
res
)
=>
{
if
(
res
.
resultCode
==
1
)
{
that
.
obj
.
phoneNum
=
JSON
.
parse
(
res
.
data
).
phoneNumber
if
(
that
.
info
)
{
let
limiturls
=
`https://jj.kookaku.com?phoneNum=
${
that
.
obj
.
phoneNum
}
&limit=
${
that
.
info
}
`
that
.
url
=
decodeURIComponent
(
limiturls
)
}
else
{
let
urls
=
`https://jj.kookaku.com?phoneNum=
${
that
.
obj
.
phoneNum
}
`
that
.
url
=
decodeURIComponent
(
urls
)
}
that
.
showPhone
=
false
console
.
log
(
'要跳转的链接'
,
that
.
url
)
// that.goUrl(`https://jj.kookaku.com?phoneNum=${that.obj.phoneNum}`)
...
...
plugin/api.js
View file @
0e73da29
export
default
{
install
(
Vue
,
options
)
{
Vue
.
prototype
.
host
=
"https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
Vue
.
prototype
.
host2
=
"http://192.168.10.128:8200"
//本地
// Vue.prototype.host2 = "http://192.168.10.46:8200"
//Vue.prototype.host2 = "http://192.168.10.128:8200"
//Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
Vue
.
prototype
.
host2
=
"https://mallApi.oytour.com"
//测试
//进阶思维后台地址
//
Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
//Vue.prototype.host3 = "http://192.168.10.128:8900"//本地
Vue
.
prototype
.
host3
=
"https://jjeduapi.oytour.com"
//测试
Vue
.
prototype
.
UploadConfig
=
function
()
{
//本地上传配置
return
{
...
...
@@ -140,13 +138,14 @@ export default {
msg
:
postMsg
},
success
:
res
=>
{
typeof
success
==
"function"
&&
success
(
res
);
if
(
res
.
data
.
Code
==
10000
)
{
let
u
=
uni
.
getStorageSync
(
"mall_UserInfo"
);
if
(
u
)
{
this
.
getLogin_t
(
u
)
}
}
else
if
(
res
.
Code
==
1
)
{
}
else
if
(
res
.
data
.
Code
==
0
)
{
}
else
if
(
res
.
data
.
Code
!=
1
)
{
...
...
@@ -213,7 +212,7 @@ export default {
// 获取小程序APPID
Vue
.
prototype
.
GetMiniAppId
=
function
()
{
let
appObj
=
{};
let
appType
=
4
;
let
appType
=
13
;
switch
(
appType
)
{
case
1
:
//赞羊
appObj
=
{
...
...
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