zhangqi
/
circulation_ancientCoins_new
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改文案、样式

master
zq 4 months ago
parent
e124791945
commit
848342516d
9 changed files with 58 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      components/preBookList.vue
  2. 10
      components/tabbar.vue
  3. 9
      components/userCard.vue
  4. 12
      components/visitorAccount.vue
  5. 2
      pages.json
  6. 8
      pages/index/index.vue
  7. 34
      pages/prebook/prebook.vue
  8. 2
      pages/usercenter/usercenter.vue
  9. 22
      pages/visit_detail/visit_detail.vue

15
components/preBookList.vue
View File

@ -152,8 +152,8 @@ export default {
&.status_wait{ &.status_wait{
view{ view{
background: #F8FFF7; background: #F8FFF7;
border: 1rpx solid #5BD07A; border: 1rpx solid #58CA7F;
color: #58CA7F; color: #30C563;
} }
} }
&.status_out_num{ &.status_out_num{
@ -170,18 +170,25 @@ export default {
color: #999999; color: #999999;
} }
} }
&.status_expire,&.status_cancle{ &.status_cancle{
view{ view{
background: #FCFCFC; background: #FCFCFC;
border: 1rpx solid #AEB0B8; border: 1rpx solid #AEB0B8;
color: #B6B8BF; color: #B6B8BF;
} }
} }
&.status_expire{
view{
background: #FFEEEE;
border: 1rpx solid #FD0000;
color: #FD3B3B;
}
}
&.status_ing{ &.status_ing{
view{ view{
border: 1rpx solid #5FA1CB; border: 1rpx solid #5FA1CB;
background: #F7FCFF; background: #F7FCFF;
color: #5FA1CB; color: #007FD0;
} }
} }
} }

10
components/tabbar.vue
View File

