Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
3b26adb3
Commit
3b26adb3
authored
Jun 06, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: 积分兑换吸底
parent
f9536d51
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
17 deletions
+15
-17
base.wxss
src/base/base.wxss
+8
-0
integralMallDetail.wxml
src/pages/integralMallDetail/integralMallDetail.wxml
+4
-9
userCenter.js
src/pages/userCenter/userCenter.js
+2
-1
project.config.json
src/project.config.json
+1
-7
No files found.
src/base/base.wxss
View file @
3b26adb3
...
@@ -249,3 +249,11 @@ i {
...
@@ -249,3 +249,11 @@ i {
.color333 {
.color333 {
color: #333 !important; }
color: #333 !important; }
.position-bottom {
background-color: #fff;
position: fixed;
width: 100%;
bottom: 0;
padding: 20rpx;
margin: 20rpx;
}
src/pages/integralMallDetail/integralMallDetail.wxml
View file @
3b26adb3
...
@@ -15,16 +15,11 @@
...
@@ -15,16 +15,11 @@
</view>
</view>
<view class='integral-detail' wx:if="{{integralMallDetail.desc}}">
<view class='integral-detail' wx:if="{{integralMallDetail.desc}}">
<image src='{{integralMallDetail.desc}}' mode="widthFix" style="width: 100%;"></image>
<image src='{{integralMallDetail.desc}}' mode="widthFix" style="width: 100%;"></image>
<!-- <view class='integral-list'>
<button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button>
<view class='integral-title'>优惠详情</view>
<view class='integral-desc'>数据库更待何时规范规定时间官方价格都十分关键是大概花费</view>
</view>
<view class='integral-list'>
<view class='integral-title'>有效期</view>
<view class='integral-desc'>数据库更待何时规范规定时间官方价格都十分关键是大概花费</view>
</view>-->
</view>
</view>
<button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button>
</view>
</view>
</view>
</view>
<!--<view class="position-bottom">
<button type='primary' class="redeem-now" bindtap='exchange'>立即兑换</button>
</view>-->
<exchange-coupon-modal exchangeId="{{integralMallDetail.id}}" exchangePoint="{{integralMallDetail.point}}" isExchange='{{isExchange}}' />
<exchange-coupon-modal exchangeId="{{integralMallDetail.id}}" exchangePoint="{{integralMallDetail.point}}" isExchange='{{isExchange}}' />
src/pages/userCenter/userCenter.js
View file @
3b26adb3
...
@@ -141,7 +141,8 @@ wxService.page({
...
@@ -141,7 +141,8 @@ wxService.page({
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
title
:
'加载中'
})
})
wxService
.
post
(
`/merchant/modelPage/getDetailById?pageId=3`
).
then
(
res
=>
{
// 1001 2005
wxService
.
post
(
`/merchant/modelPage/getDetailById?pageId=3&brandId=2005`
).
then
(
res
=>
{
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
){
if
(
result
==
0
){
// 动态设置title
// 动态设置title
...
...
src/project.config.json
View file @
3b26adb3
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
"list"
:
[]
"list"
:
[]
},
},
"miniprogram"
:
{
"miniprogram"
:
{
"current"
:
14
,
"current"
:
-1
,
"list"
:
[
"list"
:
[
{
{
"id"
:
-1
,
"id"
:
-1
,
...
@@ -113,12 +113,6 @@
...
@@ -113,12 +113,6 @@
},
},
{
{
"id"
:
-1
,
"id"
:
-1
,
"name"
:
"空白页"
,
"pathName"
:
"pages/index/index"
,
"query"
:
""
},
{
"id"
:
-1
,
"name"
:
"外卖"
,
"name"
:
"外卖"
,
"pathName"
:
"pages/deliveryService/deliveryService"
,
"pathName"
:
"pages/deliveryService/deliveryService"
,
"query"
:
""
"query"
:
""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment