Merge remote-tracking branch 'remotes/origin/test'

.env.dev.js

@@ -10,5 +10,6 @@ const UNI_APP = {
 	},
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'http://deudn.c.pp.cc/',
+	argoDebugMode: 1
 }
 module.exports = UNI_APP;

.env.js

 ;
 (function() {
-	let NODE_ENV = 'prod'; // dev:开发环境 | test:测试环境 | prod:生产环境
+	let NODE_ENV = 'test'; // dev:开发环境 | test:测试环境 | prod:生产环境
 	let ENV_VAR = null;
 	if (process.env.NODE_ENV === "development") {
 		if (NODE_ENV === 'dev') {
@@ -12,8 +12,8 @@
 		}
 
 	} else if (process.env.NODE_ENV === "production") {
-		ENV_VAR = require('./.env.prod.js');
-		// ENV_VAR = require('./.env.test.js');
+		// ENV_VAR = require('./.env.prod.js');
+		ENV_VAR = require('./.env.test.js');
 	}
 	if (ENV_VAR) {
 		process.uniEnv = {};

.env.prod.js

@@ -8,7 +8,8 @@ const UNI_APP = {
 		apiUrl:'https://system.banshouhui.com', //java端域名请求头
 	},
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
-	qn_asset_url: 'https://qn-static.banshouhui.com'
+	qn_asset_url: 'https://qn-static.banshouhui.com',
+	argoDebugMode: 0
 }
 
 module.exports = UNI_APP;

.env.test.js

@@ -8,6 +8,7 @@ const UNI_APP = {
 		apiUrl: 'https://system.dev.banshouhui.com', //java端域名请求头
 	},
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
-	qn_asset_url: 'https://qn-static.banshouhui.com'
+	qn_asset_url: 'https://qn-static.banshouhui.com',
+	argoDebugMode: 1
 }
 module.exports = UNI_APP;

src/App.vue

@@ -245,7 +245,7 @@ export default {
         let userInfo = {
           mobile: user.mobile,
           userfrom_id: user.uid,
-          userfrom: "家维广场",
+          userfrom: "自营平台",
           avatar: user.avatar,
           nickname: user.nickname,
           username: user.username,

src/common/api/order.js

@@ -40,7 +40,10 @@ let orderApiFun = function(vm){
 	 * 订单详情查询
 	 */
 	let orderDetail = async (params = {},orderId) => await vm.$u.get('/wxh-worker-rest/rest/order/revision/'+ vm.vuex_token+'/'+orderId, params);
-
+	/**
+	 * 结算详情查询
+	 */
+	let querySettleByOrder = async (params = {},orderId) => await vm.$u.get('/wxh-worker-rest/rest/settle/'+ vm.vuex_token+'/querySettleByOrder/'+orderId, params);
 	/* 过程反馈查询接口 */
 	let feedbackConfig = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/v2/getFeedBack/' + vm.vuex_token, params)
 
@@ -172,6 +175,7 @@ let orderApiFun = function(vm){
 		workerAppointment,
 		maintainWorkerCheckin,
 		orderDetail,
+		querySettleByOrder,
 		listOrderRecord,
 		orderAccept,
 		orderGan,

src/components/createCom/XhFiles.vue

@@ -2,10 +2,6 @@
 <template>
 	<view>
 		<view class="file-box">
-			<!-- <view class="u-flex">
-				<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">
 				<view class="img-list" v-for="(item,index) in imgList" :key="index">
 					<u-image class="pic" width="160" height="160" :src="item.path ? item.path : item.src + '?imageView2/1/w/100/h/100/q/75'" :border-radius="10" @click.stop="prviewImage(item,index)"></u-image>
@@ -14,13 +10,14 @@
 						<view class="icon-del rotate"></view>
 					</view>
 				</view>
-				<view class="img-list">
+				<slot></slot>
+				<!-- <view class="img-list">
 					<u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image>
+				</view> -->
 			</view>
+			<!-- <u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet> -->
 		</view>
-			<u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet>
-		</view>
-		<take-photo v-if="takeStatus" @close="closeTake" :upload="false" :currentItem="currentItemDate"></take-photo>
+		<!-- <take-photo v-if="takeStatus" @close="closeTake" :upload="false" :currentItem="currentItemDate"></take-photo> -->
 	</view>
 </template>
 
@@ -86,6 +83,26 @@
 			}
 		},
 		methods: {
+			setTmpValue(values) {
+				this.imgList = this.imgList.concat(values)
+				const dataValue = this.imgList.map(v => v.src)
+				this.valueChange(dataValue)
+			},
+			setValue() {
+				const dataValue = this.imgList.map(item => item.src)
+				this.valueChange(dataValue)
+			},
+			prviewImage(item, index) {
+				uni.previewImage({
+					urls: [item.path ? item.path : item.src],
+					current: index
+				});
+			},
+			delFile(index) {
+				this.imgList.splice(index, 1)
+				this.setValue()
+			},
+			/*
 			selectUpload(){
 				if (this.imgList.length === 10) {
 					return this.$refs.uToast.show({
@@ -122,18 +139,6 @@
 				this.photograph()
 				this.getWatermark()
 			},
-			setTmpValue(values) {
-				this.imgList = this.imgList.concat(values)
-				const dataValue = values.map(v => v.key)
-				this.valueChange(dataValue)
-			},
-			setValue() {
-				const dataValue = []
-				this.imgList.map(item=>{
-					dataValue.push(item.src)
-				})
-				this.valueChange(dataValue)
-			},
 			closeTake(val) {
 				if(val && val.length > 0){
 					// val.forEach(item=>{
@@ -164,16 +169,6 @@
 				// }
 				// uploader.qnFileUpload(options)
 			},
-			prviewImage(item, index) {
-				uni.previewImage({
-					urls: [item.path ? item.path : item.src],
-					current: index
-				});
-			},
-			delFile(index) {
-				this.imgList.splice(index, 1)
-				this.setValue()
-			},
 			photograph(){// 获取拍照规范接口
 				let self = this
 				let param = {"partnerCompanyId":self.partnerCompanyId,
@@ -201,7 +196,7 @@
 						console.log("获取水印备注异常",res.data.message)
 					}
 				});
-			}
+			}*/
 		}
 	}
 </script>

src/components/createCom/XhSelect.vue

 <!-- *******************  单个下拉选择  *******************  -->
 <template>
 	<view class="xh-select" :style="{'width': fieldsWidth}">
-		<u-input :value="text" disabled @click="show=true" :placeholder="placeholder" :placeholder-style="placeholderStyle"
+		<!-- <u-input :value="text" disabled @click="show=true" :placeholder="placeholder" :placeholder-style="placeholderStyle"
 		:custom-style="customStyle" :clearable="false"></u-input>
 		<u-select :list="settings" v-model="show" @confirm="actionSheetCallback" safe-area-inset-bottom></u-select>
-		<u-icon class="input-icon" :name="show ? 'arrow-up' : 'arrow-down'"></u-icon>
+		<u-icon class="input-icon" :name="show ? 'arrow-up' : 'arrow-down'"></u-icon> -->
+
+		<view class="u-flex u-row-between picker-common">
+			<picker mode="selector" :value="index" range-key="label" :range="settings" @click="show = true" @change="pickerChange" class="u-flex-1">
+				<view class="txt">{{text || '请选择'}}</view>
+			</picker>
+			<u-icon class="input-icon" color="#2272FF" :name="show ? 'arrow-up' : 'arrow-down'"></u-icon>
+		</view>
 	</view>
 </template>
 
@@ -26,7 +33,8 @@
 		},
 		data() {
 			return {
-				show: false
+				show: false,
+				index: ''
 			}
 		},
 		computed: {
@@ -80,7 +88,13 @@
 				const id = event[0].value
 				this.dataValue = id
 				this.valueChange(id)
-			}
+			},
+			pickerChange(data) {
+				this.index = data.detail.value
+				const id = this.item.fieldsOptions[this.index].key
+				this.dataValue = id
+				this.valueChange(id)
+			},
 		}
 	}
 </script>
