diff --git a/北京仁仁体检小程序/api/api.js b/北京仁仁体检小程序/api/api.js
index 810c645..c6701b0 100644
--- a/北京仁仁体检小程序/api/api.js
+++ b/北京仁仁体检小程序/api/api.js
@@ -1,7 +1,7 @@
let url_ = "https://bjrrtj-api.sixinyun.com";
let report_url_ = "https://bjrrtj-api.sixinyun.com";
let h5_url_ = "https://bjrrtj-api.sixinyun.com";
-const dev = 1;
+const dev = 0;
if (dev === 1) {
url_ = "http://localbeijingrenren";
report_url_ = "http://192.168.31.106:5173";
diff --git a/北京仁仁体检小程序/api/index.js b/北京仁仁体检小程序/api/index.js
index 8e19466..f90115e 100644
--- a/北京仁仁体检小程序/api/index.js
+++ b/北京仁仁体检小程序/api/index.js
@@ -3,7 +3,7 @@ import {
} from '@/lu/axios.js'
import $api from './api.js'
let url_ = "https://bjrrtj-api.sixinyun.com";
-const dev =1
+const dev =0
if (dev === 1) {
url_ = "http://localbeijingrenren"
}
diff --git a/北京仁仁体检小程序/pages.json b/北京仁仁体检小程序/pages.json
index b550d50..932198e 100644
--- a/北京仁仁体检小程序/pages.json
+++ b/北京仁仁体检小程序/pages.json
@@ -34,6 +34,14 @@
"enablePullDownRefresh": false
}
+ },{
+ "path" : "pages/test/test",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
}],
"subPackages": [{
"root": "pages/buy",
diff --git a/北京仁仁体检小程序/pages/test/test.vue b/北京仁仁体检小程序/pages/test/test.vue
new file mode 100644
index 0000000..efce0e1
--- /dev/null
+++ b/北京仁仁体检小程序/pages/test/test.vue
@@ -0,0 +1,92 @@
+
+
+ 正在加载请稍后...
+
+
+
+ 文档打开后
+ 点击右上角按钮,可下载或转发保存
+
+
+ 我知道了,打开文档
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/北京仁仁体检平台报告对比/components/report/type3.vue b/北京仁仁体检平台报告对比/components/report/type3.vue
index feb5c00..9394156 100644
--- a/北京仁仁体检平台报告对比/components/report/type3.vue
+++ b/北京仁仁体检平台报告对比/components/report/type3.vue
@@ -5,7 +5,8 @@
* date:2023年3月19日 13:38:24
*/
import {
- ref
+ ref,
+ onMounted
} from 'vue'
import {
$image,
@@ -15,7 +16,7 @@
import {
onShow
} from '@dcloudio/uni-app'
-
+import wx from 'weixin-js-sdk'
const props = defineProps({
list: {
type: Object,
@@ -28,10 +29,11 @@
}
}
});
+ const popup=ref(null)
let url = ref('')
const ReportDown = async (id) => {
uni.showLoading({
- title: '正在下载,请打开弹窗拦截'
+ title: '正在查询报告...'
})
const response = await ReportDownAction({
rid: props.list.info.id,
@@ -41,7 +43,8 @@
uni.hideLoading()
$response(response, () => {
url.value = $image(response.data.url)
- jianqieban(url.value)
+ popup.value.open()
+ //jianqieban(url.value)
})
}
const jianqieban = (url) => {
@@ -82,10 +85,51 @@
}
});
}
+ let Env = ''
+ onMounted(() => {
+ console.log(props.list)
+ if(props.list && props.list.list.length>0){
+
+ }else{
+ uni.$lu.toast("暂无报告可下载")
+ }
+ Env = uni.getSystemInfoSync().platform
+ console.log(Env)
+ })
+ const tiao = (url) => {
+ console.log(url)
+ wx.miniProgram.navigateTo({
+ url: '/pages/test/test?url=' + url
+ })
+ }
+ const preview=()=>{
+ if(Env=='ios'){
+ //window.location.href = url.value
+ tiao(url.value)
+ }
+ if(Env=='android'){
+ tiao(url.value)
+ }
+ }
-
+
+
+
+
+
+
+ 报告预览
+
+
+
+
+ 报告下载
+
+
+
+
@@ -182,4 +226,26 @@
color: #ccc;
padding-top: 60rpx;
}
+ .tan{
+ padding: 40rpx;
+ background-color: #fff;
+ border-radius: 5rpx;
+ }
+ .t_row{
+ display: flex;
+ font-size: 30rpx;
+ border: 1px solid #88ebd6;
+ border-radius: 5rpx;
+ margin: 40rpx;
+ padding: 10rpx 60rpx;
+ }
+ .t_logo{
+ color:#42b983;
+ margin-right: 20rpx;
+ }
+ .t_title{
+ font-size: 33rpx;
+ color:#333;
+ margin-top: 8rpx;
+ }
\ No newline at end of file
diff --git a/北京仁仁体检平台报告对比/package.json b/北京仁仁体检平台报告对比/package.json
index 3f9ecb1..ec45c43 100644
--- a/北京仁仁体检平台报告对比/package.json
+++ b/北京仁仁体检平台报告对比/package.json
@@ -1,5 +1,6 @@
{
"dependencies": {
- "echarts": "^5.4.2"
+ "echarts": "^5.4.2",
+ "weixin-js-sdk": "^1.6.5"
}
}
diff --git a/北京仁仁体检平台报告对比/pnpm-lock.yaml b/北京仁仁体检平台报告对比/pnpm-lock.yaml
index b364e57..590470a 100644
--- a/北京仁仁体检平台报告对比/pnpm-lock.yaml
+++ b/北京仁仁体检平台报告对比/pnpm-lock.yaml
@@ -1,12 +1,23 @@
lockfileVersion: '6.0'
+settings:
+ autoInstallPeers: true
+ excludeLinksFromLockfile: false
+
dependencies:
echarts:
specifier: ^5.4.2
version: registry.npmmirror.com/echarts@5.4.2
+ weixin-js-sdk:
+ specifier: ^1.6.5
+ version: 1.6.5
packages:
+ /weixin-js-sdk@1.6.5:
+ resolution: {integrity: sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ==}
+ dev: false
+
registry.npmmirror.com/echarts@5.4.2:
resolution: {integrity: sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npmmirror.com/echarts/-/echarts-5.4.2.tgz}
name: echarts