1.1.10

app.js

@@ -26,8 +26,8 @@ App({
     }
   },
   globalData: {
-    version: "1.1.9",
-    IsProduction: false,
+    version: "1.1.10",
+    IsProduction: true,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",
     ProgramName: "数学计算题",

app.json

@@ -17,6 +17,7 @@
     "navigationBarTitleText": "数学计算题",
     "navigationBarTextStyle": "black",
     "backgroundColor": "#000000",
+    "resizable": false,
     "enablePullDownRefresh": false
   },
   "navigateToMiniProgramAppIdList": [

pages/main/default.js

@@ -6,6 +6,7 @@ var code;
 var imageIndex = 0;
 var arrBuildImageSource = [];
 var arrBuildImageTarget = [];
+var isMiaoguoADShow = false;
 
 Page({
   data: {
@@ -16,6 +17,8 @@ Page({
     AvatarUrl: "",
     IsAccredit: false,
     IsExit: false,
+    IsMiaoguoAD: false,
+    IsMiaoguoAD2: 0,
   },
   onLoad: function () {
     var that = this;
@@ -39,6 +42,7 @@ Page({
       }
     }
 
+    isMiaoguoADShow = false;
   },
   onUnload: function () {
 
@@ -86,6 +90,21 @@ Page({
       }
     });
 
+    common.getStorageValue(this, "IsMiaoguoAD", true, function () { });
+
+    var miaoguoADTime = wx.getStorageSync("miaoguoADTime");
+    if (miaoguoADTime) {
+      if (this.data.IsShow == 1 && this.data.IsMember == 1 && isMiaoguoADShow && common.formatTime(new Date()) >= miaoguoADTime) {
+        this.setData({
+          IsMiaoguoAD2: 1,
+        });
+      }
+    }
+    else {
+      wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 1, new Date())));
+    }
+
+    isMiaoguoADShow = true;
   },
   downloadUserAvatar: function () {
     var avatar = wx.getStorageSync("Avatar");
@@ -118,6 +137,14 @@ Page({
     wx.navigateTo({
       url: url
     });
+
+    if (e.currentTarget.dataset.id == "topAD") {
+      this.setData({
+        IsMiaoguoAD2: 0,
+      });
+      wx.setStorageSync('IsMiaoguoAD', false);
+      wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 15, new Date())));
+    }
   },
   gotoHelp: function () {
     wx.redirectTo({
@@ -220,6 +247,17 @@ Page({
     });
 
   },
+  close: function (e) {
+    this.setData({
+      IsMiaoguoAD2: 0,
+    });
+    var num = e.currentTarget.dataset.num;
+    if (num > 0) {
+      var time = common.addDate("d", Number(num), new Date());
+      time = common.formatTime(time);
+      wx.setStorageSync("miaoguoADTime", time);
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/default.wxml

@@ -1,11 +1,13 @@
 <view class="container FlexColumn" style="min-height:{{Containnerheight}}rpx;">
-  <scroll-view class="scroll-view_H" scroll-x>
-    <image class="homepage_headline_illus" src="../images/homepage_headline_illus.png" />
-    <scroll-view scroll-y class="scrollview">
-      <image class="homepage_headline_info" src="../images/homepage_headline_info.png" />
+  <view class="index0 FlexColumn">
+    <image src='../images/home_banner_header_jst.png' class="home_banner_header_sz" bindtap='goto' data-id="topAD" data-url='../../package4/main/newuser' wx:if="{{IsMiaoguoAD && IsMember==1 && IsShow==1}}" />
+    <scroll-view class="scroll-view_H" scroll-x>
+      <image class="homepage_headline_illus" src="../images/homepage_headline_illus.png" />
+      <scroll-view scroll-y class="scrollview">
+        <image class="homepage_headline_info" src="../images/homepage_headline_info.png" />
+      </scroll-view>
     </scroll-view>
-  </scroll-view>
-
+  </view>
   <view class="panel FlexColumn">
 
     <view class="line1"></view>
@@ -49,14 +51,14 @@
               </view>
               <view class="line4 line3"></view>
               <view class="panel002000 FlexRow">
-                <view class="btn" bindtap='gotoErrorList'>
-                  <view class="btn1">
+                <view class="btn0" bindtap='gotoErrorList'>
+                  <view class="btn10">
                     错题集
                   </view>
                 </view>
 
-                <view class="btn2 btn" bindtap='gotoAnswer'>
-                  <view class="btn3 btn1">
+                <view class="btn20 btn0" bindtap='gotoAnswer'>
+                  <view class="btn3 btn10">
                     对答案
                   </view>
                 </view>
@@ -75,9 +77,6 @@
 
         </view>
         <image class="universalpic_line_zigzag_brown_down" src="../images/universalpic_line_zigzag_brown_down.png" />
-
-        <image wx:if="{{IsShow==1}}" src='../images/homepage_banner.png' class="homepage_banner" bindtap='goto' data-url="../../package4/main/newuser" />
-
         <image class="universalpic_line_zigzag_brown_up" src="../images/universalpic_line_zigzag_brown_up.png" />
         <view class="panel003 circularBottom FlexColumn">
           <view class="panel0030 FlexRow">
@@ -91,8 +90,8 @@
                 <view bindtap='gotoFeedback'>合作</view>
               </view>
             </view>
-            <button class="btn4 btn" open-type="share">
-              <view class="btn5 btn1 FlexColumn">
+            <button class="btn4 btn0" open-type="share">
+              <view class="btn5 btn10 FlexColumn">
                 <image class="universalpic_share_size01" src="../images/universalpic_share_size01.png" />
                 <view>分享</view>
               </view>
@@ -116,14 +115,34 @@
               <view class="line"></view>
 
             </block>
+            <view class="index5 FlexColumn" wx:if="{{IsShow==1}}">
+              <image src='../images/home_banner_footer600.png' class="home_banner" bindtap='goto' data-url='../../package4/main/newuser' />
+            </view>
           </view>
         </view>
+
+        <view style="height:100rpx;width:100%"></view>
       </view>
     </view>
   </view>
 </view>
 <image hidden="{{HelpHidden1}}" bindtap='closeHelp' class="Help_aside_homepage" src="../images/Help_aside_homepage.png" />
 
+<view class="HelpInfo2 FlexColumn" style='height:{{Containnerheight}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
+  <view class="btn" bindtap='goto' data-url='../../package4/main/newuser' data-id="topAD">
+    <view class="btn1 FlexColumn">
+      <image src='../images/home_banner_window.png' class="home_banner_window" />
+      <view class="btn2">了解一下</view>
+    </view>
+  </view>
+  <view class="close2 FlexColumn" bindtap='close' data-num="1">
+    以后再看
+  </view>
+  <view class="close FlexColumn" bindtap='close' data-num="0">
+    <image src='../images/02024.png' class="closeImage" />
+  </view>
+</view>
+
 <audio hidden='true' id="myAudio"></audio>
 <canvas class='Canvas' canvas-id="MyCanvas"></canvas>
 

pages/main/default.wxss

@@ -1,9 +1,20 @@
+page{
+  background-color: #583027;
+}
 .container {
   background-color: #583027;
   justify-content: flex-start;
   font-weight: 500;
 }
 
+.index0{
+  width:100%;
+}
+.home_banner_header_sz{
+  width:100%;
+  height:150rpx;
+}
+
 .scroll-view_H {
   width: 100%;
   height: 460rpx;
@@ -31,7 +42,6 @@
 .panel {
   width: 100%;
   background-color: #583027;
-  height: 2654rpx;
   justify-content: flex-start;
 }
 
@@ -58,7 +68,6 @@
 
 .panel00 {
   width: 680rpx;
-  height: 2534rpx;
   justify-content: flex-start;
 }
 
@@ -220,7 +229,7 @@
   font-weight: 600;
 }
 
-.btn {
+.btn0 {
   width: 208rpx;
   height: 90rpx;
   background-color: #98492F;
@@ -231,11 +240,11 @@
 }
 
 
-.btn::after {
+.btn0::after {
   border: 0px;
 }
 
-.btn1 {
+.btn10 {
   width: 100%;
   height: 70rpx;
   background-color: #D0603B;
@@ -246,7 +255,7 @@
   font-size: 32rpx;
 }
 
-.btn2 {
+.btn20 {
   background-color: #315982;
   margin-left: 14rpx;
 }
@@ -291,7 +300,6 @@
 
 .panel003 {
   width: 100%;
-  height: 1050rpx;
   background-color: #723c30;
   box-shadow: 0px 10px 0px rgba(0, 0, 0, 0.10);
   color: #edc1b4;
@@ -489,4 +497,89 @@
   width:100rpx;
   font-size:36rpx;
   text-align: center;
-}
+}
+
+
+.index5{
+  width:100%;
+  justify-content: flex-start;
+}
+
+.home_banner{
+   width:600rpx;
+   height:320rpx;
+   margin: 40rpx 0 50rpx 0;
+}
+
+.HelpInfo2 {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  background-color: rgba(185, 220, 93, 0.95);
+  justify-content: flex-start;
+  z-index: 100;
+}
+
+.HelpInfo2 .btn {
+  width: 600rpx;
+  height: 640rpx;
+  background-color: #D2D2D2;
+  border-radius: 40rpx;
+  margin: 15rpx;
+  position: relative;
+  margin-top: 222rpx;
+  box-shadow: 0 0 30rpx rgba(0, 0, 0, 0.5);
+}
+
+.HelpInfo2 .btn1 {
+  width: 100%;
+  height: 640rpx;
+  border-radius: 40rpx;
+  color: #1e1e1e;
+  text-align: center;
+  font-size: 36rpx;
+  justify-content: flex-start;
+}
+
+.HelpInfo2 .home_banner_window {
+  width: 600rpx;
+  height: 500rpx;
+  border-top-left-radius: 40rpx;
+  border-top-right-radius: 40rpx;
+}
+
+.HelpInfo2 .btn2 {
+  width: 100%;
+  height: 120rpx;
+  line-height: 120rpx;
+  background-color: #F0F0F0;
+  color: #1e1e1e;
+  text-align: center;
+  font-size: 48rpx;
+  font-weight: 500;
+  border-bottom-left-radius: 40rpx;
+  border-bottom-right-radius: 40rpx;
+}
+.HelpInfo2 .close2 {
+  position: fixed;
+  bottom:207rpx;
+  font-size:26rpx;
+  color: #1e1e1e;
+  text-decoration: underline;
+  font-weight: 500;
+  z-index: 100;
+  width:100%;
+  height:50rpx;
+}
+.HelpInfo2 .close {
+  width: 100%;
+  height: 235rpx;
+  position: fixed;
+  bottom:0;
+}
+
+.HelpInfo2 .closeImage{
+  width:33rpx;
+  height:33rpx;
+}

utils/util.js

@@ -303,6 +303,51 @@ function FormatMoney(money) {
   return result;
 }
 
+
+function addDate(interval, number, date) {
+  switch (interval.toLowerCase()) {
+    case "y":
+      return new Date(date.setFullYear(date.getFullYear() + number));
+    case "m":
+      return new Date(date.setMonth(date.getMonth() + number));
+    case "d":
+      return new Date(date.setDate(date.getDate() + number));
+    case "w":
+      return new Date(date.setDate(date.getDate() + 7 * number));
+    case "h":
+      return new Date(date.setHours(date.getHours() + number));
+    case "n":
+      return new Date(date.setMinutes(date.getMinutes() + number));
+    case "s":
+      return new Date(date.setSeconds(date.getSeconds() + number));
+    case "l":
+      return new Date(date.setMilliseconds(date.getMilliseconds() + number));
+  }
+}
+
+function diffDate(interval, date1, date2) {
+  var long = date2.getTime() - date1.getTime(); //相差毫秒
+  switch (interval.toLowerCase()) {
+    case "y":
+      return parseInt(date2.getFullYear() - date1.getFullYear());
+    case "m":
+      return parseInt((date2.getFullYear() - date1.getFullYear()) * 12 + (date2.getMonth() - date1.getMonth()));
+    case "d":
+      return parseInt(long / 1000 / 60 / 60 / 24);
+    case "w":
+      return parseInt(long / 1000 / 60 / 60 / 24 / 7);
+    case "h":
+      return parseInt(long / 1000 / 60 / 60);
+    case "n":
+      return parseInt(long / 1000 / 60);
+    case "s":
+      return parseInt(long / 1000);
+    case "l":
+      return parseInt(long);
+  }
+}
+
+
 module.exports = {
   formatTime: formatTime,
   formatDateCHS: formatDateCHS,
@@ -323,4 +368,6 @@ module.exports = {
   getStorageValue: getStorageValue,
   getSystemHeight: getSystemHeight,
   FormatMoney: FormatMoney,
+  addDate: addDate,
+  diffDate: diffDate,
 }