From 19aa7ecf73a271aa93fe248e9eb267c49b87b04e Mon Sep 17 00:00:00 2001 From: unknown <331404948@qq.com> Date: Wed, 20 Dec 2023 18:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/UserTab/UserTab - 副本.vue | 130 ------ components/UserTab/UserTab.vue | 117 ----- components/pickDateTimer/pickDateTimer.vue | 311 ------------- components/privacyRadion/privacyRadion.vue | 35 -- config/api.js | 2 + config/site.config.js | 2 +- main.js | 3 +- manifest.json | 2 +- pages.json | 19 +- pages/indexEntry/enroll/enroll.vue | 6 + pages/indexEntry/enroll/realName/realName.vue | 7 +- pages/indexEntry/enroll/realName/webView.vue | 1 - pages/indexEntry/examines/comp/examineItem.vue | 2 - pages/indexEntry/examines/comp/marquee.vue | 101 ----- pages/mineEntry/myContract/myContract.vue | 7 +- pages/mineEntry/myOrder/detail/detail.vue | 6 +- pages/mineEntry/myOrder/voucher/voucher.vue | 35 ++ pages/tabbar/mine/index.vue | 1 - pages/userCenter/login/comp/privacyRadion.vue | 35 ++ pages/userCenter/login/face.vue | 492 --------------------- pages/userCenter/login/login.vue | 2 +- pages/userCenter/login/loginByPhone.vue | 2 +- static/logo.png | Bin 4023 -> 0 bytes uni_modules/mumu-previewOffce/changelog.md | 9 - .../mumu-previewOffce/mumu-previewOffce.vue | 208 --------- uni_modules/mumu-previewOffce/package.json | 85 ---- uni_modules/mumu-previewOffce/readme.md | 85 ---- 27 files changed, 99 insertions(+), 1606 deletions(-) delete mode 100644 components/UserTab/UserTab - 副本.vue delete mode 100644 components/UserTab/UserTab.vue delete mode 100644 components/pickDateTimer/pickDateTimer.vue delete mode 100644 components/privacyRadion/privacyRadion.vue delete mode 100644 pages/indexEntry/examines/comp/marquee.vue create mode 100644 pages/mineEntry/myOrder/voucher/voucher.vue create mode 100644 pages/userCenter/login/comp/privacyRadion.vue delete mode 100644 pages/userCenter/login/face.vue delete mode 100644 static/logo.png delete mode 100644 uni_modules/mumu-previewOffce/changelog.md delete mode 100644 uni_modules/mumu-previewOffce/components/mumu-previewOffce/mumu-previewOffce.vue delete mode 100644 uni_modules/mumu-previewOffce/package.json delete mode 100644 uni_modules/mumu-previewOffce/readme.md diff --git a/components/UserTab/UserTab - 副本.vue b/components/UserTab/UserTab - 副本.vue deleted file mode 100644 index d5f7ebd..0000000 --- a/components/UserTab/UserTab - 副本.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/UserTab/UserTab.vue b/components/UserTab/UserTab.vue deleted file mode 100644 index 5de086a..0000000 --- a/components/UserTab/UserTab.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/pickDateTimer/pickDateTimer.vue b/components/pickDateTimer/pickDateTimer.vue deleted file mode 100644 index 36f9afe..0000000 --- a/components/pickDateTimer/pickDateTimer.vue +++ /dev/null @@ -1,311 +0,0 @@ - - - - - \ No newline at end of file diff --git a/components/privacyRadion/privacyRadion.vue b/components/privacyRadion/privacyRadion.vue deleted file mode 100644 index dd065f0..0000000 --- a/components/privacyRadion/privacyRadion.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - \ No newline at end of file diff --git a/config/api.js b/config/api.js index c20029d..a0a2187 100644 --- a/config/api.js +++ b/config/api.js @@ -154,6 +154,8 @@ export const getbiztoken = (params) => http.get('app/student-record/getbiztoken' export const getdictDataList = (params) => http.get('app/refund/getdictDataList', {params}) // 轮询是否已报名 export const getApplyStep = (params) => http.get('app/student-record/getApplyStep', {params}) +// 查询缴费凭证 +export const getStudentVoucher = (params) => http.get('app/apply-order/getStudentVoucher.do', {params}) diff --git a/config/site.config.js b/config/site.config.js index 5138528..84173db 100644 --- a/config/site.config.js +++ b/config/site.config.js @@ -3,7 +3,7 @@ const VUE_APP_PLATFORM = process.env.VUE_APP_PLATFORM; module.exports = { H5_API: VUE_APP_PLATFORM === 'h5' ? '/api' : '',//h5代理 WX_API: VUE_APP_PLATFORM === 'h5' ? '' : 'http://192.168.1.36:48080/',//非代理地址 - website: 'http://192.168.1.44:90/h5/#', + website: 'http://192.168.1.37:90/h5/#', httpPrefix: 'app-api/', imgUrl: 'https://jiangxijiakao-1.oss-cn-hangzhou.aliyuncs.com/defaultImages/app/bigImg/' }; diff --git a/main.js b/main.js index 0319b9f..49fac85 100644 --- a/main.js +++ b/main.js @@ -16,8 +16,7 @@ App.mpType = 'app' import uView from '@/uni_modules/uview-ui' Vue.use(uView) -import tabBar from "components/UserTab/UserTab.vue" -Vue.component('tabBar',tabBar) + const app = new Vue({ ...App, diff --git a/manifest.json b/manifest.json index b9180ea..90262d0 100644 --- a/manifest.json +++ b/manifest.json @@ -62,7 +62,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx2d71605af3b620e6", + "appid" : "wx57963042440048d6", "setting" : { "urlCheck" : true, "es6" : true, diff --git a/pages.json b/pages.json index fe05c43..a1061da 100644 --- a/pages.json +++ b/pages.json @@ -443,6 +443,15 @@ } }, { + "path": "myOrder/voucher/voucher", + "style": { + "navigationBarTitleText": "我的订单", + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "backgroundTextStyle": "dark" + } + }, + { "path": "carLearProgress/carLearProgress", "style": { "navigationBarTitleText": "学车进度", @@ -541,16 +550,6 @@ } }, { - "path": "login/face", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom", - "enablePullDownRefresh": false, - "backgroundTextStyle": "dark" - } - }, - - { "path": "login/loginByPhone", "style": { "navigationBarTitleText": "手机号登录", diff --git a/pages/indexEntry/enroll/enroll.vue b/pages/indexEntry/enroll/enroll.vue index 538d4d3..2acc5b4 100644 --- a/pages/indexEntry/enroll/enroll.vue +++ b/pages/indexEntry/enroll/enroll.vue @@ -142,14 +142,20 @@ let obj = JSON.parse(res) this.link = obj.Url this.$store.commit('updateBizToken', obj.BizToken) + console.log('来这里了吗？') // #ifdef H5 + console.log('来这里了吗2？') window.open(this.link, '_blank') + // #endif // var regex = /\[.*?\]/; // alert(obj.BizToken) // this.GetDetectInfoEnhancedFn(obj.BizToken) // #ifdef MP-WEIXIN + console.log('来这里了吗3？') + console.log(website+'website地址') this.$store.commit('updateWebVeiwUrl', this.link) + uni.navigateTo({ url: '/pages/indexEntry/enroll/realName/webView' }) diff --git a/pages/indexEntry/enroll/realName/realName.vue b/pages/indexEntry/enroll/realName/realName.vue index fcf116c..07da0f8 100644 --- a/pages/indexEntry/enroll/realName/realName.vue +++ b/pages/indexEntry/enroll/realName/realName.vue @@ -14,15 +14,12 @@ } }, onLoad(options) { - alert(options.userId) - alert(options.test) + const routeInfo = this.$route; console.log('当前页面路由信息：', routeInfo); const fullPath = '/' + routeInfo.path + '?' + Object.keys(routeInfo.query).map(key => key + '=' + routeInfo.query[key]).join('&'); console.log('当前页面全路径：', fullPath); - alert(fullPath) - alert(routeInfo.query.userId) - alert(routeInfo.query.test) + if(options.userId) { this.userId = options.userId this.GetDetectInfoEnhancedFn() diff --git a/pages/indexEntry/enroll/realName/webView.vue b/pages/indexEntry/enroll/realName/webView.vue index 7f5e7f3..95a6087 100644 --- a/pages/indexEntry/enroll/realName/webView.vue +++ b/pages/indexEntry/enroll/realName/webView.vue @@ -26,7 +26,6 @@ }, onLoad() { this.link = this.$store.state.webViewUrl - console.log('噜噜哇'+ this.$store.state.webViewUrl) // http://192.168.1.44:92/question/?uniItem=%7B%22phone%22%3A%2218267103167%22%2C%22cityCode%22%3A%223311%22%2C%22isUni%22%3A1%7D // uni.hideNavigationBarLoading() }, diff --git a/pages/indexEntry/examines/comp/examineItem.vue b/pages/indexEntry/examines/comp/examineItem.vue index 534b6fd..08bff87 100644 --- a/pages/indexEntry/examines/comp/examineItem.vue +++ b/pages/indexEntry/examines/comp/examineItem.vue @@ -33,10 +33,8 @@ - \ No newline at end of file diff --git a/pages/mineEntry/myContract/myContract.vue b/pages/mineEntry/myContract/myContract.vue index 096c2cf..fd59f55 100644 --- a/pages/mineEntry/myContract/myContract.vue +++ b/pages/mineEntry/myContract/myContract.vue @@ -4,8 +4,6 @@ - - 暂无合同 @@ -14,11 +12,8 @@ + + \ No newline at end of file diff --git a/pages/tabbar/mine/index.vue b/pages/tabbar/mine/index.vue index 54973ff..fd62062 100644 --- a/pages/tabbar/mine/index.vue +++ b/pages/tabbar/mine/index.vue @@ -60,7 +60,6 @@ - diff --git a/pages/userCenter/login/comp/privacyRadion.vue b/pages/userCenter/login/comp/privacyRadion.vue new file mode 100644 index 0000000..76a57e7 --- /dev/null +++ b/pages/userCenter/login/comp/privacyRadion.vue @@ -0,0 +1,35 @@ + + + + + \ No newline at end of file diff --git a/pages/userCenter/login/face.vue b/pages/userCenter/login/face.vue deleted file mode 100644 index 7e68270..0000000 --- a/pages/userCenter/login/face.vue +++ /dev/null @@ -1,492 +0,0 @@ - - - diff --git a/pages/userCenter/login/login.vue b/pages/userCenter/login/login.vue index 5932c02..61a0e62 100644 --- a/pages/userCenter/login/login.vue +++ b/pages/userCenter/login/login.vue @@ -28,7 +28,7 @@ - diff --git a/uni_modules/mumu-previewOffce/package.json b/uni_modules/mumu-previewOffce/package.json deleted file mode 100644 index d1ac8e5..0000000 --- a/uni_modules/mumu-previewOffce/package.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "id": "mumu-previewOffce", - "displayName": "预览offce文件。可以打开 PDF WORD PPT EXCEL 文件", - "version": "1.0.3", - "description": "在程序中直接打开 offce 文件进行预览。可以打开 PDF WORD PPT EXCEL 文件", - "keywords": [ - "PDF", - "WORD", - "PPT", - "EXCEL", - "offce" -], - "repository": "", - "engines": { - "HBuilderX": "^3.1.0" - }, -"dcloudext": { - "sale": { - "regular": { - "price": "0.00" - }, - "sourcecode": { - "price": "0.00" - } - }, - "contact": { - "qq": "" - }, - "declaration": { - "ads": "无", - "data": "无", - "permissions": "无" - }, - "npmurl": "", - "type": "component-vue" - }, - "uni_modules": { - "dependencies": [], - "encrypt": [], - "platforms": { - "cloud": { - "tcb": "y", - "aliyun": "y" - }, - "client": { - "Vue": { - "vue2": "y", - "vue3": "y" - }, - "App": { - "app-vue": "y", - "app-nvue": "n" - }, - "H5-mobile": { - "Safari": "y", - "Android Browser": "y", - "微信浏览器(Android)": "y", - "QQ浏览器(Android)": "y" - }, - "H5-pc": { - "Chrome": "y", - "IE": "n", - "Edge": "y", - "Firefox": "y", - "Safari": "y" - }, - "小程序": { - "微信": "y", - "阿里": "y", - "百度": "y", - "字节跳动": "y", - "QQ": "y", - "钉钉": "y", - "快手": "u", - "飞书": "y", - "京东": "y" - }, - "快应用": { - "华为": "u", - "联盟": "u" - } - } - } - } -} \ No newline at end of file diff --git a/uni_modules/mumu-previewOffce/readme.md b/uni_modules/mumu-previewOffce/readme.md deleted file mode 100644 index f823fcd..0000000 --- a/uni_modules/mumu-previewOffce/readme.md +++ /dev/null @@ -1,85 +0,0 @@ -# 插件介绍 - -** 预览的文件地址必须是可以通过互联网访问的！！！ ** - -** 预览的文件地址必须是可以直接复制在浏览器地址中访问的！！！ ** - -## 本插件将于2023/11/30停止提供服务 - -文档预览工具新版本已上线 - -对比当前版本支持了手机端双手缩放操作，office文件不在依赖微软的解析接口，支持服务端完全私有化部署(内网部署)，UI界面有单独的电脑端、ios端、安卓端。 - -新版地址：[h5office。预览office文件，预览文档，打开PDF WORD PPT EXCEL 文件 - DCloud 插件市场](https://ext.dcloud.net.cn/plugin?id=10895) - -## 插件原理 - -> pdf 文件预览是通过 `pdf.js` 开源库，搭建了一个pdf预览的网站。前端只需要使用 iframe 加载这个网站即可。[pdf.js 官网](http://mozilla.github.io/pdf.js/api/draft/index.html) -> -> offce 文件的预览是通过微软offce在线接口进行解析的。offce在线地址：https://view.officeapps.live.com/op/embed.aspx?src=‘你的文件网络地址’ -> -> 在微信小程序中，是通过小程序中的API进行预览的。[小程序文档](https://developers.weixin.qq.com/miniprogram/dev/api/file/wx.openDocument.html) - -## 使用环境 - -** 不支持nvue 。小程序中使用官方提供的api。h5与其他环境是通过上面介绍的插件原理加载。** - -## 插件使用 - -**插件已支持 uni_modules 支持组件easycom，以下代码演示的是普通使用** - -``` html - - - - -``` - -``` js - import MumuPreviewOffce from '@/uni_modules/mumu-previewOffce/components/mumu-previewOffce/mumu-previewOffce.vue' - export default { - components: { - MumuPreviewOffce - }, - data() { - return { - showPreview: false, - fileUrl: 'https://h5plugin.mumudev.top/public/previewOffce/333.docx' - } - }, - methods: { - - }, - } -``` - -## 相关 API - -### 可传属性（Props） - -| 参数 | 说明 | 类型 | 默认值 | 可选 | -| ------- | ------------------------ | ------- | ------ | ------------ | -| v-model | 双向绑定，显示或隐藏组件 | Boolean | false | false / true | -| fileUrl | 预览文件的网络地址 | String | - | - | - - - -## 打开本地预览 - -本地预览功能还在开发中... - -开发思路是： - -> 选择打开本地文件，上传到服务器。获取到服务器中的文件地址，传递给当前组件展示。 - -没有办法直接在本地打开，所有采取这种方案。有条件的同学可以自己开发。我也会尽快把这个功能做出来。 - - - -## 案例演示 - -![](https://h5plugin.mumudev.top/public/previewOffce/qrcode.png) - -## 支持作者 - -![支持作者](https://student.mumudev.top/wxMP.jpg) \ No newline at end of file