1.5.11

app.json

@@ -34,6 +34,7 @@
     
     "pages/marketing/extenduser",
     "pages/marketing/shareuser",
+    "pages/marketing/award",
     "pages/marketing/index",
     
     "pages/other/lessonlist",

pages/main/default.wxml

@@ -16,7 +16,7 @@
   <view class='panelBottom FlexColumn'>
 
     <image class="study_index_banner_close" src='../images/study_index_banner_close.png' bindtap="closeMarketing" wx:if="{{IsShowMarketing===2}}"/>
-    <image class="study_index_banner" src='../images/study_index_banner.png' bindtap="goto" data-url="../marketing/index" wx:if="{{IsShowMarketing===0 || IsShowMarketing===2}}" />
+    <image class="study_index_banner" src='../images/study_index_banner191224.png' bindtap="goto" data-url="../marketing/index" wx:if="{{IsShowMarketing===0 || IsShowMarketing===2}}" />
     
     <image class="study_index_footer" src='../images/study_index_footer.png' />
 

pages/main/searchCard.js

@@ -6,6 +6,7 @@ const app = getApp();
 Page({
   data: {
     IsIPhoneX: app.globalData.IsIPhoneX,
+    IsYearReport:false,
   },
   onLoad: function () {
     var that = this;
@@ -15,6 +16,12 @@ Page({
       NickName: app.globalData.userInfo.NickName,
       IsShow: app.globalData.userInfo.IsShow,
     });
+
+    if (new Date().getFullYear()>=2020){
+      that.setData({
+        IsYearReport: true,
+      });
+    }
     
   },
   onShow:function(){

pages/main/searchCard.wxml

@@ -1,102 +1,104 @@
 <view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view class='panel'>
-    <view class="panelSearch FlexRow">
-      <view class="panelSearch1 FlexRow" bindtap="onSearch">
-        <image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
-        <view>搜索我的题卡</view>
-      </view>
-    </view>
-    <block wx:if="{{IsShow==0}}">
-    <view class='panelBtn FlexColumn'>
-      <view class="panelItem3 panelItem FlexRow" bindtap="gotoAccredit">
-        <view class="panelItem1 FlexRow">
-          <image class="avatar" src='{{AvatarUrl}}' />
-          <view class="text6" wx:if="{{NickName=='陌生用户'}}">点击这里登录</view>
-          <view class="text6" wx:if="{{NickName!='陌生用户'}}">{{NickName}}</view>
-        </view>
-        <view class="panelItem2 FlexRow">
-        </view>
-      </view>
-    </view>
-    <view class='lineFooter'></view>
-    </block>
-    <view class='panelBtn FlexColumn'>
-      <view class="panelItem FlexRow" bindtap="getList" data-id="0">
-        <view class="panelItem1">
-          全部题卡
-        </view>
-        <view class="panelItem2 FlexRow">
-          <view>{{CardNumber}}</view>
-          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-        </view>
-      </view>
-      <view class="lineWidthAll FlexRow">
-        <view class="lineWidth720"></view>
-      </view>
-      <view class="panelItem FlexRow" bindtap="getList" data-id="0" data-iscollect="1">
-        <view class="panelItem1 FlexRow">
-          <image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' />
-          <view>收藏夹</view>
-        </view>
-        <view class="panelItem2 FlexRow">
-          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-        </view>
-      </view>
-    </view>
-    <view class='lineFooter'></view>
-    <view class='panelBtn FlexColumn'>
-      <view class="panelItem FlexRow" bindtap="getList" data-id="1">
-        <view class="panelItem1">
-          今天剩余任务
-        </view>
-        <view class="panelItem2 FlexRow">
-          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-        </view>
-      </view>
-    </view>
-    <view class='lineFooter'></view>
-    <view class='panelBtn FlexColumn'>
-      <view class="panelItem FlexRow" bindtap="gotoUserbook">
-        <view class="panelItem1">
-          用户手册
-        </view>
-        <view class="panelItem2 FlexRow">
-          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-        </view>
-      </view>
-    </view>
-    <view class='lineFooter'></view>
-    <view class='panelBtn FlexColumn'>
-      <view class="panelItem FlexRow" bindtap="gotoAnnualReport">
-        <view class="panelItem1">
-          2019年度报告
-        </view>
-        <view class="panelItem2 FlexRow">
-          <image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
-        </view>
-      </view>
-    </view>
-    <view class='lineFooter'></view>
-  </view>
-  <view class='panelBottom FlexColumn'>
+	<view class='panel'>
+		<view class="panelSearch FlexRow">
+			<view class="panelSearch1 FlexRow" bindtap="onSearch">
+				<image class="universalpic_search_gray_30x30" src='../images/universalpic_search_gray_30x30.png' />
+				<view>搜索我的题卡</view>
+			</view>
+		</view>
+		<block wx:if="{{IsShow==0}}">
+			<view class='panelBtn FlexColumn'>
+				<view class="panelItem3 panelItem FlexRow" bindtap="gotoAccredit">
+					<view class="panelItem1 FlexRow">
+						<image class="avatar" src='{{AvatarUrl}}' />
+						<view class="text6" wx:if="{{NickName=='陌生用户'}}">点击这里登录</view>
+						<view class="text6" wx:if="{{NickName!='陌生用户'}}">{{NickName}}</view>
+					</view>
+					<view class="panelItem2 FlexRow">
+					</view>
+				</view>
+			</view>
+			<view class='lineFooter'></view>
+		</block>
+		<view class='panelBtn FlexColumn'>
+			<view class="panelItem FlexRow" bindtap="getList" data-id="0">
+				<view class="panelItem1">
+					全部题卡
+				</view>
+				<view class="panelItem2 FlexRow">
+					<view>{{CardNumber}}</view>
+					<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+				</view>
+			</view>
+			<view class="lineWidthAll FlexRow">
+				<view class="lineWidth720"></view>
+			</view>
+			<view class="panelItem FlexRow" bindtap="getList" data-id="0" data-iscollect="1">
+				<view class="panelItem1 FlexRow">
+					<image class="universalpic_fav_default_gray_26x24" src='../images/universalpic_fav_default_gray_26x24.png' />
+					<view>收藏夹</view>
+				</view>
+				<view class="panelItem2 FlexRow">
+					<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+				</view>
+			</view>
+		</view>
+		<view class='lineFooter'></view>
+		<view class='panelBtn FlexColumn'>
+			<view class="panelItem FlexRow" bindtap="getList" data-id="1">
+				<view class="panelItem1">
+					今天剩余任务
+				</view>
+				<view class="panelItem2 FlexRow">
+					<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+				</view>
+			</view>
+		</view>
+		<view class='lineFooter'></view>
+		<view class='panelBtn FlexColumn'>
+			<view class="panelItem FlexRow" bindtap="gotoUserbook">
+				<view class="panelItem1">
+					用户手册
+				</view>
+				<view class="panelItem2 FlexRow">
+					<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+				</view>
+			</view>
+		</view>
+		<view class='lineFooter'></view>
+		<block wx:if="{{IsYearReport}}">
+			<view class='panelBtn FlexColumn'>
+				<view class="panelItem FlexRow" bindtap="gotoAnnualReport">
+					<view class="panelItem1">
+						2019年度报告
+					</view>
+					<view class="panelItem2 FlexRow">
+						<image class="universalpic_indicator_right_gray" src='../images/universalpic_indicator_right_gray.png' />
+					</view>
+				</view>
+			</view>
+			<view class='lineFooter'></view>
+		</block>
+	</view>
+	<view class='panelBottom FlexColumn'>
 
-    <view class='panelBottom1 FlexRow'>
-      <view class='panelBottom11 FlexColumn' bindtap="gotoDefault">
-        <image class="program_tabbar_study_default" src='../images/program_tabbar_study_default.png' />
-        <view>学习</view>
-      </view>
-      <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
-        <image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
-        <view>添加</view>
-      </view>
-      <view class='line1'></view>
-      <view class='panelBottom11 FlexColumn'>
-        <image class="program_tabbar_study_default" src='../images/program_tabbar_note_normal.png' />
-        <view class='text5'>题卡</view>
-      </view>
-    </view>
+		<view class='panelBottom1 FlexRow'>
+			<view class='panelBottom11 FlexColumn' bindtap="gotoDefault">
+				<image class="program_tabbar_study_default" src='../images/program_tabbar_study_default.png' />
+				<view>学习</view>
+			</view>
+			<view class='line1'></view>
+			<view class='panelBottom11 FlexColumn' bindtap="goto" data-url="add?type=add&id=0">
+				<image class="program_tabbar_study_default" src='../images/program_tabbar_add_default.png' />
+				<view>添加</view>
+			</view>
+			<view class='line1'></view>
+			<view class='panelBottom11 FlexColumn'>
+				<image class="program_tabbar_study_default" src='../images/program_tabbar_note_normal.png' />
+				<view class='text5'>题卡</view>
+			</view>
+		</view>
 
-    <view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
-  </view>
+		<view class="iphone10plus" wx:if="{{IsIPhoneX}}"></view>
+	</view>
 </view>

pages/main/searchCardList.js

@@ -53,11 +53,15 @@ Page({
       Count: count,
       Containnerheight: main.getWindowHeight(),
       PageType:options.type,
+      IsNew:options.IsNew,
     });
   },
   onShow: function () {
     var that = this;
-    that.getList();
+    if (that.data.IsNew)
+      that.onOrder({ currentTarget: { dataset: { value: 4 } } });
+    else
+      that.getList();
 
     //题卡主题色
     var arrColorIndex = wx.getStorageSync("ColorIndexArr");

pages/marketing/award.js

@@ -0,0 +1,30 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    var that = this;
+    main.getData('GetAwardInfo?UserID=' + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          Award: data,
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?type=marketing&UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.uploadImageUrl+"web/program_screenshot_promotion.png",
+    }
+  },
+});

