Commit 9a68de66 authored by zhengzy's avatar zhengzy
parents 6df21b2d 7f521e97
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
// 授权用户信息 // 授权用户信息
authUserInfo: '', authUserInfo: '',
// 用户入驻信息
settledInfo: {},
}, },
onLaunch: function() { onLaunch: function() {
// 应用初始化(全局只触发一次) // 应用初始化(全局只触发一次)
...@@ -46,9 +49,7 @@ ...@@ -46,9 +49,7 @@
}, },
onShow: function() { onShow: function() {
// 应用启动,或从后台进入前台显示 // 应用启动,或从后台进入前台显示
if (!this.globalData.token) { this.autoLogin()
this.autoLogin()
}
}, },
onHide: function() { onHide: function() {
// 应用从前台进入后台 // 应用从前台进入后台
......
...@@ -38,13 +38,18 @@ export default [{ ...@@ -38,13 +38,18 @@ export default [{
"cat": 10 "cat": 10
}, },
{ {
"fieldsTitle": "短裙", "fieldsTitle": "文件选择",
"fieldsName": "file",
"fieldsType": "file",
"key": "短裙", "key": "短裙",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg", "icon": "https://cdn.uviewui.com/uview/common/classify/1/5.jpg",
"cat": 10 "cat": 10
}, },
{ {
"fieldsTitle": "阔腿裤", "fieldsTitle": "获取经纬度",
"fieldsName": "location",
"fieldsType": "location",
"required": true,
"key": "阔腿裤", "key": "阔腿裤",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/6.jpg", "icon": "https://cdn.uviewui.com/uview/common/classify/1/6.jpg",
"cat": 10 "cat": 10
......
qn_base_url = 'https://qn-static.banshouhui.com/self-support/'
\ No newline at end of file
<template>
<view class="file-box">
<view class="u-flex" @click="selectUpload">
<view class="txt u-flex-1">{{item.fieldsTitle}}</view>
<u-icon name="arrow-right" color="#666" size="28"></u-icon>
</view>
<view class="pics u-flex u-flex-wrap">
<u-image class="pic" v-for="(item,index) in imgList" width="170rpx" height="170" :src="item.path"></u-image>
<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> -->
</view>
<u-popup v-model="maskShow" mode="center" width="500">
<view class="upload-box u-p-30">
<view class="title">请选择图片</view>
<view class="u-flex u-row-between">
<view class="upload-item u-text-center" @click="uploadFile('photo')">
<u-image class="pic" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image>
相册
</view>
<view class="upload-item u-text-center" @click="uploadFile">
<u-image class="pic" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image>
拍摄
</view>
</view>
</view>
</u-popup>
</view>
</template>
<script>
import objMixin from './objMixin'
import baseFile from '@/components/upload/index';
export default {
name: 'XhFiles',
components: {},
mixins: [objMixin,baseFile],
props: {},
filters:{},
data() {
return {
maskShow:false
}
},
computed: {
settings() {
return this.item.settings || []
}
},
watch: {},
mounted() {},
methods: {
selectUpload(){
// 弹窗展示
this.maskShow = true
},
async uploadFile(type){
const self = this
if(type&&type==='photo'){
// 直接打开相册
let config = {
options:{
consourceType:['album'],//['album', 'camera']
}
}
await this.chooseImage('qiniu',config)
self.setValue()
return
}
// 使用拍照工具拍摄
},
setValue() {
const dataValue = []
this.imgList.map(item=>{
dataValue.push(item.key)
})
this.valueChange(dataValue)
}
}
}
</script>
<style lang="scss" scoped>
.pic{
margin-right: 15rpx;
margin-bottom: 15rpx;
&:nth-child(3n){
margin-right: 0;
}
}
// .list {
// display: flex;
// .txt {
// color: #666;
// padding: 10rpx;
// &.active {
// background-color: red;
// color: #fff;
// }
// }
// }
</style>
<template>
<view class="list u-flex u-row-between">
<text class="required" v-if="item.required">*</text>
<view class="u-m-r-20">{{item.fieldsTitle}}</view>
<view class="u-flex-1">{{valueTxt || ''}}</view>
<u-button type="primary" size="mini" @click="$u.debounce(getLocation,1000)">默认按钮</u-button>
</view>
</template>
<script>
import objMixin from './objMixin'
export default {
name: 'XhRadio',
components: {},
mixins: [objMixin],
props: {},
filters:{},
data() {
return {}
},
computed: {
valueTxt() {
let str = ''
const dataValue = this.dataValue
if(dataValue && dataValue.length>1){
str = '经度:'+dataValue[0]+','+'维度:'+dataValue[1]
}
return str
}
},
watch: {},
mounted() {},
methods: {
getLocation() {
let self = this
const dataValue = this.dataValue || []
const waterInfo = this.waterInfo
uni.getLocation({
type: 'gcj02',
success: function(res) {
dataValue.push(res.longitude)
dataValue.push(res.latitude)
self.dataValue = dataValue
self.setValue(dataValue)
},
fail(err) {}
});
},
setValue(txt) {
this.valueChange(this.dataValue)
}
}
}
</script>
<style lang="scss" scoped>
.required {
padding-right: 10rpx;
font-size: 28rpx;
line-height: 40rpx;
color: #fa3534;
}
</style>
<template>
<view class="list">
<view v-for="(item,index) in settings" :key="index" :class="{'txt':true,'active':item===dataValue}"
@click="setValue(item)">{{item}}</view>
</view>
</template>
<script>
import stringMixin from './stringMixin'
export default {
name: 'XhRadio',
components: {},
mixins: [stringMixin],
props: {},
data() {
return {}
},
computed: {
settings(){
return this.item.settings || []
}
},
watch: {},
mounted() {},
methods: {
setValue(txt){
this.dataValue = txt
this.valueChange(txt)
}
}
}
</script>
<style lang="scss" scoped>
.list{
display: flex;
.txt{
color:#666;
padding:10rpx;
&.active{
background-color: red;
color:#fff;
}
}
}
</style>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
}, },
computed: { computed: {
url() { url() {
return '../../static/settle/top' + this.index + '@3x.png' return qn_base_url + 'top' + this.index + '.png'
} }
} }
} }
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
bottom: 44rpx; bottom: 44rpx;
width: 100%; width: 100%;
} }
</style> </style>
<template>
<view class="content-view">
<view class="headimage-view">
<image class="headimage-view-image" :src="kefuImage"></image>
<text class="name-text">朱曼婷</text>
</view>
<view class="content-info">
<view>
<view class="content-info-title">深圳唯修汇科技有限公司</view>
<view class="content-info-tip">长按二维码添加官方客服微信及时了解审核进度</view>
</view>
<view class="QRcode-view">
<image class="content-info-QRcode":src="erweimaImage"></image>
</view>
</view>
</view>
</template>
<script>
export default {
props: {
},
data() {
return {}
},
computed: {
erweimaImage() {
return qn_base_url + 'erweima.png'
},
kefuImage() {
return qn_base_url + 'kefu.png'
}
}
}
</script>
<style lang="scss" scoped>
.content-view {
background-color: #FFFFFF;
width: 440rpx;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
.headimage-view {
position: relative;
.headimage-view-image {
width: 440rpx;
height: 400rpx;
}
.name-text {
position: absolute;
bottom: 20rpx;
left: 20rpx;
color: #FFFFFF;
font-size: 28rpx;
}
}
.content-info {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
padding: 0rpx 12rpx 20rpx 12rpx;
.content-info-title {
font-size: 24rpx;
color: #333333;
margin-bottom: 10rpx;
}
.content-info-tip {
font-size: 20rpx;
color: #666666;
}
.QRcode-view {
margin-left: 30rpx;
}
.content-info-QRcode {
padding-top: 12rpx;
width: 104rpx;
height: 104rpx;
}
}
}
</style>
...@@ -5,7 +5,9 @@ export default { ...@@ -5,7 +5,9 @@ export default {
components: {}, components: {},
data() { data() {
return { return {
imgList:[] imgList:[],
// 上传文件种类:0--头像、1--证件、2--身份证
categories: ['avatar', 'cert', 'id'],
}; };
}, },
created() { created() {
...@@ -26,10 +28,19 @@ export default { ...@@ -26,10 +28,19 @@ export default {
} }
let res = await uploader.urlFileUpload(options) let res = await uploader.urlFileUpload(options)
}, },
async chooseImage(type){ /**
* 上传图片公用组件
* @param {Object} type 文件上传方式
* @param {Object} attr 文件属性:图片种类[category](身份证、证件、头像);
* 图片上传其他配置[options】(如,选择图片或拍摄options.consourceType,['album', 'camera'];)其他
*/
async chooseImage(type, attr={}){
const self = this const self = this
let imgList = [] let imgList = []
if(type==='qiniu'){ if(type==='qiniu'){
// 图片种类
let category = attr && attr.category || self.categories[0]
let config = attr && attr.options || {} // 图片上传参数配置
// 七牛上传 // 七牛上传
let options = { let options = {
onProgressUpdate(res){ onProgressUpdate(res){
...@@ -57,13 +68,15 @@ export default { ...@@ -57,13 +68,15 @@ export default {
} }
self.imgList = imgList self.imgList = imgList
console.log(res,'res---onEachUpdate') console.log(res,'res---onEachUpdate')
} },
cardType: category,
...config
} }
// 不需要进度条等可直接获取 // 不需要进度条等可直接获取
let res = await uploader.qnImgUpload(options) let res = await uploader.qnImgUpload(options)
console.log(self.imgList,'self.imgList') console.log(self.imgList,'self.imgList')
// console.log(uploader,uploader.qiniuTokenObj,'qiniuTokenObj') console.log(uploader,uploader.qiniuTokenObj,'qiniuTokenObj')
// let imgList = res.map(item=>{ // let imgList = res.map(item=>{
// return { // return {
// key:item, // key:item,
......
...@@ -4,6 +4,7 @@ import uView from "uview-ui"; ...@@ -4,6 +4,7 @@ import uView from "uview-ui";
import vuexStore from "@/store/$u.mixin.js"; import vuexStore from "@/store/$u.mixin.js";
import store from '@/store/index' import store from '@/store/index'
import {router,RouterMount} from '@/router/index.js' //路径换成自己的 import {router,RouterMount} from '@/router/index.js' //路径换成自己的
import './common/global.js'
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.mixin(vuexStore) Vue.mixin(vuexStore)
......
...@@ -145,7 +145,9 @@ ...@@ -145,7 +145,9 @@
{ {
"path": "pages/exam/index", "path": "pages/exam/index",
"style": { "style": {
"navigationBarTitleText": "入驻考试" "navigationBarTitleText": "入驻考试",
"navigationStyle": "custom",
"disableScroll": true
} }
}, },
{ {
...@@ -227,8 +229,8 @@ ...@@ -227,8 +229,8 @@
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": "" //启动参数,在页面的onLoad函数里面得到
}, },
{ {
"name": "在线考试-old", //模式名称 "name": "入驻考试", //模式名称
"path": "pages/exam/start", //启动页面,必选 "path": "pages/exam/index", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": "" //启动参数,在页面的onLoad函数里面得到
}, },
{ {
......
This diff is collapsed.
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
// 后台自动判断入驻流程是否完成,前台通过status确定状态 // 后台自动判断入驻流程是否完成,前台通过status确定状态
if (result && result.record) { if (result && result.record) {
vm.loaded = true; vm.loaded = true;
vm.status = result.record.status; vm.status = Number(result.record.status);
// vm.status = 1 // vm.status = 1
} }
}; };
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="exam-wrap"> <view class="exam-wrap">
<Settle :index="3"> <Settle :index="3">
<view class="tip-text"> <view class="tip-text">
<image class="tip-image" mode="widthFix" src="../../static/settle/tips1@3x.png"></image> <image class="tip-image" mode="widthFix" :src="tips1Image"></image>
<text>接单教程可让您快速了解如何使用小程序,建议先查看并学习教程。</text> <text>接单教程可让您快速了解如何使用小程序,建议先查看并学习教程。</text>
</view> </view>
<view class="learn-view"> <view class="learn-view">
...@@ -126,16 +126,19 @@ ...@@ -126,16 +126,19 @@
'background-color': '#FFFFFF', 'background-color': '#FFFFFF',
'font-size': '24rpx' 'font-size': '24rpx'
} }
},
buttonStyle() {
return {
'color': '#FFFFFF',
'width': '500rpx',
'height': '112rpx',
'background-color': '#2272FF',
'font-size': '32rpx',
'font-weight': 'bold'
}
}, },
buttonStyle() { tips1Image() {
return { return qn_base_url + 'tips1@3x.png'
'color': '#FFFFFF',
'width': '500rpx',
'height': '112rpx',
'background-color': '#2272FF',
'font-size': '32rpx',
'font-weight': 'bold'
}
} }
}, },
onLoad() { onLoad() {
...@@ -173,11 +176,11 @@ ...@@ -173,11 +176,11 @@
debugger; debugger;
console.log(e, 'loadLearnData'); console.log(e, 'loadLearnData');
}); });
}, },
handleClick() { handleClick() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/exam/index' url: '/pages/exam/index'
}) })
}, },
viewCourse(e) { viewCourse(e) {
let that = this; let that = this;
...@@ -244,23 +247,23 @@ ...@@ -244,23 +247,23 @@
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
font-weight: bold; font-weight: bold;
} }
.tip-bottom { .tip-bottom {
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
padding: 38rpx 30rpx 30rpx 30rpx; padding: 38rpx 30rpx 30rpx 30rpx;
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;
} }
.tip-bottom-t { .tip-bottom-t {
margin-top: 30rpx; margin-top: 30rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
} }
.learn-view { .learn-view {
...@@ -292,9 +295,9 @@ ...@@ -292,9 +295,9 @@
padding-top: 8rpx; padding-top: 8rpx;
padding-right: 2rpx; padding-right: 2rpx;
text-align: center; text-align: center;
margin-right: 20rpx; margin-right: 20rpx;
.item-st-text { .item-st-text {
color: #FFFFFF; color: #FFFFFF;
} }
} }
...@@ -311,4 +314,4 @@ ...@@ -311,4 +314,4 @@
} }
} }
} }
</style> </style>
...@@ -22,25 +22,32 @@ ...@@ -22,25 +22,32 @@
<view class="class-item" :key="groupIndex"> <view class="class-item" :key="groupIndex">
<view class="title">{{groupItem.groupName}}</view> <view class="title">{{groupItem.groupName}}</view>
<view class="class-bd"> <view class="class-bd">
<u-form-item v-for="(item,itemIndex) in groupItem.item" :key="itemIndex" <u-form-item v-for="(item,itemIndex) in groupItem.item" :key="itemIndex"
label-position="top"
:prop="item.fieldsName"> :prop="item.fieldsName">
<view class="label" @click="nextStep(item)"> <view class="label" v-if="toLowerCase(item.fieldsType)!=='location'" @click="nextStep(item)">
<text class="required" v-if="item.required">*</text> <text class="required" v-if="item.required">*</text>
{{item.fieldsTitle}} {{item.fieldsTitle}}
</view> </view>
<template v-if="item.fieldsType"> <template v-if="item.fieldsType">
<xh-input v-if="item.fieldsType==='input'" :groupIndex="groupIndex" <xh-input v-if="toLowerCase(item.fieldsType)==='input'" :groupIndex="groupIndex"
:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange"> :itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
</xh-input> </xh-input>
<xh-radio v-if="item.fieldsType==='radio'" :groupIndex="groupIndex" <xh-radio v-else-if="toLowerCase(item.fieldsType)==='radio'" :groupIndex="groupIndex"
:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange"> :itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
</xh-radio> </xh-radio>
<xh-checkbox v-if="item.fieldsType==='checkbox'" :groupIndex="groupIndex" <xh-checkbox v-else-if="toLowerCase(item.fieldsType)==='checkbox'" :groupIndex="groupIndex"
:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange"> :itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
</xh-checkbox> </xh-checkbox>
<xh-select v-if="item.fieldsType==='select'" :groupIndex="groupIndex" <xh-select v-else-if="toLowerCase(item.fieldsType)==='select'" :groupIndex="groupIndex"
:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange"> :itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
</xh-select> </xh-select>
<xh-files v-else-if="toLowerCase(item.fieldsType)==='file'" :groupIndex="groupIndex"
:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
</xh-files>
<xh-location v-else-if="toLowerCase(item.fieldsType)==='location'" :groupIndex="groupIndex"
:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
</xh-location>
</template> </template>
</u-form-item> </u-form-item>
</view> </view>
...@@ -58,6 +65,8 @@ ...@@ -58,6 +65,8 @@
import XhRadio from '@/components/createCom/XhRadio.vue' import XhRadio from '@/components/createCom/XhRadio.vue'
import XhCheckbox from '@/components/createCom/XhCheckbox.vue' import XhCheckbox from '@/components/createCom/XhCheckbox.vue'
import XhSelect from '@/components/createCom/XhSelect.vue' import XhSelect from '@/components/createCom/XhSelect.vue'
import XhFiles from '@/components/createCom/XhFiles.vue'
import XhLocation from '@/components/createCom/XhLocation.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue' // import XhRadio from '@/components/createCom/XhRadio.vue'
export default { export default {
data() { data() {
...@@ -109,7 +118,9 @@ ...@@ -109,7 +118,9 @@
XhInput, XhInput,
XhRadio, XhRadio,
XhCheckbox, XhCheckbox,
XhSelect XhSelect,
XhFiles,
XhLocation
// formCom // formCom
}, },
created() { created() {
...@@ -144,7 +155,17 @@ ...@@ -144,7 +155,17 @@
// 下一步 // 下一步
console.log(item, 'item') console.log(item, 'item')
}, },
fieldTypeStatus(type){
let typeArr = ['input','radio','checkbox','select','file']
let fieldsType = type.toLocaleLowerCase()
let flag = false
flag = typeArr.indexOf(fieldsType)>=0
return flag
},
toLowerCase(str){
str = str || ''
return str.toLocaleLowerCase()
},
// ------------------------- 以下方法为展示滚动切换 ------------------------- // ------------------------- 以下方法为展示滚动切换 -------------------------
// 点击左边的栏目切换 // 点击左边的栏目切换
async swichMenu(index) { async swichMenu(index) {
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<Settle :index="2"> <Settle :index="2">
<view class="base-list"> <view class="base-list">
<view class="tip-text"> <view class="tip-text">
<image class="tip-image" mode="widthFix" src="../../static/settle/anquan@3x.png"></image> <image class="tip-image" mode="widthFix" :src="anquanImage"></image>
<text>身份证照片、电工证照片、行驶证/驾驶证照片及车辆照片仅用于申请入驻。</text> <text>身份证照片、电工证照片、行驶证/驾驶证照片及车辆照片仅用于申请入驻。</text>
</view> </view>
<view class="base-item"> <view class="base-item">
<view class="item item-select" @click="gopage('/pages/settle/select?selectType=area')"> <view class="item item-select" @click="gopage('/pages/settle/select?selectType=area')">
<view class="flex-center"> <view class="flex-center">
<image class="item-image" src="../../static/settle/mixing@3x.png"></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 txt', {before: !cityText}]">{{ cityText ? '已选择' : '去选择' }} <p :class="['u-flex-1 u-text-right txt', {before: !cityText}]">{{ cityText ? '已选择' : '去选择' }}
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<view class="base-item" style="height: 600rpx;"> <view class="base-item" style="height: 600rpx;">
<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="../../static/settle/mixing@3x.png"></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}]">
...@@ -47,11 +47,11 @@ ...@@ -47,11 +47,11 @@
<view> <view>
<view class="item item-select" @click="locationClick()"> <view class="item item-select" @click="locationClick()">
<view class="flex-center"> <view class="flex-center">
<image class="item-image" src="../../static/settle/mixing@3x.png"></image> <image class="item-image" :src="mixingImage"></image>
<text class="itemTitle">详细地址</text> <text class="itemTitle">详细地址</text>
</view> </view>
<view class="flex-center"> <view class="flex-center">
<image class="item-image-l" src="../../static/settle/dizhi@3x.png"></image> <image class="item-image-l" :src="dizhiImage"></image>
<text class="right-label blueColor">自动定位</text> <text class="right-label blueColor">自动定位</text>
</view> </view>
</view> </view>
...@@ -123,6 +123,15 @@ ...@@ -123,6 +123,15 @@
}, },
cityText() { cityText() {
return this.areaTxts.join('、') return this.areaTxts.join('、')
},
anquanImage() {
return qn_base_url + 'anquan.png'
},
mixingImage() {
return qn_base_url + 'mixing.png'
},
dizhiImage() {
return qn_base_url + 'dizhi.png'
} }
}, },
components: { components: {
...@@ -691,4 +700,4 @@ ...@@ -691,4 +700,4 @@
margin-right: 8rpx; margin-right: 8rpx;
margin-top: 2rpx; margin-top: 2rpx;
} }
</style> </style>
This diff is collapsed.
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
this.jumpJudge() this.jumpJudge()
}, },
jumpJudge() { jumpJudge() {
if (Number(this.status) > 0) { if (Number(this.status) > 0) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/settle/prompt' url: '/pages/settle/prompt'
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<view class="line-view"></view> <view class="line-view"></view>
<view class="item u-flex u-row-between"> <view class="item u-flex u-row-between">
<view class="txt">待缴纳金额</view> <view class="txt">待缴纳金额</view>
<view class="txt-value">¥ {{settledInfo.record.deposit}}</view> <view class="txt-value">¥ {{settledInfo.record.deposit || '--'}}</view>
</view> </view>
</view> </view>
<!-- <view class="tips">你已缴纳金额:1000.00元</view> <!-- <view class="tips">你已缴纳金额:1000.00元</view>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<template v-slot:bottom> <template v-slot:bottom>
<view class="btn-wrap flex-xc"> <view class="btn-wrap flex-xc">
<button class="btn-submit" :disabled="saving" @click="paySubmit"> <button class="btn-submit" :disabled="saving" @click="paySubmit">
<image class="button-image" mode="widthFix" src="../../static/settle/weixin@3x.png"></image> <image class="button-image" mode="widthFix" :src="weixinImage"></image>
<text>{{saving ? '支付中……' : '微信支付'}}</text> <text>{{saving ? '支付中……' : '微信支付'}}</text>
</button> </button>
</view> </view>
...@@ -63,7 +63,11 @@ ...@@ -63,7 +63,11 @@
this.getBaseInfo() this.getBaseInfo()
} }
}, },
computed: {}, computed: {
weixinImage() {
return qn_base_url + 'weixin.png'
}
},
watch: { watch: {
isRefresh(val) { isRefresh(val) {
this.getBaseInfo() this.getBaseInfo()
...@@ -75,7 +79,7 @@ ...@@ -75,7 +79,7 @@
methods: { methods: {
successCallback() { successCallback() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/settle/prompt' url: '/pages/settle/prompt' + '?pageIndex=' + '4'
}) })
}, },
async getBaseInfo() { async getBaseInfo() {
...@@ -311,9 +315,9 @@ ...@@ -311,9 +315,9 @@
border-radius: 52rpx; border-radius: 52rpx;
background: #2272FF; background: #2272FF;
font-size: 32rpx; font-size: 32rpx;
color: #fff; color: #fff;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
&[disabled] { &[disabled] {
...@@ -322,4 +326,4 @@ ...@@ -322,4 +326,4 @@
} }
} }
} }
</style> </style>
...@@ -4,16 +4,20 @@ ...@@ -4,16 +4,20 @@
<view class="content-view"> <view class="content-view">
<view class="u-flex u-row-center"> <view class="u-flex u-row-center">
<image :class="['icon', {active: status != 1}]" <image :class="['icon', {active: status != 1}]"
:src="status == 1 ? require('@/static/settle/chenggong@3x.png') : require('@/static/settle/icon-prompt@3x.png')"> :src="imageUrl">
</image> </image>
</view> </view>
<view class="txt-box"> <view class="txt-box">
<text :class="['title',index ? 'active' : '']" v-for="(txt,index) in info.txtArr">{{txt}}</text> <text :class="['title', {failed: status == 4} ,index ? 'active' : '']" v-for="(txt,index) in info.txtArr">{{txt}}</text>
</view> </view>
<view class="tips-box" v-if="info.tipsArr"> <view class="tips-box" v-if="info.tipsArr">
<text :class="['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']" <text :class="['tips',info.tipsArr.length>1 && index===0 ? 'red' : '']"
v-for="(txt,index) in info.tipsArr">{{txt}}</text> v-for="(txt,index) in info.tipsArr">{{txt}}</text>
</view> </view>
<view class="services-view">
<Services/>
</view>
</view> </view>
<template v-slot:bottom> <template v-slot:bottom>
<button class="btn-submit" @click="$u.debounce(goPage, 500)">{{info.btnTxt}}</button> <button class="btn-submit" @click="$u.debounce(goPage, 500)">{{info.btnTxt}}</button>
...@@ -24,35 +28,37 @@ ...@@ -24,35 +28,37 @@
<script> <script>
import Settle from '@/components/settle/index.vue' import Settle from '@/components/settle/index.vue'
import Services from '@/components/settle/services.vue'
export default { export default {
components: { components: {
Settle Settle,
Services
}, },
data() { data() {
return { return {
pageIndex: 2, pageIndex: 2,
settledInfo: null, settledInfo: null,
promptList: [{ promptList: [{
status: 1, status: 1,
statusName: '待审核', statusName: '待审核',
txtArr: ['已提交,等待审核', '正在审核中'], txtArr: ['已提交,等待审核', '正在审核中'],
btnTxt: '去接单广场逛逛', btnTxt: '去首页',
url: '/pages/take/index' url: '/pages/index/index'
}, { }, {
status: 2, status: 2,
statusName: '已通过', statusName: '已通过',
txtArr: ['恭喜,审核通过', '“充电桩安装入驻审核”'], txtArr: ['恭喜,审核通过', '“充电桩安装入驻审核”'],
btnTxt: '去考试', btnTxt: '去考试',
url: '/pages/exam/start' url: '/pages/learn/exam'
}, { }, {
status: 3, status: 3,
statusName: '备选', statusName: '备选',
txtArr: ['您已成为', "“充电桩安装备选服务商”"], txtArr: ['您已成为', "“充电桩安装备选服务商”"],
tipsArr: ['后续如有业务,请留意通知!'], tipsArr: ['后续如有业务,请留意通知!'],
btnTxt: '去接单广场逛逛', btnTxt: '去首页',
url: '/pages/take/index' url: '/pages/index/index'
}, { }, {
status: 4, status: 4,
statusName: '已驳回', statusName: '已驳回',
...@@ -78,8 +84,8 @@ ...@@ -78,8 +84,8 @@
status: 7, status: 7,
statusName: '已支付保证金', statusName: '已支付保证金',
txtArr: ['您已成为', "充电桩安装的正式服务商"], txtArr: ['您已成为', "充电桩安装的正式服务商"],
btnTxt: '去接单广场逛逛', btnTxt: '去首页',
url: '/pages/take/index' url: '/pages/index/index'
}], }],
// 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交' // 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
status: '', status: '',
...@@ -87,21 +93,21 @@ ...@@ -87,21 +93,21 @@
} }
}, },
computed: { computed: {
imageUrl() { imageUrl() {
return this.status == 1 ? require('@/static/settle/chenggong@3x.png') : require( return this.status == 1 ? qn_base_url + 'chenggong.png' : qn_base_url + 'icon-prompt.png'
'@/static/settle/icon-prompt@3x.png') },
}
}, },
onLoad(e) { onLoad(e) {
if (e) { if (e) {
if (e.pageIndex) { if (e.pageIndex) {
this.pageIndex = e.pageIndex; this.pageIndex = e.pageIndex;
} }
} }
// if(!this.settledInfo){ // if(!this.settledInfo){
// this.getBaseInfo() // this.getBaseInfo()
// } // }
}, },
onShow() { onShow() {
...@@ -109,7 +115,6 @@ ...@@ -109,7 +115,6 @@
this.getBaseInfo() this.getBaseInfo()
} }
}, },
computed: {},
components: { components: {
}, },
...@@ -156,9 +161,16 @@ ...@@ -156,9 +161,16 @@
}, },
goPage() { goPage() {
const url = this.info.url const url = this.info.url
uni.navigateTo({ if (this.status == 1 || this.status == 3 || this.status == 3) {
url, uni.reLaunch({
}); url,
});
} else {
uni.navigateTo({
url,
});
}
}, },
}, },
} }
...@@ -194,7 +206,7 @@ ...@@ -194,7 +206,7 @@
} }
.txt-box { .txt-box {
padding-bottom: 50rpx;
} }
.title { .title {
...@@ -205,29 +217,25 @@ ...@@ -205,29 +217,25 @@
font-weight: bold; font-weight: bold;
font-size: 44rpx; font-size: 44rpx;
color: #2272FF; color: #2272FF;
&.failed {
color: #FA5A49;
}
&.active { &.active {
color: #666666; color: #666666;
font-size: 24rpx; font-size: 24rpx;
font-weight: 300rpx; font-weight: 400;
margin-top: 26rpx; margin-top: 20rpx;
} }
} }
.tips-box { .tips-box {
margin-top: 32rpx; // margin-top: 32rpx;
text-align: center; text-align: center;
} }
.tips { .tips {
text-align: center; color: #666666;
line-height: 44rpx; font-size: 24rpx;
font-size: 32rpx;
color: #666;
&.red {
color: red;
}
} }
.btn-submit { .btn-submit {
...@@ -246,5 +254,10 @@ ...@@ -246,5 +254,10 @@
color: #999; color: #999;
} }
} }
.services-view {
display: flex;
justify-content: center;
padding-top: 50rpx;
}
} }
</style> </style>
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
<view class="page-content"> <view class="page-content">
<Settle :index="4"> <Settle :index="4">
<view class="tip-text"> <view class="tip-text">
<image class="tip-image" mode="widthFix" src="../../static/settle/tips3@3x.png"></image> <image class="tip-image" mode="widthFix" :src="tips3Image"></image>
<text>身份证信息、银行卡相关信息、签约人信息须为同一人,否则无法入驻。</text> <text>身份证信息、银行卡相关信息、签约人信息须为同一人,否则无法入驻。</text>
</view> </view>
<view class="base-list"> <view class="base-list">
<view class="agreement-view"> <view class="agreement-view">
<Agreement /> <Agreement />
</view> </view>
<view class="info-view"> <view class="info-view">
<view class="item item-input flex-yc"> <view class="item item-input flex-yc">
<label class="label">签约人</label> <label class="label">签约人</label>
<view class="input flex1 u-text-right">{{baseInfo.name}}</view> <view class="input flex1 u-text-right">{{baseInfo.name}}</view>
</view> </view>
<view class="line-view"></view> <view class="line-view"></view>
<view class="item u-row-between"> <view class="item u-row-between">
<view class="label">结算方式:</view> <view class="label">结算方式:</view>
...@@ -23,19 +23,19 @@ ...@@ -23,19 +23,19 @@
{{item.name}} {{item.name}}
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</view> </view>
<view class="line-view"></view> <view class="line-view"></view>
<template v-if="baseInfo.pay_type==='bankcard'"> <template v-if="baseInfo.pay_type==='bankcard'">
<view class="item item-input flex u-row-between"> <view class="item item-input flex u-row-between">
<label class="label">银行名称</label> <label class="label">银行名称</label>
<input placeholder="请输入银行名称" :placeholder-style="placeholderStyle" maxlength="100" v-model="baseInfo.bank_name" class="input flex1" /> <input placeholder="请输入银行名称" :placeholder-style="placeholderStyle" maxlength="100" v-model="baseInfo.bank_name" class="input flex1" />
</view> </view>
<view class="line-view"></view> <view class="line-view"></view>
<view class="item item-input flex u-row-between"> <view class="item item-input flex u-row-between">
<label class="label">银行卡号</label> <label class="label">银行卡号</label>
<input placeholder="请输入银行卡号" :placeholder-style="placeholderStyle" maxlength="30" v-model="baseInfo.bank_no" type="number" <input placeholder="请输入银行卡号" :placeholder-style="placeholderStyle" maxlength="30" v-model="baseInfo.bank_no" type="number"
class="input flex1" /> class="input flex1" />
</view> </view>
<view class="line-view"></view> <view class="line-view"></view>
<view class="item item-input flex u-row-between"> <view class="item item-input flex u-row-between">
<label class="label">支行名称</label> <label class="label">支行名称</label>
...@@ -51,15 +51,15 @@ ...@@ -51,15 +51,15 @@
<label class="label">支付宝账号</label> <label class="label">支付宝账号</label>
<input placeholder="请输入支付宝账号" maxlength="100" v-model="baseInfo.bank_no" class="input flex1" /> <input placeholder="请输入支付宝账号" maxlength="100" v-model="baseInfo.bank_no" class="input flex1" />
</view> </view>
</template> </template>
</view> </view>
</view> </view>
<template v-slot:bottom> <template v-slot:bottom>
<view class="btn-wrap flex-xc"> <view class="btn-wrap flex-xc">
<button class="btn-submit" :disabled="!submitStatus" @click="$u.debounce(submitBaseInfo, 500)"> <button class="btn-submit" :disabled="!submitStatus" @click="$u.debounce(submitBaseInfo, 500)">
我已阅读协议,点击签约{{count ? '('+count+')' : ''}} 我已阅读协议,点击签约{{count ? '('+count+')' : ''}}
</button> </button>
</view> </view>
</template> </template>
</Settle> </Settle>
</view> </view>
...@@ -127,9 +127,12 @@ ...@@ -127,9 +127,12 @@
flag = flag && baseInfo.bank_site && baseInfo.bank_name flag = flag && baseInfo.bank_site && baseInfo.bank_name
} }
return flag && !this.saving && this.isStop; return flag && !this.saving && this.isStop;
},
placeholderStyle() {
return 'color:#999999;font-size:28rpx'
}, },
placeholderStyle() { tips3Image() {
return 'color:#999999;font-size:28rpx' return qn_base_url + 'tips3.png'
} }
}, },
components: { components: {
...@@ -270,7 +273,7 @@ ...@@ -270,7 +273,7 @@
this.baseInfo.bank_no = '' this.baseInfo.bank_no = ''
this.baseInfo.bank_site = '' this.baseInfo.bank_site = ''
}, },
async getBaseInfo() { async getBaseInfo() {
const app = getApp() const app = getApp()
const callBack = (vm, result) => { const callBack = (vm, result) => {
vm.settledInfo = result vm.settledInfo = result
...@@ -430,22 +433,22 @@ ...@@ -430,22 +433,22 @@
.base-list { .base-list {
// height:524rpx; // height:524rpx;
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;
}
.info-view {
margin-top: 10rpx;
} }
.line-view { .info-view {
background-color: #F4F5F7; margin-top: 10rpx;
height: 2rpx; }
width: 100%; .line-view {
background-color: #F4F5F7;
height: 2rpx;
width: 100%;
} }
.item { .item {
display: flex; display: flex;
...@@ -594,8 +597,8 @@ ...@@ -594,8 +597,8 @@
width: 34rpx; width: 34rpx;
margin-right: 8rpx; margin-right: 8rpx;
margin-top: 2rpx; margin-top: 2rpx;
}
.radio-class {
margin-right: -20rpx;
} }
</style> .radio-class {
margin-right: -20rpx;
}
</style>
...@@ -26,11 +26,11 @@ let baseOptions = { ...@@ -26,11 +26,11 @@ let baseOptions = {
let uploader = new request(baseOptions); let uploader = new request(baseOptions);
// 添加获取七牛云token的方法 // 添加获取七牛云token的方法
uploader.getQnToken = function(data) { uploader.getQnToken = function(params) {
//该地址需要开发者自行配置(每个后台的接口风格都不一样) //该地址需要开发者自行配置(每个后台的接口风格都不一样)
// console.log(uploader.get,'uploader.get') // console.log(uploader.get,'uploader.get')
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uploader.post(baseOptions.qiniuUploadUrl,data).then(data => { uploader.post(baseOptions.qiniuUploadUrl, params).then(data => {
/* /*
*接口返回参数: *接口返回参数:
*visitPrefix:访问文件的域名 *visitPrefix:访问文件的域名
......
...@@ -83,7 +83,7 @@ export default class fileUpload extends request { ...@@ -83,7 +83,7 @@ export default class fileUpload extends request {
} }
let qnRes = this.qiniuTokenObj let qnRes = this.qiniuTokenObj
if(!qnRes || qnRes.cardType !== requestInfo.cardType){ if(!qnRes || qnRes.cardType !== requestInfo.cardType){
let params = {type:requestInfo.cardType || ''} let params = {type:requestInfo.cardType || 'avatar'}
qnRes = await this.getQnToken(params) qnRes = await this.getQnToken(params)
this.qiniuTokenObj = { this.qiniuTokenObj = {
cardType:'', cardType:'',
......
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