Commit 980d4b8d authored by 和慭琛's avatar 和慭琛

bug修复

parent 2ea511fb
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<text class="itemTitle">联系人</text> <text class="itemTitle">联系人</text>
<text class="itemRedStar">*</text> <text class="itemRedStar">*</text>
</view> </view>
<input class="itemInput" @input="nameInput" maxlength="20" v-model="name" type="" value="" placeholder="请输入联系人姓名" placeholder-style='color:#CCCCCC;font-size:32rpx;'/> <input class="itemInput" @input="nameInput" maxlength="5" v-model="name" type="" value="" placeholder="请输入联系人姓名" placeholder-style='color:#CCCCCC;font-size:32rpx;'/>
</view> </view>
<view class="itemView"> <view class="itemView">
<view class="itemTitleView"> <view class="itemTitleView">
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
//this.getPerson() //this.getPerson()
//this.isClean = true //this.isClean = true
this.checkClean() this.checkClean()
//this.timeProcessing('2020/12/17')
//getApp().initAPIneedToken //getApp().initAPIneedToken
}, },
...@@ -171,6 +172,8 @@ ...@@ -171,6 +172,8 @@
doNothing:function(){}, doNothing:function(){},
nameInput(e){ nameInput(e){
this.name = e.detail.value this.name = e.detail.value
// console.log('联系人 监听:') // console.log('联系人 监听:')
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
<view class="itemView" @click="itemClick(item)" v-if="activeTop == 0" v-for="(item,ikey) in unfinishList":key="ikey"> <view class="itemView" @click="itemClick(item)" v-if="activeTop == 0" v-for="(item,ikey) in unfinishList":key="ikey">
<view class="nameView"> <view class="nameView">
<view class="nameLeftView"> <view class="nameLeftView">
<text class="nameText" v-if="item.contactName">{{item.contactName}}</text> <text class="nameText u-line-1" v-if="item.contactName">{{item.contactName}}</text>
<text class="phoneText" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text> <text class="phoneText u-line-1" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text>
</view> </view>
<text class="productText" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text> <text class="productText u-line-1" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text>
</view> </view>
<text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text> <text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text>
<view class="itemBottomView" v-if="item.maintainWorkerName || item.statusText"> <view class="itemBottomView" v-if="item.maintainWorkerName || item.statusText">
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<text class="workerPhoneText" v-if="item.maintainWorkerPhone" @click.stop="callClick(item.maintainWorkerPhone)">{{item.maintainWorkerPhone}}</text> <text class="workerPhoneText" v-if="item.maintainWorkerPhone" @click.stop="callClick(item.maintainWorkerPhone)">{{item.maintainWorkerPhone}}</text>
</view> </view>
<view class="statusView" v-if="item.statusText"> <view class="statusView" v-if="item.statusText">
<text class="statusText" v-if="item.statusText">{{item.statusText}}</text> <text class="statusText u-line-1" v-if="item.statusText">{{item.statusText}}</text>
</view> </view>
</view> </view>
<view class="divideLine u-m-t-30"></view> <view class="divideLine u-m-t-30"></view>
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
<view class="itemView" @click="itemClick(item)" v-if="activeTop == 1" v-for="(item,ikey) in finishList":key="ikey"> <view class="itemView" @click="itemClick(item)" v-if="activeTop == 1" v-for="(item,ikey) in finishList":key="ikey">
<view class="nameView"> <view class="nameView">
<view class="nameLeftView"> <view class="nameLeftView">
<text class="nameText" v-if="item.contactName">{{item.contactName}}</text> <text class="nameText u-line-1" v-if="item.contactName">{{item.contactName}}</text>
<text class="phoneText" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text> <text class="phoneText u-line-1" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text>
</view> </view>
<text class="productText" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text> <text class="productText u-line-1" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text>
</view> </view>
<text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text> <text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text>
<view class="itemBottomView" v-if="item.maintainWorkerName || item.statusText"> <view class="itemBottomView" v-if="item.maintainWorkerName || item.statusText">
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<text class="workerPhoneText" v-if="item.maintainWorkerPhone" @click="callClick(item.maintainWorkerPhone)">{{item.maintainWorkerPhone}}</text> <text class="workerPhoneText" v-if="item.maintainWorkerPhone" @click="callClick(item.maintainWorkerPhone)">{{item.maintainWorkerPhone}}</text>
</view> </view>
<view class="statusView" v-if="item.statusText"> <view class="statusView" v-if="item.statusText">
<text class="statusText" v-if="item.statusText">{{item.statusText}}</text> <text class="statusText u-line-1" v-if="item.statusText">{{item.statusText}}</text>
</view> </view>
</view> </view>
<view class="divideLine u-m-t-30"></view> <view class="divideLine u-m-t-30"></view>
......
...@@ -212,7 +212,8 @@ ...@@ -212,7 +212,8 @@
//照片相关 //照片相关
photoList:[], photoList:[],
photo_fieldsValue:'', photo_fieldsValue:'',
photo_tempFilePaths:[] photo_tempFilePaths:[],
photo_totalValue:''
} }
}, },
onLoad(e) { onLoad(e) {
...@@ -931,15 +932,19 @@ ...@@ -931,15 +932,19 @@
successCount = successCount + 1 successCount = successCount + 1
console.log('totalCount:'+totalCount) console.log('totalCount:'+totalCount)
console.log('successCount:'+successCount) console.log('successCount:'+successCount)
that.photo_totalValue = that.photo_totalValue + uploadFileRes.data + ','
//if(i == (that.photo_tempFilePaths.length-1)){ //if(i == (that.photo_tempFilePaths.length-1)){
if (successCount == totalCount){ if (successCount == totalCount){
//改为先上传照片 //改为先上传照片
//that.finishConfirm() //that.finishConfirm()
that.savePhotoValues(uploadFileRes.data) that.savePhotoValues(that.photo_totalValue)
} }
console.log( '第' + i + '张 照片单张上传 成功'); console.log( '第' + i + '张 照片单张上传 成功');
console.log(uploadFileRes.data); console.log(uploadFileRes.data);
console.log('照片总值拼接:');
console.log(that.photo_totalValue);
},fail(res) { },fail(res) {
uni.hideLoading(); uni.hideLoading();
console.log('照片单张上传 失败'); console.log('照片单张上传 失败');
...@@ -957,6 +962,10 @@ ...@@ -957,6 +962,10 @@
//保存照片value到配置项里 //保存照片value到配置项里
savePhotoValues: function(photoValue){ savePhotoValues: function(photoValue){
console.log('保存照片value到配置项里')
console.log(photoValue)
for (var i=0;i<this.orderInfo.fieldsItems.length;i++) for (var i=0;i<this.orderInfo.fieldsItems.length;i++)
{ {
var item = this.orderInfo.fieldsItems[i] var item = this.orderInfo.fieldsItems[i]
...@@ -1196,6 +1205,14 @@ ...@@ -1196,6 +1205,14 @@
} }
//日期
if (item.fieldsType == 'DATE' && item.fieldsValue){
item.fieldsValue = this.timeProcessing(item.fieldsValue)
console.log('单独处理后的 日期')
console.log(item.fieldsValue)
}
} }
...@@ -1387,6 +1404,33 @@ ...@@ -1387,6 +1404,33 @@
}) })
}, },
timeProcessing(dateTime){
//dateTime = dateTime.substr(0,16);
dateTime = dateTime.replace("-","/")
dateTime = dateTime.replace("-","/")
dateTime = dateTime.replace("-","/")
console.log('dateTime' + dateTime)
//let timeDate = "2019-06-24 11:08:48";
let timeDate = dateTime
let Time = new Date(timeDate);
console.log(Time)//Mon Jun 24 2019 11:08:48 GMT+0800 (中国标准时间)
let timestemp = Time.getTime();
console.log('转换后的时间戳')
console.log(timestemp)
return timestemp
//1561345728000
}
//------------------------------------------------- //-------------------------------------------------
/* /*
getConfig: function () { getConfig: function () {
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
<view class="itemView" v-if="activeTop == 0" @click="itemClick(item)" v-for="(item,ikey) in grabList":key="ikey"> <view class="itemView" v-if="activeTop == 0" @click="itemClick(item)" v-for="(item,ikey) in grabList":key="ikey">
<view class="nameView"> <view class="nameView">
<view class="nameLeftView"> <view class="nameLeftView">
<text class="nameText" v-if="item.contactName">{{item.contactName}}</text> <text class="nameText u-line-1" v-if="item.contactName">{{item.contactName}}</text>
<text class="phoneText" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text> <text class="phoneText u-line-1" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text>
</view> </view>
<text class="productText" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text> <text class="productText u-line-1" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text>
</view> </view>
<text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text> <text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<text class="typeText" v-if="item.inGuaranteePeriodText">({{item.inGuaranteePeriodText}})-{{item.orderServiceType}}</text> <text class="typeText" v-if="item.inGuaranteePeriodText">({{item.inGuaranteePeriodText}})-{{item.orderServiceType}}</text>
</view> </view>
<view class="robStatusView" v-if="item.statusText"> <view class="robStatusView" v-if="item.statusText">
<text class="statusText" v-if="item.statusText">{{item.statusText}}</text> <text class="statusText u-line-1" v-if="item.statusText">{{item.statusText}}</text>
</view> </view>
</view> </view>
<view class="divideLine u-m-t-30"></view> <view class="divideLine u-m-t-30"></view>
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
<view class="itemView" v-if="activeTop == 1" v-for="(item,ikey) in unfinishList":key="ikey"> <view class="itemView" v-if="activeTop == 1" v-for="(item,ikey) in unfinishList":key="ikey">
<view class="nameView" @click="itemClick(item)"> <view class="nameView" @click="itemClick(item)">
<view class="nameLeftView"> <view class="nameLeftView">
<text class="nameText" v-if="item.contactName">{{item.contactName}}</text> <text class="nameText u-line-1" v-if="item.contactName">{{item.contactName}}</text>
<text class="callPhoneText underLine" @click="callClick(item.contactMobilephone)" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text> <text class="callPhoneText underLine u-line-1" @click="callClick(item.contactMobilephone)" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text>
</view> </view>
<text class="productText" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text> <text class="productText u-line-1" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text>
</view> </view>
<text class="addressText" @click="itemClick(item)" v-if="item.contactAddress">{{item.contactAddress}}</text> <text class="addressText" @click="itemClick(item)" v-if="item.contactAddress">{{item.contactAddress}}</text>
<view class="bookBottomView" v-if="item.maintainWorkerName || item.statusText"> <view class="bookBottomView" v-if="item.maintainWorkerName || item.statusText">
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
<view class="itemView" v-if="activeTop == 2" @click="itemClick(item)" v-for="(item,ikey) in finishList":key="ikey"> <view class="itemView" v-if="activeTop == 2" @click="itemClick(item)" v-for="(item,ikey) in finishList":key="ikey">
<view class="nameView"> <view class="nameView">
<view class="nameLeftView"> <view class="nameLeftView">
<text class="nameText" v-if="item.contactName">{{item.contactName}}</text> <text class="nameText u-line-1" v-if="item.contactName">{{item.contactName}}</text>
<text class="callPhoneText underLine" @click="callClick(item.contactMobilephone)" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text> <text class="callPhoneText underLine u-line-1" @click="callClick(item.contactMobilephone)" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text>
</view> </view>
<text class="productText" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text> <text class="productText u-line-1" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text>
</view> </view>
<text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text> <text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text>
<view class="finishBottomView" v-if="item.maintainWorkerName || item.statusText"> <view class="finishBottomView" v-if="item.maintainWorkerName || item.statusText">
...@@ -650,6 +650,8 @@ ...@@ -650,6 +650,8 @@
}) })
setTimeout(function() { setTimeout(function() {
that.unfinishList.length = 0
that.pageNumber = 0
that.getOrderList(0) that.getOrderList(0)
}, 1000); }, 1000);
......
...@@ -3,32 +3,32 @@ ...@@ -3,32 +3,32 @@
<view class="topView"> <view class="topView">
<view class="itemView u-m-t-30"> <view class="itemView u-m-t-30">
<text class="titleText u-m-l-30">联系人:</text> <text class="titleText u-m-l-30">联系人:</text>
<text class="contentText u-m-l-20" v-if="contactName">{{contactName}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.contactName">{{orderInfo.contactName}}</text>
<text class="contentText u-m-l-20 underLine" v-if="contactMobilephone">{{contactMobilephone}}</text> <text class="contentText u-m-l-20 underLine" v-if="orderInfo.contactMobilephone">{{orderInfo.contactMobilephone}}</text>
</view> </view>
<view class="itemView u-m-t-30"> <view class="itemView u-m-t-30">
<text class="titleText u-m-l-30">地址:</text> <text class="titleText u-m-l-30">地址:</text>
<text class="contentText u-m-l-20" v-if="contactAddress">{{contactAddress}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.contactAddress">{{orderInfo.contactAddress}}</text>
</view> </view>
<view class="itemView u-m-t-60"> <view class="itemView u-m-t-60">
<text class="titleText u-m-l-30">类型:</text> <text class="titleText u-m-l-30">类型:</text>
<text class="contentText u-m-l-20" v-if="inGuaranteePeriodText">({{inGuaranteePeriodText}}) {{orderServiceType}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.inGuaranteePeriodText">({{orderInfo.inGuaranteePeriodText}}) {{orderServiceType}}</text>
</view> </view>
<view class="itemView u-m-t-30"> <view class="itemView u-m-t-30">
<text class="titleText u-m-l-30">产品:</text> <text class="titleText u-m-l-30">产品:</text>
<text class="contentText u-m-l-20" v-if="brandName">{{brandName}}-{{categoryName}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.brandName">{{orderInfo.brandName}}-{{categoryName}}</text>
</view> </view>
<view class="itemView u-m-t-30"> <view class="itemView u-m-t-30">
<text class="titleText u-m-l-30">状态:</text> <text class="titleText u-m-l-30">状态:</text>
<text class="contentText u-m-l-20" v-if="statusText">{{statusText}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.statusText">{{orderInfo.statusText}}</text>
</view> </view>
<view class="itemView u-m-t-30"> <view class="itemView u-m-t-30">
<text class="titleText u-m-l-30">描述:</text> <text class="titleText u-m-l-30">描述:</text>
<text class="contentText u-m-l-20" v-if="serviceContent">{{serviceContent}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.serviceContent">{{orderInfo.serviceContent}}</text>
</view> </view>
<view class="itemView u-m-t-60 padding_bottom_180"> <view class="itemView u-m-t-60 padding_bottom_180">
<text class="titleText u-m-l-30">下单时间:</text> <text class="titleText u-m-l-30">下单时间:</text>
<text class="contentText u-m-l-20" v-if="createDatetime">{{formatDate(createDatetime)}}</text> <text class="contentText u-m-l-20" v-if="orderInfo.createDatetime">{{formatDate(orderInfo.createDatetime)}}</text>
</view> </view>
</view> </view>
<view class="bottomView"> <view class="bottomView">
...@@ -107,6 +107,7 @@ ...@@ -107,6 +107,7 @@
getApp().globalData.token = res.data getApp().globalData.token = res.data
//that.getData() //that.getData()
that.getDataNew()
}, },
fail() { fail() {
uni.navigateTo({ uni.navigateTo({
...@@ -118,6 +119,61 @@ ...@@ -118,6 +119,61 @@
//await this.getData() //await this.getData()
}, },
getDataNew: function () {
let that = this
uni.showLoading({
title:'加载中'
})
// /wxh-worker-rest/rest/order/revision/applets/{token}/order/grabbing/detail
uni.request({
url: getApp().globalData.domain_Name
+'/wxh-worker-rest/rest/order/revision/applets/'+
getApp().globalData.token
+'/order/grabbing/detail',
method: 'GET',
data: {
orderId:this.orderId
},
header:{
'Content-Type': 'application/x-www-form-urlencoded'
},
success: (res) => {
uni.hideLoading()
console.log('获取 抢单详情 成功 成功')
console.log(res)
if(res.data.code==200){
this.orderInfo = res.data.data
}else{
console.log('获取 抢单详情 不为200时候')
uni.showToast({
icon:'none',
title:res.data.message
})
}
},
fail: (e) => {
uni.hideLoading()
console.log('获取 抢单详情 失败')
console.log(e)
uni.showToast({
icon:'none',
title:'获取抢单详情失败'
})
}
})
},
getTopInfo: function (e) { getTopInfo: function (e) {
/* /*
......
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