删除部分文件 优化部分页面

App.vue

@@ -32,6 +32,7 @@
 						Vue.prototype.platformClass = 'left'
 					} else {
 						Vue.prototype.platformClass = 'center'
+						self.$store.dispatch('setIsIphoneFun',true)
 					}
 					Vue.prototype.StatusBar = e.statusBarHeight;
 					Vue.prototype.fontSizeSetting = e.fontSizeSetting
@@ -46,8 +47,6 @@
 						Vue.prototype.CustomBar = e.statusBarHeight + 50;
 					}
 					// #endif		
-				
-			
 					// #ifdef MP-ALIPAY
 					Vue.prototype.StatusBar = e.statusBarHeight;
 					Vue.prototype.CustomBar = e.statusBarHeight + e.titleBarHeight;

api/utils.js

@@ -163,7 +163,7 @@ export function uploadFileImage() {
 			success: (res) => {
 				const tempFilePaths = res.tempFilePaths;
 				const uploadTask = uni.uploadFile({
-					url : 'https://spi-b.caimei365.com/formData/MultiPictareaddData',
+					url : requestUrl+'/formData/MultiPictareaddData',
 					filePath: tempFilePaths[0],
 					name: 'file',
 					header: {

common/config/wxLogin.js

@@ -22,6 +22,34 @@ const wxLoginAuthorize = function(){
 		})
 	})
 }
+const wxLoginQuick = function(){// 根据微信的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 =>{
+					console.log(response)
+					store.commit('updateStatus',response.data)
+					store.commit('login',response.data);
+					store.commit('wxLogin',wxResponse.userInfo);
+					uni.setStorageSync('token',response.data.token)
+					uni.removeStorageSync('sessionid')
+					uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
+					if(response.data.userIdentity ==1){
+						uni.navigateTo({url:'/seller/pages/index/index'})
+					}else{
+						uni.switchTab({url:'/pages/tabBar/user/user'})
+					}
+				}).catch(error =>{
+					uni.removeStorageSync('sessionid')
+					uni.setStorageSync('sessionid','JSESSIONID='+error.data)
+					store.commit('logout',error.data)
+					store.commit('updateStatus',error.data)
+					store.commit('wxLogin',wxResponse.userInfo);
+				})
+			})
+		})
+}
 export default{
-	wxLoginAuthorize
+	wxLoginAuthorize,
+	wxLoginQuick
 }

components/cm-module/listTemplate/ZuheList.vue

@@ -1,146 +0,0 @@
-<template>
-	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-		<view class="good-search clearfix" v-if="searchStatus">
-			<view id="shop">
-				<view class="style addstyle ">单一商品</view>
-				<view class="style zuhe">组合商品</view>
-			</view>
-			<view class="search-from name">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" 
-					   type="text" 
-					   focus
-					   confirm-type="search" 
-					   v-model="searchInputVal" 
-					   placeholder="请输入商品关键词" 
-					   @input="onShowClose" 
-					   @confirm="searchOpertor"
-					   maxlength="20"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn">
-				<button class="search-btn" type="default" @click.stop="searchOpertor">搜索</button>
-			</view>
-		</view>
-		<list-skeleton v-if="showSkeleton"></list-skeleton>
-	</view>
-</template>
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-	}
-		
-</script>
-
-<style>
-.commodity-list-wrapper {
-		scroll-view {
-			height: 100%;
-		}
-		.style{
-			width: 128rpx;
-			height: 64rpx;
-			background: #fff;
-			font-size: 26rpx;
-			display: inline-block;
-			border-radius: 10rpx;
-			text-align: center;
-			line-height: 64rpx;
-			border: 2rpx solid #EEEEEE;
-			position: relative;
-			margin-right: 12rpx;
-			}
-		.danyi i{
-			color: #E15616;	
-			position: absolute;
-			top: 20rpx;
-			right: 4rpx;
-			font-weight: bold
-			}
-		.addstyle{
-				background: linear-gradient(-42deg, transparent 28rpx, #E15616 0) top right;
-				color: #FFFFFF;
-			}
-		.show-more-btn {
-			width: 276rpx;
-			height: 52rpx;
-			line-height: 52rpx;
-			border: 2rpx solid #D8D8D8;
-			background: #F7F7F7;
-			font-size: 26rpx;
-			margin: 26rpx 0;
-			position: absolute;
-			left: 50%;
-			margin-left: -138rpx;
-		}
-	}
-	.good-search{
-		height: 64rpx;
-		width: 702rpx;
-		padding: 24rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.search-from{
-			width: 330rpx;
-			height: 64rpx;
-			background: #F7F7F7;
-			border-radius: 14rpx;
-			float: left;
-			position: relative;
-			.input{
-				// width: 500rpx;
-				height: 64rpx;
-				float: left;
-				line-height: 64rpx;
-				color: $text-color;
-				font-size: $font-size-24;
-			}
-			.icon-iconfonticonfontsousuo1{
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				display: block;
-				font-size: $font-size-38;
-				float: left;
-				color: #999999;
-			}
-			.icon-shanchu1{
-				font-size: $font-size-32;
-				color: #999999;
-				position: absolute;
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				top: 0;
-				right: 0;
-				text-align: center;
-				z-index: 10;
-			}
-		}
-		.search-btn{
-			// width: 90rpx;
-			line-height: 64rpx;
-			text-align: center;
-			font-size: $font-size-28;
-			color: $color-system;
-			float: left;
-			background: #FFFFFF;
-			margin-left: 10rpx
-		}
-	 }
-	}
-</style>

