update:add、update

scope:self-support
body:完工页面交互调试

src/common/api/order.js

@@ -73,6 +73,21 @@ let orderApiFun = function(vm){
 	 */
 	let getWatermark= async (params = {}) => await vm.$u.get('wxh-worker-rest/rest/'+ vm.vuex_token+'/photo/watermark', params);
 	
+	/**
+	 * 获取订单的完工项目(配置+数据)
+	 */
+	let getCompleteConfigAndData= async (orderId) => await vm.$u.get('wxh-worker-rest/rest/'+ vm.vuex_token+'/order/'+ orderId +'/maintain/info');
+	
+	/**
+	 * 查询措施
+	 */
+	let getMeasure= async (params = {}) => await vm.$u.get('wxh-worker-rest/rest/service/'+ vm.vuex_token+'/measure/queryMeasureItems', params);
+	
+	/**
+	 * 保存售后记录
+	 */
+	let saveCompleteData = async (params = {},orderId) => await vm.$u.post('wxh-worker-rest/rest/'+ vm.vuex_token+'/order/'+ orderId +'/maintain/saveMaintainInfoV2', params);
+	
 	const orderApi = {
 		listByRecommendOrder,
 		listOrderCount,
@@ -84,13 +99,15 @@ let orderApiFun = function(vm){
 		listOrderRecord,
 		orderAccept,
 		orderGan,
-		maintainWorkerCheckin,
 		feedbackConfig,
 		traceAndAppointment,
 		rejectOrder,
 		orderStandard,
 		saveImage,
-		getWatermark
+		getWatermark,
+		getCompleteConfigAndData,
+		getMeasure,
+		saveCompleteData
 	}
 	return orderApi
 }

src/components/createCom/XhCheckbox.vue

@@ -2,7 +2,7 @@
 <template>
 	<view class="list">
 		<view v-for="(item,index) in settings" :key="index"
-			:class="{'txt':true,'active':checkStatus(item)}"  @click="setValue(item)">{{item}}
+			:class="{'txt':true,'active':checkStatus(item.key)}"  @click="setValue(item.key)">{{item.label}}
 		</view>
 	</view>
 </template>
@@ -20,7 +20,7 @@
 		},
 		computed: {
 			settings() {
-				return this.item.settings || []
+				return this.item.fieldsOptions || []
 			}
 		},
 		watch: {},

src/components/createCom/XhFiles.vue

@@ -13,7 +13,7 @@
 					<view class="icon-del rotate"></view>
 				</view>
 			</view>
-			<view class="img-list" @click="choose">
+			<view class="img-list">
 				<u-image class="pic" width="170rpx" height="170"  @click="selectUpload" src="https://gitee.com/xuqu/uView/blob/master/static/uview/example/min_button.png"></u-image>
 			</view>
 			<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> -->
@@ -23,12 +23,12 @@
 </template>
 
 <script>
