5.15

pages.json

@@ -7,7 +7,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "商城"
 			}
 		},
 		{
@@ -37,6 +37,13 @@
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false
 			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "登录",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 	"subPackages": [{
@@ -100,7 +107,7 @@
 		"selectedColor": "#F83224",
 		"list": [{
 				"iconPath": "static/express1.png",
-				"selectedIconPath": "static/express1.png",
+				"selectedIconPath": "static/express2.png",
 				"text": "跨境速递",
 				"pagePath": "pages/express/express"
 			},
@@ -111,8 +118,8 @@
 				"pagePath": "pages/index/index"
 			},
 			{
-				"iconPath": "static/index1.png",
-				"selectedIconPath": "static/index2.png",
+				"iconPath": "static/shop.png",
+				"selectedIconPath": "static/shop.png",
 				"text": "购",
 				"pagePath": "pages/shopping/shopping"
 			},

pages/cart/cart.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 购物车 -->
 	<view>
 		
 	</view>

pages/express/express.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 快递 -->
 	<view>
 		
 	</view>

pages/index/index.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 商城 -->
 	<view class="">
 	</view>
 </template>
@@ -7,7 +8,7 @@
 	export default {
 		data() {
 			return {
-				title: 'Hello'
+				
 			}
 		},
 		onLoad() {

pages/login/login.vue

@@ -0,0 +1,63 @@
+<template>
+	<!-- 登录 -->
+	<view style="padding: 0 44rpx;">
+		<view class="" style="text-align: center;margin-top: 156rpx;">
+			<image src="../../static/images/logo.png" style="width: 350rpx;height: 350rpx;" mode=""></image>
+		</view>
+		<button open-type="getPhoneNumber" class="login-btn" @getphonenumber="tologin">
+			微信授权登录
+		</button>
+		<view class="" style="margin-top: 42rpx;display: flex;">
+			<u-checkbox-group v-model="checkboxValue1" placement="column" @change="checkboxChange">
+				<u-checkbox shape="circle" :customStyle="{marginBottom: '8px'}" :name="1">
+				</u-checkbox>
+			</u-checkbox-group>
+			<text class='fontYin'>我已阅读并同意</text>
+			<text class='fontYin' style='color:#F83224'>《用户协议》</text>
+			<text class='fontYin'>和</text>
+			<text class='fontYin' style='color:#F83224'>隐私协议》</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			checkboxChange(n) {
+				console.log('change', n);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.login-btn {
+		width: 662rpx;
+		height: 96rpx;
+		background: #F83224;
+		box-shadow: 0rpx 16rpx 40rpx -12rpx rgba(255, 21, 21, 0.5);
+		border-radius: 48rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		line-height: 96rpx;
+		text-align: center;
+		font-style: normal;
+	}
+
+	.fontYin {
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #666666;
+		line-height: 34rpx;
+		text-align: left;
+		font-style: normal;
+	}
+</style>

pages/mine/mine.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 我的 -->
 	<view>
 		
 	</view>

pages/shopping/shopping.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 十元购 -->
 	<view>
 		
 	</view>