Skip to content

T
thinkApp
Commit 8b34a1be authored by youjie's avatar youjie
Browse files
Options

no message

parent 8c2a5dff
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 115 deletions
src/api/erp.js
View file @ 8b34a1be
...@@ -130,3 +130,15 @@ export function GetOrderPage(data) { ...@@ -130,3 +130,15 @@ export function GetOrderPage(data) {
data data
}) })
} }
/**
* 获取需要添加孩子的信息
* @param {JSON参数} data
*/
export function GetStudentPageList(data) {
return request({
url: '/User/GetStudentPageList',
method: 'post',
data
})
}
\ No newline at end of file
src/api/index.js
View file @ 8b34a1be
import request from '../utils/request.js' import request from '../utils/request.js'
/**
* 新增修改"我的孩子"
* @param {JSON参数} data
*/
export function SetMyChild(data) {
return request({
url: '/AppletCenter/SetMyChild',
method: 'post',
data
})
}
/**
* 根据编号删除“我的孩子”
* @param {JSON参数} data
*/
export function RemoveMyChild(data) {
return request({
url: '/AppletCenter/RemoveMyChild',
method: 'post',
data
})
}
/** /**
* 获取“我的孩子”列表 * 获取“我的孩子”列表
* @param {JSON参数} data * @param {JSON参数} data
......
src/pages/FriendsAndRelatives/index.vue
View file @ 8b34a1be
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<view class="header-list flex_between_center"> <view class="header-list flex_between_center">
<view class="header-left flex"> <view class="header-left flex">
<view class="left-text flex" style="width: 99rpx;height: 99rpx;"> <view class="left-text flex" style="width: 99rpx;height: 99rpx;">
<text>{{ContractNum||0}}</text> <text>{{FriendCount||0}}</text>
<view>人</view> <view>人</view>
</view> </view>
<text class="left-title">亲友团</text> <text class="left-title">亲友团</text>
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
proxy proxy
} = getCurrentInstance(); } = getCurrentInstance();
let data = reactive({ let data = reactive({
ContractNum: null, FriendCount: null,
loading:true, loading:true,
Account:'', Account:'',
showPopup: false, showPopup: false,
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
}; };
}, },
onLoad(options) { onLoad(options) {
this.ContractNum = options.ContractNum this.FriendCount = options.FriendCount
}, },
onShow(){ onShow(){
......
src/pages/MyChild/addChild.vue
View file @ 8b34a1be
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<view class="header-text">输入该账号注册的手机号</view> <view class="header-text">输入该账号注册的手机号</view>
<view class="header-input"> <view class="header-input">
<van-cell-group> <van-cell-group>
<van-field :value="Account" placeholder="输入手机号" clearable input-align="center" @input="usernameInput"> <van-field :value="msg.StuTel" placeholder="输入手机号" clearable input-align="center" @input="usernameInput">
</van-field> </van-field>
</van-cell-group> </van-cell-group>
</view> </view>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
import Loadmore from "../../components/loadmore.vue"; import Loadmore from "../../components/loadmore.vue";
import bottom from "../../components/bottom"; import bottom from "../../components/bottom";
import { import {
GetOrderPage GetOrderPage,GetStudentPageList
} from "../../api/erp"; } from "../../api/erp";
export default { export default {
components: { components: {
...@@ -166,7 +166,25 @@ ...@@ -166,7 +166,25 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
OrderType: 1 KeyWords:"",//关键词
StuName: "", //昵称
StuTel: "", //电话
CreateBy: "", //负责人
StuStage: "", //客户阶段
StartTime: "", //开始时间
EndTime: "", //结束时间
QQ: '',
WechatNo: '',
StuType: '',
QStudentStatus: 1, //客户状态 1有效 2无效
AdvisorStatus: '', //当前状态
StuChannel: "",
CreateIds: [],
CreateType: "", //来源类型
StuSourceId: "", //来源人编号
CategoryId: "", //同行编号
School_Id: 0,
ClassName: "", //班级名称
}, },
pageCount: 0, pageCount: 0,
dataList: [], dataList: [],
...@@ -175,7 +193,8 @@ ...@@ -175,7 +193,8 @@
}); });
const methods = { const methods = {
usernameInput(val) { usernameInput(val) {
data.Account = val.detail; data.msg.StuTel = val.detail;
that.getData()
}, },
addChild(){ addChild(){
data.loading = false data.loading = false
...@@ -186,33 +205,17 @@ ...@@ -186,33 +205,17 @@
}); });
},2000) },2000)
}, },
onClose(event) { getData() {
const { position, instance } = event.detail; let res = GetStudentPageList(data.msg);
switch (position) {
case 'left':
case 'cell':
case 'right':
instance.close();
break;
}
},
jumpPage(url) {
uni.navigateTo({
url: url,
});
},
async getData() {
let res = await GetOrderPage(data.msg);
if (res) { if (res) {
return
if (data.timer) data.timer = null; if (data.timer) data.timer = null;
if (data.msg.pageIndex === 1) { if (data.msg.pageIndex === 1) {
data.dataList = res.Data.PageData; data.dataList = res.Data&&res.Data.PageData;
} else { } else {
data.dataList = [...data.dataList, ...res.Data.PageData]; data.dataList = [...data.dataList, ...res.Data.PageData];
} }
data.pageCount = res.Data.PageCount data.pageCount = res.Data&&res.Data.PageCount
if (data.msg.pageIndex >= res.Data.PageCount) { if (data.msg.pageIndex >= res.Data&&res.Data.PageCount) {
data.pageState = "none"; data.pageState = "none";
} else { } else {
data.pageState = "more"; data.pageState = "more";
...@@ -221,14 +224,16 @@ ...@@ -221,14 +224,16 @@
}, },
}; };
let that = methods; let that = methods;
onMounted(() => {
// that.getData()
});
return { return {
...toRefs(data), ...toRefs(data),
...methods ...methods
}; };
}, },
onLoad(options) { onLoad(options) {
this.msg.OrderType = options.type
this.getData();
}, },
onReachBottom() { onReachBottom() {
if (this.msg.pageIndex < this.pageCount) { if (this.msg.pageIndex < this.pageCount) {
......
src/pages/MyChild/index.vue
View file @ 8b34a1be
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<view class="dataList-content"> <view class="dataList-content">
<view class="title">在读小孩列表</view> <view class="title">在读小孩列表</view>
<view class="text">左滑可删除小孩信息</view> <view class="text">左滑可删除小孩信息</view>
<view v-for="item in 2"> <view v-for="(item,index) in dataList" :key="index">
<van-swipe-cell <van-swipe-cell
id="swipe-cell" id="swipe-cell"
:right-width="70" :right-width="70"
...@@ -153,20 +153,20 @@ ...@@ -153,20 +153,20 @@
<image :src="imgBoy?imgBoy:imgGirl" <image :src="imgBoy?imgBoy:imgGirl"
mode="aspectFill" style="width:101rpx;height:101rpx;"> mode="aspectFill" style="width:101rpx;height:101rpx;">
</image> </image>
<text>周启明</text> <text>{{item.StuName}}</text>
</view> </view>
<view class="dataList-center active flex_between_center"> <view class="dataList-center active flex_between_center">
<view class="dataList-left flex"> <view class="dataList-left flex">
<text class="left-text">武侯校区</text> <text class="left-text">{{item.SchoolName}}</text>
<view class="left-phone"> <view class="left-phone">
<van-icon name="phone" color="#919191"></van-icon> <van-icon name="phone" color="#919191"></van-icon>
<text>18226665548</text> <text>{{item.StuRealMobile}}</text>
</view> </view>
</view> </view>
<view class="dataList-right flex" <view class="dataList-right flex"
:class="{'active':!imgUrlG}"> :class="{'active':item.StateStr!='正常'}">
<image :src="imgUrlG?imgUrlG:imgUrlR" style="width: 24rpx;height: 24rpx;"></image> <image :src="item.StateStr=='正常'?imgUrlG:imgUrlR" style="width: 24rpx;height: 24rpx;"></image>
<text>{{imgUrlG?'学习中':'休学'}}</text> <text>{{item.StateStr}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -296,8 +296,6 @@ ...@@ -296,8 +296,6 @@
}; };
}, },
onLoad(options) { onLoad(options) {
this.msg.OrderType = options.type
this.getData();
// uni.setNavigationBarTitle({ // uni.setNavigationBarTitle({
// title: this.pageTitle // title: this.pageTitle
// }); // });
...@@ -308,7 +306,7 @@ ...@@ -308,7 +306,7 @@
if (this.timer) clearTimeout(this.timer); if (this.timer) clearTimeout(this.timer);
this.timer = setTimeout(() => { this.timer = setTimeout(() => {
this.msg.pageIndex++; this.msg.pageIndex++;
that.getList(); that.getData();
}, 1000); }, 1000);
} else { } else {
this.pageState = "none"; this.pageState = "none";
......
src/pages/person/person.vue
View file @ 8b34a1be
...@@ -36,16 +36,16 @@ ...@@ -36,16 +36,16 @@
</view> </view>
<view class="orderItem" @click="jumpPage(`/pages/MyChild/index`)"> <view class="orderItem" @click="jumpPage(`/pages/MyChild/index`)">
<view class=" flex_between_center" style="width:100%"> <view class=" flex_between_center" style="width:100%">
<view class="orderNum">{{ pageData.StudyAbroadNum||0 }}</view> <view class="orderNum">{{ pageData.ChildCount||0 }}</view>
<image src="../../static/image/person/order2.png" mode="aspectFill" class="orderIcon"></image> <image src="../../static/image/person/order2.png" mode="aspectFill" class="orderIcon"></image>
</view> </view>
<view class="orderName"> <view class="orderName">
我的小孩 我的小孩
</view> </view>
</view> </view>
<view class="orderItem " @click="jumpPage(`/pages/FriendsAndRelatives/index`,pageData.ContractNum)"> <view class="orderItem " @click="jumpPage(`/pages/FriendsAndRelatives/index`,pageData.FriendCount)">
<view class=" flex_between_center" style="width:100%"> <view class=" flex_between_center" style="width:100%">
<view class="orderNum">{{ pageData.ContractNum||0 }}</view> <view class="orderNum">{{ pageData.FriendCount||0 }}</view>
<image src="../../static/image/person/order3.png" mode="aspectFill" class="orderIcon"></image> <image src="../../static/image/person/order3.png" mode="aspectFill" class="orderIcon"></image>
</view> </view>
<view class="orderName"> <view class="orderName">
...@@ -69,35 +69,32 @@ ...@@ -69,35 +69,32 @@
</view> </view>
</view> </view>
</view> </view>
<view class="courseInfo" v-if="pageData.CourseInfo.State==1"> <template v-if="pageData.CourseInfo.length>0">
<view class="courseInfo" v-for="(item,index) in pageData.CourseInfo">
<template v-if="item.State==1">
<view class="title">当前学习课程</view> <view class="title">当前学习课程</view>
<view class="statistic"> <view class="statistic">
<view class="statisticItem"> <view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.TotalHours||0 }} <view class="time">{{ item.TotalHours||0 }}
<!-- <text class="unit">节</text> --> <!-- <text class="unit">节</text> -->
</view> </view>
<view class="statisticName">总共课时</view> <view class="statisticName">总共课时</view>
</view> </view>
<view class="statisticItem" style="display: none;"> <view class="statisticItem" style="display: none;">
<view class="time">{{ pageData.CourseInfo.CompleteHours||0 }} <view class="time">{{ item.CompleteHours||0 }}
</view> </view>
<view class="statisticName">已学课时</view> <view class="statisticName">已学课时</view>
</view> </view>
<view class="statisticItem"> <view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.AbsenceNum||0 }} <view class="time">{{ item.AbsenceNum||0 }}
</view> </view>
<view class="statisticName">缺勤课时</view> <view class="statisticName">缺勤课时</view>
</view> </view>
<view class="statisticItem"> <view class="statisticItem">
<view class="time">{{ pageData.CourseInfo.LeaveNum||0 }} <view class="time">{{ item.LeaveNum||0 }}
</view> </view>
<view class="statisticName">请假课时</view> <view class="statisticName">请假课时</view>
</view> </view>
<view class="statisticItem" @click="jumpPage(`/pages/appointment/mySubscribe`)">
<view class="time">{{yuyueNum}}
</view>
<view class="statisticName">约课记录</view>
</view>
</view> </view>
<view class="courseBox"> <view class="courseBox">
<view class="left"> <view class="left">
...@@ -121,29 +118,33 @@ ...@@ -121,29 +118,33 @@
border-radius: 6rpx; border-radius: 6rpx;
"> ">
</view> </view>
<image :src="pageData.CourseInfo.B2BIcon" mode="aspectFill" <image :src="item.B2BIcon" mode="aspectFill"
style="width:115rpx;height:115rpx;border-radius: 6rpx; position: absolute;bottom:10rpx;right: 18rpx;"> style="width:115rpx;height:115rpx;border-radius: 6rpx; position: absolute;bottom:10rpx;right: 18rpx;">
</image> </image>
</view> </view>
<view class="right"> <view class="right">
<view class="className one_line">{{ <view class="className one_line">{{
pageData.CourseInfo.CourseName item.CourseName
}}</view> }}</view>
<view class="Grade" style="margin-bottom:20rpx" v-if="pageData.CourseInfo.ClassScrollType!==2">{{ <view class="Grade" style="margin-bottom:20rpx" v-if="item.ClassScrollType!==2">{{
pageData.CourseInfo.ClassName item.ClassName
}}</view> }}</view>
<view class="Grade">等级：{{ pageData.CourseInfo.CourseRate||'' }}</view> <view class="Grade">等级：{{ item.CourseRate||'' }}</view>
<view><text class="Grade">状态：</text> <view><text class="Grade">状态：</text>
<text class="StatusName" v-if="pageData.CourseInfo.TotalHours>pageData.CourseInfo.CompleteHours"> <text class="StatusName" v-if="item.TotalHours>item.CompleteHours">
学习中 学习中
</text> </text>
<text class="StatusName" v-if="pageData.CourseInfo.TotalHours==pageData.CourseInfo.CompleteHours"> <text class="StatusName" v-if="item.TotalHours==item.CompleteHours">
已结课 已结课
</text> </text>
</view> </view>
</view> </view>
</view> </view>
</template>
</view> </view>
</template>
<view class="serve" v-if="pageData.AssistList.length>0"> <view class="serve" v-if="pageData.AssistList.length>0">
<view class="serveSubTitle">随时电话联系哟</view> <view class="serveSubTitle">随时电话联系哟</view>
<view class="serveTitle">服务人员信息</view> <view class="serveTitle">服务人员信息</view>
...@@ -233,7 +234,7 @@ ...@@ -233,7 +234,7 @@
}, },
jumpPage(url,num) { jumpPage(url,num) {
uni.navigateTo({ uni.navigateTo({
url: num?url+'?ContractNum='+num:url, url: num?url+'?FriendCount='+num:url,
}); });
}, },
async getData() { async getData() {
......
src/utils/request.js
View file @ 8b34a1be
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
let host = '' let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
//host = 'https://jjswapi.oytour.com/api' //host = 'https://jjswapi.oytour.com/api'
host = 'http://192.168.10.206:5004/api' // host = 'http://192.168.10.206:5004/api'
// host = 'http://192.168.10.128:8900/api' host = 'http://192.168.10.128:8800/api'
} else { } else {
host = 'https://jjswapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
} }
......
src/utils/requestErp.js
View file @ 8b34a1be
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
let host = '' let host = ''
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
//host = 'https://jjswapi.oytour.com/api' //host = 'https://jjswapi.oytour.com/api'
host = 'http://192.168.10.206:5005/api' // host = 'http://192.168.10.206:5005/api'
// host = 'http://192.168.10.128:8900/api' host = 'http://192.168.10.128:8900/api'
} else { } else {
host = 'https://jjswapi.oytour.com/api' host = 'https://jjswapi.oytour.com/api'
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment