Commit d8d6c1de authored by Damon's avatar Damon

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

parents 600b9086 412f4ae3
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
}, },
handleChange(timestamp) { handleChange(timestamp) {
if (this.timeout) this.$refs['order-count-down'].seconds += 2 if (this.timeout) this.$refs['order-count-down'].seconds += 2
if (timestamp == 0 && !this.timeout) { if (timestamp == 0 && !this.timeout) { // 超时之后倒计时变为正计时
setTimeout(()=> { setTimeout(()=> {
this.timestamp = 1 this.timestamp = 1
this.timeout = true this.timeout = true
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
"path": "complete", "path": "complete",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
// "navigationStyle": "custom", "navigationStyle": "custom",
"disableScroll": true "disableScroll": true
} }
}, },
......
...@@ -2,17 +2,8 @@ ...@@ -2,17 +2,8 @@
<view class="pg-complete"> <view class="pg-complete">
<complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check> <complete-check :show="completeCheckStatus" :list-data="completeCheckResult" :pass="pass" @close="closeCheckResult" @handle="handerProgrom" @change="confirm"></complete-check>
<view class="com-content"> <view class="com-content">
<!-- <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息" title-bold></u-navbar> --> <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="32" title-color="#fff" :border-bottom="false" title="完工信息" title-bold></u-navbar>
<view class="com-cont-top">
<view class="detail-view">
<Detail :order="order" :readMore.sync="readMore" :showOperate="false"></Detail>
</view>
<u-sticky>
<!-- <view style="background-color: #FF9900;height: 40rpx;width: 100%;">
aaaa
</view> -->
<u-tabs class="order-tabs" ref="tabs" :current="current" name="panelName" :list="tabList" @change="swichMenu" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs> <u-tabs class="order-tabs" ref="tabs" :current="current" name="panelName" :list="tabList" @change="swichMenu" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="80" font-size="32"></u-tabs>
</u-sticky>
<view class="u-menu-wrap"> <view class="u-menu-wrap">
<!-- <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" v-if="list[tabIndex].items.length > 1 && showTab"> <!-- <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" v-if="list[tabIndex].items.length > 1 && showTab">
<view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item" <view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item"
...@@ -20,7 +11,7 @@ ...@@ -20,7 +11,7 @@
<text class="u-line-1">{{item.name}}</text> <text class="u-line-1">{{item.name}}</text>
</view> </view>
</scroll-view> --> </scroll-view> -->
<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll" :scroll-into-view="itemId"> <scroll-view :scroll-top="scrollRightTop" style="height: 100%;" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll" :scroll-into-view="itemId">
<u-form :model="form" ref="uForm"> <u-form :model="form" ref="uForm">
<template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])"> <template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])">
<view class="class-item" :key="groupIndex"> <view class="class-item" :key="groupIndex">
...@@ -101,7 +92,6 @@ ...@@ -101,7 +92,6 @@
</u-form> </u-form>
</scroll-view> </scroll-view>
</view> </view>
</view>
<view :class="['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]"> <view :class="['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]">
<u-button class="btn-submit" @click="saveComplete" <u-button class="btn-submit" @click="saveComplete"
type="primary" shape="circle" :custom-style="customStyle" :hover-class="submitStatus ? '' : 'none'"> type="primary" shape="circle" :custom-style="customStyle" :hover-class="submitStatus ? '' : 'none'">
...@@ -143,7 +133,6 @@ ...@@ -143,7 +133,6 @@
export default { export default {
data() { data() {
return { return {
pageIndex: 0, // 勘察、完工、基本信息
orderId:0, orderId:0,
categoryId:0, categoryId:0,
orderServiceType:'', orderServiceType:'',
...@@ -186,8 +175,6 @@ ...@@ -186,8 +175,6 @@
currentItemDate:{}, currentItemDate:{},
photoItem: {}, photoItem: {},
// showTab: true, // showTab: true,
order: {},
readMore: true
} }
}, },
components: { components: {
...@@ -215,23 +202,17 @@ ...@@ -215,23 +202,17 @@
getApp().trackPage('订单完工信息页') getApp().trackPage('订单完工信息页')
if (option) { if (option) {
if (option.pageIndex) { if (option.pageIndex) {
this.pageIndex = option.pageIndex this.tabIndex = option.pageIndex
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title: this.title title: this.title
}); });
} }
if (option.item) { this.orderId = option.orderId
let string = decodeURIComponent(option.item) this.categoryId = option.categoryId
const item = JSON.parse(decodeURIComponent(string)) this.orderServiceType = decodeURIComponent(option.orderServiceType)
this.order = item this.inGuaranteePeriod = option.inGuaranteePeriod
this.partnerCompanyId = option.partnerCompanyId
this.orderId = item.orderId this.auditResultsId = option.auditResultsId
this.categoryId = item.categoryId
this.orderServiceType = decodeURIComponent(item.orderServiceType)
this.inGuaranteePeriod = item.inGuaranteePeriod
this.partnerCompanyId = item.partnerCompanyId
this.auditResultsId = item.auditResultsId
}
// this.showTab =item.partnerCompanyName == '挚达充电桩' // this.showTab =item.partnerCompanyName == '挚达充电桩'
} else { } else {
...@@ -254,9 +235,9 @@ ...@@ -254,9 +235,9 @@
return ['勘察信息', '完工信息', '基本信息'] return ['勘察信息', '完工信息', '基本信息']
}, },
title() { title() {
return this.pageTitles[this.pageIndex] return this.pageTitles[this.tabIndex]
}, },
tabList() { // 没有数据的时候tab要有占位数据,不然会因为没有初始高度而会划上去下不来 tabList() { // 没有数据的时候tab要有占位数据,不然有页面有晃动
return this.list.length > 0 ? this.list[this.tabIndex].items : [{name:''}] return this.list.length > 0 ? this.list[this.tabIndex].items : [{name:''}]
}, },
mixingImage() { mixingImage() {
...@@ -882,11 +863,6 @@ ...@@ -882,11 +863,6 @@
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.com-cont-top {
height: 100%;
overflow: auto;
}
.u-search-box { .u-search-box {
padding: 18rpx 30rpx; padding: 18rpx 30rpx;
} }
...@@ -897,10 +873,10 @@ ...@@ -897,10 +873,10 @@
} }
.u-menu-wrap { .u-menu-wrap {
flex: 1; // flex: 1;
height: 100%; height: 100%;
display: flex; overflow: auto;
overflow: hidden; // overflow: hidden;
border-radius: 12rpx 12rpx 0 0; border-radius: 12rpx 12rpx 0 0;
} }
......
...@@ -627,18 +627,15 @@ ...@@ -627,18 +627,15 @@
}, },
filish(){ filish(){
// 去完工 // 去完工
let item = encodeURIComponent(JSON.stringify(this.order))
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/complete?item='+item url: 'pages/order/complete?orderId='+this.order.orderId
+ "&categoryId=" + this.order.categoryId
+ "&orderServiceType=" + this.order.orderServiceType
+ "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
+ "&partnerCompanyId=" + this.order.partnerCompanyId
+ '&partnerCompanyName=' + this.order.partnerCompanyName
}) })
// uni.navigateTo({
// url: 'pages/order/complete?orderId='+this.order.orderId
// + "&categoryId=" + this.order.categoryId
// + "&orderServiceType=" + this.order.orderServiceType
// + "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
// + "&partnerCompanyId=" + this.order.partnerCompanyId
// + '&partnerCompanyName=' + this.order.partnerCompanyName
// })
}, },
rejectOrder() { // 拒单 rejectOrder() { // 拒单
// 检查是否可以拒单 // 检查是否可以拒单
......
...@@ -58,6 +58,7 @@ function validImages(imgurl) { ...@@ -58,6 +58,7 @@ function validImages(imgurl) {
const imageCache = async function (vm, src, host) { const imageCache = async function (vm, src, host) {
host = host || process.uniEnv.qn_base_url host = host || process.uniEnv.qn_base_url
let image_url = host + src let image_url = host + src
return image_url // 临时
let image_name = md5Libs.md5(image_url) let image_name = md5Libs.md5(image_url)
var arr = Object.keys(vm.vuex_cache); var arr = Object.keys(vm.vuex_cache);
const result = await validImages(vm.vuex_cache[image_name]) const result = await validImages(vm.vuex_cache[image_name])
......
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