1.0.5

app.js

@@ -25,7 +25,7 @@ App({
     serverUrl: "https://www.kylx365.com/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
     serverUrlLocalhost: "http://localhost:3020/apiData/",
-    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=6&pit=5",
+    audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=4&spd=6&pit=5",
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
     

pages/index/guide.wxss

@@ -7,13 +7,13 @@
   width: 100%;
   height: 1206rpx;
   position: fixed;
-  top: 0;
+  top:0;
 }
 
 .panel{
   width:100%;
   position: fixed;
-  top: 0;
+  bottom: 130rpx;
 }
 .welcomeguide_info {
   width: 630rpx;
@@ -36,4 +36,5 @@
   line-height: 130rpx;
   color:#713312;
   font-size: 48rpx;
+  font-weight: 700;
 }

pages/index/index.json

@@ -1,6 +1,6 @@
 {
   "navigationBarBackgroundColor": "#213A5B",
-  "navigationBarTextStyle": "white",
+  "navigationBarTextStyle": "black",
   "navigationBarTitleText": "",
   "backgroundColor": "#213A5B",
   "backgroundTextStyle": "light",

pages/index/index.wxss

@@ -15,7 +15,10 @@
   top: 142rpx;
   color: #fff;
   font-size: 48rpx;
-  text-shadow: 0 7rpx 0 #112331;
+  text-shadow: 0 5rpx 0 #112331;
+  letter-spacing:5px;
+  text-align: center;
+  margin-left: 5rpx;
 }
 
 .panel {

pages/main/answer.json

@@ -2,7 +2,7 @@
   "navigationBarBackgroundColor": "#326FAE",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "答案资料室",
-  "backgroundColor": "#326FAE",
+  "backgroundColor": "#213a53",
   "backgroundTextStyle": "light",
   "enablePullDownRefresh": false
 }

pages/main/answer.wxml

@@ -7,15 +7,25 @@
     <view class="panelTop0 FlexColumn">
       <view class="panelTop00 FlexRow" wx:if="{{IsEdit}}" bindtap="deleteItem">
         <image class="universalpic_select_on_white" src="../../images/universalpic_select_on_white.png" />
-        <view class="text">删除选中 {{SelectedCount}} 个</view>
+        <view class="textTitle0 textTitle">
+          <view class="textTitle10 textTitle1">删除选中 {{SelectedCount}} 个</view>
+          <view class="textTitle2">删除选中 {{SelectedCount}} 个</view>
+        </view>
       </view>
       <view class="line" wx:if="{{IsEdit}}"></view>
     </view>
     <view class="panelTop1 FlexRow" bindtap='btnEdit'>
       <view class="btn" wx:if="{{IsEdit}}"></view>
       <view class="btn2 btn" wx:if="{{!IsEdit}}"></view>
-      <view class="text2 text" wx:if="{{IsEdit}}">完成</view>
-      <view class="text2 text" wx:if="{{!IsEdit}}">编辑</view>
+
+      <view class="textTitle" wx:if="{{IsEdit}}">
+        <view class="textTitle1">完成</view>
+        <view class="textTitle2">完成</view>
+      </view>
+      <view class="textTitle" wx:if="{{!IsEdit}}">
+        <view class="textTitle1">整理</view>
+        <view class="textTitle2">整理</view>
+      </view>
     </view>
   </view>
 

pages/main/answer.wxss

@@ -56,13 +56,35 @@
   background-color: #b98043;
 }
 