pages/marketing/award.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "奖励"
+}

pages/marketing/award.wxml

@@ -0,0 +1,61 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+
+	<view class="panelTitle FlexRow">
+		<view class="panelTitle1">用户您好，本界面用于记录推广计划的奖励情况。</view>
+		<view class="panelTitle2"></view>
+	</view>
+	<view class="panelItem FlexColumn">
+		<view class="panelItem1 FlexRow">
+			<view class="panelItem11">统计截止日期</view>
+			<view class="panelItem11">{{Award.Time}}</view>
+		</view>
+		<view class="panelItem2">
+			根据7天可退款的规定，截止日期为7天前
+		</view>
+	</view>
+	<view class='lineFooter'></view>
+	<view class='lineFooter2'></view>
+	<view class="panelItem FlexColumn">
+		<view class="text5 panelItem1 FlexRow">
+			<view class="panelItem11">累积奖励天数</view>
+			<view class="panelItem12">{{Award.Total}}天</view>
+		</view>
+	</view>
+	<view class='lineFooter'></view>
+	<view class='lineFooter2'></view>
+	<view class="panelItem FlexColumn">
+		<view class="panelItem1 FlexRow">
+			<view class="panelItem11">奖励天数由以下组成</view>
+			<view class="panelItem12"></view>
+		</view>
+		<view class="panelItem3 FlexRow">
+			<view class="panelItem31">项目</view>
+			<view class="panelItem32">人数</view>
+			<view class="panelItem33">内容</view>
+			<view class="panelItem34">小计</view>
+		</view>
+		<view class="line"></view>
+		<view class="panelItem4 panelItem4 FlexRow" wx:for="{{Award.List}}" wx:key="index">
+			<view class="panelItem31">{{item.Name}}</view>
+			<view class="panelItem32">{{item.PersonNum}}</view>
+			<view class="panelItem33">{{item.Content}}</view>
+			<view class="panelItem34">{{item.Total}}</view>
+		</view>
+		<view class="panelItem2 FlexColumn">
+			<view class="text3">{{Award.Remark}}</view>
+		</view>
+	</view>
+	<view class='lineFooter'></view>
+	<view class="text6 text1">补充说明</view>
+	<text class="text2">① 遇退款，奖励会有相应变更。\n
+② 会员有效期截止时，将用奖励天数接续，延长使用不中断。\n
+③ 推广计划试运行，目前为人工清算，自动化功能将在2020年陆续升级，届时会做群公告通知。如有疑问请直接联系天乐。</text>
+	<view class="text1">人工补登记</view>
+	<text class="text2">做了推荐但没有“推荐效果”有如下可能：\n
+① 推荐时没有使用宣传品；\n
+② 推荐时使用他人的宣传品；\n
+③ 好友看到广告但没有打开，事后自己搜索小程序打开；\n
+④ 好友第一次打开的是他人的宣传品。\n
+以上情况都不可能纳入您的统计结果。为了尽可能感谢您的推荐，天乐可以为您做“人工补登记”。只要您能提供相关资料，核对有效后可以为您增补记录。详情请咨询天乐。</text>
+	<view class="footer"></view>
+</view>

