Răsfoiți Sursa

refactor:首页修改

zhanghui 2 ani în urmă
părinte
comite
1fc0b0e79b

+ 0 - 1
common/js/api.js

@@ -576,7 +576,6 @@ export default {
 		return request({
 			url: '/resource/oss/listByIds/' + data.ossId,
 			method: 'GET'
-
 		})
 
 	},

+ 3 - 6
common/js/request.js

@@ -3,14 +3,11 @@ import env from '../js/env.js';
 function service(options = {}) {
 	options.url = `${env.baseUrl}${options.url}`;
 	// 判断本地是否存在token,如果存在则带上请求头
-	let access_token = uni.getStorageSync('access_token')
+	let access_token = uni.getStorageSync('accessToken')
 	let refresh_token = uni.getStorageSync('refresh_token')
 	options.header = {
-		'Tenant-Id':'000000',
-		'Authorization': 'Basic c3dvcmQ6c3dvcmRfc2VjcmV0',
-		'content-type': 'application/json',
-		'Blade-Auth': access_token ,
-		'refresh_token': refresh_token
+		'Authorization': 'Bearer '+ access_token,
+		'content-type': 'application/json'
 	};
 
 	// resolved是返回成功数据,rejected返回错误数据

+ 98 - 0
components/scroll-notice/ScrollNotice.vue

@@ -0,0 +1,98 @@
+<template>
+	<view class="notice-main">
+		<view class="notice-icon">
+			<image src="/static/index/u01.png" mode=""></image>
+		</view>
+		<view class="notice-swiper-wrap">
+			<swiper class="notice-swiper" :style="'height:'+height+'px;line-height:'+height+'px;'" autoplay="true"
+				:interval="interval" duration="500" circular="true" :vertical="type==1?true:false">
+				<swiper-item v-for="(list,index) in dataList" :key="index" @click.stop="clickList(list)">
+					<view class="notice-swiper-item" :style="'font-size:'+fontSize+'px;color:'+color">
+						{{list.noticeTitle}}
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			//通知列表
+			dataList: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			//滚动类型(1:向上循环滚动;2:横向滚动)
+			type: {
+				type: Number,
+				default: 1
+			},
+			//滚动时间间隔
+			interval: {
+				type: Number,
+				default: 1000
+			},
+			//通告栏高度(rpx)
+			height: {
+				type: Number,
+				default: 66
+			},
+			//字体大小(rpx)
+			fontSize: {
+				type: Number,
+				default: 30
+			},
+			//字体颜色
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			//自定义取值名字
+			customName: {
+				type: String,
+				default: 'title'
+			},
+		},
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			clickList(item) {
+				this.$emit("click", item)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+.notice-main {
+	z-index: 100;
+	width: 100%;
+	display: flex;
+	align-items: center;
+}
+
+.notice-icon{
+	width: 8%;
+}
+.notice-icon image{
+	height: 16px;
+	width: 16px;
+}
+.notice-swiper-wrap{
+	width: 90%;
+}
+.notice-swiper-item {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 1;
+}
+</style>

+ 0 - 1
loginPages/login/bind-transaction-password.vue

@@ -55,7 +55,6 @@
   </view>
 </template>
 <script>
-import {wechatRegister,realNameAuthLogin} from '/src/api/login/login.js';
 export default {
 	data() {
 		return {

+ 9 - 10
loginPages/login/retrieve-account-password.vue

@@ -30,7 +30,7 @@
 			<text>确定</text>
 		</view>
 	</view>
-	
+
 	<!-- 密码正确 -->
 	<u-popup :show="show" :round="10"  mode="center"  @close="close" @open="open">
 	  <view class="h-popo-content">
@@ -53,7 +53,7 @@
 		   </view>
 	  </view>
 	</u-popup>
-	
+
 	<!-- 密码正确 -->
 	<u-popup :show="passwordErrShow" :round="10"  mode="center"  @close="close" @open="open">
 	  <view class="h-popo-content">
@@ -71,11 +71,10 @@
 		   </view>
 	  </view>
 	</u-popup>
-	
+
   </view>
 </template>
  <script>
-import {wechatRetrieveAccountPwdLogin} from '/src/api/login/login.js';
 export default {
 	data() {
 		return {
@@ -137,9 +136,9 @@ export default {
 					loginState.accessToken = res.access_token;
 					that.$store.commit('updateLoginState', loginState);
 					that.$store.commit('updateLoginUserInfo', res.userInfo)
-					
+
 					that.show = true;
-					
+
 				} else {
 					uni.showToast({
 						title: "操作失败"
@@ -152,10 +151,10 @@ export default {
 			});
 		},
 		open() {
-			
+
 		},
 		close() {
-			
+
 		}
 	}
 }
@@ -238,8 +237,8 @@ page,body{
 			width: 100px;
 			border-radius: 16px;
 			margin: 0 auto;
-			
+
 		}
 	}
 }
-</style>
+</style>

+ 6 - 7
loginPages/login/retrieve-account-phone.vue

@@ -31,7 +31,7 @@
 			<text>下一步</text>
 		</view>
 	</view>
-	
+
 	<!-- 密码正确 -->
 	<u-popup :show="show" :round="10"  mode="center" >
 	  <view class="h-popo-content">
@@ -51,11 +51,10 @@
 		   </view>
 	  </view>
 	</u-popup>
-	
+
   </view>
 </template>
  <script>
-import {phoneIsExist} from '/src/api/login/login.js';
 export default {
 	data() {
 		return {
@@ -75,13 +74,13 @@ export default {
 		}
 	},
 	onLoad() {
-		
+
 	},
 	onReady() {
 		this.$refs.form1.setRules(this.rules)
 	},
 	methods: {
-		
+
 		// 去选择找回方式
 		gotoRetrieveMethod(){
 			let that = this;
@@ -203,8 +202,8 @@ page,body{
 			width: 100px;
 			border-radius: 16px;
 			margin: 0 auto;
-			
+
 		}
 	}
 }
-</style>
+</style>

+ 8 - 10
loginPages/login/retrieve-account.vue

@@ -28,7 +28,7 @@
 					label="验证码"
 					prop="smsCode"
 					width="120"
-					
+
 				>
 				<u--input
 					v-model="userInfo.smsCode"
@@ -52,7 +52,7 @@
 						>{{tips2}}</text>
 					</view>
 				</template>
-				
+
 			  </u-form-item>
 			</u--form>
 		</view>
@@ -62,7 +62,7 @@
 			<text>下一步</text>
 		</view>
 	</view>
-	
+
 	<!-- 密码正确 -->
 	<u-popup :show="errShow" :round="10"  mode="center"  @close="close" @open="open">
 	  <view class="h-popo-content">
@@ -85,12 +85,10 @@
 		   </view>
 	  </view>
 	</u-popup>
-	
+
   </view>
 </template>
  <script>
-import color from 'uview-plus/libs/config/color';
-import {validateSmsCode,wechatRegister,getSmsCode} from '/src/api/login/login.js';
 
 export default {
 	data() {
@@ -186,8 +184,8 @@ export default {
 					title: "操作失败"
 				})
 			});
-			
-			
+
+
 		},
 		// 去绑定账号密码页面
 		gotoBindAccountPassword(){
@@ -281,7 +279,7 @@ page,body{
 			width: 100px;
 			border-radius: 16px;
 			margin: 0 auto;
-			
+
 		}
 	}
 }
@@ -316,4 +314,4 @@ page,body{
 		}
 	}
 }
-</style>
+</style>

+ 3 - 0
main.js

@@ -3,6 +3,8 @@ import App from './App'
 import Vue from 'vue'
 import './uni.promisify.adaptor'
 import api from './common/js/api'
+// 通用方法
+// import commonUtils from "./common/js/commonUtils.js"
 
 import uView from "uview-ui";
 const baseUrl = 'https://jje.admin.xinyuekj.com.cn/';
@@ -14,6 +16,7 @@ App.mpType = 'app'
 const app = new Vue({
   ...App
 })
+// app.config.globalProperties.$getImgUrlByOssId = commonUtils.getImgUrlByOssId;
 app.$mount()
 
 

+ 2 - 17
pages.json

@@ -13,7 +13,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": ""
 			}
 		},
 		{
@@ -43,22 +43,7 @@
 
 	],
 
