新增安品上传以及审核

.hbuilderx/launch.json

@@ -2,10 +2,19 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "local"
-            }
-        }
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"h5" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

common/http.interceptor.js

@@ -4,18 +4,18 @@ const install = (Vue, vm) => {
 	let baseURL;
 	if (process.env.NODE_ENV === 'development') {
 		// baseURL = "https://test.wms.tubaosoft.com/prod-api"
-		// baseURL = "https://zd.tubaosoft.com/prod-api"
+		baseURL = "https://zd.tubaosoft.com/prod-api"
 		// baseURL = "http://192.168.1.177:9020"
-		baseURL = "https://ap.tubaosoft.com/prod-api"
+		// baseURL = "https://ap.tubaosoft.com/prod-api"
 		// baseURL = "https://dmu.tubaosoft.com/prod-api"
 		// baseURL = "https://jingang.tubaosoft.com/prod-api"
 		// baseURL = "https://jiyong.tubaosoft.com/prod-api"
 	}
 	if (process.env.NODE_ENV === 'production') {
-		// baseURL = "https://zd.tubaosoft.com/prod-api"
+		baseURL = "https://zd.tubaosoft.com/prod-api"
 		// baseURL = "https://jiyong.tubaosoft.com/prod-api"
 		// baseURL = "https://jingang.tubaosoft.com/prod-api"
-		baseURL = "https://ap.tubaosoft.com/prod-api"
+		// baseURL = "https://ap.tubaosoft.com/prod-api"
 		// baseURL = "https://dmu.tubaosoft.com/prod-api"
 	}
 	Vue.prototype.$u.http.setConfig({

manifest.json

@@ -2,8 +2,8 @@
     "name" : "TuBaoSoft",
     "appid" : "__UNI__38FA993",
     "description" : "",
-    "versionName" : "1.0.10",
-    "versionCode" : 10,
+    "versionName" : "1.0.21",
+    "versionCode" : 21,
     "transformPx" : false,
     "app-plus" : {
         // APP-VUE分包，可提APP升启动速度，2.7.12开始支持，兼容微信小程序分包方案，默认关闭

pages/home/home.vue

@@ -11,19 +11,22 @@
 				</view>
 			</u-navbar>
 			<!-- 快捷功能 -->
-			<view style="display: flex;justify-content: space-around;">
-				<view style="width: 120rpx;text-align: center;" @click="myData">
-					<u-icon name="order" color="#fff" size="60"></u-icon>
-					<view style="margin-top: 10rpx;color: #FFFFFF;">我的数据</view>
-				</view>
-				<view style="width: 120rpx;text-align: center;" @click="myReview">
-					<u-icon name="edit-pen" color="#fff" size="60"></u-icon>
-					<view style="margin-top: 10rpx;color: #FFFFFF;">我的审核</view>
-				</view>
-				<view style="width: 120rpx;text-align: center;" @click="scanCode">
-					<u-icon name="scan" color="#fff" size="60"></u-icon>
-					<view style="margin-top: 10rpx;color: #FFFFFF;">扫一扫</view>
-				</view>
+			<view style="height: 150rpx;margin-top: -20rpx;">
+				<u-grid :col="3" :border="false">
+					<u-grid-item bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
+						<u-icon name="order" color="#fff" size="60"></u-icon>
+						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">我的数据</view>
+					</u-grid-item>
+					<u-grid-item @click="myReview" bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
+						<u-badge type="error" :count="totalTwo" style="margin-right: 30rpx;" />
+						<u-icon name="edit-pen" color="#fff" size="60"></u-icon>
+						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">我的审核</view>
+					</u-grid-item>
+					<u-grid-item @click="scanCode" bg-color="#ffffff00" style="background-color: rgba(0,0,0,0);">
+						<u-icon name="scan" color="#fff" size="60"></u-icon>
+						<view class="grid-text" style="color: #FFFFFF;margin-top: 10px;">扫一扫</view>
+					</u-grid-item>
+				</u-grid>
 			</view>
 			<!-- 正文内容 -->
 			<view class="content">
@@ -51,25 +54,29 @@
 					<u-grid-item @click="jumpPath(6)">
 						<u-icon name="lock" :size="46"></u-icon>
 						<view class="grid-text">海运费计算</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath(7)">
-						<u-icon name="camera" :size="46"></u-icon>
-						<view class="grid-text">巡检</view>
-					</u-grid-item>
-					<u-grid-item @click="jumpPath(8)">
-						<u-icon name="checkmark-circle" :size="46"></u-icon>
-						<view class="grid-text">我的采购</view>
+					</u-grid-item>
+					<u-grid-item @click="jumpPath(7)">
+						<u-icon name="camera" :size="46"></u-icon>
+						<view class="grid-text">巡检</view>
+					</u-grid-item>
+					<!-- <u-grid-item @click="jumpPath(8)">
+						<u-badge type="error" :count="total" />
+						<u-icon name="checkmark-circle" :size="46"></u-icon>
+						<view class="grid-text">我的采购</view>
 					</u-grid-item>
 					<u-grid-item @click="jumpPath('null')">
 						<u-icon name="grid" :size="46"></u-icon>
 						<view class="grid-text">其他</view>
-					</u-grid-item>
+					</u-grid-item> -->
 				</u-grid>
 			</view>
 			<view style="width: 96%;margin: 0 auto;">
 				<u-image width="100%" height="170rpx" src="../../static/activityDiagram.png"></u-image>
 			</view>
-			<view style="width: 96%;">
+			<view style="width: 96%;margin: 10rpx auto;">
+				<u-image width="100%" height="900rpx" src="../../static/image/advertisingMap.png"></u-image>
+			</view>
+			<view style="width: 96%;margin: 0 auto;height: 100rpx;">
 				<!-- <h1>全新功能正在开发中</h1> -->
 			</view>
 		</view>
@@ -92,13 +99,40 @@
 				},
 				actionStyle: {
 					color: '#fff'
-				}
+				},
+				deptName: '',
+				form: {
+					pageNum: 1,
+					pageSize: 10,
+					fBilltype: 'SQ',
+					fTakeOrders: 0
+				},
+				total: '',
+				totalTwo: ''
 			}
 		},
 		onShow() {
-			this.$nextTick(function() {
-				this.testUpgrade()
+			this.$nextTick(function() {
+				this.testUpgrade()
 			})
+			// this.deptName = uni.getStorageSync('deptName')
+			// if (this.deptName == '外部用户') {
+			// 	this.$u.get('/anPin/anPinApp/supplier', this.form).then(res => {
+			// 		this.dataList = res.rows
+			// 		this.total = res.total
+			// 	})
+			// } else {
+			// 	this.$u.get('/anPin/anPinApp/list', this.form).then(res => {
+			// 		this.dataList = res.rows
+			// 		this.total = res.total
+			// 	})
+			// }
+			// this.$u.get('/warehouse/paths/selectOrderAuditItems', {
+			// 	refno2: 'SQ',
+			// 	auditStatus: 'S'
+			// }).then(res => {
+			// 	this.totalTwo = res.data.length
+			// })
 		},
 		methods: {
 			testUpgrade() {
@@ -136,9 +170,9 @@
 						})
 						break;
 				}
-			},
-			myReview(){
-				this.$u.route('/pages/home/myReview/index');
+			},
+			myReview() {
+				this.$u.route('/pages/home/myReview/index');
 			},
 			myData() {
 				uni.showToast({

pages/home/myReview/index.vue

@@ -1,5 +1,10 @@
 <template>
 	<view>
+		<u-tabs :list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+		<!-- 时间选择组件 -->
+		<u-calendar v-model="show" max-date="2050" mode="range" :closeable="false" :mask-close-able="false" @change="changeTwo"></u-calendar>
+		<!-- 状态选择组件 -->
+		<u-action-sheet :list="listData" v-model="showTwo" :mask-close-able="false" @click="click" @close="close"></u-action-sheet>
 		<view v-for="(item,index) in dataList" :key="index"
 			style="box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);width: 96%;border-top-right-radius: 10rpx;margin: 10rpx auto;padding-top: 10rpx;">
 			<span
@@ -11,20 +16,34 @@
 			<view style="width: 90%;margin: 0 auto;margin: 0 auto;">
 				<view
 					style="display: flex;justify-content: space-between;height: 60rpx;line-height: 60rpx;border-bottom: 1rpx solid #eff4ff;">
-					<h4>委托方：{{item.refno3}}</h4>
+					<h4>系统编号：{{item.refno3}}</h4>
 				</view>
 				<view>
 					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
-						<view style="float: left;">业务类型</view>
-						<view style="float: right;">{{item.refno2}}</view>
+						<view style="float: left;">供应商</view>
+						<view style="float: right;">{{item.refno1}}</view>
 					</view>
 					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
-						<view style="float: left;">日期</view>
-						<view style="float: right;">{{item.sendTime}}</view>
+						<view style="float: left;">提货日期</view>
+						<view style="float: right;">{{item.fBsdate}}</view>
+					</view>
+					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
+						<view style="float: left;">项目名称</view>
+						<view style="float: right;">{{item.projectName}}</view>
+					</view>
+					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
+						<view style="float: left;">申请人</view>
+						<view style="float: right;">{{item.nickName}}</view>
+					</view>
+					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
+						<view style="float: left;">申请日期</view>
+						<view style="float: right;">
+							{{item.sendTime ? item.sendTime.slice(0,10) : item.sendTime}}
+						</view>
 					</view>
 					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
 						<view style="float: left;">审核人</view>
-						<view style="float: right;">{{item.auditUserName}}</view>
+						<view style="float: right;">{{item.nickName}}</view>
 					</view>
 					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
 						<view style="float: left;">审核日期</view>
@@ -32,10 +51,6 @@
 							{{item.auditOpTime ? item.auditOpTime.slice(0,10) : item.auditOpTime}}
 						</view>
 					</view>
-					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
-						<view style="float: left;">提交人</view>
-						<view style="float: right;">{{item.sendName}}</view>
-					</view>
 				</view>
 				<view
 					style="width: 100%;margin: 0 auto;height: 80rpx;margin: 0 auto;line-height: 80rpx;border-top: 1rpx solid #eff4ff;"
@@ -56,204 +71,175 @@
 	export default {
 		data() {
 			return {
-				dataList: []
+				dataList: [],
+				listData: [{
+					text: '全部',
+					value:null
+				},{
+					text: '提交',
+					value:'0'
+				}, {
+					text: '待审',
+					value:'S'
+				}, {
+					text: '审核退回',
+					value:'B'
+				}, {
+					text: '审核通过',
+					value:'A'
+				}],
+				showTwo:false,
+				show:false,
+				list: [{
+					name: '待审核'
+				}, {
+					name: '提货时间'
+				}, {
+					name: '状态'
+				}],
+				current: 0,
+				form:{
+					refno2: 'SQ',
+					auditStatus:'S'
+				}
 			}
 		},
-		// created() {
-		// 	this.$u.get('/warehouse/paths/selectAuditItems').then(res => {
-		// 		res.data.map((e) => {
-		// 			if (e.sendTime) {
-		// 				e.sendTime = e.sendTime.slice(0, 10);
-		// 			}
-		// 			if (e.refno2) {
-		// 				switch (e.refno2) {
-		// 					case "SJRK": {
-		// 						e.refno2 = "入库"
-		// 						break;
-		// 					}
-		// 					case "SJCK": {
-		// 						e.refno2 = "出库"
-		// 						break;
-		// 					}
-		// 					case "HQZY": {
-		// 						e.refno2 = "货转"
-		// 						break;
-		// 					}
-		// 					case "CKDB": {
-		// 						e.refno2 = "调拨"
-		// 						break;
-		// 					}
-		// 					case "HWTG": {
-		// 						e.refno2 = "货物通关"
-		// 						break;
-		// 					}
-		// 					case "JSCCF": {
-		// 						e.refno2 = "计算仓储费"
-		// 						break;
-		// 					}
-		// 					case "CCF": {
-		// 						e.refno2 = "仓储费"
-		// 						break;
-		// 					}
-		// 					case "ZYF": {
-		// 						e.refno2 = "作业费"
-		// 						break;
-		// 					}
-		// 					case "SF": {
-		// 						e.refno2 = "收费"
-		// 						break;
-		// 					}
-		// 					case "DZ": {
-		// 						e.refno2 = "对账"
-		// 						break;
-		// 					}
-		// 					case "FF": {
-		// 						e.refno2 = "付费"
-		// 						break;
-		// 					}
-		// 					case "SE": {
-		// 						e.refno2 = "下单配船"
-		// 						break;
-		// 					}
-		// 					case "ApplyFP": {
-		// 						e.refno2 = "凯合开票申请"
-		// 						break;
-		// 					}
-		// 					case "KHDZ": {
-		// 						e.refno2 = "凯合对账"
-		// 						break;
-		// 					}
-		// 					case "KHSF": {
-		// 						e.refno2 = "凯合收费"
-		// 						break;
-		// 					}
-		// 					case "KHFF": {
-		// 						e.refno2 = "凯合付费"
-		// 						break;
-		// 					}
-		// 					case "KHDD": {
-		// 						e.refno2 = "凯合订单"
-		// 						break;
-		// 					}
-		// 					case "XS": {
-		// 						e.refno2 = "销售出库"
-		// 						break;
-		// 					}
-		// 					case "SQ": {
-		// 						e.refno2 = "采购申请"
-		// 						break;
-		// 					}
-		// 					case "XMGL": {
-		// 						e.refno2 = "项目管理"
-		// 						break;
-		// 					}
-		// 					default: {
-		// 						return this.$message.error("未知错误，无状态");
-		// 					}
-		// 				}
-		// 			}
-		// 		})
-		// 		this.dataList = res.data
-		// 	})
-		// },
-		onShow() {
-			this.$u.get('/warehouse/paths/selectAuditItems').then(res => {
-				res.data.map((e) => {
-					if (e.sendTime) {
-						e.sendTime = e.sendTime.slice(0, 10);
-					}
-					if (e.refno2) {
-						switch (e.refno2) {
-							case "SJRK": {
-								e.refno2 = "入库"
-								break;
-							}
-							case "SJCK": {
-								e.refno2 = "出库"
-								break;
-							}
-							case "HQZY": {
-								e.refno2 = "货转"
-								break;
-							}
-							case "CKDB": {
-								e.refno2 = "调拨"
-								break;
-							}
-							case "HWTG": {
-								e.refno2 = "货物通关"
-								break;
-							}
-							case "JSCCF": {
-								e.refno2 = "计算仓储费"
-								break;
-							}
-							case "CCF": {
-								e.refno2 = "仓储费"
-								break;
-							}
-							case "ZYF": {
-								e.refno2 = "作业费"
-								break;
-							}
-							case "SF": {
-								e.refno2 = "收费"
-								break;
-							}
-							case "DZ": {
-								e.refno2 = "对账"
-								break;
-							}
-							case "FF": {
-								e.refno2 = "付费"
-								break;
-							}
-							case "SE": {
-								e.refno2 = "下单配船"
-								break;
-							}
-							case "ApplyFP": {
-								e.refno2 = "凯合开票申请"
-								break;
-							}
-							case "KHDZ": {
-								e.refno2 = "凯合对账"
-								break;
-							}
-							case "KHSF": {
-								e.refno2 = "凯合收费"
-								break;
-							}
-							case "KHFF": {
-								e.refno2 = "凯合付费"
-								break;
-							}
-							case "KHDD": {
-								e.refno2 = "凯合订单"
-								break;
-							}
-							case "XS": {
-								e.refno2 = "销售出库"
-								break;
-							}
-							case "SQ": {
-								e.refno2 = "采购申请"
-								break;
-							}
-							case "XMGL": {
-								e.refno2 = "项目管理"
-								break;
-							}
-							default: {
-								return this.$message.error("未知错误，无状态");
-							}
-						}
-					}
-				})
-				this.dataList = res.data
-			})
+		onShow() {
+			this.queryAudit()
 		},
 		methods: {
+			change(index) {
+				this.current = index
+				if(index == 1){
+					this.show = true
+				}else if(index ==2){
+					this.showTwo = true
+				}else{
+					this.form = {
+						refno2: 'SQ',
+						auditStatus:'S'
+					}
+					this.queryAudit(false)
+				}
+			},
+			changeTwo(e) {
+				console.log(e);
+				this.current = null
+				let data = [e.startDate,e.endDate]
+				this.form = {refno2: 'SQ',sendTimeList:data}
+				this.queryAudit()
+			},
+			click(index){
+				this.form = {
+					refno2: 'SQ',
+					auditStatus:this.listData[index].value
+				}
+				this.queryAudit()
+				this.current = null
+			},
+			close(){
+				this.current = null
+			},
+			queryAudit(e) {
+				// if(e == false) this.current = null
+				console.log(this.form)
+				this.$u.get('/warehouse/paths/selectOrderAuditItems', this.form).then(res => {
+					res.data.map((e) => {
+						if (e.sendTime) {
+							e.sendTime = e.sendTime.slice(0, 10);
+						}
+						if (e.refno2) {
+							switch (e.refno2) {
+								case "SJRK": {
+									e.refno2 = "入库"
+									break;
+								}
+								case "SJCK": {
+									e.refno2 = "出库"
+									break;
+								}
+								case "HQZY": {
+									e.refno2 = "货转"
+									break;
+								}
+								case "CKDB": {
+									e.refno2 = "调拨"
+									break;
+								}
+								case "HWTG": {
+									e.refno2 = "货物通关"
+									break;
+								}
+								case "JSCCF": {
+									e.refno2 = "计算仓储费"
+									break;
+								}
+								case "CCF": {
+									e.refno2 = "仓储费"
+									break;
+								}
+								case "ZYF": {
+									e.refno2 = "作业费"
+									break;
+								}
+								case "SF": {
+									e.refno2 = "收费"
+									break;
+								}
+								case "DZ": {
+									e.refno2 = "对账"
+									break;
+								}
+								case "FF": {
+									e.refno2 = "付费"
+									break;
+								}
+								case "SE": {
+									e.refno2 = "下单配船"
+									break;
+								}
+								case "ApplyFP": {
+									e.refno2 = "凯合开票申请"
+									break;
+								}
+								case "KHDZ": {
+									e.refno2 = "凯合对账"
+									break;
+								}
+								case "KHSF": {
+									e.refno2 = "凯合收费"
+									break;
+								}
+								case "KHFF": {
+									e.refno2 = "凯合付费"
+									break;
+								}
+								case "KHDD": {
+									e.refno2 = "凯合订单"
+									break;
+								}
+								case "XS": {
+									e.refno2 = "销售出库"
+									break;
+								}
+								case "SQ": {
+									e.refno2 = "采购申请"
+									break;
+								}
+								case "XMGL": {
+									e.refno2 = "项目管理"
+									break;
+								}
+								default: {
+									return this.$message.error("未知错误，无状态");
+								}
+							}
+						}
+					})
+					this.dataList = res.data
+				})
+
+			},
 			expenseDetails(item) {
 				switch (item.refno4) {
 					case 'SQ':

pages/home/patrolInspection/index.vue

@@ -24,7 +24,7 @@
 					</view>
 					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
 						<view style="float: left;">备注</view>
-						<view style="float: right;">{{item.remark}}</view>
+						<view style="float: right;">{{item.fRemark}}</view>
 					</view>
 				</view>
 				<view style="width: 100%;margin: 0 auto;height: 80rpx;margin: 0 auto;line-height: 80rpx;border-top: 1rpx solid #eff4ff;"
@@ -134,7 +134,8 @@
 					this.dataList = []
 					this.query()
 				}
-				if (index === 0) {
+				if (index === 0) {
+					this.dataList = []
 					this.form = {
 						pageNum: 1,
 						pageSize: 10

pages/home/patrolInspection/patrolDetails.vue

@@ -29,7 +29,7 @@
 					</view>
 					<view style="width: 100%;height: 60rpx;line-height: 60rpx;">
 						<view style="float: left;">备注</view>
-						<view style="float: right;">{{form.remark}}</view>
+						<view style="float: right;">{{form.fRemark}}</view>
 					</view>
 				</view>
 				<!-- <view style="width: 100%;margin: 0 auto;height: 80rpx;margin: 0 auto;line-height: 80rpx;border-top: 1rpx solid #eff4ff;" @click="expenseDetails(item)">

pages/home/procurementApplicationApproval/index.vue

@@ -5,7 +5,7 @@
 		</view>
 		<u-action-sheet :list="whetherList" v-model="whetherShow" @click="whetherClick" @close="whetherClose">
 		</u-action-sheet>
-		<u-calendar v-model="timeInterval" mode="range" max-date="2050" @change="timeIntervalChange" :mask-close-able="false" :closeable="false"></u-calendar>
+		<u-calendar v-model="timeInterval" mode="date" max-date="2050" @change="timeIntervalChange" :mask-close-able="false" :closeable="false"></u-calendar>
 		<view v-for="(item,index) in dataList" :key="index" style="box-shadow: 0px 0px 8px 0px rgba(165, 189, 251, 0.4);width: 96%;border-top-right-radius: 10rpx;margin: 10rpx auto;padding-top: 10rpx;">
 			<span style="width: 10rpx;height: 40rpx;background-color: #2979ff;display: block;float: left;margin-top: 10rpx;"></span>
 			<h4 style="width: 140rpx;border-radius: 200rpx;text-align: center;color: #2979ff;border: 2rpx solid #1785FF;float: right;margin-right: 10rpx;margin-top: 10rpx;">
@@ -58,7 +58,8 @@
 			</view>
 		</view>
 		<u-loadmore v-if="total > 0" :status="status" :icon-type="iconType" :load-text="loadText" />
-		<u-empty v-else style="width: 50%;
+		<u-empty v-else style="
+			width: 50%;
 			margin: 0 auto;
 			height: 220rpx;
 			align-items: center;
@@ -75,6 +76,9 @@
 			return {
 				timeInterval: false,
 				whetherList: [{
+					text: '全部',
+					value: null
+				},{
 					text: '待接单',
 					value: 0
 				}, {
@@ -86,7 +90,7 @@
 				}],
 				whetherShow: false,
 				list: [{
-					name: '全部'
+					name: '待接单'
 				}, {
 					name: '是否接单'
 				}, {
@@ -103,7 +107,9 @@
 				},
 				form: {
 					pageNum: 1,
-					pageSize: 5,
+					pageSize: 10,
+					fBilltype: 'SQ',
+					fTakeOrders:0
 				},
 				iconType: 'flower',
 				deptName: ''
@@ -133,7 +139,9 @@
 				} else if (index == 0) {
 					this.form = {
 						pageNum: 1,
-						pageSize: 10,
+						pageSize: 10,
+						fBilltype: 'SQ',
+						fTakeOrders:0
 					}
 					this.dataList = []
 					this.query()
@@ -143,7 +151,8 @@
 				this.form = {
 					pageNum: 1,
 					pageSize: 10,
-					timeInterval:[e.startDate,e.endDate]
+					fBilltype: 'SQ',
+					fBsdate:e.result
 				}
 				this.dataList = []
 				this.current = null;
@@ -152,7 +161,8 @@
 			whetherClick(index) {
 				this.form = {
 					pageNum: 1,
-					pageSize: 10,
+					pageSize: 10,
+					fBilltype: 'SQ',
 					fTakeOrders: this.whetherList[index].value
 				}
 				this.dataList = []

pages/login/login.vue

@@ -96,7 +96,7 @@
 				this.$u.vuex('vuex_token', this.lifeData.vuex_token);
 				// console.log(this.vuex_token)
 				this.$u.get('/getInfo').then(res => {
-					// console.log(res)
+					console.log(res.user.dept.deptName)
 					uni.setStorageSync('deptName', res.user.dept.deptName);
 					uni.setStorageSync('userId', res.user.userId);
 					//跳转页面为tabBar页面