From a0234d492f96d19a9654ff88960663a6155b127e Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Wed, 9 Sep 2020 19:12:12 +0800
Subject: [PATCH] add style

---
 src/App.vue                                 |  50 +++-
 src/pages.json                              |  23 +-
 src/pages/employee/manage/manage.vue        | 166 +++++++++++++
 src/pages/index/index.vue                   | 137 ++++++++---
 src/pages/merchant_info/merchant_info.vue   |  69 ++++++
 src/pages/merchant_login/merchant_login.vue |  49 ++++
 src/static/images/icon/author_modal.png     | Bin 0 -> 14649 bytes
 src/static/images/icon/round_add.png        | Bin 0 -> 703 bytes
 src/static/images/icon/round_close.png      | Bin 0 -> 369 bytes
 src/utils/util.js                           | 347 ++++++++++++++++++++++++++++
 10 files changed, 804 insertions(+), 37 deletions(-)
 create mode 100644 src/pages/employee/manage/manage.vue
 create mode 100644 src/pages/merchant_info/merchant_info.vue
 create mode 100644 src/pages/merchant_login/merchant_login.vue
 create mode 100644 src/static/images/icon/author_modal.png
 create mode 100644 src/static/images/icon/round_add.png
 create mode 100644 src/static/images/icon/round_close.png
 create mode 100644 src/utils/util.js

diff --git a/src/App.vue b/src/App.vue
index 849f61c..384de0a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,13 +1,25 @@
 <script>
+	import Vue from 'vue'
+	import util from './utils/util';
 	export default {
 		onLaunch: function() {
-			console.log('App Launch')
+			this.updateManager();
 		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
+		methods: {	
+			updateManager(){
+				const updateManager = uni.getUpdateManager();
+				updateManager.onCheckForUpdate(res=>console.log('请求完新版本信息的回调-->',res.hasUpdate));
+				updateManager.onUpdateReady(function () {
+					util.showModal({
+						title: '更新提示',
+						content: '新版本已经准备好，请重启应用！',
+						showCancel:false,
+						confirmText:'重启',
+						success:res=>updateManager.applyUpdate(),
+					})
+				});
+				updateManager.onUpdateFailed(err=>console.log('版本更新失败——>',err));
+			},
 		}
 	}
 </script>
@@ -20,4 +32,30 @@
 	view,scroll-view,text,picker{
 		box-sizing: border-box;
 	}
+	.ox-dark-mask{
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .5);
+	}
+
+	/* btn hover-class */ 
+	.hover-active{
+		position: relative;
+		overflow: hidden;
+	}
+
+	.hover-active::after{
+		content: '';
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 2;
+		background-color: rgba(0,0,0,.1);
+	}
+	/* btn hover-class */ 
 </style>
diff --git a/src/pages.json b/src/pages.json
index 56abf81..720c11d 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,16 +1,35 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/store_list/store_list",
+			"path": "pages/employee/manage/manage",
 			"style": {
-				"navigationBarTitleText": "门店信息列表"
+				"navigationBarTitleText": "员工管理"
+			}
+		},
+		{
+			"path": "pages/merchant_login/merchant_login",
+			"style": {
+				"navigationBarTitleText": "商家登录"
 			}
 		},
 		{
 			"path": "pages/index/index",
 			"style": {
 			}
+		},
+		{
+			"path": "pages/merchant_info/merchant_info",
+			"style": {
+				"navigationBarTitleText": "商户号资料"
+			}
+		},
+		{
+			"path": "pages/store_list/store_list",
+			"style": {
+				"navigationBarTitleText": "门店信息列表"
+			}
 		}
