396316021
/
warm_man
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改问题

dev
396316021 1 year ago
parent
e8e6e4fdb4
commit
ce163b0f74
3 changed files with 92 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 139
      pages/Index/components/ActivityPage/index.vue
  2. 9
      pages/Index/components/ShopPage/index.vue
  3. 6
      uni_modules/mz-sticky/components/mz-sticky/mz-sticky.vue

139
pages/Index/components/ActivityPage/index.vue
Unescape View File

@ -1,62 +1,64 @@
<template>
<view class="body-background"></view>
<mz-sticky>
<view class="screen-body row pad">
<u-row :custom-style="{boxSizing:'border-box',width:'100%',flexWrap:'wrap'}">
<u-col
:custom-style="{backgroundColor:'#fff',borderRadius:'10rpx',padding:((tabCheck === 'item')?'0 0':'0 26rpx'),boxSizing:'border-box'}">
<view class="screen-container row">
<view class="col-12">
<u-image radius="20" :src="staticImage.activityHead" mode="widthFix" width="100%" height="240"></u-image>
</view>
<mz-sticky>
<view class="screen-body row pad">
<u-row :custom-style="{boxSizing:'border-box',width:'100%',flexWrap:'wrap'}">
<u-col
:custom-style="{backgroundColor:'#fff',borderRadius:'10rpx',padding:((tabCheck === 'item')?'0 0':'0 26rpx'),boxSizing:'border-box'}">
<view class="screen-container row">
<view class="col-12">
<u-image radius="20" :src="staticImage.activityHead" mode="widthFix" width="100%" height="240"></u-image>
</view>
<view :style="{width:'100%',display:'flex',padding:'26rpx 0'}">
<view class="row" style="justify-content: space-around;margin-top:16rpx;">
<view class="screen-type">
<view class="screen-type-button row " @click="openStreetPicker">
<view class="button-text">
<u-text :bold="(shows.street_name!=='')" :text="shows.street_name || '选择街道'" size="28" color="#020B18"></u-text>
</view>
<view class="button-icon">
<u-icon name="arrow-down-fill" size="12"></u-icon>
<view :style="{width:'100%',display:'flex',padding:'26rpx 0'}">
<view class="row" style="justify-content: space-around;margin-top:16rpx;">
<view class="screen-type">
<view class="screen-type-button row " @click="openStreetPicker">
<view class="button-text">
<u-text :bold="(shows.street_name!=='')" :text="shows.street_name || '选择街道'" size="28" color="#020B18"></u-text>
</view>
<view class="button-icon">
<u-icon name="arrow-down-fill" size="12"></u-icon>
</view>
</view>
</view>
</view>
<view class="screen-type">
<view class="screen-type-button row " @click="openCommunityPicker">
<view class="button-text">
<u-text :bold="(shows.community_name!=='')" :text="shows.community_name || '选择社区'" size="28" color="#020B18"></u-text>
</view>
<view class="button-icon">
<u-icon name="arrow-down-fill" size="12"></u-icon>
<view class="screen-type">
<view class="screen-type-button row " @click="openCommunityPicker">
<view class="button-text">
<u-text :bold="(shows.community_name!=='')" :text="shows.community_name || '选择社区'" size="28" color="#020B18"></u-text>
</view>
<view class="button-icon">
<u-icon name="arrow-down-fill" size="12"></u-icon>
</view>
</view>
</view>
</view>
</view>
<u-row :custom-style="{boxSizing:'border-box',width:'100%',flexWrap:'wrap'}">
<u-col :custom-style="{backgroundColor:'#fff',borderRadius:'10rpx',padding:'16rpx 26rpx',boxSizing:'border-box'}">
<u-tabs
:list="listItem"
u-sticky
lineWidth="40"
lineHeight="4"
:inactiveStyle="{color:'#AFB5BE'}"
:activeStyle="{color:'#F47210'}"
lineColor="#F47210"
:custom-style="{margin:'auto',width:'100%'}"
:scrollable="false"
:current="current"
@change="tabsChange"
></u-tabs>
</u-col>
</u-row>
<!-- -->
</view>
<u-row :custom-style="{boxSizing:'border-box',width:'100%',flexWrap:'wrap'}">
<u-col :custom-style="{backgroundColor:'#fff',borderRadius:'10rpx',padding:'16rpx 26rpx',boxSizing:'border-box'}">
<u-tabs
:list="listItem"
u-sticky
lineWidth="40"
lineHeight="4"
:inactiveStyle="{color:'#AFB5BE'}"
:activeStyle="{color:'#F47210'}"
lineColor="#F47210"
:custom-style="{margin:'auto',width:'100%'}"
:scrollable="false"
:current="current"
@change="tabsChange"
></u-tabs>
</u-col>
</u-row>
<!-- -->
</view>
</u-col>
</u-row>
</view>
</mz-sticky>
</u-col>
</u-row>
</view>
</mz-sticky>
<view class="room-container" :style="{display:'block'} " style="margin-top:0rpx;">
<!-- <view class="gradient-background"></view>-->
<view class="item-container" style="padding:16rpx 26rpx;position: relative;z-index: 2">
@ -67,10 +69,21 @@
<view class="item-img-right">
<!-- 状态：0=待报名,1=报名中,2=已抢光,3=待开始,4=活动中,5=已完成,6=已取消-->
<!-- <u-image :src="staticImage.rightRed" width="96" height="96"></u-image>-->
<u-image :src="staticImage.rightRed" v-if="item.status === 2" width="96" height="96"></u-image>
<!-- 已取消-->
<u-image :src="staticImage.rightJoin" v-if="item.status === 0" width="96" height="96"></u-image>
<!-- 报名中-->
<u-image :src="staticImage.rightBlue" v-if="item.status === 1" width="96" height="96"></u-image>
<u-image :src="staticImage.rightGreen" v-if="item.status === 4" width="96" height="96"></u-image>
<!-- 已抢光-->
<u-image :src="staticImage.rightRed" v-if="item.status === 2" width="96" height="96"></u-image>
<!-- 待开始-->
<u-image :src="staticImage.rightStart" v-if="item.status === 3" width="96" height="96"></u-image>
<!-- 活动中-->
<u-image :src="staticImage.rightGreenActivity" v-if="item.status === 4 && tabCheck === 'activity'" width="96" height="96"></u-image>
<u-image :src="staticImage.rightGreenProject" v-if="item.status === 4 && tabCheck === 'project'" width="96" height="96"></u-image>
<!-- 已完成-->
<u-image :src="staticImage.rightOrange" v-if="item.status === 5" width="96" height="96"></u-image>
<!-- 已取消-->
<u-image :src="staticImage.rightCancel" v-if="item.status === 6" width="96" height="96"></u-image>
</view>
<view :class="getStatusColor(item.status)" style="padding:20rpx;border-radius:20rpx;">
<view class="title row" style="margin-bottom:32rpx;">
@ -86,7 +99,10 @@
</view>
</view>
<view class="body row">
<view class="cover" style="margin-right:24rpx;">
<view class="cover" style="margin-right:24rpx;position:relative;">
<view style="position: absolute;top:0;left:0;z-index:10;" v-if="item.is_top === 1">
<u-image mode="widthFix" width="64" height="64" :src="staticImage.activityTop"></u-image>
</view>
<u-image mode="widthFix" width="260" height="160" :src="item.cover" radius="10"></u-image>
</view>
<view class="content col">
@ -198,10 +214,15 @@ export default {
mapClose:imghost+'/map-close.png',
listPosition:imghost+'/activity-position.png',
listTime:imghost+'/activity-time.png',
rightRed:imghost+'/activity-red.png',
rightBlue:imghost+'/activity-blue.png',
rightGreen:imghost+'/activity-green.png',
rightOrange:imghost+'/activity-orange.png',
rightRed:imghost+'/activity-red.png',//已抢光
rightBlue:imghost+'/activity-blue.png',//报名中
rightGreenProject:imghost+'/activity-green.png',//实施中
rightGreenActivity:imghost+'/activity-1-green.png',//活动中
rightOrange:imghost+'/activity-orange.png',//已完成]
rightCancel:imghost+'/activity-cancel.png',//已取消
rightStart:imghost+'/activity-start.png',//待开始
rightJoin:imghost+'/activity-join.png',//待报名
activityTop:imghost+'/activity-top.png',//置顶
},
}
},
@ -245,14 +266,20 @@ export default {
},
getStatusColor(status){
switch (status){
case 0:
return 'red';
case 1:
return 'blue';
case 2:
return 'red';
case 3:
return 'red';
case 4:
return 'green';
case 5:
return 'orange';
case 6:
return 'gray';
default:
return 'blue';
}

9
pages/Index/components/ShopPage/index.vue
Unescape View File

@ -1,6 +1,6 @@
<template>
<view class="body-background"></view>
<view class="screen-body row" :class="{pad:(tabCheck === 'item')}">
<view class="screen-body row" :class="{pad:(tabCheck === 'item')}" :style="{top:topStyle}">
<u-row :custom-style="{boxSizing:'border-box',width:'100%',flexWrap:'wrap'}">
<u-col :custom-style="{backgroundColor:'#fff',borderRadius:'10rpx',padding:'0rpx 26rpx',boxSizing:'border-box'}" v-if="showTabs">
<u-tabs
@ -334,7 +334,11 @@ import MzMap from "@/components/MzMap/index.vue";
const img = 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/logo.png';
export default {
computed: {},
computed: {
topStyle(){
return uni.getStorageSync('sysInfo').sysAndMenuHeight+'px';
}
},
components: {
MzMap,
MzCard,
@ -855,7 +859,6 @@ export default {
.screen-body {
position: fixed;
top: 91px;
z-index: 9;
transition-duration: .2s;
transition-timing-function: ease-in-out;

6
uni_modules/mz-sticky/components/mz-sticky/mz-sticky.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<view class="safe-area" :style="{height:safeHeight,display:((type !== 'sticky') || 'none')}"></view>
<view class="safe-area" :style="{height:safeHeight,display:((type !== 'sticky') ?'block': 'none')}"></view>
<view class="mz-sticky-container" :style="{top:(offsetTop === '0')?offSetDefault:offsetTop,position:type}">
<slot />
<slot></slot>
</view>
</template>
@ -19,7 +19,7 @@
data() {
return {
show: true,
safeHeight:''
safeHeight:0
}
},
computed: {

Write Preview
Loading…
Cancel
Save