1.1.5

app.js

@@ -11,7 +11,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.1.3",
+    Version: "1.1.5",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",

pages/about/payfinished.js

@@ -37,6 +37,16 @@ Page({
       Text3: text3,
       OrderType: options.type,
     });
+
+    //适配ipad
+    var systemInfo = wx.getSystemInfoSync();
+    if (systemInfo.model) {
+      if (systemInfo.model.indexOf("iPad") >= 0) {
+        this.setData({
+          ipad: "ipad",
+        })
+      }
+    }
   },
   onUnload: function () {
     wx.reLaunch({

pages/about/payfinished.wxml

@@ -14,7 +14,7 @@
     </view>
   </block>
   
-  <view class="line2"></view>
+  <view class="line2 {{ipad}}"></view>
   <text class="text3">{{Text3}}</text>
 
 </view>

pages/about/payfinished.wxss

@@ -24,6 +24,7 @@
   font-size:44rpx;
   text-align: center;
   margin-top: 10rpx;
+  z-index: 10;
 }
 
 
@@ -57,6 +58,11 @@
   z-index: 10;
 }
 
+
+.ipad{
+  margin-top:140rpx;
+}
+
 .text3{
   font-size:22rpx;
   width:560rpx; 

pages/index/index.js

@@ -48,6 +48,15 @@ Page({
     });
 
     this.getUserInfo();
+
+    var systemInfo = wx.getSystemInfoSync();
+    if (systemInfo.model) {
+      if (systemInfo.model.indexOf("iPad") >= 0) {
+        this.setData({
+          ipad: "ipad",
+        })
+      }
+    }
   },
   //得到用户信息
   getUserInfo: function (cb) {

pages/index/index.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
-  <view class="index1 FlexRow">
+  <view class="index1 FlexRow {{ipad}}">
     <image src='../../images/01001.png' class="image01001" />
   </view>
   <view class="index2 FlexRow">

pages/index/index.wxss

@@ -12,6 +12,10 @@
   width:100%;
 }
 
+.ipad {
+  top: 78rpx;
+}
+
 .image01001 {
   width: 462rpx;
   height: 516rpx;

pages/main/detail.js

@@ -21,7 +21,7 @@ Page({
     IntervalSecondIndex: 2,//播放间隔秒数索引
     IsImageError: false,
     SpeakerArray: [{ name: "温柔姐姐(推荐)", value: "woman", isShow: true }, { name: "爽朗哥哥", value: "man", isShow: false }, { name: "古韵叔叔", value: "oldman", isShow: false }, { name: "可爱妹妹", value: "sister", isShow: false }],
-
+    pinyinCss:"",
   },
   onLoad: function (options) {
     var bookID = options.bookid || 0;
@@ -98,6 +98,15 @@ Page({
     if (this.data.WordType == "normal")
       this.submitData();
 
+    var systemInfo = wx.getSystemInfoSync();
+    if (systemInfo.model) {
+      if (systemInfo.model.indexOf("iPad") >= 0) {
+        this.setData({
+          pinyinCss:"pinyinCssIpad",
+        })
+      }
+    }
+
   },
   onShow: function (e) {
     if (app.globalData.IsSaveCustom) {

pages/main/detail.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
   <view class="main FlexColumn" bindtap='playAudio' data-click="true">
     <block wx:if="{{CurrentIndex<List.length-1}}">
-      <view class="pinyin">
+      <view class="pinyin {{pinyinCss}}">
         <block wx:if="{{ShowPinyin}}">
           {{List[CurrentIndex].Pinyin}}
         </block>

pages/main/detail.wxss

@@ -76,6 +76,10 @@
   height:110rpx;
 }
 
+.main .pinyinCssIpad{
+  margin-top: 112rpx;
+}
+
 .main .wordImage{
   margin-top: 40rpx;
   margin-right: 10rpx;

pages/main/index.wxml

@@ -52,6 +52,16 @@
             </view>
           </view>
         </view>
+        <view class="btn" bindtap="goto" data-id="5">
+          <view class="btn1">
+            <view class="panel1 FlexRow">
+              <image src='../../images/02031.png' class="img" />
+            </view>
+            <view class="panel2 FlexRow">
+              <image src='../../images/02032.png' class="img2" />
+            </view>
+          </view>
+        </view>
       </view>
     </view>
     <view class="index7 FlexRow">

pages/main/index.wxss

@@ -64,7 +64,7 @@
 
 .index2{
   width:100%;
-  height:1038rpx;
+  height:1486rpx;
   background-color: #DFC7A4;
   justify-content: flex-start;
 }

pages/main/list.js

@@ -76,9 +76,14 @@ Page({
         break;
       }
     }
+    var imgNum = this.data.BookID;
+    if (imgNum==5)
+      imgNum="11";
+    else
+      imgNum="0"+imgNum;
     this.setData({
       List: result.Units,
-      topImage: "../../images/0400" + this.data.BookID + ".png"
+      topImage: "../../images/040" + imgNum + ".png"
     });
     wx.setNavigationBarTitle({
       title: result.Name,