Commit f9921081 authored by 郭晓清's avatar 郭晓清
parents fc74282d 18595172
const UNI_APP = { const UNI_APP = {
ucenterUrl: { ucenterUrl: {
apiUrl: 'http://rest-u.yunya.com', //php端域名请求头 apiUrl: 'http://192.168.1.46', //php端域名请求头
// xueUrl: 'https://xue.banshouhui.com', //学院 xueUrl: 'http://192.168.1.46:8088', //学院
// banshou: 'https://m.banshou.com', //扳手app // banshou: 'https://m.banshou.com', //扳手app
}, },
systemUrl: { systemUrl: {
......
; ;
(function() { (function() {
let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境
let ENV_VAR = null; let ENV_VAR = null;
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === "development") {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
......
...@@ -46,14 +46,37 @@ export default { ...@@ -46,14 +46,37 @@ export default {
// 授权用户信息 // 授权用户信息
authUserInfo: "", authUserInfo: "",
// 用户入驻信息 // 用户入驻信息
settledInfo: {}, settledInfo: {},
navHeight: 0, //导航栏高度
rpxScreenHeight: 0,// 照相视框高度
safeHeight:0, // 安全高度
//拍照相关数据
photo: {
product: {
brandId: '', // 品牌id
brandName: '', // 品牌名称
classifyId: '', // 分类id
systemId: '', // 系统id
},
topIndex:0,
itemIndex:0,
currentItemLength: 0,//已拍摄照片张数
productList: [],
currentItem: null, // 选择的某一项
setting: null, //自定义设置
waterSetting: null, // 水印设置
tempPath: {
origin: '', // 缓存拍照图片
mixWater: '' // 缓存水印拍照图片
}
},
}, },
onLaunch: function () { onLaunch: function () {
// 应用初始化(全局只触发一次) // 应用初始化(全局只触发一次)
AnalysysAgent.registerSuperProperty("platform", "self-support"); AnalysysAgent.registerSuperProperty("platform", "self-support");
this.getSystemInfo()
// 版本更新 // 版本更新
this.updateApp(); this.updateApp();
}, },
...@@ -64,7 +87,22 @@ export default { ...@@ -64,7 +87,22 @@ export default {
onHide: function () { onHide: function () {
// 应用从前台进入后台 // 应用从前台进入后台
}, },
methods: { methods: {
getSystemInfo() {
try {
let a = wx.getSystemInfoSync();
// this.globalData.platform = systemInfo.platform, this.globalData.pixelRatio = a.pixelRatio,
// this.globalData.statusBarHeight = a.statusBarHeight, this.globalData.navHeight = a.statusBarHeight / a.screenWidth * 750 + 90,
// this.globalData.rpxScreenHeight = a.screenHeight / a.screenWidth * 750, this.globalData.screenWidth = a.screenWidth,
// this.globalData.screenHeight = a.screenHeight;
this.globalData.navHeight = a.statusBarHeight / a.screenWidth * 750 + 90
this.globalData.rpxScreenHeight = a.screenHeight / a.screenWidth * 750
this.globalData.screenHeight = a.screenHeight
this.globalData.safeHeight = a.safeArea.bottom
} catch (a) {
}
},
async getBaseInfo(vm, callBack) { async getBaseInfo(vm, callBack) {
uni.showLoading({ uni.showLoading({
title: "加载中……", title: "加载中……",
......
let commonApiFun = function(vm){ let commonApiFun = function(vm){
let loginWxByUser = async (params = {}) => await vm.$u.get('/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode', params); let loginWxByUser = async (params = {}) => await vm.$u.get('/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode', params);
let loginWxByPhone = async (params = {}) => await vm.$u.post('/wxh-support-rest/rest/ssoinfo/v3/findByMobile', params,{'content-type': 'application/x-www-form-urlencoded'}); let loginWxByPhone = async (params = {}) => await vm.$u.post('/wxh-support-rest/rest/ssoinfo/v3/findByMobile', params,{'content-type': 'application/x-www-form-urlencoded'});
let loginWechatAuth = async (params = {}) => await vm.$u.post('/wxh-support-rest/rest/ssoinfo/wxapp/unify/authorization', params, {'content-type': 'application/x-www-form-urlencoded'}); let loginWechatAuth = async (params = {}) => await vm.$u.post('/wxh-support-rest/rest/ssoinfo/wxapp/unify/authorization', params, {'content-type': 'application/x-www-form-urlencoded'});
// 水印-查询用户自定义设置
let getUserWatermark = async (params = {}) => await vm.$u.post('http://apidoc.banshouhui.com:3000/mock/89/getUserWatermark', params);
// 水印-保存用户自定义设置
let saveUserWatermark = async (params = {}) => await vm.$u.post('http://apidoc.banshouhui.com:3000/mock/89/saveUserWatermark', params);
// 保存图片
let saveImage = async (params = {}) => await vm.$u.post('http://apidoc.banshouhui.com:3000/mock/89/saveImage', params);
const commonApi = { const commonApi = {
loginWxByUser, loginWxByUser,
loginWxByPhone, loginWxByPhone,
loginWechatAuth, loginWechatAuth,
getUserWatermark,
saveUserWatermark,
saveImage
} }
return commonApi return commonApi
} }
......
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
import { import {
settledApiFun settledApiFun
} from '@/common/api/settled.js'; } from '@/common/api/settled.js';
import { learnApiFun } from "@/common/api/learn.js"; import {learnApiFun} from "@/common/api/learn.js";
import { orderApiFun } from "@/common/api/order.js"; import { orderApiFun } from "@/common/api/order.js";
let apiFun = function(vm) { let apiFun = function(vm) {
let commonApi = commonApiFun(vm); let commonApi = commonApiFun(vm);
......
const globalUrl = process.uniEnv || {} const globalUrl = process.uniEnv || {}
const ucenterApiUrl = globalUrl.ucenterUrl.apiUrl const ucenterApiUrl = globalUrl.ucenterUrl.apiUrl
const collegeApiUrl = globalUrl.ucenterUrl.xueUrl
let learnApiFun = function(vm){ let learnApiFun = function(vm){
/* 查询用户基本信息 */ /* 通知消息基本信息 */
let getTrainingNoticeList = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/notice/list', params); let getTrainingNoticeList = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/notice/list', params);
/* 获取学习视频基本信息 */
let CourseList = async (params = {}) => await vm.$u.get(collegeApiUrl+'/v1/course-details?course_id=173',params);
/* 获取章节详情 */
let ChapterDetails = async (params = {}) => await vm.$u.get(collegeApiUrl+'/v1/chapter-sections',params);
/* 获取课程节信息*/
let CourseSection = async (params = {}) => await vm.$u.get(collegeApiUrl+'/v1/section-details',params);
const learnApi = { const learnApi = {
getTrainingNoticeList, getTrainingNoticeList,CourseList,ChapterDetails,CourseSection
} }
return learnApi return learnApi
} }
......
page { page {
background-color: #fafafa; background-color: #fafafa;
} }
::-webkit-scrollbar {
width:0;
height:0;
color:transparent;
display:none;
}
.btn-share { .btn-share {
background-color: transparent; background-color: transparent;
......
<template> <template>
<view class="order-cell"> <view class="order-view" @click="handleClickCell">
<view class="order-view" @click="handleClickCell"> <view class="order-top-view">
<view class="order-top-view"> <view class="left-view">
<view class="left-view"> <view :class="['tag-view', {'active': active}]">
<view :class="['tag-view', {'active': active}]"> {{ orderData.orderServiceType }}
{{ orderData.orderServiceType }}
</view>
<view class="store-view">{{ orderData.categoryName }}</view>
</view> </view>
<view class="right-view">{{ orderData.orderBusinessTypeText }}</view> <view class="store-view">{{ orderData.categoryName }}</view>
</view> </view>
<view class="content-view"> <view class="right-view">{{ orderData.orderBusinessTypeText }}</view>
<view class="info-view" v-for="(item, key) in infoTexts" :key="key"> </view>
<text>{{item + ':'}}</text> <view class="content-view">
<text>{{orderData[key]}}</text> <view class="info-view" v-for="(item, key) in infoTexts" :key="key">
<text>{{item + ':'}}</text>
<text>{{orderData[key]}}</text>
</view>
<view class="address-view">
<view class="address-left-view">
<image class="address-image" :src="dizhiImage" mode="widthFix"></image>
<text>{{orderData.contactAddress }}</text>
</view> </view>
<view class="address-view"> <view v-if="showDistance">
<view class="address-left-view"> {{getDistance(orderData.contactAddressLatitud,orderData.contactAddressLongitud)}}km
<image class="address-image" :src="dizhiImage" mode="widthFix"></image>
<text>{{orderData.contactAddress }}</text>
</view>
<view v-if="showDistance">
{{getDistance(orderData.contactAddressLatitud,orderData.contactAddressLongitud)}}km
</view>
</view> </view>
</view> </view>
</view>
<view class="line-view"></view> <view class="line-view"></view>
<view class="reason-view" v-if="showReason"><text>未通过原因:</text> <view class="reason-view" v-if="showReason"><text>未通过原因:</text>
<text class="reason-text">{{orderData.auditResults.remark}}</text> <text class="reason-text">{{orderData.auditResults.remark}}</text>
</view> </view>
<view class="bottom-view"> <view class="bottom-view">
<view> <view>
<view v-if="showCountTime" class="bottom-left-view"> <view v-if="showCountTime" class="bottom-left-view">
<view :class="['bottom-tag-view', {'will': orderData.currentWillOverTime}]">{{tagText}}</view> <view :class="['bottom-tag-view', {'will': orderData.currentWillOverTime}]">{{tagText}}</view>
<u-count-down :timestamp="orderData.currentWillOverTime || orderData.currentOverTime" <u-count-down :timestamp="orderData.currentWillOverTime || orderData.currentOverTime" font-size="44"
font-size="44" color="#FF930D" @change="handleChange" ref="order-count-down"></u-count-down> color="#FF930D" @change="handleChange" ref="order-count-down"></u-count-down>
</view> </view>
<view v-else-if="showTime"> <view v-else-if="showTime">
<text>{{timeTitle}}</text> <text>{{timeTitle}}</text>
<text>{{timeText}}</text> <text>{{timeText}}</text>
</view>
</view> </view>
<u-button class="right-btn" @click.stop="handleClick" :custom-style="buttonStyle" type="primary"
shape="circle">
{{orderText}}
</u-button>
</view> </view>
<u-button class="right-btn" @click.stop="handleClick" :custom-style="buttonStyle" type="primary"
shape="circle">
{{orderText}}
</u-button>
</view> </view>
</view> </view>
</view> </view>
...@@ -251,138 +249,134 @@ ...@@ -251,138 +249,134 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.order-cell { .order-view {
padding-bottom: 20rpx; width: 100%;
background-color: #FFFFFF;
border-radius: 12rpx;
padding: 30rpx;
margin-bottom: 20rpx;
.order-view { .order-top-view {
width: 100%; display: flex;
background-color: #FFFFFF; align-items: center;
border-radius: 12rpx; justify-content: space-between;
padding: 30rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
.order-top-view { .left-view {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
margin-bottom: 20rpx;
.left-view {
display: flex;
align-items: center;
.tag-view { .tag-view {
width: 84rpx; width: 84rpx;
height: 40rpx; height: 40rpx;
color: #FFFFFF; color: #FFFFFF;
border-radius: 8rpx; border-radius: 8rpx;
background-image: linear-gradient(to right, #FF930D, #FFC174); background-image: linear-gradient(to right, #FF930D, #FFC174);
&.active {
background-image: linear-gradient(to right, #2272FF, #47ABFF);
}
}
.store-view { &.active {
color: #333333; background-image: linear-gradient(to right, #2272FF, #47ABFF);
font-size: 36rpx;
font-weight: bold;
margin-left: 20rpx;
} }
} }
.right-view { .store-view {
width: 100rpx;
height: 40rpx;
background-color: #F4F5F7;
border-radius: 20rpx;
color: #333333; color: #333333;
font-size: 22rpx; font-size: 36rpx;
line-height: 40rpx; font-weight: bold;
margin-left: 20rpx;
} }
} }
.content-view { .right-view {
.info-view { width: 100rpx;
text-align: left; height: 40rpx;
color: #333333; background-color: #F4F5F7;
font-size: 26rpx; border-radius: 20rpx;
margin-top: 12rpx; color: #333333;
margin-bottom: 12rpx; font-size: 22rpx;
} line-height: 40rpx;
}
}
.content-view {
.info-view {
text-align: left;
color: #333333;
font-size: 26rpx;
margin-top: 12rpx;
margin-bottom: 12rpx;
}
.address-view { .address-view {
display: flex;
align-items: flex-start;
justify-content: space-between;
color: #333333;
font-size: 24rpx;
margin-top: 12rpx;
.address-left-view {
display: flex; display: flex;
align-items: center;
align-items: flex-start; align-items: flex-start;
justify-content: space-between;
color: #333333;
font-size: 24rpx;
margin-top: 12rpx;
.address-left-view { .address-image {
display: flex; width: 26rpx;
align-items: center; height: 28rpx;
align-items: flex-start; margin-right: 8rpx;
flex-shrink: 0;
.address-image { margin-top: 4rpx;
width: 26rpx;
height: 28rpx;
margin-right: 8rpx;
flex-shrink: 0;
margin-top: 4rpx;
}
} }
.address-right-view {}
} }
}
.line-view { .address-right-view {}
background-color: #F4F5F7;
height: 2rpx;
width: 100%;
margin-top: 30rpx;
} }
}
.reason-view { .line-view {
text-align: left; background-color: #F4F5F7;
margin-top: 30rpx; height: 2rpx;
font-size: 26rpx; width: 100%;
color: #666666; margin-top: 30rpx;
}
.reason-text { .reason-view {
color: #FA5A49; text-align: left;
} margin-top: 30rpx;
font-size: 26rpx;
color: #666666;
.reason-text {
color: #FA5A49;
} }
}
.bottom-view { .bottom-view {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 30rpx;
.bottom-left-view {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
margin-top: 30rpx;
.bottom-left-view { .bottom-tag-view {
display: flex; width: 52rpx;
align-items: center; height: 52rpx;
border-radius: 26rpx;
.bottom-tag-view { line-height: 56rpx;
width: 52rpx; color: #FFFFFF;
height: 52rpx; font-size: 26rpx;
border-radius: 26rpx; background-color: #FA5A49;
line-height: 56rpx; margin-right: 20rpx;
color: #FFFFFF;
font-size: 26rpx;
background-color: #FA5A49;
margin-right: 20rpx;
&.will { &.will {
background-color: #FF930D; background-color: #FF930D;
}
} }
} }
.right-btn {}
} }
.right-btn {}
} }
} }
</style> </style>
<template>
<view>
<view class="contentView">
<!-- <u-image class="pic" :src="files[0]" bg-color="transparent" @click="showPreviewFn"></u-image> -->
<image class="pic" :src="files[0]" v-lazy mode="aspectFit" @click="showPreviewFn"></image>
</view>
<view class="bottomView">
<image class="btn" :src="btn_remake" @click="$u.throttle(remakePhoto, 3000)"></image>
<image class="btn" :src="btn_continue" @click="$u.throttle(continuePhoto, 3000)"></image>
</view>
<image class="btn finish" src="/static/photo/finish.png" @click="$u.throttle(finishPhoto, 3000)"></image>
</view>
</template>
<script>
import qiniup from '@/components/upload/qiniup';
const app = getApp()
export default {
props: {},
mixins: [qiniup],
data() {
return {
protocolContent: '',
btn_remake: 'https://qn-static.banshouhui.com/take_order/photo/remake.png',
btn_continue: '/static/photo/continue.png',
standardId: '',
images: [],
files: [],
fileMaps: [],
keys: [],
token: '',
product: '',
}
},
created(e) {
// 获取照片选项对象
console.log(getApp().globalData.photo.currentItem)
const product = app.globalData.photo.product
this.product = `?brandId=${product.brandId}&brand=${product.brandName}&classifyId=${product.classifyId}&systemId=${product.systemId}`
// if(app.globalData.photo.currentItem) {
// // 获取规格Id
// this.standardId = app.globalData.photo.currentItem._id
// }
getApp().trackPage('照片预览页')
const globalTempPath = getApp().globalData.photo.tempPath
if(globalTempPath && globalTempPath.mixWater){
this.files = [globalTempPath.mixWater]
}
// if(e.standardId) {
// this.standardId = e.standardId
// }
console.log(this.files)
this.token = getApp().globalData.token
},
methods: {
// 保存照片到本地
async saveTempToLocal(tempImagePath) {
//has_origin //是否保存原图
let that = this
const photo = getApp().globalData.photo
if(!photo.tempPath){
return
}
let path = ''
if(photo.tempPath.origin && photo.waterSetting && photo.waterSetting.has_origin){
// 保存原图到本地
path = photo.tempPath.origin
let result = await this.saveLocal(path)
if(result){
uni.showToast({
icon: 'none',
title: '已将照片原图保存到本地相册'
})
}
}
if(photo.currentItem){
photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
}
// if(photo.productList && photo.productList[photo.topIndex]){
// const topArr = photo.productList[photo.topIndex]
// if(topArr[photo.itemIndex]){
// topArr[photo.itemIndex].imageList.push(photo.tempPath.mixWater)
// }
// }
// photo.
if(photo.tempPath.mixWater){
// 保存水印处理图片到本地
path = photo.tempPath.mixWater
let result1 = await this.saveLocal(path)
if(result1){
uni.showToast({
icon: 'none',
title: '已将水印图片保存到本地相册'
})
}
}
},
saveLocal(path){
return new Promise((resolve,reject)=>{
uni.saveImageToPhotosAlbum({
filePath: path,
success() {
resolve(true)
},
fail() {
reject('保存失败')
}
})
})
},
showPreviewFn(img) {
uni.previewImage({
current: 0,
urls: this.files
});
},
// 重拍图片
remakePhoto() {
this.$emit('changeType', 1)
},
finishPhoto(){
const photo = getApp().globalData.photo
photo.currentItemLength = 10
this.continuePhoto()
// 完成本项
this.$emit('finish')
},
// 确认图片
continuePhoto() {
const photo = getApp().globalData.photo
let self = this
uni.showLoading({
title:'图片保存中…'
})
self.saveTempToLocal()
self.confirmUpload(true)
},
submitFile() {
let self = this
if(self.keys.length) {
for (let s of self.keys) {
self.$u.api.saveImage({
"token": self.token,
"standardId": self.standardId,
"url": s,
}).then(async res =>{
console.log(res, "云服务保存图片");
if(res.result.code) {
// TODO 参数是否要来回传递
const photo = getApp().globalData.photo
photo.currentItemLength = photo.currentItemLength + 1
uni.hideLoading()
// 当前项的图片显示
// 拍照项张数目增加 等于10张
if(photo.currentItemLength<10){
this.$emit('changeType', 1)
}else{
this.$emit('finish')
}
} else {
uni.showToast({
title:'图片上传失败 '+ res.result.msg
})
}
})
}
}
},
downloadImages() {
let self = this;
for (let url of this.images) {
uni.downloadFile({
url: url, //仅为示例,并非真实的资源
success(res) {
// 只要服务器有响应数据,就会把响应内容写入文件并进入 success 回调,业务需要自行判断是否下载到了想要的内容
if (res.statusCode === 200) {
self.files.push(res.tempFilePath)
}
},
fail(e) {
debugger
}
})
}
},
}
}
</script>
<style lang="scss">
.contentView {
background-color: #333333;
/* padding-top: 120rpx; */
padding-bottom:228rpx;
height: 100vh;
display: flex;
flex-direction: column;
}
/deep/ .u-image{
height:100%!important;
}
/deep/ .u-image__loading{
background-color: transparent!important;
}
/deep/ .u-image__error{
background-color: transparent!important;
}
.pic {
flex:1;
width: 100%;
/* height:auto */
/* height: 760rpx; */
}
.bottomView {
box-shadow: 0 0 1rpx 6rpx rgba(255,255,255,0.05);
background-color: #333333;
width: 100%;
padding:70rpx 0;
position: fixed;
bottom: 0;
display: flex;
justify-content: space-around;
align-items: center;
.btn{
display: block;
width: 200rpx;
height: 88rpx;
}
}
.btn{
display: block;
width: 232rpx;
height: 80rpx;
&.finish{
position: fixed;
top:180rpx;
right:30rpx;
}
}
</style>
This diff is collapsed.
<!-- 拍照规范弹窗 -->
<template>
<view class="standard-box">
<swiper class="swiper-box" :current="swiperCurrent" @change="changeTab" @transition="transition" @animationfinish="animationfinish">
<swiper-item class="swiper-item" key="swiper1">
<view class="title">
拍照要求
</view>
<view class="txt-box" >
<view class="txt" v-for="(txt,index) in currentItem.main_point" :key="index">
{{index+1}}. {{txt}}
</view>
<view class="txt tips">
注意:{{currentItem.note}}
</view>
</view>
</swiper-item>
<swiper-item class="swiper-item" v-for="(src, index) in swiperList" :key="index">
<image @click="previewImage(index)" class="icon" mode="aspectFit" :src="src"></image>
</swiper-item>
</swiper>
<view class="tab-box">
<u-tabs-swiper bg-color="transparent" inactive-color="#999"
ref="uTabs" :list="tabList" :current="current"
@change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper>
</view>
</view>
</template>
<script>
export default {
name:"photo-standard",
props:{
currentItem:{
type: Object,
default () {
return {
images: [],
}
}
},
},
data() {
return {
tabList: [{
name: '十年'
}, {
name: '青春'
}, {
name: '之约'
}],
swiperList:[],
// 因为内部的滑动机制限制,请将tabs组件和swiper组件的current用不同变量赋值
current: 0, // tabs组件的current值,表示当前活动的tab选项
swiperCurrent: 0, // swiper组件的current值,表示当前那个swiper-item是活动的
height:0,
}
},
watch:{
"currentItem.images"(val){
if(val.length>0){
this.changeList(val)
// let swiperList = JSON.parse(JSON.stringify(val))
// let len = tabs.length
// let tabList = [{name:'拍照要求'}].concat(Array.from({name:'示意图'},len))
// console.log(tabList,'tabList')
}
},
},
created() {
// getApp().trackPage('照片预览页')
// console.log(e, 'e')
// if (e.img) {
// this.images = [e.img]
// }
// console.log(this.images, 'this.images')
},
mounted(){
this.changeList(this.currentItem.images)
this.getSwiperHeight()
},
methods: {
changeList(list){
let swiperList = JSON.parse(JSON.stringify(list))
let len = list.length
let tabList = []
for(let i=0;i<len;i++){
let item = {
name:'示意图' + (i + 1)
}
tabList.push(item)
}
tabList = [{name:'拍照要求'}].concat(tabList)
this.swiperList = swiperList
this.tabList = tabList
},
getSwiperHeight(){
const globalData = getApp().globalData
this.height = globalData.screenHeight*2 - globalData.navHeight - 200
},
previewImage(index){
uni.previewImage({
current:index,
urls:this.swiperList,
})
},
// tabs通知swiper切换
tabsChange(index) {
this.swiperCurrent = index;
},
// swiper-item左右移动,通知tabs的滑块跟随移动
transition(e) {
// console.log(e.detail,'e.detail-transition')
// let dx = e.detail.dx;
// this.$refs.uTabs.setDx(dx);
},
changeTab(){
this.current = this.swiperCurrent
},
// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
// swiper滑动结束,分别设置tabs和swiper的状态
animationfinish(e) {
// console.log(e.detail,'e.detail-animationfinish')
// let current = e.detail.current;
// this.$refs.uTabs.setFinishCurrent(current);
// this.swiperCurrent = current;
// this.current = current;
},
// scroll-view到底部加载更多
onreachBottom() {
}
}
}
</script>
<style lang="scss">
.standard-box{
position: absolute;
left:0;right:0;
/* height: calc(100vh - 240rpx); */
z-index: 100;
bottom:240rpx;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
color:#fff;
}
.swiper-box{
width: 690rpx;
min-height: 690rpx;
margin-bottom: 150rpx;
border-radius: 12rpx;
background-color: #fff;
}
.tab-box{
position: absolute;
bottom:0;
left:30rpx;
right:30rpx;
}
.swiper-item{
box-sizing: border-box;
// width:690rpx;
padding:30rpx;
.title{
margin-top:20rpx;
font-weight: bold;
line-height: 50rpx;
color:#333;
font-size: 36rpx;
}
&>image{
width:630rpx;
min-height: 630rpx;
}
.txt-box{
max-height: 560rpx;
overflow: auto;
}
.txt{
white-space: normal;
padding-top:26rpx;
line-height: 34rpx;
color:#666;
font-size: 28rpx;
&.tips{
padding-bottom:26rpx;
color:#D73400
}
}
}
/* .pic {
display: block;
width: 100%;
height: auto;
}
.scroll-view_H {
white-space: nowrap;
width: 750rpx;
height: 300rpx;
}
.view-content {
display: flex;
} */
</style>
<template>
<view>
<view class="wrap">
<swiper class="swiper-box" :current="swiperCurrent" @transition="transition"
@animationfinish="animationfinish">
<swiper-item class="swiper-item">
<view class="inner txt-inner" :style="{'background-image':'url(/static/photo/shadow-bg.png)'}">
<view class="title">
拍照要求
</view>
<view class="txt-box" >
<view class="txt" v-for="(txt,index) in currentItem.main_point" :key="index">
{{index+1}}. {{txt}}
</view>
<view class="txt tips" v-if="currentItem.note">
注意:{{currentItem.note}}
</view>
</view>
</view>
</swiper-item>
<swiper-item class="swiper-item" v-for="(src, index) in swiperList" :key="index">
<view class="inner pic">
<image @click="previewImage(index)" class="icon" mode="aspectFit" :src="src"></image>
</view>
</swiper-item>
</swiper>
<view class="u-tabs-box">
<u-tabs-swiper bg-color="transparent" inactive-color="#999" activeColor="#2272FF" ref="tabs"
:list="tabList" :current="current" @change="change" :is-scroll="false" swiperWidth="750">
</u-tabs-swiper>
</view>
</view>
</view>
</template>
<script>
export default {
props: {
currentItem: {
type: Object,
default () {
return {
images: [],
}
}
},
},
data() {
return {
current: 0,
swiperCurrent: 0,
dx: 0,
};
},
onLoad() {},
computed: {
swiperList() {
let list = this.currentItem.images || []
return list
},
tabList() {
let list = this.currentItem.images || []
let swiperList = JSON.parse(JSON.stringify(list))
let len = list.length
let tabList = []
for (let i = 0; i < len; i++) {
let item = {
name: '示意图' + (i + 1)
}
tabList.push(item)
}
tabList = [{
name: '拍照要求'
}].concat(tabList)
return tabList
},
},
methods: {
previewImage(index){
uni.previewImage({
current:index,
urls:this.swiperList,
})
},
// tab栏切换
change(index) {
this.swiperCurrent = index;
// this.getOrderList(index);
},
transition({
detail: {
dx
}
}) {
this.$refs.tabs.setDx(dx);
},
animationfinish({
detail: {
current
}
}) {
this.$refs.tabs.setFinishCurrent(current);
this.swiperCurrent = current;
this.current = current;
}
}
};
</script>
<style>
/* #ifndef H5 */
page {
height: 100%;
background-color: #f2f2f2;
}
/* #endif */
</style>
<style lang="scss" scoped>
.wrap {
display: flex;
flex-direction: column;
height: calc(100vh - var(--window-top) - 200rpx);
padding-top:100rpx;
width: 100%;
padding-bottom: 0;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);;
}
.swiper-box {
flex: 1;
}
.swiper-item {
display: flex;
align-items: center;
height: 100%;
padding: 0 30rpx;
box-sizing: border-box;
}
.swiper-item .inner {
padding: 30rpx;
background-color: #fff;
width:690rpx;
height: 690rpx;
overflow: hidden;
&.txt-inner{
background-position: bottom right;
background-size: 340rpx 380rpx;
background-repeat: no-repeat;
}
.title {
margin-top: 20rpx;
font-weight: bold;
line-height: 50rpx;
color: #333;
font-size: 36rpx;
}
&.pic{
padding:0;
background-color: transparent;
}
&>image {
width: 690rpx;
min-height: 690rpx;
}
.txt-box {
// max-height: 560rpx;
overflow: auto;
width:100%;
height: 560rpx;
}
.txt {
white-space: normal;
padding-top: 26rpx;
line-height: 34rpx;
color: #666;
font-size: 28rpx;
&.tips {
padding-bottom: 26rpx;
color: #D73400
}
}
}
</style>
...@@ -31,13 +31,19 @@ ...@@ -31,13 +31,19 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.settle-view {
::-webkit-scrollbar {
width: 0;
}
}
.introduction { .introduction {
border-radius: 12rpx; border-radius: 12rpx;
overflow: auto; overflow: auto;
position: fixed; position: fixed;
top: 370rpx; top: 370rpx;
bottom: 0rpx; bottom: 168rpx;
left: 30rpx; left: 30rpx;
right: 30rpx; right: 30rpx;
} }
......
This diff is collapsed.
import qiniuUploader from '@/include/libs/qiniuUploader.js'; import qiniuUploader from '@/include/libs/qiniuUploader.js';
const globalUrl = process.uniEnv || {}' const globalUrl = process.uniEnv || {}
export default { export default {
name: 'qiniup', name: 'qiniup',
components: {}, components: {},
......
import qiniuUploader from '@/include/libs/qiniuUploader.js';
const globalUrl = process.uniEnv || {}
export default {
name: 'qiniup',
components: {},
data() {
return {
domain: 'http://upload.qiniup.com', // 七牛上传域名地址
uptokenURL: globalUrl.ucenterUrl.apiUrl + '/v1/tokens', // 上传token地址
files:[], // 上传文件
fileMaps:[], // 上传文件返回对象
keys:[], // 七牛返回key
uploadToken: '', // 上传token
maximum:999, // 最大上传数量
qiniuOptions: {}, // 七牛上传配置
};
},
created() {
this.initQiniu()
},
methods: {
initQiniu: function() {
var defaulfs = {
// bucket所在区域,这里是华北区。ECN, SCN, NCN, NA, ASG,分别对应七牛云的:华东,华南,华北,北美,新加坡 5 个区域
region: 'ECN',
bucket: 'fa-cms',
qiniuBucketURLPrefix: 'uploads',
// 获取uptoken方法三选一即可,执行优先级为:uptoken > uptokenURL > uptokenFunc。三选一,剩下两个置空。推荐使用uptokenURL,详情请见 README.md
// 由其他程序生成七牛云uptoken,然后直接写入uptoken
uptoken: '',
// 从指定 url 通过 HTTP GET 获取 uptoken,返回的格式必须是 json 且包含 uptoken 字段,例如: {"uptoken": "0MLvWPnyy..."}
uptokenURL: this.uptokenURL,
// uptokenFunc 这个属性的值可以是一个用来生成uptoken的函数,详情请见 README.md
uptokenFunc: function() {
},
// bucket 外链域名,下载资源时用到。如果设置,会在 success callback 的 res 参数加上可以直接使用的 fileURL 字段。否则需要自己拼接
domain: this.domain,
// qiniuShouldUseQiniuFileName 如果是 true,则文件的 key 由 qiniu 服务器分配(全局去重)。如果是 false,则文件的 key 使用微信自动生成的 filename。出于初代sdk用户升级后兼容问题的考虑,默认是 false。
// 微信自动生成的 filename较长,导致fileURL较长。推荐使用{qiniuShouldUseQiniuFileName: true} + "通过fileURL下载文件时,自定义下载名" 的组合方式。
// 自定义上传key 需要两个条件:1. 此处shouldUseQiniuFileName值为false。 2. 通过修改qiniuUploader.upload方法传入的options参数,可以进行自定义key。(请不要直接在sdk中修改options参数,修改方法请见demo的index.js)
// 通过fileURL下载文件时,自定义下载名,请参考:七牛云“对象存储 > 产品手册 > 下载资源 > 下载设置 > 自定义资源下载名”(https://developer.qiniu.com/kodo/manual/1659/download-setting)。本sdk在README.md的"常见问题"板块中,有"通过fileURL下载文件时,自定义下载名"使用样例。
shouldUseQiniuFileName: true
};
let options = {}
if(Object.keys(this.qiniuOptions).length) {
Object.assign(options, defaulfs, this.qiniuOptions);
} else {
options = defaulfs;
}
// 将七牛云相关配置初始化进本sdk
qiniuUploader.init(options);
},
getUrlKey(file) {
let index = file.lastIndexOf('/');
let len = file.length
let name = file.substring(index + 1, len)
return name;
},
/**
* 确认上传
* @param {boolean} submit
*/
confirmUpload(submit = false) {
let self = this
const fileList = self.files
if (self.maximum - fileList.length <= 0) {
uni.showToast({
title: '图片数量不能大于' + self.maximum,
icon: 'none'
})
return
}
for (let file of fileList) {
let name = self.getUrlKey(file)
// 交给七牛上传
let item = {
src: '',
id: '',
key:'',
// filesize: '',
progress: 0
}
const params = {
name:name,
file:file,
}
qiniuUploader.upload(params, (res) => {
console.log(res,'res')
let inLen = self.maximum - fileList.length
if (inLen > 0) {
item.src = file
item.key = res.key || res.src
self.fileMaps.push(item);
self.keys.push(item.key)
if(submit) {
self.submitFile()
}
} else {
uni.showToast({
title: '图片数量不能大于9'
})
}
}, (error) => {
console.log('error: ' + error);
}, null, (res) => {
item.progress = res.progress
}, () => {
// 取消上传
}, () => {
// `before` 上传前执行的操作
}, (err) => {
// `complete` 上传接受后执行的操作(无论成功还是失败都执行)
});
}
}
}
}
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "首页", "navigationBarTitleText": "首页",
"navigationStyle": "custom" "navigationStyle": "custom",
"enablePullDownRefresh": true
} }
}, },
{ {
...@@ -41,7 +42,8 @@ ...@@ -41,7 +42,8 @@
{ {
"path": "pages/mine/index", "path": "pages/mine/index",
"style": { "style": {
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的",
"navigationStyle": "custom"
} }
}, },
{ {
...@@ -69,7 +71,8 @@ ...@@ -69,7 +71,8 @@
{ {
"path": "pages/learn/index", "path": "pages/learn/index",
"style": { "style": {
"navigationBarTitleText": "学习" "navigationBarTitleText": "学习",
"navigationStyle":"custom"//隐藏系统导航栏
} }
}, },
{ {
...@@ -84,17 +87,23 @@ ...@@ -84,17 +87,23 @@
"navigationBarTitleText": "考试答题" "navigationBarTitleText": "考试答题"
} }
}, },
{ {
"path": "pages/learn/result", "path":"pages/learn/result",
"style": { "style":{
"navigationBarTitleText": "考试结果页" "navigationBarTitleText":"考试答题"
} }
}, },
{ {
"path": "pages/learn/news-details", "path": "pages/learn/news-details",
"style": { "style": {
"navigationBarTitleText": "" "navigationBarTitleText": ""
} }
},
{
"path":"pages/learn/section",
"style" :{
"navigationBarTitleText": ""
}
}, },
{ {
"path": "pages/learn/curriculum", "path": "pages/learn/curriculum",
...@@ -106,7 +115,8 @@ ...@@ -106,7 +115,8 @@
"path": "pages/settle/select", "path": "pages/settle/select",
"style": { "style": {
"navigationBarTitleText": "选择可服务的城市", "navigationBarTitleText": "选择可服务的城市",
"navigationBarBackgroundColor": "#FFFFFF" "navigationBarBackgroundColor": "#FFFFFF",
"disableScroll": true
} }
}, },
{ {
...@@ -202,8 +212,8 @@ ...@@ -202,8 +212,8 @@
"tabBar": { "tabBar": {
"color": "#7A7E83", "color": "#7A7E83",
"selectedColor": "#007AFF", "selectedColor": "#007AFF",
"borderStyle": "black", "borderStyle": "white",
"backgroundColor": "#F8F8F8", "backgroundColor": "#FFFFFF",
"list": [ "list": [
{ {
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
...@@ -260,8 +270,8 @@ ...@@ -260,8 +270,8 @@
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": "" //启动参数,在页面的onLoad函数里面得到
}, },
{ {
"name": "入驻提示", //模式名称 "name": "完工配置", //模式名称
"path": "pages/settle/prompt", //启动页面,必选 "path": "pages/order/complete", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": "" //启动参数,在页面的onLoad函数里面得到
}, },
{ {
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</view> </view>
<view class="bottomRightView"> <view class="bottomRightView">
<view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' " <view :class="isSelect ? 'nextBtn selectBackColor' : 'nextBtn defaultBackColor' "
@click="nextClick()"> @click="handleClick()">
<text class="bottomTitle">{{bottomTitle}}</text> <text class="bottomTitle">{{bottomTitle}}</text>
</view> </view>
</view> </view>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
return process.uniEnv.qn_base_url + 'chenggong.png' return process.uniEnv.qn_base_url + 'chenggong.png'
}, },
timuImage() { timuImage() {
return process.uniEnv.qn_base_url + 'timu.png' return process.uniEnv.qn_base_url + 'timu-new.png'
} }
}, },
onLoad(e) { onLoad(e) {
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
that.vuex_token + that.vuex_token +
'?userExamId=' + this.userExamId + '?userExamId=' + this.userExamId +
'&questionId=' + questionId + '&questionId=' + questionId +
'&userAnswerIds=' + this.userAnswerIds, '&userAnswerIds=' + (this.userAnswerIds || '9999'), // 9999超时自动下一题
method: 'POST', method: 'POST',
data: { data: {
// userExamId:this.userExamId, // userExamId:this.userExamId,
...@@ -372,7 +372,6 @@ ...@@ -372,7 +372,6 @@
}, },
startCounting: function() { startCounting: function() {
if (this.isStop) { if (this.isStop) {
return return
} }
...@@ -441,16 +440,18 @@ ...@@ -441,16 +440,18 @@
},
// 点击下一步
handleClick() {
// 判断有没有选
if (!this.isSelect) {
return
}
this.nextClick()
}, },
//下一题 //下一题
nextClick: function() { nextClick: function() {
//判断有没有选
if (!this.isSelect) {
return
}
clearTimeout(this.timer) clearTimeout(this.timer)
this.currentNumber = this.currentNumber + 1 this.currentNumber = this.currentNumber + 1
...@@ -582,7 +583,9 @@ ...@@ -582,7 +583,9 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y:auto;
overflow-y:auto;
} }
.noticeView { .noticeView {
...@@ -803,10 +806,10 @@ ...@@ -803,10 +806,10 @@
} }
.bottom-padding { .bottom-padding {
margin-bottom: 188rpx; // margin-bottom: 188rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
padding: 40rpx 30rpx 46rpx 30rpx; padding: 40rpx 30rpx 40rpx 30rpx;
} }
.answerBottomView { .answerBottomView {
......
This diff is collapsed.
...@@ -45,8 +45,12 @@ ...@@ -45,8 +45,12 @@
} }
], ],
selectId:[], selectId:[],
}; };
}, },
onLoad() {
this.getUserExamInfo()
},
methods: { methods: {
abc() { abc() {
console.log("11111") console.log("11111")
...@@ -73,7 +77,10 @@ ...@@ -73,7 +77,10 @@
this.selectId.push(this.list[index].title) this.selectId.push(this.list[index].title)
console.log("选中的值", this.selectId) console.log("选中的值", this.selectId)
} }
} },
}, },
mounted() { mounted() {
console.log("111111") console.log("111111")
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<view class="title">考试规则说明</view> <view class="title">考试规则说明</view>
<view class="test"> <view class="test">
<view class="text"> <view class="text">
<text class="left">考试科目:</text><text style="color: #007AFF;">服务规范</text> <text class="left">考试科目:</text><text style="color: #007AFF;">{{exam.examName}}</text>
</view> </view>
<view class="text"> <view class="text">
<text class="left">合格条件:</text><text>随机20题,答对20题</text> <text class="left">合格条件:</text><text>{{exam.ruleDisc}}</text>
</view> </view>
<view class="text"> <view class="text">
<text class="left">考试时间:</text><text>30分钟</text> <text class="left">考试时间:</text><text>30分钟</text>
...@@ -26,9 +26,13 @@ ...@@ -26,9 +26,13 @@
export default { export default {
data() { data() {
return { return {
examId:1,
exam:null
} }
}, },
onLoad() {
this.getUserExamInfo()
},
methods: { methods: {
aaa(){ aaa(){
...@@ -36,7 +40,83 @@ ...@@ -36,7 +40,83 @@
url:'./answer' url:'./answer'
}) })
} },
//获取考试信息
getUserExamInfo: function() {
uni.showLoading({
title: '请稍候'
})
let that = this
uni.request({
url: 'https://system.banshouhui.com' +
'/wxh-worker-rest/rest/exam' +
'/serviceRule/userExamInfo/' +
'RTOKENf86a7c0606ef5ebf36f211ace3466b7f9de56e37' +
'?examId=' + this.examId,
method: 'POST',
data: {
//examId:this.examId,
},
header: {
'Content-Type': 'application/x-www-form-urlencoded'
},
success: (res) => {
console.log(res.data)
uni.hideLoading()
if (!res.data) {
return
}
if (res.data.code == 401 || res.data.code == 403) {
// uni.navigateTo({
// url: '/pages/login/wxlogin'
// })
// return
console.log('洪塘张学友')
}
if (res.data.code == 200) {
//examStatus 用户考试状态 0考试中 1考试完成 2未参与
that.exam = res.data.data
console.log(that.exam)
if (res.data.data.examStatus == 2) {
that.applyExam()
return
}
if(res.data.data.examStatus == 1){
console.log('111111111111111111111111111')
that.isComplete = true
that.examScore = res.data.data.examScore
that.postResult()
return
}
if (res.data.data.examStatus == 0 ) {
that.userExamId = res.data.data.id
that.getNext()
}
} else {
uni.showToast({
icon: 'none',
title: res.data.message
})
}
},
fail: (e) => {
uni.hideLoading()
uni.showToast({
icon: 'none',
title: '获取考试信息失败'
})
}
})
},
} }
} }
</script> </script>
......
...@@ -163,7 +163,8 @@ export default { ...@@ -163,7 +163,8 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y:auto;
} }
.course-video { .course-video {
......
...@@ -15,59 +15,22 @@ ...@@ -15,59 +15,22 @@
<view class="" style="font-size: 40rpx;font-weight:1000"> <view class="" style="font-size: 40rpx;font-weight:1000">
目录 目录
</view> </view>
<view class="" style="font-size: 40rpx;font-weight: 1000;"> <view v-for="item in list">
第一章 充电桩常见问题答疑 <view class="chapter">
</view> {{item.name}}
<view class="video" >
<view class="video_1" >
<view class="text" >
视频
</view>
<text class="text2">1-1唯修汇公司简介</text>
</view>
<view class="video_1" >
<view class="text">
视频
</view>
<text class="text2">1-2可接单评定标准</text>
</view>
<view class="video_1" >
<view class="text">
视频
</view>
<text class="text2">1-3结算规则</text>
</view>
<view class="video_1">
<view class="text">
视频
</view>
<text class="text2">1-4充电桩安装开城计划</text>
</view>
<view class="video_1">
<view class="text">
视频
</view>
<text class="text2">1-5缴纳质保金和费用答疑</text>
</view>
<view class="video_1" >
<view class="text" >
视频
</view>
<text class="text2">1-6安装材料品牌答疑1</text>
</view>
<view class="video_1" >
<view class="text">
视频
</view>
<text class="text2">1-7安装材料答疑2</text>
</view> </view>
<view class="video_1"> <view class="video" v-for="key in item.section" @click=details(key.id)>
<view class="text"> <view class="video_1" >
视频 <view class="text" v-text="key.ware=='0'?'视频':'图文'">
</view>
<text>1-{{key.order}}</text>
<text class="text2">{{key.name}}</text>
<text class="text3" v-text="key.isLearned==false?'未开始':'完成'"></text>
</view> </view>
<text class="text2">1-8其他问题答疑</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
...@@ -77,11 +40,72 @@ ...@@ -77,11 +40,72 @@
export default { export default {
data() { data() {
return { return {
params:{
course_id:0,
},
list:[],
examId:1,
} }
}, },
onLoad(a){
console.log(a)
this.params.course_id=a.course_id
console.log(this.params.course_id)
this.getCapterDetails()
},
methods: { methods: {
//获取章节详情
getCapterDetails() {
console.log(1111111)
this.$u.api
.ChapterDetails(this.params)
.then((res) => {
if (res.code == 200) {
if (res.data) {
this.list = this.list.concat(res.data);
console.log(this.list)
if (res.data.length < 5) {
//判断接口返回数据量小于请求数据量,则表示此为最后一页
this.isLoadMore = true;
this.loadStatus = "nomore";
} else {
this.isLoadMore = false;
}
} else {
this.isLoadMore = true;
this.loadStatus = "nomore";
}
} else {
//接口请求失败的处理
uni.showToast({
title: res.message,
icon: "none"
});
this.isLoadMore = false;
if (this.params.start > 0) {
this.page -= 5;
}
}
})
.catch((err) => {
uni.showToast({
title: err,
icon: "none",
});
this.isLoadMore = false;
if (this.params.start > 0) {
this.page -= 5;
}
});
},
//跳转到小节
details(id){
console.log(id)
uni.navigateTo({
url:"./section?section_id=" + id
})
}
} }
} }
</script> </script>
...@@ -101,9 +125,18 @@ ...@@ -101,9 +125,18 @@
width: 128rpx; width: 128rpx;
height: 128rpx; height: 128rpx;
} }
.chapter{
font-size: 37rpx;
font-weight: 700;
}
.video{
width: 100%;
}
.video_1{ .video_1{
display: flex; display: flex;
margin: 20rpx 0; margin: 20rpx 0;
position: relative;
width: 100%;
.text{ .text{
width: 100rpx; width: 100rpx;
height: 38rpx; height: 38rpx;
...@@ -114,8 +147,15 @@ ...@@ -114,8 +147,15 @@
} }
.text2{ .text2{
width: 397rpx;
font-size: 33rpx; font-size: 33rpx;
color: #82848A; color: #82848A;
margin-right: 0rpx;
}
.text3{
float: right;
position: relative;
right: 0;
} }
} }
</style> </style>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
return { return {
'color': '#FFFFFF', 'color': '#FFFFFF',
'width': '500rpx', 'width': '500rpx',
'height': '112rpx', 'height': '104rpx',
'background-color': '#2272FF', 'background-color': '#2272FF',
'font-size': '32rpx', 'font-size': '32rpx',
'font-weight': 'bold' 'font-weight': 'bold'
...@@ -226,7 +226,8 @@ ...@@ -226,7 +226,8 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y:auto;
} }
.exam-head { .exam-head {
...@@ -234,10 +235,10 @@ ...@@ -234,10 +235,10 @@
font-weight: bold; font-weight: bold;
} }
.content-gap { // .content-gap {
height: 1rpx; // height: 1rpx;
margin-bottom: 200rpx; // margin-bottom: 200rpx;
} // }
.tip-text { .tip-text {
background-color: #FFFFFF; background-color: #FFFFFF;
...@@ -271,7 +272,7 @@ ...@@ -271,7 +272,7 @@
margin-bottom: 20rpx; margin-bottom: 20rpx;
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
margin-bottom: 188rpx; // margin-bottom: 188rpx;
.tip-bottom-h { .tip-bottom-h {
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
......
This diff is collapsed.
<template> <template>
<view> <view>
<view class="title"> <view class="title">
《关于充电桩xxxx》 {{newsInfo.title}}
</view> </view>
<view class="content"> <view class="content" v-html="newsInfo.body">
于2021年3月23日 10:00 进行《xxx》内容进行培训。 <button @click="add">aaa</button>
{{newsInfo.body}}
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes,
nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus 。
zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
</view> </view>
</view> </view>
</template> </template>
...@@ -18,10 +14,24 @@ ...@@ -18,10 +14,24 @@
export default { export default {
data() { data() {
return { return {
banner:{},
obj:{
},
newsInfo:null
} }
}, },
methods: { methods: {
},
onLoad() {
},
onShow(){
uni.$on('news',(news)=>{
this.newsInfo = news;
console.log(news,'news')
})
}, },
onLoad() { onLoad() {
......
<template> <template>
<view class="content"> <view class="test-result">
<view class="title"> <text class="title">考试结果</text>
考试结果
</view>
<view class="result"> <view class="result">
未通过 未通过
</view> </view>
<view class="details"> <view class="test-explain">
<view class=""> <view class="hang">
<text class="first">合格条件:</text><text>答对20题</text> <text class="text1">合格条件:</text><text class="text2">答对20题</text>
</view>
<view class="">
<text class="first">考试结果:</text><text>答对10题</text>
</view> </view>
<view class=""> <view class="hang">
<text class="first">考试用时</text><text>16分29秒</text> <text class="text1">考试结果:</text><text class="text2">答对10题</text>
</view> </view>
<view class="btn"> <view class="hang">
<button class="btn1">再答一次</button> <text class="text1">考试用时:</text><text class="text2">16分29秒</text>
<button class="btn2">退出重考</button>
</view> </view>
</view> </view>
<view class="btn">
<button class="btn1">再答一次</button>
<button class="btn2">退出重考</button>
</view>
</view> </view>
</template> </template>
...@@ -32,57 +29,61 @@ ...@@ -32,57 +29,61 @@
} }
}, },
methods:{ methods: {
} }
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.content{ .test-result{
width: 100%; width: 610rpx;
height: 950rpx; height: 965rpx;
background: #DCDFE6; margin: 70rpx auto 0;
padding: 53rpx; .title{
} margin: 0 44rpx 0;
.title{
font-size: 30rpx;
}
.result{
color: red;
font-size: 73rpx;
text-align: center;
margin: 46rpx 0;
}
.details{
border-top: 2rpx dashed #808080;
height: 600rpx;
padding-top: 94rpx;
view{
margin: 26rpx 0 0;
.first{
margin: 0 20rpx 0;
}
} }
} .result{
.btn{ color: red;
.btn1{ font-size: 66rpx;
width: 477rpx; text-align: center;
height: 61rpx; border-bottom: 1px dashed #000000;
border-radius: 27rpx; margin: 74rpx 0;
line-height: 61rpx; padding: 66rpx;
font-size: 29rpx; }
background: #007AFF; .test-explain{
color: #FFFFFF; .hang{
margin: 140rpx auto 34rpx; margin: 26rpx 26rpx;
.text1{
color: #a69999;
margin-right: 22rpx;
}
.text2{
color: #333333;
}
}
} }
.btn2{ .btn{
width: 477rpx; margin-top: 236rpx;
height: 61rpx; .btn1{
border-radius: 27rpx; width: 478rpx;
line-height: 61rpx; height: 60rpx;
font-size: 29rpx; background: #0079fe;
color: #fff;
font-size: 26rpx;
line-height: 60rpx;
margin: 20rpx auto;
}
.btn2{
width: 478rpx;
height: 60rpx;
background: #f2f2f2;
color: #333333;
font-size: 26rpx;
line-height: 60rpx;
margin:0 auto;
}
} }
} }
</style> </style>
\ No newline at end of file
<template>
<view>
<view class="title">
{{CourseSectionlist.name}}
</view>
<view class="content" v-html="CourseSectionlist.content">
{{CourseSectionlist.content}}
</view>
</view>
</template>
<script>
export default {
data() {
return {
CourseSectionlist:null,
section_id:{
section_id:0
}
}
},
onLoad(id) {
this.section_id.section_id = id.section_id
this.getCourseSection()
},
methods: {
getCourseSection() {
this.$u.api
.CourseSection(this.section_id)
.then((res) => {
if (res.code == 200) {
if (res.data) {
this.CourseSectionlist = res.data;
console.log("--------")
console.log(this.CourseSectionlist)
if (res.data.length < 5) {
//判断接口返回数据量小于请求数据量,则表示此为最后一页
this.isLoadMore = true;
this.loadStatus = "nomore";
} else {
this.isLoadMore = false;
}
} else {
this.isLoadMore = true;
this.loadStatus = "nomore";
}
} else {
//接口请求失败的处理
uni.showToast({
title: res.message,
icon: "none"
});
this.isLoadMore = false;
if (this.params.start > 0) {
this.page -= 5;
}
}
})
.catch((err) => {
uni.showToast({
title: err,
icon: "none",
});
this.isLoadMore = false;
if (this.params.start > 0) {
this.page -= 5;
}
});
},
}
}
</script>
<style lang="scss">
.title{
text-align: center;
font-size: 45rpx;
font-weight: 700;
margin: 24rpx;
}
.content{
font-size: 30rpx;
padding: 50rpx;
}
</style>
<template> <template>
<view> <view>
<view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30"> <u-navbar v-if="!takeStatus" :is-back="false" :title-size="26" title-color="#000" title="我的"></u-navbar>
<view class="u-m-r-10"> <view v-if="!takeStatus">
<u-avatar :src="pic" size="140"></u-avatar> <view class="u-flex user-box u-p-l-30 u-p-r-20 u-p-b-30">
<view class="u-m-r-10">
<u-avatar :src="pic" size="140"></u-avatar>
</view>
<view class="u-flex-1">
<view class="u-font-18 u-p-b-20">uView ui</view>
<view class="u-font-14 u-tips-color">微信号:helang_uView</view>
</view>
</view> </view>
<view class="u-flex-1">
<view class="u-font-18 u-p-b-20">uView ui</view> <view class="u-m-t-20">
<view class="u-font-14 u-tips-color">微信号:helang_uView</view> <u-cell-group>
<u-cell-item v-for="(item, index) in items" :title="item.title" :value="item.value" :key="index">
<u-icon slot="icon" size="32" name="search"></u-icon>
</u-cell-item>
</u-cell-group>
</view>
<view class="u-m-t-20">
<u-cell-group>
<u-cell-item icon="setting" title="设置"></u-cell-item>
</u-cell-group>
</view>
<view class="u-m-t-20" @click="take">
<u-cell-group>
<u-cell-item icon="setting" title="相机组件测试"></u-cell-item>
</u-cell-group>
</view> </view>
</view> </view>
<take-photo type="test" v-if="takeStatus" @close="closeTake"></take-photo>
<view class="u-m-t-20">
<u-cell-group>
<u-cell-item v-for="(item, index) in items" :title="item.title" :value="item.value" :key="index">
<u-icon slot="icon" size="32" name="search"></u-icon>
</u-cell-item>
</u-cell-group>
</view>
<view class="u-m-t-20">
<u-cell-group>
<u-cell-item icon="setting" title="设置"></u-cell-item>
</u-cell-group>
</view>
</view> </view>
</template> </template>
<script> <script>
import takePhoto from '@/components/take/index.vue'
export default { export default {
components: {
'take-photo': takePhoto
},
data() { data() {
return { return {
pic:'https://uviewui.com/common/logo.png', pic:'https://uviewui.com/common/logo.png',
show:true show:true,
takeStatus: false
} }
}, },
computed: { computed: {
...@@ -50,7 +64,13 @@ ...@@ -50,7 +64,13 @@
}, },
methods: { methods: {
take() {
uni.hideTabBar()
this.takeStatus = true
},
closeTake() {
this.takeStatus = false
}
} }
} }
</script> </script>
......
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
<view class="city-text">{{cityText}}</view> <view class="city-text">{{cityText}}</view>
</view> </view>
</view> </view>
<view class="base-item" style="height: 600rpx;"> <view class="base-item" style="margin-bottom: 0rpx;">
<view class="item item-select" @click="gopage('/pages/settle/select?selectType=working_age')"> <view class="item item-select" @click="gopage('/pages/settle/select?selectType=working_age')">
<view class="flex-center"> <view class="flex-center">
<image class="item-image" :src="mixingImage"></image> <image class="item-image" :src="mixingImage"></image>
<text class="label">电工工龄(年)</text> <text class="label">电工工龄(年)</text>
</view> </view>
<p :class="['u-flex-1 u-text-right area', {before: !baseInfo.working_age}]"> <p :class="['u-flex-1 u-text-right area', {before: baseInfo.working_age === ''}]">
{{ baseInfo.working_age !== '' ? workingAgeTxt : '去选择'}} {{ baseInfo.working_age !== '' ? workingAgeTxt : '去选择'}}
</p> </p>
<u-icon name="arrow-right" color="#2272FF" size="28"></u-icon> <u-icon name="arrow-right" color="#2272FF" size="28"></u-icon>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="seat"></view> <!-- <view class="seat"></view> -->
<template v-slot:bottom> <template v-slot:bottom>
<view class="btn-wrap flex-xc"> <view class="btn-wrap flex-xc">
<u-button class="btn-submit" @click="$u.debounce(submitBaseInfo, 500)" :custom-style="buttonStyle" <u-button class="btn-submit" @click="$u.debounce(submitBaseInfo, 500)" :custom-style="buttonStyle"
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
submitStatus() { submitStatus() {
const baseInfo = this.baseInfo const baseInfo = this.baseInfo
//baseInfo.name && baseInfo.mobile && //baseInfo.name && baseInfo.mobile &&
const flag = baseInfo.service_area && baseInfo.working_age !== '' && baseInfo.address const flag = baseInfo.service_area.length > 0 && baseInfo.working_age !== '' && baseInfo.address !== ''
return flag && !this.saving return flag && !this.saving
}, },
cityText() { cityText() {
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
} }
this.baseInfo = res.data this.baseInfo = res.data
uni.showToast({ uni.showToast({
title: '入驻基本信息提交成功', title: '提交成功',
icon: 'success' icon: 'success'
}); });
}, },
...@@ -326,7 +326,9 @@ ...@@ -326,7 +326,9 @@
*/ */
async submitBaseInfo() { async submitBaseInfo() {
if (!this.submitStatus) {
return
}
// this.newSubmitBaseInfo() // this.newSubmitBaseInfo()
// return // return
const baseInfo = this.baseInfo; const baseInfo = this.baseInfo;
...@@ -384,7 +386,8 @@ ...@@ -384,7 +386,8 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y:auto;
} }
.base-list { .base-list {
...@@ -427,7 +430,8 @@ ...@@ -427,7 +430,8 @@
.label { .label {
color: #333; color: #333;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold;
} }
.txt { .txt {
...@@ -582,9 +586,9 @@ ...@@ -582,9 +586,9 @@
font-weight: bold; font-weight: bold;
} }
.seat { // .seat {
padding-bottom: 168rpx; // padding-bottom: 168rpx;
} // }
/*提交按钮*/ /*提交按钮*/
.btn-wrap { .btn-wrap {
...@@ -680,7 +684,8 @@ ...@@ -680,7 +684,8 @@
.address-view { .address-view {
border: 2rpx solid #ECECEC; border: 2rpx solid #ECECEC;
height: 112rpx; height: 112rpx;
margin-top: 30rpx; margin-top: 30rpx;
margin-bottom: 20rpx;
padding: 16rpx 30rpx; padding: 16rpx 30rpx;
} }
......
...@@ -321,7 +321,7 @@ export default { ...@@ -321,7 +321,7 @@ export default {
break; break;
} }
await self.chooseImage("qiniu", attr) await self.chooseImage("qiniu", {...attr, options: {count: 1}})
if(self.uploadType && self.imgList && self.imgList.length > 0) { if(self.uploadType && self.imgList && self.imgList.length > 0) {
// 设置图片对象 // 设置图片对象
self.imgObj[self.uploadType] = self.imgList self.imgObj[self.uploadType] = self.imgList
...@@ -460,7 +460,10 @@ export default { ...@@ -460,7 +460,10 @@ export default {
return formFlag; return formFlag;
}, },
async submitFileInfo() { async submitFileInfo() {
if (!this.submitBtnStatus) {
return
}
if (!this.checkFileInfo()) { if (!this.checkFileInfo()) {
return; return;
} }
...@@ -525,7 +528,8 @@ export default { ...@@ -525,7 +528,8 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y:auto;
} }
.base-list { .base-list {
...@@ -735,7 +739,7 @@ export default { ...@@ -735,7 +739,7 @@ export default {
} }
.info-view { .info-view {
margin-bottom: 188rpx; // margin-bottom: 188rpx;
.title-view { .title-view {
background-color: #FFFFFF; background-color: #FFFFFF;
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
.content-view { .content-view {
background-color: #FFFFFF; background-color: #FFFFFF;
margin-bottom: 188rpx; // margin-bottom: 188rpx;
border-radius: 12rpx; border-radius: 12rpx;
} }
......
This diff is collapsed.
This diff is collapsed.
...@@ -412,7 +412,15 @@ ...@@ -412,7 +412,15 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.content { .content {
background-color: #F3F3F3; background-color: #F4F5F7;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
overflow-y:auto;
} }
.nav-item, .nav-item,
.age-item { .age-item {
...@@ -447,7 +455,7 @@ ...@@ -447,7 +455,7 @@
} }
.nav-item.active { .nav-item.active {
background-color: #ededed; background-color: #F4F5F7;
} }
} }
......
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
// } // }
uni.hideLoading() uni.hideLoading()
uni.showToast({ uni.showToast({
title: '入驻基本信息提交成功', title: '提交成功',
icon: 'success' icon: 'success'
}); });
// let timer = setTimeout(() => { // let timer = setTimeout(() => {
...@@ -424,7 +424,8 @@ ...@@ -424,7 +424,8 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-y:auto;
} }
.content-txt { .content-txt {
...@@ -453,8 +454,8 @@ ...@@ -453,8 +454,8 @@
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
padding: 30rpx 30rpx 0rpx 30rpx; padding: 30rpx 30rpx 0rpx 30rpx;
margin-bottom: 20rpx; // margin-bottom: 20rpx;
margin-bottom: 188rpx; // margin-bottom: 188rpx;
/deep/ .u-radio__label { /deep/ .u-radio__label {
line-height: 40rpx; line-height: 40rpx;
......
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