微信快捷登录

pageTwo/login/login.vue

@@ -23,7 +23,7 @@
 					<view class="input yanzhengma">
 						<input class="uni-input" v-model="code" />
 						<button class="code" type="none" @click="handleCode" v-model="code"
-							:disabled="disabled">{{second<60 ? second+'S后重发':$t("login.sendcode")}}
+							:disabled="disabled">{{second<60 ? second+'S后重发':'获取验证码'}}
 						</button>
 					</view>
 				</view>
@@ -53,6 +53,20 @@
 				<text>注册</text>
 			</view>
 		</view>
+		<view class="wxbtn">
+			<button open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="value==1">
+				<view>
+					<image src="../../static/phone.png"></image>
+				</view>
+				<text>手机号快捷登录</text>
+			</button>
+			<button v-else @click="handleIsTel">
+				<view>
+					<image src="../../static/phone.png"></image>
+				</view>
+				<text>手机号快捷登录</text>
+			</button>
+		</view>
 
 	</view>
 </template>
@@ -70,7 +84,11 @@
 				isCode: true,
 			}
 		},
+		onLoad() {
+			this.login()
+		},
 		methods: {
+			// 勾选协议
 			checkboxChange(e) {
 				this.value = e.detail.value.length ? e.detail.value[0] : "0"
 			},
@@ -149,6 +167,55 @@
 					}, 60000)
 				}).catch(err => {})
 			},
+			// 
+			handleIsTel() {
+				if (this.value == 0) {
+					this.$tools.msg("请先确认勾选协议")
+					return
+				}
+			},
+			// 获取code
+			login() {
+				let that = this
+				uni.login({
+					success(res) {
+						if (res.code) {
+							if (res.errMsg = "login:ok") {
+								that.$model.onlogin({
+									code: res.code,
+									userid: ""
+								}).then(res => {
+									if (res.code == 2) {
+										that.sessionid = res.data.sessionid
+										return
+									}
+								}).catch(e => {})
+							}
+						}
+					}
+				})
+			},
+			// 授权
+			getPhoneNumber(res) {
+				const that = this
+				if (res.detail.errMsg == 'getPhoneNumber:ok') {
+					this.$model.getregister({
+						sessionId: uni.getStorageSync('sessionid'),
+						encryptedData: res.detail.encryptedData,
+						iv: res.detail.iv,
+					}).then(res => {
+						if (res.code != 0) return
+						that.value = 1
+						uni.setStorageSync('token', res.data.token)
+						uni.setStorageSync('aan_id', res.data.aan_id)
+						setTimeout(function() {
+							uni.reLaunch({
+								url: "/pages/home/home?type=1"
+							})
+						}, 1000)
+					})
+				}
+			},
 			handleToggle() {
 				this.phone = ""
 				this.isCode = !this.isCode
@@ -192,4 +259,51 @@
 	.href {
 		width: auto;
 	}
+
+	.wxbtn {
+		width: 100%;
+		position: absolute;
+		margin-top: 30px;
+		top: 80%;
+
+		icon {
+			font-size: 25px;
+			color: #28c445;
+		}
+
+
+		text {
+			display: block;
+			// width: 100%;
+			margin-top: 5px;
+			font-size: 12px;
+			// color: #666;
+			text-align: center;
+			border-bottom: 1px solid blue;
+			color: blue;
+		}
+
+		button {
+			line-height: initial;
+			background: #fff;
+			display: flex;
+			flex-wrap: wrap;
+			padding: 0;
+			justify-content: center;
+		}
+
+		button::after {
+			display: none;
+		}
+
+		view {
+			width: 100%;
+		}
+
+		image {
+			width: 30px;
+			height: 30px;
+			border-radius: 50%;
+		}
+	}
 </style>

pageTwo/my/about.vue

@@ -46,8 +46,10 @@
 		onLoad() {
 			let that = this
 			if (!that.phoneInfo.versionUrl) {
+				console.log("111")
 				that.handleoginversion()
 			} else {
+				console.log("222")
 				that.version = that.$tools.compareVersions(that.phoneInfo.info.version, that.phoneInfo.versionUrl.version)
 			}
 		},

scss/login.scss

@@ -22,7 +22,7 @@
 			width: 70px;
 			height: 70px;
 			margin: auto;
-			margin-bottom: 10px;
+			// margin-bottom: 10px;
 			border-radius: 50%;
 		}
 