pages/marketing/award.wxss

@@ -0,0 +1,120 @@
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+.panelTitle .panelTitle1{
+  font-size:24rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  background-color: #fff;
+}
+
+.panelItem1{
+  width:690rpx;
+  justify-content: space-between;
+  font-size:28rpx;
+  font-weight: 400;
+  margin:30rpx 0 0 0;
+}
+
+.panelItem12{
+  font-size:48rpx;
+  font-weight: 500;
+  color:#FE6659;
+}
+
+.panelItem2{
+  width:690rpx;
+  font-size:20rpx;
+  font-weight: 500;
+  margin:10rpx 0 30rpx 0;
+  color: #787878;
+}
+
+.panelItem3{
+  width:690rpx;
+  font-size:20rpx;
+  font-weight: 500;
+  margin:30rpx 0 0 0;
+  color: #787878;
+  justify-content: space-between;
+}
+
+
+.panelItem4{
+  font-size:24rpx;
+  font-weight: 400;
+  margin-bottom: 10rpx;
+}
+
+.panelItem31{
+  width:170rpx;
+}
+
+.panelItem32{
+  width:120rpx;
+}
+
+.panelItem33{
+  width:240rpx;
+}
+.panelItem34{
+  width:160rpx;
+  text-align: right;
+}
+
+.line{
+  width:690rpx;
+  height:1rpx;
+  background-color: #E3E3E3;
+  margin:20rpx 0 20rpx 0;
+}
+
+
+.text3{
+  width:690rpx;
+  font-size:20rpx;
+  font-weight: 500;
+  color: #787878;
+}
+
+.text5{
+  margin-bottom: 30rpx;
+}
+
+.text1{
+  width:690rpx;
+  font-size:28rpx;
+  font-weight: 500;
+  margin-top: 30rpx;
+}
+
+.text2{
+  width:690rpx;
+  font-size:24rpx;
+  margin-top: 15rpx;
+  font-weight: 400;
+}
+
+.text6{
+  margin-top: 50rpx;
+}
+
+.lineFooter2{
+  width:100%;
+  height:50rpx;
+  background-color: #F0F0F0;
+}
+
+.footer{
+  width:100%;
+  height:100rpx;
+}

