新粉丝的跳转

mall/src/pages/goods/detail.vue

@@ -20,9 +20,9 @@
 				</button>
 			</div>
 			<div class="shop-express app-color-3">
-				<div>{{ data.freeSendDist }}公里免运费</div>
+				<div>{{ data.freeSendDist }}公里内免运费</div>
 				<div>
-					<span class="prompt-text">月销</span>
+					<span class="prompt-text">已售</span>
 					<span>{{ data.sold }}</span>
 				</div>
 				<div>

mall/src/pages/interest/invite.vue

@@ -9,7 +9,7 @@
 					<span class="money-text">{{ data.asset.prize }}</span>
 				</div>
 				<div class="app-color-2">
-					<span>受邀朋友可以得</span>
+					<span>受邀朋友可得</span>
 					<span class="app-price" style="margin: 0 4px;">{{ data.asset.amount }}</span>
 					<span class="app-price">元优惠券</span>
 				</div>

shop/src/mock/userInfo.js

@@ -322,7 +322,7 @@ let menu = {
 		{
 			id: '406',
 			parentId: '4',
-			name: '通用简介',
+			name: '简要说明',
 			type: 1,
 			icon: 'icon-user',
 			orderNum: 4,

shop/src/sass/order/list.vue

@@ -75,7 +75,7 @@ export default {
 					val: 0
 				},
 				{
-					text: '已完结',
+					text: '已完成',
 					key: '5',
 					val: 0
 				}

shop/src/service/single/index.js

@@ -41,7 +41,7 @@ export class SingleService extends BaseService {
 		});
 	}
 
