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
a37e317c
Commit
a37e317c
authored
Oct 18, 2020
by
Edwise
🍷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
细节修改
parent
ac75957c
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
9696 additions
and
8 deletions
+9696
-8
comtask.acss
taobao_jn/client/components/comtask/comtask.acss
+1
-1
comtasklist.axml
taobao_jn/client/components/comtasklist/comtasklist.axml
+2
-1
comtempitemmodal.axml
.../client/components/comtempitemmodal/comtempitemmodal.axml
+1
-1
prizeModal.axml
taobao_jn/client/components/prizeModal/prizeModal.axml
+1
-1
pagepageindex.acss
taobao_jn/client/pages/pagepageindex/pagepageindex.acss
+2
-2
pagepageindex.axml
taobao_jn/client/pages/pagepageindex/pagepageindex.axml
+1
-1
pagepagerank.acss
taobao_jn/client/pages/pagepagerank/pagepagerank.acss
+14
-1
pagepagerank.axml
taobao_jn/client/pages/pagepagerank/pagepagerank.axml
+2
-0
debug.log
taobao_jn/debug.log
+9672
-0
No files found.
taobao_jn/client/components/comtask/comtask.acss
View file @
a37e317c
...
@@ -155,7 +155,7 @@
...
@@ -155,7 +155,7 @@
font-weight: bolder;
font-weight: bolder;
}
}
.task .task_item .task_award {
.task .task_item .task_award {
width:
1
40rpx;
width:
3
40rpx;
height: 24rpx;
height: 24rpx;
opacity: 1;
opacity: 1;
left: 138rpx;
left: 138rpx;
...
...
taobao_jn/client/components/comtasklist/comtasklist.axml
View file @
a37e317c
...
@@ -19,7 +19,8 @@
...
@@ -19,7 +19,8 @@
<label class="task_title " a:if="{{item.taskType!='sign'&&item.taskType!='collectGoods'}}">{{item.title}}</label>
<label class="task_title " a:if="{{item.taskType!='sign'&&item.taskType!='collectGoods'}}">{{item.title}}</label>
<label class="task_title " a:if="{{item.taskType=='sign'}}">{{item.title}}({{item.todayCompleteTimes}}/{{item.times}})</label>
<label class="task_title " a:if="{{item.taskType=='sign'}}">{{item.title}}({{item.todayCompleteTimes}}/{{item.times}})</label>
<label class="task_title " a:if="{{item.taskType=='collectGoods'}}">{{item.title}}({{item.completeTimes}}/{{item.times}})</label>
<label class="task_title " a:if="{{item.taskType=='collectGoods'}}">{{item.title}}({{item.completeTimes}}/{{item.times}})</label>
<label class="task_award ">温暖值 +{{item.rewards}}</label>
<label class="task_award " a:if="{{item.taskType!='collectGoods'}}">温暖值 +{{item.rewards}}</label>
<label class="task_award " a:if="{{item.taskType=='collectGoods'}}">每收藏1个商品温暖值+{{item.rewards}}</label>
<block>
<block>
<!-- <label class="task_progress " a:if="{{item.taskType=='invites'}}">(不限次数)</label>
<!-- <label class="task_progress " a:if="{{item.taskType=='invites'}}">(不限次数)</label>
<label class="task_progress " a:elif="{{item.taskType!='follow'}}">({{item.todayCompleteTimes}}/{{item.times}})</label>
<label class="task_progress " a:elif="{{item.taskType!='follow'}}">({{item.todayCompleteTimes}}/{{item.times}})</label>
...
...
taobao_jn/client/components/comtempitemmodal/comtempitemmodal.axml
View file @
a37e317c
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<view class="tempitemtext ">
<view class="tempitemtext ">
<label class="tempitemtitle ">蕉内旗下热装备 持久保温</label>
<label class="tempitemtitle ">蕉内旗下热装备 持久保温</label>
<label class="tempitemname ">人气商品</label>
<label class="tempitemname ">人气商品</label>
<
label class="tempitemprize ">双十一惊喜价:¥299</label
>
<
!-- <label class="tempitemprize ">双十一惊喜价:¥299</label> --
>
</view>
</view>
<image class="tempitemImg " src={{resList['e41300b7-bee4-4224-9f12-7a8513ce8fe9'].url}} onTap="goGoodsDetail" />
<image class="tempitemImg " src={{resList['e41300b7-bee4-4224-9f12-7a8513ce8fe9'].url}} onTap="goGoodsDetail" />
...
...
taobao_jn/client/components/prizeModal/prizeModal.axml
View file @
a37e317c
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
<image class="my-prize-copy" data-text="{{item._id}}" onTap="handleCopyId" src="{{task.image.copyIcon}}" />
<image class="my-prize-copy" data-text="{{item._id}}" onTap="handleCopyId" src="{{task.image.copyIcon}}" />
</view>
</view>
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FAILURE}}">{{item.remark}}</view>
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FAILURE}}">{{item.remark}}</view>
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.REPEAT || (item.drawStatus === PRIZE_DRAW_STATUS_MAP.RECEIVE)}}">请于{{endTime}}前领取</view>
<view class="my-prize-tip" a:if="{{item.
type != PRIZE_TYPE_MAP.EQUITY&&item.
drawStatus === PRIZE_DRAW_STATUS_MAP.REPEAT || (item.drawStatus === PRIZE_DRAW_STATUS_MAP.RECEIVE)}}">请于{{endTime}}前领取</view>
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FINISHED }}">奖品已过期失效</view>
<view class="my-prize-tip" a:if="{{item.drawStatus === PRIZE_DRAW_STATUS_MAP.FINISHED }}">奖品已过期失效</view>
</view>
</view>
<view class="prize-status" style="{{task.btnStyle}}">
<view class="prize-status" style="{{task.btnStyle}}">
...
...
taobao_jn/client/pages/pagepageindex/pagepageindex.acss
View file @
a37e317c
...
@@ -250,8 +250,8 @@
...
@@ -250,8 +250,8 @@
color: #000000;
color: #000000;
}
}
.pageindex .rule {
.pageindex .rule {
width: 3
2
rpx;
width: 3
8
rpx;
height: 1
25
rpx;
height: 1
31
rpx;
opacity: 1;
opacity: 1;
top: 130rpx;
top: 130rpx;
position: absolute;
position: absolute;
...
...
taobao_jn/client/pages/pagepageindex/pagepageindex.axml
View file @
a37e317c
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<image class="lockbtn3 " a:if="{{curGameStep<3}}" src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
<image class="lockbtn3 " a:if="{{curGameStep<3}}" src={{resList['62f291e9-e8c8-40f8-9d4d-a0445f085fdc'].url}} />
<view class="wen_zi2 ">
<view class="wen_zi2 ">
<label class="superise ">赢2999元
惊喜礼包
</label>
<label class="superise ">赢2999元
购物金
</label>
<view class="lei_ji_sheng_chang ">
<view class="lei_ji_sheng_chang ">
<label class="curtemp ">当前温暖值:<text class="curWarms " style="size:{{'30rpx'}}">{{curWarms}}</text></label>
<label class="curtemp ">当前温暖值:<text class="curWarms " style="size:{{'30rpx'}}">{{curWarms}}</text></label>
<label class="currank ">排名位于第 <text class="curWarms " style="size:{{'30rpx'}}">{{curRank}}</text> 位</label>
<label class="currank ">排名位于第 <text class="curWarms " style="size:{{'30rpx'}}">{{curRank}}</text> 位</label>
...
...
taobao_jn/client/pages/pagepagerank/pagepagerank.acss
View file @
a37e317c
...
@@ -115,6 +115,19 @@
...
@@ -115,6 +115,19 @@
font-size: 30rpx;
font-size: 30rpx;
color: #000000;
color: #000000;
}
}
.pagerank .ranktex .prizeTips {
width: 750rpx;
height: 40rpx;
opacity: 0.6;
left: -75rpx;
top: 188rpx;
position: absolute;
font-size: 20rpx;
color: rgba(0, 0, 0, 1);
transform-origin: 0rpx 0rpx 0rpx;
text-align: center;
}
.pagerank .ranktex .rankList {
.pagerank .ranktex .rankList {
width: 596rpx;
width: 596rpx;
height: 484rpx;
height: 484rpx;
...
@@ -222,7 +235,7 @@
...
@@ -222,7 +235,7 @@
height: 164rpx;
height: 164rpx;
opacity: 1;
opacity: 1;
left: 120rpx;
left: 120rpx;
top: 41
4
rpx;
top: 41
0
rpx;
position: absolute;
position: absolute;
word-break: keep-all;
word-break: keep-all;
white-space: nowrap;
white-space: nowrap;
...
...
taobao_jn/client/pages/pagepagerank/pagepagerank.axml
View file @
a37e317c
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
<image class="rankbg " src={{resList['bf292c37-4753-46bc-bae5-e886ae9cec80'].url}} />
<image class="rankbg " src={{resList['bf292c37-4753-46bc-bae5-e886ae9cec80'].url}} />
<image class="rankreturnbtn btn" onTap="navigateToIndex" src={{resList['071da23d-ca97-4979-91d1-533fe386eef7'].url}} />
<image class="rankreturnbtn btn" onTap="navigateToIndex" src={{resList['071da23d-ca97-4979-91d1-533fe386eef7'].url}} />
<view class="ranktex ">
<view class="ranktex ">
<label class="prizeTips ">右滑查看更多奖品</label>
<view class="myrank ">
<view class="myrank ">
<label class="rankid ">{{myRankInfo.userNick}}</label>
<label class="rankid ">{{myRankInfo.userNick}}</label>
<label class="ranktemp ">{{myRankInfo.warms}}</label>
<label class="ranktemp ">{{myRankInfo.warms}}</label>
...
@@ -11,6 +12,7 @@
...
@@ -11,6 +12,7 @@
<label class="tao_baoid ">淘宝id</label>
<label class="tao_baoid ">淘宝id</label>
<label class="lei_ji_ji_bai_ren_shu ">累计温暖值</label>
<label class="lei_ji_ji_bai_ren_shu ">累计温暖值</label>
<label class="pai_ming ">排名</label>
<label class="pai_ming ">排名</label>
</view>
</view>
<view class="rankList">
<view class="rankList">
<view class="rankItem" a:for="{{rankList}}">
<view class="rankItem" a:for="{{rankList}}">
...
...
taobao_jn/debug.log
View file @
a37e317c
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