Compare commits

..

No commits in common. 'main' and 'master' have entirely different histories.
main ... master

@ -20,7 +20,6 @@ const API = {
getTodoist:(data,userId) => net.GET("/user/todo",data,true,{"userId":userId}),// 获取待办事项
getVisionList:data => net.GET("/vision/list",data),// 获取测试记录
todoFinished:data => net.PUT("/user/todo",data),// 修改待办列表状态
todayTodoList:data => net.GET("/user/todo/today",data),// 今天待办列表
// 百科
getArticleList:data => net.GET("/article/list",data),// 百科列表
getArticleDetail:(data,userId) => net.GET("/article/"+data.id,null,true,{"userId":userId}),// 文章详情

@ -1,6 +1,8 @@
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';
// function JSON_to_URLEncoded(element,key,list){
// var list = list || [];
@ -74,20 +76,20 @@ export default {
});
}
}
if(res.data.code === 7) { // 登录失败
const store = useStore()
store.afterFailLogin(2000)
uni.showToast({
title:res.msg,
icon:"error",
duration:2000,
mask:true,
// success() {
// console.log(1212121)
// store.afterFailLogin(2000)
// }
})
}
// if(res.data.code === 7) { // 登录失败
// uni.showToast({
// title:res.msg,
// icon:"error",
// duration:2000,
// mask:true,
// success() {
// if(res.code === 7) // 登录失败
// {
// store.afterFailLogin(2000)
// }
// }
// })
// }
return res.data;
} else {
const reg = /abort/;

@ -42,6 +42,6 @@
<style scoped lang="scss">
.aikefuBox{
// margin-top: 200rpx;
margin-top: 200rpx;
}
</style>

@ -1,7 +1,6 @@
// isdev 为 true 表示开发环境 false 表示发布环境
const isdev = false;
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 isdev = true;
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://192.168.1.133:8899' : 'https://api.gwkjxb.com';// 办公室接口 & 正式环境
// const baseUrl = 'https://api.gwkjxb.com';// 正式环境(由于本地测试后台没有启动,暂时通用正式服)

@ -52,11 +52,10 @@
"mp-weixin" : {
"appid" : "wxaaf66dbb5c3983b3",
"setting" : {
"urlCheck" : false,
"minified" : true
"urlCheck" : false
// "ignoreDevUnusedFiles": false ,
// "ignoreUploadUnusedFiles": false
},
// "ignoreDevUnusedFiles": false ,
// "ignoreUploadUnusedFiles": false
"usingComponents" : true
},
"mp-alipay" : {

@ -84,8 +84,8 @@
}
// console.log(res.height,w_h.value)
}).exec()
}
</script>
}
</script>
<template>
<view class="aikefuBox page-box page-bg-gray" style="height: 100%;">
<!-- 信息展示区域 -->
@ -118,8 +118,8 @@
</view>
</view>
</view>
</view>
</template>
</view>
</template>
<style scoped lang="scss">
.aikefuBox{
height: 100%;
@ -164,7 +164,6 @@
position: fixed;
bottom: 0px;
width: 100%;
box-shadow: 0px -10px 20px 1px #eaeaea;
.input-box{
padding: 20rpx;
display: flex;
@ -200,5 +199,5 @@
.ac-part{
}
}
}
</style>

