2.3.48

app.json

@@ -42,6 +42,7 @@
         
     "pages/other/family",
     "pages/other/recover",
+    "pages/other/grade",
     "pages/other/video",
     "pages/other/menu",
     "pages/other/lessonlist",

pages/index/accredit.js

@@ -6,118 +6,113 @@ const app = getApp();
 Page({
   data: {
     IsIPad:"",
-    AgeList:[{Name:"学龄前",Grade:0},{Name:"一年级",Grade:1},{Name:"二年级",Grade:2},{Name:"三年级",Grade:3},{Name:"四年级",Grade:4},{Name:"五年级",Grade:5},{Name:"六年级",Grade:6},{Name:"初中及以上",Grade:100}],
-  },
+ },
   onLoad: function (options) {
+
+    var nickname=app.globalData.userInfo.NickName;
+    if (app.globalData.userInfo.NickName=="陌生用户")
+      nickname="";
     this.setData({
       Containnerheight: main.getWindowHeight(),
-      IsAccredit:true,
+      NickName: nickname,
+      AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
 
     var that = this;
     var hType=0;
     if (options.Type)
       hType=options.Type;
-    main.getData("GetAccreditInfo?Type=" + hType, function (data) {
+
+    
+    main.getData("GetAccreditInfo2?Type="+hType, function (data) {
       that.setData({
         Info: data,
-        Htype:hType,
       });
     });
-
-    if (!app.globalData.userInfo)
-      app.globalData.userInfo = {};
+    
 
     if (app.globalData.IsIPad) {
       that.setData({
         IsIPad: "_iPad",
       });
     }
-
   },
-  //得到用户信息
-  getUserInfo: function () {
-    var that = this
-
-    wx.getUserProfile({
-      desc: "登录注册",
-      success: function (res2) {
-        that.data.Info.Text3=null;
+  onChooseAvatar:function(e){
+    var that = this;
+    console.log(e);
+    that.uploadFileToServer(e.detail.avatarUrl, function (data) {
+      if (data) {
         that.setData({
-          Info: that.data.Info,
-        });
-
-        app.globalData.userInfo.NickName = res2.userInfo.nickName;
-        app.globalData.userInfo.AvatarUrl = res2.userInfo.avatarUrl;
-        
-        //调用登录接口
-        wx.login({
-          success: function (res0) {
-            app.globalData.userInfo.Code = res0.code;
-            that.login(app.globalData.userInfo, res2.userInfo);
-          }
+          AvatarUrl:app.globalData.uploadImageUrl + data.Target,
         });
-      },
-      fail: function (res) {
-        console.log(res);
-        that.gotoReturn();
+        that.save();
       }
     });
   },
-  login: function (param, param2) {
-    var that = this;
-    var url = "MiaoguoLogin";
-    main.postData(url, {
-      Code: param.Code,
-      NickName: param2.nickName,
-      AvatarUrl: param2.avatarUrl,
-      Language: param2.language,
-      Gender: param2.gender,
-      City: param2.city,
-      Province: param2.province,
-      Country: param2.country,
-      ProgramVersion: app.globalData.Version,
-      Introducer: app.globalData.introducer,
-      UserSource: app.globalData.userSource,
-      SourceID: app.globalData.SourceID,
-      LastUserSource: app.globalData.userSource,
-      iv: param.iv,
-      encryptedData: param.encryptedData,
-    }, function (data) {
-      app.globalData.userInfo.NickName = data.NickName;
-      app.globalData.userInfo.AvatarUrl = data.AvatarUrl;
-      app.globalData.userInfo.Language = data.Language;
-      app.globalData.userInfo.Gender = data.Gender;
-      app.globalData.userInfo.City = data.City;
-      app.globalData.userInfo.Province = data.Province;
-      app.globalData.userInfo.Country = data.Country;
-
-      app.globalData.userInfo.IsMember = data.IsMember;
-
-      if (app.globalData.userInfo.UserID){
-        if (that.data.Htype==1){
-          that.setData({
-            IsAccredit:false,
+  onKeyInput: function (e) {
+    var that=this;
+    var nickname = e.detail.value;    
+    that.setData({
+      NickName: nickname,
+    });
+    that.save();
+  },
+  save:function(){
+    var that=this;
+    app.globalData.userInfo.NickName=that.data.NickName;
+    app.globalData.userInfo.AvatarUrl=that.data.AvatarUrl;
+    
+    var param={};
+    param.NickName=app.globalData.userInfo.NickName;
+    param.AvatarUrl=app.globalData.userInfo.AvatarUrl;
+    main.postData('UpdateUserNickNameAndAvatar?UserID=' + app.globalData.userInfo.UserID, param, function (data) {
+      
+    });
+  },
+  uploadFileToServer: function (file, callback) {
+    var url = common.Encrypt("MiaoguoUploadFile2");
+    wx.showLoading({
+      title: '上传中',
+      mask: true,
+    });
+    wx.uploadFile({
+      url: app.globalData.serverUrl + url,
+      filePath: file,
+      name: 'file',
+      success(res) {
+        var err = JSON.parse(res.data);
+        if (err.errcode == 10000) {
+          wx.hideLoading();
+          callback(err.result);
+        } else {
+          wx.hideLoading();
+          wx.showModal({
+            title: '上传文件失败',
+            showCancel: false,
+            content: JSON.stringify(err.errMsg),
           });
         }
-        else{
-          that.gotoReturn();
-        }
-      }
-      else {
-        app.globalData.userInfo.UserID = data.UserID;
-        that.gotoReturn();
+      },
+      fail: function (err) {
+        wx.hideLoading();
+        wx.showModal({
+          title: '上传文件失败',
+          showCancel: false,
+          content: JSON.stringify(err),
+        });
       }
-      wx.setStorageSync("AccreditLimitTime",common.formatTime(new Date(),"-",true)+" 23:59:59");
     });
   },
   gotoReturn: function () {
-    var that = this;
-    if (app.globalData.userInfo.IsShow == 1 && that.data.Info.Text3){
+    var that=this;
+    if (app.globalData.userInfo.isShow == 1 
+      && that.data.Info.Remind
+      && (that.data.NickName=="陌生用户" || that.data.NickName=="")
+      ){
       wx.showModal({
         title: '提醒',
         showCancel: false,
-        content: that.data.Info.Text3,
+        content: that.data.Info.Remind,
         confirmText: '知道了',
         success(res) {
           if (res.confirm) {
@@ -127,22 +122,13 @@ Page({
       });
     }
     else{
+      wx.setStorageSync("AccreditLimitTime",common.formatTime(new Date(),"-",true)+" 23:59:59");
+
       wx.navigateBack({
         delta: 1
       });
     }
   },
-  setGrade:function(e){
-    var that=this;
-    var grade=e.currentTarget.dataset.grade;
-    console.log(grade);
-    var url = 'SetGrade?UserID=' + app.globalData.userInfo.UserID+'&Grade='+grade;
-    main.getData(url, function (data) {
-      wx.navigateBack({
-        delta: 1
-      });
-    });
-  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/index/accredit.wxml

@@ -3,30 +3,29 @@
   </view>
 </navigation-bar>
 
-<view wx:if="{{IsAccredit}}" class="container{{IsIPad}} FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <image src="../images/universalpic_logo_200x200.png" class='img' />
+<view class="container{{IsIPad}} FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="text1">{{Info.Text1}}</view>
 
+  <text class="panel3 panel1" wx:if="{{Info.Text2}}">{{Info.Text2}}</text>
 
-  <text class="text0">{{Info.Text1}}</text>
-  <text class="text1">{{Info.Text2}}</text>
-
-  <button catchtap="getUserInfo" class="btn FlexRow">
-    <view>{{Info.Btn1}}</view>
-  </button>
-  <view catchtap="gotoReturn" class="btn2 btn FlexRow">
-    <view>{{Info.Btn2}}</view>
+  <view class="panel1 FlexRow">
+    <view class="text3">头像</view>
+    <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">
+      <image class="avatar" src="{{AvatarUrl}}"></image>
+    </button> 
   </view>
-  
-</view>
-
-<view wx:if="{{!IsAccredit}}" class="container{{IsIPad}}  FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-  <image src="../images/universalpic_logo_200x200.png" class='img{{IsIPad}}' />
+  <view class="line1"></view>
+  <view class="panel2 panel1 FlexRow">
+    <view class="text3">用户名字</view>
+    <input type="nickname" class="weui-input" placeholder-class="placeholder" bindinput="onKeyInput" placeholder="请输入名字" value="{{NickName}}" />
+  </view>
+  <view class="line2 line1"></view>
 
+  <block wx:if="{{Info.Text3}}">
+    <view class="text4">友情提示</view>
+    <view class="line3 line1"></view>
+    <view class="text5 text4">{{Info.Text3}}</view>
+  </block>
 
-  <text class="text2{{IsIPad}}">选择孩子的年级</text>
-  <view class="panel1 FlexRow">
-    <view wx:for="{{AgeList}}" wx:key="*this" class="btn3" bindtap="setGrade" data-grade="{{item.Grade}}">{{item.Name}}</view>
-  </view>
-  
-  
+  <view class="btn1" bindtap="gotoReturn">{{Info.Text4}}</view>
 </view>

pages/index/accredit.wxss

@@ -12,79 +12,86 @@
   color:#fff;
 }
 
-.img{
-  width:200rpx;
-  height:200rpx;
-  border-radius: 50%;
-  margin-top: 150rpx;
+.text1{
+  font-size: 54rpx;
+  margin-top: 120rpx;
 }
 
-.img_iPad{
-  width:200rpx;
-  height:200rpx;
-  border-radius: 50%;
+.panel1{
+  width:630rpx;
+  margin-top: 80rpx;
+  justify-content:space-between;
+}
+
+.panel3{
   margin-top: 30rpx;
+  font-size: 24rpx;
+}
+.panel2{
+  margin-top: 60rpx;
 }
 
-.text0{
-  font-size:48rpx;
-  margin-top: 120rpx;
-  text-align: center;
+.text3{
+  font-size: 28rpx;
 }
 
-.text1{
-  font-size:32rpx;
-  margin-top: 20rpx;
-  text-align: center;
+.avatar-wrapper{
+  width:100rpx;
+  height:100rpx;
+  margin: 0rpx;
+  padding: 0rpx;
+  border-radius: 50%;
+}
+
+.avatar{
+  width:100rpx;
+  height:100rpx;
+  border-radius: 50%;
 }
 
-.btn{
+.weui-input{
   width:400rpx;
-  height:110rpx;
-  border-radius: 14rpx;
-  border:1rpx solid #fff;
-  background-color: #0B8457;
-  margin-top: 60rpx;
-  color:#fff;
-  font-size:36rpx;
+  text-align: right;
 }
-.btn2{
-  border:1rpx solid #0B8457;
-  margin: 40rpx 0 0 0;
-  font-size:28rpx;
+
+.placeholder{
+  font-size: 28rpx;
+  color: #B6F57F;
+  text-align: right;
 }
 
-.universalpic_share_white_52x40{
-  width: 52rpx;
-  height: 41rpx;
-  margin-right: 20rpx;
+.line1{
+  background: rgba(0,0,0,0.25);
+  width: 630rpx;
+  height:1rpx;
+  margin: 30rpx 0 0 0;
 }
 
-.text2{
-  font-size:54rpx;
-  margin-top: 170rpx;
-  text-align: center;
+.line2{
+  margin: 60rpx 0 0 0;
 }
 
-.text2_iPad{
-  font-size:54rpx;
-  margin-top: 20rpx;
-  text-align: center;
+.line3{
+  margin: 20rpx 0 0 0;
 }
 
-.panel1{
-  margin-top:25rpx;
-  flex-wrap: wrap;
+.text4{
+  font-size: 24rpx;
+  width:630rpx;
+  text-align: left;
+  margin-top: 60rpx;
+}
+.text5{
+  margin-top: 20rpx;
 }
 
-.btn3{
-  background: #0B8457;
-  border: 1rpx solid #FFFFFF;
+.btn1{
+  width:630rpx;
+  height:110rpx;
+  background: rgba(0,0,0,0.25);
   border-radius: 14rpx;
   font-size: 36rpx;
-  color: #FFFFFF;
   text-align: center;
-  width:285rpx;
-  line-height:90rpx;
-  margin: 15rpx;
+  line-height: 110rpx;
+  margin-top: 80rpx;
 }

pages/index/index.js

@@ -258,7 +258,7 @@ Page({
               isShow = 1;
             }
           }
-          app.globalData.userInfo.IsShow = isShow;
+          app.globalData.userInfo.isShow = isShow;
 
           if (app.globalData.userInfo.IsMember == 1)
             app.globalData.IsLocked = 0;

pages/main/add.js

@@ -99,7 +99,7 @@ Page({
       UpdateType: options.type,
       MiaoguoCardID: options.id,
       FieldNumber: fieldNumber,
-      IsShow: app.globalData.userInfo.IsShow,
+      IsShow: app.globalData.userInfo.isShow,
       CardType: cardtype,
       PracticeCardType: constant1.arrStudyPattern[cardtype] + "题卡",
       FolderID: folderid,

pages/main/addInfomationDetail.wxml

@@ -37,7 +37,7 @@
       </view>
       <view></view>
     </view>
-    <text wx:if="{{Result.CHN.Book}}" class="panelRemark">该内容出现在《{{Result.CHN.Book}}》\n除了自制题卡还可以试一试语文「知识检验」</text>
+    <text wx:if="{{Result.CHN.Book}}" class="panelRemark">该内容出现在\n<block wx:for="{{Result.CHN.Book}}" wx:key="*this">《{{item}}》\n</block>除了自制题卡还可以试一试语文「知识检验」</text>
   </block>
 
   <!-- 拼音 -->

pages/main/addInfomationDetail.wxss

@@ -183,9 +183,9 @@
 
 .panelRemark{
   width: 670rpx;
-  height:97rpx;
   font-size:24rpx;
   color:#4D4D4D;
+  padding-bottom: 20rpx;
   border-bottom:1rpx solid #d2d2d2;
 }
 

pages/main/cardmain.js

@@ -16,9 +16,7 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      AvatarUrl: app.globalData.userInfo.AvatarUrl,
-      NickName: app.globalData.userInfo.NickName,
-      IsShow: app.globalData.userInfo.IsShow,
+      IsShow: app.globalData.userInfo.isShow,
     });
 
     var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
@@ -211,11 +209,6 @@ Page({
       }
     }
   },
-  gotoAccredit: function () {
-    wx.navigateTo({
-      url: '../index/accredit',
-    });
-  },
   openOrder: function () {
     this.setData({
       IsShowOrder: true,

pages/main/cardmain.wxml

@@ -6,17 +6,6 @@
       <view>搜题卡</view>
     </view>
   </view>
-  <block wx:if="{{IsShow==0}}">
-    <view class="panelTemp FlexRow" bindtap="gotoAccredit">
-      <view class="panelTemp1 FlexRow">
-        <image class="avatar" src='{{AvatarUrl}}' />
-        <view class="text6" wx:if="{{NickName=='陌生用户'}}">点击这里登录</view>
-        <view class="text6" wx:if="{{NickName!='陌生用户'}}">{{NickName}}</view>
-      </view>
-      <view>
-      </view>
-    </view>
-  </block>
   <view class="panelItem2 FlexRow">
     <view class="panelItem21 FlexColumn" bindtap="getList" data-id="0">
       <image class="tabbar_allcards_56x50" src='../images/tabbar_allcards_56x50.png' />

pages/main/default.js

@@ -56,7 +56,7 @@ Page({
   },
   onShow: function () {
     var that = this;
-    if (app.globalData.userInfo.IsNewUser && app.globalData.userInfo.IsNewUser == 1 && app.globalData.userInfo.IsShow == 1) {
+    if (app.globalData.userInfo.IsNewUser && app.globalData.userInfo.IsNewUser == 1 && app.globalData.userInfo.isShow == 1) {
       if (app.globalData.userInfo.Subscribe == 0) {
         wx.navigateTo({
           url: '../other/newuser',
@@ -65,12 +65,12 @@ Page({
     } else {
       wx.getSetting({
         success(res) {
-          if (app.globalData.userInfo.NickName == "陌生用户" && app.globalData.userInfo.IsMember == 1 && app.globalData.userInfo.IsShow == 1) {
+          if (app.globalData.userInfo.NickName == "陌生用户" && app.globalData.userInfo.IsMember == 1 && app.globalData.userInfo.isShow == 1) {
             wx.navigateTo({
               url: '../index/accredit',
             });
           } else {
-            if (!app.globalData.userInfo.IsTryOut && app.globalData.userInfo.IsShow == 1) {
+            if (!app.globalData.userInfo.IsTryOut && app.globalData.userInfo.isShow == 1) {
               if (app.globalData.userInfo.Subscribe == 1) {
                 wx.navigateTo({
                   url: '../other/userbook',
@@ -81,7 +81,7 @@ Page({
                   url: '../other/newuser',
                 });
               }
-            } else if (app.globalData.userInfo.IsTryOut && app.globalData.userInfo.IsShow == 1) {
+            } else if (app.globalData.userInfo.IsTryOut && app.globalData.userInfo.isShow == 1) {
               if (app.globalData.GotoUrl.indexOf("../other/pay?PayType=6") >= 0) {
                 wx.navigateTo({
                   url: app.globalData.GotoUrl,
@@ -103,7 +103,7 @@ Page({
                 }
               }
 
-            } else if (app.globalData.userInfo.IsShow == 0) {
+            } else if (app.globalData.userInfo.isShow == 0) {
               var url = 'SetGrade?UserID=' + app.globalData.userInfo.UserID+'&Grade=1';
               main.getData(url, function (data) {});
             }

pages/main/preview.js

@@ -57,6 +57,8 @@ Page({
       Containnerheight: height,
       ShowType: options.type,
       MiaoguoCardID: id,
+      IsShow:app.globalData.userInfo.isShow,
+      ShowText:app.globalData.userInfo.ShowText1,
       Color: main.getDetailColor(app.globalData.ColorIndex),
     });
     console.log("MiaoguoCardID:" + id);
@@ -79,7 +81,7 @@ Page({
     else {
       if (options.type == "share") {
         wx.setNavigationBarTitle({
-          title: "来自分享"
+          title: "来自"+app.globalData.userInfo.ShowText1,
         });
       }
       else if (options.type == "play") {
@@ -154,7 +156,7 @@ Page({
           else {
             var time = 2000;
             wx.showToast({
-              title: '分享人已删除',
+              title: +app.globalData.userInfo.ShowText1+'人已删除',
               mask: true,
               duration: time,
               complete: function () {
@@ -679,7 +681,7 @@ Page({
     }
     
     return {
-      title: '我的分享',
+      title: '我的'+app.globalData.userInfo.ShowText1,
       path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&type=share&ColorIndex=' + app.globalData.ColorIndex + '&MiaoguoCardID=' + this.data.MiaoguoCardID,
     }
   },

pages/main/preview.wxml

@@ -86,8 +86,9 @@
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{PrevID}}" wx:if="{{PrevID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_prev_gray_30x30.png' />
       </view>
-      <button class="btn21" open-type='share' wx:if="{{!PrintID}}">分享给大家</button>
-      <view class='btn21' wx:if="{{PrintID}}">{{CurrentIndex}}</view>
+      <button class="btn21" open-type='share' wx:if="{{!PrintID && IsShow==1}}">{{ShowText}}给大家</button>
+      <view class="btn21" wx:if="{{PrintID && IsShow==1}}">{{CurrentIndex}}</view>
+      <view class='btn21' wx:if="{{IsShow!=1}}"></view>
       <view class='btn1 FlexRow' catchtap="previewNext" data-id="{{NextID}}" wx:if="{{NextID>0}}">
         <image class="universalpic_next_gray_30x30" src='../images/universalpic_next_gray_30x30.png' />
       </view>

pages/main/systemsetting.js

@@ -16,7 +16,7 @@ Page({
       Containnerheight: main.getWindowHeight(),
       ProgramName: app.globalData.ProgramName,
       Version: app.globalData.Version,
-      IsShow: app.globalData.userInfo.IsShow,
+      IsShow: app.globalData.userInfo.isShow,
       ShowUserID:app.globalData.userInfo.ShowUserID,
       IsPromoter:app.globalData.userInfo.IsPromoter,
     });

pages/other/binding.js

@@ -110,11 +110,11 @@ Page({
   },
   onShow: function (options) {
     var that = this;
-    if (app.globalData.userInfo.IsShow == 1) {
+    if (app.globalData.userInfo.isShow == 1) {
       var today=wx.getStorageSync("AccreditLimitTime");
       if (common.formatTime(new Date(),"-")>today){
         wx.navigateTo({
-          url: '../index/accredit',
+          url: '../index/accredit?Type=binding',
         });
       }
     }

pages/other/family.js

@@ -30,11 +30,11 @@ Page({
   },
   onShow: function (options) {
     var that = this;
-    if (app.globalData.userInfo.IsShow == 1) {
+    if (app.globalData.userInfo.isShow == 1) {
       var today=wx.getStorageSync("AccreditLimitTime");
       if (common.formatTime(new Date(),"-")>today){
         wx.navigateTo({
-          url: '../index/accredit',
+          url: '../index/accredit?Type=family',
         });
       }
     }

pages/other/grade.js

@@ -0,0 +1,34 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    IsIPad:"",
+    AgeList:[{Name:"学龄前",Grade:0},{Name:"一年级",Grade:1},{Name:"二年级",Grade:2},{Name:"三年级",Grade:3},{Name:"四年级",Grade:4},{Name:"五年级",Grade:5},{Name:"六年级",Grade:6},{Name:"初中及以上",Grade:100}],
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+  },
+  setGrade:function(e){
+    var that=this;
+    var grade=e.currentTarget.dataset.grade;
+    console.log(grade);
+    var url = 'SetGrade?UserID=' + app.globalData.userInfo.UserID+'&Grade='+grade;
+    main.getData(url, function (data) {
+      wx.navigateBack({
+        delta: 1
+      });
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/other/grade.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "秒过",
+  "usingComponents": {
+    "navigation-bar": "/components/navigation-bar/navigation-bar"
+  },  
+  "navigationStyle": "custom",
+  "navigationBarBackgroundColor": "#0B8457",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#0B8457"
+}

pages/other/grade.wxml

@@ -0,0 +1,12 @@
+<navigation-bar title="秒过" background="#0B8457" color="#fff" show="true" left="true">
+  <view slot="left" >
+  </view>
+</navigation-bar>
+
+<view class="container{{IsIPad}}  FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src="../images/universalpic_logo_200x200.png" class='img{{IsIPad}}' />
+  <text class="textGrade{{IsIPad}}">选择孩子的年级</text>
+  <view class="panelGrade FlexRow">
+    <view wx:for="{{AgeList}}" wx:key="*this" class="btnGrade" bindtap="setGrade" data-grade="{{item.Grade}}">{{item.Name}}</view>
+  </view>
+</view>

pages/other/grade.wxss

@@ -0,0 +1,62 @@
+.container {
+  background-color: #0B8457;
+  position: fixed;
+  top:120rpx;
+  color:#fff;
+}
+
+.container_iPad {
+  background-color: #0B8457;
+  position: fixed;
+  top:0rpx;
+  color:#fff;
+}
+
+.universalpic_share_white_52x40{
+  width: 52rpx;
+  height: 41rpx;
+  margin-right: 20rpx;
+}
+
+.img{
+  width:200rpx;
+  height:200rpx;
+  border-radius: 50%;
+  margin-top: 150rpx;
+}
+
+.img_iPad{
+  width:200rpx;
+  height:200rpx;
+  border-radius: 50%;
+  margin-top: 30rpx;
+}
+
+.textGrade{
+  font-size:54rpx;
+  margin-top: 170rpx;
+  text-align: center;
+}
+
+.textGrade_iPad{
+  font-size:54rpx;
+  margin-top: 20rpx;
+  text-align: center;
+}
+
+.panelGrade{
+  margin-top:25rpx;
+  flex-wrap: wrap;
+}
+
+.btnGrade{
+  background: #0B8457;
+  border: 1rpx solid #FFFFFF;
+  border-radius: 14rpx;
+  font-size: 36rpx;
+  color: #FFFFFF;
+  text-align: center;
+  width:285rpx;
+  line-height:90rpx;
+  margin: 15rpx;
+}

pages/other/newuser.js

@@ -53,7 +53,6 @@ Page({
   },
   goto: function (e) {
     var url = e.currentTarget.dataset.url;
-    
     wx.navigateTo({
       url: url,
     });
@@ -97,7 +96,7 @@ Page({
       });
       if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow == 1){
         wx.navigateTo({
-          url: '../index/accredit?Type=1',
+          url: '../other/grade',
         });
       }
     });

pages/other/newuser.wxml

@@ -1,5 +1,4 @@
 <view wx:if="{{PanelShow==0}}" class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-
     <image id="Image{{index}}" wx:for="{{List}}" wx:key="*this" class="img" lazy-load="true" mode="widthFix" 
     src='{{ImagePath}}web/{{item.Image}}' bindtap="{{item.BindTap}}" data-url="{{item.Url}}"  
     bindtouchmove="scroll"/>

pages/other/paycustom.js

@@ -35,7 +35,7 @@ Page({
       that.showToast('输入用户ID');
     }
     else {
-      main.getData("GetMiaoguoWXUserInfo?FieldStr=UserID,NickName,AvatarUrl &UserID=" + that.data.SearchUserID, function (data) {
+      main.getData("GetMiaoguoWXUserInfo?FieldStr=UserID,NickName,NickNameRemark,AvatarUrl &GetWechatUserID=1&UserID=" + that.data.SearchUserID, function (data) {
         if (data) {
           that.setData({
             UserInfo: data,

pages/other/paycustom.wxml

@@ -8,7 +8,12 @@
   </view>
   <view class="panelTitle3 FlexRow">
     <image src="{{UserInfo.AvatarUrl}}" class="avatar" />
-    <view class="btn2 btn" bindtap="getUserInfo">头像查验</view>
+    <view class="panelTitle31 FlexColumn">
+      <view>用户昵称：{{UserInfo.NickName}}</view>
+      <view>服务号ID：{{UserInfo.WechatUserID}}</view>
+      <view>客服备注：{{UserInfo.NickNameRemark}}</view>
+    </view>
+    <view class="btn2 btn" bindtap="getUserInfo">身份查验</view>
   </view>
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">增加有效期（天）</view>

pages/other/paycustom.wxss

@@ -52,6 +52,11 @@
   justify-content: space-between;
 }
 
+.panelTitle31{
+  align-items: flex-start;
+  font-size: 24rpx;
+}
+
 
 .avatar{
   width:90rpx;
@@ -62,7 +67,7 @@
 }
 
 .btn2{
-  width:260rpx;
+  width:180rpx;
   margin-top: 0rpx;
   margin-right: 30rpx;
 }

pages/other/userbook.js

@@ -73,7 +73,7 @@ Page({
       ProductServiceTime: productServiceTime,
       EndDate: endDate,
       ArrInformation: arrInformation,
-      IsShow: app.globalData.userInfo.IsShow,
+      IsShow: app.globalData.userInfo.isShow,
       IsMember: app.globalData.userInfo.IsMember,
       IsPay: app.globalData.userInfo.IsPay,
       IsLoseEfficacy: app.globalData.userInfo.IsLoseEfficacy,
@@ -81,6 +81,7 @@ Page({
       ChildUserID: app.globalData.userInfo.ChildUserID,
       MainUserID: app.globalData.userInfo.MainUserID,
       UserID:app.globalData.userInfo.UserID,
+      ShowUserID:app.globalData.userInfo.ShowUserID,
     });
 
     that.init();

pages/other/userbook.wxml

@@ -12,7 +12,14 @@
     <view class='userinfo FlexRow'>
       <view class="left FlexRow" bindtap="updateMember">
         <image class='avatar' src="{{AvatarUrl}}" />
-        <view class="nickname">{{NickName}}</view>
+        <view class="userinfo1 FlexColumn">
+          <view class="userinfo11 FlexRow">
+            <view wx:if="{{NickName!='陌生用户'}}" class="nickname">{{NickName}}</view>
+            <view wx:if="{{NickName=='陌生用户'}}" class="nickname">添加名字</view>
+            <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+          </view>
+          <view class="showuserid">{{ShowUserID}}</view>
+        </view>
       </view>
       <view class="right FlexRow" bindtap="goto" data-url="../main/systemsetting" wx:if="{{IsShow==1 && !IsLoseEfficacy && ((ClassDayNumber<ClassTotalDayNumber && IsPay==0) || IsPay==1 || PanelShow===2)}}">
         <image class='universalpic_setup_white_50x50' src="../images/universalpic_setup_white_50x50.png" />

pages/other/userbook.wxss

@@ -78,12 +78,32 @@
   border-radius: 50%;
 }
 
+.userinfo1{
+  align-items: flex-start;
+}
+
 .nickname {
   margin-left: 20rpx;
   font-size: 28rpx;
   color: #fff;
 }
 
+.showuserid{
+  margin-left: 20rpx;
+  font-size: 24rpx;
+  color: #fff;
+}
+
+.userinfo11{
+  justify-content: flex-start;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 20rpx;
+}
+
 .panel1 {
   width: 100%;
   height: 134rpx;

pages/share/shareitem.js

@@ -59,7 +59,7 @@ Page({
     wx.showLoading({
       title: '读取中',
     });
-    var url = 'GetShareItemInfo?IsShow='+app.globalData.userInfo.IsShow+'&IsHistory=' + isHistory + '&UserID=' + app.globalData.userInfo.UserID + "&TaskID=" + taskid;
+    var url = 'GetShareItemInfo?IsShow='+app.globalData.userInfo.isShow+'&IsHistory=' + isHistory + '&UserID=' + app.globalData.userInfo.UserID + "&TaskID=" + taskid;
     main.getData(url, function (data) {
       wx.hideLoading();
       if (!data.MilestoneDayNumber && !that.data.IsHistory && data.Remark)
@@ -152,7 +152,7 @@ Page({
         innerAudioContext1.stop();
     }
   },
-  //生成里程碑分享图片
+  //生成里程碑图片
   buildShareImageMilestone: function () {
     var that = this;
 
@@ -251,7 +251,7 @@ Page({
       });
     });
   },
-  //生成分享图片
+  //生成图片
   buildShareImage: function () {
     var that = this;
 
@@ -383,7 +383,7 @@ Page({
       });
     });
   },
-  //生成分享图片(历史)
+  //生成图片(历史)
   buildShareImageHistory: function () {
     var that = this;
 

pages_agent/main/enter.js

@@ -57,10 +57,4 @@ Page({
 
   },
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  }
 })

utils/main.js

@@ -99,7 +99,7 @@ function payMoney(payType, remark, money, detail, callback) {
       if (res.code) {
         console.log('获取用户登录态成功！' + res.code);
         //预支付
-        getData('ProductPayLogin500?code=' + res.code + '&payType=' + payType + '&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID + '&Remark=' + remark, function (data) {
+        getData('ProductPayLogin500?code=' + res.code + '&payType=' + payType + '&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID + '&Remark=' + remark+'&UserID='+app.globalData.userInfo.ShowUserID, function (data) {
           if (data && data.timeStamp) {
             //微信支付
             wx.requestPayment({
@@ -1151,7 +1151,7 @@ function GetTestReportInfo(reportid, callback) {
         if (obj.BookID >= 43 && obj.BookID <= 60)
           name1 = name1[0] + "生词" + name1[2].substr(0, 1);
         else if (obj.BookID == 73)
-          name1 = name1[0] + name1[1].substr(2, 3) + name1[2];
+          name1 = name1[1].substr(2, 3) + name1[2];
         else if (obj.BookID == 86)
           name1 = name1[1] + name1[2];
         else