Commit 18df65d1 authored by Morson's avatar Morson
parents 9af987a2 a226fa84
const globalUrl = process.uniEnv || {}
const ucenterApiUrl = globalUrl.ucenterUrl.apiUrl
let certApiFun = function(vm){
let getCertList = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/settled/get-cert-list', params);
const certApi = {
getCertList
}
return certApi
}
module.exports = {
certApiFun
}
\ No newline at end of file
......@@ -10,6 +10,7 @@ import {
import {learnApiFun} from "@/common/api/learn.js";
import { orderApiFun } from "@/common/api/order.js";
import {assessmentApiFun} from"@/common/api/assessment.js"
import {certApiFun} from"@/common/api/cert.js"
let apiFun = function(vm) {
let commonApi = commonApiFun(vm);
let settledApi = settledApiFun(vm)
......@@ -17,13 +18,15 @@ let apiFun = function(vm) {
let learnApi=learnApiFun(vm)
let assessmentApi = assessmentApiFun(vm)
let orderApi=orderApiFun(vm)
let certApi=certApiFun(vm)
let apiUrl = {
...commonApi,
...settledApi,
...cloudApi,
...learnApi,
...orderApi,
...assessmentApi
...assessmentApi,
...certApi
}
return apiUrl
}
......
......@@ -74,6 +74,11 @@ let orderApiFun = function(vm){
* 获取师傅水印 or 默认水印
*/
let getWatermark = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token + '/photo/watermark', params);
/**
* 保存师傅水印
*/
let saveWatermark = async (params = {}) => await vm.$u.post(prefix + vm.vuex_token + '/photo/watermark', params);
/**
* 获取师傅开放可选时间段
......@@ -144,6 +149,7 @@ let orderApiFun = function(vm){
orderStandard,
saveImage,
getWatermark,
saveWatermark,
openTimerange,
contactTime,
checkRejectable,
......
......@@ -72,7 +72,13 @@
}
},
methods: {
selectUpload(){
selectUpload(){
if (this.imgList.length === 10) {
return this.$refs.uToast.show({
title: '图片已超出最大数量',
type: 'error',
})
}
// 弹窗展示
this.maskShow = true
},
......
......@@ -64,5 +64,7 @@
}
.input-item{
background: #F4F5F7;
border-radius: 12rpx;
padding-left: 20rpx;
}
</style>
......@@ -27,7 +27,7 @@
<view class="line-view"></view>
<view class="reason-view" v-if="showReason"><text class="reason-text">未通过原因:</text>
<text>{{orderData.auditResults.remark}}</text>
<text v-for="(item, index) in orderData.auditResults" :key="index">{{item}}</text>
</view>
<view class="bottom-view">
<view>
......
......@@ -61,8 +61,8 @@
if(!photo.tempPath){
return
}
let path = ''
if(photo.tempPath.origin && photo.waterSetting && photo.waterSetting.has_origin){
let path = ''
if(photo.tempPath.origin){
// 保存原图到本地
path = photo.tempPath.origin
let result = await this.saveLocal(path)
......@@ -73,18 +73,18 @@
})
}
}
// if(photo.currentItem){
// photo.currentItem.imageList.unshift(photo.tempPath.mixWater)
// }
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){
// photo.
if(photo.tempPath.mixWater){
// 保存水印处理图片到本地
path = photo.tempPath.mixWater
let result1 = await this.saveLocal(path)
......@@ -125,7 +125,7 @@
photo.currentItemLength = 10
this.continuePhoto()
// 完成本项
this.$emit('finish')
//this.$emit('finish')
},
// 确认图片
continuePhoto() {
......@@ -139,7 +139,7 @@
},
submitFile() {
const photo = getApp().globalData.photo
photo.currentItemLength = photo.currentItemLength + 1
if (photo.currentItemLength < 10) photo.currentItemLength = photo.currentItemLength + 1
uni.hideLoading()
// 当前项的图片显示
// 拍照项张数目增加 等于10张
......
This diff is collapsed.
This diff is collapsed.
......@@ -34,7 +34,8 @@
"path": "pages/index/mine",
"style": {
"navigationBarTitleText": "我的",
"navigationStyle": "custom"
"navigationStyle": "custom" ,
"disableScroll": true
}
},
{
......@@ -155,7 +156,31 @@
"navigationStyle": "custom", // 隐藏系统导航栏
"disableScroll": true
}
}
},
{
"path": "wallet/index",
"style": {
"navigationBarTitleText": "我的钱包",
"enablePullDownRefresh": false,
"disableScroll": true,
"navigationStyle": "custom", // 隐藏系统导航栏
"navigationBarBackgroundColor":"#F4F5F7"
}
},
{
"path": "cert/list",
"style": {
"navigationBarTitleText": "我的证件",
"navigationStyle":"custom"
}
},
{
"path": "cert/detail",
"style": {
"navigationBarTitleText": "",//证件详情
"navigationStyle":"custom"
}
}
]
},
{
......@@ -458,7 +483,12 @@
"name": "学习 - 首页", //模式名称
"path": "pages/index/learn", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
}
},
{
"name": "我的 - 我的证件 - 列表", //模式名称
"path": "pages/mine/cert/list", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
}
]
}
}
\ No newline at end of file
<template>
<view class="mine-view">
<image class="header-image" mode="widthFix" :src="imageUrl + 'wodebeijing.png'"></image>
<u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false">
<text class="title-view">我的</text>
<view class="mine-view">
<image class="header-image" mode="widthFix" :src="wodebeijingImage"></image>
<u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false">
<text class="title-view">我的</text>
</u-navbar>
<view class="mine-content">
<view class="header-view">
<view class="head-image">
<u-avatar :src="headImageUrl" size="142" mode="circle"></u-avatar>
<view :class="['head-image', {'has-image': info.headImage}]">
<u-avatar :src="headImageUrl" :size="headSize" mode="circle"></u-avatar>
</view>
<view class="header-content">
<view class="name-view">{{name}}</view>
<view :class="['tel-view', {'active': info.tel}]">
<text>{{tel}}</text>
<icon name="arrow-left-fill"></icon>
</view>
<view class="name-view" @click="handleClickName">{{name}}</view>
<view :class="['tel-view', {'active': info.tel}]" @click="handleClickTel">
<text>{{telTip}}</text>
<u-icon class="tel-arrow-icon" name="arrow-up-fill"></u-icon>
</view>
</view>
</view>
<view class="list-view">
<u-cell-group>
<u-cell-group :border="false">
<view v-for="(item, index) in items" :key="index">
<u-cell-item :value="item.value" :border-bottom="false" @click="handleClick(index)">
<image slot="icon" :src="imageUrl + item.icon" :style="item.imageStyle"></image>
......@@ -30,13 +30,13 @@
</view>
</u-cell-group>
</view>
<view class="u-m-t-20" @click="take">
<!-- <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>
<take-photo v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo>
<!-- <take-photo v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo> -->
</view>
</template>
......@@ -48,23 +48,23 @@
},
data() {
return {
serviceTel: '0755-81773817',
serviceTel: '0755-81773817',
info: {},
pic: 'https://uviewui.com/common/logo.png',
show: true,
takeStatus: false,
testData: {
_id: '1', // 规格ID
system_id: '2', // 系统ID
brand_id: '3', // 品牌ID
classify_id: '4', // 分类ID
images: [ // 拍照要求示意图
'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png'
],
main_point: [] // 要点
}
// pic: 'https://uviewui.com/common/logo.png',
// show: true,
// takeStatus: false,
// testData: {
// _id: '1', // 规格ID
// system_id: '2', // 系统ID
// brand_id: '3', // 品牌ID
// classify_id: '4', // 分类ID
// images: [ // 拍照要求示意图
// 'https://qn-static.banshouhui.com/live_mark.png',
// 'https://qn-static.banshouhui.com/live_mark.png',
// 'https://qn-static.banshouhui.com/live_mark.png'
// ],
// main_point: [] // 要点
// }
}
},
computed: {
......@@ -112,97 +112,139 @@
imageStyle: 'width:32rpx;height:32rpx'
}
]
},
name() {
return this.info.name || '点击登录'
},
tel() {
return this.info.tel ? '已绑定手机号' : '绑定手机号'
},
name() {
return this.info.name || '点击登录'
},
telTip() {
return this.info.tel ? '已绑定手机号' : '绑定手机号'
},
imageUrl() {
return process.uniEnv.qn_base_url
},
pages() {
return ['', '', '', '', 'address', '', '']
},
headImageUrl() {
return this.info.headImage || this.placeholderImage
},
placeholderImage() {
return this.imageUrl + 'touxiang.png'
return ['wallet', '', 'contract', '', 'address', '', '']
},
headImageUrl() {
return this.info.headImage || this.placeholderImage
},
wodebeijingImage() {
return this.imageUrl + 'wodebeijing.png'
},
placeholderImage() {
return this.imageUrl + 'touxiang.png'
},
headSize() {
return this.info.headImage ? 136 : 144
}
},
onLoad() {
},
methods: {
methods: {
handleClick(index) {
uni.navigateTo({
url: 'pages/mine/' + this.pages[index]
})
console.log('clicked:', index)
uni.navigateTo({
url: 'pages/mine/' + this.pages[index] + '/index'
})
},
take() {
uni.hideTabBar()
this.takeStatus = true
handleClickName() {
console.log('click name')
},
closeTake(img) {
console.log(img)
this.takeStatus = false
}
handleClickTel() {
console.log('click tel')
},
// take() {
// uni.hideTabBar()
// this.takeStatus = true
// },
// closeTake(img) {
// console.log(img)
// this.takeStatus = false
// }
}
}
</script>
<style lang="scss" scoped>
.mine-view {
position: relative;
.header-image {
position: absolute;
width: 100%;
}
.title-view {
color: #FFFFFF;
font-weight: bold;
font-size: 40rpx;
position: relative;
height: 100vh;
overflow: auto;
background-color: #FFFFFF;
.header-image {
position: absolute;
width: 100%;
}
.title-view {
color: #FFFFFF;
font-weight: bold;
font-size: 40rpx;
padding-left: 30rpx;
}
.mine-content {
background-color: #F4F5F7;
.header-view {
padding: 30rpx;
display: flex;
.head-image {
width: 142rpx;
height: 142rpx;
}
.header-content {
color: #FFFFFF;
z-index: 0;
.name-view {
}
.tel-view {
background-color: #FFFFFF;
border-radius: 26rpx;
color: #2272FF;
width: 164rpx;
height: 52rpx;
&.active {
color: #FFFFFF;
border: 1rpx bold #FFFFFF;
}
}
}
.mine-content {
position: relative;
.header-view {
padding: 30rpx 30rpx 80rpx 30rpx;
display: flex;
align-items: center;
.head-image {
width: 144rpx;
height: 144rpx;
background-color: #FFFFFF;
border-radius: 72rpx;
&.has-image {
border: 4rpx solid #FFFFFF;
}
}
.header-content {
color: #FFFFFF;
z-index: 1;
margin-left: 24rpx;
.name-view {
font-size: 44rpx;
font-weight: bold;
margin-bottom: 14rpx;
margin-top: 6rpx;
}
.tel-view {
background-color: #FFFFFF;
border-radius: 26rpx;
color: #2272FF;
width: 164rpx;
height: 52rpx;
font-size: 20rpx;
display: flex;
align-items: center;
justify-content: center;
&.active {
color: #FFFFFF;
border: 2rpx solid #FFFFFF;
background-color: #2272FF;
}
.tel-arrow-icon {
transform: rotate(90deg);
margin-left: 6rpx;
}
}
}
}
.list-view {
background-color: #FFFFFF;
border-radius: 16rpx 16rpx 0 0;
overflow: hidden;
.item-title {
font-size: 32rpx;
......@@ -219,8 +261,7 @@
.line-view {
height: 2rpx;
background-color: #F4F5F7;
margin-top: 30rpx;
margin-bottom: 30rpx;
margin: 30rpx;
}
}
}
......
......@@ -328,13 +328,14 @@
console.log('click cell')
this.viewOderItem(item.orderId)
},
filish(item){
filish(item){
// 去完工
uni.navigateTo({
url: 'pages/order/complete?orderId='+item.orderId
+ "&categoryId=" + item.categoryId
+ "&orderServiceType=" + item.orderServiceType
+ "&inGuaranteePeriod=" + item.inGuaranteePeriod
+ "&inGuaranteePeriod=" + item.inGuaranteePeriod
+ "&auditResultsId=" + Object.keys(item.auditResults)[0]
})
},
handleAction(item) {
......
<template>
<view class="cert-page">
<u-navbar
back-icon-color="#000000"
:background="background"
title-color="#000"
:border-bottom="false"
title="我的证件"
title-bold="true"
></u-navbar>
<view class="content-cody">
<view class="title">{{ info.type }}</view>
<view class="content" v-for="item in info.url"><image :src="item" mode=""></image></view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {
type: "",
url: null
}
}
},
onLoad() {
var that = this;
const eventChannel = this.getOpenerEventChannel()
eventChannel.on('acceptDataFromCert', function(data) {
try{
let urlArr = data.url.split(',');
that.info.type = data.type;
that.info.url = urlArr;
console.log(urlArr);
}catch(e){}
console.log(that.info);
})
},
}
</script>
<style>
.cert-page {
font-size: 28rpx;
margin: 30rpx;
}
.content-cody {
padding-left: 30rpx;
padding-right: 30rpx;
background-color: #F4F5F7;
border-radius: 12rpx;
}
.title {
font-size: 32rpx;
font-weight: bold;
}
.content {
padding-top: 30rpx;
}
</style>
<template>
<view class="cert-page">
<u-navbar
back-icon-color="#000000"
:background="background"
title-color="#000"
:border-bottom="false"
title="我的证件"
title-bold="true"
></u-navbar>
<view class="content-cody">
<u-cell-group>
<u-cell-item v-for="item in list" :title="item.name" :value="item.isUploadName" :arrow="true"
:value-style="{'color': item.color}" @click="toDetail(item.keyName)">
<u-icon slot="icon" size="32" name="checkmark-circle" :color="item.iconColor"></u-icon>
</u-cell-item>
</u-cell-group>
</view>
</view>
</template>
<script>
export default {
data() {
return {
list: {
id_card: {
name: "身份证",
isUpload: false,
isUploadName: "",
keyName: "id_card",
color: "#999999"
},
electrician_certificate: {
name: "电工证",
isUpload: false,
isUploadName: "",
keyName: "electrician_certificate",
color: "#999999"
},
driver_license: {
name: "驾驶证",
isUpload: false,
isUploadName: "",
keyName: "driver_license",
color: "#999999"
},
driving_license: {
name: "行驶证",
isUpload: false,
isUploadName: "",
keyName: "driving_license",
color: "#999999"
},
vehicle: {
name: "车辆照",
isUpload: false,
isUploadName: "",
keyName: "vehicle",
color: "#999999"
},
high_sky_license: {
name: "高空证",
isUpload: false,
isUploadName: "",
keyName: "high_sky_license",
color: "#999999"
},
refrigeration_license: {
name: "制冷证",
isUpload: false,
isUploadName: "",
keyName: "refrigeration_license",
color: "#999999"
},
business_license: {
name: "营业执照",
isUpload: false,
isUploadName: "",
keyName: "business_license",
color: "#999999"
},
}
}
},
onLoad() {
let that = this;
this.$u.api
.getCertList()
.then((res) => {
if(res.code != 200){
return
}
for(let key in this.list){
let getData = res.data[key];
this.list[key].isUpload = getData.status;
this.list[key].isUploadName = getData.status == 1 ? '已上传' : '未上传';
this.list[key].color = getData.status == 1 ? "#999999" : "#2272FF";
this.list[key].iconColor = getData.status == 1 ? "#2272FF" : "#999999";
this.list[key].data = getData;
}
console.log(this.list);
console.log(res);
}).catch((err) => {
console.log(err);
});
},
methods: {
isUpload(typeBool) {
return typeBool ? '已上传' : '未上传'
},
toDetail(key) {
let data = this.list[key].data;
if(data.status != 1){
return;
}
wx.navigateTo({
url: '/pages/mine/cert/detail',
success: function(res) {
res.eventChannel.emit('acceptDataFromCert', data)
}
});
}
}
}
</script>
<style>
.cert-page {
font-size: 28rpx;
margin: 30rpx;
}
.content-cody {
/* padding-left: 30rpx;
padding-right: 30rpx; */
padding-left: 30rpx;
padding-right: 30rpx;
background-color: #ffffff;
border-radius: 12rpx;
}
.rightBlue {
color: #007AFF;
}
</style>
<template>
<view class="contract">
<u-navbar
title="我的合同"
b:is-back="false"
:background="background"
:border-bottom="false"
></u-navbar>
<view class="content">
<text class="title">合同清单</text>
<view class="jf-currency-class">
<view class="left"> 自营平台技 工入驻签约 合同 </view>
<view class="text1">《自营平台技工入驻签约合同》</view>
<view class="text2">下载时间: 2021.05.06 14:25:00</view>
</view>
<view class="jf-currency-class">
<view class="left">新风机技工入驻签约合同</view>
<view class="text1">《新风机技工入驻签约合同》</view>
<view class="text2">下载时间: 2021.05.06 15:01:48</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
background: {
backgroundColor: "#F4F5F7",
// 导航栏背景图
// background: 'url(https://cdn.uviewui.com/uview/swiper/1.jpg) no-repeat',
// 还可以设置背景图size属性
// backgroundSize: 'cover',
// 渐变色
// backgroundImage: 'linear-gradient(45deg, rgb(28, 187, 180), rgb(141, 198, 63))'
},
};
},
onLoad() {},
methods: {},
};
</script>
<style lang="scss" scoped>
.contract {
width: 100%;
height: 100vh;
background: #f4f5f7;
}
.content {
width: 100%;
height: 100%;
padding: 40rpx 30rpx 0 30rpx;
}
.title {
width: 65px;
height: 16px;
font-size: 16px;
font-family: PingFang-SC-Bold, PingFang-SC;
font-weight: bold;
color: #333333;
line-height: 16px;
}
.jf-currency-class {
width: 100%;
height: 180rpx;
border-radius: 12rpx;
padding-top: 40rpx;
margin-top: 74rpx;
background: #ffffff;
position: relative;
.left {
width: 160rpx;
height: 200rpx;
padding: 30rpx 14rpx 0 14rpx;
position: absolute;
top: -40rpx;
left: 30rpx;
background: url(@/static/photo/hetong.png);
border-radius: 6px;
color: #ffffff;
font-size: 26rpx;
line-height: 38rpx;
font-family: PingFang-SC-Bold, PingFang-SC;
font-weight: bold;
}
.text1 {
font-size: 32rpx;
font-family: PingFang-SC-Bold, PingFang-SC;
font-weight: bold;
color: #2272ff;
margin-left: 208rpx;
}
.text2 {
font-size: 24rpx;
color: #999999;
margin-left: 220rpx;
margin-top: 22rpx;
}
}
.current-img {
width: 100%;
height: 100%;
position: absolute;
}
</style>
\ No newline at end of file
<template>
<view class="wallet-view">
<u-navbar back-icon-color="#333333" background="#F4F5F7" title="我的钱包" titleColor="#333333" :border-bottom="false"></u-navbar>
<image class="header-image" mode="widthFix" :src="qianbaobeijing"></image>
<view class="survey-view">
<view class="survey-top-view">
<view class="survey-top-left">
<view>账户总资产(元)</view>
<view>{{info.totalPayAmount}}</view>
</view>
<view class="survey-top-right">
<u-button>提现</u-button>
</view>
</view>
<view class="survey-bottom-view">
<view v-for="(value, key) in items" :key="key">
<view>{{value}}</view>
<view>{{info[key]}}</view>
</view>
</view>
</view>
<view class="content-view">
<view v-for="(item, index) in lists" :class="['content-list', {'first': index==0}]" :key="index">
<view class="content-list-left">
<image class="content-list-image" :src="item.icon"></image>
<view class="content-list-text">
<view class="content-list-text-title">{{item.title}}</view>
<view>{{item.content}}</view>
</view>
</view>
<view class="content-list-right">
<text class="content-list-right-text">点击查看</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
<view class="list-view">
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {
canApplyAmount: 0, // 可提现金额
saveApplyCount: 0, // 已申请提现的支付单数
canApplyCount: 0, // 可申请提现的支付单数
saveAndApplyAmount: 0, // 已申请提现金额
totalPayAmount: 0, // 总共收入
/* 还没对字段名 */
dairuzhang: 0, // 预计待入账
}
}
},
computed: {
lists() {
return [{
title: '结算账单',
content: '展示您已提现的账单信息',
icon: this.imageUrl + 'jiesuan.png'
},{
title: '收入流水',
content: '当前展示最近5条,点击查看全部',
icon: this.imageUrl + 'liushui.png'
}]
},
items() {
return {canApplyAmount:'可提现(元)', dairuzhang:'预计待入账(元)'}
},
imageUrl() {
return process.uniEnv.qn_base_url
},
qianbaobeijing() {
return this.imageUrl + 'qianbaobeijing.png'
},
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.wallet-view {
position: relative;
height: 100vh;
overflow: auto;
background-color: #F4F5F7;
.header-image {
position: absolute;
width: 100%;
margin-left: 4rpx;
margin-top: 10rpx;
}
.survey-view {
position: relative;
height: 400rpx;
margin: 30rpx 30rpx 10rpx 30rpx;
color: #FFFFFF;
padding: 30rpx;
.survey-top-view {
display: flex;
justify-content: space-between;
align-items: flex-end;
.survey-top-left {
}
.survey-top-right {
}
}
.survey-bottom-view {
display: flex;
justify-content: space-between;
}
}
.content-view {
position: relative;
padding: 0 30rpx;
.content-list {
height: 140rpx;
border-radius: 12rpx;
display: flex;
justify-content: space-between;
padding: 30rpx;
background-color: #FFFFFF;
&.first {
margin-bottom: 20rpx;
}
.content-list-left {
display: flex;
.content-list-image {
width: 56rpx;
height: 56rpx;
margin-top: 2rpx;
}
.content-list-text {
font-size: 24rpx;
color: #666666;
margin-left: 20rpx;
.content-list-text-title {
font-size: 32rpx;
color: #333333;
}
}
}
.content-list-right {
color: #2272FF;
font-size: 26rpx;
.content-list-right-text {
margin-right: 4rpx;
}
}
}
}
.list-view {
position: relative;
}
}
</style>
......@@ -121,7 +121,8 @@
orderId:0,
categoryId:0,
orderServiceType:'',
inGuaranteePeriod:'',
inGuaranteePeriod:'',
auditResultsId: '',
list: [],
tabIndex: 0,
scrollTop: 0, //tab标题的滚动条位置
......@@ -194,7 +195,8 @@
this.orderId = option.orderId
this.categoryId = option.categoryId
this.orderServiceType = decodeURIComponent(option.orderServiceType)
this.inGuaranteePeriod = option.inGuaranteePeriod
this.inGuaranteePeriod = option.inGuaranteePeriod
this.auditResultsId = option.auditResultsId
} else {
this.orderId = 11880091
this.categoryId = 1100000214
......@@ -238,7 +240,7 @@
'font-size': '32rpx',
}
},
show200() { /// 基础信息显示金额输入框
show200() {
return this.form.paymentMethodsType != '03'
}
},
......@@ -249,12 +251,29 @@
self.$u.api.getCompleteConfigAndData(self.orderId).then((res) => {
if (res.code == 200) {
self.list = res.data.config
self.form = res.data.value || {}
self.form = res.data.value || {}
// 异常单处理
if (self.auditResultsId) self.checkCompleteError()
} else {
console.log(res.message, "获取订单完工项目失败!");
}
});
}
},
checkCompleteError() { // 异常单定位错误项
let self = this
self.list.forEach((panel, panelIndex)=>{
panel.items.forEach((group, groupIndex) =>{
group.items.forEach((ele, eleIndex)=>{
if (ele.fieldsName === self.auditResultsId) {
self.waitHandlerPanelIndex = panelIndex
self.waitHandlerGroupIndex = groupIndex
self.waitHandlerEleIndex = eleIndex
}
})
})
})
this.locationCompleteItem(self.waitHandlerPanelIndex, self.waitHandlerGroupIndex, self.waitHandlerEleIndex)
},
saveComplete(){// 保存完工信息
let self = this
......@@ -307,7 +326,6 @@
}else if(value&&Array.isArray(value)&&value.length > 0){
panelResult.submitted++
}else if(first){// 记录第一个 为空 并且需要必填的项 用于定位
console.log(ele)
first = false
self.waitHandlerPanelIndex = panelIndex
self.waitHandlerGroupIndex = groupIndex
......@@ -387,12 +405,20 @@
if(innerItem.fieldsType ==='multiInput'){
// 多个输入框的值触发
let key = Object.keys(data.value)[0]
debugger
this.form[key] = data.value[key]
}else{
this.$set(this.form,innerItem.fieldsName,data.value)
}
if (innerItem.fieldsId == 199) { // 选不需要收款的时候,收款金额修改为非必选
for (var item of this.list[0].items) {
for (var i of item.items) {
if (i.fieldsId == 200) {
i.required = data.value !='03'
}
}
}
}
console.log(this.form)
},
nextStep() {
......@@ -440,7 +466,8 @@
case 'location':
formType = 'location'
break
case 'scan':
case 'scan':
case 'machine_code':
formType = 'scan'
break
case 'picker':
......
......@@ -5,12 +5,12 @@
<view class="topView">
<view :class="['topItemView', {'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)"
v-for="(item,ikey) in dataList" :key="ikey">
<text :class="['ph-lst-top-index', {'active':activeTop===ikey}]">{{ ikey + 1 }}</text>
<text class="topItemTitle">{{item.type}}</text>
</view>
</view>
<view class="rightView">
<view class="right-view-title">拍照项有:</view>
<scroll-view scroll-y="true" class="scroll-y">
......@@ -33,7 +33,7 @@
<!-- <u-button v-if="activeTop + 1 === dataList.length" class="ph-list-button" type="error" shape="circle"
:disabled="buttonDisabled" :custom-style="buttonStyle" @click="isPopShow = true">一键清空展示图片</u-button> -->
</view>
<!-- <u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom mode="center" width="690rpx"
height="600rpx">
<view class="ph-list-pop-title">
......@@ -165,7 +165,7 @@
}
})
},
getListDataNew() {
getListDataNew() {
this.loading = true
let self = this
var data = {
......@@ -177,7 +177,6 @@
self.$u.api.orderStandard(data).then((res) => {
this.loading = false
if (res.code == 200) {
console.log("===", res.data)
if(res.data && res.data.length > 0){
let dataList = []
var flag = false;
......@@ -196,7 +195,7 @@
}else{
flag = false
}
})
})
if(!flag){
var dataItem = {type:'',list:[]}
dataItem.type = item.type
......@@ -205,6 +204,7 @@
}
}
})
console.log("===", dataList)
this.handleData(dataList)
}
} else {
......@@ -217,7 +217,6 @@
this.dataList = result
if (result.length > 0) {
var item = result[0]
getApp().globalData.photo.waterSetting = this.userWatermark
this.rightList = item.list
}
},
......@@ -253,28 +252,28 @@
})
},
// 清除图片
handleClickSure: function() {
this.$u.cloudApi.cleanImage({
'token': this.vuex_token,
}).then(res => {
this.isPopShow = false
if (res && res.result) {
this.getListData()
}
handleClickSure: function() {
this.$u.cloudApi.cleanImage({
'token': this.vuex_token,
}).then(res => {
this.isPopShow = false
if (res && res.result) {
this.getListData()
}
})
},
take(item,ikey) {
this.currentItemDate = item
const photo = getApp().globalData.photo
photo.currentItem = item
photo.itemIndex = ikey
const len = item.orderImages?item.orderImages.length:0
photo.currentItemLength = len > 9 ? 10 : len
uni.hideTabBar()
this.takeStatus = true
},
uni.hideTabBar()
this.takeStatus = true
},
closeTake(img) {
if(img !==undefined ){
if (!this.currentItemDate.orderImages) this.currentItemDate.orderImages = []
......@@ -448,7 +447,6 @@
background-color: #FAFAFA;
width: 100%;
height: 100rpx;
position: fixed;
display: flex;
flex-direction: row;
z-index: 1;
......@@ -501,6 +499,6 @@
}
.scroll-y {
height: 80vh;
height: 73vh;
}
</style>
</style>
......@@ -26,6 +26,7 @@
:send-message-img="sendMessageImg"
:show-message-card="showMessageCard"
@getphonenumber="getphonenumber"
@getuserinfo="getuserinfo"
@error="error"
@opensetting="opensetting"
@launchapp="launchapp"
......@@ -324,9 +325,9 @@ export default {
getphonenumber(res) {
this.$emit('getphonenumber', res);
},
// getuserinfo(res) {
// this.$emit('getuserinfo', res);
// },
getuserinfo(res) {
this.$emit('getuserinfo', res);
},
error(res) {
this.$emit('error', res);
},
......
......@@ -24,7 +24,6 @@
* @property {Boolean} bold 激活选项的字体是否加粗(默认true)
* @property {String} bg-color 组件背景颜色,mode为button时有效(默认#eeeeef)
* @property {String} button-color 按钮背景颜色,mode为button时有效(默认#ffffff)
* @property {String Number} border-radius 圆角值,单位rpx(默认5)
* @event {Function} change 分段器选项发生改变时触发
* @example <u-subsection active-color="#ff9900"></u-subsection>
*/
......@@ -92,12 +91,7 @@
vibrateShort: {
type: Boolean,
default: false
},
// 圆角值
borderRadius: {
type: [Number, String],
default: 5
},
}
},
data() {
return {
......@@ -111,7 +105,7 @@
},
currentIndex: this.current,
buttonPadding: 3, // mode = button 时,组件的内边距
// borderRadius: 5, // 圆角值
borderRadius: 5, // 圆角值
firstTimeVibrateShort: true // 组件初始化时,会触发current变化,此时不应震动
};
},
......
......@@ -2,8 +2,8 @@ module.exports = {
onLoad() {
// 设置默认的转发参数
this.$u.mpShare = {
title: '充电桩安装火爆进行中...就等你', // 默认为小程序名称
path: '/pages/index/index', // 默认为当前页面路径
title: '', // 默认为小程序名称
path: '', // 默认为当前页面路径
imageUrl: '' // 默认为当前页面的截图
}
},
......
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