Skip to content

S
self-support
Commit 65c96d3e authored by 刘用法's avatar 刘用法
Browse files
Options

Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

parents 44717ef0 3d175aa5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 493 additions and 399 deletions
src/components/complete-check/complete-check.vue
View file @ 65c96d3e
......@@ -116,7 +116,7 @@
},
confirm() {
if(this.pass) {
this.$emit('confirm')
this.$emit('change')
} else {
let data = this.listData.find((item, index) => {
return item.pass == false;
......
src/components/createCom/XhSelect.vue
View file @ 65c96d3e
<!-- ******************* 单个下拉选择 ******************* -->
<template>
<view class="xh-select">
<view class="xh-select" :style="{'width': fieldsWidth}">
<u-input :value="text" disabled @click="show=true" :placeholder="placeholder" :placeholder-style="placeholderStyle"
:custom-style="customStyle" :clearable="false"></u-input>
<u-select :list="settings" v-model="show" @confirm="actionSheetCallback" safe-area-inset-bottom></u-select>
......@@ -68,7 +68,10 @@
'font-size':'26rpx',
'height': '76rpx'
}
}
},
fieldsWidth() {
return this.item.fieldsWidth ? (this.item.fieldsWidth + 'rpx') : '100%'
},
},
watch: {},
mounted() {},
......
src/components/createCom/XhServiceMeasure.vue
View file @ 65c96d3e
<!-- ******************* 单级/多级 选择 ******************* -->
<template>
<view class="picker-box">
<view class="picker-box" :style="{'width': fieldsWidth}">
<view class="u-flex u-row-between text-view" @click="openPicker">
<view class="txt u-flex-1 text-title">{{text||''}}</view>
<u-icon class="input-icon" color="#2272FF" :name="showPicker ? 'arrow-up' : 'arrow-down'"></u-icon>
......@@ -68,7 +68,10 @@
val = data[0].measureTypeName + "-" + data[0].measureName
}
return val
}
},
fieldsWidth() {
return this.item.fieldsWidth ? (this.item.fieldsWidth + 'rpx') : '100%'
},
},
watch: {
specificationId(val, oldVal){
......
src/components/upload/index.js
View file @ 65c96d3e
......@@ -58,7 +58,7 @@ export default {
imgList[res.fileIndex]
self.imgList = imgList
// 多文件上传每个文件进度条
console.log(res,'res---onProgressUpdate')
//console.log(res,'res---onProgressUpdate')
},
onEachUpdate(res){
// 多文件上传每个文件上传成功触发
......@@ -67,7 +67,7 @@ export default {
imgList[res.fileIndex].src = uploader.qiniuTokenObj.visitPrefix + res.url
}
self.imgList = imgList
console.log(res,'res---onEachUpdate')
//console.log(res,'res---onEachUpdate')
},
cardType: category,
...config
......@@ -75,8 +75,8 @@ export default {
// 不需要进度条等可直接获取
let res = await uploader.qnImgUpload(options)
console.log(self.imgList,'self.imgList')
console.log(uploader,uploader.qiniuTokenObj,'qiniuTokenObj')
// console.log(self.imgList,'self.imgList')
// console.log(uploader,uploader.qiniuTokenObj,'qiniuTokenObj')
// let imgList = res.map(item=>{
// return {
// key:item,
......
src/components/upload/qiniup.js
View file @ 65c96d3e
......@@ -91,11 +91,11 @@ export default {
}
qiniuUploader.upload(params, (res) => {
console.log(res,'res')
console.log(res,'res111')
let inLen = self.maximum - fileList.length
if (inLen > 0) {
item.src = file
item.key = res.key || res.src
item.key = res.url
self.fileMaps.push(item);
self.keys.push(item.key)
if(submit) {
......
src/pages.json
View file @ 65c96d3e
This diff is collapsed.
src/pages/learn/answer.vue
View file @ 65c96d3e
<template>
<view class="content">
<view class="">
<view class="" style="padding-left: 94rpx; margin: 36rpx 0">
<text class="dx">单选</text
><text class="all">{{ ExaminationQuestions.progress }}</text>
<view class="answer-box">
<u-navbar
title="考核认证"
:background="background"
:border-bottom="false"
></u-navbar>
<view class="content">
<view class="">
<text class="dx">单选</text>
</view>
<view class="" style="text-align: center">
{{ ExaminationQuestions.question.content }}
<view class="topicView">
<text class="topictext">{{
ExaminationQuestions.question.content
}}</text>
</view>
<view class="" style="margin-top: 130rpx">
<view class="">
<view class="list-box">
<view
v-for="(item, index) in list"
......@@ -21,6 +27,7 @@
</view>
</view>
<button class="btn" @click="getNextClick()">下一题</button>
<text class="all">{{ ExaminationQuestions.progress }}</text>
</view>
</view>
</template>
......@@ -47,6 +54,9 @@ export default {
content: "",
},
],
background: {
backgroundColor: "#F4F5F7",
},
isSelect: false,
selectId: [],
userExamId: null,
......@@ -199,20 +209,57 @@ export default {
</script>
<style lang="scss">
.content {
width: 600rpx;
height: 800rpx;
.answer-box {
width: 750rpx;
height: 100vh;
/* background: #8F8F94; */
margin: 0 auto;
}
.content {
margin: 30rpx 30rpx;
overflow: hidden;
border-radius: 12rpx;
padding: 40rpx 30rpx 40rpx 30rpx;
background-repeat: no-repeat;
background-size: 66%;
background-color: #fff;
background-position: right bottom;
min-height: 800rpx;
}
.dx {
padding: 0rpx;
background: #2979ff;
border-radius: 8rpx;
background-color: #ff930d;
font-size: 20rpx;
color: #ffffff;
border-radius: 0px;
width: 72rpx;
height: 40rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
}
.topicView {
margin-top: 40rpx;
width: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
margin-bottom: 40rpx;
}
.topictext {
color: #333333;
font-size: 32rpx;
line-height: 48rpx;
font-weight: bold;
}
.num {
color: #2b85e4;
}
......@@ -263,10 +310,18 @@ export default {
/*未选择*/
.noselde {
background: #e4e7ed;
color: #959595;
border-radius: 20upx;
font-size: 20upx;
padding: 0 10upx;
margin-top: 30rpx;
background-color: #f4f5f7;
width: 100%;
padding: 40rpx 30rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: start;
-webkit-align-items: flex-start;
align-items: flex-start;
border-radius: 12rpx;
border: 2rpx solid transparent;
font-size: 28rpx;
}
</style>
src/pages/learn/assessment.vue
View file @ 65c96d3e
<template>
<view class="content">
<view class="title">考试规则说明</view>
<u-navbar
back-icon-color="#FFFFFF"
:background="background"
title-color="#fff"
:border-bottom="false"
></u-navbar>
<view class="title">考试规则</view>
<view class="test">
<view class="slogan"
>这是一场严肃的考试，请认真查看 规则，预祝您顺利通过考试！</view
>
<view class="text">
<text class="left">考试科目:</text
><text style="color: #007aff">服务规范</text>
</view>
<view class="text">
<text class="left">合格条件:</text
><text>随机20题,答对20题</text>
<text class="left">合格条件:</text><text>60分</text>
</view>
<view class="text">
<text class="left">考试时间:</text><text>30分钟</text>
</view>
<view class="text">
<text class="left">题目规则:</text
><text>题库100题,随机抽20题</text>
</view>
<view class="text">
<text class="left">备注说明:</text><text>无</text>
<text class="left">题目来源:</text><text>系统随机20题</text>
</view>
<button @click="getUserExamId()">开始考试</button>
</view>
<button @click="getUserExamId()">开始考试</button>
</view>
</template>
......@@ -77,32 +81,62 @@ export default {
<style>
.content {
margin: 187rpx 80rpx;
width: 750rpx;
height: 100vh;
overflow: auto;
background-color: #f4f5f7;
background-image: linear-gradient(to top, #f4f5f7 0%, #2272ff 50%);
background-size: 750rpx 600rpx;
background-repeat: no-repeat;
}
.title {
font-size: 17px;
text-align: center;
padding: 30rpx 30rpx 46rpx;
line-height: 40rpx;
font-size: 40rpx;
color: #fff;
}
.test {
margin: 0 0;
margin: 0 30rpx;
overflow: hidden;
border-radius: 12rpx;
padding-bottom: 60rpx;
background-image: url(../../static/photo/examination.png);
background-repeat: no-repeat;
background-size: 66%;
background-color: #fff;
background-position: right bottom;
min-height: 800rpx;
}
.slogan {
font-size: 40rpx;
font-weight: bold;
color: #333333;
line-height: 20px;
padding: 50rpx 58rpx 46rpx 30rpx;
}
.left {
margin-right: 8rpx;
margin-left: 68rpx;
margin-left: 30rpx;
color: #666666;
font-size: 28rpx;
}
.text {
margin: 50rpx 0;
margin: 30rpx 0;
}
button {
width: 364rpx;
height: 56rpx;
background: #007aff;
font-size: 24rpx;
width: 600rpx;
height: 104rpx;
background: #2272ff;
font-size: 32rpx;
font-weight: 600;
color: #ffffff;
margin-top: 237rpx;
border-radius: 26px;
line-height: 104rpx;
}
</style>
src/pages/order/complete.vue
View file @ 65c96d3e
......@@ -195,7 +195,7 @@
this.orderServiceType = decodeURIComponent(option.orderServiceType)
this.inGuaranteePeriod = option.inGuaranteePeriod
} else {
this.orderId = 11878346
this.orderId = 9708719
this.categoryId = 88
this.orderServiceType = '安装'
this.inGuaranteePeriod = 'Y'
......@@ -453,9 +453,6 @@
case 'date':
formType = 'time'
break
case 'form':
formType = 'form'
break
}
return formType
},
......
src/plugins/uploader/index.js
View file @ 65c96d3e
......@@ -39,7 +39,7 @@ uploader.getQnToken = function(params) {
*region: 地区 默认为：ECN
*/
resolve({
visitPrefix: data.host || globalUrl.qn_asset_url,
visitPrefix: data.host,
token: data.token || '',
folderPath: data.folderPath || '',
region: "ECN"
......
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