Procházet zdrojové kódy

Merge remote-tracking branch 'origin/master'

吴洪双 před 5 roky
rodič
revize
e784af7946

+ 1 - 0
pages/Charts/equipmentStatistics.vue

@@ -293,6 +293,7 @@
 		},
 		onShow() {
 			uni.setNavigationBarTitle({title: this.$t('equipmentStatics.title')});
+			uni.setTabBarItem({ index: 2,text: this.$t('tabs.tab3')});
 			this.tese = this.tese + 1;
 			var globalUser = uni.getStorageSync("globalUser");
 			if (globalUser.id == '1') {

+ 1 - 0
pages/Charts/mainStatistics.vue

@@ -227,6 +227,7 @@
 		// },
 		onShow() {
 			uni.setNavigationBarTitle({title: this.$t('mainStatistics.title')});
+			uni.setTabBarItem({ index: 0,text: this.$t('tabs.tab1')});
 			// console.log("onShow");
 			var test = uni.getStorageSync('test');
 			//判断是不是初次登陆

+ 1 - 0
pages/User/equipmentStatusList.vue

@@ -165,6 +165,7 @@
 		onShow() {
 			this.globalUser = uni.getStorageSync("globalUser");
 			uni.setNavigationBarTitle({title: this.$t('equipmentStatusList.title')});
+			uni.setTabBarItem({ index: 3,text: this.$t('tabs.tab4')});
 			this.getEquipmentListData();
 		},
 		methods: {

+ 1 - 0
pages/User/merchantList.vue

@@ -60,6 +60,7 @@
 		},
 		onShow() {
 			uni.setNavigationBarTitle({title: this.$t('merchantList.title')});
+			uni.setTabBarItem({ index: 1,text: this.$t('tabs.tab2')});
 			this.globalUser = uni.getStorageSync("globalUser");
 			this.id = this.globalUser.id;
 			this.getEquipmentListData();

+ 17 - 10
pages/User/user.vue

@@ -21,8 +21,8 @@
 		</view>
 		<view class="">
 			<uni-list>
-				<view v-if="Aid!='1'">
-					<view v-if="ifForeign!='1'">
+				<view v-if="ifForeign">
+					<view v-if="gid">
 						<uni-list-item title="优惠码" @click="open()" />
 					</view>
 				</view>
@@ -58,11 +58,11 @@
 			return {
 				name: '',
 				show: false,
-				isForeign: 0,
+				ifForeign: false,
 				listName: [],
 				value: null,
 				id: null,
-				Aid: null,
+				gid: false,
 				parm: {
 					name: null,
 					id: null
@@ -80,20 +80,27 @@
 		},
 		onShow() {
 			uni.setNavigationBarTitle({title: this.$t('user.title')});
+			 uni.setTabBarItem({ index: 4,text: this.$t('tabs.tab5')});
 			// uni.startPullDownRefresh();
 			var globalUser = uni.getStorageSync("globalUser");
-			this.Aid = globalUser.id;
+			var gid = globalUser.id;
+			if(gid!=1){
+				this.gid = true;
+			}
 			var ifForeign = globalUser.ifForeign;
-			this.ifForeign = ifForeign;
-			var me = this;
+			if(ifForeign==0){
+				this.ifForeign = true;
+			}
+			
+			// var me = this;
 			var name = uni.getStorageSync("name");
-			me.name = name;
+			this.name = name;
 			var listName = uni.getStorageSync("listName");
-			me.listName = listName;
+			this.listName = listName;
 			if (listName != '' && listName != null) {
 				var adminId = listName[0].adminId;
 				if (adminId != '1' && adminId != null) {
-					me.show = true;
+					this.show = true;
 				}
 			}
 			var newparm = uni.getStorageSync("newparm");