@ -77,17 +77,6 @@
}
])
//
function subscribeFunc() {
uni.requestSubscribeMessage({
         tmplIds: ['BKyIwkt7HHEQoQ9ByrHqnHaGO5jq8d-MCp9YYGK23TE'],
         success: (res) => {
             console.log(res);
        },
fail(res) {
 console.log(res);
}
    })
}
function init(){
// list.value = []
list_box.value[c_index.value].list = []
@ -149,7 +138,6 @@
handle_info.value = item
handle_info_index.value = i
inputDialog.value.open()
subscribeFunc()
}
function finishFunc() {
// api.todoFinished
@ -164,7 +152,7 @@
})
uni.showToast({
title:res_.msg,
icon:"success",
icon:"error",
duration:2000,
mask:true,
success() {
@ -191,8 +179,7 @@
{{item.content}}
</view>
<view class="td-info small-text">
<!-- {{util.timestampToDate(item.CreatedAt)}} -->
{{item.remindDay + " " +item.remindTime}}
{{util.timestampToDate(item.CreatedAt)}}
</view>
</view>
<emptyCard v-else></emptyCard>
@ -209,24 +196,6 @@
{{handle_info?.content}}
</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-left">创建时间</view>
<view class="pb-item-right">

@ -14,18 +14,16 @@
const h_index = ref(0)
onShow((e) => {
getLbtList()
// if(!store.userInfo && !store.operation_info) { //
if(!store.userInfo) { //
// getHospitalList()
// setTimeout(()=>{
// inputDialog.value.open()
// },0)
} else {
// setTimeout(()=>{
// inputDialog.value.close()
// },0)
getTodayTodoList()
if(store.userInfo && !store.operation_info) { //
getHospitalList()
setTimeout(()=>{
inputDialog.value.open()
},0)
}
let s = `$http({code:'1s'});if`
// // let arr = /\$http\((\S*)\)\;if/.exec(s);
let arr = s.match(/\$http\((.*)\)\;if/)
console.log(arr[1])
})
//
@ -50,59 +48,7 @@
pageSize:1000,
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() {
const res = await api.getHospitalList(h_queryParams.value)
if(res.code == 0) {
@ -213,7 +159,6 @@
// if(state_index === 0) {
// url = '/pages/index/done?state_index='+state_index
// }
subscribeFunc()
uni.navigateTo({
url
})
@ -230,19 +175,15 @@
}
function bindPickerChange(e) {
console.log(hospitals.value )
h_index.value = e.detail.value
}
//
async function getPhoneNumber (e) {
await store.getAccess_token({code:e.detail.code})
toClose()
}
</script>
<template>
<view class="content page-box">
<!-- 背景图 -->
<view class="bg-imgs-card">
<image src="https://jmyl-app.oss-cn-chengdu.aliyuncs.com/miniapp/bg.png" mode="aspectFill"></image>
<image src="../../static/style/bg.png" mode="aspectFill"></image>
</view>
<!-- 轮播图 -->
<mySwiper :indicatorDots="true" :isRadius="true" height="160" class="index-siwper margin-b-card" :lbt_list="lbt_list" style="width: 100%;" />
@ -252,15 +193,6 @@
<uni-icons type="forward" color="#9bc027" size="20"></uni-icons>
</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}}: &nbsp;{{todayTodoListShow.content}}</view>
</view>
</view>
</view> -->
<view class="attention-card">
<!-- <view class="part-title">
测试记录
@ -316,21 +248,11 @@
<view class="test-text">视力自测小助手</view>
<image class="test-img" src="../../static/style/test.png" mode=""></image>
</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}}: &nbsp;{{todayTodoListShow.content}}</view>
</view>
</view>
</view>
<uni-popup ref="inputDialog" @tap="toBlur" :is-mask-click='false'>
<view class="pop-box">
<view class="pb-title">您好, 请先登录</view>
<view class="pb-title">完善手术信息</view>
<view class="pb-content">
<!-- <view class="pb-item">
<view class="pb-item">
<view class="pb-item-left">已经手术</view>
<view class="pb-item-right">
<radio-group @change="radioChange">
@ -342,58 +264,38 @@
<view class="pb-item">
<view class="pb-item-left">手术时间</view>
<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>
</view>
</view>
<view class="pb-item">
<view class="pb-item-left">医院名称</view>
<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">
<view class="uni-input">{{hospitals[h_index]?.name}}</view>
</picker>
</view>
</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 class="pb-item pb-item-btn" @tap="toSave"></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>
<aikefu />
</view>
</template>
<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{
padding: 30rpx 20rpx;
margin: 20rpx 0;

@ -99,21 +99,6 @@
uni.showLoading({
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
if(uni.getStorageSync('operation_info')) {
operation_info = JSON.parse(uni.getStorageSync('operation_info'))
@ -148,18 +133,6 @@
}
})
}
} else {
uni.showToast({
title:'请填写手术信息',
icon:"error",
duration:2000,
mask:true,
success() {
setTimeout(() => {
store.toProfile()
},2000)
}
})
}
uni.hideLoading();
}
@ -181,9 +154,9 @@
const handle_info = ref(null)
const handle_info_index = ref(0)
function handle_func(item,i) {
// handle_info.value = item
// handle_info_index.value = i
// inputDialog.value.open()
handle_info.value = item
handle_info_index.value = i
inputDialog.value.open()
}
function finishFunc() {
// api.todoFinished
@ -212,33 +185,23 @@
}
}
})
}
</script>
}
</script>
<template>
<view class="todoBox page-box">
<cc-newsTabs class="ccTabs" style="position: fixed;top: 0px;" :tabArr="tabArr" :o_index="c_index" @tabChange="tabChange"></cc-newsTabs>
<cc-newsTabs :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-item v-for="(item1) in list_box" :key="item1" style="overflow: auto;">
<swiper-item v-for="(item1,i1) in list_box">
<view class="todoBox">
<template v-if="item1.list.length>0" >
<view v-for="(item,i) in item1.list" @tap="handle_func(item,i)" :key="i" class="td-item swiper-item uni-bg-green">
<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 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">
<view class="td-content text-ellipsis-2">
{{item.content}}
</view>
<view class="td-info small-text">
{{util.timestampToDate(item.CreatedAt)}}
</view>
</template>
<template v-else>
<emptyCard />
</template>
</view>
<emptyCard v-else></emptyCard>
</view>
</swiper-item>
</swiper>
@ -263,18 +226,11 @@
</view>
</uni-popup>
</view>
</template>
</view>
</template>
<style scoped lang="scss">
.ccTabs{
position: fixed;
top: 0px;
width: 100%;
z-index: 100;
}
.swiper{
height: var(--size);
margin-top: 80rpx;
}
.todoBox{
padding: 20rpx;
@ -333,5 +289,5 @@
.uni-popup__wrapper{
width: 100%;
}
}
}
</style>

