commit - m

api/use.js

@@ -60,62 +60,6 @@ export function organizationVerifyRegisterFirst(params) {
 		})
 	});
 }
-/**
- *机构升级会员机构
- */
-export function organizationRegister(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/club/upgrade',params,true, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *机构修改资料
- */
-export function organizationUpdateModifyInfo(params) {
-	return new Promise(function(resolve,reject) {
-		request.lodingGet('/user/club/applicationData',params, res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *机构提交修改申请信息
- */
-export function organizationModifyUpdate(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/user/club/updateCompanyInfo',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
-/**
- *保存机构修改信息
- */
-export function organizationUpdate(params) {
-	return new Promise(function(resolve,reject) {
-		request.post('/operation/modifiedData',params,true,res => {
-			if(res.code == 0){
-				resolve(res)
-			}else{
-				reject(res)
-			}
-		})
-	})
-}
 /**
  *绑定邮箱
  */

components/cm-module/modelAlert/supplierRegisreAlert.vue

@@ -3,6 +3,7 @@
 		<!-- 运费弹窗说明 -->
 		<view class="freight-alert">
 			<view class="content clearfix">
+				<view class="title">供应商注册需知</view>
 				<view class="text">采美采购商城(隶属于采美365网)是美容行业一站式B2B采购交易服务平台，供应商入驻需平台审核。注册说明如下，请您仔细阅读：</view>
 				<view class="text">1、本商城商品需绝对保证正品，谢绝非自营/自有品牌（以登记备案为准），代理商应出具授权书等说明文件，杜绝山寨、假冒伪劣等侵权、侵害他人利益的行为。</view>
 				<view class="text">2、注册需要提供公司名称、营业执照、公司地址、联系人等基本信息。</view>
@@ -83,7 +84,7 @@
 		}
 		.content{
 			width: 580rpx;
-			height: 720rpx;
+			height: 770rpx;
 			position: absolute;
 			left: 0;
 			right: 0;
@@ -91,9 +92,16 @@
 			top: 0;
 			margin: auto;
 			border-radius: 16rpx;
-			padding: 30rpx;
+			padding: 0 30rpx 30rpx 30rpx;
 			box-sizing: border-box;
 			background-color: #FFFFFF;
+			.title{
+				line-height: 80rpx;
+				font-size: $font-size-30;
+				color: #333333;
+				text-align: center;
+				font-weight: bold;
+			}
 			.text{
 				line-height: 44rpx;
 				font-size: $font-size-26;

components/cm-module/supplier/user.vue

@@ -11,7 +11,7 @@
 							<text class="u-tips">供应商</text>
 						</view>
 						<view class="user-item" @click="navigator('/supplier/pages/user/my-shop?shopId='+shopID)">
-							<text class="u-shop">我的店铺</text><text class="iconfont icon-jinrudianpu"></text>
+							<text class="u-shop">进入店铺</text><text class="iconfont icon-jinrudianpu"></text>
 						</view>
 					</view>
 				</view>

pages/login/apply.vue

@@ -56,7 +56,7 @@
 							placeholder-class="placeholder"
 							maxlength="25"
 							@input="onTextareaInput"
-							@focus="textareaFocus"
+							:focus="textareaFocus"
 							@blur="hideTextareaFocus"
 							:class="isShowInput ? '':''"
 				/>
@@ -152,14 +152,6 @@
 						</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>
-				 v-show="isShowAustomItem"-->
 				<view class="register-from group btn" style="height: auto;border: 0;">
 					<view class="content-class btn">
 						<input class="row-input other" type="text" v-model="customItemValue"  placeholder-style="placeholder" placeholder="请输入自定义项目" maxlength="5"/>
@@ -182,17 +174,9 @@
 						</checkbox-group>
 					</view>	
 				</view>	
-				<!-- <view class="register-from group btn" style="height: auto;border: 0;">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view> 
-				v-show="isShowAustomItem"-->
 				<view class="register-from group btn" style="height: auto;border: 0;">
 					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  placeholder-style="placeholder" maxlength="5"/>
+						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义主营内容"  placeholder-style="placeholder" maxlength="5"/>
 						<button type="default" 
 								class="confirm-btn" 
 								@click.stop="addCustomItem"
@@ -219,7 +203,6 @@
 	import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationUpdateModifyInfo , organizationRegister  } from "@/api/use.js"
 	import { uploadFileImage } from "@/api/utils.js" 
 	export default{
 		components:{
@@ -286,7 +269,7 @@
 		onLoad(option) {
 			this.clubStatus = option.clubStatus
 			console.log(this.clubStatus)
-			// this.organizationInfo()
+			this.organizationInfo()
 		},
 		methods:{
 			hanldNavigateBack(){
@@ -299,7 +282,7 @@
 			organizationInfo(){
 				this.$api.getStorage().then((resolve) =>{
 					this.userID = resolve.userID
-					organizationUpdateModifyInfo({userID:this.userID}).then(response =>{
+					this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
 						let organizationClub = response.data.club
 						let organizationUser = response.data.user
 						if(organizationUser.auditNoteList!=null){
@@ -309,21 +292,22 @@
 						this.clubID = organizationUser.clubID
 						this.clubName = this.$reg.checkData(organizationClub.name)
 						this.abbreviation = this.$reg.checkData(organizationClub.sname)
-						if( organizationClub.provinceID == null ){
+						if( organizationClub.provinceID){
 							this.addressData.provinceID = ''
 						}else{
 							this.addressData.provinceID = organizationClub.provinceID
 						}
-						if( organizationClub.cityID == null ){
+						if( organizationClub.cityID){
 							this.addressData.cityID = ''
 						}else{
 							this.addressData.cityID = organizationClub.cityID
 						}
-						if( organizationClub.townID == null ){
+						if( organizationClub.townID){
 							this.addressData.townID = ''
 						}else{
 							this.addressData.townID = organizationClub.townID
 						}
+						console.log('66666666666666')
 						this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress:'请选择机构所在地区'
 						this.addressData.addressDetail = this.$reg.checkData(organizationClub.address)
 						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
@@ -332,7 +316,7 @@
 						this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage) 
 						this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
 						this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
-						this.department = this.$reg.checkData(organizationClub.department)						
+						this.department = this.$reg.checkData(organizationClub.department)		
 						//机构类型&&主营项目
 						switch(this.firstClubType){
 							case '1':
@@ -351,15 +335,17 @@
 						if(organizationClub.mainpro == "" || organizationClub.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(organizationClub.mainpro)
-								this.medicaCampList = this.medicaCampNullList
-								
+								this.medicaCampList = this.medicaCampNullList							
 							}else{
 								this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
 								this.mentuzCampList = this.mentuzCampNullList
 							}
+							this.mainpro = organizationClub.mainpro;
 						}
 						//机构类型
 						switch(this.secondClubType){
@@ -435,7 +421,7 @@
 						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
 						mainpro:this.mainpro,
 				}
-				organizationRegister(params).then(response =>{
+				this.UserService.OrganizationRegister(params).then(response =>{
 					this.$util.msg('您的升级申请已提交审核',2000);
 					setTimeout(()=>{
 						uni.navigateBack();
@@ -592,7 +578,7 @@
 			},
 			addCustomItem(){
 				if(this.customItemValue==''){
-					this.$util.msg('请输入自定义项目',2000);
+					this.$util.msg('请输入自定义主营内容',2000);
 				}else{
 					if(this.isOrganizationType == 1){
 						let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}

pages/login/information.vue

@@ -252,7 +252,6 @@
 	import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationUpdateModifyInfo , organizationUpdate  } from "@/api/use.js"
 	import { getClubMobileCode,getClubNewMobileCode,uploadFileImage } from "@/api/utils.js" 
 	var self;
 	export default{
@@ -334,7 +333,7 @@
 			organizationInfo(){
 				this.$api.getStorage().then((resolve) =>{
 					this.userID = resolve.userID
-					organizationUpdateModifyInfo({userID:this.userID}).then(response =>{
+					this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
 						let organizationClub = response.data.club
 						let organizationUser = response.data.user
 						this.email = organizationUser.email ? organizationUser.email :''	
@@ -458,7 +457,7 @@
 							info : this.companyPprofile
 					}
 				}
-				organizationUpdate(params).then(response =>{
+				this.UserService.OrganizationUpdate(params).then(response =>{
 					this.$util.msg('修改成功',2000,true,'success')
 					setTimeout(()=>{
 						uni.navigateBack();

pages/login/register-supplier.vue

@@ -130,7 +130,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="threeParmas.socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="20"/>
+					<input class="row-input" type="text" v-model="threeParmas.socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -233,7 +233,7 @@
 	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,organizationRegister } from "@/api/use.js"
+	import { organizationVerifyRegisterFirst } from "@/api/use.js"
 	import { uploadFileImage } from "@/api/utils.js"
 	export default{
 		components:{
@@ -335,7 +335,7 @@
 			},
 			getMobileCodeFn(){
 				if( this.firstParmas.bindMobile == ''){
-					this.$util.msg('请输入手机号',2000);
+					this.$util.msg('请输入联系人常用手机号',2000);
 					return
 				}
 				if(!this.$reg.isMobile(this.firstParmas.bindMobile)){
@@ -401,11 +401,11 @@
 			},
 			SupplierRegisteredFirst(){//供应商注册第一步
 				if( this.firstParmas.bindMobile == ''){
-					this.$util.msg('请输入手机号',2000);
+					this.$util.msg('请输入联系人常用手机号',2000);
 					return
 				}
 				if(!this.$reg.isMobile(this.firstParmas.bindMobile)){
-					this.$util.msg('手机格式不正确',2000);
+					this.$util.msg('请输入正确的手机号',2000);
 					return
 				}
 				if( this.firstParmas.mobileCode == ''){

pages/login/register.vue

@@ -71,7 +71,7 @@
 	import wxLogin from "@/common/config/wxLogin.js"
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationVerifyRegisterFirst,organizationRegister } from "@/api/use.js"
+	import { organizationVerifyRegisterFirst } from "@/api/use.js"
 	import { getRegisterMobileCode, uploadFileImage } from "@/api/utils.js"
 	export default{
 		components:{

seller/pages/login/apply.vue

@@ -271,7 +271,6 @@
 import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationUpdateModifyInfo , organizationRegister ,organizationUpdate } from "@/api/use.js"
 	import { uploadFileImage } from "@/api/utils.js" 
 	export default{
 		components:{
@@ -352,7 +351,7 @@ import { mapMutations } from 'vuex';
 				})
 			},
 			organizationInfo(){
-				organizationUpdateModifyInfo({userID:this.userID}).then(response =>{
+				this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
 					let organizationClub = response.data.club
 					let organizationUser = response.data.user
 					this.clubStatus = organizationClub.status
@@ -450,7 +449,7 @@ import { mapMutations } from 'vuex';
 							contractPhone:this.clubTelePhone,
 							info : this.companyPprofile,
 						}		
-					organizationUpdate(params).then(response =>{
+					this.UserService.OrganizationUpdate(params).then(response =>{
 						this.$util.msg('修改成功',2000,true,'success')
 						setTimeout(()=>{
 							uni.navigateBack({delta: 1})
@@ -529,7 +528,7 @@ import { mapMutations } from 'vuex';
 						contractPhone:this.clubTelePhone,
 						info : this.companyPprofile,
 				}
-				organizationRegister(params).then(response =>{
+				this.UserService.OrganizationRegister(params).then(response =>{
 					this.$util.msg('您的升级申请已提交审核',2000);
 					setTimeout(()=>{
 						uni.navigateBack({delta: 1})

seller/pages/login/information.vue

@@ -251,7 +251,6 @@
 	import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationUpdateModifyInfo , organizationUpdate } from "@/api/use.js"
 	import { uploadFileImage } from "@/api/utils.js" 
 	export default{
 		components:{
@@ -329,7 +328,7 @@
 				})
 			},
 			organizationInfo(){
-				organizationUpdateModifyInfo({userID:this.userID}).then(response =>{
+				this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
 					let organizationClub = response.data.club
 					let organizationUser = response.data.user
 					this.clubID = organizationUser.clubID
@@ -440,7 +439,7 @@
 						contractPhone:this.clubTelePhone,
 						info : this.companyPprofile,
 					}
-				organizationUpdate(params).then(response =>{
+				this.UserService.OrganizationUpdate(params).then(response =>{
 					this.$util.msg('修改成功',2000,true,'success')
 					setTimeout(()=>{
 						uni.navigateBack({

services/user.service.js

@@ -71,5 +71,18 @@ 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 })
+	}
+	/* 机构升级会员机构 */
+	OrganizationRegister (data = {}) {
+		return this.AjaxService.post({ url:'/club/upgrade', data, isLoading: true })
+	}
+	/* 机构提交资料修改 */
+	OrganizationUpdate (data = {}) {
+		return this.AjaxService.post({ url:'/operation/modifiedData', data, isLoading: true })
+	}
+	
 	
 }

supplier/pages/user/my-shop.vue

@@ -273,6 +273,7 @@
 		},
 		onLoad(option) {
 			this.listQuery.id = this.supplierId = option.shopId
+			console.log(this.supplierId)
 			this.$api.getStorage().then((resolve) =>{
 				this.shopId = resolve.shopID ? resolve.shopID : 0
 				this.userID = resolve.userID ? resolve.userID : 0

supplier/pages/user/supplier.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container all-type-list-wrapper">
-		<supplier-details :shopUserId="shopUserId" v-if="isLoading"></supplier-details>
+		<supplier-details :shopId="shopId" v-if="isLoading"></supplier-details>
 	</view>
 </template>
 
@@ -12,14 +12,13 @@
 		},
 		data(){
 			return{
-				shopUserId:0,
+				shopId:0,
 				shopInfo:{},
 				isLoading:false
 			}
 		},		
 		onLoad(option) {
-			console.log(option.shopUserId)
-			this.shopUserId = option.shopUserId
+			this.shopId = option.shopId
 			this.isLoading = true
 		},
 		methods:{