1.2.22

app.js

@@ -1,16 +1,14 @@
-//app.js
 App({
-
   globalData: {
-    Version: "1.2.21",
+    Version: "1.2.22",
     IsProduction: true,
     //IsProduction: false,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
-    ProgramName: "语文识字",
+    ProgramName: "秒过识字",
     ShareTitle:"赢在阅读起跑线",
     SharePath: "pages/index/index",
-    ShareImage: "../../pages/images/07001.png",
+    ShareImage: "../../pages/images/program_share-a01.png",
     userInfo: null,
     fileUrl: "https://www.kylx365.com/",
     serverUrl: "https://www.kylx365.com/apiData/",

app.json

@@ -14,7 +14,7 @@
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#F5E2BE",
-    "navigationBarTitleText": "语文识字",
+    "navigationBarTitleText": "秒过识字",
     "navigationBarTextStyle": "black",
     "resizable": false,
     "backgroundColor": "#F5E2BE"

pages/index/index.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "语文识字",
+  "navigationBarTitleText": "秒过识字",
   "enablePullDownRefresh": false
 }

pages/main/detail.js

@@ -62,7 +62,6 @@ Page({
       IsAudioLengthChecked: true,//显示组词播放音
       WordType: options.Type,
     });
-
     var that = this;
     common.getStorageValue(that, "IsAutoPlay", true, function () {
       common.getStorageValue(that, "IsAutoPage", false, function () {
@@ -107,18 +106,6 @@ Page({
         })
       }
     }
-
-    common.getStorageValue(this, "IsShare", 0, function () {
-      if (that.data.IsShare == 0
-        && app.globalData.userInfo.IsMember == 0
-        && app.globalData.userInfo.IsShow == 1
-        && app.globalData.IsLocked == 1
-      ) {
-        wx.navigateTo({
-          url: '../../package4/main/share',
-        })
-      }
-    });
   },
   onShow: function (e) {
     if (app.globalData.IsSaveCustom) {

pages/main/index.js

@@ -9,7 +9,6 @@ var isMiaoguoADShow=false;
 
 Page({
   data: {
-    Version: app.globalData.Version,
     List: [
       {
         ImageUrl: "home_plate_11.png",
@@ -43,6 +42,9 @@ Page({
         ImageUrl: "home_plate_42.png",
         Url: "../main/list?id=8",
       },
+      {
+        IsAd:1,
+      },
       {
         ImageUrl: "home_plate_51.png",
         Url: "../main/list?id=9",
@@ -71,7 +73,9 @@ Page({
     IsMemberForeverRemind: 0,
     IsMiaoguoAD: false,
     IsMiaoguoAD2:0,
-    IsShowGift:0,
+    IsShowGift:0,  
+    ProgramName:app.globalData.ProgramName,
+    version: app.globalData.Version,
   },
   onLoad: function (options) {
     //app.globalData.userInfo.UserID=5;
@@ -81,9 +85,6 @@ Page({
       IsShowGift:app.globalData.userInfo.IsShowGift,
     });
 
-    var that = this;
-   
-    isMiaoguoADShow = false;
   },
   onShow: function () {
     this.setData({
@@ -106,27 +107,6 @@ Page({
       });
       app.globalData.goto = "";
     }
-    
-    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;
-
-    if (app.globalData.IsShowMiaoguo){
-      this.setData({
-        IsShowMiaoguo:1,
-      });
-      app.globalData.IsShowMiaoguo=false;
-    }
   },
   getData: function () {
     var that = this;
@@ -205,15 +185,6 @@ Page({
       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())));
-    }
-
-    app.globalData.userInfo.IsShowGift=0;
   },
   gotoSearch: function (e) {
     wx.navigateTo({
@@ -221,16 +192,9 @@ Page({
     });
   },
   gotoReview: function () {
-    if (this.data.IsShow == 1 && this.data.IsMember == 0) {
-      wx.navigateTo({
-        url: '../../package4/main/buyad',
-      })
-    }
-    else {
-      wx.navigateTo({
-        url: '../main/review',
-      });
-    }
+    wx.navigateTo({
+      url: '../main/review',
+    });
   },
   gotoTest: function (e) {
     wx.navigateTo({
@@ -285,19 +249,6 @@ Page({
     }
     app.globalData.userInfo.IsShowGift=0;
   },
-  showMiaoguo:function(){
-    this.setData({
-      IsShowMiaoguo: 1,
-      IsMiaoguoAD2: 0,
-    });
-    app.globalData.userInfo.IsShowGift=0;
-    wx.setStorageSync("miaoguoADTime", common.formatTime(common.addDate("d", 15, new Date())));
-  },
-  closeMiaoguo:function(){
-    this.setData({
-      IsShowMiaoguo: 0,
-    });
-  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/index.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "课程",
+  "navigationBarTitleText": "秒过识字",
   "enablePullDownRefresh": false
 }

pages/main/index.wxml

@@ -1,37 +1,31 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
-
   <view class="panelTop FlexRow">
-    <view class="Avatar FlexColumn">
-      <image src='../images/userface_default.png' class="AvatarImage" bindtap="gotoMemberCenter">
-      </image>
-      <image src='{{AvatarUrl}}' class="AvatarImage1" bindtap="gotoMemberCenter">
-      </image>
-    </view>
-
+    <image src='../images/sz_home_01.png' class="home_header_bg" />
     <view class="panelTop1 FlexColumn">
       <view class="number" wx:if="{{!IsAccredit}}">-</view>
       <view class="number" wx:if="{{IsAccredit}}">{{DayNumber}}</view>
       <view class="panelTop11 FlexRow">持续天数</view>
     </view>
-    <view class="panelTop1 FlexColumn">
+    <view class="panelTop1 panelTop1_1 FlexColumn">
       <view class="number" wx:if="{{!IsAccredit}}">-</view>
       <view class="number" wx:if="{{IsAccredit}}">{{FinishedCount}}</view>
       <view class="panelTop11 FlexRow">已学章节</view>
     </view>
-    <view class="panelTop1 FlexColumn">
+    <view class="panelTop1 panelTop1_2 FlexColumn">
       <view class="number" wx:if="{{!IsAccredit}}">-</view>
       <view class="number" wx:if="{{IsAccredit}}">{{HanziNumber}}</view>
       <view class="panelTop11 FlexRow">总共识字</view>
     </view>
-    <image src='../images/home_header_bg.png' class="home_header_bg" />
-  </view>
-  <view class="panelTop2 FlexRow" wx:if="{{IsMember==0 && IsShow==1}}" bindtap="goto" data-url="../../package4/main/buyad">
-    <view class="panelTop21">帐户已过期，点这里升级到正式版</view>
   </view>
+  <view style="height:210rpx;"></view>
   <view class="panelList FlexRow">
-    <view class="panelItem btn FlexColumn" wx:for="{{List}}" wx:key="*this">
-      <image src='../images/{{item.ImageUrl}}' bindtap="goto" data-url="{{item.Url}}" class="itemImg" />
-    </view>
+    <block wx:for="{{List}}" wx:key="*this" >
+      <view class="panelItem btn FlexColumn" wx:if="{{!item.IsAd}}">
+        <image src='../images/{{item.ImageUrl}}'  bindtap="goto" data-url="{{item.Url}}" class="itemImg" />
+      </view>
+      <view class="panelItemAD" wx:if="{{false}}"></view>
+    </block>
+   
     <view class="panelTool FlexColumn">
       <view class="panelTool1">自测工具</view>
       <view class="panelTool2 FlexRow">
@@ -47,131 +41,72 @@
         </view>
       </view>
     </view>
-
-    <image src='../images/png02016.png' class="png02016" />
-
-    <block wx:if="{{IsShow==1}}">
-      <view class="panelOther FlexRow">
-        <view class="panelOther1">其它产品</view>
-        <image src='../images/home_triangle_up.png' class="home_triangle_up" />
-      </view>
-
-    </block>
   </view>
 
   <block wx:if="{{IsShow==1}}">
+    <view class="panelOther0"></view>
+    <view class="panelOther FlexColumn">
+      <view class="panelOther1">秒过系列</view>
+      <view class="panelOther2">辅助各年龄段的练习小程序</view>
+      <image src='../images/cpxl_pic_01.png' class="home_triangle_up" />
+    </view>
     <view class="panelProduct FlexColumn">
-      <view class="panelProduct10 panelProduct0 FlexColumn">
-        <view class="panelProduct1">全科练习</view>
-        <view class="panelProduct3 FlexRow" bindtap="showMiaoguo">
-          <image src='../images/sofewareicon_mg.png' class="sofewareicon_mg" />
-          <view class="panelProduct31 FlexColumn">
-            <view class="panelProduct311">秒过</view>
-            <view class="panelProduct312">基础知识记忆工具</view>
+        <image src="../images/cpxl_t01.png" class="cpxl_t01"></image>
+        <view class="panelProduct1 FlexRow">
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wxa5e33c61fe37dd01">
+            <image src="../images/cpxl_logo_01.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">注意力</view>
+            <view class="panelProduct112">好玩的注意力训练工具</view>
+            <view class="panelProduct113">免费</view>
+          </view>
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wxb54a6d5aff836ee3">
+            <image src="../images/cpxl_logo_02.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">英语自然拼读</view>
+            <view class="panelProduct112">词汇大全+点读练习</view>
+            <view class="panelProduct113">免费</view>
           </view>
         </view>
-      </view>
-
-      <view class="panelProduct1">单科练习</view>
-      <view class="panelProduct10 FlexRow" style="width:100%;">
-        <view class="panelProduct0 FlexColumn">
-          <view class="panelProduct2">数学</view>
-          <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wxa5441bbf344692ba'>
-            <image src='../images/sofewareicon_ks.png' class="sofewareicon_mg" />
-            <view class="panelProduct31 FlexColumn">
-              <view class="panelProduct311">口算星球</view>
-              <view class="panelProduct312">好玩的口算敏捷练习</view>
-            </view>
+        <image src="../images/cpxl_t02.png" class="cpxl_t01 cpxl_t02"></image>
+        <view class="panelProduct1 panelProduct100 FlexRow">
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wxa5441bbf344692ba">
+            <image src="../images/cpxl_logo_03.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">练口算</view>
+            <view class="panelProduct112">好玩的口算敏捷训练</view>
           </view>
-          <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx1fef080f74481cbd'>
-            <image src='../images/sofewareicon_jst.png' class="sofewareicon_mg" />
-            <view class="panelProduct31 FlexColumn">
-              <view class="panelProduct311">计算题打印</view>
-              <view class="panelProduct312">打印竖式横式计算题</view>
-            </view>
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wx1fef080f74481cbd">
+            <image src="../images/cpxl_logo_04.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">练笔算</view>
+            <view class="panelProduct112">竖式计算题出题+打印</view>
           </view>
         </view>
-        <view class="panelProduct0 FlexColumn">
-          <view class="panelProduct2">语文</view>
-          <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx331e8dd070f01d0e'>
-            <image src='../images/sofewareicon_py.png' class="sofewareicon_mg" />
-            <view class="panelProduct31 FlexColumn">
-              <view class="panelProduct311">汉语拼音</view>
-              <view class="panelProduct312">纯正发音练习</view>
-            </view>
+        <view class="panelProduct1 FlexRow">
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wx331e8dd070f01d0e">
+            <image src="../images/cpxl_logo_05.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">汉语拼音</view>
+            <view class="panelProduct112">易错字词发音点读</view>
+            <view class="panelProduct113">免费</view>
           </view>
-          <view class="panelProduct3 FlexRow" bindtap='switchProgram' data-appid='wx313a8f2c0741efe1'>
-            <image src='../images/sofewareicon_sz.png' class="sofewareicon_mg" />
-            <view class="panelProduct31 FlexColumn">
-              <view class="panelProduct311">识字</view>
-              <view class="panelProduct312">小学六年课本同步</view>
-            </view>
+          <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wx313a8f2c0741efe1">
+            <image src="../images/cpxl_logo_06.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">识字表点读</view>
+            <view class="panelProduct112">一到六年级语文书同步</view>
+            <view class="panelProduct113">免费</view>
           </view>
         </view>
-      </view>
-
-      <view style="width:100%;height:20rpx;"></view>
-      <view class="panelProduct10 panelProduct0 FlexColumn" bindtap='switchProgram' data-appid='wxb54a6d5aff836ee3'>
-        <view class="panelProduct1">英语</view>
-        <view class="panelProduct3 FlexRow">
-          <image src='../images/sofewareicon_pd.png' class="sofewareicon_mg" />
-          <view class="panelProduct31 FlexColumn">
-            <view class="panelProduct311">自然拼读</view>
-            <view class="panelProduct312">英语国家母语学习法</view>
+        <image src="../images/cpxl_t03.png" class="cpxl_t01 cpxl_t03"></image>
+        <view class="panelProduct1 FlexRow">
+          <view class="panelProduct11 panelProduct10 FlexColumn" bind:tap="switchProgram" data-appid="wx84b3feac6069eec3">
+            <image src="../images/cpxl_logo_07.png" class="cpxl_logo_01"></image>
+            <view class="panelProduct111">秒过 · 错题记忆卡</view>
+            <view class="panelProduct114">可以记牢一切基础知识的练习方法和工具。彻底解决语文字词、成语、诗词；英语单词、语法；数物化公式、定理；史地政必考要点等。</view>
+            <image src="../images/cpxl_ad_01.gif" class="cpxl_ad_01"></image>
           </view>
         </view>
-      </view>
-      <view style="width:100%;height:60rpx;"></view>
+        <view class="panelProduct1 FlexColumn">
+          <view class="panelFooter1">2017-2025 {{ProgramName}}</view>
+          <view class="panelFooter2">唱意教育微信小程序 版本 {{version}}</view>
+        </view>
     </view>
 
-    <image bindtap="showMiaoguo" src='../images/home_banner.png' class="home_banner" />
   </block>
 </view>
-
-<view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMiaoguoAD2==1}}">
-  <view class="btn">
-    <view class="btn1 FlexColumn" catchtap="showMiaoguo">
-      <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>
-
-<view class="HelpInfo2 FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowGift==1}}">
-  <view class="btn">
-    <view class="btn1 FlexColumn" catchtap="showMiaoguo">
-      <view class="HelpInfo21 FlexColumn">
-        <image src='../images/02023.png' class="png02014" />
-        <view class="HelpInfo211">有效期已延长</view>
-        <view class="HelpInfo212">识字20天礼品卡已兑换成功</view>
-      </view>
-      <view class="btn2" catchtap='goto' data-url='../../package4/main/getgiftlist'>查看记录</view>
-    </view>
-  </view>
-  <view class="close FlexColumn" bindtap='close' data-num="0">
-    <image src='../images/02024.png' class="closeImage" />
-  </view>
-</view>
-
-<view class="PanelMiaoguo FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowMiaoguo==1}}" catchtap="closeMiaoguo">
-  <view class="PanelMiaoguo1 FlexColumn">
-    <image src='../images/bm_sy_illus.png' class="bm_sy_illus" />
-    <view class="Text1">该记的记不住</view>
-    <view class="Text2">用「秒过」</view>
-    <text class="Text3">帮助孩子记牢语数外基础知识的\n工具和练习方法</text>
-    <view class="Text4">了解详情，欢迎参加</view>
-    <view class="Text5">新手培训</view>
-    <view class="btn3 FlexColumn" bindtap='switchProgram' data-appid='wx84b3feac6069eec3'>
-      <image src='../images/bm_sy_banner-open.png' class="bm_sy_banner-open" />
-    </view>
-
-    <view class="btnReadme" catchtap='goto' data-url='../../package4/main/miaoguoreadme'></view>
-    <view class="btnRecord" catchtap='goto' data-url='../../package4/main/getgiftlist'></view>
-  </view>
-</view>

pages/main/index.wxss

@@ -1,510 +1,38 @@
-/* .container {
+.container {
   background-color: #F5E2BE;
   justify-content: flex-start;
   font-weight: 500;
-  color:#1e1e1e;
-  overflow-x:hidden;
-}
-
-.index0{
-  width:100%;
-}
-.home_banner_header_sz{
-  width:100%;
-  height:150rpx;
-}
-.index1{
-  width:100%;
-  height:190rpx;
-  justify-content: space-between;
-  align-items: flex-end;
-}
-
-.index1 .nav{
-  border-bottom: 10rpx solid #593613;
-  width:250rpx;
-  height: 80rpx;
-  padding-bottom: 10rpx;
-  justify-content: flex-end;
-}
-
-.index1 .nav2{
-  border-bottom: 10rpx solid #F5E2BE;
-}
-
-.index1 .nav3{
-  border-bottom: 10rpx solid #3D76C7;
-}
-
-.index1 .img{
-  width:174rpx;
-  height:190rpx;
-}
-.index1 .img3{
-  width:158rpx;
-  height:37rpx;
-  margin-bottom: 6rpx;
-}
-.index1 .img2{
-  width:154rpx;
-  height:39rpx;
-  margin-bottom: 6rpx;
-}
-.index1 .hand{
-  width:60rpx;
-  height:90rpx;
-  position: absolute;
-  right:106rpx;
-  top:20rpx;
-}
-
-.index6{
-  width:100%;
-  justify-content: flex-start;
-  flex-wrap: wrap;
 }
 
-.index6 .btn2{
-  width:100%;
-  height:350rpx;
-}
-
-.index2{
+.panelTop{
   width:100%;
-  height:2876rpx;
-  background-color: #DFC7A4;
-  justify-content: flex-start;
-}
-
-.index2 .index2_1{
-  margin: 0 30rpx 0 30rpx;
-  width:690rpx;
-  flex-wrap: wrap;
   justify-content: space-between;
-}
-.index2 .btn {
-  width: 330rpx;
-  height: 448rpx;
-  background-color: #CDB797;
-  border-radius: 20rpx;
-  margin-bottom: 20rpx;
-}
-.index2 .btn1 {
-  width: 100%;
-  height: 428rpx;
-  background-color: #F8F8F8;
-  border-radius: 20rpx;
-  position:relative;
-  top:0;
-}
-
-.index2 .panel1 {
-  width: 100%;
-  height: 298rpx;
-  border-bottom:2rpx solid #DFDFDF;
-}
-
-.index2 .panel2 {
-  width: 100%;
-  height: 130rpx;
-  background-color: #F0F0F0;
-  border-bottom-left-radius: 20rpx;
-  border-bottom-right-radius: 20rpx;
-}
-
-.index2 .img {
-  width: 223rpx;
-  height: 202rpx;
-}
-.index2 .img2 {
-  width: 94rpx;
-  height: 71rpx;
-}
-
-
-.index7{
-  width:100%;
-  height:35rpx;
-  background-color: #DFC7A4;
-  
-}
-.imgWave {
-  width: 100%;
-  height: 35rpx;
-}
-
-.index8{
-  width:100%;
-  height:406rpx;
-  background-color: #CDB797;
-  justify-content: flex-start;
-}
-
-.index8 .img{
-  width:198rpx;
-  height:37rpx;
-  margin-top: 102rpx;
-}
-
-.index8 .index8_1{
-  width:690rpx;
-  height:120rpx;
-  margin-top: 30rpx;
-  border-radius: 20rpx;
-  text-align: center;
-  line-height: 120rpx;
-  font-size:32rpx;
-  color:#1e1e1e;
-  background-color: #F0F0F0;
-}
-
-
-.index3{
-  width:100%;
-  justify-content: flex-start;
-  background-color: #F0F0F0;
-  align-items: center;
   position: relative;
-  color:#1E1E1E;
 }
 
-.index3 .Avatar{
-  width:160rpx;
-  height:160rpx;
-  background-color: #9B9B9B;
-  border-radius: 20rpx;
-  margin-top: 120rpx;
-  position: relative;
-}
-
-.index3 .Avatar .gear{
-  width:40rpx;
-  height:40rpx;
+.home_header_bg{
+  width:750rpx;
+  height: 220rpx;
   position: absolute;
-  bottom:0;
+  top:0;
   left:0;
-  border-bottom-left-radius: 10rpx;
-  border-top-right-radius: 10rpx;
-  background-color: #fff;
-}
-.index3 .Avatar .img{
-  width:24rpx;
-  height:24rpx;
-}
-
-.index3 .NickName{
-  font-size:48rpx;
-  color:#1E1E1E;
-  margin-top: 40rpx;
-  width:90%;
-  text-align: center;
 }
 
-.index3 .Member{
-  font-size:24rpx;
-  color:#fff;
-  background-color: #C29F6D;
-  border-radius: 8rpx;
-  height:42rpx;
-  line-height: 42rpx;
-  text-align: center;
-  padding: 0 10rpx;
-  margin-top: 10rpx;
-}
-
-.index3 .Member2{
-  background-color: #4A4A4A;
-}
-
-.index3 .index3_0{
-  width:100%;
-  margin-top: 50rpx;
-  justify-content: center;
-}
-.index3 .index3_1{
-  width:216rpx;
+.panelTop1{
   justify-content: center;
-}
-
-.index3 .index3_1_2{
-  width:116rpx;
-  height:42rpx;
-  text-align: center;
-  line-height: 42rpx;
-  color:#1E1E1E;
-  font-size:26rpx;
-}
-.index3 .number{
-  font-family: 'SF UI Display Light';
-  font-weight: 200;
-  font-style: normal;
-  font-size:56rpx;
-}
-.index3 .text{
-  font-size:24rpx;
-  margin: 25rpx 0 0 10rpx;
-}
-.index3 .Circle{
-  width:160rpx;
-  height:160rpx;
-  background-color: #ffffff;
-  border-radius: 50%;
-  margin-top: 100rpx;
-  padding-left: 0;
-  padding-right: 0;
-  margin-bottom: 80rpx;
-  font-size:24rpx;
-  justify-content: flex-start;
-}
-
-.index3 .Circle::after {
-  border: 0px;
-}
-
-.index3 .Share{
-  width:50rpx;
-  height:50rpx;
-  margin: 39rpx 0 0rpx 0;
-}
-
-.index3 .btn {
-  width: 600rpx;
-  height: 100rpx;
-  background-color: #035834;
-  border-radius: 14rpx;
-}
-.index3 .btn1 {
-  width: 100%;
-  height: 90rpx;
-  background-color: #03AF69;
-  border-radius: 14rpx;
-  color:#fff;
-  text-align: center;
-  line-height: 90rpx;
-  font-size:36rpx;
-  position:relative;
-  top:0;
-}
-
-.index3 .btn2 {
-  margin-top: 60rpx;
-}
-
-.index3 .btn3 {
-  background-color: #262626;
-}
-
-.index3 .btn4 {
-  background-color: #4D4D4D;
-  color:#787878;
-}
-
-.index3 .btn5 {
-  margin-top: 40rpx;
-}
-
-
-.index3 .btn6 {
-  background-color: #A63917;
-}
-
-.index3 .btn7 {
-  background-color: #FF7245;
-  position: relative;
-}
-
-.index3 .btn8 {
-  margin-top: 50rpx;
-}
-
-.index3 .ReviewCount {
-  min-width: 53rpx;
-  height:50rpx;
-  background-color: #D54F24;
-  color:#fff;
-  border-radius: 8rpx;
-  text-align: center;
-  line-height: 50rpx;
   position: absolute;
-  right: 20rpx;
-  top: 20rpx;
-  font-size:24rpx;
-  font-family: 'Arial BoldMT';
-  font-weight: bold;
-  font-style: normal;
-}
-
-
-.index9{
-  width:100%;
-  height:35rpx;
-  background-color: #F0F0F0;
-  
-}
-.index10{
-  background-color: #fff;
-}
-
-.index4{
-  width:100%;
-  height:10rpx;
-  background-color: #EB8A95;
-}
-
-.index5{
-  width:100%;
-  background-color: #F5E2BE;
-  font-size:20rpx;
-  justify-content: flex-start;
-  color:#1e1e1e;
-}
-
-.home_banner{
-   width:100%;
-}
-
-
-
-.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;
-}
-
-
-.HelpInfo2 {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  background-color: rgba(245, 226, 190, 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;
-} */
-
-.container {
-  background-color: #F5E2BE;
-  justify-content: flex-start;
-  font-weight: 500;
-}
-.panelTop{
-  width:100%;
-  height:120rpx;
-  justify-content: flex-start;
-  position: relative;
-}
-
-.Avatar{
-  width:80rpx;
-  height:80rpx;
-  background-color: #FEF5DA;
-  border-radius: 20rpx;
-  margin:0 45rpx 0 70rpx;
-  justify-content: flex-end;
-  position: relative;
-}
-.AvatarImage{
-  width:80rpx;
-  height:90rpx;
+  top:50rpx;
+  left:50rpx;
+  z-index: 10;
 }
-.AvatarImage1{
-  width:80rpx;
-  height:80rpx;
-  border-radius: 18rpx;
-  position: absolute;
-  top:-10rpx;
-  left:0;
-
+.panelTop1_1{
+  left:170rpx;
 }
-.panelTop1{
-  width:120rpx;
-  justify-content: center;
-  position: relative;
-  z-index: 10;
+.panelTop1_2{
+  left:290rpx;
 }
 
 .number{
-  font-family: 'SF UI Display Light';
-  font-weight: 200;
   font-style: normal;
   font-size:36rpx;
 }
@@ -514,40 +42,6 @@
   font-size:22rpx;
 }
 
-.home_header_bg{
-  width:250rpx;
-  height: 120rpx;
-  position: absolute;
-  right:0;
-  z-index: 5;
-}
-
-.message_home_01{
-  width:265rpx;
-  height: 127rpx;
-  position: absolute;
-  top:80rpx;
-  left:70rpx;
-  z-index: 10;
-}
-
-.panelTop2{
-  width:100%;
-  height:80rpx;
-  background-color: #DFC7A4;
-  align-items: flex-end;
-}
-
-.panelTop21{
-  width:400rpx;
-  height:42rpx;
-  background-color: #593613;
-  text-align: center;
-  border-radius: 8rpx;
-  line-height:42rpx;
-  font-size:24rpx;
-  color:#fff;
-}
 
 .panelList{
   width:100%;
@@ -566,7 +60,13 @@
   height:306rpx;
   background-color: #F8F8F8;
   margin:40rpx 15rpx 0 15rpx;
-  
+}
+
+.panelItemAD{
+  width:690rpx;
+  height:238rpx;
+  margin:40rpx 0 0 0;
+  background-color: #fff;
 }
 
 .itemImg{
@@ -627,80 +127,138 @@
   height:35rpx;
 }
 
+.panelOther0{
+  width:100%;
+  height:26rpx;
+  background-color: #AA6C33;
+}
 .panelOther{
   width:100%;
-  height:197rpx;
-  background-color: #CDB797;
-  position: relative;
+  height:190rpx;
+  justify-content: flex-start;
   align-items: flex-start;
+  background-color: #55382B;
+  position: relative;
 }
 
 .panelOther1{
-  color:#593613;
-  margin:80rpx 0 0 0;
+  color:#fff;
+  margin:50rpx 0 0 50rpx;
   font-size:48rpx; 
 }
+.panelOther2{
+  color:#fff;
+  margin:0rpx 0 0 50rpx;
+  font-size:28rpx; 
+}
 
 .home_triangle_up{
   width:34rpx;
   height:20rpx;
   position: absolute;
   bottom:0;
+  left:100rpx;
   z-index: 10;
 }
-
 .panelProduct{
   width:100%;
-  background-color: #fff;
+  background-color: #D5CAC6;
   align-items: flex-start;
 }
-.panelProduct0{
-  width:50%;
-  font-size:32rpx;
-  color:#4D4D4D;
-  justify-content: flex-start;
-  align-items: flex-start;
+
+.cpxl_t01{
+  width: 156rpx;
+  height:52rpx;
+  margin: 60rpx 0 0 50rpx;
 }
-.panelProduct1{
-  background-color: #fff;
-  margin: 50rpx 0 0 50rpx;
-  font-size:32rpx;
-  color:#4D4D4D;
+.cpxl_t02{
+  width: 190rpx;
+}
+.cpxl_t03{
+  width: 300rpx;
 }
 
-.panelProduct10{
+.panelProduct1{
   width:100%;
+  margin: 40rpx 0 20rpx 0;
 }
 
-.panelProduct2{
-  background-color: #fff;
-  margin: 0 0 0 50rpx;
-  font-size:32rpx;
-  color:#4D4D4D;
+.panelProduct100{
+  margin: 40rpx 0 0 0;
 }
 
-.panelProduct3{
-  width:300rpx;
-  margin:30rpx 0 0 50rpx;
-  justify-content: flex-start;
+.panelProduct11{
+  width:330rpx;
+  height:285rpx;
+  background: #F8F8F8;
+  border: 4rpx solid #B67249;
+  box-shadow: 0 16rpx 0 0 rgba(0,0,0,0.30), inset 0 -20rpx 0 0 rgba(0,0,0,0.20);
+  border-radius: 30rpx;
+  margin: 0 15rpx;
+  align-items: flex-start;
+  position: relative;
 }
 
-.sofewareicon_mg{
-  width:66rpx;
-  height:66rpx;
+.panelProduct10{
+  width:690rpx;
+  height:811rpx;
 }
 
+.cpxl_logo_01{
+  width:90rpx;
+  height:90rpx;
+  margin-left: 40rpx;
+}
 
-.panelProduct31{
-  margin:0 0 0 30rpx;
-  align-items: flex-start;
+
+.panelProduct111{
+  font-size: 34rpx;
+  font-weight: 600;
+  color:#1E1E1E;
+  margin: 20rpx 0 0 40rpx;
+}
+
+.panelProduct112{
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin: 0 0 10rpx 40rpx;
+}
+.panelProduct113{
+  background: #B67249;
+  border-radius: 6rpx;
+  font-size: 20rpx;
+  color: #FFFFFF;
+  text-align: center;
+  width: 60rpx;
+  height:34rpx;
+  line-height: 34rpx;
+  position: absolute;
+  top:50rpx;
+  right:40rpx;
 }
-.panelProduct311{
-  font-size:28rpx;
+.panelProduct114{
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #4D4D4D;
+  margin: 0 0 0 40rpx;
+  width: 610rpx;
 }
-.panelProduct312{
-  font-size:20rpx;
-  color:#4D4D4D;
+.cpxl_ad_01{
+  width:610rpx;
+  height:410rpx;
+  margin: 40rpx 0 0 40rpx;
+}
+
+.panelFooter1{
+  font-size:24rpx;
+  color:#695852;
+  margin-top: 20rpx;
+}
+.panelFooter2{
+  font-size:24rpx;
+  color:#695852;
+  margin-bottom: 100rpx;
 }
 
 .home_banner{

pages/main/list.js

@@ -117,13 +117,7 @@ Page({
     }
   },
   goto: function (e) {
-    var islocked = e.currentTarget.dataset.islocked;
-    if (islocked == 1 && app.globalData.userInfo.IsShow == 1) {
-      wx.navigateTo({
-        url: '../../package4/main/buyad',
-      })
-    }
-    else {
+    
       var word = e.currentTarget.dataset.word;
       if (word) {
         var bookid = e.currentTarget.dataset.bookid;
@@ -140,7 +134,7 @@ Page({
           url: "../main/detail?bookid=" + bookid + "&unitid=" + unitid + "&wordid=" + wordid + "&isfinished=" + isfinished,
         });
       }
-    }
+    
   },
   getFinished: function () {
     var that = this;

pages/main/list.wxml

@@ -21,12 +21,10 @@
       <view class="btn" bindtap="goto" data-bookid='{{BookID}}' data-islocked='{{item.IsLocked}}' data-word='true' data-unitid='{{item.ID}}' data-isfinished='{{item.IsFinished}}' wx:for="{{List}}" wx:key="index">
         <view class="btn1 FlexRow">
           <view class="left FlexRow">
-            <image wx:if="{{IsShow==1 && item.IsLocked==0 && !item.IsFinished}}" src='../images/04007.png' class="img04007" />
-            <image wx:if="{{IsShow==1 && item.IsLocked==0 && item.IsFinished}}" src='../images/04006.png' class="img04007" />
-            <image wx:if="{{IsShow==1 && item.IsLocked==1}}" src='../images/04005.png' class="img04005" />
-            <image wx:if="{{IsShow==0 && item.IsLocked==0 && !item.IsFinished}}" src='../images/04007.png' class="img04007" />
-            <image wx:if="{{IsShow==0 && item.IsLocked==0 && item.IsFinished}}" src='../images/04006.png' class="img04007" />
-            <image wx:if="{{IsShow==0 && item.IsLocked==1}}" src='../images/04007.png' class="img04007" />
+            <image wx:if="{{IsShow==1 && !item.IsFinished}}" src='../images/04007.png' class="img04007" />
+            <image wx:if="{{IsShow==1 && item.IsFinished}}" src='../images/04006.png' class="img04007" />
+            <image wx:if="{{IsShow==0 && !item.IsFinished}}" src='../images/04007.png' class="img04007" />
+            <image wx:if="{{IsShow==0 && item.IsFinished}}" src='../images/04006.png' class="img04007" />
             <view class="title">{{item.Title}}</view>
           </view>
           <view class="right FlexColumn">

project.private.config.json

@@ -32,5 +32,10 @@
         }
       ]
     }
+  },
+  "libVersion": "3.1.5",
+  "projectname": "%E8%AF%86%E5%AD%97",
+  "setting": {
+    "compileHotReLoad": true
   }
 }