fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by htoooth
Commit 255a4fba6efbcbda5927a9f39e26182ce9f6c9e1 2 parents c15327df 01f62a5b

Merge branch 'develop' of http://git.yoho.cn/fe/yoho-limited-sell-miniapp into develop

Inline Side-by-side
Showing 9 changed files with 81 additions and 11 deletions
... ... @@ -10,7 +10,8 @@
"array-callback-return": "off",
"no-unused-vars": "off",
"guard-for-in": "off",
"indentation": "off"
"indentation": "off",
"max-len": "off"
},
"globals": {
"App": true,
... ...
... ... @@ -95,7 +95,7 @@ Page({
* index: tab的index，
* page:分页，
* limit: 每页数量，
* isBottom:是否是到达底部后触发
* isBottom:是否是到达底部后触发的
*/
getList: function(index, page, limit, isBottom) {
let method = this.data.tabBarArr[index].method;
... ...
... ... @@ -230,13 +230,18 @@ Page(Object.assign({
* 用户点击右上角分享
*/
onShareAppMessage: function(res) {
let path = `/pages/product/detail/detail?limitProductCode=${this.data.shareInfo.limitProductCode}`;
if (this.data.userInfo.isDrawline) {
path = `/pages/product/detail/detail?limitProductCode=
${this.data.shareInfo.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`;
}
let params = {
FROM: res.from,
SHARE_RESUIL: 0,
TITLE: decodeURIComponent(this.data.shareInfo.product_name),
DESC: '我在有货限定频道发现一个不错的商品赶快来看看吧！',
PATH: `/pages/product/detail/detail?limitProductCode=
${this.data.shareInfo.limitProductCode}&originUid=${app.getUid()}`,
PATH: path,
IMG: decodeURIComponent(this.data.shareInfo.default_image)
};
... ...
... ... @@ -23,7 +23,14 @@
</view>
<view class='item-info-container'>
<!--itemInfo-->
<view class='item-user-rank'>{{item.sort}}</view>
<view class='item-user-rank'>
<text>{{item.sort}}</text>
<view wx:if="{{item.helpName}}" class='item-user-assist'>
<image src='{{item.helpheadIco}}'></image>
<text>好友助力</text>
</view>
</view>
<view class='item-user-name'>{{item.nickName}}</view>
<view class='item-user-time'>
<view class='item-user-time-icon'></view>
... ...
... ... @@ -46,6 +46,7 @@ image {
color: #fff;
font-size: 24rpx;
margin-left: 30rpx;
text-shadow: 2rpx 2rpx 5rpx #000;
}
.queue-prize-link {
... ... @@ -70,7 +71,7 @@ image {
bottom: 42rpx;
right: 32rpx;
flex-direction: row;
align-items: flex-end;
align-items: flex-start;
justify-content: space-between;
z-index: 19;
}
... ... @@ -111,7 +112,7 @@ image {
border-radius: 6px 6px 0rpx 6px;
box-sizing: border-box;
overflow: hidden;
font-size: 28rpx;
font-size: 24rpx;
line-height: 1.2;
z-index: -1;
}
... ... @@ -273,9 +274,34 @@ image {
}
.item-user-rank { /* item 用户排名 */
display: flex;
flex-direction: row;
align-items: center;
font-size: 36rpx;
font-weight: bold;
line-height: 40rpx;
overflow: hidden;
}
.item-user-assist {
display: flex;
flex-direction: row;
align-items: center;
width: 138rpx;
height: 32rpx;
background-color: #d0021b;
border-radius: 20rpx;
margin-left: 10rpx;
font-size: 24rpx;
font-weight: lighter;
color: #fff;
}
.item-user-assist image {
width: 28rpx;
height: 28rpx;
margin: 0 4rpx 0 4rpx;
border-radius: 28rpx;
}
.item-user-name { /* item 用户名称 */
... ... @@ -467,4 +493,4 @@ image {
.zan-actionsheet__container {
z-index: 29 !important;
}
\ No newline at end of file
}
... ...
... ... @@ -150,7 +150,7 @@ Page(Object.assign({
TITLE: decodeURIComponent(this.data.shareInfo.product_name),
DESC: '我在有货限定频道发现一个不错的商品赶快来看看吧！',
PATH: `/pages/product/detail/detail?limitProductCode=
${this.data.limitProductCode}&originUid=${app.getUid()}`,
${this.data.limitProductCode}&originUid=${app.getUid()}&originUnionID=${app.getUnionID()}`,
IMG: decodeURIComponent(this.data.shareInfo.default_image)
};
... ...
... ... @@ -15,7 +15,13 @@
</view>
<view class='item-info-container'>
<!--itemInfo-->
<view class='item-user-rank'>{{item.sort}}</view>
<view class='item-user-rank'>
<text>{{item.sort}}</text>
<view wx:if="{{item.helpName}}" class='item-user-assist'>
<image src='{{item.helpheadIco}}'></image>
<text>好友助力</text>
</view>
</view>
<view class='item-user-name'>{{item.nickName}}</view>
<view class='item-user-time'>
<view class='item-user-time-icon'></view>
... ...
... ... @@ -273,9 +273,34 @@ image {
}
.item-user-rank { /* item 用户排名 */
display: flex;
flex-direction: row;
align-items: center;
font-size: 36rpx;
font-weight: bold;
line-height: 40rpx;
overflow: hidden;
}
.item-user-assist {
display: flex;
flex-direction: row;
align-items: center;
width: 138rpx;
height: 32rpx;
background-color: #d0021b;
border-radius: 20rpx;
margin-left: 10rpx;
font-size: 24rpx;
font-weight: lighter;
color: #fff;
}
.item-user-assist image {
width: 28rpx;
height: 28rpx;
margin: 0 4rpx 0 4rpx;
border-radius: 28rpx;
}
.item-user-name { /* item 用户名称 */
... ...
... ... @@ -63,7 +63,7 @@
"id": -1,
"name": "限定商品排队",
"pathName": "pages/queue/index",
"query": "actId=338"
"query": "actId=362"
},
{
"id": 5,
... ...