Skip to content

N
nyx
Commit 34b2ff20 by jscat
Options

nyx-master: 

- 删除不用的matchStudy模块
parent 5f60a876
正在显示 包含 0 行增加 和 578 行删除
增值产品-小程序及app/nyx-master/pages/key/matchStudy/matchStudy.js deleted 100644 → 0
// pages/key/matchStudy/matchStudy.js
// pages/key/matchStudy/matchStudy.js
var config = wx.getStorageSync("config");
var app = getApp();
Page({
/**
* 页面的初始数据
*/
data: {
//用户信息初始化
nyxCode: "",
authStatus: "",
userInfo: {},
matchSeason: "", // 学习赛季
studyResult: {
"wset1" : "0",
"wset2": "0",
"wset3": "0",
"wset4": "0",
"wine": "0",
"whisky": "0",
"sake": "0",
},
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var _this = this;
//初始化数据
if (wx.getStorageSync('nyxCode')) {
_this.setData({
nyxCode: wx.getStorageSync('nyxCode'),
userInfo: wx.getStorageSync('userInfo'),
authStatus: wx.getStorageSync('authStatus'),
matchSeason: wx.getStorageSync('matchSeason'),
matchType: "daily", // 学习类型
})
}
/**
* 系统配置：主要用于置底页面设置 step2
*/
var windowHeight = wx.getSystemInfoSync().windowHeight;//获取设备高度，小程序自带的方法
this.setData({
windowHeight: windowHeight
})
/* end */
//tips:每次进入都重新更新
var matchSeason = _this.data.matchSeason
var nyxCode = _this.data.nyxCode
_this.getMatchRank(matchSeason, nyxCode);
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
var _this = this;
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
// 用户自定义函数
// 获取真实数据
getMatchRank: function (matchSeason, matchTeam) {
var _this = this;
var strUrl = config.match_rank_query_url + '?matchSeason=' + matchSeason + '&matchTeam=' + matchTeam
wx.request({
url: strUrl,
method: 'GET',
header: {
'Cookie': wx.getStorageSync('cookieKey'),
},
success: function (res) {
if (res.data.resultCode == 200) {
//表示上传成功(可以在阿里云服务器查看上传的图片)
console.log(res.data);
var result = _this.data.studyResult
var list = res.data.data
for (var j = 0; j < list.length; j++) {
var matchType = list[j].matchType
result[matchType] = list[j].ratioFinish == null ? 0 : list[j].ratioFinish
}
wx.setStorageSync('studyResult', result)
_this.setData({
studyResult: result,
})
}
}
})
},
})
\ No newline at end of file
增值产品-小程序及app/nyx-master/pages/key/matchStudy/matchStudy.json deleted 100644 → 0
{
{
"usingComponents": {},
"navigationBarTitleText": "知识学习"
}
\ No newline at end of file
增值产品-小程序及app/nyx-master/pages/key/matchStudy/matchStudy.wxml deleted 100644 → 0
<!--pages/key/matchStudy/matchStudy.wxml-->
<!--pages/key/matchStudy/matchStudy.wxml-->
<wxs module="tutil" src="../../../utils/date.wxs"></wxs>
<view class="page">
<view class="workbench">
<text class="title">认证</text>
<view class="list">
<view class="items">
<text>Level-1</text>
<navigator url="matchStudyDetail/matchStudyDetail?studyType=wset1">
<image src="/icon/study/wset2.jpg"></image>
</navigator>
<text>已完成 {{tutil.toFix(studyResult.wset1)}}%</text>
</view>
<view class="items">
<text>Level-2</text>
<navigator url="matchStudyDetail/matchStudyDetail?studyType=wset2">
<image src="/icon/study/wset2.jpg"></image>
</navigator>
<text>已完成 {{tutil.toFix(studyResult.wset2)}}%</text>
</view>
<view class="items">
<text>Level-3</text>
<navigator url="matchStudyDetail/matchStudyDetail?studyType=wset3">
<image src="/icon/study/wset2.jpg"></image>
</navigator>
<text>已完成 {{tutil.toFix(studyResult.wset3)}}%</text>
</view>
<view class="items">
<text>Level-4</text>
<navigator url="matchStudyDetail/matchStudyDetail?studyType=wset4">
<image src="/icon/study/wset2.jpg"></image>
</navigator>
<text>已完成 {{tutil.toFix(studyResult.wset4)}}%</text>
</view>
</view>
</view>
<view class="workbench">
<text class="title">品类</text>
<view class="list">
<view class="items">
<text class="top">红酒</text>
<navigator url="matchStudyDetail/matchStudyDetail?studyType=wine">
<image src="/icon/study/wine.png"></image>
</navigator>
<text class="bottom">已完成 {{tutil.toFix(studyResult.wine)}}%</text>
</view>
<view class="items">
<text >威士忌</text>
<navigator url="matchStudyDetail/matchStudyDetail?studyType=whisky">
<image src="/icon/study/whisky.png"></image>
</navigator>
<text >已完成 {{tutil.toFix(studyResult.whisky)}}%</text>
</view>
</view>
<text>\n</text>
<view class="list">
<!-- start view -->
<view class="items">
<text class="top">清酒</text>
<navigator url="matchStudyDetail/matchStudyDetail?studyType=sake">
<image src="/icon/study/sake.png"></image>
</navigator>
<text class="bottom">已完成 {{tutil.toFix(studyResult.wine)}}%</text>
</view>
<!-- end view -->
<!-- start view -->
<view class="items">
<text class="top">精酿</text>
<navigator url="matchStudyDetail/matchStudyDetail?studyType=beer">
<image src="/icon/study/beer.png"></image>
</navigator>
<text class="bottom">已完成 {{tutil.toFix(studyResult.wine)}}%</text>
</view>
<!-- end view -->
</view>
</view>
</view>
增值产品-小程序及app/nyx-master/pages/key/matchStudy/matchStudy.wxss deleted 100644 → 0
.workbench{
.workbench{
font-size: 30rpx;
background: #fff;
padding-bottom: 30rpx;
margin-bottom:10rpx;
color: #333;
}
.workbench .title{
font-size: 35rpx;
padding: 20rpx 20rpx;
margin-bottom: 40rpx;
display: block;
}
.workbench .items{
width: 100rpx;
flex:1;
text-align: center;
}
.workbench .items image{
width: 100rpx;
height: 100rpx;
}
.workbench .items image.service-icon{
width: 50rpx;
height: 50rpx;
}
.workbench .items text{
display: block;
text-align: center;
margin-top: 0rpx;
margin-bottom: 0rpx;
}
.workbench .items text.top{
display: block;
text-align: center;
margin-bottom: 0rpx;
}
.workbench .items text.bottom{
display: block;
text-align: center;
margin-top: 0rpx;
}
.workbench .list{
display: flex;
flex-direction: row;
flex:1;
}
/* end */
\ No newline at end of file
增值产品-小程序及app/nyx-master/pages/key/matchStudy/matchStudyDetail/matchStudyDetail.json deleted 100644 → 0
{
{
"usingComponents": {},
"navigationBarTitleText": "知识学习"
}
\ No newline at end of file
增值产品-小程序及app/nyx-master/pages/key/matchStudy/matchStudyDetail/matchStudyDetail.wxml deleted 100644 → 0
<!--pages/key/matchStudyDetail/matchStudyDetail.wxml-->
<!--pages/key/matchStudyDetail/matchStudyDetail.wxml-->
<wxs module="tutil" src="../../../../utils/date.wxs"></wxs>
<view class="page bottom_fixed_page" style="min-height:{{ windowHeight }}px">
<view class="weui-flex">
<view class="weui-flex__item"><view class="placeholder">题目：{{studyStatus.total_score}}/{{studyStatus.total_quiz}}题</view></view>
<view class="weui-flex__item"><view class="placeholder">分数：{{score}}</view></view>
</view>
<view class="weui-loadmore" hidden="{{isQuizReady}}">
<view class="weui-loadmore__tips">题目准备中, 敬请期待 {{'>'}}_{{'<'}} </view>
</view>
<view class="weui-loadmore" hidden="{{!isStudyDone}}">
<view class="weui-loadmore__tips">好牛哦, 恭喜你已完成该项挑战 {{'>'}}_{{'<'}} </view>
</view>
<view hidden="{{isStudyDone}}"> <!-- start of isStudyDone flag -->
<view class="page__hd">
<!-- 标题 -->
<view class="page__desc">{{quizResult.questionName}}</view>
</view>
<view class="page__bd " wx:for-items="{{quizResult.choiceString}}" >
<button class="weui-btn button-sp-area {{current_item == index?'btn-selected':'btn-not-selected'}}" bind:tap="onClick" disabled="{{button_disabled==1?true:false}}" id="{{index}}">
<image src="{{operateResult}}" style="vertical-align:middle;width:60rpx;height:60rpx" hidden="{{hidden_type==1?true:(current_item == index?false:true)}}" />
{{item}}
</button>
</view>
<view class="page__hd" hidden="{{button_disabled==0}}">
<!-- 优化: 直接显示正确答案 -->
<view class="page__desc">推荐答案: {{tutil.formatAnswer(quizResult.answer)}}</view>
</view>
<!-- <text>\n</text> -->
<view class="weui-flex" hidden="{{!isQuizReady}}" >
<view class="weui-flex__item" bindtap="{{button_disabled==0?'onGetComment':'onTypeNext'}}">
<view class="placeholder-button">
<image src="{{button_disabled==0?(comment_hidden_type==1?'/icon/matchDaily/checkComment.png':'/icon/matchDaily/checkComment.png'):'/icon/matchDaily/next.png'}}" style="vertical-align:middle;width:60rpx;height:60rpx" />
{{button_disabled==0?(comment_hidden_type==1?"查看评论":"隐藏评论"):"下一题"}}</view>
</view>
<view class="weui-flex__item"><view class="{{button_disabled==0?'placeholder-button':'placeholder-button-disabled'}}" bind:tap="onReportBug">
<image src="{{button_disabled==0?'/icon/matchDaily/question.png':'/icon/matchDaily/question_0.png'}}" style="vertical-align:middle;width:60rpx;height:60rpx" />这题有问题</view>
</view>
</view>
<!-- 评论区 -->
<view class="page__bd" hidden="{{comment_hidden_type==1?true:false}}">
<view class="weui-panel weui-panel_access" wx:for="{{commentList}}" wx:key="commentList">
<view class="weui-panel__bd weui-media-box weui-media-box_appmsg" bind:tap="onReplyUser" data-nickname="{{item.nicknameFrom}}" data-userid="{{item.useridFrom}}" data-content-to="{{item.content}}">
<view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
<image class="weui-media-box__thumb" src="{{item.avatarUrlFrom}}" />
</view>
<view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
<view class="weui-cells weui-cells_after-title">
<view class="weui-cell" style="height:20rpx;text-align:left;padding-left:0rpx;margin:0rpx">
<view class="weui-cell__bd" style="text-align:left;padding:rpx;margin:0rpx">
<!-- start id+日期 -->
<view class="workbench">
<view class="items weui-media-box__desc">
<text>{{item.nicknameFrom}}</text>
<text class="bottom">{{tutil.formatDate_ymd(item.createDatetime)}}</text>
</view>
</view>
<!-- end id+date -->
</view>
<!-- start 点赞数 + 图标 -->
<view class="weui-media-box__desc" style="font-size:30rpx">
{{item.numLike}}
<view bindtap="onSubmitLike" data-comment-id="{{item.commentId}}">
<image src="/icon/matchDaily/like.png" style="width:30rpx;height:30rpx" />
</view>
</view>
<!-- end 点赞数 + 图标 -->
</view>
</view>
<view class="weui-media-box__desc">{{item.nicknameTo==null?"":"@"+item.nicknameTo+" "}}{{item.content}}</view>
</view>
</view>
</view>
<view class="weui-loadmore" hidden="{{isHideLoadMore}}">
<view class="weui-loading"></view>
<view class="weui-loadmore__tips">正在加载</view>
</view>
<view class="weui-loadmore" hidden="{{!isHideLoadMore}}">
<view class="weui-loadmore__tips">没有更多啦 {{'>'}}_{{'<'}} </view>
</view>
<!-- 评论栏置底 -->
<view class="page__hd bottom_fixed_view" style="position:fixed; bottom:0;width: 750rpx;" >
<view class="weui-panel weui-panel_access">
<view class="weui-panel__ft">
<form catchsubmit="onSubmitComment" >
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd">
<input class="weui-input" type="text" name="content" focus="{{autoFocus}}" value='{{inputContentValue}}' pattern="" placeholder="{{inputHolderValue}}" bindblur="onCancelReply" />
<input type="text" style="display:none" name="useridTo" value='{{inputUseridToValue}}'/>
<input type="text" style="display:none" name="contentTo" value='{{inputContentToValue}}'/>
</view>
<view class="weui-cell__ft">
<button type="default" formType="submit">发送</button>
</view>
</view>
</form>
</view>
</view>
</view>
</view>
</view> <!-- end of isStudyDone flag -->
</view>
增值产品-小程序及app/nyx-master/pages/key/matchStudy/matchStudyDetail/matchStudyDetail.wxss deleted 100644 → 0
page{background-color:#EDEDED;}
page{background-color:#EDEDED;}
.button-sp-area{
margin-top: 20rpx; /* 用于表示button与button之间的间隔 */
padding-top: 0px;
margin-left: 0rpx;
padding-left: 100rpx;
text-align:left;
line-height: 60rpx; /*缩小行间距 */
font-size: 40rpx;
}
.mini-btn{
margin: 0 4px;
}
.btn-selected{
/* background-color: #ffffff; */
color: rgb(105, 72, 16);
border-color: #00ff00;
border-style:solid;
border-width:2px;
}
.btn-not-selected{
/* background-color: #111111; */
color: rgb(105, 72, 16);
}
.icon-success{
color: greenyellow;
size: 21px;
margin-top: 20rpx; /* 用于表示button与button之间的间隔 */
}
.icon-cancel{
color: red;
size: 21px;
margin-top: 20rpx; /* 用于表示button与button之间的间隔 */
}
.text{
font-size: 6px;
line-height: 0.5em;
}
.container {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
width: 100%;
line-height: 80rpx;
height: 100rpx;
}
.left {
color: #888;
}
.right {
color: #ff0000;
}
.placeholder{
margin: 5px;
padding: 0 10px;
text-align: center;
background-color: #F7F7F7;
height: 2.3em;
line-height: 2.3em;
color: rgba(0,0,0,.3);
}
.placeholder-button{
margin: 5px;
padding: 0 10px;
text-align: center;
background-color: #F7F7F7;
height: 2.3em;
line-height: 2.3em;
color: rgba(198, 133, 36);
font-size: 35rpx;
font-weight: bold;
}
.placeholder-button-disabled{
margin: 5px;
padding: 0 10px;
text-align: center;
background-color: #F7F7F7;
height: 2.3em;
line-height: 2.3em;
color: rgba(0,0,0,.3);
font-size: 35rpx;
font-weight: bold;
pointer-events: none;
}
/**
* 系统配置：主要用于置底页面设置 step3
*/
.bottom_fixed_page{
position: relative;
padding-bottom: 56px; /* 需要定位的盒子的高度 */
box-sizing: border-box;
}
.bottom_fixed_view {
position: fixed;
bottom:0;
}
/*
id+date css
*/
.workbench{
font-size: 25rpx;
padding-bottom: 0rpx;
margin-bottom: 0rpx;
}
.workbench .items{
width: 200rpx;
flex:1;
text-align: left;
}
.workbench .items text{
display: block;
text-align: left;
margin-top: 0rpx;
margin-bottom: 0rpx;
}
.workbench .items text.bottom{
font-size: 25rpx;
display: block;
text-align: left;
margin-top: 3rpx;
}
/* end */
/* 加载更多 */
.weui-loading {
margin: 0 5px;
width: 20px;
height: 20px;
display: inline-block;
vertical-align: middle;
-webkit-animation: weuiLoading 1s steps(12, end) infinite;
animation: weuiLoading 1s steps(12, end) infinite;
background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
background-size: 100%;
}
.weui-loadmore {
width: 65%;
margin: 1.5em auto;
line-height: 1.6em;
font-size: 14px;
text-align: center;
}
.weui-loadmore__tips {
display: inline-block;
vertical-align: middle;
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论