2.1.58

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.1.48",
+    Version: "2.1.58",
     IsProduction: true,
     //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",

app.json

@@ -3,8 +3,6 @@
     
     "pages/index/index",
     "pages/main/health",
-    
-    
     "pages/main/folderEdit",
     "pages/main/folderIcon",
 
@@ -77,6 +75,29 @@
     "resizable": false,
     "enablePullDownRefresh": false
   },
+  "subPackages": [
+    {
+      "root": "pages_agent",
+      "pages": [
+        "promotion/earnings_list",
+        "promotion/earnings",
+        "promotion/user_index",
+        "main/message_info",
+        "main/message",
+        "main/userinfo",
+        "main/enter",
+        "main/index"
+      ]
+    }
+  ],
+  "preloadRule": {
+    "pages_agent/main/index": {
+      "network": "all",
+      "packages": [
+        "pages_agent"
+      ]
+    }
+  },
   "requiredBackgroundModes": [
     "audio"
   ],

pages/main/add.wxml

@@ -5,7 +5,7 @@
 	<view class="panelTop FlexRow" style="top:{{topBarHeight+topBarHeightIPad}}rpx;">
 		<view class="panelLeft FlexRow">
 			<view class='panelTop1 FlexRow' catchtap='onClose'>
-				放弃
+				<text wx:if="{{BtnSaveSelectCss}}">放弃</text><text wx:if="{{!BtnSaveSelectCss}}">返回</text>
 			</view>
 		</view>
 		<view class="panelRight FlexRow">
@@ -53,16 +53,13 @@
 						</text>
 
 						<view class="sound FlexRow" wx:if="{{item.Type=='sound'}}">
-							<image class="universalpic_read_mark_black_20x20"
-								src='../images/universalpic_read_mark_black_20x20.png' />
+							<image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
 						</view>
 						<text class="textPinyin" wx:if="{{item.Type=='sound'}}">{{item.Content}}</text>
 						<view class="panelRecorder FlexRow" wx:if="{{item.Type=='recorder'}}">
-							<image class="universalpic_read_mark_black_20x20"
-								src='../images/universalpic_read_mark_black_20x20.png' />
+							<image class="universalpic_read_mark_black_20x20" src='../images/universalpic_read_mark_black_20x20.png' />
 						</view>
-						<image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}'
-							binderror="onBindError" />
+						<image class="imageFree" mode="widthFix" wx:if="{{item.Type=='image'}}" src='{{item.Content}}' binderror="onBindError" />
 						<view class="textBr" wx:if="{{item.Type=='br'}}"></view>
 						<text class="textReturn" wx:if="{{item.Type=='return'}}"></text>
 					</block>
@@ -73,14 +70,12 @@
 		<view class="panelItemCircleBottom"></view>
 	</view>
 
-	<view class="panelItem0 FlexColumn"
-		wx:if="{{(CardType===0 || CardType===1 || CardType===-1 || FolderID || LimitTime || FontSize) && UpdateType!='edit1'}}">
+	<view class="panelItem0 FlexColumn" wx:if="{{(CardType===0 || CardType===1 || CardType===-1 || FolderID || LimitTime || FontSize) && UpdateType!='edit1'}}">
 		<view class="panelItemCircleTop"></view>
 		<block wx:if="{{CardType===0 || CardType===1 || CardType===-1}}">
 			<view class="panelTimePlan FlexRow" catchtap="showPanel" data-type="cardtype">
 				<view class="panelItem1 FlexRow">
-					<image src='../images/universalpic_practisemodel_black_30x28.png'
-						class="universalpic_practisemodel_black_30x28" />
+					<image src='../images/universalpic_practisemodel_black_30x28.png' class="universalpic_practisemodel_black_30x28" />
 					<view class="panelTimePlan1">{{PracticeCardType}}</view>
 				</view>
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -96,9 +91,9 @@
 					<image src='../images/universalpic_cardlist_black_30x28.png' class="universalpic_cardlist_black_30x28" />
 					<view class="panelTimePlan1">{{FolderName}}</view>
 				</view>
-				
+
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-				
+
 			</view>
 		</block>
 
@@ -111,9 +106,9 @@
 					<image src='../images/universalpic_plan_6dots_black_30x32.png' class="universalpic_plan_6dots_black_30x32" />
 					<view class="panelTimePlan1">{{PracticeTimeStr}}</view>
 				</view>
-				
+
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-				
+
 			</view>
 		</block>
 
@@ -153,7 +148,7 @@
 				复查
 			</view>
 			<view class="panelSave1" wx:if="{{UpdateType!='add' && UpdateType!='add2'}}">
-				
+
 			</view>
 			<view class='{{BtnSaveSelectCss}} panelSave2' bindtap="saveCard">
 				保存
@@ -168,16 +163,11 @@
 </view>
 
 <!-- 自动记号 -->
-<view wx:if="{{IsTagShow}}" class="numberContainer FlexColumn"
-	style='height:{{Containnerheight}}rpx;top:{{topBarHeight}}rpx;'>
-	<view class="panelTop FlexRow"  style="top:{{topBarHeight}}rpx;">
-    <view class="panelLeft FlexRow" catchtap="closeTagShow">
-			<view class="panelTop1 FlexRow"><image class="universalpic_close_black_24x24" src='../images/universalpic_close_black_24x24.png' /></view>
-    </view>
-    <view class='panelRight FlexRow' catchtap='deleteItem' data-type="3">
-      <view class="panelTop1">确定</view> 
-    </view>
-  </view>
+<view wx:if="{{IsTagShow}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;top:{{topBarHeight}}rpx;'>
+	<view class="panelTop FlexRow" style="top:{{topBarHeight}}rpx;">
+		<view class="panelSaveTag3" catchtap="closeTagShow">取消</view>
+		<view class="panelSaveTag3" catchtap='deleteItem' data-type="3">确定</view>
+	</view>
 	<view class="line"></view>
 	<view class="panelItem FlexColumn" style="margin-top:{{topBarHeight}}rpx;">
 		<view class="panelTitle FlexRow">
@@ -191,12 +181,10 @@
 		</view>
 		<view class='panelTag FlexRow'>
 			<block wx:for="{{TagTemp}}" wx:key="indexTag" wx:for-index="indexTag">
-				<view wx:if="{{indexTag!=TagIndex}}" class="panelTag1 FlexRow" catchtap='deleteItem' data-id="{{indexTag}}"
-					data-type="1">
+				<view wx:if="{{indexTag!=TagIndex}}" class="panelTag1 FlexRow" catchtap='deleteItem' data-id="{{indexTag}}" data-type="1">
 					<view class="tag1">{{item}}</view>
 				</view>
-				<view wx:if="{{indexTag==TagIndex}}" class="panelTag2 panelTag1 FlexRow" catchtap='deleteItem'
-					data-id="{{indexTag}}" data-type="2">
+				<view wx:if="{{indexTag==TagIndex}}" class="panelTag2 panelTag1 FlexRow" catchtap='deleteItem' data-id="{{indexTag}}" data-type="2">
 					<view class="tag1">{{item}}</view>
 					<image src='../images/universalpic_del_white_14x14.png' class="universalpic_del_white_14x14" />
 				</view>
@@ -206,197 +194,178 @@
 </view>
 
 <!-- 字段编辑 -->
-<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight+topBarHeightIPad}}rpx;'
-	hidden='{{HiddenFieldEdit || IsRecorder}}'>
+<view class="addItem container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight+topBarHeightIPad}}rpx;' hidden='{{HiddenFieldEdit || IsRecorder}}'>
 	<view class="panelItemTag FlexRow">
 
-		<view class="panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="false">
-			<image class="universalpic_close_black_24x24" src='../images/universalpic_close_black_24x24.png' />
-		</view>
-
-
-		<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
-			<image class="universalpic_underline_default_20x40" src='../images/universalpic_underline_default_20x40.png' />
-		</view>
-		<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{LineSign}}"
-			hidden="{{LineSign=='[线]'}}">
-			<image class="universalpic_underline_activate_60x40" src='../images/universalpic_underline_activate_60x40.png' />
-		</view>
-
-		<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{HighlighterSign}}"
-			hidden="{{HighlighterSign=='[/光]'}}">
-			<image class="universalpic_backcolor_default_20x40" src='../images/universalpic_backcolor_default_20x40.png' />
-		</view>
-		<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{HighlighterSign}}"
-			hidden="{{HighlighterSign=='[光]'}}">
-			<image class="universalpic_backcolor_activate_60x40" src='../images/universalpic_backcolor_activate_60x40.png' />
+		<view class="panelSaveTag3 panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="false">
+			<view class="panelSaveTag311">取消</view>
 		</view>
 
-		<view class="panelSaveTag1 FlexRow" catchtap="uploadImageField" wx:if="{{IsShow==1}}">
-			<image class="universalpic_picture_black_30x30" src='../images/universalpic_picture_black_30x30.png' />
-		</view>
+		<view class="FlexRow">
+			<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[/线]'}}">
+				<image class="universalpic_underline_default_20x40" src='../images/universalpic_underline_default_20x40.png' />
+			</view>
+			<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{LineSign}}" hidden="{{LineSign=='[线]'}}">
+				<image class="universalpic_underline_activate_60x40" src='../images/universalpic_underline_activate_60x40.png' />
+			</view>
 
-		<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}">
-			<image class="universalpic_soundwave_default_32x22" src='../images/universalpic_soundwave_default_32x22.png' />
-		</view>
-		<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{SoundSign}}"
-			hidden="{{SoundSign=='[读]'}}">
-			<image class="universalpic_soundwave_activate_32x22" src='../images/universalpic_soundwave_activate_32x22.png' />
-		</view>
+			<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[/光]'}}">
+				<image class="universalpic_backcolor_default_20x40" src='../images/universalpic_backcolor_default_20x40.png' />
+			</view>
+			<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{HighlighterSign}}" hidden="{{HighlighterSign=='[光]'}}">
+				<image class="universalpic_backcolor_activate_60x40" src='../images/universalpic_backcolor_activate_60x40.png' />
+			</view>
 
+			<view class="panelSaveTag1 FlexRow" catchtap="uploadImageField" wx:if="{{IsShow==1}}">
+				<image class="universalpic_picture_black_30x30" src='../images/universalpic_picture_black_30x30.png' />
+			</view>
 
-		<view class="panelSaveTag11 panelSaveTag1 FlexRow" catchtap="recorderAccredit" wx:if="{{IsShow==1}}">
-			<image class="universalpic_microphone_black_20x30" src='../images/universalpic_microphone_black_20x30.png' />
-		</view>
+			<view class="panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[/读]'}}">
+				<image class="universalpic_soundwave_default_32x22" src='../images/universalpic_soundwave_default_32x22.png' />
+			</view>
+			<view class="panelSaveTag2 panelSaveTag1 FlexRow" catchtap="addSymbol" data-id="{{SoundSign}}" hidden="{{SoundSign=='[读]'}}">
+				<image class="universalpic_soundwave_activate_32x22" src='../images/universalpic_soundwave_activate_32x22.png' />
+			</view>
 
-		<!-- <view class="panelSaveTag3 FlexRow" catchtap="onSearchField">
-			加资料
+			<view class="panelSaveTag11 panelSaveTag1 FlexRow" catchtap="recorderAccredit" wx:if="{{IsShow==1}}">
+				<image class="universalpic_microphone_black_20x30" src='../images/universalpic_microphone_black_20x30.png' />
+			</view>
 		</view>
 
-		<view class="panelSaveTag31 panelSaveTag3 panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="true">
-			确定
-		</view> -->
-
-		<view class="panelSaveTag31 panelSaveTag3 panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="true">
+		<view class="panelSaveTag3 panelSaveTag0 FlexRow" catchtap="closeAddItem" data-idsave="true">
 			<view class="panelSaveTag311">确定</view>
 		</view>
 	</view>
 	<view class='lineFooter'></view>
 	<view class='panelInput'>
-		<textarea class="input" style="height:{{InputHeight+topBarHeightIPad2}}rpx;" maxlength='-1' show-confirm-bar="true"
-			value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" 
-			bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
-		</view>
-  <view class='lineFooter'></view>
-  <view class='panelBtnItem FlexColumn'>
-    <scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
-      <view class="btn0"></view>
-      <view class="btn" catchtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item.Name}}">{{item.Name}}</view>
-      <view class="btn2 btn" catchtap="goto" data-url="../main/symbolsetting">更多</view>
-    </scroll-view>
-    <view class='lineFooter'></view>
-  </view>
+		<textarea class="input" style="height:{{InputHeight+topBarHeightIPad2}}rpx;" maxlength='-1' show-confirm-bar="true" value="{{FieldContent}}" focus="{{Focus}}" cursor="{{Cursor}}" bindinput="bindinputField" bindblur="onBindblur" bindfocus="onBindFocus" data-id='{{FieldNumber}}' />
+	</view>
+	<view class='lineFooter'></view>
+	<view class='panelBtnItem FlexColumn'>
+		<scroll-view scroll-x="true" class="panelBtnSmall" bindscroll="bindscrollHandler">
+			<view class="btn0"></view>
+			<view class="btn" catchtap="addSymbol" wx:for="{{SymbolMain}}" wx:key="index" data-id="{{item.Name}}">{{item.Name}}</view>
+			<view class="btn2 btn" catchtap="goto" data-url="../main/symbolsetting">更多</view>
+		</scroll-view>
+		<view class='lineFooter'></view>
+	</view>
 </view>
 
 <!-- 录音功能 -->
 <view wx:if="{{IsRecorder}}" class="numberContainer FlexColumn" style='height:{{Containnerheight}}rpx;top:{{topBarHeight}}rpx;'>
-  <view class="panelTop FlexRow"  style="top:{{topBarHeight}}rpx;">
-    <view class="panelLeft FlexRow" catchtap="closeRecorder">
-			<view class="panelTop1 FlexRow"><image class="universalpic_close_black_24x24" src='../images/universalpic_close_black_24x24.png' /></view>
-    </view>
-    <view class='panelRight FlexRow' catchtap='btnRecorderSave'>
-      <view class="panelTop1">上传</view> 
-    </view>
-  </view>
-  <view class='RecorderPanel2 FlexRow' wx:if="{{!FieldContent}}">
-    <image class="edit_voicerecorder_illus" src='../images/edit_voicerecorder_illus.png' />
-  </view>
-  <view class="RecorderPanel3 FlexColumn" wx:if="{{FieldContent}}" style='height:{{Containnerheight-449}}rpx;top:{{topBarHeight+100}}rpx;'>
-    <view class='RecorderPanel31 FlexColumn'>
-      <text class='RecorderPanel311'>以下内容来自题卡段落\n只要提前写进段落，就能在录音时方便照读。</text>
+	<view class="panelTop FlexRow" style="top:{{topBarHeight}}rpx;">
+		<view class="panelSaveTag3" catchtap="closeRecorder">取消</view>
+		<view class="panelSaveTag3" catchtap='btnRecorderSave'>上传</view>
+	</view>
+	<view class='RecorderPanel2 FlexRow' wx:if="{{!FieldContent}}">
+		<image class="edit_voicerecorder_illus" src='../images/edit_voicerecorder_illus.png' />
+	</view>
+	<view class="RecorderPanel3 FlexColumn" wx:if="{{FieldContent}}" style='height:{{Containnerheight-449}}rpx;top:{{topBarHeight+100}}rpx;'>
+		<view class='RecorderPanel31 FlexColumn'>
+			<text class='RecorderPanel311'>以下内容来自题卡段落\n只要提前写进段落，就能在录音时方便照读。</text>
 		</view>
 		<view class="panelLine2"></view>
