diff --git a/config.js b/config.js
index 8fcce58..cf9a58b 100644
--- a/config.js
+++ b/config.js
@@ -1,83 +1,33 @@
// 产线
-// module.exports = {
-// // http://192.168.0.14:19999
-// loginBaseUrl: 'http://112.29.103.165:1616',
-// baseUrl: 'http://112.29.103.165:1616/exam',
-// // login: 'http://112.29.103.165:1616',
-// login: 'http://112.29.103.165:1616/exam/exam-auth/',
-// // 图片展示基础地址
-// fileUrl: 'http://112.29.103.165:1616/exam-file/',
-// // 上传文件地址
-// uploadUrl: 'http://112.29.103.165:1616/exam-file/file/uploadBase64',
-// bmwUrl: 'http://112.29.103.165:1616/exam-bmw',
-// // 体检-基础路径
-// tjBaseUrl: 'http://112.29.103.165:1616/AppPeaManager',
-// tjFile: 'http://112.29.103.165:1616/medicalDocumentation/statics/',
-
-// //实名制移动端-登录接口
-// realLoginUrl: 'http://192.168.0.14:9200/',
-// //实名制移动端-移动
-// realAppUrl: 'http://192.168.0.14:1913/app',
-// //实名制移动端-安培
-// realExamUrl: 'http://192.168.0.14:1910',
-// //实名制移动端-文件
-// realFileUrl: 'http://192.168.0.14:1909/file/',
-// //实名制移动端
-// realBmwUrl: 'http://192.168.0.14:1911/bmw',
-// //实名制移动端 -- 新
-// realNewBmwUrl: 'http://192.168.0.14:1911',
-// //实名制移动端 -- 新
-// realNewYnUrl: 'http://192.168.0.14:1918',
-
-// // 应用信息
-// appInfo: {
-// // 应用名称
-// name: '作业管控智慧平台',
-// // 应用版本
-// version: '1.1.0'
-// }
-// }
-// 测试环境
module.exports = {
- // baseUrl:'/prod-api',
// http://192.168.0.14:19999
loginBaseUrl: 'http://112.29.103.165:1616',
- // loginBaseUrl: 'http://192.168.0.14:27018',
- // loginBaseUrl:'http://192.168.0.14:19999',
- // baseUrl:'http://192.168.0.14:2900',
- baseUrl: 'http://192.168.0.14:19999',
- // loginUrl: 'http://112.29.103.165:1616',
- login: 'http://192.168.0.14:19200',
+ baseUrl: 'http://112.29.103.165:1616/exam',
+ // login: 'http://112.29.103.165:1616',
+ login: 'http://112.29.103.165:1616/exam/exam-auth/',
// 图片展示基础地址
- fileUrl: 'http://192.168.0.14:19999/exam-file/',
+ fileUrl: 'http://112.29.103.165:1616/exam-file/',
// 上传文件地址
- uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64',
- bmwUrl: 'http://192.168.0.14:19999/exam-bmw',
+ uploadUrl: 'http://112.29.103.165:1616/exam-file/file/uploadBase64',
+ bmwUrl: 'http://112.29.103.165:1616/exam-bmw',
// 体检-基础路径
- tjBaseUrl: 'http://192.168.0.14:18077/AppPeaManager',
- // tjBaseUrl: 'http://192.168.2.91:19100/AppPeaManager',
- tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/',
+ tjBaseUrl: 'http://112.29.103.165:1616/AppPeaManager',
+ tjFile: 'http://112.29.103.165:1616/medicalDocumentation/statics/',
//实名制移动端-登录接口
- realLoginUrl: 'http://192.168.0.14:1616/auth/',
- realBaseUrl: 'http://192.168.0.14:1910/',
+ realLoginUrl: 'http://192.168.0.14:9200/',
//实名制移动端-移动
realAppUrl: 'http://192.168.0.14:1913/app',
//实名制移动端-安培
- realExamUrl: 'http://192.168.0.14:1616/system',
+ realExamUrl: 'http://192.168.0.14:1910',
//实名制移动端-文件
realFileUrl: 'http://192.168.0.14:1909/file/',
//实名制移动端
- realBmwUrl: 'http://192.168.0.14:1616/bmw',
+ realBmwUrl: 'http://192.168.0.14:1911/bmw',
//实名制移动端 -- 新
- realNewBmwUrl: 'http://192.168.0.14:1616',
- loginUrl: 'http://192.168.0.14:27018',
+ realNewBmwUrl: 'http://192.168.0.14:1911',
//实名制移动端 -- 新
realNewYnUrl: 'http://192.168.0.14:1918',
- realIdCardUrl: 'http://192.168.0.14:26699',
-
- //作业计划 -- 新
- workPlanNewYnUrl: 'http://192.168.0.14:19191',
// 应用信息
appInfo: {
@@ -87,3 +37,53 @@ module.exports = {
version: '1.1.0'
}
}
+// 测试环境
+// module.exports = {
+// // baseUrl:'/prod-api',
+// // http://192.168.0.14:19999
+// loginBaseUrl: 'http://112.29.103.165:1616',
+// // loginBaseUrl: 'http://192.168.0.14:27018',
+// // loginBaseUrl:'http://192.168.0.14:19999',
+// // baseUrl:'http://192.168.0.14:2900',
+// baseUrl: 'http://192.168.0.14:19999',
+// // loginUrl: 'http://112.29.103.165:1616',
+// login: 'http://192.168.0.14:19200',
+// // 图片展示基础地址
+// fileUrl: 'http://192.168.0.14:19999/exam-file/',
+// // 上传文件地址
+// uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64',
+// bmwUrl: 'http://192.168.0.14:19999/exam-bmw',
+// // 体检-基础路径
+// tjBaseUrl: 'http://192.168.0.14:18077/AppPeaManager',
+// // tjBaseUrl: 'http://192.168.2.91:19100/AppPeaManager',
+// tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/',
+
+// //实名制移动端-登录接口
+// realLoginUrl: 'http://192.168.0.14:1616/auth/',
+// realBaseUrl: 'http://192.168.0.14:1910/',
+// //实名制移动端-移动
+// realAppUrl: 'http://192.168.0.14:1913/app',
+// //实名制移动端-安培
+// realExamUrl: 'http://192.168.0.14:1616/system',
+// //实名制移动端-文件
+// realFileUrl: 'http://192.168.0.14:1909/file/',
+// //实名制移动端
+// realBmwUrl: 'http://192.168.0.14:1616/bmw',
+// //实名制移动端 -- 新
+// realNewBmwUrl: 'http://192.168.0.14:1616',
+// loginUrl: 'http://192.168.0.14:27018',
+// //实名制移动端 -- 新
+// realNewYnUrl: 'http://192.168.0.14:1918',
+// realIdCardUrl: 'http://192.168.0.14:26699',
+
+// //作业计划 -- 新
+// workPlanNewYnUrl: 'http://192.168.0.14:19191',
+
+// // 应用信息
+// appInfo: {
+// // 应用名称
+// name: '作业管控智慧平台',
+// // 应用版本
+// version: '1.1.0'
+// }
+// }
diff --git a/pages/YNEduApp/index/index.vue b/pages/YNEduApp/index/index.vue
index ae69baa..181846b 100644
--- a/pages/YNEduApp/index/index.vue
+++ b/pages/YNEduApp/index/index.vue
@@ -12,7 +12,7 @@
-
+
{{ part.name }}
@@ -50,7 +50,7 @@
-
+
可联系管理员发布
diff --git a/pages/YNEduApp/learn/learn.vue b/pages/YNEduApp/learn/learn.vue
index 0bdca14..8fd1234 100644
--- a/pages/YNEduApp/learn/learn.vue
+++ b/pages/YNEduApp/learn/learn.vue
@@ -5,11 +5,11 @@
id="myVideo"
:src="path"
:initial-time="studyDuration"
- :show-progress="false"
+ :show-progress="true"
:enable-progress-gesture="false"
@error="videoErrorCallback"
@timeupdate="videoTimeUpdate"
- :controls="false"
+ :controls="true"
:autoplay="true"
/>
diff --git a/pages/YNEduApp/learnProj/learnProj.vue b/pages/YNEduApp/learnProj/learnProj.vue
index 46f566c..5f35557 100644
--- a/pages/YNEduApp/learnProj/learnProj.vue
+++ b/pages/YNEduApp/learnProj/learnProj.vue
@@ -46,11 +46,11 @@
-
-
- 暂无内容
-
+
+
+ 暂无内容
+
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index 6f15be9..1d494df 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -25,7 +25,7 @@
我的应用
-
+
@@ -440,6 +440,9 @@ export default {
if (response.code == 200) {
console.log('我的应用-----------', response)
this.myApp = response.data
+ if (this.myApp.length == 1 && this.myApp[0].appName == '考试培训移动端') {
+ this.gotoYy('考试培训移动端')
+ }
} else {
uni.$u.toast('获取我的应用失败')
}
diff --git a/totalTabbar.js b/totalTabbar.js
index 411ae27..d27d50b 100644
--- a/totalTabbar.js
+++ b/totalTabbar.js
@@ -15,11 +15,11 @@ export default {
selectedIconPath: "static/images/dh2s.png",
text: "工作台",
//新版本新增，页面被打开方式，默认为reLaunch
- }, {
- pagePath: "pages/txl/index",
- iconPath: "static/images/dh3.png",
- selectedIconPath: "static/images/dh3s.png",
- text: "通讯录",
+ // }, {
+ // pagePath: "pages/txl/index",
+ // iconPath: "static/images/dh3.png",
+ // selectedIconPath: "static/images/dh3s.png",
+ // text: "通讯录",
//新版本新增，页面被打开方式，默认为reLaunch
}, {
pagePath: "pages/mine/index",