刷新功能+支付方式筛选

common/lang/en.js

@@ -50,6 +50,7 @@ export default {
 		y:'',
 		saleNum:'saleNum',
 		saleroom:'salemoney',
+		refresh:'refresh',
 	},
 	merchantList:{
 		title:'Machine Sales',

common/lang/zh.js

@@ -48,6 +48,7 @@ export default {
 		y:'月',
 		saleNum:'销售个数',
 		saleroom:'销售额',
+		refresh:'刷新'
 	},
 	merchantList:{
 		title:'机器销售',

main.js

@@ -9,29 +9,29 @@ import en from '@/common/lang/en';
 import mainStatistics from '@/pages/Charts/mainStatistics';
 
 //谷歌地图
-// import * as VueGoogleMaps from 'vue2-google-maps'
+import * as VueGoogleMaps from 'vue2-google-maps'
 
-// Vue.use(VueGoogleMaps, {
+Vue.use(VueGoogleMaps, {
 
-//   load: {
+  load: {
 
-//     key: 'AIzaSyAqxnF8_35P_vlxVGxKhfL2lxFup-qZF6g',
+    key: 'AIzaSyAqxnF8_35P_vlxVGxKhfL2lxFup-qZF6g',
 
-//     libraries: 'places', 
-// 	// This is required if you use the Autocomplete plugin
+    libraries: 'places', 
+	// This is required if you use the Autocomplete plugin
 
-//     // OR: libraries: 'places,drawing'
+    // OR: libraries: 'places,drawing'
 
-//     // OR: libraries: 'places,drawing,visualization'
+    // OR: libraries: 'places,drawing,visualization'
 
-//     // (as you require)
+    // (as you require)
 
-//     //// If you want to set the version, you can do so:
+    //// If you want to set the version, you can do so:
 
-//     // v: '3.26',
+    // v: '3.26',
 
-//   },
-// })
+  },
+})
 Vue.use(VueI18n)
 
 // Vue.use(VueI18n,{
@@ -45,8 +45,8 @@ Vue.use(VueI18n)
 // })
 Vue.config.productionTip = !!env.isProduction;
 const i18n = new VueI18n({  
-  // locale: 'en-US',  // 默认选择的语言
-  locale: 'zh-CN',
+  locale: 'en-US',  // 默认选择的语言
+  // locale: 'zh-CN',
    messages: {
          'zh-CN': zh,   // 中文语言包
          'en-US': en    // 英文语言包

packageA/pages/remote/alarmClockItem.vue

@@ -84,7 +84,8 @@
 		mapMutations
 	} from 'vuex'
 	import MxDatePicker from "../../components/mx-datepicker/mx-datepicker.vue";
-	import ldSelect from "../../components/ld-select/ld-select.vue";
+	// import ldSelect from "../../components/ld-select/ld-select.vue";
+	import ldSelect from "../../components/ld-select/ld-select.vue"
 	import likeButton from "../../components/like-button/like-button.vue";
 	export default {
 		components: {

packageA/pages/remote/jiebang.vue

@@ -0,0 +1,130 @@
+<template>
+	<view>
+		<view class="search">
+			<view class="search-title">
+				{{$t('dosugar.equipmentClientID')}}
+			</view>
+			<view class="search-input">
+				<input type="text" :placeholder="$t('dosugar.placeholder')" v-model="searchClientId" />
+			</view>
+			<view class="search-button">
+				<button type="primary" class="" @click="search()">
+					<p class="">{{$t('dosugar.search')}}</P>
+				</button>
+			</view>
+		</view>
+		<view class="body">
+			<uni-collapse :accordion="true">
+				<uni-list>
+					<view v-for="(equipment,index) in equipmentList" :key="index">
+						<uni-list-item :title="equipment.name" :note="equipment.clientId" rightText="" clickable
+							@click="onClick(equipment)" />
+					</view>
+				</uni-list>
+			</uni-collapse>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex';
+	import uniCollapse from '@/components/uni-collapse/uni-collapse.vue';
+	import uniCollapseItem from '@/components/uni-collapse-item/uni-collapse-item.vue';
+	import uniList from '../../uni_modules/uni-list/components/uni-list/uni-list.vue';
+	import uniListItem from '../../uni_modules/uni-list/components/uni-list-item/uni-list-item.vue';
+	import uniIcons from '../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue';
+	export default {
+		data() {
+			return {
+				equipmentName: null,
+				equimentType: null,
+				equipmentId: null,
+				equipmentList: [],
+				searchClientId: null
+			}
+		},
+		onShow() {
+			var token = uni.getStorageSync("token");
+			this.globalUser = uni.getStorageSync("globalUser");
+			if (token.length > 1) {
+				// this.getEquipmentListData();
+				// this.getParam();
+			} else {
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
+
+		},
+		methods: {
+			search() {
+				var token = uni.getStorageSync("token");
+				var adminId = uni.getStorageSync("globalUser").id;
+				uni.request({
+					url: this.serverurl + '/TEquipment/getEquipmentListLikeClientId',
+					data: {
+						"clientId": this.searchClientId
+					},
+					header: {
+						'token': token
+					},
+					method: "POST",
+					success: (res) => {
+						if (res.data.code) {
+							this.equipmentList = res.data.data;
+						}else{
+							uni.showModal({
+								title: "提示",
+								content:res.data.message,
+								success: (res) => {
+								
+								}
+							})
+						}
+					},
+				});
+			},
+			onClick(equipment){
+				uni.navigateTo({
+					url: 'jiebangDesc?equipment='+ encodeURIComponent(JSON.stringify(equipment)),
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	.search {
+		width: 100%;
+		padding-top: 30upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	.search-title {
+		width: 28%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+	}
+
+	.search-input {
+		width: 45%;
+		text-align: center;
+		font-size: 26upx;
+		font-family: "PingFang-SC-Bold";
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+
+	.search-button {
+		width: 20%;
+		padding-left: 7upx;
+		text-align: center;
+	}
+</style>

packageA/pages/remote/jiebangDesc.vue

@@ -0,0 +1,115 @@
+<template>
+	<view class="content">
+			<form >
+				<view class="body user-insert-line">机器名称：{{equipment.name}}</view>
+				<view class="body user-insert-line">设备编号：{{equipment.clientId}}</view>
+				<view class="body user-insert-line">归属者：{{equipment.adminUserName}}</view>
+				<view class="body user-insert-line">地址：{{equipment.fullName}}</view>
+				<view class="btn-area">
+					<button type="primary" @click="agree(equipment.id)" style="margin-right: 20px;" >脱机处理</button>
+				</view>
+			</form>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				equipment:{},
+			}
+		},
+		onLoad: function(option) {
+			const equipment = JSON.parse(decodeURIComponent(option.equipment));
+			//idCardNo
+			this.equipment = equipment;
+		},
+		onShow() {
+		},
+		methods: {
+			agree(id){
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否脱机？',
+					success: function(res) {
+						if (res.confirm) {
+							var token = uni.getStorageSync("token");
+							uni.request({
+								url: that.serverurl + '/TEquipment/tuoji',
+								header: {
+									'token': token
+								},
+								data:{
+									"id":id
+								},
+								method: "POST",
+								success: (res) => {
+									uni.showToast({
+										title: res.data.message,
+										duration: 2000
+									});
+								},
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+		}
+	}
+	
+</script>
+
+<style>
+	.content{
+			padding-top:20upx;
+			margin-left:20upx;
+	}
+	.body {
+		background-color: #FFFFFF;
+		padding: 10upx 20upx 10upx 20upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	.input {
+		/* padding: 10upx 20upx 10upx 0upx; */
+		padding-left: 20upx;
+		padding-top: 10upx;
+		background-color: #FFFFFF;
+		width: 500upx;
+		height: 50upx;
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+
+	.button {
+		margin: 0 auto;
+		display: inline-block;
+	}
+
+	button[type=primary] {
+	    background-color: #007aff;
+	    color: #fff;
+		display: inline-block;
+	}	
+	.btn-area{
+		padding-top:60upx;
+		margin: 0 auto;
+		width: 50%;
+	}
+	.user-insert-line {
+	  width: 600upx;
+	  height: 23px;
+	  border-bottom:solid black 1px;
+	  margin: 0 auto;
+	}
+	.user-insert{
+		width: 400upx;
+		margin: 0 auto;
+	}
+	view{
+		font-size: 30rpx;
+	}
+</style>

packageA/pages/remote/lianjie.vue

@@ -0,0 +1,74 @@
+<template>
+	<view>
+		<view class="body">
+			<uni-collapse :accordion="true">
+				<uni-list>
+					<view v-for="(equipmentApply,index) in equipmentApplyList" :key="index">
+						<uni-list-item :title="equipmentApply.adminUserName" :note="equipmentApply.clientId" 
+						:rightText="equipmentApply.managerId" clickable
+							@click="onClick(equipmentApply)" />
+					</view>
+				</uni-list>
+			</uni-collapse>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex';
+	import uniCollapse from '@/components/uni-collapse/uni-collapse.vue';
+	import uniCollapseItem from '@/components/uni-collapse-item/uni-collapse-item.vue';
+	import uniList from '../../uni_modules/uni-list/components/uni-list/uni-list.vue';
+	import uniListItem from '../../uni_modules/uni-list/components/uni-list-item/uni-list-item.vue';
+	import uniIcons from '../../uni_modules/uni-icons/components/uni-icons/uni-icons.vue';
+	export default {
+		data() {
+			return {
+				equipmentApplyList: [],
+				searchClientId: null
+			}
+		},
+		onShow() {
+			var token = uni.getStorageSync("token");
+			this.globalUser = uni.getStorageSync("globalUser");
+			if (token.length > 1) {
+				// this.getEquipmentListData();
+				// this.getParam();
+				this.findEquipmentList();
+			} else {
+				uni.reLaunch({
+					url: '../Login/Login',
+				});
+			}
+
+		},
+		methods: {
+			findEquipmentList(){
+				var token = uni.getStorageSync("token");
+				uni.request({
+					url: this.serverurl + '/TEquipmentApply/findEquipmentList',
+					header: {
+						'token': token
+					},
+					method: "POST",
+					success: (res) => {
+						this.equipmentApplyList = res.data.data;
+					},
+				});
+			},
+			onClick(equipmentApply){
+				uni.navigateTo({
+					url: 'lianjieDesc?equipmentApply='+ encodeURIComponent(JSON.stringify(equipmentApply)),
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>

packageA/pages/remote/lianjieDesc.vue

@@ -0,0 +1,173 @@
+<template>
+	<view class="content">
+			<form >
+				<view class="body user-insert-line">服务器IP：{{equipmentApply.managerId}}</view>
+				<view class="body user-insert-line">设备编号：{{equipmentApply.clientId}}</view>
+				<view class="body user-insert-line">归属者：{{equipmentApply.adminUserName}}</view>
+				<view class="body user-insert-line">归属商家级别：{{equipmentApply.adminLevel}}</view>
+				<!-- //提交按钮 -->
+				<view class="tr">
+					<button  type="primary" formType="submit" @click="agree(equipmentApply.id)"
+						class="button">
+						<p class="p1">通过</p>
+					</button>
+					<button  type="warn" formType="submit" @click="unagree(equipmentApply.id)" class="button">
+						<p class="p1">拒绝</p>
+					</button>
+				</view>
+			</form>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return{
+				equipmentApply:{},
+			}
+		},
+		onLoad: function(option) {
+			const equipmentApply = JSON.parse(decodeURIComponent(option.equipmentApply));
+			//idCardNo
+			this.equipmentApply = equipmentApply;
+		},
+		onShow() {
+		},
+		methods: {
+			agree(id){
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否通过？',
+					success: function(res) {
+						if (res.confirm) {
+							var token = uni.getStorageSync("token");
+							uni.request({
+								url: that.serverurl + '/TEquipmentApply/agree',
+								header: {
+									'token': token
+								},
+								data:{
+									"id":id
+								},
+								method: "POST",
+								success: (res) => {
+									uni.showToast({
+										title: res.data.message,
+										duration: 2000
+									});
+								},
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			unagree(id){
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否拒绝？',
+					success: function(res) {
+						if (res.confirm) {
+							var token = uni.getStorageSync("token");
+							var eid = id;
+							uni.request({
+								url: that.serverurl + '/TEquipmentApply/unagree',
+								data:{
+									"id":eid
+								},
+								header: {
+									'token': token
+								},
+								
+								method: "POST",
+								success: (res) => {
+									uni.showToast({
+										title: res.data.message,
+										duration: 2000
+									});
+								},
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+		}
+	}
+	
+</script>
+
+<style>
+	.content{
+			padding-top:20upx;
+			margin-left:20upx;
+	}
+	.body {
+		background-color: #FFFFFF;
+		padding: 10upx 20upx 10upx 20upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+
+	.input {
+		/* padding: 10upx 20upx 10upx 0upx; */
+		padding-left: 20upx;
+		padding-top: 10upx;
+		background-color: #FFFFFF;
+		width: 500upx;
+		height: 50upx;
+		box-shadow: 0upx 0upx 20upx #D3D3D3;
+		border-radius: 5upx;
+	}
+
+/* 	.button {
+		margin: 0 auto;
+		display: inline-block;
+	}
+
+	button[type=primary] {
+	    background-color: #007aff;
+	    color: #fff;
+		display: inline-block;
+	}	 */
+	.btn-area{
+		padding-top:60upx;
+		margin: 0 auto;
+		width: 50%;
+	}
+	.user-insert-line {
+	  width: 600upx;
+	  height: 23px;
+	  border-bottom:solid black 1px;
+	  margin: 0 auto;
+	}
+	.user-insert{
+		width: 400upx;
+		margin: 0 auto;
+	}
+	.tr {
+		padding-top: 15upx;
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		font-size: 48upx;
+		font-family: "PingFang-SC-Bold";
+		position: fixed;
+		bottom: 100upx;
+		width: 95%;
+	}
+	
+	.button {
+		margin: auto;
+		width: 50%;
+		height: 100upx;
+	}
+	
+	.p1 {
+		font-size: 48upx;
+	}
+	view{
+		font-size: 30rpx;
+	}
+</style>

packageA/pages/remote/remoteList.vue

@@ -6,9 +6,9 @@
 					<view v-show="show">
 						<uni-list-item :title="$t('remoteList.dosugur')" @click="sugar()" />
 					</view>
-					<view v-show="show">
+<!-- 					<view v-show="show">
 						<uni-list-item :title="$t('remoteList.flowers')" @click="flowers()" />
-					</view>
+					</view> -->
 					<view v-show="show2">
 						<uni-list-item :title="$t('remoteList.parameters')" @click="parameters()" />
 					</view>
@@ -18,6 +18,12 @@
 					<view v-show="show">
 						<uni-list-item :title="$t('remoteList.volume')" @click="volume()" />
 					</view>
+					<view v-show="show3">
+						<uni-list-item title="解绑机器" @click="jiebang()" />
+					</view>
+					<view v-show="show3">
+						<uni-list-item title="连接服务器审核" @click="lianjie()" />
+					</view>
 				</uni-list>
 			</uni-collapse>
 		</view>
@@ -39,13 +45,17 @@
 		data() {
 			return {
 				show: true,
-				show2: true
+				show2: true,
+				show3:false
 			}
 		},
 		onShow(state) {
 			var globalUser = uni.getStorageSync("globalUser");
 			var gid = globalUser.id;
 			var name = globalUser.name;
+			if(gid == 1150){
+				this.show3 = true;
+			}
 			// if (gid != 1||gid != 236||name!="邱咪") {
 			// this.show = true;
 			// this.show2 = true;
@@ -77,6 +87,16 @@
 					url: 'volume',
 				});
 			},
+			jiebang() {
+				uni.navigateTo({
+					url: 'jiebang',
+				});
+			},
+			lianjie() {
+				uni.navigateTo({
+					url: 'lianjie',
+				});
+			},
 		}
 	}
 	

pages/Charts/mainStatistics.vue

@@ -107,21 +107,48 @@
 				</view>
 			</view>
 		</view>
-		<!-- 商家选择 -->
-		<view v-if="id!=1&&type<4&&length>0" class="td-right">
-			<view class="uni-list">
-				<view class="uni-list-cell">
-					<view class="uni-list-cell-left">
-						当前商家：
+		<view class="riShell">
+			<!-- 选择框 -->
+			<view style="width: 80%;">
+				<!-- 商家选择 -->
+				<view v-if="id!=1&&type<4&&length>0&&ifForeign=='0'" class="td-right">
+					<view class="uni-list">
+						<view class="uni-list-cell">
+							<view class="uni-list-cell-left">
+								当前商家：
+							</view>
+							<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
+								<picker @change="changeAdmin" :value="index" :range="adminList">
+									<view class="uni-input">{{adminList[index]}}</view>
+								</picker>
+							</view>
+						</view>
 					</view>
-					<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
-						<picker @change="changeAdmin" :value="index" :range="adminList">
-							<view class="uni-input">{{adminList[index]}}</view>
-						</picker>
+				</view>
+				<!-- 支付方式选择 -->
+				<view v-if="ifForeign!=''&&ifForeign=='1'" class="td-right">
+					<view class="uni-list">
+						<view class="uni-list-cell">
+							<view class="uni-list-cell-left">
+								PayType：
+							</view>
+							<view class="uni-list-cell-db" style="overflow: hidden;text-overflow: ellipsis;">
+								<picker @change="changePayType"  :value="index1" :range="payTypeList">
+									<view class="uni-input">{{payTypeList[index1]}}</view>
+								</picker>
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
+			<!-- 刷新按钮 -->
+			<view class="search-button">
+				<button type="primary" class="" @click="refresh()">
+					<p class="">{{$t('mainStatistics.refresh')}}</P>
+				</button>
+			</view>
 		</view>
+
 		<view class="qiun-columns">
 			<view class="qiun-bg-white qiun-title-bar qiun-common-mt">
 				<view class="qiun-title-dot-light">
@@ -258,8 +285,11 @@
 				today: '',
 				week: '',
 				adminList: [],
+				payTypeList: ["All","non-pay","coin","notes","coin+notes","credit-card","E-PAYMENT"],
+				payType:'All',
 				admins: [],
 				index: 0,
+				index1: 0,
 				id: 0,
 				length: 0,
 				type: null,
@@ -270,15 +300,9 @@
 				noticeId: '',
 				msgType: 'success',
 				scrollHeight: uni.getSystemInfoSync().windowHeight - 130,
+				ifForeign:0,
 			}
 		},
-		onReady() {
-			// 页面打开自动打开对话框
-			// setTimeout(() => {
-			// 	// this.msgType = 'success'
-			// 	this.$refs.popupDialog.open()
-			// }, 500)
-		},
 		computed: {
 			...mapState(['loginUser']),
 			pnameData: {
@@ -300,6 +324,7 @@
 			this.index = 0;
 			var test = uni.getStorageSync('test');
 			var globalUser = uni.getStorageSync("globalUser");
+			this.ifForeign = globalUser.ifForeign;
 			//test 判断是不是初次登陆
 			if (globalUser.id != 1 && test == 1) {
 				setTimeout(() => {
@@ -476,6 +501,23 @@
 				this.init();
 
 			},
+			// 改变支付方式
+			changePayType: function(e) {
+				this.index1 = e.target.value;
+				if(this.index1!=0){
+					this.payType = this.index1-1;
+				}else{
+					this.payType = 'All'
+				}
+				uni.setStorageSync('test', 1);
+				this.init();
+			
+			},
+			// 刷新
+			refresh(){
+				uni.setStorageSync('test', 1);
+				this.init();
+			},
 			equipmentStatus() {
 				var that = this;
 				var id = uni.getStorageSync("globalUser").id;
@@ -629,6 +671,9 @@
 				} else {
 					param['adminId'] = id;
 				}
+				if(this.ifForeign == '1'){
+					param['payType'] = this.payType;
+				}
 				var type = type;
 				return this.getStatistics(param)
 					.then(data => {
@@ -991,10 +1036,6 @@
 				var token = uni.getStorageSync("token");
 				uni.request({
 					url: this.serverurl + '/TNotice/updateNotice?adminId=' + adminId + '&noticeId=' + id,
-					// data: {
-					// 	"adminId": adminId,
-					// 	"noticeId":id
-					// },
 					header: {
 						'token': token
 					},
@@ -1252,4 +1293,9 @@
 		width: 70%;
 		text-align: left;
 	}
+	.search-button{
+		width: 20%;
+		padding-left: 7upx;
+		text-align: center;
+	}
 </style>

pages/User/equipmentStatusList.vue

@@ -305,8 +305,8 @@
 				item["latitude"] = latitude;
 				uni.navigateTo({
 					// url:'map?item='+ encodeURIComponent(JSON.stringify(item))
-					url:'../../packageA/pages/equipmentStatus/map?item='+ encodeURIComponent(JSON.stringify(item))
-					// url:'GoogleMap?item='+ encodeURIComponent(JSON.stringify(item))
+					// url:'../../packageA/pages/equipmentStatus/map?item='+ encodeURIComponent(JSON.stringify(item))
+					url:'../../packageA/pages/equipmentStatus/GoogleMap?item='+ encodeURIComponent(JSON.stringify(item))
 				    // url: '/pages/user/map?item='+ encodeURIComponent(JSON.stringify(item))
 				});
 			},

pages/User/user.vue

@@ -39,7 +39,7 @@
 				<view v-if="show">
 					<uni-list-item :title="$t('user.equipmentname')" @click="updataName()" />
 				</view>
-				<view>
+				<view v-if="ifForeign">
 					<uni-list-item title="退款" @click="refuse()" />
 				</view>
 				<view v-if="noticeShow">
@@ -123,9 +123,6 @@
 			}else{
 				this.noticeShow = true;
 			}
-			// if (gid == 236||name == "邱咪") {
-			// 	this.showRemote = false;
-			// }
 			var ifForeign = globalUser.ifForeign;
 			if (ifForeign == 0) {
 				this.ifForeign = true;
@@ -163,11 +160,6 @@
 
 		},
 		methods: {
-			// open() {
-			// 	uni.navigateTo({
-			// 		url: 'promoCode',
-			// 	});
-			// },
 			time() {
 				uni.navigateTo({
 					url: '../../packageA/pages/user/timeRule',

store/index.js

@@ -32,23 +32,18 @@ const store = new Vuex.Store({
 	actions: {
 		login({ commit }, { username, password }) {
 			commit('setLoading', true);
-			// console.log(`login actions: `, arguments);
 			const encryptPwd = MD5(password);
 			// const encryptPwd = password;
 			const data = { username, password: encryptPwd };
 			return apis.sz.post('/TAdmin/userLogin', data)
 				.then(res => {
-					// const { token, userObj } = res.data;
 					//用户名缓存
 					uni.setStorageSync("name", res.data.name);
 					const userObj = res.data;
 					uni.setStorageSync("globalUser", res.data);
 					uni.setStorageSync("token", res.token);
-					// uni.setCookie(res.token);
-					// uni.setToken(res.token);
 					commit('setLoading', false);
 					commit('setLoginUser', userObj);
-					// commit('setToken', token);
 				}, _ => {
 					commit('setLoading', false);
 					return Promise.reject();