1.6.25

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "1.6.23",
+    Version: "1.6.25",
     IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",

pages/main/default.js

@@ -15,6 +15,7 @@ Page({
     IsIPhoneX: app.globalData.IsIPhoneX,
     ImagePath: app.globalData.uploadImageUrl,
     IsShowUserID: false,
+    VersionID:app.globalData.Version,
   },
   onPullDownRefresh: function () {
     wx.redirectTo({
@@ -326,6 +327,11 @@ Page({
         ChangeIntroducerUserID: id,
       });
     }
+    else if (usertype=="versionid"){
+      that.setData({
+        VersoinID: id,
+      });
+    }
   },
   setSelectUser: function (e) {
     var that = this;
@@ -407,6 +413,16 @@ Page({
       }
     }
   },
+  setVersionStart:function(e){
+    var flag=e.currentTarget.dataset.flag;
+    var versionid=e.currentTarget.dataset.versionid;
+    var url = "UpdateVersionStatus?ProgramID=166&Version="+versionid+"&Flag=" + flag;
+    main.getData(url, function (data) {
+      wx.showToast({
+        title: '修改成功！',
+      })
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/default.wxml

@@ -73,11 +73,15 @@
 </view>
 
 <view wx:if="{{IsShowUserID}}" class="IsExitContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-    <input class='input' type="number" value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />
-    <button class="btnShowUserID" bindtap="setSelectUser">查看用户数据</button>
+    <view class="panel2 FlexRow">
+    <input class='input2 input' type="number" value="{{ChangeUserID}}" bindinput="onKeyInput" data-type="userid" />
+    <button class="btn2" bindtap="setSelectUser">查看用户</button>
+    </view>
     <view style="height:50rpx;"></view>
-    <button class="btnShowUserID" bindtap="goto" data-url="../other/webview?PageID=9999">网页访问钥匙</button>
+    <view class="panel2 FlexRow">
+    <button class="btnShowUserID" bindtap="goto" data-url="../other/webview?PageID=9999">钥匙</button>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/webviewInterior">访问统计网页</button>
+    </view>
     <view style="height:50rpx;"></view>
     <button class="btnShowUserID" bindtap="goto" data-url="../other/paycustom">自定义开据</button>
     <view style="height:50rpx;"></view>
@@ -98,6 +102,11 @@
       <view  class="NickName2">{{IntroducerNickName}}</view>
     </view>
     <button class="btnShowUserID" bindtap="setUserIntroducer">更改用户介绍人</button>
-    
+    <view style="height:50rpx;"></view>
+    <view class="panel2 FlexRow">
+      <input class='input2 input' type="number" placeholder="版本号" value="{{VersionID}}" bindinput="onKeyInput" data-type="versionid"/>
+      <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="1">开通</button>
+      <button class="btn2" bindtap="setVersionStart" data-versionid="{{VersionID}}" data-flag="-1">关闭</button>
+    </view>
 </view>
 

pages/main/default.wxss

@@ -280,14 +280,16 @@
 }
 .input2{
   width: 200rpx;
+  height:65rpx;
   margin-top: 0rpx;
   margin-left: 10rpx;
+  font-size:28rpx;
 }
 .btnShowUserID{
-  margin-top: 30rpx;
+  margin:30rpx 5rpx;
+  font-size: 26rpx;
 }
 .btn2{
-  height:50rpx;
-  font-size: 22rpx;
-  margin:0 10rpx 0 10rpx;
+  font-size: 26rpx;
+  margin:0 0 0 10rpx;
 }

pages/main/searchWeb2.js

@@ -162,7 +162,7 @@ Page({
                     str = "[读 src='" + item.SoundMark + "']" + item.Content + "[/读]";
                 }
                 else
-                  str = "[读]" + item.Content + "[/读]";
+                  str = "[读 src='"+this.data.Result.CHN.HanZi+"("+ main.getPinyinNormal(item.Content) +")"+"']" + item.Content + "[/读]";
               }
             }
             else {

pages/other/newuser.js

@@ -10,16 +10,26 @@ Page({
   },
   onLoad: function (options) {
     var that = this;
-    that.setData({
-      Containnerheight: main.getWindowHeight(),
-    });
-    that.init();
-
-    wx.setNavigationBarColor({
-      frontColor: "#ffffff",
-      backgroundColor: "#9BD41C",
+    wx.getSetting({
+      success(res) {
+        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow == 0) {
+          that.setData({
+            Containnerheight: main.getWindowHeight(),
+          });
+      
+          that.init();
+          wx.setNavigationBarColor({
+            frontColor: "#ffffff",
+            backgroundColor: "#9BD41C",
+          });
+        }
+        else {
+          wx.navigateTo({
+            url: '../index/accredit',
+          });
+        }
+      }
     });
-
   },
   init: function () {
     var that = this;
@@ -35,7 +45,10 @@ Page({
     var that = this;
     var money = 1;
     var detail = {};
-      
+    detail.UserID = app.globalData.userInfo.UserID;
+    detail.Introducer = app.globalData.userInfo.Introducer;
+    detail.PayType=9;
+    detail = JSON.stringify(detail);
     //console.log(detail);
     //console.log(money);
     var remark = null;

pages/other/userbook.wxml

@@ -31,12 +31,12 @@
         <view>优惠券</view>
       </view>
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) }}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==0 || IsLoseEfficacy==1) && !ChildUserID }}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
         <view>去续费</view>
       </view>
       
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6&EndDate={{EndDate}}" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==1 && !IsLoseEfficacy) }}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../other/pay?PayUserID={{UserID}}&PayType=6&EndDate={{EndDate}}" wx:if="{{ClassDayNumber>=ClassTotalDayNumber && (IsPay==1 && !IsLoseEfficacy) && !ChildUserID }}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_wallet.png' />
         <view>去续费</view>
       </view>
@@ -104,7 +104,7 @@
       </view>
     </block>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=ClassTotalDayNumber && IsPay==0}}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>=ClassTotalDayNumber && IsPay==0 && !ChildUserID}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a04_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a04_usermanual_banner_header.png' />
         <view class="btn3 btn2 btn" bindtap="goto" data-url="../other/pay?PayType=5&EndDate={{ClassTimeEnd}}">续费</view>
