commit -m 维沙

pages.json

@@ -13,6 +13,11 @@
 				"navigationBarTitleText": "微信授权",
 				"navigationStyle":"custom"
 			}
+		},{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+			}
 		},{
 			"path": "pages/tabBar/home/index",
 			"style": {
@@ -38,42 +43,6 @@
 		{
 			"root": "pages/service/",//信息服务模块
 			"pages": [
-				{
-					"path": "aftersale",
-					"style": {
-						"navigationBarTitleText": "售后无忧"
-					}
-				},
-				{
-					"path": "shoppingnotice",
-					"style": {
-						"navigationBarTitleText": "购物须知"
-					}
-				},
-				{
-					"path": "organagree",
-					"style": {
-						"navigationBarTitleText": "机构协议"
-					}
-				},
-				{
-					"path": "useragree",
-					"style": {
-						"navigationBarTitleText": "用户协议"
-					}
-				},
-				{
-					"path": "supplieragree",
-					"style": {
-						"navigationBarTitleText": "供应商协议"
-					}
-				},
-				{
-					"path": "privacyagree",
-					"style": {
-						"navigationBarTitleText": "隐私权政策"
-					}
-				},
 				{
 					"path": "sellconten",
 					"style": {
@@ -92,13 +61,6 @@
 						"enablePullDownRefresh":true
 					}
 				},
-				{
-					"path": "goods-instrument",
-					"style": {
-						"navigationBarTitleText": "项目仪器",
-						"enablePullDownRefresh":true
-					}
-				},
 				{
 					"path": "goods-classify",
 					"style": {
@@ -107,28 +69,6 @@
 						"navigationStyle":"custom"
 					}
 				},
-				{
-					"path": "good-floorMore",
-					"style": {
-						"navigationBarTitleText": "更多楼层",
-						"enablePullDownRefresh":true
-					}
-				},
-				{
-					"path": "good-floor",
-					"style": {
-						"navigationBarTitleText": "",
-						"enablePullDownRefresh":true,
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "goods-active",
-					"style": {
-						"navigationBarTitleText": "凑单商品",
-						"enablePullDownRefresh":true
-					}
-				},
 				{
 					"path": "product",
 					"style": {
@@ -136,13 +76,6 @@
 						"navigationStyle":"custom"
 					}
 				},
-				{
-					"path": "instrument-details",
-					"style": {
-						"navigationBarTitleText": "项目仪器详情",
-						"navigationStyle":"custom"
-					}
-				},
 				{
 					"path": "cart",
 					"style": {
@@ -153,99 +86,9 @@
 				}
 			]
 		},
-		{
-			"root": "pages/login/",//注册登录模块
-			"pages": [
-				{
-					"path": "register",
-					"style": {
-						"navigationBarTitleText": "机构注册",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "register-supplier",
-					"style": {
-						"navigationBarTitleText": "供应商注册",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "register-select",
-					"style": {
-						"navigationBarTitleText": "选择身份"
-					}
-				},
-				{
-					"path": "apply",
-					"style": {
-						"navigationBarTitleText": "升级会员机构",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "apply-supplier",
-					"style": {
-						"navigationBarTitleText": "修改申请资料",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "logincode",
-					"style": {
-						"navigationBarTitleText": "邀请码登录"
-					}
-				},
-				{
-					"path": "login",
-					"style": {
-						"navigationBarTitleText": "登录"
-					}
-				},
-				{
-					"path": "bindemail",
-					"style": {
-						"navigationBarTitleText": "绑定邮箱"
-					}
-				},
-				{
-					"path": "bindwechat",
-					"style": {
-						"navigationBarTitleText": "绑定微信"
-					}
-				},
-				{
-					"path": "bindOperator",
-					"style": {
-						"navigationBarTitleText": "绑定运营人员"
-					}
-				},
-				{
-					"path": "information",
-					"style": {
-						"navigationBarTitleText": "修改资料",
-						"navigationStyle":"custom"
-					}
-				},
-				{
-					"path": "password",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				}
-			]
-		},
 		{
 			"root": "pages/user/",//机构个人中心模块
 			"pages": [
-				{
-					"path": "account/account",
-					"style": {
-						"navigationBarTitleText": "账户余额明细",
-						"enablePullDownRefresh" : true,
-						"navigationStyle":"custom"
-					}
-				},
 				{
 					"path": "address/addressManage",
 					"style": {
@@ -258,12 +101,6 @@
 						"navigationBarTitleText": "地址列表"
 					}
 				},
-				{
-					"path": "about/about",
-					"style": {
-						"navigationBarTitleText": "关于我们"
-					}
-				},
 				{
 				    "path" : "regularPurchase/regularPurchase",
 				    "style" : {
@@ -334,36 +171,6 @@
 					"style": {
 						"navigationBarTitleText": "物流信息"
 					}
-				},
-				{
-					"path": "operator/list",
-					"style": {
-						"navigationBarTitleText": "运营人员管理"
-					}
-				},
-				{
-					"path": "operator/addoperator",
-					"style": {
-						"navigationBarTitleText": "添加运营人员"
-					}
-				},
-				{
-					"path": "setting/setting",
-					"style": {
-						"navigationBarTitleText": "账户设置"
-					}
-				},
-				{
-					"path": "setting/phone",
-					"style": {
-						"navigationBarTitleText": "更换手机号"
-					}
-				},
-				{
-					"path": "coupon/coupon",
-					"style": {
-						"navigationBarTitleText": "优惠券"
-					}
 				}
 			]	
 		}

pages/goods/good-floor.vue

@@ -1,153 +0,0 @@
-<template>
-	<view class="container floor clearfix" :style="{paddingTop:CustomBar+'px'}">
-		<custom-floor   :systeminfo='systeminfo' 
-						:navbar-data='nvabarData' 
-						:headerBtnPosi ="headerBtnPosi">
-		</custom-floor>
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-home tui-skeleton">
-			<!-- 金刚区菜单 -->
-			<templateNav :list="navBarsList" v-if="isRequest"></templateNav>
-		</view>	
-		<!-- 楼层 -->
-		<view class="container-section tui-skeleton">
-			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType="2" v-if="isRequest"></page-floor>
-		</view>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations} from 'vuex';
-	import customFloor from '@/components/cm-custom/custom-floor' 		 //自定义导航
-	import templateNav from '@/components/cm-module/pageTemplate/templateNav.vue'
-	import pageFloor from '@/components/cm-module/homeIndex/pageFloor.vue'
-	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	
-	export default{
-		components:{
-			customFloor,
-			templateNav,
-			pageFloor
-		},
-		data(){
-			return{
-				userID:0,
-				shopId:0,
-				userIdentity:0,
-				skeletonShow:true,
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo: this.setSysteminfo(),		 //获取设备信息
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				navBarsList:[],
-				pageList:[],//楼层
-				isRequest:false,
-				isScrollTop:false,
-				pageId:'',
-				typeSort:'',
-			}
-		},
-		onLoad(option) {
-			if(option.type =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-			this.pageId = option.linkId
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
-				this.userIdentity = resolve.userIdentity
-				this.GetInstrumentPageData();
-			}).catch(error =>{
-				this.GetInstrumentPageData();
-			})
-			setTimeout(()=>{
-				this.skeletonShow = false
-			},2000)
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity'])
-		},
-		methods:{
-			GetInstrumentPageData(){//获取楼层数据
-				this.CommonService.GetInstrumentPageData({pageId:this.pageId,userId:this.userID,source:2}).then(response =>{
-					let data = response.data
-					this.typeSort = data.page.typeSort
-					this.pageList = data.floorList
-					this.GetHomeInit()
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetHomeInit(){//金刚区分类
-				this.CommonService.GetFirstClassly({typeSort:this.typeSort,source:'crm'}).then(response =>{
-					this.navBarsList = response.data
-					this.isRequest =true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			setHeaderBtnPosi(){
-				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				return headerBtnPosi
-			},
-			setSysteminfo(){
-				let systeminfo;
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			},
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>400){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onPullDownRefresh() {
-			setTimeout(() => {
-				uni.stopPullDownRefresh()
-			}, 200)
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: '采美-一站式生/医美采购服务平台',
-			  path: `pages/goods/good-floor?type=share&linkId=${this.pageId}`
-			}
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	.container-home{
-		width: 100%;
-		height: auto;
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-	}
-</style>

pages/goods/good-floorMore.vue

@@ -1,171 +0,0 @@
-<template>
-	<view class="container floor clearfix">
-		<view class='navbar-wrap'> 
-			<view class="gosearch-btn" @click="this.$api.navigateTo(clickPath)">
-				<view class="search-icon">
-					<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				</view>
-				<view class="search-text">{{hotSearchText}}</view>
-			</view>
-		</view>
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<!-- 楼层 -->
-		<view class="container-section tui-skeleton">
-			<template v-if="pageData.floorContent.templateType == '1'">
-				<templateA :pageData="pageData" :userIdentity="userIdentity" v-if="isRequest"></templateA>
-			</template>	 
-			<template v-if="pageData.floorContent.templateType == '2'">
-				<templateB :pageData="pageData" :userIdentity="userIdentity" v-if="isRequest"></templateB>
-			</template>	 
-			<template v-if="pageData.floorContent.templateType == '3'">
-				<templateC :pageData="pageData" :userIdentity="userIdentity" v-if="isRequest"></templateC>
-			</template>	 
-			<template v-if="pageData.floorContent.templateType == '4'">
-				<templateD :pageData="pageData" :userIdentity="userIdentity" v-if="isRequest"></templateD>
-			</template>	 
-			<template v-if="pageData.floorContent.templateType == '5' || pageData.floorContent.templateType == '6'">
-				<templateE :pageData="pageData" :userIdentity="userIdentity" v-if="isRequest"></templateE>
-			</template>	 
-			<template v-if="pageData.floorContent.templateType == '7'">
-				<templateF :pageData="pageData" :userIdentity="userIdentity" v-if="isRequest"></templateF>
-			</template>	 
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations} from 'vuex';
-	import templateA from '@/components/cm-module/pageFloorTemplate/templateA.vue'
-	import templateB from '@/components/cm-module/pageFloorTemplate/templateB.vue'
-	import templateC from '@/components/cm-module/pageFloorTemplate/templateC.vue'
-	import templateD from '@/components/cm-module/pageFloorTemplate/templateD.vue'
-	import templateE from '@/components/cm-module/pageFloorTemplate/templateE.vue'
-	import templateF from '@/components/cm-module/pageFloorTemplate/templateF.vue'
-	export default{
-		components:{
-			templateA,
-			templateB,
-			templateC,
-			templateD,
-			templateE,
-			templateF
-		},
-		data(){
-			return{
-				clickPath:'/search/pages/search/search',
-				hotSearchText:'搜索商品/供应商/项目仪器',	
-				userIdentity:0,
-				skeletonShow:true,
-				isRequest:false,
-				navBarsList:[],
-				pageData:{},//楼层
-				floorId:null,
-				pageType:null
-			}
-		},
-		onLoad(option) {
-			this.pageType = option.pageType
-			this.floorId = Number(option.floorId)
-			uni.setNavigationBarTitle({title:option.title});
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.clubStatus = resolve.clubStatus
-				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopID ? resolve.shopID : 0;
-				this.userIdentity = resolve.userIdentity
-				this.GetHomeFloorContentDetails(this.pageType);
-			}).catch(error =>{
-				this.GetHomeFloorContentDetails(this.pageType);
-			})
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity'])
-		},
-		methods:{
-			GetHomeFloorContentDetails(pageType){//楼层查看更多
-				if(pageType == '1'){
-					this.CommonService.GetHomeFloorContentDetails({userId:this.userID,floorId:this.floorId,source:2}).then(response =>{
-						this.pageData = response.data
-						this.skeletonShow = false
-						this.isRequest = true
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				}else{
-					this.CommonService.GePageFloorContentDetails({userId:this.userID,centreId:this.floorId,source:2}).then(response =>{
-						this.pageData = response.data
-						this.skeletonShow = false
-						this.isRequest = true
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				}
-			}
-		},
-		onPullDownRefresh() {
-			setTimeout(() => {
-				this.GetHomeFloorContentDetails(this.pageType);
-				uni.stopPullDownRefresh()
-			}, 200)
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	.container-home{
-		width: 100%;
-		height: auto;
-	}
-	.container-section{
-		width: 100%;
-		height: auto;
-		background-color: #F7F7F7;
-		box-sizing: border-box;
-		padding:24rpx;
-	}
-	.navbar-wrap {
-		 width: 100%;
-		 height: 116rpx;
-		 box-sizing: border-box;
-		 background: #FFFFFF;
-		 padding: 25rpx 24rpx;
-		 .gosearch-btn{
-		 	width: 100%;
-		 	height: 100%;
-		 	border-radius: 40rpx;
-		 	font-size: 28rpx;
-		 	line-height: 66rpx;
-		 	color: #8A8A8A;
-		 	background: #f7f7f7;
-		 	position: relative;
-		 	box-sizing: border-box;
-		 	padding-left: 66rpx;
-		 	.search-icon{
-		 		width: 66rpx;
-		 		height: 66rpx;
-		 		position:absolute ;
-		 		left: 0;
-		 		top: 2rpx;
-		 		text-align: center;
-		 		line-height: 66rpx;
-		 		.icon-iconfonticonfontsousuo1{
-		 			margin:0 6rpx;
-		 			font-size: $font-size-34;
-		 			color: #8A8A8A;
-		 			z-index: 10;
-		 		}
-		 	}
-		 	.search-text{
-		 		font-size: $font-size-24;
-		 		line-height: 66rpx;
-		 		color: #8A8A8A;
-		 	}
-		 }
-	}
-</style>
-                               

pages/goods/goods-active.vue

@@ -1,303 +0,0 @@
-<template>
-	<view class="container" v-show="isRepuest">
-		<view class="container-title">
-			<view class="name">【{{promotionsInfo.name}}】{{promotionsInfo.description}}</view>
-			<view class="text">
-				<text class="span">促销时间:</text>
-				<text class="span r">
-					<text class="txt" v-if="promotionsInfo.status == 1">不限时</text>
-					<text class="txt" v-else>{{ promotionsInfo.beginTime }} ～ {{ promotionsInfo.endTime }}</text>
-				</text>
-			</view>
-			<view class="text">下面为参与本次凑单满赠活动的全部商品</view>
-		</view>
-		<view class="tui-order-content">
-			<view class="hotgoods-swiper">
-				<view class="scoll-wrapper clearfix">
-					<view class="floor-item" v-for="(item, index) in  productList" :key="index" @click.stop="detail(item.productId)">
-						<image class="tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
-						<view class="floor-item-content">
-							<view class="title"><text class="mclap">{{item.name}}</text></view>
-							<view class="price">
-								<text class="p sm">￥</text>
-								<text class="p big">{{item.price | NumFormat}}</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>
-			<!--加载loadding-->
-		</view>
-	</view>
-</template>
-
-<script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	
-	export default {
-		components: {
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				isRepuest:false,
-				userID:0,
-				promotionsId:0,
-				productList: [],
-				pageSize:10,
-				pageNum:1,
-				loadding: false,
-				pullUpOn: true,
-				modal:false,
-				promotionsInfo:{},
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				nomoreText: '上拉显示更多',
-			}
-		},
-		onLoad(option) {
-			this.promotionsId=option.id
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userID = resolve.userID ? resolve.userID :0;
-				this.initSsoMemberCollectionList()
-			}).catch(error =>{
-				this.initSsoMemberCollectionList()
-			})
-		},
-		filters: {
-			NumFormat:function(text) {//处理金额
-				return Number(text).toFixed(2);
-			},
-		},
-		methods: {
-			initSsoMemberCollectionList(id){//凑单初始化
-				this.ProductService.queryProductPromotionInfo({promotionsId:this.promotionsId}).then(response =>{
-					let data = response.data
-					this.promotionsInfo = data
-					this.queryProductPromotionList()
-				}).catch(error =>{
-					this.$util.msg(error.message,2000)
-				})	
-			},
-			queryProductPromotionList(id){//查询凑单商品列表
-				this.ProductService.queryProductPromotionList({pageNum:this.pageNum,pageSize:this.pageSize,promotionsId:this.promotionsId}).then(response =>{
-					let data = response.data
-					if(data.list && data.list.length > 0){
-						this.hasNextPage = data.hasNextPage;
-						this.productList = data.list;
-						this.getProductPrice()
-						// 防上拉暴滑
-						this.pullFlag = false;
-						setTimeout(()=>{ this.pullFlag = true; },500)
-						// 底部提示文案
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.productList.length < 2){
-								this.pullUpOn = true
-							}else{
-								this.pullUpOn = false
-								this.nomoreText = '已至底部'
-							}
-						}
-					}
-				}).catch(error =>{
-					this.$util.msg(error.message,2000)
-				})	
-			},
-			getOnReachBottomData(){//上滑加载
-				this.pageNum+=1
-				this.ProductService.queryProductPromotionList({pageNum:this.pageNum,pageSize:this.pageSize,promotionsId:this.promotionsId}).then(response =>{
-					let data = response.data
-					if(data.list&&data.list.length > 0){
-						this.hasNextPage = data.hasNextPage;
-						this.productList = this.productList.concat(data.list) 
-						this.getProductPrice()
-						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)
-				})
-			},
-			getProductPrice(){//获取商品或者活动价格
-				let productIdArr = [];
-				let productIds ='';
-				this.productList.map(item=>{
-					productIdArr.push(item.id)
-				})
-				productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
-					this.productList = this.ReturnNewProducts(this.productList,response.data);
-					this.isRepuest = true;
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			ReturnNewProducts(Array,list){
-				let NewArray = []
-				Array.map(item=>{
-					for (let i = 0; i < list.length; i++) {
-						if( item.id == list[i].productId ){
-							NewArray.push(Object.assign(item,list[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			detail: function(id) {
-				this.$api.navigateTo(`/pages/goods/productDetail?id=${id}`)
-			},
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.pageNum = 1
-			this.queryProductPromotionList()
-			uni.stopPullDownRefresh()
-		},
-		onShow() {
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.container {
-		padding-bottom: 0;
-	}
-	.container-title{
-		width: 100%;
-		height: 242rpx;
-		box-sizing: border-box;
-		padding:21rpx 24rpx 23rpx 24rpx;
-		background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/09/%E8%83%8C%E6%99%AF%E5%9B%BE.png) no-repeat;
-		background-size: cover;
-		.name{
-			width: 100%;
-			box-sizing: border-box;
-			height: 96rpx;
-			line-height: 36rpx;
-			padding: 12rpx 0;
-			font-size: $font-size-28;
-			color: #FFFFFF;
-		}
-		.text{
-			width: 100%;
-			height: 48rpx;
-			line-height: 48rpx;
-			font-size: $font-size-24;
-			color: #FFFFFF;
-			.span{
-				display: inline-block;
-				float: left;
-				&.r{
-					padding:0 20rpx;
-					height: 36rpx;
-					line-height: 36rpx;
-					border-radius: 6rpx;
-					text-align: center;
-					color: $color-system;
-					font-size: $font-size-26;
-					margin-top: 4rpx;
-					background-color: #FFFFFF;
-					margin-left: 10rpx;
-				}
-			}
-		}
-	}
-	.hotgoods-swiper{
-		width: 100%;
-		height: auto;				
-		overflow: hidden;
-		margin-bottom: 20rpx;
-		.scoll-wrapper{
-			width: 100%;
-			height: auto;
-			box-sizing: border-box;
-			padding: 24rpx;
-			background: #F7F7F7;
-			.floor-item{
-				width: 340rpx;
-				height: auto;
-				margin-right: 20rpx;
-				font-size: $font-size-24;
-				color: $text-color;
-				background: #FFFFFF;
-				line-height: 36rpx;
-				border-radius: 14rpx;
-				margin-bottom: 20rpx;
-				float: left;
-				box-sizing: border-box;
-				padding-bottom: 16rpx;
-				&:nth-child(2n){
-					margin-right: 0;
-				}
-				image{
-					width: 341rpx;
-					height: 341rpx;
-					border-radius: 20rpx 20rpx 0 0;
-					display: block;
-					margin-bottom: 20rpx;
-				}
-				.floor-item-content{
-					width: 100%;
-					padding: 0 15rpx;
-					box-sizing: border-box;
-				}
-				.title{
-					width: 100%;
-					height: 72rpx;
-					display: flex;
-					flex-direction: column;
-					padding: 10rpx 0;
-					.mclap{
-						width: 100%;
-						line-height: 36rpx;
-						text-overflow:ellipsis;
-						display: -webkit-box;
-						word-break: break-all;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						overflow: hidden;
-						font-size: 26rpx;
-					}
-				}
-				.price{
-					color: #333333;
-					line-height: 44rpx;
-					.sm{
-						font-size: $font-size-24;
-					}
-					.big{
-						font-size: $font-size-28;
-					}
-				}
-			}
-		}
-	}
-</style>

pages/goods/goods-instrument.vue

@@ -1,279 +0,0 @@
-<template>
-	<view class="container instrument clearfix">
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<template v-else>
-			<view class="instrument-btn" v-if="buttonName" :style="{paddingBottom :isIphoneX ? '68rpx' : '34rpx'}">
-				<view class="btn" @click="ButtonNavigateTo(buttonLinkType,buttonLinkParam.id,buttonLink,buttonLinkKeyword)">{{ buttonName }}</view>
-			</view>
-			<view class="banner clearfix">
-				<view class="banner-image">
-					<image :src="banner" mode=""></image>
-				</view>
-				<view class=content v-if="linkId == 6">
-					<text>{{ content }}</text>
-				</view>
-			</view>
-			<view class="instrument-list clearfix" :style="{paddingBottom :isIphoneX ? '83px' : '34px'}">
-				<view class="list-item-cell" v-for="(item,index) in list" :key="index">
-					<view class="list-item-title">
-						<view class="title" :class="item.link ? 'float' : ''">
-							<text>{{ item.title }}</text>
-						</view>
-						<view class="more" v-if="item.link" @click="NavToDetailPage(item)">
-							<text>查看更多</text>
-							<text class="iconfont icon-xiangyou"></text>
-						</view>
-					</view>
-					<view class="list-item-pros">
-						<view class="item-pros" v-for="(pros,prosIndex) in item.floorData" :key="prosIndex" @click="NavToDetailPage(pros)">
-							<view class="item-pros-image">
-								<image :src="pros.image" mode=""></image>
-							</view>
-							<view class="item-pros-name">{{ pros.title }}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</template>
-		<!-- 侧边 -->
-		<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
-	</view>
-</template>
-
-<script>
-	export default{
-		components:{
-			
-		},
-		data(){
-			return{
-				isIphoneX:this.$store.state.isIphoneX,
-				banner:'',
-				list:[],
-				linkId:0,
-				isScrollTop:false,
-				linkTitle:'',
-				skeletonShow:true,
-				content:'',
-				buttonName:'',
-				buttonLink:'',
-				buttonLinkType:'',
-				buttonLinkParam:{},
-				buttonLinkKeyword:''
-			}
-		},		
-		onLoad(option) {
-			console.log(option)
-			let _self = this
-			this.linkId = option.linkId
-			this.linkTitle = option.title
-			this.GetPageTopicInfo()
-		},
-		methods:{
-			GetPageTopicInfo(){//获取数据
-				this.ProductService.GetPageTopic({type:this.linkId}).then(response =>{
-					let data = response.data
-					this.list = data
-					this.GetPageTopicBanner()
-					this.skeletonShow = false
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			GetPageTopicBanner(){//获取banner
-				this.ProductService.GetPageTopicBanner({type:this.linkId}).then(response =>{
-					let data = response.data
-					this.banner = data.image
-					this.content = data.content
-					this.buttonLink = data.buttonLink
-					this.buttonName = data.buttonName
-					this.buttonLinkType = data.linkType
-					this.buttonLinkParam = data.linkParam
-					this.buttonLinkKeyword = data.keywords
-					uni.setNavigationBarTitle({title:data.title});
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			NavToDetailPage(pros) {//跳转
-				if(pros.linkType){
-					const typeMap = {
-					 	1:`/pages/goods/goods-instrument?linkId=${pros.linkParam.id}&title=${pros.title}`,
-					 	2:`/pages/goods/instrument-details?id=${pros.linkParam.id}`,
-						4:`/h5/pages/activity/activity?title=${pros.crmTitle}&link=${pros.crmLink}`,
-					 	5:`/pages/goods/product?id=${pros.linkParam.id}`,
-					 	7:`/supplier/pages/user/my-shop?shopId=${pros.linkParam.id}`,
-					 	8:`/h5/pages/activity/activity-list`,
-					 	9:`/second/pages/form/introduce`,
-					 	10:`/second/pages/product/product-list`,
-					 	11:`/second/pages/form/form`,
-					 	12:`/search/pages/search/search?keyWord=${pros.linkParam.keyword}`,
-					 	13:`/h5/pages/article/path?link=${pros.link}`,
-					 	14:`/h5/pages/article/path?link=${pros.link}`,
-					 	15:`/h5/pages/article/path?link=${pros.link}`,
-					 	17:`/pages/login/register-select`,
-					 	18:`/h5/pages/article/path?link=${pros.link}`,
-					 	19:`/search/pages/search/search-supplier?keyWord=${pros.linkParam.keyword}`
-					}
-					const url = typeMap[pros.linkType];
-					uni.navigateTo({
-					  	url:url
-					})
-				}
-			},
-			ButtonNavigateTo(linkType,linkId,linkHref,keyword) {//跳转
-				this.$api.BannerNavigateTo(linkType,linkId,linkHref,keyword)
-			}
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>600){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}	
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F7F7F7;
-	}
-	.instrument{
-		width: 100%;
-		height: auto;
-		.banner{
-			box-sizing: border-box;
-			padding:24rpx;
-			width: 100%;
-			.banner-image{
-				width: 100%;
-				height: 248rpx;
-				border-radius: 16rpx;
-				float: left;
-				image{
-					width: 100%;
-					height: 248rpx;
-					border-radius: 16rpx;
-				}
-			}
-			.content{
-				width: 100%;
-				margin-top: 10rpx;
-				float: left;
-				box-sizing: border-box;
-				background-color: #FFFFFF;
-				font-size: $font-size-26;
-				color: #666666;
-				text-align: justify;
-				line-height: 36rpx;
-			}
-		}
-		.instrument-btn{
-			width: 100%;
-			box-sizing: border-box;
-			padding: 7rpx 24rpx;
-			background-color: #FFFFFF;
-			position: fixed;
-			bottom: 0;
-			left: 0;
-			z-index: 999;
-			.btn{
-				width: 100%;
-				height: 100%;
-				background-image: $btn-confirm;
-				line-height: 84rpx;
-				border-radius: 42rpx;
-				text-align: center;
-				font-size: 26rpx;
-				color: #FFFFFF;
-			}
-		}
-		.instrument-list{
-			width: 100%;
-			height: auto;
-			box-sizing: border-box;
-			padding: 0 24rpx;
-			.list-item-cell{
-				width: 100%;
-				height: auto;
-				float: left;
-				.list-item-title{
-					width: 100%;
-					height: 88rpx;
-					line-height: 88rpx;
-					float: left;
-					.title{
-						font-size: $font-size-28;
-						line-height: 80rpx;
-						color: $text-color;
-						font-weight: bold;
-						&.float{
-							float: left;
-						}
-					}
-					.more{
-						font-size: $font-size-26;
-						line-height: 80rpx;
-						color: #999999;
-						height: 80rpx;
-						float: right;
-						.icon-xiangyou{
-							font-size: $font-size-28;
-							margin-left: 10rpx;
-						}
-					}
-				}
-				.list-item-pros{
-					width: 100%;
-					height: auto;
-					float: left;
-					.item-pros{
-						width: 340rpx;
-						height: 414rpx;
-						float: left;
-						margin-right: 20rpx;
-						margin-bottom: 20rpx;
-						background-color: #FFFFFF;
-						border-radius: 16rpx;
-						&:nth-child(2n){
-							margin-right: 0;
-						}
-						.item-pros-image{
-							width: 340rpx;
-							height: 340rpx;
-							float: left;
-							image{
-								width: 340rpx;
-								height: 340rpx;
-								display: block;
-								border-radius: 16rpx 16rpx 0 0;
-							}
-						}
-						.item-pros-name{
-							width: 100%;
-							height: 74rpx;
-							line-height: 74rpx;
-							box-sizing: border-box;
-							padding: 0 24rpx;
-							white-space: normal;
-							word-break: break-all;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							display: -webkit-box;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 1;
-							text-align: center;
-							font-size: $font-size-26;
-							line-height: 74rpx;
-							text-align: center;
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

pages/goods/instrument-details.vue

@@ -1,714 +0,0 @@
-<template>
-	<view class="product">
-		<custom-p   v-if="isHeaderPoduct"
-					:systeminfo='systeminfo' 
-					:navbar-data='nvabarData' 
-					:headerBtnPosi ="headerBtnPosi" 
-					:headerColor="headerColor" 
-					:type="isShareType"
-					:page='backPage'>
-		</custom-p>
-		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-product tui-skeleton">
-			<view class="product-top">
-				<view class="banner-section">
-					<uni-swiper-dot :info="productImage" :current="current" field="content" :mode="mode" >
-						<swiper class="banner tui-banner tui-skeleton-rect"  @change="swiperChange" :duration='800' :autoplay="false" :circular="true" >
-							<swiper-item v-for="(item, index) in productImage" :key="index" class="banner-item"> 
-								<image :src="item" @click="previewImg(index)" class="product-img" />
-							</swiper-item>
-						</swiper>
-						<view class="swiper__dots-box">
-							<tui-tag padding="12rpx 24rpx" type="translucent" shape="circleLeft" size="32rpx" :scaleMultiple="0.82" originRight>{{ current + 1 }}/{{ productImage.length }}</tui-tag>
-						</view>
-					</uni-swiper-dot>
-				</view>
-				<view class="product-parameter" @click="showPopup">
-					<view class="view">
-						<text class="title">仪器信息</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-				<view class="product-message clearfix">
-					<view class="msg-pin clearfix"  v-for="(label, idx) in firstFloorList" :key="idx">
-						<view class="label">{{ label.name }}:</view>
-						<view class="label-li">
-							<text>{{ label.content ? label.content : '暂无' }}</text>
-						</view>
-					</view>
-				</view>			
-			</view>
-			<view class="product-details">
-				<view  class="navbar">
-					<view class="nav-item tui-skeleton-fillet" v-for="(tab, index) in crmDetailList" :key="index"  :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">
-						<text>{{ tab.name }}</text>
-						<text class="line"></text>
-					</view>
-				</view>	
-	
-			</view>	
-			<view class="product-details service" v-show="tabCurrentIndex == 0">
-				<view class="content tui-banner product-rich-text tui-skeleton-rect">
-					<parser :html="html" :img-mode="widthFix"></parser>
-				</view>
-			</view>	
-			<view class="product-details service" v-show="tabCurrentIndex == 1">
-				<view class="content service" v-if="crmDetailList[tabCurrentIndex].content">
-					{{ crmDetailList[tabCurrentIndex].content ? crmDetailList[tabCurrentIndex].content : '' }}
-				</view>
-				<view class="content service">
-					<view class="content-none">暂无内容</view>
-				</view>
-			</view>	
-			<view class="product-details service" v-show="tabCurrentIndex == 2">
-				<view class="content service" v-if="crmDetailList[tabCurrentIndex].content">
-					{{ crmDetailList[tabCurrentIndex].content ? crmDetailList[tabCurrentIndex].content : '' }}
-				</view>
-				<view class="content service">
-					<view class="content-none">暂无内容</view>
-				</view>
-			</view>	
-			<view class="product-details recommend">
-				<!-- 相关推荐 -->
-				<view class="instrument-recommend-cell" v-for="(floor, index) in floorList" :key="index">
-					<view class="title">
-						<view class="title-tab">{{ floor.title }}</view>
-					</view>
-					<view class="content hot">
-						<recommend :list="floor.floorData" v-if="isRequest"></recommend>
-					</view>
-				</view>
-			</view>	
-			<view class="product-details contact clearfix">
-				<!-- 联系 -->
-				<view class="instrument-contact-title">
-					<image src="https://static.caimei365.com/app/img/icon/icon-title-bg.png" mode=""></image>
-				</view>
-				<view class="instrument-contact-cell">
-					<view class="cell-icon">
-						<image src="https://static.caimei365.com/app/img/icon/icon-kefus.png" mode=""></image>
-					</view>
-					<view class="cell-text">
-						<view class="cell-text-p">0755-22907771转806</view>
-						<view class="cell-text-p">15338851365</view>
-					</view>
-				</view>
-				<view class="instrument-contact-cell">
-					<view class="cell-icon">
-						<image src="https://static.caimei365.com/app/img/icon/icon-phone.png" mode=""></image>
-					</view>
-					<view class="cell-text">
-						<view class="cell-text-p">产品设备：18948339365</view>
-						<view class="cell-text-p">商务合作：17318032647</view>
-					</view>
-				</view>
-			</view>	
-			<!-- 仪器信息 -->
-			<tui-bottom-popup :radius="true" :show="popupShow" @close="hidePopup()">
-				<view class="tui-popup-box clearfix">
-					<view class="title">{{ secondFloorList[0].name }}</view>
-					<view class="content">
-						<view class="content-tr"  v-for="(item, index) in secondFloorList" :key="index">
-							<view class="content-td">{{ item.name }}:</view>
-							<view class="content-th">{{ item.content ? item.content : '暂无' }}</view>
-						</view>
-					</view>
-					<view class="tui-right-flex tui-popup-btn" :style="{ paddingBottom :isIphoneX ? '68rpx' : '0rpx' }">
-						<view class="tui-flex-1">
-							<view class="tui-button" @click="hidePopup()">收起</view>
-						</view>
-					</view>
-				</view>	
-			</tui-bottom-popup>	
-			<!-- 侧边 -->
-			<scroll-top :isScrollTop="isScrollTop" :bottom="200"></scroll-top>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import customP from '@/components/cm-custom/custom-p.vue' 		 //自定义导航
-	import cmPrice from "@/components/cm-module/productDetails/cm-price.vue" //价格显示
-	import cmAttributes from "@/components/cm-module/productDetails/cm-attributes.vue" //规格信息
-	import authorize from '@/common/config/authorize.js'
-	import uniStars from '@/components/uni-stars/uni-stars.vue'
-	import parser from "@/components/jyf-Parser/index" //富文本处理
-	import tuiSkeleton from "@/components/tui-skeleton/tui-skeleton"
-	import recommend from "@/components/cm-module/productDetails/instrument-recommend" //相关推荐
-	import cmParameter from "@/components/cm-module/productDetails/cm-parameter" //相关参数
-	import cmService from "@/components/cm-module/productDetails/cm-service" //服务项目
-	import wxLogin from "@/common/config/wxLogin.js"
-	var isPreviewImg;
-	export default{
-		components:{
-			uniStars,
-			customP,
-			parser,
-			tuiSkeleton,
-			recommend,
-			cmPrice,
-			cmAttributes,
-			cmParameter,
-			cmService
-		},
-		data(){
-			return{			
-				html:'<div style="text-align: center;color:#333333;">暂无内容</div>',
-				disabledTabNavList:[{name:'相关推荐'}],
-				mode:'round',
-				iconClass:'icon-aixin',
-				iconColor:'#ff9100',
-				specClass: '',//规格弹窗css类，控制开关动画
-				isBtnType:'',
-				isRequest:false,
-				isScrollTop:false,
-				current:0,
-				isShareType:'',
-				isHeaderPoduct:false,
-				isRecommend:false,
-				isRarameter:true,
-				isService:false,
-				isEvaluate:false,
-				skeletonShow:true,
-				tabCurrentIndex:0,
-				userID:'',
-				equipmentId:0,
-				userIdentity:'',//用户类型
-				productImage:[],
-				floorList:[],
-				secondFloorList:[],//仪器信息
-				firstFloorList:[],//项目基本信息
-				crmDetailList:[],//项目详情
-				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
-				systeminfo: this.setSysteminfo(),		 //获取设备信息
-				isIphoneX:this.$store.state.isIphoneX,
-				windowHeight: '',
-				headerColor:false,
-				backPage:1,
-				nvabarData: {							 //顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
-					title: ''		// 导航栏 中间的标题
-				},
-				linkPath:'',
-				popupShow:false//参数弹窗
-			}
-		},
-		onLoad(option) {
-			this.equipmentId = option.id;//获取商品ID
-			this.isShareType = option.type
-			this.linkPath = option.path
-			this.isHeaderPoduct = true
-			if(option.page == 2){
-				this.backPage = option.page
-			}
-			if(this.isShareType =='share'){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					console.log(wxResponse)
-					if(wxResponse == 1){
-						wxLogin.wxLoginAuthorize()
-					}else{
-						console.log(new Date +'用户未授权微信信息')
-					}
-				})	
-			}
-		},
-		computed: {
-			...mapState(['hasLogin','isWxAuthorize'])
-		},
-		methods:{
-			initData(){// 初始化商品详情查询
-				this.ProductService.GetEquipmentDetails({equipmentId:this.equipmentId}).then(response =>{	
-					let data = response.data 
-					let pageMap = data.pageContentMap
-					this.secondFloorList = pageMap.secondFloorList
-					this.firstFloorList = pageMap.firstFloorList
-					this.crmDetailList = pageMap.pcDetailList
-					this.html = this.$api.adaptRichTextImg(this.crmDetailList[0].content)
-					this.floorList = data.floorList
-					this.skeletonShow = false
-					this.productImage=[];
-					this.productImage.push(data.image);
-					console.log(this.productImage)
-					this.isRequest = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			swiperChange(e) {//顶部商品图片切换
-				const index = e.detail.current;
-				this.current = index;
-			},
-			previewImg (index) {//顶部商品图片预览
-				isPreviewImg = true
-				let previewUrls = this.productImage
-				uni.previewImage({
-					current: index, 	//图片索引
-					urls: previewUrls, //必须是http图片，本地图片无效
-					longPressActions:''
-				})
-			},
-			tabClick(index) {//商品详情&&供应商信息tab切换
-				console.log(index)
-				this.tabCurrentIndex = index;
-				switch(index){
-					case 1:
-						this.isRarameter = true
-						break;
-					case 2:
-						this.isService = true
-						break;
-					case 3:
-						this.isRecommend = true
-						break;
-				}
-			},
-			setHeaderBtnPosi(){
-				// 获得胶囊按钮位置信息
-				let headerBtnPosi = uni.getMenuButtonBoundingClientRect();
-				return headerBtnPosi
-			},
-			setSysteminfo(){
-				let systeminfo;
-				uni.getSystemInfo({ // 获取设备信息
-					success: (res) => {
-						systeminfo = res
-					},
-				})
-				return systeminfo
-			},
-			onShare(res){//分享转发
-				if (res.from === 'button') {
-			      // 来自页面内转发按钮
-			    }
-				return {
-				  title: `${this.product.name}`,
-				  path: `pages/goods/product?type=share&id=${this.productID}`,
-				  imageUrl:`${this.productImage[0]}`
-				}
-			},
-			showPopup(){
-				this.popupShow = true
-			},
-			hidePopup(){
-				this.popupShow = false
-			}
-		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>50){
-				this.headerColor = true
-				this.nvabarData={							
-					showCapsule: 1, 
-					title: '商品详情', 		
-				}
-			}else{
-				this.headerColor = false
-				this.nvabarData={
-					showCapsule: 1, 
-					title: '', 		
-				}
-			}
-			if(e.scrollTop>700){
-				this.isScrollTop = true
-			}else{
-				this.isScrollTop = false
-			}
-		},
-		onShareAppMessage(res){//分享转发
-			if (res.from === 'button') {
-		      // 来自页面内转发按钮
-		    }
-			return {
-			  title: `${this.product.name}`,
-			  path: `pages/goods/product?type=share&id=${this.productID}`,
-			  imageUrl:`${this.productImage[0]}`
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID ? resolve.userID : '';	
-				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
-				if (isPreviewImg) {
-					isPreviewImg = false;
-					return;
-				} else {
-					this.initData();
-				}
-			}).catch(error =>{
-				this.initData();
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #FFFFFF;
-	}
-	.productRemarks{
-		height: 36rpx;
-		margin: 8rpx 0;
-		width: 100%;
-		float: left;
-		.text{
-			display: inline-block;
-			padding: 0 18rpx;
-			line-height: 32rpx;
-			font-size: 20rpx;
-			color: #FF2A2A;
-			text-align: center;
-			border-radius: 4rpx;
-			background: #FFFFFF;
-			border: 1px solid #FF2A2A;
-			float: left;
-			opacity: 0.8;
-		}
-	}
-	.banner-section{
-		width: 100%;
-		height: 750rpx;
-		position: relative;
-	}	
-	.banner{
-		width: 100%;
-		height: 750rpx;
-		.product-img{
-			width: 750rpx;
-		}
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.swiper__dots-box{
-		position: absolute;
-		color: #fff;
-		bottom: 30rpx;
-		right: 0;
-	}
-	.product-message{
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		margin-top: 24rpx;
-		.msg-pin{
-			width: 100%;
-			height: auto;
-			margin-bottom: 16rpx;
-			.label{
-				float: left;
-				line-height: 48rpx;
-				font-size: $font-size-28;
-				color: #999999;
-			}
-			.label-li{
-				width: 568rpx;
-				float: left;
-				line-height: 48rpx;
-				font-size: $font-size-28;
-				color: #333333;
-				margin-left: 10rpx;
-			}
-		}
-	}
-	.product-parameter{
-		width: 100%;
-		height: 90rpx;
-		padding: 0 24rpx;
-		box-sizing: border-box;
-		background-color: #FFFFFF;
-		position: relative;
-		display: flex;
-		margin-top: 24rpx;
-		.view{
-			width: 100%;
-			height: 90rpx;
-			background-color: #fef6f3;
-			position: relative;
-			display: flex;
-			padding: 0 20rpx;
-			.title{
-				line-height: 90rpx;
-				display: inline-block;
-				float: left;
-				font-size: $font-size-28;
-				color: $color-system;
-			}
-			.icon-xiayibu{
-				line-height: 90rpx;
-				display: inline-block;
-				position: absolute;
-				width: 48rpx;
-				top: 0;
-				right: 0;
-				color: $color-system;
-			}
-		}
-	}
-	.product-details {
-		width: 100%;
-		background: #FFFFFF;
-		.content{
-			&.service{
-				text-align: justify;
-				font-size: $font-size-26;
-				color: #666666;
-			}
-			.content-none{
-				width: 100%;
-				height: 80rpx;
-				line-height: 80rpx;
-				font-size: $font-size-26;
-				color: #999999;
-				text-align: center;
-			}
-		}
-		&.recommend{
-			background-color: #F7F7F7;
-			border-bottom: none;
-			.title{
-				.title-tab{
-					background-color: #F7F7F7;
-					color: $text-color;
-					
-				}
-			}
-		}
-		&.contact{
-			width: 100%;
-			box-sizing: border-box;
-			background-color: #FFFFFF;
-			padding:24rpx;
-			.instrument-contact-title{
-				width: 100%;
-				height: 40rpx;
-				margin-bottom: 30rpx;
-				image{
-					width: 100%;
-					height: 100%;
-					display: block;
-				}
-			}
-			.instrument-contact-cell{
-				width: 100%;
-				height: 72rpx;
-				float: left;
-				box-sizing: border-box;
-				padding: 0 150rpx;
-				margin-bottom: 24rpx;
-				.cell-icon{
-					width: 72rpx;
-					height: 72rpx;
-					float: left;
-					image{
-						width: 100%;
-						height: 100%;
-						display: block;
-					}
-				}
-				.cell-text{
-					width: 330rpx;
-					height: 72rpx;
-					float: left;
-					box-sizing: border-box;
-					padding-left: 15rpx;
-					.cell-text-p{
-						width: 100%;
-						height: 36rpx;
-						line-height: 36rpx;
-						font-size: $font-size-24;
-						color: $text-color;
-						text-align: left;
-						float: left;
-					}
-				}
-			}
-		}
-		.title{
-			width: 100%;
-			box-sizing: border-box;
-			padding: 0 24rpx;
-			.title-tab{
-				width: 100%;
-				height: 100rpx;
-				background: #fff;
-				z-index: 10;
-				font-size: $font-size-30;
-				text-align: center;
-				color: $text-color;
-				line-height: 100rpx;
-				font-weight: 600;
-			}
-			.title-msg{
-				width: 100%;
-				height: 236rpx;
-				padding: 18rpx;
-				background-color: rgba(225,86,22, 0.1);
-				color: $color-system;
-				box-sizing: border-box;
-				margin-bottom: 30rpx;
-				.tit{
-					line-height: 46rpx;
-					font-size: $font-size-24;
-					text-align: left;
-				}
-				.txt{
-					line-height: 38rpx;
-					font-size: $font-size-20;
-					text-align: justify;
-				}
-			}
-		}
-		.navbar {
-			width: 702rpx;
-			height: 96rpx;
-			padding: 0 24rpx;
-			background: #fff;
-			z-index: 10;
-			display: flex;
-			border-top: 20rpx solid #F7F7F7;
-			padding-bottom: 20rpx;
-			&.fixed{
-				position: fixed;
-				left: 0;
-			}
-			.nav-item {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				height: 96rpx;
-				font-size: $font-size-28;
-				color: $text-color;
-				position: relative;
-				float: left;
-				position: relative;
-				padding: 0 15rpx;
-				margin-right: 20rpx;
-				.line{
-					width: 40rpx;
-					height: 2px;
-					border-radius: 1px;
-					background: #FFFFFF;
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					margin-left: -20rpx;
-				}
-				&.current{
-					color:$color-system;
-					font-weight: bold;
-					.line{
-						background: $color-system;
-					}
-				}
-			}
-		}
-		.content{
-			width: 100%;
-			background-color: #FFFFFF;
-		}
-	}
-	.isLower{
-		width: 100%;
-		height: 116rpx;
-		line-height: 116rpx;
-		text-align: center;
-		color: #000000;
-		font-size: $font-size-32;
-		font-weight: bold;
-	}
-	.uni-badge--small {
-		-webkit-transform: scale(.8);
-		-ms-transform: scale(.8);
-		transform: scale(.8);
-		-webkit-transform-origin: center center;
-		-ms-transform-origin: center center;
-		transform-origin: center center;
-	}
-	.uni-badge {
-		font-family: 'Helvetica Neue', Helvetica, sans-serif;
-		-webkit-box-sizing: border-box;
-		box-sizing: border-box;
-		font-size: 12px;
-		line-height: 1;
-		display: inline-block;
-		padding: 3px 6px;
-		color: #333;
-		border-radius: 100px;
-		background-color: #f1f1f1;
-	}
-	.uni-badge-error {
-		color: #fff;
-		background-color: #dd524d;
-	}
-	.tui-popup-box {
-		position: relative;
-		box-sizing: border-box;
-		min-height: 220rpx;
-		padding:0rpx 55rpx;
-		.title{
-			font-size: $font-size-34;
-			color: $text-color;
-			line-height: 88rpx;
-			text-align: center;
-			float: left;
-			width: 100%;
-			height: 88rpx;
-		}
-		.content{
-			width: 100%;
-			height: auto;
-			float: left;
-			.content-tr{
-				width: 100%;
-				height: auto;
-				line-height: 58rpx;
-				display: flex;
-				.content-td{
-					display: flex;
-					font-size: $font-size-28;
-					color: #999999;
-					line-height: 58rpx;
-					text-align: left;
-				}
-				.content-th{
-					display: flex;
-					flex: 7;
-					font-size: $font-size-28;
-					color: #666666;
-					line-height: 58rpx;
-					text-align: left;
-					padding-left: 20rpx;
-					box-sizing: border-box;
-				}
-			}
-		}
-	}
-	.tui-popup-btn {
-		width: 100%;
-		height: auto;
-		float: left;
-		margin-top: 24rpx;
-		.tui-button{
-			width: 100%;
-			height: 88rpx;
-			background: $btn-confirm;
-			line-height: 88rpx;
-			text-align: center;
-			color: #FFFFFF;
-			font-size: $font-size-28;
-			border-radius: 44rpx;
-		}
-	}
-	/*富文本样式*/
-	rich-text.p{
-		width: 702rpx !important;
-		padding: 0 24rpx;
-		text-align: justify;
-	}
-	rich-text.img{
-		width: 100%;
-		height: auto;
-	}
-</style>

pages/login/apply-supplier.vue

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

pages/login/apply.vue

@@ -1,1123 +0,0 @@
-<template>
-	<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"><text></text></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>
-				</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="registerEmail" placeholder="请输入您的常用邮箱"placeholder-class="placeholder" maxlength="30"/>
-				</view>
-				<view class="register-tip"><text>提示：邮箱可用作登录账号，请使用公司邮箱或法人邮箱</text></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="请输入您的机构名称" placeholder-class="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="abbreviation" placeholder="请输入您的机构简称" placeholder-class="placeholder" maxlength="10"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
-					<view class="label">机构地址</view>
-					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{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>
-			<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"/>
-				</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="uploadBusinessImage === ''"  @click="chooseBusinessImage">
-							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
-						</view>
-						<view class="upload-image" v-else>
-							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
-							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-picture">
-					<view class="label">门头照</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage === ''" @click="chooseMentuzImage">
-							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
-						</view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
-							<view class="upload-del" @click="delMentuzImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from picker noneborder">
-					<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>
-						</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>
-				</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="uploadMedicalImage === ''" @click="chooseMedicalImage">
-							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
-							</view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
-							<view class="upload-del" @click="delMedicalImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-show="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>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<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 :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</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>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
-				<view class="register-from group" style="height: auto;border: 0;">
-					<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>
-						</checkbox-group>
-					</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>
-					</view>
-				</view>
-			</view>
-			<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>
-		</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
-				},
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				errorList:[],
-				tabCurrentIndex:3,	
-				clubStatus:'',			//审核状态
-				isPreviewImage:false,   //预览图片开关
-				userID:'',				//用户ID
-				clubID:'',				//会所ID
-				registerEmail:'',		//邮箱
-				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
-				socialCreditCode:'',	//统一社会信用代码
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
-				firstClubType:'',		//机构类型
-				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: '',	//地址详情
-				},
-				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
-					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
-						}
-						this.registerEmail = organizationUser.email	
-						this.clubID = organizationUser.clubID
-						this.clubName = this.$reg.checkData(organizationClub.name)
-						this.abbreviation = this.$reg.checkData(organizationClub.sname)
-						if( organizationClub.provinceID==''||organizationClub.provinceID==null){
-							this.addressData.provinceID = ''
-						}else{
-							this.addressData.provinceID = organizationClub.provinceID
-						}
-						if( organizationClub.cityID==''||organizationClub.cityID===null){
-							this.addressData.cityID = ''
-						}else{
-							this.addressData.cityID = organizationClub.cityID
-						}
-						if( organizationClub.townID==''||organizationClub.townID==null){
-							this.addressData.townID = ''
-						}else{
-							this.addressData.townID = organizationClub.townID
-						}
-						console.log('66666666666666')
-						this.addressData.address = organizationClub.provincialAddress ? organizationClub.provincialAddress:'请选择机构所在地区'
-						this.addressData.addressDetail = this.$reg.checkData(organizationClub.address)
-						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
-						this.firstClubType = organizationClub.firstClubType
-						this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
-						this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage) 
-						this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
-						this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
-						this.department = this.$reg.checkData(organizationClub.department)		
-						//机构类型&&主营项目
-						switch(this.firstClubType){
-							case '1':
-								this.organizationTypeText = '医美'
-								this.isOrganizationType = 1
-								break;
-							case '2':
-								this.organizationTypeText = '生美'
-								this.isOrganizationType = 2
-								break;
-							case null:
-								this.organizationTypeText = '请选择机构类型'
-								this.isOrganizationType = 0
-								break;
-						}	
-						if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
-							this.mentuzCampList = this.mentuzCampNullList
-							this.medicaCampList = this.medicaCampNullList
-						}else{
-							if(this.firstClubType == '1'){
-								this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
-								this.medicaCampList = this.medicaCampNullList							
-							}else{
-								this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
-								this.mentuzCampList = this.mentuzCampNullList
-							}
-							this.mainpro = organizationClub.mainpro;
-						}
-						//机构类型
-						switch(this.secondClubType){
-							case '1':this.current = 0;break;
-							case '2':this.current = 1;this.isDepartment=true;break;
-							case '3':this.current = 2;this.isDepartment=true;break;
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			organizationUpdateInfo(){//提交审核
-				if(!this.isMainproCheck){
-					let mainproList = []
-					if(this.firstClubType == '1'){
-						this.mentuzCampList.forEach(item =>{
-							mainproList.push(item.name)
-						})
-					}else{
-						this.medicaCampList.forEach(item =>{
-							mainproList.push(item.name)
-						})
-					}
-					this.mainpro = mainproList.join('/')
-				}
-				if( this.registerEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if( !this.$reg.isEmail(this.registerEmail)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				if( this.clubName == ''){
-					this.$util.msg('请输入机构名称',2000);
-					return
-				}
-				if( this.addressData.townID == ''){
-					this.$util.msg('请选择机构地址',2000);
-					return
-				}
-				if( this.addressData.addressDetail == ''){
-					this.$util.msg('请填写机构详细地址',2000);
-					return
-				}
-				if( this.uploadBusinessImage == ''){
-					this.$util.msg('请上传您的营业执照',2000);
-					return
-				}
-				if(this.isOrganizationType!=0){
-					if(this.mainpro == ''){
-						this.$util.msg('请选择住机构主营内容',2000);
-						return
-					}
-				}
-				let params ={
-						userID:this.userID,
-						clubID:this.clubID,					//会所ID
-						contractEmail1:this.registerEmail,
-						name:this.clubName,
-						sname:this.abbreviation,
-						provinceID:this.addressData.provinceID,
-						cityID:this.addressData.cityID,
-						townID:this.addressData.townID,
-						address:this.addressData.addressDetail,
-						socialCreditCode:this.socialCreditCode,
-						businessLicenseImage:this.uploadBusinessImage,
-						headpic:this.uploadMentuzImage,
-						firstClubType:this.isOrganizationType,  //机构类型分类 医美:1和生美:2
-						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
-						department:this.department,				//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
-						mainpro:this.mainpro,
-				}
-				this.UserService.OrganizationRegister(params).then(response =>{
-					this.$util.msg('您的升级申请已提交审核',2000);
-					setTimeout(()=>{
-						uni.navigateBack();
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			// 三级联动选择
-			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.uploadBusinessImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMentuzImage() {//门头照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMentuzImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMedicalImage() {//资质照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMedicalImage = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.uploadBusinessImage)
-			},
-			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.uploadMentuzImage)
-			},
-			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.uploadMedicalImage)
-			},
-			myPreviewImageFn(url){
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.uploadBusinessImage = ''
-				})
-			},
-			delMentuzImage(){
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.uploadMentuzImage = ''
-				})
-			},			
-			delMedicalImage(){
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.uploadMedicalImage = ''
-				})
-			},
-			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;
-					}
-				}
-			},
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.isMainproCheck = true
-				this.mainpro = 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)
-						}
-					}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
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.placeholder{color:#b2b2b2 ;}
-	.register{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.register-main{
-			width: 100%;
-			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%);
-			}
-			&.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;
-				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;
-					}
-				}
-				.register-tip{
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					color: #fea785;
-					text-align: left;
-				}
-				.register-title{
-					line-height: 44rpx;
-					font-size: $font-size-24;
-					color: $color-system;
-					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: 100%;
-					height: 88rpx;
-					background: #FFFFFF;
-					position: relative;
-					border-bottom: 1px solid #e1e1e1;
-					box-sizing: border-box;
-					&.noneborder{
-						border: none;
-					}
-					&.second{
-						padding-left: 160rpx;
-					}
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 88rpx;
-						float: left;
-					}
-					.kes-title{
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 88rpx;
-					}
-					.row-input{
-						width: 520rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 88rpx;
-						float: right;
-						height: 88rpx;
-						&.code{width: 500rpx;}
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #333333;
-						}
-					}
-					.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;
-						}
-					}
-					&.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: 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{
-						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;
-						}
-					}
-					&.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;
-						}
-					}
-					&.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;
-						}
-					}
-					&.btn{
-						margin-top: 0;
-					}
-					.content-class {
-						margin: 20rpx auto;
-						display: flex;
-						flex-flow: row wrap;
-						justify-content: space-between;
-						align-items: center;
-						&.btn{
-							margin: 0 auto;
-							margin-left: 116rpx;
-						}
-						.row-input{
-							display: flex;
-							width: 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: 40rpx;
-						  box-sizing: border-box;
-						  // border: 1rpx solid #EFEFEF;
-						  float: left;
-						 //  checkbox {
-							// display: none;
-						 //  }
-						}
-						.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;
-					color: #b2b2b2;
-				}
-				&.text-textarea{
-					background: #FFFFFF;
-					.textarea{
-						width: 100%;
-						height: 120rpx;
-						background: #FFFFFF;
-						padding: 24rpx 0;
-						font-size: $font-size-28;
-						color: $text-color;
-						z-index: 1;
-						border-bottom: 1px solid #E1E1E1;
-					}
-					.textarea.hide{
-						opacity: 0;
-					}
-					.textarea.show{
-						color: #999999;
-					}
-				}
-			}
-			.register-picture{
-				// height: 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-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;
-							}
-						}
-					}
-				}
-			}
-			.register-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin: 0 auto;
-				margin-bottom: 60rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-			.register-fiexd{
-				width: 100%;
-				height: auto;
-				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;
-						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;
-				}
-			}
-		}
-	}
-	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);
-	}
-</style>

pages/login/bindOperator.vue

@@ -1,431 +0,0 @@
-<template>
-	<view class="container login" >
-		<!-- v-if="isUserInfo" -->
-		<view class="login-form title">
-			<view class="text">
-				<label class="iconfont icon-tishi"></label>请填写如下信息成为机构运营人员后才能操作订单
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="text" 
-					   v-model="bindLinkName"  
-					   maxlength="30" 
-					   class="input" 
-					   placeholder="请输入姓名"
-					   placeholder-class="placeholder"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="number" 
-					   v-model="bindMobile"  
-					   maxlength="11" 
-					   class="input" 
-					   placeholder="请输入手机号"
-					   placeholder-class="placeholder"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="text" 
-					   v-model="imageCode"  
-					   maxlength="4" 
-					   class="input" 
-					   placeholder="请输入右侧图形验证码"
-					   placeholder-class="placeholder"
-				/>
-			</view>
-			<view class="login-input img-btn">
-				<view class="vscodeimg">
-					<image :src="imageCodeUrl" mode=""></image>
-				</view>
-				<view class="vscod-refresh"  @click.stop="getVerificationCode">
-					<text class="iconfont icon-shuaxin"></text>
-					<text class="ref-text">刷新</text>
-				</view>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="number" 
-					   v-model="mobildeCode"  
-					   maxlength="6" 
-					   class="input" 
-					   placeholder="请输入短信验证码"
-					   placeholder-class="placeholder"
-				/>
-			</view>
-			<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
-				<button type="button"
-						@click.stop="getMobileCodeFn"
-						:disabled="isMobileDisabled"
-					    class="input">
-						{{ mobileCodeText }}
-				</button>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-btn"  @click="bindWechatInfo">绑定</view>
-		</view>
-		<view class="login-foot">
-			<text class="foot-text">本操作会绑定您的微信，绑定后您可使用微信直接登录【采美采购商城】小程序。</text>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import authorize from '@/common/config/authorize.js' 
-	import wxLogin from "@/common/config/wxLogin.js"
-	import { userInfoLogin } from "@/services/use.js"
-	import { getbindOperatorCode } from "@/services/public.js"
-	export default{
-		data() {
-			return{
-				wxUserInfo:'',			//储存用户微信信息
-				bindLinkName:'',  		//用户姓名
-				bindMobile:'',  		//用户手机号
-				mobildeCode:'',  		//手机验证码
-				imageCode:'',			//图形验证码
-				imageCodeUrl:'',		//图形验证码地址
-				imageCodetoken:'',		//图形校验token
-				isMobileDisabled:false, //获取手机短信按钮
-				count: '',				//倒计时
-				mobileCodeText: '获取验证码',
-				codeTime: null,
-				isUserInfo:false
-			}
-		},
-		onLoad(option) {
-			console.log(option)
-			uni.setStorageSync('bind_id', option.userID);
-			this.getVerificationCode()
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
-					this.getWxAuthorize()
-				}else{
-					this.$api.navigateTo('/pages/authorization/authorization')
-					this.isUserInfo = true
-				}
-			})	
-		},
-		computed: {
-			...mapState(['isWxAuthorize'])
-		},
-		methods:{
-			...mapMutations(['login','logout']),
-			getWxAuthorize(){// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-				authorize.getCode('weixin').then(wechatcode =>{
-					// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					authorize.getUserInfo('weixin').then(wxResponse =>{
-						userInfoLogin({code:wechatcode,encryptedData:wxResponse.encryptedData,iv:wxResponse.iv}).then(response =>{
-							this.login(response.data)
-							uni.setStorageSync('token',response.data.token)
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
-							this.$store.commit('updateStatus',response.data)
-							if(response.data.userIdentity ==1){
-								// this.$api.navigateTo('/seller/pages/index/index')
-							}else{
-								// this.$api.switchTabTo('/pages/tabBar/home/index')
-							}
-						}).catch(error =>{
-							this.logout()
-							this.isUserInfo = true
-							uni.removeStorageSync('sessionid')
-							uni.setStorageSync('sessionid','JSESSIONID='+error.data)
-							this.$store.commit('updateStatus',error.data)
-						})
-					})
-				})
-			},
-			bindWechatInfo(){
-				if( this.bindLinkName == ''){
-					this.$util.msg('请输入姓名',2000)
-					return
-				}
-				if( this.bindMobile == ''){
-					this.$util.msg('请输入手机号',2000)
-					return
-				}
-				if(!this.$reg.isMobile(this.bindMobile)){
-					this.$util.msg('请输入正确的手机号',2000)
-					return
-				}
-				if( this.mobildeCode == ''){
-					this.$util.msg('请输入手机验证码',2000)
-					return
-				}
-				if(!this.$reg.isMobileCode(this.mobildeCode)){
-					this.$util.msg('验证码格式不正确',2000)
-					return
-				}
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						this.bindingWechatLogin()
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization')
-					}
-				})	
-			},
-			getVerificationCode(){//图形验证
-				this.PublicService.GetImgVerifyCode().then(res => {
-					this.imageCodeUrl = res.data.baseImage
-					this.imageCodetoken = res.data.token
-				})
-			},
-			getMobileCodeFn(){//获取手机验证码
-				if( this.bindMobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.bindMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				if( this.imageCode == ''){
-					this.$util.msg('请输入图形验证码',2000);
-					return
-				}			
-				let params = {
-						userId:uni.getStorageSync('bind_id'),
-						mobile:this.bindMobile,
-						platformType:2,
-						imgCode:this.imageCode,
-						token:this.imageCodetoken,
-				}
-				this.isMobileDisabled = true;
-				getbindOperatorCode(params).then(res =>{
-					const TIME_COUNT = 60;
-					this.$util.msg('验证短信已发送',2000)
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-						this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( res =>{
-					this.$util.msg(res.msg,2000)
-					this.isMobileDisabled = false;
-				})
-			},
-			
-			bindingWechatLogin(){//获取用户基本信息登录
-				wx.getUserInfo({
-					success: res => {
-						this.wxUserInfo = res.userInfo;
-						let params ={
-								userID: uni.getStorageSync('bind_id'),
-								mobile: this.bindMobile,
-								linkName: this.bindLinkName,
-								verificationCode: this.mobildeCode,
-								nickName: this.wxUserInfo.nickName,
-								headimgurl: this.wxUserInfo.avatarUrl,
-						}
-						this.SellerService.SellerBindingOperation(params).then(response =>{
-							this.login(response.data)
-							this.$api.switchTabTo('/pages/tabBar/home/index')
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-							this.isUserInfo = true
-						})			
-					}
-				})
-			}
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		padding-top: 30rpx;
-		.login-foot{
-			width: 528rpx;
-			height: 88rpx;
-			padding: 0 24rpx;
-			margin: 30rpx auto;
-			text-align: center;
-			.foot-text{
-				font-size: 24rpx;
-				line-height: 44rpx;
-				color:#999999;
-			}
-		}
-		.login-form{
-			width: 702rpx;
-			height: auto;
-			padding: 0 24rpx;
-			&.title{
-				color: #e15616;
-				font-size: 24rpx;
-				text-align: center;
-				margin-bottom: 20rpx;
-				.text{
-					padding: 20rpx 24rpx;
-					background: #fff0e9;
-					border-radius: 16rpx;
-					.iconfont{
-						margin-right: 20rpx;
-						position: relative;
-						top: 5rpx;
-					}
-				}
-			}
-			.login-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin-bottom: 20rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				border-bottom: 1rpx solid #e1e1e1;
-				&.code{
-					width: 370rpx;
-					float: left;
-					margin-right: 10rpx;
-				}
-				&.btn{
-					width: 258rpx;
-					height: 88rpx;
-					padding: 0;
-					float: left;
-					border: 0;
-					.input{
-						width: 280rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						padding: 0;
-						border-radius: 45rpx;
-						color: #FFFFFF;
-						background: $btn-confirm;
-					}
-					&.disabled{
-						background: #F7F7F7;
-						.input{
-							color: #999999;
-						}
-					}
-				}
-				&.img-btn{
-					width: 270rpx;
-					height: 88rpx;
-					padding: 0;
-					float: left;
-					background: #FFFFFF;
-					display: block;
-					border: 0;
-					.vscodeimg{
-						width: 160rpx;
-						height: 64rpx;
-						float: left;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						border-radius: 6rpx;
-						image{
-							width: 180rpx;
-							height: 88rpx;
-							border-radius: 14rpx;
-						}
-					}
-					.vscod-refresh{
-						width: 95rpx;
-						float: right;
-						// display: flex;
-						flex-direction: column;
-						align-items: center;
-						margin-top: 10rpx;
-						.icon-shuaxin{
-							font-size: 36rpx;
-							color: #999999;
-							display: inline-block;
-						}
-						.ref-text{
-							font-size: 24rpx;
-							color: #999999;
-							display: inline-block;
-							margin-left: 10rpx;
-						}
-					}
-				}
-				.input{
-					width: 100%;
-					height: 100%;
-					// background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-		}
-		.login-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: 100rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
-	}
-	.placeholder{
-		color:#b2b2b2 ;
-	}
-</style>

pages/login/bindemail.vue

@@ -1,243 +0,0 @@
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<text class="logo-text">您的账号尚未绑定机构邮箱，请填写机构邮箱地址进行绑定。邮箱可用于登录和修改密码。</text>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input">
-				<input type="text" 
-					   v-model="bindEmail"  
-					   maxlength="30" 
-					   class="input" 
-					   placeholder="请输入邮箱地址"
-				/>
-			</view>
-		</view>
-		<view class="login-form clearfix">
-			<view class="login-input code">
-				<input type="number" 
-					   v-model="bindEmailCode"  
-					   maxlength="4" 
-					   class="input" 
-					   placeholder="请输入邮箱验证码"
-				/>
-			</view>
-			<view class="login-input btn" :class="[isEmialDisabled  ? 'disabled' : '']">
-				<button type="button"  
-						@click.stop="getEmailCodeFn"
-						:disabled="isEmialDisabled" 
-						class="input" >
-						{{ emailCodeText }}
-				</button>
-			</view>
-		</view>
-		<view class="login-form btns clearfix">
-			<view class="login-btn none"  @click="bindEmailNone">暂不绑定</view>
-			<view class="login-btn"  @click="bindEmailFrist">绑定</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js' 
-	import { bindingEmail } from '@/services/use.js' 
-	import { getEmailCode } from "@/services/public.js"
-	import wxLogin from "@/common/config/wxLogin.js"
-	
-	export default{
-		data() {
-			return{
-				userID:'',			//用户ID
-				bindEmail:'',  		//用户绑定邮箱
-				bindEmailCode:'',  	//用户绑定邮箱验证码
-				isEmialDisabled:false,	//获取验证码按钮
-				count: '',				//倒计时
-				emailCodeText: '获取验证码',
-				codeTime: null,
-				codeType:'',		//用户状态 为4状态的跳绑定微信
-				getOption:'',			//储存上一级页面的option
-				loginType:'',		//跳转类型
-				loginPath:'',		//从哪个页面跳的
-				alertText:'',
-				id:''//商品ID
-			}
-		},
-		onLoad(option) {
-			if(option.data){
-				let data = JSON.parse(option.data);
-				this.getOption = data
-				this.loginType = data.type;
-			}
-			this.loginPath = option.pathType
-			this.codeType = option.codeType
-		},
-		methods:{
-			bindEmailFrist(){
-				 let params = {
-						userID:this.userID,
-						email:this.bindEmail,
-						code:this.bindEmailCode
-				}
-				bindingEmail(params).then(response =>{
-					if(this.loginPath == 1){
-						wxLogin.wxLoginAuthorize()
-						this.$api.switchTabTo('/pages/tabBar/user/user')
-					}else{
-						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			bindEmailNone(){
-				if(this.loginPath == 1){
-					wxLogin.wxLoginAuthorize()
-					this.$api.switchTabTo('/pages/tabBar/user/user')
-				}else{
-					this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
-				}
-			},
-			getEmailCodeFn(){
-				if( this.bindEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if(!this.$reg.isEmail(this.bindEmail)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				this.isEmialDisabled = true;	
-				getEmailCode({email:this.bindEmail,status:1}).then(res =>{
-					this.$util.msg('邮箱验证码已发送',2000)
-					const TIME_COUNT = 60;
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-						this.isEmialDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.emailCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isEmialDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.emailCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isEmialDisabled = false;
-				})
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		border-top: 1px solid #F7F7F7;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 702rpx;
-			background: rgba(225, 86, 22, 0.1);
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: 68rpx;
-			padding: 20rpx 24rpx;
-			margin: 24rpx 0 118rpx 0;
-			.logo-text{
-				font-size: 24rpx;
-				line-height: 34rpx;
-				color: $color-system;
-			}
-		}
-		.login-form{
-			width: 702rpx;
-			height: auto;
-			padding: 0 24rpx;
-			&.btns{
-				display: flex;
-				margin-top: 80rpx;
-				.login-btn{
-					flex:1;
-					width: 303rpx;
-					height: 88rpx;
-					margin: 0 24rpx;
-					border-radius: 44rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					background: $btn-confirm;
-					&.none{
-						background: #999999;
-						color: #FFFFFF;
-					}
-				}
-			}
-			.login-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin-bottom: 20rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				&.code{
-					width: 377rpx;
-					float: left;
-					margin-right: 20rpx;
-				}
-				&.btn{
-					width: 258rpx;
-					height: 88rpx;
-					padding: 0;
-					float: left;
-					background: $btn-confirm;
-					.input{
-						width: 258rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						padding: 0;
-						border-radius: 14rpx;
-						color: #FFFFFF;
-						background: $btn-confirm;
-						
-					}
-					&.disabled{
-						background: #F7F7F7;
-						.input{
-							background: #F7F7F7;
-							color: #999999;
-						}
-					}
-				}
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-		}
-	}
-</style>

pages/login/bindwechat.vue

@@ -1,412 +0,0 @@
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<text class="logo-text">您的微信尚未绑定公司账号，填写以下资料进行绑定后，您能通过微信快速登录。</text>
-		</view>
-		<view class="login-container">
-			<view class="login-form clearfix">
-				<view class="login-input">
-					<input type="text" 
-						   v-model="bindLinkName"  
-						   maxlength="30" 
-						   class="input" 
-						   placeholder="请输入姓名"
-					/>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input">
-					<input type="number" 
-						   v-model="bindLinkPhone"  
-						   maxlength="11" 
-						   class="input" 
-						   placeholder="请输入手机号"
-					/>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input code">
-					<input type="text" 
-						   v-model="imageCode"  
-						   maxlength="4" 
-						   class="input" 
-						   placeholder="请输入右侧图形验证码"
-					/>
-				</view>
-				<view class="login-input img-btn">
-					<view class="vscodeimg">
-						<image :src="imageCodeUrl" mode=""></image>
-					</view>
-					<view class="vscod-refresh"  @click.stop="getVerificationCode">
-						<text class="iconfont icon-shuaxin"></text>
-						<text class="ref-text">刷新</text>
-					</view>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input code">
-					<input type="number" 
-						   v-model="mobildeCode"  
-						   maxlength="6" 
-						   class="input" 
-						   placeholder="请输入短信验证码"
-					/>
-				</view>
-				<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
-					<button type="button"
-							@click.stop="getMobileCodeFn"
-							:disabled="isMobileDisabled"
-						    class="input">
-							{{ mobileCodeText }}
-					</button>
-				</view>
-			</view>
-			<view class="login-form none clearfix">
-				<view class="login-btn"  @click="bindWechatInfo">绑定并登录</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	import authorize from '@/common/config/authorize.js' 
-	import wxLogin from "@/common/config/wxLogin.js"
-	import { bindingWechat } from "@/services/use.js"
-	import { getbindWechatCode } from "@/services/public.js"
-	export default{
-		data() {
-			return{
-				userIdentity:'',
-				userID:'',
-				bindMobile:'',
-				bindLinkName:'',  		//用户姓名
-				bindLinkPhone:'',  		//用户手机号
-				mobildeCode:'',  		//手机验证码
-				imageCode:'',			//图形验证码
-				imageCodeUrl:'',		//图形验证码地址
-				imageCodetoken:'',		//图形校验token
-				isMobileDisabled:false, //获取手机短信按钮
-				count: '',				//倒计时
-				mobileCodeText: '获取验证码',
-				codeTime: null,
-			}
-		},
-		onLoad(option) {
-			this.getVerificationCode()
-		},
-		computed: {
-			...mapState(['isWxAuthorize','isLoginType','isLoginProductId','isLoginOrderId'])
-		},
-		methods:{
-			...mapMutations(['login']),
-			bindWechatInfo(){
-				if( this.bindLinkName == ''){
-					this.$util.msg('请输入姓名',2000)
-					return
-				}
-				if( this.bindLinkPhone == ''){
-					this.$util.msg('请输入手机号',2000)
-					return
-				}
-				if(!this.$reg.isMobile(this.bindLinkPhone)){
-					this.$util.msg('请输入正确的手机号',2000)
-					return
-				}
-				if( this.mobildeCode == ''){
-					this.$util.msg('请输入手机验证码',2000)
-					return
-				}
-				if(!this.$reg.isMobileCode(this.mobildeCode)){
-					this.$util.msg('验证码格式不正确',2000)
-					return
-				}
-				this.bindingWechatLogin()
-			},
-			getVerificationCode(){//图形验证
-				this.PublicService.GetImgVerifyCode().then(res => {
-					this.imageCodeUrl = res.data.baseImage
-					this.imageCodetoken = res.data.token
-				})
-			},
-			getMobileCodeFn(){//获取手机验证码
-				if( this.bindLinkPhone == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.bindLinkPhone)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				if( this.imageCode == ''){
-					this.$util.msg('请输入图形验证码',2000);
-					return
-				}
-				let params = {
-						mobile:this.bindLinkPhone,
-						mobileOrEmail:this.bindMobile,
-						platformType:2,
-						imgCode:this.imageCode,
-						token:this.imageCodetoken,
-				}
-				this.isMobileDisabled = true;
-				getbindWechatCode(params).then(res =>{
-					const TIME_COUNT = 60;
-					this.$util.msg('验证短信已发送',2000)
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-						this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000)
-					this.isMobileDisabled = false;
-				})
-			},
-			bindingWechatLogin(){//获取用户基本信息登录
-				wx.getUserInfo({
-					success: res => {
-						this.isUserInfo = false;
-						this.userInfo = res.userInfo;
-						let params ={
-								userID:this.userID,
-								mobile:this.bindLinkPhone,
-								linkName:this.bindLinkName,
-								verificationCode:this.mobildeCode,
-								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
-						}
-						// console.log(params)
-						bindingWechat(params).then(response =>{
-							if(this.userIdentity === 3){
-								this.$api.navigateTo('/supplier/pages/index/index')
-							}else{
-								switch(this.isLoginType){
-									case 9:
-										this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-										break;
-									case 8:
-										this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-										break;
-									case 7:
-										this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-										break;
-									default:
-										this.$api.switchTabTo('/pages/tabBar/user/user')
-								}
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-						})							
-					}
-				})
-			},
-			//关闭未授权用户授权提示弹窗
-			hideModel(){
-				this.isUserInfo = false;
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userID
-				this.bindMobile = resolve.bindMobile
-				this.userIdentity = resolve.userIdentity
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		border-top: 1px solid #F7F7F7;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 100%;
-			background: rgba(225, 86, 22, 0.1);
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: 68rpx;
-			padding: 20rpx 24rpx;
-			margin: 24rpx 0 118rpx 0;
-			box-sizing: border-box;
-			.logo-text{
-				font-size: 24rpx;
-				line-height: 34rpx;
-				color: $color-system;
-			}
-		}
-		.login-container{
-			width: 100%;
-			height: auto;
-			padding: 0 24rpx;
-			box-sizing: border-box;
-		}
-		.login-form{
-			width: 100%;
-			height: auto;
-			box-sizing: border-box;
-			border-bottom: 1px solid #E1E1E1;
-			&.none{
-				border-bottom: none;
-			}
-			.login-input{
-				width: 100%;
-				height: 60rpx;
-				padding: 20rpx 0;
-				background: #FFFFFF;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				&.code{
-					width: 370rpx;
-					float: left;
-					margin-right: 20rpx;
-				}
-				&.btn{
-					width: 220rpx;
-					height: 64rpx;
-					padding: 0;
-					float: left;
-					background: $btn-confirm;
-					border-radius: 32rpx;
-					margin-top: 15rpx;
-					.input{
-						width: 220rpx;
-						height: 64rpx;
-						line-height: 64rpx;
-						padding: 0;
-						border-radius: 32rpx;
-						color: #FFFFFF;
-						background: $btn-confirm;
-					}
-					&.disabled{
-						background: #F7F7F7;
-						.input{
-							background: #F7F7F7;
-							color: #999999;
-						}
-					}
-				}
-				&.img-btn{
-					width: 300rpx;
-					height: 64rpx;
-					padding: 0;
-					float: left;
-					background: #FFFFFF;
-					display: block;
-					border-bottom: none;
-					margin-top: 16rpx;
-					.vscodeimg{
-						width: 160rpx;
-						height: 64rpx;
-						float: left;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						border-radius: 6rpx;
-						image{
-							width: 180rpx;
-							height: 88rpx;
-							border-radius: 6rpx;
-						}
-					}
-					.vscod-refresh{
-						width: 100rpx;
-						float: right;
-						height: 64rpx;
-						.icon-shuaxin{
-							font-size: 40rpx;
-							color: #999999;
-							display: block;
-							float: left;
-							height: 64rpx;
-							line-height: 64rpx;
-						}
-						.ref-text{
-							display: block;
-							float: right;
-							height: 64rpx;
-							line-height: 64rpx;
-							font-size: 24rpx;
-							color: #999999;
-						}
-					}
-				}
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #FFFFFF;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-		}
-		.login-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: 100rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
-	}
-</style>

pages/login/information.vue

@@ -1,1148 +0,0 @@
-<template>
-	<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 clearfix">
-				<view class="register-from">
-					<view class="label">联系人</view>
-					<input class="row-input" type="text" v-model="clubContact" placeholder="请输入联系姓名" placeholder-class="placeholder" maxlength="6"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from bordernone">
-					<view class="label">手机号</view>
-					<view class="row-input" placeholder="请输入手机号">{{ mobile }}</view>
-				</view>
-			</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 clearfix">
-				<view class="register-from">
-					<view class="label">邮箱</view>
-					<input class="row-input" type="text" name="input" v-model="email" placeholder="请输入邮箱地址"placeholder-class="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="请输入您的机构名称" placeholder-class="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="abbreviation" placeholder="请输入您的机构简称" placeholder-class="placeholder" maxlength="10"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
-					<view class="label">机构地址</view>
-					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{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>
-			<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"/>
-				</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="uploadBusinessImage == ''"  @click="chooseBusinessImage">
-							<image src="https://static.caimei365.com/app/img/upload/club-zizhi.png"></image>
-						</view>
-						<view class="upload-image" v-else>
-							<image :src="uploadBusinessImage" mode="" @click="viewBusinessImage"></image>
-							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-picture">
-					<view class="label">门头照</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMentuzImage == ''" @click="chooseMentuzImage">
-							<image src="https://static.caimei365.com/app/img/upload/club-door.png"></image>
-						</view>
-						<view class="upload-image" v-else>
-							<image :src="uploadMentuzImage" mode=""  @click="viewMentuzImage"></image>
-							<view class="upload-del" @click="delMentuzImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from picker bordernone">
-					<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="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 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="isOrganizationType == 1">
-				<view class="register-picture zz">
-					<view class="label zz">医疗执业许可证</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage == ''||uploadMedicalImage == 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="uploadMedicalImage" mode=""  @click="viewMedicalImage"></image>
-							<view class="upload-del" @click="delMedicalImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-show="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>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 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 :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</view>
-				</view>	
-				<!-- <view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				  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>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 2">
-				<view class="register-from group">
-					<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>
-						</checkbox-group>
-					</view>
-				</view>	
-				<!-- <view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				 v-show="isShowAustomItem"-->
-				<view class="register-from group btn" >
-					<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>
-					</view>
-				</view>
-			</view>
-			<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 clearfix">
-				<view class="register-from">
-					<view class="label">固定电话</view>
-					<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"/>
-				</view>
-			</view>
-			<view class="register-row text-textarea clearfix">
-				<view class="label">公司介绍</view>
-					<textarea 	class="textarea" 
-								type="text" 
-								v-model="companyPprofile" 
-								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-row">
-					<view class="register-btn sub" @click.stop="organizationUpdateInfo">确定</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 { getClubMobileCode,getClubNewMobileCode,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:'',			//机构用户类型
-				email:'',					//邮箱
-				clubName:'',	 			//机构名称
-				abbreviation:'',	 		//机构简称
-				clubContact:'',	 			//联系人
-				mobile:'',					//联系人手机号
-				socialCreditCode:'',	//统一社会信用代码
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
-				clubTelePhone:'',		//固定电话
-				clubFax:'',				//传真
-				companyPprofile:'',		//公司简介
-				firstClubType:'',		//机构类型
-				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: '',	//地址详情
-				},
-				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
-					this.UserService.OrganizationUpdateModifyInfo({userID:this.userID}).then(response =>{
-						let organizationClub = response.data.club
-						let organizationUser = response.data.user
-						this.email = organizationUser.email ? organizationUser.email :''	
-						this.clubID = organizationUser.clubID
-						this.userIdentity = organizationUser.userIdentity
-						this.clubName = organizationClub.name ? organizationClub.name : ''
-						this.clubContact = organizationClub.linkMan1
-						this.mobile = organizationUser.bindMobile ? organizationUser.bindMobile : ''
-						this.abbreviation = this.$reg.checkData(organizationClub.sname)
-						if( organizationClub.provinceID == null ){
-							this.addressData.provinceID = ''
-						}else{
-							this.addressData.provinceID = organizationClub.provinceID
-						}
-						if( organizationClub.cityID == null ){
-							this.addressData.cityID = ''
-						}else{
-							this.addressData.cityID = organizationClub.cityID
-						}
-						if( organizationClub.townID == null ){
-							this.addressData.townID = ''
-						}else{
-							this.addressData.townID = organizationClub.townID
-						}
-						this.addressData.addressDetail = organizationClub.address ? organizationClub.address : ''
-						this.socialCreditCode = this.$reg.checkData(organizationClub.socialCreditCode)
-						this.firstClubType = organizationClub.firstClubType
-						this.secondClubType = this.$reg.checkData(organizationClub.secondClubType)
-						this.addressData.address =  organizationClub.provincialAddress ? organizationClub.provincialAddress : ''
-						this.uploadBusinessImage = this.$reg.checkData(organizationClub.businessLicenseImage)
-						this.uploadMedicalImage = this.$reg.checkData(organizationClub.medicalPracticeLicenseImg)
-						this.uploadMentuzImage = this.$reg.checkData(organizationClub.headpic)
-						this.department = organizationClub.department						
-						this.clubTelePhone = this.$reg.checkData(organizationClub.contractPhone)
-						this.clubFax = this.$reg.checkData(organizationClub.fax)
-						this.companyPprofile = this.$reg.checkData(organizationClub.info)
-						//机构类型&&主营项目
-						switch(this.firstClubType){
-							case '1':
-								this.organizationTypeText = '医美'
-								this.isOrganizationType = 1
-								break;
-							case '2':
-								this.organizationTypeText = '生美'
-								this.isOrganizationType = 2
-								break;
-							case null:
-								this.organizationTypeText = '请选择机构类型'
-								this.isOrganizationType = 0
-								break;
-						}	
-						if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
-							this.mentuzCampList = this.mentuzCampNullList
-							this.medicaCampList = this.medicaCampNullList
-						}else{
-							if(this.firstClubType == '1'){
-								this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
-								this.medicaCampList = this.medicaCampNullList
-							}else{
-								this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
-								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;
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			organizationUpdateInfo(){//提交审核
-				let params = {}
-				if(this.userIdentity === 4){
-					 params = {
-							userID:this.userID,
-							clubID:this.clubID,					//会所ID
-							linkMan1:this.clubContact,
-							fax:this.clubFax,
-							contractPhone:this.clubTelePhone,
-							info : this.companyPprofile,
-						}		
-				}else{
-					if(!this.isMainproCheck){
-						let mainproList = []
-						if(this.firstClubType == '1'){
-							this.mentuzCampList.forEach(item =>{
-								mainproList.push(item.name)
-							})
-						}else{
-							this.medicaCampList.forEach(item =>{
-								mainproList.push(item.name)
-							})
-						}
-						this.mainpro = mainproList.join('/')
-					}
-					params 	= {
-							userID:this.userID,
-							clubID:this.clubID,					//会所ID
-							name:this.clubName,
-							linkMan1:this.clubContact,
-							sname:this.abbreviation,
-							contractEmail1:this.email,
-							provinceID:this.addressData.provinceID,
-							cityID:this.addressData.cityID,
-							townID:this.addressData.townID,
-							address:this.addressData.addressDetail,
-							socialCreditCode:this.socialCreditCode,
-							businessLicenseImage:this.uploadBusinessImage,
-							headpic:this.uploadMentuzImage,
-							firstClubType:this.isOrganizationType, //机构类型分类 医美:0和生美:1
-							secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
-							department:this.department,				//科室
-							medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
-							mainpro:this.mainpro,
-							fax:this.clubFax,
-							contractPhone:this.clubTelePhone,
-							info : this.companyPprofile
-					}
-				}
-				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.companyPprofile = e.detail.value;
-			},
-			chooseBusinessImage() {//营业执照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadBusinessImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMentuzImage() {//门头照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMentuzImage = JSON.parse(res.data).data
-				})
-			},
-			chooseMedicalImage() {//资质照图片上传
-				uploadFileImage().then(res =>{
-					this.uploadMedicalImage = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.uploadBusinessImage)
-			},
-			viewMentuzImage(e) {
-				this.myPreviewImageFn(this.uploadMentuzImage)
-			},
-			viewMedicalImage(e) {
-				this.myPreviewImageFn(this.uploadMedicalImage)
-			},
-			myPreviewImageFn(url){
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.uploadBusinessImage = ''
-				})
-			},
-			delMentuzImage(){
-				this.$util.modal('','确定删除门头照图片吗？','确定','取消',true,() =>{
-					this.uploadMentuzImage = ''
-				})
-			},			
-			delMedicalImage(){
-				this.$util.modal('','确定删除资质图片吗？','确定','取消',true,() =>{
-					this.uploadMedicalImage = ''
-				})
-			},
-			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;
-					}
-				}
-			},
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.isMainproCheck = true
-				this.mainpro = 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)
-							}
-						}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() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userIdentity = resolve.userIdentity
-			})
-			if(this.isPreviewImage){
-				this.isPreviewImage = false
-				return
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.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;
-			&.detailed{
-				padding-bottom: 300rpx;
-			}
-			.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{
-				height: auto;
-				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;
-					}
-				}	
-				.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;
-					}
-				}
-				.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;
-					}
-					&.bordernone{
-						border: none;
-						height: auto;
-					}
-					&.second{
-						padding-left: 160rpx;
-					}
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 88rpx;
-						float: left;
-					}
-					.kes-title{
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 88rpx;
-					}
-					.row-input{
-						width: 520rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 88rpx;
-						float: right;
-						height: 88rpx;
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #333333;
-						}
-						
-					}
-					&.code{
-						width: 410rpx;
-						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: 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;
-							}
-						}
-					}
-					&.picker{
-						width: 654rpx;
-						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;
-						}
-					}
-					&.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;
-						}
-					}
-					&.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;
-						}
-					}
-					&.btn{
-						margin-top: 0;
-					}
-					.content-class {
-						margin: 20rpx auto;
-						display: flex;
-						flex-flow: row wrap;
-						justify-content: space-between;
-						align-items: center;
-						&.btn{
-							margin: 0 auto;
-							margin-left: 116rpx;
-						}
-						.row-input{
-							display: flex;
-							width: 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;
-						}
-						.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;
-					color: #b2b2b2;
-				}
-				&.text-textarea{
-					background: #FFFFFF;
-					margin: 0 24rpx;
-					.label{
-						color: #666666;
-						font-size: $font-size-28;
-						line-height: 88rpx;
-					}
-					.textarea{
-						width: 654rpx;
-						height: 200rpx;
-						// background: #F7F7F7;
-						padding: 24rpx;
-						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;
-						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;
-					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;
-						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;
-							}
-						}
-					}
-				}
-			}
-			.register-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin: 0 auto;
-				margin-bottom: 60rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-			.register-fiexd{
-				width: 100%;
-				height: auto;
-				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;
-						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;
-				}
-			}
-		}
-	}
-	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);
-	}
-</style>

