调整添加员工转跳错误

2021-09-30 17:23:05 +08:00
parent 827944a142
commit aa7b7c7d35
7 changed files with 25 additions and 19 deletions
--- a/pages/employees/list.vue
+++ b/pages/employees/list.vue
@@ -41,8 +41,8 @@
 		</uni-collapse>
 		<view v-else class="list-null">
 			<image class="icon" src="@/static/icons/listnull-icon.png" mode="widthFix" />
-			<view class="sub-title">暂未添加员工</view>
-			<view class="sub-btn" @click="$Router.push({name: 'employeesAdd'})">添加员工</view>
+			<view class="sub-title">暂无员工</view>
+			<view class="sub-btn" @click="addEmployees">添加员工</view>
 		</view>
 	</view>
 </template>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -59,7 +59,11 @@
 					<view class="number nowrap">{{chains.balance}}</view>
 				</view>
 				<view class="header-item">
-					<view class="title">上期能量球价值<uni-icons class="help-icon" @click="showHelp('up')" type="help-filled" size="15" color="rgba(255,255,255,.3)" /></view>
+					<view class="title">上期发放能量球<uni-icons class="help-icon" @click="showHelp('up')" type="help-filled" size="15" color="rgba(255,255,255,.3)" /></view>
+					<view class="number nowrap">{{chains.up}}</view>
+				</view>
+				<view class="header-item">
+					<view class="title">当前能量球价值<uni-icons class="help-icon" @click="showHelp('up')" type="help-filled" size="15" color="rgba(255,255,255,.3)" /></view>
 					<view class="number nowrap">{{chains.up}}</view>
 				</view>
 				<view class="header-item">
@@ -241,6 +245,8 @@
 			},
 			// 绘制图表
 			showCartc(data){
+				console.log(data)
+				
 				// 图表信息
 				this.$refs.chartChange.init(config => {
 					config.appendPadding = [10, 30, 10, 15]
@@ -252,7 +258,7 @@
 							mask: 'MM-DD'
 						},
 						value: {
-							tickCount: 5
+							tickCount: 0
 						}
 					});
 					chart.legend({
@@ -272,7 +278,7 @@
 								return 'line';
 							}
 							if (name === '实际收益率') {
-								return 'dash';
+								return 'line';
 							}
 						});
 						chart.render();
@@ -416,12 +422,12 @@
 				padding: $padding / 2;
 				padding-bottom: $padding;
 				box-sizing: border-box;
-				&:first-child{
-					width: 100%;
-					.number{
-						font-size: $title-size;
-					}
-				}
+				// &:first-child{
+				// 	width: 100%;
+				// 	.number{
+				// 		font-size: $title-size;
+				// 	}
+				// }
 			}
 		}
 		// 图表
--- a/router/index.js
+++ b/router/index.js
@@ -24,11 +24,11 @@ const router = createRouter({
 router.beforeEach((to, from, next) => {
 	const token  = store.getters.getToken || uni.getStorageSync('token')
 	// 检查是否需要微信授权
-	// if(store.getters.getCode === '' && to.name != 'wxAuth'){
-	// 	next({
-	// 		name: 'wxAuth'
-	// 	})
-	// }
+	if(store.getters.getCode === '' && to.name != 'wxAuth'){
+		next({
+			name: 'wxAuth'
+		})
+	}
 	// 检查是否需要登录
 	if(to.auth && token === ''){
 		next({
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>链商星球</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.61332aa4.js></script><script src=/static/js/index.e319a908.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.5e7e3b56.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.61332aa4.js></script><script src=/static/js/index.7da88982.js></script></body></html>
--- a/unpackage/dist/build/h5/static/js/index.7da88982.js
+++ b/unpackage/dist/build/h5/static/js/index.7da88982.js
--- a/unpackage/dist/build/h5/static/js/pages-goods-add.c3e70d8a.js
+++ b/unpackage/dist/build/h5/static/js/pages-goods-add.c3e70d8a.js
--- a/unpackage/dist/build/h5/static/js/pages-goods-add.d8167b19.js
+++ b/unpackage/dist/build/h5/static/js/pages-goods-add.d8167b19.js