文字优化

hd/src/views/home.vue

@@ -57,41 +57,11 @@
         <span class="title_right">本月收入： {{ incomeData.month || 0 }}<span style="margin-right: 20px;"></span>上月收入： {{ incomeData.previousMonth || 0 }}</span>
       </div>
 			<div class="card-body">
-				<!-- <div class="echart-left-wrap">
-					<div>
-						<div>本月收入</div>
-						<div class="num">{{ incomeData.month || 0 }}</div>
-					</div>
-					<div>
-						<div>上月收入</div>
-						<div class="num">{{ incomeData.previousMonth || 0 }}</div>
-					</div>
-				</div> -->
 				<div class="echart-wrap">
 					<trend-echart ref="incomeEchart" :chartData="incomeData.list"></trend-echart>
 				</div>
 			</div>
 		</div>
-		<!-- visitor -->
-		<!-- <div class="card card-visitor">
-			<div class="card-title">访问统计</div>
-			<div class="card-body">
-				<div class="echart-left-wrap">
-					<div>
-						<div>本月收入</div>
-						<div class="num">{{ visitorData.month || 0 }}</div>
-					</div>
-					<div>
-						<div>本周收入</div>
-						<div class="num">{{ visitorData.week || 0 }}</div>
-					</div>
-				</div>
-				<div class="echart-wrap">
-					<div class="echart-tit">最近七天访问</div>
-					<trend-echart ref="visitorEchart" :chartData="visitorData.list"></trend-echart>
-				</div>
-			</div>
-		</div>-->
 		<!-- allTotal -->
 		<div class="card all-total-wrap">
 			<div class="card-title">总览</div>
@@ -120,33 +90,28 @@ export default {
 			// 总数
 			totalData: [
 				{
-					name: '访问量',
-					icon: 'el-icon-s-data',
-					val: 0
+					name: '收入',
+					icon: 'el-icon-s-marketing',
+					val: '￥0.00',
+					url: '/assets/list'
 				},
 				{
-					name: '新客户',
+					name: '开单',
+					icon: 'el-icon-s-order',
+					val: 0,
+					url: '/order/list?status=-1'
+				},
+				{
+					name: '访客',
 					icon: 'el-icon-s-custom',
 					val: 0,
 					url: '/member/list'
 				},
 				{
-					name: '新粉丝',
+					name: '新学员',
 					icon: 'el-icon-user',
 					val: 0,
 					url: '/member/list?type=1'
-				},
-				{
-					name: '收入',
-					icon: 'el-icon-s-marketing',
-					val: '￥0.00',
-					url: '/assets/list'
-				},
-				{
-					name: '订单',
-					icon: 'el-icon-s-order',
-					val: 0,
-					url: '/order/list?status=-1'
 				}
 			],
 			// 待处理
@@ -275,11 +240,10 @@ export default {
 					this.initChart();
 				});
 				// total
-				this.totalData[0].val = res.todayData.visit;
-				this.totalData[1].val = res.todayData.user;
-				this.totalData[2].val = res.todayData.fans;
-				this.totalData[3].val = `￥${res.todayData.income}`;
-				this.totalData[4].val = res.todayData.order;
+				this.totalData[0].val = `￥${res.todayData.income}`;
+				this.totalData[1].val = res.todayData.order;
+				this.totalData[2].val = res.todayData.visit;
+				this.totalData[3].val = res.todayData.newStudent;
 				//待处理事务
 				this.pendingData[0].val = res.asset.unPayOrder;
 				this.pendingData[1].val = res.asset.sendingOrder;
@@ -345,7 +309,7 @@ export default {
 	.card-statistics {
 		@include disFlex(center, space-between);
 		.block {
-			width: calc(19% - 40px);
+			width: calc(25% - 60px);
 			background-color: #fff;
 			// height: 100px;
 			padding: 20px;
@@ -523,4 +487,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

hdApp/src/admin/home/newStudent.vue

@@ -30,19 +30,19 @@
             class="status_apply"
             v-if="item.status === '1'"
             style="color: #09bb07;"
-          >已报名</text>
+          >待付款</text>
           <text
             class="status_apply"
             style="color: #333333;"
             v-if="item.status === '2'"
-          >待付款</text>
+          >已报名</text>
         </view>
         <view class="item_main">
           <image :src="item.classFullCover"></image>
           <view class="student_text">
             <view class="_class">{{item.className}}</view>
-            <view class="class_odd">课程单号：{{item.orderSn}} </view>
-            <view class="class_odd">下单日期：{{item.applyTime.length > 10 ? item.applyTime.substr(0, 10) : item.applyTime}}</view>
+            <view class="class_odd">单号：{{item.orderSn}} </view>
+            <view class="class_odd">日期：{{item.applyTime.length > 10 ? item.applyTime.substr(0, 10) : item.applyTime}}</view>
           </view>
           <view class="price">¥985.80</view>
         </view>

hdApp/src/admin/home/workbench.vue

@@ -17,9 +17,9 @@
           </div>
         </navigator>
         <div class="info-list">
-          <div class="info-list-name">新客</div>
+          <div class="info-list-name">访客</div>
           <div class="info-list-value">
-            {{ $util.numberFormat(data.todayData.user) || 0 }}
+            {{ $util.numberFormat(data.todayData.visit) || 0 }}
           </div>
         </div>
         <div
@@ -28,7 +28,7 @@
         >
           <div class="info-list-name">新学员</div>
           <div class="info-list-value">
-            {{ $util.numberFormat(data.todayData.expend) || 0 }}
+            {{ $util.numberFormat(data.todayData.newStudent) || 0 }}
           </div>
         </div>
       </div>

pt/src/saas/shop/apply.vue

@@ -78,7 +78,7 @@ export default {
 		applyFn() {
 			this.$service.saasShop.applyCheck(this.form).then(res => {
 				this.app.refresh();
-				this.$message.success('审核成功！');
+				this.$message.success('操作成功');
 				this.resetForm();
 			});
 		},