Merge branch 'dev' into chenxuelian

pages/ideasAndNeeds/ideasAndNeeds.vue

@@ -105,8 +105,10 @@
 </template>
 
 <script>
-import { apiService } from '../../service/request'
-import login from '../my/login/login.vue'
+	import {
+		apiService
+	} from '../../service/request'
+	import login from '../my/login/login.vue'
 	export default {
 		components: {
 			login
@@ -152,9 +154,9 @@ import login from '../my/login/login.vue'
 		},
 		onLoad(options) {
 			console.log(options)
-			if (options.index == 0) {
+			if (options.index == 1) {
 				this.tabCurrent = 0
-			} else if (options.index == 1) {
+			} else if (options.index == 2) {
 				this.tabCurrent = 1
 			}
 			if (!uni.getStorageSync('token') || uni.getStorageSync('token').length === 0) {
@@ -230,7 +232,7 @@ import login from '../my/login/login.vue'
 			},
 			getPositionValue(data) {
 				this.showPositionPicker = false
-				
+
 				const obj = this.positionPickerList.find(item => {
 					return item.name === data.value[0]
 				})
@@ -238,7 +240,7 @@ import login from '../my/login/login.vue'
 				if (obj) {
 					this.needsPublishForm.tagids = obj.id
 				}
-				
+
 			},
 			getCategoryValue(data) {
 				this.showCategoryPicker = false
@@ -322,13 +324,15 @@ import login from '../my/login/login.vue'
 					http.open('GET', blodurl, true);
 					http.responseType = 'blob';
 					http.onload = function(e) {
-					    if (this.status == 200 || this.status === 0) {
-						// console.log('blod数据',this.response);
-						// 在将blod数据转为file
-						let files = new window.File([this.response], 'file.name', { type: 'image' });
-						// console.log('blod数据转换file',files);
-						resolve(files);
-				            }
+						if (this.status == 200 || this.status === 0) {
+							// console.log('blod数据',this.response);
+							// 在将blod数据转为file
+							let files = new window.File([this.response], 'file.name', {
+								type: 'image'
+							});
+							// console.log('blod数据转换file',files);
+							resolve(files);
+						}
 					};
 					http.send();
 				});