Commit d3969621 authored by 任建锋's avatar 任建锋

--

parent 3eaf02df
...@@ -32,7 +32,7 @@ App({ ...@@ -32,7 +32,7 @@ App({
const { activityId } = query; const { activityId } = query;
// this.activityId = activityId || '5f81841def5071b132fd5e21'; //赵然 // this.activityId = activityId || '5f81841def5071b132fd5e21'; //赵然
// this.activityId = activityId || '5f8022919da671f3b6d5fb14'; //小婷1 // this.activityId = activityId || '5f8022919da671f3b6d5fb14'; //小婷1
this.activityId = activityId || '5fd03fd63075d9784dbcd7ac'; //小婷2 this.activityId = activityId || '5fd42f0175cfb61cd86a16f0'; //小婷2
} }
}); });
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
} }
.mycardpanel .mycardbody .mycardcontent{ .mycardpanel .mycardbody .mycardcontent{
overflow-y:scroll; overflow-y:scroll;
z-index:10; z-index:10;
} }
.getcardpanel { .getcardpanel {
height: 1094rpx !important; height: 1094rpx !important;
......
...@@ -210,5 +210,9 @@ Component({ ...@@ -210,5 +210,9 @@ Component({
TaskList:DataCenter.TaskList TaskList:DataCenter.TaskList
}); });
}, },
onShow() {
console.log("弹窗展示 onShow")
// 页面显示
},
}); });
\ No newline at end of file
.win_bg > .taskpanel{ .win_bg > .taskpanel{
position:fixed !important; position:absolute !important;
top:auto !important; top:auto !important;
bottom:0rpx !important; bottom:0rpx !important;
left:0rpx !important; left:0rpx !important;
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
font-size:22rpx!important; font-size:22rpx!important;
} }
.taskpanel .taskbody{ .taskpanel .taskbody{
-webkit-overflow-scrolling: touch;
overflow-y:scroll; overflow-y:scroll;
height: 770rpx!important; height: 770rpx!important;
z-index:10; z-index:10;
......
<view>
<view class="indexpage " disableScroll={{false}}> <view class="indexpage " disableScroll={{false}}>
<view class="indexcontent "> <view class="indexcontent ">
<view class="indexbgcontent "> <view class="indexbgcontent ">
...@@ -83,7 +85,10 @@ ...@@ -83,7 +85,10 @@
<image class="indexrecordbtn " onTap="onTapIndexRecordBtn" src={{resList['5a6679e0-89f7-4582-a89b-116a35e9750a'].url}} /> <image class="indexrecordbtn " onTap="onTapIndexRecordBtn" src={{resList['5a6679e0-89f7-4582-a89b-116a35e9750a'].url}} />
<image class="loadImg" a:for={{assets}} src={{item}} /> <image class="loadImg" a:for={{assets}} src={{item}} />
</view> </view>
<panel
<view a:if={{disibleAll}} class="disibleAll"></view>
</view>
<panel
showWinLists={{showWinLists}} showWinLists={{showWinLists}}
CollectCardInfo={{CollectCardInfo}} CollectCardInfo={{CollectCardInfo}}
onOpenTaskPanel="openTaskPanel" onOpenTaskPanel="openTaskPanel"
...@@ -94,5 +99,4 @@ ...@@ -94,5 +99,4 @@
onDoBoxDraw="doBoxDraw" onDoBoxDraw="doBoxDraw"
onTapHiddenPanelEvent="hiddenPanelEvent"/> onTapHiddenPanelEvent="hiddenPanelEvent"/>
<canvas id="canvas" type="2d" onReady="onCanvasReady"></canvas> <canvas id="canvas" type="2d" onReady="onCanvasReady"></canvas>
<view a:if={{disibleAll}} class="disibleAll"></view>
</view> </view>
\ No newline at end of file
...@@ -54,6 +54,14 @@ Page({ ...@@ -54,6 +54,14 @@ Page({
disibleAll:false disibleAll:false
}, },
doShare() { my.showSharePanel(); }, doShare() { my.showSharePanel(); },
onShow() {
console.log("弹窗展示 onShow")
// 页面显示
this.setData({
showWinLists:[]
})
this.updateData()
},
onLoad(query) { onLoad(query) {
this.inviteId = query.inviteId; this.inviteId = query.inviteId;
this.cardId = query.cardId; this.cardId = query.cardId;
......
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