@@ -112,7 +112,7 @@
       <view class='lineFooter'></view>
     </block>
 
-    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=(ClassTotalDayNumber-4) && ClassDayNumber<ClassTotalDayNumber}}">
+    <block wx:if="{{IsShow==1 && PanelShow===2 && IsPay==0 && ClassDayNumber>=(ClassTotalDayNumber-4) && ClassDayNumber<ClassTotalDayNumber && !ChildUserID}}">
       <view class="panelItem FlexColumn">
         <image class="salesactivity_a02_usermanual_banner_header" src='{{ImagePath}}web/salesactivity_a02_usermanual_banner_header.png' />
         <view class="text9">活动日期：{{EarlyBirdTimeStart}}-{{EarlyBirdTimeEnd}}</view>

pages/test/list.wxml

@@ -88,7 +88,7 @@
 				<image src="../images/universalpic_words_blue_30x30.png" class="universalpic_word_blue_30x30" />
 				<view class="SelectContainer1Text4">查看词表</view>
 			</view>
-			<view class="btnPanel1">说出单词在句子中的含义</view>
+			<view class="btnPanel1">念出单词的发音并说出含义</view>
 			<view class="btnPanel0 btnPanel FlexRow">
 				<view wx:if="{{SelectItem.TestTypeReadFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.ReadReportID}}" data-url="./item?testtype=read&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
 					<view class="SelectContainer1Text3">开始检验</view>

project.config.json