@ -13,7 +13,7 @@
<view class="scan_wrapper"> <view class="scan_wrapper">
<image :src="cssUrl+'scan.png'"></image> <image :src="cssUrl+'scan.png'"></image>
</view> </view>
<view :class="'scantxt '+[current==3?'tabbarYes':'tabbarNone']">扫码报道</view> <view :class="'scantxt '+[current==3?'tabbarYes':'tabbarNone']">扫码报到</view>
</view> </view>
<view class="tabbar_item tabbar_item04" @click="jumpto('/pages/usercenter/usercenter')" style=""> <view class="tabbar_item tabbar_item04" @click="jumpto('/pages/usercenter/usercenter')" style="">
@ -37,10 +37,10 @@
is_admin:{ is_admin:{
type: Boolean, type: Boolean,
default: false default: false
}, },
leftButtonText: { leftButtonText: {
type: String, type: String,
default: '文章' default: '文章'
} }
}, },
data() { data() {

9
components/userCard.vue
View File

@ -145,6 +145,12 @@ export default {
margin: 0; margin: 0;
width: calc(50% - 14rpx); width: calc(50% - 14rpx);
box-sizing: border-box; box-sizing: border-box;
display: flex;
justify-content: center;
align-items: center;
.checklist-content{
flex: none;
}
.checklist-content .checklist-text{ .checklist-content .checklist-text{
font-size: 30rpx; font-size: 30rpx;
font-weight: normal; font-weight: normal;
@ -162,7 +168,8 @@ export default {
&.is--button{ &.is--button{
margin-right: 0rpx; margin-right: 0rpx;
padding: 20rpx; padding: 20rpx 42rpx 20rpx 24rpx;
box-sizing: border-box;
border: none; border: none;
min-height: 82rpx; min-height: 82rpx;
border-radius: 8rpx; border-radius: 8rpx;

12
components/visitorAccount.vue
View File

@ -8,11 +8,11 @@
<view class="title PfScSemibold">单次项目</view> <view class="title PfScSemibold">单次项目</view>
<view class="item"> <view class="item">
<text>针灸</text> <text>针灸</text>
<text>余1次</text> <text>治疗1次</text>
</view> </view>
<view class="item"> <view class="item">
<text>麦粒灸</text> <text>麦粒灸</text>
<text>余3次</text> <text>治疗3次</text>
</view> </view>
<view class="item notice"> <view class="item notice">
<text>艾灸</text> <text>艾灸</text>
@ -26,11 +26,11 @@
<span class="package-name over">上热下寒疗程包</span> <span class="package-name over">上热下寒疗程包</span>
<view class="item"> <view class="item">
<text>针灸</text> <text>针灸</text>
<text>余1次</text> <text>治疗1次</text>
</view> </view>
<view class="item"> <view class="item">
<text>麦粒灸</text> <text>麦粒灸</text>
<text>余3次</text> <text>治疗3次</text>
</view> </view>
<view class="item notice"> <view class="item notice">
<text>艾灸</text> <text>艾灸</text>
@ -43,11 +43,11 @@
<span class="package-name over">上热下寒疗程包</span> <span class="package-name over">上热下寒疗程包</span>
<view class="item"> <view class="item">
<text>针灸</text> <text>针灸</text>
<text>余1次</text> <text>治疗1次</text>
</view> </view>
<view class="item"> <view class="item">
<text>麦粒灸</text> <text>麦粒灸</text>
<text>余3次</text> <text>治疗3次</text>
</view> </view>
<view class="item notice"> <view class="item notice">
<text>艾灸</text> <text>艾灸</text>

2
pages.json
View File

@ -74,7 +74,7 @@
"path" : "pages/visitors/visitors", "path" : "pages/visitors/visitors",
"style" : "style" :
{ {
"navigationBarTitleText": "就诊人", "navigationBarTitleText": "选择就诊人",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },

8
pages/index/index.vue
View File

@ -107,7 +107,7 @@
</view> </view>
<pre-book-list class="preg-books" :dataList="recentAppoint" :topnopadding="true"></pre-book-list> <pre-book-list class="preg-books" :dataList="recentAppoint" :topnopadding="true"></pre-book-list>
<tabbar current="1" leftButtonText="预约"></tabbar> <tabbar current="1" leftButtonText="主页"></tabbar>
</view> </view>
</template> </template>
@ -501,11 +501,11 @@
} }
.right{ .right{
// width: 200rpx; // width: 200rpx;
width: 172rpx; width: 172rpx;
flex-shrink: 0; flex-shrink: 0;
height: 100%; height: 100%;
color: #666666; color: #666666;
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
img{ img{
width: 52rpx; width: 52rpx;

34
pages/prebook/prebook.vue
View File

@ -134,29 +134,8 @@
depart_id:this.departId, depart_id:this.departId,
date:date?date:'' date:date?date:''
} }
//仅测试
// const data1={"date2work":{"2024-12-09":{"date":"2024-12-09","week_desc":"周三","work_desc":"上午出诊"},"2024-12-10":{"date":"2024-12-10","week_desc":"周四","work_desc":"上午出诊"},"2024-12-11":{"date":"2024-12-11","week_desc":"周五","work_desc":"不出诊"},"2024-09-30":{"date":"2024-09-30","week_desc":"周一","work_desc":"下午出诊"},"2024-10-01":{"date":"2024-10-01","week_desc":"周二","work_desc":"全天出诊"},"2024-10-02":{"date":"2024-10-02","week_desc":"周三","work_desc":"上午出诊"},"2024-10-03":{"date":"2024-10-03","week_desc":"周四","work_desc":"上午出诊"}},
// "date2time":{
// "am":[
// "8:00-08:30","08:30-09:00","09:00-09:30","09:30-10:00","10:00-10:30","10:30-11:00","11:00-11:30","11:30-12:00"
// ],"pm":[
// "13:00-13:30",
// "13:30-14:00",
// "14:00-14:30",
// "14:30-15:00",
// "15:00-15:30",
// "15:30-16:00",
// "14:00-14:30",
// "14:30-15:00",
// "15:00-15:30",
// "15:30-16:00",
// "16:00-16:30",
// "16:30-17:00",
// ]},
// "time2remain":{"8:00-08:30":1,"08:30-09:00":2,"09:00-09:30":20,"09:30-10:00":20,"10:00-10:30":20,"10:30-11:00":20,"11:00-11:30":20,"11:30-12:00":20}}
this.$http.req('/user/get_appoint_times',param, 'POST').then(data=>{ this.$http.req('/user/get_appoint_times',param, 'POST').then(data=>{
let date2work = data.date2work let date2work = data.date2work
// let date2work = data1.date2work;//后续可删除
let regxp = /^0/; let regxp = /^0/;
for(let key in date2work){ for(let key in date2work){
let itemObj = date2work[key]; let itemObj = date2work[key];
@ -169,16 +148,9 @@
itemObj['month'] = month itemObj['month'] = month
} }
} }
// this.RegistrationTimeList = date2work if(flag) {
// if(this.RegistrationTimeList.length>0) { this.$refs.book.dataInit(data,date)
if(flag) { }
// this.$refs.book.dataInit(data1['date2time'],data1['time2remain'])
this.$refs.book.dataInit(data,date)
// this.$refs.book.dataInit(data['date2time'],data['time2remain'],date)
// }else{
// this.$refs.book.chooseDay(chooseDay, this.RegistrationTimeList[chooseDay])
}
// }
}); });
}, },
closeConfirm() { closeConfirm() {

2
pages/usercenter/usercenter.vue
View File

@ -14,7 +14,7 @@
<view class="item" @click="toPrebookList"> <view class="item" @click="toPrebookList">
<img :src="cssUrl+'message.svg'" alt=""> <img :src="cssUrl+'message.svg'" alt="">
<view>候诊记录</view> <view>就诊记录</view>
</view> </view>
</view> </view>

22
pages/visit_detail/visit_detail.vue
View File

@ -51,7 +51,7 @@
export default { export default {
data() { data() {
return { return {
statusList:['status_wait', 'status_ing', 'status_down', 'status_out_num', 'status_expire', 'status_cancle'], statusList:{'9':'text_wait', '1':'text_ing', '2':'text_down', '3':'text_out_num', '4':'text_expire', '5':'text_cancle'},
statusStyleList:{'0':'status_wait', '1':'status_ing', '2':'status_down', '3':'status_out_num', '4':'status_expire','5':'status_cancle'}, statusStyleList:{'0':'status_wait', '1':'status_ing', '2':'status_down', '3':'status_out_num', '4':'status_expire','5':'status_cancle'},
statusDescList:['候诊', '就诊中', '已完成','过号', '已过期', '已取消'], statusDescList:['候诊', '就诊中', '已完成','过号', '已过期', '已取消'],
status:'', status:'',
@ -189,7 +189,8 @@
// this.list[5].custom = "<view class='queue-text'>前方<text class='queue-num-txt PfScSemibold'>"+bookInfo.wait_visit_count+"</text>人</view>" // this.list[5].custom = "<view class='queue-text'>前方<text class='queue-num-txt PfScSemibold'>"+bookInfo.wait_visit_count+"</text>人</view>"
// if(bookInfo.wait_visit_count<=0 || bookInfo.status!=0) this.list[5].show = false // if(bookInfo.wait_visit_count<=0 || bookInfo.status!=0) this.list[5].show = false
this.list[6].show = false this.list[6].show = false
this.list[7].custom = "<view class='book-date"+(bookInfo.status==0?' wait':' expire')+"'>"+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+"</view>" // this.list[7].custom = "<view class='book-date"+(bookInfo.status==0?' wait':' expire')+"'>"+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+"</view>"
this.list[7].custom = "<view class='book-date "+this.statusList[bookInfo.status]+"'>"+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+"</view>"
this.notice = bookInfo.notice; this.notice = bookInfo.notice;
}); });
} }
@ -278,7 +279,7 @@
border-radius: 6rpx; border-radius: 6rpx;
font-size: 26rpx; font-size: 26rpx;
height: 40rpx; height: 40rpx;
line-height: 40rpx; line-height: 38rpx;
padding: 0 10rpx; padding: 0 10rpx;
box-sizing: border-box; box-sizing: border-box;
min-width: 90rpx; min-width: 90rpx;
@ -348,6 +349,21 @@
color: #FD7B13; color: #FD7B13;
} }
} }
.text_wait{
color: #58CA7F;
}
.text_ing{
color: #5FA1CB;
}
.text_down{
color: #999999;
}
.text_out_num{
color: #FE6710;
}
.text_expire,.text_cancle{
color: #B6B8BF;
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save