@@ -95,5 +109,17 @@
 			color: #2272FF;
 		}
 	}
-
+	.picker-common {
+		min-height: 35px;
+		background-color: #F4F5F7;
+		border-radius: 6px;
+		color: #333333;
+		padding-left: 10px;
+		padding-right: 12px;
+		width: 100%;
+		height: 38px;
+		.txt {
+			font-size: 14px;
+		}
+	}
 </style>

src/components/createCom/XhServiceMeasure.vue

 <!-- *******************  单级/多级 选择  *******************  -->
 <template>
 	<view class="picker-box" :style="{'width': fieldsWidth}">
-		<view class="u-flex u-row-between text-view" @click="openPicker">
+		<!-- <view class="u-flex u-row-between text-view" @click="openPicker">
 			<view class="txt u-flex-1 text-title">{{text||''}}</view>
 			<u-icon class="input-icon" color="#2272FF" :name="showPicker ? 'arrow-up' : 'arrow-down'"></u-icon>
 		</view>
-		<u-picker v-model="showPicker" range-key="label" @columnchange="columnchange" :mode="isNotMulti?'selector':'multiSelector'" @confirm="pickerConfirm" :range="settings"></u-picker>
+		<u-picker v-model="showPicker" range-key="label" @columnchange="columnchange" :mode="isNotMulti?'selector':'multiSelector'" @confirm="pickerConfirm" :range="settings"></u-picker> -->
+		<view class="u-flex u-row-between picker-common">
+			<picker :mode="isNotMulti?'selector':'multiSelector'" :value="index" range-key="label" :range="settings" @click="showPicker = true" @change="pickerChange" class="txt u-flex-1">
+				<view>{{text || '请选择'}}</view>
+			</picker>
+			<u-icon class="input-icon" color="#2272FF" :name="showPicker ? 'arrow-up' : 'arrow-down'"></u-icon>
+		</view>
 		<!-- :default-selector='[0, 1]' -->
 		<u-toast ref="uToast" />
 	</view>
