Skip to content

E
educationStu
Commit 3c7742cb authored by 黄奎's avatar 黄奎
Browse files
Options

去掉授权登录

parent f1a8b15d
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 106 deletions
src/pages/index/index.vue
View file @ 3c7742cb
......@@ -9,19 +9,18 @@
<view v-if="userData && userData.AccountName && userData.AccountId>0">
{{userData.AccountName}}
</view>
<indexassembly @success='againdata' v-else>
<!-- <indexassembly @success='againdata' v-else>
<view class="flex_start_center">
<image
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/login2x.png"
mode="aspectFit" class="loginIcon" id="loadImg"></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/login2x.png" mode="aspectFit"
class="loginIcon" id="loadImg"></image>
登录
</view>
</indexassembly>
</indexassembly> -->
</view>
<!-- 扫码登陆 -->
<view class="scanBox" @click="scan">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/scan2x.png"
mode="aspectFit" class="scanIcon">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/scan2x.png" mode="aspectFit"
class="scanIcon">
</image>
</view>
......@@ -50,41 +49,34 @@
<view class="flex_around_center ">
<view class="wordItem">
<text class="wordItemTitle">今日新词</text>
<text class="wordItemText">{{pageData.Words.NextWord||0}}<text
class="wordItemTextUnit">词</text></text>
<text class="wordItemText">{{pageData.Words.NextWord||0}}<text class="wordItemTextUnit">词</text></text>
</view>
<view class="wordItem">
<text class="wordItemTitle">复习词语</text>
<text class="wordItemText">{{pageData.Words.ReviewWord||0}} <text
class="wordItemTextUnit">词</text></text>
<text class="wordItemText">{{pageData.Words.ReviewWord||0}} <text class="wordItemTextUnit">词</text></text>
</view>
</view>
<view class="wordDuration" style="visibility: hidden;">
预计用时10分钟
</view>
<view style="text-align: center;font-size: 22rpx;color: #4C50E7;"
v-if="(pageData.Words.NextWord==0||!pageData.Words.NextWord)&&(pageData.Words.ReviewWord==0||!pageData.Words.ReviewWord)">
<view style="text-align: center;font-size: 22rpx;color: #4C50E7;" v-if="(pageData.Words.NextWord==0||!pageData.Words.NextWord)&&(pageData.Words.ReviewWord==0||!pageData.Words.ReviewWord)">
暂无新词</view>
<view class="wordBtn" v-else
@click="jumpPage(`/pages/word/word?CourseId=${pageData.Words.CourseId||0}&&ChapterId=${pageData.Words.NextCourseNo||0}&&ReviewChapterId=${pageData.Words.ReviewCourseNo||0}&&ClassId=${pageData.Words.ClassId||0}`)">
<view class="wordBtn" v-else @click="jumpPage(`/pages/word/word?CourseId=${pageData.Words.CourseId||0}&&ChapterId=${pageData.Words.NextCourseNo||0}&&ReviewChapterId=${pageData.Words.ReviewCourseNo||0}&&ClassId=${pageData.Words.ClassId||0}`)">
开始学习
</view>
</view>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/coffee/xbkbanner2.png"
mode="widthFix" class="starbucks" @click="jumpJiahemini"></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/coffee/xbkbanner2.png" mode="widthFix"
class="starbucks" @click="jumpJiahemini"></image>
<view class="courseBox">
<view class="courseInnerBox" @click="jumpTimetable">
<view class="top">
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/classtime.png"
mode="aspectFit" class="courseIcon"></image>
<text class="courseDateStr"
style="margin: 0 16rpx 0 8rpx;">{{pageData.ClassNext.DateStr||'暂无'}}</text>
<text class="courseDateStr"
v-if="pageData.ClassNext.DateStart">{{pageData.ClassNext.DateStart}}</text>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/classroom.png"
mode="aspectFit" class="courseIcon" style="margin: 0 12rpx 0 50rpx;"></image>
<text class="courseDateStr"
style="margin-right: 30rpx;">{{pageData.ClassNext.RoomName||'暂无'}}</text>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/classtime.png" mode="aspectFit"
class="courseIcon"></image>
<text class="courseDateStr" style="margin: 0 16rpx 0 8rpx;">{{pageData.ClassNext.DateStr||'暂无'}}</text>
<text class="courseDateStr" v-if="pageData.ClassNext.DateStart">{{pageData.ClassNext.DateStart}}</text>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/classroom.png" mode="aspectFit"
class="courseIcon" style="margin: 0 12rpx 0 50rpx;"></image>
<text class="courseDateStr" style="margin-right: 30rpx;">{{pageData.ClassNext.RoomName||'暂无'}}</text>
</view>
<view class="flex">
<view class="courseNameBox">
......@@ -95,8 +87,8 @@
{{pageData.ClassNext.CourseName||'暂无'}}
</view>
</view>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/female2x.png"
mode="aspectFit" class="courseIcon2"></image>
<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/female2x.png" mode="aspectFit"
class="courseIcon2"></image>
</view>
</view>
<view class="courseTitle">
......@@ -116,16 +108,14 @@
height: 60rpx;
font-size: 24rpx;
font-weight: 500;
color: #4C50E7;display: flex;align-items: center;" @click="jumpGarden(item.Id)">查看更多
color: #4C50E7;display: flex;align-items: center;"
@click="jumpGarden(item.Id)">查看更多
<van-icon name="arrow" />
</view>
</view>
<view class="gardenCon" v-for="(item1,index1) in item.List" :key="index1" id="img"
@click="jumpPage(`/pages/learningGarden/learningGardenDetails?Id=${item1.Id}`)">
<image :src="item1.Img" mode="aspectFill" :id="'img'+index1"
style="width: 100%;height:100%;border-radius: 24rpx 24rpx 0 0;"></image>
<view class="gardenTextBox"
:style="{'background':`linear-gradient(to bottom,${item1.bgcolor},${item1.bgcolor1} , ${item1.bgcolor2})` }">
<view class="gardenCon" v-for="(item1,index1) in item.List" :key="index1" id="img" @click="jumpPage(`/pages/learningGarden/learningGardenDetails?Id=${item1.Id}`)">
<image :src="item1.Img" mode="aspectFill" :id="'img'+index1" style="width: 100%;height:100%;border-radius: 24rpx 24rpx 0 0;"></image>
<view class="gardenTextBox" :style="{'background':`linear-gradient(to bottom,${item1.bgcolor},${item1.bgcolor1} , ${item1.bgcolor2})` }">
<view class="gardenTitle one_line">
{{item1.Title}}
</view>
......@@ -140,7 +130,8 @@
<canvas canvas-id="myCanvas" class="canvas" style="position:absolute;left: -1000px;"></canvas>
<van-toast id="van-toast" />
<view class="diaocha-box" v-if="SurveyObj.ActivitySurveyId>0">
<image @click="goTongji()" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1652251724000_835.png" mode="widthFix"></image>
<image @click="goTongji()" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1652251724000_835.png"
mode="widthFix"></image>
</view>
</view>
</template>
......@@ -166,7 +157,8 @@
getSweepCode
} from '../../api/index.js'
import {
getImageColor,VersionUpdate
getImageColor,
VersionUpdate
} from '../../utils/index.js'
import indexassembly from './components/indexassembly.vue'
import navbar from '../../components/navbar.vue'
......@@ -197,9 +189,9 @@
pageData: {
LearningGardenList: []
},
SurveyObj:{
ActivitySurveyId:0,
ActivitySurveyGuestId:0,
SurveyObj: {
ActivitySurveyId: 0,
ActivitySurveyGuestId: 0,
},
userData: {}
});
......@@ -208,7 +200,8 @@
VersionUpdate,
goTongji() {
//console.log("SurveyObj",data.SurveyObj);
this.jumpPage('/pages/study/questionNaire?ActivitySurveyId='+data.SurveyObj.ActivitySurveyId+"&ActivitySurveyGuestId="+data.SurveyObj.ActivitySurveyGuestId);
this.jumpPage('/pages/study/questionNaire?ActivitySurveyId=' + data.SurveyObj.ActivitySurveyId +
"&ActivitySurveyGuestId=" + data.SurveyObj.ActivitySurveyGuestId);
},
jumpPage(url) {
uni.navigateTo({
......@@ -274,7 +267,7 @@
scanType: ['qrCode'],
success: function(res) {
// 解码
var saveObj={};
var saveObj = {};
try {
saveObj = that.base64_decode(res.result)
// console.log(saveObj)
......@@ -282,23 +275,23 @@
//TODO handle the exception
// console.log(e)
}
var jsonObj= JSON.parse(saveObj)
if(jsonObj.cmd =="checkin"){
var jsonObj = JSON.parse(saveObj)
if (jsonObj.cmd == "checkin") {
var userData = uni.getStorageSync('userInfo');
console.log("userData",userData);
jsonObj.params.StuId=userData.AccountId;
var array=[];
console.log("userData", userData);
jsonObj.params.StuId = userData.AccountId;
var array = [];
array.push(jsonObj.params);
console.log("jsonObj.params",jsonObj.params)
console.log("jsonObj.params", jsonObj.params)
let result = getSweepCode(array);
if (result) {
// console.log(result)
if (result.Code == 1) {
console.log('扫码成功')
uni.navigateTo({
url:'./success',
url: './success',
})
}else{
} else {
console.log('扫码失败')
uni.navigateTo({
url: './fail'
......@@ -319,8 +312,8 @@
proxy.$request("/AppletIndex/GetIndexInfo_V2", {}).then(res => {
data.pageData = res.Data
uni.setStorageSync("indexData", res.Data);
data.SurveyObj.ActivitySurveyId=res.Data.ActivitySurveyId;
data.SurveyObj.ActivitySurveyGuestId=res.Data.ActivitySurveyGuestId;
data.SurveyObj.ActivitySurveyId = res.Data.ActivitySurveyId;
data.SurveyObj.ActivitySurveyGuestId = res.Data.ActivitySurveyGuestId;
if (data.pageData.LearningGardenList.length > 0) {
data.pageData.LearningGardenList.forEach((x, y) => {
if (x.List.length > 0) {
......@@ -763,22 +756,25 @@
border-radius: 20rpx;
margin: 60rpx auto;
}
.diaocha-box{
.diaocha-box {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
background-color: rgba(0,0,0,.3);
padding:0 10vw;
background-color: rgba(0, 0, 0, .3);
padding: 0 10vw;
display: flex;
align-items: center;
z-index: 1000;
}
.diaocha-box image{
width:80vw;
.diaocha-box image {
width: 80vw;
}
.no-scroll{
.no-scroll {
overflow: hidden !important;
height: 100vh !important;
}
......
src/pages/login/login.vue
View file @ 3c7742cb
......@@ -5,8 +5,7 @@
</van-nav-bar>
<view class="top">
登录
<van-image width="193rpx" height="242rpx" fit="cover" class="yuqi"
src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/yuqi.png" />
<van-image width="193rpx" height="242rpx" fit="cover" class="yuqi" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/yuqi.png" />
</view>
<view class="main">
<van-cell-group>
......@@ -21,9 +20,9 @@
<view class="btnBox" @click="login">
账号登录
</view>
<view class="flex_center_center" v-if="showVisitor">
<indexassembly width="440rpx" height="90rpx" @success='againdata' >
<view class="btnBox authBtn" >
<!-- <view class="flex_center_center" v-if="showVisitor">
<indexassembly width="440rpx" height="90rpx" @success='againdata'>
<view class="btnBox authBtn">
授权登录
</view>
</indexassembly>
......@@ -32,9 +31,8 @@
游客登录
</view>
<van-toast id="van-toast" />
<van-dialog :show='show' title="提示" message='游客登录,不能使用全部功能!' show-cancel-button @cancel='show = false'
@confirm='login3'>
</van-dialog>
<van-dialog :show='show' title="提示" message='游客登录,不能使用全部功能!' show-cancel-button @cancel='show = false' @confirm='login3'>
</van-dialog> -->
</view>
</template>
......@@ -60,7 +58,7 @@
} from '../../wxcomponents/vant/dialog/index';
import indexassembly from '../index/components/indexassembly.vue'
export default {
components:{
components: {
indexassembly
},
setup(props, context) {
......@@ -79,7 +77,7 @@
openid: "",
code: "",
show: false,
showVisitor:false,
showVisitor: false,
});
let methods = {
......@@ -95,12 +93,9 @@
jumpPage() {
uni.reLaunch({
url: "/pages/index/index",
// url: "/pages/index/index2",//跳转查看考试
});
clearTimeout();
},
async login() {
if (msg.Account == "" || !msg.Account) {
Toast.fail("请输入账号");
......@@ -110,8 +105,8 @@
Toast.fail("请输入密码");
return;
}
let res = await this.$request('/AppletLogin/Login', msg).then(res=>{
if(res.Code==1){
let res = await this.$request('/AppletLogin/Login', msg).then(res => {
if (res.Code == 1) {
res.Data.Account = msg.Account;
uni.setStorageSync("userInfo", res.Data);
Toast.success("登录成功");
......@@ -203,17 +198,10 @@
} else {
uni.showToast({
icon: "none",
title:"未授权电话,请先点击授权按钮",
duration:2000,
title: "未授权电话,请先点击授权按钮",
duration: 2000,
})
// setTimeout(()=>{
// uni.reLaunch({
// url: '/pages/index/index' //没有授权登录
// });
// },1500)
}
},
againdata() {
uni.reLaunch({
......@@ -231,7 +219,7 @@
},
onLoad() {
//审核用
this.showVisitor=new Date().getTime()> new Date('2022-03-16').getTime()
this.showVisitor = new Date().getTime() > new Date('2022-03-16').getTime()
}
};
</script>
......@@ -321,11 +309,13 @@
text-align: center;
line-height: 88rpx;
}
.authBtn{
.authBtn {
background-color: #EDEDFD !important;
color: #4C50E8 !important;
}
.visitor{
.visitor {
text-align: center;
font-size: 28rpx;
font-family: PingFang SC;
......
src/utils/request.js
View file @ 3c7742cb
//请求教育接口
let host = ''
if (process.env.NODE_ENV === "development") {
host = 'http://192.168.10.46:8300/api'
// host = 'http://192.168.10.65:8085/api'
// host = 'https://eduapi.oytour.com/api'
host = 'http://192.168.10.128:8300/api'
} else {
host = 'https://eduapi.oytour.com/api'
}
......
src/utils/requestMall.js
View file @ 3c7742cb
//请求电商接口
let host = ''
if (process.env.NODE_ENV === "development") {
host = 'http://192.168.10.46:8200/api'
//host = "https://mallapi.oytour.com/api"
host = 'http://192.168.10.128:8200/api'
} else {
host = "https://mallapi.oytour.com/api"
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment