Commit 0e09ffc8 by fengzhaoyu

Merge branch 'dev' into release/1.0.0

parents 8fd89f52 ad210a73
import { setGlobalStore } from "dd-store";
import exampleStore from "./stores/exampleStore";
import { checkFullScren } from "./utils/checkFullScren";
setGlobalStore(exampleStore);
import login from "./api/login";
......@@ -9,14 +8,12 @@ App({
// 第一次打开
// options.query == {number:1}
login();
this.globalData.isFullScren = checkFullScren;
},
onShow(options) {
// 从后台被 scheme 重新打开
// options.query == {number:1}
},
globalData: {
isFullScren: false,
loading: false,
token: "",
avatar: "",
......
......@@ -148,5 +148,5 @@
<text class="iconfont iconicon_add1"></text>
</view>
</view>
<template is="fullScreen" data="{{isIPX:isFullscreen}}" />
<template is="fullScreen" data="{{isIPX:isIPX}}" />
</view>
\ No newline at end of file
......@@ -19,6 +19,7 @@ import {
padZero,
getCreateShowTime
} from "../../utils/utils";
import { checkFullScren } from "../../utils/checkFullScren";
const currentDate = new Date();
const minYear = 2020;
const maxYear = currentDate.getFullYear() + 1;
......@@ -44,7 +45,7 @@ create.Page({
current: 1,
pages: 1,
listLoading: true,
isFullscreen: false
isIPX: checkFullScren()
},
scrollTop: 0,
pageSize: 10,
......@@ -96,9 +97,6 @@ create.Page({
)}`
});
}
this.setData({
isFullscreen: getApp().globalData.isFullscreen
});
dd.setNavigationBar({
title: "动态"
});
......
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