pages/marketing/index.js

@@ -16,19 +16,10 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
   },
-  gogoExtendUser: function(e){
+  goto:function(e){
+    var url=e.currentTarget.dataset.url;
     wx.navigateTo({
-      url: './extenduser?PageType='+e.currentTarget.dataset.id,
-    });
-  },
-  gogoShareUser: function () {
-    wx.navigateTo({
-      url: './shareuser',
-    });
-  },
-  gotoWeb:function(){
-    wx.navigateTo({
-      url: '../../pages/other/webview?PageID=7',
+      url: url,
     });
   },
   onShareAppMessage: function () {

pages/marketing/index.wxml

@@ -4,7 +4,7 @@
     <view class="panelTitle1">推广</view>
     <view class="panelTitle2"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap="gotoWeb">
+  <view class="panelItem FlexRow" bindtap="goto" data-url="../../pages/other/webview?PageID=7">
     <view class="panelItem1">活动规则</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -13,7 +13,7 @@
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap="gogoShareUser">
+  <view class="panelItem FlexRow" bindtap="goto" data-url="./shareuser">
     <view class="panelItem1">我的宣传品</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
@@ -22,43 +22,21 @@
   <view class="lineWidthAll FlexRow">
     <view class="lineWidth720"></view>
   </view>
-  <view class="panelItem FlexRow" bindtap="gogoExtendUser" data-id="0">
+  <view class="panelItem FlexRow" bindtap="goto" data-url="./extenduser?PageType=0">
     <view class="panelItem1">推广效果</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
   <view class='lineFooter'></view>
-
-  <!-- <view class="panelTitle FlexRow">
-    <view class="panelTitle1">奖励</view>
-    <view class="panelTitle2"></view>
-  </view>
-  <view class="panelItem FlexRow" bindtap="gogoExtendUser" data-id="1">
-    <view class="panelItem1">奖励名单</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view> -->
-
-  <!-- <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">对账结算</view>
+  <view class="line1"></view>
+  <view class="panelItem FlexRow" bindtap="goto" data-url="./award">
+    <view class="panelItem1">奖励</view>
     <view class="panelItem2 FlexRow">
       <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
   </view>
-  <view class="lineWidthAll FlexRow">
-    <view class="lineWidth720"></view>
-  </view>
-  <view class="panelItem FlexRow">
-    <view class="panelItem1">结算记录</view>
-    <view class="panelItem2 FlexRow">
-      <image src='../../pages/images/universalpic_indicator_right_gray.png' class="Arrow" />
-    </view>
-  </view> -->
   <view class='lineFooter'></view>
+  
 
 </view>

pages/marketing/index.wxss

@@ -53,3 +53,8 @@
   height:26rpx;
   margin-left: 30rpx;
 }
+
+.line1{
+  width:100%;
+  height:50rpx;
+}

pages/other/annualreport.js

@@ -15,8 +15,12 @@ Page({
       Containnerheight: main.getWindowHeight(),
     });
 
+    wx.showLoading({
+      title: '请稍候',
+    });
     var userid=app.globalData.userInfo.UserID;
     main.getData("GetAnnualReport?UserID=" + userid, function (data) {
+      wx.hideLoading();
       if (data){
         that.setData({
           Data:data,
@@ -24,6 +28,13 @@ Page({
       }
     });
   },
+  goto: function (e) {
+    var url = e.currentTarget.dataset.url;
+    
+    wx.navigateTo({
+      url: url,
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/other/annualreport.wxml

@@ -47,9 +47,12 @@
 			<view class="text4">{{Data.CardNum}}张</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow">
+		<view class="panelItem FlexRow" bindtap="goto" data-url="../main/searchCardList?type=0&IsNew=true">
 			<view class="text3">新题卡</view>
-			<view class="text4">{{Data.NewCardNum}}张</view>
+			<view class="FlexRow">
+				<view class="text4">{{Data.NewCardNum}}张</view>
+				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
+			</view>
 		</view>
 		<view class="line1"></view>
 		<view class="panelItem FlexRow">
@@ -87,35 +90,35 @@
 			<image src="{{ImagePath}}web/universalpic_help_orange_26x26.png" class="help" />
 			<view>急需了解的知识</view>
 		</view>
-		<view class="panelItem FlexRow">
+		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=1&idchild=0">
 			<view class="text3">题卡建议数量</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow">
+		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=2&idchild=2">
 			<view class="text3">1分钟做完和0任务量的处理</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow">
+		<view class="panelItem FlexRow" bindtap='goto' data-url="../plan/memoryLevel">
 			<view class="text3">建议把记忆评价命名方式改为“再现间隔”</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow">
+		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=2&idchild=3">
 			<view class="text3">过度点蓝的成因和危害</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="panelItem FlexRow">
+		<view class="panelItem FlexRow" bindtap='goto' data-url="./help?id=0&idchild=3">
 			<view class="text3">什么是群接力</view>
 			<view class="text4">
 				<image src="../images/universalpic_indicator_right_gray.png" class="universalpic_indicator_right_gray" />

pages/other/annualreport.wxss

@@ -85,6 +85,7 @@ page{
 .universalpic_indicator_right_gray{
   width:16rpx;
   height:26rpx;
+  margin-left: 30rpx;
 }
 
 .report_20191231_03{

pages/other/pay.js

@@ -43,8 +43,6 @@ Page({
   },
   init: function (PayType, EndDate, Price, DayNumber) {
     var that = this;
-
-    EndDate = common.formatDateENG(EndDate, "/");
     var url = 'GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType + '&UserID=' + app.globalData.userInfo.UserID;
     if (Price && DayNumber) {
       url += "&Price=" + Price + "&DayNumber=" + DayNumber;

pages/test/index.js

@@ -137,22 +137,22 @@ Page({
             },
           ]
         },
-        // {
-        //   Name: "五年级",
-        //   Name2: "语文五年级",
-        //   Select: "",
-        //   List: [
-        //     {
-        //       ID: 9,
-        //       Type: "Shizi",
-        //       Name: "语文识字",
-        //       Name2: "上学期",
-        //       Finish: 0,
-        //       Total: 16,
-        //       Image: "../images/examine_subject_a005.png"
-        //     },
-        //   ]
-        // },
+        {
+          Name: "五年级",
+          Name2: "语文五年级",
+          Select: "",
+          List: [
+            {
+              ID: 9,
+              Type: "Shizi",
+              Name: "语文识字",
+              Name2: "上学期",
+              Finish: 0,
+              Total: 16,
+              Image: "../images/examine_subject_a009.png"
+            },
+          ]
+        },
         // {
         //   Name: "六年级",
         //   Name2: "语文六年级",
@@ -165,7 +165,7 @@ Page({
         //       Name2: "上学期",
         //       Finish: 0,
         //       Total: 16,
-        //       Image: "../images/examine_subject_a005.png"
+        //       Image: "../images/examine_subject_a011.png"
         //     },
         //   ]
         // },

pages/test/list.wxml

@@ -67,7 +67,7 @@
 			</view>
 
 			<block wx:if="{{BookID<=12}}">
-				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-url="./item?testtype=write&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
+				<view wx:if="{{SelectItem.TestTypeWriteFinished}}" class="btn FlexRow" bindtap="gotoTestReportInfo" data-id="{{SelectItem.WriteReportID}}" data-url="./item?testtype=write&bookid={{BookID}}&unitsid={{SelectItem.ID}}&name1={{Name1}}&name2={{SelectItem.Name}}">
 					<image src="../images/examine_willwrite_gray_27x27.png" class="examine_willwrite_gray_27x27" />
 					<view class="SelectContainer1Text3">会写</view>
 				</view>

project.config.json

@@ -121,9 +121,9 @@
 					"scene": 1007
 				},
 				{
-					"id": -1,
-					"name": "pages/other/annualreport",
-					"pathName": "pages/other/annualreport",
+					"id": 9,
+					"name": "pages/marketing/award",
+					"pathName": "pages/marketing/award",
 					"query": "",
 					"scene": null
 				}