commit -m 协销拉机构上线, 二手发布接口联调，

pages/login/binding.vue

@@ -8,7 +8,7 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">手机号</view>
-				<view class="form-text">{{ clubInfo.contractMobile }}</view>
+				<view class="form-text">{{ clubInfo.bindMobile }}</view>
 			</view>
 			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
 				<view class="register-agree">
@@ -28,7 +28,7 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">手机号</view>
-				<view class="form-text">{{ clubInfo.contractMobile }}</view>
+				<view class="form-text">{{ clubInfo.bindMobile }}</view>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">邮箱</view>
@@ -144,6 +144,7 @@
 			console.log(option)
 			uni.setStorageSync('bind_id', option.userId);
 			this.params.userId = option.userId
+			this.isUserIdentity = option.Identity
 		},
 		filters: {
 			FirstFormat:function(type) {//处理金额
@@ -203,12 +204,11 @@
 					this.isRegisterShow = true
 				})
 			},	
-			GetClubUserInfo(){
-				this.UserService.OrganizationUpdateModifyInfo({userId:uni.getStorageSync('bind_id')})
+			GetClubUserInfo(){//查询填写资料
+				this.UserService.UseRregisterTemporaryInfo({id:uni.getStorageSync('bind_id')})
 				.then(response =>{
-					this.isUserIdentity = response.data.user.userIdentity
-					this.clubInfo = response.data.club
-					this.params.mobile = this.clubInfo.contractMobile
+					this.clubInfo = response.data
+					this.params.mobile = this.clubInfo.bindMobile
 					this.params.linkName = this.clubInfo.linkMan
 					if(this.clubInfo.mainProduct){
 						this.medicaCampList = this.ArrayFormat(this.clubInfo.mainProduct)
@@ -218,11 +218,19 @@
 					this.$util.msg(error.msg,2000)
 				})
 			},
-			SubmitRegister(){//微信用户帮机构运营人员
-				this.params.unionId = uni.getStorageSync('unionId')
+			SubmitRegister(){//确认并登录绑定微信
 				this.GetUserProfile()
 			},
-			GetUserProfile(){
+			SellerClubRegister(){//机构注册
+				this.SellerService.SellerClubRegister(this.clubInfo).then(response =>{
+					setTimeout(()=>{
+						this.BindingWechat(this.params)
+					},1000)
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			GetUserProfile(){//获取微信用户信息
 				const self = this
 				wx.getUserProfile({
 					desc: '采美采购商城小程序获取您的信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
@@ -232,7 +240,7 @@
 						self.params.nickName = res.userInfo.nickName
 						self.params.avatarUrl = res.userInfo.avatarUrl
 						self.params.unionId = uni.getStorageSync('unionId')
-						self.BindingWechat(self.params)
+						self.SellerClubRegister()
 					},
 					fail() {
 						self.$util.msg('授权失败', 2000)

second/pages/form/form-seller.vue

@@ -266,17 +266,16 @@
 				 					@onConfirm="onConfirm">
 				 </mpvue-city-picker>
 	          </view>
-			<view class="secondBj thebj"   v-show="vShow_secondBj" :class="vShow_secondBj?'show':''">
-				<view class="bjmain theresult">
-					<span class="title">发布提示</span>
-					<p>发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月</br>
-						支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线</p>
-					<view class="paybtn">
-						<view class="thegopay gozhofubao" @click.stop="cancel">取消发布</view>
-						<view class="cancel closebtn" @click.stop="gopay">去支付</view>
-					</view>
+		<view class="secondBj thebj"   v-show="PopupShow" :class="PopupShow ? 'show':''">
+			<view class="bjmain theresult">
+				<text class="title">发布提示</text>
+				<text class="content"> {{ tipsContentText }} </text>
+				<view class="paybtn">
+					<view class="btn cancel" @click.stop="cancelButtonFn">{{ cancelButtonText  }}</view>
+					<view class="btn confirm" @click.stop="confirmButtonFn">{{ confirmButtonText }}</view>
 				</view>
 			</view>
+		</view>
 		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 	</view>
 </template>
@@ -314,7 +313,7 @@
 				],
 				BrandList:[],
 				isShow:false,
-				GoodsImagesList:[''],
+				GoodsImagesList:['https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg'],
 				secondParams:{
 					secondHandType:'',//一级分类
 					instrumentType:'',//二手仪器分类
@@ -332,14 +331,14 @@
 					productQuality:'',//商品成色
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
-					authenticationImage:'',//身份验证图片
-					commitmentImage:'',//承诺函图片
+					authenticationImage:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//身份验证图片
+					commitmentImage:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//承诺函图片
 					dockingPeopleName:'',//采美对接人姓名
 					dockingPeopleMobile:'',//采美对接人手机号
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
-					image:'',//图片
+					image:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//图片
 					fileName:'',
 					ossName:'',
 					productDetails:'',//商品详细信息
@@ -355,7 +354,11 @@
 				brandname:'请选择品牌名称',
 				checkbox:false,
 				shoplogoTwo:false,
-				vShow_secondBj:false,
+				PopupShow:false,
+				tipsContentText:'发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线',
+				cancelButtonText:'取消发布',
+				confirmButtonText:'去支付',
+				isButtonsType:0,
 				resultBj:false,
 				vShow_detailTalkFlag:false,
 				playid:'',
@@ -428,16 +431,16 @@
 			},
 			uploadCommitmentFile(){//上传承诺函文件
 				uploadFilePdf().then(res =>{
-					console.log(res.data)
 					let data =  JSON.parse(res.data).data
-					this.secondParams.fileName = data.fileName;
+					this.secondParams.fileName = uni.getStorageSync('fileName');
 					this.secondParams.ossName = data.ossName;
+					console.log('fileName',this.secondParams.fileName)
+					console.log('ossName',this.secondParams.ossName)
 				})
 			},
 			deleteCommitmentFile(){//删除承诺函文件
 				this.secondParams.fileName = ''
 			},
-			
 			removeGoodsImagesFn(index){//删除商品图片
 				this.GoodsImagesList.splice(index,1);
 				this.secondParams.image =this.GoodsImagesList.toString()+',';
@@ -544,8 +547,31 @@
 					return
 				}
 				console.log(this.secondParams)
-				this.SecondService.SecondHandProduct(this.secondParams).then(res=>{ //提交发布
-					this.vShow_secondBj = true;
+				if(this.secondParams.authenticationImage == ''){
+					this.PopupShow = true
+					this.tipsContentText = '上传身份验证照片。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.cancelButtonText = '继续发布'
+					this.confirmButtonText = '去上传'
+					this.isButtonsType = 1
+					return;
+				}
+				if(this.secondParams.commitmentImage == '' || this.secondParams.ossName == ''){
+					this.PopupShow = true
+					this.tipsContentText = '上传二手出让承诺函。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.cancelButtonText = '继续发布'
+					this.confirmButtonText = '去上传'
+					this.isButtonsType = 1
+					return;
+				}
+				this.SecondHandProduct(this.secondParams)
+			},
+			SecondHandProduct(params){//提交发布
+				this.SecondService.SecondHandProduct(params).then(res=>{ 
+					this.PopupShow = true;
+					this.tipsContentText = '发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线'
+					this.cancelButtonText = '取消发布'
+					this.confirmButtonText = '去支付'
+					this.isButtonsType = 2
 					this.playid= res.data;
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -553,12 +579,26 @@
 					return
 				})
 			},
-			cancel(){
-				this.vShow_secondBj = false;
+			cancelButtonFn(){//弹窗操作按钮
+				switch(this.isButtonsType){
+					case 1:
+						this.SecondHandProduct(this.secondParams)
+						break;
+					case 2:	
+						this.PopupShow = false;
+						break;
+				}
 			},
-			gopay(){
-				this.MiniWxPayFor()
-				this.vShow_secondBj = false;
+			confirmButtonFn(){//弹窗操作按钮
+				switch(this.isButtonsType){
+					case 1:
+						this.PopupShow = false;
+						break;
+					case 2:	
+						this.MiniWxPayFor()
+						this.PopupShow = false;
+						break;
+				}
 			},
 			MiniWxPayFor(){
 				authorize.getCode('weixin').then(wechatcode =>{
@@ -983,30 +1023,36 @@
 		font-weight: bold;
 		border-bottom: 2rpx solid #efefef;
 	}
-	.theresult p{
+	.theresult .content{
 		padding: 30rpx 52rpx;
 		line-height: 48rpx;
 		color: #666666;
 		font-size: 30rpx;
+		display: block;
 	}
-	.paybtn view{
-		width: 290rpx;
+	.paybtn{
+		width: 100%;
 		height: 90rpx;
-		text-align: center;
-		line-height: 90rpx;
-		font-size: 30rpx;
-		display: inline-block;
-	}
-	.paybtn .cancel{
-		background-image: linear-gradient(270deg, #f28f31 0%, #e15616 100%);
-		border-radius: 0rpx 0rpx 32rpx 0rpx;
-		color: #fff;
-		
-	}
-	.paybtn .thegopay{
-		background-color: #efefef;
-		border-radius: 0rpx 0rpx 0rpx 32rpx;
-		color: #999999;
+		float: left;
+		.btn{
+			width: 50%;
+			height: 90rpx;
+			text-align: center;
+			line-height: 90rpx;
+			font-size: 30rpx;
+			display: inline-block;
+			float: left;
+			&.cancel{
+				background-color: #efefef;
+				border-radius: 0rpx 0rpx 0rpx 32rpx;
+				color: #999999;
+			}
+			&.confirm{
+				background-image: linear-gradient(270deg, #f28f31 0%, #e15616 100%);
+				border-radius: 0rpx 0rpx 32rpx 0rpx;
+				color: #fff;
+			}
+		}
 	}
 	.icon-wenhao{
 		color: #1890f9;

second/pages/form/form.vue

@@ -266,17 +266,16 @@
 				 					@onConfirm="onConfirm">
 				 </mpvue-city-picker>
 	          </view>
-			<view class="secondBj thebj"   v-show="vShow_secondBj" :class="vShow_secondBj?'show':''">
-				<view class="bjmain theresult">
-					<span class="title">发布提示</span>
-					<p>发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月</br>
-						支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线</p>
-					<view class="paybtn">
-						<view class="thegopay gozhofubao" @click.stop="cancel">取消发布</view>
-						<view class="cancel closebtn" @click.stop="gopay">去支付</view>
-					</view>
+		<view class="secondBj thebj"   v-show="PopupShow" :class="PopupShow ? 'show':''">
+			<view class="bjmain theresult">
+				<text class="title">发布提示</text>
+				<text class="content"> {{ tipsContentText }} </text>
+				<view class="paybtn">
+					<view class="btn cancel" @click.stop="cancelButtonFn">{{ cancelButtonText  }}</view>
+					<view class="btn confirm" @click.stop="confirmButtonFn">{{ confirmButtonText }}</view>
 				</view>
 			</view>
+		</view>
 		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
 	</view>
 </template>
@@ -314,7 +313,7 @@
 				],
 				BrandList:[],
 				isShow:false,
-				GoodsImagesList:[''],
+				GoodsImagesList:['https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg'],
 				secondParams:{
 					secondHandType:'',//一级分类
 					instrumentType:'',//二手仪器分类
@@ -332,14 +331,14 @@
 					productQuality:'',//商品成色
 					contactName:'',//联系人
 					contactMobile:'',//联系方式
-					authenticationImage:'',//身份验证图片
-					commitmentImage:'',//承诺函图片
+					authenticationImage:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//身份验证图片
+					commitmentImage:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//承诺函图片
 					dockingPeopleName:'',//采美对接人姓名
 					dockingPeopleMobile:'',//采美对接人手机号
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
-					image:'',//图片
+					image:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//图片
 					fileName:'',
 					ossName:'',
 					productDetails:'',//商品详细信息
@@ -355,7 +354,11 @@
 				brandname:'请选择品牌名称',
 				checkbox:false,
 				shoplogoTwo:false,
-				vShow_secondBj:false,
+				PopupShow:false,
+				tipsContentText:'发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线',
+				cancelButtonText:'取消发布',
+				confirmButtonText:'去支付',
+				isButtonsType:0,
 				resultBj:false,
 				vShow_detailTalkFlag:false,
 				playid:'',
@@ -428,16 +431,16 @@
 			},
 			uploadCommitmentFile(){//上传承诺函文件
 				uploadFilePdf().then(res =>{
-					console.log(res.data)
 					let data =  JSON.parse(res.data).data
-					this.secondParams.fileName = data.fileName;
+					this.secondParams.fileName = uni.getStorageSync('fileName');
 					this.secondParams.ossName = data.ossName;
+					console.log('fileName',this.secondParams.fileName)
+					console.log('ossName',this.secondParams.ossName)
 				})
 			},
 			deleteCommitmentFile(){//删除承诺函文件
 				this.secondParams.fileName = ''
 			},
-			
 			removeGoodsImagesFn(index){//删除商品图片
 				this.GoodsImagesList.splice(index,1);
 				this.secondParams.image =this.GoodsImagesList.toString()+',';
@@ -544,8 +547,31 @@
 					return
 				}
 				console.log(this.secondParams)
-				this.SecondService.SecondHandProduct(this.secondParams).then(res=>{ //提交发布
-					this.vShow_secondBj = true;
+				if(this.secondParams.authenticationImage == ''){
+					this.PopupShow = true
+					this.tipsContentText = '上传身份验证照片。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.cancelButtonText = '继续发布'
+					this.confirmButtonText = '去上传'
+					this.isButtonsType = 1
+					return;
+				}
+				if(this.secondParams.commitmentImage == '' || this.secondParams.ossName == ''){
+					this.PopupShow = true
+					this.tipsContentText = '上传二手出让承诺函。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.cancelButtonText = '继续发布'
+					this.confirmButtonText = '去上传'
+					this.isButtonsType = 1
+					return;
+				}
+				this.SecondHandProduct(this.secondParams)
+			},
+			SecondHandProduct(params){//提交发布
+				this.SecondService.SecondHandProduct(params).then(res=>{ 
+					this.PopupShow = true;
+					this.tipsContentText = '发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线'
+					this.cancelButtonText = '取消发布'
+					this.confirmButtonText = '去支付'
+					this.isButtonsType = 2
 					this.playid= res.data;
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -553,12 +579,26 @@
 					return
 				})
 			},
-			cancel(){
-				this.vShow_secondBj = false;
+			cancelButtonFn(){//弹窗操作按钮
+				switch(this.isButtonsType){
+					case 1:
+						this.SecondHandProduct(this.secondParams)
+						break;
+					case 2:	
+						this.PopupShow = false;
+						break;
+				}
 			},
-			gopay(){
-				this.MiniWxPayFor()
-				this.vShow_secondBj = false;
+			confirmButtonFn(){//弹窗操作按钮
+				switch(this.isButtonsType){
+					case 1:
+						this.PopupShow = false;
+						break;
+					case 2:	
+						this.MiniWxPayFor()
+						this.PopupShow = false;
+						break;
+				}
 			},
 			MiniWxPayFor(){
 				authorize.getCode('weixin').then(wechatcode =>{
@@ -983,30 +1023,36 @@
 		font-weight: bold;
 		border-bottom: 2rpx solid #efefef;
 	}
-	.theresult p{
+	.theresult .content{
 		padding: 30rpx 52rpx;
 		line-height: 48rpx;
 		color: #666666;
 		font-size: 30rpx;
+		display: block;
 	}
-	.paybtn view{
-		width: 290rpx;
+	.paybtn{
+		width: 100%;
 		height: 90rpx;
-		text-align: center;
-		line-height: 90rpx;
-		font-size: 30rpx;
-		display: inline-block;
-	}
-	.paybtn .cancel{
-		background-image: linear-gradient(270deg, #f28f31 0%, #e15616 100%);
-		border-radius: 0rpx 0rpx 32rpx 0rpx;
-		color: #fff;
-		
-	}
-	.paybtn .thegopay{
-		background-color: #efefef;
-		border-radius: 0rpx 0rpx 0rpx 32rpx;
-		color: #999999;
+		float: left;
+		.btn{
+			width: 50%;
+			height: 90rpx;
+			text-align: center;
+			line-height: 90rpx;
+			font-size: 30rpx;
+			display: inline-block;
+			float: left;
+			&.cancel{
+				background-color: #efefef;
+				border-radius: 0rpx 0rpx 0rpx 32rpx;
+				color: #999999;
+			}
+			&.confirm{
+				background-image: linear-gradient(270deg, #f28f31 0%, #e15616 100%);
+				border-radius: 0rpx 0rpx 32rpx 0rpx;
+				color: #fff;
+			}
+		}
 	}
 	.icon-wenhao{
 		color: #1890f9;

seller/pages/login/register-general.vue

@@ -33,7 +33,7 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">手机号</view>
-				<view class="form-text">{{ clubInfo.contractMobile }}</view>
+				<view class="form-text">{{ clubInfo.bindMobile }}</view>
 			</view>
 			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
 				<view class="register-row">
@@ -116,8 +116,7 @@
 					this.$util.msg('请勾选同意协议',2000);
 					return
 				}
-				this.SellerService.SellerClubRegister(this.params).then(response =>{
-					this.$util.msg('注册成功',2000);
+				this.SellerService.SellerClubTemporary(this.params).then(response =>{
 					this.clubInfo.userId = response.data
 					setTimeout(()=>{
 						this.isRegisterStep = false
@@ -127,10 +126,10 @@
 					this.$util.msg(error.msg,2000);
 				})
 			},
-			GetClubUserInfo(userId){
-				this.UserService.OrganizationUpdateModifyInfo({userId:userId})
+			GetClubUserInfo(id){//回显数据
+				this.UserService.UseRregisterTemporaryInfo({id:id})
 				.then(response =>{
-					this.clubInfo = response.data.club
+					this.clubInfo = response.data
 				})
 				.catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -155,7 +154,7 @@
 		    }
 			return {
 			  title: '您已注册采美365网，请点击登录',
-			  path: `/pages/login/binding?userId=${this.clubInfo.userId}`,
+			  path: `/pages/login/binding?userId=${this.clubInfo.userId}&Identity=4`,
 			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}
 		},

seller/pages/login/register-member.vue

@@ -167,7 +167,7 @@
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">手机号</view>
-				<view class="form-text">{{ clubInfo.contractMobile }}</view>
+				<view class="form-text">{{ clubInfo.bindMobile }}</view>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">邮箱</view>
@@ -288,9 +288,9 @@
 					cityId:'',			//区ID
 					provinceId:'',		//区ID
 					addressDetail: '',	//地址
-					businessLicense:'', //营业执照
-					shopPhoto:'',		//门头照
-					medicalPracticeLicense:'',//资质
+					businessLicense:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg', //营业执照
+					shopPhoto:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',		//门头照
+					medicalPracticeLicense:'https://dss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2306696130,3636777462&fm=26&gp=0.jpg',//资质
 					firstClubType:1, //1医美；2生美
 					secondClubType:1, //1诊所；2门诊；3医院 
 					department:'',//科室
@@ -420,8 +420,7 @@
 					this.$util.msg('请勾选同意协议',2000);
 					return
 				}
-				this.SellerService.SellerClubRegister(this.params).then(response =>{
-					this.$util.msg('提交成功',2000);
+				this.SellerService.SellerClubTemporary(this.params).then(response =>{
 					this.clubInfo.userId = response.data
 					setTimeout(()=>{
 						this.isRegisterStep = false
@@ -431,10 +430,10 @@
 					this.$util.msg(error.msg,2000);
 				})
 			},
-			GetClubUserInfo(userId){
-				this.UserService.OrganizationUpdateModifyInfo({userId:userId})
+			GetClubUserInfo(id){
+				this.UserService.UseRregisterTemporaryInfo({id:id})
 				.then(response =>{
-					this.clubInfo = response.data.club
+					this.clubInfo = response.data
 					this.showMainProductList =  this.setNewMainpro(this.clubInfo.mainProduct)
 				})
 				.catch(error =>{
@@ -616,7 +615,7 @@
 		    }
 			return {
 			  title: '您已注册采美365网，请点击登录',
-			  path: `/pages/login/binding?userId=${this.clubInfo.userId}`,
+			  path: `/pages/login/binding?userId=${this.clubInfo.userId}&Identity=2`,
 			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}
 		},

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

@@ -69,10 +69,11 @@ export function uploadFilePdf() {
 				// tempFilePath可以作为img标签的src属性显示图片
 				const tempFilePaths = res.tempFiles
 				const size = tempFilePaths[0].size;
-				const filename = res.tempFiles[0].filename;
+				const filename = res.tempFiles[0].name;
 				const newfilename = filename + ""; 
-				const url = requestUrl+'/file/upload' ;
-				console.log('url',url)
+				const url = requestUrl+'/file/upload';
+				uni.setStorageSync('fileName',filename)
+				console.log('filename',filename)
 				console.log('size',size)
 				console.log('tempFilePaths',tempFilePaths)
 				// if (size > 10240000 || newfilename.indexOf(".pdf")==-1){ //限制了文件的大小和具体文件类型

services/sellse.service.js

@@ -28,6 +28,18 @@ export default class SellerService {
 	GetSellerHome (data = {}) {
 		return this.AjaxService.get({ url:'/seller/home', data, isLoading: true })
 	}
+	/**
+	 *@协销拉机构上线(资料填写)
+	 *@param userID 协销ID
+	 */
+	SellerClubTemporary (data={}){
+		return this.AjaxService.post({ 
+			url:'/user/register/club/temporary', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
+	}
 	/**
 	 *@协销拉机构上线
 	 *@param userID 协销ID

services/user.service.js

@@ -67,6 +67,15 @@ export default class UserService {
 			isHost:true
 		})
 	}
+	/* 协销拉机构上线(查询暂时数据)*/
+	UseRregisterTemporaryInfo (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/user/register/temporary/data',
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
 	/* 机构升级会员机构 */
 	OrganizationRegister (data = {}) {
 		return this.AjaxService.post({