Merge branch 'master' of http://gitlab.oytour.com/youjie/thinkapp

src/api/erp.js

@@ -142,7 +142,13 @@ export function GetOrderPage(data) {
         data
     })
 }
-
+export function BindMyChild(data) {
+    return request({
+        url: '/AppletCenter/SetMyChild',
+        method: 'post',
+        data
+    })
+}
 /**
  * 进入亲友团
  * @param {JSON参数} data 

src/components/bottom.vue

@@ -28,7 +28,7 @@
                       uni.removeStorageSync('userInfo') 
                       uni.removeStorageSync('users')
                       uni.reLaunch({
-                          url: '/pages/login/accountLogin'
+                          url: '/pages/login/login'
                       });
                         
                     } else if (res.cancel) {

src/components/index/scoreDetails/allGraspTheSituation.vue

 <template>
 	<view class="allGraspTheSituation-box flex">
-        <view class="allGraspTheSituation-title flex">
-            <view v-for="(T,index) in TitleList" :key="index">{{T}}</view>
-        </view>
-        <view class="allGraspTheSituation-content flex">
-            <view class="allGraspTheSituation-num flex" v-for="(item,index) in ModuleList" :key="index">
-                <text class="name">{{item.Module}}</text>
-                <text class="Score">{{item.Score}}</text>
-                <text class="ScoreRate"
-                :class="item.ScoreRate<0.5?'failed':
-                (item.ScoreRate==1?'fullScore':'')">{{item.PScore.toFixed(0)}}<text></text></text>
-                <text class="AvgScoreRate">{{item.AvgScore.toFixed(0)}}<text></text></text>
-            </view>
-            
-        </view>
-        
+		<view class="allGraspTheSituation-title flex">
+			<view v-for="(T,index) in TitleList" :key="index">{{T}}</view>
+		</view>
+		<view class="allGraspTheSituation-content flex">
+			<view class="allGraspTheSituation-num flex" v-for="(item,index) in ModuleList" :key="index">
+				<text class="name">{{item.Module}}</text>
+				<text class="Score">{{item.Score}}</text>
+				<text class="ScoreRate" :class="item.ScoreRate<0.5?'failed':
+                (item.ScoreRate==1?'fullScore':'')">
+					{{item.PScore.toFixed(0)}}
+					<text>
+					</text>
+				</text>
+				<text class="AvgScoreRate">{{item.AvgScore.toFixed(0)}}<text></text></text>
+			</view>
+
+		</view>
+
 	</view>
 </template>
 <script>
@@ -28,7 +31,7 @@
 
 	export default {
 		props: {
-			ModuleList:[]
+			ModuleList: []
 		},
 		components: {},
 		setup() {
@@ -40,7 +43,7 @@
 				},
 				showPhone: false,
 				showLogin: true, //多次点击
-                TitleList:['考点','分数','个人得分','平均得分']
+				TitleList: ['考点', '分数', '个人得分', '平均得分']
 			});
 			return {
 				...toRefs(data),
@@ -49,75 +52,88 @@
 	};
 </script>
 <style scoped>
-    .allGraspTheSituation-num .ScoreRate.failed{
-        color: #EE8790;
-    }
-    .allGraspTheSituation-num .ScoreRate.failed text{
-        color: #EE8790;
-    }
-    .allGraspTheSituation-num .ScoreRate.fullScore{
-        color: #4AC698;
-    }
-    .allGraspTheSituation-num .ScoreRate.fullScore text{
-        color: #4AC698;
-    }
-    .allGraspTheSituation-num text text{
-        font-size: 20rpx;
-        margin-top: 10rpx;
-        margin-left: 5rpx;
-    }
-    .allGraspTheSituation-num text{
-        flex: 0 0 25%;
-        font-size: 36rpx;
-        font-weight: 800;
-        font-style: italic;
-    }
-    .allGraspTheSituation-num .name{
-        font-size: 20rpx;
-        font-style: inherit;
-        font-weight: 400;
-        color: #282828;
-    }
-    .allGraspTheSituation-num:last-child{
-        margin-bottom: 44rpx;
-    }
-    .allGraspTheSituation-num{
-        flex: 1;
-        color: #282828;
-        font-weight: 400;
-        flex-direction: row;
-        align-items: center;
-        margin-top: 41rpx;
-    }
-    .allGraspTheSituation-content{
-        flex-direction: column;
-        text-align: center;
-        font-size: 20px;
-        font-weight: 400;
-        color: #282828;
-    }
-    .allGraspTheSituation-title view:first-child{
-        font-weight: bold;
-        color: #282828;
-    }
-    .allGraspTheSituation-title view{
-        flex: 0 0 25%;
-        color: #A1A1A1;
-    }
-    .allGraspTheSituation-title{
-        flex-shrink: 0;
-        font-size: 20rpx;
-        font-weight: 400;
-        color: #282828;
-        padding: 41rpx 0 21rpx 0;
-        border-bottom:2rpx solid #EDEDED;
-        text-align: center;
-    }
-    .allGraspTheSituation-box{
-        margin: 30rpx 50rpx 0 50rpx;
-        background: #FFFFFF;
-        box-shadow: 0px 6px 29px 0px rgba(76, 76, 76, 0.09);
-        border-radius: 30px;
-        flex-direction: column;
-    }
+	.allGraspTheSituation-num .ScoreRate.failed {
+		color: #EE8790;
+	}
+
+	.allGraspTheSituation-num .ScoreRate.failed text {
+		color: #EE8790;
+	}
+
+	.allGraspTheSituation-num .ScoreRate.fullScore {
+		color: #4AC698;
+	}
+
+	.allGraspTheSituation-num .ScoreRate.fullScore text {
+		color: #4AC698;
+	}
+
+	.allGraspTheSituation-num text text {
+		font-size: 20rpx;
+		margin-top: 10rpx;
+		margin-left: 5rpx;
+	}
+
+	.allGraspTheSituation-num text {
+		flex: 0 0 25%;
+		font-size: 36rpx;
+		font-weight: 800;
+		font-style: italic;
+	}
+
+	.allGraspTheSituation-num .name {
+		font-size: 20rpx;
+		font-style: inherit;
+		font-weight: 400;
+		color: #282828;
+	}
+
+	.allGraspTheSituation-num:last-child {
+		margin-bottom: 44rpx;
+	}
+
+	.allGraspTheSituation-num {
+		flex: 1;
+		color: #282828;
+		font-weight: 400;
+		flex-direction: row;
+		align-items: center;
+		margin-top: 41rpx;
+	}
+
+	.allGraspTheSituation-content {
+		flex-direction: column;
+		text-align: center;
+		font-size: 20px;
+		font-weight: 400;
+		color: #282828;
+	}
+
+	.allGraspTheSituation-title view:first-child {
+		font-weight: bold;
+		color: #282828;
+	}
+
+	.allGraspTheSituation-title view {
+		flex: 0 0 25%;
+		color: #A1A1A1;
+	}
+
+	.allGraspTheSituation-title {
+		flex-shrink: 0;
+		font-size: 20rpx;
+		font-weight: 400;
+		color: #282828;
+		padding: 41rpx 0 21rpx 0;
+		border-bottom: 2rpx solid #EDEDED;
+		text-align: center;
+	}
+
+	.allGraspTheSituation-box {
+		margin: 30rpx 50rpx 0 50rpx;
+		background: #FFFFFF;
+		box-shadow: 0px 6px 29px 0px rgba(76, 76, 76, 0.09);
+		border-radius: 30px;
+		flex-direction: column;
+	}
 </style>

src/components/user-card.vue

@@ -25,7 +25,7 @@
 		  :show="showChange"
 		  round
 		  v-if="currentErpUser"
-		  custom-style="height: 650rpx;width:650rpx"
+		  custom-style=";width:650rpx"
 		>
 			<view class="user-change-box">
 				<view class="title-box">
@@ -39,7 +39,7 @@
 						<van-icon name='cross' @click="closeChangeUserHandler"></van-icon>
 					</view>
 				</view>
-				<scroll-view style="overflow-y: auto; height: 1px; flex:1;margin-top:50rpx">
+				<scroll-view scroll-y="true" style=" height: 500rpx;;margin-top:50rpx">
 					<view class="user-item" @click="changeErpUserHandler(x)" v-for="(x,i) in erpUsers">
 						<view class="avatar" :style="{background:x.bgColor}">{{x.AccountName.substring(0,1)}}</view>
 						<view class="uname">
@@ -172,7 +172,7 @@
 	.userCard-box .user-change-box {
 		padding: 50rpx;
 		box-sizing: border-box;
-		height: 100%;
+		/* height: 600rpx; */
 		display: flex;
 		flex-direction: column;
 	}

