个人中心修改、签到页面修改、青创赛修改

pages/checkin/index.js

@@ -36,8 +36,42 @@ Page({
           let list1 = res.data.infiniteTask ? [...res.data.infiniteTask] : [];
           let list2 = res.data.singleTask ? [...res.data.singleTask] : [];
           // console.log([...list, ...list1, ...list2]);
+          let dataList = [...list, ...list1, ...list2].map(v => { 
+            switch (v.taskName) {
+              case '邀请好友':
+                v.desc = '邀请好友获得积分';
+                break;
+              case '参与兼职':
+              case '参加兼职/成长会':
+                v.desc = '参与兼职获得积分';
+                break;
+                break;
+              case '每日签到':
+                v.desc = '每日签到获得积分';
+                break;
+              case '购买会员':
+              case '开通会员':
+                v.desc = '开通会员获得积分';
+                break;
+              case '学籍认证':
+              case '完成学籍认证':
+                v.desc = '学籍认证获得积分';
+                break;
+              case '完善资料':
+              case '完善个人资料':
+                v.desc = '完善个人资料获得积分';
+                break;
+              case '参与活动':
+                v.desc = '参与活动获得积分';
+                break;
+              case '观看广告':
+                v.desc = '观看广告获得积分';
+                break;
+            }
+            return v
+          })
           that.setData({
-            tasks: [...list, ...list1, ...list2]
+            tasks: [...dataList]
           })
         }
       })