-    <textarea class="RecorderPanel32" maxlength='-1' value="{{FieldContent}}" fixed="true"/>
-  </view>
-  <view class='RecorderPanel1 FlexColumn'>
-    <view class='RecorderPanel11 FlexRow'>
-      <view class='{{RecorderTimeCss}} RecorderPanel112'>{{RecorderTime}}</view>
-    </view>
-    <view class='btnRecorderStart FlexRow' hover-start-time="50" hover-class="btnRecorderEnd" catchtouchstart='btnRecorderStart' catchtouchend='btnRecorderEnd' wx:if="{{!IsRecorderFinished}}">
-      <view class="symbol1" wx:if="{{RecorderTimeCss!='RecorderPanel1121'}}">●</view>
-      <view>{{BtnRecorderName}}</view>
-    </view>
-    <view class='RecorderPanel12 FlexRow' wx:if="{{IsRecorderFinished}}">
-      <view class='btnRecorderStart2 btnRecorderStart FlexRow' hover-class="btnRecorderEnd" catchtap='showRecorder'>
-        <view class="symbol1">●</view>
-      	<view>重录</view>
-      </view>
-      <view class='btnRecorderStart2 btnRecorderStart FlexRow' catchtap='btnRecorderPlay'>
-        <view class="symbol2" wx:if="{{RecorderPlayName=='播放'}}">▶︎</view>
-        <view class="symbol2" wx:if="{{RecorderPlayName=='停止'}}">■</view>
-        <view>{{RecorderPlayName}}</view>
-      </view>
-    </view>
-  </view>
+		<textarea class="RecorderPanel32" maxlength='-1' value="{{FieldContent}}" fixed="true" />
+	</view>
+	<view class='RecorderPanel1 FlexColumn'>
+		<view class='RecorderPanel11 FlexRow'>
+			<view class='{{RecorderTimeCss}} RecorderPanel112'>{{RecorderTime}}</view>
+		</view>
+		<view class='btnRecorderStart FlexRow' hover-start-time="50" hover-class="btnRecorderEnd" catchtouchstart='btnRecorderStart' catchtouchend='btnRecorderEnd' wx:if="{{!IsRecorderFinished}}">
+			<view class="symbol1" wx:if="{{RecorderTimeCss!='RecorderPanel1121'}}">●</view>
+			<view>{{BtnRecorderName}}</view>
+		</view>
+		<view class='RecorderPanel12 FlexRow' wx:if="{{IsRecorderFinished}}">
+			<view class='btnRecorderStart2 btnRecorderStart FlexRow' hover-class="btnRecorderEnd" catchtap='showRecorder'>
+				<view class="symbol1">●</view>
+				<view>重录</view>
+			</view>
+			<view class='btnRecorderStart2 btnRecorderStart FlexRow' catchtap='btnRecorderPlay'>
+				<view class="symbol2" wx:if="{{RecorderPlayName=='播放'}}">▶︎</view>
+				<view class="symbol2" wx:if="{{RecorderPlayName=='停止'}}">■</view>
+				<view>{{RecorderPlayName}}</view>
+			</view>
+		</view>
+	</view>
 </view>
 
 <!-- 菜单 -->
 <view wx:if="{{IsShowMenu}}" class="panelMenu container FlexColumn" style='height:{{Containnerheight}}rpx; top:{{topBarHeight}}rpx;'>
 	<view class="panelMenu0 FlexColumn">
 		<view class="panelMenu12 panelMenu1 FlexColumn">
-		<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="cardtype">
-			<view class="Arrow"></view>
-		  <view>练习模式</view>
-		  <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-		</view>
-		<view class="panelMenuLine"></view>
-		<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="folder">
-			<view class="Arrow"></view>
-		  <view>卡单</view>
-		  <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-		</view>
-		<block wx:if="{{CardType!=-1}}">
+			<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="cardtype">
+				<view class="Arrow"></view>
+				<view>练习模式</view>
+				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			</view>
 			<view class="panelMenuLine"></view>
-			<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="limittime">
+			<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="folder">
 				<view class="Arrow"></view>
-				<view>到期时间</view>
+				<view>卡单</view>
 				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 			</view>
-		</block>
-		
-		<view class="panelMenuLine"></view>
-		<view class="panelMenu1 FlexRow" catchtap="setCollect">
-			<view></view>
-			<view wx:if="{{IsCollect==0}}">加注星标</view>
-			<view wx:if="{{IsCollect==1}}">清除星标</view>
-			<view></view>
-		</view>
-		<view class="panelMenuLine"></view>
-		<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="fontsize">
-			<view class="Arrow"></view>
-		  <view>字号</view>
-		  <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			<block wx:if="{{CardType!=-1}}">
+				<view class="panelMenuLine"></view>
+				<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="limittime">
+					<view class="Arrow"></view>
+					<view>到期时间</view>
+					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+				</view>
+			</block>
+
+			<view class="panelMenuLine"></view>
+			<view class="panelMenu1 FlexRow" catchtap="setCollect">
+				<view></view>
+				<view wx:if="{{IsCollect==0}}">加注星标</view>
+				<view wx:if="{{IsCollect==1}}">清除星标</view>
+				<view></view>
+			</view>
+			<view class="panelMenuLine"></view>
+			<view class="panelMenu1 FlexRow" catchtap="showPanel" data-type="fontsize">
+				<view class="Arrow"></view>
+				<view>字号</view>
+				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+			</view>
+
 		</view>
-		
-	</view>
-	<view class="panelMenu11 panelMenu1" wx:if="{{UpdateType!='add' && UpdateType!='add2' && UpdateType!='add3'}}" catchtap="deleteCard">删除题卡</view>
-	<view class="panelMenu10 panelMenu1" catchtap="hiddenPanel">取消</view>
+		<view class="panelMenu11 panelMenu1" wx:if="{{UpdateType!='add' && UpdateType!='add2' && UpdateType!='add3'}}" catchtap="deleteCard">删除题卡</view>
+		<view class="panelMenu10 panelMenu1" catchtap="hiddenPanel">取消</view>
 	</view>
-	
+
 </view>
 
 <view wx:if="{{IsHelp}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;top:{{topBarHeight}}rpx;'>
-  <view class="HelpPanel1 FlexColumn" style="bottom:{{topBarHeightIPad}}rpx;">
-    <view class="HelpPanel11 FlexRow">
-      <view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
-        <image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
-      </view>
-      <view></view>
-    </view>
-    <swiper class="HelpPanel2" indicator-dots="true" autoplay="true" interval="10000" duration="500">
-      <block wx:for="{{HelpArr}}" wx:key="*this">
-        <swiper-item>
-          <view class="HelpPanel12 FlexColumn">
-            <image src='{{ImagePath}}web/{{item}}.png?0' class="{{item}}" />
-          </view>
-        </swiper-item>
-      </block>
-    </swiper>
-  </view>
+	<view class="HelpPanel1 FlexColumn" style="bottom:{{topBarHeightIPad}}rpx;">
+		<view class="HelpPanel11 FlexRow">
+			<view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
+				<image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
+			</view>
+			<view></view>
+		</view>
+		<swiper class="HelpPanel2" indicator-dots="true" autoplay="true" interval="10000" duration="500">
+			<block wx:for="{{HelpArr}}" wx:key="*this">
+				<swiper-item>
+					<view class="HelpPanel12 FlexColumn">
+						<image src='{{ImagePath}}web/{{item}}.png?0' class="{{item}}" />
+					</view>
+				</swiper-item>
+			</block>
+		</swiper>
+	</view>
 </view>
 
 <view wx:if="{{IsFontsize}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="HelpPanel1 FlexColumn">
-    <view class="HelpPanel11 FlexRow">
-      <view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
-        <image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
-      </view>
-      <view class="HelpPanel112" catchtap="saveFontSize">
+	<view class="HelpPanel1 FlexColumn">
+		<view class="HelpPanel11 FlexRow">
+			<view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
+				<image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
+			</view>
+			<view class="HelpPanel112" catchtap="saveFontSize">
 				确定
 			</view>
-    </view>
-    <view class="HelpPanel3 HelpPanel2 FlexColumn" >
-      <view class="panelTitle2 FlexColumn">
+		</view>
+		<view class="HelpPanel3 HelpPanel2 FlexColumn">
+			<view class="panelTitle2 FlexColumn">
 				<view class="panelTitle21">调整题卡「字号」</view>
 				<view class="panelTitle22">只有段落1可调整字号，默认字号为「标准」</view>
 			</view>
@@ -404,22 +373,22 @@
 			<view class="MenuBtn FlexRow">
 				<view class="{{item.Selected}} MenuBtn1" wx:for="{{FontSizeArr}}" wx:key="index" catchtap="setFontSize" data-fontsize="{{item.Value}}">{{item.Name}}</view>
 			</view>
-    </view>
-  </view>
+		</view>
+	</view>
 </view>
 
 <view wx:if="{{IsFolder}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="HelpPanel1 FlexColumn"  style="bottom:{{topBarHeightIPad-38}}rpx;">
-    <view class="HelpPanel11 FlexRow">
-      <view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
-        <image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
-      </view>
-      <view class="HelpPanel112" catchtap="setFolder">
+	<view class="HelpPanel1 FlexColumn" style="bottom:{{topBarHeightIPad-38}}rpx;">
+		<view class="HelpPanel11 FlexRow">
+			<view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
+				<image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
+			</view>
+			<view class="HelpPanel112" catchtap="setFolder">
 				确定
 			</view>
-    </view>
-    <view class="HelpPanel4 HelpPanel2 FlexColumn" >
-      <view class="panelTitle20 panelTitle2 FlexColumn">
+		</view>
+		<view class="HelpPanel4 HelpPanel2 FlexColumn">
+			<view class="panelTitle20 panelTitle2 FlexColumn">
 				<view class="panelTitle21">选择所属「卡单」</view>
 				<view class="panelTitle22">一张题卡只能属于一张卡单或不属于任何卡单</view>
 			</view>
@@ -427,7 +396,7 @@
 				<view class="MenuBtn3 MenuBtn1 FlexRow" catchtap="goto" data-url="./folderEdit?type=add">
 					<view>新建卡单</view>
 					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-    		</view>
+				</view>
 				<view class="{{NullFolder}} MenuBtn2 MenuBtn1" catchtap="selectFolder" data-id="0">不属于任何卡单</view>
 			</view>
 			<scroll-view scroll-y="true" class="MenuList FlexColumn">
@@ -437,21 +406,21 @@
 				</view>
 			</scroll-view>
 		</view>
-  </view>
+	</view>
 </view>
 
 <view wx:if="{{IsLimitTime}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="HelpPanel1 FlexColumn">
-    <view class="HelpPanel11 FlexRow">
-      <view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
-        <image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
-      </view>
-      <view class="HelpPanel112" catchtap="setLimitTime">
+	<view class="HelpPanel1 FlexColumn">
+		<view class="HelpPanel11 FlexRow">
+			<view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
+				<image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
+			</view>
+			<view class="HelpPanel112" catchtap="setLimitTime">
 				确定
 			</view>
-    </view>
-    <view class="HelpPanel5 HelpPanel2 FlexColumn" >
-      <view class="panelTitle20 panelTitle2 FlexColumn">
+		</view>
+		<view class="HelpPanel5 HelpPanel2 FlexColumn">
+			<view class="panelTitle20 panelTitle2 FlexColumn">
 				<view class="panelTitle21">修改题卡「到期时间」</view>
 				<view class="panelTitle23 panelTitle21">{{PracticeTimeStrTemp}}</view>
 				<view class="panelTitle22">到期时间就是下次练习的时间，一般情况无须更改</view>
@@ -463,30 +432,30 @@
 			</view>
 			<picker class="Picker" mode="date" value="{{Today}}" end="2050-01-01" bindchange="selectLimitTime2">
 				<view class="MenuBtn5 MenuBtn1 FlexRow">
-				<view class="panelLeft FlexRow">
-					<image src='../images/universalpic_bell_black_30x30.png' class="universalpic_bell_black_30x30_2" />
-    			<view>指定具体日期</view>
+					<view class="panelLeft FlexRow">
+						<image src='../images/universalpic_bell_black_30x30.png' class="universalpic_bell_black_30x30_2" />
+						<view>指定具体日期</view>
+					</view>
+					<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
 				</view>
-				<image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
-			</view>
-      </picker>
+			</picker>
 			<view class="panelHeight100"></view>
-    </view>
-  </view>
+		</view>
+	</view>
 </view>
 
 <view wx:if="{{IsCardType}}" class="HelpContainer container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class="HelpPanel1 FlexColumn">
-    <view class="HelpPanel11 FlexRow">
-      <view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
-        <image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
-      </view>
-      <view class="HelpPanel112" catchtap="setCardType">
+	<view class="HelpPanel1 FlexColumn">
+		<view class="HelpPanel11 FlexRow">
+			<view class="HelpPanel111 FlexRow" catchtap="hiddenPanel">
+				<image src='../images/universalpic_close_black_24x24.png' class="universalpic_close_black_24x24" />
+			</view>
+			<view class="HelpPanel112" catchtap="setCardType">
 				确定
 			</view>
-    </view>
-    <view class="HelpPanel6 HelpPanel2 FlexColumn" >
-      <view class="panelTitle20 panelTitle2 FlexColumn">
+		</view>
+		<view class="HelpPanel6 HelpPanel2 FlexColumn">
+			<view class="panelTitle20 panelTitle2 FlexColumn">
 				<view class="panelTitle21">变更题卡所属「练习模式」</view>
 			</view>
 			<view class="{{CardTypeCss.NormalCss}} MenuBtn6 MenuBtn1 FlexRow" catchtap="selectCardType" data-cardtype="0" data-disabled="{{CardTypeCss.NormalCss}}">
@@ -506,7 +475,7 @@
 					<view>紧急练习</view>
 					<view class="panelTitle22{{CardTypeCss.UrgentCss}}">针对基础知识在短期内强化的临时措施</view>
 				</view>
-				<view class="disabled FlexRow" wx:if="{{CardNumberUrgent>=200}}" >
+				<view class="disabled FlexRow" wx:if="{{CardNumberUrgent>=200}}">
 					<image src='../images/universalpic_stop_black_20x20.png' class="universalpic_stop_black_20x20" />
 					<view class="disabled1">容量已满请先移出一部分题卡</view>
 				</view>
@@ -516,13 +485,13 @@
 					<view>归档</view>
 					<view class="MenuBtn71">用于「暂停练习的题卡」和「预备日后练习的题卡」。归档的题卡不属于任何练习模式，不会被练习。秒过推荐做法：不练习的归档，不需要的删除。</view>
 				</view>
-				<switch class="switch" color="#5282FA" checked="{{CardTypeTemp==-1}}" bindchange="selectCardType"/>
+				<switch class="switch" color="#5282FA" checked="{{CardTypeTemp==-1}}" bindchange="selectCardType" />
 			</view>
 			<view class="MenuBtn80 MenuBtn8 FlexRow">
 				<image src='../images/universalpic_infor_green_40x40.png' class="universalpic_infor_green_40x40" />
 				<view>模式更改后，原本的旧题卡会变成新题卡且无法撤销。</view>
 			</view>
 			<view class="panelHeight100_green"></view>
-    </view>
-  </view>
+		</view>
+	</view>
 </view>

pages/main/add.wxss

@@ -426,6 +426,7 @@ page{
   width: 100%;
   height: 100rpx;
   background-color: #fff;
+  justify-content: space-between;
 }
 
 
