1.1.17

app.js

@@ -25,7 +25,7 @@ App({
     }
   },
   globalData: {
-    Version: "1.1.15",
+    Version: "1.1.18",
     IsProduction: true,
     ShareTitle: "刻意学习，高效成长",
     SharePath: "pages/index/index",

app.json

@@ -20,6 +20,8 @@
     "pages/main/detail",
     "pages/main/memoryLevel",
     "pages/other/payinfo",
+    "pages/other/lessonlist",
+    "pages/other/userlist",
     "pages/main/setting"
   ],
   "window": {

pages/index/index.js

@@ -61,6 +61,10 @@ Page({
       if (options.LessonID) {
         console.log("Lesson:" + options.LessonID);
         app.globalData.LessonID = options.LessonID;
+        if (options.LessonPage)
+          app.globalData.LessonPage = options.LessonPage;
+        else
+          app.globalData.LessonPage = 1;
       }
     }
     this.setData({

pages/main/add.js

@@ -409,6 +409,8 @@ Page({
               }
               //console.log("serverUrl:" + serverUrl);
               //console.log("tempUrl:" + tempUrl);
+              if (serverUrl=="")
+                serverUrl = main.getServerImage(tempUrl);
 
               main.saveTempImage(serverUrl, tempUrl);
               arr[i][j].Content = serverUrl;

pages/main/default.js

@@ -48,7 +48,7 @@ Page({
 
           if (app.globalData.userInfo.IsMember && app.globalData.LessonID && app.globalData.LessonID>0) {
             wx.navigateTo({
-              url: '../other/lesson?id=' + app.globalData.LessonID,
+              url: '../other/lesson?LessonID=' + app.globalData.LessonID +'&LessonPage='+app.globalData.LessonPage,
             });
           }
 

pages/main/preview.js

@@ -590,7 +590,6 @@ Page({
     return {
       title: '我的分享',
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&Share=1&MiaoguoCardID=' + this.data.MiaoguoCardID,
-      imageUrl: app.globalData.ShareImage,
     }
   },
 })

pages/main/setting.js

@@ -4,8 +4,8 @@ import main from '../../utils/main';
 const app = getApp();
 const arrSortType = ["随机抽取的题卡", "时间较早的题卡", "时间较近的题卡"];
 const arrSortType2 = ["随机的", "较早的", "较近的"];
-const arrClickType=["专属按钮","点击空白","两种方式"];
-var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan","临时"];
+const arrClickType = ["专属按钮", "点击空白", "两种方式"];
+var arrUserName = ["程晟涵", "大耳兔", "teresa", "古利古拉", "Lucy-chan", "临时"];
 var arrUserID = [2, 11, 8, 9, 10, 128];
 
 Page({
@@ -13,8 +13,8 @@ Page({
     CardNumber: [],
     IsShowChange: false,
     ProgramName: app.globalData.ProgramName,
-    Version:app.globalData.Version,
-    RecommendName:"启用",
+    Version: app.globalData.Version,
+    RecommendName: "启用",
   },
   onLoad: function () {
     var that = this;
@@ -54,7 +54,7 @@ Page({
         }
       }
     });
-    
+
 
     if (app.globalData.userInfo.UserID == 1 || app.globalData.userInfo.UserID == 2) {
       that.setData({
@@ -63,9 +63,9 @@ Page({
     }
   },
   onShow: function () {
-    var that=this;
+    var that = this;
     var colorIndex = wx.getStorageSync("ColorIndexArr");
-    if (!colorIndex || colorIndex.length>1) {
+    if (!colorIndex || colorIndex.length > 1) {
       this.setData({
         ColorName: "多色变换",
       });
@@ -88,7 +88,7 @@ Page({
         RecommendName: "禁用",
       });
     }
-    
+
     that.setData({
       ClickTypeName: arrClickType[app.globalData.ClickType],
     });
@@ -166,13 +166,13 @@ Page({
       url: './clicktype',
     })
   },
-  updateMember:function(){
+  updateMember: function () {
     wx.reLaunch({
       url: '../index/index',
     })
   },
   getMemoryLevel: function () {
-    var that=this;
+    var that = this;
     var index = wx.getStorageSync("MemoryLevel");
     if (!index) {
       index = 0;
@@ -182,26 +182,30 @@ Page({
     for (var i = 0; i < list.length; i++) {
       if (i == index) {
         that.setData({
-          MemoryLevelName:list[i].Key,
+          MemoryLevelName: list[i].Key,
         });
         break;
       }
     }
   },
-  setRecommend:function(){
+  setRecommend: function () {
     wx.navigateTo({
       url: './recommend',
     })
   },
   gotoPay: function () {
-    wx.navigateTo({
-      url: '../other/payinfo',
-    })
+    if (app.globalData.userInfo.UserID <= 7) {
+      wx.navigateTo({
+        url: '../other/payinfo',
+      });
+    }
   },
   gotoLesson: function () {
-    wx.navigateTo({
-      url: '../other/lesson',
-    })
+    if (app.globalData.userInfo.UserID <= 7) {
+      wx.navigateTo({
+        url: '../other/lessonlist',
+      });
+    }
   },
   onShareAppMessage: function () {
     return {

pages/main/setting.wxml

@@ -116,7 +116,7 @@
     <view class='lineFooter'></view>
   </block>
 
-  <view style='width:100%;height:100rpx;' bindtap='updateMember'></view>
-  <text class='text1' bindtap='gotoPay'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
+  <view style='width:100%;height:100rpx;' bindtap='gotoPay'></view>
+  <text class='text1' bindtap='updateMember'>©2019 {{ProgramName}}\n微信小程序 版本 {{Version}}</text>
   <view style='width:100%;height:100rpx;' bindtap='gotoLesson'></view>
 </view>

pages/other/lesson.js

@@ -15,23 +15,34 @@ Page({
   },
   onLoad: function (options) {
     var that = this;
-    var id = 1;
-    if (options && options.id)
-      id = options.id;
-    imageUrlPrefix = app.globalData.uploadImageUrl + "lesson/lesson" + id + "/";
-    main.getData("GetMiaoguoLesson?Lesson=" + id + "&time=" + new Date().getTime(), function (data) {
+    var LessonID = 1;
+    var LessonPage = 1;
+    if (options && options.LessonID) {
+      LessonID = options.LessonID;
+    } 
+    if (options && options.LessonPage) {
+      LessonPage = options.LessonPage;
+    }
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      LessonID: LessonID,
+      LessonPage: LessonPage,
+    });
+    imageUrlPrefix = app.globalData.uploadImageUrl + "lesson/lesson" + LessonID + "/";
+    main.getData("GetMiaoguoLesson?Lesson=" + LessonID + "&time=" + new Date().getTime(), function (data) {
+      var id = that.data.LessonPage;
+      if (id < 10)
+        id = "0" + id;
       that.setData({
-        LessonID: data.LessonID,
         ArrTirtle: data.List,
         IsPause: true,
-        PlayIndex: 0,
-        Containnerheight: main.getWindowHeight(),
-        AudioSrc: imageUrlPrefix + "sounds/1.m4a",
-        ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%8701.jpg",
+        AudioSrc: imageUrlPrefix + "sounds/"+that.data.LessonPage+".m4a",
+        ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%87" + id+".jpg",
       });
     });
     currentContent = [];
     app.globalData.LessonID = 0;
+    app.globalData.LessonPage = 0;
   },
   onUnload: function () {
     this.InsertMiaoguoUserLesson();
@@ -52,12 +63,12 @@ Page({
   },
   playAudio: function (e) {
     var that = this;
-    var id = e.currentTarget.dataset.id + 1;
+    var id = Number(e.currentTarget.dataset.id) + 1;
     if (id < 10)
       id = "0" + id;
     this.setData({
       IsPause: false,
-      PlayIndex: e.currentTarget.dataset.id,
+      LessonPage: Number(id),
       AudioSrc: imageUrlPrefix + "sounds/" + Number(id) + ".m4a",
       ImageUrl: imageUrlPrefix + "%E5%B9%BB%E7%81%AF%E7%89%87" + id + ".jpg",
     });
@@ -66,28 +77,37 @@ Page({
     }, 1000);
   },
   bindEnded: function () {
-    var id = this.data.PlayIndex + 1;
+    var id = this.data.LessonPage;
     currentContent.push(id);
     if (id < this.data.ArrTirtle.length)
       this.playAudio({ currentTarget: { dataset: { id: id } } });
   },
   audioPlay: function () {
-    this.audioCtx.play();
-    this.setData({
-      IsPause: false,
-    });
+    if (this.data.IsPause){
+      this.audioCtx.play();
+      this.setData({
+        IsPause: false,
+      });
+    }
+    else{
+      this.audioCtx.pause();
+      this.setData({
+        IsPause: true,
+      });
+    }
   },
-  audioPause: function () {
-    this.audioCtx.pause();
-    this.setData({
-      IsPause: true,
+  previewImage:function(e){
+    var url=e.currentTarget.dataset.url;
+    wx.previewImage({
+      current: url,
+      urls: [url]
     });
   },
   onShareAppMessage: function () {
     return {
       title: "秒过学习法",
-      path: app.globalData.SharePath + '?LessonID=' + this.data.LessonID + '&UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: '../images/program_screenshot_l1.png',
+      path: app.globalData.SharePath + '?LessonID=' + this.data.LessonID + '&LessonPage=' + this.data.LessonPage+'&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: '../images/program_screenshot_l' + this.data.LessonID+'.png',
     }
   },
 });

pages/other/lesson.wxml

@@ -1,9 +1,9 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class='top FlexColumn'>
-    <image class="img" src='{{ImageUrl}}' bindtap='audioPause'></image>
-    <view class='pause img FlexRow' catchtap='audioPlay' hidden="{{!IsPause}}">
-      <image class="music-player-play" src='../images/music-player-play.png'></image>
-    </view>
+    <image class="img" src='{{ImageUrl}}' bindtap='previewImage' data-url="{{ImageUrl}}"></image>
+    <image class='music-player-play' src='../images/music-player-play.png' hidden="{{!IsPause}}" ></image>
+    <image class='music-player-pause-lines' src='../images/music-player-pause-lines.png' hidden="{{IsPause}}" ></image>
+    <view class='btnUp' catchtap='audioPlay'></view>  
   </view>
   <audio class='audio' src="{{AudioSrc}}" id="myAudio" bindended="bindEnded"></audio>
   <view class="main FlexColumn">
@@ -11,10 +11,9 @@
       <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
         <view class="lineWidth680"></view>
       </view>
-
       <view class='item FlexRow' bindtap='playAudio' data-id="{{index}}">
-        <image src="../images/universalpic_read_begin_gray_20x20.png" class='universalpic_read_begin_gray_20x20' wx:if="{{PlayIndex==index}}" />
-        <view class='universalpic_read_begin_gray_20x20' wx:if="{{PlayIndex!=index}}"></view>
+        <image src="../images/universalpic_read_begin_gray_20x20.png" class='universalpic_read_begin_gray_20x20' wx:if="{{(LessonPage-1)==index}}" />
+        <view class='universalpic_read_begin_gray_20x20' wx:if="{{(LessonPage-1)!=index}}"></view>
         <view>{{item.Title}}</view>
       </view>
     </block>

pages/other/lesson.wxss

@@ -7,7 +7,7 @@
 
 .top {
   width:100%;
-  height:495rpx;
+  height:575rpx;
   position: fixed;
   z-index: 10;
   background-color: #f0f0f0;
@@ -19,19 +19,8 @@
   border-radius: 10rpx;
 }
 
-.pause{
-  background-color: rgba(0,0,0,0.2);
-  position: absolute;
-  z-index: 20;
-}
-
-.music-player-play{
-  width:102rpx;
-  height:120rpx;
-}
-
 .main{
-  margin-top: 495rpx;
+  margin-top: 575rpx;
   width:100%;
   align-items: flex-start;
   background-color: #fff;
@@ -51,4 +40,23 @@
   width:21rpx;
   height:20rpx;
   margin-right: 20rpx;
+}
+
+.music-player-play{
+  width:60rpx;
+  height:60rpx;
+  margin: 20rpx;
+}
+
+.music-player-pause-lines{
+  width:60rpx;
+  height:60rpx;
+  margin: 20rpx;
+}
+
+.btnUp{
+  width:60rpx;
+  height:60rpx;
+  background-color: rgba(240,240,240,0.6);
+  margin-top: -80rpx;
 }

pages/other/lessonlist.js

@@ -0,0 +1,34 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List: ['预备课','第1课','第2课','第3课'],
+  },
+  onLoad: function () {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  gotoLesson: function (e) {
+    var id=e.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: '../other/lesson?LessonID='+id,
+    });
+  },
+  gotoUserList: function (e) {
+    wx.navigateTo({
+      url: '../other/userlist',
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/lessonlist.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/other/lessonlist.wxml

@@ -0,0 +1,18 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="main FlexColumn">
+    <block wx:for="{{List}}" wx:key="index">
+      <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{index+1}}">
+        <view class="panelItem1">
+          {{item}}
+        </view>
+        <view class="panelItem2 FlexRow">
+          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+        </view>
+      </view>
+      <view class='lineFooter'></view>
+    </block>
+  </view>
+  
+  <view style='height:100rpx;'></view>
+  <button bindtap='gotoUserList'>审核用户</button>
+</view>

pages/other/lessonlist.wxss

@@ -0,0 +1,37 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+}
+
+.main{
+  width: 100%;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  height: 100rpx;
+  background-color: #fff;
+}
+
+.panelItem1 {
+  margin-left: 30rpx;
+  justify-content: flex-start;
+  font-weight: 400;
+  font-size:28rpx;
+}
+
+.panelItem2 {
+  margin-right: 30rpx;
+  color: #787878;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+

pages/other/payinfo.wxml

@@ -1,5 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <image class='imageDM' src="http://miaguo-1253256735.file.myqcloud.com/DM.png" ></image>
   <view class='btn' bindtap='gotoProgram'>报名</view>
-  <text class="text">完成报名完成\n如未能自动刷新结果，请手动下拉刷新</text>
+  <view style='height:100rpx;'></view>
+  <!-- <text class="text">完成报名完成\n如未能自动刷新结果，请手动下拉刷新</text> -->
 </view>

pages/other/userlist.js

@@ -0,0 +1,81 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function () {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+    this.init();
+  },
+  onPullDownRefresh:function(){
+    this.init();
+    var that = this;
+    that.setData({
+      SearchInfo: "",
+    });
+    wx.stopPullDownRefresh();
+  },
+  init: function () {
+    wx.showLoading({
+      title: '请稍候',
+    });
+    var that = this;
+    main.getData("GetApprovalUserList", function (data) {
+      wx.hideLoading();
+      that.setData({
+        List: data,
+      });
+    });
+  },
+  switch2Change: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var isMember = 0;
+    if (e.detail.value)
+      isMember = 1;
+
+    main.getData("UpdateUserMemberInfo?UserID=" + id + "&IsMember=" + isMember, function (data) {
+      var title = "权限已关";
+      if (isMember == 1)
+        title = "权限已开";
+      wx.showToast({
+        title: title,
+      });
+    });
+  },
+  onKeyInput: function (e) {
+    var search = e.detail.value;
+    var that = this;
+    that.setData({
+      SearchInfo: search,
+    });
+  },
+  search: function () {
+    if (this.data.SearchInfo) {
+      var list = [];
+      for (var i = 0; i < this.data.List.length; i++) {
+        if (this.data.List[i].NickName.indexOf(this.data.SearchInfo) >= 0) {
+          list.push(this.data.List[i]);
+        }
+      }
+      this.setData({
+        List: list,
+      });
+    }
+    else {
+      this.init();
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/userlist.json

@@ -0,0 +1,3 @@
+{
+  "enablePullDownRefresh": true
+}

pages/other/userlist.wxml

@@ -0,0 +1,28 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelSearch FlexRow">
+    <view class="panelSearch1 FlexRow">
+      <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
+      <input class='input' maxlength='50' bindinput="onKeyInput" value="{{SearchInfo}}" />
+      <view class='btnSearch' bindtap='search'>搜索</view>
+    </view>
+  </view>
+  
+  <view class='lineFooter'></view>
+  <view class="main FlexColumn">
+    <block wx:for="{{List}}" wx:key="index">
+      <view class="panelItem FlexRow" bindtap="gotoLesson" data-id="{{item.UserID}}">
+        <view class="panelItem1 FlexRow">
+          <image class='avatar' src="{{item.AvatarUrl}}" />
+          <view>{{item.NickName}}</view>
+          <view class='time'>{{item.CreateTime}}</view>
+        </view>
+        <view class="panelItem2 FlexRow">
+          <switch checked='{{item.IsMember}}' bindchange="switch2Change" data-id="{{item.UserID}}" />
+        </view>
+      </view>
+      <view class='lineFooter'></view>
+    </block>
+  </view>
+  
+  <view style='height:100rpx;'></view>
+</view>

pages/other/userlist.wxss

@@ -0,0 +1,86 @@
+.container {
+  justify-content: flex-start;
+  font-weight: 500;
+}
+
+
+.panelSearch{
+  width:100%;
+  height:140rpx;
+  background-color: #fff;
+}
+.panelSearch1{
+  width:690rpx;
+  height:80rpx;
+  margin: 20rpx 0 40rpx 0;
+  border-radius: 14rpx;
+  background-color: #F0F0F0;
+  color:#787878;
+  font-size:28rpx;
+  font-weight: 400;
+  justify-content: flex-start;
+}
+
+.universalpic_search_gray_30x30{
+  width:30rpx;
+  height:30rpx;
+  margin: 0 20rpx 0 30rpx;
+}
+
+.input{
+  font-size:32rpx;
+  font-weight: 400;
+  color:#1e1e1e;
+  width:500rpx;
+  height:40rpx;
+}
+
+.btnSearch{
+  margin-right: 0rpx;
+  width:80rpx;
+  font-size:24rpx;
+  border-radius: 5rpx;
+  height:50rpx;
+  background-color: #dddddd;
+  text-align: center;
+  line-height: 50rpx;
+}
+
+.main{
+  width: 100%;
+}
+
+.panelItem {
+  width: 100%;
+  justify-content: space-between;
+  font-size: 28rpx;
+  height: 100rpx;
+  background-color: #fff;
+  margin-top: 10rpx;
+}
+
+.panelItem1 {
+  margin-left: 30rpx;
+  justify-content: flex-start;
+  font-weight: 400;
+  font-size:28rpx;
+}
+
+.panelItem2 {
+  margin-right: 30rpx;
+  color: #787878;
+  font-size:28rpx;
+  font-weight: 400;
+}
+
+.avatar{
+  width:100rpx;
+  height:100rpx;
+  margin-right: 30rpx;
+}
+
+.time{
+  margin-left: 30rpx;
+  font-size:24rpx;
+  color:#787878;
+}

project.config.json

@@ -40,7 +40,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 3,
+			"current": 2,
 			"list": [
 				{
 					"id": 0,
@@ -59,7 +59,7 @@
 				{
 					"id": 2,
 					"name": "临时",
-					"pathName": "pages/other/lesson",
+					"pathName": "pages/other/userlist",
 					"query": "",
 					"scene": null
 				},
@@ -67,7 +67,7 @@
 					"id": 3,
 					"name": "临时",
 					"pathName": "pages/index/index",
-					"query": "LessonID=1",
+					"query": "LessonID=1&LessonPage=2",
 					"scene": null
 				}
 			]

utils/main.js

@@ -536,6 +536,22 @@ function getTempImage(serverUrl) {
   return serverUrl;
 }
 
+
+function getServerImage(tempUrl) {
+  if (tempUrl.indexOf("http") < 0) {
+    var list = wx.getStorageSync("TempImageList");
+    if (!list)
+      list = [];
+    for (var i = 0; i < list.length; i++) {
+      if (list[i].TempUrl == tempUrl) {
+        return list[i].ServerUrl;
+        break;
+      }
+    }
+    return ""
+  }
+}
+
 function saveTempImage(serverUrl, tempUrl) {
   if (tempUrl.indexOf("http") < 0) {
     var list = wx.getStorageSync("TempImageList");
@@ -2335,4 +2351,5 @@ module.exports = {
   UpdateMiaoguoCardTodayAll: UpdateMiaoguoCardTodayAll,
   setCollect: setCollect,
   UploadUserConfig: UploadUserConfig,
+  getServerImage: getServerImage,
 }