1.0.1

app.js

@@ -11,8 +11,8 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.0.0",
-    IsProduction: false,
+    Version: "1.0.1",
+    IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
     ShareTitle:"赢在阅读起跑线",
@@ -34,5 +34,6 @@ App({
     BaiduToken:"",//百度开发平台token
     IsShow: 0,
     NewUserNumberMax:6,//邀请新用户最大值
+    IsSaveCustom:false,//是否保存了定制
   }
 })

app.json

@@ -4,6 +4,7 @@
     "pages/main/list",
     "pages/main/detail",
     "pages/main/search",
+    "pages/main/setcombine",
     "pages/about/about",
     "pages/about/cooperation",
     "pages/about/payfinished",

pages/main/detail.js

@@ -99,6 +99,12 @@ Page({
       this.submitData();
 
   },
+  onShow: function (e) {
+    if (app.globalData.IsSaveCustom) {
+      isEditSetting.push("saveCustom");
+      app.globalData.IsSaveCustom=false;
+    }
+  },
   onUnload: function () {
     clearInterval(intervalAutoPage);
 
@@ -135,6 +141,15 @@ Page({
         for (var j = 0; j < arr[i].Units.length; j++) {
           var item = arr[i].Units[j];
           if (item.ID == this.data.UnitID) {
+            //查看用户有没有自定义
+            var wordArr = wx.getStorageSync("UnitCustom");
+            if (wordArr) {
+              for (var k = 0; k < wordArr.length; k++) {
+                if (wordArr[k].ID == this.data.UnitID) {
+                  item.Words = wordArr[k].List;
+                }
+              }
+            }
             for (var k = 0; k < item.Words.length; k++) {
               item.Words[k].PinyinAll = item.Words[k].Pinyin;
               if (item.Words[k].Pinyin.indexOf(",") > 0)
@@ -144,7 +159,7 @@ Page({
 
               item.Words[k].IsReview = false;
               for (var l = 0; l < arrReview.length; l++) {
-                if (arrReview[l].Word == item.Words[k].Name) {
+                if (arrReview[l].Name == item.Words[k].Name) {
                   item.Words[k].IsReview = true;
                   break;
                 }
@@ -195,6 +210,20 @@ Page({
       result = common.randomArray(result);
     }
 
+    var wordArr = wx.getStorageSync("UnitCustom");
+    if (wordArr) {
+      for (var k = 0; k < wordArr.length; k++) {
+        for (var n = 0; n < wordArr[k].List.length; n++) {
+          for (var i = 0; i < result.length;i++){
+            if (wordArr[k].List[n].ID == result[i].ID) {
+              result[i].CombineWords=wordArr[k].List[n].CombineWords;
+              break;
+            }
+          }
+        }
+      }
+    }
+
     var obj = {
       Title: "复习",
       Title2: "到底了",
@@ -517,8 +546,10 @@ Page({
 
     if (isEditSetting.length > 0) {
       for (var i = 0; i < isEditSetting.length; i++) {
-        if (isEditSetting[i] == "page" || isEditSetting[i] == "sort") {
-          that.data.CurrentIndex = 0;
+        if (isEditSetting[i] == "page" || isEditSetting[i] == "saveCustom" || isEditSetting[i] == "sort") {
+          if (isEditSetting[i] != "saveCustom")
+            that.data.CurrentIndex = 0;
+
           if (that.data.WordType == "normal")
             that.init();
           else if (that.data.WordType == "review")
@@ -697,6 +728,12 @@ Page({
       });
     }
   },
+  setCombine: function (e) {
+    var id = e.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: '../main/setcombine?id=' + id,
+    });
+  },
   setRemind: function (str, css) {
     var that = this;
     that.setData({

pages/main/detail.wxml

@@ -225,10 +225,10 @@
     </view>
     <switch class='title2_2' checked="{{IsAudioLengthChecked}}" bindchange="settingAudioLength" />
   </view>
-  <view class="line FlexColumn" wx:if="{{!IsAutoPage}}">
+  <view class="line FlexColumn" wx:if="{{!IsAutoPage && WordType == 'normal'}}">
     <view class="line1"></view>
   </view>
-  <view class="title2 FlexRow" bindtap='showSettingMenu' data-status="speaker" wx:if="{{!IsAutoPage}}">
+  <view class="title2 FlexRow" bindtap='setCombine' data-id="{{UnitID}}" wx:if="{{!IsAutoPage && WordType == 'normal'}}">
     <view class="title2_1">首选词语</view>
     <view class="title2_2 FlexRow">
       <image src='../../images/Arrow.png' class="Arrow" />

pages/main/index.js

@@ -223,11 +223,26 @@ Page({
 
         if (data.IsShow)
           app.globalData.IsShow = data.IsShow;
+        else
+          app.globalData.IsShow = 0;
 
         app.globalData.userInfo.IsMember = data.IsMember;
 
       }
     });
+
+    var UnitCustom = wx.getStorageSync("UnitCustom");
+    if (!UnitCustom) {
+      var that = this;
+      server.getData('GetHanziCustomList?UserID=' + app.globalData.userInfo.UserID, function (data) {
+        if (data && data.length>0) {
+          for (var n = 0; n < data.length; n++) {
+            data[n].List = JSON.parse(data[n].List);
+          }
+          wx.setStorageSync("UnitCustom", data);
+        }
+      });
+    }
   },
   selectNav: function (e) {
     var id = e.currentTarget.dataset.id;

pages/main/list.js

@@ -63,7 +63,7 @@ Page({
 
           if (item.WordLength % 6 > 0) {
             var count = 6 - (item.WordLength % 6);
-            console.log(count);
+            //console.log(count);
             for (var n = 0; n < count; n++) {
               var obj = {
                 Name: "",

pages/main/list.wxml

@@ -18,7 +18,10 @@
     <view class="line2 line">
     </view>
     <view class="list2 FlexColumn">
-      <view class="btn" bindtap="goto" data-bookid='{{BookID}}' data-islocked='{{item.IsLocked}}' data-unitid='{{item.ID}}' data-isfinished='{{item.IsFinished}}' wx:for="{{List}}" wx:key="index">
+      <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" />
@@ -26,6 +29,7 @@
             <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" />
             <view class="title">{{item.Example}}</view>
           </view>
           <view class="right FlexColumn">

pages/main/setcombine.js

@@ -0,0 +1,103 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+Page({
+  data: {
+
+  },
+  onLoad: function (options) {
+    var unitid = options.id;
+    this.setData({
+      Height: common.getSystemHeight(),
+      UnitID: unitid,
+    });
+    this.init();
+  },
+  init: function () {
+    var that = this;
+    server.getData('GetHanziWordListByUnitID?UnitID=' + this.data.UnitID + "&UserID=" + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          List: data,
+        })
+      }
+    });
+  },
+  changeSelected: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var name = e.currentTarget.dataset.name;
+    for (var i = 0; i < this.data.List.length; i++) {
+      if (this.data.List[i].ID == id) {
+        for (var j = 0; j < this.data.List[i].CombineWords.length; j++) {
+          var item = this.data.List[i].CombineWords[j];
+          if (item.name == name) {
+            if (item.css == "")
+              item.css = "selected";
+            else
+              item.css = "";
+            break;
+          }
+        }
+      }
+    }
+    this.setData({
+      List: this.data.List,
+    })
+  },
+  save: function () {
+    var result=[];
+    for (var i = 0; i < this.data.List.length; i++) {
+      var word=[];
+      for (var j = 0; j < this.data.List[i].CombineWords.length; j++) {
+        var item = this.data.List[i].CombineWords[j];
+        if (item.css == "selected"){
+          word.push(item.name);
+        }
+      }
+      this.data.List[i].CombineWords=word.join(",");
+      result.push(this.data.List[i]);
+    }
+
+    var UnitCustom = wx.getStorageSync("UnitCustom");
+    if (UnitCustom){
+      var b=false;
+      for(var i=0;i<UnitCustom.length;i++){
+        if (UnitCustom[i].ID==this.data.UnitID){
+          UnitCustom[i].List=result;
+          b=true;
+          break;
+        }
+      }
+
+      if (!b){
+        UnitCustom.push({
+          ID:this.data.UnitID,
+          List:result,
+        })
+      }
+    }
+    else{
+      UnitCustom=[];
+      UnitCustom.push({
+        ID: this.data.UnitID,
+        List: result,
+      })
+    }
+
+    wx.setStorageSync("UnitCustom", UnitCustom);
+    
+    
+    server.postData('AddHanziCustom',{
+      UserID: app.globalData.userInfo.UserID,
+      UnitID: this.data.UnitID,
+      UnitCustom: JSON.stringify(result),
+    }, function (data) {});
+
+    app.globalData.IsSaveCustom=true;
+    
+    wx.navigateBack({
+      delta: 1
+    });
+  },
+})

pages/main/setcombine.json

@@ -0,0 +1,7 @@
+{
+  "navigationBarBackgroundColor": "#F0F0F0",
+  "navigationBarTitleText": "首选词语",
+  "enablePullDownRefresh": false,
+  "backgroundColor": "#F0F0F0",
+  "disableScroll": false
+}

pages/main/setcombine.wxml

@@ -0,0 +1,21 @@
+<view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
+  <view class="panel1">
+    <view class="text">调整本章节范围内“组词播报”的首选词语。每组中，第一或第二个词语来自课文，之后是扩展阅读中常见词汇。确认修改按“完成”。</view>
+  </view>
+  <view class="panel1 FlexColumn" wx:for="{{List}}" wx:key="index">
+    <view class="word FlexRow">
+      <view class="word1 FlexRow"><view>{{item.Name}}</view><view class="pinyin">{{item.Pinyin}}</view></view>
+    </view>
+    <view class="combine FlexRow">
+      <view class="combine1 FlexRow">
+        <view bindtap='changeSelected' data-id="{{item.ID}}" data-name="{{itemChild.name}}" class="{{itemChild.css}} word2" wx:for="{{item.CombineWords}}" wx:for-item="itemChild" wx:key="i">{{itemChild.name}}</view>
+      </view>
+    </view>
+  </view>
+  <view style='height:200rpx;'></view>
+  <view class="bottom FlexColumn" bindtap='save'>
+    <view class="bottom1 FlexRow">
+      完成
+    </view>
+  </view>
+</view>

pages/main/setcombine.wxss

@@ -0,0 +1,85 @@
+.container {
+  background-color: #F0F0F0;
+  justify-content: flex-start;
+  font-weight: 500;
+}
+
+.panel1{
+  width: 100%;
+  background-color: #fff;
+}
+.panel1 .text{
+  width: 690rpx;
+  margin: 40rpx 30rpx;
+  font-size:24rpx;
+  color:#1e1e1e;
+  font-weight: 400;
+  line-height: 35rpx;
+}
+
+.panel1 .word{
+  width: 100%;
+  height:125rpx;
+  background-color: #F0F0F0;
+  justify-content: flex-start;
+}
+
+.panel1 .word1{
+  font-size:32rpx;
+  margin: 50rpx 0 30rpx 30rpx;
+}
+
+.panel1 .pinyin{
+  margin-left: 30rpx;
+  font-family: 'GB Pinyinok-C';
+  font-weight: normal;
+  font-style: normal;
+}
+
+.panel1 .combine{
+  width: 100%;
+}
+
+.panel1 .combine1{
+  margin: 30rpx 20rpx 10rpx 20rpx;
+  width: 710rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+  flex-wrap: wrap;
+}
+.panel1 .word2{
+  font-size:28rpx;
+  margin: 0 10rpx 20rpx 10rpx;
+  padding: 6rpx 10rpx;
+}
+.panel1 .selected{
+  background-color: #F5E2BE;
+  border-radius: 6rpx;
+  padding: 6rpx 10rpx;
+}
+
+.container .bottom{
+  width:100%;
+  height:160rpx;
+  position: fixed;
+  bottom:0;
+  background-color: #CDB797;
+  justify-content: flex-end;
+  z-index: 100;
+}
+.container .bottom1{
+  width:100%;
+  height:140rpx;
+  background-color: #1B1B1B;
+  text-align: center;
+  line-height: 140rpx;
+  font-size: 48rpx;
+  color: #f0f0f0;
+}
+
+.container .bottom1 .btn{
+  width:20%;
+  height:120rpx;
+}
+
+

project.config.json

@@ -1,7 +1,7 @@
 {
 	"description": "项目配置文件。",
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
@@ -64,9 +64,9 @@
 				},
 				{
 					"id": 5,
-					"name": "\b活动",
-					"pathName": "pages/about/paylist",
-					"query": ""
+					"name": "\b首选词语",
+					"pathName": "pages/main/setcombine",
+					"query": "id=1"
 				}
 			]
 		}