-.panelTop .text {
-  color: #fff;
+.panelTop .textTitle {
   font-size: 26rpx;
-  text-shadow: 3rpx 3rpx 3rpx #906a3c,
-                 3rpx -3rpx 3rpx #906a3c,
-                 -3rpx 3rpx 3rpx #906a3c,
-                 -3rpx -3rpx 3rpx #906a3c;
+  font-weight: 500;
+  width:52rpx;
+  height:37rpx;
+}
+
+.panelTop .textTitle0 {
+  width:155rpx;
+  height:37rpx;
+}
+
+.panelTop .textTitle1 {
+  -webkit-text-stroke:8rpx #c34738;
+  position: absolute;
+  text-align: center;
+  line-height: 37rpx;
+}
+
+
+.panelTop .textTitle10 {
+  -webkit-text-stroke:8rpx #906A3C;
+}
+
+.panelTop .textTitle2 {
+  color: #fff;
+  position: absolute;
+  text-align: center;
+  line-height: 37rpx;
 }
 
 .panelTop .btn {
@@ -71,19 +93,12 @@
   background-color: #9ee74f;
   margin-right: 10rpx;
   border-radius: 3rpx;
-  box-shadow: 0px 3px 0px rgba(0, 0, 0, 0.10);
 }
 
-.panelTop .btn {
+.panelTop .btn2 {
   background-color: #f0be7b;
 }
 
-.panelTop .text2 {
-  text-shadow: 3rpx 3rpx 6rpx #c34738,
-                 3rpx -3rpx 6rpx #c34738,
-                 -3rpx 3rpx 6rpx #c34738,
-                 -3rpx -3rpx 6rpx #c34738;
-}
 
 .universalpic_select_on_white {
   width: 30rpx;
@@ -210,11 +225,13 @@
 
 .itemChild .title1 {
   font-size: 20rpx;
+  font-weight: 500;
 }
 
 .itemChild .title2 {
   font-size: 30rpx;
   color: #c9c9c9;
+  font-weight: 500;
 }
 
 .itemChild .title3 {

pages/main/default.wxml

@@ -2,21 +2,22 @@
   <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" />
+      <image class="homepage_headline_info" src="../../images/homepage_headline_info.png" />
     </scroll-view>
   </scroll-view>
 
   <view class="panel FlexColumn">
-    
+
     <view class="line1"></view>
     <view class="panel0 FlexRow">
       <view class="panel00 FlexColumn">
-        
+
         <view class="panel000 FlexRow">
-        <view class="line2"></view>
-          <view class="text">选题</view>
-          <view class="text">+</view>
-          <view class="text">打印</view>
+          <view class="line2"></view>
+          <view class="textTitle">
+            <view class="textTitle1">选题 + 打印</view>
+            <view class="textTitle2">选题 + 打印</view>
+          </view>
         </view>
         <view class="panel001 FlexRow">
           <view class="panel0010 FlexRow">
@@ -28,7 +29,10 @@
         <view class="panel002 FlexRow">
           <view class="panel0020 FlexRow">
             <view class="panel00200 FlexColumn">
-              <view class="text0">批改</view>
+              <view class="textTitle3">
+                <view class="textTitle4">批改</view>
+                <view class="textTitle5">批改</view>
+              </view>
               <view class="line3"></view>
               <view class="panel002000 FlexRow">
                 <view class="text1">试卷张数</view>
@@ -46,14 +50,14 @@
                     登录
                   </view>
                 </button>
-                
+
                 <view class="btn2 btn" bindtap='gotoAnswer' wx:if="{{!IsAccredit}}">
                   <view class="btn3 btn1">
-                    答案
+                    对答案
                   </view>
                 </view>
 
-                <view class="btn6 btn2 btn' " wx:if="{{IsAccredit}}" bindtap='gotoAnswer' >
+                <view class="btn6 btn2 btn' " wx:if="{{IsAccredit}}" bindtap='gotoAnswer'>
                   <view class="btn3 btn1">
                     对答案
                   </view>
@@ -103,7 +107,7 @@
                   <image class="universalpic_product_kousuan_icon_size01" src="../../images/{{item.imageName}}.png" />
                   <view class="text">{{item.Name}}</view>
                 </view>
-                <image class="universalpic_indicator_pink" src="../../images/universalpic_indicator_pink.png" />
+                <image class="universalpic_indicator_maroon" src="../../images/universalpic_indicator_pink.png" />
               </view>
               <view class="line"></view>
             </block>
@@ -114,5 +118,4 @@
   </view>
 </view>
 <image hidden="{{HelpHidden1}}" bindtap='closeHelp' class="Help_aside_homepage" src="../../images/Help_aside_homepage.png" />
-<audio hidden='true' id="myAudio"></audio>
-              
+<audio hidden='true' id="myAudio"></audio>

pages/main/default.wxss

@@ -1,6 +1,7 @@
 .container {
   background-color: #583027;
   justify-content: flex-start;
+  font-weight: 500;
 }
 
 .scroll-view_H {
@@ -42,7 +43,7 @@
 }
 
 .panel .line2 {
-  width: 100%;
+  width: 680rpx;
   height: 10rpx;
   background-color: rgba(0, 0, 0, 0.30);
   position: absolute;
@@ -66,15 +67,25 @@
   width: 100%;
   height: 90rpx;
   background-color: #4f2921;
-  position: relative;
 }
 
-
-.panel000 .text {
-  margin: 0 6rpx;
-  color: #e3e3e3;
+.panel000 .textTitle {
   font-size: 36rpx;
-  text-shadow: 8rpx 8rpx 6rpx #1e1e1e, -8rpx -8rpx 6rpx #1e1e1e;
+  font-weight: 500;
+  width: 180rpx;
+  height:50rpx;
+}
+.panel000 .textTitle1 {
+  -webkit-text-stroke:10rpx #471e1c;
+  position: absolute;
+  text-align: center;
+  line-height: 50rpx;
+}
+.panel000 .textTitle2 {
+  color: #e3e3e3;
+  position: absolute;
+  text-align: center;
+  line-height: 50rpx;
 }
 
 .panel001 {
@@ -124,7 +135,7 @@
   height: 116rpx;
   position: absolute;
   left: 230rpx;
-  top: 5rpx;
+  top: -17rpx;
 }
 
 .homepage_clipboard_illus_ruler {
@@ -147,14 +158,23 @@
   font-weight: 500;
 }
 
-.panel00200 .text0 {
+.panel00200 .textTitle3 {
   font-size: 36rpx;
-  color: #fff;
   margin-top: 70rpx;
-  text-shadow: -3rpx -3rpx 4rpx #bd682d,
-                 -3rpx 3rpx 4rpx #bd682d,
-                 3rpx -3rpx 4rpx #bd682d,
-                 3rpx 3rpx 4rpx #bd682d;
+  font-weight: 500;
+  position: relative;
+  width: 72rpx;
+  height:50rpx;
+}
+.panel00200 .textTitle4 {
+  -webkit-text-stroke:10rpx #bd682d;
+  position: absolute;
+  text-align: center;
+}
+.panel00200 .textTitle5 {
+  color: #fff;
+  position: absolute;
+  text-align: center;
 }
 
 .panel00200 .line3 {
@@ -328,6 +348,7 @@
 .panel003110 {
   margin-left: 40rpx;
   font-size:28rpx;
+  font-weight: 400;
 }
 
 
@@ -338,7 +359,7 @@
   margin-right: 20rpx;
 }
 
-.universalpic_indicator_pink {
+.universalpic_indicator_maroon {
   width: 16rpx;
   height: 26rpx;
   margin-right: 30rpx;

pages/main/detail.js

@@ -91,6 +91,7 @@ Page({
   getFinish: function () {
     this.setData({
       ShowLoading: true,
+      BtnText: "全部保存到相册",
     });
     wx.hideLoading();
     arrAnswerID = [];
@@ -397,40 +398,44 @@ Page({
           } 
           else {
             //生成图片完成
-            that.setData({
-              ShowLoading: false,
-            });
-
-            wx.pageScrollTo({
-              scrollTop: 0,
-              duration: 300
-            });
-            // wx.previewImage({
-            //   current: that.data.arrPage[0], // 当前显示图片的http链接
-            //   urls: that.data.arrPage // 需要预览的图片http链接列表
-            // });
-
-            //存列表
-            var tempList = wx.getStorageSync("AnswerList");
-            if (!tempList)
-              tempList=[];
-            for(var x=0;x<tempAnswerList.length;x++){
-              var tempItem = tempAnswerList[x];
-              var id=x*tempItem.PageCount;
-              var arr=[];
-              for(var y=0;y<tempItem.QuestionList.length;y++){
-                if (y >= id && y < id + tempItem.PageCount){
-                  arr.push(tempItem.QuestionList[y]);
+            setTimeout(function(){
+              that.setData({
+                ShowLoading: false,
+              });
+              wx.pageScrollTo({
+                scrollTop: 0,
+                duration: 300
+              });
+              // wx.previewImage({
+              //   current: that.data.arrPage[0], // 当前显示图片的http链接
+              //   urls: that.data.arrPage // 需要预览的图片http链接列表
+              // });
+
+              //存列表
+              var tempList = wx.getStorageSync("AnswerList");
+              if (!tempList)
+                tempList = [];
+              for (var x = 0; x < tempAnswerList.length; x++) {
+                var tempItem = tempAnswerList[x];
+                var id = x * tempItem.PageCount;
+                var arr = [];
+                for (var y = 0; y < tempItem.QuestionList.length; y++) {
+                  if (y >= id && y < id + tempItem.PageCount) {
+                    arr.push(tempItem.QuestionList[y]);
+                  }
                 }
+                tempItem.QuestionList = arr;
+                tempList.unshift(tempItem);
               }
-              tempItem.QuestionList=arr;
-              tempList.unshift(tempItem);
-            }
-            wx.setStorageSync("AnswerList", tempList);
+              wx.setStorageSync("AnswerList", tempList);
+
+              common.getStorageValue(that, "HelpHidden7", false, function () {
+                that.showHelp2();
+              });
+
+            },3000);
+            
 
-            common.getStorageValue(that, "HelpHidden7", false, function () {
-              that.showHelp2();
-            });
             
           }
         }
@@ -480,6 +485,7 @@ Page({
               });
               that.setData({
                 IsDistabled: "Distabled",
+                BtnText: "已保存",
               });
               wx.pageScrollTo({
                 scrollTop: 400,
@@ -502,11 +508,11 @@ Page({
     var id = Number(e.currentTarget.dataset.id);
     this.data.PageNumber += id;
     var addDisabled="",subDisabled="";
-    if (this.data.PageNumber < 1){
+    if (this.data.PageNumber <= 1){
       this.data.PageNumber = 1;
       subDisabled ="btnAddSubDisabled";
     }
-    else if (this.data.PageNumber > 4){
+    else if (this.data.PageNumber >= 4){
       this.data.PageNumber = 4;
       addDisabled = "btnAddSubDisabled";
     }

pages/main/detail.json

@@ -2,7 +2,7 @@
   "navigationBarBackgroundColor": "#E5A744",
   "navigationBarTextStyle": "black",
   "navigationBarTitleText": "制作车间",
-  "backgroundColor": "#E5A744",
+  "backgroundColor": "#4F4745",
   "backgroundTextStyle": "light",
   "enablePullDownRefresh": false
 }

pages/main/detail.wxml

@@ -69,6 +69,7 @@
         </view>
       </view>
     </view>
+    <view style='height:230rpx'></view>
   </block>
 
   <block wx:if="{{IsFinished}}">
@@ -87,7 +88,7 @@
       </view>
       <view class="btn2{{IsDistabled}} btn" bindtap='saveImageFile'>
         <view class="btn1{{IsDistabled}} btn1">
-          全部保存到相册
+          {{BtnText}}
         </view>
       </view>
       <image class="universalpic_line_dashed_size01" src="../../images/universalpic_line_dashed_size01.png" />
@@ -109,6 +110,7 @@
         </view>
       </view>
     </view>
+    <view style='height:170rpx'></view>
   </block>
   <view class="line5"></view>
 
@@ -125,12 +127,6 @@
       <image wx:if="{{filter=='vertical'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
 
     </view>
-    <!-- <view class="line"></view>
-    <view class="panel FlexRow" bindtap='menuClick' data-id="all">
-      <view>横式+竖式</view>
-      <image wx:if="{{filter=='all'}}" class="universalpic_select_on_black" src="../../images/universalpic_select_on_black.png" />
-
-    </view> -->
     <view class="line"></view>
     <view class="line2"></view>
     <view class="line"></view>
@@ -146,12 +142,12 @@
   <view class="loading1 FlexColumn">
     <view class="line1"></view>
     <view class="line2 FlexColumn">
-      <view class="text">正在生成第 {{arrPage.length}} 张图片</view>
-      <view class="text2">共有 {{PageNumber}} 张图片，可能需要{{WaitTime}}</view>
+      <view class="textLoading1">正在生成第 {{arrPage.length}} 张图片</view>
+      <view class="textLoading2">共有 {{PageNumber}} 张图片，可能需要{{WaitTime}}</view>
     </view>
     <view class="line3 FlexColumn">
-      <view class="text3">使用建议</view>
-      <view class="text4">每张卷子里的题目都是动态生成哒，每次出题都会得到不同的结果。</view>
+      <view class="textLoading3">使用建议</view>
+      <view class="textLoading4">每张卷子里的题目都是动态生成哒，每次出题都会得到不同的结果。</view>
     </view>
     <view class="line4"></view>
     <image class="universalpic_attention_light_red_bg" src="../../images/universalpic_attention_light_red_bg.png" />

pages/main/detail.wxss

@@ -2,6 +2,7 @@
   background-color: #4F4745;
   justify-content: flex-start;
   width: 100%; 
+  font-weight: 500;
 }
 
 .makepaper_headline_illus_lab{
@@ -100,6 +101,7 @@
 .panel1 .text1{
   font-size:36rpx;
   margin-top: 60rpx;
+  font-weight: 600;
 }
 .panel1 .text2{
   font-size:36rpx;
@@ -145,6 +147,7 @@
 .panel1 .text4{
   font-size:36rpx;
   margin-top: 40rpx;
+  font-weight: 600;
 }
 
 .universalpic_value_cell_size01{
@@ -168,12 +171,13 @@
 }
 .panel1 .btnAddSubDisabled{
   background-color: rgba(46, 46, 46, 0.7);
+  height:64rpx;
 }
 
 .panel1 .Number{
   color:#D2D2D2;
   font-size: 36rpx;
-  margin-top: 0rpx;
+  margin-top: 10rpx;
 }
 
 .panel1 .text5{
@@ -204,6 +208,7 @@
   text-align: center;
   color: #DEC2B8;
   font-size: 56rpx;
+  font-weight: 600;
 }
 
 .btn {
@@ -255,8 +260,7 @@
   background-color: #262626;
   margin-top: 40rpx;
   z-index: 10;
-  border-bottom-left-radius: 20rpx;
-  border-bottom-right-radius: 20rpx;
+  border-radius: 20rpx;
   box-shadow: 0px 10px 0px rgba(0, 0, 0, 0.10);
   justify-content: flex-start;
 }
@@ -380,6 +384,7 @@
   width: 100%;
   background-color: #d2d2d2;
   z-index: 30;
+  font-weight: 400;
 }
 
 .menu .text1 {
@@ -428,12 +433,12 @@
   position: fixed;
   top:0;
   z-index: 100;
-  background-color: rgba(229,167,68,0.8);
+  background-color: rgba(229,167,68,1);
 }
 
 .loading .loading1 {
   position: absolute;
-  top:317rpx;
+  top:230rpx;
   width:100%;
 }
 
@@ -451,12 +456,13 @@
   z-index: 100;
 }
 
-.loading1 .text {
+.loading1 .textLoading1 {
   font-size:48rpx;
   margin-top:60rpx;
+  font-weight: 400;
 }
 
-.loading1 .text2 {
+.loading1 .textLoading2 {
   font-size:24rpx;
   margin-top: 10rpx;
 }
@@ -468,11 +474,11 @@
   color:#fff;
 }
 
-.loading1 .text3 {
+.loading1 .textLoading3 {
   font-size:28rpx;
 }
 
-.loading1 .text4 {
+.loading1 .textLoading4 {
   font-size:32rpx;
   margin-top: 10rpx;
   font-weight: 400;

pages/main/item.json

@@ -2,7 +2,7 @@
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",
   "navigationBarTitleText": "试卷答案",
-  "backgroundColor": "#fff",
+  "backgroundColor": "#F0F0F0",
   "backgroundTextStyle": "light",
   "enablePullDownRefresh": false
 }

pages/main/item.wxss

@@ -17,6 +17,7 @@
 .panelLeft2{
   margin-left: 30rpx;
   font-size: 32rpx;
+  font-weight: 500;
 }
 
 .panelRight{

pages/main/list.js

@@ -6,6 +6,7 @@ var categoryID = "";
 var categoryName = "";
 var categoryNum = "";
 var SelectID = 0;
+var arrDifficult=["","","简单","普通","困难"];
 
 Page({
   data: {
@@ -33,9 +34,6 @@ Page({
   },
   getList: function () {
     this.buildList();
-    wx.setNavigationBarTitle({
-      title: categoryName + " 题卡仓库",
-    });
   },
   gotoDetail: function (e) {
     SelectID = e.currentTarget.dataset.id;
@@ -79,7 +77,7 @@ Page({
                 data[i].List[k].SelectItem = "boxLeft";
               }
             }
-
+            data[i].List[k].DifficultyName = arrDifficult[Number(data[i].List[k].Difficulty)];
             data[i].List[k].Select = false;
             if (SelectID == data[i].List[k].ID)
               data[i].List[k].Select = true;

pages/main/list.json

@@ -1,8 +1,8 @@
 {
   "navigationBarBackgroundColor": "#9C5043",
   "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "题卡仓库",
-  "backgroundColor": "#9C5043",
+  "navigationBarTitleText": "题目仓库",
+  "backgroundColor": "#514a47",
   "backgroundTextStyle": "light",
   "enablePullDownRefresh": false
 }

pages/main/list.wxml

@@ -12,7 +12,7 @@
       </view>
     </view>
     <view class="panelTopCenter">
-      <image class="questioncollection_headline_shelf_illus_grade0{{CategoryNum}}" src="../../images/questioncollection_headline_shelf_illus_grade0{{CategoryNum}}.png" />
+      <image class="questioncollection_headline_shelf_illus_grade01" src="../../images/questioncollection_headline_shelf_illus_grade0{{CategoryNum}}.png" />
     </view>
     <view class="panelTopLine1 lineRight lineLong FlexRow">
       <view class="panelTopLine lineLong1">

pages/main/list.wxss

@@ -1,6 +1,7 @@
 .container {
   background-color: #3b3431;
   justify-content: flex-start;
+  font-weight: 600;
 }
 
 .questioncollection_headline_root {
@@ -64,25 +65,9 @@
 }
 
 .questioncollection_headline_shelf_illus_grade01 {
-  width: 520rpx;
-  height: 160rpx;
-}
-
-.questioncollection_headline_shelf_illus_grade02 {
-  width: 545rpx;
-  height: 140rpx;
-}
-
-.questioncollection_headline_shelf_illus_grade03 {
   width: 580rpx;
-  height: 140rpx;
-}
-
-.questioncollection_headline_shelf_illus_grade04 {
-  width: 529rpx;
-  height: 130rpx;
+  height: 160rpx;
 }
-
 .questioncollection_headline_plate01_selected {
   width: 112rpx;
   height: 70rpx;
@@ -101,18 +86,20 @@
   z-index: 100;
 }
 
-.questioncollection_shelf_board {
-  width: 630rpx;
-  height: 100rpx;
-  z-index: 10;
-}
-
 .questioncard {
   width: 100%;
   height: 130rpx;
   margin-top: -40rpx;
 }
 
+.questioncollection_shelf_board {
+  width: 630rpx;
+  height: 100rpx;
+  z-index: 50;
+  position: relative;
+  top:0;
+}
+
 .cardCenter {
   width: 590rpx;
   height: 130rpx;