Authored by 李奇

配置文件精简

@@ -15,7 +15,8 @@ import { @@ -15,7 +15,8 @@ import {
15 YB_LAUNCH_APP, 15 YB_LAUNCH_APP,
16 YB_ENTER_FOREGROUND, 16 YB_ENTER_FOREGROUND,
17 YB_ENTER_BACKGROUND, 17 YB_ENTER_BACKGROUND,
18 - YB_AWAKE_MP 18 + YB_AWAKE_MP,
  19 + YB_MY_LOGIN
19 } from './libs/yas'; 20 } from './libs/yas';
20 import router from './pages/zeroSell/router/router'; 21 import router from './pages/zeroSell/router/router';
21 22
@@ -100,6 +101,9 @@ App({ @@ -100,6 +101,9 @@ App({
100 } 101 }
101 } else { 102 } else {
102 event.once('user-login-success', (userInfo) => { 103 event.once('user-login-success', (userInfo) => {
  104 + // TODO
  105 + yasReport(YB_MY_LOGIN);
  106 + console.log('登录注册上报');
103 if (loginSuccess) { 107 if (loginSuccess) {
104 loginSuccess(userInfo); 108 loginSuccess(userInfo);
105 } 109 }
@@ -116,7 +120,7 @@ App({ @@ -116,7 +120,7 @@ App({
116 let that = this 120 let that = this
117 let params = {}; 121 let params = {};
118 yasReport(YB_ENTER_FOREGROUND, params, that) 122 yasReport(YB_ENTER_FOREGROUND, params, that)
119 - if (that.globalData.hasReportAwakeAction==='false'){ 123 + if (!that.globalData.hasReportAwakeAction){
120 let pathParam = "" 124 let pathParam = ""
121 if(options && options.query) { 125 if(options && options.query) {
122 for (var Key in options.query) { 126 for (var Key in options.query) {
@@ -138,7 +142,7 @@ App({ @@ -138,7 +142,7 @@ App({
138 PAGE_PATH: path 142 PAGE_PATH: path
139 }; 143 };
140 yasReport(YB_AWAKE_MP, params, this); 144 yasReport(YB_AWAKE_MP, params, this);
141 - that.globalData.hasReportAwakeAction = 'true' 145 + that.globalData.hasReportAwakeAction = true;
142 } 146 }
143 147
144 if (options && options.scene){ 148 if (options && options.scene){
@@ -308,7 +312,7 @@ App({ @@ -308,7 +312,7 @@ App({
308 udid:'', 312 udid:'',
309 cid:'1', 313 cid:'1',
310 mobileRegisterState:'', 314 mobileRegisterState:'',
311 - hasReportAwakeAction: 'false', 315 + hasReportAwakeAction: false,
312 defraudurl:'https://activity.yoho.cn/feature/45.html?title=防诈骗提醒', 316 defraudurl:'https://activity.yoho.cn/feature/45.html?title=防诈骗提醒',
313 miniapp_type: MINI_APP_TYPE, 317 miniapp_type: MINI_APP_TYPE,
314 union_type:'',//渠道号,大数据上传用 318 union_type:'',//渠道号,大数据上传用
@@ -27,7 +27,6 @@ export const LOG_EVENT_HOST = 'https://analysis.yohobuy.com/yas_mobile'; @@ -27,7 +27,6 @@ export const LOG_EVENT_HOST = 'https://analysis.yohobuy.com/yas_mobile';
27 27
28 export const MINI_APP_TYPE = 29; 28 export const MINI_APP_TYPE = 29;
29 export const MINI_QR_TYPE = 16; 29 export const MINI_QR_TYPE = 16;
30 -export const PAYMENT_CODE = '45';  
31 30
32 export const OS_VERSION = 'yohobuy:h5'; 31 export const OS_VERSION = 'yohobuy:h5';
33 32
@@ -36,8 +35,3 @@ export const APP_BUILD = '1041'; @@ -36,8 +35,3 @@ export const APP_BUILD = '1041';
36 35
37 export const PRIVATE_KEY = 'b43890b0a296ff3c7b8c260ca763980b'; 36 export const PRIVATE_KEY = 'b43890b0a296ff3c7b8c260ca763980b';
38 export const CLIENT_TYPE = 'miniapp'; 37 export const CLIENT_TYPE = 'miniapp';
39 -  
40 -export const JUMP_BRAND = 'go.brand';  
41 -export const JUMP_DETAIL = 'go.detail';  
42 -export const JUMP_PRODUCTPOOL = 'go.poollist';  
43 -  
1 -// component/login/login.js  
2 import { getUserInfo, getPhoneNumber, checkUnionIdIsBind } from '../utils/login/login.js'; 1 import { getUserInfo, getPhoneNumber, checkUnionIdIsBind } from '../utils/login/login.js';
3 Component({ 2 Component({
4 /** 3 /**
1 <swiper wx:if="{{list.length !== 0}}" indicator-dots="{{indicatorDots}}" 1 <swiper wx:if="{{list.length !== 0}}" indicator-dots="{{indicatorDots}}"
2 autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" vertical="{{true}}" class="swiper" circular="{{true}}"> 2 autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" vertical="{{true}}" class="swiper" circular="{{true}}">
3 - <block wx:for="{{list}}"> 3 + <block wx:for="{{list}}" wx:key="{{index}}">
4 <swiper-item> 4 <swiper-item>
5 <view class="avatar-item"> 5 <view class="avatar-item">
6 <image src="{{item.user_thumb || 'http://img12.static.yhbimg.com/sns/2018/08/02/15/0237a5305f921865764e8409fcffbd3299.png'}}" class="avatar-image"/> 6 <image src="{{item.user_thumb || 'http://img12.static.yhbimg.com/sns/2018/08/02/15/0237a5305f921865764e8409fcffbd3299.png'}}" class="avatar-image"/>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <view class="banner" bindtap="_jumpBanner" wx:if="{{bannerSrc != null && bannerSrc !== ''}}"> 8 <view class="banner" bindtap="_jumpBanner" wx:if="{{bannerSrc != null && bannerSrc !== ''}}">
9 <image class="banner-img" src="{{bannerSrc}}"></image> 9 <image class="banner-img" src="{{bannerSrc}}"></image>
10 </view> 10 </view>
11 - <block wx:for="{{list}}"> 11 + <block wx:for="{{list}}" wx:key="{{index}}">
12 <block wx:if="{{item.floor_type === 1}}"> 12 <block wx:if="{{item.floor_type === 1}}">
13 <view >{{item.content}}</view> 13 <view >{{item.content}}</view>
14 </block> 14 </block>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <text class="title">邀新团</text> 4 <text class="title">邀新团</text>
5 </view> 5 </view>
6 <view class="group-list"> 6 <view class="group-list">
7 - <block wx:for="{{groupRecommendList}}"> 7 + <block wx:for="{{groupRecommendList}}" wx:key="{{index}}">
8 <group-recommend-cell product="{{item}}" bindhandlegroupdetail="groupDetail"></group-recommend-cell> 8 <group-recommend-cell product="{{item}}" bindhandlegroupdetail="groupDetail"></group-recommend-cell>
9 </block> 9 </block>
10 </view> 10 </view>
@@ -132,7 +132,6 @@ Page(Object.assign({ @@ -132,7 +132,6 @@ Page(Object.assign({
132 data.actPrizeId = options.actPrizeId; 132 data.actPrizeId = options.actPrizeId;
133 } 133 }
134 134
135 - console.log('options=>', options);  
136 135
137 if (options.scene && options.scene.length === 32) { 136 if (options.scene && options.scene.length === 32) {
138 data.scene = options.scene; 137 data.scene = options.scene;
@@ -261,7 +260,6 @@ Page(Object.assign({ @@ -261,7 +260,6 @@ Page(Object.assign({
261 let query = wx.createSelectorQuery(); 260 let query = wx.createSelectorQuery();
262 query.select('.code-list-item-container').boundingClientRect(); 261 query.select('.code-list-item-container').boundingClientRect();
263 query.exec((res) => { 262 query.exec((res) => {
264 - console.log(res[0].height)  
265 animation.height(res[0].height - 63).step(); 263 animation.height(res[0].height - 63).step();
266 this.setData({ 264 this.setData({
267 animation: animation.export() 265 animation: animation.export()
@@ -403,7 +401,6 @@ Page(Object.assign({ @@ -403,7 +401,6 @@ Page(Object.assign({
403 } 401 }
404 } 402 }
405 403
406 - console.log('step=>', step)  
407 this.setData({ 404 this.setData({
408 step: step 405 step: step
409 }); 406 });
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <view class="code-list" animation="{{animation}}"> 12 <view class="code-list" animation="{{animation}}">
13 <view class="code-list-item-container"> 13 <view class="code-list-item-container">
14 <view class="code-list-item"><view class="content"></view></view> 14 <view class="code-list-item"><view class="content"></view></view>
15 - <view class="code-list-item" wx:for="{{codeList}}" wx:if="{{index < 3}}"> 15 + <view class="code-list-item" wx:for="{{codeList}}" wx:if="{{index < 3}}" wx:key="{{index}}">
16 <view class="content"> 16 <view class="content">
17 <image class="thumb" mode="widthFix" src="{{item.user_thumb}}"></image> 17 <image class="thumb" mode="widthFix" src="{{item.user_thumb}}"></image>
18 <view class="text"> 18 <view class="text">
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <view class="line"></view> 35 <view class="line"></view>
36 36
37 <more wx:if="{{recommends.length > 0}}"> 37 <more wx:if="{{recommends.length > 0}}">
38 - <block wx:for="{{recommends}}"> 38 + <block wx:for="{{recommends}}" wx:key="{{index}}">
39 <view class="product-item"> 39 <view class="product-item">
40 <product-item product="{{item}}" tab-idx="{{tabIdx - 1}}"></product-item> 40 <product-item product="{{item}}" tab-idx="{{tabIdx - 1}}"></product-item>
41 </view> 41 </view>
@@ -230,7 +230,6 @@ Page(Object.assign({ @@ -230,7 +230,6 @@ Page(Object.assign({
230 _getResouceCode() { 230 _getResouceCode() {
231 this.commonService.getResourceCode('194ffd46254d6ad20e6c538bea4d89d7') 231 this.commonService.getResourceCode('194ffd46254d6ad20e6c538bea4d89d7')
232 .then(data => { 232 .then(data => {
233 - // console.log(data)  
234 this.setData({ 233 this.setData({
235 dialogSrc: formatImageUrl(data.src, 340 * app.globalData.systemInfo.pixelRatio, 340 * app.globalData.systemInfo.pixelRatio, 2), 234 dialogSrc: formatImageUrl(data.src, 340 * app.globalData.systemInfo.pixelRatio, 340 * app.globalData.systemInfo.pixelRatio, 2),
236 dialogUrl: data.url 235 dialogUrl: data.url
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 </view> 37 </view>
38 </block> 38 </block>
39 <block wx:else> 39 <block wx:else>
40 - <block wx:for="{{my_zero_list[0].data}}"> 40 + <block wx:for="{{my_zero_list[0].data}}" wx:key="{{index}}">
41 <prize-item item="{{item}}" bindshare="share" tab-idx="{{tabIndex}}"></prize-item> 41 <prize-item item="{{item}}" bindshare="share" tab-idx="{{tabIndex}}"></prize-item>
42 </block> 42 </block>
43 </block> 43 </block>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 </view> 50 </view>
51 </block> 51 </block>
52 <block wx:else> 52 <block wx:else>
53 - <block wx:for="{{my_zero_list[1].data}}"> 53 + <block wx:for="{{my_zero_list[1].data}}" wx:key="{{index}}">
54 <prize-item item="{{item}}" bindshare="share" tab-idx="{{tabIndex}}"></prize-item> 54 <prize-item item="{{item}}" bindshare="share" tab-idx="{{tabIndex}}"></prize-item>
55 </block> 55 </block>
56 </block> 56 </block>
@@ -58,11 +58,6 @@ @@ -58,11 +58,6 @@
58 <block wx:else> 58 <block wx:else>
59 <login theme="light" openType="{{openType}}"></login> 59 <login theme="light" openType="{{openType}}"></login>
60 </block> 60 </block>
61 - <!-- <view class="productList">  
62 - <block wx:for="{{list[2].products}}" wx:key="{{item.id}}">  
63 - <product-item product="{{item}}" class="product"></product-item>  
64 - </block>  
65 - </view> -->  
66 </tabs-pane> 61 </tabs-pane>
67 <block wx:if="{{tabIndex !== 3}}"> 62 <block wx:if="{{tabIndex !== 3}}">
68 <view class="list-foot-blank">{{footText}}</view> 63 <view class="list-foot-blank">{{footText}}</view>
@@ -74,16 +69,6 @@ @@ -74,16 +69,6 @@
74 </view> 69 </view>
75 </block> 70 </block>
76 71
77 -<!-- <view class="bottom-bar">  
78 - <block wx:if="{{isLogin}}">  
79 - <view bindtap="goMyList">我的抽奖码</view>  
80 - </block>  
81 -  
82 - <block wx:else>  
83 - <button class="bottom-btn" plain="true" hover-class="none" open-type="{{!hasUnionID ? 'getUserInfo':'getPhoneNumber'}}" bindgetphonenumber="getPhoneNumber" bindgetuserinfo='getUserInfo'>我的抽奖码</button>  
84 - </block>  
85 -</view> -->  
86 -  
87 <import src="../../vendors/zanui/toast/index.wxml"/> 72 <import src="../../vendors/zanui/toast/index.wxml"/>
88 <template is="zan-toast" data="{{zanToast}}"/> 73 <template is="zan-toast" data="{{zanToast}}"/>
89 74
@@ -96,4 +81,3 @@ url="{{dialogUrl}}" @@ -96,4 +81,3 @@ url="{{dialogUrl}}"
96 ></dialog> 81 ></dialog>
97 <import src="../../vendors/zanui/actionsheet/index.wxml" /> 82 <import src="../../vendors/zanui/actionsheet/index.wxml" />
98 <template is="zan-actionsheet" data="{{...actionsheet}}" /> 83 <template is="zan-actionsheet" data="{{...actionsheet}}" />
99 -<!-- <quickNavigation id="quickNavigation" isShowIndicator="{{false}}" isShowShopCart="{{false}}" marginBottom="{{190}}"></quickNavigation> -->  
@@ -32,7 +32,7 @@ class CommonService extends Service { @@ -32,7 +32,7 @@ class CommonService extends Service {
32 }) 32 })
33 .catch(error => { 33 .catch(error => {
34 reject(error) 34 reject(error)
35 - }) 35 + });
36 }) 36 })
37 37
38 } 38 }