@ -10,11 +10,11 @@
const store = useStore()
onLoad((e) => {
res_.value = JSON.parse(decodeURIComponent(e.res))
// console.log(res_.value)
// console.log(store.bgList)
// if(store.bgList.length>0) {
// bg_imgs.value = store.bgList
// }
console.log(res_.value)
console.log(store.bgList)
if(store.bgList.length>0) {
bg_imgs.value = store.bgList
}
randomFunc()
})
//
@ -29,49 +29,24 @@
const avatarUrl = ref(null)
const info = ref({left:'',right:''})
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() {
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))
bg_index.value = parseInt((Math.random()*store.bgList.length))
uni.getImageInfo({
// src:bg_imgs.value[bg_index.value],
src: bg_list.value[bg_list_index.value],
src:bg_imgs.value[bg_index.value].url,
success:function(res) {
avatarUrl.value = uni.getStorageSync('avatarUrl')
// info.value.left = parseFloat(res_.value.leftEyeVision)
// info.value.right = parseFloat(res_.value.rightEyeVision)
info.value.left = res_.value.leftEyeVision
info.value.right = res_.value.rightEyeVision
show_.value = true
//
info.value.left = getRightNum(info.value.left)
info.value.right = getRightNum(info.value.right)
},
fail(err) {
console.log(err)
}
})
}
function getRightNum(num) {
if((num+'').length === 1) {
num = num+'.0'
}
return num
}
</script>
}
</script>
<template>
<view class="visionTestBox page-box">
<!-- <view class="actionBox" :style="{background:`url(${bg_imgs[bg_index]})`}">
@ -79,7 +54,7 @@
</view> -->
<view class="actionBox">
<view class="img-box">
<image style="width: 100%;" :src="bg_list[bg_list_index]" mode="widthFix"></image>
<image style="width: 100%;" :src="bg_imgs[bg_index].url" mode="widthFix"></image>
<view v-if="show_" class="avatar-box">
<image :src="avatarUrl" mode="widthFix"></image>
</view>
@ -89,8 +64,8 @@
</view>
</view>
</view>
</view>
</template>
</view>
</template>
<style scoped lang="scss">
.avatar-box{
width: 100%;
@ -189,5 +164,5 @@
width: 80%;
margin: 0 auto;
border-radius: 20rpx;
}
}
</style>