components/cm-module/zuheList/ZuheList.vue

@@ -1,146 +0,0 @@
-<template>
-	<view class="container commodity-list-wrapper" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
-		<view class="good-search clearfix" v-if="searchStatus">
-			<view id="shop">
-				<view class="style addstyle ">单一商品</view>
-				<view class="style zuhe">组合商品</view>
-			</view>
-			<view class="search-from name">
-				<text class="iconfont icon-iconfonticonfontsousuo1"></text>
-				<input class="input" 
-					   type="text" 
-					   focus
-					   confirm-type="search" 
-					   v-model="searchInputVal" 
-					   placeholder="请输入商品关键词" 
-					   @input="onShowClose" 
-					   @confirm="searchOpertor"
-					   maxlength="20"/>
-				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
-			</view>
-			<view class="search-btn">
-				<button class="search-btn" type="default" @click.stop="searchOpertor">搜索2</button>
-			</view>
-		</view>
-		<list-skeleton v-if="showSkeleton"></list-skeleton>
-	</view>
-</template>
-<script>
-	export default {
-		components: {
-			
-		},
-		data() {
-			return {
-				
-			};
-		},
-	}
-		
-</script>
-
-<style>
-.commodity-list-wrapper {
-		scroll-view {
-			height: 100%;
-		}
-		.style{
-			width: 128rpx;
-			height: 64rpx;
-			background: #fff;
-			font-size: 26rpx;
-			display: inline-block;
-			border-radius: 10rpx;
-			text-align: center;
-			line-height: 64rpx;
-			border: 2rpx solid #EEEEEE;
-			position: relative;
-			margin-right: 12rpx;
-			}
-		.danyi i{
-			color: #E15616;	
-			position: absolute;
-			top: 20rpx;
-			right: 4rpx;
-			font-weight: bold
-			}
-		.addstyle{
-				background: linear-gradient(-42deg, transparent 28rpx, #E15616 0) top right;
-				color: #FFFFFF;
-			}
-		.show-more-btn {
-			width: 276rpx;
-			height: 52rpx;
-			line-height: 52rpx;
-			border: 2rpx solid #D8D8D8;
-			background: #F7F7F7;
-			font-size: 26rpx;
-			margin: 26rpx 0;
-			position: absolute;
-			left: 50%;
-			margin-left: -138rpx;
-		}
-	}
-	.good-search{
-		height: 64rpx;
-		width: 702rpx;
-		padding: 24rpx;
-		background: #FFFFFF;
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 999;
-		.search-from{
-			width: 330rpx;
-			height: 64rpx;
-			background: #F7F7F7;
-			border-radius: 14rpx;
-			float: left;
-			position: relative;
-			.input{
-				// width: 500rpx;
-				height: 64rpx;
-				float: left;
-				line-height: 64rpx;
-				color: $text-color;
-				font-size: $font-size-24;
-			}
-			.icon-iconfonticonfontsousuo1{
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				text-align: center;
-				display: block;
-				font-size: $font-size-38;
-				float: left;
-				color: #999999;
-			}
-			.icon-shanchu1{
-				font-size: $font-size-32;
-				color: #999999;
-				position: absolute;
-				width: 64rpx;
-				height: 64rpx;
-				line-height: 64rpx;
-				top: 0;
-				right: 0;
-				text-align: center;
-				z-index: 10;
-			}
-		}
-		.search-btn{
-			// width: 90rpx;
-			line-height: 64rpx;
-			text-align: center;
-			font-size: $font-size-28;
-			color: $color-system;
-			float: left;
-			background: #FFFFFF;
-			margin-left: 10rpx
-		}
-	 }
-	}
-</style>

components/cu-custom.vue

@@ -1,18 +1,19 @@
 <template name="headerNavbar">
 	<!-- 自定义导航栏 -->
-	<view class='navbar-wrap' :style="{height:CustomBar+'px',paddingTop:StatusBar+'px'}"> 
-	  	<view class="navbar-text" :style="{lineHeight:(CustomBar - StatusBar)+'px;',fontSize:fontSizeSetting+'px;',paddingLeft:navbarData.textLeft ? 18+'rpx' : ''}" :class="platformClass">
-	    	{{navbarData.title ? navbarData.title : " "}}
-	  	</view>
-	  	<view class="navbar-icon" v-if="navbarData.showCapsule == 1 ? true : false" 
+	<view class='navbar-wrap' :style="{height:CustomBar+'px',paddingTop:StatusBar+'px',background:navbarData.bgColor ? navbarData.bgColor : '#FFFFFF'}"> 
+	  	<view class="navbar-text" 
+			  :style="{color:navbarData.textColor ? navbarData.textColor:'',lineHeight:(CustomBar - StatusBar)+'px;',fontSize:fontSizeSetting+'px;',paddingLeft:navbarData.textLeft ? '' : capsule.height+'px'}" :class="platformClass">
+	    	  {{navbarData.title ? navbarData.title : " "}}
+	  	</view>
+	  	<view class="navbar-icon" v-if="navbarData.showCapsule == 1 ? true : false" 
 			  :style="{top:capsule.top +'px;',left:((screenWidth-capsule.right)+5)+'px;',height:capsule.height+'px;',lineHeight:capsule.height+'px;'}">