pages/login/login.vue

@@ -1,114 +1,87 @@
+
 <template>
-	<view class="container login" v-if="isWxAuthorize">
+	<view class="container login">
 		<view class="login-main">
 			<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
 		</view>
-		<view class="login-form">
-			<view class="login-input">
-				<input type="text" 
-					   v-model="accountNumber"  
-					   maxlength="30" 
-					   class="input" 
-					   placeholder="请输入邮箱/手机号"
-				/>
-			</view>
-			<view class="login-input">
-				<input v-show="isShowEye" type="text" v-model="password"  maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
-				<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="18" class="input" placeholder="请输入密码" autocomplete="new-password"/>
-				<view class="iconfont" :class="isShowEye ? iconEyen : iconEyes"  @click="passwordClick"></view>
-			</view>
-			<view class="login-input link">
-				<view class="login-reg" @click.stop="this.$api.navigateTo('/pages/login/register-select')">免费注册</view>
-				<view class="login-pwd" @click.stop="this.$api.navigateTo('/pages/login/password')">忘记密码?</view>
-			</view>
+		<view class="login-input">
+			<input type="number" 
+				   v-model="invitationCode"  
+				   maxlength="6" 
+				   class="input" 
+				   placeholder="请输入邀请码"
+			/>
 		</view>
