Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
new_taobao
Project
Project
Details
Activity
Releases
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
wildfirecode13
new_taobao
Commits
d3969621
Commit
d3969621
authored
Dec 25, 2020
by
任建锋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
--
parent
3eaf02df
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
5 deletions
+22
-5
app.js
taobao_mini/client/app.js
+1
-1
your.acss
taobao_mini/client/components/comgetcardpanel/your.acss
+1
-1
comtaskpanel.js
taobao_mini/client/components/comtaskpanel/comtaskpanel.js
+4
-0
your.acss
taobao_mini/client/components/comtaskpanel/your.acss
+2
-1
pageindexpage.axml
taobao_mini/client/pages/pageindexpage/pageindexpage.axml
+6
-2
pageindexpage.js
taobao_mini/client/pages/pageindexpage/pageindexpage.js
+8
-0
No files found.
taobao_mini/client/app.js
View file @
d3969621
...
@@ -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
||
'5fd
03fd63075d9784dbcd7ac
'
;
//小婷2
this
.
activityId
=
activityId
||
'5fd
42f0175cfb61cd86a16f0
'
;
//小婷2
}
}
});
});
taobao_mini/client/components/comgetcardpanel/your.acss
View file @
d3969621
...
@@ -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;
...
...
taobao_mini/client/components/comtaskpanel/comtaskpanel.js
View file @
d3969621
...
@@ -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
taobao_mini/client/components/comtaskpanel/your.acss
View file @
d3969621
.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;
...
...
taobao_mini/client/pages/pageindexpage/pageindexpage.axml
View file @
d3969621
<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
taobao_mini/client/pages/pageindexpage/pageindexpage.js
View file @
d3969621
...
@@ -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
;
...
...
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