@@ -498,20 +499,11 @@ page{
 }
 
 .panelSaveTag3 {
-  width: 110rpx;
+  width: 90rpx;
   font-size:28rpx;
   text-align: center;
   line-height: 80rpx;
-}
-
-.panelSaveTag31 {
-  margin:0 10rpx 0 65rpx;
-  width: 150rpx;
-  justify-content: flex-end;
-}
-
-.panelSaveTag311 {
-  margin-right:17rpx;
+  margin: 0 20rpx;
 }
 
 .line1 {

pages/main/addInfomationDetail.js

@@ -243,7 +243,7 @@ Page({
 
             if (list[i].Content[item.Number].Content){
               if (item.Tag == "组词" || item.Tag == "近义词" || item.Tag == "反义词"){
-                str = " " + str;
+                str = "\n" + str;
               }
               else{
                 str = "\n\n" + str;

pages/main/detail.js

@@ -50,7 +50,8 @@ Page({
     IsAutoSound: false, //是否设置了自动播放
     IsAutoSoundStart: false, //是否开始自动播放
     Title: "",
-    FontSizeArray: constant.arrFontSize, 
+    FontSizeArray: constant.arrFontSize,
+    IsBuildReport:false,
   },
   onReady: function () {
     var that = this;
@@ -85,6 +86,7 @@ Page({
     }
 
     that.setData({
+      IsBuildReport:false,
       Containnerheight: height,
       Containnerheight2: height - height2,
       IsShowAnswer: [0, 0],
@@ -98,6 +100,7 @@ Page({
 
     this.audioCtx = wx.createAudioContext('myAudio');
 
+    this.startTask();
 
     this.getList();
 
@@ -165,6 +168,10 @@ Page({
     clearTimeout(timeoutHide);
     //console.log("显示");
   },
+  startTask: function () {
+    var url = 'StartMiaoguoTask?UserID=' + app.globalData.userInfo.UserID;
+    main.getData(url, function (data) {});
+  },
   onUnload: function () {
     clearInterval(intervalSound);
     clearTimeout(timeoutEveryCard);
@@ -177,7 +184,7 @@ Page({
     }
   },
   onHide: function (e) {
-    //console.log("隐藏");
+    console.log("隐藏");
     var that = this;
     if (isExit) {
       timeoutHide = setTimeout(function () {
@@ -305,9 +312,9 @@ Page({
       that.autoAudioPlayInit();
       taskInfo = TaskList[0];
 
-      
+
       common.getStorageValue(that, "IsFolderPractice", 0, function () {
-        if (that.data.IsFolderPractice==1)
+        if (that.data.IsFolderPractice == 1)
           that.onShowFolder();
       });
     }
@@ -365,13 +372,13 @@ Page({
     if (!(clicktype && clicktype == "all" && app.globalData.ClickType == 0)) {
 
       var start = e.currentTarget.dataset.start;
-      
+
       if (!(that.data.NumberNew == 0 &&
           that.data.NumberReview == 0 &&
           that.data.NumberHistory == 0) && !that.data.IsShowNumberInfo) {
 
         if (!that.data.IsShowAnswer)
-          that.data.IsShowAnswer=[0,0];
+          that.data.IsShowAnswer = [0, 0];
         var recommend = 0;
         if (start) {
           that.data.IsShowAnswer[0] = 0;
@@ -383,10 +390,10 @@ Page({
           if (that.data.IsShowAnswer[0] == 0 && that.data.IsShowAnswer[1] == 0) {
             that.data.IsShowAnswer[0] = 1;
 
-            if (TaskList[0].ContentNew && TaskList[0].ContentNew.Field && TaskList[0].ContentNew.Field.length>0){
+            if (TaskList[0].ContentNew && TaskList[0].ContentNew.Field && TaskList[0].ContentNew.Field.length > 0) {
               if (TaskList[0].ContentNew.Field[3].length == 0) {
                 that.data.IsShowAnswer[1] = 1;
-  
+
                 if (!that.data.TaskInfo.IsNew)
                   recommend = getRecommendTime();
                 that.setData({
@@ -394,7 +401,7 @@ Page({
                 });
               }
             }
-            
+
           } else if (that.data.IsShowAnswer[0] && !that.data.IsShowAnswer[1]) {
             that.data.IsShowAnswer[1] = 1;
 
@@ -410,35 +417,32 @@ Page({
         });
         that.autoAudioPlayInit();
 
-        if (that.data.IsShowAnswer[0]==1 && that.data.IsShowAnswer[1]==0) {
+        if (that.data.IsShowAnswer[0] == 1 && that.data.IsShowAnswer[1] == 0) {
           startScroll(2);
-        }
-        else if (that.data.IsShowAnswer[0]==1 && that.data.IsShowAnswer[1]==1) {
-          if (that.data.TaskInfo.Content[3].Content){
+        } else if (that.data.IsShowAnswer[0] == 1 && that.data.IsShowAnswer[1] == 1) {
+          if (that.data.TaskInfo.Content[3].Content) {
             startScroll(3);
-          }
-          else{
+          } else {
             startScroll(2);
           }
         }
       }
 
-      function startScroll(t){
-        var num=0;
-        setHeight("#ViewField1",function(h1){
-          num+=h1;
-          setHeight("#ViewFieldTag",function(hTag){
-            if (hTag>0)
-              num+=hTag+60;
+      function startScroll(t) {
+        var num = 0;
+        setHeight("#ViewField1", function (h1) {
+          num += h1;
+          setHeight("#ViewFieldTag", function (hTag) {
+            if (hTag > 0)
+              num += hTag + 60;
             //console.log("hTag:"+(hTag));
-            
-            setHeight("#ViewField2",function(h2){
-              if (t==2){
-                if (h2>(app.globalData.systemInfo.screenHeight/3))
+
+            setHeight("#ViewField2", function (h2) {
+              if (t == 2) {
+                if (h2 > (app.globalData.systemInfo.screenHeight / 3))
                   scroll(num);
-              }
-              else{
-                num+=h2+20;
+              } else {
+                num += h2 + 20;
                 scroll(num);
               }
             });
@@ -446,14 +450,13 @@ Page({
         });
       }
 
-      function setHeight(obj,callback) {
+      function setHeight(obj, callback) {
         var query = wx.createSelectorQuery().in(that);
         query.select(obj).boundingClientRect(function (res) {
-          if (res && res.height){
+          if (res && res.height) {
             //console.log(obj+".height:"+res.height);
             callback(res.height);
-          }
-          else{
+          } else {
             callback(0);
           }
         }).exec();
@@ -566,40 +569,45 @@ Page({
     var btnnumber = e.currentTarget.dataset.btnnumber;
     //若是“挪到最后”
     if (btnnumber == 2) {
-      if (TaskList.length>0){
+      if (TaskList.length > 0) {
         var card = TaskList.splice(0, 1);
         card[0].IsFinally = true;
         card[0].LimitTime = common.formatTime(new Date(), "/", true) + " 23:59:59";
         TaskList.push(card[0]);
-  
-        if (currentFolderID>=0){
-          that.setCurrentFolder({currentTarget:{dataset:{folderid:currentFolderID}}});
+
+        if (currentFolderID >= 0) {
+          that.setCurrentFolder({
+            currentTarget: {
+              dataset: {
+                folderid: currentFolderID
+              }
+            }
+          });
         }
-        
+
         that.setData({
           IsShowAnswer: [0, 0],
           TaskInfo: TaskList[0],
           CanUndo: 1,
           Recommend: 0,
-          Title:"",
+          Title: "",
         });
         if (that.data.IsShowOtherButton)
-            that.closeOtherButton();
-  
+          that.closeOtherButton();
+
         wx.showToast({
           title: '挪到最后',
           mask: true,
           image: "../images/universalpic_movetoend_white_120x120.png",
         });
         that.setSoundFile(3);
-      }
-      else{
+      } else {
         that.setFinallyResult();
       }
     } else {
       //若是没有选择了卡单，或者刚刚选择卡单
       if (currentFolderID == -1 || !currentFolderStart) {
-        
+
         var time = e.currentTarget.dataset.time;
         //处理当前卡片进入历史数组
         var finishCard = {};
@@ -683,7 +691,7 @@ Page({
               TaskList[0].IsReview = true;
               delete TaskList[0].IsNew;
               delete TaskList[0].IsHistory;
-              
+
               TaskList.push(TaskList[0]);
             }
             //若是天月年
@@ -731,7 +739,7 @@ Page({
 
         wx.setStorageSync("ListTaskFinished", listTaskFinished);
         TaskList.shift();
-        
+
       }
 
       that.data.NumberNew = 0;
@@ -754,18 +762,18 @@ Page({
             var card = TaskList.splice(i, 1);
             TaskList.unshift(card[0]);
           }
-        } 
+        }
       }
 
       currentFolderStart = false;
       //若选择了卡单
-      var bFolder=false;
-      if (currentFolderID>=0){
-        for(var i=0;i<TaskList.length;i++){
-          if (TaskList[i].FolderID==currentFolderID && !TaskList[i].IsFinally){
+      var bFolder = false;
+      if (currentFolderID >= 0) {
+        for (var i = 0; i < TaskList.length; i++) {
+          if (TaskList[i].FolderID == currentFolderID && !TaskList[i].IsFinally) {
             var card = TaskList.splice(i, 1);
             TaskList.unshift(card[0]);
-            bFolder=true;
+            bFolder = true;
             break;
           }
         }
@@ -784,15 +792,15 @@ Page({
       if (that.data.NumberNew == 0 &&
         that.data.NumberReview == 0 &&
         that.data.NumberHistory == 0) {
-        
-          that.setFinallyResult();
+
+        that.setFinallyResult();
       }
       //没有完成任务
       else {
 
         //如果卡单内题卡已经练习完毕，则重新选择卡单
-        if (currentFolderID>=0 && !bFolder){
-          currentFolderID=-1;
+        if (currentFolderID >= 0 && !bFolder) {
+          currentFolderID = -1;
           that.onShowFolder();
         }
 
@@ -862,7 +870,7 @@ Page({
 
     }, app.globalData.CardWaitTimeMax * 60 * 1000);
   },
-  setFinallyResult:function(){
+  setFinallyResult: function () {
     var that = this;
     that.setData({
       IsShowAnswer: [0, 0],
@@ -927,6 +935,14 @@ Page({
           Title: "报告",
         });
 
+        if (speed1 == "0张题卡" && speed2 == "0秒" && duration.toString() == "1") {
+          wx.showModal({
+            title: '提醒',
+            showCancel: false,
+            confirmText: '知道了',
+            content: "也许您已经发现「报告」上的数据有些异样。这是由于本次练习从昨天开始到今天结束，发生了「跨天」的情况。虽然报告内容不够正确，但练习数据不会受到影响，这个问题将在日后得到改善。请不用担心。"
+          });
+        }
       }
     });
   },
@@ -957,13 +973,12 @@ Page({
   showImage: function (e) {
     var name = e.currentTarget.dataset.name;
     if (name && name.length > 5) {
-      if (name.indexOf("tmp")>=0){
+      if (name.indexOf("tmp") >= 0) {
         wx.previewImage({
           current: name,
           urls: [name],
         });
-      }
-      else{
+      } else {
         wx.previewImage({
           current: name,
           urls: arrImage
@@ -971,15 +986,15 @@ Page({
       }
     }
   },
-  onFontSize: function (e) { 
-    var value = e.currentTarget.dataset.value; 
-    TaskList[0].FontSize = value; 
-    this.setData({ 
-      TaskInfo: TaskList[0], 
-      IsMore: false, 
-      Title:"", 
-    }); 
-  }, 
+  onFontSize: function (e) {
+    var value = e.currentTarget.dataset.value;
+    TaskList[0].FontSize = value;
+    this.setData({
+      TaskInfo: TaskList[0],
+      IsMore: false,
+      Title: "",
+    });
+  },
   onBindError: function (e) {
     var that = this;
     var serverUrl = e.currentTarget.dataset.serverurl;
@@ -1004,7 +1019,7 @@ Page({
 
     clearTimeout(intervalRefresh);
     intervalRefresh = setTimeout(function () {
-      if (TaskList && TaskList[0]){
+      if (TaskList && TaskList[0]) {
         TaskList[0].ContentNew = main.changeStringToView(TaskList[0].Content);
         that.setData({
           TaskInfo: TaskList[0],
@@ -1024,63 +1039,67 @@ Page({
     });
   },
   onMore: function () {
-    for (var i = 0; i < this.data.FontSizeArray.length; i++) { 
-      if (this.data.FontSizeArray[i].Value == this.data.TaskInfo.FontSize) 
-        this.data.FontSizeArray[i].CSS = "color:#1E1E1E;background-color:" + this.data.Color.LineColor + ";border:3rpx solid " + this.data.Color.LineColor + ";"; 
-      else 
-        this.data.FontSizeArray[i].CSS = ""; 
-    } 
-    this.setData({ 
-      IsMore: true, 
-      FontSizeArray: this.data.FontSizeArray, 
-      Title: "调节", 
+    for (var i = 0; i < this.data.FontSizeArray.length; i++) {
+      if (this.data.FontSizeArray[i].Value == this.data.TaskInfo.FontSize)
+        this.data.FontSizeArray[i].CSS = "color:#1E1E1E;background-color:" + this.data.Color.LineColor + ";border:3rpx solid " + this.data.Color.LineColor + ";";
+      else
+        this.data.FontSizeArray[i].CSS = "";
+    }
+    this.setData({
+      IsMore: true,
+      FontSizeArray: this.data.FontSizeArray,
+      Title: "调节",
     });
     clearTimeout(timeoutEveryCard);
   },
-  showOtherButton:function(){
+  showOtherButton: function () {
     var animation = wx.createAnimation();
 
     this.animation = animation;
 
-    animation.translate(-710+'rpx', 0).step({ duration: 200 });
+    animation.translate(-710 + 'rpx', 0).step({
+      duration: 200
+    });
 
     this.setData({
-      animationData:animation.export(),
-      IsShowOtherButton:true,
+      animationData: animation.export(),
+      IsShowOtherButton: true,
     });
   },
-  closeOtherButton:function(){
+  closeOtherButton: function () {
     var animation = wx.createAnimation();
 
     this.animation = animation;
 
-    animation.translate(0, 0).step({ duration: 200 });
+    animation.translate(0, 0).step({
+      duration: 200
+    });
 
     this.setData({
-      animationData:animation.export(),
-      IsShowOtherButton:false,
+      animationData: animation.export(),
+      IsShowOtherButton: false,
     });
   },
   onShowFolder: function () {
     for (var j = 0; j < FolderList.length; j++) {
       FolderList[j].Total = 0;
       for (var i = 0; i < TaskList.length; i++) {
-        if (TaskList[i].FolderID == FolderList[j].FolderID 
-          && !TaskList[i].IsFinally) {
+        if (TaskList[i].FolderID == FolderList[j].FolderID &&
+          !TaskList[i].IsFinally) {
           FolderList[j].Total++;
         }
       }
     }
-    var FolderListLength=FolderList.length;
+    var FolderListLength = FolderList.length;
     for (var j = 0; j < FolderList.length; j++) {
-      if (FolderList[j].Total == 0){
+      if (FolderList[j].Total == 0) {
         FolderListLength--;
       }
     }
 
-    var IsFinallyCount=0;
+    var IsFinallyCount = 0;
     for (var j = 0; j < TaskList.length; j++) {
-      if (TaskList[j].IsFinally){
+      if (TaskList[j].IsFinally) {
         IsFinallyCount++;
       }
     }
@@ -1090,8 +1109,8 @@ Page({
       IsShowNumberInfo: false,
       IsMore: false,
       FolderList: FolderList,
-      FolderListLength:FolderListLength,
-      IsFinallyCount:IsFinallyCount,
+      FolderListLength: FolderListLength,
+      IsFinallyCount: IsFinallyCount,
       Title: " ",
     });
   },
@@ -1128,6 +1147,10 @@ Page({
 
   buildShareImage: function () {
     var that = this;
+
+    that.setData({
+      IsBuildReport:true,
+    });
     wx.showLoading({
       title: '生成中',
     });
@@ -1141,162 +1164,180 @@ Page({
     //console.log(avatarUrl);
 
     wx.downloadFile({
-      url: avatarUrl, // 仅为示例，并非真实的资源
-      success(res) {
+      url: avatarUrl, 
+      success(resDownload) {
         // 只要服务器有响应数据，就会把响应内容写入文件并进入 success 回调，业务需要自行判断是否下载到了想要的内容
-        if (res.statusCode === 200) {
-
-          // const query = wx.createSelectorQuery();
-          // query.select('#shareCanvas')
-          //   .fields({ node: true, size: true })
-          //   .exec((res) => {
-          //     const canvas0 = res[0].node;
-          //     const canvas = canvas0.getContext('2d');
-
-          //     const dpr = wx.getSystemInfoSync().pixelRatio;
-          //     canvas0.width = res[0].width * dpr;
-          //     canvas0.height = res[0].height * dpr;
-          //     canvas.scale(dpr, dpr);
-
-          //     canvas.fillRect(360, 0, 600, 360);
-
-          //     //canvas.drawImage(res.tempFilePath, 0, 0, 360, 360);
-          //     //canvas.drawImage("../images/universalpic_screenshot_jl_bgimage_360x360.png", 0, 0, 360, 360);
-          //     canvas.fillStyle = "#ffffff";
-          //     //canvas.setTextBaseline('top');
-          //     canvas.setFontSize(24);
-          //     canvas.fillText(app.globalData.userInfo.NickName, 30, 282);
-
-          //     var today = common.formatTime(new Date(), ".", true);
-          //     canvas.setFontSize(18);
-          //     canvas.fillText(today, 30, 315);
-
-          //     canvas.setFontSize(20);
-          //     canvas.fillText("秒过学习", 390, 30);
-          //     canvas.setFontSize(44);
-          //     canvas.fillText("勤勉接力", 390, 58);
-          //     canvas.setFontSize(20);
-          //     canvas.fillText("见证成长", 390, 120);
-
-          //     canvas.setFontSize(68);
-          //     if (!that.data.TodayTime)
-          //       that.data.TodayTime = 0;
-
-          //     canvas.fillText(that.data.TodayTime, 390, 148);
-
-          //     canvas.font = "normal 500 68px caption";
-          //     var metrics = canvas.measureText(that.data.TodayTime.toString());
-          //     //console.log(JSON.stringify(metrics));
-
-          //     var h = 179;
-          //     if (app.globalData.IsIOS)
-          //       h = 176;
-          //     canvas.font = "normal 500 32px caption";
-          //     canvas.fillText("分钟", 393 + Math.round(metrics.width), h);
-
-
-          //     canvas.setFontSize(20);
-          //     canvas.fillText("迄今已接力", 390, 267);
-          //     canvas.setFontSize(32);
-          //     canvas.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 295);
-          //     //console.log("生成前");
-          //     canvas.draw(1, function (n) {
-          //       //console.log("生成后1");
-          //       wx.canvasToTempFilePath({
-          //         x: 0,
-          //         y: 0,
-          //         width: 600,
-          //         height: 360,
-          //         destWidth: 600,
-          //         destHeight: 360,
-          //         canvasId: 'shareCanvas',
-          //         success: function (res2) {
-          //           wx.hideLoading();
-          //           //console.log("生成后2");
-          //           wx.previewImage({
-          //             current: res2.tempFilePath, // 当前显示图片的http链接
-          //             urls: [res2.tempFilePath] // 需要预览的图片http链接列表
-          //           });
-
-          //           main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {});
-          //         },
-          //         fail: function (e) {
-          //           wx.hideLoading();
-          //           //console.log("生成错误："+e);
-          //         }
-          //       })
-          //     });
-          //   });
-
-          var canvas = wx.createCanvasContext("shareCanvas", that);
-          canvas.setFillStyle(main.getShareImageBackColor());
-          canvas.fillRect(360, 0, 600, 360);
-          canvas.drawImage(res.tempFilePath, 0, 0, 360, 360);
-          canvas.drawImage("../images/universalpic_screenshot_jl_bgimage_360x360.png", 0, 0, 360, 360);
-          canvas.fillStyle = "#ffffff";
-          canvas.setTextBaseline('top');
-          canvas.setFontSize(24);
-          canvas.fillText(app.globalData.userInfo.NickName, 30, 282);
-
-          var today = common.formatTime(new Date(), ".", true);
-          canvas.setFontSize(18);
-          canvas.fillText(today, 30, 315);
-
-          canvas.setFontSize(20);
-          canvas.fillText("秒过学习", 390, 30);
-          canvas.setFontSize(44);
-          canvas.fillText("勤勉接力", 390, 58);
-          canvas.setFontSize(20);
-          canvas.fillText("见证成长", 390, 120);
-
-          canvas.setFontSize(68);
-          if (!that.data.TodayTime)
-            that.data.TodayTime = 0;
-
-          canvas.fillText(that.data.TodayTime, 390, 148);
-
-          canvas.font = "normal 500 68px caption";
-          var metrics = canvas.measureText(that.data.TodayTime.toString());
-          //console.log(JSON.stringify(metrics));
-
-          var h = 179;
-          if (app.globalData.IsIOS)
-            h = 176;
-          canvas.font = "normal 500 32px caption";
-          canvas.fillText("分钟", 393 + Math.round(metrics.width), h);
-
-
-          canvas.setFontSize(20);
-          canvas.fillText("迄今已接力", 390, 267);
-          canvas.setFontSize(32);
-          canvas.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 295);
-          //console.log("生成前");
-          canvas.draw(1, function (n) {
-            //console.log("生成后1");
-            wx.canvasToTempFilePath({
-              x: 0,
-              y: 0,
-              width: 600,
-              height: 360,
-              destWidth: 600,
-              destHeight: 360,
-              canvasId: 'shareCanvas',
-              success: function (res2) {
-                wx.hideLoading();
-                //console.log("生成后2");
-                wx.previewImage({
-                  current: res2.tempFilePath, // 当前显示图片的http链接
-                  urls: [res2.tempFilePath] // 需要预览的图片http链接列表
-                });
+        if (resDownload.statusCode === 200) {
 
-                main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {});
-              },
-              fail: function (e) {
-                wx.hideLoading();
-                //console.log("生成错误："+e);
-              }
+          const query = wx.createSelectorQuery();
+          query.select('#shareCanvas')
+            .fields({
+              node: true,
+              size: true
             })
-          });
+            .exec((res) => {
+              const canvas = res[0].node;
+              const ctx = canvas.getContext('2d');
+
+              const dpr = wx.getSystemInfoSync().pixelRatio;
+              canvas.width = res[0].width * dpr;
+              canvas.height = res[0].height * dpr;
+              ctx.scale(dpr, dpr);
+
+              var img = canvas.createImage();
+              img.src = resDownload.tempFilePath;
+              img.onerror = err =>{
+                  console.log(err);
+              };
+              img.onload = e => {
+                ctx.drawImage(img, 0, 0, 360, 360);
+                var img2 = canvas.createImage();
+                img2.src = "../images/universalpic_screenshot_jl_bgimage_360x360.png";
+                img2.onload = e => {
+                  ctx.drawImage(img2, 0, 0, 360, 360);
+
+                  ctx.fillStyle = main.getShareImageBackColor();
+                  
+                  ctx.fillRect(360, 0, 240, 360);
+
+                  ctx.fillStyle = "#ffffff";
+                  ctx.font = "24px";
+                  ctx.fillText(app.globalData.userInfo.NickName, 30, 306);
+
+                  var today = common.formatTime(new Date(), ".", true);
+                  ctx.font = "18px";
+                  ctx.fillText(today, 30, 335);
+
+                  ctx.font = "20px";
+                  ctx.fillText("秒过学习", 390, 40);
+                  ctx.font = "44px";
+                  ctx.fillText("勤勉接力", 390, 88);
+                  ctx.font = "20px";
+                  ctx.fillText("见证成长", 390, 140);
+
+                  ctx.font = "68px";
+                  if (!that.data.TodayTime)
+                    that.data.TodayTime = 0;
+
+                  ctx.fillText(that.data.TodayTime, 390, 209);
+
+                  ctx.font = "normal 500 68px caption";
+                  var metrics = ctx.measureText(that.data.TodayTime.toString());
+                  //console.log(JSON.stringify(metrics));
+
+                  var h = 209;
+                  if (app.globalData.IsIOS)
+                    h = 206;
+                  ctx.font = "normal 500 32px caption";
+                  ctx.fillText("分钟", 393 + Math.round(metrics.width), h);
+
+
+                  ctx.font = "20px";
+                  ctx.fillText("迄今已接力", 390, 295);
+
+                  ctx.font = "32px";
+                  ctx.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 333);
+                  //console.log("生成前");
+                  setTimeout(function () {
+                    //console.log("生成后1");
+                    wx.canvasToTempFilePath({
+                      x: 0,
+                      y: 0,
+                      width: 600,
+                      height: 360,
+                      destWidth: 600,
+                      destHeight: 360,
+                      canvas: canvas,
+                      success: function (res2) {
+                        wx.hideLoading();
+                        //console.log("生成后2");
+                        wx.previewImage({
+                          current: res2.tempFilePath, // 当前显示图片的http链接
+                          urls: [res2.tempFilePath] // 需要预览的图片http链接列表
+                        });
+
+                        main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {});
+                      },
+                      fail: function (e) {
+                        wx.hideLoading();
+                        //console.log("生成错误："+e);
+                      }
+                    })
+                  }, 500);
+                };
+              };
+
+            });
+
+          // var canvas = wx.createCanvasContext("shareCanvas", that);
+          // canvas.setFillStyle(main.getShareImageBackColor());
+          // canvas.fillRect(360, 0, 600, 360);
+          // canvas.drawImage(res.tempFilePath, 0, 0, 360, 360);
+          // canvas.drawImage("../images/universalpic_screenshot_jl_bgimage_360x360.png", 0, 0, 360, 360);
+          // canvas.fillStyle = "#ffffff";
+          // canvas.setTextBaseline('top');
+          // canvas.setFontSize(24);
+          // canvas.fillText(app.globalData.userInfo.NickName, 30, 282);
+
+          // var today = common.formatTime(new Date(), ".", true);
+          // canvas.setFontSize(18);
+          // canvas.fillText(today, 30, 315);
+
+          // canvas.setFontSize(20);
+          // canvas.fillText("秒过学习", 390, 30);
+          // canvas.setFontSize(44);
+          // canvas.fillText("勤勉接力", 390, 58);
+          // canvas.setFontSize(20);
+          // canvas.fillText("见证成长", 390, 120);
+
+          // canvas.setFontSize(68);
+          // if (!that.data.TodayTime)
+          //   that.data.TodayTime = 0;
+
+          // canvas.fillText(that.data.TodayTime, 390, 148);
+
+          // canvas.font = "normal 500 68px caption";
+          // var metrics = canvas.measureText(that.data.TodayTime.toString());
+          // //console.log(JSON.stringify(metrics));
+
+          // var h = 179;
+          // if (app.globalData.IsIOS)
+          //   h = 176;
+          // canvas.font = "normal 500 32px caption";
+          // canvas.fillText("分钟", 393 + Math.round(metrics.width), h);
+
+
+          // canvas.setFontSize(20);
+          // canvas.fillText("迄今已接力", 390, 267);
+          // canvas.setFontSize(32);
+          // canvas.fillText(app.globalData.TaskToday.DayNumber + "次", 390, 295);
+          // //console.log("生成前");
+          // canvas.draw(1, function (n) {
+          //   //console.log("生成后1");
+          //   wx.canvasToTempFilePath({
+          //     x: 0,
+          //     y: 0,
+          //     width: 600,
+          //     height: 360,
+          //     destWidth: 600,
+          //     destHeight: 360,
+          //     canvasId: 'shareCanvas',
+          //     success: function (res2) {
+          //       wx.hideLoading();
+          //       //console.log("生成后2");
+          //       wx.previewImage({
+          //         current: res2.tempFilePath, // 当前显示图片的http链接
+          //         urls: [res2.tempFilePath] // 需要预览的图片http链接列表
+          //       });
+
+          //       main.getData("ShareMiaoguoTask?UserID=" + app.globalData.userInfo.UserID, function (data) {});
+          //     },
+          //     fail: function (e) {
+          //       wx.hideLoading();
+          //       //console.log("生成错误："+e);
+          //     }
+          //   })
+          // });
         } else {
           wx.hideLoading();
         }
@@ -1308,14 +1349,14 @@ Page({
   },
   saveCardType: function (event) {
     var that = this;
-    var foldertype=event.currentTarget.dataset.foldertype;
+    var foldertype = event.currentTarget.dataset.foldertype;
     var url = 'UpdateMiaoguoCardType?UserID=' + app.globalData.userInfo.UserID;
     url += "&CardType=-1";
-    url += "&FolderType="+foldertype;
+    url += "&FolderType=" + foldertype;
     url += "&ID=" + TaskList[0].MiaoguoCardID;
     main.getData(url, function (data) {
       TaskList.splice(0, 1);
-      if (TaskList.length>0){
+      if (TaskList.length > 0) {
         that.setData({
           TaskInfo: TaskList[0],
           IsShowAnswer: [0, 0],
@@ -1323,33 +1364,31 @@ Page({
         if (that.data.IsShowOtherButton)
           that.closeOtherButton();
         that.closeNumberContainner();
-        if (foldertype==1){
+        if (foldertype == 1) {
           wx.showToast({
             title: '不练习',
             mask: true,
             image: "../images/universalpic_exclamation_white_120x120.png",
           });
-          app.globalData.FolderList=[];
-        }
-        else{
+          app.globalData.FolderList = [];
+        } else {
           wx.showToast({
             title: '归档成功',
             mask: true,
             image: "../images/universalpic_cupboard_white_120x120.png",
           });
         }
-        
+
         that.setSoundFile(3);
-      }
-      else{
+      } else {
         that.setFinallyResult();
       }
-      
+
     });
   },
-  saveIsFolderPractice:function(e){
+  saveIsFolderPractice: function (e) {
     var that = this;
-    var IsFolderPractice = that.data.IsFolderPractice==0 ? 1 : 0;
+    var IsFolderPractice = that.data.IsFolderPractice == 0 ? 1 : 0;
     that.setData({
       IsFolderPractice: IsFolderPractice,
     });
@@ -1389,7 +1428,7 @@ Page({
           fieldNumber = 2;
         if (that.data.IsShowAnswer[1] == 1 && taskInfo.ContentNew.Field[3].length > 0)
           fieldNumber = 3;
-        if (taskInfo.ContentNew && taskInfo.ContentNew.Field && taskInfo.ContentNew.Field.length>0)
+        if (taskInfo.ContentNew && taskInfo.ContentNew.Field && taskInfo.ContentNew.Field.length > 0)
           field = taskInfo.ContentNew.Field[fieldNumber];
         arrAutoAudio = [];
         for (var i = 0; i < field.length; i++) {
@@ -1452,9 +1491,11 @@ Page({
     }
   },
   audioBindError: function (err) {
-    console.log(err);
-    innerAudioContext1.src = tempPlayUrlLocal;
-    innerAudioContext1.play();
+    //console.log(err);
+    if (innerAudioContext1 && innerAudioContext1.src) {
+      innerAudioContext1.src = tempPlayUrlLocal;
+      innerAudioContext1.play();
+    }
   },
 
   playSound: function (e) {
@@ -1518,8 +1559,8 @@ Page({
         fail(err) {
           wx.hideLoading();
 
-          if (url.indexOf("sp0.baidu.com")>0){
-            var soundmark=url.substring(url.indexOf("text=")+5,url.indexOf("&spd"));
+          if (url.indexOf("sp0.baidu.com") > 0) {
+            var soundmark = url.substring(url.indexOf("text=") + 5, url.indexOf("&spd"));
             url = app.globalData.audioUrlYoudao;
             url = url.replace("[word]", soundmark);
             tempPlayUrlLocal = url;
@@ -1536,14 +1577,15 @@ Page({
       isPlaying = false;
     }
   },
-  showBishunOrKaiti:function(e){
-    var that=this;
+  showBishunOrKaiti: function (e) {
+    var that = this;
     main.downloadBishunKaitiImage(
       e.currentTarget.dataset.url,
       e.currentTarget.dataset.serverurl,
       e.currentTarget.dataset.type,
-      that.data.TaskInfo.ContentNew.Field,function(fields){
-        that.data.TaskInfo.ContentNew.Field=fields;
+      that.data.TaskInfo.ContentNew.Field,
+      function (fields) {
+        that.data.TaskInfo.ContentNew.Field = fields;
         that.setData({
           TaskInfo: that.data.TaskInfo,
         });
@@ -1562,8 +1604,8 @@ Page({
   getBarInfo(e) {
     var h = e.detail.topBarHeight;
     h = h * 2;
-    if (app.globalData.IsIPad){
-      h+=25;
+    if (app.globalData.IsIPad) {
+      h += 25;
     }
     this.setData({
       topBarHeight: h,

pages/main/detail.wxml

@@ -335,7 +335,7 @@
   </view>
 </view>
 
-<canvas class='Canvas' canvas-id="shareCanvas"></canvas>
-<!-- <canvas class='Canvas' type="2d" id="shareCanvas"></canvas> -->
+<!-- <canvas style="width:600px;height:360px;background-color: {{Color.BackColor}};" canvas-id="shareCanvas"></canvas> -->
+<canvas wx:if="{{IsBuildReport}}" type="2d" style="width:600px;height:360px;background-color: {{Color.BackColor}};" id="shareCanvas"></canvas>
 
 <audio hidden='true' src="{{AudioSrc}}" id="myAudio" bindended="audioBindEnded" binderror="audioBindError"></audio>

pages/main/detail.wxss

@@ -669,13 +669,6 @@ page{
   text-align: center;
 }
 
-.Canvas{
-  width: 600px; 
-  height: 360px;
-  position: fixed;
-  left:760rpx;
-}
-
 /* 更多功能 */
 .numberContainerFooter1{
   width:100%;

pages/main/mainlist.js

@@ -65,6 +65,7 @@ Page({
     PrintID: 0, //打印ID
     CardShowDetail: 0, //0 创建时间 1 修改时间 2到期时间 3练习时间 4练习次数
     FolderListCss:"",//卡单时列表样式
+    HasNullImage:0,//有没有未上传成功的空图
   },
   onLoad: function (options) {
     var that = this;
@@ -379,6 +380,7 @@ Page({
     } else {
       that.setData({
         List: list,
+        HasNullImage:0,
       });
     }
 
@@ -406,6 +408,29 @@ Page({
       return result;
     }
     
+  },
+  getNullImageList:function(){
+    var that=this;
+    var list=that.data.List;
+    var arr=[];
+    var count=0;
+    for(var i=0;i<list.length;i++){
+      if (list[i].IsNullImage){
+        arr.push(list[i]);
+        count++;
+      }
+    }
+    app.globalData.CardList=arr;
+    that.setData({
+      List:arr,
+      Count:count,
+      HasPage:false,
+      HasNullImage:2,
+    });
+    wx.setNavigationBarTitle({
+      title: "遗失图片的题卡"
+    });
+
   },
   onPreview: function (e) {
     var id = e.currentTarget.dataset.id;
@@ -422,11 +447,26 @@ Page({
 
     var serverUrl = e.currentTarget.dataset.serverurl;
     wx.downloadFile({
-      url: serverUrl, // 仅为示例，并非真实的资源
+      url: serverUrl, 
       success(res) {
         if (res.statusCode === 200) {
           main.saveTempImage(serverUrl, res.tempFilePath);
         }
+        else{
+          var list=that.data.List;
+          for(var i=0;i<list.length;i++){
+            if (list[i].MiaoguoCardID==id)
+              list[i].IsNullImage=true;
+          }
+
+          that.setData({
+            HasNullImage:1,
+            List:list,
+          });
+          wx.pageScrollTo({
+            scrollTop: 0,
+          });
+        }
       }
     });
   },
@@ -1126,6 +1166,13 @@ Page({
       url: './' + url,
     })
   },
+  showHelpImage:function(){
+    var url=app.globalData.uploadImageUrl+"web/update_image_mathod.png";
+    wx.previewImage({
+      current: url, // 当前显示图片的http链接
+      urls: [url] // 需要预览的图片http链接列表
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/mainlist.wxml

@@ -32,9 +32,9 @@
         </view>
         <view wx:if="{{!IsFilter && (CardType==-2 || IsToday==1 || IsToday==2 || Search || PrintID)}}" class='panelTop5'>
         </view>
-        <view wx:if="{{!IsFilter && !IsCollect && !FolderID }}" class="panelTop2">{{Count}}张</view>
-        <view wx:if="{{!IsFilter && (IsCollect || FolderID)}}" class="panelTop21" bindtap="showSelectCardType">{{CardTypeStr}} {{Count}} 张</view>
-        <image wx:if="{{!IsFilter && (IsCollect || FolderID)}}" class="universalpic_arrow_down_black_14x10_0"
+        <view wx:if="{{!IsFilter && !IsCollect && !FolderID || HasNullImage==2}}" class="panelTop2">{{Count}}张</view>
+        <view wx:if="{{!IsFilter && (IsCollect || FolderID) && HasNullImage!=2}}" class="panelTop21" bindtap="showSelectCardType">{{CardTypeStr}} {{Count}} 张</view>
+        <image wx:if="{{!IsFilter && (IsCollect || FolderID) && HasNullImage!=2}}" class="universalpic_arrow_down_black_14x10_0"
           src='../images/universalpic_arrow_down_black_14x10.png' bindtap="showSelectCardType" />
         <block wx:if="{{IsFilter}}">
           <view class='{{item[2]}} panelTop4' wx:for="{{FilterArr}}" wx:key="index" catchtap='gotoNextPage' data-id="0" data-iscollect="{{item[4]}}" data-cardtype="{{item[3]}}">
@@ -44,7 +44,7 @@
       </view>
 
       <view class="panelRight FlexRow">
-        <view class='panelTop1 FlexRow' bindtap="goto" data-url="./folderEdit?type=edit&FolderID={{FolderID}}" wx:if="{{FolderID}}">
+        <view class='panelTop1 FlexRow' bindtap="goto" data-url="./folderEdit?type=edit&FolderID={{FolderID}}" wx:if="{{FolderID && HasNullImage!=2}}">
           <view class="panelTop3">编辑</view>
         </view>
         <view wx:if="{{(CardType==0 || CardType==1 || CardType==-1 || IsCollect==1) && !FolderID}}" class='panelTop1 FlexRow'
@@ -56,7 +56,7 @@
             src='../images/universalpic_arrow_updown_black_26x22.png' />
         </view>
         <view class='panelTop1 FlexRow' bindtap='addCard'
-          wx:if="{{(CardType==2 || CardType==0 || CardType==1 || CardType==-1) && !IsToday && !PrintID}}">
+          wx:if="{{(CardType==2 || CardType==0 || CardType==1 || CardType==-1) && !IsToday && !PrintID && HasNullImage!=2}}">
           <image class="universalpic_magnifier_black_30x30" src='../images/universalpic_add_black_30x30.png' />
         </view>
       </view>
@@ -66,7 +66,7 @@
   <view class="Null1"></view>
   
   <!-- 有卡单的情况 -->
-  <block wx:if="{{FolderID}}">
+  <block wx:if="{{FolderID && HasNullImage!=2}}">
     <view class="panelFolder FlexColumn" style="background-color:{{ColorName}};">
       <image class="cardlist_huawen_750x500" src='{{ImagePath}}web/cardlist_huawen_750x500.png' />
       <image class="iconClass" src='{{ImagePath}}web/{{IconName}}-big.png' />
@@ -82,14 +82,36 @@
       class="panelHelpText">在本清单中用「到期时间」排序时，您的题卡数量可能变少。由于题卡归档后不被练习没有到期时间概念，所以不能以到期时间排序，去除归档题卡总数就减少了。日常和紧急题卡不受影响，可以正常排序。</text>
   </view>
   <view class="panelHelp1 panelHelp FlexRow" wx:if="{{CardType==1 && !IsToday}}">
-    <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_infor_green_40x40.png' />
+    <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_exclamation_orange_40x40.png' />
     <text class="panelHelpText">紧急练习最多容纳200张题卡，属于临时强化措施不能取代日常练习，一般练习1个月建议停用或者更换一批题卡。经常使用请常换常新。</text>
   </view>
   <view class="panelHelp1 panelHelp FlexRow" wx:if="{{CardType==-2}}">
-    <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_infor_green_40x40.png' />
+    <image class="universalpic_exclamation_orange_40x40" src='../images/universalpic_exclamation_orange_40x40.png' />
     <text class="panelHelpText">题卡自删除之日起3个月后会自动清理，也可手动放回原处。\n小建议：不练的题卡请归档，彻底不要的再删除。</text>
   </view>
 
+  <view class="panelHelp2 FlexColumn" wx:if="{{HasNullImage==1}}" bindtap="getNullImageList">
+    <view class="panelHelp21 FlexRow">
+      <image class="universalpic_exclamation_orange_40x40_2 universalpic_exclamation_orange_40x40" src='../images/universalpic_exclamation_orange_40x40.png' />
+      <text class="panelHelpText2 panelHelpText">在数据维护时发现，一些题卡的图片不见了。可能是在制作过程中遗失了图片。</text>
+    </view>
+    <view class="panelHelp22 FlexRow">
+      <view class="panelHelp221">查看题卡</view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+		</view>
+  </view>
+
+  <view class="panelHelp2 FlexColumn" wx:if="{{HasNullImage==2}}" bindtap="showHelpImage">
+    <view class="panelHelp21 FlexRow">
+      <image class="universalpic_exclamation_orange_40x40_2 universalpic_exclamation_orange_40x40" src='../images/universalpic_exclamation_orange_40x40.png' />
+      <text class="panelHelpText2 panelHelpText">这些题卡的图片遗失了。请修改题卡，去掉老图片信息，建议从相册重新上传图片。</text>
+    </view>
+    <view class="panelHelp22 FlexRow">
+      <view class="panelHelp221">如何更换题卡图片</view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+		</view>
+  </view>
+
   <view class="panelList FlexColumn">
 
     <block wx:if="{{List.length>0}}" wx:for="{{List}}" wx:key="index">
@@ -102,8 +124,12 @@
           <view class="panelListItem FlexColumn" bindtap='onPreview' data-id="{{item.MiaoguoCardID}}">
             <view class="panelListItem1 FlexRow">
               <image class="panelListItem1Image" mode="aspectFill" src='{{item.ImageUrlTemp}}'
-                wx:if="{{item.ImageUrlServer}}" binderror="onBindError" data-id="{{item.MiaoguoCardID}}"
+                wx:if="{{!item.IsNullImage && item.ImageUrlServer}}" binderror="onBindError" data-id="{{item.MiaoguoCardID}}"
                 data-serverurl="{{item.ImageUrlServer}}" />
+              <view class="panelListItem1ImageNull panelListItem1Image FlexColumn" wx:if="{{item.IsNullImage}}">
+                <image class="universalpic_errorpic_black_30x30" src='../images/universalpic_errorpic_black_30x30.png' />
+              </view>
+              
               <view class="panelListItem11 FlexColumn">
                 <view class="panelListItem11Name1">
                   {{item.Content[1].ContentStr}}

pages/main/mainlist.wxss

@@ -135,15 +135,50 @@
 }
 
 .panelHelp1{
-  background-color: #E3FCF3;
+  background-color: #FFE4B6;
 }
 
+.panelHelp2{
+  width: 710rpx;
+  height:206rpx;
+  margin-top: 60rpx;
+  margin-bottom: 40rpx;
+}
+
+.panelHelp21{
+  width: 100%;
+  height:116rpx;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+  background-color: #FFE4B6;
+}
+
+.panelHelp22{
+  width: 100%;
+  height:90rpx;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  background-color: #fff;
+  justify-content: space-between;
+}
+
+
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin:0 30rpx;
+}
 .universalpic_exclamation_orange_40x40{
   width:40rpx;
   height:40rpx;
   margin-left: 30rpx;
   margin-top: 30rpx;
 }
+.universalpic_exclamation_orange_40x40_2{
+  margin-left: 0rpx;
+  margin-top: 0rpx;
+}
 
 .panelHelpText{
   width:620rpx;
@@ -153,6 +188,16 @@
   margin: 30rpx 0 30rpx 30rpx;
 }
 
+
+.panelHelpText2{
+  width:580rpx;
+}
+
+.panelHelp221{
+  font-size:28rpx;
+  font-weight: 400;
+  margin: 0 0 0 30rpx;
+}
 /* ************************************** */
 .panelFolder{
   width:100%;
@@ -262,6 +307,13 @@
   margin-right: 30rpx;
   border-radius: 6rpx;
 }
+.panelListItem1ImageNull{
+  background-color: #F2F2F2;
+}
+.universalpic_errorpic_black_30x30{
+  width:30rpx;
+  height:30rpx;
+}
 
 .panelListItem11{
   max-width: 650rpx;

pages/test/index.js

@@ -3,26 +3,26 @@ import main from '../../utils/main';
 import constant from '../../utils/constant';
 
 const app = getApp();
-var testGradeArr=constant.testGradeArr;
+
 
 Page({
   data: {
     List: [],
     TestSelectGrade: 0,
     IsIPhoneX: app.globalData.IsIPhoneX,
-    IsIPad:app.globalData.IsIPad,
-    ScrollLeft:0,
+    IsIPad: app.globalData.IsIPad,
+    ScrollLeft: 0,
   },
   onLoad: function (options) {
-    if (options.UserID){
-      app.globalData.userInfo={};
-      app.globalData.userInfo.UserID=options.UserID;
+    if (options.UserID) {
+      app.globalData.userInfo = {};
+      app.globalData.userInfo.UserID = options.UserID;
     }
 
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      Subject:"CHN",
+      Subject: "CHN",
     });
 
     main.getHanzi(function (arr) {
@@ -36,8 +36,8 @@ Page({
   onShow: function () {
     this.getTestReportList();
   },
-  selectSubject:function(e){
-    var subject=e.currentTarget.dataset.type;
+  selectSubject: function (e) {
+    var subject = e.currentTarget.dataset.type;
     var that = this;
     that.setData({
       Subject: subject,
@@ -45,20 +45,17 @@ Page({
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
-    if (url=="../other/userbook"){
+    if (url == "../other/userbook") {
 
-    }
-    else if (e.currentTarget.dataset.type=="Shici"){
-      var name1=e.currentTarget.dataset.name1;
-      name1=name1.replace("语文古诗文","语文");
-      url="./item?testtype=recite&name1="+name1+"&bookid="+e.currentTarget.dataset.bookid;
-    }
-    else if (e.currentTarget.dataset.type=="Word" && e.currentTarget.dataset.bookid==100){
-      var name1=e.currentTarget.dataset.name1;
-      url="./item?testtype=read&name1="+name1+"&name2=英文字母&bookid=100";
-    }
-    else if (e.currentTarget.dataset.name1 && e.currentTarget.dataset.bookid){
-      url="./list?name1="+e.currentTarget.dataset.name1+"&id="+e.currentTarget.dataset.bookid;
+    } else if (e.currentTarget.dataset.type == "Shici") {
+      var name1 = e.currentTarget.dataset.name1;
+      name1 = name1.replace("语文古诗文", "语文");
+      url = "./item?testtype=recite&name1=" + name1 + "&bookid=" + e.currentTarget.dataset.bookid;
+    } else if (e.currentTarget.dataset.type == "Word" && e.currentTarget.dataset.bookid == 100) {
+      var name1 = e.currentTarget.dataset.name1;
+      url = "./item?testtype=read&name1=" + name1 + "&name2=英文字母&bookid=100";
+    } else if (e.currentTarget.dataset.name1 && e.currentTarget.dataset.bookid) {
+      url = "./list?name1=" + e.currentTarget.dataset.name1 + "&id=" + e.currentTarget.dataset.bookid;
     }
     wx.navigateTo({
       url: url,
@@ -66,130 +63,45 @@ Page({
   },
   getTestReportList: function () {
     var that = this;
-    for(var i=0;i<testGradeArr.length;i++){
-      for(var j=0;j<testGradeArr[i].List.length;j++){
-        testGradeArr[i].List[j].Finish=0;
-      }
-    }
-    that.setData({
-      GradeArr: testGradeArr,
-    });
+    
     var userid = app.globalData.userInfo.UserID;
-    main.getData('GetTestReportList?UserID=' + userid, function (data) {
-      if (data) {
-        var dataTemp = [];
-        for (var i = 0; i < data.length; i++) {
-          for (var j = 0; j < dataTemp.length; j++) {
-            if (dataTemp[j].Name[0] == data[i].Name[0] &&
-              dataTemp[j].Name[1] == data[i].Name[1] &&
-              dataTemp[j].TestType == data[i].TestType &&
-              data[i].IsFinished == 1
-            ) {
-              dataTemp.splice(j, 1);
-              break;
-            }
-          }
-          dataTemp.push(data[i]);
-
-          if (data[i].Name[0].indexOf("英语")>=0 || data[i].Name[0].indexOf("语文词语")>=0 || data[i].Name[0].indexOf("识字 上学期")>=0 || data[i].Name[0].indexOf("拼音")>=0 || data[i].Name[1].indexOf("古诗文")>=0){
-            if (data[i].TestRightStr){
-              data[i].TestRightStr=data[i].TestRightStr.split(",");
-            }
-            if (data[i].TestWrongStr){
-              data[i].TestWrongStr=data[i].TestWrongStr.split(",");
-            }          
-            if (data[i].TestSkipStr){
-              data[i].TestSkipStr=data[i].TestSkipStr.split(",");
-            }
-            if (data[i].TestExistStr){
-              data[i].TestExistStr=data[i].TestExistStr.split(",");
-            }
-          }
-          
-          if (!data[i].TestRightStr)
-            data[i].TestRightStr="";
-          if (!data[i].TestWrongStr)
-            data[i].TestWrongStr="";
-          if (!data[i].TestSkipStr)
-            data[i].TestSkipStr="";
-          if (!data[i].TestExistStr)
-            data[i].TestExistStr="";
-                
-        }
+    main.GetTestReportList(userid,function (data,GradeArrResult) {
+      that.setData({
+        TestReport: data,
+        GradeArr: GradeArrResult,
+      });
+      
 
-        for (var i = 0; i < dataTemp.length; i++) {
-          var name = dataTemp[i].Name[0].split(" ");
-          for (var j = 0; j < that.data.GradeArr.length; j++) {
-            var item = that.data.GradeArr[j];
-            if (name[0] == item.Name) {
-              for (var k = 0; k < item.List.length; k++) {
-                
-                //音标计算进度  
-                if (item.List[k].ID==101 && dataTemp[i].BookID==101){
-                  for(var n=1;n<=4;n++){
-                    if (Number(dataTemp[i].Name[2])==n && dataTemp[i].IsFinished==1)
-                      item.List[k].Finish++;
-                  }
-                }
-                //古诗词计算进度
-                else if (item.List[k].ID==dataTemp[i].BookID && dataTemp[i].TestType=="recite" && dataTemp[i].IsFinished == 1)
-                  item.List[k].Finish=1;
-                else{
-                  if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2) {
-                    if (dataTemp[i].IsFinished == 1)
-                      item.List[k].Finish++;
-                  }
-                }
-              }
+      common.getStorageValue(that, "TestSelectGrade", 0, function () {
+        that.onSelectGrade({
+          currentTarget: {
+            dataset: {
+              value: that.data.TestSelectGrade
             }
           }
-        }
-
-        for (var j = 0; j < that.data.GradeArr.length; j++) {
-          var item = that.data.GradeArr[j];
-          for (var k = 0; k < item.List.length; k++) {
-            item.List[k].Finished = Math.round(100 * item.List[k].Finish / item.List[k].Total);
-            item.List[k].NameStr=item.List[k].Name.replace("语文","");
-          }
-        }
-
-        that.setData({
-          TestReport: data,
-          GradeArr: that.data.GradeArr,
         });
-        wx.setStorageSync("UserTestReport", data);
 
-        common.getStorageValue(that, "TestSelectGrade", 0, function () {
-          that.onSelectGrade({
-            currentTarget: {
-              dataset: {
-                value: that.data.TestSelectGrade
-              }
-            }
+        if (that.data.TestSelectGrade < 9) {
+          that.setData({
+            Subject: "CHN",
           });
-
-          if (that.data.TestSelectGrade<9){
+          if (that.data.TestSelectGrade > 4) {
             that.setData({
-              Subject:"CHN",
+              ScrollLeft: 500,
             });
-            if (that.data.TestSelectGrade>4){
-              that.setData({
-                ScrollLeft:500,
-              });
-            }
           }
-          else{
+        } else {
+          that.setData({
+            Subject: "ENG",
+          });
+          if (that.data.TestSelectGrade > 11) {
             that.setData({
-              Subject:"ENG",
+              ScrollLeft: 500,
             });
-            if (that.data.TestSelectGrade>11){
-              that.setData({
-                ScrollLeft:500,
-              });
-            }
           }
-        });
-      }
+        }
+      });
+
     });
   },
   onSelectGrade: function (e) {
@@ -206,18 +118,18 @@ Page({
   gotoTestReportInfo: function (e) {
     var id = e.currentTarget.dataset.id;
     var userid = app.globalData.userInfo.UserID;
-    main.GetTestReportInfo(id,function(data){
-        wx.setStorageSync("TestTask", data);
-        wx.navigateTo({
-          url: "./report?type=edit",
-        });
+    main.GetTestReportInfo(id, function (data) {
+      wx.setStorageSync("TestTask", data);
+      wx.navigateTo({
+        url: "./report?type=edit",
+      });
     });
   },
   onUnload: function () {
     wx.removeStorageSync("UserTestReport");
   },
   gotoReLaunch: function (e) {
-    var url=e.currentTarget.dataset.url;
+    var url = e.currentTarget.dataset.url;
     wx.reLaunch({
       url: url,
     });

pages/test/item.js

@@ -562,6 +562,7 @@ Page({
       TestTask.List = TaskList;
       TestTask.BookID=this.data.BookID;
       wx.setStorageSync("TestTask", TestTask);
+
       wx.redirectTo({
         url: './report?type=new',
       });

pages/test/item.wxml

@@ -30,10 +30,10 @@
         <view class="panelTopText">自动播报</view>
       </block>
       
-      <view class="btnTop FlexRow" catchtap='gotoNext' data-btnnumber="1">
+      <!-- <view class="btnTop FlexRow" catchtap='gotoNext' data-btnnumber="1">
         <image src="../images/universalpic_shelve_gray_26x26.png" class="universalpic_shelve_gray_26x26" />
-      </view>
-      <view class="btnTop FlexRow" catchtap='gotoNext' data-btnnumber="-1" >
+      </view> -->
+      <view class="btnTop2 btnTop FlexRow" catchtap='gotoNext' data-btnnumber="-1" >
         <image src="../images/universalpic_undo_gray_26x20.png" class="universalpic_undo_gray_26x20" />
       </view>
     </view>
@@ -58,7 +58,13 @@
           </view>
           <view class="Answer0 btnColor"></view>
         </view>
-        <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="4">
+        <view class="Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="1">
+          <view class="btnTime">
+            没学过
+          </view>
+          <view class="Answer4 btnColor"></view>
+        </view>
+        <view class="AnswerRight Answer FlexColumn" hover-class='AnswerHover' catchtap='gotoNext' data-btnnumber="4">
           <view class="btnTime">
             答对
           </view>

pages/test/item.wxss

@@ -63,6 +63,9 @@ page{
   background-color: rgba(0,0,0,0.1);
   margin-left: 30rpx;
 }
+.btnTop2{
+  margin-left: 60rpx;
+}
 .universalpic_broadcast_default_gray_34x25{
   width:34rpx;
   height:25rpx;
@@ -384,20 +387,22 @@ page{
 }
 
 .Answer {
-  flex: 1;
   font-size: 28rpx;
   justify-content: flex-start;
   height: 140rpx;
+  width:180rpx;
 }
 
 .AnswerLeft{
   border-top-left-radius: 20rpx;
   border-bottom-left-radius: 20rpx;
+  width:265rpx;
 }
 
 .AnswerRight{
   border-top-right-radius: 20rpx;
   border-bottom-right-radius: 20rpx;
+  width:265rpx;
 }
 
 .AnswerHover{
@@ -423,6 +428,10 @@ page{
   background-color: #ffbc00;
 }
 
+.Answer .Answer4 {
+  background-color: #787878;
+}
+
 .Answer .Answer1Recommend {
   height: 50rpx;
   border-bottom-left-radius: 0;

pages/test/list.js

@@ -4,6 +4,7 @@ import constant from '../../utils/constant';
 
 const app = getApp();
 var isClick = true;
+var isStart = true;
 
 Page({
   data: {
@@ -26,16 +27,24 @@ Page({
         wx.removeStorageSync("CambridgeEngList");
         wx.removeStorageSync("PhoneticEngList");
         main.getHanzi(function (arr) {
-          that.init(options);
+          that.init();
         });
       } else {
-        that.init(options);
+        that.init();
       }
+      isStart=false;
     });
   },
-  init: function (options) {
+  onUnload:function(){
+    isStart = true;
+  },
+  onShow:function(){
+    if (!isStart)
+      this.init();
+  },
+  init: function () {
     var that = this;
-    var name = options.name1;
+    var name = that.data.Name1;
     if (name.indexOf(" ") > 0)
       name = name.substr(name.indexOf(" ") + 1);
     wx.setNavigationBarTitle({
@@ -84,7 +93,7 @@ Page({
     if (that.data.BookID < 43 ||that.data.BookID > 44){
       arr = JSON.parse(arr);
     }
-    var id = Number(options.id);
+    var id = that.data.BookID;
     
     var testReportList = wx.getStorageSync("UserTestReport");
     
@@ -109,7 +118,7 @@ Page({
           list[j].TestTypeWriteFinished = true;
 
           for (var k = 0; k < testReportList.length; k++) {
-            if (testReportList[k].Name[0] == options.name1 &&
+            if (testReportList[k].Name[0] == that.data.Name1 &&
               testReportList[k].Name[1] == list[j].Name) {
 
               var testRightCount = 0;
@@ -146,6 +155,7 @@ Page({
             }
           }
         }
+        console.log("List:"+list.length);
         that.setData({
           List: list,
           UnitsID: id,

pages/test/list.wxml

@@ -8,9 +8,9 @@
 		<view class="PanelItem FlexColumn" bindtap="onShowFrame" data-id="{{item.ID}}">
 			<view class="PanelItem1 FlexRow">
 				<view class="left FlexRow">
-					<view class="Word FlexRow" wx:if="{{ListType!='english' && (BookID<=24)}}">
+					<!-- <view class="Word FlexRow" wx:if="{{ListType!='english' && (BookID<=24)}}">
 						<image class="img" src="{{ImagePath}}web/test/{{item.Words[0]}}.png" />
-					</view>
+					</view> -->
 					<view class="Title FlexRow" wx:if="{{BookID!=44}}">
 						{{item.Name}}
 					</view>

pages/test/report.js

@@ -62,7 +62,7 @@ Page({
         });
         if (listSkip.length > 0)
           result.push({
-            Name: "跳过的题目",
+            Name: "没学过的题目",
             Expand: 1,
             List: listSkip
           });
@@ -75,7 +75,7 @@ Page({
       } else {
         if (listSkip.length > 0) {
           result.push({
-            Name: "跳过的题目",
+            Name: "没学过的题目",
             Expand: 1,
             List: listSkip
           });
@@ -236,15 +236,8 @@ Page({
   },
   close: function (e) {
     wx.removeStorageSync("TestTask");
-    var delta = 2;
-    if (this.data.ReportType == "edit")
-      delta = 1;
-    
-    if (this.data.BookID==100 || (this.data.BookID>=25 && this.data.BookID<=36))
-      delta = 1;
-
     wx.navigateBack({
-      delta: delta,
+      delta: 1,
     });
   },
   saveInfo: function (TestTask) {
@@ -287,10 +280,11 @@ Page({
     wx.setStorageSync('TestTask', param1);
     
     delete param1.List;
-
     main.postData('InsertTestReport?UserID=' + userid, param1, function (data) {
       if (data){
         TestReportID = data;
+        var userid = app.globalData.userInfo.UserID;
+        main.GetTestReportList(userid,function (data,GradeArrResult) {});
       }
     });
   },

pages/test/report.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelTop FlexColumn">
     <view class="text0">{{Name}}</view>
-    <view class="text1">答对{{NumberRight}}个 答错{{NumberWrong}}个 跳过{{NumberSkip}}个</view>
+    <view class="text1">答对{{NumberRight}}个 答错{{NumberWrong}}个 没学过{{NumberSkip}}个</view>
     <view class="text2">选择题目可一键生成题卡</view>
   </view>
   <view class="panelItem FlexRow" wx:for="{{List}}" wx:key="index">
@@ -34,9 +34,7 @@
       <view class="btn3 btn FlexRow" bindtap="buildCard">
         生成题卡
       </view>
-
     </view>
-
     <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
   </view>
 

pages_agent/main/enter.js

@@ -0,0 +1,66 @@
+// pages_agent/main/enter.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages_agent/main/enter.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "秒过推广计划",
+  "navigationBarBackgroundColor": "#4ACB96",
+  "navigationBarTextStyle": "black"
+}

pages_agent/main/enter.wxml

@@ -0,0 +1,13 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <!-- <image src='../../pages/images/product_icon_mg_70x70.png' class="product_icon_mg_70x70" /> -->
+      
+  <view class="panelBottom FlexColumn">
+    <view class="panelBottom1 FlexRow">
+      <checkbox class="cb" value="cb" checked="true"/>
+      <view class="panelBottom11">我已同意</view>
+      <view class="panelBottom12">「秒过推广计划规则」</view>
+    </view>
+    <button class="btn">我要参加</button>
+  </view>
+  
+</view>

pages_agent/main/enter.wxss

@@ -0,0 +1,40 @@
+.panelBottom{
+  width: 100%;
+  background-color: #F2F2F2;
+  height:230rpx;
+  position: fixed;
+  bottom: 0;
+  justify-content: flex-start;
+}
+
+.panelBottom1{
+  justify-content: flex-start;
+  width: 100%;
+  margin-top: 30rpx;
+}
+
+.cb{
+  margin: 0 10rpx 0 40rpx;
+}
+
+.panelBottom11{
+  font-size:24rpx;
+  font-weight: 400;
+}
+.panelBottom12{
+  font-size:24rpx;
+  font-weight: 500;
+  text-decoration:underline;
+}
+
+.btn{
+  width:730rpx;
+  height:110rpx;
+  background-color:#F57C00;
+  border-radius: 20rpx;
+  text-align: center;
+  line-height: 110rpx;
+  font-size:48rpx;
+  color:#fff;
+  margin-top: 30rpx;
+}

pages_agent/main/index.js

@@ -0,0 +1,29 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  goto:function(){
+      wx.navigateTo({
+        url: '../other/paycustom',
+      });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/main/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "秒过活动",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/main/index.wxml

@@ -0,0 +1,22 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelHeight"></view>
+  <view class="panel1 FlexRow" bindtap='goto'>
+    <view class="panel11 FlexRow">
+      <image src='../../pages/images/product_icon_mg_70x70.png' class="product_icon_mg_70x70" />
+      <view class="panel111">秒过推广计划</view>
+    </view>
+    <view class="panel12 FlexRow">
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="panel1 FlexRow" bindtap='goto'>
+    <view class="panel11 FlexRow">
+      <image src='../../pages/images/product_icon_mg_70x70.png' class="product_icon_mg_70x70" />
+      <view class="panel111">秒过大使计划</view>
+    </view>
+    <view class="panel12 FlexRow">
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  
+</view>

pages_agent/main/index.wxss

@@ -0,0 +1,30 @@
+.panelHeight{
+  width:100%;
+  height: 60rpx;
+}
+.panel1{
+  width:710rpx;
+  height:130rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+}
+
+.product_icon_mg_70x70{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 10rpx;
+  margin:0 20rpx 0 30rpx;
+}
+
+.panel111{
+  font-size: 28rpx;
+  font-weight: 400;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}

pages_agent/main/message.js

@@ -0,0 +1,24 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/main/message.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "消息中心",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/main/message.wxml

@@ -0,0 +1,38 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelHeight"></view>
+  <view class="panel1 FlexRow" bindtap='goto'>
+    <view class="panel11 FlexColumn">
+      <view class="panel110"></view>
+      <view class="panel111">新消息未读</view>
+      <view class="panel112_1 panel112">平台通知</view>
+      <view class="panel113">你推荐的用户退款，以及您需要注意的事项</view>
+      <view class="panel114">2021年11月04日</view>
+    </view>
+    <view class="panel12 FlexRow">
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="panel1 FlexRow" bindtap='goto'>
+    <view class="panel11 FlexColumn">
+      <view class="panel110"></view>
+      <view class="panel111">新消息未读</view>
+      <view class="panel112_2 panel112">财务通知</view>
+      <view class="panel113">审核通过 - 166.24元</view>
+      <view class="panel114">2021年11月04日</view>
+    </view>
+    <view class="panel12 FlexRow">
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="panel1 FlexRow" bindtap='goto'>
+    <view class="panel11 FlexColumn">
+      <view class="panel110"></view>
+      <view class="panel112_2 panel112">财务通知</view>
+      <view class="panel113">3天后您的资质将失去</view>
+      <view class="panel114">2021年11月04日</view>
+    </view>
+    <view class="panel12 FlexRow">
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+</view>

pages_agent/main/message.wxss

@@ -0,0 +1,61 @@
+.panelHeight{
+  width:100%;
+  height: 60rpx;
+}
+.panel1{
+  width:710rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  margin-bottom: 30rpx;
+}
+
+.panel11{
+  margin-left: 30rpx;
+  align-items: flex-start;
+  max-width:600rpx;
+}
+
+.panel110{
+  margin-top: 30rpx;
+}
+.panel111{
+  margin-top: 10rpx;
+  font-size: 24rpx;
+  color:#FE6659;
+}
+.panel112{
+  margin-top: 10rpx;
+  font-size: 24rpx;
+  border-radius: 10rpx;
+  width:116rpx;
+  height:40rpx;
+  line-height: 40rpx;
+  color:#fff;
+  text-align: center;
+}
+.panel112_1{
+  background-color: #FE6659;
+}
+.panel112_2{
+  background-color: #4D4D4D;
+}
+.panel113{
+  margin-top: 10rpx;
+  font-size: 32rpx;
+  font-weight: 400;
+  color:#1E1E1E;
+}
+.panel114{
+  margin-top: 10rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  color:#787878;
+  margin-bottom: 40rpx;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}

pages_agent/main/message_info.js

@@ -0,0 +1,24 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/main/message_info.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "消息",
+  "backgroundColor": "#fff"
+}

pages_agent/main/message_info.wxml

@@ -0,0 +1,11 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <text class="text1">您推荐的用户已退款，以及您需要注意的事项</text>
+  <text class="text2">2021年11月04日</text>
+  <view class="line"></view>
+  <text class="text3">　　在iPad上也可以使用秒过。
+
+　　首先，安装微信并登录。首先，把iPad调整为竖屏状态。然后，启动微信就能顺利使用秒过小程序了。
+　　
+　　iPad版小程序只能在竖屏情况下运行（在启动微信之前，就必须把iPad调节为竖屏，否则就会反复出现警告信息）。而且，在使用过程中，也必须保持竖屏（请锁住iPad屏幕方向，确保始终处于竖屏状态）。</text>
+  
+</view>

pages_agent/main/message_info.wxss

@@ -0,0 +1,30 @@
+.container{
+  background-color: #fff;
+}
+
+.text1{
+  width:690rpx;
+  margin-top: 60rpx;
+  font-size: 48rpx;
+  font-weight: 400;
+}
+.text2{
+  width:690rpx;
+  margin-top: 30rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+}
+
+.line{
+  width:690rpx;
+  height:1rpx;
+  background-color: #d2d2d2;
+  margin:60rpx 0;
+}
+
+.text3{
+  width:690rpx;
+  font-size: 30rpx;
+  font-weight: 400;
+  line-height: 50rpx;
+}

pages_agent/main/userinfo.js

@@ -0,0 +1,66 @@
+// pages_agent/main/userinfo.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages_agent/main/userinfo.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "用户信息",
+  "navigationBarBackgroundColor": "#FC7406",
+  "navigationBarTextStyle": "white"
+}

pages_agent/main/userinfo.wxml

@@ -0,0 +1,64 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1_1 panel1 FlexColumn">
+    <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
+    <view class="text1">昵称</view>
+    <view class="panel11 FlexColumn">
+      <view class="text2">正式用户</view>
+      <view class="panel111 FlexRow">
+        <view class="panel1111 FlexColumn">
+          <view class="text3">2021.11.04</view>
+          <view class="text4">首次续费时间</view>
+        </view>
+        <view class="line"></view>
+        <view class="panel1111 FlexColumn">
+          <view class="text3">2021.11.04</view>
+          <view class="text4">首次续费时间</view>
+        </view>
+      </view>
+    </view>
+  </view>
+  <view class="panel2 FlexColumn">
+    <view class="panel2Item FlexRow">
+      <view>推广计划资格有效期</view>
+      <view>2021年11月04日</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panel2Item2 panel2Item FlexRow">
+      <view>离失去推广收益资格还剩</view>
+      <view>1天</view>
+      <text class="text5">这里有一段对资格有效期的说明\nARIA vocal collection（15曲）アリア OP, ED, 挿入歌 ／ 牧野由依, ROUND TABLE feat. Nino, 河井英里 etc.</text>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panel2Item FlexRow">
+      <view>微信支付平台交易手续费</view>
+      <view>0.6%</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panel2Item FlexRow">
+      <view>代缴个人所得税</view>
+      <view>6%</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panel2Item FlexRow">
+      <view>收款人微信帐号</view>
+      <view>一泓清水@体脂管理</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panel2Item FlexRow">
+      <view>收款帐号真实姓名</view>
+      <view>天不怕</view>
+    </view>
+  </view>    
+  
+  
+</view>

pages_agent/main/userinfo.wxss

@@ -0,0 +1,88 @@
+.panel1{
+  width: 100%;
+  justify-content: flex-start;
+  color:#fff;
+}
+.panel1_1{
+  background-color: #FC7406;
+}
+.panel1_2{
+  background-color: #FFB808;
+}
+.avatar{
+  width:200rpx;
+  height:200rpx;
+  margin-top: 60rpx;
+  border-radius: 20rpx;
+}
+
+.text1{
+  font-size:32rpx;
+  margin-top: 20rpx;
+}
+
+.panel11{
+  width:710rpx;
+  height:245rpx;
+  background-color: #F2F2F2;
+  border-radius: 20rpx;
+  color:#4D4D4D;
+  margin: 60rpx 0 80rpx 0;
+  justify-content: flex-start;
+
+  box-shadow: 0 20rpx 0 0 rgba(0,0,0,0.1);
+}
+.text2{
+  font-size:36rpx;
+  margin-top:40rpx;
+}
+
+.panel111{
+  margin-top: 20rpx;
+  align-items: flex-start;
+}
+
+.panel1111{
+  width:300rpx;
+  height:85rpx;
+}
+
+.text3{
+  font-size:36rpx;
+  font-family: 'Roboto-Black';
+}
+.text4{
+  font-size:24rpx;
+  margin-top: 10rpx;
+}
+
+.line{
+  width:4rpx;
+  height:40rpx;
+  background-color: #4D4D4D;
+}
+
+.panel2{
+  width:100%;
+  background-color: #fff;
+}
+
+.panel2Item{
+  width:690rpx;
+  min-height:100rpx;
+  justify-content: space-between;
+  font-size: 28rpx;
+  font-weight: 400;
+  flex-wrap: wrap;
+}
+
+.panel2Item2{
+  height:189rpx;
+}
+
+.text5{
+  width:690rpx;
+  font-size: 20rpx;
+  font-weight: 500;
+}
+

pages_agent/promotion/earnings.js

@@ -0,0 +1,27 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onPullDownRefresh: function () {
+    wx.stopPullDownRefresh();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/promotion/earnings.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "预估新增收益",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/promotion/earnings.wxml

@@ -0,0 +1,115 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexColumn" bindtap='goto'>
+    <view class="panel11 FlexColumn">
+      <text class="text1">① 7天退款期，有退款的情况\n② 检查一下是否与您的认知有出入，一旦他人就无法更改了
+      </text>
+    </view>
+    <view class="panel12 FlexRow">
+      <view class="text2">详细规则</view>
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+
+  <view class="panel4 FlexRow">
+    <view class="Left FlexRow">
+      <image src='../../pages/images/universalpic_exclamation_orange_40x40.png' class="universalpic_exclamation_orange_40x40" />
+      <view class="panel41 FlexColumn">
+        <view class="text8">您有1笔退款，返还奖励后，剩余收益可提现。</view>
+        <view class="text4">查看退款记录</view>
+      </view>
+    </view>
+    <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+  </view>
+
+  <view class="panel2 FlexRow">
+    <text class="text3"><text class="Number1">24</text> 条记录</text>
+    <text class="text7">收益 <text class="Number1">960.00</text></text>
+  </view>
+  <view class="panel3 FlexColumn">
+    <block wx:for="{{[1,2,3,4,5]}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth720"></view>
+      </view>
+      <view class="panelItem FlexRow" >
+      <view class="Left FlexRow">
+        <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
+        <view class="panelItem1 FlexColumn">
+          <view class="text4">昵称</view>
+          <view class="text5">续费 2021年11月04日 08:20</view>
+        </view>
+      </view>
+      <view class="Right FlexColumn">
+        <block wx:if="{{false}}">
+          <view class="text6">等待生效</view>
+          <view class="text5">2021年11月04日 08:20</view>
+        </block>
+        <view class="Number1" wx:if="{{true}}">30.00</view>
+      </view>
+    </view>
+    </block>
+    
+  </view>
+  <view style="height:150rpx;"></view>
+  <view class="panelBottom FlexColumn">
+    <view class="btn">申请提现</view>
+  </view>
+</view>
+
+<view class="container2 container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel5 FlexColumn">
+    <view class="text51">申请提现</view>
+    <view class="panel51 FlexRow">
+      <view class="panel511 FlexColumn">
+        <view class="text52">176.42</view>
+        <view class="text53">提现金额</view>
+      </view>
+      <view class="panel511 FlexColumn">
+        <view class="text52">166.24</view>
+        <view class="text53">到账金额</view>
+      </view>
+    </view>
+    <view class="panel52 FlexRow">
+      <view class="Left FlexRow">
+        <image src='../../pages/images/universalpic_exclamation_orange_40x40.png' class="universalpic_exclamation_orange_40x40" />
+        <view class="text53">已扣除因退款返还奖励金额</view>
+      </view>
+      <view class="text54">24.58</view>
+    </view>
+    <view class="panel53 FlexRow">
+      <view class="text54">微信支付平台交易手续费</view>
+      <view class="text54">0.6%</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth680"></view>
+    </view>
+    <view class="panel53 FlexRow">
+      <view class="text54">代缴个人所得税</view>
+      <view class="text54">0%</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth680"></view>
+    </view>
+    <view class="panel53 FlexRow">
+      <view class="text54">收款方式</view>
+      <view class="text54">微信钱包</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth680"></view>
+    </view>
+    <view class="panel53 FlexRow">
+      <view class="text54">收款人微信帐号</view>
+      <view class="text54">ABC</view>
+    </view>
+    <view class="lineWidthAll FlexRow">
+      <view class="lineWidth680"></view>
+    </view>
+    <view class="panel53 FlexRow">
+      <view class="text54">收款人帐号真实姓名</view>
+      <view class="text54">张三</view>
+    </view>
+    <view class="btn2">确认</view>
+    
+  </view>
+  <view class="btnCancel">取消</view>
+
+</view>

pages_agent/promotion/earnings.wxss

@@ -0,0 +1,237 @@
+.panel1{
+  width:710rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  margin: 60rpx 0;
+}
+
+.panel11{
+  width:100%;
+  font-size: 22rpx;
+  font-weight: 400;
+  min-height: 178rpx;
+  justify-content: flex-start;
+  border-bottom:1rpx solid #e3e3e3;
+}
+
+.text1{
+  margin-top: 30rpx;
+  width:650rpx;
+}
+
+.panel12{
+  width:100%;
+  height: 100rpx;
+  justify-content: space-between;
+}
+
+.text2{
+  font-size: 28rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+.panel4{
+  width:710rpx;
+  height:143rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+  margin: 0 0 60rpx 0;
+  justify-content: space-between;
+}
+
+.universalpic_exclamation_orange_40x40{
+  width:40rpx;
+  height:40rpx;
+  margin-left: 30rpx;
+}
+
+.panel2{
+  width: 100%;
+  justify-content: space-between;
+}
+
+.text3{
+  margin-left: 30rpx;
+  font-size: 32rpx;
+  color:#4D4D4D;
+}
+.text7{
+  margin-right: 30rpx;
+  font-size: 32rpx;
+  color:#4D4D4D;
+}
+.Number1{
+  font-family: 'Roboto-Black';
+  font-size:28rpx;
+  color:#4D4D4D;
+}
+
+.panel41{
+  align-items: flex-start;
+  margin-left: 20rpx;
+}
+.text8{
+  font-size: 24rpx;
+  color:#1E1E1E;
+  margin-bottom: 10rpx;
+}
+
+.panel3{
+  width: 100%;
+  justify-content: flex-start;
+  background-color: #fff;
+  margin-top: 30rpx;
+}
+
+.panelItem{
+  width: 100%;
+  height:141rpx;
+  justify-content: space-between;
+}
+
+.avatar{
+  width:80rpx;
+  height:80rpx;
+  border-radius: 20rpx;
+  margin-left: 30rpx;
+}
+
+.panelItem1{
+  align-items: flex-start;
+  margin-left: 20rpx;
+}
+
+.text4{
+  font-size: 28rpx;
+  color:#4D4D4D;
+  font-weight: 400;
+}
+.text5{
+  font-size: 20rpx;
+  color:#9B9B9B;
+}
+.Right{
+  margin-right: 30rpx;
+  align-items: flex-end;
+}
+.text6{
+  font-size: 24rpx;
+  color:#4D4D4D;
+}
+
+.panelBottom{
+  width:100%;
+  height:131rpx;
+  bottom: 0;
+  position: fixed;
+  background-color: #f2f2f2;
+  border-top: 1rpx solid #d2d2d2;
+}
+
+.panelBottom .btn{
+  width:730rpx;
+  height:110rpx;
+  border-radius: 20rpx;
+  background-color: #F57C00;
+  line-height: 110rpx;
+  color:#fff;
+  font-size:48rpx;
+  text-align: center;
+}
+
+/* 申请提现 */
+.container2{
+  background-color: rgba(0,0,0,0.8);
+  position: fixed;
+  top:0;
+  z-index: 10;
+  width: 100%;
+}
+
+.panel5{
+  width: 710rpx;
+  border-radius: 20rpx;
+  position: fixed;
+  bottom:160rpx;
+  background-color: #fff;
+  min-height: 500rpx;
+}
+
+.btnCancel{
+  width:710rpx;
+  height:100rpx;
+  border-radius: 20rpx;
+  text-align: center;
+  line-height: 100rpx;
+  font-size:28rpx;
+  background-color: #fff;
+  color: #1e1e1e;
+  position: fixed;
+  bottom:30rpx;
+}
+
+.text51{
+  margin-top: 40rpx;
+  font-size: 32rpx;
+  color:#4D4D4D;
+}
+
+.panel51{
+  margin-top: 10rpx;
+  width:100%;
+}
+
+.panel511{
+  flex: 1;
+}
+
+.text52{
+  font-size: 64rpx;
+  color:#4D4D4D;
+  font-family: 'Roboto-Black';
+}
+.text53{
+  font-size: 24rpx;
+  color:#4D4D4D;
+  margin: 0 30rpx 0 20rpx;
+  font-weight: 400;
+}
+
+.panel52{
+  width: 100%;
+  background-color: #FFE4B6;
+  height:94rpx;
+  justify-content: space-between;
+  margin-top: 30rpx;
+}
+
+.text54{
+  font-size: 24rpx;
+  color:#4D4D4D;
+  margin: 0 30rpx 0 30rpx;
+  font-weight: 400;
+}
+
+.panel53{
+  width: 100%;
+  height:94rpx;
+  justify-content: space-between;
+}
+
+.btn2{
+  width:100%;
+  line-height: 127rpx;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  background-color: #F57C00;
+  text-align: center;
+  color:#fff;
+  font-size: 48rpx;
+}

pages_agent/promotion/earnings_list.js

@@ -0,0 +1,27 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onPullDownRefresh: function () {
+    wx.stopPullDownRefresh();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/promotion/earnings_list.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "收益记录",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/promotion/earnings_list.wxml

@@ -0,0 +1,45 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1 FlexColumn" bindtap='goto'>
+    <view class="text10 text1">等待审核</view>
+    <view class="text2">166.24</view>
+    <view class="text3">到帐金额</view>
+    <view class="line"></view>
+    <view class="panel11 FlexColumn">
+      <view class="panel111 FlexRow">
+        <view class="text4">申请单号</view>
+        <view class="text5">123456789</view>
+      </view>
+      <view class="panel112 FlexRow">
+        <view class="text4">申请时间</view>
+        <view class="text5">2021年11月04日 08:20</view>
+      </view>
+    </view>
+    <view class="line2"></view>
+    <view class="panel12 FlexRow">
+      <view class="text6">查看申请单详情</view>
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+
+  <view class="panel1 FlexColumn" bindtap='goto'>
+    <view class="text1">审核通过</view>
+    <view class="text2">66.84</view>
+    <view class="text3">到帐金额</view>
+    <view class="line"></view>
+    <view class="panel11 FlexColumn">
+      <view class="panel111 FlexRow">
+        <view class="text4">申请单号</view>
+        <view class="text5">123456789</view>
+      </view>
+      <view class="panel112 FlexRow">
+        <view class="text4">申请时间</view>
+        <view class="text5">2021年11月04日 08:20</view>
+      </view>
+    </view>
+    <view class="line2"></view>
+    <view class="panel12 FlexRow">
+      <view class="text6">查看申请单详情</view>
+      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
+</view>

pages_agent/promotion/earnings_list.wxss

@@ -0,0 +1,86 @@
+.panel1{
+  width:711rpx;
+  margin-top: 60rpx;
+  background-color: #fff;
+  border-radius: 20rpx;
+}
+
+.text1{
+  font-size: 36rpx;
+  margin-top: 40rpx;
+  color:#4D4D4D;
+}
+
+.text10{
+  color:#FE6659;
+}
+
+.text2{
+  font-size: 64rpx;
+  margin-top: 10rpx;
+  color:#4D4D4D;
+  font-family: 'Roboto-Black';
+}
+
+.text3{
+  font-size: 28rpx;
+  color:#4D4D4D;
+}
+.line{
+  width:650rpx;
+  height:1rpx;
+  background-color: #e3e3e3;
+  margin-top: 30rpx;
+}
+.panel11{
+  width:100%;
+  height: 146rpx;
+  justify-content: flex-start;
+}
+
+.panel111{
+  margin: 30rpx 0 0 0;
+  width:650rpx;
+  justify-content: flex-start;
+}
+.panel112{
+  margin: 20rpx 0 0 0;
+  width:650rpx;
+  justify-content: flex-start;
+}
+
+.text4{
+  font-size: 24rpx;
+  color:#787878;
+  font-weight: 400;
+}
+.text5{
+  font-size: 24rpx;
+  color:#4D4D4D;
+  margin-left: 30rpx;
+}
+
+.panel12{
+  width:100%;
+  height: 100rpx;
+  justify-content: space-between;
+}
+
+.text6{
+  font-size: 28rpx;
+  columns: #1e1e1e;
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.line2{
+  width:100%;
+  height:1rpx;
+  background-color: #e3e3e3;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+

pages_agent/promotion/user_index.js

@@ -0,0 +1,27 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    var that = this;
+    
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  onPullDownRefresh: function () {
+    wx.stopPullDownRefresh();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages_agent/promotion/user_index.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "秒过推广计划",
+  "navigationBarBackgroundColor": "#FC7406",
+  "navigationBarTextStyle": "white",
+  "backgroundColorTop":"#FC7406",
+  "backgroundColorBottom":"#FC7406",
+  "enablePullDownRefresh": true
+}

pages_agent/promotion/user_index.wxml

@@ -0,0 +1,105 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+    <image src='../../pages/images/product_icon_mg_70x70.png' class="avatar" />
+    <view class="text1">累计收益</view>
+    <view class="text2">166.24</view>
+    
+    <view class="panel1 FlexColumn">
+      <view class="panel11 FlexRow">
+        <view class="panel111 FlexColumn">
+          <view class="text3">60</view>
+          <view class="text4 FlexRow">
+            <view class="universalpic_indicator_right_deepgray"></view>
+            <view>预估新增收益</view>
+            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
+          </view>
+        </view>
+        <view class="line"></view>
+        <view class="panel111 FlexColumn">
+          <view class="text3">260</view>
+          <view class="text4 FlexRow">
+            <view class="universalpic_indicator_right_deepgray"></view>
+            <view>可提现收益</view>
+            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
+          </view>
+        </view>
+        <view class="line"></view>
+        <view class="panel111 FlexColumn">
+          <view class="text3">12</view>
+          <view class="text4 FlexRow">
+            <view class="universalpic_indicator_right_deepgray"></view>
+            <view>已结清人数</view>
+            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
+          </view>
+        </view>
+      </view>
+      <view class="panel2_0 panel2 FlexRow">
+        <view class="panel21 FlexRow">
+          收益记录
+        </view>
+        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
+      <view class="panel2_1 panel2 FlexRow">
+        <view class="panel21 FlexRow">
+          其它情况
+        </view>
+        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
+    </view>
+
+    <view class="panel1_0 panel1 FlexColumn">
+      <view class="text5">潜在收益</view>
+      <view class="panel11 FlexRow">
+        <view class="panel111 FlexColumn">
+          <view class="text3">17</view>
+          <view class="text4 FlexRow">
+            <view class="universalpic_indicator_right_deepgray"></view>
+            <view>新报名</view>
+            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
+          </view>
+        </view>
+        <view class="line"></view>
+        <view class="panel111 FlexColumn">
+          <view class="text3">0</view>
+          <view class="text4 FlexRow">
+            <view class="universalpic_indicator_right_deepgray"></view>
+            <view>新访客</view>
+            <image src='../images/universalpic_indicator_right_deepgray.png' class="universalpic_indicator_right_deepgray" />
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="panel1_0 panel1 FlexColumn">
+      <view class="panel11 FlexRow">
+        <view class="panel111 FlexColumn">
+          <image src='../images/promotion_index_rules.png' class="promotion_index_rules" />
+          <view class="text4 FlexRow">
+            <view>推广计划规则</view>
+          </view>
+        </view>
+        <view class="line2 line"></view>
+        <view class="panel111 FlexColumn">
+          <image src='../images/promotion_index_code.png' class="promotion_index_rules" />
+          <view class="text4 FlexRow">
+            <view>我的推广物料</view>
+          </view>
+        </view>
+        <view class="line2 line"></view>
+        <view class="panel111 FlexColumn">
+          <image src='../images/promotion_index_message.png' class="promotion_index_rules" />
+          <view class="text4 FlexRow">
+            <view>消息中心</view>
+          </view>
+          <view class="textMessage">新消息</view>
+        </view>
+      </view>
+      <view class="panel2_1 panel2 FlexRow">
+        <view class="panel21 FlexRow">
+          联系客服
+        </view>
+        <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
+      </view>
+    </view>
+
+    <view class="textBottom">返回秒过活动首页</view>
+</view>

pages_agent/promotion/user_index.wxss

@@ -0,0 +1,135 @@
+.container{
+  width: 100%;
+  justify-content: flex-start;
+  color:#fff;
+  background-color: #FC7406;
+}
+
+.avatar{
+  width:200rpx;
+  height:200rpx;
+  margin-top: 60rpx;
+  border-radius: 20rpx;
+}
+
+.text1{
+  font-size:48rpx;
+  margin-top: 30rpx;
+}
+
+.text2{
+  font-size:128rpx;
+  font-family: 'Roboto-Black';
+}
+
+
+.panel1{
+  width:710rpx;
+  background-color: #F2F2F2;
+  border-radius: 20rpx;
+  color:#4D4D4D;
+  margin: 60rpx 0 0 0;
+  justify-content: flex-start;
+  box-shadow: 0 20rpx 0 0 rgba(0,0,0,0.1);
+}
+
+.panel11{
+  align-items: flex-start;
+}
+
+.panel111{
+  width:238rpx;
+  height:188rpx;
+  justify-content: flex-start;
+  position: relative;
+}
+
+.text3{
+  font-size:64rpx;
+  font-family: 'Roboto-Black';
+  color:#1E1E1E;
+  margin-top: 40rpx;
+}
+.text4{
+  font-size:24rpx;
+  margin-top: 10rpx;
+}
+
+.line{
+  width:4rpx;
+  height:40rpx;
+  background-color: #4D4D4D;
+  margin-top: 60rpx;
+}
+.line2{
+  margin-top: 54rpx;
+}
+
+.universalpic_indicator_right_deepgray{
+  width:16rpx;
+  height:26rpx;
+  margin: 0 10rpx;
+}
+
+.panel2{
+  width:100%;
+  background-color: #F2F2F2;
+  justify-content: space-between;
+  height: 100rpx;
+}
+.panel2_0{
+  background-color: #2e2e2e; 
+  color:#fff;
+}
+.panel2_1{
+  border-top:1rpx solid #e3e3e3;
+  border-bottom-left-radius: 20rpx;
+  border-bottom-right-radius: 20rpx;
+  background-color: #fff;
+}
+.panel21{
+  margin-left: 30rpx;
+  font-size: 28rpx;
+  font-weight: 400;
+}
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 30rpx;
+}
+
+.panel1_0{
+  margin-top: 50rpx;
+}
+
+.text5{
+  font-size:36rpx;
+  margin-top: 40rpx;
+}
+
+.promotion_index_rules{
+  width:46rpx;
+  height:46rpx;
+  margin: 52rpx 0 12rpx 0;
+}
+
+.textMessage{
+  position: absolute;
+  top:20rpx;
+  right:20rpx;
+  width:80rpx;
+  height:36rpx;
+  line-height: 36rpx;
+  border-radius: 18rpx;
+  background-color: #FE6659;
+  text-align: center;
+  font-size: 20rpx;
+  font-weight: 600;
+  color:#fff;
+}
+
+.textBottom{
+  font-size:28rpx;
+  color:#fff;
+  margin: 100rpx 0 60rpx 0;
+}

project.private.config.json

@@ -26,41 +26,6 @@
           "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",
@@ -69,14 +34,8 @@
           "scene": null
         },
         {
-          "name": "pages/index/index",
-          "pathName": "pages/index/index",
-          "query": "type=video&LessonID=3&LessonPage=5&UserID=1",
-          "scene": 1047
-        },
-        {
-          "name": "pages/other/newuser",
-          "pathName": "pages/other/newuser",
+          "name": "pages_agent/promotion/earnings_list",
+          "pathName": "pages_agent/promotion/earnings_list",
           "query": "",
           "scene": null
         }

utils/constant.js

@@ -15,6 +15,12 @@ module.exports = {
     }, {
       Word: "刚才",
       Sound: "(gāng)(cái)",
+    },{
+      Word: "吐蕃",
+      Sound: "(tǔ)(bō)",
+    },{
+      Word: "游说",
+      Sound: "(yóu)(shuì)",
     },
   ],
   arrMenuText: [{
@@ -585,7 +591,7 @@ module.exports = {
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 41,
+      Total: 82,
       Image: "../images/examine_subject_a001.png"
     }, {
       ID: 13,
@@ -593,7 +599,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "上学期",
       Finish: 0,
-      Total: 26,
+      Total: 52,
       Image: "../images/examine_subject_a001.png"
     }, {
       ID: 25,
@@ -617,7 +623,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "下学期",
       Finish: 0,
-      Total: 28,
+      Total: 56,
       Image: "../images/examine_subject_a002.png"
     }, {
       ID: 26,
@@ -640,7 +646,7 @@ module.exports = {
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 36,
+      Total: 72,
       Image: "../images/examine_subject_a003.png"
     }, {
       ID: 15,
@@ -648,7 +654,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "上学期",
       Finish: 0,
-      Total: 28,
+      Total: 56,
       Image: "../images/examine_subject_a003.png"
     },{
       ID: 45,
@@ -656,7 +662,7 @@ module.exports = {
       Name: "语文词语",
       Name2: "上学期",
       Finish: 0,
-      Total: 22,
+      Total: 52,
       Image: "../images/examine_subject_a003.png"
     },{
       ID: 27,
@@ -680,7 +686,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "下学期",
       Finish: 0,
-      Total: 29,
+      Total: 58,
       Image: "../images/examine_subject_a004.png"
     }, {
       ID: 46,
@@ -688,7 +694,7 @@ module.exports = {
       Name: "语文词语",
       Name2: "下学期",
       Finish: 0,
-      Total: 23,
+      Total: 46,
       Image: "../images/examine_subject_a004.png"
     }, {
       ID: 28,
@@ -711,7 +717,7 @@ module.exports = {
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 31,
+      Total: 62,
       Image: "../images/examine_subject_a005.png"
     }, {
       ID: 17,
@@ -719,7 +725,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "上学期",
       Finish: 0,
-      Total: 28,
+      Total: 40,
       Image: "../images/examine_subject_a005.png"
     }, {
       ID: 47,
@@ -727,7 +733,7 @@ module.exports = {
       Name: "语文词语",
       Name2: "上学期",
       Finish: 0,
-      Total: 17,
+      Total: 34,
       Image: "../images/examine_subject_a005.png"
     }, {
       ID: 29,
@@ -751,7 +757,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "下学期",
       Finish: 0,
-      Total: 21,
+      Total: 42,
       Image: "../images/examine_subject_a006.png"
     }, {
       ID: 48,
@@ -759,7 +765,7 @@ module.exports = {
       Name: "语文词语",
       Name2: "下学期",
       Finish: 0,
-      Total: 18,
+      Total: 36,
       Image: "../images/examine_subject_a006.png"
     }, {
       ID: 30,
@@ -782,7 +788,7 @@ module.exports = {
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 31,
+      Total: 62,
       Image: "../images/examine_subject_a007.png"
     },  {
       ID: 19,
@@ -790,7 +796,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "上学期",
       Finish: 0,
-      Total: 20,
+      Total: 40,
       Image: "../images/examine_subject_a007.png"
     },  {
       ID: 49,
@@ -798,7 +804,7 @@ module.exports = {
       Name: "语文词语",
       Name2: "上学期",
       Finish: 0,
-      Total: 16,
+      Total: 32,
       Image: "../images/examine_subject_a007.png"
     },  {
       ID: 31,
@@ -822,7 +828,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "下学期",
       Finish: 0,
-      Total: 20,
+      Total: 40,
       Image: "../images/examine_subject_a008.png"
     }, {
       ID: 50,
@@ -830,7 +836,7 @@ module.exports = {
       Name: "语文词语",
       Name2: "下学期",
       Finish: 0,
-      Total: 16,
+      Total: 32,
       Image: "../images/examine_subject_a008.png"
     }, {
       ID: 32,
@@ -853,7 +859,7 @@ module.exports = {
       Name: "语文识字",
       Name2: "上学期",
       Finish: 0,
-      Total: 27,
+      Total: 54,
       Image: "../images/examine_subject_a009.png"
     }, {
       ID: 21,
@@ -861,7 +867,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "上学期",
       Finish: 0,
-      Total: 21,
+      Total: 42,
       Image: "../images/examine_subject_a009.png"
     }, {
       ID: 51,
@@ -869,7 +875,7 @@ module.exports = {
       Name: "语文词语",
       Name2: "上学期",
       Finish: 0,
-      Total: 16,
+      Total: 32,
       Image: "../images/examine_subject_a009.png"
     }, {
       ID: 33,
@@ -893,7 +899,7 @@ module.exports = {
       Name: "语文写字",
       Name2: "下学期",
       Finish: 0,
-      Total: 16,
+      Total: 32,
       Image: "../images/examine_subject_a010.png"
     }, {
       ID: 52,
@@ -901,7 +907,7 @@ module.exports = {
       Name: "语文词语",
       Name2: "下学期",
       Finish: 0,
-      Total: 12,
+      Total: 24,
       Image: "../images/examine_subject_a010.png"
     }, {
       ID: 34,
@@ -926,7 +932,7 @@ module.exports = {
         Name: "语文写字",
         Name2: "上学期",
         Finish: 0,
-        Total: 18,
+        Total: 36,
         Image: "../images/examine_subject_a011.png"
       }, {
         ID: 53,
@@ -934,7 +940,7 @@ module.exports = {
         Name: "语文词语",
         Name2: "上学期",
         Finish: 0,
-        Total: 14,
+        Total: 28,
         Image: "../images/examine_subject_a011.png"
       }, {
         ID: 35,
@@ -950,7 +956,7 @@ module.exports = {
         Name: "语文写字",
         Name2: "下学期",
         Finish: 0,
-        Total: 12,
+        Total: 24,
         Image: "../images/examine_subject_a012.png"
       }, {
         ID: 54,
@@ -958,7 +964,7 @@ module.exports = {
         Name: "语文词语",
         Name2: "下学期",
         Finish: 0,
-        Total: 7,
+        Total: 14,
         Image: "../images/examine_subject_a012.png"
       }, {
         ID: 36,
@@ -1084,7 +1090,7 @@ module.exports = {
         Name: "常用单词1",
         Name2: "词汇1~220",
         Finish: 0,
-        Total: 22,
+        Total: 44,
         Image: "../images/examine_subject_b001.png"
       },
       {
@@ -1093,7 +1099,7 @@ module.exports = {
         Name: "常用单词2",
         Name2: "词汇221~500",
         Finish: 0,
-        Total: 28,
+        Total: 56,
         Image: "../images/examine_subject_b002.png"
       },
       {
@@ -1102,7 +1108,7 @@ module.exports = {
         Name: "常用单词3",
         Name2: "词汇500~1000",
         Finish: 0,
-        Total: 50,
+        Total: 100,
         Image: "../images/examine_subject_b003.png"
       },
       {
@@ -1111,7 +1117,7 @@ module.exports = {
         Name: "常用单词4",
         Name2: "词汇1001~1500",
         Finish: 0,
-        Total: 50,
+        Total: 100,
         Image: "../images/examine_subject_b004.png"
       },
       {
@@ -1120,7 +1126,7 @@ module.exports = {
         Name: "常用单词5",
         Name2: "词汇1501~2000",
         Finish: 0,
-        Total: 50,
+        Total: 100,
         Image: "../images/examine_subject_b005.png"
       },
     ]
@@ -1136,7 +1142,7 @@ module.exports = {
         Name: "第一册",
         Name2: "词汇906",
         Finish: 0,
-        Total: 115,
+        Total: 230,
         Image: "../images/examine_subject_c001.png"
       },
       {
@@ -1145,7 +1151,7 @@ module.exports = {
         Name: "第二册",
         Name2: "词汇861",
         Finish: 0,
-        Total: 96,
+        Total: 192,
         Image: "../images/examine_subject_c002.png"
       },
       {
@@ -1154,7 +1160,7 @@ module.exports = {
         Name: "第三册",
         Name2: "词汇1054",
         Finish: 0,
-        Total: 60,
+        Total: 120,
         Image: "../images/examine_subject_c003.png"
       },
       {
@@ -1163,7 +1169,7 @@ module.exports = {
         Name: "第四册",
         Name2: "词汇777",
         Finish: 0,
-        Total: 46,
+        Total: 92,
         Image: "../images/examine_subject_c004.png"
       }
     ]
@@ -1174,20 +1180,20 @@ module.exports = {
     Select: "",
     List: [
       {
-        ID: 131,
+        ID: 133,
         Type: "Word",
         Name: "KET分类单词",
-        Name2: "词汇528",
+        Name2: "词汇1144",
         Finish: 0,
-        Total: 17,
+        Total: 48,
         Image: "../images/examine_subject_c001.png"
       },{
-        ID: 132,
+        ID: 134,
         Type: "Word",
         Name: "PET分类单词",
-        Name2: "词汇1374",
+        Name2: "词汇1907",
         Finish: 0,
-        Total: 54,
+        Total: 46,
         Image: "../images/examine_subject_c002.png"
       }
     ]

utils/main.js

@@ -1562,6 +1562,97 @@ function GetSoundError(str) {
   return result;
 }
 
+function GetTestReportList(userID,callback){
+  var GradeArr = constant.testGradeArr;
+  for (var i = 0; i < GradeArr.length; i++) {
+    for (var j = 0; j < GradeArr[i].List.length; j++) {
+      GradeArr[i].List[j].Finish = 0;
+    }
+  }
+  getData('GetTestReportList?UserID=' + userID, function (data) {
+    if (data) {
+      var dataTemp = [];
+      for (var i = 0; i < data.length; i++) {
+        for (var j = 0; j < dataTemp.length; j++) {
+          if (dataTemp[j].Name[0] == data[i].Name[0] &&
+            dataTemp[j].Name[1] == data[i].Name[1] &&
+            dataTemp[j].TestType == data[i].TestType &&
+            data[i].IsFinished == 1
+          ) {
+            dataTemp.splice(j, 1);
+            break;
+          }
+        }
+        dataTemp.push(data[i]);
+
+        if (data[i].Name[0].indexOf("英语")>=0 || data[i].Name[0].indexOf("语文词语")>=0 || data[i].Name[0].indexOf("识字 上学期")>=0 || data[i].Name[0].indexOf("拼音")>=0 || data[i].Name[1].indexOf("古诗文")>=0){
+          if (data[i].TestRightStr){
+            data[i].TestRightStr=data[i].TestRightStr.split(",");
+          }
+          if (data[i].TestWrongStr){
+            data[i].TestWrongStr=data[i].TestWrongStr.split(",");
+          }          
+          if (data[i].TestSkipStr){
+            data[i].TestSkipStr=data[i].TestSkipStr.split(",");
+          }
+          if (data[i].TestExistStr){
+            data[i].TestExistStr=data[i].TestExistStr.split(",");
+          }
+        }
+        
+        if (!data[i].TestRightStr)
+          data[i].TestRightStr="";
+        if (!data[i].TestWrongStr)
+          data[i].TestWrongStr="";
+        if (!data[i].TestSkipStr)
+          data[i].TestSkipStr="";
+        if (!data[i].TestExistStr)
+          data[i].TestExistStr="";
+              
+      }
+
+      for (var i = 0; i < dataTemp.length; i++) {
+        var name = dataTemp[i].Name[0].split(" ");
+        for (var j = 0; j < GradeArr.length; j++) {
+          var item = GradeArr[j];
+          if (name[0] == item.Name) {
+            for (var k = 0; k < item.List.length; k++) {
+              
+              //音标计算进度  
+              if (item.List[k].ID==101 && dataTemp[i].BookID==101){
+                for(var n=1;n<=4;n++){
+                  if (Number(dataTemp[i].Name[2])==n && dataTemp[i].IsFinished==1)
+                    item.List[k].Finish++;
+                }
+              }
+              //古诗词计算进度
+              else if (item.List[k].ID==dataTemp[i].BookID && dataTemp[i].TestType=="recite" && dataTemp[i].IsFinished == 1)
+                item.List[k].Finish=1;
+              else{
+                if (name[1] == item.List[k].Name && name[2] == item.List[k].Name2) {
+                  if (dataTemp[i].IsFinished == 1)
+                    item.List[k].Finish++;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      for (var j = 0; j < GradeArr.length; j++) {
+        var item = GradeArr[j];
+        for (var k = 0; k < item.List.length; k++) {
+          item.List[k].Finished = Math.round(100 * item.List[k].Finish / item.List[k].Total);
+          item.List[k].NameStr=item.List[k].Name.replace("语文","");
+        }
+      }
+      wx.setStorageSync("UserTestReport", data);
+      
+      callback(data,GradeArr);
+    }
+  });
+}
+
 module.exports = {
   getData: getData,
   postData: postData,
@@ -1601,4 +1692,5 @@ module.exports = {
   searchInfomation:searchInfomation,
   downloadBishunKaitiImage:downloadBishunKaitiImage,
   GetSoundError:GetSoundError,
+  GetTestReportList:GetTestReportList,
 }