2.2.1

app.js

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

app.json

@@ -40,10 +40,6 @@
     "pages/plan/studyplan",
     "pages/plan/studyplandetail",
     
-    "pages/marketing/extenduser",
-    "pages/marketing/shareuser",
-    "pages/marketing/award",
-    "pages/marketing/index",
     
     "pages/other/recover",
     "pages/other/video",
@@ -90,7 +86,11 @@
         "main/message",
         "main/userinfo",
         "main/enter",
-        "main/index"
+        "main/index",
+        "marketing/extenduser",
+        "marketing/shareuser",
+        "marketing/award",
+        "marketing/index"
       ]
     }
   ],

pages/index/index.js

@@ -102,7 +102,7 @@ Page({
       else if (options.type == "marketing") {
         this.setData({
           gotoType: "other",
-          gotoUrl: '../marketing/index',
+          gotoUrl: '../../pages_agent/marketing/index',
         });
       }
       else if (options.type == "homework") {

pages/main/default.js

@@ -182,7 +182,7 @@ Page({
       url: url,
     });
 
-    if (url == "../marketing/index") {
+    if (url == "../../pages_agent/marketing/index") {
       this.setData({
         IsShowRemind: false,
       });

pages/main/default.wxml

@@ -135,7 +135,7 @@
     <view class="IsRemindLine"></view>
     <text class="IsRemindText3" wx:if="{{AwardDayNumber===0}}">目前您的奖励天数\noops…还没有</text>
     <text class="IsRemindText3" wx:if="{{AwardDayNumber>0}}">现在您的奖励还有\n{{AwardDayNumber}}天</text>
-    <view class="IsRemindBtn" catchtap="goto" data-url="../marketing/index" >详情</view>
+    <view class="IsRemindBtn" catchtap="goto" data-url="../../pages_agent/marketing/index" >详情</view>
 
     <image class="practise_index_board_blackboard" src='../images/practise_index_board_blackboard.png' />
     <image class="practise_index_board_avater01" src='../images/practise_index_board_avater01.png' />

pages/marketing/shareuser.js

@@ -1,113 +0,0 @@
-import common from '../../utils/util';
-import main from '../../utils/main';
-
-const app = getApp();
-var downloadNumber=0;
-
-Page({
-  data: {
-  },
-  onLoad: function (options) {
-    this.setData({
-      Containnerheight: main.getWindowHeight(),
-    });
-    this.init();
-    downloadNumber=0;
-  },
-  init:function(){
-    var that = this;
-    main.getData('GetMiaoguoShareInfo?Version=' + app.globalData.Version, function (data) {
-      wx.hideLoading();
-      if (data) {
-         that.setData({
-          List: data,
-        });
-      }
-    });
-    main.getData("GetClassList?Flag=0", function (data) {
-      if (data && data.length > 0) {
-        that.setData({
-          StartDate: common.formatDateCHS(data[0].StartDate),
-        })
-      }
-    });
-  }, 
-  buildImage:function(){
-
-    if (!app.globalData.userInfo) {
-      app.globalData.userInfo = {};
-      app.globalData.userInfo.UserID = 1;
-    }
-    var that=this;
-    wx.showLoading({
-      title: '请稍候',
-    });
-    var imageUrl = '../images/promotion_leaflet_a01.png';
-    var imageQRCode = app.globalData.serverUrl;
-    imageQRCode += common.Encrypt("BuildWXServiceQRCode?QRCodeType=0&UserID=" + app.globalData.userInfo.UserID + "&SourceID=" + app.globalData.ProgramID);
-    console.log(imageQRCode);
-    var that = this;
-    var downloadTask = wx.downloadFile({
-      url: imageQRCode,
-      success(res) {
-        if (res.statusCode === 200) {
-
-          var canvas = wx.createCanvasContext("shareCanvas", that);
-          canvas.drawImage(imageUrl, 0, 0, 750, 1256);
-          canvas.drawImage(res.tempFilePath, 550, 1068, 160, 160);
-          canvas.fillStyle = "#1e1e1e";
-          canvas.setFontSize(28);
-          canvas.fillText("开班时间："+that.data.StartDate, 50, 1212);
-          canvas.draw(1, function (n) {
-
-            wx.canvasToTempFilePath({
-              x: 0,
-              y: 0,
-              width: 750,
-              height: 1256,
-              destWidth: 750,
-              destHeight: 1256,
-              canvasId: 'shareCanvas',
-              success: function (res2) {
-
-                console.log(res2.tempFilePath);
-                wx.hideLoading();
-                wx.previewImage({
-                  current: res2.tempFilePath, // 当前显示图片的http链接
-                  urls: [res2.tempFilePath] // 需要预览的图片http链接列表
-                });
-              },
-              fail:function(err){
-                wx.hideLoading();
-              }
-            })
-          });
-        }
-        else{
-          wx.hideLoading();
-        }
-      },
-      fail: function (err) {
-        console.log("err:"+err);
-        wx.hideLoading();
-        downloadNumber++;
-        if (downloadNumber<3)
-          that.buildImage();
-      }
-    });
-
-    downloadTask.onProgressUpdate((res) => {
-      console.log('下载进度', res.progress)
-      console.log('已经下载的数据长度', res.totalBytesWritten)
-      console.log('预期需要下载的数据总长度', res.totalBytesExpectedToWrite)
-    })
-    
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: "../../pages/images/program_screenshot_main.png",
-    }
-  },
-});

pages/marketing/shareuser.json

@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "我的宣传品",
-  "backgroundColor": "#ffffff"
-}

pages/marketing/shareuser.wxml

@@ -1,13 +0,0 @@
-<view class="container FlexColumn" style='height:{{Containnerheight}}rpx;'>
-  <view style="height:100rpx;"></view>
-  <view class="panel FlexColumn" wx:for="{{List}}" wx:key="*this">
-    <text class="text1">{{item.Text1}}</text>
-    <text class="text2">{{item.Text2}}</text>
-    <text class="text3">{{item.Text3}}</text>
-    <text class="text4" wx:if="{{item.Text4}}">{{item.Text4}}</text>
-    <text class="text5" wx:if="{{item.Text5}}">{{item.Text5}}</text>
-    <button class="btn" open-type="{{item.OpenType}}" bindtap="{{item.BindTap}}">{{item.BtnStr}}</button>
-  </view>
-</view>
-
-<canvas class='Canvas' canvas-id="shareCanvas"></canvas>

pages/marketing/shareuser.wxss

@@ -1,52 +0,0 @@
-.container {
-  background-color: #fff;
-} 
-
-.panel{
-  margin-bottom: 119rpx;
-}
-
-.panel .text1{
-  font-size:28rpx;
-}
-.panel .text2{
-  font-size:68rpx;
-  color:#169DED;
-}
-.panel .text3{
-  font-size:28rpx;
-  font-weight: 400;
-}
-
-.panel .text4{
-  font-size:28rpx;
-  margin-top: 40rpx;
-}
-.panel .text5{
-  font-size:24rpx;
-  margin-top: 20rpx;
-  text-align: center;
-  font-weight: 400;
-}
-
-.panel .btn{
-  width:520rpx;
-  height:90rpx;
-  line-height: 90rpx;
-  font-size:36rpx;
-  margin-top: 40rpx;
-  text-align: center;
-  font-weight: 400;
-  color:#fff;
-  background-color: #0071EF;
-  border-radius: 10rpx;
-}
-
-
-.Canvas{
-  width: 750px; 
-  height: 1256px;
-  background-color: #fff;
-  position: fixed;
-  left:760rpx;
-}

pages/other/userbook.wxml

@@ -47,7 +47,7 @@
         <view>作业清单</view>
       </view>    
 
-      <view class="panel21 FlexColumn" bindtap="goto" data-url="../marketing/index" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
+      <view class="panel21 FlexColumn" bindtap="goto" data-url="../../pages_agent/marketing/index" wx:if="{{IsPay==1 && !IsLoseEfficacy}}">
         <image class="usermanual_index_handshake" src='../images/usermanual_index_handshake.png' />
         <view>推广计划</view>
       </view>
@@ -100,7 +100,7 @@
 
     <block wx:if="{{IsShow==1 && PanelShow===2 && ClassDayNumber>0 && IsPay==1 && !IsLoseEfficacy}}">
       <view class="panelItem FlexColumn">
-        <image class="salesactivity_a05_usermanual_banner" src='{{ImagePath}}web/salesactivity_a05_usermanual_banner.png' bindtap="goto" data-url="../marketing/index" />
+        <image class="salesactivity_a05_usermanual_banner" src='{{ImagePath}}web/salesactivity_a05_usermanual_banner.png' bindtap="goto" data-url="../../pages_agent/marketing/index" />
         <view class="marketingDetail" bindtap="goto" data-url="../../pages/other/webview?PageID=7"></view>
       </view>
     </block>

pages_agent/main/index.js

@@ -15,6 +15,7 @@ Page({
     });
 
     that.getUserInfo(); 
+    
   },
   //得到用户信息
   getUserInfo: function () {
@@ -37,7 +38,7 @@ Page({
       fail: function () {}
     });
   },
-
+  
   login: function (param) {
     var that = this;
     main.getLocalHost(function () {
@@ -89,11 +90,23 @@ Page({
           that.setData({
             IsPromoter:app.globalData.userInfo.IsPromoter,
           });    
+
+          that.getUserList();
         }
       });
     });
   },
-
+  getUserList:function(){
+    var that = this;
+    var url="GetAgentUserList";
+    main.getData(url, function (data) {
+      if (data) {
+        that.setData({
+          UserList:data,
+        });
+      }
+    });
+  },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.navigateTo({

pages_agent/main/index.wxml

@@ -22,16 +22,8 @@
     </view>
   </view>
 
-  <view class="test FlexColumn">
-    <view class="btn">下列按钮测试用({{Version}})</view>
-    <button class="btn" bindtap="setSelectUser" data-userid="4398">slyicecream</button>
-    <button class="btn" bindtap="setSelectUser" data-userid="14983">小云</button>
-    <button class="btn" bindtap="setSelectUser" data-userid="14822">管璐瑶</button>
-    <button class="btn" bindtap="setSelectUser" data-userid="10541">忠丽</button>
-    <button class="btn" bindtap="setSelectUser" data-userid="14850">艾小西</button>
-    <button class="btn" bindtap="setSelectUser" data-userid="14818">甲子</button>
-    <button class="btn" bindtap="setSelectUser" data-userid="15655">大肉丁</button>
-    <button class="btn" bindtap="setSelectUser" data-userid="16109">堃堃</button>
+  <view class="test FlexRow">
+    <button class="btn" bindtap="setSelectUser" wx:key="*this" wx:for="{{UserList}}" data-userid="{{item.UserID}}">{{item.NickName}}</button>
   </view>
   
 </view>

pages_agent/main/index.wxss

@@ -30,13 +30,14 @@
 }
 
 .test{
-  width: 500rpx;
+  width: 680rpx;
   border-radius: 20rpx;
   padding: 0 0 30rpx 0;
   margin-top: 100rpx;
   background-color: #dddddd;
+  flex-wrap: wrap;
 }
 
 .btn{
-  margin: 30rpx 0 0 0;
+  margin: 30rpx 15rpx 0 0;
 }

pages_agent/main/user_index.wxml

@@ -81,6 +81,12 @@
         团队动态
       </view>
     </view>
+    <view class="panel112 FlexColumn" bindtap="goto" data-url="../../pages_agent/marketing/shareuser">
+      <image src='../images/promotion_index_code.png' class="promotion_index_rules" />
+      <view class="text8">
+        我的推广物料
+      </view>
+    </view>
 
     <!-- 
     <view class="panel112 FlexColumn" wx:if="{{IsPromotion}}">
@@ -89,12 +95,7 @@
         推广计划规则
       </view>
     </view>
-    <view class="panel112 FlexColumn" wx:if="{{IsPromotion}}">
-      <image src='../images/promotion_index_code.png' class="promotion_index_rules" />
-      <view class="text8">
-        我的推广物料
-      </view>
-    </view>
+    
     <view class="panel112 FlexColumn" bindtap='goto' data-url="userinfo?AgentCategory={{AgentCategory}}">
       <image src='../images/promotion_index_userinfo.png' class="promotion_index_rules" />
       <view class="text8">

pages_agent/marketing/shareuser.js

@@ -0,0 +1,157 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+var downloadNumber = 0;
+var shareUrl = "";
+
+Page({
+  data: {},
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: main.getWindowHeight(),
+      ServerImage: app.globalData.uploadImageUrl + "web/"
+    });
+    this.init();
+    downloadNumber = 0;
+
+    shareUrl = "WebExtend?UserID=" + app.globalData.userInfo.UserID;
+    shareUrl = app.globalData.serverUrl + common.Encrypt(shareUrl);
+
+  },
+  init: function () {
+    var that = this;
+    main.getData('GetMiaoguoShareInfo220?Version=' + app.globalData.Version, function (data) {
+      wx.hideLoading();
+      if (data) {
+        that.setData({
+          List: data,
+        });
+      }
+    });
+    main.getData("GetClassList?Flag=0", function (data) {
+      if (data && data.length > 0) {
+        that.setData({
+          StartDate: common.formatDateCHS(data[0].StartDate),
+        })
+      }
+    });
+  },
+  buildImage: function (e) {
+    var that = this;
+
+    if (!app.globalData.userInfo) {
+      app.globalData.userInfo = {};
+      app.globalData.userInfo.UserID = 1;
+    }
+    wx.showLoading({
+      title: '请稍候',
+    });
+    var id = e.currentTarget.dataset.id;
+    var imageUrl = '../../pages_agent/images/promotion_poster0' + id + '.png';
+
+    var timeout = 100;
+
+    //如果没有生成过二维码，则生成
+    if (!app.globalData.userInfo.HasACode) {
+      var imageQRCode = "BuildMiaoguoQRCode?IsWeb=1&UserID=" + app.globalData.userInfo.UserID;
+      console.log(imageQRCode);
+      main.getData(imageQRCode, function (data) {});
+      timeout = 5000;
+      app.globalData.userInfo.HasACode=1;
+    }
+
+    var downloadUrl = app.globalData.uploadImageUrl + "MiaoguoUser" + common.Encrypt(app.globalData.userInfo.UserID) + ".png";
+    setTimeout(function () {
+      var downloadTask = wx.downloadFile({
+        url: downloadUrl,
+        success(res) {
+          if (res.statusCode === 200) {
+
+            var downloadTask2 = wx.downloadFile({
+              url: app.globalData.userInfo.AvatarUrl,
+              success(res2) {
+                if (res2.statusCode === 200) {
+                  var canvas = wx.createCanvasContext("shareCanvas", that);
+                  canvas.drawImage(imageUrl, 0, 0, 750, 1110);
+                  canvas.drawImage(res2.tempFilePath, 30, 995, 70, 70);
+                  canvas.drawImage("../../pages_agent/images/promotion_face_circle.png", 30, 995, 70, 70);
+                  canvas.drawImage(res.tempFilePath, 600, 970, 120, 120);
+                  
+                  canvas.draw(1, function (n) {
+
+                    wx.canvasToTempFilePath({
+                      x: 0,
+                      y: 0,
+                      width: 750,
+                      height: 1110,
+                      destWidth: 750,
+                      destHeight: 1110,
+                      canvasId: 'shareCanvas',
+                      success: function (res2) {
+
+                        console.log(res2.tempFilePath);
+                        wx.hideLoading();
+                        wx.previewImage({
+                          current: res2.tempFilePath, // 当前显示图片的http链接
+                          urls: [res2.tempFilePath] // 需要预览的图片http链接列表
+                        });
+                      },
+                      fail: function (err) {
+                        wx.hideLoading();
+                      }
+                    })
+                  });
+                }
+              }
+            });
+          } else {
+            wx.hideLoading();
+          }
+        },
+        fail: function (err) {
+          console.log("err:" + err);
+          wx.hideLoading();
+          downloadNumber++;
+          if (downloadNumber < 3)
+            that.buildImage();
+        }
+      });
+
+      downloadTask.onProgressUpdate((res) => {
+        console.log('下载进度', res.progress)
+        console.log('已经下载的数据长度', res.totalBytesWritten)
+        console.log('预期需要下载的数据总长度', res.totalBytesExpectedToWrite)
+      })
+    }, timeout);
+
+  },
+  buildUrl: function () {
+    wx.setClipboardData({
+      data: shareUrl,
+      success(res) {
+        wx.showToast({
+          title: '已复制',
+        });
+      }
+    });
+  },
+  buildText: function () {
+    var text = "我家孩子在用「秒过」小程序做复习。它可以解决错别字、背古诗、记单词，还能牢记词语、成语、公式、定理、史地政等一切基础知识，都可以用它来练习。详情体验：" + shareUrl;
+    wx.setClipboardData({
+      data: text,
+      success(res) {
+        wx.showToast({
+          title: '已复制',
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: "../../pages/images/program_screenshot_main.png",
+    }
+  },
+});

pages_agent/marketing/shareuser.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "我的推广物料",
+  "backgroundColor": "#F2F2F2"
+}

pages_agent/marketing/shareuser.wxml

@@ -0,0 +1,21 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
+  <view class="panel FlexColumn" wx:for="{{List}}" wx:key="*this">
+    <view class="text1 FlexRow">{{item.Text1}}<view class="Number">{{index+1}}</view></view>
+    <view class="text2">{{item.Text2}}</view>
+    <button wx:if="{{item.BtnStr}}" class="btn FlexRow" open-type="{{item.OpenType}}" bindtap="{{item.BindTap}}">
+      <view class="Arrow"></view>
+      <view>{{item.BtnStr}}</view>
+      <image src='../images/arrow_right_orange.png' class="Arrow" />
+    </button>
+    <view class="panel1 FlexRow" wx:if="{{item.Images}}">
+      <image bindtap="buildImage" data-id="{{itemChild.id}}" class="img" src="{{ServerImage}}{{itemChild.icon}}" wx:for="{{item.Images}}" wx:key="index" wx:for-item="itemChild"></image>
+    </view>
+    <text class="text3">{{item.Text3}}</text>
+  </view>
+ 
+  <view style="height:60rpx;"></view>
+
+</view>
+
+<canvas class='Canvas' canvas-id="shareCanvas"></canvas>

pages_agent/marketing/shareuser.wxss

@@ -0,0 +1,72 @@
+.container {
+  background-color: #f2f2f2;
+  color:#4D4D4D;
+} 
+
+.panel{
+  margin-top: 60rpx;
+  width:710rpx;
+  border-radius: 40rpx;
+  background-color: #fff;
+  justify-content: flex-start;
+}
+
+.panel .text1{
+  font-size:24rpx;
+  margin-top: 60rpx;
+}
+
+.panel .Number{
+  font-family: Roboto-Black;
+  font-size: 28rpx;
+  color: #4D4D4D;
+  margin-left: 6rpx;
+}
+.panel .text2{
+  font-size:36rpx;
+  margin-top: 30rpx;
+  color:#1E1E1E;
+  text-align: center;
+}
+
+.panel .panel1{
+  margin-top: 60rpx;
+}
+
+.panel .img{
+  width:196rpx;
+  height:248rpx;
+  margin: 0 10rpx;
+}
+
+.panel .text3{
+  font-size:24rpx;
+  margin: 40rpx 0;
+  text-align: center;
+}
+
+.panel .btn{
+  width:622rpx;
+  height:92rpx;
+  line-height: 100rpx;
+  font-size:36rpx;
+  margin-top: 60rpx;
+  color:#E65A20;
+  background-color: #fff;
+  border-radius: 20rpx;
+  justify-content: space-between;
+  border:4rpx solid #E65A20;
+}
+
+.Arrow{
+  width:14rpx;
+  height:22rpx;
+}
+
+.Canvas{
+  width: 750px; 
+  height: 1110px;
+  background-color: #fff;
+  position: fixed;
+  left:760rpx;
+}