Merge branch 'release/dev/2.0.0' into release/2.0.0

api/login.js

 let lock = false;
+import { alertOnce } from './xFetch';
+
 export default async function login() {
   if (lock == true) {
     await waitLockRelease(50);
@@ -35,6 +37,8 @@ export default async function login() {
               });
               lock = false;
               resolve(res)
+            } else if (res.data.code == 10200) {
+              alertOnce('应用正在开通中，请稍后再试', reject, { code: 10200 });
             } else {
               lock = false;
               reject(res.data);

api/xFetch.js

@@ -31,8 +31,6 @@ export default function xFetch({ url, method, data, type }) {
                 } else {
                     if (res.data.code == 401) {
                         login();
-                    } else if (res.data.code == 10200) {
-                        alertOnce('应用正在开通中，请稍后再试', rejects, { refresh: false });
                     } else {
                         alertOnce(res.data.msg || '请求异常，请重试', rejects, res);
                     }
@@ -54,7 +52,7 @@ export default function xFetch({ url, method, data, type }) {
 }
 
 let alert = false;
-function alertOnce(content, rejects, err) {
+export function alertOnce(content, rejects, err) {
     if (alert == false) {
         dd.alert({
             content: content,

pages/index/index.axml

 <import src="../../template/loading/loading.axml"/>
 <import src="../../template/fullScreen/fullScreen.axml"/>
 <import src="../../template/refresh/index.axml"/>
-<template is="refresh" a:if='{{refresh}}' ></template>
+<template is="refresh" a:if='{{refresh}}' data="{{refreshCode}}"></template>
 <block a:else>
   <view hidden="{{$data.tabBarIndex === '1'}}">
     <import src="../../template/affairBlank/index.axml"/>

pages/index/index.js

@@ -289,7 +289,8 @@ create.Page({
       if (err && err.refresh) {
         this.setData({
           loading: false,
-          refresh: true
+          refresh: true,
+          refreshCode: 10200
         });
       }
     });

template/refresh/index.axml

 <template name="refresh">
     <view class="refresh-bg">
-        <view>您的网络好像不给力，请重试</view>
+        <view a:if="{{refreshCode}}">应用正在开通中，请稍后再试</view>
+        <view a:else>您的网络好像不给力，请重试</view>
         <button class="btn refresh-btn" onTap="refresh">刷新</button>
     </view>
 </template>
\ No newline at end of file