src/manifest.json

@@ -58,7 +58,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx10655d8e5b0a67c5",
+        "appid" : "13982128958",
         "setting" : {
             "urlCheck" : false,
             "es6" : false,

src/pages/index/index.vue

 <template>
 	<page-meta :page-style="showPopu?'overflow:hidden;':''">
-	<view class="indexpage">
+	<view class="indexpage" :style="{'padding-bottom': `${statusBarHeight}px`}">
 		<navbar class="navbarSticky" bg="#F6F6F6">
 			<!-- <view class="index-header-box">
 				<view class="index-header-img">
@@ -132,6 +132,7 @@
 				searchBindKey:'',
 				searchResult:null,
 				submiting:false,
+				statusBarHeight:0,
 				workList: [],//学员作业、考试、评语数据
 			});
 
@@ -235,6 +236,13 @@
 			}
 			onMounted(() => {
 				that.VersionUpdate()
+				wx.getSystemInfo({
+					success(res) {
+						let lift=res.screenHeight-res.safeArea.bottom
+						let tabbarHeight=Number(lift)+50
+						data.statusBarHeight=tabbarHeight
+					}
+				})
 			});
 			let that = methods;
 			return {

src/pages/person/bind.vue

@@ -146,8 +146,11 @@
 				</view> -->
 			</view>
 		</scroll-view>
-		<view v-if="loading" class="addChild-buttom" @click="setBindHandler">
+		<view v-if="loading && exsitsUnionId" class="addChild-buttom" @click="setBindHandler">
 			已选{{list.length}}个，确认绑定
+		</view>
+		<view v-else-if="loading && !exsitsUnionId" open-type="getUserInfo" class="addChild-buttom" @click="getUserProfile">
+			已选{{list.length}}个，确认绑定
 		</view>
 		<view v-else class="addChild-buttom active">
 			已选{{list.length}}个，确认绑定
@@ -172,9 +175,12 @@
 	import bottom from "../../components/bottom";
 	import {
 		GetStudentPageList,
-		SetMyChild,
+		BindMyChild,
 		setStudentClassInAccount
-	} from "../../api/erp";
+	} from "../../api/erp";
+	import {
+		getWeChatOpenId
+	} from "../../api/index";
 	export default {
 		components: {
 			bottom,
@@ -207,11 +213,42 @@
 				pageState: "more",
 				timer: null, //防抖
 				isSearched: false,
-				userInfo: null
+				userInfo: null,
+				exsitsUnionId:false
 			});
