commit -m 提交

second/pages/form/form.vue

@@ -137,13 +137,13 @@
 						<view class="label-im">身份验证照片</view>
 						<view class="label-em">(个人请上传身份证正面照片；机构请上传营业执照照片)</view>
 						<view class="release-input upload image uploadGoodsImages" >
-							<view class="upload-file" v-if="secondParams.userImage == ''">
+							<view class="upload-file" v-if="secondParams.authenticationImage == ''">
 								<i class="iconfont icon-shangchuantupian"></i>
 								<text class="add-text">验证照片</text>
 								<view ref="goodsImages" class="input-file"  @click="uploadUserImageFn"></view>
 							</view>
 							<view class="upload-file" v-else>
-								<image :src="secondParams.userImage" alt="" class="upload-img" ></image>
+								<image :src="secondParams.authenticationImage" alt="" class="upload-img" ></image>
 								<i class=" del iconfont icon-shanchu1" @click="removeUserImageFn"></i>
 							</view>
 						</view>
@@ -209,11 +209,11 @@
 						</view>
 						<view class="row">
 							<view class="label">二手出让承诺函文件</view>
-							<view class="spacing file-none" v-if="secondParams.file">
+							<view class="spacing file-none" v-if="secondParams.fileName == ''">
 								<view class="file-none-button" @click="uploadCommitmentFile">上传</view>
 							</view> 
 							<view class="spacing file-text" v-else>
-								<text class="file-text-em">奥术大师大所大所大所大所大所大多</text>
+								<text class="file-text-em">{{ secondParams.fileName }}</text>
 								<i class=" del iconfont icon-shanchu1" @click="deleteCommitmentFile"></i>
 							</view>
 						</view>
@@ -221,14 +221,14 @@
 							<view class="label-im">二手出让承诺函图片</view>
 							<view class="label-em">(若不方便上传承诺函文件，可对承诺函进行拍照或者截图，再上传图片)</view>
 							<view class="release-input upload image uploadGoodsImages" >
-								<view class="upload-file" v-if="secondParams.userImage == ''">
+								<view class="upload-file" v-if="secondParams.commitmentImage == ''">
 									<i class="iconfont icon-shangchuantupian"></i>
 									<text class="add-text">承诺函图片</text>
-									<view ref="goodsImages" class="input-file"  @click="uploadUserImageFn"></view>
+									<view ref="goodsImages" class="input-file"  @click="uploadCommitmentImageFn"></view>
 								</view>
 								<view class="upload-file" v-else>
-									<image :src="secondParams.userImage" alt="" class="upload-img" ></image>
-									<i class=" del iconfont icon-shanchu1" @click="removeUserImageFn"></i>
+									<image :src="secondParams.commitmentImage" alt="" class="upload-img" ></image>
+									<i class=" del iconfont icon-shanchu1" @click="removeCommitmentImageFn"></i>
 								</view>
 							</view>
 						</view>
@@ -332,14 +332,16 @@
 					productQuality:'',//商品成色
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
-					userImage:'',
+					authenticationImage:'',//身份验证图片
+					commitmentImage:'',//承诺函图片
 					dockingPeopleName:'',//采美对接人姓名
 					dockingPeopleMobile:'',//采美对接人手机号
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
 					image:'',//图片
-					file:'',
+					fileName:'',
+					ossName:'',
 					productDetails:'',//商品详细信息
 					source:2//二手发布来源.1:WWW,2:小程序,3:后台,4:协销
 				 },
@@ -401,39 +403,50 @@
 				this.secondParams.instrumentType = e.target.value.toString();
 			},
 			Detailed(){
-			this.vShow_detailTalkFlag = !this.vShow_detailTalkFlag;
-			 if(this.vShow_detailTalkFlag){
-				 this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
-			  }else {
-				this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
-			  }
+				this.vShow_detailTalkFlag = !this.vShow_detailTalkFlag;
+				if(this.vShow_detailTalkFlag){
+					this.secondParams.detailTalkFlag = 2 ;//启用价格详聊
+				}else {
+					this.secondParams.detailTalkFlag = 1 ;//不启用价格详聊
+				}
 			},
