Commit 3925e313 authored by zhijie.xue's avatar zhijie.xue

部分图片替换为base64

parent 2fd29285
This diff is collapsed.
...@@ -178,8 +178,6 @@ ...@@ -178,8 +178,6 @@
<introduce v-if="isShowIntroduce"></introduce> <introduce v-if="isShowIntroduce"></introduce>
<view class="video-wrapper" v-else> <view class="video-wrapper" v-else>
<view class="prize"> <view class="prize">
<!--<prize-list :videoList="videoList" :userAccount="mainInfo && mainInfo.account && mainInfo.account.quantity || 0" bindchange="changeVideo" @getAwardsInfo="getAwardsInfo">
</prize-list>-->
<video-list :videoList="videoList" :userAccount="mainInfo && mainInfo.account && mainInfo.account.quantity || 0" bindchange="changeVideo" @getAwardsInfo="getAwardsInfo"></video-list> <video-list :videoList="videoList" :userAccount="mainInfo && mainInfo.account && mainInfo.account.quantity || 0" bindchange="changeVideo" @getAwardsInfo="getAwardsInfo"></video-list>
</view> </view>
<view class="userInfo" style="{{ safeAreaStyle }}"> <view class="userInfo" style="{{ safeAreaStyle }}">
...@@ -189,7 +187,7 @@ ...@@ -189,7 +187,7 @@
<image v-if="!authmodal" @tap="showMenu(!showModal)" :src="userInfo.avatarUrl" mode="cover" class="userimage"></image> <image v-if="!authmodal" @tap="showMenu(!showModal)" :src="userInfo.avatarUrl" mode="cover" class="userimage"></image>
</view> </view>
<view class="search" style="{{ searchStyle }}" bindtap="toSearch"> <view class="search" style="{{ searchStyle }}" bindtap="toSearch">
<image src="/static/images/search.png" class="searchimg"></image> <image src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACIAAAAiCAMAAAANmfvwAAAAZlBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+Vn2moAAAAIXRSTlMA+NQVHOYPmT8K38bDv5RMMSwnBobu7ciBhRK8lXd2TarCw2kxAAAA5klEQVQ4y9WSyxKCMAxFE+0DKFBpURSf9/9/Ul1YaelM3XpWYeYkBHLpg7udJbM83xzlqVoE2ioj1BrYX6zwtbOXPaDr1JgNeFSfJ3VimDmZMaEZaMHQYIrnaEgRNwkJHW0K3lHCjrHcucVIK0a0iwYc1FpRB3xHH9FThh7HUHe45xSLLtQSIqcIyFAzfE7x4IWiSoqEK7youG75o8u/rnyA7xmH1BgYVRyGJg1DA12MFCdN8wQ+RcFkbLaZePdWeC9s/4632KwcqgwC5rXpNuOQu3aSWXbX9z0iJ8c/O4ZKjnnQDzwBL9QS17pdGmYAAAAASUVORK5CYII=" class="searchimg"></image>
搜索 搜索
</view> </view>
<view> <view>
...@@ -205,7 +203,7 @@ ...@@ -205,7 +203,7 @@
<shared-popup v-if="showModal === 4" :inviteinfo="mainInfo && mainInfo.buyRecord" type="buy" @getSharedGold="getSharedGold"/> <shared-popup v-if="showModal === 4" :inviteinfo="mainInfo && mainInfo.buyRecord" type="buy" @getSharedGold="getSharedGold"/>
<popup @showMenu="showMenu" :showMenus="showModal === 3"/> <popup @showMenu="showMenu" :showMenus="showModal === 3"/>
<!--商品推荐列表--> <!--商品推荐列表-->
<goods-list></goods-list> <goods-list v-if="showGoodsList"></goods-list>
<van-dialog id="van-dialog"/> <van-dialog id="van-dialog"/>
<van-notify id="van-notify"/> <van-notify id="van-notify"/>
<!--克币充值弹窗--> <!--克币充值弹窗-->
...@@ -252,12 +250,13 @@ ...@@ -252,12 +250,13 @@
isReceive: false, // 是否显示领取克币动画 isReceive: false, // 是否显示领取克币动画
cornModal: false, cornModal: false,
cornCode: '', // 克币充值码 cornCode: '', // 克币充值码
cornText: '', cornText: '充值码错误',
cornTextShow: true, cornTextShow: true,
searchStyle: '', searchStyle: '',
avtivityModal: false, // 展示活动弹窗 avtivityModal: false, // 展示活动弹窗
awardsInfo: {}, awardsInfo: {},
isShowIntroduce: false isShowIntroduce: false,
showGoodsList: false
}, },
computed: { computed: {
...@@ -436,14 +435,27 @@ ...@@ -436,14 +435,27 @@
async showActivity() { async showActivity() {
// 1期方案先一次取50 // 1期方案先一次取50
const list = await getActivityFeed({ count: 50 }); const list = await getActivityFeed({ count: 50 });
this.activityList = list; setTimeout(() => {
this.activityList = list;
}, 1000);
}, },
async getOpenId() { getOpenId() {
const { code } = await wepy.wx.login(); return new Promise((resolve, reject) => {
let loginInfo = await login(code); wx.checkSession({
loginInfo = loginInfo || {}; success() {
wx.setStorageSync('openId', loginInfo.openid); resolve();
wx.setStorageSync('isRegister', loginInfo.register); },
async fail() {
const { code } = await wepy.wx.login();
let loginInfo = await login(code);
loginInfo = loginInfo || {};
wx.setStorageSync('openId', loginInfo.openid);
wx.setStorageSync('isRegister', loginInfo.register);
resolve();
},
complete() {}
});
});
}, },
cornModalShow() { cornModalShow() {
this.cornTextShow = false; this.cornTextShow = false;
...@@ -506,6 +518,32 @@ ...@@ -506,6 +518,32 @@
path: `/pages/index?openid=${openid}&prizeId=${this.$wepy.awardsInfo.id}`, path: `/pages/index?openid=${openid}&prizeId=${this.$wepy.awardsInfo.id}`,
imageUrl: compressShareImage(decodeURIComponent(this.$wepy.awardsInfo.photoUrl)) imageUrl: compressShareImage(decodeURIComponent(this.$wepy.awardsInfo.photoUrl))
}; };
},
async loadPrizeList(id) {
const list = await getPrizeList(id);
this.videoList = list;
// 推迟加载商品,减少图片请求对并发的影响
// FIXME: 商品列表加载少量图片
setTimeout(() => {
this.showGoodsList = true;
}, 1500);
},
async loadUserInfo() {
// FIXME: 场景是?
if (this.userInfo.nickName) {
this.registUser(this.userInfo);
return;
}
// TODO:通过setting判断再获取userinfo比较耗时
const setting = await wepy.wx.getSetting();
if (setting.authSetting['scope.userInfo']) {
const { userInfo } = await wepy.wx.getUserInfo();
this.setUserInfo(userInfo);
this.registUser(userInfo);
} else {
this.authmodal = true;
}
} }
}, },
async onLoad (query) { async onLoad (query) {
...@@ -514,46 +552,36 @@ ...@@ -514,46 +552,36 @@
this.showInfo(); this.showInfo();
return; return;
} }
wx.showShareMenu({
withShareTicket: false,
menus: ['shareAppMessage', 'shareTimeline']
});
this.cornText = '充值码错误';
// 获取分享人openid // 获取分享人openid
if (query.openid) { if (query.openid) {
this.inviter = query.openid; this.inviter = query.openid;
} }
// 获取头像安全距离
let statusHeight = this.$app.$options.globalData.statusBarHeight || '';
this.setSafeAreaStyle('top:' + statusHeight + 'px');
this.searchStyle = 'top:' + (statusHeight + 12) + 'px';
// 获取openid // 获取openid
await this.getOpenId(); await this.getOpenId();
// 获取奖品列表
this.videoList = await getPrizeList(query.prizeId);
this.getMainInfo(); this.getMainInfo();
flag = true; flag = true;
// 获取奖品列表
this.loadPrizeList(query.prizeId);
// 获取用户信息并注册 // 获取用户信息并注册
if (this.userInfo.nickName) { this.loadUserInfo();
this.registUser(this.userInfo);
} else {
const setting = await wepy.wx.getSetting();
if (setting.authSetting['scope.userInfo']) {
const { userInfo } = await wepy.wx.getUserInfo();
this.setUserInfo(userInfo);
this.registUser(userInfo);
} else {
this.authmodal = true;
}
}
// 获取活动信息 // 获取活动信息
this.showActivity(); this.showActivity();
// 获取头像安全距离
let statusHeight = this.$app.$options.globalData.statusBarHeight || '';
this.setSafeAreaStyle('top:' + statusHeight + 'px');
this.searchStyle = 'top:' + (statusHeight + 12) + 'px';
wx.showShareMenu({
withShareTicket: false,
menus: ['shareAppMessage', 'shareTimeline']
});
}, },
async onShow() { async onShow() {
const {scene} = wx.getLaunchOptionsSync(); const {scene} = wx.getLaunchOptionsSync();
......
...@@ -3,7 +3,7 @@ import Vuex from '@wepy/x'; ...@@ -3,7 +3,7 @@ import Vuex from '@wepy/x';
export default new Vuex.Store({ export default new Vuex.Store({
state: { state: {
userInfo: { userInfo: {
avatarUrl: '/static/images/user@2x.png' avatarUrl: 'data:image/png;base64,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'
}, },
isConnected: true, isConnected: true,
safeAreaStyle: '' safeAreaStyle: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment