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
6169b528
Commit
6169b528
authored
Sep 26, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
集点详情
parent
750ba1a5
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
18 deletions
+31
-18
app.js
src/app.js
+2
-2
progressImage.wxml
src/component/progressImage/progressImage.wxml
+5
-6
progressImage.wxss
src/component/progressImage/progressImage.wxss
+17
-5
index.js
src/config/index.js
+1
-1
pointDetail.wxss
src/pages/pointDetail/pointDetail.wxss
+4
-2
project.config.json
src/project.config.json
+2
-2
No files found.
src/app.js
View file @
6169b528
...
@@ -117,9 +117,9 @@ App({
...
@@ -117,9 +117,9 @@ App({
imageUrl
:
envInfo
.
imgCtx
,
//图片地址
imageUrl
:
envInfo
.
imgCtx
,
//图片地址
isFullSucreen
:
false
,
// 当前设备是否为 FullSucreen
isFullSucreen
:
false
,
// 当前设备是否为 FullSucreen
commonFunc
:
commonFunc
,
commonFunc
:
commonFunc
,
brandId
:
2711
,
//
brandId: 2711,
// brandId: 2005,
// brandId: 2005,
// brandId: 1001,
// brandId: 1001,
//
brandId: 1002,
brandId
:
1002
,
}
}
})
})
src/component/progressImage/progressImage.wxml
View file @
6169b528
<!--component/progressImage/progressImage.wxml-->
<!--component/progressImage/progressImage.wxml-->
<view class="section clearfix">
<view class="section clearfix">
<view class="{{goal >=
7
? '' : 'text-section'}}">
<view class="{{goal >=
5
? '' : 'text-section'}}">
<!-- 当前已完成 -->
<!-- 当前已完成 -->
<block wx:for="{{currentProgress}}" wx:key="{{index}}">
<block wx:for="{{currentProgress}}" wx:key="{{index}}">
<view class="text-item" style="width: {{100 / 8}}%;">
<view class="text-item" style="width: {{100 / 6}}%;">
<!--<image class="item-img" style="" src="/assets/imgs/point/color.png" mode="widthFix" />-->
<image class="item-img" src="{{iconImageFinsh}}" mode="widthFix" />
<image class="item-img" style="" src="{{iconImageFinsh}}" mode="widthFix" />
</view>
</view>
</block>
</block>
<!-- 当前目标进度 未完成 -->
<!-- 当前目标进度 未完成 -->
<block wx:for="{{goal - currentProgress}}" wx:key="{{index}}">
<block wx:for="{{goal - currentProgress}}" wx:key="{{index}}">
<view class="text-item" style="width: {{100 /
8
}}%;">
<view class="text-item" style="width: {{100 /
6
}}%;">
<image class="item-img" s
tyle="" s
rc="{{iconImage}}" mode="widthFix" />
<image class="item-img" src="{{iconImage}}" mode="widthFix" />
</view>
</view>
</block>
</block>
</view>
</view>
...
...
src/component/progressImage/progressImage.wxss
View file @
6169b528
/* component/progressImage/progressImage.wxss */
/* component/progressImage/progressImage.wxss */
.section {
padding-left: 10px;
box-sizing: border-box;
}
.text-section {
.text-section {
text-align: center;
text-align: center;
display: flex;
display: flex;
justify-content: center;
justify-content: center;
}
}
.text-item {
.text-item {
float: left;
/*
float: left;
height: 82rpx;
height: 82rpx;
line-height: 82rpx;
line-height: 82rpx;
margin:0 10rpx 10rpx 0;
margin:0 10rpx 10rpx 0;
box-sizing: content-box;
box-sizing: content-box;
border-radius: 50%;
border-radius: 50%; */
float: left;
width: 120rpx;
height: 118.6rpx;
margin: 0 15rpx 15rpx 7rpx;
box-sizing: border-box;
text-align: center;
/* border-radius: 50%; */
}
}
.item-img {
.item-img {
height: 82rpx;
/* width: 120rpx; */
height: 118.6rpx;
width: 100%;
width: 100%;
border-radius: 50%;
/* border-radius: 50%; */
}
}
.clearfix::after {
.clearfix::after {
content: '';
content: '';
...
...
src/config/index.js
View file @
6169b528
const
PROJECT_ENV
=
'
prod
'
// 生产 prod, 开发1 dev,开发2 dev2, 测试 test, 预生产 pre
const
PROJECT_ENV
=
'
test
'
// 生产 prod, 开发1 dev,开发2 dev2, 测试 test, 预生产 pre
const
needMock
=
''
//
const
needMock
=
''
//
// appid_dev_wx wxc3b64b09b1d3dfc2
// appid_dev_wx wxc3b64b09b1d3dfc2
...
...
src/pages/pointDetail/pointDetail.wxss
View file @
6169b528
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.detail-info{
.detail-info{
min-height: 350rpx;
min-height: 350rpx;
background-color: #fff;
background-color: #fff;
padding: 44rpx
51
rpx;
padding: 44rpx
44rpx 51rpx 46
rpx;
}
}
.info-num {
.info-num {
height: 45rpx;
height: 45rpx;
...
@@ -21,7 +21,9 @@
...
@@ -21,7 +21,9 @@
font-family: PingFangSC-Regular;
font-family: PingFangSC-Regular;
}
}
.info-progress{
.info-progress{
padding: 31rpx 0 56rpx 15rpx;
/* padding: 31rpx 0 56rpx 15rpx; */
padding-top: 43rpx;
padding-bottom: 39rpx;
}
}
.info-status-btn {
.info-status-btn {
margin: 0 50rpx;
margin: 0 50rpx;
...
...
src/project.config.json
View file @
6169b528
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
},
},
"compileType"
:
"miniprogram"
,
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
700028bf32a3be66
"
,
"appid"
:
"wx
ac09792264c49b5c
"
,
"projectname"
:
"7-Eleven"
,
"projectname"
:
"7-Eleven"
,
"debugOptions"
:
{
"debugOptions"
:
{
"hidedInDevtools"
:
[]
"hidedInDevtools"
:
[]
...
@@ -138,7 +138,7 @@
...
@@ -138,7 +138,7 @@
"id"
:
15
,
"id"
:
15
,
"name"
:
"pages/pointDetail/pointDetail"
,
"name"
:
"pages/pointDetail/pointDetail"
,
"pathName"
:
"pages/pointDetail/pointDetail"
,
"pathName"
:
"pages/pointDetail/pointDetail"
,
"query"
:
"id=
623814145518743552
"
,
"query"
:
"id=
620613569049923584
"
,
"scene"
:
null
"scene"
:
null
},
},
{
{
...
...
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