-	import objMixin from './objMixin'
+	import arrMixin from './arrMixin'
 	import baseFile from '@/components/upload/index';
 	export default {
 		name: 'XhFiles',
 		components: {},
-		mixins: [objMixin,baseFile],
+		mixins: [arrMixin,baseFile],
 		props: {
 			files: {
 				type: Array,
@@ -60,17 +60,37 @@
 			},
 			'files': { // 处理相机拍照返回的图片
 				handler (val) {
-					this.imgList = val.map(v => {
-						v.path = v.src
-						return v
+					if(val && val.length > 0){
+						val.forEach((item,index,array)=>{
+							item.path = item.src
+						    this.imgList.push(item)
 						})
+						// this.imgList = val.map(v => {
+						// 	v.path = v.src
+						// 	return v
+						// })
 						this.setValue()
+					}
 				},
 				deep:true,
 				immediate: true,
+			},
+			// 'value'(val, oldVal){
+			// 	if(val){
+			// 		this.imgList = val.map(img =>{
+			// 			return {path:img}
+			// 		})
+			// 	}
+			// }
+		},
+		mounted() {
+			if(this.value){
+				this.imgList = this.value.map(img =>{
+					return {path: img}
+				})
 			}
+			this.setValue()
 		},
-		mounted() {},
 		methods: {
 			selectUpload(){
 				// 弹窗展示
@@ -90,7 +110,7 @@
 					let config = {
 						options:{
 							sourceType:['album'],//['album', 'camera']
-							count: 5,
+							count: 10,
 							sizeType: ['compressed']
 						}
 					}
@@ -104,9 +124,8 @@
 			setValue() {
 				const dataValue = []
 				this.imgList.map(item=>{
-					dataValue.push(item.key)
+					dataValue.push(item.src)
 				})
-				console.log(this.imgList)
 				this.valueChange(dataValue)
 			},
 			prviewImage(url, index) {
@@ -117,14 +136,15 @@
 			},
 			delFile(index) {
 				this.imgList.splice(index, 1)
+				this.setValue()
 			}
 		}
 	}
 </script>
 <style lang="scss" scoped>
 	.pic{
-		margin-right: 15rpx;
-		margin-bottom: 15rpx;
+		// margin-right: 15rpx;
+		// margin-bottom: 15rpx;
 		&:nth-child(3n){
 			margin-right: 0;
 		}

src/components/createCom/XhInput.vue

@@ -17,7 +17,6 @@
 		},
 		computed: {
 			type() {
-				console.log(this.item)
 				if (this.item && this.item.fieldsType == 'password' || this.item.fieldsType == 'textarea') {
 					return this.item.fieldsType
 				} else {

src/components/createCom/XhLocation.vue

@@ -4,7 +4,6 @@
 		<view class="list u-flex u-row-between">
 			<image class="item-image" :src="mixingImage" v-if="item.required"></image>
 			<view class="u-m-r-20">{{item.fieldsTitle}}</view>
-			<!-- <u-button type="primary" size="mini" @click="$u.debounce(getLocation,1000)">自动定位</u-button> -->
 			<view class="u-flex-1 location-name">
 				<u-icon name="map" color="#2979ff" size="30"></u-icon>自动定位
 			</view>
@@ -14,11 +13,11 @@
 </template>
 
 <script>
-	import objMixin from './objMixin'
+	import arrMixin from './arrMixin'
 	export default {
 		name: 'XhLocation',
 		components: {},
-		mixins: [objMixin],
+		mixins: [arrMixin],
 		props: {},
 		filters:{},
 		data() {

src/components/createCom/XhPicker.vue

-<!-- *******************  单级/多级 选择  *******************  -->
+<!-- *******************  服务措施  *******************  -->
 <template>
 	<view class="picker-box">
 		<view class="u-flex u-row-between" @click="openPicker">

src/components/createCom/XhRadio.vue

 <!-- *******************  单选框  *******************  -->
 <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 v-for="(item,index) in settings" :key="index" :class="{'txt':true,'active':item.key===dataValue}" 
+		@click="setValue(item.key)">{{item.label}}</view>
 	</view>
 </template>
 
@@ -18,7 +18,7 @@
 		},
 		computed: {
 			settings(){
-				return this.item.settings || []
+				return this.item.fieldsOptions || []
 			}
 		},
 		watch: {},

src/components/createCom/XhSelect.vue

 <!-- *******************  单个下拉选择  *******************  -->
 <template>
 	<view>
-		<u-input v-model="dataValue" readOnly @click="show=true" type="select" />
+		<u-input :value="text" readOnly @click="show=true" type="select" />
 		<u-action-sheet :list="settings" v-model="show" @click="actionSheetCallback"></u-action-sheet>
 	</view>
 </template>
@@ -28,22 +28,27 @@
 			},
 			settings() {
 				let result = []
-				let settings = this.item.settings || []
+				let settings = this.item.fieldsOptions || []
 				result = settings.map(item => {
 					return {
-						text: item
+						text: item.label,
+						id: item.key
 					}
 				})
 				return result
+			},
+			text(){
+				let option = this.item.fieldsOptions.find(a=>{return a.key === this.dataValue}) 
+				return option?option.label:''
 			}
 		},
 		watch: {},
 		mounted() {},
 		methods: {
 			actionSheetCallback(index) {
-				let txt = this.settings[index].text;
-				this.dataValue = txt
-				this.valueChange(txt)
+				let id = this.settings[index].id;
+				this.dataValue = id
+				this.valueChange(id)
 			}
 		}
 	}

src/components/createCom/XhTime.vue

@@ -2,8 +2,8 @@
 <template>
 	<view class="picker-box">
 		<view class="u-flex u-row-between" @click="openPicker">
-			<view class="txt">{{item.fieldsTitle}}</view>
-			<view class="txt u-flex-1">{{dataValue}}</view>
+			<!-- <view class="txt">{{item.fieldsTitle}}</view> -->
+			<view class="txt u-flex-1">{{dataValue||'请选择时间'}}</view>
 			<u-icon name="arrow-right" color="#666" size="28"></u-icon>
 		</view>
 		<u-picker :params="params" v-model="showPicker" mode="time" @confirm="pickerConfirm"></u-picker>
@@ -25,10 +25,9 @@
 					year: true,
 					month: true,
 					day: true,
-					hour: true,
-					minute: true,
-					second: true,
-					// 选择时间的时间戳
+					hour: false,
+					minute: false,
+					second: false,
 					timestamp: true,
 				}
 			}
@@ -49,11 +48,8 @@
 				this.showPicker = true
 			},
 			pickerConfirm(data) {
-				console.log(data, 'DATA')
 				let result = []
-				let dataValue = data.year + '-' + data.month + '-' + data.day + ' ' + data.hour + ':' + data.minute +
-					':' + data.second
-				console.log(dataValue, 'dataValue')
+				let dataValue = data.year + '-' + data.month + '-' + data.day
 				this.dataValue = dataValue
 				this.valueChange(dataValue)
 			},

src/pages/order/detail.vue

@@ -378,6 +378,8 @@
 				// 去完工
 				uni.navigateTo({
 					url: 'pages/order/complete?orderId='+this.order.orderId 
+						+ "&categoryId=" + this.order.categoryId 
+						+ "&orderServiceType=" + this.order.orderServiceType
 				})
 			},
 			/**