@ -1,6 +1,6 @@
<script setup>
<script setup>
//
import { onLoad, onBackPress } from "@dcloudio/uni-app"
import { onLoad } from "@dcloudio/uni-app"
// import mySwiper from "@/components/mySwiper.vue"
import {ref,onMounted,nextTick,watch} from "vue"
import {useStore} from '@/store/index.js'
@ -9,37 +9,116 @@
import custom from "@/utils/index.js"
onLoad((e) => {
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 avatarUrl = ref(null)
const nickname = ref('')
var isOperation = ref([ //
{
index:0,
name:"否"
},
{
index: 1,
name: "是"
}
])
const res_form = ref(null)
watch(nickname,(v1,v2)=> {
console.log("watch",v1)
})
//
function onChooseAvatar(e) {
// const { avatarUrl } = e.detail
// console.log(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(){ // ,
let user_info = JSON.parse(uni.getStorageSync('userInfo'))
user_info.avatar = avatarUrl.value
user_info.id =user_info.userId
// console.log(user_info)
return await api.userinfoUpdae(user_info)
}
function nameInput(e) {
nickname.value = e.detail.value
// console.log('',e)
// console.log('nickname:',nickname.value)
}
async function updateInfoFunc() {
if(!avatarUrl.value) {
@ -58,25 +137,23 @@
})
return
}
// let user_info = JSON.parse(uni.getStorageSync('userInfo'))
await custom.uploadImage(avatarUrl.value,async (file)=>{
avatarUrl.value = file.data.file.url
uni.setStorageSync('avatarUrl', file.data.file.url);//
token_info.value.nickname = nickname.value
token_info.value.avatar = avatarUrl.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() //
store.checkLogin() //
uni.setStorageSync('access_token','Bearer '+token_info.value.access_token);// token
uni.switchTab({
url:"/pages/user/index"
})
})
}
function bindOperationPickerChange(e) {
token_info.value.IsSurgery = e.detail.value
}
</script>
</script>
<template>
<view class="loginBox page-box img-part card-part" style="text-align:center">
<view class="base-info">
@ -86,60 +163,13 @@
</button>
<input type="nickname" @blur="nameInput" class="weui-input" placeholder="请输入昵称" v-model="nickname" />
</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">
<!-- <button class="buy-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"></button> -->
<button class="buy-btn" @tap="updateInfoFunc"></button>
</view>
</view>
</template>
</view>
</template>
<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{
padding: 50rpx 0;
}
@ -170,7 +200,7 @@
border-radius: 50rpx;
font-weight: 200;
font-size: 24rpx;
width: 80%;
width: 50%;
padding: 10rpx 0;
}
.title-part{
@ -195,5 +225,5 @@
}
.weui-input{
}
}
</style>

@ -66,7 +66,7 @@
}
function getPhoneNumber (e) {
// tel_code.value = e.detail.code
// console.log(e)
console.log(e)
getAccess_token({code:e.detail.code})
// console.log(e.detail.code) //
// console.log(e.detail.errMsg) //
@ -74,7 +74,7 @@
}
async function getAccess_token(params={}){//token
//token
wx.clearStorageSync();
// wx.clearStorageSync();
//访
const data={
username:params.code,//code
@ -86,7 +86,6 @@
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=>{
@ -94,17 +93,15 @@
provider: 'weixin', //使
success: function (loginRes) {
resolve(loginRes);
// console.log(loginRes,'');
console.log(loginRes,'微信登录返回信息');
}
});
});
//
uni.setStorageSync('access_token','Bearer '+res.data.access_token);// token
let res2=await api.wx_login({code:res_p.code},userId);
if(res2.code === 0) {
store.checkLogin()
// toLogin(encodeURIComponent(JSON.stringify(res.data)))
store.toProfile(encodeURIComponent(JSON.stringify(res.data)))
toLogin(encodeURIComponent(JSON.stringify(res.data)))
}
}
else{
@ -148,7 +145,7 @@
uni.clearStorage();
}
}
</script>
</script>
<template>
<view class="user-box page-box">
<view class="userinfo-box" @tap="toUserInfo">
@ -210,8 +207,8 @@
</view>
</view>
</view>
</view>
</template>
</view>
</template>
<style scoped lang="scss">
.buy-btn{
display: inline-block;
@ -285,5 +282,5 @@
}
.user-box{
background: #f6f6f6;
}
}
</style>

