ss~~

components/Welcome/Welcome.vue

+<template>
+	<!-- 欢迎回来页面 -->
+	<!--  -->
+	<view class="prizemodel">
+		<!--  -->
+		<uni-popup :show="showtip" type="center" :mask-click="true" @change="change">
+			
+			<view class="tipboxs">
+				<view class="heads">
+					<!-- <image class="headimg" src="/static/news/ishellobg.png " mode=""></image> -->
+					<image class="headimg" src="/static/news/helloword.png " mode=""></image>
+					<!-- helloword.png -->
+					
+					<image class="isusertx" :src="staticurl+userInfo.logo" mode=""></image>
+					
+					<view class="shopnames">{{userInfo.shop_name}}</view>
+				</view>
+				
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	export default{
+		//props:["title","content"],
+		props:{
+			//开奖人数
+			shuliang:{
+				type:String,
+				default:"0",
+			}
+		},
+		name:"Welcome",
+		components:{
+			uniPopup,
+		},
+		data(){
+			return{
+				showtip:false,
+				
+			}
+		},
+		//计算属性
+		computed:{
+			userInfo(){
+				return this.$store.state.userInfo;
+			},
+			staticurl(){
+				return this.$store.state.staticUrl;
+			}
+		},
+		methods:{
+			cancel(type) {//关闭
+				this.showtip = false;
+			},
+			//提示弹窗
+			change(e) {
+				console.log('是否打开:' + e.show)
+				if (!e.show) {
+					this.showtip = false
+				}
+			},
+			show(){
+				this.showtip = true;
+			},
+			//确认发布点击
+			confirm(){
+				this.showtip = false;
+				this.$emit("fromSubmitfun",{});//触发回调方法
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$wid:750upx;
+	$hei:863upx;
+	.prizemodel{
+		width: $wid;
+		height: $hei;
+	}
+	.tipboxs{
+		width: $wid;
+		height: $hei;
+		
+		.heads{
+			position: relative;
+			.headimg{
+				width: $wid;
+				height: $hei;
+				
+			}
+			
+			.isusertx{
+				position: absolute;
+				width: 382upx;
+				height: 382upx;
+				top: 312upx;
+				left: 50%;
+				margin-left: -191upx;
+				z-index: 99;
+				border-radius: 50%;
+			}
+			
+			.shopnames{
+				width: 100%;
+				font-size: 40upx;
+				font-weight: bold;
+				color:#000;
+				position: absolute;
+				top: 740upx;
+				text-align: center;
+				z-index: 99;
+				border-radius: 50%;
+			}
+		}
+		.tipboxs_body{
+			border-top-left-radius: 0;
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 7px;
+			border-bottom-left-radius: 7px;
+			margin-top: -20upx;
+			padding: 20upx;
+			padding-top: 30upx;
+			background: #ffffff;
+			text-align: center;
+			.textmsgs{
+				color:#333C4C;
+				font-size: 32upx;
+				.sum{
+					color:#ff6900;
+				}
+			}
+			.submitbtns{
+				font-size: 32upx;
+				width:411upx;
+				height:83upx;
+				line-height: 83upx;
+				text-align: center;
+				background:rgba(255,105,0,1);
+				border-radius:10upx;
+				color:#FFFFFF;
+				margin: 0 auto;
+				margin-top: 50upx;
+				margin-bottom: 30upx;
+			}
+		}
+	}
+</style>

pages/LuckDraw/LuckList/LuckList.vue

@@ -53,13 +53,19 @@
 			</view>
 		</view>
 		
-
+		<empty v-if="dataLotteryList.length==0"></empty>
+		<!-- 空数据展示 -->
+		
 	</view>
 </template>
 
 <script>
 	import {LotteryList,slotuserList} from "@/utils/api/LuckDraw.js";
+	import empty from "@/components/empty/empty.vue";
 	export default {
+		components:{
+			empty
+		},
 		data(){
 			return {
 				numberarr:["一","二","三","四","五","六","七","八","九","十"],

pages/index/index.vue

@@ -202,7 +202,9 @@
 		
 		<yomol-upgrade   ref="yomolUpgrade"></yomol-upgrade>
 		<!-- 升级组件 -->
-			
+		
+		<Welcome ref="Welcome"></Welcome>
+		<!-- 欢迎回来 -->
 		
 	</view>
 </template>
@@ -211,6 +213,7 @@
 	import uniBadge from "@/components/uni/uni-badge/uni-badge.vue"
 	import uniIcon from "@/components/uni/uni-icon/uni-icon.vue"
 	import yomolUpgrade from '@/components/yomol-upgrade/yomol-upgrade.vue';//升级组件
+	import Welcome from "@/components/Welcome/Welcome.vue";//欢迎回来
 	
 	import {storeIndex} from "@/utils/api/api.js";
 	export default {
@@ -226,14 +229,22 @@
 			uniIcon,
 			uniBadge,
 			yomolUpgrade,//升级组件
+			Welcome,
 		},
 		computed:{
 			storeinfo(){
 				return this.$store.state.userInfo;
 			}
+		},
+		onLaunch(){
+			
+			
 		},
 		onLoad() {  
-
+			//显示欢迎回来~
+			setTimeout(()=>{
+				this.$refs.Welcome.show();
+			},2000)
 		},
 		//下拉刷新
 		onPullDownRefresh(){

pages/user/tongji/tongji.vue

@@ -11,15 +11,29 @@
 				<view class="card_01">经营收入</view>
 				<view class="card_02">¥ {{counts.money?counts.money:0}}</view>
 				<view class="card_03">
-					<view class="card_03_1">
+					
+					<!-- 外卖订单 -->
+					<navigator v-if="shop_type=='ele'" url="/pages/order/order" class="card_03_1">
 						订单数<br /><span>{{counts.total_order?counts.total_order:0}}</span>
-					</view>
+					</navigator>
+					
+					<!-- 商城订单 -->
+					<navigator v-if="shop_type=='goods'" url="/pages/order/shopOrder" class="card_03_1">
+						订单数<br /><span>{{counts.total_order?counts.total_order:0}}</span>
+					</navigator>
+					
+					<!-- 酒店订单 -->
+					<navigator v-if="shop_type=='hotel'" url="/pages/hotelOrder/hotelOrder" class="card_03_1">
+						订单数<br /><span>{{counts.total_order?counts.total_order:0}}</span>
+					</navigator>
+					
+					
 					<view class="card_03_1">
 						总提现资金<br /><span>￥{{counts.amount_cash?counts.amount_cash:0}}</span>
 					</view>
-					<view class="card_03_1">
+					<navigator url="/pages/yjWithdraw/yjWithdraw?type=2" class="card_03_1">
 						可提现金额<br /><span>￥{{counts.gold?counts.gold:0}}</span>
-					</view>
+					</navigator>
 				</view>
 			</view>
 			<!-- <view class="name">用户数据</view>
@@ -133,6 +147,7 @@
 				defaultVal1:[],
 				selectList1:[],
 				resulttime:"",//日期
+				shop_type:"",
 				
 			};
 		},
@@ -206,6 +221,7 @@
 				});
 				if (res.code == 0) {
 					this.counts = res.data.counts;
+					this.shop_type = res.data.shop_type;
 				} else {
 					this.$api.msg(res.msg);
 				}

utils/debug.js

@@ -2,8 +2,8 @@
 //环境变量 这个是 鹿马商家助手的 商家助手的~~~~
 module.exports = {
 	//是否为开发调试环境 true为本地环境 false 为正式环境
-	isdebug:true,//测试
-	// isdebug:false,//正式
+	// isdebug:true,//测试
+	isdebug:false,//正式
 	
 	xqdebug:false,//正式权限
 	// xqdebug:true,//发布审核权限 也是测试环境的 主要用于ios