Skip to content

S
study
Commit ca20de08 authored by Damon's avatar Damon
Browse files
Options

Merge branch 'dev-v1.0.0' of git.banshouhui.com:wuzhenzhe/study into dev-v1.0.0

parents 6d3dfbf0 448a0312
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1022 additions and 128 deletions
.env.js
View file @ ca20de08
(function () { ;(function() {
let NODE_ENV = 'dev'; // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'dev' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null; let ENV_VAR = null
if (process.env.NODE_ENV === "development") { if (process.env.NODE_ENV === 'development') {
if (NODE_ENV === 'dev') { if (NODE_ENV === 'dev') {
ENV_VAR = require('./.env.dev.js'); ENV_VAR = require('./.env.dev.js')
} else if (NODE_ENV === 'test') { } else if (NODE_ENV === 'test') {
ENV_VAR = require('./.env.test.js'); ENV_VAR = require('./.env.test.js')
} else if (NODE_ENV === 'prod') { } else if (NODE_ENV === 'prod') {
ENV_VAR = require('./.env.prod.js'); ENV_VAR = require('./.env.prod.js')
} }
} else if (process.env.NODE_ENV === "production") { } else if (process.env.NODE_ENV === 'production') {
if (NODE_ENV === 'test') { if (NODE_ENV === 'test') {
ENV_VAR = require('./.env.test.js'); ENV_VAR = require('./.env.test.js')
} else if (NODE_ENV === 'prod') { } else if (NODE_ENV === 'prod') {
ENV_VAR = require('./.env.prod.js'); ENV_VAR = require('./.env.prod.js')
} }
} }
if (ENV_VAR) { ENV_VAR['bmapAK'] = 'lF1HoyXdiv4uZx6TrGQEZs48F5y8kEHI'
process.uniEnv = {}; if (ENV_VAR) {
process.uniEnv['node_env'] = NODE_ENV; process.uniEnv = {}
for (let key in ENV_VAR) { process.uniEnv['node_env'] = NODE_ENV
process.uniEnv[key] = ENV_VAR[key]; for (let key in ENV_VAR) {
} process.uniEnv[key] = ENV_VAR[key]
} }
})(); }
})()
src/components/pop-view/index.vue 0 → 100644
View file @ ca20de08
<template>
<u-popup
border-radius="12"
v-model="visible"
safe-area-inset-bottom
mode="center"
width="654rpx"
:mask-close-able="false"
>
<view class="pop-view">
<view class="pop-title">
<text>{{ title }}</text>
</view>
<view class="pop-message">
<text>{{ message }}</text>
</view>
<view class="line-view" />
<view class="pop-content">
<slot></slot>
</view>
<view class="pop-btn-view">
<u-button
:custom-style="customStyleCancel"
hover-class="none"
shape="circle"
@click="handleClickCancel"
>
取消
</u-button>
<u-button
:custom-style="customStyleSave"
shape="circle"
type="primary"
@click="handleClickSure"
>
{{ buttonText }}
</u-button>
</view>
</view>
</u-popup>
</template>
<script>
export default {
props: {
visible: Boolean,
title: String,
message: String,
buttonText: {
// 确定按钮
type: String,
default: '确定',
},
},
data() {
return {}
},
computed: {
customStyleCancel() {
return {
width: '264rpx',
height: '80rpx',
color: '#9EA5BB',
fontWeight: 'bold',
fontSize: '32rpx',
}
},
customStyleSave() {
return {
backgroundColor: '#2953FF',
width: '264rpx',
height: '80rpx',
color: '#ffffff',
fontWeight: 'bold',
fontSize: '32rpx',
}
},
},
methods: {
changeVisibleValue(val) {
this.$emit('update:visible', val)
},
handleClickCancel() {
this.changeVisibleValue(false)
this.$emit('cancel')
},
handleClickSure() {
this.$emit('submit')
},
},
}
</script>
<style lang="scss" scoped>
.pop-view {
padding: 48rpx 40rpx;
min-height: 520rpx;
position: relative;
.pop-title {
font-size: 40rpx;
margin-bottom: 30rpx;
text-align: center;
color: #191c27;
font-weight: bold;
}
.pop-message {
font-size: 28rpx;
text-align: center;
color: #5a6073;
text-align: center;
}
.pop-content {
margin-bottom: 140rpx;
}
.line-view {
background-color: #e8ebf3;
height: 2rpx;
width: 100%;
margin-bottom: 40rpx;
margin-top: 40rpx;
}
.pop-btn-view {
display: flex;
padding-top: 60rpx;
align-items: center;
justify-content: space-between;
position: absolute;
bottom: 48rpx;
left: 40rpx;
right: 40rpx;
}
}
</style>
src/libs/bmap-wx.min.js 0 → 100644
View file @ ca20de08
This diff is collapsed.
src/manifest.json
View file @ ca20de08
{ {
"name": "", "name" : "",
"appid": "", "appid" : "",
"description": "", "description" : "",
"versionName": "1.0.0", "versionName" : "1.0.0",
"versionCode": "100", "versionCode" : "100",
"transformPx": false, "transformPx" : false,
"app-plus": { /* 5+App特有相关 */ "app-plus" : {
"usingComponents": true, /* 5+App特有相关 */
"splashscreen": { "usingComponents" : true,
"alwaysShowBeforeRender": true, "splashscreen" : {
"waiting": true, "alwaysShowBeforeRender" : true,
"autoclose": true, "waiting" : true,
"delay": 0 "autoclose" : true,
}, "delay" : 0
"modules": { /* 模块配置 */ },
"modules" : {},
}, /* 模块配置 */
"distribute": { /* 应用发布信息 */ "distribute" : {
"android": { /* android打包配置 */ /* 应用发布信息 */
"permissions": ["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "android" : {
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", /* android打包配置 */
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>", "permissions" : [
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
] "<uses-feature android:name=\"android.hardware.camera\"/>",
}, "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"ios": { /* ios打包配置 */ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
}, },
"sdkConfigs": { /* SDK配置 */ "ios" : {},
/* ios打包配置 */
} "sdkConfigs" : {}
} }
}, },
"quickapp": { /* 快应用特有相关 */ /* SDK配置 */
"quickapp" : {},
}, /* 快应用特有相关 */
"mp-weixin": { /* 微信小程序特有相关 */ "mp-weixin" : {
"appid": "wxfd20fa0ca340284b", /* 微信小程序特有相关 */
"setting": { "appid" : "wxfd20fa0ca340284b",
"urlCheck": false, "setting" : {
"es6" : true "urlCheck" : false,
}, "es6" : true
"usingComponents": true },
}, "usingComponents" : true,
"mp-alipay" : { "permission" : {
"usingComponents" : true "scope.userLocation" : {
}, "desc" : "您的位置信息将用于默认对应区域题库的选择"
"mp-baidu" : { }
"usingComponents" : true }
}, },
"mp-toutiao" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true
}, },
"mp-qq" : { "mp-baidu" : {
"usingComponents" : true "usingComponents" : true
} },
} "mp-toutiao" : {
"usingComponents" : true
},
"mp-qq" : {
"usingComponents" : true
}
}
src/pages.json
View file @ ca20de08
...@@ -74,6 +74,16 @@ ...@@ -74,6 +74,16 @@
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"disableScroll": true "disableScroll": true
} }
},
{
"path": "examSetting",
"name": "learnExamSetting",
"style": {
"navigationBarTitleText": "选择题库-设置",
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"disableScroll": true
}
} }
] ]
}, },
......
src/pages/learn/addExam.vue
View file @ ca20de08
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<!-- 类别 --> <!-- 类别 -->
<view> <view>
<view class="category-view"> <view class="category-view">
<text>{{ category.name}}</text> <text>{{ category.name }}</text>
</view> </view>
</view> </view>
<view class="label-title"> <view class="label-title">
...@@ -25,11 +25,16 @@ ...@@ -25,11 +25,16 @@
<view>{{ label.name }}</view> <view>{{ label.name }}</view>
<view class="label-text"> <view class="label-text">
共 共
<text class="label-blue">{{label.quantity}}</text>道精编试题，通过率 <text class="label-blue">{{ label.quantity }}</text
>道精编试题，通过率
<text class="label-blue">{{ label.pass }}</text> <text class="label-blue">{{ label.pass }}</text>
</view> </view>
</view> </view>
<u-button :customStyle="buttonStyle" @click="handleClick(index)"> <u-button
:customStyle="buttonStyle"
@click="handleClick(index)"
type="primary"
>
<u-icon name="plus"></u-icon>添加 <u-icon name="plus"></u-icon>添加
</u-button> </u-button>
</view> </view>
...@@ -38,25 +43,29 @@ ...@@ -38,25 +43,29 @@
<view class="tag-loading-view" v-if="loading"> <view class="tag-loading-view" v-if="loading">
<u-loading mode="flower"></u-loading> <u-loading mode="flower"></u-loading>
</view> </view>
<!-- 无供应商、无品牌 --> <!-- 无数据 -->
<view class="tag-loading-view" v-else-if="list.length <= 0">暂无数据</view> <view class="tag-loading-view" v-else-if="list.length <= 0"
>暂无数据</view
>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import uButton from '../../uview-ui/components/u-button/u-button.vue' const key2 = '2'
import UIcon from '../../uview-ui/components/u-icon/u-icon.vue' const key3 = '3'
export default { export default {
components: { uButton, UIcon },
data() { data() {
return { return {
category: {},
list: [], // 题库列表 list: [], // 题库列表
loading: true, loading: true,
selected: {},
} }
}, },
computed: { computed: {
category() {
return this.selected[key2]
},
buttonStyle() { buttonStyle() {
return { return {
width: '120rpx', width: '120rpx',
...@@ -69,18 +78,17 @@ export default { ...@@ -69,18 +78,17 @@ export default {
}, },
}, },
onLoad(e) { onLoad(e) {
if (e && e.name) { this.getPageInfo()
this.category.name = decodeURIComponent(e.name)
}
if (e && e.id) {
this.category.id = e.id
}
this.loadList() // 获取题库列表 this.loadList() // 获取题库列表
}, },
methods: { methods: {
// 点击了添加按钮 // 点击了添加按钮
handleClick(index) { handleClick(index) {
this.selected[key] = label this.selected[key3] = this.list[index]
this.setPageInfo(this.selected)
this.$u.route({
url: 'pages/learn/examSetting',
})
}, },
// 获取题库列表 // 获取题库列表
loadList() { loadList() {
...@@ -97,10 +105,26 @@ export default { ...@@ -97,10 +105,26 @@ export default {
name: '登高架设作业', name: '登高架设作业',
quantity: '80000', quantity: '80000',
pass: '98%', pass: '98%',
id: i,
}) })
} }
// } // }
}, },
// 本页数据设置，用于其他页面访问本页数据
setPageInfo(info) {
var pages = getCurrentPages()
if (pages.length >= 1) {
var page = pages[pages.length - 1]
page.info = info
}
},
getPageInfo() {
var pages = getCurrentPages()
if (pages.length >= 2) {
var page = pages[pages.length - 2]
this.selected = page.info
}
},
}, },
} }
</script> </script>
...@@ -165,9 +189,7 @@ export default { ...@@ -165,9 +189,7 @@ export default {
font-size: 36rpx; font-size: 36rpx;
color: #191c27; color: #191c27;
font-weight: bold; font-weight: bold;
word-break: break-all; word-break: break-all;
.label-text { .label-text {
margin-top: 24rpx; margin-top: 24rpx;
font-size: 26rpx; font-size: 26rpx;
......
src/pages/learn/examSetting.vue 0 → 100644
View file @ ca20de08
This diff is collapsed.
src/pages/learn/selectCategory.vue
View file @ ca20de08
...@@ -21,7 +21,10 @@ ...@@ -21,7 +21,10 @@
<view <view
:class="[ :class="[
'label-normal', 'label-normal',
{ 'selected': label.id == selected[key].id, 'wide': key == secondKey }, {
selected: label.id == selected[key].id,
wide: key == secondKey,
},
]" ]"
@click="handleClick(key, label)" @click="handleClick(key, label)"
> >
...@@ -34,11 +37,12 @@ ...@@ -34,11 +37,12 @@
<view class="tag-loading-view" v-if="tapLoading"> <view class="tag-loading-view" v-if="tapLoading">
<u-loading mode="flower"></u-loading> <u-loading mode="flower"></u-loading>
</view> </view>
<!-- 无供应商、无品牌 --> <!-- 无数据 -->
<view <view
class="tag-loading-view" class="tag-loading-view"
v-else-if="item.length <= 0 && titles[key]" v-else-if="item.length <= 0 && titles[key]"
>{{ "暂无" + selected[key1].name }}</view> >{{ '暂无' + selected[key1].name }}</view
>
</view> </view>
</view> </view>
</template> </template>
...@@ -88,13 +92,9 @@ export default { ...@@ -88,13 +92,9 @@ export default {
this.loadLabel(key2, label.id) // 获取二级标签 this.loadLabel(key2, label.id) // 获取二级标签
} else { } else {
// 选中二级标签 // 选中二级标签
this.setPageInfo(this.selected)
this.$u.route({ this.$u.route({
type: 'redirect',
url: 'pages/learn/addExam', url: 'pages/learn/addExam',
params: {
name: '金属冶炼(有色金属冶炼<除铜、铝、铅、锌之外的其他有色金属>',
id: '888',
},
}) })
} }
}, },
...@@ -134,6 +134,14 @@ export default { ...@@ -134,6 +134,14 @@ export default {
} }
// } // }
}, },
// 本页数据设置，用于其他页面访问本页数据
setPageInfo(info) {
var pages = getCurrentPages()
if (pages.length >= 1) {
var page = pages[pages.length - 1]
page.info = info
}
},
}, },
} }
</script> </script>
......
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