commit-m 超级会员

common/json/data.json.js

@@ -1,39 +1,47 @@
-const beautyList =  [
-						{value:1,name:'诊所'},
-						{value:2,name:'门诊'},
-						{value:3,name:'医院'},
-					]
+const beautyList = [
+    { value: 1, name: '诊所' },
+    { value: 2, name: '门诊' },
+    { value: 3, name: '医院' },
+    { value: 4, name: '其他' }
+]
+const beautyLists = [
+    { value: 1, name: '美容院' },
+    { value: 2, name: '养生馆' },
+    { value: 3, name: '其他' }
+]
 const mentuzCampNullList = [
-						{value:'1',name:'整形'},
-						{value:'2',name:'轻医美'},
-						{value:'3',name:'皮肤科'},
-					]
+    { value: '1', name: '整形' },
+    { value: '2', name: '轻医美' },
+    { value: '3', name: '皮肤科' }
+]
 const medicaCampNullList = [
-						{value:'1',name:'美容'},
-						{value:'2',name:'美体'},
-						{value:'3',name:'美发'},
-						{value:'4',name:'皮肤管理'},
-						{value:'5',name:'光电'},
-						{value:'6',name:'综合类'},
-						{value:'7',name:'中医养生'},
-						{value:'8',name:'spa'},
-					]
+    { value: '1', name: '美容' },
+    { value: '2', name: '美体' },
+    { value: '3', name: '美发' },
+    { value: '4', name: '皮肤管理' },
+    { value: '5', name: '光电' },
+    { value: '6', name: '综合类' },
+    { value: '7', name: '中医养生' },
+    { value: '8', name: 'spa' },
+    { value: '9', name: '产后修复' }
+]
 
 const supplierList = [
-						{value:1,name:'一类器械'},
-						{value:2,name:'二类器械'},
-						{value:3,name:'三类器械'},
-						{value:4,name:'其他'},
-					]
+    { value: 1, name: '一类器械' },
+    { value: 2, name: '二类器械' },
+    { value: 3, name: '三类器械' },
+    { value: 4, name: '其他' }
+]
 const supplierMedicaCampNullList = [
-						{value:'1',name:'产品'},
-						{value:'2',name:'仪器'},
-						{value:'3',name:'服务'},
-					]
+    { value: '1', name: '产品' },
+    { value: '2', name: '仪器' },
+    { value: '3', name: '服务' }
+]
 module.exports = {
-	beautyList,
-	mentuzCampNullList,
-	medicaCampNullList,
-	supplierList,
-	supplierMedicaCampNullList
-}
+    beautyList,
+    beautyLists,
+    mentuzCampNullList,
+    medicaCampNullList,
+    supplierList,
+    supplierMedicaCampNullList
+}

components/cm-module/activity/activityBean.vue

@@ -56,7 +56,7 @@
 				type: String,
 				default: ""
 			},
-			beansType:{//根据类型设置背景图片:1注册机构，2升级会员机构，3普通机构修改资料，4会员机构修改资料，5下单成功，6线上支付成功，7确认收货成功
+			beansType:{//根据类型设置背景图片:1注册机构，2升级资质机构，3个人机构修改资料，4资质机构修改资料，5下单成功，6线上支付成功，7确认收货成功
 				type: Number,
 				default: 1
 			},

components/cm-module/listTemplate/classifyProductList.vue

@@ -216,7 +216,7 @@
 			},
 			getProductPrice(){//获取价格
 				let productIdArr = [];
-				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
+				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对资质机构公开
 					productIdArr.push(item.productID)
 				})
 				this.productIds = productIdArr.join(",");

components/cm-module/listTemplate/immediatelyList.vue

@@ -310,7 +310,7 @@
 			getProductPrice(){//获取商品或者活动价格
 				let productIdArr = [];
 				let productIds ='';
-				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
+				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对资质机构公开
 					productIdArr.push(item.productId)
 				})
 				productIds = productIdArr.join(",");

components/cm-module/productDetails/cm-price.vue

@@ -38,7 +38,7 @@
 					</view>
 				</view>		
 			</template>	
-			<!-- 会员机构  -->
+			<!-- 资质机构  -->
 			<template v-if="userIdentity == 2">
 				<view class="wrap-main-item">
 					<view v-if="product.priceFlag == 1" class="wrap-main-text">￥未公开价格</view>
@@ -84,7 +84,7 @@
 					</view>
 				</template>	
 			</template>
-			<!-- 普通机构  -->
+			<!-- 个人机构  -->
 			<template v-if="userIdentity == 4">
 				<template v-if="product.priceFlag == 1">
 					<text class="wrap-main-text">￥未公开价格</text>

components/cm-module/productDetails/cm-product-doc.vue

@@ -156,7 +156,7 @@ export default {
             ],
             showModal: false,
             //用户信息相关
-            permission: 5, //用户权限  0可查看，1未登录，2需升级会员机构，3需升级医美会员机构，4需要抵扣采美豆，5无权限查看
+            permission: 5, //用户权限  0可查看，1未登录，2需升级资质机构，3需升级医美资质机构，4需要抵扣采美豆，5无权限查看
             imageArchiveList: [], // 图片资料列表
             videoArchiveList: [], // 视频资料列表
             fileArchiveList: [], // 文件资料列表
@@ -173,12 +173,12 @@ export default {
             const statusText = [
                 false, // 正常访问
                 { text: '请登录后查看！', btn: '去登录', redirect: '/pages/login/login' },
-                { text: '请升级成为会员机构后方可查看！', btn: '去升级', redirect: '/pages/login/apply' },
-                { text: '请升级成为医美会员机构后方可查看！', btn: '去升级', redirect: '/pages/login/apply' },
+                { text: '请升级成为资质机构后方可查看！', btn: '去升级', redirect: '/pages/login/apply' },
+                { text: '请升级成为医美资质机构后方可查看！', btn: '去升级', redirect: '/pages/login/apply' },
                 { text: '需抵扣100采美豆方可查看！', btn: '去查看', redirect: 10 },
                 { text: '无权限查看！', btn: '确认' }
             ]
-            // 0可查看，1未登录，2需升级会员机构，3需升级医美会员机构，4需要抵扣采美豆，5无权限查看
+            // 0可查看，1未登录，2需升级资质机构，3需升级医美资质机构，4需要抵扣采美豆，5无权限查看
             return statusText[this.permission]
         }
     },
@@ -300,7 +300,7 @@ export default {
         },
         //用户权限校验拦截
         checkPermission() {
-            //permission:查看权限:0可查看，1未登录，2需升级会员机构，3需升级医美会员机构，4需要抵扣采美豆，5无权限查看
+            //permission:查看权限:0可查看，1未登录，2需升级资质机构，3需升级医美资质机构，4需要抵扣采美豆，5无权限查看
             const _self = this
             // 如果 TipStatus 返回false 就放行
             if (!_self.TipStatus) return 0

pages.json

@@ -184,7 +184,7 @@
                 {
                     "path": "apply",
                     "style": {
-                        "navigationBarTitleText": "升级会员机构",
+                        "navigationBarTitleText": "升级资质机构",
                         "navigationStyle": "custom"
                     }
                 },
@@ -404,7 +404,40 @@
                         "navigationBarTitleText": "收藏商品",
                         "enablePullDownRefresh": true
                     }
-                }
+                },
+				{
+				    "path": "member/member",
+				    "style": {
+				        "navigationBarTitleText": "采美超级会员",
+				        "enablePullDownRefresh": true
+				    }
+				},
+				{
+				    "path": "member/member-renew",
+				    "style": {
+				        "navigationBarTitleText": "购买超级会员"
+				    }
+				},
+				{
+				    "path": "member/member-record",
+				    "style": {
+				        "navigationBarTitleText": "购买记录",
+				        "enablePullDownRefresh": true
+				    }
+				},
+				{
+				    "path": "member/member-pay",
+				    "style": {
+				        "navigationBarTitleText": "支付超级会员"
+				    }
+				},
+				{
+				    "path": "member/member-product",
+				    "style": {
+				        "navigationBarTitleText": "优惠商品",
+				        "enablePullDownRefresh": true
+				    }
+				}
             ]
         },
         {
@@ -526,13 +559,13 @@
                 {
                     "path": "login/register-general",
                     "style": {
-                        "navigationBarTitleText": "普通机构"
+                        "navigationBarTitleText": "个人机构"
                     }
                 },
                 {
                     "path": "login/register-member",
                     "style": {
-                        "navigationBarTitleText": "会员机构"
+                        "navigationBarTitleText": "资质机构"
                     }
                 },
                 {
@@ -571,6 +604,24 @@
                     "style": {
                         "navigationBarTitleText": "添加地址"
                     }
+                },
+                {
+                    "path": "remarks/list",
+                    "style": {
+                        "navigationBarTitleText": "资料备注"
+                    }
+                },
+                {
+                    "path": "remarks/add",
+                    "style": {
+                        "navigationBarTitleText": "添加备注"
+                    }
+                },
+                {
+                    "path": "remarks/details",
+                    "style": {
+                        "navigationBarTitleText": "备注详情"
+                    }
                 }
             ]
         },

pages/goods/goods-classify.vue

@@ -354,7 +354,7 @@
 			},	
 			GetProductPrice(){//获取价格
 				let productIdArr = [];
-				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
+				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对资质机构公开
 					productIdArr.push(item.productId)
 				})
 				this.priceLoading = true;

pages/login/apply.vue

@@ -1,85 +1,116 @@
 <template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
+	<view class="container register" :style="{ paddingTop: CustomBar + 'px' }">
+		<cu-custom :navbar-data="nvabarData" @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="register-main title clearfix">
 			<view class="register-row none clearfix">
-				<view class="register-title first"><text>补充以下详细信息即可升级为会员机构，享受更多更好的服务。</text></view>
+				<view class="register-title first"
+					><text>补充以下详细信息即可升级为资质机构，享受更多更好的服务。</text></view
+				>
 				<view class="register-title"><text></text></view>
-			</view>	
-		</view>	
+			</view>
+		</view>
 		<view class="register-main clearfix" v-if="clubStatus == 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>
+					<text class="error-item" v-for="(item, index) in errorList" :key="index"> {{ item }} </text>
 				</view>
-			</view>	
-		</view>	
+			</view>
+		</view>
 		<view class="register-main detailed clearfix">
 			<view class="register-row none clearfix">
 				<view class="register-from">
 					<view class="label">邮箱</view>
-					<input class="row-input" type="text" name="input" v-model="contractEmail" placeholder="请输入您的常用邮箱"placeholder-class="placeholder" maxlength="30"/>
+					<input
+						class="row-input"
+						type="text"
+						name="input"
+						v-model="contractEmail"
+						placeholder="请输入您的常用邮箱"
+						placeholder-class="placeholder"
+						maxlength="30"
+					/>
 				</view>
 				<view class="register-tip"><text>提示：邮箱可用作登录账号，请使用公司邮箱或法人邮箱</text></view>
 			</view>
 			<view class="register-row none clearfix">
 				<view class="register-from">
 					<view class="label">机构名称</view>
-					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" placeholder-class="placeholder" maxlength="30"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="clubName"
+						placeholder="请输入您的机构名称"
+						placeholder-class="placeholder"
+						maxlength="30"
+					/>
 				</view>
 				<view class="register-tip"><text>示例：深圳市美丽人生医疗美容有限公司</text></view>
 			</view>
 			<view class="register-row none clearfix">
 				<view class="register-from">
 					<view class="label">机构简称</view>
-					<input class="row-input" type="text" v-model="shortName" placeholder="请输入姓名或常用名" placeholder-class="placeholder" maxlength="10"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="shortName"
+						placeholder="请输入姓名或常用名"
+						placeholder-class="placeholder"
+						maxlength="10"
+					/>
 				</view>
 				<view class="register-tip"><text>示例：美丽人生</text></view>
 			</view>
 			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
+				<view class="register-from" @click="showMulLinkageThreePicker">
 					<view class="label">机构地址</view>
 					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{addressData.address }}
-					</text>		
+						{{ addressData.address }}
+					</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" >{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="addressData.addressDetail" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="25"
-							@input="onTextareaInput"
-							:focus="textareaFocus"
-							@blur="hideTextareaFocus"
-							:class="isShowInput ? '':''"
+				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{
+					addressData.addressDetail ? addressData.addressDetail : '详细地址：如道路、门牌号、小区等'
+				}}</view>
+				<textarea
+					v-else
+					class="textarea"
+					type="text"
+					v-model="addressData.addressDetail"
+					placeholder="详细地址：如道路、门牌号、小区等"
+					placeholder-class="placeholder"
+					maxlength="25"
+					@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 code" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
+					<input
+						class="row-input code"
+						type="text"
+						v-model="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="businessLicense === ''"  @click="chooseBusinessImage">
+						<view class="upload-none" v-if="businessLicense === ''" @click="chooseBusinessImage">
 							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="businessLicense" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
@@ -93,9 +124,9 @@
 							<image src="https://static.caimei365.com/app/img/upload/club-door.png"></image>
 						</view>
 						<view class="upload-image" v-else>
-							<image :src="shopPhoto" mode=""  @click="viewMentuzImage"></image>
+							<image :src="shopPhoto" mode="" @click="viewMentuzImage"></image>
 							<view class="upload-del" @click="delMentuzImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
@@ -106,17 +137,41 @@
 					<view class="label">机构类型</view>
 					<view class="row-input picker">
 						<radio-group @change="bindPickerChange">
-							 <label class="label-radio" v-for="(item, index) in typename" :key="item.value">
-								 <radio class="row-radio" :value="item.value" :checked="item.value === isOrganizationType" color='#E15616'/>{{item.name }}
-							 </label>
+							<label class="label-radio" v-for="(item, index) in typename" :key="item.value">
+								<radio
+									class="row-radio"
+									:value="item.value"
+									:checked="item.value === isOrganizationType"
+									color="#E15616"
+								/>{{ item.name }}
+							</label>
 						</radio-group>
 					</view>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from noneborder second">
-					<view class="secondTyperadio" v-for="(item,index) in beautyList" :key="item.value" @click="radioChange(item)" :class="item.value==secondClubType?'active':''">
-						<view class="secondRadio" >{{item.name}}</view>
+					<view
+						class="secondTyperadio"
+						v-for="(item, index) in beautyList"
+						:key="item.value"
+						@click="radioChange(item)"
+						:class="item.value == secondClubType ? 'active' : ''"
+					>
+						<view class="secondRadio">{{ item.name }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="register-row clearfix" v-if="isOrganizationType == 2">
+				<view class="register-from noneborder second">
+					<view
+						class="secondTyperadio"
+						v-for="(item, index) in beautyLists"
+						:key="item.value"
+						@click="radioChange(item)"
+						:class="item.value == secondClubType ? 'active' : ''"
+					>
+						<view class="secondRadio">{{ item.name }}</view>
 					</view>
 				</view>
 			</view>
@@ -126,41 +181,56 @@
 					<view class="upload-picture">
 						<view class="upload-none" v-if="medicalPracticeLicense === ''" @click="chooseMedicalImage">
 							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
-							</view>
+						</view>
 						<view class="upload-image" v-else>
-							<image :src="medicalPracticeLicense" mode=""  @click="viewMedicalImage"></image>
+							<image :src="medicalPracticeLicense" mode="" @click="viewMedicalImage"></image>
 							<view class="upload-del" @click="delMedicalImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<view class="register-row clearfix" v-show="isDepartment">
+			<view class="register-row clearfix" v-show="firstClubType == 1 && isDepartment">
 				<view class="register-from" style="height: auto;border: 0;">
-					<view class="kes-title" >科室</view>
-					<textarea class="keshi"  placeholder="请填写经营的科室，至少三个，用逗号隔开" placeholder-style="placeholder" v-model="department" maxlength="16"></textarea>
+					<view class="kes-title">科室</view>
+					<textarea
+						class="keshi"
+						placeholder="请填写经营的科室，至少三个，用逗号隔开"
+						placeholder-style="placeholder"
+						v-model="department"
+						maxlength="16"
+					></textarea>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-from group"style="height: auto;border: 0;">
+				<view class="register-from group" style="height: auto;border: 0;">
 					<view class="label">主营内容</view>
 					<view class="content-class">
-						<checkbox-group @change="chooseMaleLike" >
-							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox class="item-checkbox" :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
+						<checkbox-group @change="chooseMaleLike">
+							<label
+								class="item"
+								v-for="(item, index) in mentuzCampList"
+								:key="index"
+								:class="{ on: item.checked }"
+							>
+								<checkbox class="item-checkbox" :value="item.value"></checkbox>
+								<text class="item-text">{{ item.name }}</text>
 							</label>
 						</checkbox-group>
-					</view>	
-				</view>	
+					</view>
+				</view>
 				<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"/>
-						<button type="default" 
-								class="confirm-btn" 
-								@click.stop="addCustomItem"
-						>确认添加</button>
+						<input
+							class="row-input other"
+							type="text"
+							v-model="customItemValue"
+							placeholder-style="placeholder"
+							placeholder="请输入自定义主营内容"
+							maxlength="5"
+						/>
+						<button type="default" class="confirm-btn" @click.stop="addCustomItem">确认添加</button>
 					</view>
 				</view>
 			</view>
@@ -169,39 +239,53 @@
 					<view class="label">主营内容</view>
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
-							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox class="item-checkbox" :value="item.value" :checked="item.checked"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
+							<label
+								class="item"
+								v-for="(item, index) in medicaCampList"
+								:key="index"
+								:class="{ on: item.checked }"
+							>
+								<checkbox class="item-checkbox" :value="item.value" :checked="item.checked"></checkbox>
+								<text class="item-text">{{ item.name }}</text>
 							</label>
 						</checkbox-group>
-					</view>	
-				</view>	
+					</view>
+				</view>
 				<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"/>
-						<button type="default" 
-								class="confirm-btn" 
-								@click.stop="addCustomItem"
-						>确认添加</button>
+						<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">确认添加</button>
 					</view>
 				</view>
 			</view>
-			<view class="register-fiexd clearfix" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx'}">
+			<view class="register-fiexd clearfix" :style="{ paddingBottom: isIphoneX ? '68rpx' : '36rpx' }">
 				<view class="register-row ">
 					<view class="register-btn sub" @click.stop="organizationUpdateInfo">确认升级并提交审核</view>
 				</view>
 			</view>
-			<mpvue-city-picker :themeColor="themeColor"
-								ref="mpvueCityPicker" 
-							    :pickerValueDefault="cityPickerValueDefault"
-								@onCancel="onCancel" 
-								@onConfirm="onConfirm">
+			<mpvue-city-picker
+				:themeColor="themeColor"
+				ref="mpvueCityPicker"
+				:pickerValueDefault="cityPickerValueDefault"
+				@onCancel="onCancel"
+				@onConfirm="onConfirm"
+			>
 			</mpvue-city-picker>
 		</view>
 		<!-- 提交审核提示弹窗 -->
 		<view class="tui-alert-box" v-if="isConfirmShow">
 			<view class="tui-alert-content">
-				<view class="tui-alert-main">升级信息提交成功，审核通过后您的身份将成为会员机构，并且获得<text class="red">500</text>采美豆的奖励</view>
+				<view class="tui-alert-main"
+					>升级信息提交成功，审核通过后您的身份将成为资质机构，并且获得<text class="red">500</text
+					>采美豆的奖励</view
+				>
 				<view class="tui-alert-btn" @click="handleClick">知道了</view>
 			</view>
 		</view>
@@ -209,1006 +293,1039 @@
 </template>
 
 <script>
-	import { mapMutations } from 'vuex';
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/services/public.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,	
-				clubStatus:'',			//审核状态
-				isPreviewImage:false,   //预览图片开关
-				userId:'',				//用户ID
-				clubId:'',				//会所ID
-				contractEmail:'',		//邮箱
-				clubName:'',	 		//机构名称
-				shortName:'',	 	//机构简称
-				socialCreditCode:'',	//统一社会信用代码
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				businessLicense:'https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1306508493,2006189766&fm=26&gp=0.jpg',	//营业执照图片
-				shopPhoto:'',  	//门头照图片
-				medicalPracticeLicense:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainProduct:'',				//主营内容
-				firstClubType:'',		//机构类型
-				isOrganizationType:0,
-				organizationTypeText:'请选择机构类型',
-				beautyList:beautyList,//医美分类
-				mentuzCampNullList:mentuzCampNullList,//医美分类
-				medicaCampNullList:medicaCampNullList,//生美分类
-				mentuzCampList:[],		//医美主营
-				medicaCampList:[],		//生美主营
-				typtIndex:0,
-				organizationType:0,
-				current:0,
-				isShowAustomItem:false, //是否显示其他添加
-				customItemValue:'', 	//自定义项目
-				isMainproCheck:false,
-				isConfirmShow:false,
-				addressData:{
-					address:'请选择机构所在地区',
-					townId:'',			//区ID
-					cityId:'',			//市ID
-					provinceId:'',		//省ID
-					addressDetail: '',	//地址详情
-				},
-				typename:[
-					{name:'医美',value:1},
-					{name:'生美',value:2}
-				],
-			}	
-		},
-		onLoad(option) {
-			this.clubStatus = option.clubStatus
-			console.log(this.clubStatus)
-			this.organizationInfo()
-		},
-		methods:{
-			hanldNavigateBack(){
-				this.$util.modal('','资料尚未提交审核，确定放弃升级吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
-				})
+import { mapMutations } from 'vuex'
+import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+import { beautyList, beautyLists, mentuzCampNullList, medicaCampNullList } from '@/common/json/data.json.js' //本地数据
+import { uploadFileImage } from '@/services/public.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,
+			clubStatus: '', //审核状态
+			isPreviewImage: false, //预览图片开关
+			userId: '', //用户ID
+			clubId: '', //会所ID
+			contractEmail: '', //邮箱
+			clubName: '', //机构名称
+			shortName: '', //机构简称
+			socialCreditCode: '', //统一社会信用代码
+			isDisabled: true,
+			isShowInput: true,
+			textareaFocus: false,
+			businessLicense:
+				'https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1306508493,2006189766&fm=26&gp=0.jpg', //营业执照图片
+			shopPhoto: '', //门头照图片
+			medicalPracticeLicense: '', //资质照图片
+			department: '', //科室
+			isDepartment: false, //是否显示科室
+			secondClubType: '', //机构类型二级分类
+			mainProduct: '', //主营内容
+			firstClubType: '', //机构类型
+			isOrganizationType: 0,
+			organizationTypeText: '请选择机构类型',
+			beautyList: beautyList, //医美分类
+			beautyLists: beautyLists, //生美分类
+			mentuzCampNullList: mentuzCampNullList, //医美分类
+			medicaCampNullList: medicaCampNullList, //生美分类
+			mentuzCampList: [], //医美主营
+			medicaCampList: [], //生美主营
+			typtIndex: 0,
+			organizationType: 0,
+			current: 0,
+			isShowAustomItem: false, //是否显示其他添加
+			customItemValue: '', //自定义项目
+			isMainproCheck: false,
+			isConfirmShow: false,
+			addressData: {
+				address: '请选择机构所在地区',
+				townId: '', //区ID
+				cityId: '', //市ID
+				provinceId: '', //省ID
+				addressDetail: '' //地址详情
 			},
-			organizationInfo(){
-				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userId ? resolve.userId : 0
-					this.UserService.OrganizationUpdateModifyInfo({userId:this.userId}).then(response =>{
+			typename: [{ name: '医美', value: 1 }, { name: '生美', value: 2 }]
+		}
+	},
+	onLoad(option) {
+		this.clubStatus = option.clubStatus
+		console.log(this.clubStatus)
+		this.organizationInfo()
+	},
+	methods: {
+		hanldNavigateBack() {
+			this.$util.modal('', '资料尚未提交审核，确定放弃升级吗？', '确定', '取消', true, () => {
+				uni.navigateBack({
+					delta: 1
+				})
+			})
+		},
+		organizationInfo() {
+			this.$api.getStorage().then(resolve => {
+				this.userId = resolve.userId ? resolve.userId : 0
+				this.UserService.OrganizationUpdateModifyInfo({ userId: this.userId })
+					.then(response => {
 						let organizationClub = response.data.club
 						let organizationUser = response.data.user
-						if(organizationUser.auditNoteList!=null){
-							this.errorList =organizationUser.auditNoteList
+						if (organizationUser.auditNoteList != null) {
+							this.errorList = organizationUser.auditNoteList
 						}
-						this.contractEmail = organizationClub.contractEmail	
+						this.contractEmail = organizationClub.contractEmail
 						console.log(this.contractEmail)
 						this.clubId = organizationUser.clubId
-						if(this.contractEmail){
+						if (this.contractEmail) {
 							this.clubName = this.$reg.checkData(organizationClub.name)
-						}else{
+						} else {
 							this.clubName = ''
 						}
 						this.shortName = this.$reg.checkData(organizationClub.shortName)
-						if( organizationClub.provinceId==''||organizationClub.provinceId==null){
+						if (organizationClub.provinceId == '' || organizationClub.provinceId == null) {
 							this.addressData.provinceId = ''
-						}else{
+						} else {
 							this.addressData.provinceId = organizationClub.provinceId
 						}
-						if( organizationClub.cityId==''||organizationClub.cityId===null){
+						if (organizationClub.cityId == '' || organizationClub.cityId === null) {
 							this.addressData.cityId = ''
-						}else{
+						} else {
 							this.addressData.cityId = organizationClub.cityId
 						}
-						if( organizationClub.townId==''||organizationClub.townId==null){
+						if (organizationClub.townId == '' || organizationClub.townId == null) {
 							this.addressData.townId = ''
-						}else{
+						} else {
 							this.addressData.townId = organizationClub.townId
 						}
-						this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress:'请选择机构所在地区'
+						this.addressData.address = organizationClub.provincialAddress
+							? organizationClub.provincialAddress
+							: '请选择机构所在地区'
 						this.addressData.addressDetail = this.$reg.checkData(organizationClub.address)
 						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 						this.firstClubType = organizationClub.firstClubType
 						this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
-						this.businessLicense = this.$reg.checkData(organizationClub.businessLicense) 
+						this.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
 						this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
 						this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
-						this.department = this.$reg.checkData(organizationClub.department)		
+						this.department = this.$reg.checkData(organizationClub.department)
 						//机构类型&&主营项目
-						switch(this.firstClubType){
+						switch (this.firstClubType) {
 							case 1:
 								this.organizationTypeText = '医美'
 								this.isOrganizationType = 1
-								break;
+								break
 							case 2:
 								this.organizationTypeText = '生美'
 								this.isOrganizationType = 2
-								break;
+								break
 							case null:
 								this.organizationTypeText = '请选择机构类型'
 								this.isOrganizationType = 0
-								break;
-						}	
-						if(organizationClub.mainProduct == "" || organizationClub.mainProduct == null){
+								break
+						}
+						if (organizationClub.mainProduct == '' || organizationClub.mainProduct == null) {
 							this.mentuzCampList = this.mentuzCampNullList
 							this.medicaCampList = this.medicaCampNullList
-						}else{
-							if(this.firstClubType == 1){
+						} else {
+							if (this.firstClubType == 1) {
 								this.mentuzCampList = this.setNewMainpro(organizationClub.mainProduct)
-								this.medicaCampList = this.medicaCampNullList							
-							}else{
+								this.medicaCampList = this.medicaCampNullList
+							} else {
 								this.medicaCampList = this.setNewMainpro(organizationClub.mainProduct)
 								this.mentuzCampList = this.mentuzCampNullList
 							}
-							this.mainProduct = organizationClub.mainProduct;
+							this.mainProduct = organizationClub.mainProduct
 						}
 						//机构类型
-						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;
+						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.mainProduct = mainproList.join('/')
-				}
-				if( this.contractEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if( !this.$reg.isEmail(this.contractEmail)){
-					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
+					.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)
+					})
 				}
-				if( this.businessLicense == ''){
-					this.$util.msg('请上传您的营业执照',2000);
+				this.mainProduct = mainproList.join('/')
+			}
+			if (this.contractEmail == '') {
+				this.$util.msg('请输入邮箱地址', 2000)
+				return
+			}
+			if (!this.$reg.isEmail(this.contractEmail)) {
+				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.businessLicense == '') {
+				this.$util.msg('请上传您的营业执照', 2000)
+				return
+			}
+			if (this.isOrganizationType != 0) {
+				if (this.mainProduct == '') {
+					this.$util.msg('请选择住机构主营内容', 2000)
 					return
 				}
-				if(this.isOrganizationType!=0){
-					if(this.mainProduct == ''){
-						this.$util.msg('请选择住机构主营内容',2000);
-						return
-					}
-				}
-				let params ={
-						userId:this.userId,
-						clubId:this.clubId,					//会所ID
-						contractEmail:this.contractEmail,
-						name:this.clubName,
-						shortName:this.shortName,
-						provinceId:this.addressData.provinceId,
-						cityId:this.addressData.cityId,
-						townId:this.addressData.townId,
-						address:this.addressData.addressDetail,
-						socialCreditCode:this.socialCreditCode,
-						businessLicense:this.businessLicense,
-						shopPhoto:this.shopPhoto,
-						firstClubType:this.isOrganizationType,  //机构类型分类 医美:1和生美:2
-						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
-						department:this.department,				//科室
-						medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
-						mainProduct:this.mainProduct,
-				}
-				// 友盟埋点普通机构确认升级点击事件
-				if(process.env.NODE_ENV != 'development'){
-					this.$uma.trackEvent('Um_Event_ConfirmClubUpgrade', {
-						Um_Key_ClubName: `${this.clubName}`,
-						Um_Key_PageName: '普通机构确认升级',
-						Um_Key_SourcePage: '升级页面',
-					})
-				}
-				this.UserService.OrganizationRegister(params).then(response =>{
-					this.isConfirmShow = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			handleClick(){//隐藏提示弹窗
-				this.isConfirmShow = false
-				setTimeout(()=>{
-					uni.navigateBack();
-				},2000)
-			},
-			// 三级联动选择
-			showMulLinkageThreePicker() {
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {
-				this.addressData.address = e.name;
-				this.addressData.townId = e.townCode;
-				this.addressData.cityId = e.cityCode;
-				this.addressData.provinceId = e.provinceCode;
-			},	
-			onTextareaInput(e){
-			   this.addressData.addressDetail = e.detail.value;
-			},
-			showTextareaFocus(){//文本框获取焦点
-				this.isShowInput = false
-				this.textareaFocus = true
-			},
-			hideTextareaFocus(){//文本框失去焦点
-				this.isShowInput = true
-				this.textareaFocus = false
-			},
-			chooseBusinessImage() {//营业执照图片上传
-				uploadFileImage().then(res =>{
-					this.businessLicense = JSON.parse(res.data).data
-				})
-			},
-			chooseMentuzImage() {//门头照图片上传
-				uploadFileImage().then(res =>{
-					this.shopPhoto = JSON.parse(res.data).data
-				})
-			},
-			chooseMedicalImage() {//资质照图片上传
-				uploadFileImage().then(res =>{
-					this.medicalPracticeLicense = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.businessLicense)
-			},
-			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.shopPhoto)
-			},
-			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.medicalPracticeLicense)
-			},
-			myPreviewImageFn(url){
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.businessLicense = ''
+			}
+			let params = {
+				userId: this.userId,
+				clubId: this.clubId, //会所ID
+				contractEmail: this.contractEmail,
+				name: this.clubName,
+				shortName: this.shortName,
+				provinceId: this.addressData.provinceId,
+				cityId: this.addressData.cityId,
+				townId: this.addressData.townId,
+				address: this.addressData.addressDetail,
+				socialCreditCode: this.socialCreditCode,
+				businessLicense: this.businessLicense,
+				shopPhoto: this.shopPhoto,
+				firstClubType: this.isOrganizationType, //机构类型分类 医美:1和生美:2
+				secondClubType: this.secondClubType, //机构类型二级分类 诊所:1,门诊:2,医院:3
+				department: this.department, //科室
+				medicalPracticeLicense: this.medicalPracticeLicense, //资质图片
+				mainProduct: this.mainProduct
+			}
+			// 友盟埋点普通机构确认升级点击事件
+			if (process.env.NODE_ENV != 'development') {
+				this.$uma.trackEvent('Um_Event_ConfirmClubUpgrade', {
+					Um_Key_ClubName: `${this.clubName}`,
+					Um_Key_PageName: '普通机构确认升级',
+					Um_Key_SourcePage: '升级页面'
 				})
-			},
-			delMentuzImage(){
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.shopPhoto = ''
+			}
+			this.UserService.OrganizationRegister(params)
+				.then(response => {
+					this.isConfirmShow = true
 				})
-			},			
-			delMedicalImage(){
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.medicalPracticeLicense = ''
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			bindPickerChange(e) {
-				this.isOrganizationType = e.target.value;
-				// let self = this
-				// uni.showActionSheet({
-				// 	title:'标题',
-				// 	itemList: ['医美', '生美'],
-				// 	success: (e) => {
-				// 		self.isOrganizationType = e.tapIndex+1
-				// 		switch(e.tapIndex){
-				// 			case 0:
-				// 				this.organizationTypeText = '医美'
-				// 				break;
-				// 			case 1:
-				// 				this.organizationTypeText = '生美'
-				// 				break;
-				// 		}
-				// 	}
-				// })
-			},
-			bindPickerChange2(e) {
-				this.typtIndex = e.target.value
-				this.isOrganizationType = e.target.value
-			},
-			radioChange(item) {
-				this.secondClubType = item.value;
-				if( this.secondClubType == 2 || this.secondClubType == 3){
-					this.isDepartment = true
-				}else{
-					this.isDepartment = false
+		},
+		handleClick() {
+			//隐藏提示弹窗
+			this.isConfirmShow = false
+			setTimeout(() => {
+				uni.navigateBack()
+			}, 2000)
+		},
+		// 三级联动选择
+		showMulLinkageThreePicker() {
+			this.isShowInput = true
+			this.$refs.mpvueCityPicker.show()
+		},
+		onConfirm(e) {
+			this.addressData.address = e.name
+			this.addressData.townId = e.townCode
+			this.addressData.cityId = e.cityCode
+			this.addressData.provinceId = e.provinceCode
+		},
+		onTextareaInput(e) {
+			this.addressData.addressDetail = e.detail.value
+		},
+		showTextareaFocus() {
+			//文本框获取焦点
+			this.isShowInput = false
+			this.textareaFocus = true
+		},
+		hideTextareaFocus() {
+			//文本框失去焦点
+			this.isShowInput = true
+			this.textareaFocus = false
+		},
+		chooseBusinessImage() {
+			//营业执照图片上传
+			uploadFileImage().then(res => {
+				this.businessLicense = JSON.parse(res.data).data
+			})
+		},
+		chooseMentuzImage() {
+			//门头照图片上传
+			uploadFileImage().then(res => {
+				this.shopPhoto = JSON.parse(res.data).data
+			})
+		},
+		chooseMedicalImage() {
+			//资质照图片上传
+			uploadFileImage().then(res => {
+				this.medicalPracticeLicense = JSON.parse(res.data).data
+			})
+		},
+		viewBusinessImage(e) {
+			this.myPreviewImageFn(this.businessLicense)
+		},
+		viewMentuzImage(e) {
+			this.myPreviewImageFn(this.shopPhoto)
+		},
+		viewMedicalImage(e) {
+			this.myPreviewImageFn(this.medicalPracticeLicense)
+		},
+		myPreviewImageFn(url) {
+			this.isPreviewImage = true
+			let mentuzArray = []
+			mentuzArray.push(url)
+			uni.previewImage({
+				urls: mentuzArray,
+				current: 0
+			})
+		},
+		delBusinessImage() {
+			this.$util.modal('', '确定删除营业执照图片吗？', '确定', '取消', true, () => {
+				this.businessLicense = ''
+			})
+		},
+		delMentuzImage() {
+			this.$util.modal('', '确定删除门头照图片吗？', '确定', '取消', true, () => {
+				this.shopPhoto = ''
+			})
+		},
+		delMedicalImage() {
+			this.$util.modal('', '确定删除资质图片吗？', '确定', '取消', true, () => {
+				this.medicalPracticeLicense = ''
+			})
+		},
+		bindPickerChange(e) {
+			this.isOrganizationType = e.target.value
+			// let self = this
+			// uni.showActionSheet({
+			// 	title:'标题',
+			// 	itemList: ['医美', '生美'],
+			// 	success: (e) => {
+			// 		self.isOrganizationType = e.tapIndex+1
+			// 		switch(e.tapIndex){
+			// 			case 0:
+			// 				this.organizationTypeText = '医美'
+			// 				break;
+			// 			case 1:
+			// 				this.organizationTypeText = '生美'
+			// 				break;
+			// 		}
+			// 	}
+			// })
+		},
+		bindPickerChange2(e) {
+			this.typtIndex = e.target.value
+			this.isOrganizationType = e.target.value
+		},
+		radioChange(item) {
+			this.secondClubType = item.value
+			if (this.secondClubType == 2 || this.secondClubType == 3) {
+				this.isDepartment = true
+			} else {
+				this.isDepartment = false
+			}
+			for (let i = 0; i < this.beautyList.length; i++) {
+				if (this.beautyList[i].value === this.secondClubType) {
+					this.current = i
+					break
 				}
-				for (let i = 0; i < this.beautyList.length; i++) {
-					if (this.beautyList[i].value === this.secondClubType) {
-						this.current = i;
-						break;
-					}
+			}
+		},
+		chooseMaleLike(e) {
+			this.isMainproCheck = true
+			this.mainProduct = this.checkLikes(e, this.mentuzCampList)
+		},
+		chooseMaleLikes(e) {
+			this.isMainproCheck = true
+			this.mainProduct = this.checkLikes(e, this.medicaCampList)
+		},
+		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)
 				}
-			},
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.mainProduct = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.isMainproCheck = true
-				this.mainProduct = this.checkLikes(e,this.medicaCampList)
-			},
-			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('/')
+		},
+		// onBlurInput(e){//
+		// 	if(e.detail.value ===''){
+		// 		this.isDisabled = true
+		// 	}else{
+		// 		this.isDisabled = false
+		// 	}
+		// },
+		showAustomItem() {
+			this.isShowAustomItem = !this.isShowAustomItem
+		},
+		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)
 					}
-				})
-				return arr.join('/')
-			},
-			// onBlurInput(e){//
-			// 	if(e.detail.value ===''){
-			// 		this.isDisabled = true
-			// 	}else{
-			// 		this.isDisabled = false
-			// 	}
-			// },
-			showAustomItem() {
-				this.isShowAustomItem = !this.isShowAustomItem
-			},
-			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)
-						}
-						
+				} 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){//判断主营内容是否已存在
-			console.log(content,arr)
-					 for(var i in arr){
-							if(arr[i].name == content){
-								return true;
-							}
-						}
-			           return false;
-			       },
+			}
 		},
-		onShow() {
-			if(this.isPreviewImage){
-				this.isPreviewImage = false
-				return
+		checkedArray(content, arr) {
+			//判断主营内容是否已存在
+			console.log(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{
+.placeholder {
+	color: #b2b2b2;
+}
+.register {
+	width: 100%;
+	height: auto;
+	border-top: 1px solid #f7f7f7;
+	.register-main {
 		width: 100%;
 		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.register-main{
-			width: 100%;
+		background: #ffffff;
+		padding: 20rpx 0;
+		&.title {
+			background-image: linear-gradient(
+				270deg,
+				rgba(255, 255, 255, 0.1) 0%,
+				rgba(255, 86, 11, 0.1) 51%,
+				rgba(255, 255, 255, 0.1) 100%
+			);
+		}
+		&.detailed {
+			padding-bottom: 300rpx;
+		}
+		&.first {
+			padding-top: 110rpx;
+		}
+		.register-tips {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			line-height: 44rpx;
+			font-size: $font-size-24;
+			color: #ff0000;
+			margin-bottom: 40rpx;
+			.iconfont {
+				font-size: $font-size-24;
+			}
+		}
+		.register-row {
+			width: 702rpx;
 			height: auto;
-			background: #FFFFFF;
-			padding: 20rpx 0;
-			&.title{
-				background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);
+			padding: 0 24rpx;
+			margin-bottom: 20rpx;
+			.secondTyperadio {
+				border: 2rpx solid #e1e1e1;
+				display: inline-block;
+				font-size: 26rpx;
+				color: #999999;
+				padding: 0 24rpx;
+				border-radius: 22rpx;
+				line-height: 42rpx;
+				margin-right: 56rpx;
+				float: left;
+				&.active {
+					border: 2rpx solid #ffe6dc;
+					color: $color-system;
+				}
+			}
+			&.none {
+				margin-bottom: 0;
 			}
-			&.detailed{
-				padding-bottom: 300rpx;
+			.error-title {
+				line-height: 40rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				text-align: left;
 			}
-			&.first{
-				padding-top: 110rpx;
+			.error-main {
+				padding: 10rpx 0;
+				.error-item {
+					padding: 0 20rpx;
+					margin: 10rpx;
+					background: #f53636;
+					height: 52rpx;
+					line-height: 52rpx;
+					border-radius: 26rpx;
+					font-size: $font-size-26;
+					color: #ffffff;
+					text-align: center;
+					display: inline-block;
+				}
 			}
-			.register-tips{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
+			.register-tip {
+				line-height: 64rpx;
+				font-size: $font-size-20;
+				color: #fea785;
+				text-align: left;
+			}
+			.register-title {
 				line-height: 44rpx;
 				font-size: $font-size-24;
-				color: #FF0000;
-				margin-bottom: 40rpx;
-				.iconfont{
-					font-size: $font-size-24;
-				}
+				color: $color-system;
+				text-align: left;
 			}
-			.register-row{
-				width: 702rpx;
-				height: auto;
-				padding: 0 24rpx;
-				margin-bottom: 20rpx;
-				.secondTyperadio{
-					border: 2rpx solid #e1e1e1;
-					display: inline-block;
-					font-size: 26rpx;
-					color: #999999;
-					padding: 0 24rpx;
-					border-radius: 22rpx;
-					line-height: 42rpx;
-					margin-right: 56rpx;
-					float: left;
-					&.active{
-						border: 2rpx solid #ffe6dc;
-						color: $color-system;
-					}
-				}				
-				&.none{
-					margin-bottom: 0;
-				}
-				.error-title{
-					line-height: 40rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: left;
-				}
-				.error-main{
-					padding: 10rpx 0;
-					.error-item{
-						padding:0 20rpx;
-						margin:10rpx;
-						background: #F53636;
-						height: 52rpx;
-						line-height: 52rpx;
-						border-radius: 26rpx;
-						font-size: $font-size-26;
-						color: #FFFFFF;
-						text-align: center;
-						display: inline-block;
-					}
+			.row-btn {
+				position: absolute;
+				right: 24rpx;
+				top: 0;
+				line-height: 88rpx;
+				text-align: center;
+				font-size: $font-size-28;
+				color: $color-system;
+			}
+			.register-from {
+				width: 100%;
+				height: 88rpx;
+				background: #ffffff;
+				position: relative;
+				border-bottom: 1px solid #e1e1e1;
+				box-sizing: border-box;
+				&.noneborder {
+					border: none;
 				}
-				.register-tip{
-					line-height: 64rpx;
-					font-size: $font-size-20;
-					color: #fea785;
-					text-align: left;
+				&.second {
+					padding-left: 160rpx;
 				}
-				.register-title{
-					line-height: 44rpx;
-					font-size: $font-size-24;
-					color: $color-system;
+				.label {
 					text-align: left;
-				}
-				.row-btn{
-					position: absolute;
-					right: 24rpx;
-					top: 0;
+					font-size: $font-size-28;
+					color: #666666;
 					line-height: 88rpx;
-					text-align: center;
+					float: left;
+				}
+				.kes-title {
 					font-size: $font-size-28;
-					color: $color-system;
+					color: #666666;
+					line-height: 88rpx;
 				}
-				.register-from{
-					width: 100%;
+				.row-input {
+					width: 520rpx;
+					padding-left: 10rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					line-height: 88rpx;
+					float: right;
 					height: 88rpx;
-					background: #FFFFFF;
-					position: relative;
-					border-bottom: 1px solid #e1e1e1;
-					box-sizing: border-box;
-					&.noneborder{
-						border: none;
+					&.code {
+						width: 500rpx;
 					}
-					&.second{
-						padding-left: 160rpx;
+					&.none {
+						color: #999999;
 					}
-					.label{
+					&.picker {
 						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 88rpx;
-						float: left;
+						color: #333333;
 					}
-					.kes-title{
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 88rpx;
+				}
+				.keshi {
+					width: 678rpx;
+					border: 2rpx solid #b2b2b2;
+					border-radius: 6rpx;
+					height: 160rpx;
+					font-size: $font-size-28;
+					padding: 10rpx;
+				}
+				&.code {
+					width: 410rpx;
+					float: left;
+					margin-right: 20rpx;
+					.row-input {
+						width: 390rpx;
 					}
-					.row-input{
-						width: 520rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 88rpx;
-						float: right;
+				}
+				&.btn {
+					width: 224rpx;
+					height: 88rpx;
+					float: left;
+					background: $btn-confirm;
+					padding: 0;
+					.row-input {
+						width: 224rpx;
 						height: 88rpx;
-						&.code{width: 500rpx;}
-						&.none{
-							color: #999999;
+						line-height: 88rpx;
+						padding: 0;
+						color: #ffffff;
+						background: $btn-confirm;
+						text-align: center;
+						border-radius: 14rpx;
+						&.other {
+							width: 350rpx;
+							background: #fff;
+							margin-right: 20rpx;
+							border: 2rpx solid #b2b2b2;
+							border-radius: 44rpx;
+							padding: 0 24rpx;
+							height: 64rpx;
+							line-height: 64rpx;
 						}
-						&.picker{
-							text-align: left;
-							color: #333333;
+						&.none {
+							background: #f7f7f7;
 						}
 					}
-					.keshi{
-							width: 678rpx;
-							border: 2rpx solid #b2b2b2;
-							border-radius: 6rpx;
-							height: 160rpx;
-							font-size: $font-size-28;
-							padding: 10rpx;
-						}
-					&.code{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 390rpx;
+					&.disabled {
+						background: #f7f7f7;
+						.row-input {
+							background: #f7f7f7;
+							color: #999999;
 						}
 					}
-					&.btn{
-						width: 224rpx;
+				}
+				&.picker {
+					width: 100%;
+					height: 88rpx;
+					line-height: 88rpx;
+					.label {
+						line-height: 88rpx;
+					}
+					.label-radio {
+						margin-right: 70rpx;
+					}
+					.row-radio {
+						transform: scale(0.8);
+					}
+					.row-input {
+						width: 500rpx;
 						height: 88rpx;
+						line-height: 88rpx;
+						padding-left: 40rpx;
 						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						.row-input{
-							width: 224rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 14rpx;
-							&.other{
-								width: 350rpx;
-								background: #FFF;
-								margin-right: 20rpx;
-								border: 2rpx solid #b2b2b2;
-								border-radius: 44rpx;
-								padding: 0 24rpx;
-								height: 64rpx;
-								line-height: 64rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
 					}
-					&.picker{
+				}
+				&.radio {
+					width: 654rpx;
+					height: 288rpx;
+					.row-input {
 						width: 100%;
 						height: 88rpx;
 						line-height: 88rpx;
-						.label{
-							line-height: 88rpx;
-						}
-						.label-radio{margin-right: 70rpx;}
-						.row-radio{
-							transform: scale(.8);
-						}
-						.row-input{
-							width: 500rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 40rpx;
-							float: left;
-						}
+						padding-left: 0;
 					}
-					&.radio{
-						width: 654rpx;
-						height: 288rpx;
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-							transform: scale(0.8);
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
+					.row-radio {
+						float: left;
+						transform: scale(0.8);
 					}
-					&.group{
-						width: 702rpx;
-						height: auto;
-						background: #FFFFFF;
-						margin-top: 30rpx;
-						.label{
-							line-height: 76rpx;
-						}
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
+					.row-text {
+						width: 100rpx;
+						text-align: center;
+						float: left;
 					}
-					&.btn{
-						margin-top: 0;
+				}
+				&.group {
+					width: 702rpx;
+					height: auto;
+					background: #ffffff;
+					margin-top: 30rpx;
+					.label {
+						line-height: 76rpx;
 					}
-					.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: 220rpx;
-							height: 40rpx;
-							padding: 24rpx;
-							text-align: left;
-							border-radius: 10rpx;
-							font-size: $font-size-28;
-							color: $text-color;
-						}
-						.confirm-btn{
-							width: 160rpx;
-							height: 64rpx;
-							border-radius: 45rpx;
-							line-height: 64rpx;
-							text-align: center;
-							background:#ffe6dc;
-							color: $color-system;
-							&.other{
-								width: 213rpx;
-							}
-							// &.none{
-							// 	color: #FFFFFF;
-							// }
-							// &.disabled{
-							// 	color: #999999;
-							// }
-						}
-						.item {
-						  // width: 190rpx;
-						  height: 60rpx;
-						  font-size:$font-size-28;
-						  line-height: 60rpx;
-						  border-radius:10rpx;
-						  margin-left: 20rpx;
-						  margin-bottom: 10rpx;
-						  box-sizing: border-box;
-						  // border: 1rpx solid #EFEFEF;
-						  float: left;
-						 //  checkbox {
-							// display: none;
-						 //  }
-						}
-						.item-checkbox{
-							display: none;
-						}
-						.item-text{
-							border: 2rpx solid #e1e1e1;
-							display: inline-block;
-							font-size: 26rpx;
-							color: #999999;
-							padding: 0 30rpx;
-							border-radius: 28rpx;
-							line-height: 50rpx;
-							float: left;
-						}
-						.on {
-							.item-text{
-								border-color: $color-system;
-								color:$color-system;
-							}
-						}
+					.row-input {
+						width: 100%;
+						height: 88rpx;
+						line-height: 88rpx;
+						padding-left: 0;
+					}
+					.row-radio {
+						float: left;
+					}
+					.row-text {
+						width: 100rpx;
+						text-align: center;
+						float: left;
 					}
 				}
-				.icon-xiayibu{
-					width: 88rpx;
-					height: 88rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
-					color: #b2b2b2;
+				&.btn {
+					margin-top: 0;
 				}
-				&.text-textarea{
-					background: #FFFFFF;
-					.textarea{
-						width: 100%;
-						height: 120rpx;
-						background: #FFFFFF;
-						padding: 24rpx 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: 220rpx;
+						height: 40rpx;
+						padding: 24rpx;
+						text-align: left;
+						border-radius: 10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
-						z-index: 1;
-						border-bottom: 1px solid #E1E1E1;
 					}
-					.textarea.hide{
-						opacity: 0;
+					.confirm-btn {
+						width: 160rpx;
+						height: 64rpx;
+						border-radius: 45rpx;
+						line-height: 64rpx;
+						text-align: center;
+						background: #ffe6dc;
+						color: $color-system;
+						&.other {
+							width: 213rpx;
+						}
+						// &.none{
+						// 	color: #FFFFFF;
+						// }
+						// &.disabled{
+						// 	color: #999999;
+						// }
+					}
+					.item {
+						// width: 190rpx;
+						height: 60rpx;
+						font-size: $font-size-28;
+						line-height: 60rpx;
+						border-radius: 10rpx;
+						margin-left: 20rpx;
+						margin-bottom: 10rpx;
+						box-sizing: border-box;
+						// border: 1rpx solid #EFEFEF;
+						float: left;
+						//  checkbox {
+						// display: none;
+						//  }
+					}
+					.item-checkbox {
+						display: none;
 					}
-					.textarea.show{
+					.item-text {
+						border: 2rpx solid #e1e1e1;
+						display: inline-block;
+						font-size: 26rpx;
 						color: #999999;
+						padding: 0 30rpx;
+						border-radius: 28rpx;
+						line-height: 50rpx;
+						float: left;
+					}
+					.on {
+						.item-text {
+							border-color: $color-system;
+							color: $color-system;
+						}
 					}
 				}
 			}
-			.register-picture{
-				// height: 102rpx;
-				margin: 30rpx 0;
-				// width: 42%;
-				// float: left;
-				&.zz{
+			.icon-xiayibu {
+				width: 88rpx;
+				height: 88rpx;
+				position: absolute;
+				right: 0;
+				top: 0;
+				line-height: 88rpx;
+				text-align: center;
+				color: #b2b2b2;
+			}
+			&.text-textarea {
+				background: #ffffff;
+				.textarea {
 					width: 100%;
-				}
-				.label{
-					// float: left;
+					height: 120rpx;
+					background: #ffffff;
+					padding: 24rpx 0;
 					font-size: $font-size-28;
 					color: $text-color;
-					line-height: 102rpx;
-					// width: 150rpx;
-					// text-align: left;
-					&.zz{
-						width: 230rpx;
+					z-index: 1;
+					border-bottom: 1px solid #e1e1e1;
+				}
+				.textarea.hide {
+					opacity: 0;
+				}
+				.textarea.show {
+					color: #999999;
+				}
+			}
+		}
+		.register-picture {
+			// height: 102rpx;
+			margin: 30rpx 0;
+			// width: 42%;
+			// float: left;
+			&.zz {
+				width: 100%;
+			}
+			.label {
+				// float: left;
+				font-size: $font-size-28;
+				color: $text-color;
+				line-height: 102rpx;
+				// width: 150rpx;
+				// text-align: left;
+				&.zz {
+					width: 230rpx;
+				}
+			}
+			.upload-picture {
+				// float: left;
+				width: 200rpx;
+				height: 180rpx;
+				.upload-none {
+					width: 200rpx;
+					height: 180rpx;
+					text-align: center;
+					line-height: 100rpx;
+					color: #999999;
+					// border: 1px solid #999999;
+					border-radius: 10rpx;
+					// margin: 0 20rpx;
+					// .iconfont{
+					// 	font-size: $font-size-28;
+					// }
+					image {
+						width: 100%;
+						height: 100%;
 					}
 				}
-				.upload-picture{
-					// float: left;
+				.upload-image {
 					width: 200rpx;
 					height: 180rpx;
-					.upload-none{
-						width: 200rpx;
-						height: 180rpx;
-						text-align: center;
-						line-height: 100rpx;
-						color: #999999;
-						// border: 1px solid #999999;
+					border-radius: 10rpx;
+					margin: 0 20rpx;
+					position: relative;
+					image {
+						width: 100%;
+						height: 100%;
 						border-radius: 10rpx;
-						// margin: 0 20rpx;
-						// .iconfont{
-						// 	font-size: $font-size-28;
-						// }
-						image{
-							width: 100%;
-							height: 100%;
-						}
 					}
-					.upload-image{
-						width:200rpx;
-						height: 180rpx;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						position: relative;
-						image{
-							width:100%;
-							height: 100%;
-							border-radius: 10rpx;
-						}
-						.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;
-							}
+					.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;
+		}
+		.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;
-				.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;
-				padding: 20rpx 0;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 99;
-				background: #FFFFFF;
-				.register-agree{
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					margin: 32rpx 0;
-					.agree-text{
-						.checkbox{
-							float: left;
-							margin: 4rpx 6rpx 0 0;
-							color: #999999;
-							font-size: $font-size-32;
-							&.icon-gouxuan{
-								color: $color-system;
-							}
-						}
-						font-size: 20rpx;
-						line-height: 44rpx;
+		}
+		.register-fiexd {
+			width: 100%;
+			height: auto;
+			padding: 20rpx 0;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			background: #ffffff;
+			.register-agree {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin: 32rpx 0;
+				.agree-text {
+					.checkbox {
+						float: left;
+						margin: 4rpx 6rpx 0 0;
 						color: #999999;
-						text{
-							color:#0091FF;
+						font-size: $font-size-32;
+						&.icon-gouxuan {
+							color: $color-system;
 						}
 					}
+					font-size: 20rpx;
+					line-height: 44rpx;
+					color: #999999;
+					text {
+						color: #0091ff;
+					}
 				}
 			}
-			.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;
-				&.none{
-					background: #FFFFFF;
-					color: $text-color;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
+		}
+		.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;
+			&.none {
+				background: #ffffff;
+				color: $text-color;
+				margin-top: 0;
+			}
+			&.sub {
+				margin-top: 0;
 			}
 		}
 	}
-	checkbox .wx-checkbox-input{
-	  border-radius: 50%;
-	  width: 36rpx; 
-	  height: 36rpx;
-	}
-	/* 选中后的 背景样式 */
-	checkbox .wx-checkbox-input.wx-checkbox-input-checked{
-	  background: #E15616;
-	  border: 2rpx solid #e15616;
-	}
-	checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
-	  border-radius: 50%;
-	  width: 36rpx;
-	  height: 36rpx;
-	  line-height: 36rpx;
-	  text-align: center;
-	  font-size:20rpx; 
-	  color:#fff;
-	  transform:scale(.8);
-	  -webkit-transform:translate(-50%, -50%) scale(1);
-	}
-	.tui-alert-box {
-		width: 100%;
-		height: 100%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		position: fixed;
-		left: 0;
+}
+checkbox .wx-checkbox-input {
+	border-radius: 50%;
+	width: 36rpx;
+	height: 36rpx;
+}
+/* 选中后的 背景样式 */
+checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+	background: #e15616;
+	border: 2rpx solid #e15616;
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+	border-radius: 50%;
+	width: 36rpx;
+	height: 36rpx;
+	line-height: 36rpx;
+	text-align: center;
+	font-size: 20rpx;
+	color: #fff;
+	transform: scale(0.8);
+	-webkit-transform: translate(-50%, -50%) scale(1);
+}
+.tui-alert-box {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+	position: fixed;
+	left: 0;
+	top: 0;
+	opacity: 1;
+	background: rgba(51, 51, 51, 0.5);
+	z-index: 99999;
+	.tui-alert-content {
+		width: 580rpx;
+		height: 324rpx;
+		border-radius: 16rpx;
+		background-color: #ffffff;
+		position: absolute;
 		top: 0;
-		opacity: 1;
-		background: rgba(51,51,51,0.5);
-		z-index: 99999;
-		.tui-alert-content{
-			width: 580rpx;
-			height: 324rpx;
-			border-radius: 16rpx;
-			background-color: #FFFFFF;
-			position: absolute;
-			top: 0;
-			bottom: 0;
-			right: 0;
-			left: 0;
-			margin: auto;
-			.tui-alert-main{
-				width: 100%;
-				height: 234rpx;
-				box-sizing: border-box;
-				padding: 60rpx 30rpx;
-				line-height: 60rpx;
-				font-size: $font-size-26;
-				color: #666666;
-				text-align: justify;
-				.red{
-					color: #e15616;
-				}
-			}
-			.tui-alert-btn{
-				width: 100%;
-				height: 90rpx;
-				box-sizing: border-box;
-				line-height: 90rpx;
-				background: $btn-confirm;
-				color: #FFFFFF;
-				text-align: center;
-				font-size: $font-size-28;
-				border-radius: 0  0 16rpx 16rpx ;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		margin: auto;
+		.tui-alert-main {
+			width: 100%;
+			height: 234rpx;
+			box-sizing: border-box;
+			padding: 60rpx 30rpx;
+			line-height: 60rpx;
+			font-size: $font-size-26;
+			color: #666666;
+			text-align: justify;
+			.red {
+				color: #e15616;
 			}
 		}
+		.tui-alert-btn {
+			width: 100%;
+			height: 90rpx;
+			box-sizing: border-box;
+			line-height: 90rpx;
+			background: $btn-confirm;
+			color: #ffffff;
+			text-align: center;
+			font-size: $font-size-28;
+			border-radius: 0 0 16rpx 16rpx;
+		}
 	}
+}
 </style>

pages/login/binding.vue

@@ -431,7 +431,7 @@
 							padding: 0 24rpx;
 							border-radius: 22rpx;
 							line-height: 42rpx;
-							margin-right: 56rpx;
+							margin-right: 28rpx;
 							float: left;
 							&.active{
 								border: 2rpx solid #ffe6dc;

pages/login/information.vue

@@ -1,14 +1,19 @@
 <template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
+	<view class="container register" :style="{ paddingTop: CustomBar + 'px' }">
+		<cu-custom :navbar-data="nvabarData" @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="register-main first clearfix">
-			<view class="register-row">
-				<view class="register-title">注册信息</view>
-			</view>
+			<view class="register-row"> <view class="register-title">注册信息</view> </view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">联系人</view>
-					<input class="row-input" type="text" v-model="linkMan" placeholder="请输入联系姓名" placeholder-class="placeholder" maxlength="6"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="linkMan"
+						placeholder="请输入联系姓名"
+						placeholder-class="placeholder"
+						maxlength="6"
+					/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -19,70 +24,106 @@
 			</view>
 		</view>
 		<view class="register-main clearfix" v-if="userIdentity === 2">
-			<view class="register-row">
-				<view class="register-title">升级信息</view>
-			</view>
+			<view class="register-row"> <view class="register-title">升级信息</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="contractEmail" placeholder="请输入邮箱地址"placeholder-class="placeholder" maxlength="30"/>
+					<input
+						class="row-input"
+						type="text"
+						name="input"
+						v-model="contractEmail"
+						placeholder="请输入邮箱地址"
+						placeholder-class="placeholder"
+						maxlength="30"
+					/>
 				</view>
 			</view>
 			<view class="register-row none clearfix">
 				<view class="register-from">
 					<view class="label">机构名称</view>
-					<input class="row-input" type="text" v-model="name" placeholder="请输入您的机构名称" placeholder-class="placeholder" maxlength="30"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="name"
+						placeholder="请输入您的机构名称"
+						placeholder-class="placeholder"
+						maxlength="30"
+					/>
 				</view>
 				<view class="register-tip"><text>示例：深圳市美丽人生医疗美容有限公司</text></view>
 			</view>
 			<view class="register-row none clearfix">
 				<view class="register-from">
 					<view class="label">机构简称</view>
-					<input class="row-input" type="text" v-model="shortName" placeholder="请输入姓名或常用名" placeholder-class="placeholder" maxlength="10"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="shortName"
+						placeholder="请输入姓名或常用名"
+						placeholder-class="placeholder"
+						maxlength="10"
+					/>
 				</view>
 				<view class="register-tip"><text>示例：美丽人生</text></view>
 			</view>
 			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
+				<view class="register-from" @click="showMulLinkageThreePicker">
 					<view class="label">机构地址</view>
 					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{addressData.address}}
-					</text>		
+						{{ addressData.address }}
+					</text>
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
-				<view class="adddress show" v-if="isShowInput" placeholder-class="placeholder" @click="showTextareaFocus">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="adddress" 
-							type="text" 
-							v-model="addressData.addressDetail" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="25"
-							@input="onTextareaInput"
-							@focus="textareaFocus"
-							@blur="hideTextareaFocus"
-							:class="isShowInput ? '':''"
+				<view
+					class="adddress show"
+					v-if="isShowInput"
+					placeholder-class="placeholder"
+					@click="showTextareaFocus"
+					>{{
+						addressData.addressDetail ? addressData.addressDetail : '详细地址：如道路、门牌号、小区等'
+					}}</view
+				>
+				<textarea
+					v-else
+					class="adddress"
+					type="text"
+					v-model="addressData.addressDetail"
+					placeholder="详细地址：如道路、门牌号、小区等"
+					placeholder-class="placeholder"
+					maxlength="25"
+					@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="socialCreditCode" placeholder="请填写社会统一信用代码"placeholder-class="placeholder" maxlength="18"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="socialCreditCode"
+						placeholder="请填写社会统一信用代码"
+						placeholder-class="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="businessLicense == ''"  @click="chooseBusinessImage">
+						<view class="upload-none" v-if="businessLicense == ''" @click="chooseBusinessImage">
 							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="businessLicense" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
@@ -96,9 +137,9 @@
 							<image src="https://static.caimei365.com/app/img/upload/club-door.png"></image>
 						</view>
 						<view class="upload-image" v-else>
-							<image :src="shopPhoto" mode=""  @click="viewMentuzImage"></image>
+							<image :src="shopPhoto" mode="" @click="viewMentuzImage"></image>
 							<view class="upload-del" @click="delMentuzImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
@@ -109,17 +150,41 @@
 					<view class="label">机构类型</view>
 					<view class="row-input">
 						<radio-group @change="bindPickerChange">
-							 <label class="label-radio" v-for="(item, index) in typename" :key="item.value">
-								 <radio class="row-radio" :value="item.value" :checked="index === firstClubTypeCurrent" color='#E15616'/>{{item.name }}
-							 </label>
+							<label class="label-radio" v-for="(item, index) in typename" :key="item.value">
+								<radio
+									class="row-radio"
+									:value="item.value"
+									:checked="index === firstClubTypeCurrent"
+									color="#E15616"
+								/>{{ item.name }}
+							</label>
 						</radio-group>
 					</view>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="firstClubType == 1">
-				<view class="register-from bordernone second" >
-					<view class="secondTyperadio" v-for="(item,index) in beautyList" :key="item.value" @click="radioChange(item)" :class="item.value==secondClubType?'active':''">
-						<view class="secondRadio" >{{item.name}}</view>
+				<view class="register-from bordernone second">
+					<view
+						class="secondTyperadio"
+						v-for="(item, index) in beautyList"
+						:key="item.value"
+						@click="radioChange(item)"
+						:class="item.value == secondClubType ? 'active' : ''"
+					>
+						<view class="secondRadio">{{ item.name }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="register-row clearfix" v-if="firstClubType == 2">
+				<view class="register-from noneborder second">
+					<view
+						class="secondTyperadio"
+						v-for="(item, index) in beautyLists"
+						:key="item.value"
+						@click="radioChange(item)"
+						:class="item.value == secondClubType ? 'active' : ''"
+					>
+						<view class="secondRadio">{{ item.name }}</view>
 					</view>
 				</view>
 			</view>
@@ -127,36 +192,51 @@
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="medicalPracticeLicense == ''||medicalPracticeLicense == null" @click="chooseMedicalImage">
+						<view
+							class="upload-none"
+							v-if="medicalPracticeLicense == '' || medicalPracticeLicense == null"
+							@click="chooseMedicalImage"
+						>
 							<image src="https://static.caimei365.com/app/img/upload/club-yiliao.png"></image>
 						</view>
 						<view class="upload-image" v-else>
-							<image :src="medicalPracticeLicense" mode=""  @click="viewMedicalImage"></image>
+							<image :src="medicalPracticeLicense" mode="" @click="viewMedicalImage"></image>
 							<view class="upload-del" @click="delMedicalImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-show="firstClubType == 1 && isDepartment">
-				<view class="register-from bordernone" >
-					<view class="kes-title" >科室</view>
-					<textarea class="keshi"  placeholder="请填写经营的科室，至少三个，用逗号隔开" placeholder-style="placeholder" v-model="department" maxlength="16"></textarea>
+				<view class="register-from bordernone">
+					<view class="kes-title">科室</view>
+					<textarea
+						class="keshi"
+						placeholder="请填写经营的科室，至少三个，用逗号隔开"
+						placeholder-style="placeholder"
+						v-model="department"
+						maxlength="16"
+					></textarea>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="firstClubType == 1">
 				<view class="register-from group bordernone">
 					<view class="label">主营内容</view>
 					<view class="content-class">
-						<checkbox-group @change="chooseMaleLike" >
-							<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox class="item-checkbox" :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
+						<checkbox-group @change="chooseMaleLike">
+							<label
+								class="item"
+								v-for="(item, index) in mentuzCampList"
+								:key="index"
+								:class="{ on: item.checked }"
+							>
+								<checkbox class="item-checkbox" :value="item.value"></checkbox>
+								<text class="item-text">{{ item.name }}</text>
 							</label>
 						</checkbox-group>
 					</view>
-				</view>	
+				</view>
 				<!-- <view class="register-from group btn">
 					<view class="content-class btn">
 						<view class="item" @click="showAustomItem">
@@ -167,11 +247,15 @@
 				  v-show="isShowAustomItem"-->
 				<view class="register-from group btn">
 					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目" placeholder-class="placeholder" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								@click.stop="addCustomItem"
-						>确认添加</button>
+						<input
+							class="row-input other"
+							type="text"
+							v-model="customItemValue"
+							placeholder="请输入自定义项目"
+							placeholder-class="placeholder"
+							maxlength="5"
+						/>
+						<button type="default" class="confirm-btn" @click.stop="addCustomItem">确认添加</button>
 					</view>
 				</view>
 			</view>
@@ -180,13 +264,18 @@
 					<view class="label">主营内容</view>
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
-							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox class="item-checkbox" :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
+							<label
+								class="item"
+								v-for="(item, index) in medicaCampList"
+								:key="index"
+								:class="{ on: item.checked }"
+							>
+								<checkbox class="item-checkbox" :value="item.value"></checkbox>
+								<text class="item-text">{{ item.name }}</text>
 							</label>
 						</checkbox-group>
 					</view>
-				</view>	
+				</view>
 				<!-- <view class="register-from group btn">
 					<view class="content-class btn">
 						<view class="item" @click="showAustomItem">
@@ -195,1024 +284,1074 @@
 					</view>
 				</view>
 				 v-show="isShowAustomItem"-->
-				<view class="register-from group btn" >
+				<view class="register-from group btn">
 					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目" placeholder-class="placeholder" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								@click.stop="addCustomItem"
-						>确认添加</button>
+						<input
+							class="row-input other"
+							type="text"
+							v-model="customItemValue"
+							placeholder="请输入自定义项目"
+							placeholder-class="placeholder"
+							maxlength="5"
+						/>
+						<button type="default" class="confirm-btn" @click.stop="addCustomItem">确认添加</button>
 					</view>
 				</view>
 			</view>
-			<mpvue-city-picker :themeColor="themeColor"
-								ref="mpvueCityPicker" 
-							    :pickerValueDefault="cityPickerValueDefault"
-								@onCancel="onCancel" 
-								@onConfirm="onConfirm">
+			<mpvue-city-picker
+				:themeColor="themeColor"
+				ref="mpvueCityPicker"
+				:pickerValueDefault="cityPickerValueDefault"
+				@onCancel="onCancel"
+				@onConfirm="onConfirm"
+			>
 			</mpvue-city-picker>
 		</view>
 		<view class="register-main detailed clearfix">
-			<view class="register-row">
-				<view class="register-title">其他信息</view>
-			</view>
+			<view class="register-row"> <view class="register-title">其他信息</view> </view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">固定电话</view>
-					<input class="row-input" type="text" v-model="clubTelePhone" placeholder="请填写机构的固定电话" placeholder-class="placeholder" maxlength="15"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="clubTelePhone"
+						placeholder="请填写机构的固定电话"
+						placeholder-class="placeholder"
+						maxlength="15"
+					/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">传真</view>
-					<input class="row-input" type="text" v-model="clubFax" placeholder="请填写机构的传真" placeholder-class="placeholder" maxlength="15"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="clubFax"
+						placeholder="请填写机构的传真"
+						placeholder-class="placeholder"
+						maxlength="15"
+					/>
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
 				<view class="label">公司介绍</view>
-					<textarea 	class="textarea" 
-								type="text" 
-								v-model="profile" 
-								placeholder="请填写公司简介，最多500字" 
-								placeholder-class="placeholder"
-								maxlength="500"
-								@input="onTextareaInputInfo"
-								:class="isShowInput ? '':''"
-					/>
+				<textarea
+					class="textarea"
+					type="text"
+					v-model="profile"
+					placeholder="请填写公司简介，最多500字"
+					placeholder-class="placeholder"
+					maxlength="500"
+					@input="onTextareaInputInfo"
+					:class="isShowInput ? '' : ''"
+				/>
 			</view>
-			<view class="register-fiexd clearfix" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx'}">
+			<view class="register-fiexd clearfix" :style="{ paddingBottom: isIphoneX ? '68rpx' : '36rpx' }">
 				<view class="register-row">
 					<view class="register-btn sub" @click.stop="organizationUpdateInfo">确定</view>
 				</view>
 			</view>
-		</view>	
+		</view>
 	</view>
 </template>
 
 <script>
-	import { mapMutations } from 'vuex';
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/services/public.js" 
-	var self;
-	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,// 顶部导航栏高度
-				isPreviewImage:false,    // 预览图片开关
-				userId:'',				 // 用户ID
-				clubId:'',				 // 会所ID
-				userIdentity:'',		 // 机构用户类型
-				contractEmail:'',		 // 邮箱
-				name:'',	 			 // 机构名称
-				shortName:'',	 		 // 机构简称
-				linkMan:'',	 			 // 联系人
-				mobile:'',				 // 联系人手机号
-				socialCreditCode:'',	 // 统一社会信用代码
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				businessLicense:'',		 // 营业执照图片
-				shopPhoto:'',  			 // 门头照图片
-				medicalPracticeLicense:'',// 资质照图片
-				department:'',			 // 科室
-				isDepartment:false,      // 是否显示科室
-				secondClubType:'',		 // 机构类型二级分类
-				mainProduct:'',			 // 主营内容
-				clubTelePhone:'',		 // 固定电话
-				clubFax:'',				 // 传真
-				profile:'',				 // 公司简介
-				firstClubType:0,		 // 机构类型
-				organizationTypeText:'请选择机构类型',
-				beautyList:beautyList,
-				mentuzCampNullList:mentuzCampNullList,
-				medicaCampNullList:medicaCampNullList,
-				mentuzCampList:[],
-				medicaCampList:[],
-				typtIndex:0,
-				organizationType:0,
-				firstClubTypeCurrent:0, 
-				current:0,
-				isShowAustomItem:false,  // 是否显示其他添加
-				customItemValue:'', 	 // 自定义项目
-				isMainproCheck:false,
-				addressData:{
-					address:'请选择机构所在地区',
-					townId:'',			 // 区ID
-					cityId:'',			 // 市ID
-					provinceId:'',		 // 省ID
-					addressDetail: '',	 // 地址详情
-				},
-				typename:[
-					{name:'医美',value:1},
-					{name:'生美',value:2}
-				],
-			}	
-		},
-		onLoad(option) {
-			this.organizationInfo()
-		},
-		methods:{
-			hanldNavigateBack(){
-				this.$util.modal('','确定放弃本次修改吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
-				})
+import { mapMutations } from 'vuex'
+import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+import { beautyList, beautyLists, mentuzCampNullList, medicaCampNullList } from '@/common/json/data.json.js' //本地数据
+import { uploadFileImage } from '@/services/public.js'
+var self
+export default {
+	components: {
+		mpvueCityPicker
+	},
+	data() {
+		return {
+			nvabarData: {
+				// 顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+				showSearch: 0,
+				title: '修改资料', // 导航栏 中间的标题
+				haveBack: true,
+				textLeft: this.$store.state.isIphone
 			},
-			organizationInfo(){
-				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userId ? resolve.userId : 0
-					this.UserService.OrganizationUpdateModifyInfo({userId:this.userId}).then(response =>{
+			isIphoneX: this.$store.state.isIphoneX,
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			isPreviewImage: false, // 预览图片开关
+			userId: '', // 用户ID
+			clubId: '', // 会所ID
+			userIdentity: '', // 机构用户类型
+			contractEmail: '', // 邮箱
+			name: '', // 机构名称
+			shortName: '', // 机构简称
+			linkMan: '', // 联系人
+			mobile: '', // 联系人手机号
+			socialCreditCode: '', // 统一社会信用代码
+			isDisabled: true,
+			isShowInput: true,
+			textareaFocus: false,
+			businessLicense: '', // 营业执照图片
+			shopPhoto: '', // 门头照图片
+			medicalPracticeLicense: '', // 资质照图片
+			department: '', // 科室
+			isDepartment: false, // 是否显示科室
+			secondClubType: '', // 机构类型二级分类
+			mainProduct: '', // 主营内容
+			clubTelePhone: '', // 固定电话
+			clubFax: '', // 传真
+			profile: '', // 公司简介
+			firstClubType: 0, // 机构类型
+			organizationTypeText: '请选择机构类型',
+			beautyList: beautyList,
+			beautyLists: beautyLists,
+			mentuzCampNullList: mentuzCampNullList,
+			medicaCampNullList: medicaCampNullList,
+			mentuzCampList: [],
+			medicaCampList: [],
+			typtIndex: 0,
+			organizationType: 0,
+			firstClubTypeCurrent: 0,
+			current: 0,
+			isShowAustomItem: false, // 是否显示其他添加
+			customItemValue: '', // 自定义项目
+			isMainproCheck: false,
+			addressData: {
+				address: '请选择机构所在地区',
+				townId: '', // 区ID
+				cityId: '', // 市ID
+				provinceId: '', // 省ID
+				addressDetail: '' // 地址详情
+			},
+			typename: [{ name: '医美', value: 1 }, { name: '生美', value: 2 }]
+		}
+	},
+	onLoad(option) {
+		this.organizationInfo()
+	},
+	methods: {
+		hanldNavigateBack() {
+			this.$util.modal('', '确定放弃本次修改吗？', '确定', '取消', true, () => {
+				uni.navigateBack({
+					delta: 1
+				})
+			})
+		},
+		organizationInfo() {
+			this.$api.getStorage().then(resolve => {
+				this.userId = resolve.userId ? resolve.userId : 0
+				this.UserService.OrganizationUpdateModifyInfo({ userId: this.userId })
+					.then(response => {
 						let organizationClub = response.data.club
 						let organizationUser = response.data.user
-						this.contractEmail = organizationClub.contractEmail ? organizationClub.contractEmail : organizationClub.email	
+						this.contractEmail = organizationClub.contractEmail
+							? organizationClub.contractEmail
+							: organizationClub.email
 						this.clubId = organizationUser.clubId
 						this.userIdentity = organizationUser.userIdentity
 						this.name = organizationClub.name ? organizationClub.name : ''
 						this.linkMan = organizationClub.linkMan
 						this.mobile = organizationUser.bindMobile ? organizationUser.bindMobile : ''
 						this.shortName = this.$reg.checkData(organizationClub.shortName)
-						if( organizationClub.provinceId == null ){
+						if (organizationClub.provinceId == null) {
 							this.addressData.provinceId = ''
-						}else{
+						} else {
 							this.addressData.provinceId = organizationClub.provinceId
 						}
-						if( organizationClub.cityId == null ){
+						if (organizationClub.cityId == null) {
 							this.addressData.cityId = ''
-						}else{
+						} else {
 							this.addressData.cityId = organizationClub.cityId
 						}
-						if( organizationClub.townId == null ){
+						if (organizationClub.townId == null) {
 							this.addressData.townId = ''
-						}else{
+						} else {
 							this.addressData.townId = organizationClub.townId
 						}
 						this.addressData.addressDetail = organizationClub.address ? organizationClub.address : ''
 						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 						this.firstClubType = organizationClub.firstClubType
+						if(this.firstClubType == 1){
+							this.firstClubTypeCurrent = 0
+						}else{
+							this.firstClubTypeCurrent = 1
+						}
 						this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
-						this.addressData.address =  organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
+						this.addressData.address = organizationClub.provincialAddress
+							? organizationClub.provincialAddress
+							: ''
 						this.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
 						this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
 						this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
-						this.department = organizationClub.department						
+						this.department = organizationClub.department
 						this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
 						this.clubFax = this.$reg.checkData(organizationClub.fax)
 						this.profile = this.$reg.checkData(organizationClub.profile)
 						//机构类型&&主营项目
-						switch(this.firstClubType){
+						switch (this.firstClubType) {
 							case 1:
 								this.organizationTypeText = '医美'
 								this.firstClubType = 1
-								break;
+								break
 							case 2:
 								this.organizationTypeText = '生美'
 								this.firstClubType = 2
-								break;
+								break
 							case null:
 								this.organizationTypeText = '请选择机构类型'
 								this.firstClubType = 0
-								break;
-						}	
-						if(organizationClub.mainProduct == "" || organizationClub.mainProduct == null){
+								break
+						}
+						if (organizationClub.mainProduct == '' || organizationClub.mainProduct == null) {
 							this.mentuzCampList = this.mentuzCampNullList
 							this.medicaCampList = this.medicaCampNullList
-						}else{
-							if(this.firstClubType == 1){
+						} else {
+							if (this.firstClubType == 1) {
 								this.mentuzCampList = this.setNewMainpro(organizationClub.mainProduct)
 								this.medicaCampList = this.medicaCampNullList
-							}else{
+							} else {
 								this.medicaCampList = this.setNewMainpro(organizationClub.mainProduct)
 								this.mentuzCampList = this.mentuzCampNullList
 							}
 						}
 						//机构类型
-						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;
+						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(){//提交审核
-				let params = {}
-				if(this.userIdentity === 4){
-					 params = {
-							userId:this.userId,
-							clubId:this.clubId,					//会所ID
-							linkMan:this.linkMan,
-							fax:this.clubFax,
-							contractPhone:this.clubTelePhone,
-							profile : this.profile,
-						}		
-				}else{
-					console.log('isMainproCheck',this.isMainproCheck)
-					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)
-							})
-						}
-						console.log('mainproList',mainproList)
-						this.mainProduct = mainproList.join('/')
-					}
-					if( this.contractEmail == ''){
-						this.$util.msg('请输入邮箱地址',2000);
-						return
-					}
-					if( !this.$reg.isEmail(this.contractEmail)){
-						this.$util.msg('请输入正确的邮箱地址',2000);
-						return
-					}
-					if( this.name == ''){
-						this.$util.msg('请输入机构名称',2000);
-						return
-					}
-					if( this.addressData.townId == ''){
-						this.$util.msg('请选择机构地址',2000);
-						return
-					}
-					if( this.addressData.addressDetail == ''){
-						this.$util.msg('请填写机构详细地址',2000);
-						return
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			})
+		},
+		organizationUpdateInfo() {
+			//提交审核
+			let params = {}
+			if (this.userIdentity === 4) {
+				params = {
+					userId: this.userId,
+					clubId: this.clubId, //会所ID
+					linkMan: this.linkMan,
+					fax: this.clubFax,
+					contractPhone: this.clubTelePhone,
+					profile: this.profile
+				}
+			} else {
+				console.log('isMainproCheck', this.isMainproCheck)
+				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)
+						})
 					}
-					if( this.businessLicense == ''){
-						this.$util.msg('请上传您的营业执照',2000);
+					console.log('mainproList', mainproList)
+					this.mainProduct = mainproList.join('/')
+				}
+				if (this.contractEmail == '') {
+					this.$util.msg('请输入邮箱地址', 2000)
+					return
+				}
+				if (!this.$reg.isEmail(this.contractEmail)) {
+					this.$util.msg('请输入正确的邮箱地址', 2000)
+					return
+				}
+				if (this.name == '') {
+					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.businessLicense == '') {
+					this.$util.msg('请上传您的营业执照', 2000)
+					return
+				}
+				console.log('mainProduct', this.mainProduct)
+				console.log('firstClubType', this.firstClubType)
+				if (this.firstClubType != 0) {
+					if (this.mainProduct == '') {
+						this.$util.msg('请选择住机构主营内容', 2000)
 						return
 					}
-					console.log('mainProduct',this.mainProduct)
-					console.log('firstClubType',this.firstClubType)
-					if(this.firstClubType!=0){
-						if(this.mainProduct == ''){
-							this.$util.msg('请选择住机构主营内容',2000);
-							return
-						}
-					}
-					params 	= {
-							userId:this.userId,
-							clubId:this.clubId,					//会所ID
-							name:this.name,
-							linkMan:this.linkMan,
-							shortName:this.shortName,
-							contractEmail:this.contractEmail,
-							provinceId:this.addressData.provinceId,
-							cityId:this.addressData.cityId,
-							townId:this.addressData.townId,
-							address:this.addressData.addressDetail,
-							socialCreditCode:this.socialCreditCode,
-							businessLicense:this.businessLicense,
-							shopPhoto:this.shopPhoto,
-							firstClubType:this.firstClubType, //机构类型分类 医美:0和生美:1
-							secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
-							department:this.department,				//科室
-							medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
-							mainProduct:this.mainProduct,
-							fax:this.clubFax,
-							contractPhone:this.clubTelePhone,
-							profile : this.profile
-					}
 				}
-				this.UserService.OrganizationUpdate(params).then(response =>{
-					this.$util.msg('修改成功',2000,true,'success')
-					setTimeout(()=>{
-						uni.navigateBack();
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			// 三级联动选择
-			showMulLinkageThreePicker() {
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {
-				this.addressData.address = e.name;
-				this.addressData.townId = e.townCode;
-				this.addressData.cityId = e.cityCode;
-				this.addressData.provinceId = e.provinceCode;
-			},	
-			onTextareaInput(e){//文本框获取焦点
-			   this.addressData.addressDetail = e.detail.value;
-			},
-			showTextareaFocus(){//文本框获取焦点
-				this.isShowInput = false
-				this.textareaFocus = true
-			},
-			hideTextareaFocus(){//文本框失去焦点
-				this.isShowInput = true
-				this.textareaFocus = false
-			},
-			onTextareaInputInfo(e){
-			   this.profile = e.detail.value;
-			},
-			chooseBusinessImage() {//营业执照图片上传
-				uploadFileImage().then(res =>{
-					this.businessLicense = JSON.parse(res.data).data
-				})
-			},
-			chooseMentuzImage() {//门头照图片上传
-				uploadFileImage().then(res =>{
-					this.shopPhoto = JSON.parse(res.data).data
-				})
-			},
-			chooseMedicalImage() {//资质照图片上传
-				uploadFileImage().then(res =>{
-					this.medicalPracticeLicense = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.businessLicense)
-			},
-			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.shopPhoto)
-			},
-			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.medicalPracticeLicense)
-			},
-			myPreviewImageFn(url){
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.businessLicense = ''
-				})
-			},
-			delMentuzImage(){
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.shopPhoto = ''
+				params = {
+					userId: this.userId,
+					clubId: this.clubId, //会所ID
+					name: this.name,
+					linkMan: this.linkMan,
+					shortName: this.shortName,
+					contractEmail: this.contractEmail,
+					provinceId: this.addressData.provinceId,
+					cityId: this.addressData.cityId,
+					townId: this.addressData.townId,
+					address: this.addressData.addressDetail,
+					socialCreditCode: this.socialCreditCode,
+					businessLicense: this.businessLicense,
+					shopPhoto: this.shopPhoto,
+					firstClubType: this.firstClubType, //机构类型分类 医美:0和生美:1
+					secondClubType: this.secondClubType, //机构类型二级分类 诊所:1,门诊:2,医院:3
+					department: this.department, //科室
+					medicalPracticeLicense: this.medicalPracticeLicense, //资质图片
+					mainProduct: this.mainProduct,
+					fax: this.clubFax,
+					contractPhone: this.clubTelePhone,
+					profile: this.profile
+				}
+			}
+			this.UserService.OrganizationUpdate(params)
+				.then(response => {
+					this.$util.msg('修改成功', 2000, true, 'success')
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 2000)
 				})
-			},			
-			delMedicalImage(){
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.medicalPracticeLicense = ''
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			bindPickerChange(e) {
-				this.firstClubType = e.target.value;
-				for (let i = 0; i < this.typename.length; i++) {
-					if (this.typename[i].value === e.target.value) {
-						this.firstClubTypeCurrent = i;
-						break;
-					}
-				}
-				// let self = this
-				// uni.showActionSheet({
-				// 	title:'标题',
-				// 	itemList: ['医美', '生美'],
-				// 	success: (e) => {
-				// 		self.firstClubType = e.tapIndex+1
-				// 		switch(e.tapIndex){
-				// 			case 0:
-				// 				this.organizationTypeText = '医美'
-				// 				break;
-				// 			case 1:
-				// 				this.organizationTypeText = '生美'
-				// 				break;
-				// 		}
-				// 	}
-				// })
-			
-			},
-			bindPickerChange2(e) {
-				this.typtIndex = e.target.value
-				this.firstClubType = e.target.value
-			},
-			radioChange(item) {
-				this.secondClubType =item.value;
-				if( this.secondClubType == 2 || this.secondClubType == 3){
-					this.isDepartment = true
-				}else{
-					this.isDepartment = false
+		},
+		// 三级联动选择
+		showMulLinkageThreePicker() {
+			this.isShowInput = true
+			this.$refs.mpvueCityPicker.show()
+		},
+		onConfirm(e) {
+			this.addressData.address = e.name
+			this.addressData.townId = e.townCode
+			this.addressData.cityId = e.cityCode
+			this.addressData.provinceId = e.provinceCode
+		},
+		onTextareaInput(e) {
+			//文本框获取焦点
+			this.addressData.addressDetail = e.detail.value
+		},
+		showTextareaFocus() {
+			//文本框获取焦点
+			this.isShowInput = false
+			this.textareaFocus = true
+		},
+		hideTextareaFocus() {
+			//文本框失去焦点
+			this.isShowInput = true
+			this.textareaFocus = false
+		},
+		onTextareaInputInfo(e) {
+			this.profile = e.detail.value
+		},
+		chooseBusinessImage() {
+			//营业执照图片上传
+			uploadFileImage().then(res => {
+				this.businessLicense = JSON.parse(res.data).data
+			})
+		},
+		chooseMentuzImage() {
+			//门头照图片上传
+			uploadFileImage().then(res => {
+				this.shopPhoto = JSON.parse(res.data).data
+			})
+		},
+		chooseMedicalImage() {
+			//资质照图片上传
+			uploadFileImage().then(res => {
+				this.medicalPracticeLicense = JSON.parse(res.data).data
+			})
+		},
+		viewBusinessImage(e) {
+			this.myPreviewImageFn(this.businessLicense)
+		},
+		viewMentuzImage(e) {
+			this.myPreviewImageFn(this.shopPhoto)
+		},
+		viewMedicalImage(e) {
+			this.myPreviewImageFn(this.medicalPracticeLicense)
+		},
+		myPreviewImageFn(url) {
+			this.isPreviewImage = true
+			let mentuzArray = []
+			mentuzArray.push(url)
+			uni.previewImage({
+				urls: mentuzArray,
+				current: 0
+			})
+		},
+		delBusinessImage() {
+			this.$util.modal('', '确定删除营业执照图片吗？', '确定', '取消', true, () => {
+				this.businessLicense = ''
+			})
+		},
+		delMentuzImage() {
+			this.$util.modal('', '确定删除门头照图片吗？', '确定', '取消', true, () => {
+				this.shopPhoto = ''
+			})
+		},
+		delMedicalImage() {
+			this.$util.modal('', '确定删除资质图片吗？', '确定', '取消', true, () => {
+				this.medicalPracticeLicense = ''
+			})
+		},
+		bindPickerChange(e) {
+			this.firstClubType = e.target.value
+			for (let i = 0; i < this.typename.length; i++) {
+				if (this.typename[i].value === e.target.value) {
+					this.firstClubTypeCurrent = i
+					break
 				}
-				for (let i = 0; i < this.beautyList.length; i++) {
-					if (this.beautyList[i].value === this.secondClubType) {
-						this.current = i;
-						break;
-					}
+			}
+			// let self = this
+			// uni.showActionSheet({
+			// 	title:'标题',
+			// 	itemList: ['医美', '生美'],
+			// 	success: (e) => {
+			// 		self.firstClubType = e.tapIndex+1
+			// 		switch(e.tapIndex){
+			// 			case 0:
+			// 				this.organizationTypeText = '医美'
+			// 				break;
+			// 			case 1:
+			// 				this.organizationTypeText = '生美'
+			// 				break;
+			// 		}
+			// 	}
+			// })
+		},
+		bindPickerChange2(e) {
+			this.typtIndex = e.target.value
+			this.firstClubType = e.target.value
+		},
+		radioChange(item) {
+			this.secondClubType = item.value
+			if (this.secondClubType == 2 || this.secondClubType == 3) {
+				this.isDepartment = true
+			} else {
+				this.isDepartment = false
+			}
+			for (let i = 0; i < this.beautyList.length; i++) {
+				if (this.beautyList[i].value === this.secondClubType) {
+					this.current = i
+					break
 				}
-			},
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.mainProduct = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.isMainproCheck = true
-				this.mainProduct = this.checkLikes(e,this.medicaCampList)
-				
-			},
-			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)
-					}
-				})
-				console.log(list)
-				return arr.join('/')
-			},
-			onBlurInput(e){//
-				if(e.detail.value ===''){
-					this.isDisabled = true
-				}else{
-					this.isDisabled = false
+			}
+		},
+		chooseMaleLike(e) {
+			this.isMainproCheck = true
+			this.mainProduct = this.checkLikes(e, this.mentuzCampList)
+		},
+		chooseMaleLikes(e) {
+			this.isMainproCheck = true
+			this.mainProduct = this.checkLikes(e, this.medicaCampList)
+		},
+		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)
 				}
-			},
-			showAustomItem() {
-				this.isShowAustomItem = !this.isShowAustomItem
-			},
-			setNewMainpro(arr){//回显处理主营内容
-				let _ARRAY = []
-				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
-					_ARRAY.push(_OBJ)
-				})
-				console.log(_ARRAY)
-				return _ARRAY
-			},
-			addCustomItem(){
-				if(this.customItemValue==''){
-					this.$util.msg('请输入自定义项目',2000);
-				}else{
-					if(this.firstClubType == 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)
-						}
+			})
+			console.log(list)
+			return arr.join('/')
+		},
+		onBlurInput(e) {
+			//
+			if (e.detail.value === '') {
+				this.isDisabled = true
+			} else {
+				this.isDisabled = false
+			}
+		},
+		showAustomItem() {
+			this.isShowAustomItem = !this.isShowAustomItem
+		},
+		setNewMainpro(arr) {
+			//回显处理主营内容
+			let _ARRAY = []
+			arr.split('/').forEach((item, index) => {
+				let _OBJ = { value: (index + 1).toString(), name: item, checked: true }
+				_ARRAY.push(_OBJ)
+			})
+			console.log(_ARRAY)
+			return _ARRAY
+		},
+		addCustomItem() {
+			if (this.customItemValue == '') {
+				this.$util.msg('请输入自定义项目', 2000)
+			} else {
+				if (this.firstClubType == 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)
 					}
-				}
-			},
-			checkedArray(content,arr){//判断主营内容是否已存在
-				for(var i in arr){
-					if(arr[i].name == content){
-						return true;
+				} 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)
 					}
 				}
-				return false;
-		   },
+			}
 		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userIdentity = resolve.userIdentity
-			})
-			if(this.isPreviewImage){
-				this.isPreviewImage = false
-				return
+		checkedArray(content, arr) {
+			//判断主营内容是否已存在
+			for (var i in arr) {
+				if (arr[i].name == content) {
+					return true
+				}
 			}
+			return false
+		}
+	},
+	onShow() {
+		this.$api.getStorage().then(resolve => {
+			this.userIdentity = resolve.userIdentity
+		})
+		if (this.isPreviewImage) {
+			this.isPreviewImage = false
+			return
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-	.placeholder{color:#b2b2b2 ;}
-	.register{
+.placeholder {
+	color: #b2b2b2;
+}
+.register {
+	width: 100%;
+	height: auto;
+	border-top: 1px solid #f7f7f7;
+	.model-warp.none {
+		display: none;
+	}
+	.model-warp.show {
+		display: block;
+	}
+	.register-main {
 		width: 100%;
 		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.model-warp.none{
-			display: none;			
+		&.detailed {
+			padding-bottom: 300rpx;
 		}
-		.model-warp.show{
-			display: block;
+		.register-tips {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			line-height: 44rpx;
+			font-size: $font-size-24;
+			color: #ff0000;
+			margin-bottom: 40rpx;
+			.iconfont {
+				font-size: $font-size-24;
+			}
 		}
-		.register-main{
-			width: 100%;
+		.register-row {
 			height: auto;
-			&.detailed{
-				padding-bottom: 300rpx;
+			margin-bottom: 20rpx;
+			&.none {
+				margin-bottom: 0;
 			}
-			.register-tips{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
+			.secondTyperadio {
+				border: 2rpx solid #e1e1e1;
+				display: inline-block;
+				font-size: 26rpx;
+				color: #999999;
+				padding: 0 24rpx;
+				border-radius: 22rpx;
+				line-height: 42rpx;
+				margin-right: 28rpx;
+				float: left;
+				&.active {
+					border: 2rpx solid #ffe6dc;
+					color: $color-system;
+				}
+			}
+			.register-tip {
+				width: 100%;
+				box-sizing: border-box;
+				padding: 0 24rpx;
 				line-height: 44rpx;
-				font-size: $font-size-24;
-				color: #FF0000;
-				margin-bottom: 40rpx;
-				.iconfont{
-					font-size: $font-size-24;
+				font-size: $font-size-20;
+				color: #fea785;
+				text-align: left;
+			}
+			.register-title {
+				line-height: 80rpx;
+				font-size: $font-size-30;
+				color: $text-color;
+				text-align: left;
+				padding-left: 20rpx;
+				background: #f7f7f7;
+				font-weight: bold;
+				.txt {
+					font-size: $font-size-26;
+					font-weight: normal;
 				}
 			}
-			.register-row{
-				height: auto;
-				margin-bottom: 20rpx;	
-				&.none{
-					margin-bottom: 0;
-				}		
-				.secondTyperadio{
-					border: 2rpx solid #e1e1e1;
-					display: inline-block;
-					font-size: 26rpx;
-					color: #999999;
-					padding: 0 24rpx;
-					border-radius: 22rpx;
-					line-height: 42rpx;
-					margin-right: 56rpx;
-					float: left;
-					&.active{
-						border: 2rpx solid #ffe6dc;
-						color: $color-system;
-					}
-				}	
-				.register-tip{
-					width: 100%;
-					box-sizing: border-box;
-					padding: 0 24rpx;
-					line-height: 44rpx;
-					font-size: $font-size-20;
-					color: #fea785;
-					text-align: left;
+			.row-btn {
+				position: absolute;
+				right: 24rpx;
+				top: 0;
+				line-height: 88rpx;
+				text-align: center;
+				font-size: $font-size-28;
+				color: $color-system;
+			}
+			.register-from {
+				width: 702rpx;
+				height: 88rpx;
+				margin: 0 24rpx;
+				position: relative;
+				border-bottom: 2rpx solid #e1e1e1;
+				box-sizing: border-box;
+				.keshi {
+					width: 678rpx;
+					border: 2rpx solid #b2b2b2;
+					border-radius: 6rpx;
+					height: 160rpx;
+					font-size: $font-size-28;
+					padding: 10rpx;
 				}
-				.register-title{
-					line-height: 80rpx;
-					font-size: $font-size-30;
-					color: $text-color;
-					text-align: left;
-					padding-left: 20rpx;
-					background: #f7f7f7;
-					font-weight: bold;
-					.txt{
-						font-size: $font-size-26;
-						font-weight: normal;
-					}
+				&.bordernone {
+					border: none;
+					height: auto;
+				}
+				&.second {
+					padding-left: 160rpx;
 				}
-				.row-btn{
-					position: absolute;
-					right: 24rpx;
-					top: 0;
+				.label {
+					text-align: left;
+					font-size: $font-size-28;
+					color: #666666;
 					line-height: 88rpx;
-					text-align: center;
+					float: left;
+				}
+				.kes-title {
 					font-size: $font-size-28;
-					color: $color-system;
+					color: #666666;
+					line-height: 88rpx;
 				}
-				.register-from{
-					width: 702rpx;
+				.row-input {
+					width: 520rpx;
+					padding-left: 10rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					line-height: 88rpx;
+					float: right;
 					height: 88rpx;
-					margin:0 24rpx;
-					position: relative;
-					border-bottom: 2rpx solid #e1e1e1;
-					box-sizing: border-box;
-					.keshi{
-						width: 678rpx;
-						border: 2rpx solid #b2b2b2;
-						border-radius: 6rpx;
-						height: 160rpx;
-						font-size: $font-size-28;
-						padding: 10rpx;
-					}
-					&.bordernone{
-						border: none;
-						height: auto;
-					}
-					&.second{
-						padding-left: 160rpx;
+					&.none {
+						color: #999999;
 					}
-					.label{
+					&.picker {
 						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 88rpx;
-						float: left;
+						color: #333333;
 					}
-					.kes-title{
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 88rpx;
+				}
+				&.code {
+					width: 410rpx;
+					float: left;
+					margin-right: 20rpx;
+					.row-input {
+						width: 390rpx;
 					}
-					.row-input{
-						width: 520rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 88rpx;
-						float: right;
+				}
+				&.btn {
+					width: 224rpx;
+					height: 88rpx;
+					float: left;
+					background: $btn-confirm;
+					padding: 0;
+					.row-input {
+						width: 224rpx;
 						height: 88rpx;
-						&.none{
-							color: #999999;
+						line-height: 88rpx;
+						padding: 0;
+						color: #ffffff;
+						background: $btn-confirm;
+						text-align: center;
+						border-radius: 14rpx;
+						&.other {
+							width: 300rpx;
+							background: #fff;
+							margin-right: 20rpx;
+							border: 2rpx solid #b2b2b2;
+							border-radius: 44rpx;
+							padding: 0 24rpx;
+							height: 64rpx;
+							line-height: 64rpx;
 						}
-						&.picker{
-							text-align: left;
-							color: #333333;
+						&.none {
+							background: #f7f7f7;
 						}
-						
 					}
-					&.code{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 390rpx;
+					&.disabled {
+						background: #f7f7f7;
+						.row-input {
+							background: #f7f7f7;
+							color: #999999;
 						}
 					}
-					&.btn{
-						width: 224rpx;
+				}
+				&.picker {
+					width: 654rpx;
+					height: 88rpx;
+					line-height: 88rpx;
+					.label {
+						line-height: 88rpx;
+					}
+					.label-radio {
+						margin-right: 70rpx;
+					}
+					.row-radio {
+						transform: scale(0.8);
+					}
+					.row-input {
+						width: 500rpx;
 						height: 88rpx;
-						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						.row-input{
-							width: 224rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 14rpx;
-							&.other{
-								width: 300rpx;
-								background: #FFF;
-								margin-right: 20rpx;
-								border: 2rpx solid #b2b2b2;
-								border-radius: 44rpx;
-								padding: 0 24rpx;
-								height: 64rpx;
-								line-height: 64rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
+						line-height: 88rpx;
+						padding-left: 30rpx;
 					}
-					&.picker{
-						width: 654rpx;
+				}
+				&.radio {
+					padding: 0 24rpx;
+					width: 654rpx;
+					height: 288rpx;
+					.row-input {
+						width: 100%;
 						height: 88rpx;
 						line-height: 88rpx;
-						.label{
-							line-height: 88rpx;
-						}
-						.label-radio{margin-right: 70rpx;}
-						.row-radio{
-							transform: scale(.8);
-						}
-						.row-input{
-							width: 500rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 30rpx;
-						}
+						padding-left: 0;
 					}
-					&.radio{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 288rpx;
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-							transform: scale(0.8);
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
+					.row-radio {
+						float: left;
+						transform: scale(0.8);
 					}
-					&.group{
-						padding: 0 24rpx;
-						width: 702rpx;
-						height: auto;
-						background: #FFFFFF;
-						margin-top: 30rpx;
-						border: 0;
-						.label{
-							line-height: 76rpx;
-						}
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
+					.row-text {
+						width: 100rpx;
+						text-align: center;
+						float: left;
 					}
-					&.btn{
-						margin-top: 0;
+				}
+				&.group {
+					padding: 0 24rpx;
+					width: 702rpx;
+					height: auto;
+					background: #ffffff;
+					margin-top: 30rpx;
+					border: 0;
+					.label {
+						line-height: 76rpx;
 					}
-					.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: 220rpx;
-							height: 40rpx;
-							padding: 24rpx;
-							text-align: left;
-							border-radius: 10rpx;
-							font-size: $font-size-28;
-							color: $text-color;
-						}
-						.confirm-btn{
-							width: 160rpx;
-							height: 64rpx;
-							border-radius: 10rpx;
-							border-radius: 45rpx;
-							line-height: 64rpx;
-							text-align: center;
-							background: #ffe6dc;
-							color: $color-system;
-							&.other{
-								width: 213rpx;
-							}
-						}
-						.item {
-						  height: 60rpx;
-						  font-size:$font-size-28;
-						  line-height: 60rpx;
-						  border-radius:10rpx;
-						  margin-left: 40rpx;
-						  box-sizing: border-box;
-						  float: left;
-						}
-						.item-checkbox{
-							display: none;
-						}
-						.item-text{
-							border: 2rpx solid #e1e1e1;
-							display: inline-block;
-							font-size: 26rpx;
-							color: #999999;
-							padding: 0 30rpx;
-							border-radius: 28rpx;
-							line-height: 50rpx;
-							float: left;
-						}
-						.on {
-							.item-text{
-								border-color: $color-system;
-								color:$color-system;
-							}
-						}
+					.row-input {
+						width: 100%;
+						height: 88rpx;
+						line-height: 88rpx;
+						padding-left: 0;
+					}
+					.row-radio {
+						float: left;
+					}
+					.row-text {
+						width: 100rpx;
+						text-align: center;
+						float: left;
 					}
 				}
-				.icon-xiayibu{
-					width: 88rpx;
-					height: 88rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
-					color: #b2b2b2;
+				&.btn {
+					margin-top: 0;
 				}
-				&.text-textarea{
-					background: #FFFFFF;
-					margin: 0 24rpx;
-					.label{
-						color: #666666;
-						font-size: $font-size-28;
-						line-height: 88rpx;
+				.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;
 					}
-					.textarea{
-						width: 654rpx;
-						height: 200rpx;
-						// background: #F7F7F7;
+					.row-input {
+						display: flex;
+						width: 220rpx;
+						height: 40rpx;
 						padding: 24rpx;
+						text-align: left;
+						border-radius: 10rpx;
 						font-size: $font-size-28;
 						color: $text-color;
-						z-index: 1;
-						border-radius: 6rpx;
-						border: 2rpx solid #b2b2b2;
 					}
-					.adddress{
-						height: 147rpx;
-						border-bottom: 2rpx solid #e1e1e1;
+					.confirm-btn {
+						width: 160rpx;
+						height: 64rpx;
+						border-radius: 10rpx;
+						border-radius: 45rpx;
+						line-height: 64rpx;
+						text-align: center;
+						background: #ffe6dc;
+						color: $color-system;
+						&.other {
+							width: 213rpx;
+						}
+					}
+					.item {
+						height: 60rpx;
 						font-size: $font-size-28;
-						color: $text-color;
-						padding: 24rpx;
+						line-height: 60rpx;
+						border-radius: 10rpx;
+						margin-left: 40rpx;
+						box-sizing: border-box;
+						float: left;
 					}
-					.textarea.hide{
-						opacity: 0;
+					.item-checkbox {
+						display: none;
 					}
-					.textarea.show{
+					.item-text {
+						border: 2rpx solid #e1e1e1;
+						display: inline-block;
+						font-size: 26rpx;
 						color: #999999;
+						padding: 0 30rpx;
+						border-radius: 28rpx;
+						line-height: 50rpx;
+						float: left;
+					}
+					.on {
+						.item-text {
+							border-color: $color-system;
+							color: $color-system;
+						}
 					}
 				}
 			}
-			.register-picture{
-				// height: 102rpx;
-				margin: 30rpx 0;
-				// width: 42%;
-				// float: left;
-				&.zz{
-					width: 100%;
+			.icon-xiayibu {
+				width: 88rpx;
+				height: 88rpx;
+				position: absolute;
+				right: 0;
+				top: 0;
+				line-height: 88rpx;
+				text-align: center;
+				color: #b2b2b2;
+			}
+			&.text-textarea {
+				background: #ffffff;
+				margin: 0 24rpx;
+				.label {
+					color: #666666;
+					font-size: $font-size-28;
+					line-height: 88rpx;
 				}
-				.label{
-					// float: left;
+				.textarea {
+					width: 654rpx;
+					height: 200rpx;
+					// background: #F7F7F7;
+					padding: 24rpx;
 					font-size: $font-size-28;
-					color: #666666;
-					line-height: 102rpx;
-					// width: 150rpx;
-					padding: 0 24rpx;
-					// text-align: left;
-					&.zz{
-						width: 230rpx;
-					}
+					color: $text-color;
+					z-index: 1;
+					border-radius: 6rpx;
+					border: 2rpx solid #b2b2b2;
+				}
+				.adddress {
+					height: 147rpx;
+					border-bottom: 2rpx solid #e1e1e1;
+					font-size: $font-size-28;
+					color: $text-color;
+					padding: 24rpx;
+				}
+				.textarea.hide {
+					opacity: 0;
+				}
+				.textarea.show {
+					color: #999999;
+				}
+			}
+		}
+		.register-picture {
+			// height: 102rpx;
+			margin: 30rpx 0;
+			// width: 42%;
+			// float: left;
+			&.zz {
+				width: 100%;
+			}
+			.label {
+				// float: left;
+				font-size: $font-size-28;
+				color: #666666;
+				line-height: 102rpx;
+				// width: 150rpx;
+				padding: 0 24rpx;
+				// text-align: left;
+				&.zz {
+					width: 230rpx;
 				}
-				.upload-picture{
-					// float: left;
+			}
+			.upload-picture {
+				// float: left;
+				height: 180rpx;
+				width: 200rpx;
+				.upload-none {
+					width: 200rpx;
 					height: 180rpx;
+					text-align: center;
+					line-height: 100rpx;
+					color: #999999;
+					// border: 1px solid #999999;
+					border-radius: 10rpx;
+					margin: 0 20rpx;
+					// .iconfont{
+					// 	font-size: $font-size-28;
+					// }
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+				.upload-image {
 					width: 200rpx;
-					.upload-none{
-						width: 200rpx;
-						height: 180rpx;
-						text-align: center;
-						line-height: 100rpx;
-						color: #999999;
-						// border: 1px solid #999999;
+					height: 180rpx;
+					border-radius: 10rpx;
+					margin: 0 20rpx;
+					position: relative;
+					image {
+						width: 100%;
+						height: 100%;
 						border-radius: 10rpx;
-						margin: 0 20rpx;
-						// .iconfont{
-						// 	font-size: $font-size-28;
-						// }
-						image{
-							width: 100%;
-							height: 100%;
-						}
 					}
-					.upload-image{
-						width: 200rpx;
-						height: 180rpx;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						position: relative;
-						image{
-							width: 100%;
-							height: 100%;
-							border-radius: 10rpx;
-						}
-						.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;
-							}
+					.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;
+		}
+		.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;
-				.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;
-				padding: 20rpx 0;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 99;
-				background: #FFFFFF;
-				.register-agree{
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					margin: 32rpx 0;
-					.agree-text{
-						.checkbox{
-							float: left;
-							margin: 4rpx 6rpx 0 0;
-							color: #999999;
-							font-size: $font-size-32;
-							&.icon-gouxuan{
-								color: $color-system;
-							}
-						}
-						font-size: 20rpx;
-						line-height: 44rpx;
+		}
+		.register-fiexd {
+			width: 100%;
+			height: auto;
+			padding: 20rpx 0;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			background: #ffffff;
+			.register-agree {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin: 32rpx 0;
+				.agree-text {
+					.checkbox {
+						float: left;
+						margin: 4rpx 6rpx 0 0;
 						color: #999999;
-						text{
-							color:#0091FF;
+						font-size: $font-size-32;
+						&.icon-gouxuan {
+							color: $color-system;
 						}
 					}
+					font-size: 20rpx;
+					line-height: 44rpx;
+					color: #999999;
+					text {
+						color: #0091ff;
+					}
 				}
 			}
-			.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;
-				&.none{
-					background: #FFFFFF;
-					color: $text-color;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
+		}
+		.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;
+			&.none {
+				background: #ffffff;
+				color: $text-color;
+				margin-top: 0;
+			}
+			&.sub {
+				margin-top: 0;
 			}
 		}
 	}
-	checkbox .wx-checkbox-input{
-	  border-radius: 50%;
-	  width: 36rpx; 
-	  height: 36rpx;
-	}
-	/* 选中后的 背景样式 */
-	checkbox .wx-checkbox-input.wx-checkbox-input-checked{
-	  background: #E15616;
-	  border: 2rpx solid #e15616;
-	}
-	checkbox .wx-checkbox-input.wx-checkbox-input-checked::before{
-	  border-radius: 50%;
-	  width: 36rpx;
-	  height: 36rpx;
-	  line-height: 36rpx;
-	  text-align: center;
-	  font-size:20rpx; 
-	  color:#fff;
-	  transform:scale(.8);
-	  -webkit-transform:translate(-50%, -50%) scale(1);
-	}
+}
+checkbox .wx-checkbox-input {
+	border-radius: 50%;
+	width: 36rpx;
+	height: 36rpx;
+}
+/* 选中后的 背景样式 */
+checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+	background: #e15616;
+	border: 2rpx solid #e15616;
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+	border-radius: 50%;
+	width: 36rpx;
+	height: 36rpx;
+	line-height: 36rpx;
+	text-align: center;
+	font-size: 20rpx;
+	color: #fff;
+	transform: scale(0.8);
+	-webkit-transform: translate(-50%, -50%) scale(1);
+}
 </style>

pages/search/search.vue

@@ -346,7 +346,7 @@
 			},
 			getProductPrice(){//获取价格
 				let productIdArr = [];
-				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
+				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对资质机构公开
 					productIdArr.push(item.productId)
 				})
 				this.productIds = productIdArr.join(",");

pages/seller/club/club-list.vue

@@ -3,14 +3,16 @@
 		<view class="club-search clearfix">
 			<view class="search-from name">
 				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" 
-					   type="text" 
-					   confirm-type="search" 
-					   v-model="searchInputVal" 
-					    @input="onShowClose" 
-					   @confirm="initclubList()" 
-					   placeholder="机构名称/联系人" 
-					   maxlength="12"/>
+				<input
+					class="input"
+					type="text"
+					confirm-type="search"
+					v-model="searchInputVal"
+					@input="onShowClose"
+					@confirm="initclubList()"
+					placeholder="机构名称/联系人"
+					maxlength="12"
+				/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
 			<view class="search-btn">
@@ -19,46 +21,56 @@
 		</view>
 		<view class="club-main">
 			<view v-if="isEmpty" class="empty-container">
-				<image class="club-empty-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png" mode="aspectFit"></image>
+				<image
+					class="club-empty-image"
+					src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"
+					mode="aspectFit"
+				></image>
 				<view class="txt">暂无机构数据</view>
 			</view>
 			<view v-else class="club-list">
-				<scroll-view scroll-y="true" >
-					<view class="list" v-for="(item, index) in clubList" :key="index">
+				<scroll-view scroll-y="true">
+					<view class="list" v-for="(club, index) in clubList" :key="index">
 						<view class="club-list-top">
 							<view class="list-left">
-								<view class="list-head"><image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image></view>
+								<view class="list-head"
+									><image
+										:src="
+											club.headpic
+												? club.headpic
+												: 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'
+										"
+										mode=""
+									></image
+								></view>
 							</view>
 							<view class="list-item">
 								<view class="list-title">
-									<text class="list-name">{{item.name}}</text>
-									<text class="list-hist" @click.stop="_goHistory(item)"><text class="iconfont icon-dingdanxuanzhong"></text>订单列表</text>
+									<text class="list-name">{{ club.name }}</text>
+									<text class="list-hist" @click.stop="_goHistory(club)"
+										><text class="iconfont icon-dingdanxuanzhong"></text>订单列表</text
+									>
 								</view>
 								<view class="list-opea">
-									
+									<text class="tags" v-if="club.userIdentity == 2">VIP</text>
+									<text class="tags sv" v-if="club.userIdentity == 4">SVIP</text>
 								</view>
 							</view>
 						</view>
 						<view class="club-list-bot">
 							<view class="list-opea">
-								<view class="btn org" @click.stop="_goImmediately(item)">
-									<text>立即下单</text>
-								</view>
-								<view class="btn gre" @click.stop="_goSecond(item)">
-									<text>二手下单</text>
-								</view>
-								<view class="btn yel" @click.stop="_goBuyagain(item)">
-									<text>再次购买</text>
-								</view>
-								<view class="btn yeo" @click.stop="_goRechargeOrder(item)">
+								<view class="btn org" @click.stop="_goImmediately(club)"> <text>立即下单</text> </view>
+								<view class="btn gre" @click.stop="_goSecond(club)"> <text>二手下单</text> </view>
+								<view class="btn yel" @click.stop="_goBuyagain(club)"> <text>再次购买</text> </view>
+								<view class="btn yeo" @click.stop="_goRechargeOrder(club)">
 									<text>充值/下订金</text>
 								</view>
 							</view>
-						</view>	
+						</view>
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
 					<!--加载loadding-->
 				</scroll-view>
 			</view>
@@ -67,346 +79,386 @@
 </template>
 
 <script>
-	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				serviceProviderId:'',
-				isShowClose:false,
-				searchInputVal:'',
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				status:66,
-				pageNum:1,
-				pageSize:10,
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				scrollHeight:'',
-				currPage:'',//当前页面
-				prevPage:'',//上一个页面
-				clubList:[],
-			}
+import authorize from '@/common/config/authorize.js'
+import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+import tuiNomore from '@/components/tui-components/nomore/nomore'
+export default {
+	components: {
+		tuiLoadmore,
+		tuiNomore
+	},
+	data() {
+		return {
+			serviceProviderId: '',
+			isShowClose: false,
+			searchInputVal: '',
+			isEmpty: false,
+			nomoreText: '上拉显示更多',
+			status: 66,
+			pageNum: 1,
+			pageSize: 10,
+			hasNextPage: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			scrollHeight: '',
+			currPage: '', //当前页面
+			prevPage: '', //上一个页面
+			clubList: []
+		}
+	},
+	onLoad() {
+		this.setScrollHeight()
+	},
+	methods: {
+		setScrollHeight() {
+			// 窗口高度 - 底部距离
+			setTimeout(() => {
+				const query = wx.createSelectorQuery().in(this)
+				query.selectAll('.add-btn').boundingClientRect()
+				query.exec(res => {
+					if (res[0][0]) {
+						let winHeight = this.$api.getWindowHeight(),
+							eleTop = res[0][0].top - 1
+						this.scrollHeight = eleTop
+					}
+				})
+			}, 500)
 		},
-		onLoad(){				
-			this.setScrollHeight();
+		searchClubList() {
+			this.pageNum = 1
+			this.initclubList()
 		},
-		methods: {
-			setScrollHeight() {
-				// 窗口高度 - 底部距离
-				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
-					query.exec(res => {
-						if(res[0][0]){
-							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
-						}
-					})
-				}, 500)
-			},
-			searchClubList(){
-				this.pageNum=1
-				this.initclubList()
-			},
-			initclubList(){
-				let params = {userIdentity:'',name:this.searchInputVal,pageNum:1,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.status}
-				this.SellerService.GetSellerClubList(params).then(response =>{
+		initclubList() {
+			let params = {
+				userIdentity: '',
+				name: this.searchInputVal,
+				pageNum: 1,
+				pageSize: this.pageSize,
+				spId: this.serviceProviderId,
+				status: this.status
+			}
+			this.SellerService.GetSellerClubList(params)
+				.then(response => {
 					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
+					if (responseData.results && responseData.results.length > 0) {
 						this.isEmpty = false
 						this.hasNextPage = response.data.hasNextPage
-						this.clubList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
+						this.clubList = responseData.results
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
+						} else {
 							this.pullUpOn = true
 							this.loadding = false
 							this.nomoreText = '已至底部'
 						}
-					}else{
+					} else {
 						this.isEmpty = true
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			},	
-			getOnReachBottomData(){
-				this.pageNum+=1
-				let params = {userIdentity:'',name:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,spId:this.serviceProviderId,status:this.status}
-				this.SellerService.GetSellerClubList(params).then(response =>{
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		getOnReachBottomData() {
+			this.pageNum += 1
+			let params = {
+				userIdentity: '',
+				name: this.searchInputVal,
+				pageNum: this.pageNum,
+				pageSize: this.pageSize,
+				spId: this.serviceProviderId,
+				status: this.status
+			}
+			this.SellerService.GetSellerClubList(params)
+				.then(response => {
 					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
+					if (responseData.results && responseData.results.length > 0) {
 						this.hasNextPage = response.data.hasNextPage
-						this.clubList = this.clubList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
+						this.clubList = this.clubList.concat(responseData.results)
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
+						} else {
 							this.pullUpOn = false
 							this.loadding = false
 							this.nomoreText = '已至底部'
 						}
 					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.searchInputVal != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.searchInputVal = ''
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.searchInputVal != '') {
+				this.isShowClose = true
+			} else {
 				this.isShowClose = false
-			},
-			_goImmediately(item){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/pages/seller/cart/immediately')
-			},
-			_goBuyagain(item ){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/pages/seller/cart/buyagain')
-			},
-			_goRechargeOrder(item){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/pages/seller/order/create-recharge-order')
-			},
-			_goSecond(item ){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo('/pages/seller/cart/second')
-			},
-			_goHistory(item){
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo(`/pages/seller/order/order-historylist?clubID=${item.clubID}&listType=0`)
 			}
 		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
+		delInputText() {
+			//清除输入框内容
+			this.searchInputVal = ''
+			this.isShowClose = false
+		},
+		_goImmediately(item) {
+			this.$api.setStorage('orderUserInfo', item)
+			this.$api.navigateTo('/pages/seller/cart/immediately')
+		},
+		_goBuyagain(item) {
+			this.$api.setStorage('orderUserInfo', item)
+			this.$api.navigateTo('/pages/seller/cart/buyagain')
+		},
+		_goRechargeOrder(item) {
+			this.$api.setStorage('orderUserInfo', item)
+			this.$api.navigateTo('/pages/seller/order/create-recharge-order')
+		},
+		_goSecond(item) {
+			this.$api.setStorage('orderUserInfo', item)
+			this.$api.navigateTo('/pages/seller/cart/second')
 		},
-		onShow() {
-			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderId
-				this.pageNum = 1;
-				this.initclubList();
-			})
+		_goHistory(item) {
+			this.$api.setStorage('orderUserInfo', item)
+			this.$api.navigateTo(`/pages/seller/order/order-historylist?clubID=${item.clubID}&listType=0`)
 		}
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.getOnReachBottomData()
+		}
+	},
+	onShow() {
+		this.$api.getStorage().then(response => {
+			this.serviceProviderId = response.serviceProviderId
+			this.pageNum = 1
+			this.initclubList()
+		})
 	}
+}
 </script>
 
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-	}
-	.container{
-		position: relative;
-	}
-	.club-search{
+<style lang="scss">
+page {
+	height: auto;
+}
+page,
+.container {
+	/* padding-bottom: 120upx; */
+	background: #f7f7f7;
+}
+.container {
+	position: relative;
+}
+.club-search {
+	height: 64rpx;
+	width: 702rpx;
+	padding: 24rpx;
+	background: #ffffff;
+	display: flex;
+	align-items: center;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	.search-from {
+		width: 582rpx;
 		height: 64rpx;
-		width: 702rpx;
-		padding: 24rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.search-from{
-			width: 582rpx;
+		background: #f7f7f7;
+		border-radius: 32rpx;
+		float: left;
+		position: relative;
+		.icon-iconfonticonfontsousuo1 {
+			width: 64rpx;
 			height: 64rpx;
-			background: #F7F7F7;
-			border-radius: 32rpx;
+			line-height: 64rpx;
+			text-align: center;
+			display: block;
+			font-size: $font-size-38;
 			float: left;
-			position: relative;
-			.icon-iconfonticonfontsousuo1{
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				display: block;
-				font-size: $font-size-38;
-				float: left;
-				color: #999999;
-			}
-			.icon-shanchu1{
-				font-size: $font-size-32;
-				color: #999999;
-				position: absolute;
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				top: 0;
-				right: 0;
-				z-index: 10;
-			}
-			.input{
-				width: 500rpx;
-				height: 64rpx;
-				float: left;
-				line-height: 64rpx;
-				color: $text-color;
-				font-size: $font-size-24;
-			}
+			color: #999999;
 		}
-		.search-btn{
-			width: 120rpx;
+		.icon-shanchu1 {
+			font-size: $font-size-32;
+			color: #999999;
+			position: absolute;
+			width: 64rpx;
+			height: 64rpx;
 			line-height: 64rpx;
 			text-align: center;
-			font-size: $font-size-28;
-			color: $color-system;
+			top: 0;
+			right: 0;
+			z-index: 10;
+		}
+		.input {
+			width: 500rpx;
+			height: 64rpx;
 			float: left;
-			background: #FFFFFF;
+			line-height: 64rpx;
+			color: $text-color;
+			font-size: $font-size-24;
 		}
 	}
-	.club-main{
-		padding-top: 122rpx;
-		.list{
-			align-items: center;
-			width: 702rpx;
-			height: auto;
-			padding: 24rpx;
-			background: #FFFFFF;
-			position: relative;
-			border-bottom: 1px solid #EBEBEB;
+	.search-btn {
+		width: 120rpx;
+		line-height: 64rpx;
+		text-align: center;
+		font-size: $font-size-28;
+		color: $color-system;
+		float: left;
+		background: #ffffff;
+	}
+}
+.club-main {
+	padding-top: 122rpx;
+	.list {
+		align-items: center;
+		width: 702rpx;
+		height: auto;
+		padding: 24rpx;
+		background: #ffffff;
+		position: relative;
+		border-bottom: 1px solid #ebebeb;
+		float: left;
+		.club-list-top {
+			width: 100%;
+			height: 140rpx;
 			float: left;
-			.club-list-top{
-				width: 100%;
+			display: flex;
+			align-items: center;
+			.list-left {
 				height: 140rpx;
-				float: left;
-				display: flex;
-				align-items: center;
-				.list-left{
+				flex: 2;
+				margin-right: 10rpx;
+				.list-head {
+					width: 140rpx;
 					height: 140rpx;
-					flex: 2;
-					margin-right: 10rpx;
-					.list-head{
+					border-radius: 14rpx;
+					image {
 						width: 140rpx;
 						height: 140rpx;
 						border-radius: 14rpx;
-						image{
-							width: 140rpx;
-							height: 140rpx;
-							border-radius: 14rpx;
-						}
 					}
 				}
-				.list-item{
-					height: 140rpx;
-					flex: 8;
-					display: flex;
-					flex-direction:column ;
-					.list-title{
-						flex: 2;
-						line-height: 80rpx;
-						width: 100%;
-						font-size: $font-size-28;
-						color: $text-color;
-						padding-left: 11rpx;
-						flex-direction: row;
-						justify-content: flex-start;
-						.list-name{
-							width: 390rpx;
-							display: block;
-							float: left;
-							text-align: left;
-							-o-text-overflow: ellipsis;
-							text-overflow: ellipsis;
-							display: -webkit-box;
-							word-break: break-all;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 1;
-							overflow: hidden;
-						}
-						.list-hist{
-							display: block;
-							float: right;
-							color: #E19B30;
-							font-size: $font-size-24;
-							text-align: right;
-							padding-right: 30rpx;
-							.icon-dingdanxuanzhong{
-								font-size: $font-size-34;
-								color: #E19B30;
-							}
-						}
+			}
+			.list-item {
+				height: 140rpx;
+				flex: 8;
+				display: flex;
+				flex-direction: column;
+				.list-title {
+					flex: 2;
+					line-height: 80rpx;
+					width: 100%;
+					font-size: $font-size-28;
+					color: $text-color;
+					padding-left: 11rpx;
+					flex-direction: row;
+					justify-content: flex-start;
+					.list-name {
+						width: 390rpx;
+						display: block;
+						float: left;
+						text-align: left;
+						-o-text-overflow: ellipsis;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						word-break: break-all;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 1;
+						overflow: hidden;
 					}
-					.list-opea{
-						width: 100%;
-						display: flex;
-						flex: 4;
-						color: #166CE1;
-						flex-direction: row;
-						align-items: center;
+					.list-hist {
+						display: block;
+						float: right;
+						color: #e19b30;
+						font-size: $font-size-24;
+						text-align: right;
+						padding-right: 30rpx;
+						.icon-dingdanxuanzhong {
+							font-size: $font-size-34;
+							color: #e19b30;
+						}
 					}
 				}
-			}
-			.club-list-bot{
-				width: 100%;
-				height: 60rpx;
-				float: left;
-				margin-top: 20rpx;
-				.list-opea{
+				.list-opea {
 					width: 100%;
 					display: flex;
-					flex: 1;
-					color: #166CE1;
+					flex: 4;
+					color: #166ce1;
 					flex-direction: row;
 					align-items: center;
-					.btn{
-						width: 160rpx;
-						height: 60rpx;
-						line-height: 60rpx;
-						border-radius: 30rpx;
-						font-size: $font-size-24;
-						color: $text-color;
+					.tags {
+						display: inline-block;
+						width: 60rpx;
+						height: 32rpx;
+						border-radius: 8rpx;
+						background: #f0cb72;
+						font-size: $font-size-22;
+						color: #4e4539;
 						text-align: center;
-						margin: 0 15rpx;
-						&.org{
-							background:rgba(22,225,77,.1);
-							color: #16E14D;
-						}
-						&.gre{
-							background:rgba(22,123,225,.1);
-							color: #167BE1;
-						}
-						&.yel{
-							background:rgba(225,86,22,.1);
-							color: #E15616;
-						}
-						&.yeo{
-							background: #fff5cf;
-							color: #ffaa01;
+						line-height: 32rpx;
+						margin-left: 10rpx;
+						&.sv {
+							background: #333333;
+							color: #f0cb72;
 						}
 					}
 				}
 			}
 		}
+		.club-list-bot {
+			width: 100%;
+			height: 60rpx;
+			float: left;
+			margin-top: 20rpx;
+			.list-opea {
+				width: 100%;
+				display: flex;
+				flex: 1;
+				color: #166ce1;
+				flex-direction: row;
+				align-items: center;
+				.btn {
+					width: 160rpx;
+					height: 60rpx;
+					line-height: 60rpx;
+					border-radius: 30rpx;
+					font-size: $font-size-24;
+					color: $text-color;
+					text-align: center;
+					margin: 0 15rpx;
+					&.org {
+						background: rgba(22, 225, 77, 0.1);
+						color: #16e14d;
+					}
+					&.gre {
+						background: rgba(22, 123, 225, 0.1);
+						color: #167be1;
+					}
+					&.yel {
+						background: rgba(225, 86, 22, 0.1);
+						color: #e15616;
+					}
+					&.yeo {
+						background: #fff5cf;
+						color: #ffaa01;
+					}
+				}
+			}
+		}
 	}
+}
 </style>
-

pages/seller/club/list.vue

@@ -1,17 +1,19 @@
 <template>
-	<view class="container club clearfix" :style="{ paddingBottom:isIphoneX?'140rpx':'98rpx' }">
+	<view class="container club clearfix" :style="{ paddingBottom: isIphoneX ? '140rpx' : '98rpx' }">
 		<view class="club-search clearfix">
 			<view class="search-top">
 				<view class="search-from name">
 					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-					<input class="input" 
-						   type="text" 
-						   confirm-type="search"
-						   v-model="searchInputVal" 
-						   @input="onShowClose" 
-						   @confirm="initclubList()" 
-						   placeholder="机构名称/联系人" 
-						   maxlength="16"/>
+					<input
+						class="input"
+						type="text"
+						confirm-type="search"
+						v-model="searchInputVal"
+						@input="onShowClose"
+						@confirm="initclubList()"
+						placeholder="机构名称/联系人"
+						maxlength="16"
+					/>
 					<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 				</view>
 				<view class="search-btn">
@@ -19,535 +21,590 @@
 				</view>
 			</view>
 			<view class="search-tab">
-				<view class="tab-item" v-for="(item,index) in  listTab" :key="index" :class="{ current: tabCurrentNum === index }" @click="tabCurrentClick(index)">
-					<text class="item-text">{{item.name}}<text class="line"></text></text>
+				<view
+					class="tab-item"
+					v-for="(item, index) in listTab"
+					:key="index"
+					:class="{ current: tabCurrentNum === index }"
+					@click="tabCurrentClick(index)"
+				>
+					<text class="item-text">{{ item.name }}<text class="line"></text></text>
 				</view>
 			</view>
 		</view>
 		<view class="club-main">
 			<view v-if="isEmpty" class="empty-container">
-				<image class="club-empty-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png" mode="aspectFit"></image>
+				<image
+					class="club-empty-image"
+					src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6AY2ZjAABpmnBICH4247.png"
+					mode="aspectFit"
+				></image>
 				<view class="txt">暂无机构数据</view>
 			</view>
 			<view v-else class="club-list">
-				<scroll-view scroll-y="true" >
-					<view class="list" v-for="(item, index) in clubList" :key="index">
+				<scroll-view scroll-y="true">
+					<view class="list" v-for="(club, index) in clubList" :key="index">
 						<view class="list-logo">
-							<image :src="item.headpic ? item.headpic : 'https://static.caimei365.com/app/img/icon/icon-club@3x.png'" mode=""></image>
-						</view>	
+							<image
+								:src="
+									club.headpic
+										? club.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">
+								{{ club.userIdentity === 2 ? club.name : club.linkMan }}
+								<text class="tags" v-if="tabCurrentNum == 0">VIP</text>
+								<text class="tags sv" v-if="tabCurrentNum == 1">SVIP</text>
+							</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-link">{{ club.linkMan ? club.linkMan : '' }}</text>
+								<text class="list-texl">{{ club.contractMobile ? club.contractMobile : '' }}</text>
 							</view>
 							<view class="list-opera">
-								<button class="btn org" @click.stop="checkData(item)">修改资料</button>
-								<view class="btn gre"  @click.stop="orderHistory(item)">
+								<button class="btn org" @click.stop="checkData(club)">修改资料</button>
+								<view class="btn gre" @click.stop="orderHistory(club)">
 									历史订单
-									<text v-if="item.orderNum >0"
-										  class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num">
-										  {{showBadge(item.orderNum)}}
+									<text
+										v-if="club.orderNum > 0"
+										class="opea-badge uni-badge uni-badge-error uni-small uni-badge--small icon-num"
+									>
+										{{ showBadge(club.orderNum) }}
 									</text>
 								</view>
+								<view class="btn doc" @click.stop="clubRemaks(club)"> 资料备注 </view>
 							</view>
-						</view>	
-					</view>		
+						</view>
+					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>
+					<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
 				</scroll-view>
 			</view>
 		</view>
-		<view class="tabBar" :style="{height:isIphoneX?'140rpx':'98rpx'}" v-if="tabCurrentNum ===0">
-			<view class="tabBar_list" :style="{paddingBottom:isIphoneX?'40rpx':''}">
-				<view  class="tabBar_item" :class="{ 'current' : tabCurrentIndex === 0}"   @click="tabClick(0)" >
-					<text class="iconfont icon-shenhetongguo"></text>
-					<view class="tabBar_name">待升级</view>
+		<view class="tabBar" :style="{ height: isIphoneX ? '140rpx' : '98rpx' }" v-if="tabCurrentNum === 0">
+			<view class="tabBar_list" :style="{ paddingBottom: isIphoneX ? '40rpx' : '' }">
+				<view class="tabBar_item" :class="{ current: tabCurrentIndex === 0 }" @click="tabClick(0)">
+					<text class="iconfont icon-shenhetongguo"></text> <view class="tabBar_name">待升级</view>
 				</view>
-				<view  class="tabBar_item" :class="{ 'current1' : tabCurrentIndex === 1}"   @click="tabClick(1)" >
-					<text class="iconfont icon-lishidingdan"></text>
-					<view class="tabBar_name">升级中</view>
+				<view class="tabBar_item" :class="{ current1: tabCurrentIndex === 1 }" @click="tabClick(1)">
+					<text class="iconfont icon-lishidingdan"></text> <view class="tabBar_name">升级中</view>
 				</view>
-				<view  class="tabBar_item" :class="{ 'current2' : tabCurrentIndex === 2}"   @click="tabClick(2)" >
-					<text class="iconfont icon-shenhebutongguo"></text>
-					<view class="tabBar_name">升级失败</view>
+				<view class="tabBar_item" :class="{ current2: tabCurrentIndex === 2 }" @click="tabClick(2)">
+					<text class="iconfont icon-shenhebutongguo"></text> <view class="tabBar_name">升级失败</view>
 				</view>
 			</view>
 		</view>
 		<!-- 分享弹窗 -->
-		<shareModel  v-if="isShareModal" :orderID="shareClubUseId" @shareConfirm ='onShareAppMessage'></shareModel>
+		<shareModel v-if="isShareModal" :orderID="shareClubUseId" @shareConfirm="onShareAppMessage"></shareModel>
 	</view>
 </template>
 
 <script>
-	import authorize from '@/common/config/authorize.js'	
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import shareModel from '@/components/cm-module/modelAlert/shareModel.vue'			 //分享弹窗
-	
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-			shareModel
-		},
-		data() {
-			return {
-				listTab:[{name:'普通机构'},{name:'会员机构'}],
-				serviceProviderId:'',
-				shareClubUseId:0,
-				shareIdentity:0,
-				isShowClose:false,
-				searchInputVal:'',
-				isEmpty:false,
-				isShareModal:false,
-				nomoreText: '上拉显示更多',
-				userIdentity:4,
-				pageNum:1,
-				pageSize:10,
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				allowDataStatus:true,
-				wrapperHeight:'100%',
-				scrollHeight:'',
-				deleteAddressId:'',
-				currPage:'',//当前页面
-				prevPage:'',//上一个页面
-				tabCurrentNum:0,
-				tabCurrentIndex:0,
-				listStatus:90,
-				clubList:[],
-				isIphoneX:this.$store.state.isIphoneX,
-				show_index:0,//控制显示那个组件
-				
-			}
+import authorize from '@/common/config/authorize.js'
+import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+import tuiNomore from '@/components/tui-components/nomore/nomore'
+import shareModel from '@/components/cm-module/modelAlert/shareModel.vue' //分享弹窗
+
+export default {
+	components: {
+		tuiLoadmore,
+		tuiNomore,
+		shareModel
+	},
+	data() {
+		return {
+			listTab: [{ name: '个人机构' }, { name: '资质机构' }],
+			serviceProviderId: '',
+			shareClubUseId: 0,
+			shareIdentity: 0,
+			isShowClose: false,
+			searchInputVal: '',
+			isEmpty: false,
+			isShareModal: false,
+			nomoreText: '上拉显示更多',
+			userIdentity: 4,
+			pageNum: 1,
+			pageSize: 10,
+			hasNextPage: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			allowDataStatus: true,
+			wrapperHeight: '100%',
+			scrollHeight: '',
+			deleteAddressId: '',
+			currPage: '', //当前页面
+			prevPage: '', //上一个页面
+			tabCurrentNum: 0,
+			tabCurrentIndex: 0,
+			listStatus: 90,
+			clubList: [],
+			isIphoneX: this.$store.state.isIphoneX,
+			show_index: 0 //控制显示那个组件
+		}
+	},
+	onLoad() {
+		this.setScrollHeight()
+	},
+	methods: {
+		setScrollHeight() {
+			// 窗口高度 - 底部距离
+			setTimeout(() => {
+				const query = wx.createSelectorQuery().in(this)
+				query.selectAll('.add-btn').boundingClientRect()
+				query.exec(res => {
+					if (res[0][0]) {
+						let winHeight = this.$api.getWindowHeight(),
+							eleTop = res[0][0].top - 1
+						this.scrollHeight = eleTop
+					}
+				})
+			}, 500)
 		},
-		onLoad(){				
-			this.setScrollHeight();
+		searchClubList() {
+			this.pageNum = 1
+			this.initclubList()
 		},
-		methods: {
-			setScrollHeight() {
-				// 窗口高度 - 底部距离
-				setTimeout(()=> {
-					const query = wx.createSelectorQuery().in(this);
-					query.selectAll('.add-btn').boundingClientRect();
-					query.exec(res => {
-						if(res[0][0]){
-							let winHeight = this.$api.getWindowHeight(),
-								eleTop = res[0][0].top - 1;
-								this.scrollHeight =  eleTop;
-						}
-					})
-				}, 500)
-			},
-			searchClubList(){
-				this.pageNum=1
-				this.initclubList()
-			},
-			initclubList(){	
-				this.SellerService.GetSellerClubList({
-					userIdentity:this.userIdentity,
-					name:this.searchInputVal,
-					pageNum:1,
-					pageSize:this.pageSize,
-					spId:this.serviceProviderId,
-					status:this.listStatus,
-				})
-				.then(response =>{
+		initclubList() {
+			this.SellerService.GetSellerClubList({
+				userIdentity: this.userIdentity,
+				name: this.searchInputVal,
+				pageNum: 1,
+				pageSize: this.pageSize,
+				spId: this.serviceProviderId,
+				status: this.listStatus
+			})
+				.then(response => {
 					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
+					if (responseData.results && responseData.results.length > 0) {
 						this.isEmpty = false
 						this.hasNextPage = response.data.hasNextPage
-						this.clubList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
+						this.clubList = responseData.results
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
+						} else {
 							this.pullUpOn = true
 							this.loadding = false
 							this.nomoreText = '已至底部'
 						}
-					}else{
+					} else {
 						this.isEmpty = true
 					}
 				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000)
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},	
-			getOnReachBottomData(){
-				this.pageNum+=1
-				this.SellerService.GetSellerClubList({
-					userIdentity:this.userIdentity,
-					name:this.searchInputVal,
-					pageNum:this.pageNum,
-					pageSize:this.pageSize,
-					spId:this.serviceProviderId,
-					status:this.listStatus,
-				})
-				.then(response =>{
+		},
+		getOnReachBottomData() {
+			this.pageNum += 1
+			this.SellerService.GetSellerClubList({
+				userIdentity: this.userIdentity,
+				name: this.searchInputVal,
+				pageNum: this.pageNum,
+				pageSize: this.pageSize,
+				spId: this.serviceProviderId,
+				status: this.listStatus
+			})
+				.then(response => {
 					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
+					if (responseData.results && responseData.results.length > 0) {
 						this.hasNextPage = response.data.hasNextPage
-						this.clubList = this.clubList.concat(responseData.results) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
+						this.clubList = this.clubList.concat(responseData.results)
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
-						}else{
+						} else {
 							this.pullUpOn = false
 							this.loadding = false
 							this.nomoreText = '已至底部'
 						}
 					}
 				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000)
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			tabClick(index) {//tab切换
-				this.tabCurrentIndex = index;
-				switch(index){
-					case 0:
-						this.listStatus = 90
-						break;
-					case 1:
-						this.listStatus = 1
-						break;
-					case 2:
-						this.listStatus = 92
-						break;
-				}
-				this.initclubList()
-			},
-			tabCurrentClick(index) {//商品详情&&供应商信息tab切换
-				this.tabCurrentNum = index;
-				switch(index){
-					case 0:
-						this.tabCurrentIndex = 0
-						this.userIdentity = 4
-						this.listStatus = 90
-						this.initclubList()
-						break;
-					case 1:
-						this.userIdentity = 2
-						this.listStatus = 90
-						this.initclubList()
-						break
-				}
-			},	
-			checkData(item){//修改机构资料
-				switch(this.tabCurrentNum){
-					case 0:
-						this.$api.navigateTo(`/pages/seller/login/apply?userID=${item.userID}`)
-						break;
-					case 1:
-						this.$api.navigateTo(`/pages/seller/login/information?userID=${item.userID}`)
-						break;
-				}
-			},
-			orderHistory(item){//跳转机构历史订单
-				this.$api.setStorage('orderUserInfo',item)
-				this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${item.clubID}&listType=0`)
-			},
-			onShowClose () {//输入框失去焦点时触发
-				if(this.searchInputVal != ''){
-					this.isShowClose = true
-				}else{					
-					this.isShowClose = false
-				}
-			},
-			delInputText(){//清除输入框内容
-				this.searchInputVal = ''
+		},
+		tabClick(index) {
+			//tab切换
+			this.tabCurrentIndex = index
+			switch (index) {
+				case 0:
+					this.listStatus = 90
+					break
+				case 1:
+					this.listStatus = 1
+					break
+				case 2:
+					this.listStatus = 92
+					break
+			}
+			this.initclubList()
+		},
+		tabCurrentClick(index) {
+			//商品详情&&供应商信息tab切换
+			this.tabCurrentNum = index
+			switch (index) {
+				case 0:
+					this.tabCurrentIndex = 0
+					this.userIdentity = 4
+					this.listStatus = 90
+					this.initclubList()
+					break
+				case 1:
+					this.userIdentity = 2
+					this.listStatus = 90
+					this.initclubList()
+					break
+			}
+		},
+		checkData(club) {
+			//修改机构资料
+			switch (this.tabCurrentNum) {
+				case 0:
+					this.$api.navigateTo(`/pages/seller/login/apply?userID=${club.userID}`)
+					break
+				case 1:
+					this.$api.navigateTo(`/pages/seller/login/information?userID=${club.userID}`)
+					break
+			}
+		},
+		orderHistory(club) {
+			//跳转机构历史订单
+			this.$api.setStorage('orderUserInfo', club)
+			this.$api.navigateTo(`/pages/seller/order/order-historylist?clubId=${club.clubID}&listType=0`)
+		},
+		clubRemaks(club){
+			//跳转机构资料备注
+			this.$api.setStorage('orderUserInfo', club)
+			this.$api.navigateTo(`/pages/seller/remarks/list?clubId=${club.clubID}`)
+		},
+		onShowClose() {
+			//输入框失去焦点时触发
+			if (this.searchInputVal != '') {
+				this.isShowClose = true
+			} else {
 				this.isShowClose = false
-			},
-			showBadge(n){
-				let num ='';
-				if(n>100){num = 99}else{num = n;}
-				return num;
-			},
+			}
 		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
+		delInputText() {
+			//清除输入框内容
+			this.searchInputVal = ''
+			this.isShowClose = false
 		},
-		onShow() {
-			this.$api.getStorage().then(response =>{
-				this.serviceProviderId = response.serviceProviderId
-				this.pageNum = 1;
-				this.initclubList();
-			})
+		showBadge(n) {
+			let num = ''
+			if (n > 100) {
+				num = 99
+			} else {
+				num = n
+			}
+			return num
 		}
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.getOnReachBottomData()
+		}
+	},
+	onShow() {
+		this.$api.getStorage().then(response => {
+			this.serviceProviderId = response.serviceProviderId
+			this.pageNum = 1
+			this.initclubList()
+		})
 	}
+}
 </script>
 
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-	}
-	.container{
-		position: relative;
-	}
-	.club-search{
-		height: auto;
-		width: 100%;
-		padding: 24rpx 0 0 0;
-		background: #FFFFFF;
+<style lang="scss">
+page {
+	height: auto;
+}
+page,
+.container {
+	/* padding-bottom: 120upx; */
+	background: #f7f7f7;
+}
+.container {
+	position: relative;
+}
+.club-search {
+	height: auto;
+	width: 100%;
+	padding: 24rpx 0 0 0;
+	background: #ffffff;
+	display: flex;
+	flex-direction: column;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	.search-top {
+		flex: 1;
 		display: flex;
-		flex-direction: column;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.search-top{
-			flex: 1;
-			display: flex;
-			align-items: center;
-			padding: 24rpx;
-			.search-from{
-				width: 582rpx;
+		align-items: center;
+		padding: 24rpx;
+		.search-from {
+			width: 582rpx;
+			height: 64rpx;
+			background: #f7f7f7;
+			border-radius: 32rpx;
+			float: left;
+			position: relative;
+			.input {
+				width: 500rpx;
 				height: 64rpx;
-				background: #F7F7F7;
-				border-radius: 32rpx;
 				float: left;
-				position: relative;
-				.input{
-					width: 500rpx;
-					height: 64rpx;
-					float: left;
-					line-height: 64rpx;
-					color: $text-color;
-					font-size: $font-size-24;
-				}
-				.icon-iconfonticonfontsousuo1{
-					width: 64rpx;
-					height: 64rpx;
-					line-height: 64rpx;
-					text-align: center;
-					display: block;
-					font-size: $font-size-38;
-					float: left;
-					color: #999999;
-				}
-				.icon-shanchu1{
-					font-size: $font-size-32;
-					color: #999999;
-					position: absolute;
-					width: 64rpx;
-					height: 64rpx;
-					line-height: 64rpx;
-					text-align: center;
-					top: 0;
-					right: 0;
-					z-index: 10;
-				}
+				line-height: 64rpx;
+				color: $text-color;
+				font-size: $font-size-24;
 			}
-			.search-btn{
-				width: 120rpx;
+			.icon-iconfonticonfontsousuo1 {
+				width: 64rpx;
+				height: 64rpx;
 				line-height: 64rpx;
 				text-align: center;
-				font-size: $font-size-28;
-				color: $color-system;
+				display: block;
+				font-size: $font-size-38;
 				float: left;
-				background: #FFFFFF;
+				color: #999999;
+			}
+			.icon-shanchu1 {
+				font-size: $font-size-32;
+				color: #999999;
+				position: absolute;
+				width: 64rpx;
+				height: 64rpx;
+				line-height: 64rpx;
+				text-align: center;
+				top: 0;
+				right: 0;
+				z-index: 10;
 			}
 		}
-		.search-tab{
-			height: 80rpx;
-			display: flex;
+		.search-btn {
+			width: 120rpx;
+			line-height: 64rpx;
+			text-align: center;
+			font-size: $font-size-28;
+			color: $color-system;
+			float: left;
+			background: #ffffff;
+		}
+	}
+	.search-tab {
+		height: 80rpx;
+		display: flex;
+		flex: 1;
+		background: #ffffff;
+		border-bottom: 1px solid #efefef;
+		.tab-item {
 			flex: 1;
-			background: #FFFFFF;
-			border-bottom: 1px solid #EFEFEF;
-			.tab-item{
-				flex: 1;
-				line-height: 80rpx;
-				text-align: center;
-				color: $text-color;
-				font-size: $font-size-28;
-				position: relative;
-				.item-text{
-					padding: 10rpx 0;
-					border-bottom:2px solid #FFFFFF;
-				}
-				&:nth-child(1)::before{
-					content: '';
-					width: 2px;
-					height: 50rpx;
-					position: absolute;
-					right: 0;
-					top: 15rpx;
-					background: #EBEBEB;
-				}
-				&.current{
-					color: $color-system;
-					.item-text{
-						border-color:$color-system;;
-					}
+			line-height: 80rpx;
+			text-align: center;
+			color: $text-color;
+			font-size: $font-size-28;
+			position: relative;
+			.item-text {
+				padding: 10rpx 0;
+				border-bottom: 2px solid #ffffff;
+			}
+			&:nth-child(1)::before {
+				content: '';
+				width: 2px;
+				height: 50rpx;
+				position: absolute;
+				right: 0;
+				top: 15rpx;
+				background: #ebebeb;
+			}
+			&.current {
+				color: $color-system;
+				.item-text {
+					border-color: $color-system;
 				}
 			}
 		}
 	}
-	.club-main{
-		padding-top: 224rpx;
-		.list{
-			width: 100%;
-			height: 228rpx;
-			padding: 24rpx;
-			box-sizing: border-box;
-			background: #FFFFFF;
-			position: relative;
-			border-bottom: 1px solid #EBEBEB;
-			.list-logo{
+}
+.club-main {
+	padding-top: 224rpx;
+	.list {
+		width: 100%;
+		height: 228rpx;
+		padding: 24rpx;
+		box-sizing: border-box;
+		background: #ffffff;
+		position: relative;
+		border-bottom: 1px solid #ebebeb;
+		.list-logo {
+			width: 180rpx;
+			height: 180rpx;
+			float: left;
+			image {
 				width: 180rpx;
 				height: 180rpx;
+				border-radius: 8rpx;
+			}
+		}
+		.list-content {
+			width: 498rpx;
+			height: 180rpx;
+			float: right;
+			.list-name {
+				width: 100%;
+				height: 50rpx;
 				float: left;
-				image{
-					width: 180rpx;
-					height: 180rpx;
+				line-height: 50rpx;
+				text-align: left;
+				font-size: $font-size-26;
+				color: #333333;
+				.tags {
+					display: inline-block;
+					width: 60rpx;
+					height: 32rpx;
 					border-radius: 8rpx;
+					background: #f0cb72;
+					font-size: $font-size-22;
+					color: #4e4539;
+					text-align: center;
+					line-height: 32rpx;
+					margin-left: 20rpx;
+					&.sv {
+						background: #333333;
+						color: #f0cb72;
+					}
 				}
 			}
-			.list-content{
-				width: 498rpx;
-				height: 180rpx;
-				float: right;
-				.list-name{
-					width: 100%;
-					height: 50rpx;
+			.list-ntel {
+				width: 100%;
+				height: 50rpx;
+				float: left;
+				line-height: 50rpx;
+				text-align: left;
+				font-size: $font-size-24;
+				color: #666666;
+				.list-link {
+					display: inline-block;
 					float: left;
-					line-height: 50rpx;
-					text-align: left;
-					font-size: $font-size-26;
-					color: #333333;
+					margin-right: 40rpx;
 				}
-				.list-ntel{
-					width: 100%;
-					height: 50rpx;
+				.list-texl {
+					display: inline-block;
 					float: left;
-					line-height: 50rpx;
-					text-align: left;
-					font-size: $font-size-26;
-					color: #666666;
-					.list-link{
-						display: inline-block;
-						float: left;
-						margin-right: 40rpx;
-					}
-					.list-texl{
-						display: inline-block;
-						float: left;
-					}
 				}
-				.list-opera{
-					width: 100%;
+			}
+			.list-opera {
+				width: 100%;
+				height: 60rpx;
+				display: flex;
+				color: #166ce1;
+				flex-direction: row;
+				align-items: center;
+				float: left;
+				margin-top: 20rpx;
+				.btn {
+					width: 160rpx;
 					height: 60rpx;
-					display: flex;
-					color: #166CE1;
-					flex-direction: row;
-					align-items: center;
-					float: left;
-					margin-top: 20rpx;
-					.btn{
-						width: 160rpx;
-						height: 60rpx;
-						line-height: 60rpx;
-						border-radius: 30rpx;
-						font-size: $font-size-24;
-						color: $text-color;
-						text-align: center;
-						margin:0 20rpx 0 0;
-						position: relative;
-						.opea-badge{
-							position: absolute;
-							right: -10rpx;
-							top: -20rpx;
-						}
-						&.org{
-							border: 1px solid #2769d5;
-							color: #2769d5;
-						}
-						&.gre{
-							border: 1px solid #e15616;
-							color: #e15616;
-						}
-						&.yel{
-							border: 1px solid #4ad04c;
-							color: #4ad04c;
-						}
+					line-height: 60rpx;
+					border-radius: 30rpx;
+					font-size: $font-size-24;
+					color: $text-color;
+					text-align: center;
+					margin: 0 20rpx 0 0;
+					position: relative;
+					.opea-badge {
+						position: absolute;
+						right: -10rpx;
+						top: -20rpx;
+					}
+					&.org {
+						border: 1px solid #2769d5;
+						color: #2769d5;
+					}
+					&.gre {
+						border: 1px solid #e15616;
+						color: #e15616;
+					}
+					&.doc {
+						border: 1px solid #627386;
+						color: #627386;
 					}
 				}
 			}
 		}
 	}
-	.tabBar{
-		width:100%;
-		height: 98rpx;
-		background: #fff;
-		border-top:1px solid #E5E5E5;
-		position: fixed;
-		bottom:0px;
-		left:0px;
-		right:0px;
+}
+.tabBar {
+	width: 100%;
+	height: 98rpx;
+	background: #fff;
+	border-top: 1px solid #e5e5e5;
+	position: fixed;
+	bottom: 0px;
+	left: 0px;
+	right: 0px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	.tabBar_list {
+		width: 86%;
 		display: flex;
-		align-items: center;
-		justify-content: center;
-		.tabBar_list{ 
-			width:86%;
+		justify-content: space-between;
+		.tabBar_item {
+			width: 120rpx;
 			display: flex;
-			justify-content: space-between;
-			.tabBar_item{ 
-				width:120rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				flex-direction: column;
-				font-size: 20rpx;
-				color: #999999;
-				&.current{
-					color: #166CE1;
-					.iconfont{
-						color:#166CE1;
-					}
-				}
-				&.current1{
-					color: #16E15C;
-					.iconfont{
-						color:#16E15C;
-					}
+			justify-content: center;
+			align-items: center;
+			flex-direction: column;
+			font-size: 20rpx;
+			color: #999999;
+			&.current {
+				color: #166ce1;
+				.iconfont {
+					color: #166ce1;
 				}
-				&.current2{
-					color: #FF0000;
-					.iconfont{
-						color:#FF0000;
-					}
+			}
+			&.current1 {
+				color: #16e15c;
+				.iconfont {
+					color: #16e15c;
 				}
-				.iconfont{
-					width:48rpx;
-					height: 48rpx;
-					display: block;
-					margin-bottom:2rpx;
-					text-align: center;
-					font-size: 46rpx;
-					color: #999999;
+			}
+			&.current2 {
+				color: #ff0000;
+				.iconfont {
+					color: #ff0000;
 				}
 			}
-		 } 
-	}
-	.nav_active{
-		color: $color-system;
+			.iconfont {
+				width: 48rpx;
+				height: 48rpx;
+				display: block;
+				margin-bottom: 2rpx;
+				text-align: center;
+				font-size: 46rpx;
+				color: #999999;
+			}
+		}
 	}
+}
+.nav_active {
+	color: $color-system;
+}
 </style>
-

pages/seller/login/apply.vue

@@ -1,75 +1,88 @@
 <template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
+	<view class="container register" :style="{ paddingTop: CustomBar + 'px' }">
+		<cu-custom :navbar-data="nvabarData" @navigateBack="hanldNavigateBack"></cu-custom>
 		<view class="register-main first clearfix" v-if="clubStatus == 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>
+					<text class="error-item" v-for="(item, index) in errorList" :key="index"> {{ item }} </text>
 				</view>
-			</view>	
-		</view>	
-		<view class="register-main first clearfix">
-			<view class="register-row clearfix">
-				<text class="register-title">注册信息</text>
 			</view>
+		</view>
+		<view class="register-main first clearfix">
+			<view class="register-row clearfix"> <text class="register-title">注册信息</text> </view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">联系人:</view>
-					<input class="row-input" type="text" name="input" v-model="clubContact" placeholder="请输入联系姓名" maxlength="6"/>
+					<input
+						class="row-input"
+						type="text"
+						name="input"
+						v-model="clubContact"
+						placeholder="请输入联系姓名"
+						maxlength="6"
+					/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
-					<view class="label">手机号:</view>
-					<view class="row-input">{{ mobile }}</view>
+					<view class="label">手机号:</view> <view class="row-input">{{ mobile }}</view>
 				</view>
 			</view>
 		</view>
 		<view class="register-main clearfix">
-			<view class="register-row">
-				<view class="register-title">其他信息</view>
-			</view>
+			<view class="register-row"> <view class="register-title">其他信息</view> </view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">固定电话:</view>
-					<input class="row-input" type="text" v-model="clubTelePhone" placeholder="请填写机构的固定电话" maxlength="15"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="clubTelePhone"
+						placeholder="请填写机构的固定电话"
+						maxlength="15"
+					/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">传真:</view>
-					<input class="row-input" type="text" v-model="clubFax" placeholder="请填写机构的传真" maxlength="15"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="clubFax"
+						placeholder="请填写机构的传真"
+						maxlength="15"
+					/>
 				</view>
 			</view>
 			<view class="register-row text-textarea clearfix">
-				<textarea 	class="textarea" 
-							type="text" 
-							v-model="companyPprofile" 
-							placeholder="请填写公司简介，最多500字" 
-							placeholder-class="placeholder"
-							maxlength="500"
-							@input="onTextareaInputInfo"
-							:class="isShowInput ? '':''"
+				<textarea
+					class="textarea"
+					type="text"
+					v-model="companyPprofile"
+					placeholder="请填写公司简介，最多500字"
+					placeholder-class="placeholder"
+					maxlength="500"
+					@input="onTextareaInputInfo"
+					:class="isShowInput ? '' : ''"
 				/>
 			</view>
-		</view>	
+		</view>
 		<view class="register-main clearfix" v-if="clubStatus == 90" :class="isUpgrade ? '' : 'detailed'">
 			<view class="register-row clearfix">
-				<view class="register-txt first"><text>您还可以填写更多信息，帮机构直接注册成为会员机构。</text></view>
+				<view class="register-txt first"><text>您还可以填写更多信息，帮机构直接注册成为资质机构。</text></view>
 				<view class="register-txt"><text>不过这些信息需要审核。</text></view>
 				<view class="register-bet" @tap.stop="showUpgrade()" v-if="isDownUpgrade">
 					<text>展开信息填写<text class="iconfont icon-xiangxiajiantou"></text></text>
 				</view>
-			</view>	
+			</view>
 			<view class="register-fiexd clearfix">
 				<view class="register-bet" @tap.stop="hideUpgrade()" v-if="isUpgrade">
 					<text>收起<text class="iconfont icon-xiangshangjiantou"></text></text>
 				</view>
 				<view class="register-row ">
-					<view class="register-btn sub" @click.stop="organizationUpgradeInfo">{{registerBtnText}}</view>
+					<view class="register-btn sub" @click.stop="organizationUpgradeInfo">{{ registerBtnText }}</view>
 				</view>
 			</view>
 		</view>
@@ -81,65 +94,93 @@
 			</view>
 		</view>
 		<view class="register-main detailed clearfix" v-if="isShowUpgrade">
-			<view class="register-row">
-				<view class="register-title">升级信息</view>
-			</view>
+			<view class="register-row"> <view class="register-title">升级信息</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="contractEmail" placeholder="请输入您的常用邮箱" maxlength="30"/>
+					<input
+						class="row-input"
+						type="text"
+						name="input"
+						v-model="contractEmail"
+						placeholder="请输入您的常用邮箱"
+						maxlength="30"
+					/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构名称:</view>
-					<input class="row-input" type="text" v-model="clubName" placeholder="请输入您的机构名称" maxlength="30"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="clubName"
+						placeholder="请输入您的机构名称"
+						maxlength="30"
+					/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="shortName" placeholder="请输入您的机构简称" maxlength="10"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="shortName"
+						placeholder="请输入您的机构简称"
+						maxlength="10"
+					/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
+				<view class="register-from" @click="showMulLinkageThreePicker">
 					<view class="label">机构地址:</view>
 					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{addressData.address }}
-					</text>		
+						{{ addressData.address }}
+					</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">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="addressData.addressDetail" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="25"
-							@input="onTextareaInput"
-							@blur="hideTextareaFocus"
-							:class="isShowInput ? '':''"
+				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{
+					addressData.addressDetail ? addressData.addressDetail : '详细地址：如道路、门牌号、小区等'
+				}}</view>
+				<textarea
+					v-else
+					class="textarea"
+					type="text"
+					v-model="addressData.addressDetail"
+					placeholder="详细地址：如道路、门牌号、小区等"
+					placeholder-class="placeholder"
+					maxlength="25"
+					@input="onTextareaInput"
+					@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="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="18"/>
+					<input
+						class="row-input"
+						type="text"
+						v-model="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="businessLicense === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="businessLicense === ''" @click="chooseBusinessImage"
+							><text class="iconfont icon-jiahao"></text
+						></view>
 						<view class="upload-image" v-else>
 							<image :src="businessLicense" mode="" @click="viewBusinessImage"></image>
 							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
@@ -147,11 +188,13 @@
 				<view class="register-picture">
 					<view class="label">门头照:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="shopPhoto === ''" @click="chooseMentuzImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="shopPhoto === ''" @click="chooseMentuzImage"
+							><text class="iconfont icon-jiahao"></text
+						></view>
 						<view class="upload-image" v-else>
-							<image :src="shopPhoto" mode=""  @click="viewMentuzImage"></image>
+							<image :src="shopPhoto" mode="" @click="viewMentuzImage"></image>
 							<view class="upload-del" @click="delMentuzImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
@@ -168,8 +211,18 @@
 				<view class="register-from radio">
 					<radio-group @change="radioChange">
 						<label class="row-input" v-for="(item, index) in beautyList" :key="item.value">
-							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
-							<view class="row-text">{{item.name}}</view>
+							<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" v-if="isOrganizationType == 2">
+				<view class="register-from radio">
+					<radio-group @change="radioChange">
+						<label class="row-input" v-for="(item, index) in beautyLists" :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>
@@ -177,18 +230,26 @@
 			<view class="register-row clearfix" v-show="isDepartment">
 				<view class="register-from">
 					<view class="label">科室:</view>
-					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
+					<input
+						class="row-input keshi"
+						type="text"
+						v-model="department"
+						placeholder="请填写经营的科室，至少三个，用逗号隔开"
+						maxlength="16"
+					/>
 				</view>
 			</view>
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-picture zz">
 					<view class="label zz">医疗执业许可证:</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="medicalPracticeLicense === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></view>
+						<view class="upload-none" v-if="medicalPracticeLicense === ''" @click="chooseMedicalImage"
+							><text class="iconfont icon-jiahao"></text
+						></view>
 						<view class="upload-image" v-else>
-							<image :src="medicalPracticeLicense" mode=""  @click="viewMedicalImage"></image>
+							<image :src="medicalPracticeLicense" mode="" @click="viewMedicalImage"></image>
 							<view class="upload-del" @click="delMedicalImage">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
@@ -198,30 +259,42 @@
 				<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 mentuzCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
+						<checkbox-group @change="chooseMaleLike">
+							<label
+								class="item"
+								v-for="(item, index) in mentuzCampList"
+								:key="index"
+								:class="{ on: item.checked }"
+							>
+								<checkbox :value="item.value"></checkbox> <text class="item-text">{{ item.name }}</text>
 							</label>
 						</checkbox-group>
 					</view>
-				</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 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>
+						<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>
@@ -230,165 +303,184 @@
 					<view class="label">主营内容:</view>
 					<view class="content-class">
 						<checkbox-group @change="chooseMaleLikes">
-							<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
+							<label
+								class="item"
+								v-for="(item, index) in medicaCampList"
+								:key="index"
+								:class="{ on: item.checked }"
+							>
+								<checkbox :value="item.value"></checkbox> <text class="item-text">{{ item.name }}</text>
 							</label>
 						</checkbox-group>
 					</view>
-				</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 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="请输入自定义项目"  @input="onBlurInput" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@click.stop="addCustomItem"
-						>确认添加</button>
+						<input
+							class="row-input other"
+							type="text"
+							v-model="customItemValue"
+							placeholder="请输入自定义项目"
+							@input="onBlurInput"
+							maxlength="5"
+						/>
+						<button
+							type="default"
+							class="confirm-btn"
+							:class="[isDisabled === true ? 'disabled' : 'none']"
+							:disabled="isDisabled"
+							@click.stop="addCustomItem"
+						>
+							确认添加
+						</button>
 					</view>
 				</view>
 			</view>
-			<mpvue-city-picker :themeColor="themeColor"
-								ref="mpvueCityPicker" 
-							    :pickerValueDefault="cityPickerValueDefault"
-								@onCancel="onCancel" 
-								@onConfirm="onConfirm">
+			<mpvue-city-picker
+				:themeColor="themeColor"
+				ref="mpvueCityPicker"
+				:pickerValueDefault="cityPickerValueDefault"
+				@onCancel="onCancel"
+				@onConfirm="onConfirm"
+			>
 			</mpvue-city-picker>
 		</view>
 	</view>
 </template>
 
 <script>
-import { mapMutations } from 'vuex';
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/services/public.js" 
-	export default{
-		components:{
-			mpvueCityPicker
-		},
-		data() {
-			return{
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '修改资料', // 导航栏 中间的标题
-					haveBack:true,
-					textLeft:this.$store.state.isIphone
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				errorList:[],
-				tabCurrentIndex:3,	
-				clubStatus:'',			//审核状态
-				isPreviewImage:false,   //预览图片开关
-				userId:'',				//用户ID
-				clubId:'',				//会所ID
-				clubContact:'',			//联系人姓名
-				mobile:'',				//联系人手机号
-				contractEmail:'',		//邮箱
-				clubName:'',	 		//机构名称
-				shortName:'',	 	//机构简称
-				socialCreditCode:'',	//统一社会信用代码
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				isUpgrade:false,
-				isShowUpgrade:false,
-				isDownUpgrade:true,
-				businessLicense:'',	//营业执照图片
-				shopPhoto:'',  	//门头照图片
-				medicalPracticeLicense:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:null,		//机构类型二级分类
-				mainProduct:'',				//主营内容
-				clubTelePhone:'',		//固定电话
-				clubFax:'',				//传真
-				companyPprofile:'',		//公司简介
-				firstClubType:null,		//机构类型
-				isOrganizationType:0,
-				organizationTypeText:'请选择机构类型',
-				beautyList:beautyList,//医美分类
-				mentuzCampNullList:mentuzCampNullList,//医美分类
-				medicaCampNullList:medicaCampNullList,//生美分类
-				mentuzCampList:[],		//医美主营
-				medicaCampList:[],		//生美主营
-				typtIndex:0,
-				organizationType:0,
-				current:0,
-				isShowAustomItem:false, //是否显示其他添加
-				customItemValue:'', 	//自定义项目
-				isMainproCheck:false,
-				addressData:{
-					address:'请选择机构所在地区',
-					townId:'',			//区ID
-					cityId:'',			//市ID
-					provinceId:'',		//省ID
-					addressDetail: '',	//地址详情
-				},
-				registerBtnText:'确定'
-			}	
-		},
-		onLoad(option) {
-			this.userId = option.userID
-			this.organizationInfo()
-		},
-		methods:{
-			hanldNavigateBack(){
-				this.$util.modal('','资料尚未提交审核，确定放弃升级吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
-				})
+import { mapMutations } from 'vuex'
+import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+import { beautyList, beautyLists, mentuzCampNullList, medicaCampNullList } from '@/common/json/data.json.js' //本地数据
+import { uploadFileImage } from '@/services/public.js'
+export default {
+	components: {
+		mpvueCityPicker
+	},
+	data() {
+		return {
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+				showSearch: 0,
+				title: '修改资料', // 导航栏 中间的标题
+				haveBack: true,
+				textLeft: this.$store.state.isIphone
 			},
-			organizationInfo(){
-				this.UserService.OrganizationUpdateModifyInfo({userId:this.userId}).then(response =>{
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			errorList: [],
+			tabCurrentIndex: 3,
+			clubStatus: '', //审核状态
+			isPreviewImage: false, //预览图片开关
+			userId: '', //用户ID
+			clubId: '', //会所ID
+			clubContact: '', //联系人姓名
+			mobile: '', //联系人手机号
+			contractEmail: '', //邮箱
+			clubName: '', //机构名称
+			shortName: '', //机构简称
+			socialCreditCode: '', //统一社会信用代码
+			isDisabled: true,
+			isShowInput: true,
+			textareaFocus: false,
+			isUpgrade: false,
+			isShowUpgrade: false,
+			isDownUpgrade: true,
+			businessLicense: '', //营业执照图片
+			shopPhoto: '', //门头照图片
+			medicalPracticeLicense: '', //资质照图片
+			department: '', //科室
+			isDepartment: false, //是否显示科室
+			secondClubType: null, //机构类型二级分类
+			mainProduct: '', //主营内容
+			clubTelePhone: '', //固定电话
+			clubFax: '', //传真
+			companyPprofile: '', //公司简介
+			firstClubType: null, //机构类型
+			isOrganizationType: 0,
+			organizationTypeText: '请选择机构类型',
+			beautyList: beautyList, //医美分类
+			beautyLists: beautyLists, //生美分类
+			mentuzCampNullList: mentuzCampNullList, //医美分类
+			medicaCampNullList: medicaCampNullList, //生美分类
+			mentuzCampList: [], //医美主营
+			medicaCampList: [], //生美主营
+			typtIndex: 0,
+			organizationType: 0,
+			current: 0,
+			isShowAustomItem: false, //是否显示其他添加
+			customItemValue: '', //自定义项目
+			isMainproCheck: false,
+			addressData: {
+				address: '请选择机构所在地区',
+				townId: '', //区ID
+				cityId: '', //市ID
+				provinceId: '', //省ID
+				addressDetail: '' //地址详情
+			},
+			registerBtnText: '确定'
+		}
+	},
+	onLoad(option) {
+		this.userId = option.userID
+		this.organizationInfo()
+	},
+	methods: {
+		hanldNavigateBack() {
+			this.$util.modal('', '资料尚未提交审核，确定放弃升级吗？', '确定', '取消', true, () => {
+				uni.navigateBack({
+					delta: 1
+				})
+			})
+		},
+		organizationInfo() {
+			this.UserService.OrganizationUpdateModifyInfo({ userId: this.userId })
+				.then(response => {
 					let organizationClub = response.data.club
 					let organizationUser = response.data.user
 					this.clubStatus = organizationClub.status
-					if(this.clubStatus === 90){
+					if (this.clubStatus === 90) {
 						this.isShowUpgrade = false
-					}else{
+					} else {
 						this.isShowUpgrade = true
 					}
-					if(organizationUser.auditNoteList!=null){
-						this.errorList =organizationUser.auditNoteList
+					if (organizationUser.auditNoteList != null) {
+						this.errorList = organizationUser.auditNoteList
 					}
 					this.clubContact = organizationClub.linkMan
 					this.mobile = organizationUser.bindMobile
-					this.contractEmail = organizationClub.contractEmail	
+					this.contractEmail = organizationClub.contractEmail
 					this.clubId = organizationUser.clubId
 					this.clubName = this.$reg.checkData(organizationClub.name)
 					this.shortName = this.$reg.checkData(organizationClub.shortName)
-					if( organizationClub.provinceId == null ){
+					if (organizationClub.provinceId == null) {
 						this.addressData.provinceId = ''
-					}else{
+					} else {
 						this.addressData.provinceId = organizationClub.provinceId
 					}
-					if( organizationClub.cityId == null ){
+					if (organizationClub.cityId == null) {
 						this.addressData.cityId = ''
-					}else{
+					} else {
 						this.addressData.cityId = organizationClub.cityId
 					}
-					if( organizationClub.townId == null ){
+					if (organizationClub.townId == null) {
 						this.addressData.townId = ''
-					}else{
+					} else {
 						this.addressData.townId = organizationClub.townId
 					}
-					this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress:'请选择机构所在地区'
+					this.addressData.address = organizationClub.provincialAddress
+						? organizationClub.provincialAddress
+						: '请选择机构所在地区'
 					this.addressData.addressDetail = this.$reg.checkData(organizationClub.address)
 					this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
 					this.firstClubType = organizationClub.firstClubType
 					this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
-					this.businessLicense = this.$reg.checkData(organizationClub.businessLicense) 
+					this.businessLicense = this.$reg.checkData(organizationClub.businessLicense)
 					this.shopPhoto = this.$reg.checkData(organizationClub.shopPhoto)
 					this.medicalPracticeLicense = this.$reg.checkData(organizationClub.medicalPracticeLicense)
 					this.department = this.$reg.checkData(organizationClub.department)
@@ -396,807 +488,828 @@ import { mapMutations } from 'vuex';
 					this.clubFax = this.$reg.checkData(organizationClub.fax)
 					this.companyPprofile = this.$reg.checkData(organizationClub.profile)
 					//机构类型&&主营项目
-					switch(this.firstClubType){
+					switch (this.firstClubType) {
 						case 1:
 							this.organizationTypeText = '医美'
 							this.isOrganizationType = 1
-							break;
+							break
 						case 2:
 							this.organizationTypeText = '生美'
 							this.isOrganizationType = 2
-							break;
+							break
 						case null:
 							this.organizationTypeText = '请选择机构类型'
 							this.isOrganizationType = 0
-							break;
-					}	
-					if(organizationClub.mainProduct == "" || organizationClub.mainProduct == null){
+							break
+					}
+					if (organizationClub.mainProduct == '' || organizationClub.mainProduct == null) {
 						this.mentuzCampList = this.mentuzCampNullList
 						this.medicaCampList = this.medicaCampNullList
-					}else{
-						if(this.firstClubType == 1){
+					} else {
+						if (this.firstClubType == 1) {
 							this.mentuzCampList = this.setNewMainpro(organizationClub.mainProduct)
-							this.medicaCampList = this.medicaCampNullList							
-						}else{
+							this.medicaCampList = this.medicaCampNullList
+						} else {
 							this.medicaCampList = this.setNewMainpro(organizationClub.mainProduct)
 							this.mentuzCampList = this.mentuzCampNullList
 						}
-						this.mainProduct = organizationClub.mainProduct;
+						this.mainProduct = organizationClub.mainProduct
 					}
 					//机构类型
-					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;
+					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(){//普通机构修改资料
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		organizationUpdateInfo() {
+			//个人机构修改资料
+			this.clubUpgradeApi()
+		},
+		organizationUpgradeInfo() {
+			//个人机构提交审核
+			if (this.isUpgrade) {
 				this.clubUpgradeApi()
-			},
-			organizationUpgradeInfo(){//普通机构提交审核
-				if(this.isUpgrade){
-					this.clubUpgradeApi()
-				}else{
-					if( this.clubContact == ''){
-						this.$util.msg('请输入联系人姓名',2000);
-						return
-					}
-					 let params = {
-							userId:this.userId,
-							clubId:this.clubId,	//会所ID
-							linkMan:this.clubContact,
-							fax:this.clubFax,
-							contractPhone:this.clubTelePhone,
-							profile : this.companyPprofile,
-						}		
-					this.UserService.OrganizationUpdate(params).then(response =>{
-						this.$util.msg('修改成功',2000,true,'success')
-						setTimeout(()=>{
-							uni.navigateBack({delta: 1})
-						},2000)
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000);
-					})
-				}
-			},
-			clubUpgradeApi(){
-				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.mainProduct = mainproList.join('/')
-				}
-				console.log(this.mainProduct)
-				if( this.contractEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if( !this.$reg.isEmail(this.contractEmail)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				if( this.clubName == ''){
-					this.$util.msg('请输入机构名称',2000);
+			} else {
+				if (this.clubContact == '') {
+					this.$util.msg('请输入联系人姓名', 2000)
 					return
 				}
-				if( this.addressData.townId == ''){
-					this.$util.msg('请选择机构地址',2000);
-					return
+				let params = {
+					userId: this.userId,
+					clubId: this.clubId, //会所ID
+					linkMan: this.clubContact,
+					fax: this.clubFax,
+					contractPhone: this.clubTelePhone,
+					profile: this.companyPprofile
 				}
-				if( this.addressData.addressDetail == ''){
-					this.$util.msg('请填写机构详细地址',2000);
-					return
+				this.UserService.OrganizationUpdate(params)
+					.then(response => {
+						this.$util.msg('修改成功', 2000, true, 'success')
+						setTimeout(() => {
+							uni.navigateBack({ delta: 1 })
+						}, 2000)
+					})
+					.catch(error => {
+						this.$util.msg(error.msg, 2000)
+					})
+			}
+		},
+		clubUpgradeApi() {
+			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)
+					})
 				}
-				if( this.businessLicense == ''){
-					this.$util.msg('请上传您的营业执照',2000);
+				this.mainProduct = mainproList.join('/')
+			}
+			console.log(this.mainProduct)
+			if (this.contractEmail == '') {
+				this.$util.msg('请输入邮箱地址', 2000)
+				return
+			}
+			if (!this.$reg.isEmail(this.contractEmail)) {
+				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.businessLicense == '') {
+				this.$util.msg('请上传您的营业执照', 2000)
+				return
+			}
+			console.log(this.isOrganizationType)
+			if (this.isOrganizationType != 0) {
+				if (this.mainProduct == '') {
+					this.$util.msg('请选择住机构主营内容', 2000)
 					return
 				}
-				console.log(this.isOrganizationType)
-				if(this.isOrganizationType!=0){
-					if(this.mainProduct == ''){
-						this.$util.msg('请选择住机构主营内容',2000);
-						return
-					}
-				}
-				let params = {
-						userId:this.userId,
-						clubId:this.clubId,		//会所ID	
-						linkMan:this.clubContact,
-						contractEmail:this.contractEmail,
-						name:this.clubName,
-						shortName:this.shortName,
-						provinceId:this.addressData.provinceId,
-						cityId:this.addressData.cityId,
-						townId:this.addressData.townId,
-						address:this.addressData.addressDetail,
-						socialCreditCode:this.socialCreditCode,
-						businessLicense:this.businessLicense,
-						shopPhoto:this.shopPhoto,
-						firstClubType:this.isOrganizationType,  //机构类型分类 医美:0和生美:1
-						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
-						department:this.department,				//科室
-						medicalPracticeLicense:this.medicalPracticeLicense,//资质图片
-						mainProduct:this.mainProduct,
-						fax:this.clubFax,
-						contractPhone:this.clubTelePhone,
-						profile : this.companyPprofile,
-				}
-				this.UserService.OrganizationRegister(params).then(response =>{
-					this.$util.msg('您的升级申请已提交审核',2000);
-					setTimeout(()=>{
-						uni.navigateBack({delta: 1})
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			// 三级联动选择
-			showMulLinkageThreePicker() {
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			onConfirm(e) {
-				this.addressData.address = e.name;
-				this.addressData.townId = e.townCode;
-				this.addressData.cityId = e.cityCode;
-				this.addressData.provinceId = e.provinceCode;
-			},	
-			onTextareaInput(e){
-			   this.addressData.addressDetail = e.detail.value;
-			},
-			showTextareaFocus(){//文本框获取焦点
-				this.isShowInput = false
-				this.textareaFocus = true
-			},
-			hideTextareaFocus(){//文本框失去焦点
-				this.isShowInput = true
-				this.textareaFocus = false
-			},
-			onTextareaInputInfo(e){
-			   this.companyPprofile = e.detail.value;
-			},
-			chooseBusinessImage() {//营业执照图片上传
-				uploadFileImage().then(res =>{
-					this.businessLicense = JSON.parse(res.data).data
-				})
-			},
-			chooseMentuzImage() {//门头照图片上传
-				uploadFileImage().then(res =>{
-					this.shopPhoto = JSON.parse(res.data).data
-				})
-			},
-			chooseMedicalImage() {//资质照图片上传
-				uploadFileImage().then(res =>{
-					this.medicalPracticeLicense = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.businessLicense)
-			},
-			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.shopPhoto)
-			},
-			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.medicalPracticeLicense)
-			},
-			myPreviewImageFn(url){
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.businessLicense = ''
-				})
-			},
-			delMentuzImage(){
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.shopPhoto = ''
-				})
-			},			
-			delMedicalImage(){
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.medicalPracticeLicense = ''
+			}
+			let params = {
+				userId: this.userId,
+				clubId: this.clubId, //会所ID
+				linkMan: this.clubContact,
+				contractEmail: this.contractEmail,
+				name: this.clubName,
+				shortName: this.shortName,
+				provinceId: this.addressData.provinceId,
+				cityId: this.addressData.cityId,
+				townId: this.addressData.townId,
+				address: this.addressData.addressDetail,
+				socialCreditCode: this.socialCreditCode,
+				businessLicense: this.businessLicense,
+				shopPhoto: this.shopPhoto,
+				firstClubType: this.isOrganizationType, //机构类型分类 医美:0和生美:1
+				secondClubType: this.secondClubType, //机构类型二级分类 诊所:1,门诊:2,医院:3
+				department: this.department, //科室
+				medicalPracticeLicense: this.medicalPracticeLicense, //资质图片
+				mainProduct: this.mainProduct,
+				fax: this.clubFax,
+				contractPhone: this.clubTelePhone,
+				profile: this.companyPprofile
+			}
+			this.UserService.OrganizationRegister(params)
+				.then(response => {
+					this.$util.msg('您的升级申请已提交审核', 2000)
+					setTimeout(() => {
+						uni.navigateBack({ delta: 1 })
+					}, 2000)
 				})
-			},
-			bindPickerChange() {
-				let self = this
-				uni.showActionSheet({
-					title:'标题',
-					itemList: ['医美', '生美'],
-					success: (e) => {
-						self.isOrganizationType = e.tapIndex+1
-						switch(e.tapIndex){
-							case 0:
-								this.organizationTypeText = '医美'
-								break;
-							case 1:
-								this.organizationTypeText = '生美'
-								break;
-						}
-					}
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			
-			},
-			bindPickerChange2(e) {
-				this.typtIndex = e.target.value
-				this.isOrganizationType = e.target.value
-			},
-			radioChange(e) {
-				this.secondClubType = e.target.value;
-				if( this.secondClubType == 2 || this.secondClubType == 3){
-					this.isDepartment = true
-				}else{
-					this.isDepartment = false
-				}
-				for (let i = 0; i < this.beautyList.length; i++) {
-					if (this.beautyList[i].value === this.secondClubType) {
-						this.current = i;
-						break;
+		},
+		// 三级联动选择
+		showMulLinkageThreePicker() {
+			this.isShowInput = true
+			this.$refs.mpvueCityPicker.show()
+		},
+		onConfirm(e) {
+			this.addressData.address = e.name
+			this.addressData.townId = e.townCode
+			this.addressData.cityId = e.cityCode
+			this.addressData.provinceId = e.provinceCode
+		},
+		onTextareaInput(e) {
+			this.addressData.addressDetail = e.detail.value
+		},
+		showTextareaFocus() {
+			//文本框获取焦点
+			this.isShowInput = false
+			this.textareaFocus = true
+		},
+		hideTextareaFocus() {
+			//文本框失去焦点
+			this.isShowInput = true
+			this.textareaFocus = false
+		},
+		onTextareaInputInfo(e) {
+			this.companyPprofile = e.detail.value
+		},
+		chooseBusinessImage() {
+			//营业执照图片上传
+			uploadFileImage().then(res => {
+				this.businessLicense = JSON.parse(res.data).data
+			})
+		},
+		chooseMentuzImage() {
+			//门头照图片上传
+			uploadFileImage().then(res => {
+				this.shopPhoto = JSON.parse(res.data).data
+			})
+		},
+		chooseMedicalImage() {
+			//资质照图片上传
+			uploadFileImage().then(res => {
+				this.medicalPracticeLicense = JSON.parse(res.data).data
+			})
+		},
+		viewBusinessImage(e) {
+			this.myPreviewImageFn(this.businessLicense)
+		},
+		viewMentuzImage(e) {
+			this.myPreviewImageFn(this.shopPhoto)
+		},
+		viewMedicalImage(e) {
+			this.myPreviewImageFn(this.medicalPracticeLicense)
+		},
+		myPreviewImageFn(url) {
+			this.isPreviewImage = true
+			let mentuzArray = []
+			mentuzArray.push(url)
+			uni.previewImage({
+				urls: mentuzArray,
+				current: 0
+			})
+		},
+		delBusinessImage() {
+			this.$util.modal('', '确定删除营业执照图片吗？', '确定', '取消', true, () => {
+				this.businessLicense = ''
+			})
+		},
+		delMentuzImage() {
+			this.$util.modal('', '确定删除门头照图片吗？', '确定', '取消', true, () => {
+				this.shopPhoto = ''
+			})
+		},
+		delMedicalImage() {
+			this.$util.modal('', '确定删除资质图片吗？', '确定', '取消', true, () => {
+				this.medicalPracticeLicense = ''
+			})
+		},
+		bindPickerChange() {
+			let self = this
+			uni.showActionSheet({
+				title: '标题',
+				itemList: ['医美', '生美'],
+				success: e => {
+					self.isOrganizationType = e.tapIndex + 1
+					switch (e.tapIndex) {
+						case 0:
+							this.organizationTypeText = '医美'
+							break
+						case 1:
+							this.organizationTypeText = '生美'
+							break
 					}
 				}
-			},
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.mainProduct = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.isMainproCheck = true
-				this.mainProduct = this.checkLikes(e,this.medicaCampList)
-			},
-			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('/')
-			},
-			onBlurInput(e){//
-				if(e.detail.value ===''){
-					this.isDisabled = true
-				}else{
-					this.isDisabled = false
+			})
+		},
+		bindPickerChange2(e) {
+			this.typtIndex = e.target.value
+			this.isOrganizationType = e.target.value
+		},
+		radioChange(e) {
+			this.secondClubType = e.target.value
+			if (this.secondClubType == 2 || this.secondClubType == 3) {
+				this.isDepartment = true
+			} else {
+				this.isDepartment = false
+			}
+			for (let i = 0; i < this.beautyList.length; i++) {
+				if (this.beautyList[i].value === this.secondClubType) {
+					this.current = i
+					break
 				}
-			},
-			showAustomItem() {
-				this.isShowAustomItem = !this.isShowAustomItem
-			},
-			setNewMainpro(arr){//回显处理主营内容
-				let _ARRAY = []
-				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
-					_ARRAY.push(_OBJ)
-				})
-				console.log(_ARRAY)
-				return _ARRAY
-			},
-			addCustomItem(){
-				if(this.isOrganizationType == 1){
-					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue,checked:true}
-					this.mentuzCampList.push(item)
-				}else{
-					let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue,checked:true}
-					this.medicaCampList.push(item)
+			}
+		},
+		chooseMaleLike(e) {
+			this.isMainproCheck = true
+			this.mainProduct = this.checkLikes(e, this.mentuzCampList)
+		},
+		chooseMaleLikes(e) {
+			this.isMainproCheck = true
+			this.mainProduct = this.checkLikes(e, this.medicaCampList)
+		},
+		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)
 				}
-			},
-			showUpgrade(){
-				this.isUpgrade = true
-				this.isShowUpgrade = true
-				this.isDownUpgrade = false
-				this.registerBtnText = '提交审核'
-			},
-			hideUpgrade(){
-				this.$util.modal('提示','收起后，您填写的升级信息将会被清空确定收起吗？','确定','取消',true,() =>{
-					this.isUpgrade = false
-					this.isShowUpgrade = false
-					this.isDownUpgrade = true
-					this.registerBtnText = '确定'
-				})
+			})
+			return arr.join('/')
+		},
+		onBlurInput(e) {
+			//
+			if (e.detail.value === '') {
+				this.isDisabled = true
+			} else {
+				this.isDisabled = false
 			}
 		},
-		onShow() {
-			if(this.isPreviewImage){
-				this.isPreviewImage = false
-				return
+		showAustomItem() {
+			this.isShowAustomItem = !this.isShowAustomItem
+		},
+		setNewMainpro(arr) {
+			//回显处理主营内容
+			let _ARRAY = []
+			arr.split('/').forEach((item, index) => {
+				let _OBJ = { value: (index + 1).toString(), name: item, checked: true }
+				_ARRAY.push(_OBJ)
+			})
+			console.log(_ARRAY)
+			return _ARRAY
+		},
+		addCustomItem() {
+			if (this.isOrganizationType == 1) {
+				let item = { value: `${this.mentuzCampList.length + 1}`, name: this.customItemValue, checked: true }
+				this.mentuzCampList.push(item)
+			} else {
+				let item = { value: `${this.medicaCampList.length + 1}`, name: this.customItemValue, checked: true }
+				this.medicaCampList.push(item)
 			}
+		},
+		showUpgrade() {
+			this.isUpgrade = true
+			this.isShowUpgrade = true
+			this.isDownUpgrade = false
+			this.registerBtnText = '提交审核'
+		},
+		hideUpgrade() {
+			this.$util.modal('提示', '收起后，您填写的升级信息将会被清空确定收起吗？', '确定', '取消', true, () => {
+				this.isUpgrade = false
+				this.isShowUpgrade = false
+				this.isDownUpgrade = true
+				this.registerBtnText = '确定'
+			})
+		}
+	},
+	onShow() {
+		if (this.isPreviewImage) {
+			this.isPreviewImage = false
+			return
 		}
 	}
+}
 </script>
 
 <style lang="scss">
-	.register{
+.register {
+	width: 100%;
+	height: auto;
+	border-top: 1px solid #f7f7f7;
+	background: #efefef;
+	.register-main {
 		width: 100%;
 		height: auto;
-		border-top: 1px solid #F7F7F7;
-		background: #EFEFEF;
-		.register-main{
-			width: 100%;
+		background: #ffffff;
+		&.detailed {
+			padding-bottom: 200rpx;
+		}
+		&.first {
+			padding-top: 30rpx;
+		}
+		.register-tips {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			line-height: 44rpx;
+			font-size: $font-size-24;
+			color: #ff0000;
+			margin-bottom: 40rpx;
+			.iconfont {
+				font-size: $font-size-24;
+			}
+		}
+		.register-row {
+			width: 702rpx;
 			height: auto;
-			background: #FFFFFF;
-			&.detailed{
-				padding-bottom: 200rpx;
+			padding: 0 24rpx;
+			margin-bottom: 20rpx;
+			&.none {
+				margin-bottom: 0;
 			}
-			&.first{
-				padding-top: 30rpx;
+			.error-title {
+				line-height: 40rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				text-align: left;
 			}
-			.register-tips{
+			.error-main {
+				padding: 10rpx 0;
+				.error-item {
+					padding: 0 20rpx;
+					margin: 10rpx;
+					background: #f53636;
+					height: 52rpx;
+					line-height: 52rpx;
+					border-radius: 26rpx;
+					font-size: $font-size-26;
+					color: #ffffff;
+					text-align: center;
+					display: inline-block;
+				}
+			}
+			.register-txt {
+				line-height: 44rpx;
+				font-size: $font-size-26;
+				color: $text-color;
+				text-align: left;
+				&.first {
+					margin-top: 20rpx;
+				}
+			}
+			.register-bet {
+				width: 100%;
 				display: flex;
-				flex-direction: column;
+				line-height: 60rpx;
+				height: 60rpx;
 				align-items: center;
-				line-height: 44rpx;
+				flex-direction: column;
+				font-size: $font-size-28;
+				color: $color-system;
+				margin-top: 40rpx;
+				text {
+					margin: 0 5rpx;
+				}
+			}
+			.register-tip {
+				line-height: 64rpx;
 				font-size: $font-size-24;
-				color: #FF0000;
-				margin-bottom: 40rpx;
-				.iconfont{
+				color: #cecece;
+				text-align: left;
+			}
+			.register-title {
+				font-size: $font-size-32;
+				color: $text-color;
+				text {
 					font-size: $font-size-24;
 				}
 			}
-			.register-row{
-				width: 702rpx;
-				height: auto;
-				padding: 0 24rpx;
-				margin-bottom: 20rpx;
-				&.none{
-					margin-bottom: 0;
-				}
-				.error-title{
+			.row-btn {
+				position: absolute;
+				right: 24rpx;
+				top: 0;
+				line-height: 88rpx;
+				text-align: center;
+				font-size: $font-size-28;
+				color: $color-system;
+			}
+			.register-from {
+				width: 654rpx;
+				height: 40rpx;
+				padding: 24rpx;
+				background: $sub-bg-color;
+				border-radius: 14rpx;
+				position: relative;
+				.label {
+					text-align: left;
+					font-size: $font-size-28;
+					color: #666666;
 					line-height: 40rpx;
+					float: left;
+				}
+				.row-input {
+					width: 440rpx;
+					padding-left: 10rpx;
 					font-size: $font-size-28;
 					color: $text-color;
-					text-align: left;
-				}
-				.error-main{
-					padding: 10rpx 0;
-					.error-item{
-						padding:0 20rpx;
-						margin:10rpx;
-						background: #F53636;
-						height: 52rpx;
-						line-height: 52rpx;
-						border-radius: 26rpx;
-						font-size: $font-size-26;
-						color: #FFFFFF;
-						text-align: center;
-						display: inline-block;
+					line-height: 40rpx;
+					float: left;
+					height: 40rpx;
+					&.none {
+						color: #999999;
 					}
-				}
-				.register-txt{
-					line-height: 44rpx;
-					font-size: $font-size-26;
-					color: $text-color;
-					text-align: left;
-					&.first{
-						margin-top: 20rpx;
+					&.picker {
+						text-align: left;
+						color: #999999;
 					}
-				}
-				.register-bet{
-					width: 100%;
-					display: flex;
-					line-height: 60rpx;
-					height: 60rpx;
-					align-items: center;
-					flex-direction: column;
-					font-size: $font-size-28;
-					color: $color-system;
-					margin-top: 40rpx;
-					text{
-						margin: 0 5rpx;
+					&.keshi {
+						width: 550rpx;
 					}
 				}
-				.register-tip{
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					color: #CECECE;
-					text-align: left;
+				&.code {
+					width: 410rpx;
+					float: left;
+					margin-right: 20rpx;
+					.row-input {
+						width: 390rpx;
+					}
 				}
-				.register-title{
-					font-size: $font-size-32;
-					color: $text-color;
-					text{
-						font-size: $font-size-24;
+				&.btn {
+					width: 224rpx;
+					height: 88rpx;
+					float: left;
+					background: $btn-confirm;
+					padding: 0;
+					.row-input {
+						width: 224rpx;
+						height: 88rpx;
+						line-height: 88rpx;
+						padding: 0;
+						color: #ffffff;
+						background: $btn-confirm;
+						text-align: center;
+						border-radius: 14rpx;
+						&.other {
+							width: 224rpx;
+							background: #f7f7f7;
+							margin-right: 20rpx;
+						}
+						&.none {
+							background: #f7f7f7;
+						}
+					}
+					&.disabled {
+						background: #f7f7f7;
+						.row-input {
+							background: #f7f7f7;
+							color: #999999;
+						}
 					}
 				}
-				.row-btn{
-					position: absolute;
-					right: 24rpx;
-					top: 0;
+				&.picker {
+					padding: 0 24rpx;
+					width: 654rpx;
+					height: 88rpx;
 					line-height: 88rpx;
-					text-align: center;
-					font-size: $font-size-28;
-					color: $color-system;
+					.label {
+						line-height: 88rpx;
+					}
+					.row-input {
+						width: 470rpx;
+						height: 88rpx;
+						line-height: 88rpx;
+						padding-left: 30rpx;
+					}
 				}
-				.register-from{
+				&.radio {
+					padding: 0 24rpx;
 					width: 654rpx;
-					height: 40rpx;
-					padding: 24rpx;
-					background: $sub-bg-color;
-					border-radius: 14rpx;
-					position: relative;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 40rpx;
-						float: left;
+					height: 90rpx;
+					.row-input {
+						width: 160rpx;
+						height: 88rpx;
+						line-height: 88rpx;
+						padding-left: 0;
 					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
+					.row-radio {
 						float: left;
-						height: 40rpx;
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #999999;
-						}
-						&.keshi{
-							width: 550rpx;
-						}
+						transform: scale(0.8);
 					}
-					&.code{
-						width: 410rpx;
+					.row-text {
+						width: 100rpx;
+						text-align: left;
 						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 390rpx;
-						}
 					}
-					&.btn{
-						width: 224rpx;
-						height: 88rpx;
-						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						.row-input{
-							width: 224rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 14rpx;
-							&.other{
-								width: 224rpx;
-								background: #F7F7F7;
-								margin-right: 20rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
+				}
+				&.group {
+					padding: 0 24rpx;
+					width: 654rpx;
+					height: auto;
+					background: #ffffff;
+					margin-top: 30rpx;
+					.label {
+						line-height: 76rpx;
 					}
-					&.picker{
-						padding: 0 24rpx;
-						width: 654rpx;
+					.row-input {
+						width: 100%;
 						height: 88rpx;
 						line-height: 88rpx;
-						.label{
-							line-height: 88rpx;
-						}
-						.row-input{
-							width: 470rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 30rpx;
-						}
+						padding-left: 0;
 					}
-					&.radio{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 288rpx;
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-							transform: scale(0.8);
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
+					.row-radio {
+						float: left;
 					}
-					&.group{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: auto;
-						background: #FFFFFF;
-						margin-top: 30rpx;
-						.label{
-							line-height: 76rpx;
-						}
-						.row-input{
-							width: 100%;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
+					.row-text {
+						width: 100rpx;
+						text-align: center;
+						float: left;
 					}
-					&.btn{
-						margin-top: 0;
+				}
+				&.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;
 					}
-					.content-class {
-						margin: 20rpx auto;
+					.row-input {
 						display: flex;
-						flex-flow: row wrap;
-						justify-content: space-between;
-						align-items: center;
-						&.btn{
-							margin: 0 auto;
-							margin-left: 116rpx;
+						width: 220rpx;
+						height: 40rpx;
+						padding: 24rpx;
+						text-align: left;
+						border-radius: 10rpx;
+						font-size: $font-size-28;
+						color: $text-color;
+					}
+					.confirm-btn {
+						width: 200rpx;
+						height: 88rpx;
+						border-radius: 10rpx;
+						line-height: 88rpx;
+						text-align: center;
+						&.other {
+							width: 213rpx;
 						}
-						.row-input{
-							display: flex;
-							width: 220rpx;
-							height: 40rpx;
-							padding: 24rpx;
-							text-align: left;
-							border-radius: 10rpx;
-							font-size: $font-size-28;
-							color: $text-color;
+						&.none {
+							color: #ffffff;
+							background: $btn-confirm;
 						}
-						.confirm-btn{
-							width: 200rpx;
-							height: 88rpx;
-							border-radius: 10rpx;
-							line-height: 88rpx;
-							text-align: center;
-							&.other{
-								width: 213rpx;
-							}
-							&.none{
-								color: #FFFFFF;
-								background: $btn-confirm;
-							}
-							&.disabled{
-								color: #999999;
-							}
+						&.disabled {
+							color: #999999;
 						}
-						.item {
-						  width: 155rpx;
-						  height: 60rpx;
-						  font-size:$font-size-28;
-						  line-height: 60rpx;
-						  border-radius:10rpx;
-						  margin: 10rpx;
-						  text-align: center;
-						  box-sizing: border-box;
-						  border: 1rpx solid #EFEFEF;
-						  float: left;
-						  checkbox {
+					}
+					.item {
+						width: 155rpx;
+						height: 60rpx;
+						font-size: $font-size-28;
+						line-height: 60rpx;
+						border-radius: 10rpx;
+						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;
 						}
 					}
+					.on {
+						border-color: $color-system;
+						color: $color-system;
+					}
 				}
-				.icon-xiayibu{
-					width: 88rpx;
-					height: 88rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					line-height: 88rpx;
-					text-align: center;
+			}
+			.icon-xiayibu {
+				width: 88rpx;
+				height: 88rpx;
+				position: absolute;
+				right: 0;
+				top: 0;
+				line-height: 88rpx;
+				text-align: center;
+			}
+			&.text-textarea {
+				background: #ffffff;
+				.textarea {
+					width: 654rpx;
+					height: 180rpx;
+					background: #f7f7f7;
+					padding: 24rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+					z-index: 1;
+					border-radius: 14rpx;
 				}
-				&.text-textarea{
-					background: #FFFFFF;
-					.textarea{
-						width: 654rpx;
-						height: 180rpx;
-						background: #F7F7F7;
-						padding: 24rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						z-index: 1;
-						border-radius: 14rpx;
-					}
-					.textarea.hide{
-						opacity: 0;
-					}
-					.textarea.show{
-						color: #999999;
-					}
+				.textarea.hide {
+					opacity: 0;
+				}
+				.textarea.show {
+					color: #999999;
 				}
 			}
-			.register-picture{
-				height: 102rpx;
-				margin: 30rpx 0;
-				width: 42%;
+		}
+		.register-picture {
+			height: 102rpx;
+			margin: 30rpx 0;
+			width: 42%;
+			float: left;
+			&.zz {
+				width: 100%;
+			}
+			.label {
 				float: left;
-				&.zz{
-					width: 100%;
+				font-size: $font-size-28;
+				color: $text-color;
+				line-height: 102rpx;
+				width: 150rpx;
+				text-align: right;
+				&.zz {
+					width: 230rpx;
 				}
-				.label{
-					float: left;
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 102rpx;
-					width: 150rpx;
-					text-align: right;
-					&.zz{
-						width: 230rpx;
+			}
+			.upload-picture {
+				float: left;
+				height: 100rpx;
+				.upload-none {
+					width: 100rpx;
+					height: 100rpx;
+					text-align: center;
+					line-height: 100rpx;
+					color: #999999;
+					border: 1px solid #999999;
+					border-radius: 10rpx;
+					margin: 0 20rpx;
+					.iconfont {
+						font-size: $font-size-28;
 					}
 				}
-				.upload-picture{
-					float: left;
+				.upload-image {
+					width: 100rpx;
 					height: 100rpx;
-					.upload-none{
+					border-radius: 10rpx;
+					margin: 0 20rpx;
+					position: relative;
+					image {
 						width: 100rpx;
 						height: 100rpx;
-						text-align: center;
-						line-height: 100rpx;
-						color: #999999;
-						border: 1px solid #999999;
 						border-radius: 10rpx;
-						margin: 0 20rpx;
-						.iconfont{
-							font-size: $font-size-28;
-						}
 					}
-					.upload-image{
-						width: 100rpx;
-						height: 100rpx;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						position: relative;
-						image{
-							width: 100rpx;
-							height: 100rpx;
-							border-radius: 10rpx;
-						}
-						.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;
-							}
+					.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;
+		}
+		.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;
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
 			}
-			.register-fiexd{
+		}
+		.register-fiexd {
+			width: 100%;
+			height: auto;
+			padding: 20rpx 0;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			background: #ffffff;
+			.register-bet {
 				width: 100%;
-				height: auto;
-				padding: 20rpx 0;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 99;
-				background: #FFFFFF;
-				.register-bet{
-					width: 100%;
-					display: flex;
-					line-height: 60rpx;
-					height: 60rpx;
-					align-items: center;
-					flex-direction: column;
-					font-size: $font-size-28;
-					color: $color-system;
-					margin-bottom: 20rpx;
-					.icon-xiangxiajiantou{
-						transform:rotate(180deg);
-					}
-					text{
-						margin: 0 5rpx;
-					}
+				display: flex;
+				line-height: 60rpx;
+				height: 60rpx;
+				align-items: center;
+				flex-direction: column;
+				font-size: $font-size-28;
+				color: $color-system;
+				margin-bottom: 20rpx;
+				.icon-xiangxiajiantou {
+					transform: rotate(180deg);
 				}
-				.register-agree{
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					margin: 32rpx 0;
-					.agree-text{
-						.checkbox{
-							float: left;
-							margin: 4rpx 6rpx 0 0;
-							color: #999999;
-							font-size: $font-size-32;
-							&.icon-gouxuan{
-								color: $color-system;
-							}
-						}
-						font-size: 20rpx;
-						line-height: 44rpx;
+				text {
+					margin: 0 5rpx;
+				}
+			}
+			.register-agree {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin: 32rpx 0;
+				.agree-text {
+					.checkbox {
+						float: left;
+						margin: 4rpx 6rpx 0 0;
 						color: #999999;
-						text{
-							color:#0091FF;
+						font-size: $font-size-32;
+						&.icon-gouxuan {
+							color: $color-system;
 						}
 					}
+					font-size: 20rpx;
+					line-height: 44rpx;
+					color: #999999;
+					text {
+						color: #0091ff;
+					}
 				}
 			}
-			.register-btn{
-				width: 702rpx;
-				height: 88rpx;
-				border-radius: 14rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-				margin-top: 96rpx;
-				&.none{
-					background: #FFFFFF;
-					color: $text-color;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
+		}
+		.register-btn {
+			width: 702rpx;
+			height: 88rpx;
+			border-radius: 14rpx;
+			font-size: $font-size-28;
+			line-height: 88rpx;
+			color: #ffffff;
+			margin: 0 auto;
+			text-align: center;
+			background: $btn-confirm;
+			margin-top: 96rpx;
+			&.none {
+				background: #ffffff;
+				color: $text-color;
+				margin-top: 0;
+			}
+			&.sub {
+				margin-top: 0;
 			}
 		}
 	}
+}
 </style>

pages/seller/login/register-member.vue

@@ -1,65 +1,107 @@
-
 <template>
 	<view class="register">
 		<view class="register-main" v-if="isRegisterStep">
 			<view class="main-form-item">
 				<view class="form-label">联系人</view>
-				<input class="form-input" type="text" name="input" v-model.trim="params.linkMan" placeholder="请输入联系姓名" maxlength="6"/>
+				<input
+					class="form-input"
+					type="text"
+					name="input"
+					v-model.trim="params.linkMan"
+					placeholder="请输入联系姓名"
+					maxlength="6"
+				/>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">手机号</view>
-				<input class="form-input phone" type="text" v-model.trim="params.bindMobile" placeholder="请输入联系人手机号" maxlength="11"/>
+				<input
+					class="form-input phone"
+					type="text"
+					v-model.trim="params.bindMobile"
+					placeholder="请输入联系人手机号"
+					maxlength="11"
+				/>
 				<view class="form-btn" @click.stop="CheckMobile()">检测</view>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">邮箱</view>
-				<input class="form-input" type="text" name="input" v-model.trim="params.contractEmail" placeholder="请输入机构邮箱地址" maxlength="30"/>
+				<input
+					class="form-input"
+					type="text"
+					name="input"
+					v-model.trim="params.contractEmail"
+					placeholder="请输入机构邮箱地址"
+					maxlength="30"
+				/>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">机构名称</view>
-				<input class="form-input" type="text" name="input" v-model.trim="params.name" placeholder="请输入机构名称" maxlength="30"/>
+				<input
+					class="form-input"
+					type="text"
+					name="input"
+					v-model.trim="params.name"
+					placeholder="请输入机构名称"
+					maxlength="30"
+				/>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label">机构简称</view>
-				<input class="form-input" type="text" name="input" v-model.trim="params.shortName" placeholder="请输入机构简称" maxlength="10"/>
+				<input
+					class="form-input"
+					type="text"
+					name="input"
+					v-model.trim="params.shortName"
+					placeholder="请输入机构简称"
+					maxlength="10"
+				/>
 			</view>
 			<view class="main-form-item" @click="showMulLinkageThreePicker">
 				<view class="form-label">机构地址</view>
-				<view  class="form-input" 
-					   :class="addressText === '请选择机构所在地区' ? 'none' : ''">
-					   {{addressText}}
-				</view>		
+				<view class="form-input" :class="addressText === '请选择机构所在地区' ? 'none' : ''">
+					{{ addressText }}
+				</view>
 				<view class="iconfont icon-xiayibu"></view>
 			</view>
 			<view class="main-form-item textarea">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{params.address ? params.address :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="params.address" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="35"
-							@input="onTextareaInput"
-							@blur="hideTextareaFocus"
-							:class="isShowInput ? '':''"
-				/>			
+				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{
+					params.address ? params.address : '详细地址：如道路、门牌号、小区等'
+				}}</view>
+				<textarea
+					v-else
+					class="textarea"
+					type="text"
+					v-model="params.address"
+					placeholder="详细地址：如道路、门牌号、小区等"
+					placeholder-class="placeholder"
+					maxlength="35"
+					@input="onTextareaInput"
+					@blur="hideTextareaFocus"
+					:class="isShowInput ? '' : ''"
+				/>
 			</view>
 			<view class="main-form-item">
 				<view class="form-label lang">营业执照编号</view>
-				<input class="form-input lang" type="text" name="input" v-model="params.socialCreditCode" placeholder="请输入社会信用统一代码" maxlength="18"/>
+				<input
+					class="form-input lang"
+					type="text"
+					name="input"
+					v-model="params.socialCreditCode"
+					placeholder="请输入社会信用统一代码"
+					maxlength="18"
+				/>
 			</view>
 			<view class="main-form-item file">
 				<view class="main-form-upload">
 					<view class="label">营业执照</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="params.businessLicense === ''"  @click="UploadPicture(1)">
+						<view class="upload-none" v-if="params.businessLicense === ''" @click="UploadPicture(1)">
 							<text class="iconfont icon-jiahao"></text><text class="upload-text">营业执照</text>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="params.businessLicense" mode="" @click="ShowPreviewImage(1)"></image>
 							<view class="upload-del" @click="DeletePicture(1)">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
@@ -71,160 +113,234 @@
 							<text class="iconfont icon-jiahao"></text><text class="upload-text">门头照</text>
 						</view>
 						<view class="upload-image" v-else>
-							<image :src="params.shopPhoto" mode=""  @click="ShowPreviewImage(2)"></image>
+							<image :src="params.shopPhoto" mode="" @click="ShowPreviewImage(2)"></image>
 							<view class="upload-del" @click="DeletePicture(2)">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
-					</view>	
+					</view>
 				</view>
-			</view>	
+			</view>
 			<view class="main-form-item picker">
 				<view class="form-label">机构类型</view>
 				<radio-group @change="bindPickerChange">
-					 <label class="label-radio" v-for="(item, index) in radioGroup1" :key="item.value">
-						 <radio class="row-radio" :value="item.value" :checked="index === current" color='#E15616'/>
-						 <view class="row-text">{{item.name}}</view>
-					 </label>
+					<label class="label-radio" v-for="(item, index) in radioGroup1" :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="main-form-item picker" v-if="params.firstClubType == 1">
 				<view class="picker-radio">
-					<view class="secondTyperadio" v-for="(item,index) in beautyList" :key="item.value" @click="radioChange(item)" :class="item.value==params.secondClubType?'active':''">
-						<view class="secondRadio" >{{item.name}}</view>
+					<view
+						class="secondTyperadio"
+						v-for="(item, index) in beautyList"
+						:key="item.value"
+						@click="radioChange(item)"
+						:class="item.value == params.secondClubType ? 'active' : ''"
+					>
+						<view class="secondRadio">{{ item.name }}</view>
 					</view>
 				</view>
 			</view>
-			<view class="main-form-item file"  v-if="params.firstClubType == 1">
+			<view class="main-form-item picker" v-if="params.firstClubType == 2">
+				<view class="picker-radio">
+					<view
+						class="secondTyperadio"
+						v-for="(item, index) in beautyLists"
+						:key="item.value"
+						@click="radioChange(item)"
+						:class="item.value == params.secondClubType ? 'active' : ''"
+					>
+						<view class="secondRadio">{{ item.name }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="main-form-item file" v-if="params.firstClubType == 1">
 				<view class="main-form-upload">
 					<view class="label">资质</view>
 					<view class="upload-picture">
-						<view class="upload-none" v-if="params.medicalPracticeLicense === ''"  @click="UploadPicture(3)">
+						<view class="upload-none" v-if="params.medicalPracticeLicense === ''" @click="UploadPicture(3)">
 							<text class="iconfont icon-jiahao"></text><text class="upload-text">医疗执业许可证</text>
 						</view>
 						<view class="upload-image" v-else>
 							<image :src="params.medicalPracticeLicense" mode="" @click="ShowPreviewImage(3)"></image>
 							<view class="upload-del" @click="DeletePicture(3)">
-								<text class='iconfont icon-shanchu1'></text>
+								<text class="iconfont icon-shanchu1"></text>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>		
-			<view class="main-form-item none" v-if="params.secondClubType == 2 || params.secondClubType == 3">
+			</view>
+			<view
+				class="main-form-item none"
+				v-if="
+					(params.firstClubType == 1 && params.secondClubType == 2) ||
+						(params.firstClubType == 1 && params.secondClubType == 3)
+				"
+			>
 				<view class="form-label none">科室</view>
-				<textarea class="textarea-ke"  placeholder="请填写经营的科室，至少三个，用逗号隔开" placeholder-style="placeholder" v-model="params.department" maxlength="16"></textarea>
-			</view>	
+				<textarea
+					class="textarea-ke"
+					placeholder="请填写经营的科室，至少三个，用逗号隔开"
+					placeholder-style="placeholder"
+					v-model="params.department"
+					maxlength="16"
+				></textarea>
+			</view>
 			<view class="main-form-item none" v-if="params.firstClubType == 1">
 				<view class="form-label none">主营内容</view>
 				<view class="form-checkbox-group">
-					<checkbox-group  @change="ChooseMaleLike" >
-						<label class="item" v-for="(item, index) in mentuzCampList" :key="index" :class="{on: item.checked}">
-							<checkbox class="item-checkbox" :value="item.value" color="#E15616" style="transform:scale(0.7)" :checked="item.checked"></checkbox>
-							<text class="item-text">{{item.name}}</text>
+					<checkbox-group @change="ChooseMaleLike">
+						<label
+							class="item"
+							v-for="(item, index) in mentuzCampList"
+							:key="index"
+							:class="{ on: item.checked }"
+						>
+							<checkbox
+								class="item-checkbox"
+								:value="item.value"
+								color="#E15616"
+								style="transform:scale(0.7)"
+								:checked="item.checked"
+							></checkbox>
+							<text class="item-text">{{ item.name }}</text>
 						</label>
 					</checkbox-group>
-				</view>	
+				</view>
 				<view class="form-checkbox-input">
-					<input class="checkbox-input" type="text" v-model="customItemValue"  placeholder="请输入其他自定义品项目" maxlength="5"/>
+					<input
+						class="checkbox-input"
+						type="text"
+						v-model="customItemValue"
+						placeholder="请输入其他自定义品项目"
+						maxlength="5"
+					/>
 					<view class="checkbox-btn" @click.stop="addCustomItem">确认添加</view>
-				</view>	
+				</view>
 			</view>
 			<view class="main-form-item none" v-if="params.firstClubType == 2">
 				<view class="form-label none">主营内容</view>
 				<view class="form-checkbox-group">
 					<checkbox-group @change="ChooseMaleLike">
-						<label class="item" v-for="(item, index) in medicaCampList" :key="index" :class="{on: item.checked}">
-							<checkbox class="item-checkbox" :value="item.value" color="#E15616" style="transform:scale(0.7)" :checked="item.checked"></checkbox>
-						    <text class="item-text">{{item.name}}</text>
+						<label
+							class="item"
+							v-for="(item, index) in medicaCampList"
+							:key="index"
+							:class="{ on: item.checked }"
+						>
+							<checkbox
+								class="item-checkbox"
+								:value="item.value"
+								color="#E15616"
+								style="transform:scale(0.7)"
+								:checked="item.checked"
+							></checkbox>
+							<text class="item-text">{{ item.name }}</text>
 						</label>
 					</checkbox-group>
-				</view>	
+				</view>
 				<view class="form-checkbox-input">
-					<input class="checkbox-input" type="text" v-model="customItemValue"  placeholder="请输入其他自定义品项目" maxlength="5"/>
+					<input
+						class="checkbox-input"
+						type="text"
+						v-model="customItemValue"
+						placeholder="请输入其他自定义品项目"
+						maxlength="5"
+					/>
 					<view class="checkbox-btn" @click.stop="addCustomItem">确认添加</view>
-				</view>	
-			</view>		
-			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
+				</view>
+			</view>
+			<view class="register-fiexd clearfix" :style="{ paddingBottom: isIphoneX ? '68rpx' : '' }">
 				<view class="register-agree">
-					<view class="agree-text"  @tap.stop="agreeCheck()">
-						<button class="checkbox iconfont" :class="[isCheck ?'icon-gouxuan':'icon-weigouxuan']"></button> 
+					<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/service?id=1036&title=机构协议')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')">《隐私权政策》</text>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1036&title=机构协议')"
+							>《机构协议》</text
+						>
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1023&title=用户协议')"
+							>《用户协议》</text
+						>及
+						<text @click.stop="this.$api.navigateTo('/pages/service/service?id=1013&title=隐私权政策')"
+							>《隐私权政策》</text
+						>
 					</view>
 				</view>
 				<view class="register-row">
-					<view class="register-btn sub" :class="isSubLoading ? 'disabled' : ''" @click.stop="SubmitRegister">确定</view>
+					<view class="register-btn sub" :class="isSubLoading ? 'disabled' : ''" @click.stop="SubmitRegister"
+						>确定</view
+					>
 				</view>
 			</view>
 		</view>
 		<view class="register-main" v-else>
 			<view class="main-form-item">
-				<view class="form-label">联系人</view>
-				<view class="form-text"> {{ clubInfo.linkMan }} </view>
+				<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 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 }}</view>
+				<view class="form-label">邮箱</view> <view class="form-text">{{ clubInfo.contractEmail }}</view>
 			</view>
 			<view class="main-form-item">
-				<view class="form-label">机构名称</view>
-				<view class="form-text">{{ clubInfo.name }}</view>
+				<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 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 class="form-input">{{ clubInfo.provincialAddress }}</view>
 			</view>
 			<view class="main-form-item">
-				<view class="form-textarea">{{ clubInfo.address }}</view>		
+				<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 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="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 class="upload-image"
+							><image :src="clubInfo.shopPhoto" mode="" @click="ShowPreviewImage(2)"></image
+						></view>
+					</view>
 				</view>
-			</view>	
+			</view>
 			<view class="main-form-item">
 				<view class="form-label">机构类型</view>
 				<view class="form-text">
-					{{ clubInfo.firstClubType | FirstFormat }}
-					-
-					{{ clubInfo.secondClubType | TwoFormat }}
+					{{ clubInfo.firstClubType | FirstFormat }} - {{ clubInfo.secondClubType | TwoFormat }}
 				</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="upload-image"
+							><image :src="clubInfo.medicalPracticeLicense" mode="" @click="ShowPreviewImage(2)"></image
+						></view>
+					</view>
 				</view>
-			</view>	
+			</view>
 			<view class="main-form-item" v-if="clubInfo.secondClubType == 2 || clubInfo.secondClubType == 3">
-				<view class="form-label">科室</view>
-				<view class="form-text">{{ clubInfo.department }}</view>
+				<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>
@@ -234,783 +350,811 @@
 					</view>
 				</view>
 			</view>
-			<view class="register-fiexd clearfix" :style="{paddingBottom:isIphoneX ? '68rpx':''}">
-				<view class="register-row">
-					<button class="register-btn sub" @tap="ShareRegister">分享</button>
-				</view>
+			<view class="register-fiexd clearfix" :style="{ paddingBottom: isIphoneX ? '68rpx' : '' }">
+				<view class="register-row"> <button class="register-btn sub" @tap="ShareRegister">分享</button> </view>
 			</view>
 		</view>
 		<!-- 地址Pciker -->
-		<city-Picker :themeColor="themeColor"
-					 ref="CityPicker" 
-					 :pickerValueDefault="cityPickerValueDefault"
-					 @onCancel="onCancel" 
-					 @onConfirm="onConfirm">
+		<city-Picker
+			:themeColor="themeColor"
+			ref="CityPicker"
+			:pickerValueDefault="cityPickerValueDefault"
+			@onCancel="onCancel"
+			@onConfirm="onConfirm"
+		>
 		</city-Picker>
 		<!-- 分享弹窗 -->
-		<shareModel  v-if="isShareModal" :bindId="bindId" @shareConfirm ='onShareAppMessage'></shareModel>
+		<shareModel v-if="isShareModal" :bindId="bindId" @shareConfirm="onShareAppMessage"></shareModel>
 	</view>
 </template>
 
 <script>
-	
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import shareModel from '@/components/cm-module/modelAlert/shareModel.vue'			 //分享弹窗
-	import { uploadFileImage } from "@/services/public.js"
-	export default{
-		components:{
-			shareModel
-		},
-		data() {
-			return{
-				isRegisterStep:true,
-				isSubLoading:false,
-				isIphoneX:this.$store.state.isIphone,
-				isCheck:false,
-				clubUserId:0,
-				isShowInput:true,
-				isShareModal:false,
-				isDepartment:false,
-				textareaFocus:false,
-				beautyList:beautyList,
-				mentuzCampList:mentuzCampNullList,
-				medicaCampList:medicaCampNullList,
-				addressText:'请选择机构所在地区',
-				params:{
-					userId:0,
-					name:'',
-					shortName:'',
-					linkMan:'',
-					bindMobile:'',
-					contractEmail:'',
-					socialCreditCode:'',
-					isAgreed:0,
-					townId:'',			//区ID
-					cityId:'',			//区ID
-					provinceId:'',		//区ID
-					addressDetail: '',	//地址
-					businessLicense:'', //营业执照
-					shopPhoto:'',		//门头照
-					medicalPracticeLicense:'',//资质
-					firstClubType:1, //1医美；2生美
-					secondClubType:1, //1诊所；2门诊；3医院 
-					department:'',//科室
-					mainProduct:'',
-				},
-				clubInfo:{
-					linkMan:'',
-					bindMobile:'',
-					userId:0,
-				},
-				radioGroup1:[
-					{name:'医美',value:1},
-					{name:'生美',value:2}
-				],
-				current:0,
-				bindId:0,
-				customItemValue:'', 	//自定义项目
-				showMainProductList:[]
-			}
-		},
-		filters: {
-			FirstFormat:function(type) {//处理金额
-				let name='';
-				switch(type){
-					case 1: name = '医美'; break;
-					case 2: name = '生美'; break;
-				}	
-				return name;
+import { beautyList, beautyLists, mentuzCampNullList, medicaCampNullList } from '@/common/json/data.json.js' //本地数据
+import shareModel from '@/components/cm-module/modelAlert/shareModel.vue' //分享弹窗
+import { uploadFileImage } from '@/services/public.js'
+export default {
+	components: {
+		shareModel
+	},
+	data() {
+		return {
+			isRegisterStep: true,
+			isSubLoading: false,
+			isIphoneX: this.$store.state.isIphone,
+			isCheck: false,
+			clubUserId: 0,
+			isShowInput: true,
+			isShareModal: false,
+			isDepartment: false,
+			textareaFocus: false,
+			beautyList: beautyList,
+			beautyLists: beautyLists,
+			mentuzCampList: mentuzCampNullList,
+			medicaCampList: medicaCampNullList,
+			addressText: '请选择机构所在地区',
+			params: {
+				userId: 0,
+				name: '',
+				shortName: '',
+				linkMan: '',
+				bindMobile: '',
+				contractEmail: '',
+				socialCreditCode: '',
+				isAgreed: 0,
+				townId: '', //区ID
+				cityId: '', //区ID
+				provinceId: '', //区ID
+				addressDetail: '', //地址
+				businessLicense: '', //营业执照
+				shopPhoto: '', //门头照
+				medicalPracticeLicense: '', //资质
+				firstClubType: 1, //1医美；2生美
+				secondClubType: 1, //1诊所；2门诊；3医院
+				department: '', //科室
+				mainProduct: ''
 			},
-			TwoFormat:function(type) {//处理金额
-				let text='';
-				switch(type){
-					case 1: text = '诊所'; break;
-					case 2: text = '门诊'; break;
-					case 3: text = '医院'; break;
-				}	
-				return text;
+			clubInfo: {
+				linkMan: '',
+				bindMobile: '',
+				userId: 0
 			},
-		},	
-		onLoad(option) {
-			this.$api.getStorage().then((resolve) =>{
-				this.params.userId = resolve.userId ? resolve.userId : 0
-			})
+			radioGroup1: [{ name: '医美', value: 1 }, { name: '生美', value: 2 }],
+			current: 0,
+			bindId: 0,
+			customItemValue: '', //自定义项目
+			showMainProductList: []
+		}
+	},
+	filters: {
+		FirstFormat: function(type) {
+			//处理金额
+			let name = ''
+			switch (type) {
+				case 1:
+					name = '医美'
+					break
+				case 2:
+					name = '生美'
+					break
+			}
+			return name
 		},
-		computed: {
-			
+		TwoFormat: function(type) {
+			//处理金额
+			let text = ''
+			switch (type) {
+				case 1:
+					text = '诊所'
+					break
+				case 2:
+					text = '门诊'
+					break
+				case 3:
+					text = '医院'
+					break
+			}
+			return text
+		}
+	},
+	onLoad(option) {
+		this.$api.getStorage().then(resolve => {
+			this.params.userId = resolve.userId ? resolve.userId : 0
+		})
+	},
+	computed: {},
+	methods: {
+		CheckMobile() {
+			//检测手机是否能注册
+			if (this.params.bindMobile == '') {
+				this.$util.msg('请输入手机号', 2000)
+				return
+			}
+			if (!this.$reg.isMobile(this.params.bindMobile)) {
+				this.$util.msg('请输入正确的手机号', 2000)
+				return
+			}
+			this.SellerService.SellerClubCheck({ bindMobile: this.params.bindMobile })
+				.then(response => {
+					this.$util.msg(response.data, 2000)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
 		},
-		methods:{
-			CheckMobile(){//检测手机是否能注册
-				if( this.params.bindMobile == ''){
-					this.$util.msg('请输入手机号',2000);
+		SubmitRegister() {
+			//提交注册
+			if (this.isSubLoading) {
+				return
+			}
+			if (this.params.linkMan == '') {
+				this.$util.msg('请输入联系人姓名', 2000)
+				return
+			}
+			if (this.params.bindMobile == '') {
+				this.$util.msg('请输入联系人手机号', 2000)
+				return
+			}
+			if (!this.$reg.isMobile(this.params.bindMobile)) {
+				this.$util.msg('手机格式不正确', 2000)
+				return
+			}
+			if (this.params.contractEmail == '') {
+				this.$util.msg('请输入邮箱地址', 2000)
+				return
+			}
+			if (!this.$reg.isEmail(this.params.contractEmail)) {
+				this.$util.msg('请输入正确的邮箱地址', 2000)
+				return
+			}
+			if (this.params.name == '') {
+				this.$util.msg('请输入机构名称', 2000)
+				return
+			}
+			if (this.params.townId == '') {
+				this.$util.msg('请选择机构地址', 2000)
+				return
+			}
+			if (this.params.address == '') {
+				this.$util.msg('请填写机构详细地址', 2000)
+				return
+			}
+			if (this.params.businessLicense == '') {
+				this.$util.msg('请上传您的营业执照', 2000)
+				return
+			}
+			if (this.params.firstClubType == 1) {
+				if (this.params.medicalPracticeLicense == '') {
+					this.$util.msg('请上传您的医疗资质', 2000)
 					return
 				}
-				if(!this.$reg.isMobile(this.params.bindMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
+			}
+			if (this.params.firstClubType != 0) {
+				console.log(this.params.mainProduct)
+				if (this.params.mainProduct == '') {
+					this.$util.msg('请选择住机构主营内容', 2000)
 					return
 				}
-				this.SellerService.SellerClubCheck({bindMobile:this.params.bindMobile})
-				.then(response =>{
-					this.$util.msg(response.data,2000);
+			}
+			const mainproList = []
+			if (this.params.firstClubType == 1) {
+				this.mentuzCampList.forEach(item => {
+					mainproList.push(item.name)
 				})
-				.catch(error =>{
-					this.$util.msg(error.msg,2000);
+			} else {
+				this.medicaCampList.forEach(item => {
+					mainproList.push(item.name)
 				})
-			},
-			SubmitRegister(){//提交注册
-				if(this.isSubLoading){ return; }
-				if( this.params.linkMan == ''){
-					this.$util.msg('请输入联系人姓名',2000);
-					return
-				}
-				if( this.params.bindMobile == ''){
-					this.$util.msg('请输入联系人手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.params.bindMobile)){
-					this.$util.msg('手机格式不正确',2000);
-					return
-				}	
-				if( this.params.contractEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if(!this.$reg.isEmail(this.params.contractEmail)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				if( this.params.name == ''){
-					this.$util.msg('请输入机构名称',2000);
-					return
-				}
-				if( this.params.townId == ''){
-					this.$util.msg('请选择机构地址',2000);
-					return
-				}
-				if( this.params.address == ''){
-					this.$util.msg('请填写机构详细地址',2000);
-					return
-				}
-				if( this.params.businessLicense == ''){
-					this.$util.msg('请上传您的营业执照',2000);
-					return
-				}
-				if( this.params.firstClubType == 1){
-					if( this.params.medicalPracticeLicense == ''){
-						this.$util.msg('请上传您的医疗资质',2000);
-						return
-					}
-				}
-				if(this.params.firstClubType!=0){
-					console.log(this.params.mainProduct)
-					if(this.params.mainProduct == ''){
-						this.$util.msg('请选择住机构主营内容',2000);
-						return
-					}
-				}
-				const mainproList = []
-				if(this.params.firstClubType == 1){
-					this.mentuzCampList.forEach(item =>{
-						mainproList.push(item.name)
-					})
-				}else{
-					this.medicaCampList.forEach(item =>{
-						mainproList.push(item.name)
-					})
-				}
-				this.params.mainProduct = mainproList.join('/')
-				if(this.params.isAgreed == 0){
-					this.$util.msg('请勾选同意协议',2000);
-					return
-				}
-				this.isSubLoading = true;	
-				this.SellerService.SellerClubTemporary(this.params).then(response =>{
+			}
+			this.params.mainProduct = mainproList.join('/')
+			if (this.params.isAgreed == 0) {
+				this.$util.msg('请勾选同意协议', 2000)
+				return
+			}
+			this.isSubLoading = true
+			this.SellerService.SellerClubTemporary(this.params)
+				.then(response => {
 					this.bindId = response.data
-					setTimeout(()=>{
+					setTimeout(() => {
 						this.isRegisterStep = false
 						this.GetClubUserInfo(this.bindId)
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
+					}, 2000)
 				})
-			},
-			GetClubUserInfo(id){
-				this.UserService.UseRregisterTemporaryInfo({id:id})
-				.then(response =>{
-					this.clubInfo = response.data
-					this.isSubLoading = false;	
-					this.showMainProductList =  this.setNewMainpro(this.clubInfo.mainProduct)
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-				.catch(error =>{
-					this.isSubLoading = false;	
-					this.$util.msg(error.msg,2000)
+		},
+		GetClubUserInfo(id) {
+			this.UserService.UseRregisterTemporaryInfo({ id: id })
+				.then(response => {
+					this.clubInfo = response.data
+					this.isSubLoading = false
+					this.showMainProductList = this.setNewMainpro(this.clubInfo.mainProduct)
 				})
-			},
-			ShareRegister(){//点击分享
-				this.isShareModal = true
-			},
-			agreeCheck() {//勾选协议
-				this.isCheck = !this.isCheck
-				if(this.isCheck){
-					this.params.isAgreed = 1
-				}else{
-					this.params.isAgreed = 0
-				}
-			},
-			showMulLinkageThreePicker() {//三级地址联动
-				this.isShowInput = true
-				this.$refs.CityPicker.show()
-			},
-			showTextareaFocus(){//文本框获取焦点
-				this.isShowInput = false
-				this.textareaFocus = true
-			},
-			hideTextareaFocus(){//文本框失去焦点
-				this.isShowInput = true
-				this.textareaFocus = false
-			},
-			onTextareaInput(e){//地址详细信息
-			   this.params.address = e.detail.value;
-			},
-			onConfirm(e) {//获取选择的地址信息
-				console.log('地址',e);
-				this.addressText = e.name;
-				this.params.townId = e.townCode;
-				this.params.cityId = e.cityCode;
-				this.params.provinceId = e.provinceCode;
-			},	
-			UploadPicture(NUM) {//图片上传
-				uploadFileImage().then(res =>{
-					switch(NUM){
-						case 1:
-							this.params.businessLicense = JSON.parse(res.data).data
-							break;
-						case 2:
-							this.params.shopPhoto = JSON.parse(res.data).data
-							break;
-						case 3:
-							this.params.medicalPracticeLicense = JSON.parse(res.data).data
-							break;
-					}
+				.catch(error => {
+					this.isSubLoading = false
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			DeletePicture(NUM){//删除照片
-				switch(NUM){
-					case 1:
-						this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-							 this.params.businessLicense = ''
-						})
-						break;
-					case 2:
-						this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-							this.params.shopPhoto = ''
-						})
-						break;
-					case 3:
-						this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-							this.params.medicalPracticeLicense = ''
-						})
-						break;
-				}
-			},
-			ShowPreviewImage(NUM) {//预览照片
-				switch(NUM){
+		},
+		ShareRegister() {
+			//点击分享
+			this.isShareModal = true
+		},
+		agreeCheck() {
+			//勾选协议
+			this.isCheck = !this.isCheck
+			if (this.isCheck) {
+				this.params.isAgreed = 1
+			} else {
+				this.params.isAgreed = 0
+			}
+		},
+		showMulLinkageThreePicker() {
+			//三级地址联动
+			this.isShowInput = true
+			this.$refs.CityPicker.show()
+		},
+		showTextareaFocus() {
+			//文本框获取焦点
+			this.isShowInput = false
+			this.textareaFocus = true
+		},
+		hideTextareaFocus() {
+			//文本框失去焦点
+			this.isShowInput = true
+			this.textareaFocus = false
+		},
+		onTextareaInput(e) {
+			//地址详细信息
+			this.params.address = e.detail.value
+		},
+		onConfirm(e) {
+			//获取选择的地址信息
+			console.log('地址', e)
+			this.addressText = e.name
+			this.params.townId = e.townCode
+			this.params.cityId = e.cityCode
+			this.params.provinceId = e.provinceCode
+		},
+		UploadPicture(NUM) {
+			//图片上传
+			uploadFileImage().then(res => {
+				switch (NUM) {
 					case 1:
-						this.myPreviewImageFn(this.businessLicense)
-						break;
+						this.params.businessLicense = JSON.parse(res.data).data
+						break
 					case 2:
-						this.myPreviewImageFn(this.shopPhoto)
-						break;
+						this.params.shopPhoto = JSON.parse(res.data).data
+						break
 					case 3:
-						this.myPreviewImageFn(this.medicalPracticeLicense)
-						break;
-				}
-			},
-			myPreviewImageFn(url){//预览证件照
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			setNewMainpro(arr){//回显处理主营内容
-				let _ARRAY = []
-				arr.split('/').forEach((item,index) =>{
-					let _OBJ = {value:(index+1).toString(),name:item,checked:true}
-					_ARRAY.push(_OBJ)
-				})
-				return _ARRAY
-			},
-			bindPickerChange(e) {//选择机构类型
-				this.params.firstClubType = Number(e.target.value);
-			},
-			radioChange(item) {//选择
-				this.params.secondClubType = item.value;
-				if( this.params.secondClubType == 2 || this.params.secondClubType == 3){
-					this.isDepartment = true
-				}else{
-					this.isDepartment = false
+						this.params.medicalPracticeLicense = JSON.parse(res.data).data
+						break
 				}
-				for (let i = 0; i < this.beautyList.length; i++) {
-					if (this.beautyList[i].value === this.params.secondClubType) {
-						break;
-					}
+			})
+		},
+		DeletePicture(NUM) {
+			//删除照片
+			switch (NUM) {
+				case 1:
+					this.$util.modal('', '确定删除营业执照图片吗？', '确定', '取消', true, () => {
+						this.params.businessLicense = ''
+					})
+					break
+				case 2:
+					this.$util.modal('', '确定删除门头照图片吗？', '确定', '取消', true, () => {
+						this.params.shopPhoto = ''
+					})
+					break
+				case 3:
+					this.$util.modal('', '确定删除资质图片吗？', '确定', '取消', true, () => {
+						this.params.medicalPracticeLicense = ''
+					})
+					break
+			}
+		},
+		ShowPreviewImage(NUM) {
+			//预览照片
+			switch (NUM) {
+				case 1:
+					this.myPreviewImageFn(this.businessLicense)
+					break
+				case 2:
+					this.myPreviewImageFn(this.shopPhoto)
+					break
+				case 3:
+					this.myPreviewImageFn(this.medicalPracticeLicense)
+					break
+			}
+		},
+		myPreviewImageFn(url) {
+			//预览证件照
+			this.isPreviewImage = true
+			let mentuzArray = []
+			mentuzArray.push(url)
+			uni.previewImage({
+				urls: mentuzArray,
+				current: 0
+			})
+		},
+		setNewMainpro(arr) {
+			//回显处理主营内容
+			let _ARRAY = []
+			arr.split('/').forEach((item, index) => {
+				let _OBJ = { value: (index + 1).toString(), name: item, checked: true }
+				_ARRAY.push(_OBJ)
+			})
+			return _ARRAY
+		},
+		bindPickerChange(e) {
+			//选择机构类型
+			this.params.firstClubType = Number(e.target.value)
+		},
+		radioChange(item) {
+			//选择
+			this.params.secondClubType = item.value
+			if (this.params.secondClubType == 2 || this.params.secondClubType == 3) {
+				this.isDepartment = true
+			} else {
+				this.isDepartment = false
+			}
+			for (let i = 0; i < this.beautyList.length; i++) {
+				if (this.beautyList[i].value === this.params.secondClubType) {
+					break
 				}
-			},
-			ChooseMaleLike(e){
-				switch(this.params.firstClubType){
-					case 1:
-						this.params.mainProduct = this.CheckLikes(e,this.mentuzCampList)
-						break;
-					case 2:
-						this.params.mainProduct = this.CheckLikes(e,this.medicaCampList)
-						break;
+			}
+		},
+		ChooseMaleLike(e) {
+			switch (this.params.firstClubType) {
+				case 1:
+					this.params.mainProduct = this.CheckLikes(e, this.mentuzCampList)
+					break
+				case 2:
+					this.params.mainProduct = this.CheckLikes(e, this.medicaCampList)
+					break
+			}
+		},
+		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)
 				}
-			},
-			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('/')
+		},
+		addCustomItem() {
+			if (this.customItemValue == '') {
+				this.$util.msg('请输入自定义主营内容', 2000)
+			} else {
+				if (this.params.firstClubType == 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)
 					}
-				})
-				return arr.join('/')
-			},
-			addCustomItem(){
-				if(this.customItemValue==''){
-					this.$util.msg('请输入自定义主营内容',2000);
-				}else{
-					if(this.params.firstClubType == 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)
-						}
+				} 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){//判断主营内容是否已存在
-				console.log(content,arr)
-				for(var i in arr){
-					if(arr[i].name == content){
-						return true;
-					}
-				}
-				return false;
-		   },
-		},
-		onShareAppMessage(res){//分享转发
-			this.isShareModal = false
-			if (res.from === 'button') { // 来自页面内转发按钮
-		    }
-			return {
-			  title: '请确认资料完成注册~',
-			  path: `/pages/login/binding?bindId=${this.bindId}&Identity=2`,
-			  imageUrl:'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
 			}
 		},
-		onShow() {
-			
+		CheckedArray(content, arr) {
+			//判断主营内容是否已存在
+			console.log(content, arr)
+			for (var i in arr) {
+				if (arr[i].name == content) {
+					return true
+				}
+			}
+			return false
 		}
-	}
+	},
+	onShareAppMessage(res) {
+		//分享转发
+		this.isShareModal = false
+		if (res.from === 'button') {
+			// 来自页面内转发按钮
+		}
+		return {
+			title: '请确认资料完成注册~',
+			path: `/pages/login/binding?bindId=${this.bindId}&Identity=2`,
+			imageUrl: 'https://static.caimei365.com/app/img/icon/icon-addShare@3x.png'
+		}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	page{
-		height: auto;
-	}
-	.register{
+page {
+	height: auto;
+}
+.register {
+	width: 100%;
+	position: relative;
+	box-sizing: border-box;
+	padding-bottom: 332rpx;
+	.register-main {
 		width: 100%;
-		position: relative;
+		height: auto;
 		box-sizing: border-box;
-		padding-bottom: 332rpx;
-		.register-main{
+		padding: 0 24rpx;
+		margin-top: 24rpx;
+		.main-form-item {
 			width: 100%;
-			height: auto;
+			height: 88rpx;
 			box-sizing: border-box;
-			padding: 0 24rpx;
-			margin-top: 24rpx;
-			.main-form-item{
-				width: 100%;
-				height: 88rpx;
-				box-sizing: border-box;
-				padding: 13rpx 0;
-				border-bottom: 1px solid #e1e1e1;
-				margin-top: 10rpx;
-				position: relative;
-				&.none{
-					border-bottom: none;
-					height: auto;
-				}
-				&.file{
-					height: 273rpx;
-					border-bottom: none;
-					.main-form-upload{
-						width: 50%;
-						height: 100%;
+			padding: 13rpx 0;
+			border-bottom: 1px solid #e1e1e1;
+			margin-top: 10rpx;
+			position: relative;
+			&.none {
+				border-bottom: none;
+				height: auto;
+			}
+			&.file {
+				height: 273rpx;
+				border-bottom: none;
+				.main-form-upload {
+					width: 50%;
+					height: 100%;
+					float: left;
+					.label {
+						width: 100%;
 						float: left;
-						.label{
-							width: 100%;
-							float: left;
-							height: 56rpx;
-							line-height: 56rpx;
-							font-size: $font-size-28;
-							text-align: left;
-							color: #999999;
+						height: 56rpx;
+						line-height: 56rpx;
+						font-size: $font-size-28;
+						text-align: left;
+						color: #999999;
+					}
+					.upload-picture {
+						width: 100%;
+						height: 180rpx;
+						float: left;
+						margin-top: 17rpx;
+						.upload-none {
+							width: 200rpx;
+							height: 180rpx;
+							border-radius: 6rpx;
+							border: 1px solid #e1e1e1;
+							box-sizing: border-box;
+							padding-top: 64rpx;
+							.icon-jiahao {
+								display: inline-block;
+								width: 100%;
+								text-align: center;
+								line-height: 48rpx;
+								font-size: 40rpx;
+								color: #b2b2b2;
+							}
+							.upload-text {
+								display: inline-block;
+								width: 100%;
+								text-align: center;
+								line-height: 40rpx;
+								font-size: $font-size-24;
+								color: #b2b2b2;
+							}
 						}
-						.upload-picture{
-							width: 100%;
+						.upload-image {
+							width: 200rpx;
 							height: 180rpx;
-							float: left;
-							margin-top: 17rpx;
-							.upload-none{
+							border-radius: 6rpx;
+							border: 1px solid #e1e1e1;
+							box-sizing: border-box;
+							position: relative;
+							image {
 								width: 200rpx;
 								height: 180rpx;
-								border-radius: 6rpx;
-								border:1px solid #e1e1e1;
-								box-sizing: border-box;
-								padding-top: 64rpx;
-								.icon-jiahao{
-									display: inline-block;
-									width: 100%;
-									text-align: center;
-									line-height: 48rpx;
-									font-size: 40rpx;
-									color: #b2b2b2;
-								}
-								.upload-text{
-									display: inline-block;
-									width: 100%;
-									text-align: center;
-									line-height: 40rpx;
-									font-size: $font-size-24;
-									color: #b2b2b2;
-								}
+								display: block;
 							}
-							.upload-image{
-								width: 200rpx;
-								height: 180rpx;
-								border-radius: 6rpx;
-								border:1px solid #e1e1e1;
-								box-sizing: border-box;
-								position: relative;
-								image{
-									width: 200rpx;
-									height: 180rpx;
-									display: block;
-								}
-								.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;
-									}
+							.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;
 								}
 							}
 						}
 					}
 				}
-				&.picker{
-					border-bottom: none;
-					.label-radio{
-						margin-left: 30rpx;
-						font-size: $font-size-28;
-						float: left;
-					}
-					.row-radio{
-						float: left;
-						transform: scale(0.7);
-					}
-					.row-text{
-						text-align: center;
-						float: left;
-						font-size: $font-size-28;
-					}
-					.picker-radio{
-						box-sizing: border-box;
-						padding-left: 180rpx;
-						.secondTyperadio{
-							border: 2rpx solid #e1e1e1;
-							display: inline-block;
-							font-size: 26rpx;
-							color: #999999;
-							padding: 0 24rpx;
-							border-radius: 22rpx;
-							line-height: 42rpx;
-							margin-right: 56rpx;
-							float: left;
-							&.active{
-								border: 2rpx solid #ffe6dc;
-								color: $color-system;
-							}
-						}	
-					}
+			}
+			&.picker {
+				border-bottom: none;
+				.label-radio {
+					margin-left: 30rpx;
+					font-size: $font-size-28;
+					float: left;
 				}
-				&.textarea{
-					height: 142rpx;
-					.textarea{
-						width: 100%;
-						height: 142rpx;
-						box-sizing: border-box;
-						font-size: $font-size-28;
-						color: $text-color;
-						z-index: 1;
-					}
-					.textarea.hide{
-						opacity: 0;
-					}
-					.textarea.show{
+				.row-radio {
+					float: left;
+					transform: scale(0.7);
+				}
+				.row-text {
+					text-align: center;
+					float: left;
+					font-size: $font-size-28;
+				}
+				.picker-radio {
+					box-sizing: border-box;
+					padding-left: 170rpx;
+					.secondTyperadio {
+						border: 2rpx solid #e1e1e1;
+						display: inline-block;
+						font-size: 26rpx;
 						color: #999999;
+						padding: 0 24rpx;
+						border-radius: 22rpx;
+						line-height: 42rpx;
+						margin-right: 28rpx;
+						float: left;
+						&.active {
+							border: 2rpx solid #ffe6dc;
+							color: $color-system;
+						}
 					}
 				}
-				.textarea-ke{
+			}
+			&.textarea {
+				height: 142rpx;
+				.textarea {
 					width: 100%;
-					height: 160rpx;
-					border-radius: 6rpx;
-					border: 1px solid #e1e1e1;
-					font-size: $font-size-28;
+					height: 142rpx;
 					box-sizing: border-box;
-					padding: 15rpx 20rpx;
-				}
-				.form-textarea{
 					font-size: $font-size-28;
-					color: #333333;
+					color: $text-color;
+					z-index: 1;
 				}
-				.form-label{
-					width: 148rpx;
-					float: left;
-					height: 100%;
-					line-height: 56rpx;
-					font-size: $font-size-28;
-					text-align: left;
+				.textarea.hide {
+					opacity: 0;
+				}
+				.textarea.show {
 					color: #999999;
-					&.lang{
-						width: 188rpx;
-					}
-					&.none{
-						width: 100%;
-					}
 				}
-				.form-input{
-					width: 554rpx;
-					height: 56rpx;
-					line-height: 56rpx;
-					font-size: $font-size-28;
+			}
+			.textarea-ke {
+				width: 100%;
+				height: 160rpx;
+				border-radius: 6rpx;
+				border: 1px solid #e1e1e1;
+				font-size: $font-size-28;
+				box-sizing: border-box;
+				padding: 15rpx 20rpx;
+			}
+			.form-textarea {
+				font-size: $font-size-28;
+				color: #333333;
+			}
+			.form-label {
+				width: 148rpx;
+				float: left;
+				height: 100%;
+				line-height: 56rpx;
+				font-size: $font-size-28;
+				text-align: left;
+				color: #999999;
+				&.lang {
+					width: 188rpx;
+				}
+				&.none {
+					width: 100%;
+				}
+			}
+			.form-input {
+				width: 554rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				font-size: $font-size-28;
+				text-align: left;
+				color: #333333;
+				float: left;
+				&.lang {
+					width: 514rpx;
+				}
+				&.phone {
+					width: 418rpx;
+				}
+				&.none {
+					color: #999999;
+				}
+			}
+			.form-text {
+				width: 554rpx;
+				height: 56rpx;
+				line-height: 56rpx;
+				font-size: $font-size-28;
+				text-align: left;
+				color: #333333;
+				float: left;
+			}
+			.form-btn {
+				width: 136rpx;
+				height: 56rpx;
+				background: $btn-confirm;
+				color: #ffffff;
+				font-size: $font-size-28;
+				text-align: center;
+				border-radius: 28rpx;
+				line-height: 56rpx;
+				float: left;
+			}
+			.icon-xiayibu {
+				width: 80rpx;
+				height: 80rpx;
+				position: absolute;
+				right: 0;
+				top: 0;
+				line-height: 80rpx;
+				text-align: center;
+				color: #b2b2b2;
+			}
+			.form-checkbox-group {
+				width: 100%;
+				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: 220rpx;
+					height: 40rpx;
+					padding: 24rpx;
 					text-align: left;
-					color: #333333;
-					float: left;
-					&.lang{
-						width: 514rpx;
-					}
-					&.phone{
-						width: 418rpx;
-					}
-					&.none{
-						color: #999999;
+					border-radius: 10rpx;
+					font-size: $font-size-28;
+					color: $text-color;
+				}
+				.confirm-btn {
+					width: 160rpx;
+					height: 64rpx;
+					border-radius: 45rpx;
+					line-height: 64rpx;
+					text-align: center;
+					background: #ffe6dc;
+					color: $color-system;
+					&.other {
+						width: 213rpx;
 					}
 				}
-				.form-text{
-					width: 554rpx;
-					height: 56rpx;
-					line-height: 56rpx;
+				.item {
+					height: 60rpx;
 					font-size: $font-size-28;
-					text-align: left;
-					color: #333333;
+					line-height: 60rpx;
+					border-radius: 10rpx;
+					margin-right: 20rpx;
+					margin-bottom: 10rpx;
+					box-sizing: border-box;
 					float: left;
 				}
-				.form-btn{
-					width: 136rpx;
-					height: 56rpx;
-					background: $btn-confirm;
-					color: #FFFFFF;
-					font-size: $font-size-28;
-					text-align: center;
+				.item-text {
+					display: inline-block;
+					font-size: 26rpx;
+					color: #999999;
 					border-radius: 28rpx;
-					line-height: 56rpx;
-					float: left;
-				}
-				.icon-xiayibu{
-					width: 80rpx;
-					height: 80rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					line-height: 80rpx;
-					text-align: center;
-					color: #b2b2b2;
+					line-height: 50rpx;
 				}
-				.form-checkbox-group {
-					width: 100%;
-					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: 220rpx;
-						height: 40rpx;
-						padding: 24rpx;
-						text-align: left;
-						border-radius: 10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-					}
-					.confirm-btn{
-						width: 160rpx;
-						height: 64rpx;
-						border-radius: 45rpx;
-						line-height: 64rpx;
-						text-align: center;
-						background:#ffe6dc;
+				.on {
+					.item-text {
+						border-color: $color-system;
 						color: $color-system;
-						&.other{
-							width: 213rpx;
-						}
-					}
-					.item {
-					  height: 60rpx;
-					  font-size:$font-size-28;
-					  line-height: 60rpx;
-					  border-radius:10rpx;
-					  margin-right: 20rpx;
-					  margin-bottom: 10rpx;
-					  box-sizing: border-box;
-					  float: left;
-					}
-					.item-text{
-						display: inline-block;
-						font-size: 26rpx;
-						color: #999999;
-						border-radius: 28rpx;
-						line-height: 50rpx;
-					}
-					.on {
-						.item-text{
-							border-color: $color-system;
-							color:$color-system;
-						}
-					}
-					.form-table-item{
-						height: 48rpx;
-						padding: 0 32rpx;
-						border: 1px solid #b2b2b2;
-						text-align: center;
-						font-size: $font-size-28;
-						color: #333333;
-						float: left;
-						line-height: 48rpx;
-						border-radius: 26rpx;
-						margin-right: 12rpx;
-						margin-top: 20rpx;
 					}
 				}
-				.form-checkbox-input{
-					width: 100%;
-					height: 64rpx;
+				.form-table-item {
+					height: 48rpx;
+					padding: 0 32rpx;
+					border: 1px solid #b2b2b2;
+					text-align: center;
+					font-size: $font-size-28;
+					color: #333333;
+					float: left;
+					line-height: 48rpx;
+					border-radius: 26rpx;
+					margin-right: 12rpx;
 					margin-top: 20rpx;
-					.checkbox-input{
-						width: 518rpx;
-						height: 64rpx;
-						box-sizing: border-box;
-						text-align: left;
-						font-size: $font-size-26;
-						color: #333333;
-						line-height: 64rpx;
-						float: left;
-						border: 1px solid #e1e1e1;
-						border-radius: 32rpx;
-						padding: 0 20rpx;
-					}
-					.checkbox-btn{
-						width: 160rpx;
-						height: 64rpx;
-						border-radius: 32rpx;
-						background-color: #ffe6dc;
-						line-height: 64rpx;
-						text-align: center;
-						color: #e15616;
-						font-size: $font-size-28;
-						float: right;
-					}
 				}
 			}
-			.register-fiexd{
+			.form-checkbox-input {
 				width: 100%;
-				height: auto;
-				padding: 20rpx 0;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 888;
-				background: #FFFFFF;
-				.register-agree{
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					margin:0 0 32rpx 0;
-					.agree-text{
-						.checkbox{
-							float: left;
-							margin: 4rpx 6rpx 0 0;
-							color: #999999;
-							font-size: $font-size-32;
-							&.icon-gouxuan{
-								color: $color-system;
-							}
-						}
-						font-size: 20rpx;
-						line-height: 44rpx;
+				height: 64rpx;
+				margin-top: 20rpx;
+				.checkbox-input {
+					width: 518rpx;
+					height: 64rpx;
+					box-sizing: border-box;
+					text-align: left;
+					font-size: $font-size-26;
+					color: #333333;
+					line-height: 64rpx;
+					float: left;
+					border: 1px solid #e1e1e1;
+					border-radius: 32rpx;
+					padding: 0 20rpx;
+				}
+				.checkbox-btn {
+					width: 160rpx;
+					height: 64rpx;
+					border-radius: 32rpx;
+					background-color: #ffe6dc;
+					line-height: 64rpx;
+					text-align: center;
+					color: #e15616;
+					font-size: $font-size-28;
+					float: right;
+				}
+			}
+		}
+		.register-fiexd {
+			width: 100%;
+			height: auto;
+			padding: 20rpx 0;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 888;
+			background: #ffffff;
+			.register-agree {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin: 0 0 32rpx 0;
+				.agree-text {
+					.checkbox {
+						float: left;
+						margin: 4rpx 6rpx 0 0;
 						color: #999999;
-						text{
-							color:#0091FF;
+						font-size: $font-size-32;
+						&.icon-gouxuan {
+							color: $color-system;
 						}
 					}
+					font-size: 20rpx;
+					line-height: 44rpx;
+					color: #999999;
+					text {
+						color: #0091ff;
+					}
 				}
 			}
-			.register-btn{
-				width: 702rpx;
-				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;
-				&.none{
-					background: #FFFFFF;
-					color: $text-color;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
+		}
+		.register-btn {
+			width: 702rpx;
+			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;
+			&.none {
+				background: #ffffff;
+				color: $text-color;
+				margin-top: 0;
+			}
+			&.sub {
+				margin-top: 0;
 			}
 		}
 	}
+}
 </style>

pages/seller/login/register-select.vue

@@ -1,4 +1,3 @@
-
 <template>
 	<view class="container register">
 		<view class="main">
@@ -7,99 +6,94 @@
 					<view class="icon">
 						<image src="https://static.caimei365.com/app/img/icon/icon-general.png" mode=""></image>
 					</view>
-					<view class="text">普通机构</view>
+					<view class="text">个人机构</view>
 				</view>
 				<view class="item" @click.stop="this.$api.navigateTo('/pages/seller/login/register-member')">
 					<view class="icon">
 						<image src="https://static.caimei365.com/app/img/icon/icon-member.png" mode=""></image>
 					</view>
-					<view class="text">会员机构</view>
+					<view class="text">资质机构</view> <view class="text none">（原会员机构）</view>
 				</view>
 			</view>
-			<view class="main-item-text">
-				提示：请尽量搜集客户完整信息，优先注册会员机构
-			</view>	
+			<view class="main-item-text"> 提示：请尽量搜集客户完整信息，优先注册资质机构 </view>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default{
-		data() {
-			return{
-				
-			}
-		},
-		onLoad(option) {
-
-		},
-		computed: {
-			
-		},
-		methods:{
-			
-		}
-	}
+export default {
+	data() {
+		return {}
+	},
+	onLoad(option) {},
+	computed: {},
+	methods: {}
+}
 </script>
 
 <style lang="scss">
-	.register{
+.register {
+	width: 100%;
+	height: 100%;
+	position: relative;
+	box-sizing: border-box;
+	padding-top: 100rpx;
+	.main {
 		width: 100%;
-		height: 100%;
-		position: relative;
-		box-sizing: border-box;
-		padding-top: 100rpx;
-		.main{
+		height: 370rpx;
+		.main-item-text {
 			width: 100%;
-			height: 370rpx;
-			.main-item-text{
-				width: 100%;
-				height: 100rpx;
-				float: left;
-				box-sizing: border-box;
-				margin-top: 150rpx;
-				text-align: center;
-				font-size: 24rpx;
-				line-height: 100rpx;
-				color: #fea785;
-			}
-			.main-item{
+			height: 100rpx;
+			float: left;
+			box-sizing: border-box;
+			margin-top: 150rpx;
+			text-align: center;
+			font-size: 24rpx;
+			line-height: 100rpx;
+			color: #fea785;
+		}
+		.main-item {
+			width: 100%;
+			height: auto;
+			float: left;
+			box-sizing: border-box;
+			margin-top: 20rpx;
+			.item {
 				width: 100%;
 				height: auto;
 				float: left;
-				box-sizing: border-box;
-				margin-top: 20rpx;
-				.item{
-					width: 100%;
-					height: auto;
-					float: left;
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					margin-top: 80rpx;
-					.icon{
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				margin-top: 80rpx;
+				.icon {
+					width: 190rpx;
+					height: 190rpx;
+					image {
 						width: 190rpx;
 						height: 190rpx;
-						image{
-							width: 190rpx;
-							height: 190rpx;
-							display: block;
-						}
+						display: block;
 					}
-					.text{
-						line-height: 54rpx;
-						font-size: $font-size-30;
-						text-align: center;
-						color: #333333;
-					}
-					.text-small{
-						line-height: 54rpx;
-						font-size: $font-size-24;
-						text-align: center;
+				}
+				.text {
+					line-height: 54rpx;
+					font-size: $font-size-30;
+					text-align: center;
+					color: #333333;
+					&.none {
 						color: #999999;
+						font-size: $font-size-26;
+						line-height: 28rpx;
 					}
 				}
+				.text-small {
+					line-height: 54rpx;
+					font-size: $font-size-24;
+					text-align: center;
+					color: #999999;
+				}
 			}
 		}
 	}
+}
 </style>

pages/seller/login/register.vue

@@ -23,7 +23,7 @@
 		</view>
 		<view class="register-main clearfix">
 			<view class="register-row clearfix">
-				<view class="register-txt first"><text>您还可以填写更多信息，帮机构直接注册成为会员机构。</text></view>
+				<view class="register-txt first"><text>您还可以填写更多信息，帮机构直接注册成为资质机构。</text></view>
 				<view class="register-txt"><text>不过这些信息需要审核。</text></view>
 				<view class="register-bet" @tap.stop="showUpgrade()" v-if="isDownUpgrade">
 					<text>展开信息填写<text class="iconfont icon-xiangxiajiantou"></text></text>

pages/seller/remarks/add.vue

@@ -0,0 +1,491 @@
+<template>
+	<view class="container qualifications" :style="{paddingBottom :isIphoneX ? (218+68)+'rpx' : '218rpx'}">
+		<view class="qualifications-title">
+			若发货商品内存在仪器类商品，建议填写下列商品信息。
+		</view>
+		<view class="qualifications-content">
+			<view class="list" v-for="(item,index) in qualificationsList" :key="index">
+				<view class="list-view-title">
+					<view class="title-left">商品{{ index+1 }}</view>
+					<view class="title-right" v-if="(index+1) > 1" @click="deleteLogistItemFn(item,index)">
+						删除商品
+					</view>
+				</view>
+				<view class="list-view">
+					<view class="list-view-label">商品</view>
+					<view class="list-view-text">
+						<picker @change="bindPickerChange(item,$event)" :value="index" :range="productActions" range-key="name">
+							<input class="input" type="text" v-model="item.productName" placeholder="请选择商品" disabled="true">
+							<text class="iconfont icon-xiayibu"></text>
+						</picker>
+					</view>
+				</view>
+				<view class="list-view">
+					<view class="list-view-label">SN码</view>
+					<view class="list-view-text">
+						<input class="input" type="text" v-model="item.sn" placeholder="请输入商品SN码" @blur="hanldSnCodeChecked">
+					</view>
+				</view>
+				<view class="list-view" v-for="(file,fileIndex) in item.fileList" :key="fileIndex">
+					<view class="list-view-label">资质文件</view>
+					<view class="list-view-text">
+						<view class="input">{{ file.fileName }}</view>
+						<text class="iconfont icon-iconfontguanbi" @click.stop="deleteFileFn(item.fileList,index)"></text>
+					</view>
+				</view>	
+				<view class="list-view" >
+					<view class="list-view-label">资质文件</view>
+					<view class="list-view-text">
+						<view class="list-view-file" @click="uploadFile(item.fileList)">上传</view>
+					</view>
+				</view>	
+				<view class="list-view-title none">图片<text class="none">(若不方便上传文件，可用图片代替)</text></view>
+				<view class="list-view-upload clearfix">
+					<view class="photo-item" v-for="(image, imageIndex) in item.imageList" :key="index">
+						<image :src="image" mode="aspectFill" @click.stop="previewImg(item.imageList,imageIndex)"></image>
+						<text class="iconfont icon-iconfontguanbi" @click.stop="deletePhotoFn(item.imageList,imageIndex)"></text>
+					</view>
+					<view class="photo-item add" @click.stop="uploadPhotoFn(item.imageList)" v-if="item.imageList.length<10 || item.imageList.length == 0">
+						<text class="iconfont icon-jiahao"></text>
+					</view>
+				</view>
+			</view>
+			<view class="list-btn" v-if="qualificationsList.length < productActions.length">
+				<view class="btn add-btn" @click="addListFn">
+					<text class="iconfont icon-jiahao"></text>
+					<text>添加商品</text>
+				</view>
+			</view>
+		</view>
+		<view class="qualifications-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0'}">
+			<view class="edit-button-canel" @click="editButtonCanel">暂不填写</view>
+			<view class="edit-button" @click="editButtonConfim">确定</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations } from 'vuex'
+	import authorize from '@/common/config/authorize.js' 
+	import { uploadFileImage , uploadFilePdfDocDocx } from "@/services/public.js"
+	
+	var isPreviewImg;
+	export default{
+		data() {
+			return{
+				isIphoneX:this.$store.state.isIphoneX,
+				shopOrderId:0,
+				logisticsBatchId:0,
+				productActions:[],
+				qualificationsList:[
+					{
+						productName:'',
+						recordId:'',
+						sn:'',
+						fileList:[],
+						imageList:[]
+					}
+				]
+			}
+		},
+		onLoad(option) {
+			console.log(option)
+			if(option.type == 'add'){
+				this.logisticsBatchId = option.logisticsBatchId
+				this.shopOrderId = option.shopOrderId
+				this.GetSupplierLogisticsRecord()
+			}else{
+				this.logisticsBatchId = option.logisticsBatchId
+				this.shopOrderId = option.shopOrderId
+				this.GetSupplierLogisticsRecord()
+				this.GetSupplierQualificationData()
+			}
+		},
+		methods:{
+			...mapMutations(['login']),
+			GetSupplierQualificationData(){//编辑回显商品资质信息
+				this.ShopService.GetSupplierQualificationData(
+					{ 
+						logisticsBatchId : this.logisticsBatchId ,
+					}
+				)
+				.then(response =>{
+					const data = response.data
+					if(data && data.length > 0){
+						this.qualificationsList = data
+						this.isEmpty = false
+					}else{
+						this.isEmpty = true
+					}
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			GetSupplierLogisticsRecord(){//添加商品资质初始化查询商品信息
+				this.ShopService.GetSupplierLogisticsRecord(
+					{ 
+						logisticsBatchId : this.logisticsBatchId
+					}
+				)
+				.then(response =>{
+					const data = response.data
+					data.forEach((el,index) => {
+						let obj = {
+								value : el.id,
+								name : el.productName
+						}
+						this.productActions.push(obj)
+					})
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			editButtonConfim(){//确定
+				// 校验物流公司不能为空
+				let isRecordId = false
+				let isSnCode = false
+				let isFileList = false
+				let isImageList = false
+				let params = [];//参数
+				this.qualificationsList.forEach((el,index) => {
+					if(el.recordId == ''){ isRecordId = true }
+					if(el.sn == ''){ isSnCode = true }
+					if(el.fileList == ''){ isFileList = true }
+					if(el.imageList == ''){ isImageList = true }
+					let paramsObject = {
+							recordId : el.recordId,
+							sn : el.sn,
+							files : el.fileList,
+							images : el.imageList
+						}
+					params.push(paramsObject)	
+				})
+				if(isRecordId){
+					this.$util.msg('请选择商品',2000);
+					return
+				}
+				if(isSnCode){
+					this.$util.msg('请输入商品SN码',2000);
+					return
+				}
+				if(isFileList && isImageList){
+					this.$util.msg('请上传商品资质文件',2000);
+					return
+				}
+				console.log('params========>',params)
+				this.ShopService.GetSupplierQualificationUpdata(
+					{
+						params:JSON.stringify(params)
+					}
+				)
+				.then(response =>{
+					this.$util.msg('保存成功',3000,true,'success')
+					setTimeout(()=>{
+						this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
+					},2000)
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			bindPickerChange: function(item,e) {//选择筛选条件
+				item.recordId =  this.productActions[e.target.value].value
+				item.productName = this.productActions[e.target.value].name
+			},
+			addListFn(){//添加
+				let obj ={
+						productName:'',
+						recordId:'',
+						sn:'',
+						fileList:[],
+						imageList:[]
+					};
+				this.qualificationsList.push(obj)
+			},
+			deleteLogistItemFn(item,index){
+				this.$util.modal('提示','确认删除物流信息吗？','确定','取消',true,() =>{
+					this.qualificationsList.splice(index, 1);
+				})
+			},
+			uploadFile(array){//上传资质文件
+				console.log(array)
+				uploadFilePdfDocDocx().then(res =>{
+					let data =  JSON.parse(res.data).data
+					let obj = {
+							fileName:uni.getStorageSync('fileName'),
+							ossName:data.ossName
+						}
+					array.push(obj)
+					console.log('array',array)
+				})
+			},
+			uploadPhotoFn(array){//添加图片
+				uploadFileImage().then(res =>{
+					array.push(JSON.parse(res.data).data)
+				})
+			},
+			deleteFileFn(array,index){//删除文件
+				this.UploadService.PostFileDelete(
+					{
+						ossName:array[index].ossName,
+					}
+				)
+				.then(res=>{
+					array.splice(index, 1);
+				})
+				.catch(error =>{
+					console.log('删除文件异常提示===>',error.msg)
+				})
+				
+			},
+			deletePhotoFn(array,index){//删除图片
+				array.splice(index, 1);
+			},
+			previewImg (image,index) {//顶部商品图片预览
+				isPreviewImg = true
+				let previewUrls = image
+				uni.previewImage({
+					current: index, 	//图片索引
+					urls: previewUrls, //必须是http图片，本地图片无效
+					longPressActions:''
+				})
+			},
+			hanldSnCodeChecked(e){
+				if(!this.$reg.isNoChinese(e.detail.value)){
+					this.$util.msg('SN码格式错误',2000);
+					return
+				}
+			},
+			editButtonCanel(){
+				this.$api.navigateTo(`/pages/supplier/deliver/deliver-record?shopOrderId=${this.shopOrderId}`)
+			},
+		},
+		onShow() {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: auto;
+		background:#F7F7F7;
+	}
+	.qualifications-title{
+		width: 100%;
+		height: 72rpx;
+		line-height: 72rpx;
+		font-size: $font-size-24;
+		background-image: linear-gradient(270deg, #ffffff 0%, rgba(225,86,22,0.1) 51%, #ffffff 100%);
+		color: $color-system;
+		text-align: center;
+	}
+	.qualifications-content{
+		width: 100%;
+		height: auto;
+		.list{
+			width: 100%;
+			height: auto;
+			background-color: #FFFFFF;
+			box-sizing: border-box;
+			margin-bottom: 20rpx;
+			padding: 0 24rpx;
+			.list-view-title{
+				width: 100%;
+				height: 92rpx;
+				border-bottom: 1px solid #E1E1E1;
+				line-height: 92rpx;
+				font-size: $font-size-30;
+				color: #333333;
+				text-align: left;
+				.title-left{
+					float: left;
+				}
+				.title-right{
+					float: right;
+					color: $color-system;
+					font-size: $font-size-24;
+				}
+				&.none{
+					border-bottom: none;
+				}
+				.none{
+					color: #666666;
+				}
+			}
+			.list-view{
+				width: 100%;
+				height: 92rpx;
+				border-bottom: 1px solid #E1E1E1;
+				line-height: 92rpx;
+				font-size: $font-size-30;
+				.list-view-label{
+					width: 192rpx;
+					color: #666666;
+					float: left;
+				}
+				.list-view-text{
+					width: 510rpx;
+					float: right;
+					position: relative;
+					.input{
+						width: 510rpx;
+						height: 92rpx;
+						box-sizing: border-box;
+						line-height: 92rpx;
+						color: #333333;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						line-clamp: 1;
+						-webkit-box-orient: vertical;
+						padding-right: 40rpx;
+					}
+					.icon-xiayibu{
+						width: 40rpx;
+						height: 80rpx;
+						display: block;
+						position: absolute;
+						right: 0;
+						top: 0;
+						font-size: $font-size-32;
+						color: #B2B2B2;
+						text-align: center;
+					}
+					.icon-iconfontguanbi{
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						background-color: #f94b4b;
+						display: block;
+						position: absolute;
+						right: 0;
+						top: 28rpx;
+						font-size: $font-size-24;
+						color: #FFFFFF;
+						line-height: 40rpx;
+						text-align: center;
+					}
+					.list-view-file{
+						width: 88rpx;
+						height: 44rpx;
+						line-height: 44rpx;
+						font-size: $font-size-20;
+						text-align: center;
+						color: #FFFFFF;
+						background-color: $color-system;
+						border-radius: 4rpx;
+						position: absolute;
+						right: 0;
+						top: 25rpx;
+					}
+				}
+			}
+			.list-view-upload{
+				width: 100%;
+				height: auto;	
+				padding: 10rpx 0;
+				.photo-item{
+					display: inline-block;
+					width: 112rpx;
+					height: 112rpx;
+					margin: 10rpx 0;
+					margin-right: 25rpx;
+					border-radius: 10rpx;
+					border:1px solid #F5F5F5;
+					position: relative;
+					float: left;
+					&.add{
+						width: 112rpx;
+						height: 112rpx;
+						border-color: #b2b2b2;
+						text-align: center;
+						line-height: 112rpx;
+						margin-right: 0rpx;
+						.icon-jiahao{
+							font-size: $font-size-44;
+							color:#b2b2b2 ;
+							font-weight: bold;
+						}
+					}
+					.icon-iconfontguanbi{
+						width: 30rpx;
+						height: 30rpx;
+						border-radius:50%;
+						display: block;
+						position: absolute;
+						right: -10rpx;
+						top: -10rpx;
+						background: #f94b4b;
+						text-align: center;
+						line-height: 30rpx;
+						color: #FFFFFF;
+						font-size: $font-size-22;
+					}
+					image{
+						width: 112rpx;
+						height: 112rpx;
+						border-radius: 10rpx;
+					}
+				}	
+				.photo-list{
+					width: 100%;
+					height: 116rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					display: flex;
+					align-items: flex-start;
+				}
+				.scoll-wrapper{
+					display:flex;
+					align-items: flex-start;
+				}
+			}
+		}
+		.list-btn{
+			width: 702rpx;
+			height: 56rpx;
+			margin: 0 auto;
+			.btn{
+				width: 236rpx;
+				height: 56rpx;
+				border-radius: 28rpx;
+				border: 1px solid $color-system;
+				line-height: 56rpx;
+				text-align: center;
+				color: $color-system;
+				margin: 0 auto;
+			}
+		}
+	}
+	.qualifications-btn{
+		width: 100%;
+		padding-top: 20rpx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		background-color: #FFFFFF;
+		.edit-button-canel{
+			width: 100%;
+			height: 88rpx;
+			line-height: 88rpx;
+			text-align: center;
+			color: #e15616;
+			font-size: $font-size-24;
+		}
+		.edit-button{
+			width: 600rpx;
+			height: 90rpx;
+			background: $btn-confirm;
+			line-height: 90rpx;
+			text-align: center;
+			color: #FFFFFF;
+			font-size: $font-size-30;
+			margin: 0 auto;
+			border-radius: 45rpx;
+		}
+	}
+</style>

pages/seller/remarks/details.vue

@@ -0,0 +1,241 @@
+<template>
+	<view class="container qualifications" :style="{paddingBottom :isIphoneX ? (150+68)+'rpx' : '150rpx'}">
+		<view class="qualifications-content" v-if="!isEmpty">
+			<view class="list" v-for="(item,index) in qualificationsList" :key="index">
+				<view class="list-view-title">商品{{ index+1 }}</view>
+				<view class="list-view">
+					<view class="list-view-label">商品</view>
+					<view class="list-view-text">{{ item.productName }}</view>
+				</view>
+				<view class="list-view">
+					<view class="list-view-label">SN码</view>
+					<view class="list-view-text">{{ item.sn }}</view>
+				</view>
+				<view class="list-view" v-for="(file,fileIndex) in item.fileList" :key="fileIndex">
+					<view class="list-view-label">资质文件</view>
+					<view class="list-view-text">{{ file.fileName }}</view>
+				</view>	
+				<view class="list-view-title none">图片</view>
+				<view class="list-view-upload clearfix">
+					<view class="photo-item" v-for="(image, imageIndex) in item.imageList" :key="index">
+						<image :src="image" mode="aspectFill" @click.stop="previewImg(item.imageList,imageIndex)"></image>
+					</view>
+				</view>
+			</view>
+			<view class="qualifications-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0'}">
+				<view class="edit-button" @click="editSubmitFn('edit')">编辑</view>
+			</view>
+		</view>
+		<view v-else class="cart-content empty">
+			<view  class="empty-container">
+				<image class="empty-container-image" src="https://static.caimei365.com/app/img/icon/icon-ques-empty@2x.png" mode="aspectFit"></image>
+				<text class="error-text">暂无商品资质信息</text>
+				<view class="login-btn"  @click="editSubmitFn('add')">去补充</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations } from 'vuex'
+	import authorize from '@/common/config/authorize.js' 
+	var isPreviewImg;
+	export default{
+		data() {
+			return{
+				logisticsBatchId:0,
+				shopOrderId:0,
+				isIphoneX:this.$store.state.isIphoneX,
+				isEmpty:false,
+				qualificationsList:[]
+			}
+		},
+		onLoad(option) {
+			this.shopOrderId = option.shopOrderId
+			this.logisticsBatchId = option.logisticsBatchId
+			console.log('shopOrderId',this.shopOrderId)
+			this.GetSupplierQualificationData(option.logisticsBatchId)
+		},
+		methods:{
+			...mapMutations(['login']),
+			GetSupplierQualificationData(logisticsBatchId){
+				this.ShopService.GetSupplierQualificationData(
+					{ 
+						logisticsBatchId : logisticsBatchId ,
+					}
+				)
+				.then(response =>{
+					const data = response.data
+					if(data && data.length > 0){
+						this.qualificationsList = data
+						this.isEmpty = false
+					}else{
+						this.isEmpty = true
+					}
+				})
+				.catch(error =>{
+					this.$util.msg(error.msg,2000);
+				})
+			},
+			editSubmitFn(type){
+				switch(type){
+					case 'edit':
+						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?type=edit&logisticsBatchId=${this.logisticsBatchId}&shopOrderId=${this.shopOrderId}`)
+						break;
+					case 'add':
+						this.$api.navigateTo(`/pages/supplier/deliver/qualifications-add?type=add&logisticsBatchId=${this.logisticsBatchId}&shopOrderId=${this.shopOrderId}`)
+						break;
+				}
+			},
+			previewImg (Array,index) {//顶部商品图片预览
+				console.log(Array)
+				isPreviewImg = true
+				let previewUrls = Array
+				uni.previewImage({
+					current: index, 	//图片索引
+					urls: previewUrls, //必须是http图片，本地图片无效
+					longPressActions:''
+				})
+			},
+		},
+		onShow() {
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		height: auto;
+		background:#F7F7F7;
+	}
+	.qualifications-content{
+		width: 100%;
+		height: auto;
+		.list{
+			width: 100%;
+			height: auto;
+			background-color: #FFFFFF;
+			box-sizing: border-box;
+			margin-bottom: 20rpx;
+			padding: 0 24rpx;
+			.list-view-title{
+				width: 100%;
+				height: 92rpx;
+				border-bottom: 1px solid #E1E1E1;
+				line-height: 92rpx;
+				font-size: $font-size-30;
+				color: #333333;
+				text-align: left;
+				&.none{
+					border-bottom: none;
+					color: #666666;
+				}
+			}
+			.list-view{
+				width: 100%;
+				height: 92rpx;
+				border-bottom: 1px solid #E1E1E1;
+				line-height: 92rpx;
+				font-size: $font-size-30;
+				.list-view-label{
+					width: 192rpx;
+					color: #666666;
+					float: left;
+				}
+				.list-view-text{
+					width: 510rpx;
+					color: #333333;
+					text-overflow: ellipsis;
+					overflow: hidden;
+					display: -webkit-box;
+					-webkit-line-clamp: 1;
+					line-clamp: 1;
+					-webkit-box-orient: vertical;
+					float: right;
+				}
+			}
+			.list-view-upload{
+				width: 100%;
+				height: auto;	
+				padding: 10rpx 0;
+				.photo-item{
+					display: inline-block;
+					width: 112rpx;
+					height: 112rpx;
+					margin: 10rpx 0;
+					margin-right: 25rpx;
+					border-radius: 10rpx;
+					border:1px solid #F5F5F5;
+					position: relative;
+					float: left;
+					&.add{
+						width: 112rpx;
+						height: 112rpx;
+						border-color: #FFC684;
+						text-align: center;
+						line-height: 112rpx;
+						margin-right: 0rpx;
+						.icon-jiahao{
+							font-size: $font-size-44;
+							color:#FFC684 ;
+							font-weight: bold;
+						}
+					}
+					.icon-iconfontguanbi{
+						width: 30rpx;
+						height: 30rpx;
+						border-radius:50%;
+						display: block;
+						position: absolute;
+						right: -10rpx;
+						top: -10rpx;
+						background: #f94b4b;
+						text-align: center;
+						line-height: 30rpx;
+						color: #FFFFFF;
+						font-size: $font-size-22;
+					}
+					image{
+						width: 112rpx;
+						height: 112rpx;
+						border-radius: 10rpx;
+					}
+				}	
+				.photo-list{
+					width: 100%;
+					height: 116rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					display: flex;
+					align-items: flex-start;
+				}
+				.scoll-wrapper{
+					display:flex;
+					align-items: flex-start;
+				}
+			}
+		}
+		.qualifications-btn{
+			width: 100%;
+			height: 90rpx;
+			padding-top: 60rpx;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			background-color: #FFFFFF;
+			.edit-button{
+				width: 600rpx;
+				height: 90rpx;
+				background: $btn-confirm;
+				line-height: 90rpx;
+				text-align: center;
+				color: #FFFFFF;
+				font-size: 30rpx;
+				margin: 0 auto;
+				border-radius: 45rpx;
+			}
+		}
+	}
+	
+</style>

pages/seller/remarks/list.vue

@@ -0,0 +1,561 @@
+<template>
+	<view class="container product clearfix">
+		<view class="remarks-content" :style="{ paddingBottom: isIphoneX ? '168rpx' : '0' }">
+			<view :class="{ 'tui-order-list': scrollTop >= 0 }" class="clearfix">
+				<!-- 空白页 -->
+				<view class="empty-container" v-if="isEmpty">
+					<image
+						class="empty-container-image"
+						:src="StaticUrl + '/icon/icon-remarks-empty@2x.png'"
+					></image>
+					<text class="error-text">暂无任何资料备注~</text>
+				</view>
+				<!-- 列表 -->
+				<view class="tui-remarks-cell  tui-mtop" v-for="(remark, index) in remarksList" :key="index">
+					<view class="tui-remarks-time">{{ remark.time }}</view>
+					<view class="tui-remarks-content">{{ remark.content }}</view>
+					<view class="tui-remarks-button">
+						<view class="btn">修改</view>
+						<view class="btn">删除</view>
+					</view>
+				</view>
+				<!--加载loadding-->
+				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+				<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text="nomoreText"></tui-nomore>
+				<!--加载loadding-->
+			</view>
+		</view>
+		<!-- 取消收藏操作 -->
+		<tui-bottom-popup :radius="false" :mask="false" :show="popupShow">
+			<view class="tui-popup-box clearfix">
+				<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom: isIphoneX ? '68rpx' : '0rpx' }">
+					<view class="tui-flex-1">
+						<view class="tui-button" @click="handleAllUnder"
+							>添加资料备注</view
+						>
+					</view>
+				</view>
+			</view>
+		</tui-bottom-popup>
+		<!-- 弹窗提示 -->
+		<tui-modal
+			:show="modal"
+			@click="handleClick"
+			@cancel="hideMobel"
+			:content="contentModalText"
+			:button="modalButton"
+			color="#333"
+			:size="32"
+			shape="circle"
+			:maskClosable="false"
+		>
+		</tui-modal>
+	</view>
+</template>
+<script>
+import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+import tuiNomore from '@/components/tui-components/nomore/nomore'
+
+import { mapState, mapMutations } from 'vuex'
+const defaultListQuery = {
+	userId: 0,
+	pageNum: 1,
+	pageSize: 10
+}
+export default {
+	components: {
+		tuiLoadmore,
+		tuiNomore,
+	},
+	data() {
+		return {
+			StaticUrl: this.$Static,
+			isIphoneX: this.$store.state.isIphoneX,
+			modalButton: [
+				{
+					text: '取消',
+					type: 'gray',
+					plain: true //是否空心
+				},
+				{
+					text: '确认',
+					customStyle: {
+						color: '#fff',
+						bgColor: 'linear-gradient(90deg, #F28F31 0%, #E15616 100%)'
+					},
+					plain: false
+				}
+			],
+			totalRecord: 0,
+			popupShow: true,
+			popupShow1: false,
+			isProductChecked: false,
+			listQuery: Object.assign({}, defaultListQuery),
+			remarksList: [
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				},
+				{
+					time:'2021.09.07  16:20:10',
+					content:'半岛超声炮是目前国内唯一一台获得NMPA认证的“国产超声刀”，采用大焦域和超脉冲技术的方式，利用超声波能量精准加热皮下SMAS筋膜层、真皮层、浅脂肪层...',
+				}
+			],
+			handleData: {},
+			number: 0,
+			buyRetailPrice: 0,
+			buyRetailPriceStep: 1,
+			isQuantity: false,
+			scrollTop: 0,
+			isEmpty: false,
+			isAllChecked: false,
+			loadding: false,
+			pullUpOn: true,
+			pullFlag: true,
+			hasNextPage: false,
+			navbarHeight: '',
+			nomoreText: '上拉显示更多',
+			contentModalText: '', //操作文字提示语句
+			modal: false,
+			userIdentity:0,
+		}
+	},
+	onLoad() {
+		// this.initGetStotage()
+	},
+	filters: {
+		NumFormat: function(value) {
+			//处理金额
+			if (!value) return '0.00'
+			let number = Number(value).toFixed(2)
+			return number
+		}
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		...mapMutations(['login', 'logout']),
+		async initGetStotage() {
+			const userInfo = await this.$api.getStorage()
+			this.listQuery.userId = userInfo.userId ? userInfo.userId : 0
+			this.userIdentity = userInfo.userIdentity ? userInfo.userIdentity : 0
+			this.GetProductListInfo()
+		},
+		GetProductListInfo() {
+			this.productList = []
+			this.listQuery.pageNum = 1
+			this.ProductService.getProductUserLikeList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.isEmpty = false
+						this.hasNextPage = data.hasNextPage
+						this.totalRecord = data.totalRecord
+						this.productList = data.results
+						this.pullFlag = false
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							if (this.productList.length < 8) {
+								this.pullUpOn = true
+							} else {
+								this.pullUpOn = false
+								this.loadding = false
+								this.nomoreText = '已至底部'
+							}
+						}
+					} else {
+						this.isEmpty = true
+					}
+					this.isRequest = true
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		GetOnReachBottomData(index) {
+			//上拉加载
+			this.listQuery.pageNum += 1
+			this.ProductService.getProductUserLikeList(this.listQuery)
+				.then(response => {
+					let data = response.data
+					if (data.results && data.results.length > 0) {
+						this.hasNextPage = data.hasNextPage
+						this.productList = this.productList.concat(data.results)
+						this.pullFlag = false // 防上拉暴滑
+						setTimeout(() => {
+							this.pullFlag = true
+						}, 500)
+						if (this.hasNextPage) {
+							this.pullUpOn = false
+							this.nomoreText = '上拉显示更多'
+						} else {
+							this.pullUpOn = false
+							this.loadding = false
+							this.nomoreText = '已至底部'
+						}
+					}
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		handleAllUnder() {
+			//批量下架操作
+			let checkedArray = []
+			this.productIds = ''
+			if (this.isProductChecked) {
+				this.productList.forEach(el => {
+					if (el.isChecked) {
+						checkedArray.push(el)
+					}
+				})
+				checkedArray.forEach(el => {
+					this.productIds += el.productId + ','
+				})
+				this.modal = true
+				this.contentModalText = '确定要取消收藏吗？'
+			}
+		},
+		handleClick(e) {
+			//取消收藏
+			if (e.index == 1) {
+				this.handleDeleteUserLike()
+			}
+			this.modal = false
+		},
+		handleDeleteUserLike() {
+			//操作取消收藏
+			this.ProductService.getDeleteUserLike({
+				productIds: this.productIds,
+				userId: this.listQuery.userId
+			})
+				.then(response => {
+					this.$util.msg('取消收藏成功', 2000, true, 'success')
+					setTimeout(() => {
+						this.GetProductListInfo()
+					}, 2000)
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		hideMobel() {
+			this.modal = false
+		},
+		updateCheckAllBtn() {
+			//勾选单个判断全选
+			let goodsCheckedLength = 0
+			this.productList.forEach(item => {
+				if (item.isChecked) {
+					goodsCheckedLength++
+				}
+			})
+			this.isAllChecked = goodsCheckedLength === this.productList.length
+			if (goodsCheckedLength > 0) {
+				this.isProductChecked = true
+			} else {
+				this.isProductChecked = false
+			}
+		},
+		updateBothCheckBtn() {
+			//全选勾选判断
+			this.productList.forEach(item => {
+				item.isChecked = this.isAllChecked
+			})
+		},
+		isCheckedAll() {
+			//全选
+			this.isAllChecked = !this.isAllChecked
+			if (this.isAllChecked) {
+				this.isProductChecked = true
+			} else {
+				this.isProductChecked = false
+			}
+			this.updateBothCheckBtn()
+		},
+		checkedSoperv(item) {
+			//选择
+			item.isChecked = !item.isChecked
+			console.log(item)
+			this.updateCheckAllBtn()
+		},
+		PromotionsFormat(promo) {
+			//促销活动类型数据处理
+			if (promo != null) {
+				if (promo.type == 1 && promo.mode == 1) {
+					return true
+				} else {
+					return false
+				}
+			}
+			return false
+		},
+		changeCountAdd() {
+			//popup弹窗数量增加按钮
+			if (this.buyRetailPriceStep == 2) {
+				this.number += this.minBuyNumber
+			} else {
+				this.number++
+			}
+			this.calculatPerice()
+		},
+		changeCountSub() {
+			//popup弹窗数量减按钮
+			if (this.number <= this.minBuyNumber) {
+				this.number = this.minBuyNumber
+				this.isQuantity = true
+				this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`, 2000)
+				return
+			} else {
+				if (this.buyRetailPriceStep == 2) {
+					this.number -= this.minBuyNumber
+				} else {
+					this.number--
+				}
+				this.calculatPerice()
+				this.isQuantity = false
+			}
+		},
+		changeNumber(e) {
+			let _value = e.detail.value
+			if (!this.$api.isNumber(_value)) {
+				this.number = this.minBuyNumber
+			} else if (_value < this.minBuyNumber) {
+				this.$util.msg(`该商品最小起订量为${this.minBuyNumber}`, 2000)
+				this.number = this.minBuyNumber
+			} else if (_value % this.minBuyNumber != 0) {
+				this.$util.msg('购买量必须为起订量的整数倍', 2000)
+				this.number = this.minBuyNumber
+			} else {
+				this.number = e.detail.value
+				this.calculatPerice()
+			}
+		},
+		calculatPerice() {
+			//判断是否为阶梯价然后做计算价格处理
+			if (this.handleData.ladderPriceFlag == 1) {
+				this.handleData.ladderPrices.forEach((item, index) => {
+					if (this.number >= item.buyNum) {
+						this.buyRetailPrice = item.buyPrice
+					}
+				})
+			}
+		},
+		toConfirmation() {
+			//跳转确认订单页面
+			this.popupShow1 = false
+			let productStp = {
+				allPrice: this.number * this.buyRetailPrice,
+				allCount: this.number,
+				productID: this.handleData.productId,
+				productCount: this.number
+			}
+			this.$api.navigateTo(
+				`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({ data: productStp })}`
+			)
+		},
+		getAddProductCart() {
+			//增加购物车成功和toast弹窗提示成功
+			this.ProductService.shoppingAddCart({
+				productID: this.handleData.productId,
+				userID: this.listQuery.userId,
+				productCount: this.number
+			})
+				.then(response => {
+					this.popupShow1 = false
+					this.$util.msg('加入购物车成功', 1500, true, 'success')
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		showPopup(index, pros) {
+			// 弹窗显示
+			switch (index) {
+				case 0:
+					this.popupShow = true
+					break
+				case 1:
+					this.popupShow1 = true
+					this.handleData = pros
+					console.log(this.handleData)
+					this.buyRetailPrice = this.handleData.price
+					this.buyRetailPriceStep = this.handleData.step
+					if (this.handleData.ladderPriceFlag == 1) {
+						this.number = this.handleData.maxBuyNumber ? this.handleData.maxBuyNumber : 1
+					} else {
+						this.number = this.handleData.minBuyNumber
+					}
+					break
+			}
+		},
+		hidePopup(index) {
+			// 弹窗隐藏
+			switch (index) {
+				case 0:
+					this.popupShow = false
+					break
+				case 1:
+					this.popupShow1 = false
+					break
+			}
+		},
+		details(id) {
+			this.$api.navigateTo(`/pages/seller/remarks/details?id=${id}`)
+		},
+	},
+	onPageScroll(e) {
+		//实时获取到滚动的值
+	},
+	onReachBottom() {
+		if (this.hasNextPage) {
+			this.loadding = true
+			this.pullUpOn = true
+			this.GetOnReachBottomData()
+		}
+	},
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.listQuery.pageNum = 1
+			uni.stopPullDownRefresh()
+		}, 200)
+	},
+	onShow() {}
+}
+</script>
+
+<style lang="scss">
+@import '@/uni.scss';
+page {
+	background: #F7F7F7;
+}
+.empty-container {
+	z-index: 9999;
+}
+.remarks-content {
+	width: 100%;
+	height: auto;
+	position: relative;
+	padding: 0;
+	box-sizing: border-box;
+	padding:24rpx;
+	.empty-container-image {
+		width: 260rpx;
+		height: 260rpx;
+		margin-top: -300rpx;
+	}
+	.tui-remarks-cell{
+		width: 100%;
+		height: 316rpx;
+		border-radius: 16rpx;
+		background: #FFFFFF;
+		margin-bottom: 24rpx;
+		box-sizing: border-box;
+		padding: 25rpx 32rpx;
+		.tui-remarks-time{
+			width: 100%;
+			height: 37rpx;
+			line-height: 37rpx;
+			text-align: left;
+			font-size: $font-size-26;
+			color: #666666;
+			margin-bottom: 24rpx;
+		}
+		.tui-remarks-content{
+			width: 100%;
+			line-height: 44rpx;
+			text-align: left;
+			font-size: $font-size-26;
+			color: #333333;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			display: -webkit-box;
+			-webkit-line-clamp: 3;
+			line-clamp: 3;
+			-webkit-box-orient: vertical;
+			margin-bottom: 24rpx;
+		}
+		.tui-remarks-button{
+			width: 100%;
+			height: 48rpx;
+			.btn{
+				width: 104rpx;
+				height: 48rpx;
+				box-sizing: border-box;
+				border: 1px solid #707070;
+				text-align: center;
+				border-radius: 25rpx;
+				color: #666666;
+				font-size: $font-size-24;
+				float: right;
+				margin-left: 24rpx;
+			}
+		}
+	}
+}
+.tui-popup-box {
+	position: relative;
+	box-sizing: border-box;
+	min-height: 100rpx;
+	padding: 6rpx 24rpx;
+	.tui-popup-content {
+		padding-top: 30rpx;
+	}
+}
+.tui-popup-btn {
+	width: 100%;
+	height: auto;
+	float: left;
+	box-sizing: border-box;
+	margin-top: 30rpx;
+	.tui-button {
+		width: 600rpx;
+		height: 88rpx;
+		background: $btn-confirm;
+		line-height: 88rpx;
+		text-align: center;
+		color: #ffffff;
+		font-size: $font-size-28;
+		border-radius: 44rpx;
+		margin: 0 auto;
+	}
+}
+</style>

pages/supplier/user/my-shop.vue

@@ -365,7 +365,7 @@
 			QueryProductPrice(data){//处理主推商品商品或者活动价格
 				let productIdArr = [];
 				let productIds ='';
-				data.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
+				data.map(item=>{// 0公开价格 1不公开价格 2仅对资质机构公开
 					productIdArr.push(item.productId)
 				})
 				productIds = productIdArr.join(",");
@@ -386,7 +386,7 @@
 			QueryProductPrice1(data){//获取商品或者活动价格
 				let productIdArr = [];
 				let productIds ='';
-				data.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
+				data.map(item=>{// 0公开价格 1不公开价格 2仅对资质机构公开
 					productIdArr.push(item.productId)
 				})
 				productIds = productIdArr.join(",");

pages/supplier/user/operator/list.vue

@@ -27,7 +27,7 @@
 				<scroll-view scroll-y="true" >
 					<view class="list" v-for="(item, index) in operatorList" :key="index" @click.stop="showOperatorModel(item)">
 						<view class="list-left">
-							<view class="list-head"><image :src="item.headimgurl ? item.headimgurl : defalutLogo" mode=""></image></view>
+							<view class="list-head"><image :src="item.avatarUrl ? item.avatarUrl : defalutLogo" mode=""></image></view>
 							<view class="list-tel">
 								<text class="txt">{{ item.linkName ? item.linkName : '' }}</text>
 								<text class="txt">{{ item.mobile ? item.mobile : '' }}</text>

pages/user/account/account-bean.vue

@@ -128,7 +128,7 @@
 				let stateText = ''
 				let	stateTextObject={
 						1:'注册机构',
-						2:'升级会员机构',
+						2:'升级资质机构',
 						3:'完善资料',
 						4:'完善资料',
 						5:'下单',

pages/user/collection/collection.vue

@@ -253,6 +253,7 @@ export default {
 	data() {
 		return {
 			StaticUrl: this.$Static,
+			isIphoneX: this.$store.state.isIphoneX,
 			modalButton: [
 				{
 					text: '取消',

pages/user/member/member-pay.vue

@@ -0,0 +1,585 @@
+<template>
+	<view class="container cashier">
+		<view class="container-cash clearfix">
+			<view class="container-wrapper">
+				<view class="pay-content">
+					<view class="pay-p"><text>待付金额</text></view>
+					<view class="pay-money">
+						<text class="pay-sm">￥</text>
+						<text class="pay-bg">{{payableAmount | NumFormat}}</text>
+					</view>
+					<view class="pay-mouth">套餐：{{ payableMouth  }}</view>
+				</view>
+				<view class="pay-check">
+					<view class="check-title"><view class="text">选择支付方式</view></view>
+					<view class="pay-checked">
+						<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 0}"   @click="tabClick(0)" >
+							<view class="item-l">
+								<view class="item-icon"><text class="iconfont icon-weixinzhifu"></text></view>
+								<view class="item-texts"><text>微信支付</text></view>
+							</view>
+							<view class="item-r">
+								<text class="iconfont icon-duigou"></text>
+							</view>
+						</view>
+						<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 1}"   @click="tabClick(1)" >
+							<view class="item-l">
+								<view class="item-icon"><text class="iconfont icon-qiyewangyinzhifu"></text></view>
+								<view class="item-text">
+									<view class="txt-p">企业网银支付</view>
+									<view class="txt-t">需要在电脑端汇款</view>
+								</view>
+							</view>
+							<view class="item-r">
+								<text class="iconfont icon-duigou"></text>
+							</view>
+						</view>
+						<view  class="pay-item" :class="{ 'current' : tabCurrentIndex === 2}"   @click="tabClick(2)" >
+							<view class="item-l">
+								<view class="item-icon"><text class="iconfont icon-gerenwangyinzhifu"></text></view>
+								<view class="item-text">
+									<view class="txt-p">个人网银支付</view>
+									<view class="txt-t">需要在电脑端汇款</view>
+								</view>
+							</view>
+							<view class="item-r">
+								<text class="iconfont icon-duigou"></text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="pay-button">
+				<view class="btn" @click.stop="goOrderCash" :style="{'background':btnColor}">{{buttonText}}</view>
+			</view>
+		</view>
+		<view class="alert spec" :class="specClass" v-if="isShowTip">
+			<!-- 选择支付弹窗说明 -->
+			<view class="payun-alert"  @tap="hideTips">
+				<view class="content">
+					<view class="title">
+						<text>支付链接</text>
+						<text class="iconfont icon-iconfontguanbi" @click.stop="hideTips"></text>
+					</view>
+					<view class="text-content">
+						<view class="text">请复制以下链接，并发送至电脑端，在浏览器访问该链接并选择银行尽快完成支付</view>
+						<view class="text-p">{{payHttpUrl}}</view>
+						<view class="text-b">链接有效期为72小时</view>
+					</view>
+					<view class="text-button" @click.stop="clipboard(payHttpUrl)">复制链接</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	const thorui = require("@/components/clipboard/clipboard.thorui.js")
+	export default{
+		data(){
+			return{
+				orderId:'',
+				payableAmount:4800,
+				emptyWrapperH: '',
+				payorderId:'',
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
+				tabCurrentIndex:0,
+				isShowTip:false,
+				isReceiptStatus:false,
+				buttonText:'使用微信支付',
+				btnColor:'#09BB07',
+				receiptStatus:'',
+				invoiceStatus:false,
+				optionType:'',
+				onlinePayFlag:'',
+				pageType:'',
+				payableMouth:'12个月',
+				payHttpUrl:'https://www.so.com/link?'
+			}
+		},
+		onLoad(option) {
+			this.initData(option)
+		},
+		filters: {
+			NumFormat(value) {
+				if(!value) return '0.00';
+				/*原来用的是Number(value).toFixed(0)，这样取整时有问题，例如0.51取整之后为1，感谢Nils指正*/
+				/*后来改成了 Number(value)|0,但是输入超过十一位就为负数了，具体见评论 */
+				var intPart = Number(value) - Number(value)%1; //获取整数部分（这里是windy93的方法）
+				var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); //将整数部分逢三一断
+				var floatPart = ".00"; //预定义小数部分
+				var value2Array = value.toString().split(".");
+				//=2表示数据有小数位
+				if(value2Array.length == 2) {
+					floatPart = value2Array[1].toString(); //拿到小数部分
+
+					if(floatPart.length == 1) { //补0,实际上用不着
+						return intPartFormat + "." + floatPart + '0';
+					} else {
+						return intPartFormat + "." + floatPart;
+					}
+				} else {
+					return intPartFormat + floatPart;
+				}
+			}
+		},
+		methods:{
+			initData(e){
+				console.log(e)
+				this.orderId = e.orderId;
+				this.payOrderId ='#'+e.orderId+'#';
+				this.optionType = e.type;
+				this.PayOrderCheckoutCounter(this.orderId)
+			},
+			PayOrderCheckoutCounter(orderId){
+				this.PayService.PayOrderCheckoutCounter({orderId:orderId}).then(response =>{
+					let data = response.data.order
+					this.payableAmount = data.payableAmount - data.receiptAmount  //待付金额
+					this.receiptStatus =  data.receiptStatus
+					this.onlinePayFlag = data.onlinePayFlag					
+					//判断线上线下显示
+					if(this.optionType == 'onlinePay'){
+						this.invoiceStatus = true
+					}else{
+						this.invoiceStatus = data.invoiceStatus
+					}
+					if(data.receiptAmount>0){
+						this.isReceiptStatus = false
+					}else{
+						this.isReceiptStatus = true
+					}
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			goOrderCash(){
+				// // 友盟埋点收集选择支付方式
+				// if(process.env.NODE_ENV != 'development'){
+				// 	this.$uma.trackEvent('Um_Event_ChooseWechatPay', {
+				// 		Um_Key_PageName: '线上支付',
+				// 		Um_Key_SourcePage: '选择支付',
+				// 		Um_Key_PayName:`${this.buttonText}`,
+				// 		Um_Key_PayOrderID:`${this.orderId}`
+				// 	})
+				// }
+				switch(this.tabCurrentIndex){
+					case 0:
+						this.MiniWxPayFor();					
+						break;
+					case 1:
+						this.BuildCatenate();	
+						break;
+					case 2:
+						this.BuildCatenate();	
+						break;
+				}
+			},
+			async MiniWxPayFor(){// 使用微信支付
+				const WechatCode = authorize.getCode('weixin')
+				this.PayService.WeChatMiniWxPay(
+					{
+						payAmount:this.accMul(this.payAmount,100),
+						payWay:"WEIXIN",
+						code:wechatcode,
+						orderId:this.orderId
+					}
+				).then(response =>{
+					// // 友盟埋点收集微信支付
+					// if(process.env.NODE_ENV != 'development'){
+					// 	this.$uma.trackEvent('Um_Event_ConfirmWechatPay', {
+					// 		Um_Key_PageName: '微信支付',
+					// 		Um_Key_SourcePage: '线上支付',
+					// 		Um_Key_PayName:`${this.buttonText}`,
+					// 		Um_Key_PayOrderID:`${this.orderId}`
+					// 	})
+					// }
+					let PayInfo = JSON.parse(response.data.data.payInfo);
+					this.WxRequestPayment(PayInfo)
+				}).catch(error =>{
+					this.$util.msg(error.msg,2000)
+				})
+			},
+			WxRequestPayment(data){// 微信支付Api
+				let self = this
+				wx.requestPayment({
+					'timeStamp': data.timeStamp,
+					'nonceStr': data.nonceStr,
+					'package': data.package,
+					'signType': data.signType,
+					'paySign': data.paySign,
+					'success':function(res){
+						wx.reLaunch({url: '/pages/tabBar/user/user'});
+					},
+					'fail':function(res){
+						self.$util.msg('用户取消支付~')
+					},
+					'complete':function(res){
+			
+					}
+				})
+			},
+			BuildCatenate(){// 生成网银支付链接
+				this.isShowTip = true
+				// this.PayService.PayOrderPayLink(
+				// 	{
+				// 		unpaidAmount:this.payAmount,
+				// 		orderId:this.orderId,
+				// 		payType:this.payType,
+				// 	}
+				// ).then(response =>{
+				// 	this.payHttpUrl = response.data
+				// 	this.isShowTip = true
+				// }).catch(error =>{
+				// 	this.$util.msg(error.msg,2000)
+				// })
+			},
+			tabClick(index) {//tab切换
+				this.tabCurrentIndex = index;
+				switch(index){
+					case 0:
+						this.btnColor="#09BB07"
+						this.buttonText='使用微信支付';
+						break;
+					case 1:
+						this.btnColor="#034582"
+						this.buttonText='生成企业网银链接';
+						break;
+					case 2:
+						this.btnColor="#034582"
+						this.buttonText='生成个人网银链接';
+						break;
+				}
+			},
+			hideTips(){//隐藏弹窗
+				this.isShowTip = false
+			},
+			clipboard(data) {
+				thorui.getClipboardData(data, (res) => {
+					if (res) {
+						this.isShowTip = false;
+						this.$util.msg("复制成功",2000,true,'success');
+						// // 友盟埋点收集复制网银链接
+						// if(process.env.NODE_ENV != 'development'){
+						// 	this.$uma.trackEvent('Um_Event_CopyUnionPay', {
+						// 		Um_Key_PageName: '网银支付',
+						// 		Um_Key_SourcePage: '线上支付',
+						// 		Um_Key_PayName:`${this.buttonText}`,
+						// 		Um_Key_PayOrderID:`${this.orderId}`
+						// 	})
+						// }
+					} else {
+						this.$util.msg("复制失败",2000,true,'none');
+					}
+				})
+			},
+		},
+		onShow() {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		height: auto !important;
+		background-color: #FFFFFF;
+	}
+	.container-cash{
+		width: 100%;
+		margin-top: 40rpx;
+		.container-wrapper{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 0 24rpx;
+			.pay-content{
+				width: 100%;
+				height: 254rpx;
+				padding: 92rpx 40rpx 16rpx 40rpx;
+				box-sizing: border-box;
+				background: url(https://static.caimei365.com/app/img/icon/icon-member-pay@2x.png) no-repeat;
+				background-size: cover;
+				float: left;
+				position: relative;
+				.pay-p{
+					font-size: $font-size-26;
+					color: #4E4539;
+					line-height: 36rpx;
+				}
+				.pay-money{
+					color: #4E4539;
+					line-height: 84rpx;
+					font-weight: bold;
+					.pay-sm{
+						font-size: $font-size-26;
+					}
+					.pay-bg{
+						font-size: 50rpx;
+					}
+				}
+				.pay-mouth{
+					position: absolute;
+					right: 40rpx;
+					bottom: 16rpx;
+					line-height: 36rpx;
+					font-size: $font-size-26;
+					color: #4E4539;
+				}
+			}
+			.pay-check{
+				width: 100%;
+				height: auto;
+				float: left;
+				.check-title{
+					width: 622rpx;
+					height: 40rpx;
+					line-height: 40rpx;
+					padding: 0 20rpx;
+					margin-top: 24rpx;
+					.text{
+						font-size: $font-size-28;
+						color: $text-color;
+						text-align: left;
+						float: left;
+					}
+					.icon{
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						line-height: 40rpx;
+						text-align: center;
+						color: #FFFFFF;
+						font-size: $font-size-24;
+						background: radial-gradient(circle,rgba(225,86,22,1) 0%,rgba(255,170,0,1) 67%,rgba(249,185,156,1) 100%);
+						float: right;
+					}
+				}
+				.pay-checked{
+					width: 100%;
+					height: auto;
+					.pay-item{
+						width: 100%;
+						height: 120rpx;
+						box-sizing: border-box;
+						border: 1px solid #E1E1E1;
+						border-radius: 8rpx;
+						padding: 20rpx;
+						margin: 24rpx 0;
+						display: flex;
+						background-color: #FFFFFF;
+						&.current{
+							border-color:#E4AA43;
+							.item-r{
+								.icon-duigou{
+									color: #E4AA43;
+								}
+							}
+						}
+						.item-l{
+							flex: 8;
+							.item-icon{
+								width: 72rpx;
+								height: 72rpx;
+								float: left;
+								text-align: center;
+								line-height: 72rpx;
+								margin-right: 20rpx;
+								.iconfont{
+									font-size:78rpx;
+								}
+								.icon-weixinzhifu{
+									color: #09BB07;
+								}
+								.icon-gerenwangyinzhifu{
+									color: #034582;
+								}
+								.icon-qiyewangyinzhifu{
+									color: #004889;
+								}
+							}
+							.item-texts{
+								line-height: 66rpx;
+								font-size:$font-size-26;
+								color: $text-color;
+							}
+							.item-text{
+								line-height: 36rpx;
+								font-size:$font-size-26;
+								.txt-p{
+									color: $text-color;
+								}
+								.txt-t{
+									color: #999999;
+								}
+							}
+						}
+						.item-r{
+							flex: 2;
+							text-align: center;
+							line-height: 72rpx;
+							.icon-duigou{
+								font-size: 54rpx;
+								color: #FFFFFF;
+							}
+						}
+					}
+				}
+			}
+		}
+		.pay-button{
+			width: 100%;
+			float: left;
+			margin-top:30rpx;
+			.btn{
+				width: 662rpx;
+				height: 88rpx;
+				border-radius: 44rpx;
+				font-size: $font-size-28;
+				line-height: 88rpx;
+				color: #FFFFFF;
+				margin: 0 auto;
+				text-align: center;
+				background:$btn-confirm;
+			}
+		}
+		.pay-bring-wrapper{
+			width: 100%;
+			padding: 24rpx 0;
+			background-color: #FFFFFF;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			.pay-bring-content{
+				width: 654rpx;
+				height: auto;
+				padding: 0 24rpx;
+				.text{
+					font-size: $font-size-24;
+					color: #666;
+					line-height: 44rpx;
+					text-align: center;
+					&.bg-color{
+						color: $color-system;
+						line-height: 88rpx;
+					}
+				}
+				.text-v{
+					font-size: $font-size-28;
+					color: #999;
+					line-height: 70rpx;
+					text-align: left;
+					&.title{
+						font-size: $font-size-28;
+						color: #666666;
+					}
+					&.bg-color{
+						line-height: 44rpx;
+						color: $color-system;
+					}
+					.clipboard{
+						width: 84rpx;
+						height: 36rpx;
+						background:linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);
+						text-align: center;
+						font-size: $font-size-24;
+						color: #FFFFFF;
+						border-radius: 4rpx;
+						line-height: 36rpx;
+						display: inline-block;
+						margin-left: 10rpx;
+					}
+				}
+			}
+		}
+	}
+	.payun-alert{
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,.5);
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 8888;
+		transition: all 0.4s;
+		&.none{
+			display: none;
+		}
+		&.show{
+			display: block;
+		}
+		.content{
+			width: 422rpx;
+			height:434rpx;
+			position: absolute;
+			background: $bg-color;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			top: 0;
+			margin: auto;
+			padding: 20rpx 32rpx;
+			border-radius: 12rpx;
+			.title{
+				width: 100%;
+				height: 68rpx;
+				line-height: 68rpx;
+				font-size: $font-size-28;
+				color: $text-color;
+				text-align: center;
+				position: relative;
+				.icon-iconfontguanbi{
+					width: 68rpx;
+					height: 68rpx;
+					text-align: center;
+					line-height: 68rpx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					font-size: $font-size-36;
+					color: #999999;
+				}
+			}
+			.text-content{
+				width: 100%;
+				height: auto;
+				.text{
+					padding: 20rpx 0 0 0;
+					line-height: 44rpx;
+					font-size: $font-size-26;
+					color:#666666;
+					text-align: justify;
+				}
+				.text-p{
+					width: 100%;
+					line-height: 44rpx;
+					font-size: $font-size-26;
+					color:$color-system;
+					text-align: left;
+					text-overflow:ellipsis;
+					display: -webkit-box;
+					word-break: break-all;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+					overflow: hidden;
+				} 
+				.text-b{
+					line-height: 44rpx;
+					font-size: $font-size-24;
+					color:#999999;
+					text-align: left;
+				}
+			}
+			.text-button{
+				width: 100%;
+				height: 88rpx;
+				line-height: 88rpx;
+				background: $btn-confirm;
+				font-size: $font-size-28;
+				border-radius: 44rpx;
+				color:#FFFFFF;
+				text-align: center;
+				margin-top: 20rpx;
+			}
+		}
+	}
+</style>

pages/user/member/member-product.vue

@@ -0,0 +1,404 @@
+<template>
+	<view class="container clearfix">
+		<view class="cm-member-top">
+			<image class="banner" :src="banner" mode=""></image>
+		</view>
+		<view class="cm-member-main ">
+			<view class="cm-member-product clearfix">
+				<view 	v-for="(pro,index) in productList"
+						:key="index" 
+						:id="pro.productId" 
+						class="product-list" 
+						@click="productDetail(pro.productId)"
+				>
+					<view class="product-image">
+						<image :src="pro.image" mode=""></image>
+					</view>
+					<view class="product-mains">
+						<view class="product-name">
+							{{ pro.name }}
+						</view>
+						<view class="product-tags">
+							<view class="floor-item-act" v-if="pro.actStatus==1">
+								<view class="floor-tags" v-if="PromotionsFormat(pro.promotions)">
+									{{pro.promotions.name}}
+									<text v-if="pro.priceFlag != 1">:￥{{ pro.price | NumFormat }}</text>
+								</view>
+								<view class="floor-tags" v-else>{{pro.promotions.name}}</view>	
+							</view>
+							<view class="floor-item-act" v-if="pro.actStatus==0">
+								<view class="floor-tags" v-if="pro.actStatus ==0  &&  pro.ladderPriceFlag==1">阶梯价格</view>	
+							</view>
+						</view>
+						<view class="product-price">
+							<view class="list-none" v-if="pro.priceFlag == 1">￥未公开价格</view>
+							<view class="list-none" v-else-if="pro.priceFlag == 2">￥价格仅会员可见</view>
+							<view class="list-none-price" v-else>￥{{ pro.price | NumFormat }}</view>
+						</view>
+						<view class="product-svip">
+							<view class="svip" v-if='pro.proType == 0'>
+								<view class="tags">SVIP</view>
+							</view>
+							<view class="svip" v-if='pro.proType == 1'>
+								<view class="tags">SVIP</view>
+								<view class="price">{{ pro.discount }}</view>
+							</view>
+							<view class="svip" v-if='pro.proType == 2'>
+								<view class="tags">SVIP</view>
+								<view class="price">￥{{ pro.discountPrice | NumFormat }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 透明模态层 -->
+		<modal-layer v-if='isModallayer'></modal-layer>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations} from 'vuex'
+	import modalLayer from '@/components/modal-layer'
+	export default {
+		components:{
+			modalLayer
+		},
+		data() {
+			return {
+				StaticUrl:this.$Static,
+				isModallayer:false,
+				banner:'https://img.caimei365.com/group1/M00/00/28/rB-lGGE4XKWADKAdAANR7wZz3OQ936.jpg',
+				params:{
+					userId:0,
+					redemptionCode:'',
+					source:2,
+				},
+				productList:[
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:0,
+						priceFlag:1,
+						originalPrice:100,
+						price:5000000,
+						actStatus:0,
+						promotions:null,
+						isChecked:false,
+						productIds:1000,
+						proType:1,
+						discount:'8.8折'
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:2,
+						originalPrice:100,
+						price:500000,
+						actStatus:1,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						isChecked:false,
+						productIds:1001,
+						proType:2,
+						discountPrice:50000,
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:0,
+						originalPrice:100,
+						price:5000000,
+						actStatus:1,
+						promotions:{
+							type:0,
+							mode:0,
+							name:'单品满减'
+						},
+						isChecked:false,
+						productIds:1002,
+						proType:0,
+						discountPrice:50000,
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:0,
+						originalPrice:100,
+						price:50000000,
+						actStatus:0,
+						promotions:null,
+						isChecked:false,
+						productIds:1003,
+						proType:0,
+						discountPrice:50000,
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:0,
+						priceFlag:1,
+						originalPrice:100,
+						price:5000000,
+						actStatus:0,
+						promotions:null,
+						isChecked:false,
+						productIds:1000,
+						proType:1,
+						discount:'8.8折'
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:2,
+						originalPrice:100,
+						price:500000,
+						actStatus:1,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						isChecked:false,
+						productIds:1001,
+						proType:2,
+						discountPrice:50000,
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:0,
+						originalPrice:100,
+						price:5000000,
+						actStatus:1,
+						promotions:{
+							type:0,
+							mode:0,
+							name:'单品满减'
+						},
+						isChecked:false,
+						productIds:1002,
+						proType:0,
+						discountPrice:50000,
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:0,
+						originalPrice:100,
+						price:50000000,
+						actStatus:0,
+						promotions:null,
+						isChecked:false,
+						productIds:1003,
+						proType:0,
+						discountPrice:50000,
+					}
+				]
+			}
+		},
+		onLoad() {
+			
+		},
+		filters: {
+			NumFormat:function(text) {//处理金额
+				return Number(text).toFixed(2)
+			}
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo','identity','isActivity'])
+		},
+		methods: {
+			PromotionsFormat(promo){//促销活动类型数据处理
+				if(promo!=null){
+					if(promo.type == 1 && promo.mode == 1){
+						return true
+					}else{
+						return false
+					}
+				}
+				return false
+			},
+			productDetail(productId) {
+				this.isModallayer = true
+				this.$api.navigateTo(`/pages/goods/product?id=${productId}`)
+				this.isModallayer = false
+			},
+		},
+		onPullDownRefresh() {
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 200)
+		},
+		onShow(){
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.params.userId = resolve.userId ? resolve.userId : 0
+			}).catch(error =>{
+				console.log('暂无用户信息~')
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #F7F7F7;
+	}
+	.container{
+		width: 100%;
+		height: auto;
+	}
+	.cm-member-top{
+		width: 100%;
+		height: 340rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+		margin: 24rpx 0 0 0;
+		.banner{
+			width: 100%;
+			height: 340rpx;
+			display: block;
+			border-radius: 16rpx;
+		}
+	}
+	.cm-member-main{
+		width: 100%;
+		box-sizing: border-box;
+		padding: 0  24rpx 24rpx 24rpx;
+		background-color: #F7F7F7;
+		.cm-member-product{
+			width: 100%;
+			margin-top: 24rpx;
+			.product-list{
+				width: 339rpx;
+				height: 560rpx;
+				border-radius: 16rpx;
+				float: left;
+				margin-right: 24rpx;
+				margin-bottom: 24rpx;
+				background-color: #FFFFFF;
+				&:nth-child(2n){
+					margin-right: 0;
+				}
+				.product-image{
+					width: 339rpx;
+					height: 339rpx;
+					image{
+						width: 339rpx;
+						height: 339rpx;
+						display: block;
+						border-radius: 16rpx 16rpx 0 0;
+					}
+				}
+				.product-mains{
+					width: 100%;
+					height: auto;
+					box-sizing: border-box;
+					padding: 0 24rpx;
+					margin-top: 8rpx;
+					.product-name{
+						line-height: 36rpx;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						line-clamp: 2;
+						-webkit-box-orient: vertical;
+						font-size: $font-size-26;
+						color: #333333;
+						text-align: justify;
+					}
+					.product-tags{
+						width: 100%;
+						height: 32rpx;
+						margin-top: 4rpx;
+						.floor-item-act{
+							width: 100%;
+							height: 32rpx;
+							text-align: center;
+							box-sizing: border-box;
+							float: left;
+							.floor-tags{
+								height: 32rpx;
+								box-sizing: border-box;
+								border-radius: 8rpx;
+								background-color: #FFFFFF;
+								line-height: 28rpx;
+								color: $color-system;
+								text-align: center;
+								display: inline-block;
+								padding:0 8rpx;
+								font-size: $font-size-20;
+								border: 1px solid #E15616;
+								float: left;
+							}
+						}
+					}
+					.product-price{
+						width: 100%;
+						line-height: 37rpx;
+						font-size: $font-size-26;
+						color: #333333;
+						margin-top: 8rpx;
+						.list-none-price{
+							text-decoration: line-through;
+							color: #999999;
+						}
+					}
+					.product-svip{
+						width: 100%;
+						height: 32rpx;
+						margin-top: 10rpx;
+						.svip{
+							padding-left: 44rpx;
+							height: 32rpx;
+							position: relative;
+							.tags{
+								width: 60rpx;
+								height: 32rpx;
+								background-color: #333333;
+								text-align: center;
+								line-height: 32rpx;
+								font-size: $font-size-22;
+								color: #F0CB72;
+								position: absolute;
+								left: 0;
+								top: 0;
+								border-radius: 8rpx 16rpx 8rpx 8rpx;
+							}
+							.price{
+								height: 32rpx;
+								box-sizing: border-box;
+								border-radius:0 8rpx 8rpx 0;
+								background-color: #F0CB72;
+								line-height: 32rpx;
+								color: #333333;
+								text-align: center;
+								padding:0 9rpx 0 25rpx;
+								font-size: $font-size-26;
+								float: left;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

pages/user/member/member-record.vue

@@ -0,0 +1,186 @@
+<template>
+	<view class="container clearfix">
+		<view class="cm-member-top">
+			<view class="cm-member-head">
+				<view class="cm-member-text">
+					<view class="cm-member-h1">
+						<text>采美·超级会员</text>
+					</view>
+					<view class="cm-member-p">
+						<text>有效期至：2021-10-01</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="cm-member-main">
+			<view class="record-list" v-for="(pay,index) in payList" :key="index" >
+				<view class="record-list-type">
+					<view class="list-type-h1"> {{ pay.text }} </view>
+					<view class="list-type-p"> {{ pay.time }} </view>
+				</view>
+				<view class="record-list-text">
+					<text v-if="pay.type == 1">￥{{ pay.money }}</text>
+					<text v-else>{{ pay.money }}采美豆</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations} from 'vuex'
+	export default {
+		components:{
+			
+		},
+		data() {
+			return {
+				StaticUrl:this.$Static,
+				memberType:0,
+				tabCurrent:0,
+				params:{
+					userId:0,
+					redemptionCode:'',
+					source:2,
+				},
+				payList:[
+					{month:'1个月',money:'600',type:1,text:'超级会员套餐-1个月',time:'2021-09-28  13:54:48'},
+					{month:'3个月',money:'1500',type:1,text:'超级会员套餐-3个月',time:'2021-09-28  13:54:48'},
+					{month:'12个月',money:'4800',type:1,text:'超级会员套餐-12个月',time:'2021-09-28  13:54:48'},
+					{month:'12个月',money:'48000',type:2,text:'超级会员套餐-12个月',time:'2021-09-28  13:54:48'},
+				],
+				payAmount:4800,
+				payBeans:480000,
+			}
+		},
+		onLoad() {
+			
+		},
+		filters: {
+			TypeFormat:function(value) {
+				switch (value) {
+					case 0:
+						return  '活动券'
+						break
+					case 1:
+						return  '品类券'
+						break
+					case 2:
+						return  '用户专享券'
+						break
+					case 3:
+						return  '店铺券'
+						break
+					case 4:
+						return  '新用户券'
+						break
+				}
+			}
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo','identity','isActivity'])
+		},
+		methods: {
+			handleCheckedPay(index,pay){// 选择会员
+				this.tabCurrent = index
+				this.payAmount = pay.money
+				this.payBeans = pay.beans
+			}
+		},
+		onPullDownRefresh() {
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 200)
+		},
+		onShow(){
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.params.userId = resolve.userId ? resolve.userId : 0
+			}).catch(error =>{
+				console.log('暂无用户信息~')
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.container{
+		width: 100%;
+		height: auto;
+	}
+	.cm-member-top{
+		width: 100%;
+		height: 242rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+		background: url(https://static.caimei365.com/app/img/icon/icon-member-bg01@2x.png) no-repeat;
+		background-size: cover;
+		position: relative;
+		.cm-member-head{
+			width: 702rpx;
+			height: 132rpx;
+			box-sizing: border-box;
+			padding: 30rpx 32rpx 0 109rpx;
+			background: url(https://static.caimei365.com/app/img/icon/icon-member-bg02@2x.png) no-repeat;
+			background-size: cover;
+			position: absolute;
+			bottom: 0;
+			left: 24rpx;
+			border-radius: 16rpx 16rpx 0 0;
+			.cm-member-text{
+				float: left;
+				.cm-member-h1{
+					line-height: 42rpx;
+					font-size: $font-size-30;
+					color: #55331D;
+					text-align: left;
+					margin-bottom: 12rpx;
+					font-weight: bold;
+				}
+				.cm-member-p{
+					line-height: 30rpx;
+					font-size: $font-size-22;
+					color: #55331D;
+					text-align: left;
+				}
+			}
+		}
+	}
+	.cm-member-main{
+		width: 100%;
+		box-sizing: border-box;
+		padding: 40rpx 24rpx;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		.record-list{
+			width: 100%;
+			height: 135rpx;
+			border-bottom: 1px solid #F0F0F0;
+			box-sizing: border-box;
+			padding: 24rpx 0;
+			.record-list-type{
+				float: left;
+				height: 100%;
+				.list-type-h1{
+					line-height: 37rpx;
+					font-size: $font-size-26;
+					color: #333333;
+					text-align: left;
+					margin-bottom: 16rpx;
+				}
+				.list-type-p{
+					line-height: 33rpx;
+					font-size: $font-size-24;
+					color: #999999;
+					text-align: left;
+				}
+			}
+			.record-list-text{
+				float: right;
+				line-height: 86rpx;
+				font-size: $font-size-34;
+				color: #FF2A2A;
+				text-align: right;
+			}
+		}
+	}
+</style>

pages/user/member/member-renew.vue

@@ -0,0 +1,256 @@
+<template>
+	<view class="container clearfix">
+		<view class="cm-member-top">
+			<view class="cm-member-head">
+				<view class="cm-member-text">
+					<view class="cm-member-h1">
+						<text>采美·超级会员</text>
+					</view>
+					<view class="cm-member-p">
+						<text>享专属特权</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="cm-member-main">
+			<view class="title">超级会员套餐</view>
+			<view class="cm-member-pay">
+				<view class="pay-item" 
+					  v-for="(pay,index) in payList" 
+					  :key="index" 
+					  :class="{current: tabCurrent === index}" 
+					  @click="handleCheckedPay(index,pay)"
+				>
+					<view class="hot" v-if="index == 0">推荐</view>
+					<view class="text-1">{{ pay.month }}</view>
+					<view class="text-2"> <text>￥</text>{{ pay.money }}</view>
+					<view class="text-3">{{ pay.text }}</view>
+				</view>
+			</view>
+			<view class="cm-member-button">
+				<view class="pay-btn pay" @click="hanldPayUrl('/pages/user/member/member-pay')">立即支付{{ payAmount }}元开通</view>
+				<view class="pay-btn none">抵扣{{ payBeans }}个采美豆开通</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations} from 'vuex';
+	export default {
+		components:{
+			
+		},
+		data() {
+			return {
+				StaticUrl:this.$Static,
+				memberType:0,
+				tabCurrent:0,
+				params:{
+					userId:0,
+					redemptionCode:'',
+					source:2,
+				},
+				payList:[
+					{month:'12个月',money:4800,type:1,text:'400元/月',beans:480000},
+					{month:'3个月',money:1500,type:2,text:'500元/月',beans:150000},
+					{month:'1个月',money:600,type:3,text:'',beans:60000},
+				],
+				payAmount:4800,
+				payBeans:480000,
+			}
+		},
+		onLoad() {
+			
+		},
+		filters: {
+			TypeFormat:function(value) {
+				switch (value) {
+					case 0:
+						return  '活动券';
+						break;
+					case 1:
+						return  '品类券';
+						break;
+					case 2:
+						return  '用户专享券';
+						break;
+					case 3:
+						return  '店铺券';
+						break;
+					case 4:
+						return  '新用户券';
+						break;
+				}
+			}
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo','identity','isActivity'])
+		},
+		methods: {
+			hanldPayUrl(url){
+				this.$api.navigateTo(url)
+			},
+			handleCheckedPay(index,pay){// 选择会员
+				this.tabCurrent = index
+				this.payAmount = pay.money
+				this.payBeans = pay.beans
+			}
+		},
+		onShow(){
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.params.userId = resolve.userId ? resolve.userId : 0;
+			}).catch(error =>{
+				console.log('暂无用户信息~')
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.container{
+		width: 100%;
+		height: auto;
+	}
+	.cm-member-top{
+		width: 100%;
+		height: 242rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+		background: url(https://static.caimei365.com/app/img/icon/icon-member-bg01@2x.png) no-repeat;
+		background-size: cover;
+		position: relative;
+		.cm-member-head{
+			width: 702rpx;
+			height: 132rpx;
+			box-sizing: border-box;
+			padding: 30rpx 32rpx 0 109rpx;
+			background: url(https://static.caimei365.com/app/img/icon/icon-member-bg02@2x.png) no-repeat;
+			background-size: cover;
+			position: absolute;
+			bottom: 0;
+			left: 24rpx;
+			border-radius: 16rpx 16rpx 0 0;
+			.cm-member-text{
+				float: left;
+				.cm-member-h1{
+					line-height: 42rpx;
+					font-size: $font-size-30;
+					color: #55331D;
+					text-align: left;
+					margin-bottom: 12rpx;
+					font-weight: bold;
+				}
+				.cm-member-p{
+					line-height: 30rpx;
+					font-size: $font-size-22;
+					color: #55331D;
+					text-align: left;
+				}
+			}
+		}
+	}
+	.cm-member-main{
+		width: 100%;
+		box-sizing: border-box;
+		padding: 40rpx 24rpx;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		.title{
+			font-size: $font-size-32;
+			line-height: 45rpx;
+			text-align: left;
+			color:#55331D;
+			font-weight: bold;
+			.small{
+				font-size: $font-size-24;
+				color: #E4AA43;
+				font-weight: normal;
+				margin-left: 15rpx;
+			}
+		}
+		.cm-member-pay{
+			width: 100%;
+			height:236rpx;
+			margin: 40rpx 0;
+			.pay-item{
+				width: 218rpx;
+				height: 100%;
+				float: left;
+				margin-right: 24rpx;
+				border: 1px solid #F0F0F0;
+				border-radius: 16rpx;
+				box-sizing: border-box;
+				text-align: center;
+				padding: 40rpx 0;
+				position: relative;
+				.hot{
+					width: 80rpx;
+					height: 36rpx;
+					text-align: center;
+					line-height: 36rpx;
+					font-size: $font-size-24;
+					color: #FFFFFF;
+					background-color: #FF2A2A;
+					border-radius: 0 8rpx 8rpx 8rpx;
+					position: absolute;
+					left: 0;
+					top: -10rpx;
+				}
+				&.current{
+					background-color: #FDF8EE;
+					border: 1px solid #F0CC8C;
+				}
+				&:last-child{
+					margin-right: 0;
+				}
+				.text-1{
+					line-height: 40rpx;
+					font-size: $font-size-28;
+					margin-bottom: 10rpx;
+					color: #55331D;
+				}
+				.text-2{
+					line-height: 59rpx;
+					font-size: $font-size-40;
+					margin-bottom: 10rpx;
+					color: #FF2A2A;
+					font-weight: bold;
+					text{
+						font-size: $font-size-26;
+					}
+				}
+				.text-3{
+					line-height: 33rpx;
+					font-size: $font-size-24;
+					color: #666666;
+				}
+				
+			}
+		}
+		.cm-member-button{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 0 51rpx;
+			.pay-btn{
+				width: 100%;
+				height: 90rpx;
+				line-height: 90rpx;
+				border-radius: 50rpx;
+				text-align: center;
+				font-size: $font-size-30;
+				color: #55331D;
+				box-sizing: border-box;
+				margin-bottom: $font-size-24;
+				&.pay{
+					background: linear-gradient(90deg, #FEE9BA 0%, #F0CB72 100%);
+					font-weight: bold;
+				}
+				&.none{
+					border: 1px solid #F0CB72;
+					margin-bottom: 0;
+				}
+			}
+		}
+	}
+</style>

pages/user/member/member.vue

@@ -0,0 +1,821 @@
+<template>
+	<view class="container clearfix">
+		<view class="cm-member-top">
+			<view class="cm-member-cel" @click="hanldPayUrl('/pages/user/member/member-record')">购买记录</view>
+			<view class="cm-member-head">
+				<view class="cm-member-text">
+					<view class="cm-member-h1">
+						<text v-if="memberType == 0">采美·超级会员</text>
+						<text v-if="memberType == 1">已开通采美·超级会员</text>
+						<text v-if="memberType == 2">采美·超级会员已过期</text>
+					</view>
+					<view class="cm-member-p">
+						<text v-if="memberType == 0">享专属特权</text>
+						<text v-else>有效期至：2021-10-01</text>
+					</view>
+				</view>
+				<view class="cm-member-btn">
+					<view class="btn" @click="hanldPayUrl('/pages/user/member/member-renew')">续费</view>
+				</view>
+			</view>
+		</view>
+		<view class="cm-member-main">
+			<view class="title">超级会员套餐</view>
+			<view class="cm-member-pay">
+				<view class="pay-item" 
+					  v-for="(pay,index) in payList" 
+					  :key="index" 
+					  :class="{current: tabCurrent === index}" 
+					  @click="handleCheckedPay(index,pay)"
+				>
+					<view class="hot" v-if="index == 0">推荐</view>
+					<view class="text-1">{{ pay.month }}</view>
+					<view class="text-2"> <text>￥</text>{{ pay.money }}</view>
+					<view class="text-3">{{ pay.text }}</view>
+				</view>
+			</view>
+			<view class="cm-member-button">
+				<view class="pay-btn pay" @click="hanldPayUrl('/pages/user/member/member-pay')">立即支付{{ payAmount }}元开通</view>
+				<view class="pay-btn none">抵扣{{ payBeans }}个采美豆开通</view>
+			</view>
+		</view>
+		<view class="cm-member-main">
+			<view class="title">专属特权</view>
+			<view class="cm-member-privilege clearfix">
+				<view class="privilege-item" v-for="(priv,index) in privilegeList" :key="index">
+					<image class="image" :src="priv.icon" mode=""></image>
+					<view class="text-2">{{ priv.privText }}</view>
+					<view class="text-3">{{ priv.privName }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="cm-member-main">
+			<view class="title">专属优惠券<text class="small">每月可领4个</text></view>
+			<view class="cm-member-coupon clearfix">
+				<view 	v-for="(coupon,index) in productCouponList"
+						:key="index" 
+						:id="coupon.couponId" 
+						class="coupon-list" 
+						:class="coupon.useStatus == 1 ? 'none' : ''"
+				>
+					<view class="list-cell-tags">{{ coupon.couponType | TypeFormat }}</view>
+					<view class="list-cell-le">
+						<view class="coupon-maxMoney"><text class="small">￥</text>{{ coupon.couponAmount }}</view>
+						<view class="coupon-minMoney">满{{ coupon.touchPrice }}可用</view>
+						<view class="coupon-texts">
+							<text v-if="coupon.couponType == 0">
+								{{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
+							</text>
+							<text v-if="coupon.couponType == 1">
+								{{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
+							</text>
+							<text v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</text>
+							<text v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</text>
+						</view>
+					</view>
+					<view class="list-cell-ri">
+						<view class="icon-used-btn receive" v-if="coupon.useStatus == 0" @click="receiveCoupon(coupon)">立即领取</view>
+						<view class="icon-used-btn make" v-if="coupon.useStatus == 1">已领取</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="cm-member-main none">
+			<view class="title">
+				优惠商品
+				<view class="more" @click="hanldPayUrl('/pages/user/member/member-product')">更多<text class="iconfont icon-xiayibu"></text></view>
+			</view>
+			<view class="cm-member-product clearfix">
+				<view 	v-for="(pro,index) in productList"
+						:key="index" 
+						:id="pro.productId" 
+						class="product-list" 
+						@click="productDetail(pro.productId)"
+				>
+					<view class="product-image">
+						<image :src="pro.image" mode=""></image>
+					</view>
+					<view class="product-mains">
+						<view class="product-name">
+							{{ pro.name }}
+						</view>
+						<view class="product-tags">
+							<view class="floor-item-act" v-if="pro.actStatus==1">
+								<view class="floor-tags" v-if="PromotionsFormat(pro.promotions)">
+									{{pro.promotions.name}}
+									<text v-if="pro.priceFlag != 1">:￥{{ pro.price | NumFormat }}</text>
+								</view>
+								<view class="floor-tags" v-else>{{pro.promotions.name}}</view>	
+							</view>
+							<view class="floor-item-act" v-if="pro.actStatus==0">
+								<view class="floor-tags" v-if="pro.actStatus ==0  &&  pro.ladderPriceFlag==1">阶梯价格</view>	
+							</view>
+						</view>
+						<view class="product-price">
+							<view class="list-none" v-if="pro.priceFlag == 1">￥未公开价格</view>
+							<view class="list-none" v-else-if="pro.priceFlag == 2">￥价格仅会员可见</view>
+							<view class="list-none-price" v-else>￥{{ pro.price | NumFormat }}</view>
+						</view>
+						<view class="product-svip">
+							<view class="svip" v-if='pro.proType == 0'>
+								<view class="tags none">SVIP</view>
+							</view>
+							<view class="svip" v-if='pro.proType == 1'>
+								<view class="tags">SVIP</view>
+								<view class="price">{{ pro.discount }}</view>
+							</view>
+							<view class="svip" v-if='pro.proType == 2'>
+								<view class="tags">SVIP</view>
+								<view class="price">￥{{ pro.discountPrice | NumFormat }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 透明模态层 -->
+		<modal-layer v-if='isModallayer'></modal-layer>
+	</view>
+</template>
+
+<script>
+	import { mapState,mapMutations} from 'vuex'
+	import modalLayer from '@/components/modal-layer'
+	export default {
+		components:{
+			modalLayer
+		},
+		data() {
+			return {
+				StaticUrl:this.$Static,
+				isModallayer:false,
+				memberType:0,
+				tabCurrent:0,
+				params:{
+					userId:0,
+					redemptionCode:'',
+					source:2,
+				},
+				payList:[
+					{month:'12个月',money:4800,type:1,text:'400元/月',beans:480000},
+					{month:'3个月',money:1500,type:2,text:'500元/月',beans:150000},
+					{month:'1个月',money:600,type:3,text:'',beans:60000},
+				],
+				payAmount:4800,
+				payBeans:480000,
+				privilegeList:[
+					{
+						icon:'https://static.caimei365.com/app/img/icon/icon-member-prer1@2x.png',
+						privText:'优惠商品',
+						privName:'超级会员专享'
+					},
+					{
+						icon:'https://static.caimei365.com/app/img/icon/icon-member-prer2@2x.png',
+						privText:'专属优惠券',
+						privName:'超级会员专享'
+					},
+					{
+						icon:'https://static.caimei365.com/app/img/icon/icon-member-prer3@2x.png',
+						privText:'采美豆翻倍',
+						privName:'下单返采美豆'
+					},
+					{
+						icon:'https://static.caimei365.com/app/img/icon/icon-member-prer4@2x.png',
+						privText:'专属客服',
+						privName:'一对一'
+					},
+					{
+						icon:'https://static.caimei365.com/app/img/icon/icon-member-prer5@2x.png',
+						privText:'专属销售顾问',
+						privName:'一对一'
+					},
+					{
+						icon:'https://static.caimei365.com/app/img/icon/icon-member-prer6@2x.png',
+						privText:'快速发货',
+						privName:'会员加速'
+					},
+					{
+						icon:'https://static.caimei365.com/app/img/icon/icon-member-prer7@2x.png',
+						privText:'售后服务',
+						privName:'会员加速'
+					},
+					{
+						icon:'https://static.caimei365.com/app/img/icon/icon-member-prer8@2x.png',
+						privText:'敬请期待',
+						privName:'更多特权'
+					}
+				],
+				productCouponList:[
+					{
+						couponAmount:5000,
+						touchPrice:2000,
+						couponType:0,
+						productType:1,
+						categoryType:1,
+						shopName:null,
+						useStatus:0,
+					},
+					{
+						couponAmount:5000,
+						touchPrice:2000,
+						couponType:1,
+						productType:1,
+						categoryType:1,
+						shopName:null,
+						useStatus:0,
+					},
+					{
+						couponAmount:5000,
+						touchPrice:2000,
+						couponType:2,
+						productType:1,
+						categoryType:1,
+						shopName:null,
+						useStatus:1,
+					},
+					{
+						couponAmount:5000,
+						touchPrice:2000,
+						couponType:3,
+						productType:1,
+						categoryType:1,
+						shopName:null,
+						useStatus:1,
+					},
+				],
+				productList:[
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:0,
+						priceFlag:1,
+						originalPrice:100,
+						price:5000000,
+						actStatus:0,
+						promotions:null,
+						isChecked:false,
+						productIds:1000,
+						proType:1,
+						discount:'8.8折'
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:2,
+						originalPrice:100,
+						price:500000,
+						actStatus:1,
+						promotions:{
+							type:1,
+							mode:1,
+							name:'优惠价'
+						},
+						isChecked:false,
+						productIds:1001,
+						proType:2,
+						discountPrice:50000,
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:0,
+						originalPrice:100,
+						price:5000000,
+						actStatus:1,
+						promotions:{
+							type:0,
+							mode:0,
+							name:'单品满减'
+						},
+						isChecked:false,
+						productIds:1002,
+						proType:0,
+						discountPrice:50000,
+					},
+					{
+						image:'https://img.caimei365.com/group1/M00/00/10/rB-lGGCHqP-AIE9-AAEQHiqWjQY981.png',
+						name:'ET-SPACE全身热疗系统全身热疗系统生物热能太空舱',
+						unit:'台',
+						ladderPriceFlag:1,
+						priceFlag:0,
+						originalPrice:100,
+						price:50000000,
+						actStatus:0,
+						promotions:null,
+						isChecked:false,
+						productIds:1003,
+						proType:0,
+						discountPrice:50000,
+					}
+				]
+			}
+		},
+		onLoad() {
+			
+		},
+		filters: {
+			TypeFormat:function(value) {
+				switch (value) {
+					case 0:
+						return  '活动券'
+						break
+					case 1:
+						return  '品类券'
+						break
+					case 2:
+						return  '用户专享券'
+						break
+					case 3:
+						return  '店铺券'
+						break
+					case 4:
+						return  '新用户券'
+						break
+				}
+			},
+			NumFormat:function(text) {//处理金额
+				return Number(text).toFixed(2)
+			}
+		},
+		computed: {
+			...mapState(['hasLogin','userInfo','identity','isActivity'])
+		},
+		methods: {
+			hanldPayUrl(url){
+				this.$api.navigateTo(url)
+			},
+			handleCheckedPay(index,pay){// 选择会员
+				this.tabCurrent = index
+				this.payAmount = pay.money
+				this.payBeans = pay.beans
+			},
+			PromotionsFormat(promo){//促销活动类型数据处理
+				if(promo!=null){
+					if(promo.type == 1 && promo.mode == 1){
+						return true
+					}else{
+						return false
+					}
+				}
+				return false
+			},
+			productDetail(productId) {
+				this.isModallayer = true
+				this.$api.navigateTo(`/pages/goods/product?id=${productId}`)
+				this.isModallayer = false
+			},
+		},
+		onPullDownRefresh() {
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 200)
+		},
+		onShow(){
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				this.params.userId = resolve.userId ? resolve.userId : 0
+			}).catch(error =>{
+				console.log('暂无用户信息~')
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #F7F7F7;
+	}
+	.container{
+		width: 100%;
+		height: auto;
+	}
+	.cm-member-top{
+		width: 100%;
+		height: 242rpx;
+		box-sizing: border-box;
+		padding: 0 24rpx;
+		background: url(https://static.caimei365.com/app/img/icon/icon-member-bg01@2x.png) no-repeat;
+		background-size: cover;
+		position: relative;
+		.cm-member-cel{
+			float: right;
+			line-height: 40rpx;
+			font-size: $font-size-26;
+			margin-top: 40rpx;
+			color: #F0CB72;
+			text-align: right;
+		}
+		.cm-member-head{
+			width: 702rpx;
+			height: 132rpx;
+			box-sizing: border-box;
+			padding: 30rpx 32rpx 0 109rpx;
+			background: url(https://static.caimei365.com/app/img/icon/icon-member-bg02@2x.png) no-repeat;
+			background-size: cover;
+			position: absolute;
+			bottom: 0;
+			left: 24rpx;
+			border-radius: 16rpx 16rpx 0 0;
+			.cm-member-text{
+				float: left;
+				.cm-member-h1{
+					line-height: 42rpx;
+					font-size: $font-size-30;
+					color: #55331D;
+					text-align: left;
+					margin-bottom: 12rpx;
+					font-weight: bold;
+				}
+				.cm-member-p{
+					line-height: 30rpx;
+					font-size: $font-size-22;
+					color: #55331D;
+					text-align: left;
+				}
+			}
+			.cm-member-btn{
+				float: right;
+				padding-top: 12rpx;
+				.btn{
+					width: 118rpx;
+					height: 48rpx;
+					background: linear-gradient(270deg, #585658 0%, #323031 100%);
+					border-radius: 24rpx;
+					line-height: 48rpx;
+					text-align: center;
+					font-size: $font-size-24;
+					color: #F0CB72;
+				}
+			}
+		}
+	}
+	.cm-member-main{
+		width: 100%;
+		box-sizing: border-box;
+		padding: 40rpx 24rpx;
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		&.none{
+			background-color: #F7F7F7;
+			padding: 20rpx 24rpx 0 24rpx;
+		}
+		.title{
+			font-size: $font-size-32;
+			line-height: 45rpx;
+			text-align: left;
+			color:#55331D;
+			font-weight: bold;
+			.small{
+				font-size: $font-size-24;
+				color: #E4AA43;
+				font-weight: normal;
+				margin-left: 15rpx;
+			}
+			.more{
+				float: right;
+				font-weight: normal;
+				line-height: 45rpx;
+				font-size: $font-size-26;
+				color: #999999;
+				.iconfont{
+					margin-left: 10rpx;
+				}
+			}
+		}
+		.cm-member-pay{
+			width: 100%;
+			height:236rpx;
+			margin: 40rpx 0;
+			.pay-item{
+				width: 218rpx;
+				height: 100%;
+				float: left;
+				margin-right: 24rpx;
+				border: 1px solid #F0F0F0;
+				border-radius: 16rpx;
+				box-sizing: border-box;
+				text-align: center;
+				padding: 40rpx 0;
+				position: relative;
+				.hot{
+					width: 80rpx;
+					height: 36rpx;
+					text-align: center;
+					line-height: 36rpx;
+					font-size: $font-size-24;
+					color: #FFFFFF;
+					background-color: #FF2A2A;
+					border-radius: 0 8rpx 8rpx 8rpx;
+					position: absolute;
+					left: 0;
+					top: -10rpx;
+				}
+				&.current{
+					background-color: #FDF8EE;
+					border: 1px solid #F0CC8C;
+				}
+				&:last-child{
+					margin-right: 0;
+				}
+				.text-1{
+					line-height: 40rpx;
+					font-size: $font-size-28;
+					margin-bottom: 10rpx;
+					color: #55331D;
+				}
+				.text-2{
+					line-height: 59rpx;
+					font-size: $font-size-40;
+					margin-bottom: 10rpx;
+					color: #FF2A2A;
+					font-weight: bold;
+					text{
+						font-size: $font-size-26;
+					}
+				}
+				.text-3{
+					line-height: 33rpx;
+					font-size: $font-size-24;
+					color: #666666;
+				}
+				
+			}
+		}
+		.cm-member-button{
+			width: 100%;
+			box-sizing: border-box;
+			padding: 0 51rpx;
+			.pay-btn{
+				width: 100%;
+				height: 90rpx;
+				line-height: 90rpx;
+				border-radius: 50rpx;
+				text-align: center;
+				font-size: $font-size-30;
+				color: #55331D;
+				box-sizing: border-box;
+				margin-bottom: $font-size-24;
+				&.pay{
+					background: linear-gradient(90deg, #FEE9BA 0%, #F0CB72 100%);
+					font-weight: bold;
+				}
+				&.none{
+					border: 1px solid #F0CB72;
+					margin-bottom: 0;
+				}
+			}
+		}
+		.cm-member-privilege{
+			width: 100%;
+			margin: 24rpx 0 16rpx 0;
+			background-color: #FFFFFF;
+			.privilege-item{
+				width: 25%;
+				height: 196rpx;
+				margin: 16rpx 0;
+				float: left;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				.image{
+					width: 90rpx;
+					height: 90rpx;
+					display: block;
+				}
+				.text-2{
+					font-size: $font-size-26;
+					color: #333333;
+					line-height: 36rpx;
+					margin-top: 12rpx;
+				}
+				.text-3{
+					font-size: $font-size-22;
+					color: #999999;
+					line-height: 30rpx;
+					margin-top: 6rpx;
+				}
+			}
+		}
+		.cm-member-coupon{
+			width: 100%;
			margin: 24rpx 0 0 0;
+			.coupon-list{
+				width: 338rpx;
+				height: 148rpx;
+				border-radius: 8rpx;
+				margin-bottom: 24rpx;
+				box-sizing: border-box;
+				background: url(https://static.caimei365.com/app/img/icon/icon-member-coupon@2x.png);
+				background-size: cover;
+				margin-right: 24rpx;
+				float: left;
+				position: relative;
+				&:nth-child(2n){
+					margin-right: 0;
+				}
+				&.none{
+					background: url(https://static.caimei365.com/app/img/icon/icon-member-coupon-none@2x.png);
+					background-size: cover;
+				}
+				.list-cell-tags{
+					display: inline-block;
+					padding: 0 10rpx;
+					height: 27rpx;
+					line-height: 27rpx;
+					background-color: #E4AA43;
+					color: #55331D;
+					font-size: $font-size-20;
+					border-radius: 8rpx 0 8rpx 0;
+					text-align: center;
+					position: absolute;
+					top: 0;
+					left: 0;
+				}
+				.list-cell-le{
+					width: 258rpx;
+					height: 100%;
+					box-sizing: border-box;
+					padding: 27rpx 24rpx 0 26rpx;
+					float: left;
+					.coupon-maxMoney{
+						width: 100%;
+						height: 50rpx;
+						line-height: 50rpx;
+						font-size: 40rpx;
+						color: #55331D;
+						text-align: left;
+						.small{
+							font-size: $font-size-24;
+						}
+					}
+					.coupon-minMoney{
+						width: 100%;
+						height: 30rpx;
+						line-height: 30rpx;
+						font-size: $font-size-24;
+						color: #55331D;
+						text-align: left;
+					}
+					.coupon-texts{
+						width: 100%;
+						height: 30rpx;
+						line-height: 30rpx;
+						font-size: $font-size-24;
+						color: #55331D;
+						text-align: left;
+						-o-text-overflow: ellipsis;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						word-break: break-all;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 1;
+						overflow: hidden;
+					}
+				}
+				.list-cell-ri{
+					width: 80rpx;
+					height: 100%;
+					float: right;
+					.icon-used-btn{
+						width: 100%;
+						height: 100%;
+						box-sizing: border-box;
+						font-size: $font-size-22;
+						text-align: center;
+						&.receive{
+							color: #55331D;
+							padding: 15rpx 28rpx;
+						}
+						&.make{
+							padding: 30rpx 28rpx;
+							color: #FFFFFF;
+						}
+					}
+				}
+			}
+		}
+		.cm-member-product{
+			width: 100%;
+			margin-top: 16rpx;
+			.product-list{
+				width: 339rpx;
+				height: 560rpx;
+				border-radius: 16rpx;
+				float: left;
+				margin-right: 24rpx;
+				margin-bottom: 24rpx;
+				background-color: #FFFFFF;
+				&:nth-child(2n){
+					margin-right: 0;
+				}
+				.product-image{
+					width: 339rpx;
+					height: 339rpx;
+					image{
+						width: 339rpx;
+						height: 339rpx;
+						display: block;
+						border-radius: 16rpx 16rpx 0 0;
+					}
+				}
+				.product-mains{
+					width: 100%;
+					height: auto;
+					box-sizing: border-box;
+					padding: 0 24rpx;
+					margin-top: 8rpx;
+					.product-name{
+						line-height: 36rpx;
+						text-overflow: ellipsis;
+						overflow: hidden;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						line-clamp: 2;
+						-webkit-box-orient: vertical;
+						font-size: $font-size-26;
+						color: #333333;
+						text-align: justify;
+					}
+					.product-tags{
+						width: 100%;
+						height: 32rpx;
+						margin-top: 4rpx;
+						.floor-item-act{
+							width: 100%;
+							height: 32rpx;
+							text-align: center;
+							box-sizing: border-box;
+							float: left;
+							.floor-tags{
+								height: 32rpx;
+								box-sizing: border-box;
+								border-radius: 8rpx;
+								background-color: #FFFFFF;
+								line-height: 28rpx;
+								color: $color-system;
+								text-align: center;
+								display: inline-block;
+								padding:0 8rpx;
+								font-size: $font-size-20;
+								border: 1px solid #E15616;
+								float: left;
+							}
+						}
+					}
+					.product-price{
+						width: 100%;
+						line-height: 37rpx;
+						font-size: $font-size-26;
+						color: #333333;
+						margin-top: 8rpx;
+						.list-none-price{
+							text-decoration: line-through;
+							color: #999999;
+						}
+					}
+					.product-svip{
+						width: 100%;
+						height: 32rpx;
+						margin-top: 10rpx;
+						.svip{
+							padding-left: 44rpx;
+							height: 32rpx;
+							position: relative;
+							.tags{
+								width: 60rpx;
+								height: 32rpx;
+								background-color: #333333;
+								text-align: center;
+								line-height: 32rpx;
+								font-size: $font-size-22;
+								color: #F0CB72;
+								position: absolute;
+								left: 0;
+								top: 0;
+								border-radius: 8rpx 16rpx 8rpx 8rpx;
+								&.none{
+									border-radius: 8rpx;
+								}
+							}
+							.price{
+								height: 32rpx;
+								box-sizing: border-box;
+								border-radius:0 8rpx 8rpx 0;
+								background-color: #F0CB72;
+								line-height: 32rpx;
+								color: #333333;
+								text-align: center;
+								padding:0 9rpx 0 25rpx;
+								font-size: $font-size-26;
+								float: left;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

services/user.service.js

@@ -25,7 +25,7 @@ export default class UserService {
 			isHost:true
 		})
 	}
-	/* 普通机构注册 */
+	/* 个人机构注册 */
 	UserRegisterClub (data = {}) {
 		return this.AjaxService.post({ 
 			url:'/user/register/club', 
@@ -76,7 +76,7 @@ export default class UserService {
 			isHost:true
 		})
 	}
-	/* 机构升级会员机构 */
+	/* 机构升级资质机构 */
 	OrganizationRegister (data = {}) {
 		return this.AjaxService.post({ 
 			url:'/user/register/club/upgrade', 
@@ -132,7 +132,7 @@ export default class UserService {
 			isHost:true
 		})
 	}
-	/*普通机构取消提示*/
+	/*个人机构取消提示*/
 	CancelPrompt (data = {}) {
 		return this.AjaxService.get({ 
 			url:'/user/register/guide', 

store/index.js

@@ -18,7 +18,7 @@ const store = new Vuex.Store({
 		isLoginProductId:0
 	},
 	mutations: {
-		login(state, provider) {//用户身份 1、协销 2、会员机构 3、供应商 4.普通机构
+		login(state, provider) {//用户身份 1、协销 2、资质机构 3、供应商 4.个人机构
 			state.hasLogin = true;
 			state.userInfo = provider;
 			uni.setStorage({//缓存用户登陆状态