@@ -57,7 +63,8 @@
 				isNotMulti:true,
 				showPicker:false,
 				settings:[],
-				measure:[]
+				measure:[],
+				index: ''
 			}
 		},
 		computed: {
@@ -145,6 +152,18 @@
 				}
 				this.valueChange(JSON.stringify(result))
 			},
+			pickerChange(data) {
+				this.showPicker = false
+				this.index = data.detail.value
+
+				let result = []
+				if(this.isMulti){// 维修
+					
+				}else{// 安装
+					result.push(this.measure[this.index])
+				}
+				this.valueChange(JSON.stringify(result))
+			},
 			columnchange(data){
 				// // 树列改变时进行联动操作
 				// const {column ,index} = data
@@ -155,6 +174,19 @@
 	}
 </script>
 <style lang="scss" scoped>
+.picker-common {
+	min-height: 35px;
+    background-color: #F4F5F7;
+    border-radius: 6px;
+    color: #333333;
+    padding-left: 10px;
+    padding-right: 12px;
+    width: 100%;
+    height: 38px;
+	.txt {
+		font-size: 14px;
+	}
+}
 .text-view {
 	background-color: #F4F5F7;
 	border-radius: 12rpx;

src/components/createCom/XhTime.vue

 <!-- *******************  输入框  *******************  -->
 <template>
 	<view class="picker-box">
-		<view class="u-flex u-row-between" @click="openPicker">
-			<!-- <view class="txt">{{item.fieldsTitle}}</view> -->
+		<!-- <view class="u-flex u-row-between" @click="openPicker">
 			<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> -->
+		<view class="u-flex u-row-between">
+			<picker mode="date" :value="dataValue" @change="bindDateChange" class="txt u-flex-1">
+				<view>{{dataValue || '请选择时间'}}</view>
+			</picker>
+			<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>
-		<!-- <u-picker v-model="showPicker" :rangeKey="rangeKey" @columnchange="columnchange" mode="multiSelector" @confirm="pickerConfirm" :default-selector='[0, 1]' :range="settings"></u-picker> -->
 	</view>
 </template>
 
 <script>
 	import stringMixin from './stringMixin'
 	export default {
-		name: 'XhInput', // 新建 input
 		components: {},
 		mixins: [stringMixin],
 		props: {},
@@ -29,19 +32,10 @@
 					minute: false,
 					second: false,
 					timestamp: true,
-				}
-			}
 				},
