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
62bffdcb
Commit
62bffdcb
authored
Oct 15, 2020
by
Edwise
🍷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aaaaa
parent
bc2d8f06
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16561 additions
and
18 deletions
+16561
-18
cominvitelistmodal.js
...lient/components/cominvitelistmodal/cominvitelistmodal.js
+1
-0
comtask.js
taobao_jn/client/components/comtask/comtask.js
+1
-1
comtempitemmodal.acss
.../client/components/comtempitemmodal/comtempitemmodal.acss
+2
-2
comtempitemmodal.axml
.../client/components/comtempitemmodal/comtempitemmodal.axml
+2
-2
prizeModal.acss
taobao_jn/client/components/prizeModal/prizeModal.acss
+2
-4
myprize.js
taobao_jn/client/pages/myprize/myprize.js
+2
-2
pagepageindex.js
taobao_jn/client/pages/pagepageindex/pagepageindex.js
+7
-7
debug.log
taobao_jn/debug.log
+16544
-0
No files found.
taobao_jn/client/components/cominvitelistmodal/cominvitelistmodal.js
View file @
62bffdcb
...
...
@@ -32,6 +32,7 @@ Component({
success
,
data
}
=
await
API
.
getInviteList
({
page
:
1
,
pageSize
:
100
}).
catch
(
r
=>
{
my
.
hideLoading
();
...
...
taobao_jn/client/components/comtask/comtask.js
View file @
62bffdcb
...
...
@@ -107,7 +107,7 @@ Component({
commonToast
(
str
||
'领取成功'
);
}
/**领取成功,增加温暖值 */
my
.
__updateWarms
&&
my
.
__updateWarms
();
my
.
__updateWarms
();
await
this
.
getTaskList
()
flag
=
0
;
},
...
...
taobao_jn/client/components/comtempitemmodal/comtempitemmodal.acss
View file @
62bffdcb
...
...
@@ -64,7 +64,7 @@
left: 53rpx;
top: 617rpx;
position: absolute;
transform-origin:
0rpx 0rpx
0rpx;
transform-origin:
50% 50%
0rpx;
}
.tempitemmodal .tempitemImg {
width: 262rpx;
...
...
@@ -73,5 +73,5 @@
left: 132rpx;
top: 206rpx;
position: absolute;
transform-origin:
0rpx 0rpx
0rpx;
transform-origin:
50% 50%
0rpx;
}
taobao_jn/client/components/comtempitemmodal/comtempitemmodal.axml
View file @
62bffdcb
...
...
@@ -6,6 +6,6 @@
<label class="tempitemprize ">双十一惊喜价:¥299</label>
</view>
<image class="tempitemImg " src={{resList['e41300b7-bee4-4224-9f12-7a8513ce8fe9'].url}} onTap="goGoodsDetail" />
<image class="tempitembtn " src={{resList['bb187403-c5fc-4c33-aea1-072bac77f32e'].url}} onTap="onClose" />
<image class="tempitemImg
btn
" src={{resList['e41300b7-bee4-4224-9f12-7a8513ce8fe9'].url}} onTap="goGoodsDetail" />
<image class="tempitembtn
btn
" src={{resList['bb187403-c5fc-4c33-aea1-072bac77f32e'].url}} onTap="onClose" />
</view>
\ No newline at end of file
taobao_jn/client/components/prizeModal/prizeModal.acss
View file @
62bffdcb
...
...
@@ -70,8 +70,6 @@
.my-prize-page .my-prize-item .my-prize-subtitle {
display: flex;
justify-content: center;
align-items: center;
}
.my-prize-page .my-prize-item .my-prize-copy {
...
...
@@ -102,7 +100,7 @@
.my-prize-page .my-prize-item .my-prize-tip {
margin-top: 16rpx;
font-size:
20
rpx;
font-size:
18
rpx;
line-height: 0rpx;
letter-spacing: 0;
color: #000000;
...
...
@@ -110,7 +108,7 @@
.my-prize-page .my-prize-item .my-prize-code {
font-family: PingFangSC-Regular;
font-size:
20
rpx;
font-size:
18
rpx;
color: #222222;
letter-spacing: 0;
overflow: hidden;
...
...
taobao_jn/client/pages/myprize/myprize.js
View file @
62bffdcb
...
...
@@ -143,7 +143,7 @@ Page({
const
params
=
{
activityId
,
area
:
countyName
,
address
d
etail
:
detailInfo
,
address
D
etail
:
detailInfo
,
name
,
phone
:
telNumber
,
detailInfo
,
...
...
@@ -154,7 +154,7 @@ Page({
provinceName
,
countyName
,
streetName
,
_
id
:
item
.
_id
id
:
item
.
_id
}
my
.
confirm
({
...
...
taobao_jn/client/pages/pagepageindex/pagepageindex.js
View file @
62bffdcb
...
...
@@ -183,10 +183,10 @@ Page({
my
.
showLoading
();
const
userInfo
=
await
getAuthUserInfo
().
catch
(
err
=>
{
console
.
log
(
'未授权成功'
,
err
);
my
.
hideLoading
();
//
my.hideLoading();
});
if
(
userInfo
)
{
my
.
hideLoading
();
//
my.hideLoading();
console
.
log
(
'userInfo'
,
userInfo
);
const
{
nickName
,
...
...
@@ -218,7 +218,7 @@ Page({
* 登录接口
*/
async
login
()
{
my
.
showLoading
();
//
my.showLoading();
const
{
nickName
,
avatar
...
...
@@ -233,12 +233,12 @@ Page({
inviteId
:
app
.
inviteId
,
inviteStep
:
app
.
step
}).
catch
(
res
=>
{
my
.
hideLoading
();
//
my.hideLoading();
commonToast
(
res
&&
res
.
message
);
})
||
{};
if
(
success
)
{
my
.
hideLoading
();
//
my.hideLoading();
app
.
openId
=
data
.
openId
;
app
.
step
=
data
.
inviteStep
;
this
.
getActivityBaseInfoById
();
...
...
@@ -248,7 +248,7 @@ Page({
* 获取活动信息
*/
async
getActivityBaseInfoById
()
{
my
.
showLoading
();
//
my.showLoading();
const
{
success
,
data
...
...
@@ -276,7 +276,7 @@ Page({
},
/**更新游戏信息 */
async
updateGameInfo
()
{
my
.
showLoading
();
//
my.showLoading();
const
{
success
,
data
...
...
taobao_jn/debug.log
View file @
62bffdcb
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