Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
c11064f87b | |||
db46299b8c | |||
c30fba1ec2 | |||
d35fab34e3 | |||
cad3bd0c69 | |||
90b72393be | |||
5d6abb0219 | |||
81758accdc | |||
e520f33d7c | |||
b40bc7deba | |||
e763f707cc | |||
0b62426169 | |||
0a8512f9e2 |
@ -20,6 +20,7 @@ const API = {
|
|||||||
getTodoist:(data,userId) => net.GET("/user/todo",data,true,{"userId":userId}),// 获取待办事项
|
getTodoist:(data,userId) => net.GET("/user/todo",data,true,{"userId":userId}),// 获取待办事项
|
||||||
getVisionList:data => net.GET("/vision/list",data),// 获取测试记录
|
getVisionList:data => net.GET("/vision/list",data),// 获取测试记录
|
||||||
todoFinished:data => net.PUT("/user/todo",data),// 修改待办列表状态
|
todoFinished:data => net.PUT("/user/todo",data),// 修改待办列表状态
|
||||||
|
todayTodoList:data => net.GET("/user/todo/today",data),// 今天待办列表
|
||||||
// 百科
|
// 百科
|
||||||
getArticleList:data => net.GET("/article/list",data),// 百科列表
|
getArticleList:data => net.GET("/article/list",data),// 百科列表
|
||||||
getArticleDetail:(data,userId) => net.GET("/article/"+data.id,null,true,{"userId":userId}),// 文章详情
|
getArticleDetail:(data,userId) => net.GET("/article/"+data.id,null,true,{"userId":userId}),// 文章详情
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
import config from '../config'
|
import config from '../config'
|
||||||
|
import { useStore} from '@/store/index.js'
|
||||||
|
|
||||||
// import {useStore} from '@/store/index.js'
|
|
||||||
// console.log(useStore)
|
|
||||||
// const store = useStore()
|
|
||||||
const loginUrl = 'pages/user/login';
|
const loginUrl = 'pages/user/login';
|
||||||
// function JSON_to_URLEncoded(element,key,list){
|
// function JSON_to_URLEncoded(element,key,list){
|
||||||
// var list = list || [];
|
// var list = list || [];
|
||||||
@ -76,20 +74,20 @@ export default {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// if(res.data.code === 7) { // 登录失败
|
if(res.data.code === 7) { // 登录失败
|
||||||
// uni.showToast({
|
const store = useStore()
|
||||||
// title:res.msg,
|
store.afterFailLogin(2000)
|
||||||
// icon:"error",
|
uni.showToast({
|
||||||
// duration:2000,
|
title:res.msg,
|
||||||
// mask:true,
|
icon:"error",
|
||||||
// success() {
|
duration:2000,
|
||||||
// if(res.code === 7) // 登录失败
|
mask:true,
|
||||||
// {
|
// success() {
|
||||||
// store.afterFailLogin(2000)
|
// console.log(1212121)
|
||||||
// }
|
// store.afterFailLogin(2000)
|
||||||
// }
|
// }
|
||||||
// })
|
})
|
||||||
// }
|
}
|
||||||
return res.data;
|
return res.data;
|
||||||
} else {
|
} else {
|
||||||
const reg = /abort/;
|
const reg = /abort/;
|
||||||
|
@ -42,6 +42,6 @@
|
|||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.aikefuBox{
|
.aikefuBox{
|
||||||
margin-top: 200rpx;
|
// margin-top: 200rpx;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -1,6 +1,7 @@
|
|||||||
// isdev 为 true 表示开发环境 false 表示发布环境
|
// isdev 为 true 表示开发环境 false 表示发布环境
|
||||||
const isdev = true;
|
const isdev = false;
|
||||||
const baseUrl = isdev ? 'https://api.jimingyiliao.com' : 'http://eb467b6.r19.cpolar.top';// 办公室接口 & 测试环境
|
const baseUrl = isdev ? 'https://367a21fd.r12.cpolar.top' : 'https://api.jimingyiliao.com';// 办公室接口 & 测试环境
|
||||||
|
// const baseUrl = isdev ? 'https://api.jimingyiliao.com' : 'http://eb467b6.r19.cpolar.top';// 办公室接口 & 测试环境
|
||||||
// const baseUrl = isdev ? 'http://707788f2.r1.cpolar.top' : 'http://eb467b6.r19.cpolar.top';// 办公室接口 & 测试环境
|
// const baseUrl = isdev ? 'http://707788f2.r1.cpolar.top' : 'http://eb467b6.r19.cpolar.top';// 办公室接口 & 测试环境
|
||||||
// const baseUrl = isdev ? 'http://192.168.1.133:8899' : 'https://api.gwkjxb.com';// 办公室接口 & 正式环境
|
// const baseUrl = isdev ? 'http://192.168.1.133:8899' : 'https://api.gwkjxb.com';// 办公室接口 & 正式环境
|
||||||
// const baseUrl = 'https://api.gwkjxb.com';// 正式环境(由于本地测试后台没有启动,暂时通用正式服)
|
// const baseUrl = 'https://api.gwkjxb.com';// 正式环境(由于本地测试后台没有启动,暂时通用正式服)
|
||||||
|
@ -52,10 +52,11 @@
|
|||||||
"mp-weixin" : {
|
"mp-weixin" : {
|
||||||
"appid" : "wxaaf66dbb5c3983b3",
|
"appid" : "wxaaf66dbb5c3983b3",
|
||||||
"setting" : {
|
"setting" : {
|
||||||
"urlCheck" : false
|
"urlCheck" : false,
|
||||||
// "ignoreDevUnusedFiles": false ,
|
"minified" : true
|
||||||
// "ignoreUploadUnusedFiles": false”
|
|
||||||
},
|
},
|
||||||
|
// "ignoreDevUnusedFiles": false ,
|
||||||
|
// "ignoreUploadUnusedFiles": false”
|
||||||
"usingComponents" : true
|
"usingComponents" : true
|
||||||
},
|
},
|
||||||
"mp-alipay" : {
|
"mp-alipay" : {
|
||||||
|
@ -84,8 +84,8 @@
|
|||||||
}
|
}
|
||||||
// console.log(res.height,w_h.value)
|
// console.log(res.height,w_h.value)
|
||||||
}).exec()
|
}).exec()
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<view class="aikefuBox page-box page-bg-gray" style="height: 100%;">
|
<view class="aikefuBox page-box page-bg-gray" style="height: 100%;">
|
||||||
<!-- 信息展示区域 -->
|
<!-- 信息展示区域 -->
|
||||||
@ -118,8 +118,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.aikefuBox{
|
.aikefuBox{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@ -164,6 +164,7 @@
|
|||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
box-shadow: 0px -10px 20px 1px #eaeaea;
|
||||||
.input-box{
|
.input-box{
|
||||||
padding: 20rpx;
|
padding: 20rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
@ -199,5 +200,5 @@
|
|||||||
.ac-part{
|
.ac-part{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -77,6 +77,17 @@
|
|||||||
}
|
}
|
||||||
])
|
])
|
||||||
// 函数
|
// 函数
|
||||||
|
function subscribeFunc() {
|
||||||
|
uni.requestSubscribeMessage({
|
||||||
|
tmplIds: ['BKyIwkt7HHEQoQ9ByrHqnHaGO5jq8d-MCp9YYGK23TE'],
|
||||||
|
success: (res) => {
|
||||||
|
console.log(res);
|
||||||
|
},
|
||||||
|
fail(res) {
|
||||||
|
console.log(res);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
function init(){
|
function init(){
|
||||||
// list.value = []
|
// list.value = []
|
||||||
list_box.value[c_index.value].list = []
|
list_box.value[c_index.value].list = []
|
||||||
@ -138,6 +149,7 @@
|
|||||||
handle_info.value = item
|
handle_info.value = item
|
||||||
handle_info_index.value = i
|
handle_info_index.value = i
|
||||||
inputDialog.value.open()
|
inputDialog.value.open()
|
||||||
|
subscribeFunc()
|
||||||
}
|
}
|
||||||
function finishFunc() {
|
function finishFunc() {
|
||||||
// api.todoFinished
|
// api.todoFinished
|
||||||
@ -152,7 +164,7 @@
|
|||||||
})
|
})
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title:res_.msg,
|
title:res_.msg,
|
||||||
icon:"error",
|
icon:"success",
|
||||||
duration:2000,
|
duration:2000,
|
||||||
mask:true,
|
mask:true,
|
||||||
success() {
|
success() {
|
||||||
@ -179,7 +191,8 @@
|
|||||||
{{item.content}}
|
{{item.content}}
|
||||||
</view>
|
</view>
|
||||||
<view class="td-info small-text">
|
<view class="td-info small-text">
|
||||||
{{util.timestampToDate(item.CreatedAt)}}
|
<!-- {{util.timestampToDate(item.CreatedAt)}} -->
|
||||||
|
{{item.remindDay + " " +item.remindTime}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<emptyCard v-else></emptyCard>
|
<emptyCard v-else></emptyCard>
|
||||||
@ -196,6 +209,24 @@
|
|||||||
{{handle_info?.content}}
|
{{handle_info?.content}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view class="pb-item">
|
||||||
|
<view class="pb-item-left">待办状态</view>
|
||||||
|
<view class="pb-item-right">
|
||||||
|
{{handle_info?.remindPeriod?'手术前':'手术后'}}
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="pb-item">
|
||||||
|
<view class="pb-item-left">用药频率</view>
|
||||||
|
<view class="pb-item-right">
|
||||||
|
{{handle_info?.frequency}}
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="pb-item">
|
||||||
|
<view class="pb-item-left">提醒时间</view>
|
||||||
|
<view class="pb-item-right">
|
||||||
|
{{handle_info?.remindTime}}
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
<view class="pb-item">
|
<view class="pb-item">
|
||||||
<view class="pb-item-left">创建时间</view>
|
<view class="pb-item-left">创建时间</view>
|
||||||
<view class="pb-item-right">
|
<view class="pb-item-right">
|
||||||
|
@ -14,16 +14,18 @@
|
|||||||
const h_index = ref(0)
|
const h_index = ref(0)
|
||||||
onShow((e) => {
|
onShow((e) => {
|
||||||
getLbtList()
|
getLbtList()
|
||||||
if(store.userInfo && !store.operation_info) { //登录过 且 未填写手术信息
|
// if(!store.userInfo && !store.operation_info) { //没登录过 且 未填写手术信息
|
||||||
getHospitalList()
|
if(!store.userInfo) { //没登录过
|
||||||
setTimeout(()=>{
|
// getHospitalList()
|
||||||
inputDialog.value.open()
|
// setTimeout(()=>{
|
||||||
},0)
|
// inputDialog.value.open()
|
||||||
|
// },0)
|
||||||
|
} else {
|
||||||
|
// setTimeout(()=>{
|
||||||
|
// inputDialog.value.close()
|
||||||
|
// },0)
|
||||||
|
getTodayTodoList()
|
||||||
}
|
}
|
||||||
let s = `$http({code:'1s'});if`
|
|
||||||
// // let arr = /\$http\((\S*)\)\;if/.exec(s);
|
|
||||||
let arr = s.match(/\$http\((.*)\)\;if/)
|
|
||||||
console.log(arr[1])
|
|
||||||
})
|
})
|
||||||
|
|
||||||
// 变量
|
// 变量
|
||||||
@ -48,7 +50,59 @@
|
|||||||
pageSize:1000,
|
pageSize:1000,
|
||||||
key:''
|
key:''
|
||||||
})
|
})
|
||||||
|
const todayTodoList = ref([])
|
||||||
|
const todayTodoListShow = ref({})
|
||||||
// 函数
|
// 函数
|
||||||
|
async function getTodayTodoList() {
|
||||||
|
const userInfo = uni.getStorageSync('userInfo')
|
||||||
|
if(userInfo) {
|
||||||
|
let user_info = JSON.parse(userInfo)
|
||||||
|
if(user_info.userId) {
|
||||||
|
const res = await api.todayTodoList({userId:user_info.userId})
|
||||||
|
if(res.code == 0) {
|
||||||
|
todayTodoList.value = res.data
|
||||||
|
// 测试开始
|
||||||
|
// let o = [
|
||||||
|
// {
|
||||||
|
// remindTime: '2024.1.1',
|
||||||
|
// content: '测试'
|
||||||
|
// },
|
||||||
|
// {
|
||||||
|
// remindTime: '2024.1.1',
|
||||||
|
// content: '快去测试343232423快去测试快去测试快去测试快去测试快去测试'
|
||||||
|
// },
|
||||||
|
// ]
|
||||||
|
// console.log(o)
|
||||||
|
// todayTodoList.value.push(...o)
|
||||||
|
// 测试结束
|
||||||
|
if(todayTodoList.value.length > 0) {
|
||||||
|
showTodo()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function showTodo() {
|
||||||
|
let start_num = 0
|
||||||
|
setInterval(() => {
|
||||||
|
if(!(start_num < todayTodoList.value.length)) {
|
||||||
|
start_num = 0
|
||||||
|
}
|
||||||
|
todayTodoListShow.value = todayTodoList.value[start_num]
|
||||||
|
start_num++
|
||||||
|
}, 2000)
|
||||||
|
}
|
||||||
|
function subscribeFunc() {
|
||||||
|
uni.requestSubscribeMessage({
|
||||||
|
tmplIds: ['PgxoZOOSDgBcmIGd_EVLDnYUmL3eu6NQTAZCsHQeuWY'],
|
||||||
|
success: (res) => {
|
||||||
|
console.log(res);
|
||||||
|
},
|
||||||
|
fail(res) {
|
||||||
|
console.log(res);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
async function getHospitalList() {
|
async function getHospitalList() {
|
||||||
const res = await api.getHospitalList(h_queryParams.value)
|
const res = await api.getHospitalList(h_queryParams.value)
|
||||||
if(res.code == 0) {
|
if(res.code == 0) {
|
||||||
@ -159,6 +213,7 @@
|
|||||||
// if(state_index === 0) {
|
// if(state_index === 0) {
|
||||||
// url = '/pages/index/done?state_index='+state_index
|
// url = '/pages/index/done?state_index='+state_index
|
||||||
// }
|
// }
|
||||||
|
subscribeFunc()
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url
|
url
|
||||||
})
|
})
|
||||||
@ -175,15 +230,19 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function bindPickerChange(e) {
|
function bindPickerChange(e) {
|
||||||
console.log(hospitals.value )
|
|
||||||
h_index.value = e.detail.value
|
h_index.value = e.detail.value
|
||||||
}
|
}
|
||||||
|
// 手机号登录
|
||||||
|
async function getPhoneNumber (e) {
|
||||||
|
await store.getAccess_token({code:e.detail.code})
|
||||||
|
toClose()
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<view class="content page-box">
|
<view class="content page-box">
|
||||||
<!-- 背景图 -->
|
<!-- 背景图 -->
|
||||||
<view class="bg-imgs-card">
|
<view class="bg-imgs-card">
|
||||||
<image src="../../static/style/bg.png" mode="aspectFill"></image>
|
<image src="https://jmyl-app.oss-cn-chengdu.aliyuncs.com/miniapp/bg.png" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
<!-- 轮播图 -->
|
<!-- 轮播图 -->
|
||||||
<mySwiper :indicatorDots="true" :isRadius="true" height="160" class="index-siwper margin-b-card" :lbt_list="lbt_list" style="width: 100%;" />
|
<mySwiper :indicatorDots="true" :isRadius="true" height="160" class="index-siwper margin-b-card" :lbt_list="lbt_list" style="width: 100%;" />
|
||||||
@ -193,6 +252,15 @@
|
|||||||
<uni-icons type="forward" color="#9bc027" size="20"></uni-icons>
|
<uni-icons type="forward" color="#9bc027" size="20"></uni-icons>
|
||||||
</view>
|
</view>
|
||||||
</view> -->
|
</view> -->
|
||||||
|
<!-- 提示弹幕 -->
|
||||||
|
<!-- <view class="todayTodoListBox" v-if="todayTodoList.length>0">
|
||||||
|
<uni-icons type="sound-filled" color="#fc9467" size="30"></uni-icons>
|
||||||
|
<view class="tlb-item-box">
|
||||||
|
<view class="tlb-item" @tap="todoFunc(1)">
|
||||||
|
<view class="tlb-content ">{{todayTodoListShow.remindTime}}: {{todayTodoListShow.content}}</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view> -->
|
||||||
<view class="attention-card">
|
<view class="attention-card">
|
||||||
<!-- <view class="part-title">
|
<!-- <view class="part-title">
|
||||||
测试记录
|
测试记录
|
||||||
@ -248,11 +316,21 @@
|
|||||||
<view class="test-text">视力自测小助手</view>
|
<view class="test-text">视力自测小助手</view>
|
||||||
<image class="test-img" src="../../static/style/test.png" mode=""></image>
|
<image class="test-img" src="../../static/style/test.png" mode=""></image>
|
||||||
</view>
|
</view>
|
||||||
|
<aikefu />
|
||||||
|
<!-- 提示弹幕 -->
|
||||||
|
<view class="todayTodoListBox" v-if="todayTodoList.length>0">
|
||||||
|
<uni-icons type="sound-filled" color="#fc9467" size="30" style="margin-right: 5px;"></uni-icons>
|
||||||
|
<view class="tlb-item-box">
|
||||||
|
<view class="tlb-item" @tap="todoFunc(1)">
|
||||||
|
<view class="tlb-content ">{{todayTodoListShow.remindTime}}: {{todayTodoListShow.content}}</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
<uni-popup ref="inputDialog" @tap="toBlur" :is-mask-click='false'>
|
<uni-popup ref="inputDialog" @tap="toBlur" :is-mask-click='false'>
|
||||||
<view class="pop-box">
|
<view class="pop-box">
|
||||||
<view class="pb-title">完善手术信息</view>
|
<view class="pb-title">您好, 请先登录</view>
|
||||||
<view class="pb-content">
|
<view class="pb-content">
|
||||||
<view class="pb-item">
|
<!-- <view class="pb-item">
|
||||||
<view class="pb-item-left">已经手术</view>
|
<view class="pb-item-left">已经手术</view>
|
||||||
<view class="pb-item-right">
|
<view class="pb-item-right">
|
||||||
<radio-group @change="radioChange">
|
<radio-group @change="radioChange">
|
||||||
@ -264,38 +342,58 @@
|
|||||||
<view class="pb-item">
|
<view class="pb-item">
|
||||||
<view class="pb-item-left">手术时间</view>
|
<view class="pb-item-left">手术时间</view>
|
||||||
<view class="pb-item-right">
|
<view class="pb-item-right">
|
||||||
<!-- <uni-datetime-picker type="date" :clear-icon="false" v-model="single" @maskClick="maskClick" /> -->
|
|
||||||
<uniDatetimePicker type="date" :clear-icon="false" v-model="surgery_time" @maskClick="maskClick" ></uniDatetimePicker>
|
<uniDatetimePicker type="date" :clear-icon="false" v-model="surgery_time" @maskClick="maskClick" ></uniDatetimePicker>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="pb-item">
|
<view class="pb-item">
|
||||||
<view class="pb-item-left">医院名称</view>
|
<view class="pb-item-left">医院名称</view>
|
||||||
<view class="pb-item-right">
|
<view class="pb-item-right">
|
||||||
<!-- <uniEasyinput @tap.stop="focusFunc" suffixIcon="search" v-model="hValue" focus placeholder="请输入内容" @iconClick="onClickH"></uniEasyinput>
|
|
||||||
<view class="h_res_show_aprt" v-if="hospitals">
|
|
||||||
<view v-for="(item,i) in hospitals" @tap.stop="toChooseH(item)" class="h_res_show_aprt_row text-ellipsis-1">
|
|
||||||
{{item.name}}
|
|
||||||
</view>
|
|
||||||
</view> -->
|
|
||||||
<!-- <uni-combox @input="onClickH" :candidates="hospitals" placeholder="请选择医院" @choosed="toChooseH" v-model="hValue"></uni-combox> -->
|
|
||||||
<picker @change="bindPickerChange" :value="h_index" :range="hospitals" range-key="name">
|
<picker @change="bindPickerChange" :value="h_index" :range="hospitals" range-key="name">
|
||||||
<view class="uni-input">{{hospitals[h_index]?.name}}</view>
|
<view class="uni-input">{{hospitals[h_index]?.name}}</view>
|
||||||
</picker>
|
</picker>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="pb-item pb-item-btn" @tap="toSave">提交</view>
|
<!-- <view class="pb-item pb-item-btn" @tap="toSave">提交</view> -->
|
||||||
|
<!-- <view class="pb-item pb-item-btn" @tap="toSave">获取手机号</view> -->
|
||||||
|
<button class="buy-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">手机号登录</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="pop-close" @tap="toClose">
|
<!-- <view class="pop-close" @tap="toClose">
|
||||||
关闭
|
关闭
|
||||||
</view>
|
</view> -->
|
||||||
<!-- <uni-popup-dialog ref="inputClose" mode="input" title="输入内容" value="对话框预置提示内容!"
|
|
||||||
placeholder="请输入内容" @confirm="dialogInputConfirm"></uni-popup-dialog> -->
|
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
<aikefu />
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
.todayTodoListBox{
|
||||||
|
display: flex;
|
||||||
|
// align-items: center;
|
||||||
|
margin-top: 1vh;
|
||||||
|
.tlb-item-box{
|
||||||
|
color: #f97a44;
|
||||||
|
font-weight: 900;
|
||||||
|
font-size: 4.2vw;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
.tlb-item{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.buy-btn{
|
||||||
|
display: block;
|
||||||
|
margin-top:1rem;
|
||||||
|
background-color: #26758d;
|
||||||
|
color: white;
|
||||||
|
border-radius: 50rpx;
|
||||||
|
font-weight: 200;
|
||||||
|
font-size: 24rpx;
|
||||||
|
width: 80%;
|
||||||
|
padding: 10rpx 0;
|
||||||
|
margin: 0 auto;
|
||||||
|
}
|
||||||
.test-card{
|
.test-card{
|
||||||
padding: 30rpx 20rpx;
|
padding: 30rpx 20rpx;
|
||||||
margin: 20rpx 0;
|
margin: 20rpx 0;
|
||||||
|
@ -99,6 +99,21 @@
|
|||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
mask:true
|
mask:true
|
||||||
})
|
})
|
||||||
|
// 判断是否登录
|
||||||
|
let is_login = util.checkLogin()
|
||||||
|
if(!is_login) {
|
||||||
|
uni.showToast({
|
||||||
|
title:'请先登录',
|
||||||
|
icon:"error",
|
||||||
|
duration:2000,
|
||||||
|
mask:true,
|
||||||
|
success() {
|
||||||
|
store.afterFailLogin(2000)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// 判断是否有手术信息
|
||||||
let operation_info = null
|
let operation_info = null
|
||||||
if(uni.getStorageSync('operation_info')) {
|
if(uni.getStorageSync('operation_info')) {
|
||||||
operation_info = JSON.parse(uni.getStorageSync('operation_info'))
|
operation_info = JSON.parse(uni.getStorageSync('operation_info'))
|
||||||
@ -133,6 +148,18 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
uni.showToast({
|
||||||
|
title:'请填写手术信息',
|
||||||
|
icon:"error",
|
||||||
|
duration:2000,
|
||||||
|
mask:true,
|
||||||
|
success() {
|
||||||
|
setTimeout(() => {
|
||||||
|
store.toProfile()
|
||||||
|
},2000)
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
}
|
}
|
||||||
@ -154,9 +181,9 @@
|
|||||||
const handle_info = ref(null)
|
const handle_info = ref(null)
|
||||||
const handle_info_index = ref(0)
|
const handle_info_index = ref(0)
|
||||||
function handle_func(item,i) {
|
function handle_func(item,i) {
|
||||||
handle_info.value = item
|
// handle_info.value = item
|
||||||
handle_info_index.value = i
|
// handle_info_index.value = i
|
||||||
inputDialog.value.open()
|
// inputDialog.value.open()
|
||||||
}
|
}
|
||||||
function finishFunc() {
|
function finishFunc() {
|
||||||
// api.todoFinished
|
// api.todoFinished
|
||||||
@ -185,23 +212,33 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<view class="todoBox page-box">
|
<view class="todoBox page-box">
|
||||||
<cc-newsTabs :tabArr="tabArr" :o_index="c_index" @tabChange="tabChange"></cc-newsTabs>
|
<cc-newsTabs class="ccTabs" style="position: fixed;top: 0px;" :tabArr="tabArr" :o_index="c_index" @tabChange="tabChange"></cc-newsTabs>
|
||||||
<swiper :current="c_index" @change="scroll_func" :style="{'--size':swiper_h+'px'}" class="swiper" circular :indicator-dots="false" :autoplay="false" >
|
<swiper :current="c_index" @change="scroll_func" :style="{'--size':swiper_h+'px'}" class="swiper" circular :indicator-dots="false" :autoplay="false" >
|
||||||
<swiper-item v-for="(item1,i1) in list_box">
|
<swiper-item v-for="(item1) in list_box" :key="item1" style="overflow: auto;">
|
||||||
<view class="todoBox">
|
<view class="todoBox">
|
||||||
<view v-for="(item,i) in item1.list" v-if="item1.list.length>0" @tap="handle_func(item,i)" class="td-item swiper-item uni-bg-green">
|
<template v-if="item1.list.length>0" >
|
||||||
<view class="td-content text-ellipsis-2">
|
<view v-for="(item,i) in item1.list" @tap="handle_func(item,i)" :key="i" class="td-item swiper-item uni-bg-green">
|
||||||
{{item.content}}
|
<view class="td-content text-ellipsis-2">
|
||||||
|
<!-- {{item.content}} -->
|
||||||
|
<image
|
||||||
|
style="width: 100%;"
|
||||||
|
:src="item.content"
|
||||||
|
mode="widthFix"
|
||||||
|
/>
|
||||||
|
</view>
|
||||||
|
<view class="td-info small-text">
|
||||||
|
{{util.timestampToDate(item.CreatedAt)}}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="td-info small-text">
|
</template>
|
||||||
{{util.timestampToDate(item.CreatedAt)}}
|
<template v-else>
|
||||||
</view>
|
<emptyCard />
|
||||||
</view>
|
</template>
|
||||||
<emptyCard v-else></emptyCard>
|
|
||||||
</view>
|
</view>
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
</swiper>
|
</swiper>
|
||||||
@ -226,11 +263,18 @@
|
|||||||
|
|
||||||
</view>
|
</view>
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
.ccTabs{
|
||||||
|
position: fixed;
|
||||||
|
top: 0px;
|
||||||
|
width: 100%;
|
||||||
|
z-index: 100;
|
||||||
|
}
|
||||||
.swiper{
|
.swiper{
|
||||||
height: var(--size);
|
height: var(--size);
|
||||||
|
margin-top: 80rpx;
|
||||||
}
|
}
|
||||||
.todoBox{
|
.todoBox{
|
||||||
padding: 20rpx;
|
padding: 20rpx;
|
||||||
@ -289,5 +333,5 @@
|
|||||||
.uni-popup__wrapper{
|
.uni-popup__wrapper{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -10,11 +10,11 @@
|
|||||||
const store = useStore()
|
const store = useStore()
|
||||||
onLoad((e) => {
|
onLoad((e) => {
|
||||||
res_.value = JSON.parse(decodeURIComponent(e.res))
|
res_.value = JSON.parse(decodeURIComponent(e.res))
|
||||||
console.log(res_.value)
|
// console.log(res_.value)
|
||||||
console.log(store.bgList)
|
// console.log(store.bgList)
|
||||||
if(store.bgList.length>0) {
|
// if(store.bgList.length>0) {
|
||||||
bg_imgs.value = store.bgList
|
// bg_imgs.value = store.bgList
|
||||||
}
|
// }
|
||||||
randomFunc()
|
randomFunc()
|
||||||
})
|
})
|
||||||
// 变量
|
// 变量
|
||||||
@ -29,24 +29,49 @@
|
|||||||
const avatarUrl = ref(null)
|
const avatarUrl = ref(null)
|
||||||
const info = ref({left:'',right:''})
|
const info = ref({left:'',right:''})
|
||||||
const show_ = ref(false)
|
const show_ = ref(false)
|
||||||
|
const bg_list = ref([
|
||||||
|
"https://jmyl-app.oss-cn-chengdu.aliyuncs.com/miniapp/result/result1.jpg",
|
||||||
|
"https://jmyl-app.oss-cn-chengdu.aliyuncs.com/miniapp/result/result2.jpg",
|
||||||
|
"https://jmyl-app.oss-cn-chengdu.aliyuncs.com/miniapp/result/result3.jpg"
|
||||||
|
])
|
||||||
|
const bg_list_index = ref(0)
|
||||||
// 函数
|
// 函数
|
||||||
function randomFunc() {
|
function randomFunc() {
|
||||||
bg_index.value = parseInt((Math.random()*store.bgList.length))
|
info.value.left = parseFloat(res_.value.leftEyeVision)
|
||||||
|
info.value.right = parseFloat(res_.value.rightEyeVision)
|
||||||
|
// 根据测试成绩显示不同的背景图
|
||||||
|
if ((info.value.left + info.value.right) / 2 > 5) {
|
||||||
|
bg_list_index.value = 0
|
||||||
|
} else if ((info.value.left + info.value.right) / 2 < 4.9 && (info.value.left + info.value.right) / 2 > 4.5) {
|
||||||
|
bg_list_index.value = 1
|
||||||
|
} else if ((info.value.left + info.value.right) / 2 < 4.5) {
|
||||||
|
bg_list_index.value = 2
|
||||||
|
}
|
||||||
|
// bg_index.value = parseInt((Math.random()*store.bgList.length))
|
||||||
uni.getImageInfo({
|
uni.getImageInfo({
|
||||||
// src:bg_imgs.value[bg_index.value],
|
// src:bg_imgs.value[bg_index.value],
|
||||||
src:bg_imgs.value[bg_index.value].url,
|
src: bg_list.value[bg_list_index.value],
|
||||||
success:function(res) {
|
success:function(res) {
|
||||||
avatarUrl.value = uni.getStorageSync('avatarUrl')
|
avatarUrl.value = uni.getStorageSync('avatarUrl')
|
||||||
info.value.left = res_.value.leftEyeVision
|
// info.value.left = parseFloat(res_.value.leftEyeVision)
|
||||||
info.value.right = res_.value.rightEyeVision
|
// info.value.right = parseFloat(res_.value.rightEyeVision)
|
||||||
show_.value = true
|
show_.value = true
|
||||||
|
// 判断度数长度是否只有一位
|
||||||
|
info.value.left = getRightNum(info.value.left)
|
||||||
|
info.value.right = getRightNum(info.value.right)
|
||||||
},
|
},
|
||||||
fail(err) {
|
fail(err) {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
</script>
|
function getRightNum(num) {
|
||||||
|
if((num+'').length === 1) {
|
||||||
|
num = num+'.0'
|
||||||
|
}
|
||||||
|
return num
|
||||||
|
}
|
||||||
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<view class="visionTestBox page-box">
|
<view class="visionTestBox page-box">
|
||||||
<!-- <view class="actionBox" :style="{background:`url(${bg_imgs[bg_index]})`}">
|
<!-- <view class="actionBox" :style="{background:`url(${bg_imgs[bg_index]})`}">
|
||||||
@ -54,7 +79,7 @@
|
|||||||
</view> -->
|
</view> -->
|
||||||
<view class="actionBox">
|
<view class="actionBox">
|
||||||
<view class="img-box">
|
<view class="img-box">
|
||||||
<image style="width: 100%;" :src="bg_imgs[bg_index].url" mode="widthFix"></image>
|
<image style="width: 100%;" :src="bg_list[bg_list_index]" mode="widthFix"></image>
|
||||||
<view v-if="show_" class="avatar-box">
|
<view v-if="show_" class="avatar-box">
|
||||||
<image :src="avatarUrl" mode="widthFix"></image>
|
<image :src="avatarUrl" mode="widthFix"></image>
|
||||||
</view>
|
</view>
|
||||||
@ -64,8 +89,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.avatar-box{
|
.avatar-box{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -164,5 +189,5 @@
|
|||||||
width: 80%;
|
width: 80%;
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
border-radius: 20rpx;
|
border-radius: 20rpx;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -1,6 +1,6 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
// 引入依赖
|
// 引入依赖
|
||||||
import { onLoad } from "@dcloudio/uni-app"
|
import { onLoad, onBackPress } from "@dcloudio/uni-app"
|
||||||
// import mySwiper from "@/components/mySwiper.vue"
|
// import mySwiper from "@/components/mySwiper.vue"
|
||||||
import {ref,onMounted,nextTick,watch} from "vue"
|
import {ref,onMounted,nextTick,watch} from "vue"
|
||||||
import {useStore} from '@/store/index.js'
|
import {useStore} from '@/store/index.js'
|
||||||
@ -9,116 +9,37 @@
|
|||||||
import custom from "@/utils/index.js"
|
import custom from "@/utils/index.js"
|
||||||
onLoad((e) => {
|
onLoad((e) => {
|
||||||
token_info.value = JSON.parse(decodeURIComponent(e.token_info))
|
token_info.value = JSON.parse(decodeURIComponent(e.token_info))
|
||||||
// is_login.value = custom.checkLogin()
|
|
||||||
// console.log(is_login.value)
|
|
||||||
})
|
})
|
||||||
|
onBackPress(() => {
|
||||||
|
return false
|
||||||
|
})
|
||||||
// 变量
|
// 变量
|
||||||
const token_info = ref(null)
|
const token_info = ref(null)
|
||||||
const avatarUrl = ref(null)
|
const avatarUrl = ref(null)
|
||||||
const nickname = ref('')
|
const nickname = ref('')
|
||||||
const res_form = ref(null)
|
var isOperation = ref([ // 是否已手术
|
||||||
watch(nickname,(v1,v2)=> {
|
{
|
||||||
console.log("watch",v1)
|
index:0,
|
||||||
})
|
name:"否"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
index: 1,
|
||||||
|
name: "是"
|
||||||
|
}
|
||||||
|
])
|
||||||
// 函数
|
// 函数
|
||||||
function onChooseAvatar(e) {
|
function onChooseAvatar(e) {
|
||||||
// const { avatarUrl } = e.detail
|
|
||||||
// console.log(avatarUrl)
|
|
||||||
avatarUrl.value = e.detail.avatarUrl
|
avatarUrl.value = e.detail.avatarUrl
|
||||||
|
|
||||||
}
|
|
||||||
function getPhoneNumber (e) {
|
|
||||||
// tel_code.value = e.detail.code
|
|
||||||
// console.log(e)
|
|
||||||
getAccess_token({code:e.detail.code})
|
|
||||||
// console.log(e.detail.code) // 动态令牌
|
|
||||||
// console.log(e.detail.errMsg) // 回调信息(成功失败都会返回)
|
|
||||||
// console.log(e.detail.errno) // 错误码(失败时返回)
|
|
||||||
}
|
|
||||||
async function getAccess_token(code){//
|
|
||||||
//清除token缓存
|
|
||||||
// wx.clearStorageSync();
|
|
||||||
if(!avatarUrl.value) {
|
|
||||||
uni.showToast({
|
|
||||||
title:"请选择头像!",
|
|
||||||
icon:"error",
|
|
||||||
duration:1500
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if(!nickname.value) {
|
|
||||||
uni.showToast({
|
|
||||||
title:"请填写昵称!",
|
|
||||||
icon:"error",
|
|
||||||
duration:1500
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
//访问接口
|
|
||||||
// console.log(code.value);return
|
|
||||||
// const data={
|
|
||||||
// username:code,//手机号按钮获取的code
|
|
||||||
// type:'wechat_mini_app',
|
|
||||||
// identity:'user',
|
|
||||||
// password:'111',
|
|
||||||
// avatarUrl:avatarUrl.value,
|
|
||||||
// nickName:nickname.value
|
|
||||||
// }
|
|
||||||
// console.log('登录参数:',data);return;
|
|
||||||
// const res = await api.getToken(data)
|
|
||||||
// if(res.code === 200) {
|
|
||||||
// uni.setStorageSync('avatarUrl', avatarUrl.value);//avatarUrl
|
|
||||||
// res_form.value = res.data
|
|
||||||
// res_form.value.access_token = 'Bearer '+res.data.access_token
|
|
||||||
// let userId = res.data.userId
|
|
||||||
// uni.setStorageSync('access_token',res_form.value.access_token);// token单独缓存一次
|
|
||||||
// wx_login(userId)
|
|
||||||
// }
|
|
||||||
uni.setStorageSync('avatarUrl', avatarUrl.value);//avatarUrl
|
|
||||||
wx_login(userId)
|
|
||||||
}
|
|
||||||
async function wx_login(userId){
|
|
||||||
let res=await new Promise(resolve=>{
|
|
||||||
uni.login({
|
|
||||||
provider: 'weixin', //使用微信登录
|
|
||||||
success: function (loginRes) {
|
|
||||||
resolve(loginRes);
|
|
||||||
console.log(loginRes,'微信登录返回信息');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
let res2=await api.wx_login({code:res.code},userId);
|
|
||||||
if(res2.code === 0) {
|
|
||||||
// for(let prop in res_form.value) {
|
|
||||||
// uni.setStorageSync(prop,res_form.value[prop])
|
|
||||||
// }
|
|
||||||
uni.setStorageSync('userInfo',JSON.stringify(res_form.value))
|
|
||||||
custom.uploadImage(avatarUrl.value,async (file)=>{
|
|
||||||
avatarUrl.value = file.data.file.url
|
|
||||||
uni.setStorageSync('avatarUrl', file.data.file.url);//头像链接
|
|
||||||
const up_res = await updateFunc() // 更新用户信息
|
|
||||||
// isInfo // 判断是否填过手术信息的字段(是否使用待定)
|
|
||||||
uni.switchTab({
|
|
||||||
url:"/pages/user/index"
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
uni.clearStorage();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function updateFunc(){ // 更新用户信息,通过此接口获取用户是否填写手术信息
|
async function updateFunc(){ // 更新用户信息,通过此接口获取用户是否填写手术信息
|
||||||
let user_info = JSON.parse(uni.getStorageSync('userInfo'))
|
let user_info = JSON.parse(uni.getStorageSync('userInfo'))
|
||||||
user_info.avatar = avatarUrl.value
|
user_info.avatar = avatarUrl.value
|
||||||
user_info.id =user_info.userId
|
user_info.id =user_info.userId
|
||||||
// console.log(user_info)
|
|
||||||
return await api.userinfoUpdae(user_info)
|
return await api.userinfoUpdae(user_info)
|
||||||
}
|
}
|
||||||
function nameInput(e) {
|
function nameInput(e) {
|
||||||
nickname.value = e.detail.value
|
nickname.value = e.detail.value
|
||||||
// console.log('拿到的值:',e)
|
|
||||||
// console.log('nickname:',nickname.value)
|
|
||||||
}
|
}
|
||||||
async function updateInfoFunc() {
|
async function updateInfoFunc() {
|
||||||
if(!avatarUrl.value) {
|
if(!avatarUrl.value) {
|
||||||
@ -137,23 +58,25 @@
|
|||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// let user_info = JSON.parse(uni.getStorageSync('userInfo'))
|
|
||||||
await custom.uploadImage(avatarUrl.value,async (file)=>{
|
await custom.uploadImage(avatarUrl.value,async (file)=>{
|
||||||
avatarUrl.value = file.data.file.url
|
avatarUrl.value = file.data.file.url
|
||||||
uni.setStorageSync('avatarUrl', file.data.file.url);//头像链接
|
uni.setStorageSync('avatarUrl', file.data.file.url);//头像链接
|
||||||
token_info.value.nickname = nickname.value
|
token_info.value.nickname = nickname.value
|
||||||
token_info.value.avatar = avatarUrl.value
|
token_info.value.avatar = avatarUrl.value
|
||||||
uni.setStorageSync('userInfo',JSON.stringify(token_info.value))
|
uni.setStorageSync('userInfo',JSON.stringify(token_info.value))
|
||||||
|
uni.setStorageSync('access_token','Bearer '+token_info.value.access_token);// 为了保险,token单独缓存一次
|
||||||
const up_res = await updateFunc() // 更新用户信息
|
const up_res = await updateFunc() // 更新用户信息
|
||||||
|
store.checkLogin() // 检查一遍登录情况
|
||||||
uni.setStorageSync('access_token','Bearer '+token_info.value.access_token);// token单独缓存一次
|
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
url:"/pages/user/index"
|
url:"/pages/user/index"
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
function bindOperationPickerChange(e) {
|
||||||
|
token_info.value.IsSurgery = e.detail.value
|
||||||
|
}
|
||||||
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<view class="loginBox page-box img-part card-part" style="text-align:center">
|
<view class="loginBox page-box img-part card-part" style="text-align:center">
|
||||||
<view class="base-info">
|
<view class="base-info">
|
||||||
@ -163,13 +86,60 @@
|
|||||||
</button>
|
</button>
|
||||||
<input type="nickname" @blur="nameInput" class="weui-input" placeholder="请输入昵称" v-model="nickname" />
|
<input type="nickname" @blur="nameInput" class="weui-input" placeholder="请输入昵称" v-model="nickname" />
|
||||||
</view>
|
</view>
|
||||||
|
<!-- <view class="row-box">
|
||||||
|
<view class="rb-card" @tap="toDetail(5)">
|
||||||
|
<view class="rbc-content">
|
||||||
|
<view class="rbc-content-row rbc-content-left rbc-content-left-box">
|
||||||
|
<uni-icons type="paperplane" color="gray" size="26"></uni-icons>
|
||||||
|
已经手术</view>
|
||||||
|
<view class="rbc-content-row rbc-content-right">
|
||||||
|
<picker @change="bindOperationPickerChange" :value="token_info?.IsSurgery" :range="isOperation" range-key="name" >
|
||||||
|
<view class="rbc-content-row rbc-content-right rbc-content-right-box">
|
||||||
|
<view class="uni-input">{{ isOperation[token_info?.IsSurgery]?.name }}</view>
|
||||||
|
<uni-icons type="forward" color="gray" size="20"></uni-icons>
|
||||||
|
</view>
|
||||||
|
</picker>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view> -->
|
||||||
<view class="btn-part">
|
<view class="btn-part">
|
||||||
<!-- <button class="buy-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">立即登录</button> -->
|
|
||||||
<button class="buy-btn" @tap="updateInfoFunc">立即登录</button>
|
<button class="buy-btn" @tap="updateInfoFunc">立即登录</button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
.rbc-content-right-box,.rbc-content-left-box{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
.row-box{
|
||||||
|
padding: 20rpx 0;
|
||||||
|
.rb-card{
|
||||||
|
padding: 20rpx;
|
||||||
|
background: white;
|
||||||
|
margin-bottom: 2rpx;
|
||||||
|
.rbc-title{
|
||||||
|
|
||||||
|
}
|
||||||
|
.rbc-content-box{
|
||||||
|
margin-top: 10rpx;
|
||||||
|
.rbc-content-row{
|
||||||
|
width: 50%;
|
||||||
|
text-align: center;
|
||||||
|
// padding: 40rpx 20rpx;
|
||||||
|
// box-shadow: 10rpx 10rpx 10rpx #cdcdcd;
|
||||||
|
border-radius: 10rpx;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.rbc-content{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
.base-info{
|
.base-info{
|
||||||
padding: 50rpx 0;
|
padding: 50rpx 0;
|
||||||
}
|
}
|
||||||
@ -200,7 +170,7 @@
|
|||||||
border-radius: 50rpx;
|
border-radius: 50rpx;
|
||||||
font-weight: 200;
|
font-weight: 200;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
width: 50%;
|
width: 80%;
|
||||||
padding: 10rpx 0;
|
padding: 10rpx 0;
|
||||||
}
|
}
|
||||||
.title-part{
|
.title-part{
|
||||||
@ -225,5 +195,5 @@
|
|||||||
}
|
}
|
||||||
.weui-input{
|
.weui-input{
|
||||||
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -66,7 +66,7 @@
|
|||||||
}
|
}
|
||||||
function getPhoneNumber (e) {
|
function getPhoneNumber (e) {
|
||||||
// tel_code.value = e.detail.code
|
// tel_code.value = e.detail.code
|
||||||
console.log(e)
|
// console.log(e)
|
||||||
getAccess_token({code:e.detail.code})
|
getAccess_token({code:e.detail.code})
|
||||||
// console.log(e.detail.code) // 动态令牌
|
// console.log(e.detail.code) // 动态令牌
|
||||||
// console.log(e.detail.errMsg) // 回调信息(成功失败都会返回)
|
// console.log(e.detail.errMsg) // 回调信息(成功失败都会返回)
|
||||||
@ -74,7 +74,7 @@
|
|||||||
}
|
}
|
||||||
async function getAccess_token(params={}){//获取token 获取手机号
|
async function getAccess_token(params={}){//获取token 获取手机号
|
||||||
//清除token缓存
|
//清除token缓存
|
||||||
// wx.clearStorageSync();
|
wx.clearStorageSync();
|
||||||
//访问接口
|
//访问接口
|
||||||
const data={
|
const data={
|
||||||
username:params.code,//手机号按钮获取的code
|
username:params.code,//手机号按钮获取的code
|
||||||
@ -86,6 +86,7 @@
|
|||||||
const res = await api.getToken(data)
|
const res = await api.getToken(data)
|
||||||
if(res.code === 200) {
|
if(res.code === 200) {
|
||||||
// newUser.value = res.data.newUser
|
// newUser.value = res.data.newUser
|
||||||
|
// res.data.newUser = true // 开发阶段专用,正式版请删除
|
||||||
if(res.data.newUser) { // 新用户,不做任何缓存动作,跳转登录页
|
if(res.data.newUser) { // 新用户,不做任何缓存动作,跳转登录页
|
||||||
let userId = res.data.userId
|
let userId = res.data.userId
|
||||||
let res_p=await new Promise(resolve=>{
|
let res_p=await new Promise(resolve=>{
|
||||||
@ -93,15 +94,17 @@
|
|||||||
provider: 'weixin', //使用微信登录
|
provider: 'weixin', //使用微信登录
|
||||||
success: function (loginRes) {
|
success: function (loginRes) {
|
||||||
resolve(loginRes);
|
resolve(loginRes);
|
||||||
console.log(loginRes,'微信登录返回信息');
|
// console.log(loginRes,'微信登录返回信息');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
// 正式版记住放开下面这行注释掉的代码
|
||||||
uni.setStorageSync('access_token','Bearer '+res.data.access_token);// token单独缓存一次
|
uni.setStorageSync('access_token','Bearer '+res.data.access_token);// token单独缓存一次
|
||||||
let res2=await api.wx_login({code:res_p.code},userId);
|
let res2=await api.wx_login({code:res_p.code},userId);
|
||||||
if(res2.code === 0) {
|
if(res2.code === 0) {
|
||||||
store.checkLogin()
|
store.checkLogin()
|
||||||
toLogin(encodeURIComponent(JSON.stringify(res.data)))
|
// toLogin(encodeURIComponent(JSON.stringify(res.data)))
|
||||||
|
store.toProfile(encodeURIComponent(JSON.stringify(res.data)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
@ -145,7 +148,7 @@
|
|||||||
uni.clearStorage();
|
uni.clearStorage();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<view class="user-box page-box">
|
<view class="user-box page-box">
|
||||||
<view class="userinfo-box" @tap="toUserInfo">
|
<view class="userinfo-box" @tap="toUserInfo">
|
||||||
@ -207,8 +210,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.buy-btn{
|
.buy-btn{
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
@ -282,5 +285,5 @@
|
|||||||
}
|
}
|
||||||
.user-box{
|
.user-box{
|
||||||
background: #f6f6f6;
|
background: #f6f6f6;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -6,28 +6,34 @@
|
|||||||
import {useStore} from '@/store/index.js'
|
import {useStore} from '@/store/index.js'
|
||||||
const store = useStore()
|
const store = useStore()
|
||||||
import api from "@/api/index.js"
|
import api from "@/api/index.js"
|
||||||
|
import custom from "@/utils/index.js"
|
||||||
const h_index = ref(0)
|
const h_index = ref(0)
|
||||||
onLoad(() => {
|
onLoad(async (e) => {
|
||||||
getHospitalList()
|
await getHospitalList()
|
||||||
// console.log(useStore.userInfo)
|
is_login.value = custom.checkLogin()
|
||||||
userinfo.value = JSON.parse(uni.getStorageSync('userInfo'))
|
if(!is_login.value) { // 未登录
|
||||||
console.log(userinfo.value)
|
userinfo.value = JSON.parse(decodeURIComponent(e.token_info))
|
||||||
avatar.value = uni.getStorageSync('avatarUrl')
|
} else { // 已登录
|
||||||
if(uni.getStorageSync('operation_info')) {
|
userinfo.value = JSON.parse(uni.getStorageSync('userInfo'))
|
||||||
h_info.value = JSON.parse(uni.getStorageSync('operation_info'))
|
h_info.value = userinfo.value
|
||||||
if(h_info.value) {
|
h_info.value.surgery_time = h_info.value.SurgeryTime
|
||||||
// console.log(h_info.value)
|
userinfo.value.avatar = uni.getStorageSync('avatarUrl')
|
||||||
getHospital(h_info.value.hospitalId)
|
h_index.value = hospitals.value.findIndex((item,i) => {
|
||||||
|
return item.ID == userinfo.value.HospitalId
|
||||||
|
})
|
||||||
|
if(userinfo.value.HospitalId) {
|
||||||
|
getHospital(userinfo.value.HospitalId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
// 变量
|
// 变量
|
||||||
|
const is_login = ref(false)
|
||||||
const h_queryParams = ref({
|
const h_queryParams = ref({
|
||||||
page:1,
|
page:1,
|
||||||
pageSize:1000,
|
pageSize:1000,
|
||||||
key:''
|
key:''
|
||||||
})
|
})
|
||||||
const hospitals = ref(null)
|
const hospitals = ref([])
|
||||||
const userinfo = ref({})
|
const userinfo = ref({})
|
||||||
const avatar = ref(null)
|
const avatar = ref(null)
|
||||||
const h_info = ref({})
|
const h_info = ref({})
|
||||||
@ -45,7 +51,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
function onInputH() {
|
function onInputH() {
|
||||||
console.log(hValue.value)
|
|
||||||
h_queryParams.value.key = hValue.value
|
h_queryParams.value.key = hValue.value
|
||||||
getHospitalList()
|
getHospitalList()
|
||||||
|
|
||||||
@ -105,28 +110,42 @@
|
|||||||
return `${year}-${month}-${day}`;
|
return `${year}-${month}-${day}`;
|
||||||
}
|
}
|
||||||
function bindDateChange(e) {
|
function bindDateChange(e) {
|
||||||
console.log(e)
|
// console.log(e)
|
||||||
h_info.value.surgery_time = e.detail.value
|
h_info.value.surgery_time = e.detail.value
|
||||||
}
|
}
|
||||||
function toChooseH(item) {
|
function toChooseH(item) {
|
||||||
console.log(item)
|
// console.log(item)
|
||||||
choosed_h.value = item
|
choosed_h.value = item
|
||||||
hValue.value = item.name
|
hValue.value = item.name
|
||||||
// hospitals.value = null
|
// hospitals.value = null
|
||||||
}
|
}
|
||||||
async function sumbmitFunc() {
|
async function sumbmitFunc() {
|
||||||
// console.log(choosed_h.value,h_info.value,userinfo.value)
|
await custom.uploadImage(userinfo.value.avatar, async (file) => {
|
||||||
|
userinfo.value.avatar = file.data.file.url
|
||||||
|
})
|
||||||
let obj = {
|
let obj = {
|
||||||
id: userinfo.value.userId,
|
id: userinfo.value.userId,
|
||||||
// isSurgery: 1, //是否已经手术 0为手术,1已经手术
|
// isSurgery: userinfo.value.isSurgery,//是否已经手术 0 - 未手术,1 - 已经手术
|
||||||
surgery_time: h_info.value?.surgery_time, //手术时间
|
surgery_time: h_info.value?.surgery_time, //手术时间
|
||||||
nickname: userinfo.value.nickname,
|
nickname: userinfo.value.nickname,
|
||||||
// avatar: '',
|
avatar: userinfo.value.avatar,
|
||||||
phone: userinfo.value.phone,
|
phone: userinfo.value.phone,
|
||||||
hospitalId:choosed_h.value?.ID
|
hospitalId:hospitals.value[h_index.value]?.ID
|
||||||
}
|
}
|
||||||
const res = await api.userinfoUpdae(obj)
|
if(!obj.hospitalId) {
|
||||||
// console.log('res is ',res)
|
uni.showToast({
|
||||||
|
title: "请选择医院",
|
||||||
|
icon: "error",
|
||||||
|
duration: 2000
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
obj.isSurgery = parseInt(userinfo.value.IsSurgery)
|
||||||
|
// if(!is_login.value) { // 新用户 - 先登录
|
||||||
|
|
||||||
|
// }
|
||||||
|
userinfo.value.SurgeryTime = obj.surgery_time
|
||||||
|
const res = await api.userinfoUpdae(obj) // 更新用户信息
|
||||||
if(res.code === 0) {
|
if(res.code === 0) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title:res.msg,
|
title:res.msg,
|
||||||
@ -152,13 +171,16 @@
|
|||||||
provider: 'weixin', //使用微信登录
|
provider: 'weixin', //使用微信登录
|
||||||
success: function (loginRes) {
|
success: function (loginRes) {
|
||||||
resolve(loginRes);
|
resolve(loginRes);
|
||||||
console.log(loginRes,'微信登录返回信息');
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
let res2=await api.wx_login({code:res.code},userId);
|
let res2=await api.wx_login({code:res.code},userId);
|
||||||
if(res2.code === 0) {
|
if(res2.code === 0) {
|
||||||
|
userinfo.value.HospitalId = hospitals.value[h_index.value]?.ID
|
||||||
|
h_info.value.hospitalId = userinfo.value.HospitalId
|
||||||
|
uni.setStorageSync('avatarUrl', userinfo.value.avatar);//avatarUrl
|
||||||
uni.setStorageSync('userInfo',JSON.stringify(userinfo.value))
|
uni.setStorageSync('userInfo',JSON.stringify(userinfo.value))
|
||||||
|
uni.setStorageSync('operation_info', JSON.stringify(h_info.value))
|
||||||
// is_login.value = custom.checkLogin()
|
// is_login.value = custom.checkLogin()
|
||||||
store.checkLogin()
|
store.checkLogin()
|
||||||
}
|
}
|
||||||
@ -167,14 +189,36 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
function bindPickerChange(e) {
|
function bindPickerChange(e) {
|
||||||
console.log(hospitals.value )
|
// console.log(hospitals.value )
|
||||||
h_index.value = e.detail.value
|
h_index.value = e.detail.value
|
||||||
}
|
}
|
||||||
</script>
|
function onChooseAvatar(e) {
|
||||||
|
// const { avatarUrl } = e.detail
|
||||||
|
// console.log(avatarUrl)
|
||||||
|
userinfo.value.avatar = e.detail.avatarUrl
|
||||||
|
}
|
||||||
|
var isOperation = ref([
|
||||||
|
{
|
||||||
|
index:0,
|
||||||
|
name:"否"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
index: 1,
|
||||||
|
name: "是"
|
||||||
|
}
|
||||||
|
])
|
||||||
|
function bindOperationPickerChange(e) {
|
||||||
|
userinfo.value.IsSurgery = e.detail.value
|
||||||
|
// console.log("userinfo.value.IsSurgery is :",userinfo.value.IsSurgery)
|
||||||
|
}
|
||||||
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<view class="userInfoBox page-box page-bg-gray">
|
<view class="userInfoBox page-box page-bg-gray">
|
||||||
<view class="avatar-box">
|
<view class="avatar-box">
|
||||||
<image :src="avatar" mode="aspectFill"></image>
|
<!-- <image :src="avatar" mode="aspectFill"></image> -->
|
||||||
|
<button class="avatar-wrapper" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" style="border-radius: 50%;">
|
||||||
|
<image :src="userinfo?.avatar" mode="aspectFill"></image>
|
||||||
|
</button>
|
||||||
</view>
|
</view>
|
||||||
<view class="row-box">
|
<view class="row-box">
|
||||||
<view class="rb-card" @tap="toDetail(1)">
|
<view class="rb-card" @tap="toDetail(1)">
|
||||||
@ -199,37 +243,57 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="rb-card" @tap="toDetail(3)">
|
<view class="rb-card" @tap="toDetail(5)">
|
||||||
<view class="rbc-content">
|
<view class="rbc-content">
|
||||||
<view class="rbc-content-row rbc-content-left rbc-content-left-box">
|
<view class="rbc-content-row rbc-content-left rbc-content-left-box">
|
||||||
<uni-icons type="calendar" color="gray" size="26"></uni-icons>
|
<uni-icons type="paperplane" color="gray" size="26"></uni-icons>
|
||||||
手术时间</view>
|
已经手术</view>
|
||||||
<view class="rbc-content-row rbc-content-right">
|
<view class="rbc-content-row rbc-content-right">
|
||||||
<!-- {{h_info?.surgery_time}} -->
|
<picker @change="bindOperationPickerChange" :value="userinfo.IsSurgery" :range="isOperation" range-key="name" >
|
||||||
<picker mode="date" :value="h_info?.surgery_time" :start="startDate" :end="endDate" @change="bindDateChange">
|
<view class="rbc-content-row rbc-content-right">
|
||||||
<view class="rbc-content-row rbc-content-right">
|
<view class="uni-input">{{ isOperation[userinfo.IsSurgery]?.name }}</view>
|
||||||
<view class="uni-input"> {{h_info?.surgery_time}}</view>
|
<uni-icons type="forward" color="gray" size="20"></uni-icons>
|
||||||
<uni-icons type="forward" color="gray" size="20"></uni-icons>
|
</view>
|
||||||
</view>
|
</picker>
|
||||||
</picker>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<view class="rb-card" @tap="toDetail(4)">
|
|
||||||
<view class="rbc-content">
|
|
||||||
<view class="rbc-content-row rbc-content-left rbc-content-left-box">
|
|
||||||
<uni-icons type="paperplane" color="gray" size="26"></uni-icons>
|
|
||||||
手术医院</view>
|
|
||||||
<view class="rbc-content-row rbc-content-right">
|
|
||||||
<!-- {{h_info?.name}} -->
|
|
||||||
<!-- <uni-combox :border="false" @input="onInputH" :candidates="hospitals" placeholder="请选择医院" @choosed="toChooseH" v-model="userinfo.HospitalId"></uni-combox> -->
|
|
||||||
<!-- <uni-icons type="forward" color="gray" size="20"></uni-icons> -->
|
|
||||||
<picker @change="bindPickerChange" :value="h_index" :range="hospitals" range-key="name">
|
|
||||||
<view class="uni-input">{{hospitals[h_index]?.name}}</view>
|
|
||||||
</picker>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
|
<template>
|
||||||
|
<view class="rb-card" @tap="toDetail(3)">
|
||||||
|
<view class="rbc-content">
|
||||||
|
<view class="rbc-content-row rbc-content-left rbc-content-left-box">
|
||||||
|
<uni-icons type="calendar" color="gray" size="26"></uni-icons>
|
||||||
|
手术时间</view>
|
||||||
|
<view class="rbc-content-row rbc-content-right">
|
||||||
|
<!-- {{h_info?.surgery_time}} -->
|
||||||
|
<picker mode="date" :value="h_info?.surgery_time" :start="startDate" :end="endDate" @change="bindDateChange">
|
||||||
|
<view class="rbc-content-row rbc-content-right">
|
||||||
|
<view class="uni-input"> {{h_info?.surgery_time}}</view>
|
||||||
|
<uni-icons type="forward" color="gray" size="20"></uni-icons>
|
||||||
|
</view>
|
||||||
|
</picker>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<view class="rb-card" @tap="toDetail(4)">
|
||||||
|
<view class="rbc-content">
|
||||||
|
<view class="rbc-content-row rbc-content-left rbc-content-left-box">
|
||||||
|
<uni-icons type="paperplane" color="gray" size="26"></uni-icons>
|
||||||
|
手术医院</view>
|
||||||
|
<view class="rbc-content-row rbc-content-right">
|
||||||
|
<!-- {{h_info?.name}} -->
|
||||||
|
<!-- <uni-combox :border="false" @input="onInputH" :candidates="hospitals" placeholder="请选择医院" @choosed="toChooseH" v-model="userinfo.HospitalId"></uni-combox> -->
|
||||||
|
<!-- <uni-icons type="forward" color="gray" size="20"></uni-icons> -->
|
||||||
|
<picker @change="bindPickerChange" :value="h_index" :range="hospitals" range-key="name">
|
||||||
|
<view class="rbc-content-row rbc-content-right">
|
||||||
|
<view class="uni-input">{{hospitals[h_index]?.name}}</view>
|
||||||
|
<uni-icons type="forward" color="gray" size="20"></uni-icons>
|
||||||
|
</view>
|
||||||
|
</picker>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
</template>
|
||||||
</view>
|
</view>
|
||||||
<!--修改姓名/电话 弹窗 -->
|
<!--修改姓名/电话 弹窗 -->
|
||||||
<uni-popup ref="inputDialog" >
|
<uni-popup ref="inputDialog" >
|
||||||
@ -250,9 +314,22 @@
|
|||||||
</view>
|
</view>
|
||||||
</uni-popup>
|
</uni-popup>
|
||||||
<view class="pb-item pb-item-btn" style="margin-top: 40rpx;" @tap="sumbmitFunc">确定</view>
|
<view class="pb-item pb-item-btn" style="margin-top: 40rpx;" @tap="sumbmitFunc">确定</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
.avatar-wrapper{
|
||||||
|
width: 160rpx !important;
|
||||||
|
height: 160rpx;
|
||||||
|
padding: 0px;
|
||||||
|
margin: 0 auto;
|
||||||
|
overflow: hidden;
|
||||||
|
margin-bottom: 40rpx;
|
||||||
|
// border: 1px solid #26758d;
|
||||||
|
background: #ececec;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
.avatar-box{
|
.avatar-box{
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@ -260,6 +337,14 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 20rpx 0;
|
padding: 20rpx 0;
|
||||||
background: #26758d;
|
background: #26758d;
|
||||||
|
button{
|
||||||
|
image{
|
||||||
|
width: 160rpx;
|
||||||
|
height: 160rpx;
|
||||||
|
background-color: white;
|
||||||
|
border-radius: 50%;
|
||||||
|
}
|
||||||
|
}
|
||||||
image{
|
image{
|
||||||
width: 160rpx;
|
width: 160rpx;
|
||||||
height: 160rpx;
|
height: 160rpx;
|
||||||
@ -379,5 +464,5 @@
|
|||||||
.uni-popup__wrapper{
|
.uni-popup__wrapper{
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
@ -28,6 +28,11 @@
|
|||||||
getDetail(e.id)
|
getDetail(e.id)
|
||||||
})
|
})
|
||||||
// 变量
|
// 变量
|
||||||
|
let strings = `<div style="text-align: center; "><p> 测试内容222sdadd </p><figure class="image"><img src="https://jmyl-app.oss-cn-chengdu.aliyuncs.com/miniapp/uploads/2024-02-24/undone.png"/></figure></div>`
|
||||||
|
// `<p> 测试内容222sdadd </p><figure class="image"><img src="https://jmyl-app.oss-cn-chengdu.aliyuncs.com/miniapp/uploads/2024-02-24/undone.png"></figure>`
|
||||||
|
// strings = strings.replaceAll("figure", "div");
|
||||||
|
// strings = strings.replaceAll("<img", "<img style='width:100%'");
|
||||||
|
console.log(strings)
|
||||||
const userInfo = ref(null)
|
const userInfo = ref(null)
|
||||||
// const content = ref(null)
|
// const content = ref(null)
|
||||||
const a_info = ref(null)
|
const a_info = ref(null)
|
||||||
@ -36,6 +41,10 @@
|
|||||||
const res = await api.getArticleDetail({id})
|
const res = await api.getArticleDetail({id})
|
||||||
if(res.code == 0) {
|
if(res.code == 0) {
|
||||||
a_info.value = res.data
|
a_info.value = res.data
|
||||||
|
if(a_info.value.content) {
|
||||||
|
a_info.value.content = a_info.value.content.replaceAll("figure", "div");
|
||||||
|
a_info.value.content = a_info.value.content.replaceAll("<img", "<img style='width:100%'");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
@ -67,15 +76,19 @@
|
|||||||
}
|
}
|
||||||
a_info.value.is_favorite = type
|
a_info.value.is_favorite = type
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<view class="detailBox">
|
<view class="detailBox">
|
||||||
<view class="title">
|
<view class="title">
|
||||||
{{a_info?.title}}
|
{{a_info?.title}}
|
||||||
</view>
|
</view>
|
||||||
<view v-if="a_info" class="more-info small-text">{{util.timestampToDate(a_info?.CreatedAt)}}</view>
|
<view v-if="a_info" class="more-info small-text">{{util.timestampToDate(a_info?.CreatedAt)}}</view>
|
||||||
<view class="d-content" v-html="a_info?.content"></view>
|
<!-- <view class="d-content">
|
||||||
|
<rich-text :nodes="a_info?.content"></rich-text>
|
||||||
|
</view> -->
|
||||||
|
<view v-if="a_info" class="d-content" v-html="a_info.content">
|
||||||
|
</view>
|
||||||
<view class="action-box" v-if="a_info">
|
<view class="action-box" v-if="a_info">
|
||||||
<view class="ab-item">
|
<view class="ab-item">
|
||||||
<uni-icons color="gray" type="eye" size="30"></uni-icons>
|
<uni-icons color="gray" type="eye" size="30"></uni-icons>
|
||||||
@ -87,8 +100,8 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<emptyCard title="暂无内容" v-if="!a_info"></emptyCard>
|
<emptyCard title="暂无内容" v-if="!a_info"></emptyCard>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.action-box{
|
.action-box{
|
||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
@ -115,5 +128,5 @@
|
|||||||
.d-content{
|
.d-content{
|
||||||
line-height: 50rpx;
|
line-height: 50rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
BIN
static/done.png
Before Width: | Height: | Size: 73 KiB |
Before Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 33 KiB |
Before Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 1.1 MiB |
Before Width: | Height: | Size: 71 KiB |
BIN
static/vip2.png
Before Width: | Height: | Size: 126 KiB |
@ -57,11 +57,11 @@ export const useStore = defineStore('main2', {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
checkLogin(){ // 检查是否登录
|
checkLogin(){ // 检查是否登录
|
||||||
let access_token = uni.getStorageSync('access_token')
|
// let access_token = uni.getStorageSync('access_token')
|
||||||
// let visitState = uni.getStorageSync('visitState')
|
let u_info = uni.getStorageSync('userInfo')
|
||||||
console.log(access_token)
|
// console.log("u_info is ",u_info)
|
||||||
if(access_token) {
|
if(u_info) {
|
||||||
this.access_token = access_token
|
this.access_token = uni.getStorageSync('access_token')
|
||||||
this.isLogin = true
|
this.isLogin = true
|
||||||
this.userInfo = uni.getStorageSync('userInfo')
|
this.userInfo = uni.getStorageSync('userInfo')
|
||||||
this.operation_info = uni.getStorageSync('operation_info')
|
this.operation_info = uni.getStorageSync('operation_info')
|
||||||
@ -181,6 +181,87 @@ export const useStore = defineStore('main2', {
|
|||||||
})
|
})
|
||||||
},duration)
|
},duration)
|
||||||
|
|
||||||
|
},
|
||||||
|
async getAccess_token(params={}) {
|
||||||
|
//清除token缓存
|
||||||
|
wx.clearStorageSync();
|
||||||
|
//访问接口
|
||||||
|
const data={
|
||||||
|
username:params.code,//手机号按钮获取的code
|
||||||
|
type:'wechat_mini_app',
|
||||||
|
identity:'user',
|
||||||
|
password:'111'
|
||||||
|
}
|
||||||
|
// console.log('登录参数:',data);return;
|
||||||
|
const res = await api.getToken(data)
|
||||||
|
if(res.code === 200) {
|
||||||
|
// newUser.value = res.data.newUser
|
||||||
|
// res.data.newUser = true // 开发阶段专用,正式版请删除或注释
|
||||||
|
if(res.data.newUser) { // 新用户,不做任何缓存动作,跳转登录页
|
||||||
|
let userId = res.data.userId
|
||||||
|
let res_p=await new Promise(resolve=>{
|
||||||
|
uni.login({
|
||||||
|
provider: 'weixin', //使用微信登录
|
||||||
|
success: function (loginRes) {
|
||||||
|
resolve(loginRes);
|
||||||
|
// console.log(loginRes,'微信登录返回信息');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
// 正式版记住放开下面这行注释掉的代码
|
||||||
|
uni.setStorageSync('access_token','Bearer '+res.data.access_token);// 为了wx登录成功,必须token单独缓存一次
|
||||||
|
let res2= await api.wx_login({code:res_p.code},userId);
|
||||||
|
if(res2.code === 0) {
|
||||||
|
// this.checkLogin()
|
||||||
|
// this.toLogin(encodeURIComponent(JSON.stringify(res.data))) // 跳转登录页,但是我不想这么做
|
||||||
|
this.toProfile(encodeURIComponent(JSON.stringify(res.data)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
let res_form = {}
|
||||||
|
uni.setStorageSync('avatarUrl', res.data.avatar);//avatarUrl
|
||||||
|
res_form = res.data
|
||||||
|
res_form.access_token = 'Bearer '+res.data.access_token
|
||||||
|
let userId = res.data.userId
|
||||||
|
uni.setStorageSync('access_token',res_form.access_token);// token单独缓存一次
|
||||||
|
this.wx_login(userId, res_form)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
uni.showToast({
|
||||||
|
icon:"error",
|
||||||
|
title:res.msg,
|
||||||
|
duration:2000
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async wx_login(userId, res_form) {
|
||||||
|
let res=await new Promise(resolve=>{
|
||||||
|
uni.login({
|
||||||
|
provider: 'weixin', //使用微信登录
|
||||||
|
success: function (loginRes) {
|
||||||
|
resolve(loginRes);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
let res2 = await api.wx_login({code:res.code},userId);
|
||||||
|
if(res2.code === 0) {
|
||||||
|
uni.setStorageSync('userInfo',JSON.stringify(res_form))
|
||||||
|
this.checkLogin()
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
uni.clearStorage();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
toLogin(token_info) {
|
||||||
|
uni.navigateTo({
|
||||||
|
url:"/pages/login/login?token_info="+token_info
|
||||||
|
})
|
||||||
|
},
|
||||||
|
toProfile(token_info = null) {
|
||||||
|
uni.navigateTo({
|
||||||
|
url:"/pages/user/userInfo?token_info="+token_info
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
@ -103,9 +103,20 @@ export default {
|
|||||||
return { m: s * 1000, km: Number(s.toFixed(2)) }
|
return { m: s * 1000, km: Number(s.toFixed(2)) }
|
||||||
},
|
},
|
||||||
checkLogin(){
|
checkLogin(){
|
||||||
let token = uni.getStorageSync('access_token')
|
// let token = uni.getStorageSync('access_token')
|
||||||
console.log(token)
|
let u_info = uni.getStorageSync('userInfo')
|
||||||
if(token){
|
if(u_info){
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
// 有缓存信息,就访问登录接口,没有缓存就直接返回未登录
|
||||||
|
checkLoginPro(){
|
||||||
|
// let token = uni.getStorageSync('access_token')
|
||||||
|
let u_info = uni.getStorageSync('userInfo')
|
||||||
|
if(u_info){ // 有缓存信息,访问登录接口
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|