1

pages.json

@@ -18,7 +18,6 @@
 			}
 		}
 		
-
         ,{
             "path" : "pages/login/login",
             "style" :                                                                                    
@@ -37,9 +36,6 @@
             }
             
         }
-        
-      
-        
         ,{
             "path" : "pages/chargingPileDetails/chargingPileDetails",
             "style" :                                                                                    
@@ -57,7 +53,14 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+		{
+			"name":"欢迎页",
+			"path": "pages/login/welcome",
+			"style": {
+				//"navigationStyle": "custom" // 隐藏系统导航栏
+			}
+		}
     ],
 	"globalStyle": {
 			"navigationStyle": "custom", // 隐藏系统导航栏

pages/login/login.vue

@@ -1,22 +1,116 @@
 <template>
-	<view>
+	<view class="wrap">
+		<view class="login">
+			<view class="login-title">
+				<h3>手机号登录/注册</h3>
+				<p>欢迎来到荆易充</p>
+			</view>
+			
+			<view class="login-form">
+				<view class="login-form-item">
+					<view class="title">手机号</view>
+					<view class="input">
+						<u-input v-model="tel" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
+					</view>
+					<view class="tips">未注册的手机号验证后将自动注册</view>
+				</view>
+				<view class="login-form-item">
+					<view class="title">验证码</view>
+					<view class="input">
+						<view class="code">获取验证码</view>
+						<u-input v-model="tel" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
+					</view>
+					<view class="tips">我已阅读并同意<span>《会员协议》</span>和<span>《隐私协议》</span></view>
+				</view>
+			</view>
+			
+			<u-button :style="[inputStyle]" class="login-btn" type="success" shape="circle">登录</u-button>
+		</view>
 		
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
+export default {
+	data() {
+		return {
+			tel: ''
+		}
+	},
+	computed: {
+		inputStyle() {
+			let style = {};
+			if(this.tel) {
+				style.color = "#fff";
+				style.backgroundColor = this.$u.color['success'];
 			}
-		},
-		methods: {
-			
+			return style;
 		}
+	},
+	methods: {
+
 	}
+};
 </script>
 
 <style>
-
+	page{
+		background-color: #fff;
+	}
+</style>
+<style lang="scss" scoped>
+.wrap {
+	font-size: 28rpx;
+	.login {
+		width: 600rpx;
+		padding-top: 80rpx;
+		margin: 0 auto;
+		.login-title {
+			text-align: left;
+			h3{
+				font-size: 48rpx;
+				font-weight: normal;
+			}
+			p{
+				margin-top: 4px;
+				color:#777
+			}
+		}
+		.login-form-item{
+			margin-top: 40px;
+			.title{
+				margin-bottom: 8px;
+			}
+			.input {
+				border-bottom: 1px solid #f7f7f7;
+				position: relative;
+			}
+			.code{
+				position: absolute;
+				right: 0;
+				top:7px;
+				color:#1677FF;
+			}
+			.tips {
+				color: $u-type-info;
+				margin-top: 12px;
+				font-size: 12px;
+				span{
+					color:#3fbd70;
+				}
+			}
+		}
+	
+		.login-btn {
+			margin-top: 40px;
+			background-color: #a7dbc2;
+		}
+		.alternative {
+			color: $u-tips-color;
+			display: flex;
+			justify-content: space-between;
+			margin-top: 30rpx;
+		}
+	}
+}
 </style>

pages/login/welcome.vue

@@ -0,0 +1,87 @@
+<template>
+	<view>
+		<view class="welcome">
+			<view class="welcome-state1">
+				<view class="welcome-next">跳过</view>
+				<view class="welcome-foot">
+					<u-image width="185px" height="48px" src="../../static/img/logo.png"></u-image>
+				</view>
+			</view>
+			<!-- <view class="welcome-state2">
+				<view class="welcome-logo">
+					<u-image width="200px" height="50px" src="../../static/img/logo2.png"></u-image>
+				</view>
+				<view class="welcome-btn">
+					<u-button class="welcomeBtn" shape="circle">用户登录</u-button>
+					<p>随便逛逛</p>
+				</view>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+<style>
+	page{
+		background:url(../../static/img/welcome_bg.png) no-repeat;
+		background-size:100%;
+	}
+</style>
+<style  lang="scss" scoped>
+	.welcome{
+		position: relative;
+	}
+	.welcome-next{
+		position: absolute;
+		padding: 4px 15px;
+		color:#fff;
+		border-radius: 14px;
+		background:rgba(0,0,0,0.5);
+		right: 15px;
+		top: 15px;
+	}
+	.welcome-foot{
+		position:fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #fff;
+		height: 100px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.welcome-logo{
+		position: absolute;
+		left: 50%;
+		margin-left: -100px;
+		top: 120px;
+	}
+	.welcome-btn{
+		position: fixed;
+		left: 48px;
+		right: 48px;
+		bottom:48px;
+		text-align: center;
+		.welcomeBtn{
+			color:#009143;
+			border-color:#fff;
+		}
+		p{
+			color:#fff;
+			margin-top: 12px;
+			font-size: 16px;
+		}
+	}
+</style>

static/img/logo.svg

@@ -0,0 +1,10 @@
+<svg width="120" height="120" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M90.29 109.87H20L22.76 93.33H31.92L37.92 63.76C35.49 63.76 34.12 63.81 28.47 63.81L34.29 29.27C35.0376 29.3343 35.7907 29.2769 36.52 29.1C42.4194 27.5758 48 25.0124 53 21.53C57.1536 18.8668 60.618 15.2585 63.11 11L99.11 11L84.4 93.33H93.05L90.29 109.87Z" fill="url(#paint0_linear_1594_783)"/>
+<path d="M94.1598 39.24L94.8598 35.38H74.7798L76.1898 27.64H53.5698L52.1598 35.38L51.4598 39.24L47.4698 61.16L46.5298 66.32H59.8398L53.7298 99.84L87.3898 61.16H70.0898L74.0798 39.24H94.1598Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_1594_783" x1="29.5" y1="55.13" x2="97.82" y2="67.18" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4891F9"/>
+<stop offset="0.73" stop-color="#31C15E"/>
+</linearGradient>
+</defs>
+</svg>

static/img/数据加载失败-缺省页.svg

@@ -0,0 +1,75 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1100 1100" height="1100px" width="1100px">
+    <title>数据加载失败-缺省页</title>
+    <defs>
+        <linearGradient id="linearGradient-1" y2="0%" x2="50%" y1="100%" x1="50%">
+            <stop offset="4.475343e-05%" stop-opacity="0" stop-color="#FFFFFF"></stop>
+            <stop offset="100%" stop-color="#E6EBEA"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-2" y2="0%" x2="50%" y1="100%" x1="50%">
+            <stop offset="4.475343e-05%" stop-opacity="0" stop-color="#FFFFFF"></stop>
+            <stop offset="100%" stop-color="#E4EBE9"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-3" y2="0%" x2="50%" y1="100%" x1="50%">
+            <stop offset="4.475343e-05%" stop-opacity="0" stop-color="#FFFFFF"></stop>
+            <stop offset="100%" stop-color="#E4EBE9"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-4" y2="0%" x2="50%" y1="95.0911138%" x1="50%">
+            <stop offset="4.475343e-05%" stop-opacity="0" stop-color="#FFFFFF"></stop>
+            <stop offset="100%" stop-color="#E4EBE9"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-5" y2="13.2167542%" x2="77.9601485%" y1="106.268911%" x1="77.9601485%">
+            <stop offset="4.475343e-05%" stop-color="#F0F5F5"></stop>
+            <stop offset="100%" stop-color="#D3E0DE"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-6" y2="13.2167542%" x2="77.9601485%" y1="106.268911%" x1="77.9601485%">
+            <stop offset="4.475343e-05%" stop-color="#F0F5F5"></stop>
+            <stop offset="100%" stop-color="#D3E0DE"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-7" y2="0%" x2="32.2166975%" y1="61.4624475%" x1="32.2166975%">
+            <stop offset="4.475343e-05%" stop-opacity="0" stop-color="#F9FCFC"></stop>
+            <stop offset="100%" stop-color="#D8E6E3"></stop>
+        </linearGradient>
+        <linearGradient id="linearGradient-8" y2="10.1403061%" x2="10.1299165%" y1="85.264472%" x1="94.5740097%">
+            <stop offset="4.475343e-05%" stop-color="#B8DBD0"></stop>
+            <stop offset="100%" stop-color="#EEF5F5"></stop>
+        </linearGradient>
+    </defs>
+    <g fill-rule="evenodd" fill="none" stroke-width="1" stroke="none" id="数据加载失败-缺省页">
+        <rect height="1100" width="1100" y="0" x="0" fill="#FFFFFF"></rect>
+        <g transform="translate(38.000000, 38.000000)" id="CRM-adorn-sjjzsb">
+            <rect height="1024" width="1024" y="0" x="0" id="矩形"></rect>
+            <g fill-rule="nonzero" transform="translate(107.584353, 107.083234)" id="编组">
+                <path opacity="0.6" fill="url(#linearGradient-1)" id="路径" d="M600.73207,71.6199644 L600.73207,307.2 C600.73207,339.516548 574.534332,365.714286 542.217785,365.714286 L188.29931,365.714286 L188.29931,365.714286 C188.738183,264.717925 189.376015,156.248768 190.212807,40.3068129 C190.270816,32.2690839 196.803059,25.7838158 204.840997,25.7838158 L268.117194,25.7838158 C276.178213,25.7838167 282.720118,32.3050017 282.745691,40.3659806 C282.800441,57.6246693 282.782126,66.3760472 282.690745,66.6201145 L282.690745,66.6773483 C282.690745,66.6773483 282.805032,66.6201145 282.862176,66.5628808 L282.862176,66.3911794 C282.862176,58.082743 289.538434,51.3959303 297.833756,51.3959303 C306.129079,51.3959303 312.805337,58.082743 312.805337,66.3911794 C312.805337,71.2958956 316.781395,75.2719536 321.686111,75.2719536 L345.80091,75.2719536 C364.023862,75.2719536 378.796483,60.4993323 378.796483,42.2763804 L378.796483,29.6003006 C378.796483,13.252506 392.048989,3.00304115e-15 408.396784,0 C424.744578,-3.00304115e-15 437.997084,13.252506 437.997084,29.6003006 L437.997084,108.49616 L437.997084,108.49616 C437.939941,108.725095 437.939941,108.896797 437.939941,109.135271 L437.939941,145.64088 C437.939941,151.001777 442.254271,155.332466 447.61623,155.332466 C452.911522,155.332466 457.235375,151.011316 457.235375,145.64088 L457.235375,117.205233 C475.835564,117.147999 489.311891,117.090765 498.235791,117.090765 C507.159692,117.090765 511.540688,117.147999 511.940693,117.205233 C513.378802,117.033532 511.940693,95.1702295 511.940693,95.1702295 L514.2046,95.1702295 C528.507827,95.1702295 540.102883,106.765286 540.102883,121.068513 L540.102883,121.068513 L540.102883,121.068513 C540.102883,124.989026 543.274344,128.165501 547.18867,128.165501 C551.102995,128.165501 554.274456,124.989026 554.274456,121.068513 L554.274456,71.6199644 C554.274456,58.7910484 564.674347,48.3911571 577.503263,48.3911571 C590.332179,48.3911571 600.73207,58.7910484 600.73207,71.6199644 Z"></path>
+                <path transform="translate(632.397563, 365.714286) scale(-1, 1) translate(-632.397563, -365.714286)" fill="url(#linearGradient-2)" id="路径备份" d="M781.717095,216.032266 L781.717095,611.768948 L781.717095,611.768948 L483.078031,611.768948 C483.693174,470.207882 483.693174,339.933708 483.078031,220.946425 L483.078031,220.946425 L483.078031,159.490126 C483.078031,137.492347 500.910755,119.659623 522.908534,119.659623 C544.906314,119.659623 562.739037,137.492347 562.739037,159.490126 L562.739037,265.653297 L562.739037,265.653297 C562.662144,265.961355 562.662144,266.192398 562.662144,266.513291 L562.662144,315.635657 C562.662144,322.849342 568.467555,328.676766 575.682669,328.676766 C582.808074,328.676766 588.626301,322.862177 588.626301,315.635657 L588.626301,277.372325 C613.654928,277.295311 631.788828,277.218296 643.79693,277.218296 C655.805032,277.218296 661.700152,277.295311 662.238402,277.372325 C664.173539,277.141282 662.238402,247.721772 662.238402,247.721772 L665.284741,247.721772 C684.531327,247.721772 700.133768,263.324213 700.133768,282.570799 L700.133768,282.570799 L700.133768,282.570799 C700.133768,287.846287 704.401322,292.120587 709.668483,292.120587 C714.935644,292.120587 719.203198,287.846287 719.203198,282.570799 L719.203198,216.032266 C719.203198,198.76953 733.19741,184.775318 750.460146,184.775318 C767.722883,184.775318 781.717095,198.76953 781.717095,216.032266 Z"></path>
+                <path transform="translate(167.959644, 446.171429) scale(-1, 1) translate(-167.959644, -446.171429)" fill="url(#linearGradient-3)" id="路径备份-2" d="M335.919287,692.226091 L0,692.226091 C0.596880527,554.867693 1.46725343,407.237118 2.61111871,249.334364 C2.66934609,241.296792 9.20152323,234.811764 17.2393063,234.811764 L112.442733,234.811764 C120.501757,234.811764 127.04283,241.32984 127.071214,249.388814 C127.16477,275.952566 127.145764,289.410146 127.014194,289.761554 L127.014194,289.838568 C127.014194,289.838568 127.16798,289.761554 127.244873,289.68454 L127.244873,289.453496 C127.244873,278.273569 136.228522,269.275718 147.390803,269.275718 C158.553083,269.275718 167.536733,278.273569 167.536733,289.453496 C167.536733,296.053338 172.886962,301.403568 179.486804,301.403568 L211.935953,301.403568 C236.456966,301.403568 256.335174,281.525359 256.335174,257.004347 L256.335174,239.908823 C256.335174,217.932277 274.150685,200.116766 296.127231,200.116766 C318.103777,200.116766 335.919287,217.932277 335.919287,239.908823 L335.919287,346.11044 L335.919287,346.970434 L335.919287,396.0928 L335.919287,692.226091 L335.919287,692.226091 Z"></path>
+            </g>
+            <g fill-rule="nonzero" transform="translate(7.314286, 475.428571)" id="编组-2">
+                <ellipse ry="241.371429" rx="504.685714" cy="241.371429" cx="504.685714" opacity="0.8" fill="url(#linearGradient-4)" id="椭圆形"></ellipse>
+                <g transform="translate(108.589011, 52.226091)" id="编组-17">
+                    <rect rx="7.31428571" height="73.1428571" width="14.6285714" y="106.057143" x="37.6967033" fill="#D8E6E4" id="矩形"></rect>
+                    <path fill="url(#linearGradient-5)" id="椭圆形" d="M45.010989,117.028571 C69.8698718,117.028571 90.021978,96.8764652 90.021978,72.0175824 C90.021978,55.4449939 75.018315,31.4391331 45.010989,0 C38.1743393,7.33961279 33.2868783,12.725406 30.3486063,16.1573795 C29.9071667,16.6729918 34.0444971,22.919945 42.7605975,34.8982392 C30.4893462,27.2147069 24.016654,23.7984359 23.342521,24.6494262 C7.78084033,44.2936772 0,60.0830626 0,72.0175824 C0,96.8764652 20.1521062,117.028571 45.010989,117.028571 Z"></path>
+                </g>
+                <g transform="translate(870.400000, 121.711805)" id="编组-17备份">
+                    <rect rx="4.16" height="41.7959184" width="8.32" y="60.6040816" x="21.44" fill="#D8E6E4" id="矩形"></rect>
+                    <path fill="url(#linearGradient-6)" id="椭圆形" d="M25.6,66.8734694 C39.7384896,66.8734694 51.2,55.3579801 51.2,41.1529042 C51.2,31.6828536 42.6666667,17.9652189 25.6,0 C21.7116554,4.19406445 18.9319121,7.27166055 17.2607698,9.23278831 C17.0097011,9.52742387 19.3628077,13.0971114 24.3200898,19.941851 C17.3408157,15.5512611 13.659472,13.5991062 13.2760588,14.0853864 C4.42535294,25.3106727 0,34.3331786 0,41.1529042 C0,55.3579801 11.4615104,66.8734694 25.6,66.8734694 Z"></path>
+                </g>
+                <g transform="translate(797.257143, 48.568948)" id="编组-17备份-2">
+                    <rect rx="4.16" height="41.7959184" width="8.32" y="60.6040816" x="21.44" fill="#D8E6E4" id="矩形"></rect>
+                    <path fill="url(#linearGradient-6)" id="椭圆形" d="M25.6,66.8734694 C39.7384896,66.8734694 51.2,55.3579801 51.2,41.1529042 C51.2,31.6828536 42.6666667,17.9652189 25.6,0 C21.7116554,4.19406445 18.9319121,7.27166055 17.2607698,9.23278831 C17.0097011,9.52742387 19.3628077,13.0971114 24.3200898,19.941851 C17.3408157,15.5512611 13.659472,13.5991062 13.2760588,14.0853864 C4.42535294,25.3106727 0,34.3331786 0,41.1529042 C0,55.3579801 11.4615104,66.8734694 25.6,66.8734694 Z"></path>
+                </g>
+            </g>
+            <g fill-rule="nonzero" transform="translate(332.800000, 194.459991)" id="编组-3">
+                <polygon points="584.407534 550.730066 257.211133 654.314698 5.72135764 411.935936 324.893767 410.775872" fill="url(#linearGradient-7)" id="路径"></polygon>
+                <path fill="url(#linearGradient-8)" id="矩形" d="M0,99.940009 L358.4,99.940009 L358.4,394.340009 C358.4,408.478499 346.93849,419.940009 332.8,419.940009 L25.6,419.940009 C11.4615104,419.940009 5.28417928e-15,408.478499 0,394.340009 L0,99.940009 L0,99.940009 Z"></path>
+                <rect rx="12.8" height="115.2" width="281.6" y="157.540009" x="38.4" fill="#FAFCFC" id="矩形"></rect>
+                <path transform="translate(179.200000, 215.140009) rotate(44.000000) translate(-179.200000, -215.140009)" fill="#B4D6CB" id="形状结合" d="M179.2,170.340009 C182.734622,170.340009 185.6,173.205387 185.6,176.740009 L185.6,208.740009 L217.6,208.740009 C221.134622,208.740009 224,211.605387 224,215.140009 C224,218.674631 221.134622,221.540009 217.6,221.540009 L185.6,221.540009 L185.6,253.540009 C185.6,257.074631 182.734622,259.940009 179.2,259.940009 C175.665378,259.940009 172.8,257.074631 172.8,253.540009 L172.8,221.540009 L140.8,221.540009 C137.265378,221.540009 134.4,218.674631 134.4,215.140009 C134.4,211.605387 137.265378,208.740009 140.8,208.740009 L172.8,208.740009 L172.8,176.740009 C172.8,173.205387 175.665378,170.340009 179.2,170.340009 Z"></path>
+                <path fill="#B4D6CB" id="矩形备份" d="M25.6,61.540009 L332.8,61.540009 C346.93849,61.540009 358.4,73.0015194 358.4,87.140009 L358.4,119.140009 L358.4,119.140009 L0,119.140009 L0,87.140009 C-1.7314656e-15,73.0015194 11.4615104,61.540009 25.6,61.540009 Z"></path>
+                <rect rx="7.31428571" height="14.6285714" width="95.0857143" y="324.854295" x="40.2285714" fill="#FAFCFC" id="矩形"></rect>
+                <path fill="#FAFCFC" id="矩形备份-13" d="M47.5428571,361.425723 L252.342857,361.425723 C256.382426,361.425723 259.657143,364.700441 259.657143,368.740009 C259.657143,372.779577 256.382426,376.054295 252.342857,376.054295 L47.5428571,376.054295 C43.5032887,376.054295 40.2285714,372.779577 40.2285714,368.740009 C40.2285714,364.700441 43.5032887,361.425723 47.5428571,361.425723 Z"></path>
+                <path transform="translate(357.789293, 22.783433) scale(-1, 1) translate(-357.789293, -22.783433)" fill="#B0D6C9" id="路径" d="M370.611178,45.5668667 L347.612597,12.1138256 C345.985837,9.74758982 345.80374,6.67492011 347.139632,4.13310735 C348.463505,1.61416288 351.132815,0.0965705307 353.974471,0.247271434 L358.872201,0.507011616 C364.302569,0.794999047 368.634545,5.1448693 368.900146,10.5763779 L370.611178,45.5668667 L370.611178,45.5668667 Z"></path>
+                <path transform="translate(373.347282, 39.238848) scale(-1, 1) translate(-373.347282, -39.238848)" fill="#B0D6C9" id="路径" d="M392.230888,51.2145911 L360.355294,45.3334884 C358.095851,44.9166172 356.253847,43.2813332 355.572216,41.0871945 C354.896451,38.9119392 355.547315,36.5422878 357.239386,35.017398 L360.153749,32.3909826 C363.384443,29.47949 368.295258,29.4882697 371.51552,32.4112956 L392.230888,51.2145911 L392.230888,51.2145911 Z"></path>
+                <path transform="translate(329.697767, 22.391943) scale(-1, 1) translate(-329.697767, -22.391943)" fill="#B0D6C9" id="路径" d="M320.31043,39.6624277 L322.701296,10.9957633 C322.870251,8.96997207 324.148064,7.20471084 326.019725,6.41145068 C327.87437,5.62540233 330.017015,5.99230538 331.504458,7.35064744 L334.074253,9.69739938 C336.92156,12.2975776 337.343043,16.6291376 335.050425,19.7294576 L320.31043,39.6624277 L320.31043,39.6624277 Z"></path>
+            </g>
+        </g>
+    </g>
+</svg>