-	// 获取商品通用简介 b
+	// 获取商品简要说明 b
 	getGoodsIntro(data) {
 		return this.request({
 			url: '/goods/introduce',
@@ -49,7 +49,7 @@ export class SingleService extends BaseService {
 		});
 	}
 
-	// 更新商品通用简介 b
+	// 更新商品简要说明 b
 	editGoodsIntro(data) {
 		return this.request({
 			url: '/goods/update-introduce',

shop/src/views/home.vue

@@ -8,11 +8,10 @@
 				:key="index"
 				@click="$util.pageTo(item)"
 			>
-				<div class="val">
+				<div :class="['val',{'show-link':item.url ? true : false}]">
 					<div class="left">
 						<i :class="item.icon"></i>
 					</div>
-
 					<div class="right">
 						<p>{{ item.name }}</p>
 						<p>{{ item.val }}</p>
@@ -39,15 +38,10 @@
 		</div>
 		<!-- entry -->
 		<div class="card entry-wrap">
-			<div class="card-title">运营快捷入口</div>
+			<div class="card-title">快捷操作</div>
 			<div class="card-body">
 				<div class="entry-list-wrap">
-					<div
-						class="list"
-						v-for="(item, index) in entryData"
-						:key="index"
-						@click="$util.pageTo(item)"
-					>
+					<div class="list" v-for="(item, index) in entryData" :key="index" @click="$util.pageTo(item)">
 						<div class="icon-wrap">
 							<i class="iconfont" :class="[item.icon]"></i>
 						</div>
@@ -58,7 +52,7 @@
 		</div>
 		<!-- income -->
 		<div class="card card-income">
-			<div class="card-title">收入统计</div>
+			<div class="card-title">最近7天收入</div>
 			<div class="card-body">
 				<div class="echart-left-wrap">
 					<div>
@@ -71,7 +65,6 @@
 					</div>
 				</div>
 				<div class="echart-wrap">
-					<div class="echart-tit">最近七天收入</div>
 					<trend-echart ref="incomeEchart" :chartData="incomeData.list"></trend-echart>
 				</div>
 			</div>
@@ -95,7 +88,7 @@
 					<trend-echart ref="visitorEchart" :chartData="visitorData.list"></trend-echart>
 				</div>
 			</div>
-		</div> -->
+		</div>-->
 		<!-- allTotal -->
 		<div class="card all-total-wrap">
 			<div class="card-title">总览</div>
@@ -140,28 +133,30 @@ export default {
 				{
 					name: '访问量',
 					icon: 'el-icon-s-data',
-					val: 0
+					val: '-'
 				},
 				{
 					name: '新客户',
 					icon: 'el-icon-s-custom',
-					val: 0
+					val: '-',
+					url: '/member/list'
 				},
 				{
 					name: '新粉丝',
 					icon: 'el-icon-user',
-					val: 0
+					val: '-',
+					url: '/member/list?type=1'
 				},
 				{
 					name: '收入',
 					icon: 'el-icon-s-marketing',
-					val: '￥0.00',
-					url: '/admin/assets/list'
+					val: '￥0.00'
 				},
 				{
 					name: '订单',
 					icon: 'el-icon-s-order',
-					val: 0
+					val: '-',
+					url: '/order/list?status=-1'
 				}
 			],
 			// 待处理
@@ -177,7 +172,7 @@ export default {
 					url: '/order/list?status=2'
 				},
 				{
-					name: '已完结订单',
+					name: '已完成订单',
 					val: 0,
 					url: '/order/list?status=5'
 				},
@@ -186,7 +181,6 @@ export default {
 					val: 0,
 					url: '/order/list?status=1'
 				},
-
 				{
 					name: '全部订单',
 					val: 0,
@@ -310,11 +304,13 @@ export default {
 				});
 
 				// total
-				this.totalData[0].val = res.todayData.visit;
-				this.totalData[1].val = `￥${res.todayData.income || 0.0}`;
-				this.totalData[2].val = res.todayData.order;
-				this.totalData[3].val = res.todayData.user;
-				this.totalData[4].val = res.todayData.fans;
+				this.totalData[0].val = res.todayData.visit > 0 ? res.todayData.visit : '-';
+				this.totalData[1].val = res.todayData.user > 0 ? res.todayData.user : '-';
+				this.totalData[2].val = res.todayData.fans > 0 ? res.todayData.fans : '-';
+				this.totalData[3].val = `￥${
+					res.todayData.income > 0 ? res.todayData.income : '-'
+				}`;
+				this.totalData[4].val = res.todayData.order > 0 ? res.todayData.order : '-';
 				// pending
 				this.pendingData[0].val = res.asset.unPayOrder;
 				this.pendingData[1].val = res.asset.sendingOrder;
@@ -357,8 +353,8 @@ export default {
 		.card-title {
 			color: #000;
 			padding: 20px 20px 0 20px;
-			font-size:15px;
-			font-weight:bold;
+			font-size: 14px;
+			font-weight: bold;
 		}
 
 		.card-body {
@@ -420,6 +416,9 @@ export default {
 					}
 				}
 			}
+			.show-link {
+				cursor: pointer;
+			}
 		}
 	}
 
@@ -436,7 +435,7 @@ export default {
 				margin-bottom: 18px;
 				border-bottom: 1px solid $borderColor;
 				padding-bottom: 6px;
-				font-size:13px;
+				font-size: 13px;
 				&:nth-child(3n) {
 					margin-right: 0;
 				}
@@ -452,12 +451,12 @@ export default {
 	.entry-wrap {
 		.entry-list-wrap {
 			@include disFlex(center, space-between);
-			padding: 0 20px;
+			padding: 0 32px;
 			color: $fontColor2;
 			.list {
 				text-align: center;
 				margin-bottom: 10px;
-				font-size:14px;
+				font-size: 14px;
 				&:hover {
 					color: $mainColor;
 					cursor: pointer;
@@ -480,13 +479,13 @@ export default {
 			.list {
 				text-align: center;
 				margin-bottom: 10px;
-				font-size:14px;
+				font-size: 14px;
 				// &:hover {
 				// 	color: $mainColor;
 				// 	cursor: pointer;
 				// }
 				.num {
-					font-size: 24px;
+					font-size: 20px;
 					margin-bottom: 10px;
 				}
 			}
@@ -502,14 +501,14 @@ export default {
 				margin-top: 20px;
 				color: $fontColor2;
 				padding-left: 10px;
-				font-size:14px;
+				font-size: 14px;
 				text-align: left;
 				& > div:first-child {
 					margin-bottom: 50px;
 				}
 				.num {
 					color: #333;
-					font-size: 26px;
+					font-size: 20px;
 					margin-top: 10px;
 				}
 			}

shop/src/views/member/list.vue

@@ -282,6 +282,10 @@ export default {
 		// crud
 		onLoad({ ctx, app }) {
 			this.app = app;
+
+			//传入参数 shish 2020.5.9
+			this.tabIndex = this.$route.query.type
+
 			ctx.service(this.$service.member)
 				.set('table', {
 					columns: [

shop/src/views/order/list.vue

@@ -166,7 +166,7 @@ export default {
 					val: 0
 				},
 				{
-					text: '已完结',
+					text: '已完成',
 					key: '5',
 					val: 0
 				}