commit - m 5月小需求测试优化

common/css/iconfont.scss

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1519039 */
-  src: url('//at.alicdn.com/t/font_1519039_2076ybzdg2q.woff2?t=1621307790277') format('woff2'),
-       url('//at.alicdn.com/t/font_1519039_2076ybzdg2q.woff?t=1621307790277') format('woff'),
-       url('//at.alicdn.com/t/font_1519039_2076ybzdg2q.ttf?t=1621307790277') format('truetype');
+  src: url('//at.alicdn.com/t/font_1519039_3c0oaod7ck2.woff2?t=1622427548260') format('woff2'),
+       url('//at.alicdn.com/t/font_1519039_3c0oaod7ck2.woff?t=1622427548260') format('woff'),
+       url('//at.alicdn.com/t/font_1519039_3c0oaod7ck2.ttf?t=1622427548260') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-daizhucejigou:before {
+  content: "\e72b";
+}
+
 .icon-shangpin:before {
   content: "\e727";
 }

components/cm-module/cm-seller/user.vue

@@ -86,7 +86,7 @@
 					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
 						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
 						<text class="cell-tit">{{item.name}}</text>
-						<text 	v-if="index == 0 && orderNum >0"
+						<text 	v-if="index == 1 && orderNum >0"
 								class="uni-badge uni-badge-error uni-small uni-badge--small icon-num">
 								{{orderNum == 99 ? '99+' : orderNum}}
 						</text>