-			  <text v-if="haveBack" @tap="BackPage" class="iconfont icon-fanhui"></text>
-			  <text v-else @tap="_goHome" class="iconfont icon-shouyeyong"></text>
-	  	</view>
+			  <text v-if="navbarData.haveBack" @tap="BackPage" class="iconfont icon-fanhui"></text>
+			  <text v-if="navbarData.haveHome" @tap="_goHome" class="iconfont icon-shouye"></text>
+	  	</view>
 		<view class="navbar-icon" v-if="navbarData.showSearch == 1 ? true : false"
 			  :style="{top:capsule.top+'px;',right:(capsule.width)+'px;',height:capsule.height+'px;',lineHeight:capsule.height+'px;'}">
 			  <text @click.stop="_goSearchPath" class="iconfont icon-iconfonticonfontsousuo1"></text>
-	  	</view>
+	  	</view>
 	</view>
 </template>
 
@@ -27,7 +28,6 @@
 		},
 		data() {
 			return{
-				haveBack: true,// 是否有返回按钮，true 有 false 没有 若从分享页进入则为 false
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				StatusBar: this.StatusBar,
 				fontSizeSetting:this.fontSizeSetting,
@@ -38,9 +38,9 @@
 		},
 		created() {
 			if (getCurrentPages().length === 1) { // 当只有一个页面时
-			      this.haveBack = false;
+			      this.navbarData.haveBack = false;
 			} else {
-			      this.haveBack = true;
+			      this.navbarData.haveBack = true;
 			}
 		},
 		onLoad(){
@@ -49,14 +49,14 @@
 		methods:{
 			BackPage: function () {
 				this.$emit('navigateBack')
-		    },
+		    },
 			_goSearchPath:function () {
 				this.$emit('goSearchPath')
 			},
 			_goHome:function(){
 				uni.switchTab({
-		        	url: '/pages/tabBar/home/home'
-		      	})
+		        	url: '/pages/tabBar/home/home'
+		      	})
 			}
 		},
 		onShow(){
@@ -111,25 +111,4 @@
 		 background: #fff;
 		 text-align: center;
 	}
-</style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+</style>

components/seller/user.vue

@@ -26,7 +26,7 @@
 				<view class="order-section">
 					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=1')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
-							<image src="../../static/temp/order1@3x.png" mode=""></image>
+							<image src="../../static/temp/order5@3x.png" mode=""></image>
 							<text 	v-if="beforeConfirmCount >0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 									:class="[beforeConfirmCount < 10 ? 'goleft':'']">
@@ -37,7 +37,7 @@
 					</view>
 					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=2')"  hover-class="common-hover" :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
-							<image src="../../static/temp/order2@3x.png" mode=""></image>
+							<image src="../../static/temp/order1@3x.png" mode=""></image>
 							<text  v-if="beforePayCount >0" 
 								   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
 								   :class="[beforePayCount < 10 ? 'goleft':'']">
@@ -48,7 +48,7 @@
 					</view>
 					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=3')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
-							<image src="../../static/temp/order3@3x.png" mode=""></image>
+							<image src="../../static/temp/order2@3x.png" mode=""></image>
 							<text   v-if="beforeShipCount >0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 									:class="[beforeShipCount < 10 ? 'goleft':'']">
@@ -59,7 +59,7 @@
 					</view>
 					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=4')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
-							<image src="../../static/temp/order4@3x.png" mode=""></image>
+							<image src="../../static/temp/order3@3x.png" mode=""></image>
 							<text 	v-if="shippedCount >0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 									:class="[shippedCount < 10 ? 'goleft':'']">
@@ -70,7 +70,7 @@
 					</view>
 					<view class="order-item" @click="navigator('/seller/pages/order/order-list?listType=5')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon tui-skeleton-fillet">
-							<image src="../../static/temp/order5@3x.png" mode=""></image>
+							<image src="../../static/temp/order4@3x.png" mode=""></image>
 							<text 	v-if="refundsCount >0"
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 									:class="[refundsCount < 10 ? 'goleft':'']">

pages/authorization/authorization.vue

@@ -27,6 +27,9 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '微信授权', // 导航栏 中间的标题
+					haveBack:true,
+					haveHome:false,
+					textLeft:this.$store.state.isIphone,
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				authorizeType:''

pages/goods/product.vue

