From 3dc241f7f8fc7a055cfb9ba2cf734fea1c5708f0 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Fri, 22 Jan 2021 18:08:24 +0800
Subject: [PATCH] add style

---
 README.md                                          |  21 ++
 package.json                                       |   6 +-
 src/App.vue                                        |  23 ++
 src/components/authorize_modal/authorize_modal.vue | 149 +++++++++
 src/js/api.js                                      |  12 +
 src/js/server.js                                   |  91 ++++++
 src/pages.json                                     |  27 +-
 src/pages/feedback/feedback.vue                    | 151 +++++++++
 src/pages/index/index.vue                          | 230 ++++++++++++--
 src/pages/login/login.vue                          | 205 +++++++++++++
 src/pages/message_list/message_list.vue            |  94 ++++++
 src/static/images/authorize.png                    | Bin 0 -> 13873 bytes
 src/static/logo.png                                | Bin 4023 -> 0 bytes
 src/store/actions.js                               |  16 +
 src/store/index.js                                 |  54 ++++
 src/store/mutations.js                             |  15 +
 src/style/public.scss                              |  89 ++++++
 src/utils/util.js                                  | 338 +++++++++++++++++++++
 18 files changed, 1483 insertions(+), 38 deletions(-)
 create mode 100644 src/components/authorize_modal/authorize_modal.vue
 create mode 100644 src/js/api.js
 create mode 100644 src/js/server.js
 create mode 100644 src/pages/feedback/feedback.vue
 create mode 100644 src/pages/login/login.vue
 create mode 100644 src/pages/message_list/message_list.vue
 create mode 100644 src/static/images/authorize.png
 delete mode 100644 src/static/logo.png
 create mode 100644 src/store/actions.js
 create mode 100644 src/store/index.js
 create mode 100644 src/store/mutations.js
 create mode 100644 src/style/public.scss
 create mode 100644 src/utils/util.js