+		
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
diff --git a/src/pages/employee/manage/manage.vue b/src/pages/employee/manage/manage.vue
new file mode 100644
index 0000000..ddfc27c
--- /dev/null
+++ b/src/pages/employee/manage/manage.vue
@@ -0,0 +1,166 @@
+<template>
+    <view class="employ-manage">
+        <view class="em-content">
+            <view class="ec-search">
+                <view>
+                    <input placeholder="请输入" />
+                    <image mode="aspectFit" src="/static/images/icon/round_close.png"></image>
+                </view>
+            </view>
+            <view class="ec-info">
+                <view class="ei-add">
+                    <image mode="aspectFit" src="/static/images/icon/round_add.png"></image>
+                    <text>添加员工</text>
+                </view>
+                <view class="ei-tip">
+                    <text>待审核员工</text>
+                    <view>
+                        <view>222</view>
+                        <image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image>
+                    </view>
+                </view>
+                <view class="ei-user">
+                    <view>
+                        <image></image>
+                        <view class="eu-name">胡雪儿</view>
+                        <view class="eu-tag">超级管理员</view>
+                    </view>
+                    <view>更换</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style lang="scss" scoped>
+    @import "../../../../style/public.scss";
+    .em-content{
+        .ec-search{
+            margin-bottom: 16upx;
+            height: 144upx;
+            background-color: #fff;
+            @include centerFlex(center);
+            >view{
+                padding: 0 28upx;
+                height: 92upx;
+                width: 702upx;
+                border-radius: 10upx;
+                background-color: #f2f2f7;
+                @include centerFlex(space-between);
+                >input{
+                    flex-grow: 1;
+                    height: 100%;
+                    font-size: 32upx;
+                    color: #1a1a1a;
+                }
+                >image{
+                    margin-left: 20upx;
+                    flex-shrink: 0;
+                    width: 32upx;
+                    height: 32upx;
+                }
+            }
+        }
+        .ec-info{
+            margin-bottom: 24upx;
+            padding: 0 24upx;
+            background-color: #fff;
+            .ei-add{
+                height: 220upx;
+                border-bottom: 2upx solid #D8D8D8;
+                @include centerFlex(center);
+                >image{
+                    flex-shrink: 0;
+                    margin-right: 38upx;
+                    width: 84upx;
+                    height: 84upx;
+                }
+                >text{
+                    font-weight: 500;
+                    font-size: 32upx;
+                    color: $themeColor;
+                }
+            }
+            .ei-tip{
+                height: 132upx;
+                border-bottom: 2upx solid #D8D8D8;
+                @include centerFlex(space-between);
+                >text{
+                    font-size: 32upx;
+                    color: #333;
+                }
+                >view{
+                    @include centerFlex(flex-end);
+                    >view{
+                        flex-shrink: 0;
+                        flex-grow: 0;
+                        margin-right: 30upx;
+                        width: 50upx;
+                        height: 50upx;
+                        border-radius: 50%;
+                        line-height: 50upx;
+                        text-align: center;
+                        font-size: 24upx;
+                        color: #fff;
+                        background-color: #ea5061;
+                        @include textHide(1);
+                    }
+                    >image{
+                        flex-shrink: 0;
+                        width: 28upx;
+                        height: 28upx;
+                    }
+                }
+            }
+            .ei-user{
+                height: 140upx;
+                @include centerFlex(space-between);
+                >view{
+                    &:first-child{
+                        @include centerFlex(flex-start);
+                        >image{
+                            margin-right: 20upx;
+                            width: 80upx;
+                            height: 80upx;
+                            border-radius: 10upx;
+                            background-color: skyblue;
+                        }
+                        .eu-name{
+                            max-width: 40%;
+                            line-height: 44upx;
+                            font-size: 32upx;
+                            color: #333;
+                            @include textHide(1);
+                        }
+                        .eu-tag{
+                            display: inline-block;
+                            margin-left: 24upx;
+                            padding: 0 6upx;
+                            height: 32upx;
+                            line-height: 32upx;
+                            border-radius: 6upx;
+                            font-size: 22upx;
+                            color: $themeColor;
+                            background-color: rgba(0, 152, 116, .2);
+                        }
+                    }
+                    &+view{
+                        flex-shrink: 0;
+                        width: 140upx;
+                        height: 64upx;
+                        line-height: 60upx;
+                        text-align: center;
+                        border-radius: 10upx;
+                        border: 2upx solid $themeColor;
+                        font-size: 32upx;
+                        color: $themeColor;
+                    }
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index a883c85..442d7a2 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,39 +1,53 @@
 <template>
 	<view class="index-container">
-		<view class="ic-header">
-			<view class="ih-address">
-				<view>广州欧轩智能场馆(共6家)</view>
-				<image src="/static/images/icon/arrow_ff.png" mode="aspectFit"></image>
-			</view>
-			<view class="ih-tip">今日总收入</view>
-			<view class="ih-price"><text>¥</text>0.00</view>
-			<view class="ih-amount">
-				<view>
-					<view>收款笔数</view>
-					<view>10</view>
+		<view class="ic-content">
+			<view class="ic-header">
+				<view class="ih-address" v-if="false">
+					<view>广州欧轩智能场馆(共6家)</view>
+					<image src="/static/images/icon/arrow_ff.png" mode="aspectFit"></image>
 				</view>
-				<view>
-					<view>收款笔数</view>
-					<view>10</view>
+				<view class="ih-btn" hover-class="hover-active">点击登陆</view>
+				<view class="ih-tip">今日总收入</view>
+				<view class="ih-price"><text>¥</text>0.00</view>
+				<view class="ih-amount">
+					<view>
+						<view>收款笔数</view>
+						<view>10</view>
+					</view>
+					<view>
+						<view>收款笔数</view>
+						<view>10</view>
+					</view>
 				</view>
+				<image class="ih-bg-icon" style="left: 0;" mode="aspectFit" src="/static/images/icon/index/header_bg_a.png"></image>
+				<image class="ih-bg-icon" mode="aspectFit" src="/static/images/icon/index/header_bg_b.png"></image>
 			</view>
-			<image class="ih-bg-icon" style="left: 0;" mode="aspectFit" src="/static/images/icon/index/header_bg_a.png"></image>
-			<image class="ih-bg-icon" mode="aspectFit" src="/static/images/icon/index/header_bg_b.png"></image>
-		</view>
-		<view class="ic-notice">
-			<view class="in-left">
-				<image src="/static/images/icon/index/notice.png" mode="aspectFit"></image>
-				<text>消息中心</text>
+			<view class="ic-notice">
+				<view class="in-left">
+					<image src="/static/images/icon/index/notice.png" mode="aspectFit"></image>
+					<text>消息中心</text>
+				</view>
+				<view class="in-right">
+					<view>99</view>
+					<image src="/static/images/icon/arrow_b2.png" mode="aspectFit"></image>
+				</view>
 			</view>
-			<view class="in-right">
-				<view>99</view>
-				<image src="/static/images/icon/arrow_b2.png" mode="aspectFit"></image>
+			<view class="ic-tabs">
+				<view class="it-item" v-for="e in tabList" :key="e.id">
+					<image mode="aspectFit" :src="'/static/images/icon/index/tab_'+ e.id + '.png'"></image>
+					<view>{{e.name}}</view>
+				</view>
 			</view>
 		</view>
-		<view class="ic-tabs">
-			<view class="it-item" v-for="e in tabList" :key="e.id">
-				<image mode="aspectFit" :src="'/static/images/icon/index/tab_'+ e.id + '.png'"></image>
-				<view>{{e.name}}</view>
+		<view class="ox-dark-mask" v-if="false">
+			<view class="ic-author-modal">
+				<view class="iam-title">微信授权</view>
+				<view class="iam-tip">您的信息和数据将受到保护</view>
+				<image class="iam-pic" mode="aspectFit" src="/static/images/icon/author_modal.png"></image>
+				<view class="iam-btns">
+					<view hover-class="hover-active">取消</view>
+					<view hover-class="hover-active">授权并登录</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -105,7 +119,10 @@
 <style lang="scss" scoped>
 	@import "../../../style/public.scss";
 	.index-container{
-		padding: 24upx 24upx 0;
+		position: relative;
+	}
+	.ic-content{
+		padding: 24upx;
 	}
 	.ic-header{
 		position: relative;
@@ -132,6 +149,17 @@
 				height: 28upx;
 			}
 		}
+		.ih-btn{
+			margin: 0 auto 28upx;
+			width: 160upx;
+			height: 48upx;
+			text-align: center;
+			line-height: 48upx;
+			font-size: 28upx;
+			color: $themeColor;
+			background-color: #fff;
+			border-radius: 24upx;
+		}
 		.ih-tip{
 			margin-bottom: 8upx;
 			line-height: 40upx;
@@ -257,4 +285,55 @@
 			}
 		}
 	}
+	.ic-author-modal{
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		padding-top: 60upx;
+		width: 662upx;
+		height: 884upx;
+		border-radius: 10upx;
+		background-color: #fff;
+		.iam-title{
+			margin-bottom: 22upx;
+			text-align: center;
+			line-height: 60upx;
+			font-size: 44upx;
+			font-weight: 500;
+			color: #1a1a1a;
+		}
+		.iam-tip{
+			margin-bottom: 52upx;
+			line-height: 40upx;
+			text-align: center;
+			font-size: 28upx;
+			color: #9c9c9f;
+		}
+		.iam-pic{
+			margin: 0 auto 62upx;
+			display: block;
+			width: 488upx;
+			height: 416upx;
+		}
+		.iam-btns{
+			@include centerFlex(center);
+			>view{
+				margin: 0 20upx;
+				width: 240upx;
+				height: 92upx;
+				line-height: 88upx;
+				text-align: center;
+				border-radius: 46upx;
+				border: 2upx solid $themeColor;
+				font-size: 32upx;
+				color: $themeColor;
+				&+view{
+					background-color: $themeColor;
+					color: #fff;
+				}
+			}
+		}
+
+	}
 </style>
diff --git a/src/pages/merchant_info/merchant_info.vue b/src/pages/merchant_info/merchant_info.vue
new file mode 100644
index 0000000..974929e
--- /dev/null
+++ b/src/pages/merchant_info/merchant_info.vue
@@ -0,0 +1,69 @@
+<template>
+    <view class="merchant-info">
+        <view class="mi-list">
+            <view class="ml-item" v-for="e in 20" :key="e">
+                <view class="mi-title">欧轩智能羽毛球馆（永泰店）</view>
+                <view class="ml-line">
+                    <view>微信商户号</view>
+                    <view>17098768441</view>
+                </view>
+                <view class="ml-line">
+                    <view>公户名称</view>
+                    <view>广州欧轩网络科技有限公司</view>
+                </view>
+                <view class="ml-line">
+                    <view>银行账号</view>
+                    <view>443**********69</view>
+                </view>
+                <view class="ml-line">
+                    <view>开户银行</view>
+                    <view>中国建设银行</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style lang="scss" scoped>
+    @import "../../../style/public.scss";
+    .mi-list{
+        padding: 24upx;
+
+    }
+    .ml-item{
+        margin-bottom: 24upx;
+        padding: 32upx 24upx 22upx;
+        border-radius: 10upx;
+        background-color: #fff;
+        .mi-title{
+            margin-bottom: 30upx;
+            line-height: 44upx;
+            font-size: 32upx;
+            color: #1a1a1a;
+            @include textHide(1);
+        }
+        .ml-line{
+            margin-bottom: 10upx;
+            @include centerFlex(space-between);
+            >view{
+                font-size: 28upx;
+                color: #9c9c9f;
+                &:first-child{
+                    margin-right: 10upx;
+                    flex-shrink: 0;
+                    line-height: 40upx;
+                }
+                &+view{
+                    flex-grow: 1;
+                    text-align: right;
+                    @include textHide(1);
+                }
+            }
+        }
+    }
+
+</style>
\ No newline at end of file
diff --git a/src/pages/merchant_login/merchant_login.vue b/src/pages/merchant_login/merchant_login.vue
new file mode 100644
index 0000000..1c26e9b
--- /dev/null
+++ b/src/pages/merchant_login/merchant_login.vue
@@ -0,0 +1,49 @@
+<template>
+    <view class="merchant-login">
+        <view class="ml-content">
+            <view class="mc-title">请联系管理员添加员工账号</view>
+            <view class="mc-tip">暂无商家</view>
+            <view class="mc-btn" hover-class="hover-active">成为商家</view>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    
+}
+</script>
+<style lang="scss">
+    @import "../../../style/public.scss";
+    page{
+        background-color: #fff;
+    }
+    .ml-content{
+        padding-top: 184upx;
+        .mc-title{
+            margin-bottom: 96upx;
+            line-height: 50upx;
+            text-align: center;
+            font-weight: 500;
+            font-size: 36upx;
+            color: #1a1a1a;
+        }
+        .mc-tip{
+            margin-bottom: 308upx;
+            text-align: center;
+            line-height: 40upx;
+            font-size: 28upx;
+            color: #9c9c9f;
+        }
+        .mc-btn{
+            margin: 0 auto;
+            width: 280upx;
+            height: 92upx;
+            text-align: center;
+            line-height: 88upx;
+            font-size: 32upx;
+            color: $themeColor;
+            border: 2upx solid $themeColor;
+            border-radius: 46upx;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/static/images/icon/author_modal.png b/src/static/images/icon/author_modal.png
new file mode 100644
index 0000000000000000000000000000000000000000..8e3612314f6f3e6f628de1ea7b9493c670bec96e
GIT binary patch
literal 14649
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
ZF=3YyEyDvK{{39TP*>Ig)GFFU{U5=)GzI_w

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/round_add.png b/src/static/images/icon/round_add.png
new file mode 100644
index 0000000000000000000000000000000000000000..96fbe9cf3ad6a3c7b6131f1756d0cbce9a4a79d3
GIT binary patch
literal 703
zcmeAS@N?(olHy`uVBq!ia0vp^At21b3?#L;KKKlz>;rs4T!A#hj1mNzR>Ck7jHZ?_
zOfH9t&nyNpfZ{-M78rrpAi-s=!n1)Uh?E5R1v7kna3Ejtf~N%k+6DS2W;DhHO|aYg
z?=J@f1Cz9;i(^Q{;WblkPit1-ab-T?yTak=|NW(52F9gXf=l1D+kGkG`hCPfc;#|e
zjdMk5F`cQGg!UbFIsTdP-J(Xn9Fd(}9ov+Htfu)VzFWs`zrU_WZtoU`u&OV=e{H^b
zKk%i|M-FY7h{MXl?>61(3{-Rsd&;6U!S{N~CBu-W;7N;4#{|s2A+~a1=e?xJCN}?F
zS9AmYEmH4A?Ok*K0{?=(yUS{uq<tg>x6O)_DXcGEQu%VhG_6z1pM7fzc)F%^{?}@g
zwP&y1V=YnCGM;e4hyTj4#5mQ%eLmkG9o=^0_vX-fzWjH8d^%D$V;iT{3Uvv$ueAqz
zn7;j!*?W;+_RQPXE&A&%uZy$%s8<g!;5$F_uw~Z!fJgCLzNyzO-x~kXx+p#5;P-_K
z;=**L{FI%9zvVJ^N|yF=xPG+!m)mThX7cBqO7NFHj-{t~@BU*{cFJsZd1cqb#e2j4
zWUPDZx`<!P8V{}rNLZ@S+sezeH1JX?ug+s9@fhDPR$5ceMVzzNnUbRw)AZP>HquY#
zwUoG4;j&XaH~6dV;v3}m-jsjz<_QafLd(L8|FPW<Oe?CEFiJ{Jf3jOtDz3or{t889
z!6{4p?YgFjXx3d?ma<^NMfbKX5$Y))CyM$WX_;W_vOrK%(?x&c^Ftm2r<Ko0Zk%}N
z16Q`6Lel|RrZXHZDhc8Ti<lIcu4pb;bKp2r3A2iRANzwd7wu1+>6mFHWivVEiT`m%
YhCea!H*Ye|eE~{|p00i_>zopr08)W6J^%m!

literal 0
HcmV?d00001

diff --git a/src/static/images/icon/round_close.png b/src/static/images/icon/round_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..c563ecb82bdcbb429388fcf903c0697c03e175c1
GIT binary patch
literal 369
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dymH|E?u0VSJ{8jVkubww=)q(}9
z7A{;5B!MCe7p?}9KsHc(&K!^km<v?4a?v6Xdxn>TF;KHmNswPK!^!0mvp73mCqKFw
zuA;l6$HjiuQu9YZ*{hx|jv*GOTZ7;79Z}$LZr^oxU*-Syy>E`J`YiP8^o?5qEUP%Q
zcdJa2S>NcEqr+QKeNpig_r~Ixb9f4ZpMH1!mvHlA+)u}aa*lu9cf_#2k`}E0*=2J`
zb8ei!e^l7KjxWEA4^HcJdi{*se|sEz6f0l9Q>Dl@A*(l=l|CC+`T143K1`gmB>c-B
zl}T)JHLY9|_#+iOnD1)}?d+2mS$FJ8&AxC0si{WsTDD$`FT4t_42{V!E$p@6chB2r
zeNUq2@hsCjX}mp_Mb|FOO3v5s+gtVR)2!G3Stp#<dH0&B{1?!J44$rjF6*2UngG*o
Bqh<gA

literal 0
HcmV?d00001

diff --git a/src/utils/util.js b/src/utils/util.js
new file mode 100644
index 0000000..1d6bbe3
--- /dev/null
+++ b/src/utils/util.js
@@ -0,0 +1,347 @@
+// import {emojiMap,emojiUrl} from './emojiMap';
+
+export const phoneReg = new RegExp(/^1(3|4|5|6|7|8|9)\d{9}$/);
+export const mailReg = new RegExp(/^\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/);
+export const specialReg = new RegExp("[^a-zA-Z0-9\_\u4e00-\u9fa5]","i");
+
+export const formatTime = date => {
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+
+  return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+}
+
+export const formatDate = ({ date= new Date(), partition= '-' }) => {
+  let _date;
+  if(typeof (date) === 'string'&&date.indexOf('-')!=-1){
+    _date = new Date(date.replace(/\-/g,'/'))
+  }else{
+    _date = new Date(date)
+  }
+  const year = _date.getFullYear();
+  const month = _date.getMonth() + 1;
+  const day = _date.getDate();
+  
+  if(partition == 'zh')return `${year}年${month}月${day}日`
+  return [year, month, day].map(formatNumber).join(partition);
+}
+
+export const formatNumber = n => {
+  n = n.toString()
+  return n[1] ? n : '0' + n
+}
+// 路由跳转
+export const routeTo = (url,type) => {
+	switch(type){
+		case 'nT': uni.navigateTo({url});
+		break 
+		case 'rT': uni.redirectTo({url});
+		break 
+		case 'rL': uni.reLaunch({url});
+		break 
+		case 'sT': uni.switchTab({url});
+    break 
+		default: uni.navigateBack({delta: 1})
+		break
+	}
+}
+
+function showNone(txt,duration=1500){
+  uni.hideToast();
+  uni.hideLoading();
+  uni.showToast({
+    mask: true,
+    title: txt,
+    icon: 'none',
+    duration,
+  })
+}
+
+function showLoad(title='加载中', mask=true){
+  uni.showLoading({
+    mask,
+    title,
+  })
+}
+function hideLoad(){
+  uni.hideLoading()
+}
+function showModal({
+  title='提示',
+  content='',
+  showCancel=false,
+  cancelText='取消',
+  confirmText='确定',
+  confirmColor='#009874',
+  success,
+  fail,
+  complete
+}){
+  uni.showModal({
+    title,
+    content,
+    showCancel,
+    cancelText,
+    confirmColor,
+    confirmText,
+    success,
+    fail,
+    complete
+  })
+}
+
+function debounce(func, wait, immediate) {
+  let timeout, args, context, timestamp, result;
+  const later = function() {
+    // 据上一次触发时间间隔
+    const last = +new Date() - timestamp;
+    // 上次被包装函数被调用时间间隔last小于设定时间间隔wait
+    if (last < wait && last > 0) {
+      timeout = setTimeout(later, wait - last);
+    } else {
+      timeout = null;
+      // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
+      if (!immediate) {
+        result = func.apply(context, args);
+        if (!timeout) context = args = null;
+      }
+    }
+  }
+  return function(...args) {
+    context = this;
+    timestamp = +new Date();
+    const callNow = immediate && !timeout;
+    // 如果延时不存在，重新设定延时
+    if (!timeout) timeout = setTimeout(later, wait);
+    if (callNow) {
+      result = func.apply(context, args);
+      context = args = null;
+    }
+    return result;
+  }
+}
+
+function jsonStr(data){
+  return encodeURIComponent(JSON.stringify(data))
+}
+function jsonPar(json){
+  return JSON.parse(decodeURIComponent(json))
+}
+
+export let promisify = api => {
+  return (options, ...params) => {
+      return new Promise((resolve, reject) => {
+          api(Object.assign({}, options, { success: resolve, fail: reject }), ...params);
+      });
+  }
+}
+
+function previousPageFunction({fnName,query}){
+	return new Promise((rs,rj)=>{
+		try{
+			if(getCurrentPages().length>1){
+        console.log(getCurrentPages())
+				getCurrentPages()[getCurrentPages().length-2]['$vm'][fnName](query);
+				rs('success');
+			}else{
+				console.error('当前路由栈为一，无法调取上一页数据');
+				rj('当前路由栈为一，无法调取上一页数据');
+			}
+		}catch(err){
+			console.error('调用上一页面栈方法失败！',err);
+			rj('调用上一页面栈方法失败！');
+		}
+	})
+	 
+}
+
+// 获取节点信息
+function getNodeMes(selector,_this=null){
+	return new Promise(rs=>{
+    let query = _this ? uni.createSelectorQuery().in(_this) : uni.createSelectorQuery();
+		query.select(selector).boundingClientRect(res=>{
+			rs(res)
+			// this.height = uni.getSystemInfoSync().windowHeight - res.height;
+		}).exec()
+	})
+}
+
+export const convertBase64 = function(base64data){
+  const fsm = uni.getFileSystemManager();
+  const FILE_BASE_NAME = 'tmp_base64src';//临时文件名
+  return new Promise((resolve, reject) => {
+    const [, format, bodyData] = /data:image\/(\w+);base64,(.*)/.exec(base64data) || []; //去掉 base64 的头信息：
+    if (!format) {
+      reject(new Error('ERROR_BASE64SRC_PARSE'));
+    }
+    const filePath = `${uni.env.USER_DATA_PATH}/${FILE_BASE_NAME}.${format}`; 
+    const buffer = bodyData&&uni.base64ToArrayBuffer(bodyData);  //将 base64 数据转换为 ArrayBuffer 数据
+    // console.log(uni.base64ToArrayBuffer(bodyData))
+    fsm.writeFile({ //将 ArrayBuffer 写为本地用户路径的二进制图片文件 //图片文件路径在 uni.env.USER_DATA_PATH 中
+      filePath,
+      data: buffer,
+      encoding: 'binary',
+      success() {
+        // console.log(buffer)
+        resolve(filePath);
+      },
+      fail() {
+        reject(new Error('ERROR_BASE64SRC_WRITE'));
+      },
+    });
+  });
+}
+export function failAuthorizeTosetting(content='调用失败，请打开检查授权状态'){
+  showModal({
+      title:'提示',
+      content,
+      showCancel:true,
+      confirmText:'打开',
+      success:res=>{if(res.confirm)uni.openSetting()}
+  })
+}
+
+// 解析小程序码 scene 参数
+export function getSceneQuery(scene){
+  const queryStr = decodeURIComponent(scene) || null;
+  let queryObj = queryStr.split('&').reduce((obj,el)=>{
+    let arr = el.split('=');
+    obj[`${arr[0]}`] = arr[1];
+    return obj;
+  },{}) || null;
+  return queryObj;
+}
+
+// 格式化聊天内容
+// export function formatContent(str = ''){
+//   let reg = /\[[\u4e00-\u9fa5_a-zA-Z0-9]{1,}\]/gi;
+//   let strArr = str.split(reg) || [];
+//   let emojiArr = str.match(reg) || [];
+//   let contentList = [];
+//   strArr.forEach(ele=>{
+//     if(ele)contentList.push({
+//         type:'txt',
+//         content:ele
+//     });
+//     if(!!emojiArr.length){
+//       let iconKey = emojiArr.splice(0,1)[0];
+//       if(emojiMap[iconKey]){
+//         contentList.push({
+//             type:'icon',
+//             src:`${emojiUrl}${emojiMap[iconKey]}`
+//         })
+//       }else{
+//         contentList.push({
+//             type:'txt',
+//             content:iconKey
+//         });
+//       }
+//     }
+//   });
+//   return contentList
+// }
+//获取地址栏里（URL）传递的参数 
+function getUrlQuery(key,url){
+	var _url = decodeURI(url).split('?a=1').join(''); //剪切'?a=1'安卓兼容，再获取参数
+	if(_url.indexOf(`${key}=`) !=-1){
+		return _url.split(`${key}=`)[1].split('&')[0]
+	}
+	return null
+}
+
+//获取地址字段栏信息 腾讯获取授权码时
+function getQueryString(name) {
+	var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+	var r = window.location.search.substr(1).match(reg);
+	if (r != null) return   (r[2]);  // 编码的字符串进行解码
+	return null; 
+}
+
+function getRandom(min, max) {
+  return Math.round(Math.random() * (max - min)) + min;
+}
+
+export function get_zh_day(date){
+  if(isSameDay(new Date().getTime(),new Date(date).getTime()))return '今天'
+  const Arr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+  return Arr[new Date(date).getDay()] || '';
+}
+
+// 判断是否同一天
+export function  isSameDay(timeStampA, timeStampB) {
+    let dateA = new Date(timeStampA);
+    let dateB = new Date(timeStampB);
+    return (dateA.setHours(0, 0, 0, 0) == dateB.setHours(0, 0, 0, 0));
+}
+
+// 获取中文日期
+export function  get_zh_date(date = new Date()){
+  return `${new Date(date).getMonth()+1}月${new Date(date).getDate()}日`
+}
+
+export function substrDate(date){
+  if(!date)return;
+  return date.substr(0,10) || '-'
+}
+
+// package 貌似为保留字，作为参数时 编译报错
+export function requestPayment(query = {}){
+  showLoad();
+  uni.requestPayment({
+    timeStamp: query.timeStamp || '',
+    nonceStr: query.nonceStr || '',
+    package: query.package || '',
+    signType: query.signType || '',
+    paySign: query.paySign || '',
+    success: function(res){
+      query.success&&query.success(res)
+    },
+    fail: function(res){
+      query.fail&&query.fail(res)
+    },
+    complete: function(res){
+      hideLoad();
+      query.complete&&query.complete(res)
+    },
+  })
+}
+function getQueryStr({url,name}){
+  let queryArr = (url.split('?')[1] || '').split("&") || [];
+  // let vars = query.split("&");
+  for (let i=0;i<queryArr.length;i++) {
+    let pair = queryArr[i].split("=");
+    if(pair[0] == name)return pair[1] || '';
+  }
+  return '';
+}
+export default {
+  formatTime,
+  formatNumber,
+  formatDate,
+  routeTo,
+  showNone,
+  showLoad,
+  hideLoad,
+  showModal,
+  debounce,
+  jsonStr,
+  jsonPar,
+  promisify,
+  previousPageFunction,
+  getNodeMes,
+  failAuthorizeTosetting,
+  getSceneQuery,
+  getUrlQuery,
+  getQueryString,
+  getRandom,
+  get_zh_day,
+  isSameDay,
+  get_zh_date,
+  substrDate,
+  requestPayment,
+  getQueryStr
+}