Merge pull request 'zmr' (#62) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/62

common/api/user.js

@@ -302,6 +302,11 @@ export default {
 			delMessage({ type }) {
 				return vm.$u.post('/message/readMessage', { type });
 			},
+<<<<<<< HEAD
+			// 已读消息
+			refreshToken({  }) {
+				return vm.$u.post('/Auth/refreshToken', { });
+=======
 			// 屏蔽列表
 			articlShieldList() {
 				return vm.$u.post('/Article/articlShieldList');
@@ -309,6 +314,7 @@ export default {
 			// 取消屏蔽
 			articleDelShield({ id }) {
 				return vm.$u.post('article/articleDelShield', { member_id: id });
+>>>>>>> 76a0e7e8bdfc42e7e46cc74d2cfb43fc4f544e7b
 			},
         }
     }

components/remaining/remaining.vue

@@ -12,9 +12,7 @@
 		<view v-if="type" class="welcome_jumpes" @click="leap_over">跳过{{remaining}}</view>
 		<view v-if="banner" class="welcome_jumpes" @click="leap_overto">跳过</view>
 		<!-- 轮播图 -->
-		<view class="uni-padding-wrap" v-if="banner"  style="height:300rpx">
+		<view class="uni-padding-wrap" v-if="banner" >
-			{{'ddd' + heightOut}}
-			111
 			<view>
 				<view class="uni-padding-wrap">
 					<view class="page-section swiper">
@@ -24,7 +22,7 @@
 									<view class="swiper-item uni-bg-red">
 										<image :src=" 'https://' + item.launch_path"></image>
 									</view>
-								</swiper-item>
+								</swiper-item> 
 							</swiper>
 						</view>
 					</view>
@@ -199,10 +197,19 @@
 			},
 			durationChange(e) {
 				this.duration = e.target.value
+			},
+			refreshToken_function(){
+				this.$u.api.refreshToken({}).then((res) => {
+					console.log(res)
+					if (res.errCode == 0) {
+						let token = res.data.token;
+						uni.setStorageSync('token', token);//存储toke值
+					}
+				})
 			}
 	},
 	mounted() {
-	
+		this.refreshToken_function()
 		// 3秒倒计时调用
 		this.remaining_time()
 		this.apiwelcome()
@@ -215,14 +222,14 @@
 		// height: 400rpx;
 	}
 	.welcome_jumpes {
-		width: 90rpx;
+		width: 94rpx;
-		height: 35rpx;
+		height: 36rpx;
 		opacity: 0.5;
 		border-radius: 18rpx;
 		position: absolute;
 		right: 37rpx;
-		top: 34rpx;
+		top: 66rpx;
-		font-size: 20rpx;
+		font-size: 22rpx;
 		text-align: center;
 		line-height: 35rpx;
 		color: #fff;

package-lock.json

@@ -8,6 +8,11 @@
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.5.0.tgz",
       "integrity": "sha512-1UdMUGJqWx60ALbXXXs3rQHKUNBARDIV5XHc06mKFxpccO/i0tzoSqS6RuPdmYwXU1q59wnIU+NLABvcU5u4vw=="
+    },
+    "vuex": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz",
+      "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
     }
   }
 }

package.json

@@ -13,6 +13,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+<<<<<<< HEAD
+    "uview-ui": "^1.5.0",
+    "vuex": "^3.5.1"
+=======
 	"uview-ui": "^1.5.0"
+>>>>>>> 76a0e7e8bdfc42e7e46cc74d2cfb43fc4f544e7b
   }
 }