-		<view class="login-btn"  @click="confirmLogin">登录</view>
-		<view class="login-btn-last" @click.stop="this.$api.navigateTo(`/pages/login/logincode?data=${getOption}`)">邀请码登录</view>
-		<view class="login-tel">客服热线：0755-22907771</view>
+		<view class="login-row" @click.stop="this.$api.navigateTo('/pages/login/register-select')"><text>免费注册</text></view>
+		<view class="login-btn"  @click.stop="goLogin">登录</view>
+		<view class="login-btn-last" @click.stop="this.$api.navigateTo('/pages/login/login')">账号登录</view>
 	</view>
 </template>
 
 <script>
-	import { mapState,mapMutations } from 'vuex';
-	import authorize from '@/common/config/authorize.js' 
+	import authorize from '@/common/config/authorize.js'
 	import wxLogin from "@/common/config/wxLogin.js"
+	import {mapState,mapMutations } from 'vuex';
+	import { invitationCodeLogin  } from '@/services/use.js'
 	export default{
 		data() {
 			return{
-				isShowEye:false,
-				iconEyes:'icon-yanjing_yincang_o',
-				iconEyen:'icon-yanjing_xianshi_o',
-				accountNumber:'',  //用户登录账号
-				password:'',	   //用户登录密码	
-				toestText:'',
-				telPhone:'',
-				loginType:'',		//跳转类型
-				alertText:'',
-				listType: '',
-				listVal: '',
-				detilType:'',
-				id:'',			//商品ID
-				getOption:''	//页面传递参数
+				invitationCode:'',  //获取用户登录的邀请码
 			}
 		},
 		onLoad(option) {
-			this.getOption = JSON.stringify(option)
+
 		},
 		computed: {
-			...mapState(['hasLogin','isWxAuthorize','isLoginType'])
+			...mapState(['isWxAuthorize','isLoginType','isLoginProductId','isLoginOrderId'])
 		},
 		methods:{
 			...mapMutations(['login']),
-			confirmLogin(){
-				if( this.accountNumber == ''){
-					this.$util.msg('请输入账户名',2000)
-					return
-				}
-				if( this.password == ''){
-					this.$util.msg('请输入密码',2000)
+			goLogin() {
+				if( this.invitationCode == ''){
+					this.$util.msg('请输入邀请码',2000)
 					return
 				}
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						this.AorganizationLogin()
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=0')
-					}
-				})
-			},
-			AorganizationLogin(){
-				this.UserService.AorganizationLogin({mobileOrEmail:this.accountNumber,password:this.password,source:'www'}).then(response =>{
-					if(response.code === 0){
-						this.storeUpdataeStatus(response.data)
-						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
-					}else if(response.code === -3){
-						this.$util.modal('','您的企业账号审核未通过，请修改资料','前往修改','',false,() =>{
-							this.$store.commit('updateStatus',response.data)
-							this.$api.navigateTo('/pages/login/apply-supplier')
+				wx.getUserInfo({
+					success: res => {
+						this.isUserInfo = false
+						this.userInfo = res.userInfo;
+						let params ={
+								invitationCode:this.invitationCode,
+								nickName:res.userInfo.nickName,
+								headimgurl:res.userInfo.avatarUrl,
+						}							
+						invitationCodeLogin(params).then(response =>{
+							this.login(response.data)
+							wxLogin.wxLoginAuthorize()
+							if(response.data.userIdentity === 3){
+								setTimeout(()=>{
+									this.$api.navigateTo('/supplier/pages/index/index')
+								},1000)
+							}else{
+								setTimeout(()=>{
+									switch(this.isLoginType){
+										case 9:
+											this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
+											break;
+										case 8:
+											this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
+											break;
+										case 7:
+											this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
+											break;
+										default:
+											this.$api.switchTabTo('/pages/tabBar/user/user')
+									}
+								},1000)
+							}
+						}).catch(error =>{
+							this.$util.msg(error.msg,2000)
+							this.isUserInfo = false
 						})
-					}else{
-						this.$util.msg(response.msg,2000);
 					}
 				})
-			},
-			storeUpdataeStatus(data){
-				uni.setStorageSync('token',data.token)
-				this.$store.commit('updateStatus',data)
-				this.login(data);
-			},
-			passwordClick() { //密码显隐操作
-				this.isShowEye = !this.isShowEye;
-			},
-		},
-		onShow() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
-					wxLogin.wxLoginQuick()
-					console.log(this.isLoginType)
-				}else{
-					this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				}	
-			})
+			}
 		}
 	}
 </script>