-			 uploadGoodsImagesFn(event){//上传商品图片
+			uploadGoodsImagesFn(event){//上传商品图片
 				uploadFileImage().then(res =>{
 					 this.GoodsImagesList.push(JSON.parse(res.data).data);
 					 this.secondParams.image =this.GoodsImagesList.toString()+',';
 				})
 			},
-			 uploadUserImageFn(event){//上传身份图片
+			uploadUserImageFn(event){//上传身份图片
 				uploadFileImage().then(res =>{
-					 this.secondParams.userImage= JSON.parse(res.data).data;
+					 this.secondParams.authenticationImage = JSON.parse(res.data).data;
+				})
+			},
+			uploadCommitmentImageFn(event){//上传承诺函图片
+				uploadFileImage().then(res =>{
+					 this.secondParams.commitmentImage = JSON.parse(res.data).data;
 				})
 			},
 			uploadCommitmentFile(){//上传承诺函文件
 				uploadFilePdf().then(res =>{
 					console.log(res.data)
-					this.secondParams.file = JSON.parse(res.data).data;
+					let data =  JSON.parse(res.data).data
+					this.secondParams.fileName = data.fileName;
+					this.secondParams.ossName = data.ossName;
 				})
 			},
 			deleteCommitmentFile(){//删除承诺函文件
-				this.secondParams.file = ''
+				this.secondParams.fileName = ''
 			},
+			
 			removeGoodsImagesFn(index){//删除商品图片
 				this.GoodsImagesList.splice(index,1);
 				this.secondParams.image =this.GoodsImagesList.toString()+',';
 			},
 			removeUserImageFn(index){//删除身份图片
-				this.secondParams.userImage = ''
+				this.secondParams.authenticationImage = ''
+			},
+			removeCommitmentImageFn(index){//删除承诺函图片
+				this.secondParams.commitmentImage = ''
 			},
 			getProductType(e){
 			  this.secondParams.secondProductType = e.target.value ;

services/ajax.env.js

@@ -2,10 +2,10 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
 	// URL_CONFIG = 'http://192.168.2.68:8008'	 //涛涛联调地址
-	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
+	URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
 	// URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境

services/config.env.js

@@ -2,8 +2,8 @@ let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	URL_CONFIG = 'https://core-b.caimei365.com'
+	URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
+	// URL_CONFIG = 'https://core-b.caimei365.com'
 	// URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境

services/public.js

@@ -61,32 +61,48 @@ export function uploadFileImage() {
  *上传文件
  */
 export function uploadFilePdf() {
-	console.log('sssssssss')
 	return new Promise(function(resolve,reject) {
 		wx.chooseMessageFile({
-		  count: 1,
-		  type: 'file',
-		  success (res) {
-		    // tempFilePath可以作为img标签的src属性显示图片
-		    const tempFilePaths = res.tempFiles
-			const uploadTask = uni.uploadFile({
-				url : requestUrl+'/file/upload',
-				filePath: tempFilePaths[0],
-				name: 'file',
-				header: {
-				    "Content-Type": "multipart/form-data",
-				},
-				formData: {
-					'file': 'test'
-				},
-				success: function (res) {
-					resolve(res);
-				},
-				error : function(e){
-					reject(res)
-				}
-			})
-		  }
+			count: 1,
+			type: 'file',
+			success (res) {
+				// tempFilePath可以作为img标签的src属性显示图片
+				const tempFilePaths = res.tempFiles
+				const size = tempFilePaths[0].size;
+				const filename = res.tempFiles[0].filename;
+				const newfilename = filename + ""; 
+				const url = requestUrl+'/file/upload' ;
+				console.log('url',url)
+				console.log('size',size)
+				console.log('tempFilePaths',tempFilePaths)
+				// if (size > 10240000 || newfilename.indexOf(".pdf")==-1){ //限制了文件的大小和具体文件类型
+				// 	uni.showToast({
+				// 		title: '文件大小不能超过10MB,格式必须为pdf！',
+				// 		icon:'none',
+				// 		mask:true,
+				// 		duration: 2000
+				// 	});
+				// }
+				wx.uploadFile({
+					url : url,
+					filePath: tempFilePaths[0].path,
+					name: 'file',
+					header: {
+					    "Content-Type": "multipart/form-data",
+					},
+					formData: {
+						'user': 'test'
+					},
+					success: function (res) {
+						console.log(res)
+						resolve(res);
+					},
+					error : function(err){
+						console.log('err',err)
+						reject(err)
+					}
+				})
+			}
 		})
 	});
 }