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
ea6172bc
Commit
ea6172bc
authored
Oct 10, 2020
by
AU-Pro-mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add new code
parent
6a76caf1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
13 deletions
+7
-13
comMissionModal.acss
...ni/client/components/comMissionModal/comMissionModal.acss
+1
-1
comMissionModal.axml
...ni/client/components/comMissionModal/comMissionModal.axml
+1
-1
output.js
taobao_mini/client/pages/pagecanvas/output.js
+5
-11
No files found.
taobao_mini/client/components/comMissionModal/comMissionModal.acss
View file @
ea6172bc
...
...
@@ -157,7 +157,7 @@
}
.waitRecive {
background
-color
: #f7a35f;
background: #f7a35f;
}
.mission_close_btn {
...
...
taobao_mini/client/components/comMissionModal/comMissionModal.axml
View file @
ea6172bc
...
...
@@ -22,7 +22,7 @@
class="mission_describe">乐园门票<text class="mission_describe_hightlight">+{{item.rewards}}</text></view>
</view>
<view class="mission_btn {{ item.status === 1 ? 'mission_btn_active' : ''}} {{item.status ==
=
2 ? 'waitRecive' : ''}}"
<view class="mission_btn {{ item.status === 1 ? 'mission_btn_active' : ''}} {{item.status == 2 ? 'waitRecive' : ''}}"
data-taskType="{{item.taskType}}" data-status="{{item.status}}" data-itemIds="{{item.itemIds}}" data-info="{{item}}" onTap="handleDoTaskByType">
<text a:if="{{item.status === 1}}" class="mission_btn_text">{{item.btnText}}</text>
<text a:if="{{item.status === 2}}" class="mission_btn_text">待领取</text>
...
...
taobao_mini/client/pages/pagecanvas/output.js
View file @
ea6172bc
...
...
@@ -1697,13 +1697,13 @@ const resCanvasListCsd = {
'27abf038-2a6b-4914-a212-143628fc7d47'
:
{
name
:
'引导2_修改'
,
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/引导2_修改617.a2b8101b6dbe454f4aa61167e2b2d581d2911c56.png'
,
url
:
'
https:
//yun.duiba.com.cn/spark/assets/引导2_修改617.a2b8101b6dbe454f4aa61167e2b2d581d2911c56.png'
,
uuid
:
'27abf038-2a6b-4914-a212-143628fc7d47'
},
'b006e393-b6a4-4757-8b56-9762ff9a3319'
:
{
name
:
'lottie_new_new'
,
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/lottie_new_newb.a684e7c3ffed151626dc9e00d0eb09c9ead79e80.png'
,
url
:
'
https:
//yun.duiba.com.cn/spark/assets/lottie_new_newb.a684e7c3ffed151626dc9e00d0eb09c9ead79e80.png'
,
uuid
:
'b006e393-b6a4-4757-8b56-9762ff9a3319'
}
};
...
...
@@ -1922,15 +1922,9 @@ var Main = (function () {
_a
.
sent
();
ctrls_1
.
changeScene
(
MainScene_2
.
OpenAni
);
resCanvasList
=
Object
.
assign
(
resCanvasList_1
.
default
,
resCanvasListCsd_1
.
default
);
return
[
4
,
RES_1
.
RES
.
loadSparkAssets
(
resCanvasList
)];
case
2
:
_a
.
sent
();
return
[
4
,
this
.
loadImageTexturesCsd01
(
resCanvasList
)];
case
3
:
_a
.
sent
();
return
[
4
,
this
.
loadImageTexturesCsd02
(
resCanvasList
)];
case
4
:
_a
.
sent
();
RES_1
.
RES
.
loadSparkAssets
(
resCanvasList
);
this
.
loadImageTexturesCsd01
(
resCanvasList
);
this
.
loadImageTexturesCsd02
(
resCanvasList
);
console
.
log
(
'resloadingList 加载完毕'
);
FYGE
.
GDispatcher
.
dispatchEvent
(
"loadEnd"
);
return
[
2
];
...
...
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