From 68f76cd2a8d58ff2ff5a1d0fb35e204a5593ea33 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Thu, 7 Mar 2019 13:10:51 +0800
Subject: [PATCH] =?UTF-8?q?iOS=E4=B8=8A=E5=A2=9E=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=98=BE=E7=A4=BA=E8=B4=AD=E4=B9=B0=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/z-action-sheet.wpy |  6 ++---
 src/mixins/base.js                |  5 ++++
 src/mixins/cfg.js                 | 42 +++++++++++++++++++++++++++----
 src/pages/gameInfo.wpy            |  8 +++---
 src/pages/index.wpy               | 14 ++++++-----
 src/pages/jumppage.wpy            |  2 +-
 6 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/src/components/z-action-sheet.wpy b/src/components/z-action-sheet.wpy
index 87ef483..5727673 100644
--- a/src/components/z-action-sheet.wpy
+++ b/src/components/z-action-sheet.wpy
@@ -12,7 +12,6 @@
     z-index: 101;
   }
   .z-action-sheet {
-    height: 285rpx;
     bottom: 0;
     left: 0;
     right: 0;
@@ -53,7 +52,7 @@
   <view class="z-action-sheet-back {{ config.hide ? 'hidden' : ''}}"></view>
   <view class="z-action-sheet {{ config.hide ? 'hidden' : ''}}">
     <view class="one-line" @tap="goldTap">{{config.goldTitle}}</view>
-    <navigator class="one-line"
+    <navigator class="one-line {{config.showBuy ? '' : 'hidden'}}"
                target="miniProgram"
                open-type="navigate"
                app-id="wx815bf59d472c0a63"
@@ -73,7 +72,8 @@
       config: {
         hide: true,
         goldTitle: '',
-        params: ''
+        params: '',
+        showBuy: false
       }
     }
     data = {
diff --git a/src/mixins/base.js b/src/mixins/base.js
index d27651f..b4a9f30 100644
--- a/src/mixins/base.js
+++ b/src/mixins/base.js
@@ -165,4 +165,9 @@ export default class baseMixin extends wepy.mixin {
       }
     }
   }
+  $isIos() {
+    let info = wepy.getSystemInfoSync();
+    console.log(info);
+    return (info.platform && (/^ios/.test(info.platform.toLowerCase()) || /^devtools/.test(info.platform.toLowerCase())));
+  }
 }
diff --git a/src/mixins/cfg.js b/src/mixins/cfg.js
index d3c49c4..997b2ef 100644
--- a/src/mixins/cfg.js
+++ b/src/mixins/cfg.js
@@ -1,4 +1,4 @@
-import wepy from 'wepy'
+import wepy from 'wepy';
 
 export default class cfgMixin extends wepy.mixin {
   $getShareCfg() {
@@ -10,13 +10,14 @@ export default class cfgMixin extends wepy.mixin {
       return {
         str: '怀旧经典游戏',
         image: 'https://resource.kingsome.cn/dalmatian/wapp/share.jpg'
-      }
+      };
     }
   }
-  $getPrice(name) {
+
+  $getExtCfg(name) {
     let cfgObj = wepy.getStorageSync('cfg');
     let price = cfgObj.ext_json_cfg;
-    let obj = {fc_price: 5, gba_price: 10, ad_price: 3};
+    let obj = { fc_price: 5, gba_price: 10, ad_price: 3 };
     if (price) {
       try {
         obj = JSON.parse(price);
@@ -24,6 +25,37 @@ export default class cfgMixin extends wepy.mixin {
         console.log('parse json error');
       }
     }
-    return obj[name+'_price'];
+    return obj[name];
+  }
+  //是否显示vip购买，游戏页面等信息
+  $showAll() {
+    let cfg = wepy.getStorageSync('cfg');
+    return !cfg ? false : !cfg.hide_main;
+  }
+  /**
+   * 是否显示vip和产品的购买
+   * 1. 如果开启了审核开关(hide_main = true)， 则隐藏所有购买按钮
+   * 2. 如果关闭了审核开关
+   *    a. 如果当前系统为android，则显示购买
+   *    b. ios，则根据ios_buy是否开启，开启的情况下，显示购买。
+   *    c. 未开启ios_buy的情况下，如果已有游戏达到show_count, 则也显示购买
+   * */
+  $showBuy() {
+    if (this.$showAll()) {
+      if (this.$isIos()) {
+        let result = !!this.$getExtCfg('ios_buy');
+        if (!result) {
+          let count = wepy.getStorageSync('game_count') || 0;
+          let countCfg = this.$getExtCfg('show_count') || 0;
+          result = count >= countCfg;
+        }
+        return result;
+      } else {
+        return true;
+      }
+    } else {
+      return false;
+    }
+
   }
 }
diff --git a/src/pages/gameInfo.wpy b/src/pages/gameInfo.wpy
index 07f6ed0..3a09a23 100644
--- a/src/pages/gameInfo.wpy
+++ b/src/pages/gameInfo.wpy
@@ -99,7 +99,8 @@
       zActionSheetCfg: {
         hide: true,
         goldTitle: '金币开通',
-        params: ''
+        params: '',
+        showBuy: false
       },
       vip: false
     };
