Skip to content

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

no message

parent 5ea2bf53
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 33 deletions
src/api/erp.js
View file @ be01c52d
...@@ -144,12 +144,12 @@ export function GetOrderPage(data) { ...@@ -144,12 +144,12 @@ export function GetOrderPage(data) {
} }
/** /**
* 根据编号删除“亲友团” * 根据编号删除“小孩”
* @param {JSON参数} data * @param {JSON参数} data
*/ */
export function RemoveMyChild(data) { export function RemoveBind(data) {
return request({ return request({
url: '/AppletCenter/RemoveMyChild', url: '/AppletCenter/RemoveBind',
method: 'post', method: 'post',
data data
}) })
...@@ -191,6 +191,18 @@ export function GetOrderPage(data) { ...@@ -191,6 +191,18 @@ export function GetOrderPage(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 @ be01c52d
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
if (res.confirm) { if (res.confirm) {
uni.showLoading() uni.showLoading()
let msg = { let msg = {
Id: item.AccountId Id: item.StuId
} }
let res = RemoveMyChild(msg); let res = RemoveMyChild(msg);
if (res) { if (res) {
......
src/pages/MyChild/addChild.vue
View file @ be01c52d
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</van-cell-group> </van-cell-group>
</view> </view>
</view> </view>
<view> <view style="margin-bottom: 100rpx;">
<view class="user-item" v-for="(item,index) in dataList" :key="index" <view class="user-item" v-for="(item,index) in dataList" :key="index"
@click="clickChecked(item)"> @click="clickChecked(item)">
<view class="avatar"> <view class="avatar">
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
{{item.StuName}} {{item.StuName}}
</view> </view>
<view class="check"> <view class="check">
<van-icon :name="item.checked?success:circle" /> <van-icon :name="item.checked?'success':'circle'" />
</view> </view>
</view> </view>
<van-empty description="暂无小孩信息" v-if="dataList.length === 0" /> <van-empty description="暂无小孩信息" v-if="dataList.length === 0" />
...@@ -177,8 +177,8 @@ ...@@ -177,8 +177,8 @@
}, },
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 1000, pageSize: 20,
KeyWords: '',//关键词 KeyWords: '182155',//关键词
}, },
pageCount: 0, pageCount: 0,
dataList: [], dataList: [],
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
}); });
const methods = { const methods = {
clickChecked(item){ clickChecked(item){
data.list = []
data.dataList.forEach(i=>{ data.dataList.forEach(i=>{
i.checked=false i.checked=false
if(item.StuId==i.StuId){ if(item.StuId==i.StuId){
...@@ -195,15 +196,24 @@ ...@@ -195,15 +196,24 @@
} }
}) })
item.checked = true item.checked = true
data.form = { // data.form.Target.Id = item.Id
Id: item.Id, data.form.Target.AccountId = item.AccountId
AccountId: item.AccountId, data.form.Target.StuId = item.StuId
StuId: item.StuId, data.form.Target.OpenId = item.OpenId
OpenId: item.OpenId, data.form.Target.WeChatName = item.WeChatName
WeChatName: item.WeChatName, data.form.Target.WeChatImg = item.WeChatImg
WeChatImg: item.WeChatImg, data.form.Target.UnionId = item.UnionId
UnionId: item.UnionId // let msgData = {
} // Id: item.Id,
// AccountId: item.AccountId,
// StuId: item.StuId,
// OpenId: item.OpenId,
// WeChatName: item.WeChatName,
// WeChatImg: item.WeChatImg,
// UnionId: item.UnionId
// }
console.log(data.form,'----')
}, },
clickIcon(){ clickIcon(){
that.getData() that.getData()
...@@ -213,6 +223,8 @@ ...@@ -213,6 +223,8 @@
that.getData() that.getData()
}, },
async addChild(){ async addChild(){
console.log(data.form)
return
if(!data.form.Id){ if(!data.form.Id){
uni.showToast({ uni.showToast({
title: '请选择需要添加的小孩', title: '请选择需要添加的小孩',
...@@ -237,23 +249,23 @@ ...@@ -237,23 +249,23 @@
let res = await GetStudentPageList(data.msg); let res = await GetStudentPageList(data.msg);
if (res) { if (res) {
uni.hideLoading() uni.hideLoading()
let data = res.Data.PageData let datas = res.Data.PageData
let addList = function (arr) { let addList = function (arr) {
arr.forEach(item => { arr.forEach(item => {
item.checked = false item.checked = false
}); });
}; };
addList(data); addList(datas);
if (data.timer) data.timer = null; if (data.timer) data.timer = null;
data.dataList = res.Data&&res.Data.PageData; // data.dataList = res.Data&&res.Data.PageData;
return // return
if (data.msg.pageIndex === 1) { if (data.msg.pageIndex === 1) {
data.dataList = res.Data&&res.Data.PageData; data.dataList = res.Data.PageData;
} else { } else {
data.dataList = [...data.dataList, ...res.Data.PageData]; data.dataList = [...data.dataList, ...res.Data.PageData];
} }
data.pageCount = res.Data&&res.Data.PageCount data.pageCount = res.Data.PageCount
if (data.msg.pageIndex >= res.Data&&res.Data.PageCount) { if (data.msg.pageIndex >= res.Data.PageCount) {
data.pageState = "none"; data.pageState = "none";
} else { } else {
data.pageState = "more"; data.pageState = "more";
...@@ -263,7 +275,7 @@ ...@@ -263,7 +275,7 @@
}; };
let that = methods; let that = methods;
onMounted(() => { onMounted(() => {
// that.getData() that.getData()
}); });
return { return {
...toRefs(data), ...toRefs(data),
...@@ -272,14 +284,17 @@ ...@@ -272,14 +284,17 @@
}, },
onLoad(options) { onLoad(options) {
},
onShow(){
this.dataList = []
}, },
onReachBottom() { onReachBottom() {
if (this.msg.pageIndex < this.pageCount) { if (this.msg.pageIndex < this.pageCount) {
data.pageState = "loading"; this.pageState = "loading";
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(); this.getData();
}, 1000); }, 1000);
} else { } else {
this.pageState = "none"; this.pageState = "none";
......
src/pages/MyChild/index.vue
View file @ be01c52d
...@@ -148,9 +148,10 @@ ...@@ -148,9 +148,10 @@
async-close async-close
:key="index" :key="index"
@close="onClose"> @close="onClose">
<view class="dataList-form active"> <view class="dataList-form"
:class="{'active':item.StuSexStr!='女'}">
<view class="dataList-image flex"> <view class="dataList-image flex">
<image :src="imgBoy?imgBoy:imgGirl" <image :src="item.StuSexStr!='女'?imgBoy:imgGirl"
mode="aspectFill" style="width:101rpx;height:101rpx;"> mode="aspectFill" style="width:101rpx;height:101rpx;">
</image> </image>
<text>{{item.StuName}}</text> <text>{{item.StuName}}</text>
...@@ -163,9 +164,9 @@ ...@@ -163,9 +164,9 @@
<text>{{item.StuRealMobile}}</text> <text>{{item.StuRealMobile}}</text>
</view> </view>
</view> </view>
<view class="dataList-right flex" <view v-if="item.StateStr" class="dataList-right flex"
:class="{'active':item.StateStr!='正常'}"> :class="{'active':item.StateStr!='学习中'}">
<image :src="item.StateStr=='正常'?imgUrlG:imgUrlR" style="width: 24rpx;height: 24rpx;"></image> <image :src="item.StateStr=='学习中'?imgUrlG:imgUrlR" style="width: 24rpx;height: 24rpx;"></image>
<text>{{item.StateStr}}</text> <text>{{item.StateStr}}</text>
</view> </view>
</view> </view>
...@@ -250,7 +251,7 @@ ...@@ -250,7 +251,7 @@
if (res.confirm) { if (res.confirm) {
uni.showLoading() uni.showLoading()
let msg = { let msg = {
Id: item.Id Id: item.StuId
} }
let res = RemoveMyChild(msg); let res = RemoveMyChild(msg);
if (res) { if (res) {
......
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