@ -6,34 +6,28 @@
import {useStore} from '@/store/index.js'
const store = useStore()
import api from "@/api/index.js"
import custom from "@/utils/index.js"
const h_index = ref(0)
onLoad(async (e) => {
await getHospitalList()
is_login.value = custom.checkLogin()
if(!is_login.value) { //
userinfo.value = JSON.parse(decodeURIComponent(e.token_info))
} else { //
userinfo.value = JSON.parse(uni.getStorageSync('userInfo'))
h_info.value = userinfo.value
h_info.value.surgery_time = h_info.value.SurgeryTime
userinfo.value.avatar = uni.getStorageSync('avatarUrl')
h_index.value = hospitals.value.findIndex((item,i) => {
return item.ID == userinfo.value.HospitalId
})
if(userinfo.value.HospitalId) {
getHospital(userinfo.value.HospitalId)
onLoad(() => {
getHospitalList()
// console.log(useStore.userInfo)
userinfo.value = JSON.parse(uni.getStorageSync('userInfo'))
console.log(userinfo.value)
avatar.value = uni.getStorageSync('avatarUrl')
if(uni.getStorageSync('operation_info')) {
h_info.value = JSON.parse(uni.getStorageSync('operation_info'))
if(h_info.value) {
// console.log(h_info.value)
getHospital(h_info.value.hospitalId)
}
}
})
//
const is_login = ref(false)
const h_queryParams = ref({
page:1,
pageSize:1000,
key:''
})
const hospitals = ref([])
const hospitals = ref(null)
const userinfo = ref({})
const avatar = ref(null)
const h_info = ref({})
@ -51,6 +45,7 @@
}
}
function onInputH() {
console.log(hValue.value)
h_queryParams.value.key = hValue.value
getHospitalList()
@ -110,42 +105,28 @@
return `${year}-${month}-${day}`;
}
function bindDateChange(e) {
// console.log(e)
console.log(e)
h_info.value.surgery_time = e.detail.value
}
function toChooseH(item) {
// console.log(item)
console.log(item)
choosed_h.value = item
hValue.value = item.name
// hospitals.value = null
}
async function sumbmitFunc() {
await custom.uploadImage(userinfo.value.avatar, async (file) => {
userinfo.value.avatar = file.data.file.url
})
// console.log(choosed_h.value,h_info.value,userinfo.value)
let obj = {
id: userinfo.value.userId,
// isSurgery: userinfo.value.isSurgery,// 0 - 1 -
// isSurgery: 1, // 01
surgery_time: h_info.value?.surgery_time, //
nickname: userinfo.value.nickname,
avatar: userinfo.value.avatar,
// avatar: '',
phone: userinfo.value.phone,
hospitalId:hospitals.value[h_index.value]?.ID
}
if(!obj.hospitalId) {
uni.showToast({
title: "请选择医院",
icon: "error",
duration: 2000
})
return
hospitalId:choosed_h.value?.ID
}
obj.isSurgery = parseInt(userinfo.value.IsSurgery)
// if(!is_login.value) { // -
// }
userinfo.value.SurgeryTime = obj.surgery_time
const res = await api.userinfoUpdae(obj) //
const res = await api.userinfoUpdae(obj)
// console.log('res is ',res)
if(res.code === 0) {
uni.showToast({
title:res.msg,
@ -171,16 +152,13 @@
provider: 'weixin', //使
success: function (loginRes) {
resolve(loginRes);
console.log(loginRes,'微信登录返回信息');
}
});
});
let res2=await api.wx_login({code:res.code},userId);
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('operation_info', JSON.stringify(h_info.value))
// is_login.value = custom.checkLogin()
store.checkLogin()
}
@ -189,36 +167,14 @@
}
}
function bindPickerChange(e) {
// console.log(hospitals.value )
console.log(hospitals.value )
h_index.value = e.detail.value
}
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>
}
</script>
<template>
<view class="userInfoBox page-box page-bg-gray">
<view class="avatar-box">
<!-- <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>
<image :src="avatar" mode="aspectFill"></image>
</view>
<view class="row-box">
<view class="rb-card" @tap="toDetail(1)">
@ -243,57 +199,37 @@
</view>
</view>
</view>
<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="userinfo.IsSurgery" :range="isOperation" range-key="name" >
<view class="rbc-content-row rbc-content-right">
<view class="uni-input">{{ isOperation[userinfo.IsSurgery]?.name }}</view>
<uni-icons type="forward" color="gray" size="20"></uni-icons>
</view>
</picker>
</view>
<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="uni-input">{{hospitals[h_index]?.name}}</view>
</picker>
</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>
<!--修改姓名/电话 弹窗 -->
<uni-popup ref="inputDialog" >
@ -314,22 +250,9 @@
</view>
</uni-popup>
<view class="pb-item pb-item-btn" style="margin-top: 40rpx;" @tap="sumbmitFunc"></view>
</view>
</template>
</view>
</template>
<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{
display: flex;
align-items: center;
@ -337,14 +260,6 @@
width: 100%;
padding: 20rpx 0;
background: #26758d;
button{
image{
width: 160rpx;
height: 160rpx;
background-color: white;
border-radius: 50%;
}
}
image{
width: 160rpx;
height: 160rpx;
@ -464,5 +379,5 @@
.uni-popup__wrapper{
width: 100%;
}
}
}
</style>

