新闻时间格式

common/dateUtils.js

@@ -45,6 +45,11 @@ const $date = {
 		return date.getFullYear() + "-" + StringUtils.add0(date.getMonth() + 1) + "-" + StringUtils.add0(date
 				.getDate()) + " " + StringUtils.add0(date.getHours()) + ":" + StringUtils.add0(date.getMinutes()) +
 			":" + StringUtils.add0(date.getSeconds())
+	},
+	stampToDay(time) {
+		var date = new Date(time)
+		return date.getFullYear() + "-" + StringUtils.add0(date.getMonth() + 1) + "-" + StringUtils.add0(date
+			.getDate())
 	}
 }
 

components/uni-tabbar/uni-tabbar.vue

@@ -172,7 +172,7 @@
 	}
 
 	.tabbar-container .item-active {
-		color: #0B5794;
+		color: #3B73FE;
 	}
 
 	.tabbar-container .center-item {

pages/index/newDetail/newDetail.vue

@@ -59,7 +59,7 @@
 				return richtext;
 			},
 			timeChange(time) {
-				return this.$date.stampToDate(time)
+				return this.$date.stampToDay(time)
 			},
 			toLinkDetail(item) {
 				uni.navigateTo({

pages/index/siteNewList/siteNewList.vue

@@ -58,7 +58,7 @@
 		},
 		methods: {
 			timeChange(time) {
-				return this.$date.stampToDate(time)
+				return this.$date.stampToDay(time)
 			},
 			httpToHttps(url) {
 				return this.$imageUtils.httpToHttps(url)

pages/mine/myScore/myScore.vue

@@ -296,7 +296,7 @@
 		.shop-list-content {
 			display: flex;
 			flex-direction: column;
-			margin: 235px 30rpx 30rpx 30rpx;
+			margin: 132px 30rpx 30rpx 30rpx;
 			background-color: #FFFFFF;
 			padding: 30rpx;
 			border-radius: 30rpx;

pages/user/login/login.vue

@@ -98,6 +98,35 @@
 					}
 				})
 			},
+			directLogin: function() {
+				Api.bindLogin({
+					data: {
+						unique_token: this.unique_token
+					}
+				}).then((result) => {
+					console.log("登录用户信息：", result);
+					if (result.code == 0) {
+						uni.setStorageSync("short_token", result.data.short_token)
+						uni.setStorageSync("token", result.data.access_token)
+						uni.setStorageSync("user_info", result.data)
+						uni.setStorageSync("company_id", result.data.comp_id)
+						uni.showToast({
+							title: "授权登录成功",
+							icon: 'none'
+						})
+						uni.switchTab({
+							url: "/pages/index/index"
+						})
+					} else {
+						uni.showToast({
+							title: result.msg,
+							icon: 'none'
+						})
+					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
+				})
+			},
 			getJsCode() {
 				let _this = this;
 				// 1.wx获取登录用户code
@@ -124,6 +153,22 @@
 					},
 				});
 			}
+			checkBind: function() {
+				Api.checkBind({
+					data: {
+						unique_token: this.unique_token
+					}
+				}).then((res) => {
+					let code = res.code
+					if (code == 0) { //已绑定直接登录
+						this.directLogin()
+					} else { //其他
+						this.wxPhoneLogin()
+					}
+				}, (err) => {
+					this.$toast.showToast(err.msg)
+				})
+			},
 
 		}
 	}