Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
u011369184
ShopXO
提交
4a8a95af
ShopXO
项目概览
u011369184
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4a8a95af
编写于
12月 29, 2020
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序新增积分商城
上级
94da4ee4
变更
103
展开全部
隐藏空白更改
内联
并排
Showing
103 changed file
with
2237 addition
and
164 deletion
+2237
-164
application/api/controller/Buy.php
application/api/controller/Buy.php
+7
-0
application/service/ToutiaoService.php
application/service/ToutiaoService.php
+1
-1
sourcecode/alipay/default/app.json
sourcecode/alipay/default/app.json
+2
-1
sourcecode/alipay/default/components/icon-nav/icon-nav.acss
sourcecode/alipay/default/components/icon-nav/icon-nav.acss
+8
-2
sourcecode/alipay/default/pages/buy/buy.acss
sourcecode/alipay/default/pages/buy/buy.acss
+22
-2
sourcecode/alipay/default/pages/buy/buy.axml
sourcecode/alipay/default/pages/buy/buy.axml
+16
-0
sourcecode/alipay/default/pages/buy/buy.js
sourcecode/alipay/default/pages/buy/buy.js
+22
-15
sourcecode/alipay/default/pages/cart/cart.js
sourcecode/alipay/default/pages/cart/cart.js
+1
-1
sourcecode/alipay/default/pages/goods-detail/goods-detail.acss
...ecode/alipay/default/pages/goods-detail/goods-detail.acss
+41
-0
sourcecode/alipay/default/pages/goods-detail/goods-detail.axml
...ecode/alipay/default/pages/goods-detail/goods-detail.axml
+17
-0
sourcecode/alipay/default/pages/goods-detail/goods-detail.js
sourcecode/alipay/default/pages/goods-detail/goods-detail.js
+1
-1
sourcecode/alipay/default/pages/message/message.axml
sourcecode/alipay/default/pages/message/message.axml
+0
-4
sourcecode/alipay/default/pages/plugins/points/index/index.acss
...code/alipay/default/pages/plugins/points/index/index.acss
+107
-0
sourcecode/alipay/default/pages/plugins/points/index/index.axml
...code/alipay/default/pages/plugins/points/index/index.axml
+64
-0
sourcecode/alipay/default/pages/plugins/points/index/index.js
...cecode/alipay/default/pages/plugins/points/index/index.js
+122
-0
sourcecode/alipay/default/pages/plugins/points/index/index.json
...code/alipay/default/pages/plugins/points/index/index.json
+5
-0
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.acss
...fault/pages/plugins/signin/index-detail/index-detail.acss
+10
-0
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.axml
...fault/pages/plugins/signin/index-detail/index-detail.axml
+3
-3
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.js
...default/pages/plugins/signin/index-detail/index-detail.js
+1
-0
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.json
...fault/pages/plugins/signin/index-detail/index-detail.json
+0
-3
sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.js
...pages/plugins/signin/user-coming-list/user-coming-list.js
+3
-1
sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.json
...ges/plugins/signin/user-coming-list/user-coming-list.json
+0
-3
sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.js
...s/plugins/signin/user-qrcode-detail/user-qrcode-detail.js
+3
-1
sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.json
...plugins/signin/user-qrcode-detail/user-qrcode-detail.json
+0
-3
sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.js
...ugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.js
+3
-1
sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.json
...ins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.json
+0
-3
sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.js
...y/default/pages/plugins/signin/user-qrcode/user-qrcode.js
+1
-0
sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.json
...default/pages/plugins/signin/user-qrcode/user-qrcode.json
+0
-3
sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.js
...y/default/pages/plugins/signin/user-signin/user-signin.js
+3
-1
sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.json
...default/pages/plugins/signin/user-signin/user-signin.json
+0
-3
sourcecode/alipay/default/pages/plugins/signin/user/user.js
sourcecode/alipay/default/pages/plugins/signin/user/user.js
+1
-0
sourcecode/alipay/default/pages/plugins/signin/user/user.json
...cecode/alipay/default/pages/plugins/signin/user/user.json
+0
-3
sourcecode/alipay/default/pages/user-integral/user-integral.axml
...ode/alipay/default/pages/user-integral/user-integral.axml
+0
-5
sourcecode/baidu/default/app.json
sourcecode/baidu/default/app.json
+2
-1
sourcecode/baidu/default/components/icon-nav/icon-nav.css
sourcecode/baidu/default/components/icon-nav/icon-nav.css
+1
-1
sourcecode/baidu/default/pages/buy/buy.css
sourcecode/baidu/default/pages/buy/buy.css
+22
-2
sourcecode/baidu/default/pages/buy/buy.js
sourcecode/baidu/default/pages/buy/buy.js
+26
-9
sourcecode/baidu/default/pages/buy/buy.swan
sourcecode/baidu/default/pages/buy/buy.swan
+16
-0
sourcecode/baidu/default/pages/cart/cart.js
sourcecode/baidu/default/pages/cart/cart.js
+1
-1
sourcecode/baidu/default/pages/goods-detail/goods-detail.css
sourcecode/baidu/default/pages/goods-detail/goods-detail.css
+41
-0
sourcecode/baidu/default/pages/goods-detail/goods-detail.js
sourcecode/baidu/default/pages/goods-detail/goods-detail.js
+1
-1
sourcecode/baidu/default/pages/goods-detail/goods-detail.swan
...cecode/baidu/default/pages/goods-detail/goods-detail.swan
+17
-0
sourcecode/baidu/default/pages/message/message.swan
sourcecode/baidu/default/pages/message/message.swan
+0
-4
sourcecode/baidu/default/pages/plugins/points/index/index.css
...cecode/baidu/default/pages/plugins/points/index/index.css
+107
-0
sourcecode/baidu/default/pages/plugins/points/index/index.js
sourcecode/baidu/default/pages/plugins/points/index/index.js
+128
-0
sourcecode/baidu/default/pages/plugins/points/index/index.json
...ecode/baidu/default/pages/plugins/points/index/index.json
+8
-0
sourcecode/baidu/default/pages/plugins/points/index/index.swan
...ecode/baidu/default/pages/plugins/points/index/index.swan
+64
-0
sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.css
...efault/pages/plugins/signin/index-detail/index-detail.css
+10
-0
sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.swan
...fault/pages/plugins/signin/index-detail/index-detail.swan
+3
-3
sourcecode/baidu/default/pages/user-integral/user-integral.swan
...code/baidu/default/pages/user-integral/user-integral.swan
+0
-5
sourcecode/qq/default/app.json
sourcecode/qq/default/app.json
+2
-1
sourcecode/qq/default/components/icon-nav/icon-nav.qss
sourcecode/qq/default/components/icon-nav/icon-nav.qss
+1
-1
sourcecode/qq/default/pages/buy/buy.js
sourcecode/qq/default/pages/buy/buy.js
+22
-6
sourcecode/qq/default/pages/buy/buy.qml
sourcecode/qq/default/pages/buy/buy.qml
+16
-0
sourcecode/qq/default/pages/buy/buy.qss
sourcecode/qq/default/pages/buy/buy.qss
+22
-2
sourcecode/qq/default/pages/cart/cart.js
sourcecode/qq/default/pages/cart/cart.js
+1
-1
sourcecode/qq/default/pages/goods-detail/goods-detail.js
sourcecode/qq/default/pages/goods-detail/goods-detail.js
+1
-1
sourcecode/qq/default/pages/goods-detail/goods-detail.qml
sourcecode/qq/default/pages/goods-detail/goods-detail.qml
+17
-0
sourcecode/qq/default/pages/goods-detail/goods-detail.qss
sourcecode/qq/default/pages/goods-detail/goods-detail.qss
+41
-0
sourcecode/qq/default/pages/message/message.qml
sourcecode/qq/default/pages/message/message.qml
+0
-4
sourcecode/qq/default/pages/plugins/points/index/index.js
sourcecode/qq/default/pages/plugins/points/index/index.js
+121
-0
sourcecode/qq/default/pages/plugins/points/index/index.json
sourcecode/qq/default/pages/plugins/points/index/index.json
+8
-0
sourcecode/qq/default/pages/plugins/points/index/index.qml
sourcecode/qq/default/pages/plugins/points/index/index.qml
+64
-0
sourcecode/qq/default/pages/plugins/points/index/index.qss
sourcecode/qq/default/pages/plugins/points/index/index.qss
+107
-0
sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qml
...efault/pages/plugins/signin/index-detail/index-detail.qml
+3
-3
sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qss
...efault/pages/plugins/signin/index-detail/index-detail.qss
+10
-0
sourcecode/qq/default/pages/user-integral/user-integral.qml
sourcecode/qq/default/pages/user-integral/user-integral.qml
+0
-5
sourcecode/toutiao/default/app.json
sourcecode/toutiao/default/app.json
+2
-1
sourcecode/toutiao/default/components/icon-nav/icon-nav.ttss
sourcecode/toutiao/default/components/icon-nav/icon-nav.ttss
+1
-1
sourcecode/toutiao/default/pages/buy/buy.js
sourcecode/toutiao/default/pages/buy/buy.js
+22
-8
sourcecode/toutiao/default/pages/buy/buy.ttml
sourcecode/toutiao/default/pages/buy/buy.ttml
+16
-0
sourcecode/toutiao/default/pages/buy/buy.ttss
sourcecode/toutiao/default/pages/buy/buy.ttss
+22
-2
sourcecode/toutiao/default/pages/cart/cart.js
sourcecode/toutiao/default/pages/cart/cart.js
+1
-1
sourcecode/toutiao/default/pages/goods-detail/goods-detail.js
...cecode/toutiao/default/pages/goods-detail/goods-detail.js
+1
-1
sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml
...code/toutiao/default/pages/goods-detail/goods-detail.ttml
+17
-0
sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss
...code/toutiao/default/pages/goods-detail/goods-detail.ttss
+41
-0
sourcecode/toutiao/default/pages/message/message.ttml
sourcecode/toutiao/default/pages/message/message.ttml
+0
-4
sourcecode/toutiao/default/pages/plugins/points/index/index.js
...ecode/toutiao/default/pages/plugins/points/index/index.js
+121
-0
sourcecode/toutiao/default/pages/plugins/points/index/index.json
...ode/toutiao/default/pages/plugins/points/index/index.json
+8
-0
sourcecode/toutiao/default/pages/plugins/points/index/index.ttml
...ode/toutiao/default/pages/plugins/points/index/index.ttml
+64
-0
sourcecode/toutiao/default/pages/plugins/points/index/index.ttss
...ode/toutiao/default/pages/plugins/points/index/index.ttss
+107
-0
sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttml
...fault/pages/plugins/signin/index-detail/index-detail.ttml
+3
-3
sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttss
...fault/pages/plugins/signin/index-detail/index-detail.ttss
+10
-0
sourcecode/toutiao/default/pages/user-integral/user-integral.ttml
...de/toutiao/default/pages/user-integral/user-integral.ttml
+0
-5
sourcecode/weixin/default/app.json
sourcecode/weixin/default/app.json
+2
-1
sourcecode/weixin/default/components/icon-nav/icon-nav.wxss
sourcecode/weixin/default/components/icon-nav/icon-nav.wxss
+1
-1
sourcecode/weixin/default/pages/buy/buy.js
sourcecode/weixin/default/pages/buy/buy.js
+22
-6
sourcecode/weixin/default/pages/buy/buy.wxml
sourcecode/weixin/default/pages/buy/buy.wxml
+16
-0
sourcecode/weixin/default/pages/buy/buy.wxss
sourcecode/weixin/default/pages/buy/buy.wxss
+22
-2
sourcecode/weixin/default/pages/cart/cart.js
sourcecode/weixin/default/pages/cart/cart.js
+1
-1
sourcecode/weixin/default/pages/goods-detail/goods-detail.js
sourcecode/weixin/default/pages/goods-detail/goods-detail.js
+1
-1
sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml
...ecode/weixin/default/pages/goods-detail/goods-detail.wxml
+17
-0
sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss
...ecode/weixin/default/pages/goods-detail/goods-detail.wxss
+41
-0
sourcecode/weixin/default/pages/message/message.wxml
sourcecode/weixin/default/pages/message/message.wxml
+0
-4
sourcecode/weixin/default/pages/plugins/points/index/index.js
...cecode/weixin/default/pages/plugins/points/index/index.js
+134
-0
sourcecode/weixin/default/pages/plugins/points/index/index.json
...code/weixin/default/pages/plugins/points/index/index.json
+8
-0
sourcecode/weixin/default/pages/plugins/points/index/index.wxml
...code/weixin/default/pages/plugins/points/index/index.wxml
+64
-0
sourcecode/weixin/default/pages/plugins/points/index/index.wxss
...code/weixin/default/pages/plugins/points/index/index.wxss
+107
-0
sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.js
...default/pages/plugins/signin/index-detail/index-detail.js
+4
-2
sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxml
...fault/pages/plugins/signin/index-detail/index-detail.wxml
+3
-3
sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxss
...fault/pages/plugins/signin/index-detail/index-detail.wxss
+10
-0
sourcecode/weixin/default/pages/plugins/weixinliveplayer/search/search.js
...n/default/pages/plugins/weixinliveplayer/search/search.js
+1
-1
sourcecode/weixin/default/pages/user-integral/user-integral.wxml
...ode/weixin/default/pages/user-integral/user-integral.wxml
+0
-5
未找到文件。
application/api/controller/Buy.php
浏览文件 @
4a8a95af
...
...
@@ -80,6 +80,13 @@ class Buy extends Common
$result
[
'plugins_coupon_data'
]
=
$ret
[
'data'
][
'data'
];
}
// 积分
$ret
=
PluginsService
::
PluginsControlCall
(
'points'
,
'index'
,
'buy'
,
'api'
,
[
'order_goods'
=>
$buy_goods
,
'params'
=>
$params
]);
if
(
$ret
[
'code'
]
==
0
&&
isset
(
$ret
[
'data'
][
'code'
])
&&
$ret
[
'data'
][
'code'
]
==
0
)
{
$result
[
'plugins_points_data'
]
=
$ret
[
'data'
][
'data'
];
}
return
DataReturn
(
'操作成功'
,
0
,
$result
);
}
return
$buy_ret
;
...
...
application/service/ToutiaoService.php
浏览文件 @
4a8a95af
...
...
@@ -43,7 +43,7 @@ class ToutiaoService
// 线上支付信息处理
$order_info
=
[];
$service
=
0
;
if
(
$ret
[
'data'
][
'is_payment_type'
]
==
0
)
if
(
isset
(
$ret
[
'data'
][
'is_payment_type'
])
&&
$ret
[
'data'
][
'is_payment_type'
]
==
0
)
{
// 配置信息
$merchant_id
=
MyC
(
'common_app_mini_toutiao_pay_merchant_id'
);
...
...
sourcecode/alipay/default/app.json
浏览文件 @
4a8a95af
...
...
@@ -75,7 +75,8 @@
"pages/plugins/signin/user-qrcode/user-qrcode"
,
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail"
,
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo"
,
"pages/plugins/signin/user-coming-list/user-coming-list"
"pages/plugins/signin/user-coming-list/user-coming-list"
,
"pages/plugins/points/index/index"
],
"window"
:
{
"defaultTitle"
:
"{{application_title}}"
,
...
...
sourcecode/alipay/default/components/icon-nav/icon-nav.acss
浏览文件 @
4a8a95af
...
...
@@ -20,6 +20,12 @@
margin-top: 5rpx;
}
.data-list .items .title {
margin-top: 10rpx;
font-size: 32rpx;
margin-top: 10rpx;
font-size: 30rpx;
text-align:center;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
max-width: 100%;
}
\ No newline at end of file
sourcecode/alipay/default/pages/buy/buy.acss
浏览文件 @
4a8a95af
...
...
@@ -180,10 +180,10 @@
width: 50%;
}
/*
*
/*
* 插件样式区域
*/
/*
*
/
*
* 优惠劵
*/
.plugins-coupon {
...
...
@@ -209,4 +209,24 @@
.coupon-container .not-use-tips {
color: #f7b240;
font-size: 32rpx;
}
/*
* 积分
*/
.plugins-points-buy-container {
padding: 20rpx;
}
.plugins-points-buy-container .select .icon {
width: 45rpx;
height: 45rpx !important;
vertical-align: middle;
}
.plugins-points-buy-container .select .sales-price {
margin-left: 30rpx;
font-size: 28rpx;
font-weight: 400;
}
.plugins-points-buy-container .desc {
color: #F37B1D;
}
\ No newline at end of file
sourcecode/alipay/default/pages/buy/buy.axml
浏览文件 @
4a8a95af
...
...
@@ -90,6 +90,22 @@
<view a:else onTap="bind_user_note_tap_event" class="{{(user_note_value || null) == null ? 'cr-888' : ''}}">{{user_note_value || '留言'}}</view>
</view>
<!-- 积分 -->
<view a:if="{{(plugins_points_data || null) != null && (plugins_points_data.discount_price || 0) > 0}}" class="plugins-points-buy-container bg-white spacing-mb">
<view class="select oh">
<text a:if="{{plugins_points_data.discount_type == 1}}">使用{{plugins_points_data.use_integral}}个积分兑换商品</text>
<text a:else>使用积分{{plugins_points_data.use_integral}}个</text>
<text class="sales-price">-{{currency_symbol}}{{plugins_points_data.discount_price}}</text>
<view onTap="points_event" class="fr">
<image class="icon" src="/images/default-select{{plugins_points_status ? '-active' : ''}}-icon.png" mode="widthFix" />
</view>
</view>
<view class="desc">
<text a:if="{{plugins_points_data.discount_type == 1}}">你有积分{{plugins_points_data.user_integral}}个</text>
<text a:else>你有积分{{plugins_points_data.user_integral}}个,可用{{plugins_points_data.use_integral}}个</text>
</view>
</view>
<!-- 支付方式 -->
<view a:if="{{payment_list.length > 0 && common_order_is_booking != 1}}" class="payment-list bg-white oh">
<view class="item tc fl" a:for="{{payment_list}}">
...
...
sourcecode/alipay/default/pages/buy/buy.js
浏览文件 @
4a8a95af
...
...
@@ -33,21 +33,16 @@ Page({
plugins_choice_coupon_value
:
[],
popup_plugins_coupon_status
:
false
,
popup_plugins_coupon_index
:
null
,
// 积分
plugins_points_data
:
null
,
plugins_points_status
:
false
,
},
onLoad
(
params
)
{
//params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}';
if
((
params
.
data
||
null
)
==
null
||
app
.
get_length
(
JSON
.
parse
(
params
.
data
))
==
0
)
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
decodeURIComponent
(
params
.
data
)))
>
0
)
{
my
.
alert
({
title
:
'
温馨提示
'
,
content
:
'
订单信息有误
'
,
buttonText
:
'
确认
'
,
success
:
()
=>
{
my
.
navigateBack
();
},
});
}
else
{
this
.
setData
({
params
:
JSON
.
parse
(
params
.
data
)});
this
.
setData
({
params
:
JSON
.
parse
(
decodeURIComponent
(
params
.
data
))});
// 删除地址缓存
my
.
removeStorageSync
({
key
:
app
.
data
.
cache_buy_user_address_select_key
});
...
...
@@ -117,7 +112,7 @@ Page({
my
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
headers
:
{
'
content-type
'
:
'
application/x-www-form-urlencoded
'
},
success
:
res
=>
{
...
...
@@ -137,6 +132,7 @@ Page({
common_site_type
:
data
.
common_site_type
||
0
,
extraction_address
:
data
.
base
.
extraction_address
||
[],
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
plugins_points_data
:
data
.
plugins_points_data
||
null
,
});
// 优惠劵选择处理
...
...
@@ -192,8 +188,9 @@ Page({
});
},
// 请求参数合并优惠券参数
request_data_coupon_merge
(
data
)
{
// 请求参数合并
request_data_ext_params_merge
(
data
)
{
// 优惠券
var
coupon_ids
=
this
.
data
.
plugins_use_coupon_ids
;
if
((
coupon_ids
||
null
)
!=
null
&&
coupon_ids
.
length
>
0
)
{
...
...
@@ -202,6 +199,10 @@ Page({
data
[
'
coupon_id_
'
+
i
]
=
coupon_ids
[
i
];
}
}
// 积分
data
[
'
is_points
'
]
=
(
this
.
data
.
plugins_points_status
===
true
)
?
1
:
0
;
return
data
;
},
...
...
@@ -251,7 +252,7 @@ Page({
my
.
request
({
url
:
app
.
get_request_url
(
"
add
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
headers
:
{
'
content-type
'
:
'
application/x-www-form-urlencoded
'
},
success
:
res
=>
{
...
...
@@ -396,4 +397,10 @@ Page({
var
address
=
(
data
.
province_name
||
''
)
+
(
data
.
city_name
||
''
)
+
(
data
.
county_name
||
''
)
+
(
data
.
address
||
''
);
app
.
open_location
(
data
.
lng
,
data
.
lat
,
name
,
address
);
},
// 积分选择事件
points_event
(
e
)
{
this
.
setData
({
plugins_points_status
:
!
this
.
data
.
plugins_points_status
});
this
.
init
();
},
});
sourcecode/alipay/default/pages/cart/cart.js
浏览文件 @
4a8a95af
...
...
@@ -439,7 +439,7 @@ Page({
"
ids
"
:
ids
.
join
(
'
,
'
)
};
my
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
},
...
...
sourcecode/alipay/default/pages/goods-detail/goods-detail.acss
浏览文件 @
4a8a95af
...
...
@@ -369,4 +369,45 @@
}
.goods-parameters .content-item .item:nth-child(2n) {
float: right;
}
/*
* 商品简述
*/
.goods-simple-desc {
color: #f00;
padding: 0 10rpx;
margin: 5rpx 0 15rpx 0;
}
/*
* icon
*/
.goods-icon-container {
padding: 20rpx 10rpx 10rpx 10rpx;
}
.goods-icon-container view {
background: #fff;
border: 1px solid #3bb4f2;
color: #3bb4f2;
padding: 3rpx 15rpx;
border-radius: 8rpx;
margin-bottom: 10rpx;
}
.goods-icon-container view:not(:last-child) {
margin-right: 10rpx;
}
/*
* 面板
*/
.goods-panel-container {
background: #fffbfc;
color: #d2354c;
}
.goods-panel-container view {
padding: 15rpx 10rpx;
}
.goods-panel-container view:not(:first-child) {
border-top: 1px dashed #fff1f2;
}
\ No newline at end of file
sourcecode/alipay/default/pages/goods-detail/goods-detail.axml
浏览文件 @
4a8a95af
...
...
@@ -29,6 +29,23 @@
<!-- 标题 -->
<view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
<!-- 简述 -->
<view a:if="{{(goods.simple_desc || null) != null}}" class="goods-simple-desc">{{goods.simple_desc}}</view>
<!-- icon -->
<view a:if="{{(goods.plugins_view_icon_data || null) != null && goods.plugins_view_icon_data.length > 0}}" class="goods-icon-container bg-white br-b-dashed oh">
<block a:for="{{goods.plugins_view_icon_data}}" a:key="key">
<view a:if="{{(item.name || null) != null}}" class="fl tc" style="{{(item.br_color || null) == null ? '' : 'border:1px solid '+item.br_color+';'}}{{(item.color || null) == null ? '' : 'color: '+item.color+';'}}">{{item.name}}</view>
</block>
</view>
<!-- 面板提示信息 -->
<view a:if="{{(goods.plugins_view_panel_data || null) != null && goods.plugins_view_panel_data.length > 0}}" class="goods-panel-container bg-white br-b-dashed oh">
<block a:for="{{goods.plugins_view_panel_data}}" a:key="key">
<view a:if="{{(item || null) != null}}">{{item}}</view>
</block>
</view>
<!-- 限时秒杀 -->
<view a:if="{{plugins_limitedtimediscount_is_valid == 1}}">
<import src="/pages/lib/limitedtimediscount/goods-detail.axml" />
...
...
sourcecode/alipay/default/pages/goods-detail/goods-detail.js
浏览文件 @
4a8a95af
...
...
@@ -629,7 +629,7 @@ Page({
"
spec
"
:
JSON
.
stringify
(
spec
)
};
my
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
this
.
popup_close_event
();
break
;
...
...
sourcecode/alipay/default/pages/message/message.axml
浏览文件 @
4a8a95af
...
...
@@ -7,10 +7,6 @@
</view>
<view class="data-detail">{{item.detail}}</view>
</view>
<view a:if="{{data_list.length == 0}}">
<import src="/pages/common/nodata.axml" />
<template is="nodata" data="{{status: data_list_loding_status}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.axml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
...
...
sourcecode/alipay/default/pages/plugins/points/index/index.acss
0 → 100644
浏览文件 @
4a8a95af
/**
* 顶部
*/
.points-user {
background-color: #fe3e28;
position: relative;
padding: 100rpx 0 120rpx 0;
}
.points-user .avatar {
padding: 1px;
background: #ff9589;
margin: 0 auto;
}
.points-user .avatar,
.points-user .avatar image {
width: 160rpx;
height: 160rpx;
border-radius: 50%;
}
.points-user .user-name {
color: #fff;
margin: 10rpx 0 20rpx 0;
}
.points-user .user-desc {
color: #ffe7b2;
}
.points-user-menu-submit {
border: 1px solid #ffd606;
color: #fae501;
position: absolute;
top: 20rpx;
right: 20rpx;
padding: 6rpx 20rpx;
border-radius: 3rpx;
}
.submit-container {
position: absolute;
bottom: 20rpx;
right: 20rpx;
}
.submit-container button:not(:first-child) {
margin-left: 30rpx;
}
button.login-submit {
color: #5eb95e;
background-color: #E4F3E4;
border-color: #d2e8d2;
margin-bottom: 30rpx;
}
.submit-container button.share-submit {
color: #F37B1D;
background-color: #ffe5be;
border-color: #f8d093;
}
/**
* 商品导航
*/
.spacing-nav-title {
color: #fe3e28;
}
.spacing-nav-title .line {
background: #fe3e28;
}
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}
.data-list .items {
width: calc(50% - 5rpx);
margin-bottom: 10rpx;
padding-bottom: 20rpx;
}
.data-list .items:nth-child(2n) {
float: right;
}
.data-list .items:nth-child(2n+1) {
float: left;
}
.data-list .items image {
width: 100%;
height: 200px !important;
}
.data-list .items .base {
text-align: left;
font-size: 32rpx;
padding: 0 15rpx;
}
.data-list .items .base,
.data-list .items .base .price {
margin-top: 10rpx;
}
.data-list .items .base .original-price {
margin-left: 0;
}
.data-list .items .base .price .sales-price {
margin: 0 5rpx;
}
.data-list .items .base .price .unit {
color: #f40;
}
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/points/index/index.axml
0 → 100644
浏览文件 @
4a8a95af
<view a:if="{{(data_base || null) != null}}">
<!-- 顶部 -->
<view class="points-user tc">
<navigator class="points-user-menu-submit" url="/pages/user-integral/user-integral" hover-class="none">我的积分</navigator>
<block a:if="{{(user || null) == null}}">
<button type="default" size="mini" class="login-submit" onTap="login_event">立即登录</button>
<view class="user-desc">获知会员积分详情</view>
</block>
<block a:else>
<view class="avatar">
<image onTap="preview_event" src="{{user.avatar || avatar_default}}" mode="widthFix" class="dis-block" />
</view>
<view class="user-name">{{user.user_name_view}}</view>
<view class="user-desc">当前可用 {{user.integral}} 积分</view>
</block>
<!-- 按钮组 -->
<view class="submit-container">
<button type="default" size="mini" open-type="share" class="share-submit">分享</button>
</view>
</view>
<!-- 广告图片 -->
<image a:if="{{(data_base.right_images || null) != null}}" src="{{data_base.right_images}}" class="wh-auto dis-block spacing-mt" mode="widthFix" onTap="right_images_event" />
<!-- 公告信息 -->
<view a:if="{{(data_base.points_desc || null) != null && data_base.points_desc.length > 0}}" class="tips spacing-mt">
<view a:for="{{data_base.points_desc}}" a:key="key" class="item">
{{item}}
</view>
</view>
<!-- 商品兑换 -->
<view a:if="{{(data_base.goods_exchange_data || null) != null && data_base.goods_exchange_data.length > 0}}" class="spacing-mt">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">商品兑换</text>
</view>
<view class="data-list spacing-10">
<view class="items bg-white" a:for="{{data_base.goods_exchange_data}}" a:key="key">
<navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods.id}}" hover-class="none">
<image src="{{item.goods.images}}" mode="aspectFit" />
<view class="base">
<view class="multi-text">{{item.goods.title}}</view>
<view class="price single-text original-price">{{currency_symbol}}{{item.goods.price}}</view>
<view class="price single-text">
<text class="unit">需</text>
<text class="sales-price">{{item.integral}}</text>
<text class="unit">积分</text>
</view>
</view>
</navigator>
</view>
</view>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.axml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</view>
<view a:else>
<import src="/pages/common/nodata.axml" />
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
</view>
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/points/index/index.js
0 → 100644
浏览文件 @
4a8a95af
const
app
=
getApp
();
Page
({
data
:
{
data_bottom_line_status
:
false
,
data_list_loding_status
:
1
,
data_list_loding_msg
:
''
,
params
:
null
,
user
:
null
,
data_base
:
null
,
avatar_default
:
app
.
data
.
default_user_head_src
,
},
onLoad
(
params
)
{
this
.
setData
({
params
:
params
,
user
:
app
.
get_user_cache_info
(),
});
},
onShow
()
{
app
.
set_nav_bg_color_main
(
'
#fe3e28
'
);
this
.
get_data
();
},
// 获取数据
get_data
()
{
var
self
=
this
;
my
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
index
"
,
"
points
"
),
method
:
"
POST
"
,
data
:
{},
dataType
:
"
json
"
,
success
:
res
=>
{
my
.
stopPullDownRefresh
();
if
(
res
.
data
.
code
==
0
)
{
var
data
=
res
.
data
.
data
;
self
.
setData
({
data_base
:
data
.
base
||
null
,
data_list_loding_msg
:
''
,
data_list_loding_status
:
0
,
data_bottom_line_status
:
true
,
});
}
else
{
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
}
},
fail
:
()
=>
{
my
.
stopPullDownRefresh
();
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
'
服务器请求出错
'
,
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
// 下拉刷新
onPullDownRefresh
()
{
this
.
get_data
();
},
// 立即登录
login_event
()
{
var
user
=
app
.
get_user_info
(
this
,
"
login_event
"
)
if
(
user
!=
false
)
{
// 用户未绑定用户则转到登录页面
if
(
app
.
user_is_need_login
(
user
))
{
my
.
confirm
({
title
:
'
温馨提示
'
,
content
:
'
绑定手机号码
'
,
confirmButtonText
:
'
确认
'
,
cancelButtonText
:
'
暂不
'
,
success
:
(
result
)
=>
{
my
.
stopPullDownRefresh
();
if
(
result
.
confirm
)
{
my
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
}
},
});
}
}
this
.
setData
({
user
:
user
||
null
});
},
// 图片事件
right_images_event
(
e
)
{
if
((
this
.
data
.
data_base
.
right_images_url
||
null
)
!=
null
)
{
my
.
navigateTo
({
url
:
this
.
data
.
data_base
.
right_images_url
,
});
}
},
// 头像查看
preview_event
()
{
if
(
app
.
data
.
default_user_head_src
!=
this
.
data
.
user
.
avatar
)
{
my
.
previewImage
({
current
:
0
,
urls
:
[
this
.
data
.
user
.
avatar
]
});
}
},
// 自定义分享
onShareAppMessage
()
{
var
user_id
=
app
.
get_user_cache_info
(
'
id
'
,
0
)
||
0
;
return
{
title
:
this
.
data
.
data_base
.
seo_title
||
'
积分商城 -
'
+
app
.
data
.
application_title
,
desc
:
this
.
data
.
data_base
.
seo_desc
||
'
积分抵扣、兑换 -
'
+
app
.
data
.
application_describe
,
path
:
'
/pages/plugins/signin/index-detail/index-detail?referrer=
'
+
user_id
};
},
});
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/points/index/index.json
0 → 100644
浏览文件 @
4a8a95af
{
"pullRefresh"
:
true
,
"titleBarColor"
:
"#fe3e28"
,
"defaultTitle"
:
"积分商城"
}
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.acss
浏览文件 @
4a8a95af
...
...
@@ -97,6 +97,16 @@
border-radius: 1000rpx;
}
/**
* 商品导航
*/
.spacing-nav-title {
color: #f6b015;
}
.spacing-nav-title .line {
background: #f6b015;
}
/**
* 商品列表
*/
...
...
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.axml
浏览文件 @
4a8a95af
...
...
@@ -55,8 +55,8 @@
<image src="{{item.images}}" mode="aspectFit" />
<view class="base">
<view class="multi-text">{{item.title}}</view>
<view class="price">
<text class="sales-price">{{currency_symbol}}{{item.
min_
price}}</text>
<view class="price
single-text
">
<text class="sales-price">{{currency_symbol}}{{item.price}}</text>
</view>
</view>
</navigator>
...
...
@@ -75,7 +75,7 @@
<text class="coming-tips-text">获得 <text>{{coming_integral}}</text> 积分</text>
</view>
</view>
</view>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.axml" />
...
...
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.js
浏览文件 @
4a8a95af
...
...
@@ -24,6 +24,7 @@ Page({
},
onShow
()
{
app
.
set_nav_bg_color_main
(
'
#f6b015
'
);
this
.
get_data
();
},
...
...
sourcecode/alipay/default/pages/plugins/signin/index-detail/index-detail.json
浏览文件 @
4a8a95af
{
"pullRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#f6b015"
,
"titleBarColor"
:
"#f6b015"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"defaultTitle"
:
"签到"
}
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.js
浏览文件 @
4a8a95af
...
...
@@ -16,7 +16,9 @@ Page({
this
.
init
();
},
onShow
()
{
},
onShow
()
{
app
.
set_nav_bg_color_main
(
'
#f6b015
'
);
},
init
()
{
var
user
=
app
.
get_user_info
(
this
,
'
init
'
);
...
...
sourcecode/alipay/default/pages/plugins/signin/user-coming-list/user-coming-list.json
浏览文件 @
4a8a95af
{
"pullRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#f6b015"
,
"titleBarColor"
:
"#f6b015"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"defaultTitle"
:
"用户签到"
}
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.js
浏览文件 @
4a8a95af
...
...
@@ -16,7 +16,9 @@ Page({
this
.
init
();
},
onShow
()
{},
onShow
()
{
app
.
set_nav_bg_color_main
(
'
#f6b015
'
);
},
init
()
{
var
self
=
this
;
...
...
sourcecode/alipay/default/pages/plugins/signin/user-qrcode-detail/user-qrcode-detail.json
浏览文件 @
4a8a95af
{
"pullRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#f6b015"
,
"titleBarColor"
:
"#f6b015"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"defaultTitle"
:
"签到码详情"
}
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.js
浏览文件 @
4a8a95af
...
...
@@ -14,7 +14,9 @@ Page({
this
.
init
();
},
onShow
()
{},
onShow
()
{
app
.
set_nav_bg_color_main
(
'
#f6b015
'
);
},
init
()
{
var
self
=
this
;
...
...
sourcecode/alipay/default/pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo.json
浏览文件 @
4a8a95af
{
"pullRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#f6b015"
,
"titleBarColor"
:
"#f6b015"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"defaultTitle"
:
"签到码新增/编辑"
}
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.js
浏览文件 @
4a8a95af
...
...
@@ -17,6 +17,7 @@ Page({
},
onShow
()
{
app
.
set_nav_bg_color_main
(
'
#f6b015
'
);
this
.
init
();
},
...
...
sourcecode/alipay/default/pages/plugins/signin/user-qrcode/user-qrcode.json
浏览文件 @
4a8a95af
{
"pullRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#f6b015"
,
"titleBarColor"
:
"#f6b015"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"defaultTitle"
:
"签到码管理"
}
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.js
浏览文件 @
4a8a95af
...
...
@@ -16,7 +16,9 @@ Page({
this
.
init
();
},
onShow
()
{
},
onShow
()
{
app
.
set_nav_bg_color_main
(
'
#f6b015
'
);
},
init
()
{
var
user
=
app
.
get_user_info
(
this
,
'
init
'
);
...
...
sourcecode/alipay/default/pages/plugins/signin/user-signin/user-signin.json
浏览文件 @
4a8a95af
{
"pullRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#f6b015"
,
"titleBarColor"
:
"#f6b015"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"defaultTitle"
:
"我的签到"
}
\ No newline at end of file
sourcecode/alipay/default/pages/plugins/signin/user/user.js
浏览文件 @
4a8a95af
...
...
@@ -11,6 +11,7 @@ Page({
onLoad
(
params
)
{},
onShow
()
{
app
.
set_nav_bg_color_main
(
'
#f6b015
'
);
this
.
init
();
},
...
...
sourcecode/alipay/default/pages/plugins/signin/user/user.json
浏览文件 @
4a8a95af
{
"pullRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#f6b015"
,
"titleBarColor"
:
"#f6b015"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"defaultTitle"
:
"签到"
}
\ No newline at end of file
sourcecode/alipay/default/pages/user-integral/user-integral.axml
浏览文件 @
4a8a95af
...
...
@@ -2,7 +2,6 @@
<view class="content">
<view class="data-card bg-white br-b" a:for="{{data_list}}">
<view class="data-box oh">
<import src="/pages/common/nodata.axml" />
<text class="data-title">{{item.type_text}} {{item.operation_integral}}</text>
<text class="data-time fr">{{item.add_time_time}}</text>
</view>
...
...
@@ -12,10 +11,6 @@
</view>
<view class="data-detail">{{item.msg}}</view>
</view>
<view a:if="{{data_list.length == 0}}">
<import src="/pages/common/nodata.axml" />
<template is="nodata" data="{{status: data_list_loding_status}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.axml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
...
...
sourcecode/baidu/default/app.json
浏览文件 @
4a8a95af
...
...
@@ -53,7 +53,8 @@
"pages/plugins/signin/user-qrcode/user-qrcode"
,
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail"
,
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo"
,
"pages/plugins/signin/user-coming-list/user-coming-list"
"pages/plugins/signin/user-coming-list/user-coming-list"
,
"pages/plugins/points/index/index"
],
"window"
:
{
"navigationBarTitleText"
:
"{{application_title}}"
,
...
...
sourcecode/baidu/default/components/icon-nav/icon-nav.css
浏览文件 @
4a8a95af
...
...
@@ -23,7 +23,7 @@
}
.data-list
.items
.title
{
margin-top
:
10
rpx
;
font-size
:
3
2
rpx
;
font-size
:
3
0
rpx
;
text-align
:
center
;
-o-text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
...
...
sourcecode/baidu/default/pages/buy/buy.css
浏览文件 @
4a8a95af
...
...
@@ -180,10 +180,10 @@
width
:
50%
;
}
/*
*
/*
* 插件样式区域
*/
/*
*
/
*
* 优惠劵
*/
.plugins-coupon
{
...
...
@@ -209,4 +209,24 @@
.coupon-container
.not-use-tips
{
color
:
#f7b240
;
font-size
:
32
rpx
;
}
/*
* 积分
*/
.plugins-points-buy-container
{
padding
:
20
rpx
;
}
.plugins-points-buy-container
.select
.icon
{
width
:
45
rpx
;
height
:
45
rpx
!important
;
vertical-align
:
middle
;
}
.plugins-points-buy-container
.select
.sales-price
{
margin-left
:
30
rpx
;
font-size
:
28
rpx
;
font-weight
:
400
;
}
.plugins-points-buy-container
.desc
{
color
:
#F37B1D
;
}
\ No newline at end of file
sourcecode/baidu/default/pages/buy/buy.js
浏览文件 @
4a8a95af
...
...
@@ -32,12 +32,17 @@ Page({
plugins_use_coupon_ids
:
[],
plugins_choice_coupon_value
:
[],
popup_plugins_coupon_status
:
false
,
popup_plugins_coupon_index
:
null
popup_plugins_coupon_index
:
null
,
// 积分
plugins_points_data
:
null
,
plugins_points_status
:
false
,
},
onLoad
(
params
)
{
//params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}';
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
params
.
data
))
>
0
)
{
this
.
setData
({
params
:
JSON
.
parse
(
params
.
data
)
});
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
decodeURIComponent
(
params
.
data
)))
>
0
)
{
this
.
setData
({
params
:
JSON
.
parse
(
decodeURIComponent
(
params
.
data
))});
// 删除地址缓存
swan
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
...
...
@@ -101,7 +106,7 @@ Page({
swan
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
success
:
res
=>
{
swan
.
stopPullDownRefresh
();
...
...
@@ -118,7 +123,8 @@ Page({
data_list_loding_status
:
3
,
common_site_type
:
data
.
common_site_type
||
0
,
extraction_address
:
data
.
base
.
extraction_address
||
[],
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
plugins_points_data
:
data
.
plugins_points_data
||
null
,
});
// 优惠劵选择处理
...
...
@@ -172,14 +178,19 @@ Page({
});
},
// 请求参数合并优惠券参数
request_data_coupon_merge
(
data
)
{
// 请求参数合并
request_data_ext_params_merge
(
data
)
{
// 优惠券
var
coupon_ids
=
this
.
data
.
plugins_use_coupon_ids
;
if
((
coupon_ids
||
null
)
!=
null
&&
coupon_ids
.
length
>
0
)
{
for
(
var
i
in
coupon_ids
)
{
data
[
'
coupon_id_
'
+
i
]
=
coupon_ids
[
i
];
}
}
// 积分
data
[
'
is_points
'
]
=
(
this
.
data
.
plugins_points_status
===
true
)
?
1
:
0
;
return
data
;
},
...
...
@@ -229,7 +240,7 @@ Page({
swan
.
request
({
url
:
app
.
get_request_url
(
"
add
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
success
:
res
=>
{
swan
.
hideLoading
();
...
...
@@ -365,5 +376,11 @@ Page({
var
name
=
data
.
alias
||
data
.
name
||
''
;
var
address
=
(
data
.
province_name
||
''
)
+
(
data
.
city_name
||
''
)
+
(
data
.
county_name
||
''
)
+
(
data
.
address
||
''
);
app
.
open_location
(
data
.
lng
,
data
.
lat
,
name
,
address
);
}
},
// 积分选择事件
points_event
(
e
)
{
this
.
setData
({
plugins_points_status
:
!
this
.
data
.
plugins_points_status
});
this
.
init
();
},
});
\ No newline at end of file
sourcecode/baidu/default/pages/buy/buy.swan
浏览文件 @
4a8a95af
...
...
@@ -90,6 +90,22 @@
<view s-else bindtap="bind_user_note_tap_event" class="{{(user_note_value || null) == null ? 'cr-888' : ''}}">{{user_note_value || '留言'}}</view>
</view>
<!-- 积分 -->
<view s-if="(plugins_points_data || null) != null && (plugins_points_data.discount_price || 0) > 0" class="plugins-points-buy-container bg-white spacing-mb">
<view class="select oh">
<text s-if="plugins_points_data.discount_type == 1">使用{{plugins_points_data.use_integral}}个积分兑换商品</text>
<text s-else>使用积分{{plugins_points_data.use_integral}}个</text>
<text class="sales-price">-{{currency_symbol}}{{plugins_points_data.discount_price}}</text>
<view bindtap="points_event" class="fr">
<image class="icon" src="/images/default-select{{plugins_points_status ? '-active' : ''}}-icon.png" mode="widthFix" />
</view>
</view>
<view class="desc">
<text s-if="plugins_points_data.discount_type == 1">你有积分{{plugins_points_data.user_integral}}个</text>
<text s-else>你有积分{{plugins_points_data.user_integral}}个,可用{{plugins_points_data.use_integral}}个</text>
</view>
</view>
<!-- 支付方式 -->
<view s-if="payment_list.length > 0 && common_order_is_booking != 1" class="payment-list bg-white oh">
<view class="item tc fl" s-for="item, index in payment_list" s-key="key">
...
...
sourcecode/baidu/default/pages/cart/cart.js
浏览文件 @
4a8a95af
...
...
@@ -391,7 +391,7 @@ Page({
"
ids
"
:
ids
.
join
(
'
,
'
)
};
swan
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
},
...
...
sourcecode/baidu/default/pages/goods-detail/goods-detail.css
浏览文件 @
4a8a95af
...
...
@@ -368,4 +368,45 @@
}
.goods-parameters
.content-item
.item
:nth-child
(
2
n
)
{
float
:
right
;
}
/*
* 商品简述
*/
.goods-simple-desc
{
color
:
#f00
;
padding
:
0
10
rpx
;
margin
:
5
rpx
0
15
rpx
0
;
}
/*
* icon
*/
.goods-icon-container
{
padding
:
20
rpx
10
rpx
10
rpx
10
rpx
;
}
.goods-icon-container
view
{
background
:
#fff
;
border
:
1px
solid
#3bb4f2
;
color
:
#3bb4f2
;
padding
:
3
rpx
15
rpx
;
border-radius
:
8
rpx
;
margin-bottom
:
10
rpx
;
}
.goods-icon-container
view
:not
(
:last-child
)
{
margin-right
:
10
rpx
;
}
/*
* 面板
*/
.goods-panel-container
{
background
:
#fffbfc
;
color
:
#d2354c
;
}
.goods-panel-container
view
{
padding
:
15
rpx
10
rpx
;
}
.goods-panel-container
view
:not
(
:first-child
)
{
border-top
:
1px
dashed
#fff1f2
;
}
\ No newline at end of file
sourcecode/baidu/default/pages/goods-detail/goods-detail.js
浏览文件 @
4a8a95af
...
...
@@ -563,7 +563,7 @@ Page({
"
spec
"
:
JSON
.
stringify
(
spec
)
};
swan
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
this
.
popup_close_event
();
break
;
...
...
sourcecode/baidu/default/pages/goods-detail/goods-detail.swan
浏览文件 @
4a8a95af
...
...
@@ -23,6 +23,23 @@
<!-- 标题 -->
<view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
<!-- 简述 -->
<view s-if="(goods.simple_desc || null) != null" class="goods-simple-desc">{{goods.simple_desc}}</view>
<!-- icon -->
<view s-if="(goods.plugins_view_icon_data || null) != null && goods.plugins_view_icon_data.length > 0" class="goods-icon-container bg-white br-b-dashed oh">
<block s-for="item, index in goods.plugins_view_icon_data" s-key="key">
<view s-if="(item.name || null) != null" class="fl tc" style="{{(item.br_color || null) == null ? '' : 'border:1px solid '+item.br_color+';'}}{{(item.color || null) == null ? '' : 'color: '+item.color+';'}}">{{item.name}}</view>
</block>
</view>
<!-- 面板提示信息 -->
<view s-if="(goods.plugins_view_panel_data || null) != null && goods.plugins_view_panel_data.length > 0" class="goods-panel-container bg-white br-b-dashed oh">
<block s-for="item, index in goods.plugins_view_panel_data" s-key="key">
<view s-if="(item || null) != null">{{item}}</view>
</block>
</view>
<!-- 限时秒杀 -->
<view s-if="plugins_limitedtimediscount_is_valid == 1">
<import src="/pages/lib/limitedtimediscount/goods-detail.swan" />
...
...
sourcecode/baidu/default/pages/message/message.swan
浏览文件 @
4a8a95af
...
...
@@ -7,10 +7,6 @@
</view>
<view class="data-detail">{{item.detail}}</view>
</view>
<view s-if="data_list.length == 0">
<import src="/pages/common/nodata.swan" />
<template is="nodata" data="{{{status: data_list_loding_status}}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.swan" />
<template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
...
...
sourcecode/baidu/default/pages/plugins/points/index/index.css
0 → 100644
浏览文件 @
4a8a95af
/**
* 顶部
*/
.points-user
{
background-color
:
#fe3e28
;
position
:
relative
;
padding
:
100
rpx
0
120
rpx
0
;
}
.points-user
.avatar
{
padding
:
1px
;
background
:
#ff9589
;
margin
:
0
auto
;
}
.points-user
.avatar
,
.points-user
.avatar
image
{
width
:
160
rpx
;
height
:
160
rpx
;
border-radius
:
50%
;
}
.points-user
.user-name
{
color
:
#fff
;
margin
:
10
rpx
0
20
rpx
0
;
}
.points-user
.user-desc
{
color
:
#ffe7b2
;
}
.points-user-menu-submit
{
border
:
1px
solid
#ffd606
;
color
:
#fae501
;
position
:
absolute
;
top
:
20
rpx
;
right
:
20
rpx
;
padding
:
6
rpx
20
rpx
;
border-radius
:
3
rpx
;
}
.submit-container
{
position
:
absolute
;
bottom
:
20
rpx
;
right
:
20
rpx
;
}
.submit-container
button
:not
(
:first-child
)
{
margin-left
:
30
rpx
;
}
button
.login-submit
{
color
:
#5eb95e
;
background-color
:
#E4F3E4
;
border-color
:
#d2e8d2
;
margin-bottom
:
30
rpx
;
}
.submit-container
button
.share-submit
{
color
:
#F37B1D
;
background-color
:
#ffe5be
;
border-color
:
#f8d093
;
}
/**
* 商品导航
*/
.spacing-nav-title
{
color
:
#fe3e28
;
}
.spacing-nav-title
.line
{
background
:
#fe3e28
;
}
/**
* 商品列表
*/
.scroll-box
{
height
:
calc
(
100vh
-
80
rpx
);
}
.data-list
{
overflow
:
hidden
;
}
.data-list
.items
{
width
:
calc
(
50%
-
5
rpx
);
margin-bottom
:
10
rpx
;
padding-bottom
:
20
rpx
;
}
.data-list
.items
:nth-child
(
2
n
)
{
float
:
right
;
}
.data-list
.items
:nth-child
(
2
n
+
1
)
{
float
:
left
;
}
.data-list
.items
image
{
width
:
100%
;
height
:
200px
!important
;
}
.data-list
.items
.base
{
text-align
:
left
;
font-size
:
32
rpx
;
padding
:
0
15
rpx
;
}
.data-list
.items
.base
,
.data-list
.items
.base
.price
{
margin-top
:
10
rpx
;
}
.data-list
.items
.base
.original-price
{
margin-left
:
0
;
}
.data-list
.items
.base
.price
.sales-price
{
margin
:
0
5
rpx
;
}
.data-list
.items
.base
.price
.unit
{
color
:
#f40
;
}
\ No newline at end of file
sourcecode/baidu/default/pages/plugins/points/index/index.js
0 → 100644
浏览文件 @
4a8a95af
const
app
=
getApp
();
Page
({
data
:
{
data_bottom_line_status
:
false
,
data_list_loding_status
:
1
,
data_list_loding_msg
:
''
,
params
:
null
,
user
:
null
,
data_base
:
null
,
avatar_default
:
app
.
data
.
default_user_head_src
},
onReady
()
{},
onLoad
(
params
)
{
this
.
setData
({
params
:
params
,
user
:
app
.
get_user_cache_info
()
});
},
onShow
()
{
this
.
get_data
();
},
// 获取数据
get_data
()
{
var
self
=
this
;
swan
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
index
"
,
"
points
"
),
method
:
"
POST
"
,
data
:
{},
dataType
:
"
json
"
,
success
:
res
=>
{
swan
.
stopPullDownRefresh
();
if
(
res
.
data
.
code
==
0
)
{
var
data
=
res
.
data
.
data
;
self
.
setData
({
data_base
:
data
.
base
||
null
,
data_list_loding_msg
:
''
,
data_list_loding_status
:
0
,
data_bottom_line_status
:
true
});
}
else
{
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
res
.
data
.
msg
});
}
},
fail
:
()
=>
{
swan
.
stopPullDownRefresh
();
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
'
服务器请求出错
'
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
// 下拉刷新
onPullDownRefresh
()
{
this
.
get_data
();
},
// 立即登录
login_event
()
{
var
user
=
app
.
get_user_info
(
this
,
"
login_event
"
);
if
(
user
!=
false
)
{
// 用户未绑定用户则转到登录页面
if
(
app
.
user_is_need_login
(
user
))
{
swan
.
showModal
({
title
:
'
温馨提示
'
,
content
:
'
绑定手机号码
'
,
confirmText
:
'
确认
'
,
cancelText
:
'
暂不
'
,
success
:
result
=>
{
swan
.
stopPullDownRefresh
();
if
(
result
.
confirm
)
{
swan
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
}
}
});
}
}
this
.
setData
({
user
:
user
||
null
});
},
// 图片事件
right_images_event
(
e
)
{
if
((
this
.
data
.
data_base
.
right_images_url
||
null
)
!=
null
)
{
swan
.
navigateTo
({
url
:
this
.
data
.
data_base
.
right_images_url
});
}
},
// 头像查看
preview_event
()
{
if
(
app
.
data
.
default_user_head_src
!=
this
.
data
.
user
.
avatar
)
{
swan
.
previewImage
({
current
:
this
.
data
.
user
.
avatar
,
urls
:
[
this
.
data
.
user
.
avatar
]
});
}
},
// 自定义分享
onShareAppMessage
()
{
var
user_id
=
app
.
get_user_cache_info
(
'
id
'
,
0
)
||
0
;
return
{
title
:
this
.
data
.
data_base
.
seo_title
||
'
积分商城 -
'
+
app
.
data
.
application_title
,
desc
:
this
.
data
.
data_base
.
seo_desc
||
'
积分抵扣、兑换 -
'
+
app
.
data
.
application_describe
,
path
:
'
/pages/plugins/signin/index-detail/index-detail?referrer=
'
+
user_id
};
},
});
\ No newline at end of file
sourcecode/baidu/default/pages/plugins/points/index/index.json
0 → 100644
浏览文件 @
4a8a95af
{
"enablePullDownRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#fe3e28"
,
"backgroundColorTop"
:
"#fe3e28"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"navigationBarTitleText"
:
"积分商城"
}
\ No newline at end of file
sourcecode/baidu/default/pages/plugins/points/index/index.swan
0 → 100644
浏览文件 @
4a8a95af
<view s-if="(data_base || null) != null">
<!-- 顶部 -->
<view class="points-user tc">
<navigator class="points-user-menu-submit" url="/pages/user-integral/user-integral" hover-class="none">我的积分</navigator>
<block s-if="(user || null) == null">
<button type="default" size="mini" class="login-submit" bindtap="login_event">立即登录</button>
<view class="user-desc">获知会员积分详情</view>
</block>
<block s-else>
<view class="avatar">
<image bindtap="preview_event" src="{{user.avatar || avatar_default}}" mode="widthFix" class="dis-block" />
</view>
<view class="user-name">{{user.user_name_view}}</view>
<view class="user-desc">当前可用 {{user.integral}} 积分</view>
</block>
<!-- 按钮组 -->
<view class="submit-container">
<button type="default" size="mini" open-type="share" class="share-submit">分享</button>
</view>
</view>
<!-- 广告图片 -->
<image s-if="(data_base.right_images || null) != null" src="{{data_base.right_images}}" class="wh-auto dis-block spacing-mt" mode="widthFix" bindtap="right_images_event" />
<!-- 公告信息 -->
<view s-if="(data_base.points_desc || null) != null && data_base.points_desc.length > 0" class="tips spacing-mt">
<view s-for="item, index in data_base.points_desc" s-key="key" class="item">
{{item}}
</view>
</view>
<!-- 商品兑换 -->
<view s-if="(data_base.goods_exchange_data || null) != null && data_base.goods_exchange_data.length > 0" class="spacing-mt">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">商品兑换</text>
</view>
<view class="data-list spacing-10">
<view class="items bg-white" s-for="item, index in data_base.goods_exchange_data" s-key="key">
<navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods.id}}" hover-class="none">
<image src="{{item.goods.images}}" mode="aspectFit" />
<view class="base">
<view class="multi-text">{{item.goods.title}}</view>
<view class="price single-text original-price">{{currency_symbol}}{{item.goods.price}}</view>
<view class="price single-text">
<text class="unit">需</text>
<text class="sales-price">{{item.integral}}</text>
<text class="unit">积分</text>
</view>
</view>
</navigator>
</view>
</view>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.swan" />
<template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
</view>
<view s-else>
<import src="/pages/common/nodata.swan" />
<template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
</view>
\ No newline at end of file
sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.css
浏览文件 @
4a8a95af
...
...
@@ -97,6 +97,16 @@
border-radius
:
1000
rpx
;
}
/**
* 商品导航
*/
.spacing-nav-title
{
color
:
#f6b015
;
}
.spacing-nav-title
.line
{
background
:
#f6b015
;
}
/**
* 商品列表
*/
...
...
sourcecode/baidu/default/pages/plugins/signin/index-detail/index-detail.swan
浏览文件 @
4a8a95af
...
...
@@ -55,8 +55,8 @@
<image src="{{item.images}}" mode="aspectFit" />
<view class="base">
<view class="multi-text">{{item.title}}</view>
<view class="price">
<text class="sales-price">{{currency_symbol}}{{item.
min_
price}}</text>
<view class="price
single-text
">
<text class="sales-price">{{currency_symbol}}{{item.price}}</text>
</view>
</view>
</navigator>
...
...
@@ -75,7 +75,7 @@
<text class="coming-tips-text">获得 <text>{{coming_integral}}</text> 积分</text>
</view>
</view>
</view>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.swan" />
...
...
sourcecode/baidu/default/pages/user-integral/user-integral.swan
浏览文件 @
4a8a95af
...
...
@@ -2,7 +2,6 @@
<view class="content">
<view class="data-card bg-white br-b" s-for="item, index in data_list">
<view class="data-box oh">
<import src="/pages/common/nodata.swan" />
<text class="data-title">{{item.type_text}} {{item.operation_integral}}</text>
<text class="data-time fr">{{item.add_time_time}}</text>
</view>
...
...
@@ -12,10 +11,6 @@
</view>
<view class="data-detail">{{item.msg}}</view>
</view>
<view s-if="data_list.length == 0">
<import src="/pages/common/nodata.swan" />
<template is="nodata" data="{{{status: data_list_loding_status}}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.swan" />
<template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
...
...
sourcecode/qq/default/app.json
浏览文件 @
4a8a95af
...
...
@@ -53,7 +53,8 @@
"pages/plugins/signin/user-qrcode/user-qrcode"
,
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail"
,
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo"
,
"pages/plugins/signin/user-coming-list/user-coming-list"
"pages/plugins/signin/user-coming-list/user-coming-list"
,
"pages/plugins/points/index/index"
],
"window"
:
{
"navigationBarTitleText"
:
"{{application_title}}"
,
...
...
sourcecode/qq/default/components/icon-nav/icon-nav.qss
浏览文件 @
4a8a95af
...
...
@@ -23,7 +23,7 @@
}
.data-list .items .title {
margin-top: 10rpx;
font-size: 3
2
rpx;
font-size: 3
0
rpx;
text-align:center;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
...
...
sourcecode/qq/default/pages/buy/buy.js
浏览文件 @
4a8a95af
...
...
@@ -33,12 +33,16 @@ Page({
plugins_choice_coupon_value
:
[],
popup_plugins_coupon_status
:
false
,
popup_plugins_coupon_index
:
null
,
// 积分
plugins_points_data
:
null
,
plugins_points_status
:
false
,
},
onLoad
(
params
)
{
//params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}';
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
params
.
data
))
>
0
)
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
decodeURIComponent
(
params
.
data
)
))
>
0
)
{
this
.
setData
({
params
:
JSON
.
parse
(
params
.
data
)});
this
.
setData
({
params
:
JSON
.
parse
(
decodeURIComponent
(
params
.
data
)
)});
// 删除地址缓存
qq
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
...
...
@@ -106,7 +110,7 @@ Page({
qq
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
success
:
res
=>
{
qq
.
stopPullDownRefresh
();
...
...
@@ -125,6 +129,7 @@ Page({
common_site_type
:
data
.
common_site_type
||
0
,
extraction_address
:
data
.
base
.
extraction_address
||
[],
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
plugins_points_data
:
data
.
plugins_points_data
||
null
,
});
// 优惠劵选择处理
...
...
@@ -181,8 +186,9 @@ Page({
});
},
// 请求参数合并优惠券参数
request_data_coupon_merge
(
data
)
{
// 请求参数合并
request_data_ext_params_merge
(
data
)
{
// 优惠券
var
coupon_ids
=
this
.
data
.
plugins_use_coupon_ids
;
if
((
coupon_ids
||
null
)
!=
null
&&
coupon_ids
.
length
>
0
)
{
...
...
@@ -191,6 +197,10 @@ Page({
data
[
'
coupon_id_
'
+
i
]
=
coupon_ids
[
i
];
}
}
// 积分
data
[
'
is_points
'
]
=
(
this
.
data
.
plugins_points_status
===
true
)
?
1
:
0
;
return
data
;
},
...
...
@@ -241,7 +251,7 @@ Page({
qq
.
request
({
url
:
app
.
get_request_url
(
"
add
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
success
:
res
=>
{
qq
.
hideLoading
();
...
...
@@ -383,4 +393,10 @@ Page({
var
address
=
(
data
.
province_name
||
''
)
+
(
data
.
city_name
||
''
)
+
(
data
.
county_name
||
''
)
+
(
data
.
address
||
''
);
app
.
open_location
(
data
.
lng
,
data
.
lat
,
name
,
address
);
},
// 积分选择事件
points_event
(
e
)
{
this
.
setData
({
plugins_points_status
:
!
this
.
data
.
plugins_points_status
});
this
.
init
();
},
});
sourcecode/qq/default/pages/buy/buy.qml
浏览文件 @
4a8a95af
...
...
@@ -90,6 +90,22 @@
<
view
qq
:
else
bindtap
=
"
bind_user_note_tap_event
"
class
=
"
{{(user_note_value || null) == null ? 'cr-888' : ''}}
"
>
{{
user_note_value
||
'
留言
'
}}
<
/view
>
<
/view
>
<!--
积分
-->
<
view
qq
:
if
=
"
{{(plugins_points_data || null) != null && (plugins_points_data.discount_price || 0) > 0}}
"
class
=
"
plugins-points-buy-container bg-white spacing-mb
"
>
<
view
class
=
"
select oh
"
>
<
text
qq
:
if
=
"
{{plugins_points_data.discount_type == 1}}
"
>
使用
{{
plugins_points_data
.
use_integral
}}
个积分兑换商品
<
/text
>
<
text
qq
:
else
>
使用积分
{{
plugins_points_data
.
use_integral
}}
个
<
/text
>
<
text
class
=
"
sales-price
"
>-
{{
currency_symbol
}}{{
plugins_points_data
.
discount_price
}}
<
/text
>
<
view
bindtap
=
"
points_event
"
class
=
"
fr
"
>
<
image
class
=
"
icon
"
src
=
"
/images/default-select{{plugins_points_status ? '-active' : ''}}-icon.png
"
mode
=
"
widthFix
"
/>
<
/view
>
<
/view
>
<
view
class
=
"
desc
"
>
<
text
qq
:
if
=
"
{{plugins_points_data.discount_type == 1}}
"
>
你有积分
{{
plugins_points_data
.
user_integral
}}
个
<
/text
>
<
text
qq
:
else
>
你有积分
{{
plugins_points_data
.
user_integral
}}
个
,
可用
{{
plugins_points_data
.
use_integral
}}
个
<
/text
>
<
/view
>
<
/view
>
<!--
支付方式
-->
<
view
qq
:
if
=
"
{{payment_list.length > 0 && common_order_is_booking != 1}}
"
class
=
"
payment-list bg-white oh
"
>
<
view
class
=
"
item tc fl
"
qq
:
for
=
"
{{payment_list}}
"
qq
:
key
=
"
key
"
>
...
...
sourcecode/qq/default/pages/buy/buy.qss
浏览文件 @
4a8a95af
...
...
@@ -180,10 +180,10 @@
width: 50%;
}
/*
*
/*
* 插件样式区域
*/
/*
*
/
*
* 优惠劵
*/
.plugins-coupon {
...
...
@@ -209,4 +209,24 @@
.coupon-container .not-use-tips {
color: #f7b240;
font-size: 32rpx;
}
/*
* 积分
*/
.plugins-points-buy-container {
padding: 20rpx;
}
.plugins-points-buy-container .select .icon {
width: 45rpx;
height: 45rpx !important;
vertical-align: middle;
}
.plugins-points-buy-container .select .sales-price {
margin-left: 30rpx;
font-size: 28rpx;
font-weight: 400;
}
.plugins-points-buy-container .desc {
color: #F37B1D;
}
\ No newline at end of file
sourcecode/qq/default/pages/cart/cart.js
浏览文件 @
4a8a95af
...
...
@@ -393,7 +393,7 @@ Page({
"
ids
"
:
ids
.
join
(
'
,
'
)
};
qq
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
},
...
...
sourcecode/qq/default/pages/goods-detail/goods-detail.js
浏览文件 @
4a8a95af
...
...
@@ -610,7 +610,7 @@ Page({
"
spec
"
:
JSON
.
stringify
(
spec
)
};
qq
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
this
.
popup_close_event
();
break
;
...
...
sourcecode/qq/default/pages/goods-detail/goods-detail.qml
浏览文件 @
4a8a95af
...
...
@@ -29,6 +29,23 @@
<!--
标题
-->
<
view
class
=
"
goods-title multi-text
"
style
=
"
color:{{goods.title_color}}
"
>
{{
goods
.
title
}}
<
/view
>
<!--
简述
-->
<
view
qq
:
if
=
"
{{(goods.simple_desc || null) != null}}
"
class
=
"
goods-simple-desc
"
>
{{
goods
.
simple_desc
}}
<
/view
>
<!--
icon
-->
<
view
qq
:
if
=
"
{{(goods.plugins_view_icon_data || null) != null && goods.plugins_view_icon_data.length > 0}}
"
class
=
"
goods-icon-container bg-white br-b-dashed oh
"
>
<
block
qq
:
for
=
"
{{goods.plugins_view_icon_data}}
"
qq
:
key
=
"
key
"
>
<
view
qq
:
if
=
"
{{(item.name || null) != null}}
"
class
=
"
fl tc
"
style
=
"
{{(item.br_color || null) == null ? '' : 'border:1px solid '+item.br_color+';'}}{{(item.color || null) == null ? '' : 'color: '+item.color+';'}}
"
>
{{
item
.
name
}}
<
/view
>
<
/block
>
<
/view
>
<!--
面板提示信息
-->
<
view
qq
:
if
=
"
{{(goods.plugins_view_panel_data || null) != null && goods.plugins_view_panel_data.length > 0}}
"
class
=
"
goods-panel-container bg-white br-b-dashed oh
"
>
<
block
qq
:
for
=
"
{{goods.plugins_view_panel_data}}
"
qq
:
key
=
"
key
"
>
<
view
qq
:
if
=
"
{{(item || null) != null}}
"
>
{{
item
}}
<
/view
>
<
/block
>
<
/view
>
<!--
限时秒杀
-->
<
view
qq
:
if
=
"
{{plugins_limitedtimediscount_is_valid == 1}}
"
>
<
import
src
=
"
/pages/lib/limitedtimediscount/goods-detail.qml
"
/>
...
...
sourcecode/qq/default/pages/goods-detail/goods-detail.qss
浏览文件 @
4a8a95af
...
...
@@ -364,4 +364,45 @@
}
.goods-parameters .content-item .item:nth-child(2n) {
float: right;
}
/*
* 商品简述
*/
.goods-simple-desc {
color: #f00;
padding: 0 10rpx;
margin: 5rpx 0 15rpx 0;
}
/*
* icon
*/
.goods-icon-container {
padding: 20rpx 10rpx 10rpx 10rpx;
}
.goods-icon-container view {
background: #fff;
border: 1px solid #3bb4f2;
color: #3bb4f2;
padding: 3rpx 15rpx;
border-radius: 8rpx;
margin-bottom: 10rpx;
}
.goods-icon-container view:not(:last-child) {
margin-right: 10rpx;
}
/*
* 面板
*/
.goods-panel-container {
background: #fffbfc;
color: #d2354c;
}
.goods-panel-container view {
padding: 15rpx 10rpx;
}
.goods-panel-container view:not(:first-child) {
border-top: 1px dashed #fff1f2;
}
\ No newline at end of file
sourcecode/qq/default/pages/message/message.qml
浏览文件 @
4a8a95af
...
...
@@ -7,10 +7,6 @@
<
/view
>
<
view
class
=
"
data-detail
"
>
{{
item
.
detail
}}
<
/view
>
<
/view
>
<
view
qq
:
if
=
"
{{data_list.length == 0}}
"
>
<
import
src
=
"
/pages/common/nodata.qml
"
/>
<
template
is
=
"
nodata
"
data
=
"
{{status: data_list_loding_status}}
"
><
/template
>
<
/view
>
<
/view
>
<
import
src
=
"
/pages/common/bottom_line.qml
"
/>
<
template
is
=
"
bottom_line
"
data
=
"
{{status: data_bottom_line_status}}
"
><
/template
>
...
...
sourcecode/qq/default/pages/plugins/points/index/index.js
0 → 100644
浏览文件 @
4a8a95af
const
app
=
getApp
();
Page
({
data
:
{
data_bottom_line_status
:
false
,
data_list_loding_status
:
1
,
data_list_loding_msg
:
''
,
params
:
null
,
user
:
null
,
data_base
:
null
,
avatar_default
:
app
.
data
.
default_user_head_src
,
},
onLoad
(
params
)
{
this
.
setData
({
params
:
params
,
user
:
app
.
get_user_cache_info
(),
});
},
onShow
()
{
this
.
get_data
();
},
// 获取数据
get_data
()
{
var
self
=
this
;
qq
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
index
"
,
"
points
"
),
method
:
"
POST
"
,
data
:
{},
dataType
:
"
json
"
,
success
:
res
=>
{
qq
.
stopPullDownRefresh
();
if
(
res
.
data
.
code
==
0
)
{
var
data
=
res
.
data
.
data
;
self
.
setData
({
data_base
:
data
.
base
||
null
,
data_list_loding_msg
:
''
,
data_list_loding_status
:
0
,
data_bottom_line_status
:
true
,
});
}
else
{
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
}
},
fail
:
()
=>
{
qq
.
stopPullDownRefresh
();
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
'
服务器请求出错
'
,
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
// 下拉刷新
onPullDownRefresh
()
{
this
.
get_data
();
},
// 立即登录
login_event
()
{
var
user
=
app
.
get_user_info
(
this
,
"
login_event
"
)
if
(
user
!=
false
)
{
// 用户未绑定用户则转到登录页面
if
(
app
.
user_is_need_login
(
user
))
{
qq
.
showModal
({
title
:
'
温馨提示
'
,
content
:
'
绑定手机号码
'
,
confirmText
:
'
确认
'
,
cancelText
:
'
暂不
'
,
success
:
(
result
)
=>
{
qq
.
stopPullDownRefresh
();
if
(
result
.
confirm
)
{
qq
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
}
},
});
}
}
this
.
setData
({
user
:
user
||
null
});
},
// 图片事件
right_images_event
(
e
)
{
if
((
this
.
data
.
data_base
.
right_images_url
||
null
)
!=
null
)
{
qq
.
navigateTo
({
url
:
this
.
data
.
data_base
.
right_images_url
,
});
}
},
// 头像查看
preview_event
()
{
if
(
app
.
data
.
default_user_head_src
!=
this
.
data
.
user
.
avatar
)
{
qq
.
previewImage
({
current
:
this
.
data
.
user
.
avatar
,
urls
:
[
this
.
data
.
user
.
avatar
]
});
}
},
// 自定义分享
onShareAppMessage
()
{
var
user_id
=
app
.
get_user_cache_info
(
'
id
'
,
0
)
||
0
;
return
{
title
:
this
.
data
.
data_base
.
seo_title
||
'
积分商城 -
'
+
app
.
data
.
application_title
,
desc
:
this
.
data
.
data_base
.
seo_desc
||
'
积分抵扣、兑换 -
'
+
app
.
data
.
application_describe
,
path
:
'
/pages/plugins/signin/index-detail/index-detail?referrer=
'
+
user_id
};
},
});
\ No newline at end of file
sourcecode/qq/default/pages/plugins/points/index/index.json
0 → 100644
浏览文件 @
4a8a95af
{
"enablePullDownRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#fe3e28"
,
"backgroundColorTop"
:
"#fe3e28"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"navigationBarTitleText"
:
"积分商城"
}
\ No newline at end of file
sourcecode/qq/default/pages/plugins/points/index/index.qml
0 → 100644
浏览文件 @
4a8a95af
<
view
qq
:
if
=
"
{{(data_base || null) != null}}
"
>
<!--
顶部
-->
<
view
class
=
"
points-user tc
"
>
<
navigator
class
=
"
points-user-menu-submit
"
url
=
"
/pages/user-integral/user-integral
"
hover
-
class
=
"
none
"
>
我的积分
<
/navigator
>
<
block
qq
:
if
=
"
{{(user || null) == null}}
"
>
<
button
type
=
"
default
"
size
=
"
mini
"
class
=
"
login-submit
"
bindtap
=
"
login_event
"
>
立即登录
<
/button
>
<
view
class
=
"
user-desc
"
>
获知会员积分详情
<
/view
>
<
/block
>
<
block
qq
:
else
>
<
view
class
=
"
avatar
"
>
<
image
bindtap
=
"
preview_event
"
src
=
"
{{user.avatar || avatar_default}}
"
mode
=
"
widthFix
"
class
=
"
dis-block
"
/>
<
/view
>
<
view
class
=
"
user-name
"
>
{{
user
.
user_name_view
}}
<
/view
>
<
view
class
=
"
user-desc
"
>
当前可用
{{
user
.
integral
}}
积分
<
/view
>
<
/block
>
<!--
按钮组
-->
<
view
class
=
"
submit-container
"
>
<
button
type
=
"
default
"
size
=
"
mini
"
open
-
type
=
"
share
"
class
=
"
share-submit
"
>
分享
<
/button
>
<
/view
>
<
/view
>
<!--
广告图片
-->
<
image
qq
:
if
=
"
{{(data_base.right_images || null) != null}}
"
src
=
"
{{data_base.right_images}}
"
class
=
"
wh-auto dis-block spacing-mt
"
mode
=
"
widthFix
"
bindtap
=
"
right_images_event
"
/>
<!--
公告信息
-->
<
view
qq
:
if
=
"
{{(data_base.points_desc || null) != null && data_base.points_desc.length > 0}}
"
class
=
"
tips spacing-mt
"
>
<
view
qq
:
for
=
"
{{data_base.points_desc}}
"
qq
:
key
=
"
key
"
class
=
"
item
"
>
{{
item
}}
<
/view
>
<
/view
>
<!--
商品兑换
-->
<
view
qq
:
if
=
"
{{(data_base.goods_exchange_data || null) != null && data_base.goods_exchange_data.length > 0}}
"
class
=
"
spacing-mt
"
>
<
view
class
=
"
spacing-nav-title
"
>
<
text
class
=
"
line
"
><
/text
>
<
text
class
=
"
text-wrapper
"
>
商品兑换
<
/text
>
<
/view
>
<
view
class
=
"
data-list spacing-10
"
>
<
view
class
=
"
items bg-white
"
qq
:
for
=
"
{{data_base.goods_exchange_data}}
"
qq
:
key
=
"
key
"
>
<
navigator
url
=
"
/pages/goods-detail/goods-detail?goods_id={{item.goods.id}}
"
hover
-
class
=
"
none
"
>
<
image
src
=
"
{{item.goods.images}}
"
mode
=
"
aspectFit
"
/>
<
view
class
=
"
base
"
>
<
view
class
=
"
multi-text
"
>
{{
item
.
goods
.
title
}}
<
/view
>
<
view
class
=
"
price single-text original-price
"
>
{{
currency_symbol
}}{{
item
.
goods
.
price
}}
<
/view
>
<
view
class
=
"
price single-text
"
>
<
text
class
=
"
unit
"
>
需
<
/text
>
<
text
class
=
"
sales-price
"
>
{{
item
.
integral
}}
<
/text
>
<
text
class
=
"
unit
"
>
积分
<
/text
>
<
/view
>
<
/view
>
<
/navigator
>
<
/view
>
<
/view
>
<
/view
>
<!--
结尾
-->
<
import
src
=
"
/pages/common/bottom_line.qml
"
/>
<
template
is
=
"
bottom_line
"
data
=
"
{{status: data_bottom_line_status}}
"
><
/template
>
<
/view
>
<
view
qq
:
else
>
<
import
src
=
"
/pages/common/nodata.qml
"
/>
<
template
is
=
"
nodata
"
data
=
"
{{status: data_list_loding_status, msg: data_list_loding_msg}}
"
><
/template
>
<
/view>
\ No newline at end of file
sourcecode/qq/default/pages/plugins/points/index/index.qss
0 → 100644
浏览文件 @
4a8a95af
/**
* 顶部
*/
.points-user {
background-color: #fe3e28;
position: relative;
padding: 100rpx 0 120rpx 0;
}
.points-user .avatar {
padding: 1px;
background: #ff9589;
margin: 0 auto;
}
.points-user .avatar,
.points-user .avatar image {
width: 160rpx;
height: 160rpx;
border-radius: 50%;
}
.points-user .user-name {
color: #fff;
margin: 10rpx 0 20rpx 0;
}
.points-user .user-desc {
color: #ffe7b2;
}
.points-user-menu-submit {
border: 1px solid #ffd606;
color: #fae501;
position: absolute;
top: 20rpx;
right: 20rpx;
padding: 6rpx 20rpx;
border-radius: 3rpx;
}
.submit-container {
position: absolute;
bottom: 20rpx;
right: 20rpx;
}
.submit-container button:not(:first-child) {
margin-left: 30rpx;
}
button.login-submit {
color: #5eb95e;
background-color: #E4F3E4;
border-color: #d2e8d2;
margin-bottom: 30rpx;
}
.submit-container button.share-submit {
color: #F37B1D;
background-color: #ffe5be;
border-color: #f8d093;
}
/**
* 商品导航
*/
.spacing-nav-title {
color: #fe3e28;
}
.spacing-nav-title .line {
background: #fe3e28;
}
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}
.data-list .items {
width: calc(50% - 5rpx);
margin-bottom: 10rpx;
padding-bottom: 20rpx;
}
.data-list .items:nth-child(2n) {
float: right;
}
.data-list .items:nth-child(2n+1) {
float: left;
}
.data-list .items image {
width: 100%;
height: 200px !important;
}
.data-list .items .base {
text-align: left;
font-size: 32rpx;
padding: 0 15rpx;
}
.data-list .items .base,
.data-list .items .base .price {
margin-top: 10rpx;
}
.data-list .items .base .original-price {
margin-left: 0;
}
.data-list .items .base .price .sales-price {
margin: 0 5rpx;
}
.data-list .items .base .price .unit {
color: #f40;
}
\ No newline at end of file
sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qml
浏览文件 @
4a8a95af
...
...
@@ -55,8 +55,8 @@
<
image
src
=
"
{{item.images}}
"
mode
=
"
aspectFit
"
/>
<
view
class
=
"
base
"
>
<
view
class
=
"
multi-text
"
>
{{
item
.
title
}}
<
/view
>
<
view
class
=
"
price
"
>
<
text
class
=
"
sales-price
"
>
{{
currency_symbol
}}{{
item
.
min_
price
}}
<
/text
>
<
view
class
=
"
price
single-text
"
>
<
text
class
=
"
sales-price
"
>
{{
currency_symbol
}}{{
item
.
price
}}
<
/text
>
<
/view
>
<
/view
>
<
/navigator
>
...
...
@@ -75,7 +75,7 @@
<
text
class
=
"
coming-tips-text
"
>
获得
<
text
>
{{
coming_integral
}}
<
/text> 积分</
text
>
<
/view
>
<
/view
>
<
/view
>
<
/view
>
<!--
结尾
-->
<
import
src
=
"
/pages/common/bottom_line.qml
"
/>
...
...
sourcecode/qq/default/pages/plugins/signin/index-detail/index-detail.qss
浏览文件 @
4a8a95af
...
...
@@ -97,6 +97,16 @@
border-radius: 1000rpx;
}
/**
* 商品导航
*/
.spacing-nav-title {
color: #f6b015;
}
.spacing-nav-title .line {
background: #f6b015;
}
/**
* 商品列表
*/
...
...
sourcecode/qq/default/pages/user-integral/user-integral.qml
浏览文件 @
4a8a95af
...
...
@@ -2,7 +2,6 @@
<
view
class
=
"
content
"
>
<
view
class
=
"
data-card bg-white br-b
"
qq
:
for
=
"
{{data_list}}
"
>
<
view
class
=
"
data-box oh
"
>
<
import
src
=
"
/pages/common/nodata.qml
"
/>
<
text
class
=
"
data-title
"
>
{{
item
.
type_text
}}
{{
item
.
operation_integral
}}
<
/text
>
<
text
class
=
"
data-time fr
"
>
{{
item
.
add_time_time
}}
<
/text
>
<
/view
>
...
...
@@ -12,10 +11,6 @@
<
/view
>
<
view
class
=
"
data-detail
"
>
{{
item
.
msg
}}
<
/view
>
<
/view
>
<
view
qq
:
if
=
"
{{data_list.length == 0}}
"
>
<
import
src
=
"
/pages/common/nodata.qml
"
/>
<
template
is
=
"
nodata
"
data
=
"
{{status: data_list_loding_status}}
"
><
/template
>
<
/view
>
<
/view
>
<
import
src
=
"
/pages/common/bottom_line.qml
"
/>
<
template
is
=
"
bottom_line
"
data
=
"
{{status: data_bottom_line_status}}
"
><
/template
>
...
...
sourcecode/toutiao/default/app.json
浏览文件 @
4a8a95af
...
...
@@ -72,7 +72,8 @@
"pages/plugins/signin/user-qrcode/user-qrcode"
,
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail"
,
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo"
,
"pages/plugins/signin/user-coming-list/user-coming-list"
"pages/plugins/signin/user-coming-list/user-coming-list"
,
"pages/plugins/points/index/index"
],
"window"
:
{
"navigationBarTitleText"
:
"{{application_title}}"
,
...
...
sourcecode/toutiao/default/components/icon-nav/icon-nav.ttss
浏览文件 @
4a8a95af
...
...
@@ -23,7 +23,7 @@
}
.data-list .items .title {
margin-top: 10rpx;
font-size: 3
2
rpx;
font-size: 3
0
rpx;
text-align:center;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
...
...
sourcecode/toutiao/default/pages/buy/buy.js
浏览文件 @
4a8a95af
...
...
@@ -33,13 +33,17 @@ Page({
plugins_choice_coupon_value
:
[],
popup_plugins_coupon_status
:
false
,
popup_plugins_coupon_index
:
null
,
// 积分
plugins_points_data
:
null
,
plugins_points_status
:
false
,
},
onLoad
(
params
)
{
//params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}';
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
params
.
data
))
>
0
)
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
decodeURIComponent
(
params
.
data
)
))
>
0
)
{
this
.
setData
({
params
:
JSON
.
parse
(
params
.
data
)});
this
.
setData
({
params
:
JSON
.
parse
(
decodeURIComponent
(
params
.
data
)
)});
// 删除地址缓存
tt
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
...
...
@@ -107,7 +111,7 @@ Page({
tt
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
success
:
res
=>
{
tt
.
stopPullDownRefresh
();
...
...
@@ -128,7 +132,8 @@ Page({
data_list_loding_status
:
3
,
common_site_type
:
data
.
common_site_type
||
0
,
extraction_address
:
data
.
base
.
extraction_address
||
[],
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
plugins_points_data
:
data
.
plugins_points_data
||
null
,
});
// 优惠劵选择处理
...
...
@@ -186,8 +191,9 @@ Page({
});
},
// 请求参数合并优惠券参数
request_data_coupon_merge
(
data
)
{
// 请求参数合并
request_data_ext_params_merge
(
data
)
{
// 优惠券
var
coupon_ids
=
this
.
data
.
plugins_use_coupon_ids
;
if
((
coupon_ids
||
null
)
!=
null
&&
coupon_ids
.
length
>
0
)
{
...
...
@@ -196,6 +202,9 @@ Page({
}
}
// 积分
data
[
'
is_points
'
]
=
(
this
.
data
.
plugins_points_status
===
true
)
?
1
:
0
;
return
data
;
},
...
...
@@ -256,7 +265,7 @@ Page({
tt
.
request
({
url
:
app
.
get_request_url
(
"
add
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
success
:
res
=>
{
tt
.
hideLoading
();
...
...
@@ -413,6 +422,11 @@ Page({
var
name
=
data
.
alias
||
data
.
name
||
''
;
var
address
=
(
data
.
province_name
||
''
)
+
(
data
.
city_name
||
''
)
+
(
data
.
county_name
||
''
)
+
(
data
.
address
||
''
);
app
.
open_location
(
data
.
lng
,
data
.
lat
,
name
,
address
);
}
}
,
// 积分选择事件
points_event
(
e
)
{
this
.
setData
({
plugins_points_status
:
!
this
.
data
.
plugins_points_status
});
this
.
init
();
},
});
\ No newline at end of file
sourcecode/toutiao/default/pages/buy/buy.ttml
浏览文件 @
4a8a95af
...
...
@@ -90,6 +90,22 @@
<view tt:else bindtap="bind_user_note_tap_event" class="{{(user_note_value || null) == null ? 'cr-888' : ''}}">{{user_note_value || '留言'}}</view>
</view>
<!-- 积分 -->
<view tt:if="{{(plugins_points_data || null) != null && (plugins_points_data.discount_price || 0) > 0}}" class="plugins-points-buy-container bg-white spacing-mb">
<view class="select oh">
<text tt:if="{{plugins_points_data.discount_type == 1}}">使用{{plugins_points_data.use_integral}}个积分兑换商品</text>
<text tt:else>使用积分{{plugins_points_data.use_integral}}个</text>
<text class="sales-price">-{{currency_symbol}}{{plugins_points_data.discount_price}}</text>
<view bindtap="points_event" class="fr">
<image class="icon" src="/images/default-select{{plugins_points_status ? '-active' : ''}}-icon.png" mode="widthFix" />
</view>
</view>
<view class="desc">
<text tt:if="{{plugins_points_data.discount_type == 1}}">你有积分{{plugins_points_data.user_integral}}个</text>
<text tt:else>你有积分{{plugins_points_data.user_integral}}个,可用{{plugins_points_data.use_integral}}个</text>
</view>
</view>
<!-- 支付方式 -->
<view tt:if="{{payment_list.length > 0 && common_order_is_booking != 1}}" class="payment-list bg-white oh">
<view class="item tc fl" tt:for="{{payment_list}}" tt:key="key">
...
...
sourcecode/toutiao/default/pages/buy/buy.ttss
浏览文件 @
4a8a95af
...
...
@@ -180,10 +180,10 @@
width: 50%;
}
/*
*
/*
* 插件样式区域
*/
/*
*
/
*
* 优惠劵
*/
.plugins-coupon {
...
...
@@ -209,4 +209,24 @@
.coupon-container .not-use-tips {
color: #f7b240;
font-size: 32rpx;
}
/*
* 积分
*/
.plugins-points-buy-container {
padding: 20rpx;
}
.plugins-points-buy-container .select .icon {
width: 45rpx;
height: 45rpx !important;
vertical-align: middle;
}
.plugins-points-buy-container .select .sales-price {
margin-left: 30rpx;
font-size: 28rpx;
font-weight: 400;
}
.plugins-points-buy-container .desc {
color: #F37B1D;
}
\ No newline at end of file
sourcecode/toutiao/default/pages/cart/cart.js
浏览文件 @
4a8a95af
...
...
@@ -393,7 +393,7 @@ Page({
"
ids
"
:
ids
.
join
(
'
,
'
)
};
tt
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
},
...
...
sourcecode/toutiao/default/pages/goods-detail/goods-detail.js
浏览文件 @
4a8a95af
...
...
@@ -610,7 +610,7 @@ Page({
"
spec
"
:
JSON
.
stringify
(
spec
)
};
tt
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
this
.
popup_close_event
();
break
;
...
...
sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml
浏览文件 @
4a8a95af
...
...
@@ -29,6 +29,23 @@
<!-- 标题 -->
<view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
<!-- 简述 -->
<view tt:if="{{(goods.simple_desc || null) != null}}" class="goods-simple-desc">{{goods.simple_desc}}</view>
<!-- icon -->
<view tt:if="{{(goods.plugins_view_icon_data || null) != null && goods.plugins_view_icon_data.length > 0}}" class="goods-icon-container bg-white br-b-dashed oh">
<block tt:for="{{goods.plugins_view_icon_data}}" tt:key="key">
<view tt:if="{{(item.name || null) != null}}" class="fl tc" style="{{(item.br_color || null) == null ? '' : 'border:1px solid '+item.br_color+';'}}{{(item.color || null) == null ? '' : 'color: '+item.color+';'}}">{{item.name}}</view>
</block>
</view>
<!-- 面板提示信息 -->
<view tt:if="{{(goods.plugins_view_panel_data || null) != null && goods.plugins_view_panel_data.length > 0}}" class="goods-panel-container bg-white br-b-dashed oh">
<block tt:for="{{goods.plugins_view_panel_data}}" tt:key="key">
<view tt:if="{{(item || null) != null}}">{{item}}</view>
</block>
</view>
<!-- 限时秒杀 -->
<view tt:if="{{plugins_limitedtimediscount_is_valid == 1}}">
<import src="/pages/lib/limitedtimediscount/goods-detail.ttml" />
...
...
sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttss
浏览文件 @
4a8a95af
...
...
@@ -364,4 +364,45 @@
}
.goods-parameters .content-item .item:nth-child(2n) {
float: right;
}
/*
* 商品简述
*/
.goods-simple-desc {
color: #f00;
padding: 0 10rpx;
margin: 5rpx 0 15rpx 0;
}
/*
* icon
*/
.goods-icon-container {
padding: 20rpx 10rpx 10rpx 10rpx;
}
.goods-icon-container view {
background: #fff;
border: 1px solid #3bb4f2;
color: #3bb4f2;
padding: 3rpx 15rpx;
border-radius: 8rpx;
margin-bottom: 10rpx;
}
.goods-icon-container view:not(:last-child) {
margin-right: 10rpx;
}
/*
* 面板
*/
.goods-panel-container {
background: #fffbfc;
color: #d2354c;
}
.goods-panel-container view {
padding: 15rpx 10rpx;
}
.goods-panel-container view:not(:first-child) {
border-top: 1px dashed #fff1f2;
}
\ No newline at end of file
sourcecode/toutiao/default/pages/message/message.ttml
浏览文件 @
4a8a95af
...
...
@@ -7,10 +7,6 @@
</view>
<view class="data-detail">{{item.detail}}</view>
</view>
<view tt:if="{{data_list.length == 0}}">
<import src="/pages/common/nodata.ttml" />
<template is="nodata" data="{{status: data_list_loding_status}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.ttml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
...
...
sourcecode/toutiao/default/pages/plugins/points/index/index.js
0 → 100644
浏览文件 @
4a8a95af
const
app
=
getApp
();
Page
({
data
:
{
data_bottom_line_status
:
false
,
data_list_loding_status
:
1
,
data_list_loding_msg
:
''
,
params
:
null
,
user
:
null
,
data_base
:
null
,
avatar_default
:
app
.
data
.
default_user_head_src
,
},
onLoad
(
params
)
{
this
.
setData
({
params
:
params
,
user
:
app
.
get_user_cache_info
(),
});
},
onShow
()
{
this
.
get_data
();
},
// 获取数据
get_data
()
{
var
self
=
this
;
tt
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
index
"
,
"
points
"
),
method
:
"
POST
"
,
data
:
{},
dataType
:
"
json
"
,
success
:
res
=>
{
tt
.
stopPullDownRefresh
();
if
(
res
.
data
.
code
==
0
)
{
var
data
=
res
.
data
.
data
;
self
.
setData
({
data_base
:
data
.
base
||
null
,
data_list_loding_msg
:
''
,
data_list_loding_status
:
0
,
data_bottom_line_status
:
true
,
});
}
else
{
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
}
},
fail
:
()
=>
{
tt
.
stopPullDownRefresh
();
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
'
服务器请求出错
'
,
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
// 下拉刷新
onPullDownRefresh
()
{
this
.
get_data
();
},
// 立即登录
login_event
()
{
var
user
=
app
.
get_user_info
(
this
,
"
login_event
"
)
if
(
user
!=
false
)
{
// 用户未绑定用户则转到登录页面
if
(
app
.
user_is_need_login
(
user
))
{
tt
.
showModal
({
title
:
'
温馨提示
'
,
content
:
'
绑定手机号码
'
,
confirmText
:
'
确认
'
,
cancelText
:
'
暂不
'
,
success
:
(
result
)
=>
{
tt
.
stopPullDownRefresh
();
if
(
result
.
confirm
)
{
tt
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
}
},
});
}
}
this
.
setData
({
user
:
user
||
null
});
},
// 图片事件
right_images_event
(
e
)
{
if
((
this
.
data
.
data_base
.
right_images_url
||
null
)
!=
null
)
{
tt
.
navigateTo
({
url
:
this
.
data
.
data_base
.
right_images_url
,
});
}
},
// 头像查看
preview_event
()
{
if
(
app
.
data
.
default_user_head_src
!=
this
.
data
.
user
.
avatar
)
{
tt
.
previewImage
({
current
:
this
.
data
.
user
.
avatar
,
urls
:
[
this
.
data
.
user
.
avatar
]
});
}
},
// 自定义分享
onShareAppMessage
()
{
var
user_id
=
app
.
get_user_cache_info
(
'
id
'
,
0
)
||
0
;
return
{
title
:
this
.
data
.
data_base
.
seo_title
||
'
积分商城 -
'
+
app
.
data
.
application_title
,
desc
:
this
.
data
.
data_base
.
seo_desc
||
'
积分抵扣、兑换 -
'
+
app
.
data
.
application_describe
,
path
:
'
/pages/plugins/signin/index-detail/index-detail?referrer=
'
+
user_id
};
},
});
\ No newline at end of file
sourcecode/toutiao/default/pages/plugins/points/index/index.json
0 → 100644
浏览文件 @
4a8a95af
{
"enablePullDownRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#fe3e28"
,
"backgroundColorTop"
:
"#fe3e28"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"navigationBarTitleText"
:
"积分商城"
}
\ No newline at end of file
sourcecode/toutiao/default/pages/plugins/points/index/index.ttml
0 → 100644
浏览文件 @
4a8a95af
<view tt:if="{{(data_base || null) != null}}">
<!-- 顶部 -->
<view class="points-user tc">
<navigator class="points-user-menu-submit" url="/pages/user-integral/user-integral" hover-class="none">我的积分</navigator>
<block tt:if="{{(user || null) == null}}">
<button type="default" size="mini" class="login-submit" bindtap="login_event">立即登录</button>
<view class="user-desc">获知会员积分详情</view>
</block>
<block tt:else>
<view class="avatar">
<image bindtap="preview_event" src="{{user.avatar || avatar_default}}" mode="widthFix" class="dis-block" />
</view>
<view class="user-name">{{user.user_name_view}}</view>
<view class="user-desc">当前可用 {{user.integral}} 积分</view>
</block>
<!-- 按钮组 -->
<view class="submit-container">
<button type="default" size="mini" open-type="share" class="share-submit">分享</button>
</view>
</view>
<!-- 广告图片 -->
<image tt:if="{{(data_base.right_images || null) != null}}" src="{{data_base.right_images}}" class="wh-auto dis-block spacing-mt" mode="widthFix" bindtap="right_images_event" />
<!-- 公告信息 -->
<view tt:if="{{(data_base.points_desc || null) != null && data_base.points_desc.length > 0}}" class="tips spacing-mt">
<view tt:for="{{data_base.points_desc}}" tt:key="key" class="item">
{{item}}
</view>
</view>
<!-- 商品兑换 -->
<view tt:if="{{(data_base.goods_exchange_data || null) != null && data_base.goods_exchange_data.length > 0}}" class="spacing-mt">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">商品兑换</text>
</view>
<view class="data-list spacing-10">
<view class="items bg-white" tt:for="{{data_base.goods_exchange_data}}" tt:key="key">
<navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods.id}}" hover-class="none">
<image src="{{item.goods.images}}" mode="aspectFit" />
<view class="base">
<view class="multi-text">{{item.goods.title}}</view>
<view class="price single-text original-price">{{currency_symbol}}{{item.goods.price}}</view>
<view class="price single-text">
<text class="unit">需</text>
<text class="sales-price">{{item.integral}}</text>
<text class="unit">积分</text>
</view>
</view>
</navigator>
</view>
</view>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.ttml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</view>
<view tt:else>
<import src="/pages/common/nodata.ttml" />
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
</view>
\ No newline at end of file
sourcecode/toutiao/default/pages/plugins/points/index/index.ttss
0 → 100644
浏览文件 @
4a8a95af
/**
* 顶部
*/
.points-user {
background-color: #fe3e28;
position: relative;
padding: 100rpx 0 120rpx 0;
}
.points-user .avatar {
padding: 1px;
background: #ff9589;
margin: 0 auto;
}
.points-user .avatar,
.points-user .avatar image {
width: 160rpx;
height: 160rpx;
border-radius: 50%;
}
.points-user .user-name {
color: #fff;
margin: 10rpx 0 20rpx 0;
}
.points-user .user-desc {
color: #ffe7b2;
}
.points-user-menu-submit {
border: 1px solid #ffd606;
color: #fae501;
position: absolute;
top: 20rpx;
right: 20rpx;
padding: 6rpx 20rpx;
border-radius: 3rpx;
}
.submit-container {
position: absolute;
bottom: 20rpx;
right: 20rpx;
}
.submit-container button:not(:first-child) {
margin-left: 30rpx;
}
button.login-submit {
color: #5eb95e;
background-color: #E4F3E4;
border-color: #d2e8d2;
margin-bottom: 30rpx;
}
.submit-container button.share-submit {
color: #F37B1D;
background-color: #ffe5be;
border-color: #f8d093;
}
/**
* 商品导航
*/
.spacing-nav-title {
color: #fe3e28;
}
.spacing-nav-title .line {
background: #fe3e28;
}
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}
.data-list .items {
width: calc(50% - 5rpx);
margin-bottom: 10rpx;
padding-bottom: 20rpx;
}
.data-list .items:nth-child(2n) {
float: right;
}
.data-list .items:nth-child(2n+1) {
float: left;
}
.data-list .items image {
width: 100%;
height: 200px !important;
}
.data-list .items .base {
text-align: left;
font-size: 32rpx;
padding: 0 15rpx;
}
.data-list .items .base,
.data-list .items .base .price {
margin-top: 10rpx;
}
.data-list .items .base .original-price {
margin-left: 0;
}
.data-list .items .base .price .sales-price {
margin: 0 5rpx;
}
.data-list .items .base .price .unit {
color: #f40;
}
\ No newline at end of file
sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttml
浏览文件 @
4a8a95af
...
...
@@ -55,8 +55,8 @@
<image src="{{item.images}}" mode="aspectFit" />
<view class="base">
<view class="multi-text">{{item.title}}</view>
<view class="price">
<text class="sales-price">{{currency_symbol}}{{item.
min_
price}}</text>
<view class="price
single-text
">
<text class="sales-price">{{currency_symbol}}{{item.price}}</text>
</view>
</view>
</navigator>
...
...
@@ -75,7 +75,7 @@
<text class="coming-tips-text">获得 <text>{{coming_integral}}</text> 积分</text>
</view>
</view>
</view>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.ttml" />
...
...
sourcecode/toutiao/default/pages/plugins/signin/index-detail/index-detail.ttss
浏览文件 @
4a8a95af
...
...
@@ -97,6 +97,16 @@
border-radius: 1000rpx;
}
/**
* 商品导航
*/
.spacing-nav-title {
color: #f6b015;
}
.spacing-nav-title .line {
background: #f6b015;
}
/**
* 商品列表
*/
...
...
sourcecode/toutiao/default/pages/user-integral/user-integral.ttml
浏览文件 @
4a8a95af
...
...
@@ -2,7 +2,6 @@
<view class="content">
<view class="data-card bg-white br-b" tt:for="{{data_list}}">
<view class="data-box oh">
<import src="/pages/common/nodata.ttml" />
<text class="data-title">{{item.type_text}} {{item.operation_integral}}</text>
<text class="data-time fr">{{item.add_time_time}}</text>
</view>
...
...
@@ -12,10 +11,6 @@
</view>
<view class="data-detail">{{item.msg}}</view>
</view>
<view tt:if="{{data_list.length == 0}}">
<import src="/pages/common/nodata.ttml" />
<template is="nodata" data="{{status: data_list_loding_status}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.ttml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
...
...
sourcecode/weixin/default/app.json
浏览文件 @
4a8a95af
...
...
@@ -78,7 +78,8 @@
"pages/plugins/signin/user-qrcode/user-qrcode"
,
"pages/plugins/signin/user-qrcode-detail/user-qrcode-detail"
,
"pages/plugins/signin/user-qrcode-saveinfo/user-qrcode-saveinfo"
,
"pages/plugins/signin/user-coming-list/user-coming-list"
"pages/plugins/signin/user-coming-list/user-coming-list"
,
"pages/plugins/points/index/index"
],
"permission"
:
{
"scope.userLocation"
:
{
...
...
sourcecode/weixin/default/components/icon-nav/icon-nav.wxss
浏览文件 @
4a8a95af
...
...
@@ -23,7 +23,7 @@
}
.data-list .items .title {
margin-top: 10rpx;
font-size: 3
2
rpx;
font-size: 3
0
rpx;
text-align:center;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
...
...
sourcecode/weixin/default/pages/buy/buy.js
浏览文件 @
4a8a95af
...
...
@@ -33,13 +33,17 @@ Page({
plugins_choice_coupon_value
:
[],
popup_plugins_coupon_status
:
false
,
popup_plugins_coupon_index
:
null
,
// 积分
plugins_points_data
:
null
,
plugins_points_status
:
false
,
},
onLoad
(
params
)
{
//params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}';
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
params
.
data
))
>
0
)
if
((
params
.
data
||
null
)
!=
null
&&
app
.
get_length
(
JSON
.
parse
(
decodeURIComponent
(
params
.
data
)
))
>
0
)
{
this
.
setData
({
params
:
JSON
.
parse
(
params
.
data
)});
this
.
setData
({
params
:
JSON
.
parse
(
decodeURIComponent
(
params
.
data
)
)});
// 删除地址缓存
wx
.
removeStorageSync
(
app
.
data
.
cache_buy_user_address_select_key
);
...
...
@@ -107,7 +111,7 @@ Page({
wx
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
success
:
res
=>
{
wx
.
stopPullDownRefresh
();
...
...
@@ -126,6 +130,7 @@ Page({
common_site_type
:
data
.
common_site_type
||
0
,
extraction_address
:
data
.
base
.
extraction_address
||
[],
plugins_coupon_data
:
data
.
plugins_coupon_data
||
null
,
plugins_points_data
:
data
.
plugins_points_data
||
null
,
});
// 优惠劵选择处理
...
...
@@ -182,8 +187,9 @@ Page({
});
},
// 请求参数合并优惠券参数
request_data_coupon_merge
(
data
)
{
// 请求参数合并
request_data_ext_params_merge
(
data
)
{
// 优惠券
var
coupon_ids
=
this
.
data
.
plugins_use_coupon_ids
;
if
((
coupon_ids
||
null
)
!=
null
&&
coupon_ids
.
length
>
0
)
{
...
...
@@ -192,6 +198,10 @@ Page({
data
[
'
coupon_id_
'
+
i
]
=
coupon_ids
[
i
];
}
}
// 积分
data
[
'
is_points
'
]
=
(
this
.
data
.
plugins_points_status
===
true
)
?
1
:
0
;
return
data
;
},
...
...
@@ -242,7 +252,7 @@ Page({
wx
.
request
({
url
:
app
.
get_request_url
(
"
add
"
,
"
buy
"
),
method
:
"
POST
"
,
data
:
this
.
request_data_
coupon
_merge
(
data
),
data
:
this
.
request_data_
ext_params
_merge
(
data
),
dataType
:
"
json
"
,
success
:
res
=>
{
wx
.
hideLoading
();
...
...
@@ -384,4 +394,10 @@ Page({
var
address
=
(
data
.
province_name
||
''
)
+
(
data
.
city_name
||
''
)
+
(
data
.
county_name
||
''
)
+
(
data
.
address
||
''
);
app
.
open_location
(
data
.
lng
,
data
.
lat
,
name
,
address
);
},
// 积分选择事件
points_event
(
e
)
{
this
.
setData
({
plugins_points_status
:
!
this
.
data
.
plugins_points_status
});
this
.
init
();
},
});
sourcecode/weixin/default/pages/buy/buy.wxml
浏览文件 @
4a8a95af
...
...
@@ -90,6 +90,22 @@
<view wx:else bindtap="bind_user_note_tap_event" class="{{(user_note_value || null) == null ? 'cr-888' : ''}}">{{user_note_value || '留言'}}</view>
</view>
<!-- 积分 -->
<view wx:if="{{(plugins_points_data || null) != null && (plugins_points_data.discount_price || 0) > 0}}" class="plugins-points-buy-container bg-white spacing-mb">
<view class="select oh">
<text wx:if="{{plugins_points_data.discount_type == 1}}">使用{{plugins_points_data.use_integral}}个积分兑换商品</text>
<text wx:else>使用积分{{plugins_points_data.use_integral}}个</text>
<text class="sales-price">-{{currency_symbol}}{{plugins_points_data.discount_price}}</text>
<view bindtap="points_event" class="fr">
<image class="icon" src="/images/default-select{{plugins_points_status ? '-active' : ''}}-icon.png" mode="widthFix" />
</view>
</view>
<view class="desc">
<text wx:if="{{plugins_points_data.discount_type == 1}}">你有积分{{plugins_points_data.user_integral}}个</text>
<text wx:else>你有积分{{plugins_points_data.user_integral}}个,可用{{plugins_points_data.use_integral}}个</text>
</view>
</view>
<!-- 支付方式 -->
<view wx:if="{{payment_list.length > 0 && common_order_is_booking != 1}}" class="payment-list bg-white oh">
<view class="item tc fl" wx:for="{{payment_list}}" wx:key="key">
...
...
sourcecode/weixin/default/pages/buy/buy.wxss
浏览文件 @
4a8a95af
...
...
@@ -180,10 +180,10 @@
width: 50%;
}
/*
*
/*
* 插件样式区域
*/
/*
*
/
*
* 优惠劵
*/
.plugins-coupon {
...
...
@@ -209,4 +209,24 @@
.coupon-container .not-use-tips {
color: #f7b240;
font-size: 32rpx;
}
/*
* 积分
*/
.plugins-points-buy-container {
padding: 20rpx;
}
.plugins-points-buy-container .select .icon {
width: 45rpx;
height: 45rpx !important;
vertical-align: middle;
}
.plugins-points-buy-container .select .sales-price {
margin-left: 30rpx;
font-size: 28rpx;
font-weight: 400;
}
.plugins-points-buy-container .desc {
color: #F37B1D;
}
\ No newline at end of file
sourcecode/weixin/default/pages/cart/cart.js
浏览文件 @
4a8a95af
...
...
@@ -393,7 +393,7 @@ Page({
"
ids
"
:
ids
.
join
(
'
,
'
)
};
wx
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
},
...
...
sourcecode/weixin/default/pages/goods-detail/goods-detail.js
浏览文件 @
4a8a95af
...
...
@@ -629,7 +629,7 @@ Page({
"
spec
"
:
JSON
.
stringify
(
spec
)
};
wx
.
navigateTo
({
url
:
'
/pages/buy/buy?data=
'
+
JSON
.
stringify
(
data
)
url
:
'
/pages/buy/buy?data=
'
+
encodeURIComponent
(
JSON
.
stringify
(
data
)
)
});
this
.
popup_close_event
();
break
;
...
...
sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml
浏览文件 @
4a8a95af
...
...
@@ -29,6 +29,23 @@
<!-- 标题 -->
<view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
<!-- 简述 -->
<view wx:if="{{(goods.simple_desc || null) != null}}" class="goods-simple-desc">{{goods.simple_desc}}</view>
<!-- icon -->
<view wx:if="{{(goods.plugins_view_icon_data || null) != null && goods.plugins_view_icon_data.length > 0}}" class="goods-icon-container bg-white br-b-dashed oh">
<block wx:for="{{goods.plugins_view_icon_data}}" wx:key="key">
<view wx:if="{{(item.name || null) != null}}" class="fl tc" style="{{(item.br_color || null) == null ? '' : 'border:1px solid '+item.br_color+';'}}{{(item.color || null) == null ? '' : 'color: '+item.color+';'}}">{{item.name}}</view>
</block>
</view>
<!-- 面板提示信息 -->
<view wx:if="{{(goods.plugins_view_panel_data || null) != null && goods.plugins_view_panel_data.length > 0}}" class="goods-panel-container bg-white br-b-dashed oh">
<block wx:for="{{goods.plugins_view_panel_data}}" wx:key="key">
<view wx:if="{{(item || null) != null}}">{{item}}</view>
</block>
</view>
<!-- 限时秒杀 -->
<view wx:if="{{plugins_limitedtimediscount_is_valid == 1}}">
<import src="/pages/lib/limitedtimediscount/goods-detail.wxml" />
...
...
sourcecode/weixin/default/pages/goods-detail/goods-detail.wxss
浏览文件 @
4a8a95af
...
...
@@ -363,4 +363,45 @@
}
.goods-parameters .content-item .item:nth-child(2n) {
float: right;
}
/*
* 商品简述
*/
.goods-simple-desc {
color: #f00;
padding: 0 10rpx;
margin: 5rpx 0 15rpx 0;
}
/*
* icon
*/
.goods-icon-container {
padding: 20rpx 10rpx 10rpx 10rpx;
}
.goods-icon-container view {
background: #fff;
border: 1px solid #3bb4f2;
color: #3bb4f2;
padding: 3rpx 15rpx;
border-radius: 8rpx;
margin-bottom: 10rpx;
}
.goods-icon-container view:not(:last-child) {
margin-right: 10rpx;
}
/*
* 面板
*/
.goods-panel-container {
background: #fffbfc;
color: #d2354c;
}
.goods-panel-container view {
padding: 15rpx 10rpx;
}
.goods-panel-container view:not(:first-child) {
border-top: 1px dashed #fff1f2;
}
\ No newline at end of file
sourcecode/weixin/default/pages/message/message.wxml
浏览文件 @
4a8a95af
...
...
@@ -7,10 +7,6 @@
</view>
<view class="data-detail">{{item.detail}}</view>
</view>
<view wx:if="{{data_list.length == 0}}">
<import src="/pages/common/nodata.wxml" />
<template is="nodata" data="{{status: data_list_loding_status}}"></template>
</view>
</view>
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
...
...
sourcecode/weixin/default/pages/plugins/points/index/index.js
0 → 100644
浏览文件 @
4a8a95af
const
app
=
getApp
();
Page
({
data
:
{
data_bottom_line_status
:
false
,
data_list_loding_status
:
1
,
data_list_loding_msg
:
''
,
params
:
null
,
user
:
null
,
data_base
:
null
,
avatar_default
:
app
.
data
.
default_user_head_src
,
},
onLoad
(
params
)
{
this
.
setData
({
params
:
params
,
user
:
app
.
get_user_cache_info
(),
});
},
onShow
()
{
this
.
get_data
();
// 显示分享菜单
app
.
show_share_menu
();
},
// 获取数据
get_data
()
{
var
self
=
this
;
wx
.
request
({
url
:
app
.
get_request_url
(
"
index
"
,
"
index
"
,
"
points
"
),
method
:
"
POST
"
,
data
:
{},
dataType
:
"
json
"
,
success
:
res
=>
{
wx
.
stopPullDownRefresh
();
if
(
res
.
data
.
code
==
0
)
{
var
data
=
res
.
data
.
data
;
self
.
setData
({
data_base
:
data
.
base
||
null
,
data_list_loding_msg
:
''
,
data_list_loding_status
:
0
,
data_bottom_line_status
:
true
,
});
}
else
{
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
res
.
data
.
msg
,
});
}
},
fail
:
()
=>
{
wx
.
stopPullDownRefresh
();
self
.
setData
({
data_bottom_line_status
:
false
,
data_list_loding_status
:
2
,
data_list_loding_msg
:
'
服务器请求出错
'
,
});
app
.
showToast
(
"
服务器请求出错
"
);
}
});
},
// 下拉刷新
onPullDownRefresh
()
{
this
.
get_data
();
},
// 立即登录
login_event
()
{
var
user
=
app
.
get_user_info
(
this
,
"
login_event
"
)
if
(
user
!=
false
)
{
// 用户未绑定用户则转到登录页面
if
(
app
.
user_is_need_login
(
user
))
{
wx
.
showModal
({
title
:
'
温馨提示
'
,
content
:
'
绑定手机号码
'
,
confirmText
:
'
确认
'
,
cancelText
:
'
暂不
'
,
success
:
(
result
)
=>
{
wx
.
stopPullDownRefresh
();
if
(
result
.
confirm
)
{
wx
.
navigateTo
({
url
:
"
/pages/login/login?event_callback=init
"
});
}
},
});
}
}
this
.
setData
({
user
:
user
||
null
});
},
// 图片事件
right_images_event
(
e
)
{
if
((
this
.
data
.
data_base
.
right_images_url
||
null
)
!=
null
)
{
wx
.
navigateTo
({
url
:
this
.
data
.
data_base
.
right_images_url
,
});
}
},
// 头像查看
preview_event
()
{
if
(
app
.
data
.
default_user_head_src
!=
this
.
data
.
user
.
avatar
)
{
wx
.
previewImage
({
current
:
this
.
data
.
user
.
avatar
,
urls
:
[
this
.
data
.
user
.
avatar
]
});
}
},
// 自定义分享
onShareAppMessage
()
{
var
user_id
=
app
.
get_user_cache_info
(
'
id
'
,
0
)
||
0
;
return
{
title
:
this
.
data
.
data_base
.
seo_title
||
'
积分商城 -
'
+
app
.
data
.
application_title
,
desc
:
this
.
data
.
data_base
.
seo_desc
||
'
积分抵扣、兑换 -
'
+
app
.
data
.
application_describe
,
path
:
'
/pages/plugins/signin/index-detail/index-detail?referrer=
'
+
user_id
};
},
// 分享朋友圈
onShareTimeline
()
{
var
user_id
=
app
.
get_user_cache_info
(
'
id
'
,
0
)
||
0
;
return
{
title
:
this
.
data
.
data_base
.
seo_title
||
'
积分商城 -
'
+
app
.
data
.
application_title
,
query
:
'
referrer=
'
+
user_id
,
imageUrl
:
this
.
data
.
data_base
.
right_images
||
''
};
},
});
\ No newline at end of file
sourcecode/weixin/default/pages/plugins/points/index/index.json
0 → 100644
浏览文件 @
4a8a95af
{
"enablePullDownRefresh"
:
true
,
"navigationBarBackgroundColor"
:
"#fe3e28"
,
"backgroundColorTop"
:
"#fe3e28"
,
"backgroundColorBottom"
:
"#f5f5f5"
,
"backgroundTextStyle"
:
"light"
,
"navigationBarTitleText"
:
"积分商城"
}
\ No newline at end of file
sourcecode/weixin/default/pages/plugins/points/index/index.wxml
0 → 100644
浏览文件 @
4a8a95af
<view wx:if="{{(data_base || null) != null}}">
<!-- 顶部 -->
<view class="points-user tc">
<navigator class="points-user-menu-submit" url="/pages/user-integral/user-integral" hover-class="none">我的积分</navigator>
<block wx:if="{{(user || null) == null}}">
<button type="default" size="mini" class="login-submit" bindtap="login_event">立即登录</button>
<view class="user-desc">获知会员积分详情</view>
</block>
<block wx:else>
<view class="avatar">
<image bindtap="preview_event" src="{{user.avatar || avatar_default}}" mode="widthFix" class="dis-block" />
</view>
<view class="user-name">{{user.user_name_view}}</view>
<view class="user-desc">当前可用 {{user.integral}} 积分</view>
</block>
<!-- 按钮组 -->
<view class="submit-container">
<button type="default" size="mini" open-type="share" class="share-submit">分享</button>
</view>
</view>
<!-- 广告图片 -->
<image wx:if="{{(data_base.right_images || null) != null}}" src="{{data_base.right_images}}" class="wh-auto dis-block spacing-mt" mode="widthFix" bindtap="right_images_event" />
<!-- 公告信息 -->
<view wx:if="{{(data_base.points_desc || null) != null && data_base.points_desc.length > 0}}" class="tips spacing-mt">
<view wx:for="{{data_base.points_desc}}" wx:key="key" class="item">
{{item}}
</view>
</view>
<!-- 商品兑换 -->
<view wx:if="{{(data_base.goods_exchange_data || null) != null && data_base.goods_exchange_data.length > 0}}" class="spacing-mt">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">商品兑换</text>
</view>
<view class="data-list spacing-10">
<view class="items bg-white" wx:for="{{data_base.goods_exchange_data}}" wx:key="key">
<navigator url="/pages/goods-detail/goods-detail?goods_id={{item.goods.id}}" hover-class="none">
<image src="{{item.goods.images}}" mode="aspectFit" />
<view class="base">
<view class="multi-text">{{item.goods.title}}</view>
<view class="price single-text original-price">{{currency_symbol}}{{item.goods.price}}</view>
<view class="price single-text">
<text class="unit">需</text>
<text class="sales-price">{{item.integral}}</text>
<text class="unit">积分</text>
</view>
</view>
</navigator>
</view>
</view>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.wxml" />
<template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
</view>
<view wx:else>
<import src="/pages/common/nodata.wxml" />
<template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
</view>
\ No newline at end of file
sourcecode/weixin/default/pages/plugins/points/index/index.wxss
0 → 100644
浏览文件 @
4a8a95af
/**
* 顶部
*/
.points-user {
background-color: #fe3e28;
position: relative;
padding: 100rpx 0 120rpx 0;
}
.points-user .avatar {
padding: 1px;
background: #ff9589;
margin: 0 auto;
}
.points-user .avatar,
.points-user .avatar image {
width: 160rpx;
height: 160rpx;
border-radius: 50%;
}
.points-user .user-name {
color: #fff;
margin: 10rpx 0 20rpx 0;
}
.points-user .user-desc {
color: #ffe7b2;
}
.points-user-menu-submit {
border: 1px solid #ffd606;
color: #fae501;
position: absolute;
top: 20rpx;
right: 20rpx;
padding: 6rpx 20rpx;
border-radius: 3rpx;
}
.submit-container {
position: absolute;
bottom: 20rpx;
right: 20rpx;
}
.submit-container button:not(:first-child) {
margin-left: 30rpx;
}
button.login-submit {
color: #5eb95e;
background-color: #E4F3E4;
border-color: #d2e8d2;
margin-bottom: 30rpx;
}
.submit-container button.share-submit {
color: #F37B1D;
background-color: #ffe5be;
border-color: #f8d093;
}
/**
* 商品导航
*/
.spacing-nav-title {
color: #fe3e28;
}
.spacing-nav-title .line {
background: #fe3e28;
}
/**
* 商品列表
*/
.scroll-box {
height: calc(100vh - 80rpx);
}
.data-list {
overflow: hidden;
}
.data-list .items {
width: calc(50% - 5rpx);
margin-bottom: 10rpx;
padding-bottom: 20rpx;
}
.data-list .items:nth-child(2n) {
float: right;
}
.data-list .items:nth-child(2n+1) {
float: left;
}
.data-list .items image {
width: 100%;
height: 200px !important;
}
.data-list .items .base {
text-align: left;
font-size: 32rpx;
padding: 0 15rpx;
}
.data-list .items .base,
.data-list .items .base .price {
margin-top: 10rpx;
}
.data-list .items .base .original-price {
margin-left: 0;
}
.data-list .items .base .price .sales-price {
margin: 0 5rpx;
}
.data-list .items .base .price .unit {
color: #f40;
}
\ No newline at end of file
sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.js
浏览文件 @
4a8a95af
...
...
@@ -25,6 +25,9 @@ Page({
onShow
()
{
this
.
get_data
();
// 显示分享菜单
app
.
show_share_menu
();
},
// 获取数据
...
...
@@ -76,8 +79,7 @@ Page({
// 初始化
init
()
{
var
user
=
app
.
get_user_info
(
this
,
"
init
"
),
self
=
this
;
var
user
=
app
.
get_user_info
(
this
,
"
init
"
);
if
(
user
!=
false
)
{
// 用户未绑定用户则转到登录页面
if
(
app
.
user_is_need_login
(
user
))
{
...
...
sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxml
浏览文件 @
4a8a95af
...
...
@@ -55,8 +55,8 @@
<image src="{{item.images}}" mode="aspectFit" />
<view class="base">
<view class="multi-text">{{item.title}}</view>
<view class="price">
<text class="sales-price">{{currency_symbol}}{{item.
min_
price}}</text>
<view class="price
single-text
">
<text class="sales-price">{{currency_symbol}}{{item.price}}</text>
</view>
</view>
</navigator>
...
...
@@ -75,7 +75,7 @@
<text class="coming-tips-text">获得 <text>{{coming_integral}}</text> 积分</text>
</view>
</view>
</view>
</view>
<!-- 结尾 -->
<import src="/pages/common/bottom_line.wxml" />
...
...
sourcecode/weixin/default/pages/plugins/signin/index-detail/index-detail.wxss
浏览文件 @
4a8a95af
此差异已折叠。
点击以展开。
sourcecode/weixin/default/pages/plugins/weixinliveplayer/search/search.js
浏览文件 @
4a8a95af
此差异已折叠。
点击以展开。
sourcecode/weixin/default/pages/user-integral/user-integral.wxml
浏览文件 @
4a8a95af
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录