@@ -135,14 +169,14 @@ Page({
   /**
    * 从服务器获取签到历史
    */
-  getCheckinHistoryFromServer() {
+  async getCheckinHistoryFromServer() {
     const userId = util.getUserId();
     wx.showLoading({
       title: '加载中...',
       mask: true
     });
     if (!userId) return;
-    App._get(
+    await App._get(
       'user/dayList/' + userId,
       {},
       (res) => {
@@ -248,7 +282,10 @@ Page({
             icon: 'success'
           });
           await _this.getCheckinHistoryFromServer();
-          _this.initCalendar();
+          this.loadList();
+          wx.nextTick(() => {
+            _this.initCalendar();
+          })
         } else {
           wx.hideLoading();
           wx.showToast({

pages/checkin/index.wxml

@@ -44,17 +44,18 @@
     <view class="tasks-list">
       <view class="task-item" wx:for="{{tasks}}" wx:key="id" bindtap="handleTaskClick" data-item="{{item}}">
         <view class="task-content">
-          <!-- <image class="task-icon" src="{{item.icon || appAssetsUrl2 + 'new/user.png'}}" mode="aspectFit"></image> -->
-          <!--<view class="box">
-            <image class="task-icon" wx:if="{{item.taskName=='完善资料'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon1.png"></image>
-            <image class="task-icon" wx:if="{{item.taskName=='分享小程序'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon2.png"></image>
-            <image class="task-icon" wx:if="{{item.taskName=='每日登录'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon3.png"></image>
-            <image class="task-icon" wx:if="{{item.taskName=='成功邀请好友'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon4.png"></image>
-            <image class="task-icon" wx:if="{{item.taskName=='购买会员'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon5.png"></image>
-            <image class="task-icon" wx:if="{{item.taskName=='参加兼职/成长会'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon6.png"></image>
-            <image class="task-icon" wx:if="{{item.taskName=='评价'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon7.png"></image>
-            <image class="task-icon" wx:if="{{item.taskName=='商城兑换'}}" mode="widthFix" src="{{appAssetsUrl}}/images/pointExchange/task-icon8.png"></image>
-          </view>-->
+          <view class="box">
+            <image class="task-icon" wx:if="{{item.taskName=='邀请好友'}}" mode="widthFix" src="/assets/images/task-icon/icon_1.png"></image>
+            <!--
+            <image class="task-icon" wx:if="{{item.taskName=='观看广告'}}" mode="widthFix" src="/assets/images/task-icon/icon_2.png"></image>
+            -->
+            <image class="task-icon" wx:if="{{item.taskName=='参加兼职/成长会' ||  item.taskName=='参与兼职'}}" mode="widthFix" src="/assets/images/task-icon/icon_3.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='每日签到'}}" mode="widthFix" src="/assets/images/task-icon/icon_4.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='购买会员' ||  item.taskName=='开通会员'}}" mode="widthFix" src="/assets/images/task-icon/icon_5.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='学籍认证' ||  item.taskName=='完成学籍认证'}}" mode="widthFix" src="/assets/images/task-icon/icon_6.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='完善资料' ||  item.taskName=='完善个人资料'}}" mode="widthFix" src="/assets/images/task-icon/icon_7.png"></image>
+            <image class="task-icon" wx:if="{{item.taskName=='参与活动'}}" mode="widthFix" src="/assets/images/task-icon/icon_8.png"></image>
+          </view>
           <view class="task-info">
             <view class="task-title">{{item.taskName}}</view>
             <view class="task-desc">{{item.desc}}</view>

pages/checkin/index.wxss

@@ -262,10 +262,10 @@
 .task-icon {
   width: 64rpx;
   height: 64rpx;
-  margin-right: 24rpx;
-  background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
+  margin-right: 20rpx;
+  /* background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%); */
   border-radius: 16rpx;
-  padding: 12rpx;
+  /* padding: 12rpx; */
 }
 
 .task-info {

pages/match/index.js

@@ -16,7 +16,10 @@ Page({
     pageSize: 10,
     total: 0,
     hasMore: true,
-    isLoading: false
+    isLoading: false,
+    imglist: [],
+    current: 0,
+    activeTitle: false,
   },
 
   /**
@@ -38,9 +41,57 @@ Page({
    */
   onLoad(options) {
     this.height();
+    this.loadImg();
     // 加载赛事数据
     this.loadMatchData();
   },
+  changeSwiper(e) {
+    let {
+      current,
+      source
+    } = e.detail;
+    if (source === "autoplay" || source === "touch") {
+      this.setData({
+        current: current,
+      });
+    }
+    // this.setData({
+    // 	current: e.detail.current
+    // })
+  },
+  //banner跳转
+  imgJump(v) {
+    // console.log(v);
+    // console.log(v.currentTarget.dataset.item.jumpAddressType);
+    if (v.currentTarget.dataset.item.jumpAddressType == 0) {
+      //内部跳转
+      wx.navigateTo({
+        url: v.currentTarget.dataset.item.linkUrl,
+      });
+    } else if (v.currentTarget.dataset.item.jumpAddressType == 1) {
+      //公众号跳转 'https://www.kujiale.cn/design/3FO4EQWQJF0M/show'
+      wx.setStorageSync("gzurl", v.currentTarget.dataset.item.linkUrl);
+      wx.navigateTo({
+        url: "./gz/gz",
+      });
+    }
+  },
+
+  // 首页banner
+  loadImg: function () {
+    let _this = this;
+    let params = {
+      type: "03",
+      area: "",
+    };
+    app._post_form("img/mylist", "application/json", params, function (res) {
+      if (res.code == 0) {
+        _this.setData({
+          imglist: res.data,
+        });
+      }
+    });
+  },
 
   /**
    * 加载赛事数据
@@ -169,6 +220,7 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh() {
+    this.loadImg();
     // 下拉刷新
     this.reloadMatchData();
     wx.stopPullDownRefresh();
@@ -193,5 +245,23 @@ Page({
    */
   onShareAppMessage() {
     
-  }
+  },
+  onPageScroll: function (e) {
+    if (
+      e.scrollTop >= 10 &&
+      this.data.activeTitle == false
+    ) {
+      this.setData({
+        activeTitle: true,
+      });
+    }
+    if (
+      e.scrollTop < 10 &&
+      this.data.activeTitle == true
+    ) {
+      this.setData({
+        activeTitle: false,
+      });
+    }
+  },
 });

pages/match/index.wxml

@@ -2,9 +2,16 @@
 <view class="match-container">
     <!-- 头部横幅区域 -->
     <view class="header-banner">
-        <view class="title" style="padding-top:{{statusBarHeightTop}}">创业赛事</view>
+        <view class="title {{activeTitle ? 'activeTitle' : ''}}" style="padding-top:{{statusBarHeightTop}}">创业赛事</view>
         <view class="banner-bg">
-            <image class="character-image" src="/assets/images/tournament-bg.png" mode="widthFix"></image>
+            <!--<image class="character-image" src="/assets/images/tournament-bg.png" mode="widthFix"></image>-->
+            <swiper autoplay="{{true}}" current="{{current}}" bindchange="changeSwiper" interval="{{2000}}" duration="{{500}}" class="bg">
+                <block wx:for="{{imglist}}" wx:key="index">
+                    <swiper-item>
+                        <image class="character-image" mode="scaleToFill" data-item="{{item}}" bindtap='imgJump' src="{{item.picture}}"></image>
+                    </swiper-item>
+                </block>
+            </swiper>
         </view>
     </view>
     <!-- 赛事列表区域 -->

pages/match/index.wxss

@@ -12,6 +12,10 @@
   overflow: hidden;
   flex-shrink: 0;
 }
+.header-banner .title.activeTitle{
+  background-color: #ffffff;
+  color: #1a1a1a;
+}
 .header-banner .title{
     position: fixed;
     top: 0;
@@ -30,7 +34,9 @@
   width: 100%;
   height: 100%;
 }
-
+.bg{
+  height: 486rpx;
+}
 .character-image {
   width: 100%;
   height: 486rpx;

pages/my/index/index.js

@@ -8,6 +8,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    appAssetsUrl: app.appAssetsUrl,
     appAssetsUrl2: app.appAssetsUrl2,
     statusBarHeightTop: 0,
     statusBarHeight: 0,
@@ -15,6 +16,7 @@ Page({
     isLogin: false,
     isDev: false,
     totalScore: 0,
+    activeTitle: false,
   },
 
   toLogin() {
@@ -405,5 +407,23 @@ Page({
    */
   onShareAppMessage() {
 
-  }
+  },
+  onPageScroll: function (e) {
+    if (
+      e.scrollTop >= 10 &&
+      this.data.activeTitle == false
+    ) {
+      this.setData({
+        activeTitle: true,
+      });
+    }
+    if (
+      e.scrollTop < 10 &&
+      this.data.activeTitle == true
+    ) {
+      this.setData({
+        activeTitle: false,
+      });
+    }
+  },
 });

pages/my/index/index.wxml

@@ -1,11 +1,11 @@
 <!-- pages/my/index/index.wxml -->
-<view class="mycontent" style="background: url('/assets/images/user-icon/user-bg.png');">
+<view class="mycontent" style="background-image: url('/assets/images/user-icon/user-bg.png');">
     <!-- 自定义导航栏 -->
-    <view class="custom-navbar" style="background: url('/assets/images/user-icon/user-bg1.png');padding-top:{{statusBarHeightTop}}">
-        <view class="navbar-content" style="padding-top:{{statusBarHeightTop}}">
+    <view class="custom-navbar" style="background-image: url('/assets/images/user-icon/user-bg1.png');padding-top:{{statusBarHeightTop}}">
+        <view class="navbar-content {{activeTitle ? 'activeTitle' : ''}}" style="padding-top:{{statusBarHeightTop}}">
             <view class="navbar-left">
                 <view class="customer-service" bindtap="onCustomerServiceTap">
-                    <image src="/assets/images/user-icon/icon_5.png" class="service-icon"></image>
+                    <image src="/assets/images/user-icon/icon_kefu.png" class="service-icon"></image>
                     <text>客服</text>
                 </view>
             </view>
@@ -23,11 +23,7 @@
                     <view class="user-details" wx:if="{{isLogin}}" bindtap="onAvatarTap">
                         <view class="user-name-row">
                             <text class="user-name">{{userInfo.vipname || '--'}}</text>
-                            <!-- <image src="{{appAssetsUrl2}}my/vip-crown.png" class="vip-icon" wx:if="{{userInfo.isVip}}"></image> -->
-                            <image src="/assets/images/login.png" class="vip-icon" wx:if="{{userInfo.isVip}}"></image>
-                            <!-- <view class="gender-icon {{userInfo.gender === 'female' ? 'female' : 'male'}}">
-                                    <text>{{userInfo.gender === 'female' ? '♀' : '♂'}}</text>
-                                </view> -->
+                            <image class="vip-icon" wx:if="{{userInfo.memberState != 0 &&  userInfo.memberState}}" src="{{appAssetsUrl2}}wjxy/mine/vip-icon.png"></image>
                             <image wx:if="{{userInfo.sex}}" mode="aspectFill" src="{{ userInfo.sex == '010' ? appAssetsUrl2+'wjxy/man.png' : appAssetsUrl2+'wjxy/wumen.png'}}" class="sex" />
                         </view>
                         <view class="user-id-row">
@@ -45,7 +41,7 @@
                     </view>
                 </view>
                 <!-- 会员升级提示 -->
-                <view class="vip-upgrade-banner" bindtap="onVipUpgradeTap" style="background: url('/assets/images/user-icon/vip-upgrade-bg.png');">
+                <view class="vip-upgrade-banner" bindtap="onVipUpgradeTap" style="background-image: url('/assets/images/user-icon/vip-upgrade-bg.png');">
                     <view class="vip-banner-left" wx:if="{{userInfo.memberState != 0}}">
                         <image src="/assets/images/user-icon/vip-icon.png" class="upgrade-icon"></image>
                         <text class="upgrade-text">青雲慧 {{userInfo.cardno}}</text>

pages/my/index/index.wxss

@@ -13,6 +13,10 @@
   background-repeat: no-repeat;
 }
 
+.navbar-content.activeTitle{
+  background-color: #ffffff;
+}
+
 .navbar-content {
   display: flex;
   align-items: center;
@@ -45,8 +49,8 @@
 }
 
 .service-icon {
-  width: 28rpx;
-  height: 28rpx;
+  width: 34rpx;
+  height: 34rpx;
   margin-right: 8rpx;
   flex-shrink: 0;
 }
@@ -204,7 +208,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  background-size: 100% 100%;
+  background-size: cover ;
   background-repeat: no-repeat;
 }
 

pages/my/myData/myData.js

@@ -55,15 +55,16 @@ Page({
 			graduationDate: ''
 		},
 
-		isDev: true //开发环境隐藏"编辑资料"页面的部分数据项
+		isDev: true, //开发环境隐藏"编辑资料"页面的部分数据项
+		formKey: []
 	},
 	/**
 	 * 防止穿透
 	 */
-	preventTouchMove() {},
+	preventTouchMove() { },
 
 	//绑定选择器滑动事件 地区
-	MultiPickerAreaChange: function(e) {
+	MultiPickerAreaChange: function (e) {
 		this.data.load = false;
 		let _this = this;
 		if (e.detail.column === 0) {
@@ -79,7 +80,7 @@ Page({
 	},
 
 	//点击完成修改后 地区
-	PickerAreaChange: function(e) {
+	PickerAreaChange: function (e) {
 		this.data.load = false;
 		let _this = this;
 		_this.data.multiIndex[0] = e.detail.value[0]
@@ -93,7 +94,7 @@ Page({
 	},
 
 	// 学校选择事件
-	bindSchChange: function(e) {
+	bindSchChange: function (e) {
 		this.data.load = false;
 		this.setData({
 			schIndex: e.detail.value
@@ -106,7 +107,7 @@ Page({
 	/**
 	 * 年级 完成
 	 */
-	pickerSchChange: function(e) {
+	pickerSchChange: function (e) {
 		this.data.load = false;
 		this.data.gradeIndex[0] = e.detail.value[0]
 		this.data.gradeIndex[1] = e.detail.value[1]
@@ -124,7 +125,7 @@ Page({
 	/**
 	 * 体重滑轨完成
 	 */
-	bindWeightChange: function(e) {
+	bindWeightChange: function (e) {
 		this.data.load = false;
 		this.setData({
 			weightIndex: e.detail.value
@@ -139,7 +140,7 @@ Page({
 	/**
 	 * 年级滑轨后
 	 */
-	MultiPickerSchChange: function(e) {
+	MultiPickerSchChange: function (e) {
 		this.data.load = false;
 		if (e.detail.column === 0) {
 			let pid = g1[e.detail.value].id;
@@ -159,7 +160,7 @@ Page({
 	/**
 	 * 性别滑轨完成
 	 */
-	bindSexChange: function(e) {
+	bindSexChange: function (e) {
 		this.setData({
 			sexIndex: e.detail.value
 		})
@@ -172,7 +173,7 @@ Page({
 	},
 
 	//生日
-	bindTimeChange: function(e) {
+	bindTimeChange: function (e) {
 		if (e.detail.value) {
 			this.setData({
 				birthday: e.detail.value
@@ -181,7 +182,7 @@ Page({
 		}
 	},
 	//毕业时间
-	bindTimeChange2: function(e) {
+	bindTimeChange2: function (e) {
 		if (e.detail.value) {
 			this.setData({
 				graduationDate: e.detail.value
@@ -192,7 +193,7 @@ Page({
 	},
 
 	//健康
-	bindhisChange: function(e) {
+	bindhisChange: function (e) {
 		this.setData({
 			isHealthyIndex: e.detail.value
 		})
@@ -208,14 +209,14 @@ Page({
 	loadUser() {
 		// let uinfo = util.getUser();
 		// console.log(uinfo)
-		
+
 		let _this = this;
 		let id = util.getUserId();
 		let parm = {
 			id
 		}
 		App._post_form('member/apiSelectMeberInfo', 'application/json', JSON.stringify(parm),
-			function(res) {
+			function (res) {
 				if (res.code === 0) {
 					wx.setStorageSync("USER", res.member);
 					let uinfo = res.member;
@@ -231,7 +232,7 @@ Page({
 						['allData.rank']: uinfo.rank,
 						['allData.grade']: uinfo.grade,
 						graduationDate: uinfo.graduationDate,
-						['allData.graduationDate']:uinfo.graduationDate
+						['allData.graduationDate']: uinfo.graduationDate
 					})
 				}
 			})
@@ -356,10 +357,10 @@ Page({
 							const tempFilePaths = res.tempFilePaths
 							wx.uploadFile({
 								url: App.apiRoot + 'member/addPhoto/' + util
-								.getUserId(),
+									.getUserId(),
 								filePath: tempFilePaths[0],
 								name: 'file',
-								success: function(res) {
+								success: function (res) {
 									if (res.errMsg === "uploadFile:ok") {
 										wx.showToast({
 											title: '修改成功',
@@ -393,10 +394,10 @@ Page({
 							const tempFilePaths = res.tempFilePaths
 							wx.uploadFile({
 								url: App.apiRoot + 'member/addPhoto/' + util
-								.getUserId(),
+									.getUserId(),
 								filePath: tempFilePaths[0],
 								name: 'file',
-								success: function(res) {
+								success: function (res) {
 									if (res.errMsg === "uploadFile:ok") {
 										wx.showToast({
 											title: '修改成功',
@@ -416,9 +417,9 @@ Page({
 										image: '',
 										duration: 1500,
 										mask: false,
-										success: (result) => {},
-										fail: () => {},
-										complete: () => {}
+										success: (result) => { },
+										fail: () => { },
+										complete: () => { }
 									});
 								}
 							})
@@ -426,7 +427,7 @@ Page({
 					})
 				}
 			},
-			fail(res) {}
+			fail(res) { }
 		})
 	},
 
@@ -438,7 +439,7 @@ Page({
 		/**
 		 * 性别
 		 */
-		App._post_form('bizcatelog/apiSelectBizcatelog/gender', '', null, function(res) {
+		App._post_form('bizcatelog/apiSelectBizcatelog/gender', '', null, function (res) {
 			if (res.code === 0) {
 				let gender = res.dictList
 				let all = {
@@ -467,7 +468,7 @@ Page({
 		/**
 		 * 体重
 		 */
-		App._post_form('bizcatelog/apiSelectBizcatelog/WEIGHTTYPE', '', null, function(res) {
+		App._post_form('bizcatelog/apiSelectBizcatelog/WEIGHTTYPE', '', null, function (res) {
 			if (res.code === 0) {
 				let weight = res.dictList
 				let all = {
@@ -495,7 +496,7 @@ Page({
 		/**
 		 * 健康证
 		 */
-		App._post_form('bizcatelog/apiSelectBizcatelog/YF', '', null, function(res) {
+		App._post_form('bizcatelog/apiSelectBizcatelog/YF', '', null, function (res) {
 			if (res.code === 0) {
 				let healthy = res.dictList
 				if (_this.data.u.ishealth) {
@@ -518,7 +519,7 @@ Page({
 
 
 		/***空闲时间*/
-		App._post_form('bizcatelog/apiSelectBizcatelog/FREETIME', '', null, function(res) {
+		App._post_form('bizcatelog/apiSelectBizcatelog/FREETIME', '', null, function (res) {
 			if (res.code === 0) {
 				let FREETIME = res.dictList
 				if (FREETIME.length) {
@@ -531,7 +532,7 @@ Page({
 		})
 
 		/*** 技能 */
-		App._post_form('bizcatelog/apiSelectBizcatelog/skill', '', null, function(res) {
+		App._post_form('bizcatelog/apiSelectBizcatelog/skill', '', null, function (res) {
 			if (res.code === 0) {
 				let skill = res.dictList
 				if (skill.length) {
@@ -553,7 +554,7 @@ Page({
 		let _this = this;
 		let proId = '';
 		let prov = '';
-		App._post_form('areainfo/province', '', null, function(res) {
+		App._post_form('areainfo/province', '', null, function (res) {
 			if (res.code === 0) {
 				let provice = res.list
 				_this.data.multiArray[0] = provice;
@@ -585,7 +586,7 @@ Page({
 	//获取市级
 	loadCity(cid) {
 		let _this = this;
-		App._post_form('areainfo/city/' + cid, '', null, function(res) {
+		App._post_form('areainfo/city/' + cid, '', null, function (res) {
 			if (res.code === 0) {
 				let city = res.list;
 				_this.data.multiArray[1] = city;
@@ -621,7 +622,7 @@ Page({
 	//获取学校
 	loadSchool(cityId) {
 		let _this = this;
-		App._post_form('areainfo/Schoolinfo/' + cityId, '', null, function(res) {
+		App._post_form('areainfo/Schoolinfo/' + cityId, '', null, function (res) {
 			if (res.code === 0) {
 				let school = []
 				if (res.dictList.length <= 0) {
@@ -661,7 +662,7 @@ Page({
 			id
 		}
 		App._post_form('member/apiSelectMeberInfo', 'application/json', JSON.stringify(parm),
-			function(res) {
+			function (res) {
 				if (res.code === 0) {
 					wx.setStorageSync("USER", res.member);
 					_this.loadUser();
@@ -757,7 +758,7 @@ Page({
 			maskShow: false,
 		})
 	},
-	checkboxChange: function(e) {
+	checkboxChange: function (e) {
 		this.data.checkboxValue = e.detail.value
 	},
 
@@ -817,10 +818,13 @@ Page({
 		}
 
 	},
+	btnCancel() {
+		wx.navigateBack();
+	},
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
-	onLoad: function(options) {
+	onLoad: function (options) {
 		let _this = this;
 		if (Object.keys(options).length > 0) {
 			if (options.type === "no") {
@@ -834,14 +838,14 @@ Page({
 		if (util.UserLoginStatus()) {
 			_this.loadUser();
 		}
-		
+
 		this.loadVipSel();
 	},
 
 	/**
 	 * 生命周期函数--监听页面初次渲染完成
 	 */
-	onReady: function() {
+	onReady: function () {
 		wx.setNavigationBarTitle({
 			title: '个人资料',
 		})
@@ -850,7 +854,7 @@ Page({
 	/**
 	 * 生命周期函数--监听页面显示
 	 */
-	onShow: function() {
+	onShow: function () {
 		this.data.load = true;
 		this.data.allData = {};
 	},
@@ -858,7 +862,7 @@ Page({
 	/**
 	 * 生命周期函数--监听页面隐藏
 	 */
-	onHide: function() {},
+	onHide: function () { },
 
 	btnUpUserInfo() {
 		let that = this;
@@ -890,7 +894,7 @@ Page({
 			wx.showModal({
 				title: '请注意',
 				content: '您已修改资料,是否保存？',
-				success: function(res) {
+				success: function (res) {
 					if (res.confirm) {
 						that.updateUserInfo()
 					}
@@ -907,7 +911,7 @@ Page({
 	/**
 	 * 生命周期函数--监听页面卸载
 	 */
-	onUnload: function() {
+	onUnload: function () {
 
 	},
 
@@ -916,7 +920,7 @@ Page({
 		App._post_form('member/apiUpdateMeberInfo',
 			'application/json',
 			JSON.stringify(_this.data.allData),
-			function(res) {
+			function (res) {
 				if (res.code === 0) {
 					// wx.showLoading({
 					// 	title: '保存中...',
@@ -926,7 +930,7 @@ Page({
 						title: '修改成功！',
 						icon: 'none'
 					})
-					setTimeout(() =>{
+					setTimeout(() => {
 						_this.PushVipInfo();
 						if (_this.data.nolink === true) {
 							wx.switchTab({
@@ -937,7 +941,7 @@ Page({
 								delta: 1
 							})
 						}
-					},2000)
+					}, 2000)
 
 				}
 			})
@@ -980,21 +984,21 @@ Page({
 	/**
 	 * 页面相关事件处理函数--监听用户下拉动作
 	 */
-	onPullDownRefresh: function() {
+	onPullDownRefresh: function () {
 
 	},
 
 	/**
 	 * 页面上拉触底事件的处理函数
 	 */
-	onReachBottom: function() {
+	onReachBottom: function () {
 
 	},
 
 	/**
 	 * 用户点击右上角分享
 	 */
-	onShareAppMessage: function() {
+	onShareAppMessage: function () {
 
 	},
 	schoolInput(e) {
@@ -1006,7 +1010,7 @@ Page({
 		let _this = this;
 		App._post_form('wgfillinfo/apiSelectwgfillinfo', 'application/json',
 			null,
-			function(res) {
+			function (res) {
 				if (res.code === 0) {
 					_this.setData({
 						isDev: res.wgFillInfo.isDev

pages/my/myData/myData.wxml

@@ -79,7 +79,9 @@
           <text class=" ml5 txt-color">推荐人</text>
         </view>
         <view class="flex-right flex-a-center">
-          <text class="txt-color mr30">{{u.referrer == '' ? '暂无' : u.referrer == null ? '暂无' : u.referrer}}</text>
+          <text class="txt-color mr30">
+            {{u.referrer == '' ? '暂无' : u.referrer == null ? '暂无' : u.referrer}}
+          </text>
         </view>
       </view>
       <view class="flex-bet flex-a-center view-avatar line-undertint">
@@ -118,9 +120,7 @@
               <view wx:if="{{allData.province}}" class="picker">
                 {{multiArray[0][multiIndex[0]].areaname}} {{multiArray[1][multiIndex[1]].areaname}}
               </view>
-              <view wx:else class="picker">
-                暂无
-              </view>
+              <view wx:else class="picker">暂无</view>
             </picker>
           </view>
           <view class="iconfont icon-xiayibu font35"></view>
@@ -153,9 +153,7 @@
               <view wx:if="{{allData.rank}}" class="menu_text">
                 {{gradeItem[0][gradeIndex[0]].name}} {{gradeItem[1][gradeIndex[1]].name}}
               </view>
-              <view wx:else class="menu_text">
-                暂无
-              </view>
+              <view wx:else class="menu_text">暂无</view>
             </picker>
           </view>
           <view class="iconfont icon-xiayibu font35"></view>
@@ -196,7 +194,7 @@
   </i-cell-group>
   <!-- 第四部分 -->
   <i-cell-group>
-    <view class="infobody">
+    <view class="infobody" style="padding-bottom: 180rpx;">
       <view wx:if="{{!isDev}}" class="flex-bet flex-a-center view-avatar line-undertint" data-title="身高" data-type="height" data-value="{{u.height}}" data-mode="text" bindtap="updateInfo">
         <view class="ml20 flex-a-center">
           <text class=" ml5 txt-color">身高</text>
@@ -294,7 +292,17 @@
   <!-- <i-cell-group>
     <view class="notice">完善所有信息可得积分奖励，完善程度 <text class="num">7</text>/15</view>
   </i-cell-group> -->
-  <view class='upbtn' bindtap='btnUpUserInfo'>保存</view>
+  <view class="flex-btn">
+    <view class="notice">
+      完善所有信息可得积分奖励，完善程度
+      <text class="num">7</text>
+      /15
+    </view>
+    <view class="flex-btn-view">
+      <view class='cancel' bindtap='btnCancel'>取消</view>
+      <view class='upbtn' bindtap='btnUpUserInfo'>保存</view>
+    </view>
+  </view>
 </form>
 <view class="mask {{maskShow?'':'hidden'}}" catchtouchmove="preventTouchMove" bindtap='maskClose'></view>
 <view class="bottom-input {{maskShow?'':'hidden'}}">