-			data.userInfo = uni.getStorageSync('userInfo')
+			data.userInfo = uni.getStorageSync('userInfo')
+			data.exsitsUnionId = uni.getStorageSync('userWxInfo')?true:false
 			console.log(uni.getStorageSync('userInfo'))
-			const methods = {
+			const methods = {
+				getUserProfile() {
+					//新的获取用户资料
+					wx.getUserProfile({
+						desc: "用于完善资料", // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+						success: (info) => {
+							uni.setStorageSync('userWxInfo',info)
+							wx.login({
+							  //成功放回
+							  success:(res)=>{
+								methods.loginByOpenCode(res.code)
+							  }
+							})
+						},
+						fail: () => {
+							uni.showToast({
+								title: "微信授权失败,无法进行绑定",
+								icon: "none",
+							});
+						},
+					});
+				},
+				loginByOpenCode(Code){
+					getWeChatOpenId({Code}).then(r=>{
+						uni.setStorageSync('wxUserAuthInfo',r.Data)
+						data.exsitsUnionId=true
+						methods.setBindHandler()
+						
+					})
+				},
 				setBindHandler() {
 					if (data.list.length == 0) {
 						uni.showToast({
@@ -272,14 +309,17 @@
 					param.WeChatImg = userWxInfo.userInfo.avatarUrl
 					param.UnionId = wxUserAuthInfo.unionid
 					data.loading = false
-					SetMyChild(param).then(res=>{
+					BindMyChild(param).then(res=>{
+						console.log(res.Code==1)
 						if (res.Code==1) {
+							console.log('in.....')
 							uni.hideLoading()
 							uni.showToast({
 								title:'绑定成功'
 							})
 							//重新获取
 							let erpStus=uni.getStorageSync('ErpStus')
+							erpStus=erpStus?erpStus:[]
 							let flag=false
 							erpStus.forEach(x=>{
 								if(x.AccountId==res.Data.AccountId){
@@ -288,17 +328,22 @@
 									uni.setStorageSync('erpUserInfo',x)
 								}
 							})
-							if(flag){
+							if(!flag){
 								erpStus.push(res.Data)
 								uni.setStorageSync('erpUserInfo',res.Data)
 							}
 							uni.setStorageSync('ErpStus',erpStus)
-							
+							// if(uni.getStorageSync('users')){
+							// 	let users=[]
+							// 	users.push(uni.getStorageSync('userInfo'))
+							// 	uni.setStorageSync('users',users)
+							// }
 							data.loading = true
 							uni.reLaunch({
 								url:'/pages/index/index'
 							})
 						}else{
+							console.log('..........22')
 							data.loading = true
 							uni.hideLoading()
 							uni.showToast({
@@ -307,6 +352,7 @@
 							})
 						}
 					}).catch(e=>{
+						console.log(e+"...........")
 						data.loading = true
 						uni.hideLoading()
 						uni.showToast({

src/pages/person/person.vue

@@ -339,7 +339,14 @@
 			};
 			let that = methods;
 			onMounted(() => {
-				data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+				//data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+				wx.getSystemInfo({
+					success(res) {
+						let lift=res.screenHeight-res.safeArea.bottom
+						let tabbarHeight=Number(lift)+50
+						data.statusBarHeight=tabbarHeight
+					}
+				})
 				that.VersionUpdate()
 				that.initColor()
 			});

src/pages/timetable/timeTable.vue

 <template>
-	<view class="" :style="{ 'padding-top': `${statusBarHeight}px`,'padding-bottom': `${statusBarHeight}px` }">
+	<view class="" :style="{'padding-bottom': `${statusBarHeight}px` }">
 
 		<view style="height: 100rpx"></view>
 		<view class="navbar">
@@ -497,7 +497,14 @@
 					activeDay.value = today.day;
 				}
 				sliceWeek(today);
-				data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+				wx.getSystemInfo({
+					success(res) {
+						let lift=res.screenHeight-res.safeArea.bottom
+						let tabbarHeight=Number(lift)+50
+						data.statusBarHeight=tabbarHeight
+					}
+				})
+				//data.statusBarHeight = uni.getSystemInfoSync().statusBarHeight+52;
 			});
 			let that = methods;
 			return {
@@ -522,9 +529,7 @@
 		onShow() {
 			this.msg.StartTime = getToday('y', 'm') + '-01';
 			this.msg.EndTime = getToday('y', 'm') + '-' + getMonthMaxDay();
-			if (this.$isLogin()) {
-				this.getAllData()
-			}
+			this.getAllData()
 		},
 		onLoad(options) {
 			this.initSwiper()

src/utils/request.js

@@ -26,7 +26,7 @@ let request = (param) => {
 					resolve(res.data)
 				} else {
 					if (res.data.Code==10001 || res.data.Code == 10000) {
-						if(!uni.getStorageSync('erpUserInfo')){
+						if(!uni.getStorageSync('erpUserInfo') || (uni.getStorageSync('erpUserInfo') && uni.getStorageSync('userInfo'))){
 							console.log('in....')
 							uni.showToast({
 								title: "用户凭证失效,请重新授权",

src/utils/requestErp.js

@@ -27,7 +27,7 @@ let request = (param) => {
 					resolve(res.data)
 				} else {
 					if (res.data.Code == 10001 || res.data.Code == 10000) {
-						if(!uni.getStorageSync('userInfo')){
+						if(!uni.getStorageSync('userInfo')|| (uni.getStorageSync('erpUserInfo') && uni.getStorageSync('userInfo'))){
 							uni.reLaunch({
 								url:"/pages/login/login"
 							})

src/utils/requestMall.js

 //请求电商接口
 let host = ''
 if (process.env.NODE_ENV === "development") {
-	 host = 'http://192.168.10.46:8200/api'
-	//host = "https://mallapi.oytour.com/api"
+	 // host = 'http://192.168.10.46:8200/api'
+	host = "https://mallapi.oytour.com/api"
 } else {
 	host = "https://mallapi.oytour.com/api"
 }