shish 4 лет назад
Родитель
Сommit
cbf089cec0

+ 3 - 1
ghsApp/src/admin/custom/visit.vue

@@ -96,7 +96,9 @@ export default {
         this.getVisit();
         this.getVisit();
     },
     },
     getVisit() {
     getVisit() {
-      return getVisit().then((res) => {
+      return getVisit({
+        page: this.list.page
+      }).then((res) => {
           this.completes(res);
           this.completes(res);
           if (this.$util.isEmpty(res.data)){
           if (this.$util.isEmpty(res.data)){
             return false;
             return false;

+ 2 - 2
ghsApp/src/admin/home/workbench.vue

@@ -16,12 +16,12 @@
 						{{ $util.numberFormat(data.todayData.order) || 0 }}
 						{{ $util.numberFormat(data.todayData.order) || 0 }}
 					</div>
 					</div>
 				</navigator>
 				</navigator>
-				<div class="info-list" @click="pageTo({url:'/admin/custom/visit'})">
+				<navigator class="info-list" url="/admin/custom/visit">
 					<div class="info-list-name">访客</div>
 					<div class="info-list-name">访客</div>
 					<div class="info-list-value">
 					<div class="info-list-value">
 						{{ $util.numberFormat(data.todayData.visitCustom) || 0 }}
 						{{ $util.numberFormat(data.todayData.visitCustom) || 0 }}
 					</div>
 					</div>
-				</div>
+				</navigator>
 				<navigator url="/pagesStore/me/incomeExpenses" class="info-list">
 				<navigator url="/pagesStore/me/incomeExpenses" class="info-list">
 					<div class="info-list-name">支出</div>
 					<div class="info-list-name">支出</div>
 					<div class="info-list-value">
 					<div class="info-list-value">

+ 1 - 1
ghsApp/src/pages.json

@@ -31,7 +31,7 @@
 			"pages": [
 			"pages": [
 				{"path": "selectCustom","style": {"navigationBarTitleText": "选择客户"}},
 				{"path": "selectCustom","style": {"navigationBarTitleText": "选择客户"}},
 				{"path": "levelSet","style": {"navigationBarTitleText": "客户等级"}},
 				{"path": "levelSet","style": {"navigationBarTitleText": "客户等级"}},
-				{"path": "visit","style": {"navigationBarTitleText": "访客"}}
+				{"path": "visit","style": {"navigationBarTitleText": "今日访客"}}
 			]
 			]
 		},
 		},
 		{
 		{

+ 1 - 1
ghsApp/src/utils/util.js

@@ -44,7 +44,7 @@ const numberFormat = (number, type) => {
 		let num = (number / 10000 + "").split(".");
 		let num = (number / 10000 + "").split(".");
 		return `${num[0]}.${("" + num[1]).slice(0, 1)} 万`;
 		return `${num[0]}.${("" + num[1]).slice(0, 1)} 万`;
 	} else {
 	} else {
-		return number;
+		return parseFloat(number)
 	}
 	}
 };
 };
 // 截取图片上传字符串
 // 截取图片上传字符串