commit -m 供应商资料

pages.json

@@ -280,6 +280,12 @@
 				"navigationBarTitleText": "升级会员机构",
 				"navigationStyle":"custom"
 			}
+		},{
+			"path": "pages/login/apply-supplier",
+			"style": {
+				"navigationBarTitleText": "修改申请资料",
+				"navigationStyle":"custom"
+			}
 		},{
 			"path": "pages/login/logincode",
 			"style": {

pages/goods/product.vue

@@ -177,7 +177,7 @@
 					</view>	
 				</tui-bottom-popup>	
 				<!-- 底部按钮 -->
-				<view class="menu" v-if="userIdentity != 1 || userIdentity !=3 ">
+				<view class="menu" v-if="userIdentity != 1 && userIdentity !=3 ">
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">

pages/login/apply-supplier.vue

@@ -0,0 +1,1055 @@
+<template>
+	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
+		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
+		<view class="register-main clearfix" v-if="auditStatus == 92">
+			<view class="register-row none clearfix">
+				<view class="error-title">审核未通过原因:</view>
+				<view class="error-main">
+					<text class="error-item" v-for="(item, index) in errorList" :key="index">
+						{{ item }}
+					</text>
+				</view>
+			</view>	
+		</view>	
+		<view class="register-main detailed clearfix">
+			<view class="register-title">基本信息</view>
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">公司名称:</view>
+					<input class="row-input" type="text" name="input" v-model="twoParmas.name" placeholder="请输入您的公司名称" maxlength="30"/>
+				</view>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">联系人:</view>
+					<input class="row-input" type="text" name="input" v-model="twoParmas.linkMan" placeholder="请输入联系人姓名" maxlength="6"/>
+				</view>
+			</view>
+			<view class="register-row none clearfix">
+				<view class="register-from">
+					<view class="label">邮箱:</view>
+					<input class="row-input" type="text" name="input" v-model="twoParmas.email" placeholder="请输入邮箱地址" maxlength="30"/>
+				</view>
+			</view>
+			<view class="register-row text clearfix">
+				<text>邮箱可用作登录账号，请使用公司邮箱或法人邮箱</text>
+			</view>	
+			<view class="register-title">详细信息</view>
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">公司简称:</view>
+					<input class="row-input" type="text" v-model="postParmas.sname" placeholder="请输入您的公司简称" maxlength="10"/>
+				</view>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-from"  @click="showMulLinkageThreePicker">
+					<view class="label">联系地址:</view>
+					<text class="row-input" :class="addressText === '请选择公司所在地区' ? 'none' : ''">
+						{{ addressText }}
+					</text>		
+					<text class="iconfont icon-xiayibu"></text>
+				</view>
+			</view>
+			<view class="register-row text-textarea clearfix">
+				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{postParmas.address ? postParmas.address :'详细地址：如道路、门牌号、小区等'}}</view>
+				<textarea 	v-else
+							class="textarea" 
+							type="text" 
+							v-model="postParmas.address" 
+							placeholder="详细地址：如道路、门牌号、小区等" 
+							placeholder-class="placeholder"
+							maxlength="40"
+							@input="onTextareaInput"
+							:focus="textareaFocus"
+							@blur="hideTextareaFocus"
+							:class="isShowInput ? '':''"
+				/>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-from">
+					<view class="label">营业执照编号:</view>
+					<input class="row-input" type="text" v-model="postParmas.socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
+				</view>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-picture">
+					<view class="label">营业执照:</view>
+					<view class="upload-picture">
+						<view class="upload-none" v-if="postParmas.businessLicenseImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-image" v-else>
+							<image :src="postParmas.businessLicenseImage" mode="" @click="viewBusinessImage"></image>
+							<view class="upload-del" @click="delBusinessImage">
+								<text class='iconfont icon-shanchu1'></text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-from picker">
+					<view class="label">公司类型:</view>
+					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
+					<text class="iconfont icon-xiayibu"></text>
+				</view>
+			</view>
+			<view class="register-row none clearfix" v-if="postParmas.firstShopType == 1">
+				<view class="register-from radio">
+					<view class="label">医疗类型:</view>
+				</view>
+			</view>
+			<view class="register-row clearfix" v-if="postParmas.firstShopType == 1">
+				<view class="register-from radio">
+					<radio-group @change="radioChange">
+						<label class="row-input" v-for="(item, index) in supplierList" :key="item.value">
+							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
+							<view class="row-text">{{item.name}}</view>
+						</label>
+					</radio-group>
+				</view>
+			</view>
+			<view class="register-row clearfix">
+				<view class="register-from group">
+					<view class="label">主营内容:</view>
+					<view class="content-class">
+						<checkbox-group @change="chooseMaleLike" >
+							<label class="item" v-for="(item, index) in supplierMedicaCampList" :key="index" :class="{on: item.checked}">
+							   <checkbox :value="item.value"></checkbox>
+							   <text class="item-text">{{item.name}}</text>
+							</label>
+						</checkbox-group>
+					</view>	
+				</view>	
+				<view class="register-from group btn">
+					<view class="content-class btn">
+						<view class="item" @click="showAustomItem">
+							<text class="item-text">其他</text>
+						</view>
+					</view>
+				</view>
+				<view class="register-from group btn" v-show="isShowAustomItem">
+					<view class="content-class btn">
+						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
+						<button type="default" 
+								class="confirm-btn" 
+								:class="[isDisabled === true ? 'disabled' : 'none']" 
+								:disabled="isDisabled"
+								@click.stop="addCustomItem"
+						>确认添加</button>
+					</view>
+				</view>
+			</view>	
+			<view class="register-main clearfix">
+				<view class="register-agree">
+					<view class="agree-text"  @tap.stop="agreeCheck()">
+						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
+						我已阅读并同意
+						<text @click.stop="this.$api.navigateTo('/pages/service/supplieragree')">《供应商协议》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
+					</view>
+				</view>
+				<view class="register-row ">
+					<view class="register-btn sub" @click.stop="SupplierRegisteredThree">提交审核</view>
+				</view>
+			</view>
+		</view>
+		<mpvue-city-picker :themeColor="themeColor"
+							ref="mpvueCityPicker" 
+						    :pickerValueDefault="cityPickerValueDefault"
+							@onCancel="onCancel" 
+							@onConfirm="onConfirm">
+		</mpvue-city-picker>
+	</view>
+</template>
+
+<script>
+	import { mapMutations } from 'vuex';
+	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+	import { supplierList,supplierMedicaCampNullList } from '@/common/json/data.json.js' //本地数据
+	import { uploadFileImage } from "@/api/utils.js" 
+	export default{
+		components:{
+			mpvueCityPicker
+		},
+		data() {
+			return{
+				nvabarData: {//顶部自定义导航
+					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+					showSearch: 0,
+					title: '修改申请资料', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphone
+				},
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				errorList:[],
+				tabCurrentIndex:3,	
+				auditStatus:'',			//审核状态
+				isPreviewImage:false,   //预览图片开关
+				postParmas:{
+					userId:'',				//用户ID
+					shopID:'',				//供应商ID
+					linkMan:'',
+					name:'',
+					email:"",
+				    provinceID :'',
+					cityID : '',
+					townID : '',
+					address:'',
+					sname:'',	 	//公司简称
+					socialCreditCode:'',	//统一社会信用代码
+					businessLicenseImage:'',	//营业执照图片
+					provinceID :'',
+					cityID : '',
+					townID : '',
+					address:'',
+					firstShopType:0,
+					secondShopType: '',
+					mainpro:'',
+					isAgreed:0,
+				},
+				addressText:'请选择公司所在地区',
+				isDisabled:true,
+				isShowInput:true,
+				textareaFocus:false,
+				organizationTypeText:'请选择公司类型',
+				supplierList:supplierList,//医疗类型
+				supplierMedicaCampList:supplierMedicaCampNullList,//主营内容
+				mentuzCampList:[],		//医美主营
+				typtIndex:0,
+				organizationType:0,
+				current:0,
+				isShowAustomItem:false, //是否显示其他添加
+				customItemValue:'', 	//自定义项目
+				isMainproCheck:false,
+				isSupplierAlert:true,
+				isCheck:false
+			}	
+		},
+		onLoad() {
+			this.GetSupplierInfo()
+		},
+		methods:{
+			hanldNavigateBack(){
+				this.$util.modal('','资料尚未提交审核，确定放弃升级吗？','确定','取消',true,() =>{
+					uni.navigateBack({
+						delta: 1
+					});
+				})
+			},
+			GetSupplierInfo(){
+				this.$api.getStorage().then((resolve) =>{
+					this.postParmas.userId = resolve.userID
+					this.auditStatus = resolve.auditStatus
+					this.ShopService.shopInfo({userId:this.postParmas.userId}).then(response =>{
+						let responseData = response.data
+						let supplierShop = responseData.shop
+						let supplierUser = responseData.user
+						this.auditStatus = responseData.status
+						if(supplierUser.auditNoteList!=null){
+							this.errorList =supplierUser.auditNoteList
+						}
+						this.registerEmail = supplierUser.email	
+						this.clubID = supplierUser.clubID
+						this.clubName = this.$reg.checkData(supplierShop.name)
+						this.abbreviation = this.$reg.checkData(supplierShop.sname)
+						if( supplierShop.provinceID){
+							this.addressData.provinceID = ''
+						}else{
+							this.addressData.provinceID = supplierShop.provinceID
+						}
+						if( supplierShop.cityID){
+							this.addressData.cityID = ''
+						}else{
+							this.addressData.cityID = supplierShop.cityID
+						}
+						if( supplierShop.townID){
+							this.addressData.townID = ''
+						}else{
+							this.addressData.townID = supplierShop.townID
+						}
+						this.addressData.address = supplierShop.provincialAddress ? supplierShop.provincialAddress:'请选择机构所在地区'
+						this.addressData.addressDetail = this.$reg.checkData(supplierShop.address)
+						this.socialCreditCode = this.$reg.checkData(supplierShop.socialCreditCode)
+						this.firstClubType = supplierShop.firstClubType
+						this.secondClubType = this.$reg.checkData(supplierShop.secondClubType)
+						this.uploadBusinessImage = this.$reg.checkData(supplierShop.businessLicenseImage) 
+						this.uploadMentuzImage = this.$reg.checkData(supplierShop.headpic)
+						this.uploadMedicalImage = this.$reg.checkData(supplierShop.medicalPracticeLicenseImg)
+						this.department = this.$reg.checkData(supplierShop.department)		
+						//机构类型&&主营项目
+						switch(this.firstClubType){
+							case '1':
+								this.organizationTypeText = '医美'
+								this.isOrganizationType = 1
+								break;
+							case '2':
+								this.organizationTypeText = '生美'
+								this.isOrganizationType = 2
+								break;
+							case null:
+								this.organizationTypeText = '请选择公司类型'
+								this.isOrganizationType = 0
+								break;
+						}	
+						if(supplierShop.mainpro == "" || supplierShop.mainpro == null){
+							this.mentuzCampList = this.mentuzCampNullList
+							this.medicaCampList = this.medicaCampNullList
+							console.log(this.medicaCampList)
+							console.log(this.mentuzCampList)
+						}else{
+							if(this.firstClubType == '1'){
+								this.mentuzCampList = this.setNewMainpro(supplierShop.mainpro)
+								this.medicaCampList = this.medicaCampNullList							
+							}else{
+								this.medicaCampList = this.setNewMainpro(supplierShop.mainpro)
+								this.mentuzCampList = this.mentuzCampNullList
+							}
+							this.mainpro = supplierShop.mainpro;
+						}
+						//机构类型
+						switch(this.secondClubType){
+							case '1':this.current = 0;break;
+							case '2':this.current = 1;this.isDepartment=true;break;
+							case '3':this.current = 2;this.isDepartment=true;break;
+						}
+					}).catch(error =>{
+						this.$util.msg(error.msg,2000)
+					})
+				})
+			},
+			organizationUpdateInfo(){//提交审核
+				if(!this.isMainproCheck){
+					let mainproList = []
+					if(this.firstClubType == '1'){
+						this.mentuzCampList.forEach(item =>{
+							mainproList.push(item.name)
+						})
+					}else{
+						this.medicaCampList.forEach(item =>{
+							mainproList.push(item.name)
+						})
+					}
+					this.mainpro = mainproList.join('/')
+				}
+				if( this.registerEmail == ''){
+					this.$util.msg('请输入邮箱地址',2000);
+					return
+				}
+				if( !this.$reg.isEmail(this.registerEmail)){
+					this.$util.msg('请输入正确的邮箱地址',2000);
+					return
+				}
+				if( this.clubName == ''){
+					this.$util.msg('请输入机构名称',2000);
+					return
+				}
+				if( this.addressData.townID == ''){
+					this.$util.msg('请选择机构地址',2000);
+					return
+				}
+				if( this.addressData.addressDetail == ''){
+					this.$util.msg('请填写机构详细地址',2000);
+					return
+				}
+				if( this.uploadBusinessImage == ''){
+					this.$util.msg('请上传您的营业执照',2000);
+					return
+				}
+				if(this.isOrganizationType!=0){
+					if(this.mainpro == ''){
+						this.$util.msg('请选择住机构主营内容',2000);
+						return
+					}
+				}
+				let params ={
+						userID:this.userID,
+						clubID:this.clubID,					//会所ID
+						contractEmail1:this.registerEmail,
+						name:this.clubName,
+						sname:this.abbreviation,
+						provinceID:this.addressData.provinceID,
+						cityID:this.addressData.cityID,
+						townID:this.addressData.townID,
+						address:this.addressData.addressDetail,
+						socialCreditCode:this.socialCreditCode,
+						businessLicenseImage:this.uploadBusinessImage,
+						headpic:this.uploadMentuzImage,
+						firstClubType:this.isOrganizationType,  //机构类型分类 医美:1和生美:2
+						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
+						department:this.department,				//科室
+						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
+						mainpro:this.mainpro,
+				}
+				this.UserService.OrganizationRegister(params).then(response =>{
+					this.$util.msg('您的升级申请已提交审核',2000);
+					setTimeout(()=>{
+						uni.navigateBack();
+					},2000)
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			chooseBusinessImage() {//营业执照图片上传
+				uploadFileImage().then(res =>{
+					this.postParmas.businessLicenseImage = JSON.parse(res.data).data
+				})
+			},
+			viewBusinessImage(e) {
+				this.myPreviewImageFn(this.businessLicenseImage)
+			},
+			myPreviewImageFn(url){
+				this.isPreviewImage = true
+				let mentuzArray = []
+				mentuzArray.push(url)
+				uni.previewImage({
+					urls: mentuzArray,
+					current: 0
+				});
+			},
+			delBusinessImage(){
+				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
+					 this.postParmas.businessLicenseImage = ''
+				})
+			},
+			radioChange(e) {
+				this.postParmas.secondShopType = e.target.value;
+				console.log(this.postParmas.secondShopType)
+			},
+			chooseMaleLike(e){
+				this.isMainproCheck = true
+				this.postParmas.mainpro = this.checkLikes(e,this.supplierMedicaCampList)
+			},
+			bindPickerChange(e) {
+				let self = this
+				uni.showActionSheet({
+					title:'标题',
+					itemList: ['医疗', '非医疗'],
+					success: (e) => {
+						self.postParmas.firstShopType = e.tapIndex+1
+						console.log(self.postParmas.firstShopType)
+						switch(e.tapIndex){
+							case 0:
+								this.organizationTypeText = '医疗'
+								break;
+							case 1:
+								this.organizationTypeText = '非医疗'
+								break;
+						}
+					}
+				})
+			},
+			showMulLinkageThreePicker() {// 三级联动选择
+				this.isShowInput = true
+				this.$refs.mpvueCityPicker.show()
+			},
+			showAustomItem() {
+				this.isShowAustomItem = !this.isShowAustomItem
+			},
+			showTextareaFocus(){//文本框获取焦点
+				this.isShowInput = false
+				this.textareaFocus = true
+			},
+			hideTextareaFocus(){//文本框失去焦点
+				this.isShowInput = true
+				this.textareaFocus = false
+			},
+			onConfirm(e) {
+				this.addressText = e.name;
+				this.postParmas.townID = e.townCode;
+				this.postParmas.cityID = e.cityCode;
+				this.postParmas.provinceID = e.provinceCode;
+				console.log(this.postParmas)
+			},	
+			onTextareaInput(e){
+			   this.postParmas.address = e.detail.value;
+			},
+			onBlurInput(e){//
+				if(e.detail.value ===''){
+					this.isDisabled = true
+				}else{
+					this.isDisabled = false
+				}
+			},
+			addCustomItem(){//添加主营内容
+				let item = {value:`${this.supplierMedicaCampList.length+1}`,name:this.customItemValue,checked:true}
+				this.supplierMedicaCampList.push(item)
+				console.log(this.supplierMedicaCampList)
+			},
+			agreeCheck() {
+				this.isCheck = !this.isCheck
+				if(this.isCheck){
+					this.postParmas.isAgreed = 1
+				}else{
+					this.postParmas.isAgreed = 0
+				}
+			},
+			checkLikes(e,list){
+				let	values = e.detail.value
+				let arr = []
+				list.forEach(item => {
+					if(values.indexOf(item.value) >= 0){
+						this.$set(item,'checked',true)
+						arr.push(item.name)
+					}else{
+						this.$set(item,'checked',false)
+					}
+				})
+				return arr.join('/')
+			},
+			setNewMainpro(arr){//回显处理主营内容
+				let _ARRAY = []
+				arr.split('/').forEach((item,index) =>{
+					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
+					_ARRAY.push(_OBJ)
+				})
+				return _ARRAY
+			},
+			addCustomItem(){
+				if(this.customItemValue==''){
+					this.$util.msg('请输入自定义主营内容',2000);
+				}else{
+					if(this.isOrganizationType == 1){
+						let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
+						if(this.checkedArray(this.customItemValue,this.mentuzCampList)){
+							this.$util.msg('主营内容已存在!',2000)
+						}else{
+							this.mentuzCampList.push(item)
+						}
+					}else{
+						let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
+						if(this.checkedArray(this.customItemValue,this.medicaCampList)){
+							this.$util.msg('主营内容已存在!',2000)
+						}else{
+							this.medicaCampList.push(item)
+						}
+						
+					}
+				}
+			},
+			checkedArray(content,arr){//判断主营内容是否已存在
+				for(var i in arr){
+					if(arr[i].name == content){
+						return true;
+					}
+				}
+				return false;
+			 },
+		},
+		onShow() {
+			if(this.isPreviewImage){
+				this.isPreviewImage = false
+				return
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.placeholder{color:#b2b2b2 ;}
+	.register{
+		width: 100%;
+		height: 100%;
+		box-sizing: border-box;
+		.register-main{
+			width: 100%;
+			height: auto;
+			position: relative;
+			.register-title{
+				width: 100%;
+				height: 80rpx;
+				line-height: 80rpx;
+				background-color: #F7F7F7;
+				font-size: $font-size-34;
+				color: $text-color;
+				text-align: left;
+				font-weight: bold;
+				box-sizing: border-box;
+				padding: 0 24rpx;
+				margin-bottom: 20rpx;
+			}
+			.register-consult{
+				width: 110rpx;
+				height: 68rpx;
+				background:linear-gradient(223deg,rgba(225,86,21,0.6) 0%,rgba(225,86,10,0.3) 100%);
+				border-radius: 34rpx 0 0 34rpx;
+				position: absolute;
+				right: 0;
+				bottom: 120rpx;
+				text-align: left;
+				line-height: 68rpx;
+				padding-left: 20rpx;
+				.icon-kefunv{
+					font-size: 48rpx;
+					color: #31313B;
+					float: left;
+				}
+				.text{
+					font-size: $font-size-24;
+					display: block;
+					float: left;
+					width: 60rpx;
+					line-height: 30rpx;
+					color: #FFFFFF;
+					margin-top: 6rpx;
+				}
+			}
+			.register-agree{
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin: 100rpx 0 20rpx 0;
+				.agree-text{
+					.checkbox{
+						float: left;
+						margin: 4rpx 6rpx 0 0;
+						color: #999999;
+						font-size: $font-size-34;
+						&.icon-gouxuan{
+							color: $color-system;
+						}
+					}
+					font-size: $font-size-22;
+					line-height: 44rpx;
+					color: #999999;
+					text{
+						color:#1890f9;
+					}
+				}
+			}
+			.register-logo{
+				width: 100%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				height: 189rpx;
+				padding:60rpx 0 40rpx 0;
+				.logo{
+					width:467rpx;
+					height: 189rpx;
+					display: block;
+				}
+			}
+			&.detailed{
+				padding-bottom: 330rpx;
+			}			
+			.register-row{
+				width: 100%;
+				height: auto;
+				padding: 0 24rpx;
+				margin-bottom: 20rpx;
+				box-sizing: border-box;
+				&.text{
+					font-size: $font-size-20;
+					line-height: 40rpx;
+					color: #fea785;
+				}
+				&.none{
+					margin-bottom: 0;
+				}
+				&.login{
+					display: flex;
+				}
+				.register-text{
+					line-height: 44rpx;
+					margin-top: 100rpx;
+					font-size: $font-size-24;
+					color: #999999;
+					text-align: justify;
+					.txt{
+						margin-right: 15rpx;
+					}
+				}
+				.register-tip{
+					line-height: 64rpx;
+					font-size: $font-size-24;
+					color: #CECECE;
+					text-align: left;
+				}
+				.register-from{
+					width: 100%;
+					height: 80rpx;
+					background: #FFFFFF;
+					position: relative;
+					border-bottom: 1px solid #e1e1e1;
+					.label{
+						text-align: left;
+						font-size: $font-size-28;
+						color:#666666;
+						line-height: 80rpx;
+						float: left;
+					}
+					.row-input{
+						width: 440rpx;
+						padding-left:10rpx;
+						font-size: $font-size-28;
+						color: $text-color;
+						line-height: 80rpx;
+						float: left;
+						height: 80rpx;
+						&.none{
+							color: #999999;
+						}
+						&.picker{
+							text-align: left;
+							color: #333333;
+						}
+						&.keshi{
+							width: 550rpx;
+						}
+						&.code{
+							width: 350rpx;
+						}
+						&.imgCode{
+							width: 390rpx;
+						}
+					}
+					.vscodeimg{
+						width: 160rpx;
+						height: 80;
+						float: left;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+						border-radius: 6rpx;
+						margin: 0 10rpx;
+						image{
+							width: 150rpx;
+							height: 68rpx;
+							border-radius: 6rpx;
+						}
+					}
+					.vscod-refresh{
+						width: 120rpx;
+						float: right;
+						line-height: 80rpx;
+						.ref-text{
+							float: left;
+							font-size: 26rpx;
+							color: #999999;
+						}
+						.icon-shuaxin{
+							float: left;
+							font-size: 36rpx;
+							color: #999999;
+							margin-right: 10rpx;
+						}
+					}
+					&.imgcode{
+						width: 410rpx;
+						float: left;
+						margin-right: 20rpx;
+						.row-input{
+							width: 230rpx;
+						}
+					}
+					.row-btn{
+						width: 180rpx;
+						height:64rpx;
+						float: left;
+						background: $btn-confirm;
+						padding: 0;
+						border-radius: 32rpx;
+						.row-input{
+							width: 180rpx;
+							height: 64rpx;
+							line-height: 64rpx;
+							padding: 0;
+							color: #FFFFFF;
+							background: $btn-confirm;
+							text-align: center;
+							border-radius: 32rpx;
+							font-size: $font-size-24;
+							&.other{
+								width: 180rpx;
+								background: #F7F7F7;
+								margin-right: 20rpx;
+							}
+							&.none{
+								background: #F7F7F7;
+							}
+						}
+						&.disabled{
+							background: #F7F7F7;
+							.row-input{
+								background: #F7F7F7;
+								color: #999999;
+							}
+						}
+					}
+					&.picker{
+						width: 100%;
+						height: 80rpx;
+						line-height: 80rpx;
+						.label{
+							line-height: 80rpx;
+						}
+						.row-input{
+							width: 470rpx;
+							height: 80rpx;
+							line-height: 80rpx;
+							padding-left: 30rpx;
+						}
+					}
+					&.radio{
+						width: 100%;
+						border-bottom: none;
+						.row-input{
+							width: 25%;
+							height: 80rpx;
+							line-height: 80rpx;
+							padding-left: 0;
+						}
+						.row-radio{
+							float: left;
+							transform: scale(0.8);
+						}
+						.row-text{
+							text-align: center;
+							float: left;
+							font-size: $font-size-24;
+						}
+					}
+					&.group{
+						width: 100%;
+						height: auto;
+						background: #FFFFFF;
+						margin-top: 30rpx;
+						border-bottom: none;
+						.label{
+							line-height: 76rpx;
+						}
+						.row-input{
+							width: 100%;
+							height: 80rpx;
+							line-height: 80rpx;
+							padding-left: 0;
+						}
+						.row-radio{
+							float: left;
+						}
+						.row-text{
+							width: 100rpx;
+							text-align: center;
+							float: left;
+						}
+					}
+					&.btn{
+						margin-top: 0;
+					}
+					.content-class {
+						margin: 20rpx auto;
+						display: flex;
+						flex-flow: row wrap;
+						justify-content: space-between;
+						align-items: center;
+						&.btn{
+							margin: 0 auto;
+							margin-left: 116rpx;
+						}
+						.row-input{
+							display: flex;
+							width: 330rpx;
+							box-sizing: border-box;
+							height: 64rpx;
+							padding:0 24rpx;
+							text-align: left;
+							border-radius: 32rpx;
+							font-size: $font-size-28;
+							color: $text-color;
+							border: 1px solid #B2B2B2;
+							line-height: 64rpx;
+						}
+						.confirm-btn{
+							width: 200rpx;
+							height: 64rpx;
+							border-radius: 32rpx;
+							line-height: 64rpx;
+							text-align: center;
+							&.other{
+								width: 213rpx;
+							}
+							&.none{
+								color: $color-system;
+								background: #ffe6dc;
+							}
+							&.disabled{
+								color: #999999;
+							}
+						}
+						.item {
+						  width: 155rpx;
+						  height: 60rpx;
+						  font-size:$font-size-28;
+						  line-height: 60rpx;
+						  border-radius:30rpx;
+						  margin: 10rpx;
+						  text-align: center;
+						  box-sizing: border-box;
+						  border: 1rpx solid #EFEFEF;
+						  float: left;
+						  checkbox {
+							display: none;
+						  }
+						}
+						.on {
+						  border-color: $color-system;
+						  color:$color-system;
+						}
+					}
+				}
+				.row-login{
+					flex: 1;
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: left;
+				}
+				.row-logincode{
+					flex: 1;
+					font-size: $font-size-28;
+					color: $text-color;
+					text-align: right;
+				}
+				.icon-xiayibu{
+					width: 80rpx;
+					height: 80rpx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					line-height: 80rpx;
+					text-align: center;
+				}
+				&.text-textarea{
+					background: #FFFFFF;
+					.textarea{
+						width: 100%;
+						height: 180rpx;
+						padding: 24rpx;
+						box-sizing: border-box;
+						font-size: $font-size-28;
+						color: $text-color;
+						z-index: 1;
+						border-bottom: 1px solid #e1e1e1;
+					}
+					.textarea.hide{
+						opacity: 0;
+					}
+					.textarea.show{
+						color: #999999;
+					}
+				}
+			}
+			.register-picture{
+				height: 180rpx;
+				margin: 30rpx 0;
+				float: left;
+				&.zz{
+					width: 100%;
+				}
+				.label{
+					float: left;
+					font-size: $font-size-28;
+					color: #666666;
+					line-height: 180rpx;
+					width: 150rpx;
+					text-align: left;
+				}
+				.upload-picture{
+					float: left;
+					height: 180rpx;
+					.upload-none{
+						width: 180rpx;
+						height: 180rpx;
+						text-align: center;
+						line-height: 180rpx;
+						color: #999999;
+						border: 1px solid #999999;
+						border-radius: 10rpx;
+						margin: 0 20rpx;
+						.iconfont{
+							font-size: 60rpx;
+						}
+					}
+					.upload-image{
+						width: 180rpx;
+						height: 180rpx;
+						border-radius: 6rpx;
+						margin: 0 20rpx;
+						position: relative;
+						image{
+							width: 180rpx;
+							height: 180rpx;
+							border-radius: 6rpx;
+						}
+						.upload-del{
+							width: 40rpx;
+							height: 40rpx;
+							position: absolute;
+							top: -20rpx;
+							right: -20rpx;
+							line-height: 40rpx;
+							text-align: center;
+							.iconfont{
+								font-size: $font-size-32;
+								color: #999999;
+							}
+						}
+					}
+				}
+			}
+			.register-input{
+				width: 654rpx;
+				height: 40rpx;
+				padding: 24rpx;
+				margin: 0 auto;
+				margin-bottom: 60rpx;
+				background: #F7F7F7;
+				border-radius: 14rpx;
+				.input{
+					width: 100%;
+					height: 100%;
+					background: #F7F7F7;
+					font-size: $font-size-28;
+					line-height: 40rpx;
+					color: #333333;
+					border-radius: 14rpx;
+				}
+			}
+			.register-fiexd{
+				width: 100%;
+				height: auto;
+				position: fixed;
+				bottom: 0;
+				left: 0;
+				z-index: 999;
+				background: #FFFFFF;
+			}
+			.register-btn{
+				width: 600rpx;
+				height: 88rpx;
+				border-radius: 44rpx;
+				font-size: $font-size-28;
+				line-height: 88rpx;
+				color: #FFFFFF;
+				margin: 0 auto;
+				text-align: center;
+				background: $btn-confirm;
+				margin-top: 96rpx;
+				&.prev{
+					background:#ffe6dc;
+					color: $color-system;
+					margin-top: 20rpx;
+				}
+				&.none{
+					border: 1px solid $color-system;
+					background: #FFFFFF;
+					color:$color-system;
+					margin-top: 0;
+				}
+				&.sub{
+					margin-top: 0;
+				}
+			}
+		}
+	}
+</style>

pages/login/login.vue

@@ -78,8 +78,15 @@
 			},
 			AorganizationLogin(){
 				this.UserService.AorganizationLogin({mobileOrEmail:this.accountNumber,password:this.password,source:'www'}).then(response =>{
-					this.storeUpdataeStatus(response.data)
-					this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
+					if(response.code === 0){
+						this.storeUpdataeStatus(response.data)
+						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
+					}else if(response.code === -3){
+						this.$util.modal('','您的企业账号审核未通过，请修改资料','前往修改','',false,() =>{
+							this.$store.commit('updateStatus',response.data)
+							this.$api.navigateTo('/pages/login/apply-supplier')
+						})
+					}
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})

pages/login/logincode.vue

@@ -54,22 +54,27 @@
 						invitationCodeLogin(params).then(response =>{
 							this.login(response.data)
 							wxLogin.wxLoginAuthorize()
-							setTimeout(()=>{
-								switch(this.isLoginType){
-									case 9:
-										this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-										break;
-									case 8:
-										this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-										break;
-									case 7:
-										this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-										break;
-									default:
-										this.$api.switchTabTo('/pages/tabBar/user/user')
-								}
-							},1000)
-							
+							if(response.data.userIdentity === 3){
+								setTimeout(()=>{
+									this.$api.navigateTo('/supplier/pages/index/index')
+								},1000)
+							}else{
+								setTimeout(()=>{
+									switch(this.isLoginType){
+										case 9:
+											this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+											break;
+										case 8:
+											this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
+											break;
+										case 7:
+											this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
+											break;
+										default:
+											this.$api.switchTabTo('/pages/tabBar/user/user')
+									}
+								},1000)
+							}
 						}).catch(error =>{
 							this.$util.msg(error.msg,2000)
 							this.isUserInfo = false

pages/login/register-supplier.vue

@@ -120,7 +120,7 @@
 							v-model="threeParmas.address" 
 							placeholder="详细地址：如道路、门牌号、小区等" 
 							placeholder-class="placeholder"
-							maxlength="25"
+							maxlength="40"
 							@input="onTextareaInput"
 							:focus="textareaFocus"
 							@blur="hideTextareaFocus"
@@ -233,7 +233,6 @@
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import supplierAlert from '@/components/cm-module/modelAlert/supplierRegisreAlert.vue'
 	import { supplierList,supplierMedicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationVerifyRegisterFirst } from "@/api/use.js"
 	import { uploadFileImage } from "@/api/utils.js"
 	export default{
 		components:{
@@ -320,18 +319,13 @@
 			...mapMutations(['login']),
 			hanldNavigateBack(){
 				this.$util.modal('','注册尚未完成，确定放弃注册吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
+					this.$api.switchTabTo('/pages/tabBar/home/index')
 				})
 			},
 			// 三级联动选择
 			showMulLinkageThreePicker() {
 				this.isShowInput = true
 				this.$refs.mpvueCityPicker.show()
-			},
-			registerStepsfirst(){
-				
 			},
 			getMobileCodeFn(){
 				if( this.firstParmas.bindMobile == ''){
@@ -489,9 +483,7 @@
 				let postParmas =  Object.assign(this.firstParmas,this.twoParmas,this.threeParmas);
 				this.UserService.appSupplierRegister(postParmas).then(response =>{
 					this.$util.modal('','您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了','',false,() =>{
-						uni.navigateBack({
-							delta: 1
-						});
+						this.$api.switchTabTo('/pages/tabBar/home/index')
 					})
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);

services/ajax.service.js

@@ -26,9 +26,7 @@ class AjaxService {
 			header = Object.assign(header, options.header)
 		}
 		let url = this.getBaseUrl(options.url)
-		let {
-			isLoading = true
-		} = options
+		let { isLoading = true } = options
 		if (isLoading) {
 			wx.showLoading({ title: '加载中' })
 		}
@@ -40,10 +38,14 @@ class AjaxService {
 				header,
 				success: res => {
 					if (isLoading) wx.hideLoading();
-					if (res.data.code === 0) {
+					if(options.isStatus){
 						resolve(res.data)
-					} else {
-						reject(res.data)
+					}else{
+						if (res.data.code === 0) {
+							resolve(res.data)
+						} else {
+							reject(res.data)
+						}
 					}
 				},
 				fail: error => {

services/user.service.js

@@ -21,7 +21,7 @@ export default class UserService {
 	 * @param source 来源 PC与小程序传:'www'crm就传'crm'
 	 */
 	AorganizationLogin (data = {}) {
-		return this.AjaxService.post({ url:'/user/login', data, isLoading: true })
+		return this.AjaxService.post({ url:'/user/login', data, isLoading: true ,isStatus: true})
 	}
 	/**
 	 * @机构-地址列表
@@ -71,7 +71,7 @@ export default class UserService {
 	PostUpdateOperatorCode (data = {}) {
 		return this.AjaxService.post({ url:'/operation/updateInvitationCode', data, isLoading: true })
 	}
-	/* 机构资料 */
+	/* 机构资料*/
 	OrganizationUpdateModifyInfo (data = {}) {
 		return this.AjaxService.get({ url:'/user/club/applicationData', data, isLoading: true })
 	}

supplier/pages/order/order-list.vue

@@ -146,6 +146,7 @@
 					{name:'部分结算',value:'2'},
 					{name:'已结算',value:'3'},
 				],
+				shopID:0,
 				showSendOutStatus:'',
 				showpayStatus:'',
 				CustomBar:this.CustomBar,// 顶部导航栏高度
@@ -180,18 +181,18 @@
 			sendOutStatusType(value) {
 				if (value === null) {
 				  return '未发货';
-				} else if(value === 1) {
+				} else if(value === '1') {
 				  return '待发货';
-				} else if(value === 2) {
+				} else if(value === '2') {
 				  return '部分发货';
 				} else{
 				  return '已发货';
 				}
 			},
 			payStatusType(value) {
-				if (value === 1) {
+				if (value === '1') {
 				  return '待结算';
-				} else if (value === 2) {
+				} else if (value === '2') {
 				  return '部分结算';
 				} else {
 				  return '已结算';
@@ -292,6 +293,7 @@
 			},
 			handSearchClear(){//重置搜索条件
 				this.listQuery = Object.assign({}, defaultListQuery)
+				this.listQuery.shopID = this.shopID
 				this.showSendOutStatus='';
 				this.showpayStatus='';
 				this.listQuery.shopOrderNo='';
@@ -327,7 +329,7 @@
 		},
 		onShow(){
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = resolve.shopID
+				this.listQuery.shopID = this.shopID = resolve.shopID
 				this.getOrderDatainit()
 			})
 		}