Merge remote-tracking branch 'remotes/origin/zhoucong' into develop

pages/vlog/uploadPictures/uploadPictures.vue

@@ -54,12 +54,9 @@
 			// 监听从裁剪页发布的事件，获得裁剪结果
 			uni.$on('uAvatarCropper', path => {
 				var that = this
-				var url = ""
-				if (process.env.NODE_ENV === 'development') { //开发环境
-					url = "http://192.168.0.213:7888/"
-				} else {
-					url = "http://manager.pangdly.com/"
-				}
+				var	url = "http://manager.pangdly.com/"
+				
+				
 				uni.uploadFile({ // s上传图片
 					url: url + 'upload/file/newUpload',
 					filePath: path,