Commit 6169b528 by 高淑倩

集点详情

parent 750ba1a5
...@@ -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,
} }
}) })
<!--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" style="" src="{{iconImage}}" mode="widthFix" /> <image class="item-img" src="{{iconImage}}" mode="widthFix" />
</view> </view>
</block> </block>
</view> </view>
......
/* 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: '';
......
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
......
...@@ -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 51rpx; padding: 44rpx 44rpx 51rpx 46rpx;
} }
.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;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.8.2", "libVersion": "2.8.2",
"appid": "wx700028bf32a3be66", "appid": "wxac09792264c49b5c",
"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
}, },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment