Commit 67b7f24a authored by Facius's avatar Facius

Merge branch 'dev-v1.0.0' into test

parents c93219e7 0329c8dc
const UNI_APP = { const UNI_APP = {
apiUrl: 'http://192.168.0.204:8760', apiUrl: 'http://192.168.1.22:8760',
qn_base_url: 'https://qn-static.banshouhui.com/study/', qn_base_url: 'https://qn-static.banshouhui.com/study/',
qn_asset_url: 'http://deudn.c.pp.cc/', qn_asset_url: 'https://img2.banshouhui.com/',
uCenterUrl: 'http://192.168.0.5:8093/', //'http://rest-u.yunya.com/' uCenterUrl: 'http://192.168.0.5:8093/', //'http://rest-u.yunya.com/'
argoDebugMode: 1, argoDebugMode: 1,
version: 'v1.0.0', version: 'v1.0.0',
......
...@@ -89,6 +89,13 @@ let learnApiFun = function(vm) { ...@@ -89,6 +89,13 @@ let learnApiFun = function(vm) {
// 检查是否具有体验资格 // 检查是否具有体验资格
let checkGetQuestion = async (questionWarehouseId) => let checkGetQuestion = async (questionWarehouseId) =>
await vm.$u.get('/rest/question/checkGetQuestion/' + questionWarehouseId) await vm.$u.get('/rest/question/checkGetQuestion/' + questionWarehouseId)
// 每日一练统计
let everyTaskList = async (questionWarehouseId, params = {}) =>
await vm.$u.get(
'/rest/question/query/everyTaskList/' + questionWarehouseId,
params
)
const learnApi = { const learnApi = {
getQuestion, getQuestion,
getQuestionTotal, getQuestionTotal,
...@@ -111,6 +118,7 @@ let learnApiFun = function(vm) { ...@@ -111,6 +118,7 @@ let learnApiFun = function(vm) {
bindCard, bindCard,
searchQuestion, searchQuestion,
checkGetQuestion, checkGetQuestion,
everyTaskList,
} }
return learnApi return learnApi
} }
......
...@@ -14,21 +14,32 @@ let userApiFun = function(vm) { ...@@ -14,21 +14,32 @@ let userApiFun = function(vm) {
//验证身份证反面 //验证身份证反面
let checkIdCardBack = async (params = {}) => let checkIdCardBack = async (params = {}) =>
await vm.$u.post(uCenterUrl + 'v1/settled/card-back', params) await vm.$u.post(uCenterUrl + 'v1/settled/card-back', params)
//获取国家证列表
let getCountryCertList = async (params = {}) => let getCountryCertList = async (params = {}) =>
await vm.$u.post(apiUrl + '/rest/certificate/query', params) await vm.$u.post(apiUrl + '/rest/certificate/query', params)
//获取学时证列表
let getlearnCertList = async (params = {}) => let getlearnCertList = async (params = {}) =>
await vm.$u.get(apiUrl + '/rest/question/getSchoolCertificate', params) await vm.$u.get(apiUrl + '/rest/question/getSchoolCertificate', params)
//获取学时证详情
let getlearnCertDetail = async (questionWarehouseId, params = {}) => let getlearnCertDetail = async (questionWarehouseId) =>
await vm.$u.get( await vm.$u.get(
apiUrl + '/rest/question/getSchoolCertificate/' + questionWarehouseId, apiUrl + '/rest/question/getSchoolCertificate/' + questionWarehouseId
params
) )
//证书查询结果
let getCertFromOut = async (params = {}) => let getCertFromOut = async (params = {}) =>
await vm.$u.get(apiUrl + '/rest/certificate/national', params) await vm.$u.get(apiUrl + '/rest/certificate/national', params)
//身份证识别
let getCertifyInfoByType = async (type, params = {}) =>
await vm.$u.get(apiUrl + '/student/get/idCard/' + type, params)
//获取学员题库列表
let getUserQuestionWareHouse = async (params = {}) =>
await vm.$u.get(
apiUrl + '/rest/question/query/allStudentQuestionWarehouse',
params
)
//获取用户刷题量
let getUserDoQuestionNum = async (params = {}) =>
await vm.$u.get(apiUrl + '/rest/question/total/question/count', params)
const userApi = { const userApi = {
updateUserInfo, updateUserInfo,
...@@ -39,6 +50,9 @@ let userApiFun = function(vm) { ...@@ -39,6 +50,9 @@ let userApiFun = function(vm) {
getlearnCertList, getlearnCertList,
getlearnCertDetail, getlearnCertDetail,
getCertFromOut, getCertFromOut,
getCertifyInfoByType,
getUserQuestionWareHouse,
getUserDoQuestionNum,
} }
return userApi return userApi
} }
......
...@@ -44,7 +44,7 @@ const install = (Vue, vm) => { ...@@ -44,7 +44,7 @@ const install = (Vue, vm) => {
if (data.code === 0) { if (data.code === 0) {
return data.data return data.data
} else if (data.code === 401) { } else if (data.code === 401) {
vm.$u.toast(data.msg) vm.$u.toast('登录过期,请重新登录!')
// 如果不是在登录页,则跳转到登录页 // 如果不是在登录页,则跳转到登录页
if (route !== 'pages/login/index') { if (route !== 'pages/login/index') {
setTimeout(() => { setTimeout(() => {
...@@ -59,7 +59,7 @@ const install = (Vue, vm) => { ...@@ -59,7 +59,7 @@ const install = (Vue, vm) => {
} }
} else if (res.statusCode === 401) { } else if (res.statusCode === 401) {
// 登录过期 // 登录过期
vm.$u.toast(data.msg) vm.$u.toast('登录过期,请重新登录!')
if (route !== 'pages/login/index') { if (route !== 'pages/login/index') {
setTimeout(() => { setTimeout(() => {
vm.$u.route('/pages/login/index') vm.$u.route('/pages/login/index')
......
This diff is collapsed.
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
共 共
<text class="label-blue">{{ info.number }}</text <text class="label-blue">{{ info.number }}</text
>道精编试题,通过率 >道精编试题,通过率
<text class="label-blue">{{ $u.random(95, 99) }}%</text> <text class="label-blue">{{ info.pass || $u.random(95, 99) }}%</text>
</view> </view>
</view> </view>
<u-button <u-button
......
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<view <view
v-if="key == 'result'" v-if="key == 'result'"
:class="['result-text', { passed: passed }]" :class="['result-text', { passed: passed }]"
>{{ resultText }}</view >{{ data[key] }}</view
> >
<view v-else class="content-text">{{ info[key] }}</view> <view v-else class="content-text">{{ data[key] }}</view>
<view class="unit-text">{{ units[key] }}</view> <view v-if="units[key]" class="unit-text">{{ units[key] }}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -32,26 +32,48 @@ export default { ...@@ -32,26 +32,48 @@ export default {
return {} return {}
}, },
computed: { computed: {
data() {
return {
take: this.take,
point: this.info.point,
result: this.resultText,
}
},
take() {
if (this.info.startDatetime && this.info.endDatetime) {
let timesStart = new Date(
this.info.startDatetime.replace(/\-/g, '/')
).getTime()
let timesEnd = new Date(
this.info.endDatetime.replace(/\-/g, '/')
).getTime()
return Math.ceil((timesEnd - timesStart) / 1000 / 60)
}
return 0
},
timeText() { timeText() {
return this.$u.timeFormat(this.info.date, 'yyyy.mm.dd') return this.info.endDatetime
? this.info.endDatetime.split(' ')[0].replace(/\-/g, '.')
: this.$u.timeFormat(new Date().getTime(), 'yyyy.mm.dd')
}, },
labels() { labels() {
return { return {
time: '模考用时', take: '模考用时',
score: '模考成绩', point: '模考成绩',
result: '是否及格', result: '是否及格',
} }
}, },
units() { units() {
return { return {
time: '分钟', take: '分钟',
score: '分', point: '分',
result: '', result: '',
} }
}, },
passed() { passed() {
// 及格、不及格 // 及格、不及格
return this.info.score >= 60 return this.info.point >= 60
}, },
resultText() { resultText() {
return this.passed ? '及格' : '不及格' return this.passed ? '及格' : '不及格'
...@@ -83,6 +105,7 @@ export default { ...@@ -83,6 +105,7 @@ export default {
padding-top: 16rpx; padding-top: 16rpx;
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
justify-content: center;
.result-text { .result-text {
font-size: 44rpx; font-size: 44rpx;
color: #fa5a49; color: #fa5a49;
...@@ -103,7 +126,7 @@ export default { ...@@ -103,7 +126,7 @@ export default {
.unit-text { .unit-text {
padding-left: 14rpx; padding-left: 14rpx;
font-weight: 400; font-weight: 400;
margin-bottom: 11rpx; margin-bottom: 12rpx;
} }
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
@change="swiperChange" @change="swiperChange"
circular circular
> >
<swiper-item v-for="(item, index) in swiperList" :key="index" class="swiper-items"> <swiper-item v-for="(item, i) in swiperList" :key="i">
<view class="u-flex subject"> <view class="u-flex subject">
<view class="title" v-if="item.title"><text class="title-type">{{ titleType[item.type - 1] }}</text>{{ item.title }}</view> <view class="title" v-if="item.title"><text class="title-type">{{ titleType[item.type - 1] }}</text>{{ item.title }}</view>
<view class="content"> <view class="content">
...@@ -69,8 +69,8 @@ export default { ...@@ -69,8 +69,8 @@ export default {
}, },
// 值为0禁止切换动画 // 值为0禁止切换动画
swiperDuration: { swiperDuration: {
type: Number, type: String,
default: 1000 default: '250'
}, },
// 分页需要传此数据 // 分页需要传此数据
total: { total: {
...@@ -126,6 +126,7 @@ export default { ...@@ -126,6 +126,7 @@ export default {
this.swiperCurrent = current this.swiperCurrent = current
}, },
answerChange(status, lists, userAnswer) { answerChange(status, lists, userAnswer) {
this.$set(this.swiperList[this.swiperIndex], 'answerList', lists)
this.$set(this.swiperList[this.swiperIndex], 'errShow', this.type === 2 ? true : status === 'fail') this.$set(this.swiperList[this.swiperIndex], 'errShow', this.type === 2 ? true : status === 'fail')
this.$set(this.swiperList[this.swiperIndex], 'submitStatus', true) this.$set(this.swiperList[this.swiperIndex], 'submitStatus', true)
this.$emit("answerChange", status, lists, userAnswer) this.$emit("answerChange", status, lists, userAnswer)
...@@ -141,6 +142,10 @@ export default { ...@@ -141,6 +142,10 @@ export default {
let info = {} let info = {}
info.source = e.detail.source info.source = e.detail.source
this.$nextTick(() => {
this.swiperCurrent = current
})
// 正向滑动,到下一个的时候 // 正向滑动,到下一个的时候
// 是正向衔接 // 是正向衔接
let isLoopPositive = current == START && lastIndex == END let isLoopPositive = current == START && lastIndex == END
...@@ -177,9 +182,10 @@ export default { ...@@ -177,9 +182,10 @@ export default {
if (currentItem == null) return if (currentItem == null) return
info.current = currentItem.index info.current = currentItem.index
this.$emit("change", info)
// 记录滑过来的位置,此值对于下一次滑动的计算很重要 // 记录滑过来的位置,此值对于下一次滑动的计算很重要
this.swiperIndex = current this.swiperIndex = current
this.$emit("change", info)
if (this.model === 2) { if (this.model === 2) {
this.changeModel() this.changeModel()
} }
......
...@@ -59,7 +59,6 @@ export default { ...@@ -59,7 +59,6 @@ export default {
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
display: flex; display: flex;
/* #endif */ /* #endif */
background-color: $uni-bg-color;
position: relative; position: relative;
flex-direction: column; flex-direction: column;
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"style": { "style": {
"navigationBarTitleText": "证书", "navigationBarTitleText": "证书",
"navigationStyle": "custom", "navigationStyle": "custom",
"disableScroll": false "disableScroll": true
} }
}, },
{ {
......
...@@ -14,15 +14,11 @@ ...@@ -14,15 +14,11 @@
<u-image :src="topImage" height="116rpx" width="100%"></u-image> <u-image :src="topImage" height="116rpx" width="100%"></u-image>
</view> </view>
<view class="table-list"> <view class="table-list">
<view v-if="type == 'country'" class="item"> <view class="item" v-for="(data, k) in dataList">
<view class="name">{{ certName }}</view> <view class="name">{{ certName[k] }}</view>
<view class="table"> <view class="table">
<u-table border-color="#9EA5BB"> <u-table border-color="#9EA5BB">
<u-tr <u-tr v-for="(item, i) in data" :key="i" class="u-tr">
v-for="(item, i) in data.certificateTextContent"
:key="i"
class="u-tr"
>
<u-td <u-td
v-for="(val, name, index) in item" v-for="(val, name, index) in item"
:key="index" :key="index"
...@@ -48,20 +44,22 @@ ...@@ -48,20 +44,22 @@
export default { export default {
data() { data() {
return { return {
data: { dataList: [],
certificateTextContent: [],
},
learnData: {}, learnData: {},
type: null, certName: [],
certName: '',
topImage: process.uniEnv.qn_base_url + 'tezhongzuoyepingtai@2x.png', topImage: process.uniEnv.qn_base_url + 'tezhongzuoyepingtai@2x.png',
logDate: null,
} }
}, },
onShow: function() { onLoad: function() {
this.formatDataByType() this.formatDataByType()
}, },
computed: { computed: {
nowDate() { nowDate() {
if (this.logDate) {
console.log('取数据的日期')
return this.logDate.split(' ')[0].replace('-', '.')
} else {
var Today = new Date() var Today = new Date()
let m = Today.getMonth() + 1 let m = Today.getMonth() + 1
let d = Today.getDate() let d = Today.getDate()
...@@ -72,6 +70,7 @@ export default { ...@@ -72,6 +70,7 @@ export default {
'.' + '.' +
(String(d).length > 1 ? d : '0' + d) (String(d).length > 1 ? d : '0' + d)
) )
}
}, },
startDate() { startDate() {
return this.learnData.startDate || ' ' return this.learnData.startDate || ' '
...@@ -111,39 +110,34 @@ export default { ...@@ -111,39 +110,34 @@ export default {
return return
} }
let certData = getApp().globalData.certItemData let certData = getApp().globalData.certItemData
this.certName = certData.certificateName
if (certData.type == 'country') {
console.log('ok')
this.type = 'country'
this.certName = certData.certificateName
let countryData = [] let countryData = []
let count = certData.data.count || 2 let certName = []
let list let count, list
console.log('data is', certData.data) for (let k in certData) {
if (!certData.data.certificateTextContent) { countryData[k] = []
count = certData[k].data.count || 2
certName[k] = certData[k].certificateName.replace('作业', '证')
//格式化表格数据为json
if (!certData[k].data.certificateTextContent) {
list = JSON.parse( list = JSON.parse(
JSON.parse(JSON.stringify(certData.data.certificateContent)) JSON.parse(JSON.stringify(certData[k].data.certificateContent))
) )
console.log('list is', list)
} else { } else {
list = certData.data.certificateTextContent list = certData[k].data.certificateTextContent
} }
//组合表格数据
for (let key in list) { for (let key in list) {
countryData[key] = [] countryData[k][key] = []
for (let i = 1; i <= count; i++) { for (let i = 1; i <= count; i++) {
countryData[key].push(list[key]['filedName_' + i]) countryData[k][key].push(list[key]['filedName_' + i])
countryData[key].push(list[key]['filedValue_' + i]) countryData[k][key].push(list[key]['filedValue_' + i])
} }
} }
console.log('data countryData', countryData) this.logDate = certData[k].logDate || null
certData.data.certificateTextContent = countryData
this.data = certData.data
console.log('data log', this.data)
} else if (certData.type == 'learn') {
this.type = 'learn'
this.learnData = certData.data
} }
this.certName = certName
this.dataList = countryData
console.log('data redo log', this.dataList)
}, },
}, },
} }
...@@ -159,23 +153,19 @@ export default { ...@@ -159,23 +153,19 @@ export default {
.begin-answer { .begin-answer {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: #2953ff;
background-size: 100% 920rpx; background-size: 100% 920rpx;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 120vh; background-color: #2953ff;
position: absolute;
top: 0;
width: 100%; width: 100%;
height: 100vh;
} }
.content { .content {
display: flex;
flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 30rpx 24rpx 0rpx 24rpx; padding: 30rpx 24rpx 50rpx 24rpx;
overflow: auto;
height: 100%;
} }
.cert-body { .cert-body {
width: 100%; width: 100%;
background-color: #ffffff; background-color: #ffffff;
...@@ -188,7 +178,7 @@ export default { ...@@ -188,7 +178,7 @@ export default {
} }
.table-list { .table-list {
margin-top: 20rpx; margin-top: 20rpx;
margin-bottom: 200rpx; margin-bottom: 40rpx;
.name { .name {
font-size: 28rpx; font-size: 28rpx;
text-align: left; text-align: left;
...@@ -196,6 +186,9 @@ export default { ...@@ -196,6 +186,9 @@ export default {
color: #191c27; color: #191c27;
font-weight: bold; font-weight: bold;
} }
.item {
margin-bottom: 20rpx;
}
.table { .table {
/* background-color: #2953ff; */ /* background-color: #2953ff; */
min-height: 200rpx; min-height: 200rpx;
...@@ -211,17 +204,14 @@ export default { ...@@ -211,17 +204,14 @@ export default {
} }
} }
.foot { .foot {
position: absolute;
bottom: 41px;
left: 0;
height: 100rpx; height: 100rpx;
width: 100%; width: 100%;
text-align: left; text-align: left;
padding-left: 24rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
font-size: 28rpx; font-size: 28rpx;
color: #5a6073; color: #5a6073;
margin-bottom: 20rpx;
} }
.cert-foot { .cert-foot {
height: 100rpx; height: 100rpx;
......
...@@ -85,16 +85,24 @@ export default { ...@@ -85,16 +85,24 @@ export default {
type: null, type: null,
certName: '', certName: '',
topImage: process.uniEnv.qn_base_url + 'xueshitoubu@2x.png', topImage: process.uniEnv.qn_base_url + 'xueshitoubu@2x.png',
workPlace: ''
} }
}, },
onLoad(){
this.$u.api.getUserInfo().then((res) => {
this.workPlace =
res && res.workUnit || null
})
},
onShow: function() { onShow: function() {
this.formatDataByType() this.formatDataByType()
}, },
computed: { computed: {
nowDate(){ nowDate(){
var Today=new Date(); var Today=new Date();
let m = (Today.getMonth()+1) let m = String(Today.getMonth()+1)
let d = Today.getDate() let d = String(Today.getDate())
console.log('d length', d.length)
return (Today.getFullYear() + '.' + (m.length > 1 ? m : '0' + m) + '.' + (d.length > 1 ? d : '0' + d)) return (Today.getFullYear() + '.' + (m.length > 1 ? m : '0' + m) + '.' + (d.length > 1 ? d : '0' + d))
}, },
headPhoto(){ headPhoto(){
...@@ -113,7 +121,7 @@ export default { ...@@ -113,7 +121,7 @@ export default {
return this.learnData.idCard || ' ' return this.learnData.idCard || ' '
}, },
company() { company() {
return this.learnData.company || ' ' return this.workPlace
}, },
subjectName() { subjectName() {
return this.learnData.subjectName || ' ' return this.learnData.subjectName || ' '
...@@ -122,13 +130,13 @@ export default { ...@@ -122,13 +130,13 @@ export default {
return this.learnData.institutionName || '模考大师' return this.learnData.institutionName || '模考大师'
}, },
maxpoint() { maxpoint() {
return this.learnData.maxPoint || 0 return this.learnData.maxPoint > 0 && this.learnData.maxPoint || ''
}, },
learnTime() { learnTime() {
return this.learnData.time || 0 return this.learnData.maxPoint > 0 && this.learnData.time || ''
}, },
resultForTest() { resultForTest() {
return (this.learnData.maxPoint > 80 && '合格') || '不合格' return this.learnData.maxPoint > 0 && ((this.learnData.maxPoint > 80 && '合格') || '不合格') || ''
}, },
}, },
methods: { methods: {
......
This diff is collapsed.
...@@ -123,6 +123,8 @@ export default { ...@@ -123,6 +123,8 @@ export default {
loading: false, loading: false,
canExperience: false, // 体验资格 canExperience: false, // 体验资格
finishCount: 0, finishCount: 0,
pass: this.$u.random(95, 99),
isAdd: false, // 题库切换
} }
}, },
computed: { computed: {
...@@ -169,7 +171,7 @@ export default { ...@@ -169,7 +171,7 @@ export default {
this.data.questionWarehouse.echoMap.provinceId && this.data.questionWarehouse.echoMap.provinceId &&
this.data.questionWarehouse.echoMap.provinceId.fullName, this.data.questionWarehouse.echoMap.provinceId.fullName,
experience: this.canExperience, experience: this.canExperience,
pass: this.$u.random(95, 99) + '%', pass: this.pass + '%',
days: this.detail.totalDayCount || 0, days: this.detail.totalDayCount || 0,
today: this.detail.todayCount || 0, today: this.detail.todayCount || 0,
total: this.detail.totalCount || 0, total: this.detail.totalCount || 0,
...@@ -260,7 +262,8 @@ export default { ...@@ -260,7 +262,8 @@ export default {
if (info) { if (info) {
this.selected = info this.selected = info
page.info = null page.info = null
this.visible = info.state this.isAdd = this.selected.isAdd
this.pass = this.$u.random(95, 99)
this.queryMyQuestionWarehouseDetail(this.selected.id) this.queryMyQuestionWarehouseDetail(this.selected.id)
} else { } else {
this.queryMyQuestionWarehouseDetail(this.info.id || 0) this.queryMyQuestionWarehouseDetail(this.info.id || 0)
...@@ -279,6 +282,8 @@ export default { ...@@ -279,6 +282,8 @@ export default {
.checkGetQuestion(id) .checkGetQuestion(id)
.then((res) => { .then((res) => {
this.canExperience = res <= 0 this.canExperience = res <= 0
this.visible = this.isAdd && this.canExperience
this.isAdd = false
}) })
.catch((err) => { .catch((err) => {
console.log(err) console.log(err)
...@@ -339,6 +344,9 @@ export default { ...@@ -339,6 +344,9 @@ export default {
var str = this.info.id ? 'selectedList' : 'selectCategory' var str = this.info.id ? 'selectedList' : 'selectCategory'
this.$u.route({ this.$u.route({
url: 'pages/learn/' + str, url: 'pages/learn/' + str,
params: {
pass: this.pass,
},
}) })
}, },
// 每日一练 // 每日一练
...@@ -408,8 +416,10 @@ export default { ...@@ -408,8 +416,10 @@ export default {
if (this.info.id) { if (this.info.id) {
// 跳转到学练记录 // 跳转到学练记录
this.$u.route({ this.$u.route({
url: 'pages/learn/record?part=', url: 'pages/learn/record?key=',
key, params: {
key: key,
},
}) })
} else { } else {
this.$refs.uToast.show({ this.$refs.uToast.show({
......
...@@ -109,6 +109,7 @@ export default { ...@@ -109,6 +109,7 @@ export default {
'workUnit', 'workUnit',
], ],
student: {}, student: {},
shauTiCount: 0,
} }
}, },
computed: { computed: {
...@@ -129,10 +130,14 @@ export default { ...@@ -129,10 +130,14 @@ export default {
return this.userInfo.nickName != undefined return this.userInfo.nickName != undefined
}, },
loginTips() { loginTips() {
return (this.student && this.student.consumeAmount) || 0 return this.shauTiCount || 0
}, },
avatar() { avatar() {
return (this.userInfo && this.userInfo.avatarUrl) || this.pic return (
(this.student && this.student.avatarPath) ||
(this.userInfo && this.userInfo.avatarUrl) ||
this.pic
)
}, },
nikeName() { nikeName() {
return (this.userInfo && this.userInfo.nickName) || '点击登录' return (this.userInfo && this.userInfo.nickName) || '点击登录'
...@@ -151,12 +156,19 @@ export default { ...@@ -151,12 +156,19 @@ export default {
return { 'font-size': '32rpx', coloe: '#191C27', 'margin-left': '26rpx' } return { 'font-size': '32rpx', coloe: '#191C27', 'margin-left': '26rpx' }
}, },
}, },
onLoad() {},
onShow() { onShow() {
if (this.userInfo.nickName) { if (this.userInfo.nickName) {
this.$u.api.getUserInfo().then((res) => { this.$u.api.getUserInfo().then((res) => {
this.student = res this.student = res
getApp().globalData.student = res getApp().globalData.student = res
this.$u.api
.getUserDoQuestionNum()
.then((ret) => {
this.shauTiCount = ret || 0
})
.catch((err) => {
console.log(err)
})
}) })
} }
}, },
...@@ -166,7 +178,12 @@ export default { ...@@ -166,7 +178,12 @@ export default {
let length = this.countItem.length let length = this.countItem.length
let count = 0 let count = 0
for (let key in this.student) { for (let key in this.student) {
if (this.countItem.indexOf(key) != -1 && this.student[key]) { if (
this.countItem.indexOf(key) != -1 &&
this.student[key] &&
this.student[key] != ' '
) {
console.log('count key', key)
count = count + 1 count = count + 1
} }
} }
......
This diff is collapsed.
...@@ -92,9 +92,11 @@ export default { ...@@ -92,9 +92,11 @@ export default {
id: res.id, id: res.id,
kemu: res.echoMap?.questionWarehouseId?.title, kemu: res.echoMap?.questionWarehouseId?.title,
tishu: `${res.totalPoint}题`, tishu: `${res.totalPoint}题`,
totalPoint: res.totalPoint,
biaozhun: `${res.passPoint}分`, biaozhun: `${res.passPoint}分`,
passPoint: res.passPoint, passPoint: res.passPoint,
duration: `${res.duration}分钟`, duration: `${res.duration}分钟`,
durationNumber: res.duration,
guize: '根据国家规定比例随机抽取' guize: '根据国家规定比例随机抽取'
} }
}) })
...@@ -117,7 +119,7 @@ export default { ...@@ -117,7 +119,7 @@ export default {
source: 3, source: 3,
passPoint: this.info.passPoint, passPoint: this.info.passPoint,
totalPoint: this.info.totalPoint, totalPoint: this.info.totalPoint,
duration: this.info.duration duration: this.info.durationNumber
} }
}) })
} }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
></u-navbar> ></u-navbar>
<view class="body-view"> <view class="body-view">
<view class="image-view" <view class="image-view"
><image class="image" :src="successImage"></image ><image class="image" :src="kapianImage" mode="widthFix"></image
></view> ></view>
<view class="content-view"> <view class="content-view">
<view class="first-line"> <view class="first-line">
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
>手动输入卡号、密码绑定</view >手动输入卡号、密码绑定</view
> >
</view> </view>
<view>
<u-toast ref="uToast" />
</view>
</view> </view>
</view> </view>
</template> </template>
...@@ -57,6 +60,9 @@ export default { ...@@ -57,6 +60,9 @@ export default {
}, },
computed: { computed: {
kapianImage() {
return process.uniEnv.qn_base_url + 'kapian.png'
},
customStyle() { customStyle() {
return { return {
height: '104rpx', height: '104rpx',
...@@ -91,7 +97,7 @@ export default { ...@@ -91,7 +97,7 @@ export default {
onlyFromCamera: true, onlyFromCamera: true,
success: (res) => { success: (res) => {
console.log(res) console.log(res)
if (res.result) { if (res.result && res.result.length == 15 + 8) {
this.$u.route({ this.$u.route({
url: 'pages/learn/boundTest', url: 'pages/learn/boundTest',
params: { params: {
...@@ -99,8 +105,22 @@ export default { ...@@ -99,8 +105,22 @@ export default {
// relationId: this.relationId, // relationId: this.relationId,
}, },
}) })
} else {
this.$refs.uToast.show({
title: '未成功识别相关信息',
type: 'error',
duration: 2000,
})
} }
}, },
fail: (err) => {
console.log(err)
this.$refs.uToast.show({
title: '未成功识别相关信息',
type: 'error',
duration: 2000,
})
},
}) })
}, },
handleClickBuy() { handleClickBuy() {
...@@ -205,8 +225,7 @@ export default { ...@@ -205,8 +225,7 @@ export default {
text-align: center; text-align: center;
.image { .image {
width: 700rpx; width: 700rpx;
height: 360rpx; // height: 360rpx;
background-color: red;
border-radius: 24rpx; border-radius: 24rpx;
box-shadow: 0px 10px 16px rgba(29, 53, 155, 0.2); box-shadow: 0px 10px 16px rgba(29, 53, 155, 0.2);
} }
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
@submit="handleClickSubmit" @submit="handleClickSubmit"
> >
<view v-for="(value, key) in selected" :key="key" class="pop-content"> <view v-for="(value, key) in selected" :key="key" class="pop-content">
<u-icon v-if="key != firstKey" name="arrow-downward"></u-icon>
<view :class="['pop-content-text', { last: key == thirdKey }]" <view :class="['pop-content-text', { last: key == thirdKey }]"
>{{ value.label >{{ value.label
}}<text v-if="key != secondKey" }}<text v-if="key != secondKey"
...@@ -99,7 +100,6 @@ ...@@ -99,7 +100,6 @@
}})</text }})</text
></view ></view
> >
<u-icon v-if="key != thirdKey" name="arrow-downward"></u-icon>
</view> </view>
</PopView> </PopView>
<view> <view>
...@@ -231,16 +231,21 @@ export default { ...@@ -231,16 +231,21 @@ export default {
async getProvinceList(id) { async getProvinceList(id) {
let res = await this.$u.api.getProvinceList(id) let res = await this.$u.api.getProvinceList(id)
console.log(res) console.log(res)
this.range = res this.range = res || []
},
// 学员增加自己的题库
async addQuestionWarehouse(params) {
let res = await this.$u.api.addQuestionWarehouse({ params })
console.log(res)
this.range = res
}, },
async handleClickSubmit() { async handleClickSubmit() {
if (this.buttonDisabled) return if (this.buttonDisabled) return
if (this.range.length <= 0 || this.range.length == null) {
this.$refs.uToast.show({
title: '该类型和区域没有的题库',
type: 'warning',
duration: 1500,
callback: () => {
this.showPop = false
},
})
return
}
if (this.index == 0) { if (this.index == 0) {
this.changeIndex() this.changeIndex()
} }
...@@ -262,6 +267,7 @@ export default { ...@@ -262,6 +267,7 @@ export default {
}) })
if (result) { if (result) {
data.isAdd = true
this.setPageInfo(data) this.setPageInfo(data)
// 成功 // 成功
this.$refs.uToast.show({ this.$refs.uToast.show({
...@@ -328,7 +334,6 @@ export default { ...@@ -328,7 +334,6 @@ export default {
var pages = getCurrentPages() var pages = getCurrentPages()
if (pages.length >= 1) { if (pages.length >= 1) {
var page = pages[0] var page = pages[0]
console.log('--------setPageInfo--------', info)
page.info = info page.info = info
} }
}, },
......
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
<view class="content-view"> <view class="content-view">
<view class="field-title">学习卡卡号</view> <view class="field-title">学习卡卡号</view>
<view class="field-view"> <view class="field-view">
<input <u-input
type="number" type="number"
class="input-view" class="input-view"
:value="code" v-model="code"
input-align="center"
placeholder="请输入卡号" placeholder="请输入卡号"
:placeholder-style="placeplaceholderStyle" :placeholder-style="placeplaceholderStyle"
cursor-spacing="140" cursor-spacing="140"
...@@ -28,10 +29,11 @@ ...@@ -28,10 +29,11 @@
</view> </view>
<view class="field-title">学习卡密码</view> <view class="field-title">学习卡密码</view>
<view class="field-view"> <view class="field-view">
<input <u-input
class="input-view" class="input-view"
password password
:value="password" input-align="center"
v-model="password"
placeholder="请输入密码" placeholder="请输入密码"
:placeholder-style="placeplaceholderStyle" :placeholder-style="placeplaceholderStyle"
cursor-spacing="140" cursor-spacing="140"
......
...@@ -16,9 +16,22 @@ ...@@ -16,9 +16,22 @@
<image class="xunzhang-image" :src="xunzhangImage"></image> <image class="xunzhang-image" :src="xunzhangImage"></image>
</view> </view>
<view class="body-view"> <view class="body-view">
<scroll-view
scroll-y="true"
class="scroll-view"
@scrolltolower="reachBottom"
scroll-anchoring
enable-back-to-top
:scroll-into-view="scrollId"
>
<view class="date-view"> <view class="date-view">
<view class="content-title" id="part-days">每日一练</view> <view class="content-title" id="part-days">每日一练</view>
<view class="date-content"></view> <view class="date-content">
<Calendar
:initialDays="days"
@change="handleChangeMonth"
></Calendar>
</view>
</view> </view>
<view class="charts-view"> <view class="charts-view">
<view class="content-title" id="part-total">练习分析</view> <view class="content-title" id="part-total">练习分析</view>
...@@ -58,36 +71,61 @@ ...@@ -58,36 +71,61 @@
</view> </view>
</picker> </picker>
</view> </view>
<view class="charts-content"> </view> <view class="charts-content">
<view class="charts-box">
<qiun-data-charts
type="tarea"
:chartData="chartData"
:canvas2d="true"
:inScrollView="true"
canvasId="scroll-viewid"
:pageScrollTop="pageScrollTop"
background="none"
/>
</view>
</view>
</view> </view>
<view class="list-view"> <view class="list-view">
<view class="content-title" id="part-today">模考成绩</view> <view class="content-title" id="part-today">模考成绩</view>
<view class="list-content"> <view class="list-content">
<RecordCell <RecordCell
v-for="(item, index) in showedList" v-for="(item, index) in lists"
:key="index" :key="index"
:info="item" :info="item"
></RecordCell> ></RecordCell>
<view class="show-more" @click="showAll = true" v-if="!showAll">
<!-- <view class="show-more" @click="showAll = true" v-if="!showAll">
<u-icon name="arrow-down"></u-icon> <u-icon name="arrow-down"></u-icon>
<text>查看更多</text> <text>查看更多</text>
</view> -->
</view> </view>
<u-loadmore
v-show="
(recordParams.current == 1 && loaded) || recordParams.current > 1
"
:status="currentLoadStatus"
></u-loadmore>
</view> </view>
</view> </scroll-view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import RecordCell from '@/components/record-cell' import RecordCell from '@/components/record-cell'
import Calendar from '@/components/calendar'
export default { export default {
components: { RecordCell }, components: { RecordCell, Calendar },
data() { data() {
return { return {
pageScrollTop: 0,
lists: [], lists: [],
days: [],
showSelect: false, showSelect: false,
showAll: false, showAll: false,
scrollId: null, scrollId: null,
loaded: false,
items: [ items: [
{ {
title: '近7天', title: '近7天',
...@@ -102,9 +140,17 @@ export default { ...@@ -102,9 +140,17 @@ export default {
selected: false, selected: false,
}, },
], ],
currentLoadStatus: 'loading',
rangeDay0: this.getDate(), // 自定义开始日期 rangeDay0: this.getDate(), // 自定义开始日期
rangeDay1: this.getDate(), // 自定义结束日期 rangeDay1: this.getDate(), // 自定义结束日期
recordParams: {
current: 0,
size: 15,
},
chartData: {
categories: [],
series: [],
},
} }
}, },
...@@ -119,23 +165,103 @@ export default { ...@@ -119,23 +165,103 @@ export default {
day: true, day: true,
} }
}, },
showedList() {
return this.showAll ? this.lists : this.lists.slice(0, 2)
},
}, },
onLoad(e) { onLoad(e) {
if (e && e.key) { if (e && e.key) {
this.$nextTick(() => { this.$nextTick(() => {
setTimeout(() => {
this.scrollId = 'part-' + e.key this.scrollId = 'part-' + e.key
}, 500)
}) })
} }
this.lists = [ this.queryExamRecord()
{ time: 36, score: 80, date: new Date().getTime }, this.chartInit()
{ time: 100, score: 40, date: new Date().getTime },
{ time: 40, score: 60, date: new Date().getTime },
]
}, },
methods: { methods: {
chartInit() {
this.chartData.series = [
{
name: '时间轴1',
pointShape: "circle",
legendShape: "circle",
data: [
[10000, 55],
[30000, 25],
[50000, 55],
[70000, 25],
[90000, 55],
],
},
{
name: '时间轴2',
pointShape: "circle",
legendShape: "circle",
data: [
[0, 25],
[20000, 55],
[40000, 25],
[60000, 55],
[80000, 25],
],
},
]
},
// 每日一练统计
everyTaskList(year, month) {
var params = {
startDate: this.$u.timeFormat(
new Date(year, month - 1, 1).getTime(),
'yyyy-mm-dd'
),
endDate: this.$u.timeFormat(
new Date(year, month, 0).getTime(),
'yyyy-mm-dd'
),
}
this.$u.api
.everyTaskList(this.questionWarehouseId, params)
.then((res) => {
this.days = []
for (var item of res) {
this.days.push(item.time.replace(/\-0/g, '\-'))
}
})
.catch((err) => {
console.log(err)
})
},
// 模考记录
queryExamRecord() {
this.recordParams.current += 1
;(this.recordParams.model = {
questionWarehouseId: this.questionWarehouseId,
}),
this.$u.api
.queryExamRecord(this.recordParams)
.then((res) => {
this.loaded = true
if (this.recordParams.current == 1) {
this.lists = []
}
if ((res.records || []).length > 0) {
this.lists.push(...res.records)
}
this.currentLoadStatus =
res.total > this.lists.length &&
(res.records || []).length == this.recordParams.size
? 'loadmore'
: 'nomore'
})
.catch((err) => {
this.loaded = true
console.log(err)
})
},
handleChangeMonth(e) {
this.everyTaskList(e.year, e.month)
},
handleClick() {}, handleClick() {},
handleClickRange(index) { handleClickRange(index) {
for (var item of this.items) { for (var item of this.items) {
...@@ -158,17 +284,16 @@ export default { ...@@ -158,17 +284,16 @@ export default {
getDate() { getDate() {
return this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd') return this.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd')
}, },
reachBottom() {
if (this.currentLoadStatus != 'loadmore') return
this.currentLoadStatus == 'loading'
this.queryExamRecord()
},
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
display: none;
}
.record-view { .record-view {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -207,26 +332,34 @@ export default { ...@@ -207,26 +332,34 @@ export default {
} }
} }
.body-view { .body-view {
::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
display: none;
}
border-radius: 24rpx 24rpx 0 0; border-radius: 24rpx 24rpx 0 0;
background-color: #ffffff; background-color: #ffffff;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
padding: 24rpx 30rpx 44rpx 30rpx; .scroll-view {
height: 100%;
}
.date-view { .date-view {
.date-content { .date-content {
min-height: 648rpx; min-height: 650rpx;
} }
} }
.content-title { .content-title {
font-size: 32rpx; font-size: 32rpx;
color: #191c27; color: #191c27;
font-weight: bold; font-weight: bold;
padding: 24rpx 30rpx 0rpx 30rpx;
} }
.charts-view { .charts-view {
.range-view { .range-view {
display: flex; display: flex;
margin-top: 40rpx; margin: 40rpx 30rpx 40rpx 30rpx;
margin-bottom: 40rpx;
.range-title { .range-title {
font-size: 28rpx; font-size: 28rpx;
color: #9ea5bb; color: #9ea5bb;
...@@ -248,7 +381,7 @@ export default { ...@@ -248,7 +381,7 @@ export default {
} }
} }
.days-select-view { .days-select-view {
margin-left: 154rpx; margin-left: 168rpx;
display: flex; display: flex;
align-items: center; align-items: center;
color: #9ea5bb; color: #9ea5bb;
...@@ -271,11 +404,19 @@ export default { ...@@ -271,11 +404,19 @@ export default {
} }
} }
.charts-content { .charts-content {
min-height: 570rpx; width: 100%;
height: 570rpx;
.charts-box {
width: 100%;
height: 570rpx;
}
} }
} }
.list-view { .list-view {
padding-bottom: 20rpx;
.list-content { .list-content {
padding: 0 30rpx 20rpx 30rpx;
.show-more { .show-more {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
...@@ -209,7 +209,6 @@ export default { ...@@ -209,7 +209,6 @@ export default {
}, 2500) }, 2500)
}, },
customBack() { customBack() {
console.log("111", 111)
this.$u.route({ this.$u.route({
type: 'tab', type: 'tab',
url: 'pages/index/index' url: 'pages/index/index'
......
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
this.labels[key1][0].push(item) this.labels[key1][0].push(item)
} }
} }
for (var i = 0; i < this.labels[key1].length; i++) { for (var i = 0; i < this.labels[key1][0].length; i++) {
var data = this.labels[key1][0][i] var data = this.labels[key1][0][i]
this.labels[key2][i] = [] this.labels[key2][i] = []
for (var item of res) { for (var item of res) {
......
...@@ -51,6 +51,7 @@ export default { ...@@ -51,6 +51,7 @@ export default {
return { return {
list: [], // 已选题库列表 list: [], // 已选题库列表
loading: true, loading: true,
currentPass: null,
} }
}, },
computed: { computed: {
...@@ -68,6 +69,9 @@ export default { ...@@ -68,6 +69,9 @@ export default {
}, },
}, },
onLoad(e) { onLoad(e) {
if (e && e.pass) {
this.currentPass = e.pass
}
this.loadList() // 获取已选题库列表 this.loadList() // 获取已选题库列表
}, },
methods: { methods: {
...@@ -94,6 +98,9 @@ export default { ...@@ -94,6 +98,9 @@ export default {
for (var item of res) { for (var item of res) {
if (item && item.echoMap && item.echoMap.questionWarehouseId) { if (item && item.echoMap && item.echoMap.questionWarehouseId) {
item.echoMap.questionWarehouseId.number = item.number item.echoMap.questionWarehouseId.number = item.number
if (item.questionWarehouseId == this.questionWarehouseId) {
item.echoMap.questionWarehouseId.pass = this.currentPass
}
} }
} }
this.list = res this.list = res
......
...@@ -139,8 +139,25 @@ function initAnswerCardList(total, vm) { ...@@ -139,8 +139,25 @@ function initAnswerCardList(total, vm) {
} }
} }
const diffTime = function diffTime(startDate, endDate) {
let diff = endDate.getTime() - startDate //.getTime();//时间差的毫秒数
//计算出相差天数
let days = Math.floor(diff / (24 * 3600 * 1000))
//计算出小时数
let leave1 = diff % (24 * 3600 * 1000) //计算天数后剩余的毫秒数
let hours = Math.floor(leave1 / (3600 * 1000))
//计算相差分钟数
let leave2 = leave1 % (3600 * 1000) //计算小时数后剩余的毫秒数
let minutes = Math.floor(leave2 / (60 * 1000))
//计算相差秒数
let leave3 = leave2 % (60 * 1000) //计算分钟数后剩余的毫秒数
let seconds = Math.round(leave3 / 1000)
return seconds
}
module.exports = { module.exports = {
TOTAL: TOTAL, TOTAL: TOTAL,
diffTime: diffTime,
request: request, request: request,
requestMulti: requestMulti, requestMulti: requestMulti,
getInitcurrentPage: getInitcurrentPage, getInitcurrentPage: getInitcurrentPage,
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:border-bottom="false" :border-bottom="false"
title-bold title-bold
></u-navbar> ></u-navbar>
<view class="content" v-if="lists.length > 0"> <view class="content" v-if="lists">
<!-- <text class="title">{{ title }}</text> --> <!-- <text class="title">{{ title }}</text> -->
<my-subject <my-subject
class="subject-item" class="subject-item"
...@@ -45,188 +45,22 @@ export default { ...@@ -45,188 +45,22 @@ export default {
return { return {
title: '我的题库', title: '我的题库',
nothing: process.uniEnv.qn_base_url + 'zanwucuoti@3x.png', nothing: process.uniEnv.qn_base_url + 'zanwucuoti@3x.png',
lists: [], lists: null,
} }
}, },
onLoad() { onLoad() {
this.$u.api.getUserQuestionWareHouse().then((res) => { this.getUserQuestionWareHouseList()
res = [
{
id: '1415266126815821824',
createTime: '2021-07-14 19:05:14',
createdBy: '1415215255998431232',
updateTime: '2021-07-14 19:05:14',
updatedBy: '1415215255998431232',
echoMap: {
studentId: {
id: '1414459877807357952',
createTime: '2021-07-12 13:41:29',
createdBy: '3',
updateTime: '2021-07-20 20:41:13',
updatedBy: '1414459877807357952',
echoMap: {},
cardCount: null,
consumeAmount: null,
loginTime: null,
unionid: '',
nickname: '',
name: '',
phoneNumber: '11111111111',
avatarPath: '',
identityNumber: '',
identityFrontPath: '',
identityBackPath: '',
certificatePhotoPath: '',
certificateValidityDate: null,
workUnit: '',
address: '',
},
questionWarehouseId: {
id: '1414854649273384960',
createTime: '2021-07-13 15:50:10',
createdBy: '1413688964405002240',
updateTime: '2021-07-22 19:21:00',
updatedBy: '1413688964405002240',
echoMap: {},
institutionId: '1',
subjectId: '1418169087225233408',
title: '测试题库',
subtitle: '大狼狗',
description: 'sad',
effectiveTime: '0',
provinceId: '470715',
cityId: '475286',
type: '1',
price: '100.00',
realPrice: '60.00',
state: true,
remark: '',
version: '0',
},
cardId: {
id: '1416278788987158528',
createTime: '2021-07-17 14:09:11',
createdBy: '1410776147574128640',
updateTime: '2021-07-17 14:09:11',
updatedBy: '1410776147574128640',
echoMap: {},
unitPrice: null,
buyTime: null,
subjectNames: null,
instrtutionId: '1',
studentId: null,
questionWarehouseId: '1',
cardType: '02',
cardNumber: '621001200010719',
cardSecret: '9923sibv',
cardStatus: 5,
isEnable: 1,
effectiveDay: 30,
bindingTime: null,
activationTime: null,
sourceType: {
code: 'INSTRTUTION_SEND',
desc: '机构发卡',
},
sourceOrderId: '1416278788521590784',
},
},
questionWarehouseId: '1414854649273384960',
studentId: '1414459877807357952',
cardId: '1416278788987158528',
},
{
id: '1415602594134360064',
createTime: '2021-07-15 17:41:51',
createdBy: '1415215255998431232',
updateTime: '2021-07-15 17:41:51',
updatedBy: null,
echoMap: {
studentId: {
id: '1414459877807357952',
createTime: '2021-07-12 13:41:29',
createdBy: '3',
updateTime: '2021-07-20 20:41:13',
updatedBy: '1414459877807357952',
echoMap: {},
cardCount: null,
consumeAmount: null,
loginTime: null,
unionid: '',
nickname: '',
name: '',
phoneNumber: '11111111111',
avatarPath: '',
identityNumber: '',
identityFrontPath: '',
identityBackPath: '',
certificatePhotoPath: '',
certificateValidityDate: null,
workUnit: '',
address: '',
},
questionWarehouseId: {
id: '1',
createTime: '2021-07-12 16:33:20',
createdBy: null,
updateTime: '2021-07-21 14:40:44',
updatedBy: '1413688964405002240',
echoMap: {},
institutionId: '1',
subjectId: '1413687160678121472',
title: '测试1',
subtitle: '侧首',
description: '哈哈哈哈',
effectiveTime: '1',
provinceId: '470715',
cityId: '475286',
type: '1',
price: '100.00',
realPrice: '50.00',
state: true,
remark: '123231',
version: null,
},
cardId: {
id: '1416278788987158528',
createTime: '2021-07-17 14:09:11',
createdBy: '1410776147574128640',
updateTime: '2021-07-17 14:09:11',
updatedBy: '1410776147574128640',
echoMap: {},
unitPrice: null,
buyTime: null,
subjectNames: null,
instrtutionId: '1',
studentId: null,
questionWarehouseId: '1',
cardType: '02',
cardNumber: '621001200010719',
cardSecret: '9923sibv',
cardStatus: 15,
isEnable: 1,
effectiveDay: 30,
bindingTime: null,
activationTime: null,
sourceType: {
code: 'INSTRTUTION_SEND',
desc: '机构发卡',
},
sourceOrderId: '1416278788521590784',
},
},
questionWarehouseId: '1',
studentId: '1414459877807357952',
cardId: '1416278788987158528',
}, },
] methods: {
getUserQuestionWareHouseList() {
this.$u.api.getUserQuestionWareHouse().then((res) => {
console.log('tiku list', res)
let length = res.length let length = res.length
if (res.length <= 0) { if (res.length <= 0) {
this.lists = [] return
} }
let data = [] let data = []
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
data[i] = {}
if ( if (
!res[i].echoMap || !res[i].echoMap ||
!res[i].echoMap.questionWarehouseId || !res[i].echoMap.questionWarehouseId ||
...@@ -234,10 +68,9 @@ export default { ...@@ -234,10 +68,9 @@ export default {
) { ) {
continue continue
} }
data[i] = {}
//绑卡或支付时间 //绑卡或支付时间
data[i].title = res[i].echoMap.questionWarehouseId.title data[i].title = res[i].echoMap.questionWarehouseId.title
data[i].subtitle = res[i].echoMap.questionWarehouseId.subtitle
data[i].time = data[i].time =
res[i].echoMap.cardId.bindingTime || res[i].echoMap.cardId.bindingTime ||
res[i].echoMap.cardId.buyTime || res[i].echoMap.cardId.buyTime ||
...@@ -247,28 +80,55 @@ export default { ...@@ -247,28 +80,55 @@ export default {
case 0: case 0:
status = '未绑定' status = '未绑定'
data[i].statusStyle = { color: '#9EA5BB' } data[i].statusStyle = { color: '#9EA5BB' }
data[i].subtitle = '请前往绑定'
break break
case 5: case 5:
status = '已绑定' status = '已绑定'
data[i].statusStyle = { color: '#2953FF' } data[i].statusStyle = { color: '#2953FF' }
data[i].subtitle = '请前往首页答题联系吧'
break break
case 10: case 10:
status = '已激活' status = '已激活'
data[i].statusStyle = { color: '#2953FF' } data[i].statusStyle = { color: '#2953FF' }
let leaveDay = 0
if (
res[i].echoMap.cardId &&
res[i].echoMap.cardId.activationTime
) {
let diff = this.datedifference(sDate1, sDate2)
leaveDay = res[i].echoMap.cardId.effectiveDay - diff
leaveDay = leaveDay > 0 ? leaveDay : 0
}
data[i].subtitle = '题库将于' + leaveDay + '天后到期'
break break
case 15: case 15:
status = '已失效' status = '已失效'
data[i].statusStyle = { color: '#9EA5BB' } data[i].statusStyle = { color: '#9EA5BB' }
data[i].subtitle = '题库已失效'
break break
default: default:
break break
} }
data[i].status = status data[i].status = status
} }
if (data.length > 0) {
this.lists = data this.lists = data
console.log(data) console.log('tiku data', data)
}
}) })
}, },
datedifference(sDate1, sDate2) {
//2021-01-01,2020-02-01,31
var dateSpan, tempDate, iDays
sDate1 = Date.parse(sDate1)
sDate2 = Date.parse(sDate2)
dateSpan = sDate2 - sDate1
dateSpan = Math.abs(dateSpan)
iDays = Math.floor(dateSpan / (24 * 3600 * 1000))
return iDays
},
},
} }
</script> </script>
......
...@@ -150,15 +150,16 @@ export default { ...@@ -150,15 +150,16 @@ export default {
upload.getPhoto(1, this.token).then((res) => { upload.getPhoto(1, this.token).then((res) => {
this.student.identityFrontPath = res.key this.student.identityFrontPath = res.key
this.$u.api this.$u.api
.checkIdCardFront({ id_card_front: res.key }) .getCertifyInfoByType('front', {
.then(() => {}) url: process.uniEnv.qn_asset_url + res.key,
})
.then((res) => {
console.log('识别结果', res)
this.student.name = res.name
this.student.identityNumber = res.number
})
.catch((data) => { .catch((data) => {
if (data.errMsg == 'request:ok') {
this.student.name = data.data.id_card_name
this.student.identityNumber = data.data.id_card_number
} else {
this.$u.toast('识别身份证信息错误') this.$u.toast('识别身份证信息错误')
}
}) })
}) })
}, },
...@@ -167,14 +168,15 @@ export default { ...@@ -167,14 +168,15 @@ export default {
upload.getPhoto(1, this.token).then((res) => { upload.getPhoto(1, this.token).then((res) => {
this.student.identityBackPath = res.key this.student.identityBackPath = res.key
this.$u.api this.$u.api
.checkIdCardBack({ id_card_back: res.key }) .getCertifyInfoByType('back', {
.then(() => {}) url: process.uniEnv.qn_asset_url + res.key,
})
.then((res) => {
console.log('识别结果', res)
this.student.certificateValidityDate = res.expire
})
.catch((data) => { .catch((data) => {
if (data.errMsg == 'request:ok') {
this.student.certificateValidityDate = data.data.id_card_expire
} else {
this.$u.toast('识别身份证信息错误') this.$u.toast('识别身份证信息错误')
}
}) })
}) })
}, },
......
...@@ -47,10 +47,6 @@ export default { ...@@ -47,10 +47,6 @@ export default {
}, },
methods: { methods: {
submit() { submit() {
if (this.student.workUnit == '') {
this.$u.toast('请输入工作单位名称')
return
}
this.$u.api this.$u.api
.updateUserInfo({ .updateUserInfo({
workUnit: this.student.workUnit, workUnit: this.student.workUnit,
......
...@@ -10,8 +10,11 @@ ...@@ -10,8 +10,11 @@
></u-navbar> ></u-navbar>
<view class="content"> <view class="content">
<view class="kf-body"> <view class="kf-body">
<view>
<u-image width="100%" height="240rpx" :src="topBgImg"></u-image>
</view>
<view class="kf-image"> <view class="kf-image">
<u-image width="436rpx" height="436rpx" :src="erweima"></u-image> <u-image width="400rpx" height="400rpx" :src="erweima"></u-image>
</view> </view>
<view class="tips"> <view class="tips">
长按识别二维码添加官方客服 长按识别二维码添加官方客服
...@@ -25,7 +28,8 @@ ...@@ -25,7 +28,8 @@
export default { export default {
data() { data() {
return { return {
erweima: process.uniEnv.qn_base_url + 'kefuerweima@3x.png', topBgImg: process.uniEnv.qn_base_url + 'kefu@2x.png',
erweima: process.uniEnv.qn_base_url + 'kefuerweima@2x.png',
} }
}, },
} }
...@@ -55,7 +59,7 @@ export default { ...@@ -55,7 +59,7 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
padding: 130rpx 24rpx 0rpx 24rpx; padding: 50rpx 24rpx 0rpx 24rpx;
} }
.kf-body { .kf-body {
...@@ -67,13 +71,13 @@ export default { ...@@ -67,13 +71,13 @@ export default {
} }
.kf-image { .kf-image {
margin-left: 132rpx; margin-left: 160rpx;
margin-top: 160rpx; margin-top: 80rpx;
} }
.tips { .tips {
color: #5a6073; color: #5a6073;
font-size: 28rpx; font-size: 28rpx;
margin-top: 114rpx; margin-top: 50rpx;
} }
</style> </style>
...@@ -24,15 +24,10 @@ ...@@ -24,15 +24,10 @@
></u-image> ></u-image>
</view> </view>
</u-cell-item> </u-cell-item>
<u-cell-item <u-cell-item title="证件照" @click="changeCertPhoto">
title="证件照"
@click="changeCertPhoto"
:arrow="false"
:hover-class="none"
>
<view slot="right-icon"> <view slot="right-icon">
<u-image <u-image
v-if="isupLoadCertPhoto" v-if="headCertPhoto"
width="92rpx" width="92rpx"
height="120rpx" height="120rpx"
:src="headCertPhoto" :src="headCertPhoto"
...@@ -40,13 +35,12 @@ ...@@ -40,13 +35,12 @@
<text v-else style="color:#2953FF">去上传</text> <text v-else style="color:#2953FF">去上传</text>
</view> </view>
</u-cell-item> </u-cell-item>
<u-cell-item title="手机号" :arrow="false" :hover-class="none"> <u-cell-item title="手机号">
<view slot="right-icon"> <view slot="right-icon">
<button <button
hover-class="none"
class="mobile-button"
open-type="getPhoneNumber" open-type="getPhoneNumber"
@getphonenumber="getPhonenumber" @getphonenumber="getPhonenumber"
style="background: none;font-size: 26rpx;padding-right: 0;"
> >
<text v-if="getMobile">{{ getMobile }}</text> <text v-if="getMobile">{{ getMobile }}</text>
<text v-else class="empty-value">去绑定</text> <text v-else class="empty-value">去绑定</text>
...@@ -82,7 +76,9 @@ import login from '@/common/login' ...@@ -82,7 +76,9 @@ import login from '@/common/login'
export default { export default {
data() { data() {
return { return {
student: {}, student: {
isCertify: false,
},
token: null, token: null,
code: '', code: '',
} }
...@@ -94,13 +90,11 @@ export default { ...@@ -94,13 +90,11 @@ export default {
) )
}, },
headCertPhoto() { headCertPhoto() {
return ( console.log(
(this.student && this.student.certificatePhotoPath) || 'touxiang bianle',
process.uniEnv.qn_base_url + 'xitongtouxiang.png' this.student ? this.student.certificatePhotoPath : 'kong'
) )
}, return (this.student && this.student.certificatePhotoPath) || false
isupLoadCertPhoto() {
return (this.student && this.student.identityNumber) || false
}, },
getMobile() { getMobile() {
return ( return (
...@@ -115,21 +109,27 @@ export default { ...@@ -115,21 +109,27 @@ export default {
return (this.student && this.student.workUnit) || '去填写' return (this.student && this.student.workUnit) || '去填写'
}, },
getCertifyStatus() { getCertifyStatus() {
return this.student && this.student.isCertify ? '已认证' : '去认证' console.log('is cert', this.student.isCertify)
return this.student.isCertify ? '已认证' : '去认证'
}, },
}, },
onLoad() { onLoad() {
this.$u.api this.$u.api
.getQiNiuToken({ bucketName: 'banshou-userprofile' }) .getQiNiuToken({ bucketName: 'banshou-userprofile' })
.then((res) => { .then((res) => {
this.token = data.data.token //token为七牛云的token一般由后台接口提供 console.log('chushihua token', res)
getApp().globalData.qiNiuToken = data.data.token this.token = res //token为七牛云的token一般由后台接口提供
getApp().globalData.qiNiuToken = res
}) })
this.$u.api.getUserInfo().then((res) => { this.$u.api.getUserInfo().then((res) => {
if (res && res.identityNumber) { console.log('huoqu userinfo', res)
this.student.isCertify = true if (res) {
} res.isCertify =
res && res.identityNumber && res.identityNumber.length > 5
? true
: false
this.student = res this.student = res
}
}) })
}, },
onShow() { onShow() {
......
...@@ -21,32 +21,32 @@ ...@@ -21,32 +21,32 @@
></u-search> ></u-search>
</view> </view>
<view v-if="lists.length > 0"> <view class="results" v-if="lists.length > 0">
<view class="title" <view class="title"
>共找到含有<text>“{{ keyword }}”</text>相关试题<text>{{ count }}</text>道</view >共找到含有<text>“{{ keyword }}”</text>相关试题<text>{{ total }}</text
>道</view
> >
<view class="result"> <view class="result">
<u-collapse :item-style="itemStyle" event-type="close">
<uni-list :border="false"> <uni-list :border="false">
<u-collapse-item <view
:ref="`collapse${index}`" v-for="item in lists"
:index="index" :key="item.id"
@change="itemChange" @click.stop="itemChange(item.id)"
v-for="(item, index) in lists" class="list-item"
:key="index" >
<view
:class="['u-flex', 'head', { selected: item.id === arrIndex }]"
> >
<view slot="title-all" :class="['u-flex','head', {'selected': index === arrIndex}]">
<view class="titles"> <view class="titles">
<text>{{ item.type }}</text <text>{{ item.type }}</text
>{{ item.title }} >{{ item.title }}
</view> </view>
<view class="u-flex arrow" v-show="index !== arrIndex"> <view class="u-flex arrow" v-show="item.id !== arrIndex">
<text>展开</text> <text>展开</text>
<u-icon name="arrow-down" color="#9EA5BB"></u-icon> <u-icon name="arrow-down" color="#9EA5BB"></u-icon>
</view> </view>
</view> </view>
<view class="u-flex subject"> <view class="u-flex subject" v-show="item.id === arrIndex">
<view class="content"> <view class="content">
<answer-sheet <answer-sheet
ref="answerSheet" ref="answerSheet"
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
></answer-explanation> ></answer-explanation>
</view> </view>
</view> </view>
<view class="u-flex opera"> <view class="u-flex opera" v-show="item.id === arrIndex">
<view class="opera-list" @click="collection(item)"> <view class="opera-list" @click="collection(item)">
<u-image <u-image
:src="collectImg" :src="collectImg"
...@@ -76,19 +76,18 @@ ...@@ -76,19 +76,18 @@
/> />
<text>{{ collectionFlag ? '已收藏' : '收藏' }}</text> <text>{{ collectionFlag ? '已收藏' : '收藏' }}</text>
</view> </view>
<view class="opera-list" @click="arrowUp(index)"> <view class="opera-list" @click.stop="arrowUp(index)">
<text>收起</text> <text>收起</text>
<u-icon name="arrow-up" color="#9EA5BB"></u-icon> <u-icon name="arrow-up" color="#9EA5BB"></u-icon>
</view> </view>
</view> </view>
</u-collapse-item> </view>
</uni-list> </uni-list>
</u-collapse> <u-loadmore :status="loadStatus" :margin-bottom="40" />
</view> </view>
</view> </view>
<view class="u-flex default" v-if="count === 0"> <view class="u-flex default" v-if="lists.length === 0">
<view> <view>
<image :src="defaultImg" /> <image :src="defaultImg" />
</view> </view>
...@@ -107,19 +106,18 @@ export default { ...@@ -107,19 +106,18 @@ export default {
components: { components: {
answerSheet, answerSheet,
answerExplanation, answerExplanation,
uniList uniList,
}, },
data() { data() {
return { return {
itemStyle: {
background: '#fff',
padding: '0rpx 20rpx',
margin: '10rpx 0',
'border-radius': '30rpx 30rpx 0 0'
},
keyword: '', keyword: '',
lists: [], lists: [],
arrIndex: null, arrIndex: '',
currentPage: 1,
pageSize: 10,
loadStatus: 'loadmore',
isLoadMore: false, //是否加载中
total: 0
} }
}, },
onLoad(e) { onLoad(e) {
...@@ -130,46 +128,57 @@ export default { ...@@ -130,46 +128,57 @@ export default {
defaultImg() { defaultImg() {
return process.uniEnv.qn_base_url + 'no-search.png' return process.uniEnv.qn_base_url + 'no-search.png'
}, },
count() {
return this.lists.length
},
collectImg() { collectImg() {
const info = this.lists.find(v => v.index === this.arrIndex) const info = this.lists.find((v) => v.index === this.arrIndex)
const name = info?.collectionFlag ? 'collected.png' : 'collect.png' const name = info?.collectionFlag ? 'collected.png' : 'collect.png'
return process.uniEnv.qn_base_url + name return process.uniEnv.qn_base_url + name
}, },
collectionFlag() { collectionFlag() {
const info = this.lists.find(v => v.index === this.arrIndex) const info = this.lists.find((v) => v.index === this.arrIndex)
return info ? info.collectionFlag : false return info ? info.collectionFlag : false
},
},
onReachBottom() {
//上拉触底函数
if (!this.isLoadMore) {
//此处判断,上锁,防止重复请求
this.isLoadMore = true
this.currentPage += 1
this.init()
} }
}, },
methods: { methods: {
init() { init() {
const data = { const data = {
questionWarehouseId: this.questionWarehouseId, questionWarehouseId: this.questionWarehouseId,
keyWord: this.keyword keyword: this.keyword,
current: this.currentPage,
size: this.pageSize,
} }
uni.showLoading({ uni.showLoading({
title: '加载中' title: '加载中',
}) })
this.$u.api.searchQuestion(data).then(res => { this.loadStatus = 'loading'
this.$u.api.searchQuestion(data).then((res) => {
uni.hideLoading() uni.hideLoading()
this.lists = res.length > 0 ? res.map((v, i) => { this.total = res.total
const lists =
res?.records.length > 0
? res?.records.map(v => {
const rightKey = v.answer.split(',') const rightKey = v.answer.split(',')
const content = JSON.parse(v.content) const content = JSON.parse(v.content)
const answerList = content.choiceList.map(item => { const answerList = content.choiceList.map((item) => {
return { return {
sort: item.value, sort: item.value,
text: item.label, text: item.label,
checked: rightKey.includes(item.value), checked: rightKey.includes(item.value),
confirm: rightKey.includes(item.value) confirm: rightKey.includes(item.value),
} }
}) })
return { return {
id: v.id, id: v.id,
index: i,
answer: v.answer, answer: v.answer,
title: content.title, title: content.title,
type: v.echoMap.questionTypeId, type: v.echoMap.questionTypeId,
...@@ -177,46 +186,58 @@ export default { ...@@ -177,46 +186,58 @@ export default {
explain: v.analysis, explain: v.analysis,
rightKey: rightKey, rightKey: rightKey,
collectionFlag: v.collectionFlag, collectionFlag: v.collectionFlag,
submitStatus: true submitStatus: true,
} }
}) : [] })
: []
this.lists = this.lists.concat(lists)
if (res.records.length < this.pageSize) {
//判断接口返回数据量小于请求数据量,则表示此为最后一页
this.isLoadMore = true
this.loadStatus = 'nomore'
} else {
this.isLoadMore = false
}
this.status = 'nomore'
}) })
}, },
itemChange(e) { itemChange(e) {
this.arrIndex = e.show ? e.index : null this.arrIndex = e
}, },
search(val) { search(val) {
if (val){ if (val) {
this.keyword = val this.keyword = val
let history = this.searchHistory.filter(v => v !== val) let history = this.searchHistory.filter((v) => v !== val)
history.unshift(val) history.unshift(val)
if (history.length > 9) { if (history.length > 9) {
history.splice(9, 1) history.splice(9, 1)
} }
this.$u.vuex('searchHistory', history) this.$u.vuex('searchHistory', history)
this.lists = []
this.init() this.init()
} }
}, },
collection(item) { collection(item) {
const action = item.collectionFlag ? 'removeCollection' : 'joinCollection' const action = item.collectionFlag ? 'removeCollection' : 'joinCollection'
this.$u.api[action]({questionId: item.id}).then(res => { this.$u.api[action]({ questionId: item.id }).then((res) => {
if(res) { if (res) {
const msg = item.collectionFlag ? '取消收藏成功' : '收藏成功' const msg = item.collectionFlag ? '取消收藏成功' : '收藏成功'
this.$u.toast(msg) this.$u.toast(msg)
item.collectionFlag = !item.collectionFlag item.collectionFlag = !item.collectionFlag
} }
}) })
}, },
arrowUp(index) { arrowUp() {
this.$refs[`collapse${index}`][0].headClick() this.arrIndex = ''
} },
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.search { .search {
height: 100vh; min-height: 100vh;
flex-direction: column; flex-direction: column;
background-color: #f8fafd; background-color: #f8fafd;
background-image: linear-gradient(to top, #f8fafd 0%, #e9f3ff 50%); background-image: linear-gradient(to top, #f8fafd 0%, #e9f3ff 50%);
...@@ -237,9 +258,17 @@ export default { ...@@ -237,9 +258,17 @@ export default {
color: #2953ff; color: #2953ff;
} }
} }
.results {
width: 100%;
}
.result { .result {
margin-top: 30rpx; margin-top: 30rpx;
width: 100%; width: 100%;
.list-item {
background: #fff;
padding: 30rpx 20rpx;
margin: 10rpx 0;
border-radius: 30rpx 30rpx 0 0;
.head { .head {
width: 100%; width: 100%;
height: 60rpx; height: 60rpx;
...@@ -263,6 +292,7 @@ export default { ...@@ -263,6 +292,7 @@ export default {
} }
.arrow { .arrow {
padding-left: 20rpx; padding-left: 20rpx;
margin-top: -10rpx;
text { text {
color: #2953ff; color: #2953ff;
font-size: 28rpx; font-size: 28rpx;
...@@ -295,7 +325,7 @@ export default { ...@@ -295,7 +325,7 @@ export default {
} }
} }
.opera { .opera {
padding: 30rpx 0; padding-top: 30rpx;
justify-content: space-between; justify-content: space-between;
color: #5a6073; color: #5a6073;
font-size: 28rpx; font-size: 28rpx;
...@@ -315,12 +345,13 @@ export default { ...@@ -315,12 +345,13 @@ export default {
} }
} }
} }
}
.default { .default {
flex-flow: column; flex-flow: column;
flex: 1; flex: 1;
justify-content: center; justify-content: center;
.no-result { .no-result {
color: #9EA5BB; color: #9ea5bb;
font-size: 28rpx; font-size: 28rpx;
} }
} }
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
bg-color="#fff" bg-color="#fff"
v-model="keyword" v-model="keyword"
@custom="search" @custom="search"
@search="search"
></u-search> ></u-search>
</view> </view>
...@@ -32,7 +31,7 @@ ...@@ -32,7 +31,7 @@
> >
</view> </view>
<view class="u-flex clear" @click="removeHistory"> <view class="u-flex clear" @click="removeHistory" v-if="history.length > 0">
<image :src="deleteImg"></image> <image :src="deleteImg"></image>
<view>清空搜索历史记录</view> <view>清空搜索历史记录</view>
</view> </view>
...@@ -113,6 +112,9 @@ export default { ...@@ -113,6 +112,9 @@ export default {
.history { .history {
margin-top: 20rpx; margin-top: 20rpx;
flex-wrap: wrap; flex-wrap: wrap;
max-height: 190rpx;
overflow: hidden;
align-items: flex-start;
.history-list { .history-list {
padding: 20rpx 25rpx; padding: 20rpx 25rpx;
background: #fff; background: #fff;
......
...@@ -53,6 +53,7 @@ const store = new Vuex.Store({ ...@@ -53,6 +53,7 @@ const store = new Vuex.Store({
: '1414854649273384960', // 科目ID : '1414854649273384960', // 科目ID
// 如果vuex_version无需保存到本地永久存储,无需lifeData.vuex_version方式 // 如果vuex_version无需保存到本地永久存储,无需lifeData.vuex_version方式
vuex_version: '1.0.0', vuex_version: '1.0.0',
beginTime: null // 考试开始时间
}, },
mutations: { mutations: {
$uStore(state, payload) { $uStore(state, payload) {
......
This diff is collapsed.
<template>
<view class="chartsview">
<view class="charts-error"></view>
<view class="charts-font">{{errorMessage==null?'请点击重试':errorMessage}}</view>
</view>
</template>
<script>
export default {
name: 'qiun-error',
props: {
errorMessage: {
type: String,
default: null
},
},
data() {
return {
};
},
}
</script>
<style>
.chartsview {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
flex: 1;
justify-content: center;
align-items: center;
}
.charts-font{
font-size: 14px;
color: #CCCCCC;
margin-top: 10px;
}
.charts-error{
width: 128px;
height: 128px;
background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAUz0lEQVR4Xu1de3Bc1X3+zmp3jYVWfkPAgCWwY8zLEglNQCSW0yT9o2SQaDKdNulUykwfM+k09p+J3ImYIPJXi9yZzDSZZiwyaZuZBCwnNG1DMogEmUAAy7xs/MAyNhCMjWWtsK1deU/n23OvtLu6j3Pv3t29d71nxjOSde455/5+3/m9z7kCjRY4BR7eK7fkcmhrasLT37hbTAY+QYADigDHagwFYGhc7gZwHMAUgG4hMPzNe8RoWInTAECAnHl4r+yREt0DXWIbhx3cJ5fHP8TYjntFR4DTBDqUIwBmMrJDCtyPHDoQw0Q8jkeXinCLtECp43Gwh56R22IxTBbu+KFxOTbQJbo9DlW17rYASGdlNySeKl2JADpbkmKiait0mWhoXHZkmzE52CkocmvavvOsbMvl8MhAl+jlQrg2CQzu6BI9NV2Yw+T2AJiVo+DuL2kSeLQ1KfrC8kLcYbkYBv/pbjEWhjUNjUvSpk9KSAicm2tGXxjAaUcbewBkJAm6xeLBp1PJ2os06ttcDl8H0CEEaGnvGegSg2EAQZTW4B0AEntSS2ov0mhgJc5jmwT6IDEWi2E0zNZ2WEFhC4CZjCRxH7GwAfpbkmIkLC9EFQBg20BXeOySsNBGZx2OXkB6Vg5CgAbMZgD7BTDSkhTDOgM3+kSDAr7iANNz8n4hQRdxojUu9kTjVRurtKKAJwBIKZfPZPOuYWFgY6wlgV4hau+GNVjsnQKeAJDOSIp/Wt6lbSKeQG8jSOSdAbV+wisA7FxDSGAqBmwNS5DIiGIucyNwKiGedutTz3/3BgCb4JBJoGqDIJ2VW4REmxRog0S3lGgT/NlfY3RzCgJjQmJSCkxeDuDwBgCb8HAhvQkCIdCbSgQfmSPDmWGDzHsm1UqwjBEUAMbqERCeAEBGz2RknwR2uW0yAZQdL6DR+WEW90syXLmjtW8So0Jg9MoE9tSD4esZANUAAd1M5NAjGOULaaOkAzCKGEaj7Ar7AoBHEGxrSYqdOnxMZ+W3ZA59ZehxnWkC7yMlJkUMIy1x7IyaVPANAAMEHTlgTACO1rYERlqTot+J8nbp58C5VcEBDftnOEpAKAsAgYPAPgNZQbYFP3QeCAybJ/Bg2CVC2QDwCoJUAtudiJKuExCQLoZbPKirAoOHovuIThVByuXii2jE/C9I2TaXBYsfmThyahMtCWy1A4ERbj7rvvRI9aCa3F7pINm3n5XdXgtjFgHAYCQrW4v8bBo6MYFep5cwmEefuSwQpDNSRoq9+osdrqRaGBqXMhfDVi8gWASAdEbuswuyGCKNSLatBygXBHUqAQohMmHESAKrqzSro4TIS2yOq10dVQQAuyKQUoC7BXnIxHQWwwL4ay/qIM/8DHaFJuijv7M99QzaNmAx6hzQFsvhKSmxvakJo7oHUooA4MUA0wHBTDYfQnVUB6bFnLc1JHqiFgPwxPnSzhKjLUn0B+UpsDoqFkOfLvO5HN8AMN5lOJUU2+2IMD0ne0QOtCcq0k7OANe1VGToag7qaBRXeiFFAJjOyBENsV20Jqcgj2FQHgvyJWYvAQfPAJuvAv7198ADm4DMHJBKAmuag5ypemPpGNiVWk2pDcCDDDQCPTU7EOgmjrxMRgA8dgBYmwJOXwBuWgH87m3gz26OLgDy6q9G9RSLvIAymFZUGsaCjJzE7qB1+vvngXRGQebG5QB/P30eaF2iQBHllk8wxdDfGq/eYVLLQJBfEOQNOpk3/Bg86hbA8iAZwt2/a78asX8zsKRJ/fzYQeDttFIHUbcJqi0JnM4FaOX9g2Sw7lgHTgPTs0DHRxTjT5wDtqzTfTr8/aoJArfTwX055P1519q6apGV4v8/XlU6nzv/vo8CvzwK3L0W2LS6Wquo/DzVAoFrMiivyzVSvpUnycIMVAUU///2kgIC9b+pDqq5jirMVXEX0RUAfMkwgoDrMoFQBUbUcoqxVFJsrdQCtAAQZhBUijChGlfiwdSSypx81gaAAQLLA6OhIlaNF2MGqriMm1cFqJoEtlai0lobAIzqZbPYF7RrV2N+BT79L99c8Eh+dzI474RGYSqB9qDyBuaLawMgnZE8Exjau24C56TPAZ8+vsD0594GPrHW50DWjwVuD2gBwDgm/q1AX6VOB/v5YeDWNerlXnsf+MKGYF/ULQvrdTZXAFQioeN1kVHqTxuAgSo2xiWCdk+DVgWuAEjPyt31XqARJYAZa92ZSqq7CMttjgCoh1r9cgkU1ueDuq7PEQDTs/JY0Nm8sBI0gusKxCCMZDIogsyqzJIDiA3YAqCx+yvDs4BHLVsKBFoPEPDLNYbToUCZUsASAFHY/SfTCxWtq5qBK4ziEB2a1VmfsqTAIgBUupLXL/Evshj0NNCaBM7NAr89sTDSp64HOj/id+ToP1eOR7AYAD4qg6tBwufeARhabV8BfPJaFWxZEgeSMWDTmstaApD8vuMCRQAI47Gs37wFrG4GrksBR882mG212VhW3rpEtPvZiL6OhvmZyOszFPm7D6qqX+76L6xfGIH/l7mkVMGNKy773Z8njIyh1081cfHBkJAEfgqZv2kV8Cmj4HP/H4ADZ1RBqNmYbfvEtV7hVX/9/X7HYR4AYUr6PPmmYjSZ/7kblRT47yOK8Uyu8DxA6xXqHADVw2XsARQhuSWBFV7rBeYBoHsyuNJ7582zwBNHgNVLgb+8TTH/8YOq/o+7ffPVCwynpAiC+W+cUfOcnwOuvlIdO4ti86MG5gGQdrkFtFoE2fUykJ4F+u4AknHgx6+pnf/ZduCW1QD9f3oDPA/A5tcFpA3x8ingxXcVuPJ61Dgt27MRuKG1Wm8c6DyevYE8AMJk/f/nq8BNK5VeN10/k8mvnwZ+ZRw1pfjnYdCOq1VZuJd2/Bzwv0cXGL9hpdr1PGNIgMUF8Oe3AquWehk1FH0nUknR6WUleQCENe37vZeUFOi/AyhUDbQL/JwE5q4ngI4YNxBxl7NiZ5kBoCePAb9/R4mBq64EejcGX9DhhTl++sYTaPdya7sCgPoySM1LvujzM8Dzd3cuMNy08ikZeBqYqoE7njv1t28p3c3f/+hapSLs2jszAI1Luo40JMn4j64s7v3PzympQNeSgLtnLfDxiHkYXkvGFAA0r2Yjsf3sPF0km/r/H+9aEP8P8ORPEhh5ecErIPNpGLJxF7/3oWLcfesV80rboQ+UyDf7f3HTYuPx+XeAX00Ct68BPn0D8O8TasyvbgZakrpvEIp+nuyAPACmM/KsW7k3b+N4/ABA5lSq8cIH0/o39f9f3KoYQYab0uDnR4BjZ4Gv3LYAgB+9qiQB+xe2X0+q4kw22hL8V9roTXz3BTXP1z6mVAJzDfxHqUIDNELN02f9hI7/T6v7zSklbml8MfFCXzzoRp1Pv57n/Wj5M/RrJnn2/QG4rlVJIPM4+DfvWVjB9/YpFfFJIzBEZv7iMHAirUT+59qBO2zcu7zuf1ftfrOKtxAUVElBF3cGTTtzPBaNtiaFhRy0nlHoGIDc/a+fUlez0Dq/ZY26kiXoRoCR0G5WvRkoMnf0/xwFXnwPiAFINgE3LAOmLwKnjPEoKejfW7Xj0+q0Mef92seLVQNLvF95H/iTm4CNJfZC0O8e5HheAkJCNwBkHsv++zuDXKq/sSgd/uu1xf47gfnWOR5mVeNe1Qx8adOClW8l+n8woQzDL9682Cik7fDTg8D1KaD3Zn9rrdRTlHA0mmmvLJJOHopERFg8AK+EIgiomo6dAy7OKdXwNx3AiRngRy8DOQl0XgN8Zp19tJDMJZMLRX/pOh7eqwhMNRCmZtpkVreiePEECADLj0SH6WWd1kIgPP6G2sVty4Av36pE/+43gDMX1K6+b8NiEJhGHqXEV263Bwm9AY731Q6gJVF7qnDnT7ynbCS6zDx8QpXJgNi8JPBwmljouoC1f3X7FdDHH30DmMsBG1YosU+m0Vg8exG4pkV5B2begCFg5htIMCf7gDOadsCXbgGusbEjqkkbMp+iv7QR5POG+eUGADL/rWmgSQBzEui4CvjT9cBUBnjikPqbCYJzF4EfGBdNMW5g5xmYBKY3cOgMsGEVcClXTVY7z+WkArxUCIkoFIA6keLXx4DXTiuDb2ubihdkcsCnDZ+fDPzZIRX+pYvJRBPF6GfbVPRQt124FE4AULJZBOe0YwFUAZG9mv2Fd4G9J4tdOEb0fnNCVQxtuQHoug4gCH5yADgxrdjtZPRZeQqvnFISgEmiMDV6ZjbueP0DgBm9PYes9Tizhr84mr98Ol9Qwps66OszZOyF+WS2GSQKiw2gCcD6BkBMABT9DNLY6XFKgicnVWCIuQR6BMwb0Ojz0hhipg3x5dsilR6ubwA0xwGCgDvaLsJHJtPPP/yBKvQg862SQG5gYByArZI5ELc1+Pi7PgCmM5JfuArNRZBuL0uGMkdg5dsXPktwcPfS4PMq9s1xzDAxS9KZlYxQ0wdAlOIAFOPU5Wxm1s6KKfTzqbvLYT7HNWMANCZZixihVp8AYHSPlrxdWpcMMiN8/Pmua1QW0E+LajbQeNf6A4BZ1MGw5z98bDFLybAnDqvYPptOkMcJGBGuB+BraReFRCYU/OPXgVMfWjOW+p4Gn1nu5RbedZMIHOe7L6pevJa+EqlvtzWU9XdPoeCQ1AM6vbCp+0t3P3c96wJZzMHG6l4WdJR7VuCR54ELc6q4xEu0sCymBfiwp2ygbj1AgOvzPBQjcU8dL9bpNPQops1dT7sgCGYxScSxGURa2+rubXh+mWo84KkeICu7IcFbQEPb6Pqx6mdpXBV9HvlgoRiktLS7nJcw9X4ipuIM9CJWXqHSxVFqXkrDRZgOhdgROZsDvv8ScMnMWgiV9uWOXxfACR6qErp8BJpVY7KF2UW3UrUwgEQC51qTQrtiU1UFz8pJIRDqj67MzAGPva5EPsO7zPkHwXyO98NX1IeomE4myFgnQHAxysiQMkPBLIZlsWoEmrYLyHfxdC6g1i/PxfJkD9O/bOWIf/OaGep7Nur8eEwBoNCFpHQw6wb/9s7yDcwq0FDbBVwAQAQ8gULCUVSPn1y4J4BlX+uWqfIv85iXFaHN4g7uaJ4INr84wtLzrAReeFs99Ve3Fx8O/ZfnVd3hXdeqbxOFuXnxAOYBENaLoZwITWnA3ct6APN0L/tTbFOEXxFXP3OnT11UI5HxhY2HPnjYhCqFpeY8+8BWGGnk89/fB9AOYWPRCXMLYW1eDMB5APCHqBaGEAisDWCI+PDZ4ttDSplEYKxfody79uUKKOapI55J4Glg2gIsJqF6IYAIMvZh/2MGQG5bA3ymLXgI0IATAj3ml0G8VmxLieOtS4SnlYXufoByydoUUwdHeUhkdk6dLqbzwCNndO8KG5nO8DGZblYHs2bwJweLgWQGmFgbyDgBG08OXx+AB1K0IAv/3ctHPP1cExO6G0LKBYDu82Q+q4a52ynSWTlUGEFkKpht+ZJiu4L/T8/g8+1Ac6JY/ejObdcvlRSWRWc8vSUlRt3S9mXdEKJzRrDcFwzL86ynZ7qYzW+tAA3Knx5Qhaa0GcotrHQ706f16T6J0ZYk+r3cE1SEuHRGTgDYHBZGVWIdhcz3WhlcuJ7CdDGDUn/crozJcprbDtYCAeDpY5PFAIiYO+iV2Nz15udcyk0Xc+7CqiPeKPLAxvJAoPO5WOOr7KMugTttEBQBoJ7VQCHzGS9wqiX0AiyCwKxBqBYIjPA9v9LuJK0n4gn0ul0XE5m7gr0wpbSveYqmnDF0nw3qWhm3gI4OCHQkyiIA6NwXoEuMsPSjH8/IX2ausiuiIcjawXJtAXOVgYBAYjKVRKedYWj3vYDQJ4cqy8rwjO4GAq502uWGdyfjsvHFkPDw2n4lAoOphHjQaalOIHACkSUAqF/SWUy6BR6iQLt6WaMERlqTot8rCBheTiTQYWcM2h539BKCrBcih/09dEBAvuWAYW5eMh8x9JnXyBu5hS359xQYa4ljp+N51ygUioSdaUGvjyBIJbDdLdpHKV7YxyqxxNyBIwDq0SMImiE1Gk870GOuz+oEGN1E1xPvUTo6ViNm1GpaTyCwC/O7AoChRwnsq9VbNuZ1pIA2CCy9BIk9rgDg9OmMHAbw9QYzQkkBLRAYkcNRAMoIBPYLoE8LAAYI6j5TGEr26i3KUyFo4ZDaANBMReott9ErUAq41RI4TaYNAA4ShWNkgVI2QoPZVRO5vYItAIbGZYcQWJZZiv2DncIoh8x/XCLSN4u6ESSqfw8UAEPjeaOvj1+kBLCuqQmd37hb8Gfz+0Juueio0jGS6/ZTDGq+6CIJMLhPLk+cx9lYDO1k+kPPyBEhMDnQJQbNh1g4ks1iopErqDhe9scT6JnLYBgC91vN5hbrd1vhIgB851nZlsvhWLYZKyj6DWmAgS6xrXCwhlHoRtry/s4a/1QSHWY4l6FcKbCtcNOxT0ygpyUp6KH5apY2gLHrt1AFCIHOWAwdpgoonKURKvZFc9eHuKtjQHcpY/Mle3NoQw7dsgkTfr4VXDq5rRH48F7Zk8uhrakJo1bMNwdqZA1d+empgx3zPQ3iobMnN9Bu3AYIPFDcoWu1mc+lBAIADsQDpshhpGEY+gNDLZgfCADoNSQvqPLkTSuxfuNq7IwJhODTCv4YUYunsjkc3f8+Bo7M4v8KYy5cixmPKVxXaWymnDWXLQGGxiVjAmaCoZy1XPbPSon9O+4VHSYhaIdJid2lhJESUzvu1f80nBNhywYA3cY5oOhI8uqlaLk+hfWXPUc1CHAijSOnL2CGXePAZKHBzd0PgEG50jZR6pZrTGXZpWwA+J248Vw4KNAAQDj4ULNVBA6Abz8ru8Ul9SVyITCVbUY/DRsjxLxLSmhdYSYEHh3oEiMch2rm0iXssqHSxI57xfZKU/ChZ+QjAOb1c6XnM+g3T4NKzRc4AIbGZR8TSeaCYzH0Ua8ZIeY8QzXbSBEAcvlSZyvwBKYPndb10LjkBQ1a4NV8P51u8zTQ6eynT+AA8LOIxjO1o0ADALWjfShmjhwACgNPoaCgsnWOO+VLwrJOq3VEDgCGLrbMjdeK0EEGZqr9DpEDgFXgqdpEK50vlsPUQJf/nHwt1///89bqDjCPWPAAAAAASUVORK5CYII=");
background-position: center;
}
</style>
<template>
<view class="container loading1">
<view class="shape shape1"></view>
<view class="shape shape2"></view>
<view class="shape shape3"></view>
<view class="shape shape4"></view>
</view>
</template>
<script>
export default {
name: 'loading1',
data() {
return {
};
}
}
</script>
<style scoped="true">
.container {
width: 30px;
height: 30px;
position: relative;
}
.container.loading1 {
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
}
.container .shape {
position: absolute;
width: 10px;
height: 10px;
border-radius: 1px;
}
.container .shape.shape1 {
left: 0;
background-color: #1890FF;
}
.container .shape.shape2 {
right: 0;
background-color: #91CB74;
}
.container .shape.shape3 {
bottom: 0;
background-color: #FAC858;
}
.container .shape.shape4 {
bottom: 0;
right: 0;
background-color: #EE6666;
}
.loading1 .shape1 {
-webkit-animation: animation1shape1 0.5s ease 0s infinite alternate;
animation: animation1shape1 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation1shape1 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(16px, 16px);
transform: translate(16px, 16px);
}
}
@keyframes animation1shape1 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(16px, 16px);
transform: translate(16px, 16px);
}
}
.loading1 .shape2 {
-webkit-animation: animation1shape2 0.5s ease 0s infinite alternate;
animation: animation1shape2 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation1shape2 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-16px, 16px);
transform: translate(-16px, 16px);
}
}
@keyframes animation1shape2 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-16px, 16px);
transform: translate(-16px, 16px);
}
}
.loading1 .shape3 {
-webkit-animation: animation1shape3 0.5s ease 0s infinite alternate;
animation: animation1shape3 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation1shape3 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(16px, -16px);
transform: translate(16px, -16px);
}
}
@keyframes animation1shape3 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(16px, -16px);
transform: translate(16px, -16px);
}
}
.loading1 .shape4 {
-webkit-animation: animation1shape4 0.5s ease 0s infinite alternate;
animation: animation1shape4 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation1shape4 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-16px, -16px);
transform: translate(-16px, -16px);
}
}
@keyframes animation1shape4 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-16px, -16px);
transform: translate(-16px, -16px);
}
}
</style>
<template>
<view class="container loading2">
<view class="shape shape1"></view>
<view class="shape shape2"></view>
<view class="shape shape3"></view>
<view class="shape shape4"></view>
</view>
</template>
<script>
export default {
name: 'loading2',
data() {
return {
};
}
}
</script>
<style scoped="true">
.container {
width: 30px;
height: 30px;
position: relative;
}
.container.loading2 {
-webkit-transform: rotate(10deg);
transform: rotate(10deg);
}
.container.loading2 .shape {
border-radius: 5px;
}
.container.loading2{
-webkit-animation: rotation 1s infinite;
animation: rotation 1s infinite;
}
.container .shape {
position: absolute;
width: 10px;
height: 10px;
border-radius: 1px;
}
.container .shape.shape1 {
left: 0;
background-color: #1890FF;
}
.container .shape.shape2 {
right: 0;
background-color: #91CB74;
}
.container .shape.shape3 {
bottom: 0;
background-color: #FAC858;
}
.container .shape.shape4 {
bottom: 0;
right: 0;
background-color: #EE6666;
}
.loading2 .shape1 {
-webkit-animation: animation2shape1 0.5s ease 0s infinite alternate;
animation: animation2shape1 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation2shape1 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(20px, 20px);
transform: translate(20px, 20px);
}
}
@keyframes animation2shape1 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(20px, 20px);
transform: translate(20px, 20px);
}
}
.loading2 .shape2 {
-webkit-animation: animation2shape2 0.5s ease 0s infinite alternate;
animation: animation2shape2 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation2shape2 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-20px, 20px);
transform: translate(-20px, 20px);
}
}
@keyframes animation2shape2 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-20px, 20px);
transform: translate(-20px, 20px);
}
}
.loading2 .shape3 {
-webkit-animation: animation2shape3 0.5s ease 0s infinite alternate;
animation: animation2shape3 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation2shape3 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(20px, -20px);
transform: translate(20px, -20px);
}
}
@keyframes animation2shape3 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(20px, -20px);
transform: translate(20px, -20px);
}
}
.loading2 .shape4 {
-webkit-animation: animation2shape4 0.5s ease 0s infinite alternate;
animation: animation2shape4 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation2shape4 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-20px, -20px);
transform: translate(-20px, -20px);
}
}
@keyframes animation2shape4 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-20px, -20px);
transform: translate(-20px, -20px);
}
}
</style>
<template>
<view class="container loading3">
<view class="shape shape1"></view>
<view class="shape shape2"></view>
<view class="shape shape3"></view>
<view class="shape shape4"></view>
</view>
</template>
<script>
export default {
name: 'loading3',
data() {
return {
};
}
}
</script>
<style scoped="true">
.container {
width: 30px;
height: 30px;
position: relative;
}
.container.loading3 {
-webkit-animation: rotation 1s infinite;
animation: rotation 1s infinite;
}
.container.loading3 .shape1 {
border-top-left-radius: 10px;
}
.container.loading3 .shape2 {
border-top-right-radius: 10px;
}
.container.loading3 .shape3 {
border-bottom-left-radius: 10px;
}
.container.loading3 .shape4 {
border-bottom-right-radius: 10px;
}
.container .shape {
position: absolute;
width: 10px;
height: 10px;
border-radius: 1px;
}
.container .shape.shape1 {
left: 0;
background-color: #1890FF;
}
.container .shape.shape2 {
right: 0;
background-color: #91CB74;
}
.container .shape.shape3 {
bottom: 0;
background-color: #FAC858;
}
.container .shape.shape4 {
bottom: 0;
right: 0;
background-color: #EE6666;
}
.loading3 .shape1 {
-webkit-animation: animation3shape1 0.5s ease 0s infinite alternate;
animation: animation3shape1 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation3shape1 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(5px, 5px);
transform: translate(5px, 5px);
}
}
@keyframes animation3shape1 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(5px, 5px);
transform: translate(5px, 5px);
}
}
.loading3 .shape2 {
-webkit-animation: animation3shape2 0.5s ease 0s infinite alternate;
animation: animation3shape2 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation3shape2 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-5px, 5px);
transform: translate(-5px, 5px);
}
}
@keyframes animation3shape2 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-5px, 5px);
transform: translate(-5px, 5px);
}
}
.loading3 .shape3 {
-webkit-animation: animation3shape3 0.5s ease 0s infinite alternate;
animation: animation3shape3 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation3shape3 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(5px, -5px);
transform: translate(5px, -5px);
}
}
@keyframes animation3shape3 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(5px, -5px);
transform: translate(5px, -5px);
}
}
.loading3 .shape4 {
-webkit-animation: animation3shape4 0.5s ease 0s infinite alternate;
animation: animation3shape4 0.5s ease 0s infinite alternate;
}
@-webkit-keyframes animation3shape4 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-5px, -5px);
transform: translate(-5px, -5px);
}
}
@keyframes animation3shape4 {
from {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
to {
-webkit-transform: translate(-5px, -5px);
transform: translate(-5px, -5px);
}
}
</style>
<template>
<view class="container loading5">
<view class="shape shape1"></view>
<view class="shape shape2"></view>
<view class="shape shape3"></view>
<view class="shape shape4"></view>
</view>
</template>
<script>
export default {
name: 'loading5',
data() {
return {
};
}
}
</script>
<style scoped="true">
.container {
width: 30px;
height: 30px;
position: relative;
}
.container.loading5 .shape {
width: 15px;
height: 15px;
}
.container .shape {
position: absolute;
width: 10px;
height: 10px;
border-radius: 1px;
}
.container .shape.shape1 {
left: 0;
background-color: #1890FF;
}
.container .shape.shape2 {
right: 0;
background-color: #91CB74;
}
.container .shape.shape3 {
bottom: 0;
background-color: #FAC858;
}
.container .shape.shape4 {
bottom: 0;
right: 0;
background-color: #EE6666;
}
.loading5 .shape1 {
animation: animation5shape1 2s ease 0s infinite reverse;
}
@-webkit-keyframes animation5shape1 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(0, 15px);
transform: translate(0, 15px);
}
50% {
-webkit-transform: translate(15px, 15px);
transform: translate(15px, 15px);
}
75% {
-webkit-transform: translate(15px, 0);
transform: translate(15px, 0);
}
}
@keyframes animation5shape1 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(0, 15px);
transform: translate(0, 15px);
}
50% {
-webkit-transform: translate(15px, 15px);
transform: translate(15px, 15px);
}
75% {
-webkit-transform: translate(15px, 0);
transform: translate(15px, 0);
}
}
.loading5 .shape2 {
animation: animation5shape2 2s ease 0s infinite reverse;
}
@-webkit-keyframes animation5shape2 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(-15px, 0);
transform: translate(-15px, 0);
}
50% {
-webkit-transform: translate(-15px, 15px);
transform: translate(-15px, 15px);
}
75% {
-webkit-transform: translate(0, 15px);
transform: translate(0, 15px);
}
}
@keyframes animation5shape2 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(-15px, 0);
transform: translate(-15px, 0);
}
50% {
-webkit-transform: translate(-15px, 15px);
transform: translate(-15px, 15px);
}
75% {
-webkit-transform: translate(0, 15px);
transform: translate(0, 15px);
}
}
.loading5 .shape3 {
animation: animation5shape3 2s ease 0s infinite reverse;
}
@-webkit-keyframes animation5shape3 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(15px, 0);
transform: translate(15px, 0);
}
50% {
-webkit-transform: translate(15px, -15px);
transform: translate(15px, -15px);
}
75% {
-webkit-transform: translate(0, -15px);
transform: translate(0, -15px);
}
}
@keyframes animation5shape3 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(15px, 0);
transform: translate(15px, 0);
}
50% {
-webkit-transform: translate(15px, -15px);
transform: translate(15px, -15px);
}
75% {
-webkit-transform: translate(0, -15px);
transform: translate(0, -15px);
}
}
.loading5 .shape4 {
animation: animation5shape4 2s ease 0s infinite reverse;
}
@-webkit-keyframes animation5shape4 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(0, -15px);
transform: translate(0, -15px);
}
50% {
-webkit-transform: translate(-15px, -15px);
transform: translate(-15px, -15px);
}
75% {
-webkit-transform: translate(-15px, 0);
transform: translate(-15px, 0);
}
}
@keyframes animation5shape4 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(0, -15px);
transform: translate(0, -15px);
}
50% {
-webkit-transform: translate(-15px, -15px);
transform: translate(-15px, -15px);
}
75% {
-webkit-transform: translate(-15px, 0);
transform: translate(-15px, 0);
}
}
</style>
<template>
<view class="container loading6">
<view class="shape shape1"></view>
<view class="shape shape2"></view>
<view class="shape shape3"></view>
<view class="shape shape4"></view>
</view>
</template>
<script>
export default {
name: 'loading6',
data() {
return {
};
}
}
</script>
<style scoped="true">
.container {
width: 30px;
height: 30px;
position: relative;
}
.container.loading6 {
-webkit-animation: rotation 1s infinite;
animation: rotation 1s infinite;
}
.container.loading6 .shape {
width: 12px;
height: 12px;
border-radius: 2px;
}
.container .shape {
position: absolute;
width: 10px;
height: 10px;
border-radius: 1px;
}
.container .shape.shape1 {
left: 0;
background-color: #1890FF;
}
.container .shape.shape2 {
right: 0;
background-color: #91CB74;
}
.container .shape.shape3 {
bottom: 0;
background-color: #FAC858;
}
.container .shape.shape4 {
bottom: 0;
right: 0;
background-color: #EE6666;
}
.loading6 .shape1 {
-webkit-animation: animation6shape1 2s linear 0s infinite normal;
animation: animation6shape1 2s linear 0s infinite normal;
}
@-webkit-keyframes animation6shape1 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(0, 18px);
transform: translate(0, 18px);
}
50% {
-webkit-transform: translate(18px, 18px);
transform: translate(18px, 18px);
}
75% {
-webkit-transform: translate(18px, 0);
transform: translate(18px, 0);
}
}
@keyframes animation6shape1 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(0, 18px);
transform: translate(0, 18px);
}
50% {
-webkit-transform: translate(18px, 18px);
transform: translate(18px, 18px);
}
75% {
-webkit-transform: translate(18px, 0);
transform: translate(18px, 0);
}
}
.loading6 .shape2 {
-webkit-animation: animation6shape2 2s linear 0s infinite normal;
animation: animation6shape2 2s linear 0s infinite normal;
}
@-webkit-keyframes animation6shape2 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(-18px, 0);
transform: translate(-18px, 0);
}
50% {
-webkit-transform: translate(-18px, 18px);
transform: translate(-18px, 18px);
}
75% {
-webkit-transform: translate(0, 18px);
transform: translate(0, 18px);
}
}
@keyframes animation6shape2 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(-18px, 0);
transform: translate(-18px, 0);
}
50% {
-webkit-transform: translate(-18px, 18px);
transform: translate(-18px, 18px);
}
75% {
-webkit-transform: translate(0, 18px);
transform: translate(0, 18px);
}
}
.loading6 .shape3 {
-webkit-animation: animation6shape3 2s linear 0s infinite normal;
animation: animation6shape3 2s linear 0s infinite normal;
}
@-webkit-keyframes animation6shape3 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(18px, 0);
transform: translate(18px, 0);
}
50% {
-webkit-transform: translate(18px, -18px);
transform: translate(18px, -18px);
}
75% {
-webkit-transform: translate(0, -18px);
transform: translate(0, -18px);
}
}
@keyframes animation6shape3 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(18px, 0);
transform: translate(18px, 0);
}
50% {
-webkit-transform: translate(18px, -18px);
transform: translate(18px, -18px);
}
75% {
-webkit-transform: translate(0, -18px);
transform: translate(0, -18px);
}
}
.loading6 .shape4 {
-webkit-animation: animation6shape4 2s linear 0s infinite normal;
animation: animation6shape4 2s linear 0s infinite normal;
}
@-webkit-keyframes animation6shape4 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(0, -18px);
transform: translate(0, -18px);
}
50% {
-webkit-transform: translate(-18px, -18px);
transform: translate(-18px, -18px);
}
75% {
-webkit-transform: translate(-18px, 0);
transform: translate(-18px, 0);
}
}
@keyframes animation6shape4 {
0% {
-webkit-transform: translate(0, 0);
transform: translate(0, 0);
}
25% {
-webkit-transform: translate(0, -18px);
transform: translate(0, -18px);
}
50% {
-webkit-transform: translate(-18px, -18px);
transform: translate(-18px, -18px);
}
75% {
-webkit-transform: translate(-18px, 0);
transform: translate(-18px, 0);
}
}
</style>
<template>
<view>
<Loading1 v-if="loadingType==1"/>
<Loading2 v-if="loadingType==2"/>
<Loading3 v-if="loadingType==3"/>
<Loading4 v-if="loadingType==4"/>
<Loading5 v-if="loadingType==5"/>
</view>
</template>
<script>
import Loading1 from "./loading1.vue";
import Loading2 from "./loading2.vue";
import Loading3 from "./loading3.vue";
import Loading4 from "./loading4.vue";
import Loading5 from "./loading5.vue";
export default {
components:{Loading1,Loading2,Loading3,Loading4,Loading5},
name: 'qiun-loading',
props: {
loadingType: {
type: Number,
default: 2
},
},
data() {
return {
};
},
}
</script>
<style>
</style>
# uCharts JSSDK说明
1、如不使用uCharts组件,可直接引用u-charts.js,打包编译后会`自动压缩`,压缩后体积约为`98kb`。
2、如果100kb的体积仍需压缩,请手动删除u-charts.js内您不需要的图表类型,如k线图candle。
3、config-ucharts.js为uCharts组件的用户配置文件,升级前请`自行备份config-ucharts.js`文件,以免被强制覆盖。
3、config-echarts.js为ECharts组件的用户配置文件,升级前请`自行备份config-echarts.js`文件,以免被强制覆盖。
# v1.0转v2.0注意事项
1、opts.colors变更为opts.color
2、ring圆环图的扩展配置由extra.pie变更为extra.ring
3、混合图借用的扩展配置由extra.column变更为extra.mix.column
4、全部涉及到format的格式化属性变更为formatter
5、不需要再传canvasId及$this参数,如果通过uChats获取context,可能会导致this实例混乱,导致小程序开发者工具报错。如果不使用qiun-data-charts官方组件,需要在new uCharts()实例化之前,自行获取canvas的上下文context(ctx),并传入new中的context(opts.context)。为了能跨更多的端,给您带来的不便敬请谅解。
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
{
"id": "qiun-data-charts",
"displayName": "秋云 ucharts echarts 高性能跨全端图表组件",
"version": "2.3.3-20210706",
"description": "uCharts v2.3上线,支持nvue!全新官方图表组件,支持H5及APP用ECharts渲染图表,uniapp可视化首选组件",
"keywords": [
"ucharts",
"echarts",
"f2",
"图表",
"可视化"
],
"repository": "https://gitee.com/uCharts/uCharts",
"engines": {
"HBuilderX": "^3.1.0"
},
"dcloudext": {
"category": [
"前端组件",
"通用组件"
],
"sale": {
"regular": {
"price": "0.00"
},
"sourcecode": {
"price": "0.00"
}
},
"contact": {
"qq": "474119"
},
"declaration": {
"ads": "无",
"data": "插件不采集任何数据",
"permissions": "无"
},
"npmurl": ""
},
"uni_modules": {
"dependencies": [],
"encrypt": [],
"platforms": {
"cloud": {
"tcb": "y",
"aliyun": "y"
},
"client": {
"App": {
"app-vue": "y",
"app-nvue": "y"
},
"H5-mobile": {
"Safari": "y",
"Android Browser": "y",
"微信浏览器(Android)": "y",
"QQ浏览器(Android)": "y"
},
"H5-pc": {
"Chrome": "y",
"IE": "y",
"Edge": "y",
"Firefox": "y",
"Safari": "y"
},
"小程序": {
"微信": "y",
"阿里": "y",
"百度": "y",
"字节跳动": "y",
"QQ": "y"
},
"快应用": {
"华为": "y",
"联盟": "y"
}
}
}
}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
## 1.0.6(2021-03-18)
- 新增 hide-second 属性,时间支持仅选择时、分
- 修复 选择跟显示的日期不一样的 bug
- 修复 chang事件触发2次的 bug
- 修复 分、秒 end 范围错误的 bug
- 优化 更好的 nvue 适配
This diff is collapsed.
This diff is collapsed.
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