1.2.7

app.js

@@ -9,9 +9,21 @@ App({
   },
   getSystemInfo: function () {
     this.globalData.systemInfo = wx.getSystemInfoSync();
+    if (this.globalData.systemInfo.system.indexOf("Android") >= 0) {
+      this.globalData.IsIOS = false;
+      this.globalData.IsAndroid = true;
+    }
+    else if (this.globalData.systemInfo.system.indexOf("iOS") >= 0) {
+      this.globalData.IsIOS = true;
+      this.globalData.IsAndroid = false;
+    }
+
+    if (this.globalData.systemInfo.model.indexOf("iPad") >= 0) {
+      this.globalData.IsIPad = true;
+    }
   },
   globalData: {
-    Version: "1.2.5",
+    Version: "1.2.7",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
@@ -37,6 +49,9 @@ App({
     BaiduToken:"",//百度开发平台token
     IsShow: 0,
     IsLocked: 0,
+    IsIOS: true,
+    IsAndroid: false,
+    IsIPad: false,
     NewUserNumberMax:6,//邀请新用户最大值
     IsSaveCustom:false,//是否保存了定制
     goto:"",//用于服务直达的跳转

app.json

@@ -14,9 +14,9 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#F5E2BE",
-    "navigationBarTitleText":"语文识字",
+    "navigationBarTitleText": "语文识字",
     "navigationBarTextStyle": "black",
-    "backgroundColor": "#F5E2BE"   
+    "backgroundColor": "#F5E2BE"
   },
   "navigateToMiniProgramAppIdList": [
     "wxa5441bbf344692ba",
@@ -58,5 +58,6 @@
         "package4"
       ]
     }
-  }
+  },
+  "sitemapLocation": "sitemap.json"
 }

pages/main/detail.js

@@ -373,15 +373,19 @@ Page({
 
           var Name = this.data.List[this.data.CurrentIndex].Name;
           if (!this.data.IsAudioLengthChecked || (e && e.currentTarget.dataset.pinyin)) {
-            url = url.replace("[word]", Name + pinyinStr);
+            url = url.replace("[word]", e.currentTarget.dataset.pinyin);
             url = url.replace("spd=3", "spd=1");
           }
           else {
             var CombineWords = this.data.List[this.data.CurrentIndex].CombineWords;
-            if (CombineWords)
+            if (CombineWords && CombineWords.length>0){
               CombineWords = "，" + CombineWords.replace(Name, Name + pinyinStr) + "的(de5)" + Name;
-
-            url = url.replace("[word]", Name + pinyinStr + CombineWords + pinyinStr);
+              url = url.replace("[word]", Name + pinyinStr + CombineWords + pinyinStr);
+            }
+            else{
+              url = url.replace("[word]", pinyinItem);
+              url = url.replace("spd=3", "spd=1");
+            }
           }
         }
       }

pages/main/index.js

@@ -22,8 +22,7 @@ Page({
     NavClass2: "nav2",
     IsRemind: false,
     IsMemberForeverRemind: 0,
-  },
-  onReady: function (e) {
+    IsExit: false,
   },
   onLoad: function (options) {
     //app.globalData.userInfo.UserID=5;
@@ -50,6 +49,14 @@ Page({
     })
 
     common.getStorageValue(this, "IsRemind", true, function () { });
+    
+    if (app.globalData.IsIPad) {
+      if (app.globalData.systemInfo.windowHeight < app.globalData.systemInfo.windowWidth) {
+        this.setData({
+          IsExit: true,
+        });
+      }
+    }
   },
   onShow: function () {
     this.setData({

pages/main/index.wxml

@@ -148,4 +148,10 @@
     <image src='../images/home_banner.png' class="home_banner" bindtap='switchProgram' data-appid='{{ListProgram[0].appId}}' data-path='{{ListProgram[0].path}}' />
   </view>
   
+</view>
+
+
+<view wx:if="{{IsExit}}" class="IsExitContainer container FlexColumn" style='height:{{Height}}rpx;'>
+  <view class='IsExitText'>请竖起屏幕再打开小程序</view>
+  <navigator class='isExit' open-type="exit" target="miniProgram">确认</navigator>
 </view>

pages/main/index.wxss

@@ -358,3 +358,25 @@
 }
 
 
+
+.IsExitContainer{
+  background-color: #F5E2BE;
+  z-index: 100;
+  position: fixed;
+  top:0;
+}
+.IsExitText{
+  margin-top: 200rpx;
+  color:#1e1e1e;
+  font-size:36rpx;
+}
+.isExit{
+  border: 1rpx solid #1e1e1e;
+  color:#1e1e1e;
+  border-radius: 10rpx;
+  margin-top: 80rpx;
+  padding: 20rpx;
+  width:100rpx;
+  font-size:36rpx;
+  text-align: center;
+}

project.config.json

@@ -12,6 +12,8 @@
 	"appid": "wx313a8f2c0741efe1",
 	"projectname": "%E8%AF%86%E5%AD%97",
 	"isGameTourist": false,
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
 	"condition": {
 		"search": {
 			"current": -1,

sitemap.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}