Merge branch 'spp' into 'master'

Spp

See merge request !3

app.js

@@ -40,7 +40,7 @@ App({
 	},
 	getVision() {
 		const accountInfo = wx.getAccountInfoSync();
-		console.log(accountInfo)
+		// console.log(accountInfo)
 		if (accountInfo.miniProgram.envVersion == 'develop') { // 开发板
 			this.globalData.globalUrl = 'https://tianzehr.xueyoubangedu.com'
 		} else if (accountInfo.miniProgram.envVersion == 'trial') { // 体验版
@@ -50,7 +50,7 @@ App({
 		} else {
 			this.globalData.globalUrl = 'https://tianzehr.xueyoubangedu.com'
 		}
-		console.log(this.globalData.globalUrl)
+		// console.log(this.globalData.globalUrl)
 	},
 	// 将token从缓存中 赋值到全局变量
 	getToken: function () {
@@ -71,7 +71,6 @@ App({
 		// 调用登录接口
 		wx.login({
 			success: function (res) {
-				console.log('wx.login微信登录',res)
 				that.codeChangeToken(res.code, cb, cb1)
 			}
 		})
@@ -94,7 +93,6 @@ App({
 							token: that.globalData.token
 						},
 						success: function (res) {
-							console.log('saveInfo',res)
 							if (res.data.meta.code === 200) {
 								wx.setStorageSync('userInfo', JSON.parse(info.rawData))
 								that.globalData.userInfo = JSON.parse(info.rawData)

pages/login/index/index.wxml

 <view class="loginbox">
-    <image class="title_img" src="/images/logo.png"></image>
+    <image class="title_img" src="/images/logo1.png"></image>
     <view class="title_tip"> 天择人才</view>
 
     <button class="title_btn flex-h flex-vc flex-hc" wx:if="{{canIUseGetUserProfile}}" bindtap="getUserProfile">
-        <text class="iconfont icon-weixin1"></text> 微信一键注册/登录
+        <text class="iconfont icon-weixin1"></text> 立即登录
     </button>
     <button class="title_btn flex-h flex-vc flex-hc" wx:else open-type="getUserInfo" bindgetuserinfo="userInfoHandler">
-        <text class="iconfont icon-weixin1"></text> 微信一键注册/登录
+        <text class="iconfont icon-weixin1"></text> 立即登录
     </button>
 
     <view class="small_tip">请登录查看更多内容</view>

pages/translate/translate.js

@@ -23,6 +23,7 @@ Page({
     onLoad: function (options) {
         this.getList()
     },
+    //获取直播间列表
     getList() {
         let params = {
             url: apiList.live_list,
@@ -47,8 +48,8 @@ Page({
         })
         base.newRequest(params)
     },
+    //跳转直播间
     goLive(e) {
-        // console.log(e.currentTarget.dataset.roomid)
         let roomId = e.currentTarget.dataset.roomid // 房间号
         try {
             var userInfo = wx.getStorageSync('userInfo')

pages/translate/translate.wxml

@@ -28,7 +28,7 @@
         <view class="blank"></view>
     </view>
     <view wx:else class="noneBox column">
-        <image src="/images/none.png"></image>
+        <image src="/images/none_pic.png"></image>
         <view>暂无任何直播哦~</view>
     </view>
 </view>
\ No newline at end of file

pages/translate/translate.wxss

@@ -63,15 +63,15 @@ page {
 }
 
 .noneBox {
-    padding: 140rpx 0 0;
+    padding: 224rpx 125rpx;
     align-items: center;
     font-size: 28rpx;
     color: #999;
 }
 
 .noneBox image {
-    width: 215rpx;
-    height: 337rpx;
+    width: 500rpx;
+    height: 400rpx;
     margin-bottom: 30rpx;
 }
 

utils/base.js

@@ -38,7 +38,6 @@ class Base {
 				if (wx.showLoading()) {
 					wx.hideLoading() //隐藏加载动画
 				}
-				console.log(res)
 				if (res.statusCode == 200) {
 					let rstcode = res.data.meta.code, msg = res.data.meta.message
 					// todo: 状态码判断