@@ -1,137 +1,141 @@
 {
-	"description": "项目配置文件",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"enhance": true,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"autoAudits": false,
-		"scopeDataCheck": false,
-		"uglifyFileName": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"compileHotReLoad": false,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useIsolateContext": true,
-		"useCompilerModule": false,
-		"userConfirmedUseCompilerModuleSwitch": false
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.11.3",
-	"appid": "wx84b3feac6069eec3",
-	"projectname": "miaoguo_master",
-	"debugOptions": {
-		"hidedInDevtools": []
-	},
-	"isGameTourist": false,
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"gamePlugin": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": 7,
-			"list": [
-				{
-					"id": 0,
-					"name": "分享",
-					"pathName": "pages/index/index",
-					"query": "UserID=1&type=share&MiaoguoCardID=71228",
-					"scene": null
-				},
-				{
-					"id": 1,
-					"name": "pages/index/index",
-					"pathName": "pages/index/index",
-					"query": "type=activity&ActivityID=2&EndTime=2019年10月07日&EarlyBirdTimeStart=2019年09月23日&EarlyBirdTimeEnd=2019年10月05日",
-					"scene": 1007
-				},
-				{
-					"id": 3,
-					"name": "webview",
-					"pathName": "pages/other/webview",
-					"query": "UserID=1",
-					"scene": 1001
-				},
-				{
-					"id": 4,
-					"name": "pages/other/activity",
-					"pathName": "pages/other/activity",
-					"query": "EndTime=2019-09-01",
-					"scene": 1001
-				},
-				{
-					"id": 4,
-					"name": "pages/other/paycustom",
-					"pathName": "pages/other/paycustom",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": 6,
-					"name": "用户手册",
-					"pathName": "pages/index/index",
-					"query": "type=userbook",
-					"scene": null
-				},
-				{
-					"id": 6,
-					"name": "pages/index/index",
-					"pathName": "pages/index/index",
-					"query": "type=paycontinue&EndDate=2020-09-15",
-					"scene": null
-				},
-				{
-					"id": 7,
-					"name": "pages/test/index",
-					"pathName": "pages/test/index",
-					"query": "UserID=1",
-					"scene": null
-				},
-				{
-					"id": 8,
-					"name": "pages/index/index",
-					"pathName": "pages/index/index",
-					"query": "type=paycustom&PayUserID=1&DayNumber=365&Price=199&Remark=111",
-					"scene": 1007
-				},
-				{
-					"id": 9,
-					"name": "pages/marketing/award",
-					"pathName": "pages/marketing/award",
-					"query": "",
-					"scene": null
-				}
-			]
-		}
-	}
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "autoAudits": false,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "useMultiFrameRuntime": false,
+    "useApiHook": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.11.3",
+  "appid": "wx84b3feac6069eec3",
+  "projectname": "miaoguo_master",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "isGameTourist": false,
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "plugin": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "currentL": -1,
+      "list": []
+    },
+    "gamePlugin": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": 7,
+      "list": [
+        {
+          "id": 0,
+          "name": "分享",
+          "pathName": "pages/index/index",
+          "query": "UserID=1&type=share&MiaoguoCardID=71228",
+          "scene": null
+        },
+        {
+          "id": 1,
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "type=activity&ActivityID=2&EndTime=2019年10月07日&EarlyBirdTimeStart=2019年09月23日&EarlyBirdTimeEnd=2019年10月05日",
+          "scene": 1007
+        },
+        {
+          "id": 3,
+          "name": "webview",
+          "pathName": "pages/other/webview",
+          "query": "UserID=1",
+          "scene": 1001
+        },
+        {
+          "id": 4,
+          "name": "pages/other/activity",
+          "pathName": "pages/other/activity",
+          "query": "EndTime=2019-09-01",
+          "scene": 1001
+        },
+        {
+          "id": 4,
+          "name": "pages/other/paycustom",
+          "pathName": "pages/other/paycustom",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": 6,
+          "name": "用户手册",
+          "pathName": "pages/index/index",
+          "query": "type=userbook",
+          "scene": null
+        },
+        {
+          "id": 6,
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "type=paycontinue&EndDate=2020-09-15",
+          "scene": null
+        },
+        {
+          "id": 7,
+          "name": "pages/test/index",
+          "pathName": "pages/test/index",
+          "query": "UserID=1",
+          "scene": null
+        },
+        {
+          "id": 8,
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "type=paycustom&PayUserID=1&DayNumber=365&Price=199&Remark=111",
+          "scene": 1007
+        },
+        {
+          "id": 9,
+          "name": "pages/marketing/award",
+          "pathName": "pages/marketing/award",
+          "query": "",
+          "scene": null
+        }
+      ]
+    }
+  }
 }