From d1ea031c889d11363bdca1d870fa28f715b209a4 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 2 Jul 2021 17:05:52 +0800 Subject: [PATCH] =?UTF-8?q?video=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client_mp/common/http.api.js | 11 +- client_mp/common/http.interceptor.js | 7 +- client_mp/pages.json | 31 ++- client_mp/pages/vod/index.vue | 74 +++++ client_mp/pages/vod/video.vue | 257 ++++++++++++++++++ client_mp/store/index.js | 4 +- .../uni_modules/uni-search-bar/changelog.md | 18 ++ .../uni-search-bar/uni-search-bar.vue | 254 +++++++++++++++++ .../uni_modules/uni-search-bar/package.json | 84 ++++++ .../uni_modules/uni-search-bar/readme.md | 86 ++++++ 10 files changed, 810 insertions(+), 16 deletions(-) create mode 100644 client_mp/pages/vod/index.vue create mode 100644 client_mp/pages/vod/video.vue create mode 100644 client_mp/uni_modules/uni-search-bar/changelog.md create mode 100644 client_mp/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue create mode 100644 client_mp/uni_modules/uni-search-bar/package.json create mode 100644 client_mp/uni_modules/uni-search-bar/readme.md diff --git a/client_mp/common/http.api.js b/client_mp/common/http.api.js index 704aa5c..70a6e89 100644 --- a/client_mp/common/http.api.js +++ b/client_mp/common/http.api.js @@ -35,17 +35,14 @@ const install = (Vue, vm) => { //获取子任务单位的详细信息 let getSubtaskDept = (id, params)=> vm.$u.get(`/quality/inspectdept/${id}/`, params); let getInspectRecords = (params)=> vm.$u.get('/quality/inspectrecord/', params); - let getInspectRecord = (id, params)=> vm.$u.get(`/quality/inspectrecord/${id}/`, params); - let checkInspectRecord = (id, params)=> vm.$u.put(`/quality/inspectrecord/${id}/check/`, params); - let startInspectDept = (id, params)=>vm.$u.put(`/quality/inspectdept/${id}/start/`, params);//开始检查 - let upInspectDept = (id, params)=>vm.$u.put(`/quality/inspectdept/${id}/up/`, params);//提交记录 - let appointChecker = (params) => vm.$u.post('/quality/inspectrecord/appoint/', params);//检查指派 let getDocument = (params={})=>vm.$u.get('/quality/document/', params);//文档 + let getVideos = (params={})=>vm.$u.get('/vod/video/', params);//点播视频 + let getDickey = (params={})=>vm.$u.get('/system/dict/', params);//查询字典 vm.$u.api = {getUserInfo, getCode, codeLogin, @@ -63,7 +60,9 @@ const install = (Vue, vm) => { upInspectDept, appointChecker, startInspectDept, - getDocument + getDocument, + getVideos, + getDickey }; } diff --git a/client_mp/common/http.interceptor.js b/client_mp/common/http.interceptor.js index 4b39a9b..95616b2 100644 --- a/client_mp/common/http.interceptor.js +++ b/client_mp/common/http.interceptor.js @@ -13,7 +13,7 @@ const install = (Vue, vm) => { // } showLoading: true, loadingText: '请求中..', - originalData: true, + originalData: false, loadingTime: 800, loadingMask: true }); @@ -39,7 +39,7 @@ const install = (Vue, vm) => { Vue.prototype.$u.http.interceptor.response = (response) => { // 如果把originalData设置为了true,这里得到将会是服务器返回的所有的原始数据 // 判断可能变成了res.statueCode,或者res.data.code之类的,请打印查看结果 - const res = response.data + const res = response if( res.code >= 200 && res.code < 300 ) { // 如果把originalData设置为了true,这里return回什么,this.$u.post的then回调中就会得到什么 return res; @@ -54,6 +54,9 @@ const install = (Vue, vm) => { }) return false; } + else if(res.code == 404){ + return false + } else{ uni.showToast({ title: res.msg, diff --git a/client_mp/pages.json b/client_mp/pages.json index 86f7cf1..018b8eb 100644 --- a/client_mp/pages.json +++ b/client_mp/pages.json @@ -110,6 +110,25 @@ } } + ,{ + "path" : "pages/vod/index", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": true, + "onReachBottomDistance":100 + } + + } + ,{ + "path" : "pages/vod/video", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + + } ], "globalStyle": { "navigationBarTextStyle": "white", @@ -128,12 +147,12 @@ "selectedIconPath": "static/common/homec.png", "text": "主页" }, - // { - // "pagePath": "pages/uview/uview", - // "iconPath": "static/uview/example/js.png", - // "selectedIconPath": "static/uview/example/js_select.png", - // "text": "uview" - // }, + { + "pagePath": "pages/vod/video", + "iconPath": "static/common/play.png", + "selectedIconPath": "static/common/playc.png", + "text": "点播" + }, { "pagePath": "pages/my/my", "iconPath": "static/common/me.png", diff --git a/client_mp/pages/vod/index.vue b/client_mp/pages/vod/index.vue new file mode 100644 index 0000000..9bd03d7 --- /dev/null +++ b/client_mp/pages/vod/index.vue @@ -0,0 +1,74 @@ + + + + + diff --git a/client_mp/pages/vod/video.vue b/client_mp/pages/vod/video.vue new file mode 100644 index 0000000..9151666 --- /dev/null +++ b/client_mp/pages/vod/video.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/client_mp/store/index.js b/client_mp/store/index.js index 5860176..700e8f9 100644 --- a/client_mp/store/index.js +++ b/client_mp/store/index.js @@ -34,11 +34,11 @@ const store = new Vuex.Store({ vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {}, vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '', // vuex_host: 'http://127.0.0.1:8000', - // vuex_api: 'http://127.0.0.1:8000/api', + vuex_api: 'http://47.95.0.242:9101/api', // vuex_apifile: 'http://127.0.0.1:8000/api/file/', vuex_host: 'https://testsearch.ctc.ac.cn', - vuex_api: 'https://testsearch.ctc.ac.cn/api', + // vuex_api: 'https://testsearch.ctc.ac.cn/api', vuex_apifile: 'https://testsearch.ctc.ac.cn/api/file/', // 如果vuex_version无需保存到本地永久存储,无需lifeData.vuex_version方式 diff --git a/client_mp/uni_modules/uni-search-bar/changelog.md b/client_mp/uni_modules/uni-search-bar/changelog.md new file mode 100644 index 0000000..1ab3128 --- /dev/null +++ b/client_mp/uni_modules/uni-search-bar/changelog.md @@ -0,0 +1,18 @@ +## 1.0.9(2021-05-12) +- 新增 项目示例地址 +## 1.0.8(2021-04-21) +- 优化 添加依赖 uni-icons, 导入后自动下载依赖 +## 1.0.7(2021-04-15) +- uni-ui 新增 uni-search-bar 的 focus 事件 + +## 1.0.6(2021-02-05) +- 优化 组件引用关系,通过uni_modules引用组件 + +## 1.0.5(2021-02-05) +- 调整为uni_modules目录规范 +- 新增 支持双向绑定 +- 更改 input 事件的返回值,e={value:Number} --> e=value +- 新增 支持图标插槽 +- 新增 支持 clear、blur 事件 +- 新增 支持 focus 属性 +- 去掉组件背景色 diff --git a/client_mp/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue b/client_mp/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue new file mode 100644 index 0000000..a0b0e53 --- /dev/null +++ b/client_mp/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/client_mp/uni_modules/uni-search-bar/package.json b/client_mp/uni_modules/uni-search-bar/package.json new file mode 100644 index 0000000..98f64a2 --- /dev/null +++ b/client_mp/uni_modules/uni-search-bar/package.json @@ -0,0 +1,84 @@ +{ + "id": "uni-search-bar", + "displayName": "uni-search-bar 搜索栏", + "version": "1.0.9", + "description": "搜索栏组件,通常用于搜索商品、文章等", + "keywords": [ + "uni-ui", + "uniui", + "搜索框", + "搜索栏" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [ + "uni-icons" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + } + } + } + } +} \ No newline at end of file diff --git a/client_mp/uni_modules/uni-search-bar/readme.md b/client_mp/uni_modules/uni-search-bar/readme.md new file mode 100644 index 0000000..b39d6cf --- /dev/null +++ b/client_mp/uni_modules/uni-search-bar/readme.md @@ -0,0 +1,86 @@ + + +## SearchBar 搜索栏 + +> **组件名:uni-search-bar** +> 代码块: `uSearchBar` + + +评分组件 + +### 安装方式 + +本组件符合[easycom](https://uniapp.dcloud.io/collocation/pages?id=easycom)规范,`HBuilderX 2.5.5`起,只需将本组件导入项目,在页面`template`中即可直接使用,无需在页面中`import`和注册`components`。 + +如需通过`npm`方式使用`uni-ui`组件,另见文档:[https://ext.dcloud.net.cn/plugin?id=55](https://ext.dcloud.net.cn/plugin?id=55) + +### 基本用法 + +在 ``template`` 中使用组件 + +```html + + + + + + + + + + + +``` + + +## API +### SearchBar Props + +|属性名 |类型 |默认值 |说明 | +|:-: |:-: |:-: |:-: | +|value/v-model |StringNumber | |搜索栏绑定值 | +|placeholder |String |搜索 |搜索栏Placeholder | +|radius |Number |10 |搜索栏圆角,单位px | +|clearButton |String |auto |是否显示清除按钮,可选值`always`-一直显示、`auto`-输入框不为空时显示、`none`-一直不显示 | +|cancelButton |String |auto |是否显示取消按钮,可选值`always`-一直显示、`auto`-输入框不为空时显示、`none`-一直不显示 | +|cancelText |String |取消 |取消按钮的文字 | +|bgColor |String |#F8F8F8|输入框背景颜色 | +|maxlength |Number |100 |输入最大长度 | +|focus |Boolean |false | | + + +### SearchBar Events + +|事件称名 |说明 |返回参数 | +|:-: |:-: |:-: | +|@confirm |uniSearchBar 的输入框 confirm 事件,返回参数为uniSearchBar的value |e={value:Number} | +|@input |uniSearchBar 的 value 改变时触发事件,返回参数为uniSearchBar的value|e=value | +|@cancel |点击取消按钮时触发事件,返回参数为uniSearchBar的value |e={value:Number} | +|@clear |点击清除按钮时触发事件,返回参数为uniSearchBar的value |e={value:Number} | +|@focus |input 获取焦点时触发事件,返回参数为uniSearchBar的value |e={value:Number} | +|@blur |input 失去焦点时触发事件,返回参数为uniSearchBar的value |e={value:Number} | + +### 替换 icon 的 slot 插槽 + +|插槽称名 |说明 | +|:-: |:-: | +|searchIcon |替换组件的搜索图标| +|clearIcon |替换组件的清除图标| + +```html + + + + + + + + X + + +``` + + +## 组件示例 + +点击查看:[https://hellouniapp.dcloud.net.cn/pages/extUI/search-bar/search-bar](https://hellouniapp.dcloud.net.cn/pages/extUI/search-bar/search-bar) \ No newline at end of file