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
61906b5d
Commit
61906b5d
authored
Oct 19, 2020
by
Edwise
🍷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
ecad66a0
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8488 additions
and
2 deletions
+8488
-2
pagecanvas.acss
taobao_mini/client/pages/pagecanvas/pagecanvas.acss
+7
-0
pagecanvas.axml
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
+1
-0
pagecanvas.js
taobao_mini/client/pages/pagecanvas/pagecanvas.js
+10
-2
resList.js
taobao_mini/client/resconfig/resList.js
+6
-0
debug.log
taobao_mini/debug.log
+8464
-0
No files found.
taobao_mini/client/pages/pagecanvas/pagecanvas.acss
View file @
61906b5d
...
@@ -16,3 +16,10 @@
...
@@ -16,3 +16,10 @@
flex-direction: column;
flex-direction: column;
}
}
.testBg {
width:750rpx;
height:1624rpx;
position:fixed;
top:0rpx;
left:0rpx;
}
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @
61906b5d
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
<canvas disable-scroll="true" id="canvas" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
<canvas disable-scroll="true" id="canvas" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
</canvas>
</canvas>
</view>
</view>
<image class="testBg" a:if="{{customValue==1}}" src={{resList['2ef3e6b8-e635-4007-ba62-36df45e096c1'].url}} />
<end-modal a:if="{{endModalVisible}}" ></end-modal>
<end-modal a:if="{{endModalVisible}}" ></end-modal>
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal>
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal>
...
...
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @
61906b5d
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
import
{
import
{
Main
Main
}
from
'./output'
;
}
from
'./output'
;
import
resList
from
'../../resconfig/resList'
;
//import API from '../../api';
import
API
from
'../../api'
;
import
API
from
'../../api'
;
const
app
=
getApp
();
const
app
=
getApp
();
const
{
const
{
...
@@ -33,6 +34,7 @@ const checkSystem = async () => {
...
@@ -33,6 +34,7 @@ const checkSystem = async () => {
Page
({
Page
({
data
:
{
data
:
{
resList
:
resList
,
catType
:
1
,
catType
:
1
,
catName
:
''
,
catName
:
''
,
activityBaseInfo
:
null
,
activityBaseInfo
:
null
,
...
@@ -52,7 +54,8 @@ Page({
...
@@ -52,7 +54,8 @@ Page({
getcatModalData
:
{},
getcatModalData
:
{},
catbackbedModalVisible
:
false
,
catbackbedModalVisible
:
false
,
catruleModalVisible
:
0
,
catruleModalVisible
:
0
,
thanksModalVisible
:
false
thanksModalVisible
:
false
,
customValue
:
1
},
},
async
doHelp
()
{
async
doHelp
()
{
if
(
!
app
.
inviteId
)
return
;
if
(
!
app
.
inviteId
)
return
;
...
@@ -356,7 +359,12 @@ Page({
...
@@ -356,7 +359,12 @@ Page({
if
(
success
)
{
if
(
success
)
{
my
.
hideLoading
();
my
.
hideLoading
();
app
.
openId
=
data
.
openId
;
app
.
openId
=
data
.
openId
;
if
(
data
.
customValue
!=
1
){
this
.
initCanvas
();
this
.
initCanvas
();
}
this
.
setData
({
customValue
:
data
.
customValue
})
this
.
getActivityBaseInfoById
();
this
.
getActivityBaseInfoById
();
}
}
...
...
taobao_mini/client/resconfig/resList.js
View file @
61906b5d
...
@@ -575,5 +575,11 @@ const resList = {
...
@@ -575,5 +575,11 @@ const resList = {
uuid
:
'255668e8-739f-41a5-9f83-207def3aa3fd'
,
uuid
:
'255668e8-739f-41a5-9f83-207def3aa3fd'
,
url
:
'//yun.duiba.com.cn/spark/assets/cf23d4ed33f7fa384c206ba3f4c1c965f3aaa000.png'
url
:
'//yun.duiba.com.cn/spark/assets/cf23d4ed33f7fa384c206ba3f4c1c965f3aaa000.png'
},
},
'2ef3e6b8-e635-4007-ba62-36df45e096c1'
:
{
name
:
'lodingFake'
,
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/lodingFake.1897ec11d95b52aecae8a6771a1d8b838583ab7b.png'
,
uuid
:
'2ef3e6b8-e635-4007-ba62-36df45e096c1'
}
};
};
export
default
resList
;
export
default
resList
;
taobao_mini/debug.log
View file @
61906b5d
This source diff could not be displayed because it is too large. You can
view the blob
instead.
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