Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
闫晓茹 2023-11-10 09:46:36 +08:00
commit 132e8a6f20
4 changed files with 32 additions and 45 deletions

View File

@ -35,30 +35,23 @@
<view class="Threecategories"> <view class="Threecategories">
<view class="item" @tap="goBehaviorpoints"> <view class="item" @tap="goBehaviorpoints">
<view class="number"> <view class="number">
0 {{appPersonallist.score>=0?appPersonallist.score:0}}
</view> </view>
<view class="text"> <view class="text">
行为积分 行为积分
</view> </view>
</view> </view>
<view class="item" @tap='gointegral'> <view class="item" @tap='gointegral'>
<view class="number" v-if="!appPersonallist.integral"> <view class="number">
0 {{appPersonallist.integral>=0?appPersonallist.integral:0}}
</view>
<view class="number" v-else>
{{appPersonallist.integral}}
</view> </view>
<view class="text"> <view class="text">
健康豆 健康豆
</view> </view>
</view> </view>
<view class="item" @tap='gocoupon'> <view class="item" @tap='gocoupon'>
<view class="number" <view class="number">
v-if="appPersonallist.patientCouponCount==0 ||!appPersonallist.patientCouponCount"> {{appPersonallist.patientCouponCount>=0?appPersonallist.patientCouponCount:0}}
0
</view>
<view class="number" v-else>
{{appPersonallist.patientCouponCount}}
</view> </view>
<view class="text"> <view class="text">
优惠券 优惠券

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="app"> <view class="app" v-if="prejectlist.data">
<view class="content" v-for="(item,index) in prejectlist" @tap="result(item)"> <view class="content" v-for="(item,index) in prejectlist" @tap="result(item)">
<view class="big">{{item.projectName}} <view class="big">{{item.projectName}}
</view> </view>
@ -8,6 +8,10 @@
</view> </view>
</view> </view>
</view> </view>
<view class="app" v-else>
<u-empty mode="order" icon-size='220' text="暂无筛查结果"></u-empty>
</view>
</template> </template>
<script> <script>
@ -18,16 +22,16 @@
data() { data() {
return { return {
prejectlist:{}, prejectlist: {},
userinfo:{} userinfo: {}
}; };
}, },
onShow() { onShow() {
this.userinfo=uni.getStorageSync('userinfo'); this.userinfo = uni.getStorageSync('userinfo');
var patientId=this.userinfo.id var patientId = this.userinfo.id
projectTypedata(patientId).then(res=>{ projectTypedata(patientId).then(res => {
this.prejectlist=res.data this.prejectlist = res.data
console.log(res) console.log(res)
}) })
@ -35,15 +39,15 @@
}, },
methods: { methods: {
resultstype(){ resultstype() {
}, },
// //
result(item){ result(item) {
console.log(item) console.log(item)
uni.navigateTo({ uni.navigateTo({
url: `/pagesB/screeningResult/screeningResult?projectId=${item.projectId}` url: `/pagesB/screeningResult/screeningResult?projectId=${item.projectId}`
}); });
console.log(item) console.log(item)
} }

View File

@ -1,5 +1,5 @@
<template> <template>
<view class="app"> <view class="app" v-if="prejectlist.data">
<view class="content" v-for="(item,index) in prejectlist"> <view class="content" v-for="(item,index) in prejectlist">
<view class="big">{{item.projectName}} <view class="big">{{item.projectName}}
</view> </view>
@ -10,19 +10,9 @@
详情 详情
</view> </view>
</view> </view>
<!-- <view class="content"> </view>
<view class="big">眼底筛查 <view class="app" v-else>
<u-empty mode="order" icon-size='220' text="暂无筛查记录"></u-empty>
</view>
<view class="servename">
2023-12-12 12:12:12
</view>
<view class="appoint" @tap="goapponint">
详情
</view>
</view> -->
</view> </view>
</template> </template>
@ -42,8 +32,8 @@
var patientId=this.userinfo.id var patientId=this.userinfo.id
projectTypedata(patientId).then(res=>{ projectTypedata(patientId).then(res=>{
this.prejectlist=res.data this.prejectlist=res.data
}) })
// this.resultstype(); // this.resultstype();
}, },

View File

@ -18,8 +18,9 @@
<view class="doctorSend" v-else> <view class="doctorSend" v-else>
<image class="head" src="@/static/docHead.png"></image> <image class="head" src="@/static/docHead.png"></image>
<view class=""> <view class="">
<text>{{item.senderName}}</text> <!-- <text>{{item.senderName}}</text> -->
<view class="sendBox" v-if="item.content">{{item.content}}</view> <view class="sendBox" v-if="item.messageType==1">{{item.content}}</view>
<image v-if="item.messageType==2" :src="baseurl+item.content" class="snedItemimage" />
</view> </view>
</view> </view>
<video v-if="item.video" :src="item.video"></video> <video v-if="item.video" :src="item.video"></video>
@ -356,7 +357,6 @@
// console.log(JSON.stringify(res.tempFilePaths)); // console.log(JSON.stringify(res.tempFilePaths));
} }
}); });
} }
}, },
// //
@ -764,4 +764,4 @@
bottom: 38rpx; bottom: 38rpx;
} }
} }
</style> </style>