@@ -136,7 +137,7 @@
         this.zActionSheetCfg.hide = true;
       },
       actionSheetGold() {
-        if (this.score < this.$getPrice(this.record.category)) {
+        if (this.score < this.$getExtCfg(this.record.category+'_price')) {
           this.requestAd('金币不足')
         } else {
           this.buyGame();
@@ -188,11 +189,12 @@
       this.showAll = !cfg ? false : !cfg.hide_main;
       this.getUserInfo();
       this.vip = this.$parent.isVip();
+      this.zActionSheetCfg.showBuy = this.$showBuy();
       this.$apply();
     }
     async showBuyMenu() {
       this.zActionSheetCfg.params = `token=${this.$parent.getGlobalDate('gameToken')}&gid=${this.id}`;
-      this.zActionSheetCfg.goldTitle = `金币开通(${this.$getPrice(this.record.category)})`;
+      this.zActionSheetCfg.goldTitle = `金币开通(${this.$getExtCfg(this.record.category + '_price')})`;
       this.zActionSheetCfg.hide = false;
     }
     playGame(multip) {
diff --git a/src/pages/index.wpy b/src/pages/index.wpy
index f896d45..6b00ce4 100644
--- a/src/pages/index.wpy
+++ b/src/pages/index.wpy
@@ -11,7 +11,7 @@
           <view class="vip-view {{showAll? '' : 'hidden'}}">
             <image src="{{vipImg}}"></image>
             <text class="vip-expire-txt">{{expire_str}}</text>
-            <navigator class="vip-btn zan-btn zan-btn--mini zan-btn--primary zan-btn--plain button-hover {{vip_btn_title ? '' : 'hidden'}}"
+            <navigator class="vip-btn zan-btn zan-btn--mini zan-btn--primary zan-btn--plain button-hover {{showBuy ? '' : 'hidden'}}"
                        target="miniProgram"
                        open-type="navigate"
                        app-id="wx815bf59d472c0a63"
@@ -87,7 +87,8 @@
       expire_str: '',
       vipImg: image.vip_s,
       vip_btn_title: '激活',
-      vip_params: ''
+      vip_params: '',
+      showBuy: false
     };
 
     methods = {
@@ -147,8 +148,8 @@
         this.getUserInfo();
       })
       jcEvent.on(jcEvent.events.NEED_UPDATE_CFG, this, data => {
-        let cfg = wepy.getStorageSync('cfg');
-        this.showAll = !cfg ? false : !cfg.hide_main;
+        this.showAll = this.$showAll();
+        this.showBuy = !!this.vip_btn_title && this.$showBuy();
         this.$apply();
       })
       jcEvent.on(jcEvent.events.BUY_VIP_RESULT, this, data => {
@@ -200,7 +201,7 @@
       if (!cfg._getrewardtype) {
         wepy.hideShareMenu();
       }
-      this.showAll = !cfg ? false : !cfg.hide_main;
+      this.showAll = this.$showAll();
       let userInfo = this.$parent.getUserInfo();
       console.log(userInfo);
       if (userInfo) {
@@ -241,6 +242,7 @@
         this.my_game_list = res.records;
         this.showMyGame = this.my_game_list.length > 0;
         this.$apply();
+        wepy.setStorageSync('game_count', this.my_game_list.length);
       } catch (err) {
         console.log('error get recent games');
       }
@@ -271,7 +273,7 @@
             this.vip_btn_title = '激活';
             this.vipImg = image.vip_s;
           }
-
+          this.showBuy = !!this.vip_btn_title && this.$showBuy();
         }
 
         this.$apply();
diff --git a/src/pages/jumppage.wpy b/src/pages/jumppage.wpy
index 35f1372..d75aeee 100644
--- a/src/pages/jumppage.wpy
+++ b/src/pages/jumppage.wpy
@@ -107,7 +107,7 @@
     onLoad(params) {
       this.text = decodeURIComponent(params.text);
       this.aid = decodeURIComponent(params.aid);
-      this.ad_price = this.$getPrice('ad');
+      this.ad_price = this.$getExtCfg('ad_price');
       console.log(`aid : ${this.aid}`);
       let self = this;
       this.$parent.getShareCount(count => {