总览的优化

shop/src/components/chat/index.vue

@@ -95,6 +95,7 @@
 			size="small"
 			@click="show()"
 		></el-button>
+
 	</div>
 </template>
 
@@ -102,7 +103,7 @@
 export default {
 	data() {
 		return {
-			visible: false,
+			visible: fale,
 			userList: [],
 			messageList: [
 				{
@@ -143,8 +144,10 @@ export default {
 		},
 
 		show() {
-			this.visible = true;
-			this.getUserList();
+            this.$message.success('即将开通...')
+            return false
+			this.visible = true
+			this.getUserList()
 		},
 
 		hide() {

shop/src/views/home.vue

@@ -41,7 +41,7 @@
 			<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="fastDoFn(item)">
 						<div class="icon-wrap">
 							<i class="iconfont" :class="[item.icon]"></i>
 						</div>
@@ -226,13 +226,11 @@ export default {
 				},
 				{
 					name: '客服',
-					icon: 'iconkefu',
-					url: ''
+					icon: 'iconkefu'
 				},
 				{
 					name: '拼团',
-					icon: 'iconlianjie',
-					url: ''
+					icon: 'iconlianjie'
 				}
 			],
 			// 总统计
@@ -292,7 +290,9 @@ export default {
 		},
 		getData() {
 			this.$service.workbench.index().then(res => {
-				if (this.$util.isEmpty(res)) return false;
+				if (this.$util.isEmpty(res)) {
+					return false;
+				}
 				this.incomeData = res.incomeStat;
 				this.visitorData = res.visitStat;
 				this.noticeData = res.notice;
@@ -311,14 +311,16 @@ export default {
 					res.todayData.income > 0 ? res.todayData.income : '-'
 				}`;
 				this.totalData[4].val = res.todayData.order > 0 ? res.todayData.order : '-';
-				// pending
+				//待处理事务
+				console.log('待处理事务')
+				console.log(this.pendingData)
 				this.pendingData[0].val = res.asset.unPayOrder;
 				this.pendingData[1].val = res.asset.sendingOrder;
 				this.pendingData[2].val = res.asset.finishOrder;
 				this.pendingData[3].val = res.asset.unSendOrder;
-				this.pendingData[4].val = res.asset.unNoticeOrder;
-				this.pendingData[5].val = res.asset.totalOrder;
-				// all-total
+				this.pendingData[4].val = res.asset.totalOrder;
+				//总览
+				console.log('查看总览');
 				this.allTotalData[0].val = res.asset.totalUser;
 				this.allTotalData[1].val = res.asset.totalFans;
 				this.allTotalData[2].val = res.asset.totalMember;
@@ -335,6 +337,13 @@ export default {
 		},
 		noticeFn(item) {
 			window.open(item.url);
+		},
+		fastDoFn(item) {
+			if (item.url) {
+				this.$util.pageTo(item);
+			} else {
+				this.$message.success('即将开通...');
+			}
 		}
 	}
 };

shop/src/views/member/list.vue

@@ -61,13 +61,19 @@
 				</div>
 			</template>
 
-			<template #table-column-actPrice="{scope}">
+			<template #table-column-sourceType="{scope}">
+				<span v-if="scope.row.sourceType == 0">微信</span>
+				<span v-else-if="scope.row.sourceType == 1">支付宝</span>
+				<span v-else-if="scope.row.sourceType == 2">小程序</span>
+				<span v-else-if="scope.row.sourceType == 3">朋友圈</span>
+				<span v-else-if="scope.row.sourceType == 4">美团</span>
+				<span v-else></span>
+			</template>
+
+			<template #table-column-memberLevel="{scope}">
 				<el-tag size="mini" v-if="scope.row.userAsset.member == -1" type="warning">普</el-tag>
-				<el-tag size="mini" v-else-if="scope.row.userAsset.member == 0">vip</el-tag>
-				<el-tag
-					size="mini"
-					v-else-if="scope.row.userAsset.member > 0"
-				>vip{{ scope.row.userAsset.member }}</el-tag>
+				<el-tag size="small" v-else-if="scope.row.userAsset.member == 0" title="已注册手机号">vip</el-tag>
+				<el-tag size="small" v-else-if="scope.row.userAsset.member > 0">{{ scope.row.userAsset.member }}</el-tag>
 			</template>
 
 			<!-- 充值 -->
@@ -78,7 +84,6 @@
 			<template #slot-upgrade="{scope}">
 				<el-button type="text" size="mini" @click="upgradeShowFn(scope.row)">升级</el-button>
 			</template>
-
 		</x-crud>
 		<!-- 充值 -->
 		<el-dialog title="充值" :visible.sync="rechargeDialog" :close-on-click-modal="false" width="600px">
@@ -284,7 +289,9 @@ export default {
 			this.app = app;
 
 			//传入参数 shish 2020.5.9
-			this.tabIndex = this.$route.query.type
+			if (this.$route.query.type) {
+				this.tabIndex = this.$route.query.type;
+			}
 
 			ctx.service(this.$service.member)
 				.set('table', {
@@ -313,7 +320,7 @@ export default {
 							width: 120
 						},
 						{
-							prop: 'actPrice',
+							prop: 'memberLevel',
 							label: '会员级别',
 							align: 'center',
 							emptyText: '无'
@@ -337,7 +344,13 @@ export default {
 						},
 						{
 							prop: 'store',
-							label: '到店消费',
+							label: '已到店',
+							align: 'center',
+							width: 100
+						},
+												{
+							prop: 'sourceType',
+							label: '来源',
 							align: 'center',
 							width: 100
 						},

shop/src/views/order/list.vue

@@ -224,7 +224,9 @@ export default {
 			this.app = app;
 
 			//传入参数 shish 2020.5.9
-			this.tabIndex = this.$route.query.status
+			if(this.$route.query.status){
+				this.tabIndex = this.$route.query.status
+			}
 
 			ctx.service(this.$service.order)
 				.set('table', {