jf 5 лет назад
Родитель
Сommit
e7638bf70d
2 измененных файлов с 68 добавлено и 47 удалено
  1. 35 26
      ghsApp/src/admin/home/workbench.vue
  2. 33 21
      ghsApp/src/mixins/priceSocket.js

+ 35 - 26
ghsApp/src/admin/home/workbench.vue

@@ -302,37 +302,46 @@ export default {
 		uni.stopPullDownRefresh();
 		uni.stopPullDownRefresh();
 	},
 	},
 	onShow() {
 	onShow() {
-		this.init();
+		// this.init();
 	},
 	},
 	methods: {
 	methods: {
 		init() {
 		init() {
-			getUser().then(res => {
-				uni.setNavigationBarTitle({
-					title: res.name
+			if(!uni.getStorageSync('token')){
+				setTimeout(()=>{
+					this.init();
+				},200);
+			}else{
+				getUser().then(res => {
+					uni.setNavigationBarTitle({
+						title: res.name
+					});
+
+					let nowTime = getDataTimestamp(new Date(), true);
+					if (nowTime > res.setDeadline) {
+						this.renewMask = true;
+					}
 				});
 				});
+				consoleIndex().then(res => {
+					this.data = res.data;
+					const { asset, todayData } = res.data;
+					if (!this.$util.isEmpty(asset)) {
+						// 订单总览
+						this.orderData[0].value = asset.unPayOrder;
+						this.orderData[1].value = asset.unSendOrder;
+						this.orderData[2].value = asset.sendingOrder;
+						// 总览数据
+						this.totalData[0].value = asset.totalUser;
+						this.totalData[1].value = asset.totalView;
+						this.totalData[2].value = asset.finishOrder;
+						this.totalData[3].value = asset.totalIncome;
+						this.totalData[4].value = asset.totalExpend;
+						this.totalData[5].value = asset.totalPurchase;
+					}
+				});
+			}
+
+
 
 
-				let nowTime = getDataTimestamp(new Date(), true);
-				if (nowTime > res.setDeadline) {
-					this.renewMask = true;
-				}
-			});
-			consoleIndex().then(res => {
-				this.data = res.data;
-				const { asset, todayData } = res.data;
-				if (!this.$util.isEmpty(asset)) {
-					// 订单总览
-					this.orderData[0].value = asset.unPayOrder;
-					this.orderData[1].value = asset.unSendOrder;
-					this.orderData[2].value = asset.sendingOrder;
-					// 总览数据
-					this.totalData[0].value = asset.totalUser;
-					this.totalData[1].value = asset.totalView;
-					this.totalData[2].value = asset.finishOrder;
-					this.totalData[3].value = asset.totalIncome;
-					this.totalData[4].value = asset.totalExpend;
-					this.totalData[5].value = asset.totalPurchase;
-				}
-			});
 		},
 		},
 		// 跳转
 		// 跳转
 		pageToFn(item) {
 		pageToFn(item) {

+ 33 - 21
ghsApp/src/mixins/priceSocket.js

@@ -10,28 +10,40 @@ export default {
 		};
 		};
 	},
 	},
 	onLaunch() {
 	onLaunch() {
-		this.priceSocket = new SocketUtil({
-			onOpen: () => {},
-			onMessage: data => {
-				let type = data.type || "";
-				switch (type) {
-					case "init":
-						let clientId = data.client_id;
+		this.priceSocketFun();
 
 
-						initSocket(clientId);
-						break;
-					case "money":
-						//到账消息    data:  {type: "money", msg: "微信到账1.2", money: 1.2}
-						console.log(data);
+	},
+	methods:{
+		priceSocketFun(){
+			if(!uni.getStorageSync('token')){
+				setTimeout(()=>{
+					this.priceSocketFun();
+				},200);
+			}else{
+				this.priceSocket = new SocketUtil({
+					onOpen: () => {},
+					onMessage: data => {
+						let type = data.type || "";
+						switch (type) {
+							case "init":
+								let clientId = data.client_id;
+
+								initSocket(clientId);
+								break;
+							case "money":
+								//到账消息    data:  {type: "money", msg: "微信到账1.2", money: 1.2}
+								console.log(data);
 
 
-						this.playPriceAudio(data.money);
-						break;
-					default:
-						console.log("default");
-				}
-			},
-			onClose: () => {},
-			onError: () => {}
-		});
+								this.playPriceAudio(data.money);
+								break;
+							default:
+								console.log("default");
+						}
+					},
+					onClose: () => {},
+					onError: () => {}
+				});
+			}
+		},
 	}
 	}
 };
 };