Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
FuLiMini
Project
Overview
Details
Activity
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
wangjian
FuLiMini
Commits
0d16903a
Commit
0d16903a
authored
Apr 27, 2022
by
wangjian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
a4b528a6
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
26 additions
and
26 deletions
+26
-26
AlertRecover.vue
components/AlertRecover/AlertRecover.vue
+3
-3
pwdCodeAlert.vue
components/pwdCodeAlert/pwdCodeAlert.vue
+0
-1
smsCodeAlert.vue
components/smsCodeAlert/smsCodeAlert.vue
+0
-1
coupon.vue
pagesA/coupon/coupon.vue
+15
-15
goods.vue
pagesA/goods/goods.vue
+4
-4
selectAccount.vue
pagesA/selectAccount/selectAccount.vue
+1
-1
recover-1.png
pagesA/static/recover-1.png
+0
-0
recover-2.png
pagesA/static/recover-2.png
+0
-0
submitOrder.vue
pagesA/submitOrder/submitOrder.vue
+3
-1
coupon-bg-w.png
static/coupon-bg-w.png
+0
-0
coupon-bottom-gray.png
static/coupon-bottom-gray.png
+0
-0
coupon-bottom-h.png
static/coupon-bottom-h.png
+0
-0
coupon-select-btn.png
static/coupon-select-btn.png
+0
-0
coupon-select-close.png
static/coupon-select-close.png
+0
-0
coupon-top-gray.png
static/coupon-top-gray.png
+0
-0
coupon-top-h.png
static/coupon-top-h.png
+0
-0
goods-customer.png
static/goods-customer.png
+0
-0
goods-home.png
static/goods-home.png
+0
-0
goods-left.png
static/goods-left.png
+0
-0
goods-right.png
static/goods-right.png
+0
-0
recover-bg.png
static/recover-bg.png
+0
-0
No files found.
components/AlertRecover/AlertRecover.vue
View file @
0d16903a
<
template
>
<view
class=
"container"
>
<view
class=
"content"
>
<image
class=
"close"
src=
"
../../pagesA
/static/close-gray.png"
mode=
""
@
click=
"close()"
></image>
<image
class=
"close"
src=
"
@
/static/close-gray.png"
mode=
""
@
click=
"close()"
></image>
<view
class=
"top"
>
<view
class=
"title"
>
卡券回收
</view>
</view>
...
...
@@ -9,9 +9,9 @@
<view
class=
"title"
>
卡片回收方法如下:
</view>
<view
class=
"first"
>
1.点击下方“确认回收”按钮,进入58同城小程序。
</view>
<view
class=
"second"
>
2.在58同城小程序的搜索框中输入“卡券”进行搜索,如下图:
</view>
<image
class=
"third"
src=
"
../../pagesA/static/recover-1
.png"
mode=
""
></image>
<image
class=
"third"
src=
"
https://static-walfare.wasair.com/goods/2022/04/27/f2d5fa585896d784551b8a3131eb6b34
.png"
mode=
""
></image>
<view
class=
"four"
>
3.在搜索结果中联系商家即可上门回收,如下图:
</view>
<image
class=
"five"
src=
"
../../pagesA/static/recover-2
.png"
mode=
""
></image>
<image
class=
"five"
src=
"
https://static-walfare.wasair.com/goods/2022/04/27/312c0872780557824aeb2d104ab3fd43
.png"
mode=
""
></image>
</view>
<view
class=
"buy-bottom"
@
click=
"goMini()"
>
确认回收
</view>
</view>
...
...
components/pwdCodeAlert/pwdCodeAlert.vue
View file @
0d16903a
...
...
@@ -46,7 +46,6 @@
return
}
this
.
$emit
(
'pwdSubmit'
,
this
.
pwd
)
this
.
close
()
},
close
()
{
this
.
pwd
=
''
...
...
components/smsCodeAlert/smsCodeAlert.vue
View file @
0d16903a
...
...
@@ -55,7 +55,6 @@
return
}
this
.
$emit
(
'smsCodeSubmit'
,
this
.
code
)
this
.
close
()
},
close
()
{
this
.
code
=
''
...
...
pagesA/coupon/coupon.vue
View file @
0d16903a
...
...
@@ -2,7 +2,7 @@
<view
class=
"container"
>
<view
class=
"top"
>
<view
class=
"nav"
:style=
"
{'height':height+4+'px','padding-top':statusBarHeight+'px'}">
<image
@
click=
"$router.pop()"
class=
"back"
src=
"../static/back-white.png"
mode=
"heightFix"
></image>
<image
@
click=
"$router.pop()"
class=
"back"
src=
"../
../
static/back-white.png"
mode=
"heightFix"
></image>
<view
class=
"title"
>
卡券信息
</view>
...
...
@@ -14,7 +14,7 @@
<view
class=
"money"
><text>
价值
</text>
¥
{{
couponData
.
cardCostTotal
}}
</view>
<view
class=
"tab"
>
<view
@
click=
"clickSelectBtn()"
class=
"btn"
:style=
"
{'opacity': selectBtnActive?'':'0.4'}">
<image
class=
"img"
:src=
"selectBtn?'../
static/coupon-select-close.png':'
../static/coupon-select-btn.png'"
mode=
""
></image>
<image
class=
"img"
:src=
"selectBtn?'../
../static/coupon-select-close.png':'../
../static/coupon-select-btn.png'"
mode=
""
></image>
<view
class=
"text"
>
批量管理
</view>
</view>
<view
@
click=
"clickType(100)"
class=
"item"
:class=
"[type==100?'active':'']"
>
...
...
@@ -27,12 +27,12 @@
</view>
<view
class=
"list"
v-if=
"list.length>0"
>
<view
class=
"coupon-content"
v-for=
"(item,index) in list"
:key=
"index"
>
<image
@
click=
"addItem(item)"
v-if=
"selectBtn"
class=
"select-img"
:src=
"selectCouponArray.indexOf(item.cardId)>-1?'../
static/select-h.png':'
../static/select-n.png'"
mode=
""
></image>
<image
@
click=
"addItem(item)"
v-if=
"selectBtn"
class=
"select-img"
:src=
"selectCouponArray.indexOf(item.cardId)>-1?'../
../static/select-h.png':'../
../static/select-n.png'"
mode=
""
></image>
<view
class=
"coupon-big"
>
<image
v-if=
"isExpired(item)"
class=
"expired"
src=
"../static/expired.png"
mode=
""
></image>
<image
v-if=
"isExpired(item)"
class=
"expired"
src=
"../
../
static/expired.png"
mode=
""
></image>
<view
class=
"goods-info"
>
<image
v-if=
"!isExpired(item)"
class=
"bg-img"
src=
"../static/coupon-top-h.png"
mode=
""
></image>
<image
v-if=
"isExpired(item)"
class=
"bg-img"
src=
"../static/coupon-top-gray.png"
mode=
""
></image>
<image
v-if=
"!isExpired(item)"
class=
"bg-img"
src=
"../
../
static/coupon-top-h.png"
mode=
""
></image>
<image
v-if=
"isExpired(item)"
class=
"bg-img"
src=
"../
../
static/coupon-top-gray.png"
mode=
""
></image>
<view
class=
"left"
>
<image
class=
"img"
:src=
"item.brandImg"
mode=
""
></image>
<view
class=
"info"
>
...
...
@@ -46,8 +46,8 @@
</view>
</view>
<view
class=
"coupon-info"
>
<image
v-if=
"!isExpired(item)"
class=
"bg-img"
src=
"../static/coupon-bottom-h.png"
mode=
""
></image>
<image
v-if=
"isExpired(item)"
class=
"bg-img"
src=
"../static/coupon-bottom-gray.png"
mode=
""
></image>
<image
v-if=
"!isExpired(item)"
class=
"bg-img"
src=
"../
../
static/coupon-bottom-h.png"
mode=
""
></image>
<image
v-if=
"isExpired(item)"
class=
"bg-img"
src=
"../
../
static/coupon-bottom-gray.png"
mode=
""
></image>
<view
class=
"left"
>
<view
v-if=
"item.cardAccount"
>
卡号:
{{
item
.
cardAccount
}}
<text
v-if=
"type==200"
@
click=
"copy(item.cardAccount)"
>
复制
</text></view>
<view>
卡密:
{{
item
.
cardPasswd
}}
<text
v-if=
"type==200"
@
click=
"copy(item.cardPasswd)"
>
复制
</text></view>
...
...
@@ -62,12 +62,12 @@
</view>
<uni-load-more
:status=
"loadingType"
v-if=
"list.length>0"
></uni-load-more>
<view
class=
"empty"
v-if=
"list.length
<
=
0
&&
loadingType
!=
'
loading
'"
>
<image
class=
"empty-img"
src=
"../static/empty-coupon.png"
mode=
""
></image>
<image
class=
"empty-img"
src=
"../
../
static/empty-coupon.png"
mode=
""
></image>
<view
class=
"empty-text"
>
暂无数据
</view>
</view>
<view
class=
"bottom"
v-if=
"selectBtn"
:style=
"
{'height':safeAreaBottom+60+'px'}">
<view
class=
"left"
>
<image
@
click=
"addAllItem()"
class=
"img"
:src=
"isSelectAll?'../
static/select-h.png':'
../static/select-n.png'"
mode=
""
></image>
<image
@
click=
"addAllItem()"
class=
"img"
:src=
"isSelectAll?'../
../static/select-h.png':'../
../static/select-n.png'"
mode=
""
></image>
<view
class=
"text"
>
全选
</view>
</view>
<view
class=
"right"
@
click=
"unLockCard()"
>
...
...
@@ -158,15 +158,15 @@
getImg
(
item
)
{
if
(
this
.
type
===
100
)
{
if
(
this
.
isExpired
(
item
))
{
return
'../static/lock-gray.png'
return
'../
../
static/lock-gray.png'
}
else
{
return
'../static/lock-h.png'
return
'../
../
static/lock-h.png'
}
}
else
{
if
(
this
.
isExpired
(
item
))
{
return
'../static/write-gray.png'
return
'../
../
static/write-gray.png'
}
else
{
return
'../static/write-h.png'
return
'../
../
static/write-h.png'
}
}
},
...
...
@@ -337,7 +337,7 @@
height
:
128rpx
;
margin-top
:
14rpx
;
width
:
100%
;
background-image
:
url(../static/coupon-bg-w.png)
;
background-image
:
url(../
../
static/coupon-bg-w.png)
;
background-size
:
100%
128rpx
;
display
:
flex
;
.btn
{
...
...
pagesA/goods/goods.vue
View file @
0d16903a
...
...
@@ -45,9 +45,9 @@
<!--商品介绍-->
<view
class=
"good-introduction-top"
>
<image
class=
"good-introduction-line"
src=
"../static/goods-left.png"
mode=
""
></image>
<image
class=
"good-introduction-line"
src=
"../
../
static/goods-left.png"
mode=
""
></image>
<text
class=
"good-introduction-txt"
>
商品介绍
</text>
<image
class=
"good-introduction-line"
src=
"../static/goods-right.png"
mode=
""
></image>
<image
class=
"good-introduction-line"
src=
"../
../
static/goods-right.png"
mode=
""
></image>
</view>
<view
class=
"good-introduction"
id=
"good-introduction"
>
<rich-text
:nodes=
"formatRichText(goods.skuDetail&&goods.skuDetail.info||'')"
class=
"rich-text"
></rich-text>
...
...
@@ -56,11 +56,11 @@
<!--商品详情底部功能-->
<view
class=
"good-detail-bottom"
>
<view
class=
"function-area"
@
click=
"goHome"
>
<image
class=
"function-icon"
src=
"../static/goods-home.png"
></image>
<image
class=
"function-icon"
src=
"../
../
static/goods-home.png"
></image>
<text
class=
"function-txt"
>
首页
</text>
</view>
<view
class=
"function-area"
@
click=
"clickCustomer()"
>
<image
class=
"function-icon"
src=
"../static/goods-customer.png"
></image>
<image
class=
"function-icon"
src=
"../
../
static/goods-customer.png"
></image>
<text
class=
"function-txt"
>
客服
</text>
</view>
<view
class=
"exchange"
@
click=
"showSkuDialog"
><text
class=
"exchange-txt"
>
立即兑换
</text></view>
...
...
pagesA/selectAccount/selectAccount.vue
View file @
0d16903a
...
...
@@ -16,7 +16,7 @@
<image
v-if=
"!selectTips"
class=
"select-img"
src=
"../../static/select-n.png"
mode=
""
@
click=
"selectTips=!selectTips"
></image>
<image
v-else
class=
"select-img"
src=
"../../static/select-h.png"
mode=
""
@
click=
"selectTips=false"
></image>
<view
class=
"tips"
>
查看并同意
<text
@
click=
"$router.push('Agreement')"
>
《隐私政策》
</text>
和
<text
@
click=
"$router.push('Agreement')"
>
《服务
协议》
</text>
我已阅读并同意使用
<text
@
click=
"$router.push('Agreement')"
>
《用户隐私
协议》
</text>
</view>
</view>
</view>
...
...
pagesA/static/recover-1.png
deleted
100644 → 0
View file @
a4b528a6
407 KB
pagesA/static/recover-2.png
deleted
100644 → 0
View file @
a4b528a6
404 KB
pagesA/submitOrder/submitOrder.vue
View file @
0d16903a
...
...
@@ -26,7 +26,7 @@
立即兑换
</view>
</view>
<pwdCodeAlert
closeName=
"showPwdAlert"
v-if=
"showPwdAlert"
:integral=
"payIntegral"
@
pwdSubmit=
"pwdSubmit"
></pwdCodeAlert>
<pwdCodeAlert
ref=
"pwd"
closeName=
"showPwdAlert"
v-if=
"showPwdAlert"
:integral=
"payIntegral"
@
pwdSubmit=
"pwdSubmit"
></pwdCodeAlert>
<smsCodeAlert
ref=
"sms"
closeName=
"showSmsCodeAlert"
v-if=
"showSmsCodeAlert"
@
smsCodeSubmit=
"smsCodeSubmit"
></smsCodeAlert>
<Alert
v-show=
"errorAlert"
:text=
"errorAlertText"
@
clickCertain=
"clickAlert"
@
clickCancel=
"clickAlert"
/>
</view>
...
...
@@ -117,6 +117,7 @@
this
.
$net
.
post
(
'/payment/validation'
,
{
'orderId'
:
this
.
orderId
,
'smsCode'
:
e
}).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
showSmsCodeAlert
=
false
this
.
$refs
.
sms
.
close
()
this
.
showPwdAlert
=
true
}
else
{
this
.
toast
(
res
.
message
)
...
...
@@ -126,6 +127,7 @@
pwdSubmit
(
e
)
{
this
.
$net
.
post
(
'/payment'
,
{
'orderId'
:
this
.
orderId
,
'payPasswd'
:
e
}).
then
(
res
=>
{
if
(
res
.
code
===
200
)
{
this
.
$refs
.
pwd
.
close
()
this
.
showPwdAlert
=
false
this
.
toast
(
'支付成功'
,
1000
)
let
that
=
this
...
...
pagesA/
static/coupon-bg-w.png
→
static/coupon-bg-w.png
View file @
0d16903a
File moved
pagesA/
static/coupon-bottom-gray.png
→
static/coupon-bottom-gray.png
View file @
0d16903a
File moved
pagesA/
static/coupon-bottom-h.png
→
static/coupon-bottom-h.png
View file @
0d16903a
File moved
pagesA/
static/coupon-select-btn.png
→
static/coupon-select-btn.png
View file @
0d16903a
File moved
pagesA/
static/coupon-select-close.png
→
static/coupon-select-close.png
View file @
0d16903a
File moved
pagesA/
static/coupon-top-gray.png
→
static/coupon-top-gray.png
View file @
0d16903a
File moved
pagesA/
static/coupon-top-h.png
→
static/coupon-top-h.png
View file @
0d16903a
File moved
pagesA/
static/goods-customer.png
→
static/goods-customer.png
View file @
0d16903a
File moved
pagesA/
static/goods-home.png
→
static/goods-home.png
View file @
0d16903a
File moved
pagesA/
static/goods-left.png
→
static/goods-left.png
View file @
0d16903a
File moved
pagesA/
static/goods-right.png
→
static/goods-right.png
View file @
0d16903a
File moved
pagesA/
static/recover-bg.png
→
static/recover-bg.png
View file @
0d16903a
File moved
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