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

.env.dev.js

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

.env.js

 (function () {
 	let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境 | prod:生产环境
 	let ENV_VAR = null;
-	let VERSION_NUMBER = '1.3.6';//版本号
-	//小程序是否审核通过，参数配置在ucenter库version表，对应版本号的is_audit设置为1，将显示学习视频
+  let VERSION_NUMBER = '1.3.9';//版本号
+    //小程序是否审核通过，参数配置在ucenter库version表，对应版本号的is_audit设置为1，将显示学习视频
 	if (process.env.NODE_ENV === "development") {
 		if (NODE_ENV === 'dev') {
 			ENV_VAR = require('./.env.dev.js');

.env.prod.js

@@ -10,7 +10,7 @@ const UNI_APP = {
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'https://qn-static.banshouhui.com',
 	argoDebugMode: 0,
-	version: 'v1.3.6'
+	version: 'v1.3.9'
 }
 
 module.exports = UNI_APP;

.env.test.js

@@ -10,6 +10,6 @@ const UNI_APP = {
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
 	qn_asset_url: 'https://qn-static.banshouhui.com',
 	argoDebugMode: 1,
-	version: 'v1.3.6'
+	version: 'v1.3.9'
 }
 module.exports = UNI_APP;

src/pages/order/complete.vue

@@ -567,6 +567,8 @@
             // 提交订单
 			orderFinish(){
                 const param = this.handleSaveData()
+				// 完工事件埋点
+				getApp().track('order_finish', {id: this.vuex_user.id, mobile: this.vuex_user.mobile, orderId: Number(this.orderId)})
                 this.$u.api.saveCompleteData(param,this.orderId).then((res)=>{
                     if (res.code == 200) {//完工项信息保存成功再次完工工单
                         if(this.inGuaranteePeriod === 'Y'){

src/pages/photo/list.vue

@@ -162,6 +162,10 @@
 							let dataList = []
 							var  flag = false;
 							res.data.forEach(item=>{
+								item.key = item.orderImages ? item.orderImages.map(v => {
+									const key = v.split('com/')
+									return key[1]
+								}) : []
 								if(dataList.length===0 ){
 									var dataItem = {type:'',list:[]}
 									dataItem.type = item.type
@@ -246,10 +250,9 @@
 			},
 			async closeTake(img) {
 				if(img !== undefined){
-					// 复制一份 用于保存
 					if (!this.currentItemDate.orderImages) this.currentItemDate.orderImages = []
-					let saveList = this.currentItemDate.orderImages.slice(0)
-
+					// 真实地址key
+					let saveList = this.currentItemDate.key 
 					const files = img.map(v => v.path)
 					const value = await this.saveToTask(files)
 					value.forEach(item =>{
@@ -258,19 +261,16 @@
 						// step1 添加缓存图片 到显示
 						this.currentItemDate.orderImages.push(item.path)
 					})
-					// step2 保存图片
-					var data = {
+					// // step2 保存图片
+					const data = {
 						type: this.currentItemDate.type,
 						images: saveList,
 						fieldsName: this.currentItemDate.fieldName
 					}
 					console.log("data", data)
 					this.$u.api.saveImage(data,this.orderId).then((res) => {
-						if (res.code == 200) {
-						} else {
-							console.log("保存图片异常",res.data.message)
-						}
-					});
+						if (res.code !== 200) console.log("保存图片异常",res.data.message)
+					})
 				}
 				this.takeStatus = false
 			},