@@ -193,7 +193,7 @@
 		data(){
 			return{			
 				html:'<div style="text-align: center;color:#333333;">暂无内容</div>',
-				tabNavList:[{name:'商品详情'},{name:'供应商细信息'},{name:'相关推荐'},{name:'评价'}],
+				tabNavList:[{name:'商品详情'},{name:'供应商信息'},{name:'相关推荐'},{name:'评价'}],
 				disabledTabNavList:[{name:'相关推荐'},{name:'评价'}],
 				mode:'round',
 				specClass: '',//规格弹窗css类，控制开关动画

pages/login/apply.vue

@@ -131,12 +131,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @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 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">
@@ -160,12 +162,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @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 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">
@@ -217,6 +221,8 @@ import { mapMutations } from 'vuex';
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '升级会员机构', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphone
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				errorList:[],
@@ -690,7 +696,7 @@ import { mapMutations } from 'vuex';
 						}
 						&.picker{
 							text-align: left;
-							color: #999999;
+							color: #333333;
 						}
 						&.keshi{
 							width: 550rpx;
@@ -824,6 +830,9 @@ import { mapMutations } from 'vuex';
 							border-radius: 10rpx;
 							line-height: 88rpx;
 							text-align: center;
+							&.other{
+								width: 213rpx;
+							}
 							&.none{
 								color: #FFFFFF;
 								background: $btn-confirm;
@@ -842,6 +851,7 @@ import { mapMutations } from 'vuex';
 						  text-align: center;
 						  box-sizing: border-box;
 						  border: 1rpx solid #EFEFEF;
+						  float: left;
 						  checkbox {
 							display: none;
 						  }

pages/login/bindOperator.vue

@@ -111,8 +111,8 @@
 			getWxAuthorize(){// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
 				authorize.getCode('weixin').then(wechatcode =>{
 					// 根据微信的code获取用户登录状态:1已登录过 -1未登录过
-					authorize.getUserInfo('weixin').then(res =>{
-						userInfoLogin({code:wechatcode}).then(response =>{
+					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')

pages/login/information.vue

@@ -134,12 +134,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @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 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">
@@ -163,12 +165,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @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 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">
@@ -245,10 +249,12 @@
 		},
 		data() {
 			return{
-				nvabarData: {		//顶部自定义导航
+				nvabarData: {//顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '修改资料', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphone
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isPreviewImage:false,   	//预览图片开关
@@ -691,7 +697,7 @@
 						}
 						&.picker{
 							text-align: left;
-							color: #999999;
+							color: #333333;
 						}
 						&.keshi{
 							width: 550rpx;
@@ -804,9 +810,10 @@
 						display: flex;
 						flex-flow: row wrap;
 						justify-content: space-between;
+						align-items: center;
 						&.btn{
 							margin: 0 auto;
-							margin-left: 126rpx;
+							margin-left: 116rpx;
 						}
 						.row-input{
 							display: flex;
@@ -824,6 +831,9 @@
 							border-radius: 10rpx;
 							line-height: 88rpx;
 							text-align: center;
+							&.other{
+								width: 213rpx;
+							}
 							&.none{
 								color: #FFFFFF;
 								background: $btn-confirm;
@@ -842,6 +852,7 @@
 						  text-align: center;
 						  box-sizing: border-box;
 						  border: 1rpx solid #EFEFEF;
+						  float: left;
 						  checkbox {
 							display: none;
 						  }

pages/login/login.vue

@@ -98,7 +98,7 @@
 		onShow() {
 			authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
 				if(wxResponse == 1){
-					wxLogin.wxLoginAuthorize()
+					wxLogin.wxLoginQuick()
 				}else{
 					this.$api.navigateTo('/pages/authorization/authorization?type=0')
 				}	

pages/login/register.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
+	<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" v-if="tabCurrentIndex === 1">
 			<view class="register-logo">
@@ -181,12 +181,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 1">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @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 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">
@@ -210,12 +212,14 @@
 			<view class="register-row clearfix" v-if="isOrganizationType == 2">
 				<view class="register-from group">
 					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @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 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">
@@ -255,10 +259,11 @@
 </template>
 
 <script>
-	import { mapMutations } from 'vuex';
+	import { mapState,mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
 	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/json/data.json.js' //本地数据
 	import authorize from '@/common/config/authorize.js' 
+	import wxLogin from "@/common/config/wxLogin.js"
 	import { organizationVerifyRegisterFirst,organizationRegister ,organizationLogin } from "@/api/use.js"
 	import { getImageCode, getRegisterMobileCode, uploadFileImage } from "@/api/utils.js"
 	export default{
@@ -267,13 +272,15 @@
 		},
 		data() {
 			return{
-				nvabarData: {		//顶部自定义导航
+				nvabarData: {//顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '注册', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphone
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
-				tabCurrentIndex:1,			//显示step
+				tabCurrentIndex:2,			//显示step
 				isPreviewImage:false,   	//预览图片开关
 				isMobileDisabled: false,	//手机验证码按钮控制
 			    mobilCount: '',				//倒计时
@@ -327,6 +334,9 @@
 		onLoad(option) {
 			this.getOption = JSON.stringify(option)
 		},
+		computed:{
+			...mapState(['isWxAuthorize'])
+		},
 		methods:{
 			...mapMutations(['login']),
 			hanldNavigateBack(){
@@ -620,6 +630,13 @@
 			}
 		},
 		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')
+				}	
+			})
 			if(this.isPreviewImage){
 				this.isPreviewImage = false
 				return
@@ -768,7 +785,7 @@
 						}
 						&.picker{
 							text-align: left;
-							color: #999999;
+							color: #333333;
 						}
 						&.keshi{
 							width: 550rpx;
@@ -970,6 +987,7 @@
 						  text-align: center;
 						  box-sizing: border-box;
 						  border: 1rpx solid #EFEFEF;
+						  float: left;
 						  checkbox {
 							display: none;
 						  }

pages/login/registers.vue

@@ -1,1173 +0,0 @@
-<template>
-	<view class="container register" :style="{paddingTop:CustomBar+'px'}">
-		<cu-custom :navbar-data='nvabarData'  @navigateBack="hanldNavigateBack"></cu-custom>
-		<view class="register-tab">
-			<view class="nav-item" :class="{ current: tabCurrentIndex === 1 }" >
-				  账户信息<view class="line"></view>
-			</view>					
-			<view class="nav-item" :class="{ current: tabCurrentIndex === 2 }" >
-				  基本信息<view class="line"></view>
-			</view>
-			<view class="nav-item" :class="{ current: tabCurrentIndex === 3 }" >
-				  详细信息
-			</view>
-		</view>
-		<view class="register-main clearfix" v-if="tabCurrentIndex === 1">
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">邮箱:</view>
-					<input class="row-input" type="text" name="input" v-model="registerEmail" placeholder="请输入您的常用邮箱" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from code">
-					<view class="label">邮箱验证码:</view>
-					<input class="row-input" type="text"  name="input" v-model="regEmailCode" placeholder="请输入邮箱验证码" maxlength="4"/>
-				</view>
-				<view class="register-from btn" :class="[isEmialDisabled ? 'disabled' : '']">
-					<button class="row-input"  
-							type="button"  
-							@click.stop="getEmailCodeFn"  
-							:disabled="isEmialDisabled">
-							{{ emailCodeText }}
-					</button>
-				</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-row clearfix">
-				<view class="register-btn"  @click="registerStepsfirst">下一步</view>
-			</view>
-			<view class="register-row">
-				<view class="register-text">
-					<text class="txt">注:</text>
-					<text>邮件可能存在1-2分钟的延迟，同时请留意垃圾箱邮件！</text>
-				</view>
-			</view>
-		</view>
-		<view class="register-main clearfix" v-if="tabCurrentIndex === 2">
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">机构名称:</view>
-					<input class="row-input" type="text" name="input" v-model="clubName" placeholder="请输入您的机构名称" maxlength="30"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">联系人:</view>
-					<input class="row-input" type="text" name="input" v-model="clubContact" 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="registerMobile" placeholder="请输入手机号" maxlength="11"/>
-				</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-from imgcode">
-					<view class="label">图形验证码:</view>
-					<input class="row-input" type="text" name="input" v-model="imageCode" placeholder="请输入图形验证码" maxlength="4"/>
-				</view>
-				<view class="register-from 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="register-row clearfix">
-				<view class="register-from code">
-					<view class="label">短信验证码:</view>
-					<input class="row-input" type="text" v-model="mobileCode" placeholder="请输入短信验证码" 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-btn"  @click="registerStepsTwo">下一步</view>
-			</view>
-			<view class="register-row clearfix">
-				<view class="register-btn none"  @click="steps(1)">上一步</view>
-			</view>
-		</view>
-		<view class="register-main detailed clearfix" v-if="tabCurrentIndex === 3">
-			<view class="register-tips"><text class="iconfont icon-gantanhao-yuankuang">详细信息请尽量填写，有利于快速审核通过</text></view>
-			<view class="register-row clearfix">
-				<view class="register-from">
-					<view class="label">机构简称:</view>
-					<input class="row-input" type="text" v-model="abbreviation" 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">{{addressData.addressDetail ? addressData.addressDetail :'详细地址：如道路、门牌号、小区等'}}</view>
-				<textarea 	v-else
-							class="textarea" 
-							type="text" 
-							v-model="addressData.addressDetail" 
-							placeholder="详细地址：如道路、门牌号、小区等" 
-							placeholder-class="placeholder"
-							maxlength="25"
-							@input="onTextareaInput"
-							:class="isShowInput ? '':''"
-				/>
-			</view>
-			<view class="register-row clearfix" >
-				<view class="register-from">
-					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
-				</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"><text class="iconfont icon-jiahao"></text></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"><text class="iconfont icon-jiahao"></text></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">
-					<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 clearfix" v-if="isOrganizationType == 1" >
-				<view class="register-from radio">
-					<radio-group @change="radioChange">
-						<label class="row-input" v-for="(item, index) in beautyList" :key="item.value">
-							<radio class="row-radio" :value="item.value" :checked="index === current" color="#E15616"/>
-							<view class="row-text">{{item.name}}</view>
-						</label>
-					</radio-group>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-show="isDepartment" >
-				<view class="register-from">
-					<view class="label">科室:</view>
-					<input class="row-input keshi" type="text" v-model="department" placeholder="请填写经营的科室，至少三个，用逗号隔开" maxlength="16"/>
-				</view>
-			</view>
-			<view class="register-row clearfix" v-if="isOrganizationType == 1">
-				<view class="register-picture">
-					<view class="label zz">医疗执业许可证:</view>
-					<view class="upload-picture">
-						<view class="upload-none" v-if="uploadMedicalImage === ''" @click="chooseMedicalImage"><text class="iconfont icon-jiahao"></text></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-if="isOrganizationType == 1">
-				<view class="register-from group">
-					<view class="label">主营内容:</view>
-					<checkbox-group class="content-class" @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 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 other" 
-								:class="[isDisabled === true ? 'disabled' : 'none']" 
-								:disabled="isDisabled"
-								@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>
-					<checkbox-group class="content-class" @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 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-fiexd 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="registerStepsSub">提交审核</view>
-				</view>
-				<view class="register-row clearfix">
-					<view class="register-btn none"  @click="steps(2)">上一步</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 authorize from '@/common/config/authorize.js' 
-	import { organizationRegister , organizationVerifyRegisterFirst ,organizationVerifyRegisterTwo } from "@/api/use.js"
-	import { getImageCode, getEmailCode, getMobileCode, uploadFileImage } from "@/api/utils.js"
-	export default{
-		components:{
-			mpvueCityPicker
-		},
-		data() {
-			return{
-				nvabarData: {		//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '注册', // 导航栏 中间的标题
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				tabCurrentIndex:1,			//显示step
-				isPreviewImage:false,   	//预览图片开关
-				isEmialDisabled: false,		//验证码按钮控制
-				isMobileDisabled: false,	//手机验证码按钮控制
-			    count: '',					//倒计时
-			    mobilCount: '',					//倒计时
-			    emailCodeText: '获取验证码',
-			    mobileCodeText: '获取验证码',
-			    codeTime: null,
-			    mobilTime: null,
-				registerEmail:'', 		//注册邮箱
-				regEmailCode:'',  		//邮箱验证码
-				password:'',			//密码
-				passwordCheck:'',		//校验密码
-				clubName:'',	 		//机构名称
-				abbreviation:'',	 	//机构简称
-				clubContact:'',	 		//联系人
-				registerMobile:'',		//联系人手机号
-				mobileCode:'',			//手机验证码
-				imageCode:'',			//图形验证码
-				imageCodeUrl:'',		//图形验证码图片
-				imageCodetoken:'',		//图形验证校验
-				socialCreditCode:'',	//统一社会信用代码
-				isAgreed:0,				//是否勾选协议
-				isDisabled:true,
-				isShowInput:false,
-				isCheck:false,			//是否勾选协议
-				uploadBusinessImage:'',	//营业执照图片
-				uploadMentuzImage:'',  	//门头照图片
-				uploadMedicalImage:'', 	//资质照图片
-				department:'',			//科室
-				isDepartment:false,     //是否显示科室
-				secondClubType:'',		//机构类型二级分类
-				mainpro:'',				//主营内容
-				isOrganizationType:0,
-				organizationTypeText:'请选择机构类型',
-				beautyList:[{value:'1',name:'诊所'},{value:'2',name:'门诊'},{value:'3',name:'医院'}],
-				mentuzCampList:[{value:'1',name:'整形'},{value:'2',name:'轻医美'},{value:'3',name:'皮肤科'}],
-				medicaCampList:[
-					{value:'1',name:'美容'},
-					{value:'2',name:'美体'},
-					{value:'3',name:'美发'},
-					{value:'4',name:'皮肤管理'},
-					{value:'5',name:'光电'},
-					{value:'6',name:'综合类'},
-					{value:'7',name:'中医养生'},
-					{value:'8',name:'spa'}
-				],
-				typtIndex:0,
-				organizationType:3,
-				current:0,
-				isShowAustomItem:false, //是否显示其他添加
-				customItemValue:'', 	//自定义项目
-				addressData:{
-					address:'请选择机构所在地区',
-					townID:'',			//区ID
-					cityID:'',			//区ID
-					provinceID:'',		//区ID
-					addressDetail: '',	//地址
-				},
-			}
-		},
-		onLoad(option) {
-		},
-		methods:{
-			hanldNavigateBack(){
-				this.$util.modal('','注册尚未完成，确定放弃注册吗？','确定','取消',true,() =>{
-					uni.navigateBack({
-						delta: 1
-					});
-				})
-			},
-			registerStepsfirst(){
-				let params ={
-						email:this.registerEmail,
-						mailboxCode:this.regEmailCode,
-						password:this.password,
-						passWordConfirm:this.passwordCheck,
-						whichStep:1,
-				}
-				organizationVerifyRegisterFirst(params).then(res =>{
-					this.tabCurrentIndex = 2
-					this.getVerificationCode()
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			registerStepsTwo(){
-				let params ={
-						name:this.clubName,
-						linkMan1:this.clubContact,
-						bindMobile:this.registerMobile,
-						activationCode:this.mobileCode,
-						whichStep:2,
-				}
-				organizationVerifyRegisterTwo(params).then(res =>{
-					this.tabCurrentIndex = 3
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			registerStepsSub(){
-				if(!this.isCheck){
-					this.$util.msg('请勾选同意协议',2000);
-					return
-				}
-				let params ={
-						email:this.registerEmail,
-						mailboxCode:this.regEmailCode,
-						password:this.password,
-						passWordConfirm:this.passwordCheck,
-						name:this.clubName,
-						linkMan1:this.clubContact,
-						bindMobile:this.registerMobile,
-						activationCode:this.mobileCode,
-						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, //机构类型分类 医美:0和生美:1
-						secondClubType:this.secondClubType,	//机构类型二级分类 诊所:1,门诊:2,医院:3
-						department:this.department,			//科室
-						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
-						isAgreed:this.isAgreed,				//是否勾选协议	
-						mainpro:this.mainpro,
-						whichStep:3
-				}
-				organizationRegister(params).then(res =>{
-					this.$util.msg('您的机构账号已提交审核',2000);
-					setTimeout(()=>{
-						this.$api.switchTabTo('/pages/tabBar/home/home')
-					},2000)
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			getEmailCodeFn(){
-				if( this.registerEmail == ''){
-					this.$util.msg('请输入邮箱地址',2000);
-					return
-				}
-				if(!this.$reg.isEmail(this.registerEmail)){
-					this.$util.msg('请输入正确的邮箱地址',2000);
-					return
-				}
-				this.isEmialDisabled = true;
-				getEmailCode({email:this.registerEmail,status:2}).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 {
-				         		clearInterval(this.codeTime)
-				         		this.codeTime = null
-								this.emailCodeText = '获取验证码'
-								this.isEmialDisabled = false;
-			        		}
-			       		},1000)
-			      	}
-				}).catch( error =>{
-					this.$util.msg(error.msg,2000);
-					this.isEmialDisabled = false;
-				})
-			},
-			getMobileCodeFn(){
-				if( this.registerMobile == ''){
-					this.$util.msg('请输入手机号',2000);
-					return
-				}
-				if(!this.$reg.isMobile(this.registerMobile)){
-					this.$util.msg('请输入正确的手机号',2000);
-					return
-				}
-				if( this.imageCode == ''){
-					this.$util.msg('请输入图形验证码',2000);
-					return
-				}
-				let params = {
-						mobile:this.registerMobile,
-						activateCodeType:2,
-						platformType:2,
-						imgCode:this.imageCode,
-						token:this.imageCodetoken,
-					}
-				this.isMobileDisabled = true;
-				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;
-				})
-			},
-			getVerificationCode(){//获取图形验证
-				getImageCode().then(res => {
-					this.imageCodeUrl = res.data.baseImage
-					this.imageCodetoken = res.data.token
-				})
-			},
-			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;
-			},
-			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() {//机构类型选择
-				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(e) {
-				this.secondClubType = e.target.value;
-				if( this.secondClubType == '2' || this.secondClubType == '3'){
-					this.isDepartment = true
-				}else{
-					this.isDepartment = false
-				}
-				for (let i = 0; i < this.beautyList.length; i++) {
-					if (this.beautyList[i].value === this.secondClubType) {
-						this.current = i;
-						break;
-					}
-				}
-			},
-			chooseMaleLike(e){
-				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-			},
-			chooseMaleLikes(e){
-				this.mainpro = this.checkLikes(e,this.medicaCampList)
-			},
-			checkLikes(e,list){
-				let items = list
-				let	values = e.detail.value
-				let arr = []
-				for (let i = 0, lenI = items.length; i < lenI; ++i) {
-					const item = items[i]
-					if(values.indexOf(item.value) >= 0){
-						this.$set(item,'checked',true)
-						arr.push(item.name)
-					}else{
-						this.$set(item,'checked',false)
-					}
-				}
-				return arr.join('/')
-			},
-			agreeCheck() {
-				this.isCheck = !this.isCheck
-				if(this.isCheck){
-					this.isAgreed = 1
-				}else{
-					this.isAgreed = 0
-				}
-			},
-			onBlurInput(e){//
-				if(e.detail.value ===''){
-					this.isDisabled = true
-				}else{
-					this.isDisabled = false
-				}
-			},
-			showAustomItem() {
-				this.isShowAustomItem = !this.isShowAustomItem
-			},
-			addCustomItem(){
-				if(this.isOrganizationType == 1){
-					let item = {value:`${this.mentuzCampList.length+1}`,name:this.customItemValue}
-					this.mentuzCampList.push(item)
-				}else{
-					let item = {value:`${this.medicaCampList.length+1}`,name:this.customItemValue}
-					this.medicaCampList.push(item)
-				}
-			},
-			steps(index) {//$attrstab切换
-				this.tabCurrentIndex = index;
-			}
-		},
-		onShow() {
-			if(this.isPreviewImage){
-				this.isPreviewImage = false
-				return
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.register{
-		width: 100%;
-		height: auto;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
-		}
-		.register-tab{
-			width: 570rpx;
-			height: 60rpx;
-			padding: 60rpx 90rpx;
-			position: relative;
-			.nav-item{
-				width: 142rpx;
-				background: #FFFFFF;
-				line-height: 60rpx;
-				border-radius: 30rpx;
-				text-align: center;
-				color: #999999;
-				font-size:$font-size-26;
-				float: left;
-				margin-right: 72rpx;
-				position: relative;
-				.line{
-					height: 3rpx;
-					width: 50rpx;
-					background: #999999;
-					position: absolute;
-					right: -58rpx;
-					top: 32rpx;
-				}
-				&:last-child{
-					margin-right: 0;
-				}
-				&.current{
-					color:#FFFFFF;
-					background: $btn-confirm;
-					
-				}
-			}
-		}
-		.register-main{
-			width: 100%;
-			height: auto;
-			&.detailed{
-				padding-bottom: 330rpx;
-			}
-			.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;
-				.register-text{
-					line-height: 44rpx;
-					margin-top: 100rpx;
-					font-size: $font-size-24;
-					color: #999999;
-					text-align: justify;
-					.txt{
-						margin-right: 15rpx;
-					}
-				}
-				.register-from{
-					width: 654rpx;
-					height: 40rpx;
-					padding: 24rpx;
-					background: $sub-bg-color;
-					border-radius: 14rpx;
-					position: relative;
-					.label{
-						text-align: left;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-					}
-					.row-input{
-						width: 440rpx;
-						padding-left:10rpx;
-						font-size: $font-size-28;
-						color: $text-color;
-						line-height: 40rpx;
-						float: left;
-						height: 40rpx;
-						&.none{
-							color: #999999;
-						}
-						&.picker{
-							text-align: left;
-							color: #999999;
-						}
-						&.keshi{
-							width: 550rpx;
-						}
-					}
-					&.img-btn{
-						width: 220rpx;
-						height: 88rpx;
-						padding: 0;
-						float: left;
-						background: #FFFFFF;
-						display: block;
-						.vscodeimg{
-							width: 150rpx;
-							height: 88rpx;
-							float: left;
-							display: flex;
-							flex-direction: column;
-							align-items: center;
-							border-radius: 14rpx;
-							image{
-								width: 150rpx;
-								height: 88rpx;
-								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;
-						}
-					}
-					&.code{
-						width: 410rpx;
-						float: left;
-						margin-right: 20rpx;
-						.row-input{
-							width: 230rpx;
-						}
-					}
-					&.btn{
-						width: 224rpx;
-						height: 88rpx;
-						float: left;
-						background: $btn-confirm;
-						padding: 0;
-						.row-input{
-							width: 224rpx;
-							height: 88rpx;
-							line-height: 88rpx;
-							padding: 0;
-							color: #FFFFFF;
-							background: $btn-confirm;
-							text-align: center;
-							border-radius: 14rpx;
-							&.other{
-								width: 224rpx;
-								background: #F7F7F7;
-								margin-right: 20rpx;
-							}
-							&.none{
-								background: #F7F7F7;
-							}
-						}
-						&.disabled{
-							background: #F7F7F7;
-							.row-input{
-								background: #F7F7F7;
-								color: #999999;
-							}
-						}
-					}
-					&.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: 126rpx;
-						}
-						.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;
-						  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;
-				}
-				&.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: 40rpx 0 0 0;
-				.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-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: 702rpx;
-				height: 88rpx;
-				border-radius: 14rpx;
-				font-size: $font-size-28;
-				line-height: 88rpx;
-				color: #FFFFFF;
-				margin: 0 auto;
-				text-align: center;
-				background: $btn-confirm;
-				margin-top: 96rpx;
-				&.none{
-					background: #FFFFFF;
-					color: $text-color;
-					margin-top: 0;
-				}
-				&.sub{
-					margin-top: 0;
-				}
-			}
-		}
-	}
-</style>

pages/tabBar/user/user.vue

@@ -27,7 +27,7 @@
 				<view class="order-section">
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=1')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon">
-							<image src="../../../static/temp/order1@3x.png" mode=""></image>
+							<image src="../../../static/temp/order5@3x.png" mode=""></image>
 							<text 	v-if="confirmedCount>0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 									:class="[confirmedCount < 10 ? 'goleft':'']">
@@ -38,7 +38,7 @@
 					</view>
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=2')"  hover-class="common-hover" :hover-stay-time="50">
 						<view class="order-icon">
-							<image src="../../../static/temp/order2@3x.png" mode=""></image>
+							<image src="../../../static/temp/order1@3x.png" mode=""></image>
 							<text  v-if="paymentCount >0" 
 								   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
 								   :class="[paymentCount < 10 ? 'goleft':'']">
@@ -49,7 +49,7 @@
 					</view>
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=3')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon">
-							<image src="../../../static/temp/order3@3x.png" mode=""></image>
+							<image src="../../../static/temp/order2@3x.png" mode=""></image>
 							<text   v-if="waitShipmentsCount >0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 									:class="[waitShipmentsCount < 10 ? 'goleft':'']">
@@ -60,7 +60,7 @@
 					</view>
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=4')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon">
-							<image src="../../../static/temp/order4@3x.png" mode=""></image>
+							<image src="../../../static/temp/order3@3x.png" mode=""></image>
 							<text 	v-if="shipmentsCount>0" 
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 									:class="[shipmentsCount < 10 ? 'goleft':'']">
@@ -71,7 +71,7 @@
 					</view>
 					<view class="order-item" @click="navigator('/pages/user/order/order-list?state=5')" hover-class="common-hover"  :hover-stay-time="50">
 						<view class="order-icon">
-							<image src="../../../static/temp/order5@3x.png" mode=""></image>
+							<image src="../../../static/temp/order4@3x.png" mode=""></image>
 							<text 	v-if="salesReturnCount >0"
 									class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
 									:class="[salesReturnCount < 10 ? 'goleft':'']">

seller/pages/index/index.vue

@@ -52,6 +52,8 @@
 					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '账户中心',  // 导航栏 中间的标题
+					haveBack:false,
+					textLeft:this.$store.state.isIphone
 				},
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度

seller/pages/login/apply.vue

@@ -277,6 +277,8 @@ import { mapMutations } from 'vuex';
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '修改资料', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphone
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				errorList:[],

seller/pages/login/information.vue

@@ -257,6 +257,8 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '修改资料', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphone
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				isPreviewImage:false,   //预览图片开关

seller/pages/login/login.vue

@@ -38,7 +38,8 @@
 					showCapsule: 0, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '登录',  // 导航栏 中间的标题
-					textLeft:true
+					haveBack:false,
+					textLeft:this.$store.state.isIphone
 				},
 				isIphoneX:this.$store.state.isIphoneX,
 				CustomBar:this.CustomBar,// 顶部导航栏高度

seller/pages/login/register.vue

@@ -246,6 +246,8 @@
 					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
 					showSearch: 0,
 					title: '拉机构上线', // 导航栏 中间的标题
+					haveBack:true,
+					textLeft:this.$store.state.isIphone
 				},
 				CustomBar:this.CustomBar,// 顶部导航栏高度
 				userID:'',//协销ID

store/index.js

@@ -70,13 +70,20 @@ const store = new Vuex.Store({
 		setChangeVar(state,variable){
 			//获取设备信息是否为IphoneX
 			state.isIphoneX = variable;
+		},
+		setIsIphone(state,variable){
+			//获取设备信息是否为IphoneX
+			state.isIphone = variable;
 		}
 	},
 	actions:{
 		setVariableFun:function(context,vData){
 			context.commit('setChangeVar',vData)
 		},
+		setIsIphoneFun:function(context,vData){
+			context.commit('setIsIphone',vData)
+		},
 	}
 })
 
-export default store
+export default store