@@ -146,7 +119,7 @@
 			background: #FFFFFF;
 			position: relative;
 			box-sizing: border-box;
-			border-bottom: 1px solid #e1e1e1;
+			border-bottom: 1px solid #E1E1E1;
 			.input{
 				width: 100%;
 				height: 100%;
@@ -155,35 +128,14 @@
 				line-height: 88rpx;
 				color: #333333;
 			}
-			.iconfont{
-				position: absolute;
-				right: 0;
-				top: 0;
-				font-size: 44rpx;
-				color: #999999;
-				font-weight: bold;
-				z-index: 99;
-				width: 96rpx;
-				height: 96rpx;
-				line-height: 96rpx;
-				text-align: center;
-			}
-			&.link{
-				background: #FFFFFF;
-				margin-bottom: 40rpx;
-				padding: 0 0;
-				line-height: 40rpx;
-				font-size: $font-size-28;
-				border-bottom: none;
-				.login-reg{
-					float: left;
-					color: $color-system;
-				}
-				.login-pwd{
-					float: right;
-					color: $text-color;
-				}
-			}
+		}
+		.login-row{
+			padding: 0 75rpx;
+			font-size: $font-size-28;
+			line-height: 40rpx;
+			color: #E15616;
+			margin-bottom: 48rpx;
+			text-align: right;
 		}
 		.login-btn{
 			width: 600rpx;
@@ -208,15 +160,6 @@
 			border: 1px solid $color-system;
 			margin-top: 20rpx;
 		}
