commit -m

pages.json

@@ -4,51 +4,46 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "维沙采购商城",
-				"enablePullDownRefresh" : true,
-				"navigationStyle":"custom"
+				"enablePullDownRefresh": true
 			}
-		},{
+		}, {
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
-		},{
+		}, {
 			"path": "pages/authorization/authorization",
 			"style": {
 				"navigationBarTitleText": "微信授权",
-				"navigationStyle":"custom"
+				"navigationStyle": "custom"
 			}
-		},{
-		    "path" : "pages/tabBar/category/index",
-		    "style" : {
+		}, {
+			"path": "pages/tabBar/category/index",
+			"style": {
 				"navigationBarTitleText": "分类",
-				"navigationStyle":"custom"
+				"navigationStyle": "custom"
 			}
-		},{
+		}, {
 			"path": "pages/tabBar/cart/cart",
 			"style": {
 				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh":true
+				"enablePullDownRefresh": true
 			}
 		}
-    ],
-	"subPackages": [
-		{
-			"root": "pages/goods/",//商品模块
-			"pages": [
-				{
-					"path": "product",
-					"style": {
-						"navigationBarTitleText": "商品详情",
-						"navigationStyle":"custom"
-					}
+	],
+	"subPackages": [{
+			"root": "pages/goods/", //商品模块
+			"pages": [{
+				"path": "product",
+				"style": {
+					"navigationBarTitleText": "商品详情",
+					"navigationStyle": "custom"
 				}
-			]
+			}]
 		},
 		{
-			"root": "pages/user/",//机构个人中心模块
-			"pages": [
-				{
+			"root": "pages/user/", //机构个人中心模块
+			"pages": [{
 					"path": "cart/cart",
 					"style": {
 						"navigationBarTitleText": "购物车"
@@ -81,28 +76,28 @@
 				{
 					"path": "order/create-order",
 					"style": {
-						"navigationBarTitleText": "确认订单"			
+						"navigationBarTitleText": "确认订单"
 					}
 				},
 				{
 					"path": "order/success",
 					"style": {
 						"navigationBarTitleText": "支付结果",
-						"navigationStyle":"custom"
+						"navigationStyle": "custom"
 					}
 				},
 				{
 					"path": "order/order-payment",
 					"style": {
 						"navigationBarTitleText": "选择支付方式",
-						"navigationStyle":"custom"
+						"navigationStyle": "custom"
 					}
 				},
 				{
 					"path": "order/order-pay",
 					"style": {
 						"navigationBarTitleText": "收银台",
-						"navigationStyle":"custom"
+						"navigationStyle": "custom"
 					}
 				},
 				{
@@ -115,14 +110,14 @@
 					"path": "order/order-list",
 					"style": {
 						"navigationBarTitleText": "我的订单",
-						"navigationStyle":"custom"
+						"navigationStyle": "custom"
 					}
 				},
 				{
 					"path": "order/order-details",
 					"style": {
 						"navigationBarTitleText": "订单详情",
-						"navigationStyle":"custom"
+						"navigationStyle": "custom"
 					}
 				},
 				{
@@ -143,28 +138,27 @@
 						"navigationBarTitleText": "条款内容"
 					}
 				}
-			]	
+			]
 		}
 	],
 	"tabBar": {
-		"height":"80",
+		"height": "80",
 		"color": "#999999",
 		"selectedColor": "#E15616",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
-		"list": [
-				{
-					"pagePath": "pages/tabBar/category/index",
-					"iconPath": "static/icon-home@3x.png",
-					"selectedIconPath": "static/icon-home-active@3x.png",
-					"text": "商城"
-				},
-				{
-					"pagePath": "pages/tabBar/cart/cart",
-					"iconPath": "static/icon-cart@3x.png",
-					"selectedIconPath": "static/icon-cart-active@3x.png",
-					"text": "购物车"
-				}
+		"list": [{
+				"pagePath": "pages/tabBar/category/index",
+				"iconPath": "static/icon-home@3x.png",
+				"selectedIconPath": "static/icon-home-active@3x.png",
+				"text": "商城"
+			},
+			{
+				"pagePath": "pages/tabBar/cart/cart",
+				"iconPath": "static/icon-cart@3x.png",
+				"selectedIconPath": "static/icon-cart-active@3x.png",
+				"text": "购物车"
+			}
 		]
 	},
 	"easycom": {
@@ -179,14 +173,12 @@
 		"navigationBarBackgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF"
 	},
-	"condition" : { //模式配置，仅开发期间生效
+	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
 }

pages/index/index.vue

@@ -1,654 +1,262 @@
 <template>
-	<view class="container user clearfix">
-		<cm-custom :navbar-data='nvabarData' v-if="isCmcustom"></cm-custom>
-		<view class="user-section">
-			<view class="header" :style="{height:(CustomBar+90)-StatusBar+'px',paddingTop:CustomBar+'px',background:'url('+ bgImgUrl +')',backgroundSize:'cover'}">
-				<view class="header-main" v-if="hasLogin">
-					<view class="header-icon"><image :src="headpic == null? 'https://static.caimei365.com/app/img/icon/icon-club@3x.png' : headpic" mode=""></image></view>
-					<view class="header-text">
-						<view class="user-item">
-							<text class="u-h1">{{name}}</text>
-							<text class="u-viptips" v-if="userIdentity == 2">{{userType}}</text>
-							<text class="u-tips" v-if="userIdentity == 4">{{userType}}</text>
-						</view>
-						<view class="user-item amount"><text class="u-p">账户余额：{{userMoney}}元</text></view>
-					</view>
-				</view>
-				<view class="header-main-none" v-else>
-					<view class="header-icon" @click="navigator('/pages/login/login')">
-						<image src="https://static.caimei365.com/app/img/icon/icon-club@3x.png" mode=""></image>
-					</view>
-					<view class="header-text">
-						<view class="user-item">
-							<text class="u-h1" @click="navigator('/pages/login/login')">账号登录</text><text class="u-h1 line">|</text>
-							<text class="u-h1" @click="navigatorNex('/pages/login/register-select')">立即注册</text>
-							<!-- <text class="u-h1" @click="navigatorNex('/pages/login/register','2')">立即注册</text> -->
-						</view>
-						<view class="user-item">
-							<text class="u-p" @click="navigator('/pages/login/login')">登录商城了解更多产品信息吧！</text>
-						</view>
-						<view class="user-item" @click="navigatorNex('/pages/login/logincode','3')">
-							<view class="u-btn"><text>邀请码登录</text><text class="iconfont icon-xiangyouhuabeifen"></text></view>
-						</view>
-					</view>
-				</view>
-				<!-- 订单 -->
-				<view class="user-order">
-					<view class="tab-title" @click="navigator('/pages/user/order/order-list?state=0')">
-						<text class="cell-tit">我的订单</text>
-						<text class="cell-more">全部订单</text>
-						<text class="iconfont icon-xiayibu"></text>
-					</view>
-					<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="https://static.caimei365.com/app/img/icon/order5@3x.png" mode=""></image>
-								<text 	v-if="confirmedCount>0 && hasLogin" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[confirmedCount < 10 ? 'goleft':'']">
-										{{confirmedCount >= 99? '99+' : confirmedCount}}
-								</text>
-							</view>
-							<text class="order-t">待确认</text>
-						</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="https://static.caimei365.com/app/img/icon/order1@3x.png" mode=""></image>
-								<text  v-if="paymentCount >0 && hasLogin" 
-									   class="uni-badge uni-badge-error uni-small uni-badge--small icon-num " 
-									   :class="[paymentCount < 10 ? 'goleft':'']">
-									   {{paymentCount >= 99? '99+' : paymentCount}}
-								</text>
-							</view>
-							<text class="order-t">待付款</text>
-						</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="https://static.caimei365.com/app/img/icon/order2@3x.png" mode=""></image>
-								<text   v-if="waitShipmentsCount >0 && hasLogin" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[waitShipmentsCount < 10 ? 'goleft':'']">
-										{{waitShipmentsCount >= 99? '99+' : waitShipmentsCount}}
-								</text>
-							</view>
-							<text class="order-t">待发货</text>
-						</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="https://static.caimei365.com/app/img/icon/order3@3x.png" mode=""></image>
-								<text 	v-if="shipmentsCount>0 && hasLogin" 
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[shipmentsCount < 10 ? 'goleft':'']">
-										{{shipmentsCount >= 99? '99+' : shipmentsCount}}
-								</text>
-							</view>
-							<text class="order-t">已发货</text>
-						</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="https://static.caimei365.com/app/img/icon/order4@3x.png" mode=""></image>
-								<text 	v-if="salesReturnCount >0 && hasLogin"
-										class="uni-badge uni-badge-error uni-small uni-badge--small icon-num" 
-										:class="[salesReturnCount < 10 ? 'goleft':'']">
-										{{salesReturnCount >= 99? '99+' : salesReturnCount}}
-								</text>
-							</view>
-							<text class="order-t">退货/款</text>
-						</view>
-					</view>
-				</view>
+	<view class="container">
+		<!-- 机构信息区域 -->
+		<view class="ws-header">
+			<!-- 用户信息 -->
+			<view class="user-info">
+				<image src="@/static/ws/logo.png" mode="widthFix"></image>
+				<view class="ws-login">请登录</view>
 			</view>
-			<!-- 底部跳转 -->
-			<view class="foot-list">
-				<view class="list-cell-item">
-					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
-						<text class="cell-icon"><text class="iconfont" :class="item.icon"></text></text>
-						<text class="cell-tit">{{item.name}}</text>
-						<text class="cell-more iconfont icon-xiayibu"></text>
-					</view>
-				</view>
-			</view>
-		</view>	
-		<upgrade-alert v-if="isUpgradeAlert" :clubStatus="clubStatus" @unBindUpgrade="hanldUnBindUpgrade" @GoApply="hanldGoApply"></upgrade-alert>
+			<!-- 背景图 -->
+			<image class="user-bg" src="@/static/ws/user_bg.png" mode="widthFix"></image
+		></view>
 	</view>
 </template>
+
 <script>
-	import uniBadge from '@/components/uni-badge/uni-badge.vue'
-	import upgradeAlert from '@/components/cm-module/modelAlert/upgradeAlert.vue'
-	import authorize from '@/common/config/authorize.js'
-	import { mapState,mapMutations } from 'vuex'
-	import { cancelPrompt } from "@/services/use.js"
-	
-	
-	export default{
-		components: {
-			uniBadge,
-			upgradeAlert
-		},
-		data() {
-			return{	
-				nvabarData: {//顶部自定义导航
-					showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
-					showSearch: 0,
-					title: '我的', // 导航栏 中间的标题
-					haveBack:false,
-					textLeft:this.$store.state.isIphone,
-					textColor:'#FFFFFF',
-					bgColor:''
-				},
-				CustomBar:this.CustomBar,// 顶部导航栏高度
-				StatusBar: this.StatusBar,
-				isCmcustom:false,
-				isUpgradeAlert:false,
-				bgImgUrl:'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z_i6ASHobAAhl69yz3SM078.png',
-				name:'',
-				userType:"",
-				headpic:'',
-				userMoney:'0.00',
-				contactNumber:'',
-				openid:'',
-				aboutHtml:'',
-				telPhone:'',
-				bindMobile:'',
-				clubStatus:'',	//机构升级会员机构审核状态1:待审核  91:审核失败
-				userIdentity:'', //机构等级
-				confirmedCount:0,//待确认
-				paymentCount:0, //待付款角标
-				waitShipmentsCount:0, //待收货角标
-				shipmentsCount:0,  //已发货角标
-				salesReturnCount:'',//退货/款角标
-				firstList:[
-					{name:'帮机构下单',path:'/pages/user/club/club-list',icon:'icon-yunyingrenyuanguanli'}
-				]
-			}
-		},
-		onLoad(){
-			
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo'])
-		},
-		methods:{
-			getUserInfo(){
-				let self = this;
-				this.UserService.PersonalInfo({userID:this.userID}).then(response =>{
-					this.$store.commit('updateAllNum',response.data.count)
-					let data =response.data
+import uniBadge from '@/components/uni-badge/uni-badge.vue'
+import upgradeAlert from '@/components/cm-module/modelAlert/upgradeAlert.vue'
+import authorize from '@/common/config/authorize.js'
+import { mapState, mapMutations } from 'vuex'
+import { cancelPrompt } from '@/services/use.js'
+
+export default {
+	components: {
+		uniBadge,
+		upgradeAlert
+	},
+	data() {
+		return {
+			nvabarData: {
+				//顶部自定义导航
+				showCapsule: 1, // 是否显示左上角图标  1表示显示  0表示不显示,
+				showSearch: 0,
+				title: '我的', // 导航栏 中间的标题
+				haveBack: false,
+				textLeft: this.$store.state.isIphone,
+				textColor: '#FFFFFF',
+				bgColor: ''
+			},
+			CustomBar: this.CustomBar, // 顶部导航栏高度
+			StatusBar: this.StatusBar,
+			isCmcustom: false,
+			isUpgradeAlert: false,
+			bgImgUrl: 'https://img.caimei365.com/group1/M00/03/B0/Cmis217Z_i6ASHobAAhl69yz3SM078.png',
+			name: '',
+			userType: '',
+			headpic: '',
+			userMoney: '0.00',
+			contactNumber: '',
+			openid: '',
+			aboutHtml: '',
+			telPhone: '',
+			bindMobile: '',
+			clubStatus: '', //机构升级会员机构审核状态1:待审核  91:审核失败
+			userIdentity: '', //机构等级
+			confirmedCount: 0, //待确认
+			paymentCount: 0, //待付款角标
+			waitShipmentsCount: 0, //待收货角标
+			shipmentsCount: 0, //已发货角标
+			salesReturnCount: '', //退货/款角标
+			firstList: [{ name: '帮机构下单', path: '/pages/user/club/club-list', icon: 'icon-yunyingrenyuanguanli' }]
+		}
+	},
+	onLoad() {},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		getUserInfo() {
+			let self = this
+			this.UserService.PersonalInfo({ userID: this.userID })
+				.then(response => {
+					this.$store.commit('updateAllNum', response.data.count)
+					let data = response.data
 					let $userData = data.user
 					let $clubData = data.club
-					if($userData.ableUserMoney == 0 || $userData.ableUserMoney ==null){
-						this.userMoney = '0.00';
-					}else{
-						let i =  $userData.ableUserMoney.toString().lastIndexOf('.');
-						let money;
-						if(i==-1){
-							money = this.$api.FormatMoney($userData.ableUserMoney); //会所剩余余额
-							this.userMoney = money +'.00'
-						}else{
-							money = this.$api.FormatMoney($userData.ableUserMoney); //会所剩余余额
+					if ($userData.ableUserMoney == 0 || $userData.ableUserMoney == null) {
+						this.userMoney = '0.00'
+					} else {
+						let i = $userData.ableUserMoney.toString().lastIndexOf('.')
+						let money
+						if (i == -1) {
+							money = this.$api.FormatMoney($userData.ableUserMoney) //会所剩余余额
+							this.userMoney = money + '.00'
+						} else {
+							money = this.$api.FormatMoney($userData.ableUserMoney) //会所剩余余额
 							this.userMoney = money
 						}
 					}
 					this.userIdentity = $userData.userIdentity //机构等级
-					if(this.userIdentity == 2){
+					if (this.userIdentity == 2) {
 						this.name = $clubData.name //会员机构名称
 						this.userType = '会员机构'
-					}else{
+					} else {
 						this.name = $userData.userName //普通机构名称
 						this.userType = '普通机构'
 					}
 					this.headpic = $userData.image //会所头像
-					this.bindMobile = $userData.bindMobile//登录手机号
+					this.bindMobile = $userData.bindMobile //登录手机号
 					this.clubStatus = $userData.clubStatus //机构审核状态
-					this.contactNumber = data.organize.contactNumber //联系电话		
-					this.confirmedCount = this.showBadge(data.confirmedCount)//待确认
-					this.paymentCount = this.showBadge(data.paymentCount)//待付款
-					this.waitShipmentsCount = this.showBadge(data.waitShipmentsCount)//待收货		
-					this.shipmentsCount = this.showBadge(data.shipmentsCount)//已发货	
-					this.salesReturnCount = this.showBadge(data.salesReturnCount)//退货/款	
-					let clubInfo ={name:this.name,image:this.headpic,clubID:$clubData.clubID}
-					if($userData.tipStatus == '0'){
+					this.contactNumber = data.organize.contactNumber //联系电话
+					this.confirmedCount = this.showBadge(data.confirmedCount) //待确认
+					this.paymentCount = this.showBadge(data.paymentCount) //待付款
+					this.waitShipmentsCount = this.showBadge(data.waitShipmentsCount) //待收货
+					this.shipmentsCount = this.showBadge(data.shipmentsCount) //已发货
+					this.salesReturnCount = this.showBadge(data.salesReturnCount) //退货/款
+					let clubInfo = { name: this.name, image: this.headpic, clubID: $clubData.clubID }
+					if ($userData.tipStatus == '0') {
 						this.isUpgradeAlert = true
 					}
-					uni.setStorage({key: 'clubInfo',data: clubInfo}) 
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
+					uni.setStorage({ key: 'clubInfo', data: clubInfo })
 				})
-			},
-			getPhone(){
-				this.CommonService.QueryAfterSale().then(response =>{
-					this.contactNumber = response.data.contactNumber
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			toPhone(){
-				uni.makePhoneCall({
-				    phoneNumber:this.contactNumber //仅为示例
-				});
-			},
-			hanldUnBindUpgrade(){//普通用户不升级会员机构
-				cancelPrompt({ userId:this.userID}).then(response =>{
-					this.isUpgradeAlert = false
+		},
+		getPhone() {
+			this.CommonService.QueryAfterSale()
+				.then(response => {
+					this.contactNumber = response.data.contactNumber
 				})
-			},
-			hanldGoApply(){
-				cancelPrompt({ userId:this.userID}).then(response =>{
-					this.isUpgradeAlert = false
-					this.$api.navigateTo(`/pages/login/apply?clubStatus=${this.clubStatus}`);
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			navigator(url){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						if(this.hasLogin){
-							this.$api.navigateTo(url)
-						}else{
-							this.$api.navigateTo('/pages/login/login?type=0')
-						}
-					}else{
-						this.$api.navigateTo('/pages/authorization/authorization?type=1')
-					}
-				})	
-			},	
-			navigatorNex(url,type){
-				authorize.getSetting().then(wxResponse =>{// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
-					if(wxResponse == 1){
-						if(!this.hasLogin){
-							this.$api.navigateTo(url)
-						}
-					}else{
-						this.$api.navigateTo(`/pages/authorization/authorization?type=${type}`)
+		},
+		toPhone() {
+			uni.makePhoneCall({
+				phoneNumber: this.contactNumber //仅为示例
+			})
+		},
+		hanldUnBindUpgrade() {
+			//普通用户不升级会员机构
+			cancelPrompt({ userId: this.userID }).then(response => {
+				this.isUpgradeAlert = false
+			})
+		},
+		hanldGoApply() {
+			cancelPrompt({ userId: this.userID }).then(response => {
+				this.isUpgradeAlert = false
+				this.$api.navigateTo(`/pages/login/apply?clubStatus=${this.clubStatus}`)
+			})
+		},
+		navigator(url) {
+			authorize.getSetting().then(wxResponse => {
+				// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+				if (wxResponse == 1) {
+					if (this.hasLogin) {
+						this.$api.navigateTo(url)
+					} else {
+						this.$api.navigateTo('/pages/login/login?type=0')
 					}
-				})	
-			},		
-			showBadge(n){
-				let num ='';
-				if(n>100){num = 99}else{num = n;}
-				return num;
-			},	
-			clubStatusText(state){
-				let stateText;
-				switch(state){
-					case 90:
-						 stateText = ''
-						 break;
-					case 1:
-						 stateText = '正在审核中'
-						 break;
-					case 92:
-						 stateText = '审核不通过'
-						 break;
+				} else {
+					this.$api.navigateTo('/pages/authorization/authorization?type=1')
 				}
-				return stateText
-			}
+			})
 		},
-		onPageScroll(e){//实时获取到滚动的值
-			if(e.scrollTop>20){
-				this.isCmcustom = true
-				this.nvabarData.bgColor = '#E37A4B'
-				this.nvabarData.textColor = '#FFFFFF'
-			}else{
-				this.isCmcustom = false
-				this.nvabarData.bgColor = ''
-				this.nvabarData.textColor = '#FFFFFF'
-			}	
+		navigatorNex(url, type) {
+			authorize.getSetting().then(wxResponse => {
+				// console.log('是否已授权',res);//0:为取消授权 1:为已授权 2:为未操作
+				if (wxResponse == 1) {
+					if (!this.hasLogin) {
+						this.$api.navigateTo(url)
+					}
+				} else {
+					this.$api.navigateTo(`/pages/authorization/authorization?type=${type}`)
+				}
+			})
 		},
-		onPullDownRefresh() {//下拉刷新
-			if(this.hasLogin){
-				this.getUserInfo()
-				uni.stopPullDownRefresh()
-			}else{
-				uni.stopPullDownRefresh()
+		showBadge(n) {
+			let num = ''
+			if (n > 100) {
+				num = 99
+			} else {
+				num = n
 			}
+			return num
 		},
-		onShow(){
-			if(this.hasLogin){
-				this.$api.getComStorage('userInfo').then((resolve) =>{
+		clubStatusText(state) {
+			let stateText
+			switch (state) {
+				case 90:
+					stateText = ''
+					break
+				case 1:
+					stateText = '正在审核中'
+					break
+				case 92:
+					stateText = '审核不通过'
+					break
+			}
+			return stateText
+		}
+	},
+	onPageScroll(e) {
+		//实时获取到滚动的值
+		if (e.scrollTop > 20) {
+			this.isCmcustom = true
+			this.nvabarData.bgColor = '#E37A4B'
+			this.nvabarData.textColor = '#FFFFFF'
+		} else {
+			this.isCmcustom = false
+			this.nvabarData.bgColor = ''
+			this.nvabarData.textColor = '#FFFFFF'
+		}
+	},
+	onPullDownRefresh() {
+		//下拉刷新
+		if (this.hasLogin) {
+			this.getUserInfo()
+			uni.stopPullDownRefresh()
+		} else {
+			uni.stopPullDownRefresh()
+		}
+	},
+	onShow() {
+		if (this.hasLogin) {
+			this.$api
+				.getComStorage('userInfo')
+				.then(resolve => {
 					this.userID = resolve.userID
 					this.getUserInfo()
-				}).catch(reject =>{
-					console.log('异常处理=========>',reject)
 				})
-			}else{
-				this.getPhone()
-				this.$store.commit('updateAllNum',0)
-			}
-		}	
+				.catch(reject => {
+					console.log('异常处理=========>', reject)
+				})
+		} else {
+			this.getPhone()
+			this.$store.commit('updateAllNum', 0)
+		}
 	}
+}
 </script>
 
 <style lang="scss">
-	@import "@/uni.scss";
-	page{
-		background-color: #F7F7F7;
-	}
-	.user{
-		width: 100%;
-		height: 100%;
-		position:relative;
-		background: rgba(247, 247, 247, 1);
-	}	
-	.header{
-		width: 100%;
-		position: relative;
-		background-size: cover;
-	}	
-	.header-main{
-		width: 702rpx;
-		height: 130rpx;
-		padding: 12rpx 24rpx;
-		display: flex;
-		.header-text{
-			flex: 8;
-			display: flex;
-			flex-direction: column;
-			box-sizing: border-box;
-			padding-left: 20rpx;
-			.user-item{
-				flex: 1;
-				height: 64rpx;
-				line-height: 64rpx;
-				&.amount{
-					height: 30rpx;
-					line-height: 30rpx;
-				}
-				.u-tips{
-					display: inline-block;
-					float: left;
-					width: 98rpx;
-					height: 30rpx;
-					border: 1px solid #FFFFFF;
-					background: linear-gradient(128deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-					border-radius: 16rpx;
-					line-height: 30rpx;
-					font-size: $font-size-20;
-					text-align: center;
-					color: #FFFFFF;
-					margin-left: 10rpx;
-					margin-top: 17rpx;
-				}
-				.u-viptips{
-					display: inline-block;
-					float: left;
-					width: 98rpx;
-					height: 30rpx;
-					border: 1px solid #FFE600;
-					background: linear-gradient(128deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);
-					border-radius: 16rpx;
-					line-height: 30rpx;
-					font-size: $font-size-20;
-					text-align: center;
-					color: #FFE600;
-					margin-left: 10rpx;
-					margin-top: 17rpx;
-				}
-				.u-h1{
-					width: 300rpx;
-					float: left;
-					font-size: $font-size-34;
-					color: #FFFFFF;
-					text-align: left;
-					-o-text-overflow: ellipsis;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 1;
-					overflow: hidden;
-				}
-				.u-p{
-					font-size: $font-size-24;
-					line-height: 30rpx;
-					color: #FFFFFF;
-					text-align: left;
-				}
-			}
-		}
-		.header-icon{
-			flex: 2;
-			image{
-				float: right;
-				width: 128rpx;
-				height: 128rpx;
-				border-radius: 100%;
-				border: 2rpx solid #FFFFFF;
-			}
-		}
-	}
-	.header-main-none{
-		width: 702rpx;
-		height: 152rpx;
-		padding: 0 24rpx;
-		display: flex;
-		.header-text{
-			flex: 8;
-			display: flex;
-			flex-direction: column;
-			.user-item{
-				flex: 1;
-				height: 50rpx;
-				line-height: 50rpx;
-				.line{
-					margin: 0 10rpx;
-				}
-				.u-h1{
-					float: left;
-					font-size: $font-size-34;
-					color: #FFFFFF;
-					text-align: left;
-					-o-text-overflow: ellipsis;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 1;
-					overflow: hidden;
-				}
-				.u-p{
-					font-size: $font-size-24;
-					line-height: 50rpx;
-					color: #EFEFEF;
-					text-align: left;
-				}
-				.u-btn{
-					width: 160rpx;
-					height: 40rpx;
-					background: rgba(255,255,255,.8);
-					border-radius: 8rpx;
-					line-height: 40rpx;
-					text-align: center;
-					font-size: $font-size-24;
-					color: $color-system;
-					display: block;
-					margin-top: 5rpx;
-					padding-left: 6rpx;
-					.icon-xiangyouhuabeifen{
-						font-size: $font-size-24;
-					}
-				}
-			}
-		}
-		.header-icon{
-			flex: 2;
-			display: flex;
-			margin-right: 20rpx;
-			align-items: center;
-			justify-content: center;
-			image{
-				float: right;
-				width: 128rpx;
-				height: 128rpx;
-				border-radius: 100%;
-				border: 2rpx solid #FFFFFF;
-			}
-		}
-	}
-	.user-order{
-		width: 654rpx;
-		height: auto;
-		padding: 0 24rpx;
-		background-color: $bg-color;
-		margin-bottom: 24rpx;
+@import '@/uni.scss';
+.ws-header {
+	position: relative;
+	.user-info{
 		position: absolute;
-		bottom: -170rpx;
-		left: 24rpx;
-		border-radius: 20rpx;
-	}	
-	.tab-title{
-		font-size: $font-size-28;
-		line-height: 80rpx;
-		color: #333333;
-		text-align:left;
-		border-bottom: 1px solid #F8F8F8;
-		position: relative;
-		.cell-tit{
-			font-size: $font-size-28;
-			color: $text-color;
-		}
-		.cell-more{
-			float: right;
-			line-height: 80rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-			padding-right: 30rpx;
-		}
-		.iconfont{
-			width: 30rpx;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-align: center;
-			position: absolute;
-			right: 0;
-			top: 0;
-			display: block;
-			font-size: $font-size-28;
-		}
-	}
-	.order-section{
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		flex-wrap:wrap;
-		height: 99rpx;
-		padding: 24rpx 0;
-	}
-	.order-item{
-		flex:1;
+		z-index: 10;
+		width: 750rpx;
+		height: 280rpx;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		position: relative;
-		&:last-child{
-			margin-right: 0;
-		}
-		.order-icon{
-			width: 52rpx;
-			height: 52rpx;
-			position: relative;
-			image{
-				width: 52rpx;
-				height: 52rpx;
-			}
-			.icon-num{
-				position: absolute;
-				right:-24rpx;
-				top: -9rpx;
-			}
-			.icon-num.goleft{
-				right: -12rpx;
-			}
+		image {
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
 		}
-		.order-t{
-			line-height: 50rpx;
-			font-size: $font-size-24;
-			color: $text-color;
-		}
-	}
-	.foot-list{
-		width: 702rpx;
-		padding: 0 24rpx;
-		padding-top: 160rpx;
-	}	
-	.list-cell-item{
-		width: 654rpx;
-		height: auto;
-		margin-bottom: 24rpx;
-		padding:0 24rpx;
-		background: $bg-color;
-		border-radius: 20rpx;
 	}
-	.list-cell{
-		display:flex;
+	.user-bg{
 		width: 100%;
-		align-items:baseline;
-		line-height:100rpx;
-		position:relative;
-		background: $bg-color;
-		justify-content: center;
-		border-bottom: 1px solid #EBEBEB;
-		&:last-child{
-			border-bottom: none;
-		}
-		&.cell-hover{
-			background:#fafafa;
-		}
-		.cell-icon{
-			width: 60rpx;
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-			.iconfont{
-				font-size: $font-size-34;
-				color: #666666;
-			}
-		}
-		.cell-more{
-			align-self: baseline;
-			font-size:$font-size-28;
-			color:#666666;
-			margin-left:10rpx;
-			.txt{
-				color: #FB4343;
-				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;
-	}
-	.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;
+	.ws-login {
+		width: 184rpx;
+		height: 56rpx;
+		border-radius: 28rpx;
+		
 	}
+}
 </style>

services/ajax.service.js

@@ -1,7 +1,7 @@
 /**
  * ajax请求相关的服务
  */
-import baseUrl from './ajax.env'
+import baseUrl from './config.env'
 import { msg } from '@/utils/util'
 
 class AjaxService {