Commit cb98a6a2 authored by wildfirecode13's avatar wildfirecode13

1

parent 10f041a4
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
const g = typeof global !== 'undefined' ? global : self; const g = typeof global !== 'undefined' ? global : self;
g.appXAppJson = { g.appXAppJson = {
"app": { "app": {
"$homepage": "pages/pagehuo_dong_ye/pagehuo_dong_ye" "$homepage": "pages/pageshou_ye/pageshou_ye"
} }
}; };
require('@alipay/appx-compiler/lib/sjsEnvInit'); require('@alipay/appx-compiler/lib/sjsEnvInit');
require('./config$'); require('./config$');
require('../../components/comyou_xi_gui_ze27/comyou_xi_gui_ze27?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../components/comgou_mai_ji_lu32/comgou_mai_ji_lu32?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../components/comgou_mai_ji_lu32/comgou_mai_ji_lu32?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../components/comhui_yuan/comhui_yuan?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../components/comhui_yuan/comhui_yuan?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../components/logisticsModal/logisticsModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../components/logisticsModal/logisticsModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../components/prizeModal/prizeModal?hash=951cb6a7fcdd2a5332763295aa08b4f86b6fd2e1'); require('../../components/prizeModal/prizeModal?hash=951cb6a7fcdd2a5332763295aa08b4f86b6fd2e1');
require('../../components/comyou_xi_gui_ze27/comyou_xi_gui_ze27?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../pages/pageshou_ye/pageshou_ye?hash=f6ca2530b12f33cb12545f5a792a8e73d47ec084');
require('../../pages/pagehuo_dong_ye/pagehuo_dong_ye?hash=90465399d3364a1028b01344ac9aa9dacad0f7e0'); require('../../pages/pagehuo_dong_ye/pagehuo_dong_ye?hash=90465399d3364a1028b01344ac9aa9dacad0f7e0');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/myprize/myprize?hash=74b7edb09b315961bb13059a83b72836912bfd2c'); require('../../pages/myprize/myprize?hash=74b7edb09b315961bb13059a83b72836912bfd2c');
require('../../pages/pageshou_ye/pageshou_ye?hash=f6ca2530b12f33cb12545f5a792a8e73d47ec084');
require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
...@@ -5,9 +5,12 @@ self.__appxInited = 1; ...@@ -5,9 +5,12 @@ self.__appxInited = 1;
require('./config$'); require('./config$');
var AFAppX = self.AFAppX.getAppContext if( navigator.userAgent && (navigator.userAgent.indexOf('LyraVM') > 0 || navigator.userAgent.indexOf('AlipayIDE') > 0) ) {
? self.AFAppX.getAppContext().AFAppX var AFAppX = self.AFAppX.getAppContext ? self.AFAppX.getAppContext().AFAppX : self.AFAppX;
: self.AFAppX; } else {
importScripts('https://appx/af-appx.worker.min.js');
var AFAppX = self.AFAppX;
}
self.getCurrentPages = AFAppX.getCurrentPages; self.getCurrentPages = AFAppX.getCurrentPages;
self.getApp = AFAppX.getApp; self.getApp = AFAppX.getApp;
self.Page = AFAppX.Page; self.Page = AFAppX.Page;
...@@ -29,15 +32,14 @@ if(AFAppX.registerApp) { ...@@ -29,15 +32,14 @@ if(AFAppX.registerApp) {
function success() { function success() {
require('../../app'); require('../../app');
require('../../components/comyou_xi_gui_ze27/comyou_xi_gui_ze27?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../components/comgou_mai_ji_lu32/comgou_mai_ji_lu32?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../components/comgou_mai_ji_lu32/comgou_mai_ji_lu32?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../components/comhui_yuan/comhui_yuan?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../components/comhui_yuan/comhui_yuan?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../components/logisticsModal/logisticsModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../components/logisticsModal/logisticsModal?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43');
require('../../components/prizeModal/prizeModal?hash=951cb6a7fcdd2a5332763295aa08b4f86b6fd2e1'); require('../../components/prizeModal/prizeModal?hash=951cb6a7fcdd2a5332763295aa08b4f86b6fd2e1');
require('../../components/comyou_xi_gui_ze27/comyou_xi_gui_ze27?hash=05d2a9730dd6009bf9446182f9c985f40f8c0f43'); require('../../pages/pageshou_ye/pageshou_ye?hash=f6ca2530b12f33cb12545f5a792a8e73d47ec084');
require('../../pages/pagehuo_dong_ye/pagehuo_dong_ye?hash=90465399d3364a1028b01344ac9aa9dacad0f7e0'); require('../../pages/pagehuo_dong_ye/pagehuo_dong_ye?hash=90465399d3364a1028b01344ac9aa9dacad0f7e0');
require('../../pages/index/index?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/myprize/myprize?hash=74b7edb09b315961bb13059a83b72836912bfd2c'); require('../../pages/myprize/myprize?hash=74b7edb09b315961bb13059a83b72836912bfd2c');
require('../../pages/pageshou_ye/pageshou_ye?hash=f6ca2530b12f33cb12545f5a792a8e73d47ec084');
require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/pagejie_shu_ye/pagejie_shu_ye?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
require('../../pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68'); require('../../pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
} }
......
{ {
"pages": [ "pages": [
"pages/pageshou_ye/pageshou_ye",
"pages/pagehuo_dong_ye/pagehuo_dong_ye", "pages/pagehuo_dong_ye/pagehuo_dong_ye",
"pages/myprize/myprize", "pages/myprize/myprize",
"pages/pageshou_ye/pageshou_ye",
"pages/pagejie_shu_ye/pagejie_shu_ye", "pages/pagejie_shu_ye/pagejie_shu_ye",
"pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1" "pages/pagewo_de_jiang_pin_ye_mian1/pagewo_de_jiang_pin_ye_mian1"
], ],
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<image class="di_kao_bei" src={{resList['66f2b76f-7265-4cb2-9b4d-7e8207ab1d74'].url}} /> <image class="di_kao_bei" src={{resList['66f2b76f-7265-4cb2-9b4d-7e8207ab1d74'].url}} />
<image class="logo" src={{resList['dd7d3a3b-6fcb-427d-8353-da169708bbab'].url}} /> <image class="logo" src={{resList['dd7d3a3b-6fcb-427d-8353-da169708bbab'].url}} />
<image class="tu" src={{resList['41567d28-d1c4-454f-8bb4-4bcb6a103be0'].url}} /> <image class="tu" src={{resList['41567d28-d1c4-454f-8bb4-4bcb6a103be0'].url}} />
<image class="an_niu" onTap="handleStart" src={{resList['9720b3cc-2faa-4bac-8244-d5f0d018a6e7'].url}} /> <image a:if="{{startBtnVisible}}" class="an_niu" onTap="handleStart" src={{resList['9720b3cc-2faa-4bac-8244-d5f0d018a6e7'].url}} />
<image class="wen_an" src={{resList['2a026ac4-0a9c-497b-9469-2da99f935821'].url}} /> <image class="wen_an" src={{resList['2a026ac4-0a9c-497b-9469-2da99f935821'].url}} />
<image class="jiang_pinicon" src={{resList['b7517eae-3bc2-4456-935a-e6e3e1fe995e'].url}} /> <image a:if="{{myPrizeBtnVisible}}" class="jiang_pinicon" src={{resList['b7517eae-3bc2-4456-935a-e6e3e1fe995e'].url}} />
<image class="gui_zeicon" onTap="showRuleModal" src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} /> <image a:if="{{ruleModalBtnVisible}}" class="gui_zeicon" onTap="showRuleModal" src={{resList['d826a2f1-a3ec-4764-aad2-f6cacc43cfce'].url}} />
</view> </view>
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="ruleModalClose"><text>案文文案文案文案文案文案文案文案文案文案文案</text></rule-modal> <rule-modal a:if="{{ruleModalVisible}}" onModalClose="ruleModalClose"><text>案文文案文案文案文案文案文案文案文案文案文案</text></rule-modal>
\ No newline at end of file
...@@ -7,13 +7,19 @@ const { tbcc } = app; ...@@ -7,13 +7,19 @@ const { tbcc } = app;
const { commonToast, getAuthUserInfo, navigateToOutside } = tbcc.tb; const { commonToast, getAuthUserInfo, navigateToOutside } = tbcc.tb;
Page({ Page({
data: { data: {
ruleModalVisible: false ruleModalVisible: false,
myPrizeBtnVisible: false,
startBtnVisible: false,
ruleModalBtnVisible: false
}, },
onLoad(props) { onLoad(query) {
this.setData({ this.setData({
resList: resList resList: resList
}); });
// 页面加载
this.getAuth();
console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
}, },
gotoVipPage() { gotoVipPage() {
API.getVipInfo().then(res => { API.getVipInfo().then(res => {
...@@ -26,12 +32,12 @@ Page({ ...@@ -26,12 +32,12 @@ Page({
handleStart() { handleStart() {
API.submit({grade:1,floor:10}); // API.submit({ grade: 1, floor: 10 });
// console.log('change') console.log('change')
// my.redirectTo({ my.redirectTo({
// url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye'
// }); });
}, },
showRuleModal() { showRuleModal() {
this.setData({ this.setData({
...@@ -43,6 +49,53 @@ Page({ ...@@ -43,6 +49,53 @@ Page({
this.setData({ this.setData({
ruleModalVisible: false ruleModalVisible: false
}) })
},
async init() {
const [activity, vipInfo] = await Promise.all([
API.getActivityBaseInfoById(),
API.getVipInfo(),
]);
vipInfo.isVip = true;
if (vipInfo.isVip && activity.data.isUserJoin) {
my.redirectTo({ url: '/pages/pagehuo_dong_ye/pagehuo_dong_ye' });
} else {
//设置状态
this.setData({
myPrizeBtnVisible: true,
startBtnVisible: true,
ruleModalBtnVisible: true
})
}
},
/**
* 登录接口
*/
async login() {
const { nickName, avatar } = app;
const { success } = await API.login({ userNick: nickName, avatar }).catch(res => {
console.log('登录失败..')
commonToast(res && res.message);
}) || {};
if (success) {
console.log('登录成功,正在初始化')
this.init();
}
},
/**
* 获取用户授权信息
*/
async getAuth() {
const userInfo = await getAuthUserInfo().catch(err => {
console.log('未授权成功', err);
});
if (userInfo) {
console.log('授权成功,userInfo=>', userInfo);
const { nickName, avatar } = userInfo;
app.nickName = nickName;
app.avatar = avatar;
this.login();
}
} }
}); });
\ No newline at end of file
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