@@ -46,7 +46,7 @@
 		z-index: 99;
 		position: absolute;
 		left: 7%;
-		top: 28%;
+		top: 27%;
 		box-shadow: 0px 1px 5px 2px #dfe2e1fc;
 
 		.title {

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -967,8 +967,8 @@ function populateParameters(result) {
   var parameters = {
     appId: "__UNI__20604F1",
     appName: "Reedaw",
-    appVersion: "1.3.2",
+    appVersion: "1.3.4",
-    appVersionCode: "132",
+    appVersionCode: "134",
     appLanguage: getAppLanguage(hostLanguage),
     uniCompileVersion: "4.24",
     uniRuntimeVersion: "4.24",
@@ -1066,8 +1066,8 @@ var getAppBaseInfo = {
     result = sortObject(Object.assign(result, {
       appId: "__UNI__20604F1",
       appName: "Reedaw",
-      appVersion: "1.3.2",
+      appVersion: "1.3.4",
-      appVersionCode: "132",
+      appVersionCode: "134",
       appLanguage: getAppLanguage(hostLanguage),
       hostVersion: version,
       hostLanguage: hostLanguage,
@@ -1747,7 +1747,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8790,7 +8790,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8811,14 +8811,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -8914,7 +8914,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"Reedaw","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

unpackage/dist/dev/mp-weixin/pageTwo/login/login.js

@@ -102,15 +102,6 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var m0 = _vm.isCode && !(_vm.second < 60) ? _vm.$t("login.sendcode") : null
-  _vm.$mp.data = Object.assign(
-    {},
-    {
-      $root: {
-        m0: m0,
-      },
-    }
-  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -209,6 +200,20 @@ exports.default = void 0;
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -221,7 +226,11 @@ var _default = {
       isCode: true
     };
   },
+  onLoad: function onLoad() {
+    this.login();
+  },
   methods: {
+    // 勾选协议
     checkboxChange: function checkboxChange(e) {
       this.value = e.detail.value.length ? e.detail.value[0] : "0";
     },
@@ -300,6 +309,55 @@ var _default = {
         }, 60000);
       }).catch(function (err) {});
     },
+    // 
+    handleIsTel: function handleIsTel() {
+      if (this.value == 0) {
+        this.$tools.msg("请先确认勾选协议");
+        return;
+      }
+    },
+    // 获取code
+    login: function login() {
+      var that = this;
+      uni.login({
+        success: function success(res) {
+          if (res.code) {
+            if (res.errMsg = "login:ok") {
+              that.$model.onlogin({
+                code: res.code,
+                userid: ""
+              }).then(function (res) {
+                if (res.code == 2) {
+                  that.sessionid = res.data.sessionid;
+                  return;
+                }
+              }).catch(function (e) {});
+            }
+          }
+        }
+      });
+    },
+    // 授权
+    getPhoneNumber: function getPhoneNumber(res) {
+      var that = this;
+      if (res.detail.errMsg == 'getPhoneNumber:ok') {
+        this.$model.getregister({
+          sessionId: uni.getStorageSync('sessionid'),
+          encryptedData: res.detail.encryptedData,
+          iv: res.detail.iv
+        }).then(function (res) {
+          if (res.code != 0) return;
+          that.value = 1;
+          uni.setStorageSync('token', res.data.token);
+          uni.setStorageSync('aan_id', res.data.aan_id);
+          setTimeout(function () {
+            uni.reLaunch({
+              url: "/pages/home/home?type=1"
+            });
+          }, 1000);
+        });
+      }
+    },
     handleToggle: function handleToggle() {
       this.phone = "";
       this.isCode = !this.isCode;

unpackage/dist/dev/mp-weixin/pageTwo/login/login.wxml

@@ -1 +1 @@
-<view class="content data-v-111bb4d3"><view class="bg data-v-111bb4d3"></view><view class="top data-v-111bb4d3"><image src="../../static/logo2.png" class="data-v-111bb4d3"></image><text class="data-v-111bb4d3">Reedaw</text></view><view class="login box_shadow data-v-111bb4d3"><view class="title data-v-111bb4d3">登录</view><view data-event-opts="{{[['tap',[['handleToggle',['$event']]]]]}}" class="toggle cblue data-v-111bb4d3" bindtap="__e">切换登录</view><view class="editem data-v-111bb4d3"><view class="item data-v-111bb4d3"><view class="text data-v-111bb4d3">手机号/邮箱</view><view class="input data-v-111bb4d3"><input data-event-opts="{{[['input',[['__set_model',['','phone','$event',[]]]]]]}}" value="{{phone}}" bindinput="__e" class="data-v-111bb4d3"/></view></view><block wx:if="{{isCode}}"><view class="item data-v-111bb4d3"><view class="text data-v-111bb4d3">验证码</view><view class="input yanzhengma data-v-111bb4d3"><input data-event-opts="{{[['input',[['__set_model',['','code','$event',[]]]]]]}}" class="uni-input data-v-111bb4d3" value="{{code}}" bindinput="__e"/><button class="code data-v-111bb4d3" type="none" disabled="{{disabled}}" value="{{code}}" data-event-opts="{{[['tap',[['handleCode',['$event']]]],['input',[['__set_model',['','code','$event',[]]]]]]}}" bindtap="__e" bindinput="__e">{{(second<60?second+'S后重发':$root.m0)+''}}</button></view></view></block><block wx:else><view class="item data-v-111bb4d3"><view class="text data-v-111bb4d3">密码</view><view class="input data-v-111bb4d3"><input data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" class="uni-input data-v-111bb4d3" value="{{password}}" bindinput="__e"/></view></view></block><block wx:if="{{!isCode}}"><view class="forget data-v-111bb4d3"><text data-event-opts="{{[['tap',[['handlePassword',['forgetPassword']]]]]}}" bindtap="__e" class="data-v-111bb4d3">忘记密码?</text></view></block></view><view class="xieyi data-v-111bb4d3"><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" class="group data-v-111bb4d3" bindchange="__e"><label class="data-v-111bb4d3"><checkbox style="transform:scale(0.7);" value="{{1}}" class="data-v-111bb4d3"></checkbox>阅读并同意<text data-event-opts="{{[['tap',[['',['$event']],['handlexieyi',['$event']]]]]}}" class="blue data-v-111bb4d3" catchtap="__e">《隐私协议》</text></label></checkbox-group></view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view><view data-event-opts="{{[['tap',[['handlePassword',['register']]]]]}}" class="btngroup data-v-111bb4d3" bindtap="__e"><text class="data-v-111bb4d3">注册</text></view></view></view>
+<view class="content data-v-111bb4d3"><view class="bg data-v-111bb4d3"></view><view class="top data-v-111bb4d3"><image src="../../static/logo2.png" class="data-v-111bb4d3"></image><text class="data-v-111bb4d3">Reedaw</text></view><view class="login box_shadow data-v-111bb4d3"><view class="title data-v-111bb4d3">登录</view><view data-event-opts="{{[['tap',[['handleToggle',['$event']]]]]}}" class="toggle cblue data-v-111bb4d3" bindtap="__e">切换登录</view><view class="editem data-v-111bb4d3"><view class="item data-v-111bb4d3"><view class="text data-v-111bb4d3">手机号/邮箱</view><view class="input data-v-111bb4d3"><input data-event-opts="{{[['input',[['__set_model',['','phone','$event',[]]]]]]}}" value="{{phone}}" bindinput="__e" class="data-v-111bb4d3"/></view></view><block wx:if="{{isCode}}"><view class="item data-v-111bb4d3"><view class="text data-v-111bb4d3">验证码</view><view class="input yanzhengma data-v-111bb4d3"><input data-event-opts="{{[['input',[['__set_model',['','code','$event',[]]]]]]}}" class="uni-input data-v-111bb4d3" value="{{code}}" bindinput="__e"/><button class="code data-v-111bb4d3" type="none" disabled="{{disabled}}" value="{{code}}" data-event-opts="{{[['tap',[['handleCode',['$event']]]],['input',[['__set_model',['','code','$event',[]]]]]]}}" bindtap="__e" bindinput="__e">{{(second<60?second+'S后重发':'获取验证码')+''}}</button></view></view></block><block wx:else><view class="item data-v-111bb4d3"><view class="text data-v-111bb4d3">密码</view><view class="input data-v-111bb4d3"><input data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" class="uni-input data-v-111bb4d3" value="{{password}}" bindinput="__e"/></view></view></block><block wx:if="{{!isCode}}"><view class="forget data-v-111bb4d3"><text data-event-opts="{{[['tap',[['handlePassword',['forgetPassword']]]]]}}" bindtap="__e" class="data-v-111bb4d3">忘记密码?</text></view></block></view><view class="xieyi data-v-111bb4d3"><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" class="group data-v-111bb4d3" bindchange="__e"><label class="data-v-111bb4d3"><checkbox style="transform:scale(0.7);" value="{{1}}" class="data-v-111bb4d3"></checkbox>阅读并同意<text data-event-opts="{{[['tap',[['',['$event']],['handlexieyi',['$event']]]]]}}" class="blue data-v-111bb4d3" catchtap="__e">《隐私协议》</text></label></checkbox-group></view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view><view data-event-opts="{{[['tap',[['handlePassword',['register']]]]]}}" class="btngroup data-v-111bb4d3" bindtap="__e"><text class="data-v-111bb4d3">注册</text></view></view><view class="wxbtn data-v-111bb4d3"><block wx:if="{{value==1}}"><button open-type="getPhoneNumber" data-event-opts="{{[['getphonenumber',[['getPhoneNumber',['$event']]]]]}}" bindgetphonenumber="__e" class="data-v-111bb4d3"><view class="data-v-111bb4d3"><image src="../../static/phone.png" class="data-v-111bb4d3"></image></view><text class="data-v-111bb4d3">手机号快捷登录</text></button></block><block wx:else><button data-event-opts="{{[['tap',[['handleIsTel',['$event']]]]]}}" bindtap="__e" class="data-v-111bb4d3"><view class="data-v-111bb4d3"><image src="../../static/phone.png" class="data-v-111bb4d3"></image></view><text class="data-v-111bb4d3">手机号快捷登录</text></button></block></view></view>

unpackage/dist/dev/mp-weixin/pageTwo/login/login.wxss

@@ -23,7 +23,6 @@
   width: 70px;
   height: 70px;
   margin: auto;
-  margin-bottom: 10px;
   border-radius: 50%;
 }
 .top text.data-v-111bb4d3 {
@@ -44,7 +43,7 @@
   z-index: 99;
   position: absolute;
   left: 7%;
-  top: 28%;
+  top: 27%;
   box-shadow: 0px 1px 5px 2px #dfe2e1fc;
 }
 .login .title.data-v-111bb4d3 {
@@ -169,4 +168,41 @@
 .href.data-v-111bb4d3 {
   width: auto;
 }
+.wxbtn.data-v-111bb4d3 {
+  width: 100%;
+  position: absolute;
+  margin-top: 30px;
+  top: 80%;
+}
+.wxbtn icon.data-v-111bb4d3 {
+  font-size: 25px;
+  color: #28c445;
+}
+.wxbtn text.data-v-111bb4d3 {
+  display: block;
+  margin-top: 5px;
+  font-size: 12px;
+  text-align: center;
+  border-bottom: 1px solid blue;
+  color: blue;
+}
+.wxbtn button.data-v-111bb4d3 {
+  line-height: initial;
+  background: #fff;
+  display: flex;
+  flex-wrap: wrap;
+  padding: 0;
+  justify-content: center;
+}
+.wxbtn button.data-v-111bb4d3::after {
+  display: none;
+}
+.wxbtn view.data-v-111bb4d3 {
+  width: 100%;
+}
+.wxbtn image.data-v-111bb4d3 {
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+}
 

unpackage/dist/dev/mp-weixin/pageTwo/my/about.js

@@ -181,8 +181,10 @@ var _default = {
   onLoad: function onLoad() {
     var that = this;
     if (!that.phoneInfo.versionUrl) {
+      console.log("111");
       that.handleoginversion();
     } else {
+      console.log("222");
       that.version = that.$tools.compareVersions(that.phoneInfo.info.version, that.phoneInfo.versionUrl.version);
     }
   },