@@ -139,7 +139,7 @@
 				refundsCount:'', //退货/款角标
 				institutionsCont:120,
 				firstList:[
-					{name:'待注册机构',path:'/seller/pages/club/stayClub-list',icon:'icon-jigouliebiao'},
+					{name:'待注册机构',path:'/seller/pages/club/stayClub-list',icon:'icon-daizhucejigou'},
 					{name:'机构列表',path:'/seller/pages/club/list',icon:'icon-jigouliebiao'},
 					{name:'拉机构上线',path:'/seller/pages/login/register-select',icon:'icon-lajigoushangxian'},
 					{name:'邀请运营人员',path:'/seller/pages/club/allClub-list',icon:'icon-yaoqingyunyingrenyuan'}

main.js

@@ -35,7 +35,6 @@ Vue.prototype.$getStorage = function(key){
 /**
  * 友盟+小程序统计
  */
-
 // if(process.env.NODE_ENV != 'development'){
 	// #ifdef MP-WEIXIN
 	uma.init({

pages/login/binding.vue

@@ -1,111 +1,121 @@
 
 <template>
 	<view class="register" v-show="isRegisterShow">
-		<view class="register-main" v-if="isUserIdentity == 4">
-			<view class="main-form-item">
-				<view class="form-label">联系人</view>
-				<view class="form-text"> {{ clubInfo.linkMan }} </view>
-			</view>
-			<view class="main-form-item">
-				<view class="form-label">手机号</view>
-				<view class="form-text">{{ clubInfo.bindMobile }}</view>
+		<template v-if="isInvalid">
+			<view class="cart-content empty">
+				<view  class="empty-container">
+					<image class="empty-container-image" :src="productNoneImage" mode="aspectFit"></image>
+					<text class="error-text">页面已失效~</text>
+				</view>
 			</view>
-			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
-				<view class="register-agree">
-					<view class="agree-text">
-						提示：采美销售顾问已帮您填写好了注册信息，请确认信息是否正确。点击确认并登录按钮将为您自动生成账号进行登录，并绑定您的微信。
-					</view>
+		</template>
+		<template v-else>
+			<view class="register-main clearfix" v-if="isUserIdentity == 4">
+				<view class="main-form-item">
+					<view class="form-label">联系人</view>
+					<view class="form-text"> {{ clubInfo.linkMan }} </view>
 				</view>
-				<view class="register-row">
-					<view class="register-btn sub" @click.stop="SubmitRegister">确认并登录</view>
+				<view class="main-form-item">
+					<view class="form-label">手机号</view>
+					<view class="form-text">{{ clubInfo.bindMobile }}</view>
 				</view>
-			</view>
-		</view>
-		<view class="register-main" v-if="isUserIdentity == 2">
-			<view class="main-form-item">
-				<view class="form-label">联系人</view>
-				<view class="form-text"> {{ clubInfo.linkMan }} </view>
-			</view>
-			<view class="main-form-item">
-				<view class="form-label">手机号</view>
-				<view class="form-text">{{ clubInfo.bindMobile }}</view>
-			</view>
-			<view class="main-form-item">
-				<view class="form-label">邮箱</view>
-				<view class="form-text">{{ clubInfo.contractEmail ? clubInfo.contractEmail : '' }}</view>
-			</view>
-			<view class="main-form-item">
-				<view class="form-label">机构名称</view>
-				<view class="form-text">{{ clubInfo.name }}</view>
-			</view>
-			<view class="main-form-item">
-				<view class="form-label">机构简称</view>
-				<view class="form-text">{{ clubInfo.shortName }}</view>
-			</view>
-			<view class="main-form-item">
-				<view class="form-label">机构地址</view>
-				<view class="form-input">{{ clubInfo.provincialAddress }}</view>		
-			</view>
-			<view class="main-form-item">
-				<view class="form-textarea">{{ clubInfo.address }}</view>		
-			</view>
-			<view class="main-form-item">
-				<view class="form-label lang">营业执照编号</view>
-				<view class="form-input lang">{{ clubInfo.socialCreditCode }}</view>		
-			</view>
-			<view class="main-form-item file">
-				<view class="main-form-upload">
-					<view class="label">营业执照</view>
-					<view class="upload-picture">
-						<view class="upload-image"><image :src="clubInfo.businessLicense" mode="" @click="ShowPreviewImage(1)"></image></view>
+				<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
+					<view class="register-agree">
+						<view class="agree-text">
+							提示：采美销售顾问已帮您填写好了注册信息，请确认信息是否正确。点击确认并登录按钮将为您自动生成账号进行登录，并绑定您的微信。
+						</view>
+					</view>
+					<view class="register-row">
+						<view class="register-btn sub" :class="isSubLoading ? 'disabled' : ''" @click.stop="SubmitRegister">确认并登录</view>
 					</view>
 				</view>
-				<view class="main-form-upload">
-					<view class="label">门头照</view>
-					<view class="upload-picture">
-						<view class="upload-image"><image :src="clubInfo.shopPhoto" mode=""  @click="ShowPreviewImage(2)"></image></view>
-					</view>	
+			</view>
+			<view class="register-main clearfix" v-if="isUserIdentity == 2">
+				<view class="main-form-item">
+					<view class="form-label">联系人</view>
+					<view class="form-text"> {{ clubInfo.linkMan }} </view>
 				</view>
-			</view>	
-			<view class="main-form-item">
-				<view class="form-label">机构类型</view>
-				<view class="form-text">
-					{{ clubInfo.firstClubType | FirstFormat }}
-					-
-					{{ clubInfo.secondClubType | TwoFormat }}
+				<view class="main-form-item">
+					<view class="form-label">手机号</view>
+					<view class="form-text">{{ clubInfo.bindMobile }}</view>
 				</view>
-			</view>
-			<view class="main-form-item file" v-if="clubInfo.firstClubType == 1">
-				<view class="main-form-upload">
-					<view class="label">资质</view>
-					<view class="upload-picture">
-						<view class="upload-image"><image :src="clubInfo.medicalPracticeLicense" mode=""  @click="ShowPreviewImage(2)"></image></view>
-					</view>	
+				<view class="main-form-item">
+					<view class="form-label">邮箱</view>
+					<view class="form-text">{{ clubInfo.contractEmail ? clubInfo.contractEmail : '' }}</view>
 				</view>
-			</view>	
-			<view class="main-form-item" v-if="clubInfo.secondClubType == 2">
-				<view class="form-label">科室</view>
-				<view class="form-text">{{ clubInfo.department }}</view>
-			</view>
-			<view class="main-form-item none">
-				<view class="form-label none">主营内容</view>
-				<view class="form-checkbox-group">
-					<view class="form-table-item" v-for="(item, index) in medicaCampList" :key="index">
-						{{ item.name }}
+				<view class="main-form-item">
+					<view class="form-label">机构名称</view>
+					<view class="form-text">{{ clubInfo.name }}</view>
+				</view>
+				<view class="main-form-item">
+					<view class="form-label">机构简称</view>
+					<view class="form-text">{{ clubInfo.shortName }}</view>
+				</view>
+				<view class="main-form-item">
+					<view class="form-label">机构地址</view>
+					<view class="form-input">{{ clubInfo.provincialAddress }}</view>		
+				</view>
+				<view class="main-form-item">
+					<view class="form-textarea">{{ clubInfo.address }}</view>		
+				</view>
+				<view class="main-form-item">
+					<view class="form-label lang">营业执照编号</view>
+					<view class="form-input lang">{{ clubInfo.socialCreditCode }}</view>		
+				</view>
+				<view class="main-form-item file">
+					<view class="main-form-upload">
+						<view class="label">营业执照</view>
+						<view class="upload-picture">
+							<view class="upload-image"><image :src="clubInfo.businessLicense" mode="" @click="ShowPreviewImage(1)"></image></view>
+						</view>
+					</view>
+					<view class="main-form-upload">
+						<view class="label">门头照</view>
+						<view class="upload-picture">
+							<view class="upload-image"><image :src="clubInfo.shopPhoto" mode=""  @click="ShowPreviewImage(2)"></image></view>
+						</view>	
+					</view>
+				</view>	
+				<view class="main-form-item">
+					<view class="form-label">机构类型</view>
+					<view class="form-text">
+						{{ clubInfo.firstClubType | FirstFormat }}
+						-
+						{{ clubInfo.secondClubType | TwoFormat }}
 					</view>
 				</view>
-			</view>
-			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
-				<view class="register-agree">
-					<view class="agree-text">
-						提示：采美销售顾问已帮您填写好了注册信息，请确认信息是否正确。点击确认并登录按钮将为您自动生成账号进行登录，并绑定您的微信。
+				<view class="main-form-item file" v-if="clubInfo.firstClubType == 1">
+					<view class="main-form-upload">
+						<view class="label">资质</view>
+						<view class="upload-picture">
+							<view class="upload-image"><image :src="clubInfo.medicalPracticeLicense" mode=""  @click="ShowPreviewImage(2)"></image></view>
+						</view>	
 					</view>
+				</view>	
+				<view class="main-form-item" v-if="clubInfo.secondClubType == 2">
+					<view class="form-label">科室</view>
+					<view class="form-text">{{ clubInfo.department }}</view>
 				</view>
-				<view class="register-row">
-					<view class="register-btn sub" @click.stop="SubmitRegister">确认并登录</view>
+				<view class="main-form-item none">
+					<view class="form-label none">主营内容</view>
+					<view class="form-checkbox-group">
+						<view class="form-table-item" v-for="(item, index) in medicaCampList" :key="index">
+							{{ item.name }}
+						</view>
+					</view>
+				</view>
+				<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
+					<view class="register-agree">
+						<view class="agree-text">
+							提示：采美销售顾问已帮您填写好了注册信息，请确认信息是否正确。点击确认并登录按钮将为您自动生成账号进行登录，并绑定您的微信。
+						</view>
+					</view>
+					<view class="register-row">
+						<view class="register-btn sub" :class="isSubLoading ? 'disabled' : ''" @click.stop="SubmitRegister">确认并登录</view>
+					</view>
 				</view>
 			</view>
-		</view>
+		</template>
 	</view>
 </template>
 
@@ -122,6 +132,9 @@
 				isIphoneX:this.$store.state.isIphone,
 				bindId:0,
 				medicaCampList:[],
+				isInvalid:false,
+				isSubLoading:false,
+				productNoneImage:'https://static.caimei365.com/app/img/icon/icon-pnone.png',
 				params:{
 					userId:0,
 					mobile:'',
@@ -220,28 +233,13 @@
 					}
 				})
 				.catch(error =>{
-					this.$util.msg(error.msg,2000)
+					this.isInvalid = true
 				})
 			},
 			SubmitRegister(){//确认并登录绑定微信
+				if(this.isSubLoading){ return; }
 				this.GetUserProfile()
 			},
-			SellerClubRegister(){//机构注册
-				this.SellerService.SellerClubRegister(
-					{
-						id:this.bindId
-					}
-				)
-				.then(response =>{
-					this.params.userId = response.data
-					setTimeout(()=>{
-						this.BindingWechat(this.params)
-					},1000)
-				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
 			GetUserProfile(){//获取微信用户信息
 				const self = this
 				wx.getUserProfile({
@@ -255,18 +253,38 @@
 						self.SellerClubRegister()
 					},
 					fail() {
+						self.isSubLoading = false
 						self.$util.msg('授权失败', 2000)
 					}
 				})
 			},
+			SellerClubRegister(){//机构注册
+				this.SellerService.SellerClubRegister(
+					{
+						id:this.bindId
+					}
+				)
+				.then(response =>{
+					this.params.userId = response.data
+					setTimeout(()=>{
+						this.BindingWechat(this.params)
+					},1000)
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000);
+					
+				})
+			},
 			BindingWechat(params){
 				this.UserService.BindingWechat(params)
 				.then(response =>{
 					this.login(response.data)
+					this.isSubLoading = false
 					this.$api.switchTabTo('/pages/tabBar/home/index')
 				})
 				.catch(error =>{
 					this.$util.msg(error.msg,2000)
+					this.isSubLoading = false
 					this.isUserInfo = true
 				})	
 			},
@@ -301,7 +319,7 @@
 		width: 100%;
 		position: relative;
 		box-sizing: border-box;
-		padding-bottom: 440rpx;
+		padding-bottom: 350rpx;
 		.register-main{
 			width: 100%;
 			height: auto;
@@ -601,6 +619,10 @@
 				text-align: center;
 				background: $btn-confirm;
 				margin-top: 96rpx;
+				&.disabled{
+					background: #e4e8eb;
+					color: #999999;
+				}
 				&.none{
 					background: #FFFFFF;
 					color: $text-color;

pages/user/order/order-logistics.vue

@@ -116,11 +116,11 @@
 								if(loIndex == 0) {
 									logisticsArr[loIndex]['isOpen'] = true;
 								}
-								if(loItem.routers) {
-									loItem.routers.forEach((rItem,rIndex) => {
+								if(loItem.routerList) {
+									loItem.routerList.forEach((rItem,rIndex) => {
 										newRouters.push({
 											desc: rItem.desc,
-											time: this.$api.timestampToTime(rItem.time)
+											time: rItem.time
 										})
 									})
 									logisticsArr[loIndex]['expressRecord'] = [...newRouters];

second/pages/form/form-seller.vue

@@ -135,7 +135,7 @@
 					 </view>
 					<view class="row none">
 						<view class="label-im">身份验证照片</view>
-						<view class="label-em">(个人请上传身份证正面照片；机构请上传营业执照照片)</view>
+						<view class="label-em">个人请上传身份证正面照片；机构请上传营业执照照片(图片大小不超过5M)</view>
 						<view class="release-input upload image uploadGoodsImages" >
 							<view class="upload-file" v-if="secondParams.authenticationImage == ''">
 								<i class="iconfont icon-shangchuantupian"></i>
@@ -208,7 +208,8 @@
 							</view>
 						</view>
 						<view class="row">
-							<view class="label">二手出让承诺函文件</view>
+							<view class="label-im">二手出让承诺函文件：</view>
+							<view class="label-em">(文件大小不超过20M)</view>
 							<view class="spacing file-none" v-if="secondParams.fileName == ''">
 								<view class="file-none-button" @click="uploadCommitmentFile">上传</view>
 							</view> 
@@ -220,6 +221,7 @@
 						<view class="row none">
 							<view class="label-im">二手出让承诺函图片</view>
 							<view class="label-em">(若不方便上传承诺函文件，可对承诺函进行拍照或者截图，再上传图片)</view>
+							<view class="label-em">图片大小不超过5M</view>
 							<view class="release-input upload image uploadGoodsImages" >
 								<view class="upload-file" v-if="secondParams.commitmentImage == ''">
 									<i class="iconfont icon-shangchuantupian"></i>
@@ -549,7 +551,7 @@
 				console.log(this.secondParams)
 				if(this.secondParams.authenticationImage == ''){
 					this.PopupShow = true
-					this.tipsContentText = '上传身份验证照片。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.tipsContentText = '上传身份验证照片,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
 					this.cancelButtonText = '继续发布'
 					this.confirmButtonText = '去上传'
 					this.isButtonsType = 1
@@ -557,7 +559,7 @@
 				}
 				if(this.secondParams.commitmentImage == '' || this.secondParams.ossName == ''){
 					this.PopupShow = true
-					this.tipsContentText = '上传二手出让承诺函。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
 					this.cancelButtonText = '继续发布'
 					this.confirmButtonText = '去上传'
 					this.isButtonsType = 1
@@ -768,16 +770,16 @@
 		vertical-align:middle;
 		position: relative;
 		&.file{
-			width: 400rpx;
+			width: 100%;
 		}
 		&.file-text{
-			width: 400rpx;
+			width: 100%;
 			line-height: 44rpx;
 			font-size: 28rpx;
-			padding-right: 40rpx;
 			box-sizing: border-box;
+			margin-left: 0;
 			.file-text-em{
-				width: 400rpx;
+				width: 100%;
 				text-overflow: ellipsis;
 				overflow: hidden;
 				display: -webkit-box;
@@ -803,7 +805,8 @@
 			}
 		}
 		&.file-none{
-			width: 400rpx;
+			width: 100%;
+			margin-left: 0;
 			position: relative;
 			.file-none-button{
 				width: 88rpx;

second/pages/form/form.vue

@@ -135,7 +135,7 @@
 					 </view>
 					<view class="row none">
 						<view class="label-im">身份验证照片</view>
-						<view class="label-em">(个人请上传身份证正面照片；机构请上传营业执照照片)</view>
+						<view class="label-em">个人请上传身份证正面照片；机构请上传营业执照照片(图片大小不超过5M)</view>
 						<view class="release-input upload image uploadGoodsImages" >
 							<view class="upload-file" v-if="secondParams.authenticationImage == ''">
 								<i class="iconfont icon-shangchuantupian"></i>
@@ -208,7 +208,8 @@
 							</view>
 						</view>
 						<view class="row">
-							<view class="label">二手出让承诺函文件</view>
+							<view class="label-im">二手出让承诺函文件：</view>
+							<view class="label-em">(文件大小不超过20M)</view>
 							<view class="spacing file-none" v-if="secondParams.fileName == ''">
 								<view class="file-none-button" @click="uploadCommitmentFile">上传</view>
 							</view> 
@@ -220,6 +221,7 @@
 						<view class="row none">
 							<view class="label-im">二手出让承诺函图片</view>
 							<view class="label-em">(若不方便上传承诺函文件，可对承诺函进行拍照或者截图，再上传图片)</view>
+							<view class="label-em">图片大小不超过5M</view>
 							<view class="release-input upload image uploadGoodsImages" >
 								<view class="upload-file" v-if="secondParams.commitmentImage == ''">
 									<i class="iconfont icon-shangchuantupian"></i>
@@ -549,7 +551,7 @@
 				console.log(this.secondParams)
 				if(this.secondParams.authenticationImage == ''){
 					this.PopupShow = true
-					this.tipsContentText = '上传身份验证照片。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.tipsContentText = '上传身份验证照片,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
 					this.cancelButtonText = '继续发布'
 					this.confirmButtonText = '去上传'
 					this.isButtonsType = 1
@@ -557,7 +559,7 @@
 				}
 				if(this.secondParams.commitmentImage == '' || this.secondParams.ossName == ''){
 					this.PopupShow = true
-					this.tipsContentText = '上传二手出让承诺函。您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
+					this.tipsContentText = '上传二手出让承诺函,您的二手商品将获得更好的推荐推荐和曝光，方便您快速卖出。'
 					this.cancelButtonText = '继续发布'
 					this.confirmButtonText = '去上传'
 					this.isButtonsType = 1
@@ -768,16 +770,16 @@
 		vertical-align:middle;
 		position: relative;
 		&.file{
-			width: 400rpx;
+			width: 100%;
 		}
 		&.file-text{
-			width: 400rpx;
+			width: 100%;
 			line-height: 44rpx;
 			font-size: 28rpx;
-			padding-right: 40rpx;
 			box-sizing: border-box;
+			margin-left: 0;
 			.file-text-em{
-				width: 400rpx;
+				width: 100%;
 				text-overflow: ellipsis;
 				overflow: hidden;
 				display: -webkit-box;
@@ -803,7 +805,8 @@
 			}
 		}
 		&.file-none{
-			width: 400rpx;
+			width: 100%;
+			margin-left: 0;
 			position: relative;
 			.file-none-button{
 				width: 88rpx;

seller/pages/club/stayClub-list.vue

@@ -6,7 +6,7 @@
 				<input class="input" 
 					   type="text" 
 					   confirm-type="search" 
-					   v-model="searchInputVal" 
+					   v-model="listQuery.searchName" 
 					   @input="onShowClose" 
 					   @confirm="initclubList()" 
 					   placeholder="机构名称/手机号"
@@ -29,15 +29,15 @@
 							<image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image>
 						</view>	
 						<view class="list-content">
-							<view class="list-name">{{item.userIdentity ===2 ? item.name : item.linkMan}}</view>
+							<view class="list-name">{{ item.contractEmail ? item.name : item.linkMan }}</view>
 							<view class="list-ntel">
 								<text class="list-link">{{item.linkMan ? item.linkMan : ''}}</text>
-								<text class="list-texl">{{item.contractMobile ? item.contractMobile : ''}}</text>
+								<text class="list-texl">{{item.bindMobile ? item.bindMobile : ''}}</text>
 							</view>
 							<view class="list-opera">
-								<view class="btn yel" @click.stop="shareBindClub(item)">分享登录</view>
 								<!-- <button class="btn org" @click.stop="checkData(item)">修改资料</button> -->
-								<view class="btn gre"  @click.stop="orderHistory(item)">删除</view>
+								<view class="btn yel" @click.stop="shareBindClub(item)">分享登录</view>
+								<view class="btn gre"  @click.stop="deleteWatingClub(item)">删除</view>
 							</view>
 						</view>	
 					</view>	
@@ -49,7 +49,7 @@
 			</view>
 		</view>
 		<!-- 分享弹窗 -->
-		<shareModel  v-if="isShareModal" :orderID="shareClubUseId" @shareConfirm ='onShareAppMessage'></shareModel>
+		<shareModel  v-if="isShareModal" :bindId="shareClubUseId" @shareConfirm ='onShareAppMessage'></shareModel>
 	</view>
 </template>
 
@@ -66,14 +66,16 @@
 		},
 		data() {
 			return {
-				serviceProviderId:'',
 				isShowClose:false,
 				shareClubUseId:0,
-				searchInputVal:'',
+				listQuery:{
+					searchName:'',
+					pageNum:1,
+					pageSize:10,
+					userId:0,
+				},
 				isEmpty:false,
 				nomoreText: '上拉显示更多',
-				pageNum:1,
-				pageSize:10,
 				hasNextPage:false,
 				loadding: false,
 				pullUpOn: true,
@@ -110,17 +112,17 @@
 				}, 500)
 			},
 			searchClubList(){
-				this.pageNum=1
+				this.listQuery.pageNum=1
 				this.initclubList()
 			},
 			initclubList(){	
-				let params = { searchWord:this.searchInputVal,pageNum:1,pageSize:this.pageSize }
-				this.SellerService.GetFindAllClubList(params).then(response =>{
+				this.UserService.SellerUserTemporaryClub(this.listQuery)
+				.then(response =>{
 					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
+					if(responseData.list&&responseData.list.length > 0){
 						this.isEmpty = false
 						this.hasNextPage = response.data.hasNextPage
-						this.clubList =responseData.results
+						this.clubList =responseData.list
 						this.pullFlag = false;
 						setTimeout(()=>{this.pullFlag = true;},500)
 						if(this.hasNextPage){
@@ -134,18 +136,19 @@
 					}else{
 						this.isEmpty = true
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},	
 			getOnReachBottomData(){
-				this.pageNum+=1
-				let params = {searchWord:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize }
-				this.SellerService.GetFindAllClubList(params).then(response =>{
+				this.listQuery.pageNum+=1
+				this.UserService.SellerUserTemporaryClub(this.listQuery)
+				.then(response =>{
 					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
+					if(responseData.list&&responseData.list.length > 0){
 						this.hasNextPage = response.data.hasNextPage
-						this.clubList = this.clubList.concat(responseData.results) 
+						this.clubList = this.clubList.concat(responseData.list) 
 						this.pullFlag = false;// 防上拉暴滑
 						setTimeout(()=>{this.pullFlag = true;},500)
 						if(this.hasNextPage){
@@ -157,13 +160,32 @@
 							this.nomoreText = '已至底部'
 						}
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
+			deleteWatingClub(item){
+				this.$util.modal('提示','确定删除改机构数据吗？删除后需要重新拉机构上线','确定','取消',true,() =>{
+					this.UserService.SellerDeleteUserTemporaryClub(
+						{
+							id:item.id,
+						}
+					)
+					.then(response =>{
+						this.$util.msg('删除成功',2000,true,'success')
+						setTimeout(()=>{
+							this.searchClubList();
+						},2000)
+					})
+					.catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
 			shareBindClub(item){//分享登录
 				this.shareClubUseId = item.id
-				if(item.businessLicense){
+				if(item.contractEmail){
 					this.shareIdentity = 2
 				}else{
 					this.shareIdentity = 4
@@ -171,18 +193,18 @@
 				this.isShareModal = true
 			},
 			onShowClose () {//输入框失去焦点时触发
-				if(this.searchInputVal != ''){
+				if(this.listQuery.searchName != ''){
 					this.isShowClose = true
 				}else{					
 					this.isShowClose = false
-					this.pageNum=1
+					this.listQuery.pageNum=1
 					this.initclubList()
 				}
 			},
 			delInputText(){//清除输入框内容
-				this.searchInputVal = ''
+				this.listQuery.searchName = ''
 				this.isShowClose = false
-				this.pageNum=1
+				this.listQuery.pageNum=1
 				this.initclubList()
 			},
 			hidePhone(val){
@@ -230,8 +252,8 @@
 		},
 		onShow() {
 			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderId
-				this.pageNum = 1;
+				this.listQuery.userId = response.userId
+				this.listQuery.pageNum = 1;
 				this.initclubList();
 			})
 		}
@@ -388,8 +410,8 @@
 							color: #2769d5;
 						}
 						&.gre{
-							border: 1px solid #e15616;
-							color: #e15616;
+							border: 1px solid #999999;
+							color: #999999;
 						}
 						&.yel{
 							border: 1px solid #4ad04c;

seller/pages/login/register-general.vue

@@ -22,7 +22,7 @@
 					</view>
 				</view>
 				<view class="register-row">
-					<view class="register-btn sub" @click.stop="SubmitRegister">确定</view>
+					<view class="register-btn sub" :class="isSubLoading ? 'disabled' : ''" @click.stop="SubmitRegister">确定</view>
 				</view>
 			</view>
 		</view>
@@ -61,6 +61,7 @@
 				clubUserId:0,
 				isShareModal:false,
 				bindId:0,
+				isSubLoading:false,
 				params:{
 					linkMan:'',
 					bindMobile:'',
@@ -101,6 +102,7 @@
 				})
 			},
 			SubmitRegister(){//提交注册
+				if(this.isSubLoading){ return; }
 				if( this.params.linkMan == ''){
 					this.$util.msg('请输入联系人姓名',2000);
 					return
@@ -117,13 +119,16 @@
 					this.$util.msg('请勾选同意协议',2000);
 					return
 				}
+				this.isSubLoading = true;	
 				this.SellerService.SellerClubTemporary(this.params).then(response =>{
 					this.bindId = response.data
 					setTimeout(()=>{
 						this.isRegisterStep = false
+						this.isSubLoading = false;
 						this.GetClubUserInfo(this.bindId)
 					},1500)
 				}).catch(error =>{
+					this.isSubLoading = false;
 					this.$util.msg(error.msg,2000);
 				})
 			},
@@ -270,6 +275,10 @@
 				text-align: center;
 				background: $btn-confirm;
 				margin-top: 96rpx;
+				&.disabled{
+					background: #e4e8eb;
+					color: #999999;
+				}
 				&.none{
 					background: #FFFFFF;
 					color: $text-color;

seller/pages/login/register-member.vue

@@ -156,7 +156,7 @@
 					</view>
 				</view>
 				<view class="register-row">
-					<view class="register-btn sub" @click.stop="SubmitRegister">确定</view>
+					<view class="register-btn sub" :class="isSubLoading ? 'disabled' : ''" @click.stop="SubmitRegister">确定</view>
 				</view>
 			</view>
 		</view>
@@ -264,6 +264,7 @@
 		data() {
 			return{
 				isRegisterStep:true,
+				isSubLoading:false,
 				isIphoneX:this.$store.state.isIphone,
 				isCheck:false,
 				clubUserId:0,
@@ -288,9 +289,9 @@
 					cityId:'',			//区ID
 					provinceId:'',		//区ID
 					addressDetail: '',	//地址
-					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',//资质
+					businessLicense:'', //营业执照
+					shopPhoto:'',		//门头照
+					medicalPracticeLicense:'',//资质
 					firstClubType:1, //1医美；2生美
 					secondClubType:1, //1诊所；2门诊；3医院 
 					department:'',//科室
@@ -357,6 +358,7 @@
 				})
 			},
 			SubmitRegister(){//提交注册
+				if(this.isSubLoading){ return; }
 				if( this.params.linkMan == ''){
 					this.$util.msg('请输入联系人姓名',2000);
 					return
@@ -421,6 +423,7 @@
 					this.$util.msg('请勾选同意协议',2000);
 					return
 				}
+				this.isSubLoading = true;	
 				this.SellerService.SellerClubTemporary(this.params).then(response =>{
 					this.bindId = response.data
 					setTimeout(()=>{
@@ -435,9 +438,11 @@
 				this.UserService.UseRregisterTemporaryInfo({id:id})
 				.then(response =>{
 					this.clubInfo = response.data
+					this.isSubLoading = false;	
 					this.showMainProductList =  this.setNewMainpro(this.clubInfo.mainProduct)
 				})
 				.catch(error =>{
+					this.isSubLoading = false;	
 					this.$util.msg(error.msg,2000)
 				})
 			},

services/public.js

@@ -62,6 +62,72 @@ export function uploadFileImage() {
 }
 /**
  *上传文件
+ * 限制pdf,doc,docx
+ */
+export function uploadFilePdfDocDocx() {
+	return new Promise(function(resolve,reject) {
+		wx.chooseMessageFile({
+			count: 1,
+			type: 'file',
+			success (res) {
+				// tempFilePath可以作为img标签的src属性显示图片
+				const tempFilePaths = res.tempFiles
+				const size = tempFilePaths[0].size;//获取图片的大小，单位B
+				const filename = res.tempFiles[0].name;
+				const newfilename = filename + ""; 
+				const url = requestUrl+'/file/upload';
+				uni.setStorageSync('fileName',filename)
+				console.log('filename',filename)
+				 //截取
+				let fixFile = newfilename.substr(newfilename.lastIndexOf('.'));
+			    console.log(fixFile);
+				//统一转成小写  
+				let lowFixFile = fixFile.toLowerCase();
+				if ( lowFixFile != '.pdf' && lowFixFile != '.doc' && lowFixFile != '.docx' ){ //限制了文件类型
+					uni.showToast({
+						title: '文件格式不正确!',
+						icon:'none',
+						mask:true,
+						duration: 3000
+					});
+					return;
+				}
+				if(size > 51200000){//限制了文件的大小50M
+					uni.showToast({
+						title: '文件大小不能超过50M',
+						icon:'none',
+						mask:true,
+						duration: 3000
+					});
+					return;
+				}
+				wx.showLoading({ title: '上传中~' })
+				wx.uploadFile({
+					url : url,
+					filePath: tempFilePaths[0].path,
+					name: 'file',
+					header: {
+					    "Content-Type": "multipart/form-data",
+					},
+					formData: {
+						'user': 'test'
+					},
+					success: function (res) {
+						wx.hideLoading()
+						resolve(res);
+					},
+					error : function(err){
+						wx.hideLoading()
+						reject(err)
+					}
+				})
+			}
+		})
+	});
+}
+
+/**
+ *上传文件,仅限制PDF文件格式
  */
 export function uploadFilePdf() {
 	return new Promise(function(resolve,reject) {
@@ -71,22 +137,35 @@ export function uploadFilePdf() {
 			success (res) {
 				// tempFilePath可以作为img标签的src属性显示图片
 				const tempFilePaths = res.tempFiles
-				const size = tempFilePaths[0].size;
+				const size = tempFilePaths[0].size;//获取图片的大小，单位B
 				const filename = res.tempFiles[0].name;
 				const newfilename = filename + ""; 
 				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){ //限制了文件的大小和具体文件类型
-				// 	uni.showToast({
-				// 		title: '文件大小不能超过10MB,格式必须为pdf！',
-				// 		icon:'none',
-				// 		mask:true,
-				// 		duration: 2000
-				// 	});
-				// }
+				//截取
+				let fixFile = newfilename.substr(newfilename.lastIndexOf('.'));
+				console.log(fixFile);
+				//统一转成小写  
+				let lowFixFile = fixFile.toLowerCase();
+				if ( lowFixFile != '.pdf' ){ //限制了文件类型
+					uni.showToast({
+						title: '文件必须为".pdf"格式!',
+						icon:'none',
+						mask:true,
+						duration: 3000
+					});
+					return;
+				}
+				if( size > 20480000 ){//限制了文件的大小20MB
+					uni.showToast({
+						title: '文件大小不能超过20M',
+						icon:'none',
+						mask:true,
+						duration: 3000
+					});
+					return;
+				}
 				wx.showLoading({ title: '上传中~' })
 				wx.uploadFile({
 					url : url,

services/sellse.service.js

@@ -238,6 +238,7 @@ export default class SellerService {
 			url:'/order/submit/rechargeOrder', 
 			data, 
 			isLoading: true ,
+			isHost:true
 		})
 	}
 	/**

services/user.service.js

@@ -276,5 +276,31 @@ export default class UserService {
 			isLoading: true ,
 		})
 	}
-	
+	/**
+	 *@协销帮机构注册 待注册列表
+	 *@param userId	协销用户userId
+	 *@param searchName 关键词
+	 *@param pageNum 页码
+	 *@param pageSize 条数
+	 */
+	SellerUserTemporaryClub (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/user/seller/temporary/club', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
+	}
+	/**
+	 *@协销待注册列表 删除操作
+	 *@param ID
+	 */
+	SellerDeleteUserTemporaryClub (data = {}) {
+		return this.AjaxService.post({ 
+			url:'/user/seller/delete/temporary/club', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
+	}
 }

supplier/pages/deliver/qualifications-add.vue

@@ -67,7 +67,7 @@
 <script>
 	import { mapState,mapMutations } from 'vuex'
 	import authorize from '@/common/config/authorize.js' 
-	import { uploadFileImage , uploadFilePdf } from "@/services/public.js"
+	import { uploadFileImage , uploadFilePdfDocDocx } from "@/services/public.js"
 	
 	var isPreviewImg;
 	export default{
@@ -211,7 +211,7 @@
 			},
 			uploadFile(array){//上传资质文件
 				console.log(array)
-				uploadFilePdf().then(res =>{
+				uploadFilePdfDocDocx().then(res =>{
 					let data =  JSON.parse(res.data).data
 					let obj = {
 							fileName:uni.getStorageSync('fileName'),