liudan
/
cesuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
liudan 1 year ago
parent 5c2b8ffdc1
commit b7d650a8d3
2 changed files with 45 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 62
      pages/mingju/mingju.vue
  2. 4
      pages/shengming/shengming.vue

62
pages/mingju/mingju.vue
Unescape View File

@ -29,32 +29,32 @@
</view>
</view>
<view class="text-wrapper_2">
<text lines="1" class="text_7">{{info.jia_data.ganzhi_data.year.name}}·{{info.jia_data.ganzhi_data.month.name}}·{{info.jia_data.ganzhi_data.day.name}}·{{info.jia_data.ganzhi_data.hour.name}}</text>
<text lines="1" class="text_7">{{info.jia_data.ganzhi_data.year?info.jia_data.ganzhi_data.year.name:''}}·{{info.jia_data.ganzhi_data.month?info.jia_data.ganzhi_data.month.name:''}}·{{info.jia_data.ganzhi_data.day?info.jia_data.ganzhi_data.day.name:''}}·{{info.jia_data.ganzhi_data.hour?info.jia_data.ganzhi_data.hour.name:''}}</text>
</view>
<view class="block_2">
<view class="group_1">
<view class="text-wrapper_3">
<view class="marktime">年</view>
<text lines="1" class="text_8">{{info.jia_data.ganzhi_data.year.name}}：</text>
<text lines="1" class="text_9">{{info.jia_data.ganzhi_data.year.xingge}}</text>
<text lines="1" class="text_8">{{info.jia_data.ganzhi_data.year?info.jia_data.ganzhi_data.year.name:''}}：</text>
<text lines="1" class="text_9">{{info.jia_data.ganzhi_data.year?info.jia_data.ganzhi_data.year.xingge:''}}</text>
<text lines="1" class="text_10" />
</view>
<view class="text-wrapper_3">
<view class="marktime">日</view>
<text lines="1" class="text_8">{{info.jia_data.ganzhi_data.day.name}}：</text>
<text lines="1" class="text_9">{{info.jia_data.ganzhi_data.day.xingge}}</text>
<text lines="1" class="text_8">{{info.jia_data.ganzhi_data.day?info.jia_data.ganzhi_data.day.name:''}}：</text>
<text lines="1" class="text_9">{{info.jia_data.ganzhi_data.day?info.jia_data.ganzhi_data.day.xingge:''}}</text>
</view>
</view>
<view class="group_1">
<view class="text-wrapper_3">
<view class="marktime">月</view>
<text lines="1" class="text_8">{{info.jia_data.ganzhi_data.month.name}}：</text>
<text lines="1" class="text_9">{{info.jia_data.ganzhi_data.month.xingge}}</text>
<text lines="1" class="text_8">{{info.jia_data.ganzhi_data.month?info.jia_data.ganzhi_data.month.name:''}}：</text>
<text lines="1" class="text_9">{{info.jia_data.ganzhi_data.month?info.jia_data.ganzhi_data.month.xingge:''}}</text>
</view>
<view class="text-wrapper_3">
<view class="marktime">时</view>
<text lines="1" class="text_8">{{info.jia_data.ganzhi_data.hour.name}}：</text>
<text lines="1" class="text_9">{{info.jia_data.ganzhi_data.hour.xingge}}</text>
<text lines="1" class="text_8">{{info.jia_data.ganzhi_data.hour?info.jia_data.ganzhi_data.hour.name:''}}：</text>
<text lines="1" class="text_9">{{info.jia_data.ganzhi_data.hour?info.jia_data.ganzhi_data.hour.xingge:''}}</text>
</view>
</view>
</view>
@ -84,32 +84,32 @@
</view>
</view>
<view class="text-wrapper_10">
<text lines="1" class="text_7">{{info.yi_data.ganzhi_data.year.name}}·{{info.yi_data.ganzhi_data.month.name}}·{{info.yi_data.ganzhi_data.day.name}}·{{info.yi_data.ganzhi_data.hour.name}}</text>
<text lines="1" class="text_7">{{info.yi_data.ganzhi_data.year?info.yi_data.ganzhi_data.year.name:''}}·{{info.yi_data.ganzhi_data.month?info.yi_data.ganzhi_data.month.name:''}}·{{info.yi_data.ganzhi_data.day?info.yi_data.ganzhi_data.day.name:''}}·{{info.yi_data.ganzhi_data.hour?info.yi_data.ganzhi_data.hour.name:''}}</text>
</view>
<view class="block_2">
<view class="group_1">
<view class="text-wrapper_3">
<view class="marktime">年</view>
<text lines="1" class="text_8">{{info.yi_data.ganzhi_data.year.name}}：</text>
<text lines="1" class="text_9">{{info.yi_data.ganzhi_data.year.xingge}}</text>
<text lines="1" class="text_8">{{info.yi_data.ganzhi_data.year?info.yi_data.ganzhi_data.year.name:''}}：</text>
<text lines="1" class="text_9">{{info.yi_data.ganzhi_data.year?info.yi_data.ganzhi_data.year.xingge:''}}</text>
<text lines="1" class="text_10" />
</view>
<view class="text-wrapper_3">
<view class="marktime">日</view>
<text lines="1" class="text_8">{{info.yi_data.ganzhi_data.day.name}}：</text>
<text lines="1" class="text_9">{{info.yi_data.ganzhi_data.day.xingge}}</text>
<text lines="1" class="text_8">{{info.yi_data.ganzhi_data.day?info.yi_data.ganzhi_data.day.name:''}}：</text>
<text lines="1" class="text_9">{{info.yi_data.ganzhi_data.day?info.yi_data.ganzhi_data.day.xingge:''}}</text>
</view>
</view>
<view class="group_1">
<view class="text-wrapper_3">
<view class="marktime">月</view>
<text lines="1" class="text_8">{{info.yi_data.ganzhi_data.month.name}}：</text>
<text lines="1" class="text_9">{{info.yi_data.ganzhi_data.month.xingge}}</text>
<text lines="1" class="text_8">{{info.yi_data.ganzhi_data.month?info.yi_data.ganzhi_data.month.name:''}}：</text>
<text lines="1" class="text_9">{{info.yi_data.ganzhi_data.month?info.yi_data.ganzhi_data.month.xingge:''}}</text>
</view>
<view class="text-wrapper_3">
<view class="marktime">时</view>
<text lines="1" class="text_8">{{info.yi_data.ganzhi_data.hour.name}}：</text>
<text lines="1" class="text_9">{{info.yi_data.ganzhi_data.hour.xingge}}</text>
<text lines="1" class="text_8">{{info.yi_data.ganzhi_data.hour?info.yi_data.ganzhi_data.hour.name:''}}：</text>
<text lines="1" class="text_9">{{info.yi_data.ganzhi_data.hour?info.yi_data.ganzhi_data.hour.xingge:''}}</text>
</view>
</view>
</view>
@ -172,7 +172,29 @@
jia_sex:1,
yi_time_type:1,
yi_sex:1,
info:{},
info:{
jia_data:{
ba_zi:{},
ganzhi_data:{
day:{},
hour:{},
year:{}
},
gong_li:{},
nong_li:{},
},
jie_xi:null,
yi_data:{
ba_zi:{},
ganzhi_data:{
day:{},
hour:{},
year:{}
},
gong_li:{},
nong_li:{},
}
},
time:'',
time2:'',
date:'',
@ -218,6 +240,8 @@
else
{
this.info = result.data;
this.info.jia_data.ganzhi_data = result.data.jia_data.ganzhi_data
this.info.yi_data.ganzhi_data = result.data.yi_data.ganzhi_data
console.log(this.info);
}

4
pages/shengming/shengming.vue
Unescape View File

@ -51,7 +51,7 @@
<img src="../../static/shengming/l-6-1.png" alt="">
<img src="../../static/shengming/l-7-1.png" alt="">
<img src="../../static/shengming/l-8-1.png" alt="">
<img v-for="item in info.three_number_line_ids" :src="'../../static/shengming/l-'+item+'-2.png'" alt="">
<img v-for="item in info.three_number_line_ids" :src="require(`../../static/shengming/l-${item}-2.png`)" alt="">
<img src="../../static/shengming/left-l-main.png" alt="">
</view>
<view class="bl_right">
@ -59,7 +59,7 @@
<img src="../../static/shengming/r-2-1.png" alt="">
<img src="../../static/shengming/r-3-1.png" alt="">
<img src="../../static/shengming/r-4-1.png" alt="">
<img v-for="item in info.two_number_line_ids" :src="'../../static/shengming/r-'+item+'-2.png'" alt="">
<img v-for="item in info.two_number_line_ids" :src="require(`../../static/shengming/r-${item}-2.png`)" alt="">
<img src="../../static/shengming/right-l-main.png" alt="">
</view>
</view>

Write Preview
Loading…
Cancel
Save