-		computed: {
-			type() {
-				if (this.item && this.item.fieldsType == 'password') {
-					return this.item.fieldsType
-				} else {
-					return 'text'
-				}
+				date: '请选择',
 			}
 		},
-		watch: {},
 		mounted() {},
 		methods: {
 			openPicker() {
@@ -53,6 +47,11 @@
 				this.dataValue = dataValue
 				this.valueChange(dataValue)
 			},
+			bindDateChange: function(e) {
+				const value = e.target.value
+				this.dataValue = value
+				this.valueChange(value)
+			}
 		}
 	}
 </script>

src/components/take/readme.md

@@ -17,7 +17,7 @@ uni.hideTabBar()
 ### Props
 | 属性名					| 类型			| 默认值	| 可选值								| 说明																	|
 | :-:						| :-:			| :-:		| :-:									| :-:																	|
-| update	| Boolean	| true		| 		true/false			| 是否默认上传 true：会自动上传好图片并返回绝对路径 false: 只返回临时路径，需要在父组件做上传动作	|
+| upload	| Boolean	| true		| 		true/false			| 是否默认上传 true：会自动上传好图片并返回绝对路径 false: 只返回临时路径，需要在父组件做上传动作	|
 | num	| Number	| 10		| 		1-10			| 拍照数量，只能传1-10的正整数	|
 | currentItem	| Object	| -			| -						| 对应的规范数据，用于获取示意图和水印，以及保存图片所需的ID **格式见下文**	|
 