diff --git a/README.md b/README.md
index 80d49f3..26f1c99 100644
--- a/README.md
+++ b/README.md
@@ -17,3 +17,24 @@ yarn build
 
 ### Customize configuration
 See [Configuration Reference](https://cli.vuejs.org/config/).
+
+### 库
+
+```
+    vuex、numeral
+    
+    依赖-> sass-loader/ node-sass/
+```
+
+*sass 需要cnpm装，npm安装报错*
+
+> 原型链接：https://org.modao.cc/app/d33151880c5a6a975b9f3af1868bf3a125a8923b?simulator_type=outside_artboard&sticky 
+> 设计稿链接：https://lanhuapp.com/web/#/item/project/board?pid=ea91cb92-0502-40c9-a746-e68d121e26fd 
+
+### ipx 底部适配高度函数
+
+```css
+    padding-bottom: 0;
+    padding-bottom: calc( 0 + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+    padding-bottom: calc( 0 + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+```
\ No newline at end of file
diff --git a/package.json b/package.json
index 2a5eee7..a0908ec 100644
--- a/package.json
+++ b/package.json
@@ -80,8 +80,12 @@
     "jest": "^25.4.0",
     "mini-types": "*",
     "miniprogram-api-typings": "*",
+    "node-sass": "^5.0.0",
+    "numeral": "^2.0.6",
     "postcss-comment": "^2.0.0",
-    "vue-template-compiler": "^2.6.11"
+    "sass-loader": "^10.1.1",
+    "vue-template-compiler": "^2.6.11",
+    "vuex": "^3.6.0"
   },
   "browserslist": [
     "Android >= 4",
diff --git a/src/App.vue b/src/App.vue
index 8c2b732..08441c9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,4 +14,27 @@
 
 <style>
 	/*每个页面公共css */
+	page{
+		background-color: #f2f2f7;
+	}
+	view,scroll-view,text,picker{
+		box-sizing: border-box;
+	}
+	/* 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/components/authorize_modal/authorize_modal.vue b/src/components/authorize_modal/authorize_modal.vue
new file mode 100644
index 0000000..a1252a8
--- /dev/null
+++ b/src/components/authorize_modal/authorize_modal.vue
@@ -0,0 +1,149 @@
+<template>
+    <view class="authorize-modal">
+        <view class="am-content">
+            <view class="ac-tit">微信授权</view>
+            <view class="ac-tip">您的信息和数据将受到保护</view>
+            <image class="ac-img" mode="aspectFit" src="/static/images/authorize.png"></image>
+            <view class="ac-btns">
+                <button plain class="ab-btn" hover-class="hover-active" @click="cancel">取消</button>
+                <button 
+                    plain 
+                    class="ab-btn" 
+                    hover-class="hover-active" 
+                    open-type="getUserInfo"
+                    lang="zh_CN"
+                    @getuserinfo="getUserInfo"
+                >授权并登录</button>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+import { API } from '../../js/api';
+import { servers } from '../../js/server';
+import util from '../../utils/util';
+import Vuex from 'vuex';
+const uniLogin = util.promisify(uni.login);
+
+export default {
+    methods: {
+        cancel(){
+            this.closeThis();
+        },
+        closeThis(){
+            this.$emit('close');
+        },
+        async getUserInfo(userRes){
+
+            if(!userRes.detail.userInfo){
+                this.$emit('loginFail');
+                this.closeThis();
+                return util.showNone('获取用户信息失败！请稍后重试');
+            }
+            let loginRes = await uniLogin();
+            if(!loginRes.code){
+                this.$emit('loginFail');
+                this.closeThis();
+                return util.showNone('获取登陆凭证失败！稍后重试');
+            }
+            const APPID = uni.getAccountInfoSync().miniProgram.appId;
+            util.showLoad();
+            servers.post({
+                url: API.wechatMiniAppLoginAndSync,
+                data: {
+                    code:loginRes.code,
+                    appid:APPID,
+                    encryptedData:userRes.detail.encryptedData,
+                    iv:userRes.detail.iv,
+                    'avatar_url': userRes.detail.userInfo.avatarUrl,
+                    ...userRes.detail.userInfo,
+                },
+                isDefaultGet: false,
+            })
+            .then(res=>{
+                util.hideLoad();
+                if(res.data.code == 0){
+                    util.showNone(res.data.message || '登陆成功！');
+                    let _data = res.data.data;
+                    uni.setStorageSync('token',_data.token);
+                    uni.setStorageSync('userInfo',_data.user);
+                    this.$emit('loginSuccess',res);
+                    setTimeout(_=>this.closeThis(), 1200);
+                }else{
+                    util.showNone(res.data.message || '后台登陆失败！');
+                    this.$emit('loginFail');
+                    setTimeout(_=>this.closeThis(), 1200);
+                }
+                
+            }).catch(util.hideLoad)
+
+            // this.$store.dispatch('initStoreInfo')
+            // .then(store=>console.log('店铺信息---',store))
+
+        }
+    }
+}
+</script>
+<style scoped lang="scss">
+    @import  "../../style/public.scss";
+    .authorize-modal{
+        position: fixed;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        background-color: rgba($color: #000, $alpha: .5);
+		z-index: 10;
+        .am-content{
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+            padding-top: 60upx;
+            width: 626upx;
+            border-radius: 16upx;
+            background-color: #fff;
+            .ac-tit{
+                margin-bottom: 22upx;
+                text-align: center;
+                line-height: 44upx;
+                font-size: 32upx;
+                color: #181818;
+            }
+            .ac-tip{
+                margin-bottom: 50upx;
+                text-align: center;
+                line-height: 40upx;
+                font-size: 28upx;
+                color: #9A9A9D;
+            }
+            .ac-img{
+                display: block;
+                margin: 0 auto;
+                width: 488upx;
+                height: 416upx;
+            }
+            .ac-btns{
+                padding: 60upx 56upx 80upx;
+                @include centerFlex(space-between);
+                .ab-btn{
+                    height: 88upx;
+                    width: 240upx;
+                    line-height: 84upx;
+                    text-align: center;
+                    border: 2upx solid #C9C9CB;
+                    border-radius: 44upx;
+                    font-size: 28upx;
+                    color: #9a9a9d;
+                    &+.ab-btn{
+                        background-color: $themeColor;
+                        border-color: $themeColor;
+                        color: #fff;
+                    }
+                }
+            }
+
+        }   
+        
+    }
+</style>
\ No newline at end of file
diff --git a/src/js/api.js b/src/js/api.js
new file mode 100644
index 0000000..67f4729
--- /dev/null
+++ b/src/js/api.js
@@ -0,0 +1,12 @@
+export const ORIGIN = ``;  //  测试
+// export const ORIGIN = ``;  //  正式
+
+export const API = {
+  ex: `${ORIGIN}/test/test`,  
+}
+
+
+export default { ORIGIN, API };
+
+
+
diff --git a/src/js/server.js b/src/js/server.js
new file mode 100644
index 0000000..e5cebad
--- /dev/null
+++ b/src/js/server.js
@@ -0,0 +1,91 @@
+import util from '../utils/util';
+// import { app as vm } from '../main';
+const islog = true;
+
+export class Server {
+  request(url,data,method,header,isDefaultGet,failMsg){
+    return new Promise(async (rs,rj)=>{
+          // const _store = vm.$store;
+          // let storeInfo = _store.state.storeInfo || null;
+          // if(storeInfo)data['brand_id'] = storeInfo.brand_id;
+
+          const _token = uni.getStorageSync('token') || '';
+          if(_token)data['token'] = _token;
+          if(method === 'POST'&&_token)url = url + `?token=${_token}`
+          uni.request({
+              url,
+              data,
+              method, // OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT
+              header: {...header}, // 设置请求的 header // {'custom-header': 'application/json'}
+              success: res=>{
+                if(islog)console.log('req success---->',{
+                    link: url,
+                    query: data,
+                    method: method,
+                    data: res,
+                })
+                if(isDefaultGet){
+                    if(failMsg == '')throw Error('默认回调，失败提示不能为空 key -> failMsg');
+                    defaultGet({
+                        url,
+                        data,
+                        res,
+                        failMsg,
+                        resolve: rs,
+                        reject: rj
+                    });
+                    return 
+                } 
+                rs(res);
+              },
+              fail: err=>{
+                if(islog)console.log('req fail---->',{
+                      link: url,
+                      query: data,
+                      method: method,
+                      data: err,
+                  })
+                  util.hideLoad();
+                  if(typeof(err.errMsg) == 'string'&&(err.errMsg.indexOf('timeout')!=-1 || err.errMsg.indexOf('interrupted')!=-1 || err.errMsg.indexOf('请求超时')!=-1)){
+                      util.showNone('网络超时！');
+                  }else if(typeof(err.errMsg) == 'string'){
+                      util.showNone(err.errMsg);
+                  }else{
+                      util.showNone('请求数据失败！请检查当前网络状态。');
+                  }
+                  rj(err);
+              },
+          })
+      })
+
+      function defaultGet({res,failMsg,resolve,reject,url,data}){
+          if(res.data.code == 0){
+            resolve(res.data.data);
+          }else{
+            util.hideLoad();
+            util.showNone(res.data.message || failMsg || '');
+            reject({url,res,data});
+          }
+      }
+  }
+  get({url,data={},header={},isDefaultGet=true,failMsg=''}){
+    return this.request(url,data,'GET',header,isDefaultGet,failMsg);
+  }
+
+  post({url,data={},header={'custom-header': 'application/json'},isDefaultGet=true,failMsg=''}){
+    return this.request(url,data,'POST',header,isDefaultGet,failMsg);
+  }
+  
+  uploadFile({url,filePath,onProgressCallBack,formData={}}){
+    return new Promise((rs,rj)=>{
+        let uploadTask = wx.uploadFile({
+            url,filePath,formData,name:'file',success:rs,fail:rj
+        })
+        uploadTask.onProgressUpdate(res=>onProgressCallBack&&onProgressCallBack(res))
+    })
+  }
+}
+
+export const servers = new Server();
+
+export default { servers, Server };
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 1aea851..bcbc40e 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -3,14 +3,31 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "欧轩智能教裁助手"
+			}
+		},
+		{
+			"path": "pages/feedback/feedback",
+			"style": {
+			}
+		},
+		
+		{
+			"path": "pages/message_list/message_list",
+			"style": {
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
 			}
 		}
+		
 	],
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "欧轩智能教裁助手",
+		"navigationBarBackgroundColor": "#009874",
+		"backgroundColor": "#f2f2f7"
 	}
 }
diff --git a/src/pages/feedback/feedback.vue b/src/pages/feedback/feedback.vue
new file mode 100644
index 0000000..5293459
--- /dev/null
+++ b/src/pages/feedback/feedback.vue
@@ -0,0 +1,151 @@
+<template>
+    <view class="feedback-container">
+        <view class="fc-textarea">
+            <textarea placeholder="请输入您的反馈、建议或者发现的问题"></textarea>
+        </view>
+        <view class="fc-tit"><text>上传照片</text>(最多上传3张，只支持.jpg、png 格式）</view>
+        <view class="fc-imgs">
+            <view class="fi-item" v-for="i in 5" :key="i">
+                <image class="fi-img"></image>
+                <image class="fi-close"></image>
+            </view>
+            <view class="fi-item fi-add">
+                <view></view>
+                <view>上传照片</view>
+            </view>
+        </view>
+        <view class="fc-fixed-bar">
+            <view hover-class="hover-active">保存</view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang='scss'>
+    @import '~style/public.scss';
+    page{
+        background-color: #fff;
+    }
+    .feedback-container{
+        padding-top: 44upx;
+        padding-bottom: 108upx;
+        padding-bottom: calc( 108upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        padding-bottom: calc( 108upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+        .fc-textarea{
+            padding: 20upx;
+            margin: 0 auto 36upx;
+            width: 692upx;
+            height: 360upx;
+            border-radius: 10upx;
+            border: 2upx solid #D8D8D8;
+            >textarea{
+                width: 100%;
+                height: 100%;
+                font-size: 28upx;
+                line-height: 40upx;
+                color: #1a1a1a;
+            }
+        }
+        .fc-tit{
+            padding: 0 30upx;
+            margin-bottom: 24upx;
+            line-height: 44upx;
+            font-size: 24upx;
+            color: #9a9a9d;
+            @include textHide(1);
+            >text{
+                font-size: 32upx;
+                color: #333;
+            }
+        }
+        .fc-imgs{
+            padding-left: 6upx;
+            font-size: 0;
+            .fi-item{
+                position: relative;
+                margin: 0 24upx 24upx;
+                display: inline-block;
+                width: 200upx;
+                height: 200upx;
+                background-color: skyblue;
+                border-radius: 10upx;
+                overflow: hidden;
+                &.fi-add{
+                    padding-top: 36upx;
+                    >view{
+                        &:first-child{
+                            position: relative;
+                            margin: 0 auto 30upx;
+                            width: 60upx;
+                            height: 60upx;
+                            &::before{
+                                content: '';
+                                position: absolute;
+                                left: 50%;
+                                top: 50%;
+                                transform: translate(-50%, -50%);
+                                width: 60upx;
+                                height: 4upx;
+                                background-color: #d8d8d8;
+
+                            }
+                            &::after{
+                                content: '';
+                                position: absolute;
+                                left: 50%;
+                                top: 50%;
+                                transform: translate(-50%, -50%);
+                                height: 60upx;
+                                width: 4upx;
+                                background-color: #d8d8d8;
+
+                            }
+                        }
+                        &+view{
+                            text-align: center;
+                            font-size: 28upx;
+                            color: #9a9a9d;
+                        }
+                    }
+                }
+                .fi-img{
+                    width: 100%;
+                    height: 100%;
+                    background-color: slateblue;
+                }
+                .fi-close{
+                    position: absolute;
+                    right: 6upx;
+                    top: 6upx;
+                    width: 40upx;
+                    height: 40upx;
+                    background-color: red;
+                }
+            }
+        }
+        .fc-fixed-bar{
+            position: fixed;
+            width: 100%;
+            left: 0;
+            bottom: 0;
+            padding: 10upx 20upx;
+            padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+            padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+            >view{
+                height: 88upx;
+                line-height: 88upx;
+                text-align: center;
+                border-radius: 44upx;
+                font-size: 32upx;
+                background-color: $themeColor;
+                color: #fff;
+
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index bd118ba..54ab78c 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,49 +1,215 @@
 <template>
-	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
-		<view>
-			<text class="title">{{title}}</text>
+	<view class="index-container">
+		<view class="ic-header">
+			<!-- <button hover-class="hover-active">前往登录</button> -->
+			<view class="ih-store-name">
+				<view>广州欧轩智能场馆(共6家)</view>
+				<image></image>
+			</view>
+			<view class="ih-tip">本月课时</view>
+			<view class="ih-num">0</view>
 		</view>
+		<view class="ic-notice">
+			<view class="in-left">
+				<image></image>
+				<text>欧轩智能场馆商家助手上线啦！</text>
+			</view>
+			<view class="in-right">
+				<view>99</view>
+				<image></image>
+			</view>
+		</view>
+		<view class="ic-tab-section">
+			<view class="its-item" v-for="e in 8" :key="e">
+				<image></image>
+				<view>我的课程</view>
+			</view>
+		</view>
+		<view class="ic-feedback">
+			<view class="if-right">
+				<image></image>
+				<text>在线反馈</text>
+			</view>
+			<image></image>
+		</view>
+		<authorize-modal v-if="false"></authorize-modal>
 	</view>
 </template>
-
 <script>
+	import authorize_modal from '../../components/authorize_modal/authorize_modal';
 	export default {
-		data() {
-			return {
-				title: 'Hello'
-			}
+		components: {
+			'authorize-modal': authorize_modal
 		},
-		onLoad() {
+		data(){
+			return {
 
+			}
 		},
-		methods: {
-
+		onLoad(){
 		}
 	}
 </script>
 
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin: 200rpx auto 50rpx auto;
-	}
+<style lang="scss">
+	@import '~style/public.scss';
+	.index-container{
+		padding-top: 24upx;
+		padding: 24upx;
+		.ic-header{
+			padding-top: 66upx;
+			margin-bottom: 24upx;
+			height: 364upx;
+			border-radius: 10upx;
+			background-color: $themeColor;
+			button{
+				margin: 0 auto 42upx;
+				padding: 0;
+				width: 160upx;
+				line-height: 40upx;
+				height: 40upx;
+				text-align: center;
+				border-radius: 20upx;
+				border: none;
+				font-size: 28upx;
+				background-color: #fff;
+				color: $themeColor;
+			}
+			.ih-store-name{
+				margin-top: 22upx;
+				margin-bottom: 10upx;
+				@include centerFlex(center);
+				>view{
+					max-width: 80%;
+					line-height: 50upx;
+					text-align: center;
+					font-size: 36upx;
+					font-weight: 500;
+					color: #fff;
+					@include textHide(1);
+				}
+				>image{
+					margin-left: 20upx;
+					width: 28upx;
+					height: 28upx;
+					background-color: skyblue;
+				}
+			}
+			.ih-tip{
+				text-align: center;
+				line-height: 40upx;
+				font-size: 28upx;
+				color: rgba($color: #fff, $alpha: .7);
+			}
+			.ih-num{
+				padding: 0 20upx;
+				font-size: 104upx;
+				text-align: center;
+				line-height: 146upx;
+				font-weight: 600;
+				color: #fff;
+				@include textHide(1);
+			}
+		}
+		@mixin sec{
+			margin-bottom: 24upx;
+			border-radius: 10upx;
+			background-color: #fff;
+		}
+		.ic-notice{
+			padding: 0 24upx;
+			height: 108upx;
+			@include sec;
+			@include centerFlex(space-between);
+			.in-left{
+				flex-shrink: 0;
+				flex-grow: 1;
+				font-size: 28upx;
+				color: #1a1a1a;
+				@include textHide(1);
+				>image{
+					vertical-align: middle;
+					width: 52upx;
+					height: 52upx;
+					margin-right: 10upx;
+					background-color: skyblue;
+				}
 
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
+			}
+			.in-right{
+				@include centerFlex(flex-end);
+				>view{
+					margin-right: 14upx;
+					width: 40upx;
+					height: 40upx;
+					border-radius: 50%;
+					background-color: #EA5061;
+					line-height: 40upx;
+					text-align: center;
+					font-size: 24upx;
+					color: #fff;
+					@include textHide(1);
+				}
+				>image{
+					flex-shrink: 0;
+					width: 28upx;
+					height: 28upx;
+					background-color: skyblue;
+				}
+			}
+		}
+		.ic-tab-section{
+			padding: 10upx 0;
+			font-size: 0;
+			@include sec;
+			.its-item{
+				display: inline-block;
+				padding: 30upx 10upx;
+				width: 33.33%;
+				height: auto;
+				>image{
+					background-color: skyblue;
+					margin: 0 auto 20upx;
+					display: block;
+					width: 52upx;
+					height: 52upx;
+				}
+				>view{
+					text-align: center;
+					height: 40upx;
+					line-height: 40upx;
+					font-size: 28upx;
+					color: #1a1a1a;
+					@include textHide(1);
+				}
+			}
+		}
+		.ic-feedback{
+			padding: 0 24upx;
+			height: 108upx;
+			@include sec;
+			@include centerFlex(space-between);
+			.if-right{
+				font-size: 28upx;
+				line-height: 40upx;
+				color: #1a1a1a;
+				@include textHide(1);
+				>image{
+					vertical-align: middle;
+					margin-right: 16upx;
+					width: 52upx;
+					height: 52upx;
+					background-color: skyblue;
+				}
+			}
+			>image{
+				flex-shrink: 0;
+				flex-grow: 0;
+				width: 28upx;
+				height: 28upx;
+				background-color: skyblue;
+			}
+		}
 
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
 	}
 </style>
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
new file mode 100644
index 0000000..db8ff22
--- /dev/null
+++ b/src/pages/login/login.vue
@@ -0,0 +1,205 @@
+<template>
+    <view class="login-container">
+        <view class="lc-header">
+            <view class="lh-logo"></view>
+            <view class="lh-name">欧轩智能场馆</view>
+        </view>
+        <view class="lc-form">
+            <view class="lf-frame"><input placeholder="请输入品牌ID" v-model="formData.brand_id" /></view>
+            <view class="lf-frame"><input placeholder="请输入账号" v-model="formData.account" /></view>
+            <view class="lf-frame"><input placeholder="请输入密码" v-model="formData.password" password /></view>
+        </view>
+
+        <button 
+            class="lf-btn" 
+            hover-class="hover-active" 
+            open-type="getUserInfo"
+            lang="zh_CN"
+            @getuserinfo="submitBtn"
+        >登录</button>
+        <!-- <view class="lf-tip">提示：请联系管理员添加您为员工账号</view>
+        <view class="lf-bot-btn" @click="toWebView">成为商家</view> -->
+
+    </view>
+</template>
+
+<script>
+import { API } from '../../js/api';
+import { servers } from '../../js/server';
+import util from '../../utils/util';
+const uniGetSetting = util.promisify(uni.getSetting);
+const uniLogin = util.promisify(uni.login);
+const APPID = '';
+export default {
+    data(){
+        return {
+            formData: {
+                brand_id: '',
+                account: '',
+                password: '',
+            }
+        }
+    },
+    methods: {
+        async submitBtn(userRes){
+            try{
+                util.showLoad();
+                if(!userRes.detail.userInfo){
+                    util.hideLoad();
+                    return util.showNone('获取用户信息失败！请稍后重试');
+                }
+
+                let loginRes = await uniLogin();
+
+                if(!loginRes.code){
+                    util.hideLoad();
+                    return util.showNone('获取登陆凭证失败！稍后重试');
+                }
+                let userInfo = userRes.detail || {};
+                console.log(userRes)
+                let { formData } = this;
+                servers.post({
+                    url: API.WechatMiniApplogin,
+                    data: {
+                        appid: APPID,
+                        code: loginRes.code,
+                        encryptedData: userInfo.encryptedData,
+                        // is_details: 1,
+                        // 后端解密错误，直接传用户信息
+                        user_info: userInfo.userInfo,
+                        user_raw_data: userInfo.rawData,
+                        ...userInfo.userInfo,
+                        username: formData.account,
+                        password: formData.password,
+                        brand_id: formData.brand_id,
+                    },
+                    isDefaultGet: false,
+                })
+                .then(res=>{
+                    util.hideLoad();
+                    let _data = res.data || {};
+                    if(_data.code == 0){
+                        util.showNone(_data.message || '操作成功！');
+                        
+                        uni.setStorageSync('token',_data.data);
+                        setTimeout(_=>{
+                            util.routeTo(`/pages/index/index`, 'rL');
+                        }, 1200);
+                    }else{
+                        util.showNone(_data.message || '操作失败！');
+                    }
+                    
+                })
+                .catch(util.hideLoad)
+            }catch(err){
+                util.hideLoad();
+                console.warn('login err', err);
+            }
+        },
+        toWebView(){
+            util.routeTo(`/pages/web_view/web_view`,'rL');
+        }
+    },
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    page{
+        background-color: #fff;
+    }
+    .login-container{
+        padding-bottom: 0;
+        padding-bottom: calc( 0 + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        padding-bottom: calc( 0 + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+        .lc-header{
+            position: relative;
+            padding-top: 70upx;
+            margin-bottom: 46upx;
+            height: 390upx;
+            width: 100%;
+            overflow: hidden;
+            &::before{
+                content: '';
+                display: block;
+                position: absolute;
+                left: 50%;
+                bottom: 0upx;
+                z-index: -1;
+                transform: translateX(-50%);
+                background-color: $themeColor;
+                width: 3000upx;
+                height: 3000upx;
+                border-radius: 50%;
+            }
+            .lh-logo{
+                margin: 0 auto 20upx;
+                width: 170upx;
+                height: 170upx;
+                border-radius: 50%;
+                background-color: #fff;
+                overflow: hidden;
+                >image{
+                    width: 100%;
+                    height: 100%;
+                }
+            }
+            .lh-name{
+                padding: 0 24upx;
+                text-align: center;
+                line-height: 50upx;
+                font-weight: 500;
+                font-size: 36upx;                
+                color: #fff;
+            }
+        }
+        .lc-form{
+            margin-bottom: 80upx;
+            .lf-frame{
+                margin: 0 auto 24upx;
+                padding: 0 20upx;
+                width: 610upx;
+                height: 108upx;
+                border: 2upx solid #dddddd;
+                border-radius: 54upx;
+                >input{
+                    width: 100%;
+                    height: 100%;
+                    text-align: center;
+                    font-size: 32upx;
+                    color: #333;
+                }
+                &:last-child{
+                    margin-bottom: 0;
+                }
+            }
+        }
+        .lf-btn{
+            margin-bottom: 16upx;
+            width: 610upx;
+            height: 108upx;
+            border-radius: 54upx;
+            border: none;
+            background-color: $themeColor;
+            font-size: 36upx;
+            line-height: 108upx;
+            color: #fff;
+        }
+        .lf-tip{
+            margin-bottom: 120upx;
+            text-align: center;
+            line-height: 40upx;
+            text-align: center;
+            font-size: 28upx;
+            color: #9A9A9D;
+        }
+        .lf-bot-btn{
+            margin-bottom: 20upx;
+            line-height: 40upx;
+            text-align: center;
+            font-size: 28upx;
+            color: $themeColor;
+            text-decoration: underline;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/pages/message_list/message_list.vue b/src/pages/message_list/message_list.vue
new file mode 100644
index 0000000..ba2f994
--- /dev/null
+++ b/src/pages/message_list/message_list.vue
@@ -0,0 +1,94 @@
+<template>
+    <view class="message-list">
+        <view class="ml-item" v-for="i in 10" :key="i">
+            <view class="mi-tit">
+                <view class="mt-name" >
+                    <view :class="[i==5?'active':'']">欧轩智能商家助手功能更新</view>
+                </view>
+                <view class="mt-date">2020/11/23</view>
+            </view>
+            <view class="mi-desc">
+                <view>喜欢喜欢需和许 i 会修 hi 休闲鞋被选行啊学…休闲鞋被选行啊学…休闲鞋被选行啊学…</view>
+                <image></image>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+    @import '~style/public.scss';
+    page{
+        background-color: #fff;
+    }
+    .message-list{
+        padding-left: 24upx;
+        padding-bottom: 24upx;
+        padding-bottom: calc( 24upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */
+        padding-bottom: calc( 24upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */
+        .ml-item{
+            padding: 54upx 24upx 40upx 0;
+            border-bottom: 2upx solid #D8D8D8;
+            .mi-tit{
+                margin-bottom: 20upx;
+                @include centerFlex(space-between);
+                .mt-name{
+                    position: relative;
+                    flex-shrink: 1;
+                    min-width: 0;
+                    &::after{
+                        content: '';
+                        position: absolute;
+                        right: -16upx;
+                        top: 6upx;
+                        width: 12upx;
+                        height: 12upx;
+                        border-radius: 50%;
+                        background-color: #FF4444;
+                    }
+                    >view{
+                        line-height: 44upx;
+                        font-size: 32upx;
+                        color: #333;
+                        @include textHide(1);
+                        &.active{
+                            color: #9A9A9D;
+                        }
+                    }
+                }
+                .mt-date{
+                    flex-shrink: 0;
+                    flex-grow: 0;
+                    max-width: 50%;
+                    margin-left: 24upx;
+                    font-size: 28upx;
+                    color: #9a9a9d;
+                    @include textHide(1);    
+                }
+            }
+            .mi-desc{
+                @include centerFlex(space-between);
+                >view{
+                    flex-grow: 1;
+                    flex-shrink: 0;
+                    max-width: 80%;
+                    font-size: 24upx;
+                    line-height: 34upx;
+                    color: #9a9a9d;
+                    @include textHide(1);
+                }
+                >image{
+                    flex-shrink: 0;
+                    width: 32upx;
+                    height: 32upx;
+                    background-color: skyblue;
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/static/images/authorize.png b/src/static/images/authorize.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc7f1fbcaaf89b8f080e87b96976e7204bd63e72
GIT binary patch
literal 13873
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

literal 0
HcmV?d00001

diff --git a/src/static/logo.png b/src/static/logo.png
deleted file mode 100644
index b5771e209bb677e2ebd5ff766ad5ee11790f305a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4023
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
SYs}WS&%*SCNx89m_<sQGK?UOg

diff --git a/src/store/actions.js b/src/store/actions.js
new file mode 100644
index 0000000..73e1a6d
--- /dev/null
+++ b/src/store/actions.js
@@ -0,0 +1,16 @@
+// 异步方法
+import { servers } from '../js/server';
+import { API } from '../js/api';
+export default {
+    getBrandInfo({commit, state}){
+        return servers.get({
+            url: API.calc,
+            data: {},
+            failMsg: '加载数据失败！'
+        })
+        .then(res=>{
+            commit('setBrandInfo',res);
+            return res;
+        })
+    }
+}
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
new file mode 100644
index 0000000..a776071
--- /dev/null
+++ b/src/store/index.js
@@ -0,0 +1,54 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import mutations from './mutations';
+import actions from './actions';
+import device from './device';
+Vue.use(Vuex);
+
+export default new Vuex.Store({
+    modules: {
+        device
+    },
+    state: {
+        // #ifdef H5
+        APPID: uni.getAccountInfoSync().miniProgram.appId,
+        // #endif
+        brandInfo: {
+            brand: {} 
+        },
+        permissionObj: { // 权限代号对应
+            '1001': '营业额',
+            '1002': '收款记录',
+            '1003': '经营分析',
+            '1004': '预约订单',
+            '1005': '会员卡订单',
+            '1006': '积分订单',
+            '1007': '员工管理',
+            '1008': '查询核销',
+            '1009': '场地管理',
+            '1010': '设备管理',
+        },
+
+        // 场地占用提交页面信息
+        occupyInfo: {
+            storeInfo: {},  // 店铺信息
+            dateInfo: {},   // 时间信息 
+            typeInfo: {},   // 球场类型
+            venueList: [],  // 选择场地列表
+        }
+    },
+    mutations,
+    actions,
+    getters: {
+        permissionArr: state=>{
+            let _arr = [], _obj = state.permissionObj;
+            for(let key in _obj){
+                _arr.push({
+                    key,
+                    name: _obj[key],
+                })
+            }
+            return _arr;
+        }
+    }
+});
diff --git a/src/store/mutations.js b/src/store/mutations.js
new file mode 100644
index 0000000..99d4083
--- /dev/null
+++ b/src/store/mutations.js
@@ -0,0 +1,15 @@
+// 同步方法
+
+
+export default {
+    // 设置品牌信息
+    setBrandInfo(state, brandInfo){
+        // console.log(storeInfo,'-----')
+        state.brandInfo = brandInfo
+    },
+
+    // 场地占用信息
+    setOccupyInfo(state, _occupyInfo){
+        state.occupyInfo = _occupyInfo;
+    }
+}
\ No newline at end of file
diff --git a/src/style/public.scss b/src/style/public.scss
new file mode 100644
index 0000000..60305d8
--- /dev/null
+++ b/src/style/public.scss
@@ -0,0 +1,89 @@
+@charset "utf-8";
+
+$themeColor: #009874;
+
+/*每个页面公共css */
+/* view,scroll-view,text,picker{
+   box-sizing: border-box;
+ } */
+
+@mixin textHide($line) {
+    display: -webkit-box;
+    word-break: break-all;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp:$line;
+}
+
+@mixin centerFlex($justtify){
+    display: flex;
+    align-items: center;
+    justify-content: $justtify;
+}
+
+@mixin botLine{
+    border-bottom: 2upx solid #e5e5e5;
+}
+
+@mixin picBgc{
+    background-color: #f9f9f9;
+}
+
+
+@mixin closeIcon($width,$height,$color) {
+    transform: rotateZ(45deg);
+    &::before{
+        content: '';
+        display: block;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+        width: $width;
+        height: $height;
+        background-color: $color;
+        border-radius: $height;
+    }
+    &::after{
+        content: '';
+        display: block;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%,-50%);
+        width: $height;
+        height: $width;
+        background-color: $color;
+        border-radius: $height;
+    }
+}
+
+@mixin hover {
+    position: relative;
+    overflow: hidden;
+    &::after{
+        content: '';
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        z-index: 2;
+        background-color: rgba(0,0,0,.1);
+    }
+}
+
+@mixin arrowIcon($size,$line,$radius,$angle,$color) {
+    &::after{
+        content:'';
+        display: inline-block;
+        vertical-align: middle;
+        transform: rotateZ($angle);
+        width: $size;
+        height: $size;
+        border-right: $line solid $color;
+        border-bottom: $line solid $color;
+        border-bottom-right-radius: $radius;
+    }
+}
diff --git a/src/utils/util.js b/src/utils/util.js
new file mode 100644
index 0000000..7c444a1
--- /dev/null
+++ b/src/utils/util.js
@@ -0,0 +1,338 @@
+// 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 = formatNumber(_date.getMonth() + 1);
+  const day = formatNumber(_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;
+}
+
+//获取地址栏里（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 '';
+}
+
+// 小程序码参数 -> '{}'
+function formatScene(sceneStr = ''){
+  let scene = decodeURIComponent(sceneStr);
+  let queryArr = scene.split('&');
+  return queryArr.reduce((obj,e,i)=>{
+    let _arr = e.split('=');
+    obj[_arr[0]] = _arr[1];
+    return obj;
+  },{}) || {};
+}
+
+function changeLowerCase(str){
+  return str.toString().toLocaleLowerCase();
+}
+
+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,
+  formatScene,
+  changeLowerCase
+}