-	"subPackages": [{
-			"root": "orderPages",
-			"pages": [{
-				"path": "orderDetail/index",
-				"style": {
-					"navigationBarTitleText": "订单详情",
-					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "goodsDetail/index",
-				"style": {
-					"navigationBarTitleText": "商品详情",
-					"enablePullDownRefresh": false
-				}
-			}]
-		},
+	"subPackages": [
 		{
 			"root": "loginPages",
 			"pages": [{

+ 644 - 12
pages/index/index.vue

@@ -1,5 +1,7 @@
 <template>
-	<view class="content">
+	<view class="content-wrap bg-color">
+
+
 		<view class="head-wrap ">
 			<view class="content-info ">
 
@@ -27,7 +29,7 @@
 							</view>
 							<view class="text">
 								<view class="phone">{{userInfo.cellPhone}}</view>
-								<view class="welcome">尊敬的用户,下午好~</view>
+								<view class="welcome">尊敬的{{userInfo.ncikName}},下午好~</view>
 							</view>
 							<view @click="gotoReceiveCoupons()" class="arrow-right">
 								<!-- <image v-if="userInfo.wxQrCode" class="qrcode" :src="userInfo.qrcode" mode=""></image> -->
@@ -220,38 +222,668 @@
 			</view>
 		</view>
 
-		<view class="tabBarLineHeight"></view>
 		<view class="tabBarView">
 			<tab-bar :tabIndex="tabIndex"></tab-bar>
 		</view>
 	</view>
+
 </template>
 
 <script>
 	import tabBar from "../../components/tabBar/tabBar";
+	import ScrollNotice  from '../../components/scroll-notice/ScrollNotice.vue';
 	export default {
-		components:{
-			tabBar
+		components: {
+			ScrollNotice,tabBar
 		},
 		data() {
 			return {
-				title: 'Hello',
-				tabIndex:0
+				noticeList: [],
+				notice: '',
+				userInfo: {},
+				bannerList: [],
+				reqParm: {
+					auth: true,
+					appid: 46,
+					telphone: '',
+					longitude: 0,
+					latitude: 0
+				},
+				storeList: [],
+				storeInfo: {}
+			};
+		},
+		mounted() {
+			// 获取经纬度信息
+			this.getLocation();
+
+			//公告信息
+			this.getNoticeListData();
+
+			// 获取banner图列表
+			this.getSlideshowList();
+
+			// 用户信息
+			this.userInfo = uni.getStorageSync('userInfo');
+			this.getImgUrlByOssId(this.userInfo.selfPhoto);
+
+			// 查询门店信息
+			const data = uni.getStorageSync('storeInfo');
+			if(!data){
+				// 获取门店列表数据
+				console.log('+++++++++++++++++++++++++++++++++',this.userInfo)
+				this.getStoreListData();
+			} else {
+				this.storeInfo = data;
 			}
+
 		},
-		onLoad() {
+		onLoad(){
 			uni.hideTabBar({
 				animation:false
 			})
 
+
 		},
+		// 分享到朋友圈
+		onShareTimeline() {},
+		// 分享到用户
+		onShareAppMessage(OBJECT) {},
 		methods: {
+			// 去服务点单页面
+			gotoServiceOrder(){
+				uni.$u.route({
+					url: '/pages/index/tabbar',
+					params: {
+						PageCur: 'goods'
+					},
+					method: 'reLaunch'
+				})
+			},
+			//点击通知
+			handleNoticeClick(e) {
+				console.log(e)
+				uni.$u.route({
+					url: '/pages/notice/notice-detail',
+					params: {
+						noticeId: e.noticeId
+					}
+				})
+			},
+			// 去优惠劵大厅
+			gotoReceiveCoupons(){
+				uni.$u.route({
+					url: '/pages/coupon/receive-coupons',
+					params: {}
+				})
+			},
+			// 去我的优惠劵页面
+			gotoCoupon(){
+				uni.$u.route({
+					url: '/pages/coupon/coupon',
+					params: {
+						name: 'lisa'
+					}
+				})
+			},
+			// 储值服务
+			gotoRechargeService(){
+				uni.$u.route({
+					url: '/pages/transaction/recharge-service',
+					params: {
+						name: 'lisa'
+					}
+				})
+			},
+			// 获取banner图片
+			getSlideshowList(){
+				let that = this;
+				this.$api.getSlideshowList({data:this.reqParm}).then((res)=>{
+					this.getImgUrlByBannerOssId(res.data.data);
+				}).catch(() =>{
+					uni.showToast({
+						title: "操作失败"
+					})
+				})
+			},
+			async getImgUrlByBannerOssId(items){
+				for(let i = 0; i <items.length; i++) {
+					this.$api.getImgUrlByOssId({ossId:items[i].slideshowId}).then(res=>{
+						this.bannerList.push(res.data.data[0].url.replace(/^http:/, "https:"))
+					})
+
+				}
+			},
+			// 获取门店列表数据
+			getStoreListData(){
+				let that = this;
+				// 用户绑定门店
+				this.$api.storeList(this.reqParm).then((res)=>{
+					console.log(res.data.data[0])
+						that.storeInfo = res.data.data[0]
+						// 更新用户选择的门店信息
+						uni.setStorageSync('storeInfo',res.data.data[0])
+				}).catch(() =>{
+					uni.showToast({
+						title: "操作失败"
+					})
+				})
+			},
+			// 积分详细页面
+			gotoIntgral(){
+				uni.$u.route({
+					url: '/pages/integral/integral',
+					params: {
+						name: 'lisa'
+					}
+				})
+			},
+			getNoticeListData(){
+				let req = {
+					auth: true,
+					noticeType:2
+				}
+				this.$api.noticeList({data:req}).then((res)=>{
+					if (res.data.rows.length === 1){
+						this.noticeList.push(res.data.rows[0])
+						this.noticeList.push(res.data.rows[0])
+					}else{
+						this.noticeList = res.data.rows;
+					}
+				}).catch(() =>{
+					uni.showToast({
+						title: "操作失败"
+					})
+				})
+			},
+
+			 getImgUrlByOssId(ossId){
+				if (ossId){
+					this.$api.getImgUrlByOssId(ossId).then(res=>{
+						console.log('++++++++用户头像+++++++++++++++',res)
+					})
+					this.userInfo.selfPhotoUrl = url;
+					return url;
+				}
+
+			},
+			// 获取经纬度信息
+			getLocation(){
+
+				uni.getLocation({
+					type: 'gcj02',
+					success: function(res) {
+						var latitude = res.latitude; // 纬度
+						var longitude = res.longitude; // 经度
+						var speed = res.speed; // 速度
+						var accuracy = res.accuracy; // 精确度
+						// 在这里可以对位置信息进行处理
+						console.log("纬度:"+latitude+";经度"+longitude)
+						this.reqParm.latitude = latitude
+						this.reqParm.longitude = longitude
+					}
+				});
+			},
+
+			// 去选择门店
+			gotoStoreChoose(){
+				uni.$u.route({
+					url: '/pages/goods/store-choose',
+					params: {
+						type: '1'
+					}
+				})
+			},
+			// 去再来一单
+			gotoComeOrder(){
+
+				uni.$u.route({
+					url: '/pages/index/tabbar',
+					params: {
+						PageCur: 'orderList',
+						status : '4'
+					}
+				})
+
+			},
+			// 储值服务
+			gotoRechargeService(){
+				uni.$u.route({
+					url: '/pages/transaction/recharge-service',
+					params: {
+						name: 'lisa'
+					}
+				})
+			},
+			// 去优惠劵页面
+			gotoCoupon(){
+				uni.$u.route({
+					url: '/pages/coupon/coupon',
+					params: {
+						name: 'lisa'
+					}
+				})
+			},
+			// 去订单页面
+			gotoOrder(){
+				uni.$u.route({
+					url: '/pages/index/tabbar',
+					params: {
+						PageCur: 'orderList'
+					}
+				})
+			},
+			// 去商品下单页面
+			gotoGoods(){
+				uni.$u.route({
+					url: '/pages/index/tabbar',
+					params: {
+						PageCur: 'goods'
+					}
+				})
+			},
+			// 去会员页面
+			gotoMember(){
+				uni.$u.route({
+					url: '/pages/index/tabbar',
+					params: {
+						PageCur: 'qrcode'
+					}
+				})
+			},
+			// 用户绑定门店
+			userBindStore(){
+				let that = this;
+				// 用户绑定门店
+				userBindStore(null,{data:this.reqParm}).then((res)=>{
+					console.log(this.reqParm)
+				}).catch(() =>{
+					uni.showToast({
+						title: "操作失败"
+					})
+				})
+			},
 
 		}
-	}
+	};
 </script>
 
-<style>
-	@import '/common/css/common.css';
-	@import './index.rpx.css';
+<style scoped lang="scss">
+
+	/* 头部内容 */
+	.head-wrap{
+		height: 1080px;
+		.content-info{
+			position: relative;
+			.h-bg{
+				height: 340px;
+			}
+			.content{
+				position: absolute;
+				top: 230px;
+				left: 12px;
+				right: 12px;
+				border-radius: 6px;
+				.h-notice-bar{
+					padding-left: 10px;
+					height: 46px;
+					background: #FFFFFF;
+					box-shadow: 0px 4px 8px 0px rgba(237,86,159,0.05);
+					border-radius: 10px;
+				}
+				.h-content-wrap{
+					background: #fff;
+					border-radius: 10px;
+					/* 欢迎语 */
+					.welcome-wrap{
+						padding-top: 12px;
+						display: flex;
+						margin-left: 12px;
+						margin-right: 12px;
+						margin-top: 16px;
+						align-items: center;
+						.logo {
+							width: 13%;
+							image{
+								border-radius: 15px;
+								width: 36px;
+								height: 36px;
+							}
+						}
+						.text{
+							width: 60%;
+							font-size: 14px;
+							.welcome-wrap{
+								font-size: 12px;
+								color: #999999 ;
+							}
+							.welcome{
+								font-size: 12px;
+								color: #999999 ;
+							}
+						}
+						.arrow-right{
+							width: 30%;
+							text-align: center;
+							cursor: pointer;
+							display: flex;
+							justify-content: center;
+							background: #fff8db;
+							// background: red;
+							height: 32px;
+							align-items: center;
+							border-radius: 16px;
+							.qrcode{
+								height: 20px;
+								width: 20px;
+							}
+							.h-text{
+								font-size: 12px;
+								color: #999999 ;
+							}
+							.coupon-wrap{
+								display: flex;
+								font-size: 14px;
+								color: #666;
+								align-items: center;
+							}
+						}
+
+					}
+
+					/* 钱包信息 */
+					.balance-info{
+						font-size: 12px;
+						padding-left: 12px;
+						margin-bottom: 16px;
+						margin-top: 12px;
+						color: #666;
+						display: flex;
+						justify-content: space-around;
+						text-align: center;
+						.balance-amount{padding-right: 4px;}
+						.score-info{padding-right: 4px;}
+						.coupon-info{padding-right: 4px;}
+						.e-currency-info{padding-right: 4px;}
+						.number{
+							color: #333333;
+							font-size: 14px;
+						}
+					}
+
+					/* 商店信息 */
+					.store-wrap{
+						margin: 10px;
+						.store-info{
+							display: flex;
+							.logo {
+								width: 10%;
+								text-align: center;
+								display: flex;
+								justify-content: center;
+								align-items: center;
+								image{
+									width: 30px;
+									height: 30px;
+								}
+							}
+							.store-content{
+								width: 90%;
+								padding-bottom: 13px;
+								.h-row{
+									display: flex;
+									align-items: center;
+									justify-content: space-between;
+									.store-desc{
+										width: 90%;
+										display: flex;
+										line-height: 30px;
+										font-size: 14px;
+										.store-name{
+										}
+
+									}
+									.arrow-right{
+										text-align: right;
+										margin: 0 auto;
+										cursor: pointer;
+										padding-top: 3px;
+										width: 100px;
+										display: flex;
+										font-size: 14px;
+										.change-store{
+											text-align: right;
+											color: #666;
+										}
+										image{
+											width: 18px;
+											height: 18px;
+										}
+									}
+									.address{
+										color: #999999;
+										font-size: 12px;
+										padding-right: 12px;
+									}
+								}
+							}
+
+						}
+						.adress{
+							font-size: 11px;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							padding-left:40px;
+							color: #666;
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	/* 上次订单 */
+	.nav-wrap{
+		background: #fff;
+		border-radius: 8px;
+		margin-top: 16px;
+		.upper-order-wrap{
+			display: flex;
+			border-radius: 6px;
+			justify-content: center;
+			.left-content{
+				margin-top: 20px;
+				width: 50%;
+				font-size: 12px;
+				text-align: center;
+				border-radius: 10px;
+				.title{
+					font-size: 18px;
+					text-align: center;
+				}
+				.desc{
+					padding-top: 6px;
+					color: #999999;
+				}
+				.bg-img{
+					text-align: center;
+					height: 100px;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					image{
+						width: 78px;
+						height: 78px;
+					}
+				}
+			}
+			.right-content{
+				margin-top: 20px;
+				width: 50%;
+				font-size: 12px;
+				text-align: center;
+				.title{
+					font-size: 18px;
+					text-align: center;
+				}
+				.desc{
+					padding-top: 6px;
+					color: #999999;
+				}
+				.bg-img{
+					height: 100px;
+					text-align: center;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					image{
+						width: 78px;
+						height: 78px;
+					}
+				}
+			}
+		}
+		.menu-tab{
+			display: flex;
+			justify-content: space-around;  // 平均分布
+			justify-content: center;
+			padding-bottom: 8px;
+			.button-wrap{
+				flex: 1;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 16px;
+				margin-bottom: 18px;
+				.name{
+					padding-top: 3px;
+					font-size: 12px;
+					color: #666666;
+				}
+				.btn{
+					padding-left: 12px;
+					padding-right: 12px;
+					height: 36px;
+					border-radius: 18px;
+					.icon{
+						display: flex;
+						padding-right: 6px;
+						align-items: center;
+						justify-content: center;
+						image{
+							height: 14px;
+							width: 14px;
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	/* 为你推荐 */
+	.recommend-wrap{
+		margin-top: 16px;
+		background: #fff;
+		border-radius: 8px;
+		.recommend-nav{
+			display: flex;
+			margin-left: 12px;
+			padding-top: 8px;
+			padding-bottom: 4px;
+			align-items: center;
+			.icon{
+				padding-right: 4px;
+				image{
+					height: 26px;
+					width: 26px;
+				}
+			}
+			.title{
+				font-size: 16px;
+			}
+		}
+		/* 门店列表 */
+		.store-wrap{
+			margin: 12px;
+			height: 100px;
+			.store-list{
+				margin-top: 16px;
+				.store-content{
+					display: flex;
+					.store-img{
+						width: 30%;
+						image{
+							width: 100%;
+							height: 78px;
+							border-radius: 6px;
+						}
+					}
+					.h-store-content{
+						width: 70%;
+						padding-left: 8px;
+						padding-top: 4px;
+						.title{
+							font-size: 18px;
+							font-family: "黑体", sans-serif;
+						}
+						.adress{
+							font-size: 14px;
+							color: #666;
+						}
+						.price{
+							color: #666;
+							width: 60%;
+							font-size: 14px;
+							line-height: 22px;
+							.red{
+								color: red;
+								font-size: 16px;
+							}
+						}
+						.desc{
+							display: flex;
+							padding-top: 3px;
+							.price{
+								width: 60%;
+								font-size: 14px;
+								line-height: 22px;
+							}
+							.order-btn{
+								width: 100%;
+								.btn{
+									background: #FFE05C;
+									text-align: center;
+									border-radius: 14px;
+									height: 26px;
+									line-height: 26px;
+									color: #333;
+									font-size: 12px;
+								}
+							}
+						}
+					}
+				}
+
+			}
+		}
+	}
+
+	/* 底部 */
+	.footer{
+		margin-top: 30px;
+		height: 60px;
+		font-size: 12px;
+		text-align: center;
+		color: #666;
+		margin-bottom: 40px;
+	}
+
+	.tabBarView{
+		position: fixed;
+		bottom: 0;
+	}
+
 </style>

+ 1 - 2
pages/my/index.vue

@@ -262,7 +262,6 @@
 
 <script >
 import tabBar from "../../components/tabBar/tabBar";
-import { saveWechatUser } from '../../api/login/login';
 export default {
 	components: {
 		tabBar
@@ -372,7 +371,7 @@ export default {
 		gotoRechargeService() {
 			uni.navigateTo({
 				url: '/myPages/recharge/index'
-				
+
 			})
 		},
 		// 去实名认证