Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-luck
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
李奇
6 years ago
Commit
0dd89c0065fc72102985e42717a47fdb6a3ca375
1 parent
997ad6fc
配置文件精简
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
16 additions
and
39 deletions
app.js
libs/config.js
login/login/login.js
pages/zeroSell/components/avatar-swiper.wxml
pages/zeroSell/components/desc.wxml
pages/zeroSell/components/group-recommend.wxml
pages/zeroSell/detail.js
pages/zeroSell/detail.wxml
pages/zeroSell/index.js
pages/zeroSell/index.wxml
pages/zeroSell/service/common.js
app.js
View file @
0dd89c0
...
...
@@ -15,7 +15,8 @@ import {
YB_LAUNCH_APP
,
YB_ENTER_FOREGROUND
,
YB_ENTER_BACKGROUND
,
YB_AWAKE_MP
YB_AWAKE_MP
,
YB_MY_LOGIN
}
from
'./libs/yas'
;
import
router
from
'./pages/zeroSell/router/router'
;
...
...
@@ -100,6 +101,9 @@ App({
}
}
else
{
event
.
once
(
'user-login-success'
,
(
userInfo
)
=>
{
// TODO
yasReport
(
YB_MY_LOGIN
);
console
.
log
(
'登录注册上报'
);
if
(
loginSuccess
)
{
loginSuccess
(
userInfo
);
}
...
...
@@ -116,7 +120,7 @@ App({
let
that
=
this
let
params
=
{};
yasReport
(
YB_ENTER_FOREGROUND
,
params
,
that
)
if
(
that
.
globalData
.
hasReportAwakeAction
===
'false'
){
if
(
!
that
.
globalData
.
hasReportAwakeAction
){
let
pathParam
=
""
if
(
options
&&
options
.
query
)
{
for
(
var
Key
in
options
.
query
)
{
...
...
@@ -138,7 +142,7 @@ App({
PAGE_PATH
:
path
};
yasReport
(
YB_AWAKE_MP
,
params
,
this
);
that
.
globalData
.
hasReportAwakeAction
=
'true'
that
.
globalData
.
hasReportAwakeAction
=
true
;
}
if
(
options
&&
options
.
scene
){
...
...
@@ -308,7 +312,7 @@ App({
udid
:
''
,
cid
:
'1'
,
mobileRegisterState
:
''
,
hasReportAwakeAction
:
'false'
,
hasReportAwakeAction
:
false
,
defraudurl
:
'https://activity.yoho.cn/feature/45.html?title=防诈骗提醒'
,
miniapp_type
:
MINI_APP_TYPE
,
union_type
:
''
,
//渠道号,大数据上传用
...
...
libs/config.js
View file @
0dd89c0
...
...
@@ -27,7 +27,6 @@ export const LOG_EVENT_HOST = 'https://analysis.yohobuy.com/yas_mobile';
export
const
MINI_APP_TYPE
=
29
;
export
const
MINI_QR_TYPE
=
16
;
export
const
PAYMENT_CODE
=
'45'
;
export
const
OS_VERSION
=
'yohobuy:h5'
;
...
...
@@ -36,8 +35,3 @@ export const APP_BUILD = '1041';
export
const
PRIVATE_KEY
=
'b43890b0a296ff3c7b8c260ca763980b'
;
export
const
CLIENT_TYPE
=
'miniapp'
;
export
const
JUMP_BRAND
=
'go.brand'
;
export
const
JUMP_DETAIL
=
'go.detail'
;
export
const
JUMP_PRODUCTPOOL
=
'go.poollist'
;
...
...
login/login/login.js
View file @
0dd89c0
// component/login/login.js
import
{
getUserInfo
,
getPhoneNumber
,
checkUnionIdIsBind
}
from
'../utils/login/login.js'
;
Component
({
/**
...
...
pages/zeroSell/components/avatar-swiper.wxml
View file @
0dd89c0
<swiper wx:if="{{list.length !== 0}}" indicator-dots="{{indicatorDots}}"
autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" vertical="{{true}}" class="swiper" circular="{{true}}">
<block wx:for="{{list}}">
<block wx:for="{{list}}"
wx:key="{{index}}"
>
<swiper-item>
<view class="avatar-item">
<image src="{{item.user_thumb || 'http://img12.static.yhbimg.com/sns/2018/08/02/15/0237a5305f921865764e8409fcffbd3299.png'}}" class="avatar-image"/>
...
...
pages/zeroSell/components/desc.wxml
View file @
0dd89c0
...
...
@@ -8,7 +8,7 @@
<view class="banner" bindtap="_jumpBanner" wx:if="{{bannerSrc != null && bannerSrc !== ''}}">
<image class="banner-img" src="{{bannerSrc}}"></image>
</view>
<block wx:for="{{list}}">
<block wx:for="{{list}}"
wx:key="{{index}}"
>
<block wx:if="{{item.floor_type === 1}}">
<view >{{item.content}}</view>
</block>
...
...
pages/zeroSell/components/group-recommend.wxml
View file @
0dd89c0
...
...
@@ -4,7 +4,7 @@
<text class="title">邀新团</text>
</view>
<view class="group-list">
<block wx:for="{{groupRecommendList}}">
<block wx:for="{{groupRecommendList}}"
wx:key="{{index}}"
>
<group-recommend-cell product="{{item}}" bindhandlegroupdetail="groupDetail"></group-recommend-cell>
</block>
</view>
\ No newline at end of file
...
...
pages/zeroSell/detail.js
View file @
0dd89c0
...
...
@@ -132,7 +132,6 @@ Page(Object.assign({
data
.
actPrizeId
=
options
.
actPrizeId
;
}
console
.
log
(
'options=>'
,
options
);
if
(
options
.
scene
&&
options
.
scene
.
length
===
32
)
{
data
.
scene
=
options
.
scene
;
...
...
@@ -261,7 +260,6 @@ Page(Object.assign({
let
query
=
wx
.
createSelectorQuery
();
query
.
select
(
'.code-list-item-container'
).
boundingClientRect
();
query
.
exec
((
res
)
=>
{
console
.
log
(
res
[
0
].
height
)
animation
.
height
(
res
[
0
].
height
-
63
).
step
();
this
.
setData
({
animation
:
animation
.
export
()
...
...
@@ -403,7 +401,6 @@ Page(Object.assign({
}
}
console
.
log
(
'step=>'
,
step
)
this
.
setData
({
step
:
step
});
...
...
pages/zeroSell/detail.wxml
View file @
0dd89c0
...
...
@@ -12,7 +12,7 @@
<view class="code-list" animation="{{animation}}">
<view class="code-list-item-container">
<view class="code-list-item"><view class="content"></view></view>
<view class="code-list-item" wx:for="{{codeList}}" wx:if="{{index < 3}}">
<view class="code-list-item" wx:for="{{codeList}}" wx:if="{{index < 3}}"
wx:key="{{index}}"
>
<view class="content">
<image class="thumb" mode="widthFix" src="{{item.user_thumb}}"></image>
<view class="text">
...
...
@@ -35,7 +35,7 @@
<view class="line"></view>
<more wx:if="{{recommends.length > 0}}">
<block wx:for="{{recommends}}">
<block wx:for="{{recommends}}"
wx:key="{{index}}"
>
<view class="product-item">
<product-item product="{{item}}" tab-idx="{{tabIdx - 1}}"></product-item>
</view>
...
...
pages/zeroSell/index.js
View file @
0dd89c0
...
...
@@ -230,7 +230,6 @@ Page(Object.assign({
_getResouceCode
()
{
this
.
commonService
.
getResourceCode
(
'194ffd46254d6ad20e6c538bea4d89d7'
)
.
then
(
data
=>
{
// console.log(data)
this
.
setData
({
dialogSrc
:
formatImageUrl
(
data
.
src
,
340
*
app
.
globalData
.
systemInfo
.
pixelRatio
,
340
*
app
.
globalData
.
systemInfo
.
pixelRatio
,
2
),
dialogUrl
:
data
.
url
...
...
pages/zeroSell/index.wxml
View file @
0dd89c0
...
...
@@ -37,7 +37,7 @@
</view>
</block>
<block wx:else>
<block wx:for="{{my_zero_list[0].data}}">
<block wx:for="{{my_zero_list[0].data}}"
wx:key="{{index}}"
>
<prize-item item="{{item}}" bindshare="share" tab-idx="{{tabIndex}}"></prize-item>
</block>
</block>
...
...
@@ -50,7 +50,7 @@
</view>
</block>
<block wx:else>
<block wx:for="{{my_zero_list[1].data}}">
<block wx:for="{{my_zero_list[1].data}}"
wx:key="{{index}}"
>
<prize-item item="{{item}}" bindshare="share" tab-idx="{{tabIndex}}"></prize-item>
</block>
</block>
...
...
@@ -58,11 +58,6 @@
<block wx:else>
<login theme="light" openType="{{openType}}"></login>
</block>
<!-- <view class="productList">
<block wx:for="{{list[2].products}}" wx:key="{{item.id}}">
<product-item product="{{item}}" class="product"></product-item>
</block>
</view> -->
</tabs-pane>
<block wx:if="{{tabIndex !== 3}}">
<view class="list-foot-blank">{{footText}}</view>
...
...
@@ -74,16 +69,6 @@
</view>
</block>
<!-- <view class="bottom-bar">
<block wx:if="{{isLogin}}">
<view bindtap="goMyList">我的抽奖码</view>
</block>
<block wx:else>
<button class="bottom-btn" plain="true" hover-class="none" open-type="{{!hasUnionID ? 'getUserInfo':'getPhoneNumber'}}" bindgetphonenumber="getPhoneNumber" bindgetuserinfo='getUserInfo'>我的抽奖码</button>
</block>
</view> -->
<import src="../../vendors/zanui/toast/index.wxml"/>
<template is="zan-toast" data="{{zanToast}}"/>
...
...
@@ -96,4 +81,3 @@ url="{{dialogUrl}}"
></dialog>
<import src="../../vendors/zanui/actionsheet/index.wxml" />
<template is="zan-actionsheet" data="{{...actionsheet}}" />
<!-- <quickNavigation id="quickNavigation" isShowIndicator="{{false}}" isShowShopCart="{{false}}" marginBottom="{{190}}"></quickNavigation> -->
\ No newline at end of file
...
...
pages/zeroSell/service/common.js
View file @
0dd89c0
...
...
@@ -32,7 +32,7 @@ class CommonService extends Service {
})
.
catch
(
error
=>
{
reject
(
error
)
})
})
;
})
}
...
...
Please
register
or
login
to post a comment