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
c96ba9aa
Commit
c96ba9aa
authored
Sep 24, 2020
by
Edwise
🍷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1234
parent
a9992e40
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
44 additions
and
25 deletions
+44
-25
comcatrule.axml
taobao_mini/client/components/comcatrule/comcatrule.axml
+3
-3
comcatrule.js
taobao_mini/client/components/comcatrule/comcatrule.js
+13
-9
pagecanvas.axml
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
+1
-1
pagecanvas.js
taobao_mini/client/pages/pagecanvas/pagecanvas.js
+10
-11
pagecanvas.json
taobao_mini/client/pages/pagecanvas/pagecanvas.json
+4
-1
resList.js
taobao_mini/client/resconfig/resList.js
+13
-0
No files found.
taobao_mini/client/components/comcatrule/comcatrule.axml
View file @
c96ba9aa
<view class="catrule">
<view class="catrule">
<image class="catrulebg" src={{resList['716ced79-de7f-40ca-ac98-46a5adf13db0'].url}} />
<image class="catrulebg" src={{resList['716ced79-de7f-40ca-ac98-46a5adf13db0'].url}} />
<image class="catrulep" src={{resList['617927a2-2dd6-456a-9d92-1f607a137dbc'].url}} />
<image class="catrulep" src={{resList['617927a2-2dd6-456a-9d92-1f607a137dbc'].url}} />
<
span
class="catrulelabel">
<
label
class="catrulelabel">
游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则
游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则游戏规则
</
span
>
</
label
>
<image class="catrulebtnclose" src={{resList['29e80fbb-98ed-40fb-a11b-e14b45fee158'].url}} />
<image class="catrulebtnclose"
onTap="onModalClose"
src={{resList['29e80fbb-98ed-40fb-a11b-e14b45fee158'].url}} />
</view>
</view>
\ No newline at end of file
taobao_mini/client/components/comcatrule/comcatrule.js
View file @
c96ba9aa
...
@@ -2,14 +2,18 @@
...
@@ -2,14 +2,18 @@
import
resList
from
'../../resconfig/resList'
;
import
resList
from
'../../resconfig/resList'
;
Component
({
Component
({
props
:
{},
props
:
{},
data
:
{},
data
:
{
methods
:
{},
resList
:
resList
},
onInit
(
props
)
{
methods
:
{
this
.
setData
(
this
.
data
||
{
onModalClose
()
{
resList
:
resList
const
{
});
onModalClose
}
}
=
this
.
props
;
onModalClose
&&
onModalClose
();
console
.
log
(
'onModalClose'
)
},
},
});
});
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @
c96ba9aa
...
@@ -13,4 +13,4 @@
...
@@ -13,4 +13,4 @@
<view class="popcontainer" a:if="{{getcatModalVisible}}"><getcat-modal catName="{{catName}}" onPostSelectCat="postSelectCat" onModalClose="closeGetcatModal"></getcat-modal></view>
<view class="popcontainer" a:if="{{getcatModalVisible}}"><getcat-modal catName="{{catName}}" onPostSelectCat="postSelectCat" onModalClose="closeGetcatModal"></getcat-modal></view>
<view class="popcontainer" a:if="{{catbackbedModalVisible}}"><catbackbed-modal mydata="{{getcatModalData}}" recallCatInfo="{{recallCatInfo}}" onUpdateUserInfo="updateUserInfo" onModalClose="closeCatbackModal"></catbackbed-modal></view>
<view class="popcontainer" a:if="{{catbackbedModalVisible}}"><catbackbed-modal mydata="{{getcatModalData}}" recallCatInfo="{{recallCatInfo}}" onUpdateUserInfo="updateUserInfo" onModalClose="closeCatbackModal"></catbackbed-modal></view>
<task-modal a:if="{{taskModalVisible}}" onModalClose="closeTaskModal"></task-modal>
<task-modal a:if="{{taskModalVisible}}" onModalClose="closeTaskModal"></task-modal>
<view class="popcontainer" a:if="{{catruleModalVisible}}"><catrule-modal onModalClose="closeCatruleModal"></catrule-modal></view>
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @
c96ba9aa
...
@@ -28,13 +28,8 @@ Page({
...
@@ -28,13 +28,8 @@ Page({
data
:
{
data
:
{
catType
:
1
,
catType
:
1
,
catName
:
''
,
catName
:
''
,
recallCatInfo
:{
recallCatInfo
:{},
value
:
1
,
taskModalVisible
:
false
,
type
:
6
,
backType
:
2
,
desc
:
"eu dolore qui mollit"
},
taskModalVisible
:
1
,
messageModalVisible
:
false
,
messageModalVisible
:
false
,
messageModalData
:
{},
messageModalData
:
{},
ruleModalVisible
:
false
,
ruleModalVisible
:
false
,
...
@@ -44,10 +39,9 @@ Page({
...
@@ -44,10 +39,9 @@ Page({
catnameModalVisible
:
false
,
catnameModalVisible
:
false
,
recallcatModalVisible
:
false
,
recallcatModalVisible
:
false
,
getcatModalVisible
:
false
,
getcatModalVisible
:
false
,
getcatModalData
:
{
getcatModalData
:
{},
catType
:
1
catbackbedModalVisible
:
false
,
},
catruleModalVisible
:
true
catbackbedModalVisible
:
false
},
},
onLoad
(
props
)
{
onLoad
(
props
)
{
...
@@ -370,4 +364,9 @@ Page({
...
@@ -370,4 +364,9 @@ Page({
catbackbedModalVisible
:
false
catbackbedModalVisible
:
false
})
})
},
},
closeCatruleModal
(){
this
.
setData
({
catruleModalVisible
:
false
})
}
});
});
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/pagecanvas.json
View file @
c96ba9aa
...
@@ -8,6 +8,9 @@
...
@@ -8,6 +8,9 @@
"catname-modal"
:
"/components/comcatname/comcatname"
,
"catname-modal"
:
"/components/comcatname/comcatname"
,
"recallcat-modal"
:
"/components/comrecallcat/comrecallcat"
,
"recallcat-modal"
:
"/components/comrecallcat/comrecallcat"
,
"getcat-modal"
:
"/components/comgetcat/comgetcat"
,
"getcat-modal"
:
"/components/comgetcat/comgetcat"
,
"catbackbed-modal"
:
"/components/comcatbackbed/comcatbackbed"
"catbackbed-modal"
:
"/components/comcatbackbed/comcatbackbed"
,
"catrule-modal"
:
"/components/comcatrule/comcatrule"
}
}
}
}
taobao_mini/client/resconfig/resList.js
View file @
c96ba9aa
...
@@ -465,5 +465,18 @@ const resList = {
...
@@ -465,5 +465,18 @@ const resList = {
url
:
'//yun.duiba.com.cn/spark/assets/5193855f40ff72dea9f48022083a6a35240b6dc6.png'
url
:
'//yun.duiba.com.cn/spark/assets/5193855f40ff72dea9f48022083a6a35240b6dc6.png'
},
},
'716ced79-de7f-40ca-ac98-46a5adf13db0'
:
{
name
:
'catruleBg'
,
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/catruleBg.8b265a49b5fef7d4020ba60884868be6d772b72d.png'
,
uuid
:
'716ced79-de7f-40ca-ac98-46a5adf13db0'
},
'617927a2-2dd6-456a-9d92-1f607a137dbc'
:
{
name
:
'进度条'
,
ext
:
'.png'
,
uuid
:
'617927a2-2dd6-456a-9d92-1f607a137dbc'
,
url
:
'//yun.duiba.com.cn/spark/assets/a67137c922a0d539215aed739676aa7636e3c4d8.png'
},
};
};
export
default
resList
;
export
default
resList
;
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