导航接口

pages/home/home.vue

@@ -3,7 +3,7 @@
 		<view class="header">首页</view>
 		<view class="userInfo-wrap">
 			<view class="userInfo">
-				<text class="p1">{{$store.getters.userName}}</text>
+				<text class="p1">{{$store.getters.userInfo !== '' ? JSON.parse($store.getters.userInfo).user_name : ''}}</text>
 				<text class="p2">欢迎进入铜箔手持系统！</text>
 			</view>
 			<view class="exit" @tap="Quit">
@@ -15,7 +15,7 @@
 			<view class="menu-wrap">
 				<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage1(e)">
 					<image class="menu-img" :src="require('../../static/image/menu/' + e.path + '.png')" alt="">
-					<view class="menu-name">{{e.name}}</view>
+					<view class="menu-name">{{e.title}}</view>
 				</view>
 			</view>
 		</view>
@@ -23,7 +23,7 @@
 			<view class="sec_menu_w">
 				<view class="menu-item" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
 					<view class="sec_menu-col_inner">
-						<view class="menu-name menu-name_inner">{{e.name}}</view>
+						<view class="menu-name menu-name_inner">{{e.title}}</view>
 					</view>
 				</view>
 			</view>
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-	import {authority} from '@/utils/getData2.js'
+	import {authority1} from '@/utils/getData2.js'
 	export default {
 		data() {
 			return {
@@ -49,8 +49,15 @@
 		},
 		methods: {
 			async _authority () {
-				let res = await authority()
+				let res = await authority1()
-				this.menuList = [...res.sonTree]
+				if (res.code === '1') {
+					this.menuList = [...res.result.sonTree]
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
 				
 			},
 			toPage1 (e) {

pages/home/home_back.vue

@@ -0,0 +1,170 @@
+<template>
+	<view class="zd_content">
+		<view class="header">首页</view>
+		<view class="userInfo-wrap">
+			<view class="userInfo">
+				<text class="p1">{{$store.getters.userName}}</text>
+				<text class="p2">欢迎进入铜箔手持系统！</text>
+			</view>
+			<view class="exit" @tap="Quit">
+				<view class="icon-exit"></view>
+				<view class="exit-text">退出</view>
+			</view>
+		</view>
+		<view class="zd_wrapper">
+			<view class="menu-wrap">
+				<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage1(e)">
+					<image class="menu-img" :src="require('../../static/image/menu/' + e.path + '.png')" alt="">
+					<view class="menu-name">{{e.name}}</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="show === true" class="sec_menu_wraper">
+			<view class="sec_menu_w">
+				<view class="menu-item" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
+					<view class="sec_menu-col_inner">
+						<view class="menu-name menu-name_inner">{{e.name}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="cancel">
+				<view class="iconfont cancel_icon" @tap="show = false"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {authority} from '@/utils/getData2.js'
+	export default {
+		data() {
+			return {
+				menuList: [],
+				show: false,
+				secM: []
+			};
+		},
+		created () {
+			this._authority()
+		},
+		methods: {
+			async _authority () {
+				let res = await authority()
+				this.menuList = [...res.sonTree]
+				
+			},
+			toPage1 (e) {
+				if (e.sonTree.length > 0) {
+					this.show = true
+					this.secM = e.sonTree
+				}
+			},
+			toPage2 (e) {
+				let url = e.path
+				uni.redirectTo({
+					url: url
+				})	
+			},
+			Quit () {
+			  this.$store.dispatch('delUserInfo')
+			  uni.redirectTo({
+			  	url: '/pages/login/login'
+			  })
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.zd_content
+	padding-top 0
+.header
+	height 86rpx
+	_font(36rpx,86rpx,#333,,center)
+.userInfo-wrap
+	_fj()
+	_wh(100%,160rpx)
+	padding 0 30rpx
+	background-color $red
+	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
+	border-radius 12rpx
+	margin-bottom 20rpx
+.userInfo
+	_fj(,flex-start,column)
+.p1
+	_font(34rpx,1,#fff)
+	padding-bottom 18rpx
+.p2
+	_font(26rpx,1,#fff)
+.exit
+	_fj()
+	height 47rpx
+	padding 0 15rpx
+	border 1px solid #FF967C
+	border-radius 20rpx
+.icon-exit
+	_wh(22rpx, 22rpx)
+	_bis('../../static/image/exit.png',22rpx)
+.exit-text
+	_font(24rpx,47rpx,#fff,,right)
+	padding-left 10rpx
+.menu-wrap
+	_fj(flex-start,flex-start,,wrap)
+	align-content: flex-start
+.menu-item
+	_fj()
+	flex-direction column
+	_wh(30%, auto)
+	margin-bottom 40rpx
+	_font(26rpx, 60rpx,#e74f1a,,center)
+	&:nth-child(3n+2)
+		margin-left 5%
+		margin-right 5%
+::v-deep .menu-img 
+	_wh(100%, auto)
+	img
+		position relative
+		opacity 1
+		_wh(55%, auto)
+		margin 0 auto 0.2rpx
+.menu-name
+	_font(28rpx, 38rpx, #444,,center)
+.sec_menu_wraper
+	position fixed
+	top 0
+	left 0
+	_wh(100%, 100%)
+	background-color rgba(0, 0, 0, .9)
+	z-index 2017
+	flex-direction column
+.sec_menu_w
+	_fj()
+	_wh(100%, calc(100% - 100rpx))
+	padding 0 24rpx
+	flex-wrap wrap
+	align-content center
+	&::after
+		content ''
+		display block
+		_wh(30%,0)
+.sec_menu-col
+	background-color transparent
+	border none
+	height auto
+.sec_menu-col_inner
+	_fj(center)
+	_wh(160rpx, 160rpx)
+	border-radius 50%
+	background-color $yellow
+	margin 0 auto
+.menu-name_inner
+	color #fff
+	padding 0 20rpx
+.cancel
+	_wh(100%, 100rpx)
+	  padding 0 24rpx
+	  overflow hidden
+	  background-color rgba(255, 255, 255, .3)
+	  box-shadow 0 1rpx 4rpx 0 rgba(160,160,160,0.9)
+</style>

pages/login/login.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-	import {getCLodop, getPrinterList} from "@/utils/CLodopfuncs.js"
+	// import {getCLodop, getPrinterList} from "@/utils/CLodopfuncs.js"
 	import { RSAencrypt } from '@/utils/jsencrypt.js'
 	import {handLogin, pdaUpdate} from '@/utils/getData2.js'
 	import UpGrade from './upgrade.vue'
@@ -60,18 +60,18 @@
 			isUpdate () {
 				this._pdaUpdate()
 			},
-			test() {
+			// test() {
-				let LODOP = getCLodop();
+			// 	let LODOP = getCLodop();
-				// 更换为打印服务器ip 不需要加前缀
+			// 	// 更换为打印服务器ip 不需要加前缀
-				LODOP.PRINT_INIT(null, "192.168.81.198");
+			// 	LODOP.PRINT_INIT(null, "192.168.81.198");
-				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
+			// 	// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
-				LODOP.SET_PRINTER_INDEX(-1);
+			// 	LODOP.SET_PRINTER_INDEX(-1);
-				// 设置打印纸大小
+			// 	// 设置打印纸大小
-				LODOP.SET_PRINT_PAGESIZE(1, 800, 600, "");
+			// 	LODOP.SET_PRINT_PAGESIZE(1, 800, 600, "");
-				// 根据需求插入打印代码
+			// 	// 根据需求插入打印代码
-				LODOP.PRINT();  // 打印
+			// 	LODOP.PRINT();  // 打印
-				// LODOP.PREVIEW()
+			// 	// LODOP.PREVIEW()
-			},
+			// },
 			toSaveUser() {
 				this.saveUser = !this.saveUser
 			},

utils/getData2.js

@@ -29,6 +29,10 @@ export const handRequest = () => request({
 })
 
 // 菜单
+export const authority1 = () => request({
+	url:'api/pda/authority',
+	data: {}
+})
 export const authority = () => {
 	let res = {
 		sonTree: [