Преглед на файлове

ltb2020年11月10日14:20:46

老狐\25396 преди 4 години
родител
ревизия
0530f742dc
променени са 2 файла, в които са добавени 11 реда и са изтрити 16 реда
  1. 1 1
      pages.json
  2. 10 15
      pages/login/login.vue

+ 1 - 1
pages.json

xqd
@@ -196,7 +196,7 @@
 		"current": 0, //当前激活的模式(list 的索引项)
 		"list": [{
 			"name": "test", //模式名称
-			"path": "pages/Scheduling", //启动页面,必选
+			"path": "pages/login/login", //启动页面,必选
 			"query": "" //启动参数,在页面的onLoad函数里面得到
 		}]
 	}

+ 10 - 15
pages/login/login.vue

xqd xqd xqd
@@ -46,19 +46,16 @@
 		<!-- 按钮 -->
 		<view style="height: 30vh;padding: 0 80rpx;">
 			<!-- 登录 -->
-			<u-button @click="startReg()" type="primary" shape="circle" :loading="isRotate">登录</u-button>
-			
+			<u-button @click="startReg()" type="primary" shape="circle" :loading="isRotate" :custom-style="customStyle">登录</u-button>
+
 			<view class="flex align-center justify-between" style="margin: 70rpx 0 100rpx 0;">
-				<button style="margin-top: 20rpx;" :class="['buttonBorder',!istrue?'dlbutton':'dlbutton_loading']" open-type="getUserInfo"
-						 @getuserinfo="getinfo">
-							<view :class="istrue?'rotate_loop':''">
-								<text v-if="istrue" class="cuIcon cuIcon-loading1 "></text>
-								<view v-if="!istrue">
-									<slot name="text">微信授权一键登录</slot>
-								</view>
-							</view>
-						</button>
-				<u-button @click="toindex()" shape="circle" style="width: 45%;font-size: 30rpx;" hair-line="false">暂不登录</u-button>
+				<button :class="" open-type="getUserInfo" style="box-shadow: 0px 0px 16px 0px rgba(0, 0, 0, 0.08);border-radius: 60rpx;border: 0.3rpx solid #dedede;"
+				 @getuserinfo="getinfo">
+					<view :class="rotate_loop" style="font-size: 30rpx;color: #84BB43;">
+						<slot name="text">微信授权一键登录</slot>
+					</view>
+				</button>
+				<button @click="toindex()"  style="width: 45%;font-size: 30rpx;border-radius: 60rpx;box-shadow: 0px 0px 16px 0px rgba(0, 0, 0, 0.08);border: 0.3rpx solid #dedede;color: #7a7a7a;"  :custom-style="customStyle" :class="buttonBorder">暂不登录</button>
 			</view>
 			<!-- <view class="flex align-center justify-between" style="margin: 70rpx 0 100rpx 0;">
 				<u-button open-type="getUserInfo" @getuserInfo="getinfo" shape="circle" style="width: 50%;font-size: 30rpx;color:#84BB43;" :custom-style="customStyle"
@@ -105,9 +102,7 @@
 			return {
 				//一键登录按钮样式
 				customStyle: {
-					color: '#84BB43',
 					boxShadow: '0px 0px 16px 0px rgba(0, 0, 0, 0.08)',
-					border: 'none'
 				},
 				//logo图片 base64
 				phoneData: '', // 用户/电话
@@ -343,7 +338,7 @@
 			getinfo: async function(e) {
 				let that = this;
 				uni.login({
-					success:(res) =>{
+					success: (res) => {
 						console.log(res.code)
 					}
 				});