Prechádzať zdrojové kódy

commit -m 二手发布

zhengjinyi 4 rokov pred
rodič
commit
e6800894ae

+ 31 - 19
second/pages/form/form-seller.vue

@@ -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>
@@ -272,7 +272,7 @@
 					<p>发布二手商品,采美需要收取您每个商品100元的展示费,展示期为3个月</br>
 						支付完成后,商品会在1-2个工作日内进行审核,审核通过后,商品会立即上线</p>
 					<view class="paybtn">
-						<view class="thegopay gozhofubao" @click.stop="quxiao">取消发布</view>
+						<view class="thegopay gozhofubao" @click.stop="cancel">取消发布</view>
 						<view class="cancel closebtn" @click.stop="gopay">去支付</view>
 					</view>
 				</view>
@@ -315,7 +315,6 @@
 				BrandList:[],
 				isShow:false,
 				GoodsImagesList:[''],
-				vShow_GoodsImages:false,
 				secondParams:{
 					secondHandType:'',//一级分类
 					instrumentType:'',//二手仪器分类
@@ -333,14 +332,16 @@
 					productQuality:'',//商品成色
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
-					authenticationImage:'',//身份验证照片
+					authenticationImage:'',//身份验证图片
+					commitmentImage:'',//承诺函图片
 					dockingPeopleName:'',//采美对接人姓名
 					dockingPeopleMobile:'',//采美对接人手机号
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
 					image:'',//图片
-					file:'',
+					fileName:'',
+					ossName:'',
 					productDetails:'',//商品详细信息
 					source:4//二手发布来源.1:WWW,2:小程序,3:后台,4:协销
 				 },
@@ -402,33 +403,41 @@
 				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.authenticationImage = JSON.parse(res.data).data;
+				})
+			},
+			uploadCommitmentImageFn(event){//上传承诺函图片
 				uploadFileImage().then(res =>{
-					 this.secondParams.authenticationImage= JSON.parse(res.data).data;
+					 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()+',';
@@ -436,6 +445,9 @@
 			removeUserImageFn(index){//删除身份图片
 				this.secondParams.authenticationImage = ''
 			},
+			removeCommitmentImageFn(index){//删除承诺函图片
+				this.secondParams.commitmentImage = ''
+			},
 			getProductType(e){
 			  this.secondParams.secondProductType = e.target.value ;
 			},
@@ -541,8 +553,8 @@
 					return
 				})
 			},
-			quxiao:function(){
-			 this.vShow_secondBj = false;
+			cancel(){
+				this.vShow_secondBj = false;
 			},
 			gopay(){
 				this.MiniWxPayFor()

+ 8 - 29
seller/pages/order/create-order.vue

@@ -6,6 +6,11 @@
 		<choice-address ref="choiceAddress" v-if="isAddress" :addressData="addressData"></choice-address>
 		<!-- 商品 -->
 		<seller-goodsList ref='goods' v-if="isRequest" :goodsData="goodsData" @handleGoodList="handChangeInputGoodsList"></seller-goodsList>
+		<!-- 返佣订单 -->
+		<view class="Rebate" @click="RebateChang" v-if="goodsData.length==1 && secondflag && isDepositFlg">
+			<text class="rebate-title">返佣订单</text>
+			<text class="iconfont" :class="rebatecheck?'icon-yixuanze':'icon-weixuanze'" ></text>
+		</view>
 		<!-- 发票信息 -->
 		<seller-invoice ref="invoice" 
 						v-if="isRequest && isDepositFlg" 
@@ -53,11 +58,6 @@
 							@handleData="claData">
 		</seller-regulations>
 		<regula-alert v-if="isregulaTip" ref="csPhone"></regula-alert>
-		<!-- 返佣订单 -->
-		<view class="Rebate" @click="RebateChang" v-if="goodsData.length==1 && secondflag && isDepositFlg">
-			<text class="rebate-title">返佣订单</text>
-			<text class="iconfont" :class="rebatecheck?'icon-yixuanze':'icon-weixuanze'" ></text>
-		</view>
 		<!-- 底部 -->
 		<view class="footer" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 			<view class="footer-le">
@@ -216,7 +216,6 @@
 								}
 							})
 						})
-						console.log(this.isDepositFlg)
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
 					})
@@ -376,27 +375,7 @@
 						orderInvoice:this.invoiceData //发票信息
 					}
 				this.modalLayer = true;	
-				if(this.rebateFlag == 1){
-					this.$util.modal('','确定该订单为返佣订单吗?点击确定按钮继续提交订单','确定','取消',true,() =>{
-						this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
-							const data = response.data;
-							if(data.code === '1'){
-								this.$util.msg('支付成功',2000,true,'success')
-								setTimeout(() =>{
-									this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
-								},2000)
-							}else{
-								this.$util.msg('订单提交成功',2000,true,'success')
-								setTimeout(()=>{
-									this.$api.redirectTo(`/seller/pages/order/order-details?type=cash&orderID=${data.orderID}`)
-								},2000)
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
-						})
-					})
-					return
-				}else{
+				this.$util.modal('','请仔细确认订单是否为返佣订单后再提交订单','继续提交','再想一想',true,() =>{
 					this.SellerService.SellerCreateOrderSubmit({'params':JSON.stringify(params)}).then(response =>{
 						const data = response.data;
 						if(data.code === '1'){
@@ -413,7 +392,7 @@
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000);
 					})
-				}
+				})
 			},
 			handFreightAlertShow(){//显示邮费弹窗
 				this.isfreightTip = true;
@@ -644,7 +623,7 @@
 		background: #FFFFFF;
 		float: left;
 		margin-bottom: 24rpx;
-		margin-bottom: 24rpx;
+		margin-top: 24rpx;
 		line-height: 86rpx;
 		.rebate-title{
 			float: left;

+ 2 - 2
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{
     // 生产环境

+ 2 - 2
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{
     // 生产环境