zcdsj
/
aqyj
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix confilcts

This commit is contained in:
caoqianming 2020-12-09 20:49:14 +08:00
parent daff4bfcce 0a48f6fb50
commit 656922a915
16 changed files with 221 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/footer/footer.js
View File

@ -14,7 +14,6 @@ Component({
*/
methods: {
delete(res) {
console.log(res)
let index = res.currentTarget.id
let list = this.data.list
list.splice(index, 1)

2
components/footer/footer.wxml
View File

@ -1,7 +1,7 @@
<view class='container'>
<view class='scroll-wrapper'>
<scroll-view scroll-x style='scroll'>
<text id='{{index}}' class='text' wx:for='{{list}}' wx:key='{{index}}' bindtap='delete'>{{item.name}}</text> </scroll-view>
<text id='{{index}}' class='text' wx:for='{{list}}' wx:key="index" bindtap='delete'>{{item.name}}</text></scroll-view>
</view>
<text class='btn' bindtap='confirm'>确定</text>
</view>

7
pages/exercise/index.js
View File

@ -119,7 +119,12 @@ wx.getStorage({
},
choosequestioncat:function(){
wx.navigateTo({
url: '/pages/questioncat/index',
url: '/pages/questioncat/index?type=2',
})
},
choosequestioncat2:function(){
wx.navigateTo({
url: '/pages/questioncat/index?type=3',
})
},
start1:function(){

9
pages/exercise/index.wxml
View File

@ -4,7 +4,14 @@
<view class="page__desc">选择题库分类进行练习。</view>
</view>
<view class="page__bd page__bd_spacing">
<button class="weui-btn" type="primary" bindtap='choosequestioncat'>选择分类</button>
<view style="width:50%;float:left">
<button class="weui-btn" type="primary" bindtap='choosequestioncat'>自建分类</button>
</view>
<view style="width:50%;float:left;">
<button class="weui-btn" type="primary" bindtap='choosequestioncat2' style="margin-left:2px">共享分类</button>
</view>
<view class="weui-cells__title">已选分类</view>
<view class="weui-cells weui-cells_after-title" style="height: 5.3em">
{{catsname}}

82
pages/miss/miss.js
View File

@ -1,12 +1,16 @@
// pages/miss/miss.js
const api = require("../../utils/request.js");
Page({
/**
* 页面的初始数据
*/
data: {
page: 1,
serverUrl: getApp().globalData.serverUrl,
query:{
a:'listall',
page:1,
rows:10
},
wslist:[]
},
@ -51,9 +55,9 @@ Page({
*/
onPullDownRefresh: function () {
var that = this;
that.getWslist(1);
this.data.query.page = 1;
that.getWslist();
wx.stopPullDownRefresh();
this.data.page = 1;
},
/**
@ -61,9 +65,16 @@ Page({
*/
onReachBottom: function () {
//上拉分页,将页码加1，然后调用分页函数
this.data.page = this.data.page + 1;
this.getWslist();
wx.stopPullDownRefresh();
var that = this
if (that.data.total <= that.data.query.page * that.data.query.rows) {
wx.showToast({
title: '没有更多了',
icon: 'none'
})
} else {
that.data.query.page = that.data.query.page + 1
that.getWslist()
}
},
/**
@ -72,49 +83,18 @@ Page({
onShareAppMessage: function () {
},
getWslist: function (page) {
var that = this;
if (page != 1) { page = that.data.page }
wx.showLoading({
title: '加载中',
}),
wx.request({
url: this.data.serverUrl + 'api/miss?a=listall&rows=10&page=' + page,
header: {
'content-type': 'application/json', // 默认值
'Cookie': getApp().globalData.sessionId,
},
success: res => {
if (res.statusCode === 200) {
if (res.data.rows.length == 0) {
if (page == 1) {
this.setData({
total: 0,
wslist: []
})
}
else {
wx.showModal({
content: "已经到底啦!",
showCancel: false,
confirmText: "确定",
})
}
} else {
let list
if (page == 1) {
list = res.data.rows
} else {
list = this.data.wslist.concat(res.data.rows)
}
this.setData({
total: res.data.total,
wslist: list
})
}
}
wx.hideLoading();
}
});
getWslist: function () {
var that = this
api.request('api/miss', 'GET', that.data.query).then(res => {
if (that.data.query.page == 1) {
that.data.wslist = res.rows
} else {
that.data.wslist = that.data.wslist.concat(res.rows)
}
that.setData({
wslist: that.data.wslist,
total: res.total
})
})
},
})

9
pages/miss/missdetail.js
View File

@ -13,6 +13,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.data.missid = options.missid
this.getWsdetail(options.missid);
},
@ -41,7 +42,15 @@ Page({
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
// var pages = getCurrentPages()
// var prePage = pages[pages.length-2]
// if(prePage.data.wslist){
// for(var i=0;i<prePage.data.wslist;i++){
// if(prePage.data.wslist[i].missid == this.data.missid){
// }
// }
// }
},
/**

8
pages/questioncat/index.js
View File

@ -11,13 +11,17 @@ Page({
selectList: [], //已选择的元素列表
originalList: [], //最原始的数据列表
indexList: [], //存储目录层级的数组，用于准确的返回上一层
selectList: [], //已选中的人员列表
selectList: [], //已选中的人员列表,
type:2
},
onLoad: function (options) {
wx.setNavigationBarTitle({
title: '选择分类'
})
if(options.type){
this.data.type = options.type
}
this.init();
},
@ -25,7 +29,7 @@ Page({
//上次选中的列表，用于判断是不是取消选中了
this.lastTimeSelect = []
wx.request({
url: getApp().globalData.serverUrl + 'api/questioncat?a=tree',
url: getApp().globalData.serverUrl + 'api/questioncat?a=tree' + this.data.type.toString(),
header: {
'content-type': 'application/json', // 默认值
'Cookie': getApp().globalData.sessionId,

4
pages/safecert/detail.wxml
View File

@ -6,7 +6,7 @@
<view>姓名</view>
</view>
<view class="weui-cell__ft">
{{realname}}
{{user__userprofile__realname}}
</view>
</view>
<view class="weui-cell weui-cell_access">
@ -14,7 +14,7 @@
<view>性别</view>
</view>
<view class="weui-cell__ft">
{{gender}}
{{user__userprofile__gender}}
</view>
</view>
<view class="weui-cell weui-cell_access">

19
pages/safecert/index.js
View File

@ -26,7 +26,7 @@ Page({
*/
onShow: function () {
var that = this;
that.getsafecertlist()
that.getsafecertlist2()
},
/**
@ -167,4 +167,21 @@ Page({
});
},
getsafecertlist2: function(){
wx.showLoading({ title: '加载中', })
wx.request({
url: getApp().globalData.serverUrl + 'api/safecert?a=listself',
header: {
'content-type': 'application/json', // 默认值
'Cookie': getApp().globalData.sessionId,
},
success: res => {
this.setData({
total: res.data.total,
safecertlist: res.data.rows
})
wx.hideLoading();
}
});
}
})

20
pages/socert/socert.js
View File

@ -26,7 +26,7 @@ Page({
*/
onShow: function () {
var that = this;
that.getSocertlist()
that.getSocertlist2()
},
/**
@ -166,4 +166,22 @@ Page({
});
},
getSocertlist2: function() {
wx.showLoading({ title: '加载中', })
wx.request({
url: getApp().globalData.serverUrl + 'api/socert?a=listself',
header: {
'content-type': 'application/json', // 默认值
'Cookie': getApp().globalData.sessionId,
},
success: res => {
this.setData({
total: res.data.total,
socertlist: res.data.rows
})
wx.hideLoading();
}
});
}
})

4
pages/socert/socertdetail.wxml
View File

@ -6,7 +6,7 @@
<view>姓名</view>
</view>
<view class="weui-cell__ft">
{{realname}}
{{user__userprofile__realname}}
</view>
</view>
<view class="weui-cell weui-cell_access">
@ -14,7 +14,7 @@
<view>性别</view>
</view>
<view class="weui-cell__ft">
{{gender}}
{{user__userprofile__gender}}
</view>
</view>
<view class="weui-cell weui-cell_access">

31
pages/user/userdetail.js
View File

@ -10,7 +10,8 @@ Page({
genderarray: ['男','女'],
genderIndex:0,
userprofile__realname:'',
userprofile__cardnum:''
userprofile__cardnum:'',
userprofile__gender:'男'
},
bindrealnameInput: function (e) {
this.data.userprofile__realname = e.detail.value
@ -161,18 +162,22 @@ Page({
if (res.statusCode === 200) {
if (res.data.code == 1) {
wx.hideLoading()
wx.navigateBack()
wx.request({
url: getApp().globalData.serverUrl + 'api/socert?a=addspiderself',
header: {
'content-type': 'application/json', // 默认值
'Cookie': getApp().globalData.sessionId,
},
method: 'GET',
data: {},
success: res => {
}
});
wx.showToast({
title: '保存成功',
icon:'none'
})
// wx.navigateBack()
// wx.request({
// url: getApp().globalData.serverUrl + 'api/socert?a=addspiderself',
// header: {
// 'content-type': 'application/json', // 默认值
// 'Cookie': getApp().globalData.sessionId,
// },
// method: 'GET',
// data: {},
// success: res => {
// }
// });
}
}
}

80
pages/userSelect/userSelect.js
View File

@ -11,7 +11,6 @@ Page({
selectList: [], //已选择的元素列表
originalList: [], //最原始的数据列表
indexList: [], //存储目录层级的数组，用于准确的返回上一层
selectList: [], //已选中的人员列表
},
onLoad: function (options) {
@ -34,10 +33,9 @@ Page({
success: res => {
if (res.statusCode === 200) {
let list = res.data.data
console.log(list)
this.setData({
currentList: list,
originalList:list
originalList: list
})
}
}
@ -45,22 +43,30 @@ Page({
},
clickItem(res) {
console.log(res)
let index = res.currentTarget.id;
let item = this.data.currentList[index]
console.log("item", item)
if (!item.isPeople) {
//children的长度为0时，请求服务器
if (item.children.length === 0) {
this._getUserByGroup(item)
} else {
//children的长度不为0时，更新 currentList
this.setData({
currentList: item.children
})
let currentList = item.children
let selectids = []
for (var i=0;i<this.data.selectList.length;i++){
selectids.push(this.data.selectList[i].id)
}
for(var i =0;i<currentList.length;i++){
if (currentList[i].isPeople && selectids.indexOf(currentList[i]['id'].toString())>=0){
currentList[i]['checked'] = true
}else{
currentList[i]['checked'] = false
}
}
this.setData({
currentList: currentList,
})
}
//将当前的索引存入索引目录中。索引多一个表示目录多一级
let indexes = this.data.indexList
@ -70,7 +76,9 @@ Page({
indexList: indexes
})
//清空上次选中的元素列表，并设置上一层的选中状态给lastTimeSelect
this.setLastTimeSelectList();
}
},
@ -81,12 +89,10 @@ Page({
if (indexList.length > 0) {
//返回时删掉最后一个索引
indexList.pop()
let currentList = []
if (indexList.length == 0) {
//indexList长度为0说明回到了最顶层
this.setData({
currentList: this.data.originalList,
indexList: indexList
})
currentList = this.data.originalList
} else {
//循环将当前索引的对应数组赋值给currentList
let list = this.data.originalList
@ -94,12 +100,24 @@ Page({
let index = indexList[i]
list = list[index].children
}
this.setData({
currentList: list,
indexList: indexList
})
currentList = list
}
//清空上次选中的元素列表，并设置上一层的选中状态给lastTimeSelect
let selectids = []
for (var i=0;i<this.data.selectList.length;i++){
selectids.push(this.data.selectList[i].id)
}
for(var i =0;i<currentList.length;i++){
if (currentList[i].isPeople && selectids.indexOf(currentList[i]['id'].toString())>=0){
currentList[i]['checked'] = true
}else{
currentList[i]['checked'] = false
}
}
this.setData({
currentList: currentList,
indexList: indexList
})
this.setLastTimeSelectList();
}
},
@ -108,7 +126,7 @@ Page({
setLastTimeSelectList() {
this.lastTimeSelect = []
this.data.currentList.forEach(item => {
if (item.checked) {
if (item.checked && item.isPeople) {
this.lastTimeSelect.push(item)
}
})
@ -126,7 +144,6 @@ Page({
success: res => {
if (res.statusCode === 200) {
let list = res.data.data
console.log(res.list)
this.setData({
currentList: list
})
@ -195,25 +212,19 @@ Page({
break;
}
this.setData({
originalList: originalList
})
console.log("originalList", originalList)
this.data.originalList = originalList
},
//选框变化回调
checkChange(res) {
console.log(res)
let values = res.detail.value
let selectItems = []
//将值取出拼接成 id，name 格式
values.forEach(value => {
let arrs = value.split(",")
selectItems.push({ id: arrs[0], name: arrs[1] })
})
console.log("selectItems", selectItems)
console.log("lastTimeSelect", this.lastTimeSelect)
//将本次选择的与上次选择的比对，本次比上次多说明新增了，本次比上次少说明删除了，找出被删除的那条数据，在footer中也删除
if (selectItems.length > this.lastTimeSelect.length) {
//将 selectList 与 selectItems 拼接并去重
@ -235,7 +246,6 @@ Page({
})
if (!flag) {
diffItem = item
console.log("diff=", item)
}
})
//找出被删除的元素在 selectList 中的位置
@ -253,19 +263,16 @@ Page({
selectList: list
})
}
console.log("selectList", this.data.selectList)
//更新 currentList 选中状态并重新挂载在数据树上，以保存选择状态
this.lastTimeSelect = selectItems
this.updateCurrentList(this.data.currentList, this.data.selectList)
},
//footer点击删除回调
footerDelete(res) {
console.log(res)
this.setData({
selectList: res.detail.selectList
})
console.log('selectList', this.data.selectList)
this.updateCurrentList(this.data.currentList, res.detail.selectList)
},
@ -280,7 +287,6 @@ Page({
wx.navigateBack({
delta: 1
})
console.log("selectdone", selectList)
},
//更新 currentList 并将更新后的列表挂载在数据树上
@ -291,17 +297,15 @@ Page({
selectids.push(selectList[i]['id'])
}
for (var i = 0; i < currentList.length; i++) {
if (selectids.indexOf(currentList[i]['id'].toString())>=0){
currentList[i]['checked']=true
if (currentList[i].isPeople && selectids.indexOf(currentList[i]['id'].toString())>=0){
currentList[i]['checked'] = true
}else{
currentList[i]['checked'] = false
}
}
console.log(currentList)
this.setData({
currentList: currentList
})
this.addList2DataTree()
this.setLastTimeSelectList()
}
})

2
pages/userSelect/userSelect.wxml
View File

@ -5,7 +5,7 @@
<view class='people-wrapper'>
<scroll-view scroll-y class='scrollview'>
<checkbox-group bindchange="checkChange">
<view class='item' wx:for='{{currentList}}' wx:key='{{item.id}}'>
<view class='item' wx:for='{{currentList}}' wx:key='index'>
<checkbox checked='{{item.checked}}' value='{{item.id + "," + item.name}}' wx:if='{{item.isPeople}}'> </checkbox>
<view id='{{index}}' class='item-content' bindtap='clickItem'>
<image class='img' wx:if='{{!item.isPeople}}' src='../images/part.png'></image>

114
project.config.json
View File

@ -1,59 +1,59 @@
{
"description": "项目配置文件。",
"setting": {
"urlCheck": false,
"es6": true,
"enhance": false,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": false,
"useIsolateContext": true,
"packNpmManually": false,
"packNpmRelationList": []
},
"compileType": "miniprogram",
"libVersion": "2.9.4",
"appid": "wx5c39b569f01c27db",
"projectname": "aqyj",
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"game": {
"currentL": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": []
}
}
"description": "项目配置文件。",
"setting": {
"urlCheck": false,
"es6": true,
"postcss": true,
"minified": true,
"newFeature": true,
"coverView": true,
"nodeModules": true,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"useIsolateContext": true,
"useCompilerModule": false,
"userConfirmedUseCompilerModuleSwitch": false,
"enhance": false,
"preloadBackgroundData": false,
"uglifyFileName": false,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"packNpmManually": false,
"packNpmRelationList": []
},
"compileType": "miniprogram",
"libVersion": "2.9.4",
"appid": "wx5c39b569f01c27db",
"projectname": "aqyj",
"isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
"search": {
"current": -1,
"list": []
},
"conversation": {
"current": -1,
"list": []
},
"game": {
"currentL": -1,
"list": []
},
"miniprogram": {
"current": -1,
"list": []
}
}
}

2
utils/request.js
View File

@ -2,7 +2,7 @@ function request(url, method, data) {
let promise = new Promise((resolve, reject) => {
wx.showNavigationBarLoading();
wx.request({
url: getApp().globalData.host + url,
url: getApp().globalData.serverUrl + url,
method: method,
data: data,
header: {