-		.login-tel{
-			width: 702rpx;
-			font-size: $font-size-28;
-			line-height: 80rpx;
-			margin: 0 auto;
-			color: $text-color;
-			text-align: center;
-			margin-top: 150rpx;
-		}
 		.model-authorization{
 			width: 100%;
 			height: 100%;

pages/login/logincode.vue

@@ -1,198 +0,0 @@
-
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
-		</view>
-		<view class="login-input">
-			<input type="number" 
-				   v-model="invitationCode"  
-				   maxlength="6" 
-				   class="input" 
-				   placeholder="请输入邀请码"
-			/>
-		</view>
-		<view class="login-row" @click.stop="this.$api.navigateTo('/pages/login/register-select')"><text>免费注册</text></view>
-		<view class="login-btn"  @click.stop="goLogin">登录</view>
-		<view class="login-btn-last" @click.stop="this.$api.navigateTo('/pages/login/login')">账号登录</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	import {mapState,mapMutations } from 'vuex';
-	import { invitationCodeLogin  } from '@/services/use.js'
-	export default{
-		data() {
-			return{
-				invitationCode:'',  //获取用户登录的邀请码
-			}
-		},
-		onLoad(option) {
-
-		},
-		computed: {
-			...mapState(['isWxAuthorize','isLoginType','isLoginProductId','isLoginOrderId'])
-		},
-		methods:{
-			...mapMutations(['login']),
-			goLogin() {
-				if( this.invitationCode == ''){
-					this.$util.msg('请输入邀请码',2000)
-					return
-				}
-				wx.getUserInfo({
-					success: res => {
-						this.isUserInfo = false
-						this.userInfo = res.userInfo;
-						let params ={
-								invitationCode:this.invitationCode,
-								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
-						}							
-						invitationCodeLogin(params).then(response =>{
-							this.login(response.data)
-							wxLogin.wxLoginAuthorize()
-							if(response.data.userIdentity === 3){
-								setTimeout(()=>{
-									this.$api.navigateTo('/supplier/pages/index/index')
-								},1000)
-							}else{
-								setTimeout(()=>{
-									switch(this.isLoginType){
-										case 9:
-											this.$api.navigateTo(`/h5/pages/activity/activity_mid`)
-											break;
-										case 8:
-											this.$api.navigateTo(`/pages/goods/product?id=${this.isLoginProductId}`)
-											break;
-										case 7:
-											this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.isLoginOrderId}`)
-											break;
-										default:
-											this.$api.switchTabTo('/pages/tabBar/user/user')
-									}
-								},1000)
-							}
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000)
-							this.isUserInfo = false
-						})
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.login-main{
-			width: 100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			height: 189rpx;
-			padding:60rpx 0 40rpx 0;
-			margin-bottom: 70rpx;
-			.logo{
-				width:467rpx;
-				height: 189rpx;
-				display: block;
-			}
-		}
-		.login-input{
-			width: 600rpx;
-			height: 88rpx;
-			padding: 24rpx 0;
-			margin: 0 auto;
-			margin-bottom: 30rpx;
-			background: #FFFFFF;
-			position: relative;
-			box-sizing: border-box;
-			border-bottom: 1px solid #E1E1E1;
-			.input{
-				width: 100%;
-				height: 100%;
-				background: #FFFFFF;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #333333;
-			}
-		}
-		.login-row{
-			padding: 0 75rpx;
-			font-size: $font-size-28;
-			line-height: 40rpx;
-			color: #E15616;
-			margin-bottom: 48rpx;
-			text-align: right;
-		}
-		.login-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;
-		}
-		.login-btn-last{
-			width: 600rpx;
-			height: 86rpx;
-			border-radius: 44rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: $color-system;
-			margin: 0 auto;
-			text-align: center;
-			border: 1px solid $color-system;
-			margin-top: 20rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
-	}
-</style>

pages/login/password.vue

@@ -1,469 +0,0 @@
-<template>
-	<view class="container login">
-		<view class="login-main">
-			<!-- <view class="line"></view> -->
-			<view class="nav-item"
-				  :class="{ current: tabCurrentIndex === 1 }" 
-				  @click="tabClick(1)">
-				  使用手机修改
-			</view>					
-			<view class="nav-item" 
-				  :class="{ current: tabCurrentIndex === 2 }" 
-				  @click="tabClick(2)">
-				  使用邮箱修改
-			</view>
-		</view>
-		<!-- 手机修改 -->
-		<view class="content" v-if="tabCurrentIndex === 1">
-			<view class="login-form clearfix">
-				<view class="login-input">
-					<input type="number" v-model="mobile"  maxlength="11" class="input" placeholder="请输入手机号" placeholder-class="placeholder"/>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input code">
-					<input type="text" v-model="imageCode"  maxlength="4" class="input" placeholder="请输入右侧图形验证码"  placeholder-class="placeholder"/>
-				</view>
-				<view class="login-input img-btn">
-					<view class="vscodeimg">
-						<image :src="imageCodeUrl" mode=""></image>
-					</view>
-					<view class="vscod-refresh" @click.stop="getVerificationCode">
-						<text class="iconfont icon-shuaxin"></text>
-						<text class="ref-text">刷新</text>
-					</view>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input code">
-					<input type="number" v-model="mobileCode"  maxlength="6" class="input" placeholder="请输入短信验证码"  placeholder-class="placeholder"/>
-				</view>
-				<view class="login-input btn" :class="[isMobileDisabled  ? 'disabled' : '']" >
-					<button type="button"
-							@click.stop="getMobileCodeFn"
-							:disabled="isMobileDisabled" 
-							class="input" >
-							{{ mobileCodeText }}
-					</button>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input pwd">
-					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input pwd">
-					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
-				</view>
-			</view>
-			<view class="login-form clearfix" style="border: 0;">
-				<view class="login-btn"  @click="confirmMobilePassword">修改密码</view>
-			</view>
-		</view>
-		<!-- 邮箱修改 -->
-		<view class="content" v-else>
-			<view class="login-form clearfix">
-				<view class="login-input">
-					<input class="input" type="text" v-model="email"  maxlength="30" placeholder="请输入邮箱地址"  placeholder-class="placeholder"/>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input code">
-					<input class="input" type="number" v-model="emailCode" maxlength="4"  placeholder="请输入邮箱验证码"  placeholder-class="placeholder"/>
-				</view>
-				<view class="login-input btn" :class="[isEmialDisabled ? 'disabled' : '']">
-					<button class="input"  
-							type="button"  
-							@click.stop="getEmailCodeFn"
-							:disabled="isEmialDisabled">
-							{{ emailCodeText }}
-					</button>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input pwd">
-					<input v-show="isShowEye" type="text" v-model="password"  maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEye" type="password" v-model="password"  :password="true" maxlength="16" class="input" placeholder="请输入新密码，必须为8-16位字母数字的组合" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEye ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEye"></view>
-				</view>
-			</view>
-			<view class="login-form clearfix">
-				<view class="login-input pwd">
-					<input v-show="isShowEyes" type="text" v-model="passwordCheck"  maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<input v-show="!isShowEyes" type="password" v-model="passwordCheck"  :password="true" maxlength="16" class="input" placeholder="请确认密码" autocomplete="new-password"  placeholder-class="placeholder"/>
-					<view class="iconfont" :class="isShowEyes ? 'icon-kejian1' : 'icon-bukejian'"  @click="passwordEyes"></view>
-				</view>
-			</view>
-			<view class="login-form clearfix" style="border: 0;">
-				<view class="login-btn"  @click="confirmEmailPassword">修改密码</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import authorize from '@/common/config/authorize.js' 
-	import { mobilePassword , emailPassword } from "@/services/use.js"
-	import { getEmailCode } from "@/services/public.js"
-	
-	export default{
-		data() {
-			return{
-				tabCurrentIndex: 1,
-				mobile:'',  		//用户手机号
-				email:'',			//邮箱地址
-				emailCode:'',		//油箱验证码
-				mobileCode:'',  	//手机验证码
-				password:'',		//新密码
-				passwordCheck:'',   //二次校验新密码
-				isShowEye:false,	//控显
-				isShowEyes:false,	//控显
-				iconEyes:'icon-yanjing_yincang_o',
-				iconEyen:'icon-yanjing_xianshi_o',
-				isEmialDisabled:false,//获取邮箱验证码按钮
-				isMobileDisabled:false,//获取手机短信按钮
-				imageCode:'',			//图形验证码
-				imageCodeUrl:'',		//图形验证码地址
-				imageCodetoken:'',		//图形校验token
-				count: '',				//倒计时
-				emailCodeText: '获取验证码',
-				mobileCodeText: '获取验证码',
-				codeTime: null,
-			}
-		},
-		onLoad(option) {
-			this.getVerificationCode()
-		},
-		methods:{
-			confirmMobilePassword(){//手机号修改
-				let params = {
-						mobileOrEmail : this.mobile,
-						activateCode : this.mobileCode,
-						passWord : this.password,
-						confirmPwd : this.passwordCheck,
-						status:1
-					}
-				mobilePassword(params).then(res =>{
-					this.$util.msg(res.msg,2000);
-					setTimeout(()=>{
-						uni.navigateBack({
-							delta: 1
-						});
-					},2000)
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			confirmEmailPassword(){//邮箱修改密码
-				 let params = {
-						mobileOrEmail : this.email,
-						activateCode : this.emailCode,
-						passWord : this.password,
-						confirmPwd : this.passwordCheck,
-						status:2
-					}
-				emailPassword(params).then(res =>{
-					this.$util.msg(res.msg,2000);
-					setTimeout(()=>{
-						uni.navigateBack({
-							delta: 1
-						});
-					},2000)
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			getVerificationCode(){//图形验证
-				this.PublicService.GetImgVerifyCode().then(res => {
-					this.imageCodeUrl = res.data.baseImage
-					this.imageCodetoken = res.data.token
-				})
-			},
-			getEmailCodeFn(){//获取邮箱验证码
-				if( this.email == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if(!this.$reg.isEmail(this.email)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				this.isEmialDisabled = true;
-				getEmailCode({email:this.email,status:3}).then(res =>{
-					this.$util.msg('邮箱验证码已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-			       		this.isEmialDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.emailCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isEmialDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.emailCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isEmialDisabled = false;
-				})
-			},
-			getMobileCodeFn(){//获取手机验证码
-				if( this.mobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.mobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				if( this.imageCode == ''){
-					this.$util.msg('请输入图形验证码',2000);
-					return
-				}
-				let params = {
-						mobile:this.mobile,
-						activateCodeType:1,
-						platformType:2,
-						imgCode:this.imageCode,
-						token:this.imageCodetoken,
-					}
-				this.isMobileDisabled = true;
-				this.PublicService.GetMobileCode(params).then(res =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-			       		this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isMobileDisabled = false;
-				})
-			},
-			tabClick(index) {//tab切换
-				this.tabCurrentIndex = index;
-				this.password = ''
-				this.passwordCheck = ''
-				if(this.tabCurrentIndex == 1){
-					this.getVerificationCode()
-				}
-			},
-			passwordEye() {//密码显隐操作
-				this.isShowEye = !this.isShowEye;
-			},
-			passwordEyes() {//密码显隐操作
-				this.isShowEyes = !this.isShowEyes;
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.login{
-		width: 100%;
-		height: auto;
-		.login-main{
-			width: 100%;
-			display: flex;
-			height: 80rpx;
-			border-top: 1px solid #F7F7F7;
-			margin-bottom: 80rpx;
-			position: relative;
-			.nav-item{
-				display: flex;
-				flex: 1;
-				flex-direction: column;
-				align-items: center;
-				line-height: 80rpx;
-				color: #666666;
-				font-size: $font-size-28;
-				background: #F7F7F7;
-				&.current{
-					color:$color-system;
-					background: #FFFFFF;
-					
-				}
-			}
-		}
-		.login-form{
-			width: 702rpx;
-			height: auto;
-			margin: auto;
-			border-bottom: 2rpx solid #e1e1e1;
-			.login-input{
-				width: 100%;
-				height: 64rpx;
-				padding: 24rpx 0;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				position: relative;
-				&.pwd{
-					.iconfont{
-						position: absolute;
-						right: 0;
-						top: 0;
-						font-size: 44rpx;
-						color: #999999;
-						z-index: 99;
-						width: 96rpx;
-						height: 96rpx;
-						line-height: 96rpx;
-						text-align: center;
-					}
-				}
-				&.code{
-					width: 310rpx;
-					float: left;
-					margin-right: 20rpx;
-				}
-				&.btn{
-					width: 220rpx;
-					height: 64rpx;
-					float: right;
-					background: $btn-confirm;
-					padding: 0;
-					border-radius: 44rpx;
-					margin-top: 20rpx;
-					.input{
-						width: 220rpx;
-						height: 64rpx;
-						line-height: 64rpx;
-						padding: 0;
-						color: #FFFFFF;
-						background: $btn-confirm;
-						text-align: center;
-						border-radius: 44rpx;
-						&.none{
-							background: #F7F7F7;
-						}
-					}
-					&.disabled{
-						background: #F7F7F7;
-						.input{
-							background: #F7F7F7;
-							color: #999999;
-						}
-					}
-				}
-				&.img-btn{
-					width: 290rpx;
-					height: 64rpx;
-					padding: 0;
-					float: right;
-					background: #FFFFFF;
-					display: block;
-					margin-top: 10rpx;
-					.vscodeimg{
-						width: 160rpx;
-						height: 64rpx;
-						float: left;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						border-radius: 6rpx;
-						margin-top: 10rpx;
-						image{
-							width: 180rpx;
-							height: 88rpx;
-							border-radius: 6rpx;
-						}
-					}
-					.vscod-refresh{
-						width: 100rpx;
-						float: right;
-						margin-top: 25rpx;
-						.icon-shuaxin{
-							font-size: 36rpx;
-							color: #999999;
-							float: left
-						}
-						.ref-text{
-							font-size: 24rpx;
-							color: #333333;
-							float: right;
-						}
-					}
-				}
-				.input{
-					width: 100%;
-					height: 100%;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-		}
-		.login-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: 100rpx;
-		}
-		.model-authorization{
-			width: 100%;
-			height: 100%;
-			position: fixed;
-			top: 0;
-			left: 0;
-			z-index: 999;
-			.authorization{
-				width: 518rpx;
-				height: 320rpx;
-				position: absolute;
-				background: rgba(255,255,255,.7);
-				left: 0;
-				right: 0;
-				bottom: 0;
-				top: 0;
-				margin: auto;
-				.to-btn{
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					margin: auto;
-					width: 70%;
-					height: 88rpx;
-					font-size: $font-size-28;
-					line-height: 88rpx;
-					color: #FFFFFF;
-					text-align: center;
-					border-radius: 44rpx;
-				}
-			}
-		}
-	}
-	.placeholder{
-		color: #b2b2b2;
-	}
-</style>

pages/login/register-select.vue

@@ -1,117 +0,0 @@
-
-<template>
-	<view class="container register">
-		<view class="main">
-			<view class="title">请选择注册的账号类型</view>
-			<view class="main-item">
-				<view class="item" @click.stop="this.$api.navigateTo('/pages/login/register')">
-					<view class="icon">
-						<image src="https://static.caimei365.com/app/img/icon/icon-club.png" mode=""></image>
-					</view>
-					<view class="text by">采购方(买家)</view>
-					<view class="text-small">医院机构/美容会所/个人买家</view>
-				</view>
-				<view class="item" @click.stop="this.$api.navigateTo('/pages/login/register-supplier')">
-					<view class="icon">
-						<image src="https://static.caimei365.com/app/img/icon/icon-supplier.png" mode=""></image>
-					</view>
-					<view class="text my">供应商(卖家)</view>
-					<view class="text-small">仪器/产品/服务供应商</view>
-				</view>
-			</view>
-		</view>
-		<image class="bg_image" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E8%83%8C%E6%99%AF.png" mode=""></image>
-	</view>
-</template>
-
-<script>
-	export default{
-		data() {
-			return{
-				
-			}
-		},
-		onLoad(option) {
-
-		},
-		computed: {
-			
-		},
-		methods:{
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.register{
-		width: 100%;
-		height: 100%;
-		position: relative;
-		box-sizing: border-box;
-		padding-top: 100rpx;
-		.main{
-			width: 100%;
-			height: 370rpx;
-			.title{
-				width: 100%;
-				height: 46rpx;
-				line-height: 46rpx;
-				float: left;
-				text-align: center;
-				font-size: $font-size-34;
-				color: $text-color;
-				font-weight: bold;
-			}
-			.main-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: 50rpx;
-					.icon{
-						width: 186rpx;
-						height: 186rpx;
-						image{
-							width: 186rpx;
-							height: 186rpx;
-							display: block;
-						}
-					}
-					.text{
-						line-height: 54rpx;
-						font-size: $font-size-30;
-						text-align: center;
-						&.by{
-							color: #3b77ff;
-						}
-						&.my{
-							color: #ff7a51;
-						}
-					}
-					.text-small{
-						line-height: 54rpx;
-						font-size: $font-size-24;
-						text-align: center;
-						color: #999999;
-					}
-				}
-			}
-		}
-		.bg_image{
-			position: absolute;
-			width: 100%;
-			height:354rpx;
-			left: 0;
-			bottom: 0;
-		}
-	}
-</style>

pages/login/register-supplier.vue

@@ -1,1160 +0,0 @@
-<template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}" v-if="isWxAuthorize">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="register-step">
-			<view class="step-item" :class="stepIndex == 0 ? 'active' : ''">
-				<text class="step-num">1</text><text>账户信息</text>
-				<text class="line"></text>
-			</view>
-			<view class="step-item" :class="stepIndex == 1 ? 'active' : ''">
-				<text class="step-num">2</text><text>基本信息</text>
-				<text class="line"></text>
-			</view>
-			<view class="step-item" :class="stepIndex == 2 ? 'active' : ''">
-				<text class="step-num">3</text><text>详细信息</text>
-			</view>
-		</view>
-		<view class="register-main clearfix" v-if="stepIndex === 0">
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">手机号:</view>
-					<input class="row-input" type="number" name="input" v-model="firstParmas.bindMobile" placeholder="请输入联系人常用手机号" maxlength="11"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<input type="text" 
-						   v-model="imageCode"  
-						   maxlength="4" 
-						   class="row-input imgCode" 
-						   placeholder="请输入右侧图形验证码"
-					/>
-					<view class="vscodeimg">
-						<image :src="imageCodeUrl" mode=""></image>
-					</view>
-					<view class="vscod-refresh"  @click.stop="getVerificationCode">
-						<text class="iconfont icon-shuaxin"></text>
-						<text class="ref-text">刷新</text>
-					</view>
-				</view>
-			</view>	
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">短信验证码:</view>
-					<input class="row-input code" type="text" v-model="firstParmas.mobileCode" placeholder="请输入短信验证码" maxlength="6"/>
-					<view class="row-btn" :class="[isMobileDisabled  ? 'disabled' : '']">
-						<button class="row-input"
-								type="button" 
-								@click.stop="getMobileCodeFn" 
-								:disabled="isMobileDisabled">
-								{{ mobileCodeText }}
-						</button>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">登录密码:</view>
-					<input class="row-input" type="password" name="input" v-model="firstParmas.password" placeholder="密码必须为8-16位字母数字组合" maxlength="16"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">确认密码:</view>
-					<input class="row-input" type="password" name="input" v-model="firstParmas.passWordConfirm" placeholder="请确认密码" maxlength="16"/>
-				</view>
-			</view>
-			<view class="register-row ">
-				<view class="register-btn" @click.stop="SupplierRegisteredFirst">下一步</view>
-			</view>
-		</view>	
-		
-		<view class="register-main clearfix" v-if="stepIndex === 1">
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">公司名称:</view>
-					<input class="row-input" type="text" name="input" v-model="twoParmas.name" placeholder="请输入您的公司名称" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">联系人:</view>
-					<input class="row-input" type="text" name="input" v-model="twoParmas.linkMan" placeholder="请输入联系人姓名" maxlength="6"/>
-				</view>
-			</view>
-			<view class="register-row none clearfix">
-				<view class="register-from">
-					<view class="label">邮箱:</view>
-					<input class="row-input" type="text" name="input" v-model="twoParmas.email" placeholder="请输入邮箱地址" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row text clearfix">
-				<text>邮箱可用作登录账号，请使用公司邮箱或法人邮箱</text>
-			</view>	
-			<view class="register-row ">
-				<view class="register-btn next" @click.stop="SupplierRegisteredTwo">下一步</view>
-				<view class="register-btn prev" @click.stop="setStep(0)">上一步</view>
-			</view>
-		</view>
-		<view class="register-main clearfix" v-if="stepIndex === 2">
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">公司简称:</view>
-					<input class="row-input" type="text" v-model="threeParmas.sname" placeholder="请输入您的公司简称" maxlength="10"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from"  @click="showMulLinkageThreePicker">
-					<view class="label">联系地址:</view>
-					<text class="row-input" :class="addressText === '请选择公司所在地区' ? 'none' : ''">
-						{{ addressText }}
-					</text>		
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="register-row text-textarea clearfix">
-				<view class="textarea show" v-if="isShowInput" @click="showTextareaFocus">{{threeParmas.address ? threeParmas.address :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="threeParmas.address" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="40"
-							@input="onTextareaInput"
-							:focus="textareaFocus"
-							@blur="hideTextareaFocus"
-							:class="isShowInput ? '':''"
-				/>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="threeParmas.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="threeParmas.businessLicenseImage === ''"  @click="chooseBusinessImage"><text class="iconfont icon-jiahao"></text></view>
-						<view class="upload-image" v-else>
-							<image :src="threeParmas.businessLicenseImage" mode="" @click="viewBusinessImage"></image>
-							<view class="upload-del" @click="delBusinessImage">
-								<text class='iconfont icon-shanchu1'></text>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from picker">
-					<view class="label">公司类型:</view>
-					<view class="row-input picker" @click="bindPickerChange">{{ organizationTypeText }}</view>
-					<text class="iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-			<view class="register-row none clearfix" v-if="threeParmas.firstShopType == 1">
-				<view class="register-from radio">
-					<view class="label">医疗类型:</view>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="threeParmas.firstShopType == 1">
-				<view class="register-from radio">
-					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in supplierList" :key="item.value">
-							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
-							<view class="row-text">{{item.name}}</view>
-						</label>
-					</radio-group>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="threeParmas.firstShopType != 0">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
-					<view class="content-class">
-						<checkbox-group @change="chooseMaleLike" >
-							<label class="item" v-for="(item, index) in supplierMedicaCampList" :key="index" :class="{on: item.checked}">
-							   <checkbox :value="item.value"></checkbox>
-							   <text class="item-text">{{item.name}}</text>
-							</label>
-						</checkbox-group>
-					</view>	
-				</view>	
-				<view class="register-from group btn">
-					<view class="content-class btn">
-						<view class="item" @click="showAustomItem">
-							<text class="item-text">其他</text>
-						</view>
-					</view>
-				</view>
-				<view class="register-from group btn" v-show="isShowAustomItem">
-					<view class="content-class btn">
-						<input class="row-input other" type="text" v-model="customItemValue" placeholder="请输入自定义项目"  @blur="onBlurInput" maxlength="5"/>
-						<button type="default" 
-								class="confirm-btn" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@click.stop="addCustomItem"
-						>确认添加</button>
-					</view>
-				</view>
-			</view>
-			<view class="register-main clearfix">
-				<view class="register-agree">
-					<view class="agree-text"  @tap.stop="agreeCheck()">
-						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
-						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/supplieragree')">《供应商协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
-					</view>
-				</view>
-				<view class="register-row ">
-					<view class="register-btn sub" @click.stop="SupplierRegisteredThree">注册</view>
-					<view class="register-btn prev" @click.stop="setStep(1)">上一步</view>
-				</view>
-			</view>
-		</view>
-		<mpvue-city-picker :themeColor="themeColor"
-							ref="mpvueCityPicker" 
-						    :pickerValueDefault="cityPickerValueDefault"
-							@onCancel="onCancel" 
-							@onConfirm="onConfirm">
-		</mpvue-city-picker>
-		<supplier-alert v-if="isSupplierAlert"></supplier-alert>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex';
-	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import supplierAlert from '@/components/cm-module/modelAlert/supplierRegisreAlert.vue'
-	import { supplierList,supplierMedicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { uploadFileImage } from "@/services/public.js"
-	export default{
-		components:{
-			mpvueCityPicker,
-			supplierAlert
-		},
-		data() {
-			return{
-				nvabarData: {//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '供应商注册', // 导航栏 中间的标题
-					haveBack:true,
-					textLeft:this.$store.state.isIphone
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				isMobileDisabled: false,	//手机验证码按钮控制
-			    mobilCount: '',				//倒计时
-			    mobileCodeText: '获取验证码',
-			    mobilTime: null,
-				imageCode:'',			//图形验证码
-				imageCodeUrl:'',		//图形验证码图片
-				imageCodetoken:'',		//图形验证校验
-				isAgreed:0,				//是否勾选协议
-				isCheck:false,			//是否勾选协议
-				userID:'',		//公司userID
-				clubID:'',		//公司ID
-				stepIndex:0,
-				firstParmas:{
-					bindMobile:'',
-					mobileCode:'',
-					password:'',
-					passWordConfirm:'',
-					whichStep:1
-				},
-				twoParmas:{
-					linkMan:'',
-					name:'',
-					email:"",
-					whichStep:2
-				},
-				threeParmas:{
-				    provinceID :'',
-					cityID : '',
-					townID : '',
-					address:'',
-					sname:'',	 	//公司简称
-					socialCreditCode:'',	//统一社会信用代码
-					businessLicenseImage:'',	//营业执照图片
-					provinceID :'',
-					cityID : '',
-					townID : '',
-					address:'',
-					firstShopType:0,
-					secondShopType: '',
-					mainpro:'',
-					isAgreed:0,
-					whichStep:3,
-					source:1,
-				},
-				addressText:'请选择公司所在地区',
-				isDisabled:true,
-				isShowInput:true,
-				textareaFocus:false,
-				organizationTypeText:'请选择公司类型',
-				supplierList:supplierList,//医疗类型
-				supplierMedicaCampList:supplierMedicaCampNullList,//主营内容
-				typtIndex:0,
-				organizationType:0,
-				current:0,
-				isShowAustomItem:false, //是否显示其他添加
-				customItemValue:'', 	//自定义项目
-				isMainproCheck:false,
-				isSupplierAlert:true
-			}
-		},
-		onLoad() {
-			this.getVerificationCode();
-		},
-		computed:{
-			...mapState(['isWxAuthorize'])
-		},
-		methods:{
-			...mapMutations(['login']),
-			hanldNavigateBack(){
-				this.$util.modal('','注册尚未完成，确定放弃注册吗？','确定','取消',true,() =>{
-					this.$api.switchTabTo('/pages/tabBar/home/index')
-				})
-			},
-			// 三级联动选择
-			showMulLinkageThreePicker() {
-				this.isShowInput = true
-				this.$refs.mpvueCityPicker.show()
-			},
-			getMobileCodeFn(){
-				if( this.firstParmas.bindMobile == ''){
-					this.$util.msg('请输入联系人常用手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.firstParmas.bindMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				if( this.imageCode == ''){
-					this.$util.msg('请输入图形验证码',2000);
-					return
-				}
-				let params = {
-						mobile:this.firstParmas.bindMobile,
-						imgCode:this.imageCode,
-						activateCodeType:3,
-						platformType:2,
-						token:this.imageCodetoken
-					}
-				this.isMobileDisabled = true;
-				this.PublicService.GetMobileCode(params).then(response =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.mobilTime) {
-			       		this.mobilCount = TIME_COUNT;
-			       		this.isMobileDisabled = true;
-			       		this.mobilTime = setInterval(() => {
-			       			if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
-			         			this.mobilCount--
-			         			this.mobileCodeText = this.mobilCount +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.mobilTime)
-				         		this.mobilTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isMobileDisabled = false;
-				})
-			},
-			bindPickerChange() {
-				let self = this
-				uni.showActionSheet({
-					title:'标题',
-					itemList: ['医疗', '非医疗'],
-					success: (e) => {
-						self.threeParmas.firstShopType = e.tapIndex+1
-						switch(e.tapIndex){
-							case 0:
-								this.organizationTypeText = '医疗'
-								break;
-							case 1:
-								this.organizationTypeText = '非医疗'
-								break;
-						}
-					}
-				})
-			},
-			setStep(index){
-				this.stepIndex = index
-			},
-			SupplierRegisteredFirst(){//供应商注册第一步
-				if( this.firstParmas.bindMobile == ''){
-					this.$util.msg('请输入联系人常用手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.firstParmas.bindMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				if( this.firstParmas.mobileCode == ''){
-					this.$util.msg('请输入手机验证码',2000);
-					return
-				}
-				if(!this.$reg.isMobileCode(this.firstParmas.mobileCode)){
-					this.$util.msg('验证码格式不正确',2000);
-					return
-				}
-				if(!this.$reg.checkPwd(this.firstParmas.password)){
-					uni.showToast({title: '密码必须为8-16位字母数字的组合',duration: 2000,mask:true,icon:'none'})
-					return
-				}
-				if( this.firstParmas.passWordConfirm == ''){
-					uni.showToast({title: '请再次确认密码',duration: 2000,mask:true,icon:'none'})
-					return
-				}
-				if( this.firstParmas.passWordConfirm !== this.firstParmas.password){
-					uni.showToast({title: '两次输入的密码不一致',duration: 2000,mask:true,icon:'none'})
-					return
-				}
-				this.ShopService.SupplierAppletsRegistered(this.firstParmas).then(response =>{
-					this.stepIndex = 1
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})	
-			},
-			SupplierRegisteredTwo(){//供应商注册第二步
-				if( this.twoParmas.name == ''){
-					this.$util.msg('请输入您的公司名称',2000);
-					return
-				}
-				if( this.twoParmas.linkMan == ''){
-					this.$util.msg('请输入联系人名称',2000);
-					return
-				}
-				if( this.twoParmas.email == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if(!this.$reg.isEmail(this.twoParmas.email)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				this.ShopService.SupplierAppletsRegistered(this.twoParmas).then(response =>{
-					this.stepIndex = 2
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})	
-			},
-			SupplierRegisteredThree(){
-				if( this.threeParmas.townID == ''){
-					this.$util.msg('请选择公司地址',2000);
-					return
-				}
-				if( this.threeParmas.address == ''){
-					this.$util.msg('请填写公司详细地址',2000);
-					return
-				}
-				if( this.threeParmas.socialCreditCode == ''){
-					this.$util.msg('请填写统一社会信用代码',2000);
-					return
-				}
-				if( !this.threeParmas.businessLicenseImage){
-					this.$util.msg('请上传您的营业执照',2000);
-					return
-				}
-				if(this.threeParmas.firstShopType == 0){
-					this.$util.msg('请选择公司类型',2000);
-					return
-				}
-				if(this.threeParmas.mainpro == ''){
-					this.$util.msg('请选择主营内容',2000);
-					return
-				}
-				if(this.threeParmas.isAgreed == 0){
-					this.$util.msg('请勾选同意协议',2000);
-					return
-				}
-				let mainproList =[]
-				this.supplierMedicaCampList.forEach(item =>{
-					mainproList.push(item.name)
-				})
-				this.threeParmas.mainpro = mainproList.join('/')
-				let postParmas =  Object.assign(this.firstParmas,this.twoParmas,this.threeParmas)
-				this.UserService.appSupplierRegister(postParmas).then(response =>{
-					this.$util.modal('','您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了','',false,() =>{
-						this.$api.switchTabTo('/pages/tabBar/home/index')
-					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			chooseBusinessImage() {//营业执照图片上传
-				uploadFileImage().then(res =>{
-					this.threeParmas.businessLicenseImage = JSON.parse(res.data).data
-				})
-			},
-			viewBusinessImage(e) {
-				this.myPreviewImageFn(this.businessLicenseImage)
-			},
-			myPreviewImageFn(url){
-				this.isPreviewImage = true
-				let mentuzArray = []
-				mentuzArray.push(url)
-				uni.previewImage({
-					urls: mentuzArray,
-					current: 0
-				});
-			},
-			delBusinessImage(){
-				this.$util.modal('','确定删除营业执照图片吗？','确定','取消',true,() =>{
-					 this.threeParmas.businessLicenseImage = ''
-				})
-			},
-			radioChange(e) {
-				this.threeParmas.secondShopType = e.target.value;
-			},
-			chooseMaleLike(e){
-				this.isMainproCheck = true
-				this.threeParmas.mainpro = this.checkLikes(e,this.supplierMedicaCampList)
-			},
-			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('/')
-			},
-			getVerificationCode(){//图形验证
-				this.PublicService.GetImgVerifyCode().then(res => {
-					this.imageCodeUrl = res.data.baseImage
-					this.imageCodetoken = res.data.token
-				})
-			},
-			showAustomItem() {
-				this.isShowAustomItem = !this.isShowAustomItem
-			},
-			showTextareaFocus(){//文本框获取焦点
-				this.isShowInput = false
-				this.textareaFocus = true
-			},
-			hideTextareaFocus(){//文本框失去焦点
-				this.isShowInput = true
-				this.textareaFocus = false
-			},
-			onConfirm(e) {
-				this.addressText = e.name;
-				this.threeParmas.townID = e.townCode;
-				this.threeParmas.cityID = e.cityCode;
-				this.threeParmas.provinceID = e.provinceCode;
-			},	
-			onTextareaInput(e){
-			   this.threeParmas.address = e.detail.value;
-			},
-			onBlurInput(e){//
-				if(e.detail.value ===''){
-					this.isDisabled = true
-				}else{
-					this.isDisabled = false
-				}
-			},
-			addCustomItem(){
-				if(this.customItemValue==''){
-					this.$util.msg('请输入自定义主营内容',2000);
-				}else{
-					let item = {value:`${this.supplierMedicaCampList.length+1}`,name:this.customItemValue,checked:true}
-					if(this.checkedArray(this.customItemValue,this.supplierMedicaCampList)){
-						this.$util.msg('主营内容已存在!',2000)
-					}else{
-						this.supplierMedicaCampList.push(item)
-					}
-				}
-			},
-			checkedArray(content,arr){//判断主营内容是否已存在
-				for(var i in arr){
-					if(arr[i].name == content){
-						return true;
-					}
-				}
-				return false;
-			},
-			agreeCheck() {
-				this.isCheck = !this.isCheck
-				if(this.isCheck){
-					this.threeParmas.isAgreed = 1
-				}else{
-					this.threeParmas.isAgreed = 0
-				}
-			}
-		},
-		onShow() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
-					wxLogin.wxLoginQuick()
-				}else{
-					this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				}	
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.register{
-		width: 100%;
-		height: 100%;
-		box-sizing: border-box;
-		.register-step{
-			margin:80rpx 0;
-			width: 100%;
-			height: 44rpx;
-			box-sizing: border-box;
-			padding: 0 90rpx;
-			.step-item{
-				line-height: 44rpx;
-				color: #B2B2B2;
-				font-size: $font-size-24;
-				float: left;
-				margin-right: 60rpx;
-				position: relative;
-				&.active{
-					color: $color-system;
-					.step-num{
-						background-color: $color-system;
-					}
-					.line{
-						background-color: $color-system;
-					}
-				}
-				&:last-child{
-					margin-right: 0;
-				}
-				.step-num{
-					display: inline-block;
-					width: 40rpx;
-					height: 40rpx;
-					border-radius: 50%;
-					background-color:#e1e1e1;
-					color: #FFFFFF;
-					line-height: 40rpx;
-					text-align: center;
-					margin-right: 10rpx;
-				}
-				.line{
-					width: 60rpx;
-					height: 2rpx;
-					background-color: #B2B2B2;
-					position: absolute;
-					right:-60rpx;
-					top: 50%;
-				}
-			}
-		}
-		.register-main{
-			width: 100%;
-			height: auto;
-			position: relative;
-			.register-consult{
-				width: 110rpx;
-				height: 68rpx;
-				background:linear-gradient(223deg,rgba(225,86,21,0.6) 0%,rgba(225,86,10,0.3) 100%);
-				border-radius: 34rpx 0 0 34rpx;
-				position: absolute;
-				right: 0;
-				bottom: 120rpx;
-				text-align: left;
-				line-height: 68rpx;
-				padding-left: 20rpx;
-				.icon-kefunv{
-					font-size: 48rpx;
-					color: #31313B;
-					float: left;
-				}
-				.text{
-					font-size: $font-size-24;
-					display: block;
-					float: left;
-					width: 60rpx;
-					line-height: 30rpx;
-					color: #FFFFFF;
-					margin-top: 6rpx;
-				}
-			}
-			.register-agree{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				margin: 100rpx 0 20rpx 0;
-				.agree-text{
-					.checkbox{
-						float: left;
-						margin: 4rpx 6rpx 0 0;
-						color: #999999;
-						font-size: $font-size-34;
-						&.icon-gouxuan{
-							color: $color-system;
-						}
-					}
-					font-size: $font-size-22;
-					line-height: 44rpx;
-					color: #999999;
-					text{
-						color:#1890f9;
-					}
-				}
-			}
-			.register-logo{
-				width: 100%;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				height: 189rpx;
-				padding:60rpx 0 40rpx 0;
-				.logo{
-					width:467rpx;
-					height: 189rpx;
-					display: block;
-				}
-			}
-			&.detailed{
-				padding-bottom: 330rpx;
-			}			
-			.register-row{
-				width: 100%;
-				height: auto;
-				padding: 0 24rpx;
-				margin-bottom: 30rpx;
-				box-sizing: border-box;
-				&.text{
-					font-size: $font-size-20;
-					line-height: 40rpx;
-					color: #fea785;
-				}
-				&.none{
-					margin-bottom: 0;
-				}
-				&.login{
-					display: flex;
-				}
-				.register-text{
-					line-height: 44rpx;
-					margin-top: 100rpx;
-					font-size: $font-size-24;
-					color: #999999;
-					text-align: justify;
-					.txt{
-						margin-right: 15rpx;
-					}
-				}
-				.register-title{
-					line-height: 44rpx;
-					font-size: $font-size-24;
-					color: $text-color;
-					text-align: left;
-					&.first{
-						margin-top: 20rpx;
-					}
-				}
-				.register-tip{
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					color: #CECECE;
-					text-align: left;
-				}
-				.register-from{
-					width: 100%;
-					height: 80rpx;
-					background: #FFFFFF;
-					position: relative;
-					border-bottom: 1px solid #e1e1e1;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color:#666666;
-						line-height: 80rpx;
-						float: left;
-					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 80rpx;
-						float: left;
-						height: 80rpx;
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #333333;
-						}
-						&.keshi{
-							width: 550rpx;
-						}
-						&.code{
-							width: 350rpx;
-						}
-						&.imgCode{
-							width: 390rpx;
-						}
-					}
-					.vscodeimg{
-						width: 160rpx;
-						height: 80;
-						float: left;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						border-radius: 6rpx;
-						margin: 0 10rpx;
-						image{
-							width: 150rpx;
-							height: 68rpx;
-							border-radius: 6rpx;
-						}
-					}
-					.vscod-refresh{
-						width: 120rpx;
-						float: right;
-						line-height: 80rpx;
-						.ref-text{
-							float: left;
-							font-size: 26rpx;
-							color: #999999;
-						}
-						.icon-shuaxin{
-							float: left;
-							font-size: 36rpx;
-							color: #999999;
-							margin-right: 10rpx;
-						}
-					}
-					&.imgcode{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 230rpx;
-						}
-					}
-					.row-btn{
-						width: 180rpx;
-						height:64rpx;
-						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						border-radius: 32rpx;
-						.row-input{
-							width: 180rpx;
-							height: 64rpx;
-							line-height: 64rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 32rpx;
-							font-size: $font-size-24;
-							&.other{
-								width: 180rpx;
-								background: #F7F7F7;
-								margin-right: 20rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
-					}
-					&.picker{
-						width: 100%;
-						height: 80rpx;
-						line-height: 80rpx;
-						.label{
-							line-height: 80rpx;
-						}
-						.row-input{
-							width: 470rpx;
-							height: 80rpx;
-							line-height: 80rpx;
-							padding-left: 30rpx;
-						}
-					}
-					&.radio{
-						width: 100%;
-						border-bottom: none;
-						.row-input{
-							width: 25%;
-							height: 80rpx;
-							line-height: 80rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-							transform: scale(0.8);
-						}
-						.row-text{
-							text-align: center;
-							float: left;
-							font-size: $font-size-24;
-						}
-					}
-					&.group{
-						width: 100%;
-						height: auto;
-						background: #FFFFFF;
-						margin-top: 30rpx;
-						border-bottom: none;
-						.label{
-							line-height: 76rpx;
-						}
-						.row-input{
-							width: 100%;
-							height: 80rpx;
-							line-height: 80rpx;
-							padding-left: 0;
-						}
-						.row-radio{
-							float: left;
-						}
-						.row-text{
-							width: 100rpx;
-							text-align: center;
-							float: left;
-						}
-					}
-					&.btn{
-						margin-top: 0;
-					}
-					.content-class {
-						margin: 20rpx auto;
-						display: flex;
-						flex-flow: row wrap;
-						justify-content: space-between;
-						align-items: center;
-						&.btn{
-							margin: 0 auto;
-							margin-left: 116rpx;
-						}
-						.row-input{
-							display: flex;
-							width: 330rpx;
-							box-sizing: border-box;
-							height: 64rpx;
-							padding:0 24rpx;
-							text-align: left;
-							border-radius: 32rpx;
-							font-size: $font-size-28;
-							color: $text-color;
-							border: 1px solid #B2B2B2;
-							line-height: 64rpx;
-						}
-						.confirm-btn{
-							width: 200rpx;
-							height: 64rpx;
-							border-radius: 32rpx;
-							line-height: 64rpx;
-							text-align: center;
-							&.other{
-								width: 213rpx;
-							}
-							&.none{
-								color: $color-system;
-								background: #ffe6dc;
-							}
-							&.disabled{
-								color: #999999;
-							}
-						}
-						.item {
-						  width: 155rpx;
-						  height: 60rpx;
-						  font-size:$font-size-28;
-						  line-height: 60rpx;
-						  border-radius:30rpx;
-						  margin: 10rpx;
-						  text-align: center;
-						  box-sizing: border-box;
-						  border: 1rpx solid #EFEFEF;
-						  float: left;
-						  checkbox {
-							display: none;
-						  }
-						}
-						.on {
-						  border-color: $color-system;
-						  color:$color-system;
-						}
-					}
-				}
-				.row-login{
-					flex: 1;
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: left;
-				}
-				.row-logincode{
-					flex: 1;
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: right;
-				}
-				.icon-xiayibu{
-					width: 80rpx;
-					height: 80rpx;
-					position: absolute;
-					right: 0;
-					top: 0;
-					line-height: 80rpx;
-					text-align: center;
-				}
-				&.text-textarea{
-					background: #FFFFFF;
-					.textarea{
-						width: 100%;
-						height: 180rpx;
-						padding: 24rpx;
-						box-sizing: border-box;
-						font-size: $font-size-28;
-						color: $text-color;
-						z-index: 1;
-						border-bottom: 1px solid #e1e1e1;
-					}
-					.textarea.hide{
-						opacity: 0;
-					}
-					.textarea.show{
-						color: #999999;
-					}
-				}
-			}
-			.register-picture{
-				height: 180rpx;
-				margin: 30rpx 0;
-				float: left;
-				&.zz{
-					width: 100%;
-				}
-				.label{
-					float: left;
-					font-size: $font-size-28;
-					color: #666666;
-					line-height: 180rpx;
-					width: 150rpx;
-					text-align: left;
-				}
-				.upload-picture{
-					float: left;
-					height: 180rpx;
-					.upload-none{
-						width: 180rpx;
-						height: 180rpx;
-						text-align: center;
-						line-height: 180rpx;
-						color: #999999;
-						border: 1px solid #999999;
-						border-radius: 10rpx;
-						margin: 0 20rpx;
-						.iconfont{
-							font-size: 60rpx;
-						}
-					}
-					.upload-image{
-						width: 180rpx;
-						height: 180rpx;
-						border-radius: 6rpx;
-						margin: 0 20rpx;
-						position: relative;
-						image{
-							width: 180rpx;
-							height: 180rpx;
-							border-radius: 6rpx;
-						}
-						.upload-del{
-							width: 40rpx;
-							height: 40rpx;
-							position: absolute;
-							top: -20rpx;
-							right: -20rpx;
-							line-height: 40rpx;
-							text-align: center;
-							.iconfont{
-								font-size: $font-size-32;
-								color: #999999;
-							}
-						}
-					}
-				}
-			}
-			.register-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin: 0 auto;
-				margin-bottom: 60rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-			.register-fiexd{
-				width: 100%;
-				height: auto;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 999;
-				background: #FFFFFF;
-			}
-			.register-btn{
-				width: 600rpx;
-				height: 88rpx;
-				border-radius: 44rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-				margin-top: 96rpx;
-				&.prev{
-					background:#ffe6dc;
-					color: $color-system;
-					margin-top: 20rpx;
-				}
-				&.none{
-					border: 1px solid $color-system;
-					background: #FFFFFF;
-					color:$color-system;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
-			}
-		}
-	}
-</style>

pages/login/register.vue

@@ -1,714 +0,0 @@
-<template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}" v-if="isWxAuthorize">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="register-main clearfix">
-			<view class="register-logo">
-				<image class="logo" src="https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/logo.png" mode=""></image>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">联系人:</view>
-					<input class="row-input" type="text" name="input" v-model="userName" placeholder="请输入机构联系人姓名" maxlength="6"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">手机号:</view>
-					<input class="row-input" type="number" name="input" v-model="bindMobile" placeholder="请输入联系人常用手机号" maxlength="11"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">短信验证码:</view>
-					<input class="row-input code" type="text" v-model="mobileCode" placeholder="请输入短信验证码" maxlength="6"/>
-					<view class="row-btn" :class="[isMobileDisabled  ? 'disabled' : '']">
-						<button class="row-input"
-								type="button" 
-								@click.stop="getMobileCodeFn" 
-								:disabled="isMobileDisabled">
-								{{ mobileCodeText }}
-						</button>
-					</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">登录密码:</view>
-					<input class="row-input" type="password" name="input" v-model="password" placeholder="密码必须为8-16位字母数字组合" maxlength="16"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">确认密码:</view>
-					<input class="row-input" type="password" name="input" v-model="passwordCheck" placeholder="请确认密码" maxlength="16"/>
-				</view>
-			</view>
-			<view class="register-main clearfix">
-				<view class="register-agree">
-					<view class="agree-text"  @tap.stop="agreeCheck()">
-						<button class="checkbox iconfont" :class="[isCheck?'icon-gouxuan':'icon-weigouxuan']"></button> 
-						我已阅读并同意
-						<text @click.stop="this.$api.navigateTo('/pages/service/organagree')">《机构协议》</text>
-						<text @click.stop="this.$api.navigateTo('/pages/service/useragree')">《用户协议》</text>及
-						<text @click.stop="this.$api.navigateTo('/pages/service/privacyagree')">《隐私权政策》</text>
-					</view>
-				</view>
-				<view class="register-row ">
-					<view class="register-btn sub" @click.stop="registerStepsfirst">注册</view>
-				</view>
-				<view class="register-row login">
-					<view class="row-login" @click.stop="this.$api.navigateTo('/pages/login/login')">账号登录</view>
-					<view class="row-logincode" @click.stop="this.$api.navigateTo('/pages/login/logincode')">邀请码登录</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex';
-	import authorize from '@/common/config/authorize.js'
-	import wxLogin from "@/common/config/wxLogin.js"
-	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
-	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
-	import { organizationVerifyRegisterFirst } from "@/services/use.js"
-	import { getRegisterMobileCode, 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,// 顶部导航栏高度
-				isMobileDisabled: false,	//手机验证码按钮控制
-			    mobilCount: '',				//倒计时
-			    mobileCodeText: '获取验证码',
-			    mobilTime: null,
-				password:'',			//密码
-				passwordCheck:'',		//校验密码
-				userName:'',	 		//联系人
-				bindMobile:'',		//联系人手机号
-				mobileCode:'',			//手机验证码
-				imageCode:'',			//图形验证码
-				imageCodeUrl:'',		//图形验证码图片
-				imageCodetoken:'',		//图形验证校验
-				isAgreed:0,				//是否勾选协议
-				isCheck:false,			//是否勾选协议
-				userID:'',		//机构userID
-				clubID:'',		//机构ID
-			}
-		},
-		onLoad(option) {
-			
-		},
-		computed:{
-			...mapState(['isWxAuthorize'])
-		},
-		methods:{
-			...mapMutations(['login']),
-			hanldNavigateBack(){
-				this.$util.modal('','注册尚未完成，确定放弃注册吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
-				})
-			},
-			registerStepsfirst(){
-				wx.getUserInfo({
-					success: res => {
-						let params ={
-								source:1,
-								userName:this.userName,
-								bindMobile:this.bindMobile,
-								activationCode:this.mobileCode,
-								password:this.password,
-								passWordConfirm:this.passwordCheck,
-								isAgreed:this.isAgreed,	//是否勾选协议
-								nickName:res.userInfo.nickName,
-								headimgurl:res.userInfo.avatarUrl,
-						}
-						organizationVerifyRegisterFirst(params).then(response =>{
-							this.storeUpdataeStatus(response.data)
-							wxLogin.wxLoginAuthorize()
-							setTimeout(() =>{
-								this.$api.switchTabTo('/pages/tabBar/user/user')
-							},2000)
-						}).catch(error =>{
-							this.$util.msg(error.msg,2000);
-						})		
-					}
-				})
-			},
-			storeUpdataeStatus(data){
-				uni.setStorageSync('token',data.token)
-				this.$store.commit('updateStatus',data)
-				this.login(data);
-			},
-			getMobileCodeFn(){
-				if( this.bindMobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.bindMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				let params = {
-						mobile:this.bindMobile,
-						activateCodeType:2,
-						platformType:2
-					}
-				this.isMobileDisabled = true;
-				getRegisterMobileCode(params).then(response =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.mobilTime) {
-			       		this.mobilCount = TIME_COUNT;
-			       		this.isMobileDisabled = true;
-			       		this.mobilTime = setInterval(() => {
-			       			if (this.mobilCount > 1 && this.mobilCount <= TIME_COUNT) {
-			         			this.mobilCount--
-			         			this.mobileCodeText = this.mobilCount +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.mobilTime)
-				         		this.mobilTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isMobileDisabled = false;
-				})
-			},
-			agreeCheck() {
-				this.isCheck = !this.isCheck
-				if(this.isCheck){
-					this.isAgreed = 1
-				}else{
-					this.isAgreed = 0
-				}
-			}
-		},
-		onShow() {
-			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-				if(wxResponse == 1){
-					wxLogin.wxLoginQuick()
-				}else{
-					this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				}	
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.register{
-		width: 100%;
-		height: 100%;
-		background: url(https://admin-b.caimei365.com/userfiles/1/images/photo/2020/11/%E8%83%8C%E6%99%AF.png) no-repeat left bottom;
-		box-sizing: border-box;
-		background-size: contain;
-		.register-main{
-			width: 100%;
-			height: auto;
-			position: relative;
-			.register-consult{
-				width: 110rpx;
-				height: 68rpx;
-				background:linear-gradient(223deg,rgba(225,86,21,0.6) 0%,rgba(225,86,10,0.3) 100%);
-				border-radius: 34rpx 0 0 34rpx;
-				position: absolute;
-				right: 0;
-				bottom: 120rpx;
-				text-align: left;
-				line-height: 68rpx;
-				padding-left: 20rpx;
-				.icon-kefunv{
-					font-size: 48rpx;
-					color: #31313B;
-					float: left;
-				}
-				.text{
-					font-size: $font-size-24;
-					display: block;
-					float: left;
-					width: 60rpx;
-					line-height: 30rpx;
-					color: #FFFFFF;
-					margin-top: 6rpx;
-				}
-			}
-			.register-agree{
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				margin: 100rpx 0 20rpx 0;
-				.agree-text{
-					.checkbox{
-						float: left;
-						margin: 4rpx 6rpx 0 0;
-						color: #999999;
-						font-size: $font-size-34;
-						&.icon-gouxuan{
-							color: $color-system;
-						}
-					}
-					font-size: $font-size-22;
-					line-height: 44rpx;
-					color: #999999;
-					text{
-						color:#1890f9;
-					}
-				}
-			}
-			.register-logo{
-				width: 100%;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				height: 189rpx;
-				padding:60rpx 0 40rpx 0;
-				.logo{
-					width:467rpx;
-					height: 189rpx;
-					display: block;
-				}
-			}
-			&.detailed{
-				padding-bottom: 330rpx;
-			}			
-			.register-row{
-				width: 100%;
-				height: auto;
-				padding: 0 75rpx;
-				margin-bottom: 30rpx;
-				box-sizing: border-box;
-				&.none{
-					margin-bottom: 0;
-				}
-				&.login{
-					display: flex;
-				}
-				.register-text{
-					line-height: 44rpx;
-					margin-top: 100rpx;
-					font-size: $font-size-24;
-					color: #999999;
-					text-align: justify;
-					.txt{
-						margin-right: 15rpx;
-					}
-				}
-				.register-title{
-					line-height: 44rpx;
-					font-size: $font-size-24;
-					color: $text-color;
-					text-align: left;
-					&.first{
-						margin-top: 20rpx;
-					}
-				}
-				.register-tip{
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					color: #CECECE;
-					text-align: left;
-				}
-				.register-from{
-					width: 100%;
-					height: 80rpx;
-					background: #FFFFFF;
-					position: relative;
-					border-bottom: 1px solid #e1e1e1;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color:#666666;
-						line-height: 88rpx;
-						float: left;
-					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 80rpx;
-						float: left;
-						height: 80rpx;
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #333333;
-						}
-						&.keshi{
-							width: 550rpx;
-						}
-						&.code{
-							width: 264rpx;
-						}
-					}
-					&.img-btn{
-						width: 220rpx;
-						height: 80rpx;
-						padding: 0;
-						float: left;
-						background: #FFFFFF;
-						display: block;
-						.vscodeimg{
-							width: 150rpx;
-							height: 80rpx;
-							float: left;
-							display: flex;
-							flex-direction: column;
-							align-items: center;
-							border-radius: 14rpx;
-							image{
-								width: 150rpx;
-								height: 80rpx;
-								border-radius: 14rpx;
-							}
-						}
-						.vscod-refresh{
-							width: 70rpx;
-							float: right;
-							text-align: right;
-							display: flex;
-							flex-direction: column;
-							align-items: center;
-							line-height: 44rpx;
-							.icon-shuaxin{
-								font-size: 48rpx;
-								color: #333333;
-							}
-							.ref-text{
-								font-size: 24rpx;
-								color: #333333;
-							}
-						}
-					}
-					&.imgcode{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 230rpx;
-						}
-					}
-					.row-btn{
-						width: 180rpx;
-						height:64rpx;
-						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						border-radius: 32rpx;
-						.row-input{
-							width: 180rpx;
-							height: 64rpx;
-							line-height: 64rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 32rpx;
-							&.other{
-								width: 180rpx;
-								background: #F7F7F7;
-								margin-right: 20rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
-					}
-					&.picker{
-						padding: 0 24rpx;
-						width: 654rpx;
-						height: 88rpx;
-						line-height: 88rpx;
-						.label{
-							line-height: 88rpx;
-						}
-						.row-input{
-							width: 470rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding-left: 30rpx;
-						}
-					}
-					&.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;
-						}
-					}
-					&.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;
-						}
-					}
-					&.btn{
-						margin-top: 0;
-					}
-					.content-class {
-						margin: 20rpx auto;
-						display: flex;
-						flex-flow: row wrap;
-						justify-content: space-between;
-						align-items: center;
-						&.btn{
-							margin: 0 auto;
-							margin-left: 116rpx;
-						}
-						.row-input{
-							display: flex;
-							width: 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;
-							}
-							&.none{
-								color: #FFFFFF;
-								background: $btn-confirm;
-							}
-							&.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 {
-							display: none;
-						  }
-						}
-						.on {
-						  border-color: $color-system;
-						  color:$color-system;
-						}
-					}
-				}
-				.row-login{
-					flex: 1;
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: left;
-				}
-				.row-logincode{
-					flex: 1;
-					font-size: $font-size-28;
-					color: $text-color;
-					text-align: right;
-				}
-				.icon-xiayibu{
-					width: 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;
-					}
-					.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: 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-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;
-							}
-						}
-					}
-				}
-			}
-			.register-input{
-				width: 654rpx;
-				height: 40rpx;
-				padding: 24rpx;
-				margin: 0 auto;
-				margin-bottom: 60rpx;
-				background: #F7F7F7;
-				border-radius: 14rpx;
-				.input{
-					width: 100%;
-					height: 100%;
-					background: #F7F7F7;
-					font-size: $font-size-28;
-					line-height: 40rpx;
-					color: #333333;
-					border-radius: 14rpx;
-				}
-			}
-			.register-fiexd{
-				width: 100%;
-				height: auto;
-				position: fixed;
-				bottom: 0;
-				left: 0;
-				z-index: 999;
-				background: #FFFFFF;
-			}
-			.register-btn{
-				width: 100%;
-				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{
-					border: 1px solid $color-system;
-					background: #FFFFFF;
-					color:$color-system;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
-			}
-		}
-	}
-</style>

pages/service/aftersale.vue

@@ -1,41 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				serverUrl: '',
-				type: 'afterSale'
-			}
-		},
-		onLoad(){
-			this.initData();
-		},
-		methods:{
-			initData(){
-				this.CommonService.QueryAfterSale().then(response =>{
-					let _data =response.data,
-						type = this.type;
-					if(type) {
-						let html = this.$api.adaptRichTextImg(_data[type]);
-						this.$refs.childTemplate.html = html;
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/service/organagree.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				type: ''
-			}
-		},
-		onLoad(){
-			this.type = 'afterSale';
-			this.initData();
-		},
-		methods:{
-			initData(){
-				let self = this;
-				this.OtherService.QueryClubProtocol({helpPageID:1036}).then(response =>{
-					let data =response.data.content
-					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/service/privacyagree.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				type: ''
-			}
-		},
-		onLoad(){
-			this.type = 'afterSale';
-			this.initData();
-		},
-		methods:{
-			initData(){
-				let self = this;
-				this.OtherService.QueryClubProtocol({helpPageID:1013}).then(response =>{
-					let data =response.data.content
-					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/service/shoppingnotice.vue

@@ -1,44 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				serverUrl: '',
-				type: ''
-			}
-		},
-		onLoad(){
-			this.serverUrl = '/home/afterSale';
-			this.type = 'shoppingNotes';
-			this.initData();
-		},
-		methods:{
-			initData(){
-				let self = this;
-				this.CommonService.QueryAfterSale().then(response =>{
-					let _data =response.data,
-						type = self.type;
-					if(type) {
-						let html = self.$api.adaptRichTextImg(_data[type]);
-						self.$refs.childTemplate.html = html;
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/service/supplieragree.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				type: ''
-			}
-		},
-		onLoad(){
-			this.type = 'afterSale';
-			this.initData();
-		},
-		methods:{
-			initData(){
-				let self = this;
-				this.OtherService.QueryClubProtocol({helpPageID:1035}).then(response =>{
-					let data =response.data.content
-					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/service/useragree.vue

@@ -1,39 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				type: ''
-			}
-		},
-		onLoad(){
-			this.type = 'afterSale';
-			this.initData();
-		},
-		methods:{
-			initData(){
-				let self = this;
-				this.OtherService.QueryClubProtocol({helpPageID:1023}).then(response =>{
-					let data =response.data.content
-					self.$refs.childTemplate.html = self.$api.adaptRichTextImg(data);
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/user/about/about.vue

@@ -1,43 +0,0 @@
-<template>
-	<view class="container clearfix rich-text-temp">
-		<rich-text-template ref="childTemplate"></rich-text-template>
-	</view>
-</template>
-
-<script>
-	import richTextTemplate from '@/components/cm-module/listTemplate/richTextTemplate'
-	
-	var self;
-	export default{
-		components: {
-		   richTextTemplate
-		},
-		data() {
-			return{
-				serverUrl: '',
-				type: 'introduction'
-			}
-		},
-		onLoad(){
-			this.initData()
-		},
-		methods:{
-			initData(){
-				this.CommonService.QueryAfterSale().then(response =>{
-					let _data =response.data,
-						type = this.type;
-					if(type) {
-						let html = this.$api.adaptRichTextImg(_data[type]);
-						this.$refs.childTemplate.html = html;
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/user/account/account.vue

@@ -1,653 +0,0 @@
-<template>
-	<view class="container account clearfix">
-		<au-custom :navbar-data='nvabarData' @navigateBack="hanldNavigateBack"></au-custom>
-		<view class="account-header">
-			<view class="h-account" :style="{paddingTop:CustomBar+'px',backgroundImage: 'url('+account_bg+')'}">
-				<view class="m-account">
-					<view class="m-m money">
-						<text class="m-t s">￥</text>
-						<text class="m-t b">{{showIndexOfMoney}}</text>
-						<text class="m-t s">{{smallMoney}}</text>
-					</view>
-					<view class="m-m title">
-						<text class="m-p">可用余额(元)</text>
-					</view>
-					<text class="iconfont icon-tishi" @click="showAccounExp"></text>
-				</view>
-			</view>
-			<view class="h-calendar">
-				<!-- 插入模式 切换年月-->
-				<uni-calendar :selected="infoData.selected"  @monthSwitch="monthSwitch" />
-			</view>
-			<view class="h-typeTab clearfix">
-				<view
-					v-for="(item, index) in navList" :key="index" 
-					class="nav-item" 
-					:class="{current: tabCurrentIndex === index}"
-					@click="tabClick(index)"
-				>
-					{{item.text}}
-					<view class="line"></view>
-				</view>
-			</view>
-		</view>
-		<!--  @scrolltolower="toLower" -->
-		<scroll-view class="h-swiper-content"  scroll-y :style="{paddingTop:CustomBar+234+'px'}">	
-			<!-- 空白页 -->
-			<view v-if="isEmpty" class="empty-account">
-				<image class="empty-account-image" src="https://img.caimei365.com/group1/M00/03/71/Cmis2F3wna6ADg5RAABQ9EmRCGk830.png" mode="aspectFit"></image>
-				<text class="error-text">{{errorText}}</text>
-			</view>
-			<!-- 余额明细列表 -->
-			<view v-else class="list-account">
-				<view v-for="(item,index) in accountList" :key="index" class="list-item">
-					<view class="list-t">
-						<view class="t-t">{{cheakType(item.balanceType)}}</view>
-						<view class="t-t bold" :style="{color:item.type == '1' ? '#ff2a2a' : '#15C47A'}">
-							<text class="txt">{{item.type =='1'? '+' : '-'}}</text>
-							<text class="txt">￥{{item.amount}}</text>
-						</view>
-					</view>
-					<view class="list-b">
-						<view class="t-t">{{item.addDate}}</view>
-						<view class="t-t">{{item.type =='1'? '收入' : '支出'}}</view>
-					</view>
-				</view>
-				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText'></tui-nomore>
-				<!--加载loadding-->
-			</view>
-		</scroll-view>
-		<view class="showAccounExp" :class="[isShowAccounExp == true ? 'show':'hide']" @tap="hideAccounExp">
-			<image src="https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SAZeZlAA2oDvspRRU204.png" mode=""></image>
-			<text class="iconfont icon-close" @click="hideAccounExp"></text>
-		</view>
-	</view>
-</template>
-<script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
-	import uniCalendar from '@/components/uni-calendar/uni-calendar.vue'
-	import { accountInfo } from "@/services/use.js"
-	var date = new Date();
-	export default{
-		components: {
-			uniCalendar,
-			tuiLoadmore,
-			tuiNomore
-		},
-		data() {
-			return{
-				nvabarData: {		//顶部自定义导航
-					showCapsule:1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '账户余额明细',  // 导航栏 中间的标题
-					haveBack:true,
-					textColor:'#ffffff',
-					textLeft:this.$store.state.isIphone,
-				},
-				account_bg:'https://img.caimei365.com/group1/M00/03/D0/Cmis21-PpUqAbubBAADf1kTyhjs098.png',
-				isIphoneX:this.$store.state.isIphoneX,
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				year: date.getFullYear(),					//年
-				month: date.getMonth()+1,					//月
-				userID: '',		 							//用户ID
-				pageNum:1,    								//页数
-				pageSize:10,   								//加载条数
-				balanceType: '', 							//查询余额类型
-				showIndexOfMoney:'',
-				smallMoney:'00',
-				ableUserMoney:58656.65,		//可用余额
-				balanceTypeText:'',			//根据类型显示文字
-				tabCurrentIndex: 0,			//标签选择索引
-				infoData: {selected: []}, 		//日期选择
-				accountList: [],			//余额列表
-				isShowAccounExp:false,		//控制明细说明文字显示
-				isRefreshing:false,
-				isNomore:false,
-				isEmpty:false,
-				loadding: false,
-				pullUpOn: true,
-				hasNextPage: false,
-				pullFlag: true,
-				nomoreText: '上拉显示更多',
-				errorText:'本月没有任何余额收支记录',
-				navList: [	
-					{state: 0,text: '全部'},
-					{state: 1,text: '收入'},
-					{state: 2,text: '支出'},
-				],
-				isCheckObject:{
-					0:['','本月没有任何余额收支记录'],
-					1:[1, '本月没有余额收入记录！'],
-					2:[2, '本月没有余额支出记录！'],
-				},
-			}
-		},
-		onLoad() {
-			this.getAccountInitData(this.tabCurrentIndex,this.year,this.month)
-		},
-		methods: {
-			getAccountInitData(index,year,month){//获取余额明细数据列表
-				Object.keys(this.isCheckObject).forEach(key => {
-					 if (+key === +index) {
-						this.balanceType = this.isCheckObject[key][0]
-						this.errorText = this.isCheckObject[key][1]
-					 }
-				})
-				this.$api.getStorage().then((resolve) =>{
-					 this.userID =resolve.userID
-					 /**
-					  * @余额明细初始化加载  仅加载第一页码
-					  * @param：type(查询余额类型:0全部,1收入,2支出)
-					  * @param：year(查询年份)
-					  * @param：month(查询月份)
-					  * @param：index(页码数)
-					  * @param：pageSize(每页条数)
-					  * @param：userId(用户ID)
-					  */ 
-					let params = {year:year,month:month,userId:this.userID,pageNum:1,pageSize:this.pageSize, type:this.balanceType,}
-					accountInfo(params).then(response =>{
-						let infoData = response.data
-						this.initAbleUserMoney(infoData.ableUserMoney)
-						let resultsData = infoData.pageDate.results
-						this.hasNextPage =  infoData.pageDate.hasNextPage;
-						if(resultsData && resultsData.length > 0){
-							this.isEmpty = false;
-							this.accountList = [...resultsData];
-						}else{
-							this.isEmpty = true
-						}
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							if(this.accountList.length < 2){
-								this.pullUpOn = true
-							}else{
-								this.pullUpOn = false
-								this.nomoreText = '已至底部'
-							}
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})	
-			},	
-			getOnReachBottomData(index,year,month){//上拉加载
-				this.pageNum+=1
-				let params = {year:year,month:month,userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize,type:this.balanceType}
-				accountInfo(params).then(response =>{
-					let infoData = response.data
-					this.initAbleUserMoney(infoData.ableUserMoney)
-					let resultsData = infoData.pageDate.results
-					this.hasNextPage =  infoData.pageDate.hasNextPage;
-					this.accountList = this.accountList.concat(resultsData)
-					this.pullFlag = false;// 防上拉暴滑
-					setTimeout(()=>{this.pullFlag = true;},500)
-					if(this.hasNextPage){
-						this.pullUpOn = false
-						this.nomoreText = '上拉显示更多'
-					}else{
-						this.loadding = false
-						this.pullUpOn = false
-						this.nomoreText = '已至底部'
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},
-			initAbleUserMoney(money){//拆分金额并转千分位格式显示
-				if(money == 0){
-					this.showIndexOfMoney ='0';
-					this.smallMoney=".00"
-				}else{
-					this.ableUserMoney = this.$api.FormatMoney(money) ;
-					let i =  this.ableUserMoney.toString().lastIndexOf('.');
-					if(i==-1){
-						this.showIndexOfMoney=this.$api.FormatMoney( this.ableUserMoney)
-						this.smallMoney=".00"
-					}else{
-						this.smallMoney = this.ableUserMoney.toString().substring(i);
-						this.showIndexOfMoney= this.$api.FormatMoney(this.ableUserMoney.toString().substring(0,i))
-					}
-				}
-			},
-			tabClick(index){//tab点击
-				this.tabCurrentIndex = index;
-				this.pageNum = 1
-				this.accountList = []
-				this.pullUpOn = true //隐藏
-				this.getAccountInitData(this.tabCurrentIndex,this.year,this.month);
-			},			
-			bindDateChange: function(e) {
-				this.date = e.target.value
-			},
-			monthSwitch(e) {
-				this.year = e.year;
-				this.month = e.month;
-				this.getAccountInitData(this.tabCurrentIndex,this.year,this.month);
-			},
-			cheakType(type){
-				let typeTextHtml,
-					typeObject={
-						1:'余额抵扣',
-						2:'多收退款到余额',
-						3:'申请退款',
-						4:'余额充值',
-						5:'余额提现',
-						6:'订金订单充值',
-						7:'余额订单充值',
-						8:'订金订单退款',
-						9:'余额订单退款'
-					};
-				Object.keys(typeObject).forEach(function(key){
-					if(key == type){
-						typeTextHtml = typeObject[key]
-					}
-				});	
-				return typeTextHtml;
-			},
-			hanldNavigateBack(){
-				uni.navigateBack({
-					delta: 1
-				});
-			},
-			showAccounExp(){
-				this.isShowAccounExp = true
-			},
-			hideAccounExp(){
-				this.isShowAccounExp = false
-			}
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData(this.tabCurrentIndex,this.year,this.month)
-			}	
-		},
-		onPullDownRefresh() {//下拉刷新
-			this.getAccountInitData(this.tabCurrentIndex,this.year,this.month)
-			uni.stopPullDownRefresh()
-		},
-		onShow() {
-			// this.accountList = []
-		}
-	}
-</script>
-
-<style lang="scss">
-	
-page, .container{
-	background: #FFFFFF;
-	height: 100%;
-}
-.account{
-	width: 100%;
-	height: auto;
-	position: relative;
-}	
-.account-header{
-	width: 100%;
-	height: auto;
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 998;
-}
-.h-account{
-	width: 100%;
-	height: 258rpx;
-	position: relative;
-	background-size: cover;
-}
-.h-calendar{
-	width: 100%;
-	height: auto;
-}
-.m-account{
-	width: 100%;
-	height: 258rpx;
-	padding:50rpx 24rpx;
-	box-sizing: border-box;
-	position: relative;
-	.icon-tishi{
-		position: absolute;
-		right: 30rpx;
-		top: 20rpx;
-		font-size: 44rpx;
-		color: #FFFFFF;
-		text-align: right;
-		line-height: 74rpx;
-	}
-	.m-m{
-		width: 100%;
-	}
-	.title{
-		height: 48rpx;
-		text-align: center;
-		.m-p{
-			width: 100%;
-			font-size: 28rpx;
-			color: #FFFFFF;
-			line-height: 40rpx;
-		}
-	}
-	.money{
-		height: 90rpx;
-		text-align: center;
-		.m-t{
-			font-size:58rpx;
-			color: #FFFFFF;
-			line-height: 90rpx;
-			&.b{
-				font-weight: bold;
-			}
-			&.s{
-				font-size: 40rpx;
-			}
-		}
-	}
-}
-.h-swiper{
-	width: 702rpx;
-	height: 40rpx;
-	padding: 24rpx;
-	display: flex;
-	.uni-input{
-		flex: 8;
-		font-size: $font-size-28;
-		color: $text-color;
-		text-align: center;
-		line-height: 40rpx;
-	}
-	.iconfont{
-		flex: 1;
-		text-align: center;
-	}
-}
-.h-typeTab{
-	width: 702rpx;
-	padding:0 24rpx;
-	background: #fff;
-	position: relative;
-	z-index: 10;
-	.nav-item{
-		width: 33.3%;
-		height: 40rpx;
-		line-height:40rpx;
-		padding: 26rpx 0 22rpx 0;
-		font-size: $font-size-28;
-		float: left;
-		color: $text-color;
-		text-align: center;
-		position: relative;
-		.line{
-			width: 70rpx;
-			height: 4rpx;
-			background-color: #FFFFFF;
-			position: absolute;
-			bottom: 10rpx;
-			left: 50%;
-			margin-left: -35rpx;
-		}
-		&.current{
-			color: $color-system;
-			.line{
-				background-color: $color-system;
-			}
-		}
-	}	
-}
-.h-swiper-content{
-	width: 100%;
-	height: calc(100% - 478rpx);
-	position: relative;
-	background: #FFFFFF;
-	box-sizing: border-box;
-	.list-account{
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 0 24rpx;
-		background: #FFFFFF;
-	}
-	.icon-jiazai{
-		color: #666666;
-		font-size: 36rpx;
-	}	
-	.loading {
-		width: 100%;
-		font-size: 28rpx;
-		color: #999999;
-		line-height: 36rpx;
-		text-align: center;
-		padding: 20rpx 0;
-		&-no .line{
-			width: 30%;
-			margin: 0 auto;
-			position: relative;
-			&:before{
-				content: "";
-				width: 80rpx;
-				height: 1px;
-				background: #999999;
-				position: absolute;
-				left: -50rpx;
-				top: 18rpx;
-			}
-			&:after{
-				content: "";
-				width: 80rpx;
-				height: 1px;
-				background: #999999;
-				position: absolute;
-				right: -50rpx;
-				top: 18rpx;
-			}
-		}
-		
-	}
-	.list-item{
-		width: 100%;
-		height: 140rpx;
-		padding: 20rpx 0;
-		border-bottom: 1px solid #EBEBEB;
-		box-sizing: border-box;
-		background: #FFFFFF;
-		&:last-child{
-			border-bottom: none;
-		}
-		.list-t{
-			height: 54rpx;
-			line-height: 54rpx;
-			font-size: $font-size-32;
-			color: #333333;
-			display: flex;
-			.t-t{
-				flex: 1;
-				&:nth-child(1){
-					text-align: left;
-				}
-				&:nth-child(2){
-					text-align: right;
-				}
-				&.bold{
-					font-weight: bold;
-				}
-			}
-
-		}
-		.list-b{
-			height: 46rpx;
-			line-height: 46rpx;
-			font-size:$font-size-28;;
-			color: $text-color;
-			display: flex;
-			.t-t{
-				flex: 1;
-				color: #9aa5b5;
-				&:nth-child(1){
-					text-align: left;
-				}
-				&:nth-child(2){
-					text-align: right;
-				}
-				.txt{
-					color: #FF2A2A;
-				}
-				&.bold{
-					font-weight: bold;
-				}
-			}
-		}
-	}
-}
-.showAccounExp{
-	width: 100%;
-	height: 100%;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	position: fixed;
-	left: 0;
-	top: 100%;
-	opacity: 0;
-	background: rgba(0,0,0,.5);
-	z-index: 999;
-	image{
-		width: 750rpx;
-		height: 1052rpx;
-	}
-	.icon-close{
-		position: absolute;
-		color: #FFFFFF;
-		font-size:60rpx ;
-		bottom: 15%;
-		left: 50%;
-		margin-left: -32rpx;
-
-	}
-}
-.showAccounExp.show{
-	top: 0;
-	opacity: 1;
-	animation:rundtop 0.3s;
-}
-.showAccounExp.hide{
-	top: 100%;
-	opacity: 0;
-	animation:rundbottom 0.3s;
-}
-@keyframes rundtop{
-	0%{top: 100%;opacity: 0;}
-	100%{top:0;opacity: 1;}
-}
-@keyframes rundbottom{
-	0%{top: 0;opacity: 1;}
-	100%{top:100%;opacity: 0;}
-}
-/*空列表显示样式*/
-.empty-account {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	background: $bg-color;
-	min-height: 800rpx;
-	&-image {
-		width: 160rpx;
-		height: 158rpx;
-	}
-	.error-text{
-		font-size: $font-size-28;
-		color: $text-color;
-		line-height: 88rpx;
-	}
-}
-.swiper-box{
-	min-height: 750rpx;
-}
-.list-scroll-content{
-	height: 100%;
-}
-.uni-swiper-item{
-	height: auto;
-}
-.load1,
-.load2,
-.load3 {
-	height: 24px;
-	width: 24px
-}
-
-.load2 {
-	transform: rotate(30deg)
-}
-
-.load3 {
-	transform: rotate(60deg)
-}
-
-.load1 view:nth-child(1) {
-	animation-delay: 0s
-}
-
-.load2 view:nth-child(1) {
-	animation-delay: .13s
-}
-
-.load3 view:nth-child(1) {
-	animation-delay: .26s
-}
-
-.load1 view:nth-child(2) {
-	animation-delay: .39s
-}
-
-.load2 view:nth-child(2) {
-	animation-delay: .52s
-}
-
-.load3 view:nth-child(2) {
-	animation-delay: .65s
-}
-
-.load1 view:nth-child(3) {
-	animation-delay: .78s
-}
-
-.load2 view:nth-child(3) {
-	animation-delay: .91s
-}
-
-.load3 view:nth-child(3) {
-	animation-delay: 1.04s
-}
-
-.load1 view:nth-child(4) {
-	animation-delay: 1.17s
-}
-
-.load2 view:nth-child(4) {
-	animation-delay: 1.3s
-}
-
-.load3 view:nth-child(4) {
-	animation-delay: 1.43s
-}
-
-@-webkit-keyframes load {
-	0% {
-		opacity: 1
-	}
-
-	100% {
-		opacity: .2
-	}
-}
-
-</style>

pages/user/coupon/coupon.vue

@@ -1,70 +0,0 @@
-<template>
-	<view class="container home clearfix">
-		<view class="coupon-title" v-if="userIdentity == 4">优惠券仅限{{userName}}（机构）使用 </view>
-		<view class="coupon-title" v-if="userIdentity == 2">优惠券仅限{{userName}}使用 </view>
-		<image class="coupon-image" src="http://static.caimei365.com/app/meibohui/meibo_coupon_04.jpg" mode=""></image>
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations} from 'vuex';
-	export default {
-		components:{
-			
-		},
-		data() {
-			return {
-				userName:'',
-				userIdentity:0
-			}
-		},
-		onLoad() {
-
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','identity','isActivity'])
-		},
-		methods: {
-
-		},
-		onShow(){
-			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userName = resolve.name;
-				this.userIdentity = resolve.userIdentity
-			}).catch(error =>{
-				
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #ff2e4c;
-	}
-	.container{
-		width: 100%;
-		height: auto;
-		.coupon-title{
-			width: 100%;
-			height: 110rpx;
-			line-height: 110rpx;
-			font-size: $font-size-28;
-			font-weight: bold;
-			background-image: linear-gradient(0deg, #fffaec 0%, #fff7d6 50%, #fff4b9 100%), linear-gradient(#fffaef, #fffaef);
-			box-sizing: border-box;
-			padding: 0 24rpx;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			overflow: hidden;
-			color: #fd3c5b;
-			text-align: center;
-		}
-		.coupon-image{
-			width: 100%;
-			height: 2381rpx;
-			display: block;
-			
-		}
-	}
-</style>

pages/user/operator/addoperator.vue

@@ -1,165 +0,0 @@
-<template>
-	<view class="container operator clearfix">
-		<view class="operator-content">
-			<view class="operator-from">
-				<view class="from-row">
-					<input class="input" type="text" v-model="linkman" placeholder="请输入运营人员姓名" maxlength="6"/>
-				</view>
-				<view class="from-row">
-					<input class="input" type="text" v-model="clubMobile" placeholder="请输入运营人员手机号" maxlength="11"/>
-				</view>
-				<button class="add-btn" @click="confirm">确定</button>
-			</view>
-			<view class="operator-text">
-				<view class="text-main">
-					<view>1. 添加运营人员后，运营人员会收到一条邀请码短信</view>
-					<view>2. 运营人员在微信搜索【采美采购商城】小程序，或者搜索关注【采美365】公众号，从底部菜单进入【采美采购商城】小程序</view>
-					<view>3. 使用邀请码进行登录并绑定微信</view>
-					<view>4. 绑定后，运营人员可通过微信直接登录采美365网</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>	
-	import authorize from '@/common/config/authorize.js'	
-	
-	export default {
-		data() {
-			return {
-				clubID:'',
-				userID:'',
-				linkman:'',
-				clubMobile:'',
-			}
-		},
-		onLoad(option){
-			
-		},
-		methods: {			
-			//提交
-			confirm(){
-				let data = this.addressData;
-				if(this.linkman== ''){
-					this.$util.msg('请输入运营人员姓名');
-					return;
-				}
-				if(this.clubMobile == ''){
-					this.$util.msg('请输入运营人员手机号');
-					return;
-				}
-				if(!/(^1[0-9][0-9]{9}$)/.test(this.clubMobile)){
-					this.$util.msg('请输入正确的手机号码');
-					return;
-				}
-				let params = {
-						mobile:this.clubMobile,
-						linkName:this.linkman,
-						userID:this.userID,
-						clubID:this.clubID,
-						configFlag:2
-					}
-				this.UserService.PostAddOperator(params).then(response =>{
-					this.$util.msg('添加成功',2000,true,'success')
-					setTimeout(() =>{
-						uni.navigateBack();
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-				this.clubID = resolve.clubID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		height: auto;
-		background: $bg-color;
-		border-top: 1px solid #EBEBEB;
-	}
-	.operator{
-		padding-top: 160rpx;
-		.operator-content{
-			width: 100%;
-			padding: 0 75rpx;
-			box-sizing: border-box;
-			.operator-from{
-				width: 100%;
-				height: auto;
-				.from-row{
-					height: 40rpx;
-					padding: 24rpx 0;
-					background: #FFFFFF;
-					margin-bottom: 40rpx;
-					font-size: $font-size-28;
-					color: $text-color;
-					border-bottom: 1px solid #E1E1E1;
-					.input{
-						width: 100%;
-						height: 100%;
-						text-align: left;
-					}
-				}
-			}
-			.operator-text{
-				width: 100%;
-				height: auto;
-				margin-top: 50rpx;
-				line-height: 40rpx;
-				.title{
-					margin-bottom: 50rpx;
-					.icon-gantanhao-yuankuang{
-						font-size: $font-size-32;
-						color: #166CE1;
-						margin-right: 10rpx;
-					}
-					.text-m{
-						font-size: $font-size-30;
-						color: #166CE1;
-					}
-					.text-s{
-						font-size: $font-size-24;
-						color: #999999;
-					}
-				}
-				.text-main{
-					width: 100%;
-					height: auto;
-					view{
-						line-height: 40rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						text-align: justify;
-						margin-bottom: 10rpx;
-					}
-				}
-			}
-			
-		}
-		.add-btn{
-			width: 600rpx;
-			height: 88rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			text-align: center;
-			background: $btn-confirm;
-			border-radius: 44rpx;
-			margin-top: 80rpx;
-		}
-		.add-btn.disabled{
-			background: #F8F8F8;
-			border-radius: 44rpx;
-		}
-	}
-</style>
-

pages/user/operator/list.vue

@@ -1,583 +0,0 @@
-<template>
-	<view class="container operator clearfix">
-		<view class="operator-top clearfix">
-			<view class="operator-title">
-				<view class="head"><image :src="clubImage == null ? 'https://static.caimei365.com/app/img/icon/icon-club@3x.png' : clubImage" mode=""></image></view>
-				<view class="title">{{clubName}}</view>
-			</view>
-			<view class="operator-search">
-				<view class="search-wrap">
-					<view class="search-from name">
-						<input class="input" type="text" v-model="linkman" placeholder="请输入姓名" maxlength="6"/>
-					</view>
-					<view class="search-from phone">
-						<input class="input" type="text" v-model="clubMobile" placeholder="请输入手机号" maxlength="11"/>
-					</view>
-					<view class="search-from search">
-						<button class="search-btn" type="default" @click.stop="searchOpertor">搜索</button>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="operator-main">
-			<view v-if="isEmpty" class="empty-container">
-				<view class="txt">暂无运营人员</view>
-			</view>
-			<view v-else class="operator-list">
-				<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 : 'https://static.caimei365.com/app/img/icon/icon-seller@3x.png'" mode=""></image></view>
-							<view class="list-tel">
-								<text class="txt">{{item.linkName}}</text>
-								<text class="txt">{{item.mobile}}</text>
-							</view>
-						</view>
-						<view class="list-opea">
-							<view class="opea-type">
-								<view class="opea-type-cell" v-if="item.effectiveFlag != null">
-									<text class="iconfont icon-iconfontweixin" :style="{color: iconStautsColor(item.status)}"></text>
-									<text :style="{color: rexpStautsColor(item.effectiveFlag)}">{{ rexpStautsText(item.effectiveFlag) }}</text>
-								</view>
-								<view class="opea-type-cell none" v-else>
-									<text>- -</text>
-								</view>
-							</view>
-							<view class="opea-del">
-								<view class="opea-type-cell" @click.stop="deleteOperator(item.id)">
-									<text class="iconfont icon-shanchu"></text>
-									<text>删除</text>
-								</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>
-					<!--加载loadding-->
-				</scroll-view>
-			</view>
-		</view>
-		<div class="operator-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-			<view class="add-btn" @click="this.$api.navigateTo('/pages/user/operator/addoperator')">添加运营人员</view>
-		</div>
-		<view class="operator-model" v-if="isOperatorModel" @click.stop="closeModel">
-			<view class="operator-alert">
-				<text class="iconfont icon-iconfontguanbi" @click.stop="closeModel"></text>
-				<view class="content">
-					<view class="ciew-t">姓名：{{modelData.linkName}}</view>
-					<view class="ciew-t">手机号：{{modelData.mobile}}</view>
-					<view class="ciew-t">邀请码：{{modelData.invitationCode ? modelData.invitationCode : '无'}}<text :style="{color: rexpStautsColor(modelData.status)}">{{modelStautsText(modelData.effectiveFlag)}}</text></view>
-					<view class="ciew-t">邀请码有效期：{{modelData.effectiveDays}}天</view>
-					<view class="ciew-t">状态：{{modelData.status == '2' ? '已绑定' : '未绑定'}}</view>
-					<view class="ciew-t">添加时间：{{modelData.addTime}}</view>
-					<view class="ciew-t">绑定时间：{{modelData.bindTime == null ? '无' : modelData.bindTime }}</view>
-				</view>
-				<view class="btn" v-if="modelData.status != '2'" @click.stop="updateInvitationCode(modelData)">更新邀请码</view>
-			</view>
-		</view>
-	</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"
-	export default {
-		components:{
-			tuiLoadmore,
-			tuiNomore,
-		},
-		data() {
-			return {
-				clubID:'',
-				clubName:'',
-				clubImage:'',
-				linkman:'',
-				clubMobile:'',
-				isEmpty:false,
-				nomoreText: '上拉显示更多',
-				userID:'',
-				pageNum:1,
-				pageSize:10,
-				hasNextPage:false,
-				loadding: false,
-				pullUpOn: true,
-				pullFlag: true,
-				allowDataStatus:true,
-				wrapperHeight:'100%',
-				scrollHeight:'',
-				deleteAddressId:'',
-				currPage:'',//当前页面
-				prevPage:'',//上一个页面
-				isOperatorModel:false,
-				operatorList:[],
-				isIphoneX:this.$store.state.isIphoneX,
-				modelData:''
-			}
-		},
-		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)
-			},
-			searchOpertor(){
-				this.pageNum=1
-				this.initOperatorList()
-			},
-			initOperatorList(){	
-				let params = {clubID:this.clubID,pageNum:1,pageSize:this.pageSize,linkName:this.linkman,mobile:this.clubMobile}
-				this.UserService.QueryOperatorList(params).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.isEmpty = false
-						this.hasNextPage = response.data.hasNextPage
-						this.operatorList =responseData.results
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
-						if(this.hasNextPage){
-							this.pullUpOn = false
-							this.nomoreText = '上拉显示更多'
-						}else{
-							this.pullUpOn = true
-							this.loadding = false
-							this.nomoreText = '已至底部'
-						}
-					}else{
-						this.isEmpty = true
-					}
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
-				})
-			},	
-			getOnReachBottomData(){
-				this.pageNum+=1
-				let params = {pageNum:this.pageNum,pageSize:this.pageSize,linkName:this.linkman,mobile:this.clubMobile}
-				this.UserService.QueryOperatorList(params).then(response =>{
-					let responseData = response.data
-					if(responseData.results&&responseData.results.length > 0){
-						this.hasNextPage = response.data.hasNextPage
-						this.operatorList = this.operatorList.concat(responseData.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)
-				})
-			},
-			showOperatorModel(item){
-				this.isOperatorModel = true
-				this.modelData = item
-			},
-			closeModel(){
-				this.isOperatorModel = false
-			},
-			deleteOperator(id){//删除运营人员
-				this.$util.modal('','确定删除运营人员吗？','确定删除','取消',true,() =>{
-					this.UserService.PostDeleteOperator({id:id}).then(response =>{
-						this.$util.msg('删除成功',2000,true,'success')
-						this.initOperatorList()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			updateInvitationCode(item){	//更新邀请码	
-				this.$util.modal('','确定更新邀请码并发送给运营人员？','确定更新','取消',true,() =>{
-					this.UserService.PostUpdateOperatorCode({id:item.id,status:item.status}).then(response =>{
-						this.$util.msg('更新邀请码成功',2000)
-						this.isOperatorModel = false
-						this.initOperatorList()
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			rexpStautsText(n) {
-			      let text = ''
-			      switch (n) {
-					case '':
-						text = '--'
-						break
-			        case '1':
-			          text = '邀请码有效'
-			          break
-			        case '2':
-			          text = '邀请码已使用'
-			          break
-			        case '3':
-			          text = '邀请码已过期'
-			          break
-			      }
-			      return text
-			},
-			modelStautsText(n) {
-			      let text = ''
-			      switch (n) {
-			        case '1':
-			          text = '(有效)'
-			          break
-			        case '2':
-			          text = '(已使用)'
-			          break
-			        case '3':
-			          text = '(已过期)'
-			          break
-			      }
-			      return text
-			},
-			rexpStautsColor(status) {
-			  let textColor = ''
-			  switch (status) {
-				case '1':
-				  textColor = '#55BB00'
-				  break
-				case '2':
-				  textColor = '#0056BB'
-				  break
-				case '3':
-				  textColor = '#BB0000'
-				  break
-			  }
-			  return textColor
-			},  
-			iconStautsColor(status) {
-			  let textColor = ''
-			  if(status == '2'){
-				   textColor = '#09BB07'
-			  }else{
-				   textColor = '#DDDDDD'
-			  }
-			  return textColor
-			},
-		},
-		onReachBottom() {
-			if(this.hasNextPage){
-				this.loadding = true
-				this.pullUpOn = true
-				this.getOnReachBottomData()
-			}	
-		},
-		onShow() {
-			this.$api.getComStorage('clubInfo').then(response =>{
-				this.clubID = response.clubID
-				this.clubName = response.name
-				this.clubImage = response.image
-				this.pageNum = 1;
-				this.initOperatorList();
-			})
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #F7F7F7;
-		border-top: 1px solid #EBEBEB;
-	}
-	.container{
-		position: relative;
-	}
-	.operator-top{
-		width: 702rpx;
-		padding: 0 24rpx;
-		height: 282rpx;
-		background: #FFFFFF;
-		position:fixed ;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.operator-title{
-			width: 100%;
-			height: 92rpx;
-			padding: 34rpx 0;
-			.title{
-				width: 420rpx;
-				float: left;
-				font-size: $font-size-32;
-				color: $text-color;
-				line-height: 92rpx;
-				text-align: left;
-				margin-left: 20rpx;
-				-o-text-overflow: ellipsis;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				word-break: break-all;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 1;
-				overflow: hidden;
-			}
-			.head{
-				width: 92rpx;
-				height: 92rpx;
-				border-radius: 50%;
-				border: 1px solid #ebebeb;
-				float: left;
-				image{
-					width: 92rpx;
-					height: 92rpx;
-					border-radius: 50%;
-				}
-			}
-		}
-		.operator-search{
-			width: 100%;
-			height: auto;
-			.search-from{
-				width: 300rpx;
-				height: 40rpx;
-				padding: 20rpx;
-				background: $sub-bg-color;
-				border-radius: 40rpx;
-				position: relative;
-				margin-bottom: 20rpx;
-				float: left;
-				&.name{
-					width: 180rpx;
-					margin-right: 20rpx;
-					.input{
-						width: 180rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-						height: 40rpx;
-					}
-				}
-				&.phone{
-					width: 228rpx;
-					margin-right: 20rpx;
-					.input{
-						width: 228rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-						height: 40rpx;
-					}
-				}
-				&.search{
-					width: 175rpx;
-					padding: 0;
-					background: #FFFFFF;
-					.search-btn{
-						width: 170rpx;
-						height: 78rpx;
-						border-radius: 39rpx;
-						font-size: $font-size-28;
-						color: #FFFFFF;
-						line-height: 78rpx;
-						background: $btn-confirm;
-					}
-				}
-				.label{
-					text-align: left;
-					font-size: $font-size-28;
-					color:$text-color;
-					line-height: 40rpx;
-					float: left;
-				}
-				
-			}
-			
-		}
-	}
-	.operator-main{
-		padding-top: 282rpx;
-		padding-bottom: 120rpx;
-	}
-	.list{
-		display: flex;
-		align-items: center;
-		width: 702rpx;
-		height: 92rpx;
-		padding: 24rpx;
-		background: #FFFFFF;
-		position: relative;
-		border-bottom: 1px solid #EBEBEB;
-		.list-left{
-			display: flex;
-			flex: 4;
-			.list-head{
-				width: 92rpx;
-				height: 92rpx;
-				border-radius: 50%;
-				image{
-					width: 92rpx;
-					height: 92rpx;
-					border-radius: 50%;
-				}
-			}
-			.list-tel{
-				margin-left: 18rpx;
-				.txt{
-					display: flex;
-					flex: 1;
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 46rpx;
-				}
-			}
-		}
-		.list-opea{
-			flex:6;
-			.opea-type{
-				flex-direction: column;
-				align-items: center;
-				margin-left: 35rpx;
-				float: left;
-				.opea-type-cell{
-					width: 186rpx;
-					height: 64rpx;
-					padding:0 16rpx;
-					border-radius: 32rpx;
-					border: 1px solid #DDDDDD;
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					.icon-iconfontweixin{
-						margin-right: 8rpx;
-						font-size: $font-size-32;
-					}
-					&.none{
-						text-align: center;
-					}
-				}
-			}
-			.opea-del{
-				float: right;
-				flex-direction: column;
-				align-items: center;
-				.opea-type-cell{
-					width: 86rpx;
-					height: 64rpx;
-					padding:0 24rpx;
-					border-radius: 32rpx;
-					border: 1px solid #DDDDDD;
-					line-height: 64rpx;
-					font-size: $font-size-24;
-					color: #FF0000;
-					.icon-shanchu{
-						font-size: $font-size-32;
-						margin-right: 6rpx;
-					}
-				}
-			}
-		}
-	}
-	.operator-model{
-		width: 100%;
-		height: 100%;
-		background: rgba(0,0,0,.1);
-		position: fixed;
-		top: 0;
-		left: 0;
-		bottom: 0;
-		right: 0;
-		margin: auto;
-		z-index: 1000;
-		.operator-alert{
-			width: 435rpx;
-			height: 360rpx;
-			padding: 68rpx 32rpx;
-			background: #FFFFFF;
-			border-radius: 14rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-			bottom: 0;
-			right: 0;
-			margin: auto;
-			z-index: 1001;
-			.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;
-			}
-			.content{
-				.ciew-t{
-					font-size: $font-size-28;
-					color: $text-color;
-					line-height: 48rpx;
-				}
-			}
-			.btn{
-				width: 100%;
-				height: 68rpx;
-				border-top: 1px solid #F7F7F7;
-				line-height: 68rpx;
-				font-size: $font-size-26;
-				text-align: center;
-				color: $color-system;
-				position: absolute;
-				bottom:0 ;
-				left: 0;
-			}
-		}
-	}
-	.operator-btn{
-		position: fixed;
-		width: 100%;
-		height: 140rpx;
-		left: 0;
-		bottom: 0;
-		background: #FFFFFF;
-		z-index: 95;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		.add-btn{
-			width: 600rpx;
-			height: 88rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			text-align: center;
-			background: $btn-confirm;
-			border-radius: 44rpx;
-		}
-	}
-	.adds-btn{
-		width: 600rpx;
-		height: 88rpx;
-		font-size: 28rpx;
-		line-height: 88rpx;
-		color: #FFFFFF;
-		margin: 0 auto;
-		text-align: center;
-		background: #000000;
-		border-radius: 44rpx;
-	}
-</style>
-

pages/user/setting/phone.vue

@@ -1,316 +0,0 @@
-<template>
-	<view class="container register">
-		<view class="register-main first clearfix">
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">原手机号:</view>
-					<view class="row-input">{{bindMobile}}</view>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from code">
-					<input class="row-input" type="number" v-model="mobileCode" placeholder="请输入原手机号的验证码" placeholder-class="place-holder" maxlength="6"/>
-				</view>
-				<view class="register-from btn" :class="[isMobileDisabled  ? 'disabled' : '']">
-					<button class="row-input"  type="button" @click.stop="getMobileCodeFn" :disabled="isMobileDisabled">{{ mobileCodeText }}</button>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<input class="row-input" type="number" v-model="contractMobile" placeholder="请输入新手机号" placeholder-class="place-holder" maxlength="11"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from code">
-					<input class="row-input" type="number" v-model="newMobileCode" placeholder="请输入新手机号的验证码" placeholder-class="place-holder" maxlength="6"/>
-				</view>
-				<view class="register-from btn" :class="[isNewMobileDisabled  ? 'disabled' : '']" >
-					<button class="row-input"  type="button" @click.stop="getNewMobileCodeFn" :disabled="isNewMobileDisabled">{{ newMobileCodeText }}</button>
-				</view>
-			</view>
-			<view class="register-row clearfix" style="border: 0;">
-				<view class="register-btn"  @click="bindMobileCheck">确定</view>
-			</view>
-			<view class="register-text clearfix">
-				<view >注意：本操作更换的是机构联系人的手机号，不是运营人员的手机号！</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { mapMutations } from 'vuex';
-	import { getClubMobileCode,getClubNewMobileCode } from "@/services/public.js" 
-	import { changeMobile } from "@/services/use.js" 
-	var self;
-	export default{
-		data() {
-			return{
-				userID:'',					//用户ID
-			    count: '',					//倒计时
-			    newCount: '',				//倒计时
-			    codeTime: null,
-			    codeTimeNew: null,
-				bindMobile:'',				//联系人手机号
-				contractMobile:'',			//新联系人手机号
-				mobileCode:'',				//手机号验证码
-				newMobileCode:'',			//新手机号手机验证码
-				mobileCodeText: '获取验证码',
-				newMobileCodeText: '获取验证码',
-				isMobileDisabled: false,	//手机验证码按钮控制
-				isNewMobileDisabled: false,	//手机验证码按钮控制
-			}	
-		},
-		onLoad(option) {
-			this.bindMobile = option.phone
-		},
-		methods:{
-			bindMobileCheck(){
-				let params = {
-						contractMobile2:this.bindMobile,
-						contractMobile:this.contractMobile,
-						mobileCode:this.mobileCode,
-						newMobileCode:this.newMobileCode,
-						userID:this.userID
-				}
-				changeMobile(params).then(response =>{
-					this.$util.msg('修改成功',1500,true,'success')
-					setTimeout(()=>{
-						uni.navigateBack({delta: 1})
-					},2000)
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			getMobileCodeFn(){
-				if( this.bindMobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.bindMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				let params = { mobile : this.bindMobile }
-				this.isMobileDisabled = true;
-				getClubMobileCode(params).then(response =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.codeTime) {
-			       		this.count = TIME_COUNT;
-			       		this.isMobileDisabled = true;
-			       		this.codeTime = setInterval(() => {
-			       			if (this.count > 1 && this.count <= TIME_COUNT) {
-			         			this.count--
-			         			this.mobileCodeText = this.count +'s重新发送'
-			        		} else {
-				         		this.isMobileDisabled = false;
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.mobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}		
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isMobileDisabled = false;
-				})
-			},
-			getNewMobileCodeFn(){
-				if( this.contractMobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.contractMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				let params = { newMobile : this.contractMobile }
-				this.isNewMobileDisabled = true;
-				getClubNewMobileCode(params).then(response =>{
-					this.$util.msg('验证短信已发送',2000);
-					const TIME_COUNT = 60;
-			     	if (!this.codeTimeNew) {
-			       		this.newCount = TIME_COUNT;
-			       		this.isNewMobileDisabled = true;
-			       		this.codeTimeNew = setInterval(() => {
-			       			if (this.newCount > 1 && this.newCount <= TIME_COUNT) {
-			         			this.newCount--
-			         			this.newMobileCodeText = this.newCount +'s重新发送'
-			        		} else {
-				         		this.isNewMobileDisabled = false;
-				         		clearInterval(this.codeTimeNew)
-				         		this.codeTimeNew = null
-								this.newMobileCodeText = '获取验证码'
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isNewMobileDisabled = false;
-				})
-			}
-		},
-		onShow() {
-			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userID
-			})
-		}
-	}
-</script>
-
-<style lang="scss">
-	.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;
-			&.detailed{
-				padding-bottom: 300rpx;
-			}
-			&.first{
-				padding-top: 40rpx;
-			}
-			.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;
-				margin: auto;
-				// margin-bottom: 20rpx;
-				border-bottom: 2rpx solid #e1e1e1;
-				.register-title{
-					line-height: 60rpx;
-					font-size: $font-size-32;
-					color: $text-color;
-					text-align: left;
-					padding-left: 20rpx;
-					.txt{
-						font-size: $font-size-26;
-						font-weight: normal;
-					}
-				}
-				.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: 64rpx;
-					padding: 24rpx 0;
-					position: relative;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: #666666;
-						line-height: 64rpx;
-						float: left;
-					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 64rpx;
-						float: left;
-						height: 64rpx;
-						&.none{
-							color: #999999;
-						}
-					}
-					&.code{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 390rpx;
-						}
-					}
-					&.btn{
-						width: 180rpx;
-						height:64rpx;
-						float: right;
-						padding: 0;
-						border: 2rpx solid #e15616;
-						border-radius: 45rpx;
-						.row-input{
-							width: 180rpx;
-							height: 64rpx;
-							line-height: 64rpx;
-							padding: 0;
-							color:#E15616;
-							text-align: center;
-							border-radius: 45rpx;
-							font-size: $font-size-24;
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							border: 2rpx solid #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
-					}
-					&.btn{
-						margin-top: 20rpx;
-					}
-				}
-				
-			}
-			.register-btn{
-				width: 600rpx;
-				height: 90rpx;
-				border-radius: 45rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-				margin-top: 96rpx;
-				&.sub{
-					margin-top: 0;
-				}
-			}
-		}
-	}
-	.register-text{
-		width: 506rpx;
-		color: #fea785;
-		font-size: 22rpx;
-		line-height: 32rpx;
-		margin: 30rpx auto;
-		text-align: center
-	}
-	.place-holder{
-		color: #b2b2b2;
-	}
-</style>
-

pages/user/setting/setting.vue

@@ -1,112 +0,0 @@
-<template>
-	<view class="container clearfix">
-		<view class="foot-list">
-			<view class="list-cell-item">
-				<view class="list-cell" @click="navigator(`/pages/user/setting/phone?phone=${bindMobile}`)" hover-class="cell-hover" :hover-stay-time="50">
-					<text class="cell-tit">更换手机号</text>
-					<text class="cell-more">
-						<text class="txt">{{hidePhone(bindMobile)}}</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</text>
-				</view>
-				<view class="list-cell" @click="navigator('/pages/login/password')" hover-class="cell-hover" :hover-stay-time="50">
-					<text class="cell-tit">修改密码</text>
-					<text class="cell-more iconfont icon-xiayibu"></text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				bindMobile:''
-			}
-		},
-		onLoad(option) {
-			
-		},
-		methods:{
-			initSetting(){
-				this.$api.getStorage().then((resolve) =>{
-					this.UserService.PersonalInfo({userID:resolve.userID}).then(response =>{
-						this.bindMobile=response.data.user.bindMobile
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
-				})
-			},
-			navigator(url){
-				this.$api.navigateTo(url)
-			},
-			hidePhone(val){
-				let phone = this.$reg.hidePhone(val) 
-				return phone
-			}
-		},
-		onShow() {
-			this.initSetting()
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		height: auto;
-	}
-	page,.container{
-		/* padding-bottom: 120upx; */
-		background: #fff;
-		/* border-top: 1px solid #EBEBEB; */
-	}
-	.foot-list{
-		width: 100%;
-		margin-top: 30rpx;
-	}	
-	.list-cell-item{
-		width: 702rpx;
-		height: auto;
-		margin-bottom: 24rpx;
-		padding:0 24rpx;
-		background: $bg-color;
-	}
-	.list-cell{
-		display:flex;
-		width: 100%;
-		align-items:baseline;
-		line-height:100rpx;
-		position:relative;
-		background: $bg-color;
-		justify-content: center;
-		border-bottom: 1px solid #EBEBEB;
-		&.cell-hover{
-			background:#fafafa;
-		}
-		.cell-more{
-			align-self: baseline;
-			font-size:$font-size-28;
-			color:#b2b2b2;
-			margin-left:10rpx;
-			.txt{
-				color: #999999;
-				padding-right: 10rpx;
-			}
-		}
-		.cell-tit{
-			flex: 1;
-			font-size: $font-size-28;
-			color: #666666;
-			margin-right:10rpx;
-		}
-		.cell-tip{
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-	}	
-	.list-cell.last{
-		border-bottom: none;
-	}
-</style>
-

services/activity.service.js

@@ -1,17 +0,0 @@
-/**
- * 这是活动页相关的业务逻辑的服务
- */
-export default class ActivityService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'ActivityService'
-	}
-	/* 小程序支付-活动接口 */
-	GetRepeatActivityBrandList (data = {}) {
-		return this.AjaxService.get({ url:'/repeat/activityProduct', data, isLoading: true })
-	}
-	/* 美博会 活动楼层 */
-	GetRepeatActivityFloorData (data = {}) {
-		return this.AjaxService.get({ url:'/activity/data', data, isLoading: true })
-	}
-}

services/other.service.js

@@ -1,27 +0,0 @@
-/**
- * 条款服务业务逻辑的服务
- */
-export default class OtherService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'OtherService'
-	}
-	/**
-	 * 售后条款
-	 */
-	QuerySaveClause (data) {
-		return this.AjaxService.get({ url:'/seller/clause', data, isLoading: true })
-	}
-	/**
-	 * 正品联盟
-	 */
-	QueryHomeMemberList (data) {
-		return this.AjaxService.get({ url:'/home/member', data, isLoading: true })
-	}
-	/**
-	 * 协议
-	 */
-	QueryClubProtocol (data) {
-		return this.AjaxService.get({ url:'/club/protocol', data, isLoading: true })
-	}
-}

services/second.service.js

@@ -1,35 +0,0 @@
-// 二手商品
-export default class SecondService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'SecondService'
-	}
-	/**
-	 *二手商品列表
-	 *@param 二手商品分类 secondHandType	1二手仪器，2临期产品，3其他  【必传】
-	 *@param 二手仪器分类的类型 instrumentType	1轻光电、2重光电、3耗材配件【不传默认全部】
-	 *@param 搜索关键词 searchKeyword	【选传】 
-	 */
-	SeconHandProductList (data = {}) {
-		return this.AjaxService.get({ url:'/product/getSecondHandProductList', data, isLoading: true })
-	}
-	/*二手发布/品牌列表 */
-	brandList (data = {}) {
-		return this.AjaxService.get({ url:'/product/brandList', data, isLoading: true })
-	}
-	/*二手发布/提交发布 */
-	SecondHandProduct (data = {}) {
-		return this.AjaxService.post({ url:'/product/releaseSecondHandProduct', data, isLoading: true })
-	}
-	/*二手发布/浏览量 */
-	ProductCount (data = {}) {
-		return this.AjaxService.get({ url:'/product/updateSecondHandProductCount', data, isLoading: true })
-	}
-	/**
-	 *@二手商品详情
-	 *@param productId：商品ID（数字类型，必传）
-	 */
-	ProductDetail (data={}){//商品详情
-		return this.AjaxService.get({ url:'/product/getSecondHandProductDetail', data, isLoading: true })
-	}
-}

services/shop.service.js

@@ -1,113 +0,0 @@
-/**
- * 这是与购物有关的业务逻辑的服务
- */
-export default class ShopService {
-	constructor(AjaxService) {
-		Object.assign(this, { AjaxService })
-		this.name = 'ShopService'
-	}
-	/* 小程序-供应商注册第一步 */
-	SupplierAppletsRegistered (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/appletsRegistered', data, isLoading: true })
-	}
-	/* 小程序-搜索供应商列表 */
-	GetSearchSupplierList (data = {}) {
-		return this.AjaxService.get({ url:'/search/query/supplier', data, isLoading: true })
-	}
-	/* 小程序供应商个人中心 */
-	GetHomePageData (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/homePageData', data, isLoading: true })
-	}
-	/* 小程序供应商我的商品 */
-	GetSupplierPyProduct (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/myProduct', data, isLoading: true })
-	}
-	/* 小程序供应商操作添加删除主推商品 */
-	SupplierSwitchFeaturedyProduct (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/switchFeatured', data, isLoading: true })
-	}
-	/* 小程序供应商操作下架商品 */
-	SupplierSoldOutProduct (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/soldOut', data, isLoading: true })
-	}
-	/* 小程序供应商我的店铺详情 */
-	GetSupplierHomeDeatils (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/home/detail', data, isLoading: true })
-	}
-	/* 小程序供应商我的店铺banner */
-	GetSupplierHomeBanner (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/home/images', data, isLoading: true })
-	}
-	/* 小程序供应商我的店铺主推商品 */
-	GetSupplierHomeProduct (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/home/products', data, isLoading: true })
-	}
-	/* 小程序供应商我的店铺全部商品 */
-	GetSupplierHomeProductList (data = {}) {
-		return this.AjaxService.get({ url:'/search/query/product/supplier', data, isLoading: false })
-	}
-	/* 小程序供应商我的订单 */
-	GetSupplierMyOrderList (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/myOrderList', data, isLoading: true })
-	}
-	/* 小程序发货-权限控制 */
-	MiniShipments (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/miniShipments', data, isLoading: true })
-	}
-	/* 小程序发货-查询供应商子订单详情 */
-	GetShopOrderDetails (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/shopOrderDetails', data, isLoading: true })
-	}
-	/* 小程序发货-绑供应商运营人员 */
-	BindShopOperator (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/shopBindingWx', data, isLoading: true })
-	}
-	/* 小程序发货-供应商订单详情获取订单分享码 */
-	ShopOrderShareCode (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/shopShareShipments', data, isLoading: false })
-	}
-	/* 小程序发货-供应商订单发货商品查询 */
-	ShopOrderShipmentsInfo (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/shipmentsInfo', data, isLoading: true })
-	}
-	/* 小程序发货-物流公司查询 */
-	GetLogisticsCompany (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/logisticsCompany', data, isLoading: true })
-	}
-	/* 小程序发货-查看发货记录物流信息 */
-	GetLogisticsInfo (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/logisticsInfo', data, isLoading: true })
-	}
-	/* 小程序发货-查看发货记录-添加物流 */
-	ShopAddLogisticsInfo (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/addLogisticsInfo', data, isLoading: true })
-	}
-	/* 小程序发货-扫码获取物流公司信息 */
-	GetExpressInformation (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/scanLogistics', data, isLoading: false })
-	}
-	/* 小程序发货-确认发货 */
-	ShopAddLogistics (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/addLogistics', data, isLoading: true })
-	}
-	/* 小程序发货-发货记录 */
-	ShopShipmentsRecord (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/shipmentsRecord', data, isLoading: true })
-	}
-	/* 小程序发货-撤销发货 */
-	ShopCancelShipment (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/cancelShipment', data, isLoading: true })
-	}
-	/* 一级分类 */
-	GetPrimaryClassification (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/primaryClassification', data, isLoading: false })
-	}
-	/* 二级级分类 */
-	GetPrimarySecondaryClassification (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/secondaryClassification', data, isLoading: false })
-	}
-	/* 三级分类 */
-	GetPrimaryThreeLevelClassification (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/threeLevelClassification', data, isLoading: false })
-	}
-}