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
78a7a259
Commit
78a7a259
authored
Sep 25, 2020
by
Edwise
🍷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2134
parent
05ee7ee4
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
211082 additions
and
69 deletions
+211082
-69
output.js
project/src/canvas/game/output.js
+97
-14
output.js.map
project/src/canvas/game/output.js.map
+1
-1
output.js
project/src/canvas/game/released/output.js
+97
-14
ResJson.ts
project/src/canvas/game/src/ResJson.ts
+1
-1
app.js
taobao_mini/client/app.js
+1
-1
comgetcat.js
taobao_mini/client/components/comgetcat/comgetcat.js
+6
-3
output.js
taobao_mini/client/pages/pagecanvas/output.js
+97
-14
pagecanvas.axml
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
+1
-1
pagecanvas.js
taobao_mini/client/pages/pagecanvas/pagecanvas.js
+28
-20
request.js
taobao_mini/client/tbcc-sdk/lib/request.js
+1
-0
debug.log
taobao_mini/debug.log
+210752
-0
No files found.
project/src/canvas/game/output.js
View file @
78a7a259
This diff is collapsed.
Click to expand it.
project/src/canvas/game/output.js.map
View file @
78a7a259
This diff is collapsed.
Click to expand it.
project/src/canvas/game/released/output.js
View file @
78a7a259
This diff is collapsed.
Click to expand it.
project/src/canvas/game/src/ResJson.ts
View file @
78a7a259
...
...
@@ -10,5 +10,5 @@ export const ResJson = {
"name"
:
"startScene"
}
],
"path"
:
"https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/160
0936371
/resource/"
"path"
:
"https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/160
1003410
/resource/"
}
\ No newline at end of file
taobao_mini/client/app.js
View file @
78a7a259
...
...
@@ -9,7 +9,7 @@ cloud.init({
App
({
env
,
requestType
:
'cloud'
,
// yapi,cloud: 云函数
requestType
:
'local'
,
// yapi,cloud: 云函数
//
requestType: 'local', // yapi,cloud: 云函数
cloudName
:
'tmallCat'
,
// 主云函数项目名 tmallCat
// cloudName: 'bubbleSurviva', // 主云函数项目名 tmallCat
cloud
,
...
...
taobao_mini/client/components/comgetcat/comgetcat.js
View file @
78a7a259
...
...
@@ -19,17 +19,20 @@ Component({
onModalClose
&&
onModalClose
();
console
.
log
(
'onModalClose'
)
},
onPostSelectCat
()
{
const
userInfo
=
API
.
getUserInfo
().
catch
(
res
=>
{
my
.
showToast
({
content
:
userInfo
?
userInfo
.
message
:
null
})
async
onPostSelectCat
()
{
const
userInfo
=
await
API
.
getUserInfo
().
catch
(
res
=>
{
my
.
showToast
({
content
:
res
?
res
.
message
:
null
})
});
if
(
userInfo
&&
userInfo
.
success
){
console
.
log
(
"aaa"
,
userInfo
)
const
{
onPostSelectCat
}
=
this
.
props
;
console
.
log
(
"领养完毕"
)
this
.
onModalClose
();
// my.__updateUserInfo__();
onPostSelectCat
&&
onPostSelectCat
(
userInfo
);
}
}
},
...
...
taobao_mini/client/pages/pagecanvas/output.js
View file @
78a7a259
This diff is collapsed.
Click to expand it.
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @
78a7a259
<view disable-scroll="true" class="page-game">
<canvas disable-scroll="true" id="canvas"
type="2d"
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>
</view>
...
...
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @
78a7a259
...
...
@@ -39,7 +39,7 @@ Page({
catnameModalVisible
:
false
,
recallcatModalVisible
:
false
,
recallcatModalData
:
{},
getcatModalVisible
:
fals
e
,
getcatModalVisible
:
tru
e
,
getcatModalData
:
{},
catbackbedModalVisible
:
false
,
catruleModalVisible
:
0
...
...
@@ -59,12 +59,13 @@ Page({
},
onReady
()
{
async
onReady
()
{
console
.
log
(
'on ready'
)
//授权和登录先搞
this
.
getAuth
();
await
this
.
getAuth
();
this
.
initCanvas
();
my
.
__onMessage__
=
(
e
)
=>
{
this
.
onMessage
(
e
)
}
...
...
@@ -104,7 +105,7 @@ Page({
}
},
init
()
{
init
Canvas
()
{
console
.
log
(
'do init'
);
this
.
spark_startEngine
();
...
...
@@ -266,8 +267,10 @@ Page({
* 获取用户授权信息
*/
async
getAuth
()
{
return
new
Promise
(
async
(
s
,
r
)
=>
{
const
userInfo
=
await
getAuthUserInfo
().
catch
(
err
=>
{
console
.
log
(
'未授权成功'
,
err
);
r
();
});
if
(
userInfo
)
{
console
.
log
(
'授权成功 userInfo'
,
userInfo
);
...
...
@@ -277,29 +280,35 @@ Page({
}
=
userInfo
;
app
.
nickName
=
nickName
;
app
.
avatar
=
avatar
;
this
.
login
();
await
this
.
login
();
s
();
}
})
},
/**
* 登录接口
*/
async
login
()
{
const
{
return
new
Promise
(
async
(
s
,
r
)
=>
{
const
{
nickName
,
avatar
}
=
app
;
const
{
success
}
=
await
API
.
login
({
userNick
:
nickName
,
avatar
}).
catch
(
res
=>
{
commonToast
(
res
&&
res
.
message
);
})
||
{};
}
=
app
;
const
{
success
}
=
await
API
.
login
({
userNick
:
nickName
,
avatar
}).
catch
(
res
=>
{
r
();
commonToast
(
res
&&
res
.
message
);
})
||
{};
if
(
success
)
{
this
.
init
();
}
if
(
success
)
{
s
();
}
})
},
/**刷新用户信息 */
updateUserInfo
()
{
...
...
@@ -370,7 +379,6 @@ Page({
})
},
closeGetcatModal
()
{
this
.
setData
({
getcatModalVisible
:
false
})
...
...
taobao_mini/client/tbcc-sdk/lib/request.js
View file @
78a7a259
...
...
@@ -104,6 +104,7 @@ const request = ({ cloud, cloudName, requestType = 'cloud' }) => {
// console.log('requestCloud', _cloudName, handle, params);
// return requestType === 'ams' ? requestAms() : requestCloud();
console
.
log
(
requestType
);
return
(
requestType
===
'ams'
||
requestType
===
'yapi'
||
requestType
===
'local'
)
?
requestMock
()
:
requestCloud
();
};
...
...
taobao_mini/debug.log
View file @
78a7a259
This diff is collapsed.
Click to expand it.
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