@ -28,11 +28,6 @@
getDetail(e.id)
})
//
let strings = `<div style="text-align: center; "><p>&nbsp;测试内容222sdadd&nbsp;</p><figure class="image"><img src="https://jmyl-app.oss-cn-chengdu.aliyuncs.com/miniapp/uploads/2024-02-24/undone.png"/></figure></div>`
// `<p>&nbsp;222sdadd&nbsp;</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 content = ref(null)
const a_info = ref(null)
@ -41,10 +36,6 @@
const res = await api.getArticleDetail({id})
if(res.code == 0) {
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{
uni.showToast({
@ -76,19 +67,15 @@
}
a_info.value.is_favorite = type
}
</script>
}
</script>
<template>
<view class="detailBox">
<view class="title">
{{a_info?.title}}
</view>
<view v-if="a_info" class="more-info small-text">{{util.timestampToDate(a_info?.CreatedAt)}}</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="d-content" v-html="a_info?.content"></view>
<view class="action-box" v-if="a_info">
<view class="ab-item">
<uni-icons color="gray" type="eye" size="30"></uni-icons>
@ -100,8 +87,8 @@
</view>
</view>
<emptyCard title="暂无内容" v-if="!a_info"></emptyCard>
</view>
</template>
</view>
</template>
<style scoped lang="scss">
.action-box{
margin-top: 20px;
@ -128,5 +115,5 @@
.d-content{
line-height: 50rpx;
}
}
}
</style>

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

@ -57,11 +57,11 @@ export const useStore = defineStore('main2', {
});
},
checkLogin(){ // 检查是否登录
// let access_token = uni.getStorageSync('access_token')
let u_info = uni.getStorageSync('userInfo')
// console.log("u_info is ",u_info)
if(u_info) {
this.access_token = uni.getStorageSync('access_token')
let access_token = uni.getStorageSync('access_token')
// let visitState = uni.getStorageSync('visitState')
console.log(access_token)
if(access_token) {
this.access_token = access_token
this.isLogin = true
this.userInfo = uni.getStorageSync('userInfo')
this.operation_info = uni.getStorageSync('operation_info')
@ -181,87 +181,6 @@ export const useStore = defineStore('main2', {
})
},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,20 +103,9 @@ export default {
return { m: s * 1000, km: Number(s.toFixed(2)) }
},
checkLogin(){
// let token = uni.getStorageSync('access_token')
let u_info = uni.getStorageSync('userInfo')
if(u_info){
return true
}
else{
return false
}
},
// 有缓存信息,就访问登录接口,没有缓存就直接返回未登录
checkLoginPro(){
// let token = uni.getStorageSync('access_token')
let u_info = uni.getStorageSync('userInfo')
if(u_info){ // 有缓存信息,访问登录接口
let token = uni.getStorageSync('access_token')
console.log(token)
if(token){
return true
}
else{

Loading…
Cancel
Save