@@ -67,10 +67,12 @@ uni.hideTabBar()
 
 ```javascript
 import takePhoto from '@/components/take/index.vue'
+import baseFile from '@/components/upload/index' // upload为false时需加上 
 export default {
 	components: {
 		'take-photo': takePhoto
 	},
+	mixins: [baseFile], // upload为false时需加上 
 	data() {
 		return {
 			takeStatus: false,
@@ -86,6 +88,11 @@ export default {
 		// 拍照完成或关闭相机
 		closeTake(images) {
 			this.takeStatus = false
+			
+			// upload为false时处理
+			const files = images.map(v => v.path)
+			const value = await this.saveToTask(files)
+			console.log("value", value)
 		}
 	}
 }

src/components/upload/index.js

@@ -48,10 +48,11 @@ export default {
 		async saveToTask(files) {
 			// 生成key返回，然后把key放到异步上传的任务队列
 			let lists = files.map(v => {
+				const key = randomChar(10)
 				return {
-					key: randomChar(10),
+					key: key,
 					path: v,
-					src: ''
+					src: key
 				}
 			})
 			// for (let i = 0; i < files.length; i++) {
@@ -92,10 +93,11 @@ export default {
 					tempFilePath: path,
 					success(e) {
 						const { savedFilePath } = e
+						const key = randomChar(10)
 						const img = {
-							key: randomChar(10),
+							key: key,
 							path: savedFilePath,
-							src: ''
+							src: key
 						}
 						resolve(img)
 					},

src/config/index.js

@@ -7,7 +7,7 @@ let argo ={
 	1 开启调试模式，数据不入库。类型：Number。
 	2 开启调试模式，数据入库。类型：Number。
 	 */
-	debugMode:0,
+	debugMode: process.uniEnv.argoDebugMode,
 	autoTrack:true,
 	uploadURL: 'https://argo.banshouhui.com/'
 }

src/pages/mine/wallet/index.vue

@@ -148,7 +148,7 @@
 			},
 			handleClickCell(orderId) {
 				this.$u.route({
-					url: 'pages/order/detail',
+					url: 'pages/order/detail?isFromMine=1',
 					params: {
 						id: orderId
 					}

src/pages/mine/wallet/statement.vue

@@ -107,7 +107,7 @@
 			handleClickCell(orderId) {
 				
 				uni.navigateTo({
-					url: 'pages/order/detail?id=' + orderId
+					url: 'pages/order/detail?isFromMine=1&id=' + orderId
 				})
 			},
 			async loadStatement() {

src/pages/order/detail.vue

@@ -72,6 +72,25 @@
 					</view>
 				<!-- </u-read-more> -->
 			</view>
+			<!-- 从我的页面进来显示计算信息 -->
+			<view v-if="isFromMine" class="settlement-view">
+				<view class="settlement-title">结算信息</view>
+				<view class="settlement-content">
+					<text class="content-left">工单确认时间：</text>
+					<text>{{settlementInfo.formatTime}}</text>
+				</view>
+				<view class="settlement-content" v-for="(item, index) in settlementInfo.list" :key="index">
+					<text class="content-left">{{item.businessSettlementType + '：'}}</text>
+					<text>{{(item.realSettlementAmount || item.settlementAmount)  + '元'}}</text>
+					<text v-if="item.adjustmentRemark">{{'-' + item.adjustmentRemark}}</text>
+				</view>
+				<view class="settlement-content">
+					<text class="content-left">最终结算金额：</text>
+					<text>{{settlementInfo.amount}}元</text>
+				</view>
+			</view>
+			<!-- 其他页面进来 -->
+			<view v-else>
 				<view class="card appoint-item" v-show="showTimeSelect">
 					<appoint-time :dateList="dateList" :timeList="timeList"  @dateChange="dateChange" @timeChange="timeChange" @weekChange="weekChange"></appoint-time>
 				</view>
@@ -114,6 +133,9 @@
 				</view>
 			</view>
 			</view>
+		</view>
+		<!-- 不是从我的页面进来不用显示 -->
+		<template v-if="!isFromMine">
 			<view v-if="showCenterBtn" class="toolbar">
 				<!-- 背景，内容，请求接口 根据状态不同改变  {{operationDoing[order.orderStatus].background}} -->
 				<!-- 过程反馈 -->
@@ -160,6 +182,7 @@
 			</view>
 			<take-photo type="test" v-if="takeStatus" @close="closeTake" :num="1"></take-photo>
 			<PopView title="查看交互规范" message="为完善交付质量，请查看对应的交付规范" :visible.sync="visibale" @click="handleClick"/>
+		</template>
 	</view>
 </template>
 
@@ -237,7 +260,9 @@
 				showTimeOut:true,
 				clicking: false,
 				dateItem: null,
-				centerBtnDisabled:false
+				centerBtnDisabled:false,
+				isFromMine: false,
+				settlementInfo: {formatTime: '-', list: [], amount: ''}
 			}
 		},
 		onLoad(option) {
@@ -246,9 +271,17 @@
 				this.orderId = option.id
 			}
 			this.loadOrderDetail()
-			this.loadOrderRecord()
 			this.getLocation()
+			if (option && option.isFromMine) {
+				this.isFromMine = true
+				// 获取结算信息
+				this.loadSettlement()
+
+			} else {
+				this.loadOrderRecord()
 				this.getSignDistance()
+			}
+			
 		},
 		onHide() {
 			this.closeLocationChange()
@@ -295,7 +328,7 @@
 					address += self.order.contactAddress || ""
 				}
 				return address
-			},
+			}
 		},
 		methods: {
 			openLocation(address){
@@ -404,6 +437,26 @@
 						if(self.order.isFirstOrder){
 							this.visibale = true
 						}
+						// 格式化时间
+						this.settlementInfo.formatTime = this.order.settleCenterSyncDatetime ? this.$u.timeFormat(this.order.settleCenterSyncDatetime, 'yyyy.mm.dd hh:MM:ss') : '-'
+					} else {
+						console.log(res.message, "获取订单详情失败！");
+					}
+				});
+			},
+			loadSettlement() { // 获取工单详情
+				let self = this
+				var data = {
+					'orderId': self.orderId
+				};
+				self.$u.api.querySettleByOrder(data, self.orderId).then((res) => {
+					if (res.code == 200) {
+						var amount = 0
+						for (var item of res.data) {
+							amount += (item.realSettlementAmount || item.settlementAmount)
+						}
+						this.settlementInfo.amount = amount
+						this.settlementInfo.list = res.data
 					} else {
 						console.log(res.message, "获取订单详情失败！");
 					}
@@ -1137,4 +1190,25 @@
 		text-align: left;
 		flex-shrink: 0;
 	}
+	.settlement-view {
+		padding: 30rpx;
+		background-color: #FFFFFF;
+		border-radius: 12rpx;
+		.settlement-title {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333333;
+			margin-bottom: 30rpx;
+		}
+		.settlement-content {
+			font-size: 26rpx;
+			color: #333333;
+			margin-bottom: 20rpx;
+			display: flex;
+			align-items: flex-start;
+			.content-left {
+				flex-shrink: 0;
+			}
+		}
+	}
 </style>

src/pages/photo/list.vue

@@ -29,7 +29,7 @@
 					</view>
 				</template>
 			</scroll-view>
-				<take-photo type="test" v-if="takeStatus" :currentItem="currentItemDate" @close="closeTake"></take-photo>
+			<take-photo type="test" v-if="takeStatus" :upload="false" :currentItem="currentItemDate" @close="closeTake"></take-photo>
 			<!-- <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>
@@ -57,6 +57,7 @@
 
 <script>
 	import takePhoto from '@/components/take/index.vue'
+	import baseFile from '@/components/upload/index';
 	export default {
 		components: {
 			'take-photo': takePhoto
@@ -81,6 +82,7 @@
 				title: '全部'
 			}
 		},
+		mixins: [baseFile],
 		onLoad(e) {
 			getApp().trackPage('照片规范列表页')
 			if (e && e.brandId) {
@@ -242,22 +244,27 @@
 				uni.hideTabBar()
 				this.takeStatus = true
 			},
-			closeTake(img) {
-				if(img !==undefined ){
+			async closeTake(img) {
+				if(img !==undefined){
+					const files = img.map(v => v.path)
+					const value = await this.saveToTask(files)
 					if (!this.currentItemDate.orderImages) this.currentItemDate.orderImages = []
-					// step1 添加图片
-					img.forEach(v => {
-						this.currentItemDate.orderImages.push(v.key)
+					// 复制一份 用于保存
+					let saveList = this.currentItemDate.orderImages.concat();
+					value.map(item =>{
+						// step1 添加缓存图片 到显示
+						this.currentItemDate.orderImages.push(item.path)
+						// 文件key添加保存数组中
+						saveList.push(item.key)
 					})
 					// step2 保存图片
 					var data={
 						type : this.currentItemDate.type,
-						images : Array.from(this.currentItemDate.orderImages),
+						images : Array.from(saveList),
 						fieldsName:this.currentItemDate.fieldName
 					}
 					this.$u.api.saveImage(data,this.orderId).then((res) => {
 						if (res.code == 200) {
-							console.log("===", res.data)
 						} else {
 							console.log("保存图片异常",res.data.message)
 						}