Browse Source

新增弹窗咨询

JXDS18FUJT 1 year ago
parent
commit
3f325cbedd

+ 57 - 0
src/components/m-disease-blur/m-disease-blur.vue

@@ -0,0 +1,57 @@
+<template>
+    <view>
+        <view v-for="(item, index) in list">
+            <view v-if="index==0&&isBlur" class="">
+                <text> {{ item.part }}:</text>
+                <text> {{ item.symp }}</text>
+            </view>
+            <view v-else-if="index==1&&isBlur" class="blur-medium">
+                <text> {{ item.part }}:</text>
+                <text> {{ item.symp }}</text>
+            </view>
+            <view v-else-if="index>1&&isBlur" class="blur-heavy">
+                <text> {{ item.part }}:</text>
+                <text> {{ item.symp }}</text>
+            </view>
+            <view v-else class="">
+                <text> {{ item.part }}:</text>
+                <text> {{ item.symp }}</text>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    props: {
+        list: {
+            type: Array,
+            default: []
+        },
+        isBlur:{
+            type:Boolean,
+            default:true
+
+        },
+    },
+
+
+}
+</script>
+
+<style lang="less" scoped>
+.blur-light {
+    color: transparent;
+    text-shadow: 2rpx 2rpx 4rpx #000000;
+}
+
+.blur-medium {
+    color: transparent;
+    text-shadow: 2rpx 2rpx 6rpx #000000;
+}
+
+.blur-heavy {
+    color: transparent;
+    text-shadow: 2rpx 2rpx 16rpx #000000;
+}
+</style>

File diff suppressed because it is too large
+ 28 - 0
src/components/m-more-alert/m-more-alert.vue


+ 102 - 0
src/components/m-number-blur/m-number-blur.vue

@@ -0,0 +1,102 @@
+<template>
+    <view>
+        <view  v-for="(item, index) in list" style="position: relative;margin-bottom: 10px;"
+            class="">
+            <view v-if="index==0&&isBlur">
+                <image class="icon1" mode="widthFix" :src="'/static/icon/' + theme + '_xysz_rect@2x.png'" />
+                <view class="lucktext">数字{{ item.id }}</view>
+                <text>
+                    {{ item.caiYun }}
+                </text>
+                <view>
+                    {{ item.taoHua }}
+                </view>
+            </view>
+            <view class="blur-medium" v-else-if="index==1&&isBlur">
+                <image class="icon1" mode="widthFix" :src="'/static/icon/' + theme + '_xysz_rect@2x.png'" />
+                <view class="lucktext">数字{{ item.id }}</view>
+                <text>
+                    {{ item.caiYun }}
+                </text>
+                <view>
+                    {{ item.taoHua }}
+                </view>
+            </view>
+            <view class="blur-heavy" v-else-if="index>1&&isBlur">
+                <image class="icon1" mode="widthFix" :src="'/static/icon/' + theme + '_xysz_rect@2x.png'" />
+                <view class="lucktext">数字{{ item.id }}</view>
+                <text>
+                    {{ item.caiYun }}
+                </text>
+                <view>
+                    {{ item.taoHua }}
+                </view>
+            </view>
+            <view v-else>
+                <image class="icon1" mode="widthFix" :src="'/static/icon/' + theme + '_xysz_rect@2x.png'" />
+                <view class="lucktext">数字{{ item.id }}</view>
+                <text>
+                    {{ item.caiYun }}
+                </text>
+                <view>
+                    {{ item.taoHua }}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    name: 'm-number-blur',
+    props: {
+        list: {
+            type: Array,
+            default: []
+        },
+        isBlur:{
+            type:Boolean,
+            default:true
+
+        },
+        theme: {
+            type: String,
+            default: 'yellow'
+        }
+    },
+
+}
+</script>
+
+<style lang="less" scoped>
+.icon1 {
+    width: 119rpx;
+    display: inline-block;
+    margin-right: 15rpx;
+}
+
+.lucktext {
+    text-align: center;
+    width: 119rpx;
+    line-height: 54rpx;
+    left: 0;
+    top: 0;
+    position: absolute;
+}
+
+
+.blur-light {
+    color: transparent;
+    text-shadow: 2rpx 2rpx 4rpx #000000;
+}
+
+.blur-medium {
+    color: transparent;
+    text-shadow: 2rpx 2rpx 6rpx #000000;
+}
+
+.blur-heavy {
+    color: transparent;
+    text-shadow: 2rpx 2rpx 16rpx #000000;
+}
+</style>

+ 5 - 0
src/pages.json

@@ -706,6 +706,11 @@
         "path": "pages/fortune/index",
         "query": ""
       },
+      {
+        "name": "运势结果",
+        "path": "pages/forecast/index",
+        "query": "birthday=2023-11-01+23:00:00&isSave=0&sex=2&username=%E7%9A%84"
+      },
       {
         "name": "运势历史",
         "path": "otherPages/forecastHistory/index",

+ 300 - 29
src/pages/forecast/index.vue

@@ -1,5 +1,26 @@
 <template>
     <view :data-theme="theme" class="bg">
+        <view style="width: 100%;height: 35rpx;"></view>
+        <view :data-theme="theme" class="score">
+            <view :data-theme="theme" class="score-outer">
+                <view :data-theme="theme" class="score-inner">
+                    <view style="display: flex;align-items: center;justify-content: center;padding-top: 24rpx;">
+                        <text
+                            style="position: absolute;left: 338rpx;color: #fff;font-size: 48rpx;font-weight: bold;bottom: 128rpx;">{{
+                                userData.riYuan.qr }}</text>
+                        <text style="position: absolute;left: 112rpx;font-size: 44rpx;color: #CB2C00;font-weight: bold;">{{
+                            userData.riYuan.score }}</text>
+                        <image class="score-inner-ring" mode="widthFix" src="/static/icon/ring@2x.png"></image>
+                        <image mode="widthFix" class="score-inner-seal" src="/static/icon/seal@2x.png"></image>
+                    </view>
+                    <text class="score-inner-text1">身强身弱,不代表好坏,具体请看详解</text>
+                    <image mode="widthFix" class="score-inner-icon1"
+                        :src="'/static/icon/' + theme + '_bzmp_long_rect@2x.png'">
+                    </image>
+                </view>
+            </view>
+
+        </view>
         <!-- <button @click="pay">支付</button> -->
         <view class="categorys">
             <view style="width:100%">
@@ -17,6 +38,10 @@
             </view>
 
         </view>
+
+        <view :data-theme="theme" v-if="goodsStatus.isPay == 0" @click="pay" class="pay">
+            <view class="pay-button"> 开通会员立即查看</view>
+        </view>
         <scroll-view :scroll-into-view="currentPoint" :scroll-with-animation="false" :scroll-y="true" class="content">
             <view id="bzmp" class="user">
                 <view style="width:50%">
@@ -148,13 +173,15 @@
                         <!-- <div v-for="(item, index) in userData.guoGuanMap" :key="index">{{ index }}.{{ item }}</div> -->
                         <m-map-blur :begin="2" :isBlur="goodsStatus.isPay == 0" :map="userData.guoGuanMap"></m-map-blur>
                     </view>
-                    <view @click="pay" class="result-pay">开通会员立即查看</view>
+
                     <!-- <img  mode="widthFix" src="https://ndata.zzxcx.net/xpgx-xcx/forecast/bg_middle.png" /> -->
                     <!-- <view class="result-content-border1">
                         <view class="result-content-border2">
                         </view>
                     </view> -->
+                    <m-more-alert :theme="theme"></m-more-alert>
                 </view>
+
                 <img mode="widthFix" class="imgFooter"
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_bottom@2x.png'" />
             </view>
@@ -206,7 +233,29 @@
                 <img mode="widthFix" class="imgFooter"
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_bottom@2x.png'" />
             </view>
+            <view id="zngx" class="result">
+                <img mode="widthFix" class="imgCircle" src="https://ndata.zzxcx.net/xpgx-xcx/forecast/circle.png">
+                <view :data-theme="theme" class="imgTitle"><text>子</text><text>女</text><text>关</text><text>系</text></view>
+                <img mode="widthFix" class="imgHeader"
+                    :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
+                <view class="result-content" :data-theme="theme">
+                    <view class="result-desc">
+                        <m-map-blur :isBlur="goodsStatus.isPay == 0" :map="userData.ziNvYun"></m-map-blur>
+                        <!-- <div v-for="(item,index) in userData.qingGan" :key="item">{{index}}.{{ item }}</div> -->
+
+
 
+                    </view>
+                    <!-- <view class="result-pay">开通会员立即查看</view> -->
+                    <!-- <img  mode="widthFix" src="https://ndata.zzxcx.net/xpgx-xcx/forecast/bg_middle.png" /> -->
+                    <!-- <view class="result-content-border1">
+                        <view class="result-content-border2">
+                        </view>
+                    </view> -->
+                </view>
+                <img mode="widthFix" class="imgFooter"
+                    :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_bottom@2x.png'" />
+            </view>
             <view style="width: 100%;height: 35rpx;"></view>
             <view id="wxpy" class="result">
                 <img mode="widthFix" class="imgCircle" src="https://ndata.zzxcx.net/xpgx-xcx/forecast/circle.png">
@@ -254,21 +303,31 @@
                     :src="'https://ndata.zzxcx.net/xpgx-xcx/forecast/reportBg/bg_' + theme + '_top@2x.png'" />
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
-                        <view v-for="item in userData.numberYunMap.numberYunList"
+                        <m-number-blur :isBlur="goodsStatus.isPay == 0" :theme="theme"
+                            :list="userData.numberYunMap.numberYunList"></m-number-blur>
+                        <!-- <view v-for="(item,index) in userData.numberYunMap.numberYunList"
                             style="position: relative;margin-bottom: 10px;" class="">
-                            <image class="result-desc-icon1" mode="widthFix"
-                                :src="'/static/icon/' + theme + '_xysz_rect@2x.png'" />
-                            <view class="result-desc-lucktext">数字{{ item.id }}</view>
-                            <text>
-                                {{ item.caiYun }}
-                            </text>
-                            <view>
-                                {{ item.taoHua }}
-                            </view>
-                        </view>
-                        <view>
-                            选用<text :data-theme="theme" class="result-desc-color">{{ userData.numberYunMap.numberYuns
-                            }}</text> 为电话号码,门牌号、车牌号等。
+                           
+                                <image class="result-desc-icon1" mode="widthFix"
+                                    :src="'/static/icon/' + theme + '_xysz_rect@2x.png'" />
+                                <view class="result-desc-lucktext">数字{{ item.id }}</view>
+                                <text>
+                                    {{ item.caiYun }}
+                                </text>
+                                <view>
+                                    {{ item.taoHua }}
+                                </view>
+                           
+
+                        </view> -->
+
+                        <view :class="{
+                            'blur-heavy': goodsStatus.isPay == 0
+                        }">
+                            选用<text :class="{
+                                'blur-heavy': goodsStatus.isPay == 0
+                            }" :data-theme="theme" class="result-desc-color">{{ userData.numberYunMap.numberYuns
+}}</text> 为电话号码,门牌号、车牌号等。
                         </view>
 
 
@@ -346,10 +405,8 @@
                 <view class="result-content" :data-theme="theme">
                     <view class="result-desc">
                         <view class="result-disease">
-                            <view v-for="(item, index) in userData.diseasePartList" class="">
-                                <text> {{ item.part }}:</text>
-                                <text> {{ item.symp }}</text>
-                            </view>
+                            <m-disease-blur :isBlur="goodsStatus.isPay == 0"
+                                :list="userData.diseasePartList"></m-disease-blur>
                         </view>
 
 
@@ -495,6 +552,9 @@ import api from '@/api'
 import responseDecorator from '@/utils/responseDecorator'
 import mMapBlur from '@/components/m-map-blur/m-map-blur.vue'
 import mLineBlur from '@/components/m-line-blur/m-line-blur.vue'
+import mDiseaseBlur from '@/components/m-disease-blur/m-disease-blur.vue'
+import mNumberBlur from '@/components/m-number-blur/m-number-blur.vue'
+import mMoreAlert from '@/components/m-more-alert/m-more-alert.vue'
 export default {
     data() {
         return {
@@ -515,6 +575,7 @@ export default {
             { text: '个人特点', point: 'grtd' },
             { text: '财运分析', point: 'cyfx' },
             { text: '婚姻情感', point: 'hyqg' },
+            { text: '子女关系', point: 'zngx' },
             { text: '五行评语', point: 'wxpy' },
             // { text: '潮湿平衡', point: 'csph' },
             { text: '喜用数字', point: 'xysz' },
@@ -541,6 +602,12 @@ export default {
                     称骨评语: "",
                     称骨重量: "",
                 },
+                riYuan: {
+                    qr: "木强",
+                    score: 60,
+                    xiYong: ["火", "土"],
+                    xiYongOld: ["火", "土"]
+                },
                 sex: 1,
                 birthday: '',
                 nongDay: '',
@@ -816,9 +883,9 @@ export default {
                     ...res.data,
                     complete: () => {
                         uni.showToast({
-                            title:'查询支付结果',
-                            icon:'loading',
-                            duration:3000
+                            title: '查询支付结果',
+                            icon: 'loading',
+                            duration: 3000
                         })
                         setTimeout(() => {
                             api.order.studentBirthdayLog({
@@ -848,18 +915,15 @@ export default {
     },
     components: {
         mMapBlur,
-        mLineBlur
+        mDiseaseBlur,
+        mLineBlur,
+        mNumberBlur,
+        mMoreAlert
     },
 };
 </script>
 
 <style lang="less" scoped>
-.bg {
-    width: 100vw;
-    height: 100vh;
-
-}
-
 [data-theme=blue].bg {
     background-color: #BFE2F4;
 
@@ -885,6 +949,213 @@ export default {
 
 }
 
+.bg {
+    width: 100vw;
+    height: 100vh;
+    position: relative;
+    overflow-y: scroll;
+}
+
+[data-theme=blue].pay {
+    background-color: #BFE2F4;
+}
+
+[data-theme=yellow].pay {
+    background-color: #FFEEBD;
+}
+
+[data-theme=brown].pay {
+    background-color: #996235;
+}
+
+[data-theme=red].pay {
+    background-color: #FC6363;
+}
+
+[data-theme=green].pay {
+    background-color: #74D597;
+}
+
+.pay {
+    width: 100%;
+    height: auto;
+    position: fixed;
+    bottom: 0rpx;
+    z-index: 999;
+    display: flex;
+    align-items: center;
+    align-content: center;
+
+    padding-bottom: constant(safe-area-inset-bottom); //为底下圆弧的高度 34px
+    padding-bottom: env(safe-area-inset-bottom); //为底下圆弧的高度 34px
+
+    .pay-button {
+        margin: 15rpx auto;
+        border: 4rpx solid #333333;
+        background: #E74D26;
+        width: 400rpx;
+        line-height: 80rpx;
+        border-radius: 10px;
+        color: #F5EC5A;
+        text-align: center;
+
+
+    }
+
+    // 
+    // margin-top: 40rpx;
+    // 
+    // 
+    // 
+    // 
+    // 
+    // 
+    // 
+    // 
+    // left: 50%;
+    // transform: translateX(-50%);
+}
+
+[data-theme=blue] .score {
+    border: 3px solid #006494;
+}
+
+[data-theme=yellow] .score {
+
+    border: 3px solid #D19C03;
+}
+
+[data-theme=brown] .score {
+
+    border: 3px solid #70390D;
+}
+
+[data-theme=red] .score {
+
+    border: 3px solid #A42705;
+}
+
+[data-theme=green] .score {
+
+    border: 3px solid #519669;
+}
+
+
+
+
+.score {
+    width: 608rpx;
+    height: 296rpx;
+    border: 3px solid transparent;
+    margin: 0 auto;
+
+    [data-theme=blue] .score-outer {
+        width: 100%;
+        height: 100%;
+        background-color: #006494;
+        padding: 20rpx;
+    }
+
+    [data-theme=yellow].score-outer {
+        width: 100%;
+        height: 100%;
+        background-color: #D19C03;
+        padding: 20rpx;
+    }
+
+    [data-theme=brown].score-outer {
+        width: 100%;
+        height: 100%;
+        background-color: #70390D;
+        padding: 20rpx;
+    }
+
+    [data-theme=red].score-outer {
+        width: 100%;
+        height: 100%;
+        background-color: #A42705;
+        padding: 20rpx;
+    }
+
+    [data-theme=green].score-outer {
+        width: 100%;
+        height: 100%;
+        background-color: #519669;
+        padding: 20rpx;
+    }
+
+    .score-outer {
+        width: 100%;
+        height: 100%;
+        background-color: transparent;
+        padding: 20rpx;
+    }
+
+    [data-theme=blue] .score-inner {
+        background-color: #DDF3FE;
+    }
+
+    [data-theme=yellow] .score-inner {
+        background-color: #FFF2CC;
+    }
+
+    [data-theme=brown] .score-inner {
+        background-color: #E2CBB8;
+    }
+
+    [data-theme=red] .score-inner {
+        background-color: #FDCECE;
+    }
+
+    [data-theme=green] .score-inner {
+        background-color: #C7FECA;
+    }
+
+    .score-inner {
+        width: 100%;
+        height: 100%;
+        background-color: #FFF2CC;
+        position: relative;
+
+        .score-inner-icon1 {
+            position: absolute;
+            bottom: 10rpx;
+            width: 528rpx;
+            left: 19rpx;
+            z-index: 11;
+        }
+
+        .score-inner-text1 {
+            position: absolute;
+            color: #000;
+            font-size: 30rpx;
+            width: 100%;
+            text-align: center;
+            bottom: 25rpx;
+            left: 0;
+            font-weight: bold;
+            z-index: 12;
+        }
+
+        .score-inner-ring {
+            width: 137rpx;
+        }
+
+        .score-inner-seal {
+            width: 222rpx;
+            margin-left: 74rpx;
+        }
+
+    }
+}
+
+.blur-heavy {
+    color: transparent !important;
+    text-shadow: 2rpx 2rpx 16rpx #000000;
+}
+
+
+
 .categorys::-webkit-scrollbar {
     display: none;
 }

+ 15 - 17
src/pages/fortune/index.vue

@@ -31,29 +31,26 @@
 						<view style="display: flex;flex-wrap: wrap;justify-content: space-between;" class="">
 							<picker @change="changeFormBirthDay" :value="form.birthday" fields="day" mode="date">
 								<view class="content-inputs-row-menu">
-									{{ form.birthday.split('-')[0] }}年 <text
-										style="font-weight: normal;text-indent: 0.5em;">
-										V</text>
+									{{ form.birthday.split('-')[0] }}年 <image style="height: 15rpx;width: 22rpx;margin-left: 8rpx;"
+										:src="downArrowImg"></image>
 								</view>
 							</picker>
 							<picker @change="changeFormBirthDay" fields="day" mode="date">
 								<view class="content-inputs-row-menu">
-									{{ form.birthday.split('-')[1] }}月 <text
-										style="font-weight: normal;text-indent:  0.5em;">
-										V</text>
+									{{ form.birthday.split('-')[1] }}月 <image style="height: 15rpx;width: 22rpx;margin-left: 8rpx;"
+										:src="downArrowImg"></image>
 								</view>
 							</picker>
 							<picker @change="changeFormBirthDay" fields="day" mode="date">
 								<view class="content-inputs-row-menu">
-									{{ form.birthday.split('-')[2] }}日 <text
-										style="font-weight: normal;text-indent:  0.5em;">
-										V</text>
+									{{ form.birthday.split('-')[2] }}日 <image style="height: 15rpx;width: 22rpx;margin-left: 8rpx;"
+										:src="downArrowImg"></image>
 								</view>
 							</picker>
 							<picker :range="chinaHours" @change="changeFormBirthChinaHour" mode="selector">
 								<view class="content-inputs-row-menu">
-									{{ form.birthChinaHour }} <text
-										style="font-weight: normal;text-indent:  0.5em;">V</text>
+									{{ form.birthChinaHour }} <image style="height: 15rpx;width: 22rpx;margin-left: 8rpx;"
+										:src="downArrowImg"></image>
 								</view>
 							</picker>
 						</view>
@@ -94,7 +91,7 @@
 					</view>
 					<view class="content-button">
 						<!-- <navigator url="/pages/forecast/index"> -->
-							<view @click="submitForm" class="content-button-submit">开始排盘</view>
+						<view @click="submitForm" class="content-button-submit">开始排盘</view>
 						<!-- </navigator> -->
 
 					</view>
@@ -118,6 +115,7 @@ export default {
 	data() {
 		return {
 			title: '国学',
+			downArrowImg: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAgCAYAAABpRpp6AAAAAXNSR0IArs4c6QAABI5JREFUWEfVmHtsFFUUxr8zQ3Gh7c62UUNIiFHUVKLGVirBNyERoZ3lITXRBBIkKUkjuo8afBCtkGCi3ZlCYzTiH2Ag0ZQ0sLOV+IqPEJFUqM8QEyMqqGkIdmdLa0u7c/S2bGnLXPfZGu9/u+fx/ebsd+/MLOF/tijFG15ZssBx1O0EqgD4W3bwrNlh//RfXU9ghe82VXW2MZT5AE5QElsj78Z/GQFuXF1ytTOsngRQngJkwhkHwwt3Rvu6pxs6rJdWMCtfgKCN0z6lDHpuGQEO6b4AwKYL2EenPfaytjYkpwu6Xp87uxh9Rwm41UVz7SiwX3sGjB1uUATaFrHiL0wXcEjX3gSw0U2PmR4bARb+ZUf9BoDqkphkBQ+ah+wPpxo6VOtbD+K9Ep2+JA3Pv7TpdN+LDH5ektztFA1VtrT3/zFV0IGakpsURf0SwGxXDUa9EbN3jwHX1UGdN6C9B2CpBOrT0x576VT4Wfi2BP2dAC9w16Z9hhVfJ2JjwOLDUyuK5yTVGV0A5rh6CNhhWvZzhZ5yyO/dC6b1kr4nlUFPdfP73X2XAY9uQN8SMH8g8TOTw8sjHQnxSxRkBXVtIwFio7mtfoZ6h2n9+X0qOGHCqS+Dtd6tRLRd0uQs84xKM3but3yJG2vKbnYU55jUt6ANhhXfM17HFbipCUriuHYYwAPuUHzE25tY0vQJhnOFbqi7qsQzcKETQIVEY49hJTZMjrkCi6TRu5/SBdBcya592YjZW3IFDunafgCPSuq/O4/iRW9Yv/dnDCwSgzVl95DifCzzs0KsN0cTHdlCh3Rt0z8b+3VJXZ/jJKtbOs6LR4XLlnTCqcxwrfY0E16SFJ8bYqVqV6zn10yhxUONovLnAGa51hCvM6KJfbJ+aYHF0RfUtQ4Clkugj5Z67Pub2nAhHfTm5eXeoqJkJxg3usNitxG16/+tTybACOulVzKUEwDmSaZiGNFEOB1wWNfeYeBhSd7X7CldbLad+StvYNEg4C+9S2FF+LnIpSEzaLVpxQ/JxIK6t4FAr0rivUlyqndGe39Id9EZTTjVJKRrjQBekTTtcVSqajkY/3lyPFCrVSkE4dsr3GqZ+BEzmng7HayIZwUs8kO6LwpwraR5p9dj3z3ez1vqyrShAUfY6TrXGsZrRsxuyAQ2F2AEl3nLaSYJgGvcRajVsOJPXIyJDXuAgDUSoK6hYXtx62EMThmwaNy40rvIcegzADNdTw6ihyLReHtY925m0C7JZG1WeKEZTfyYKWxOE77kZ+lrFcCwAWwC4S3pRTHqIjH7QDaweQGP+llrB7AqW1Fggm2yKs92001oHljl8ylJFn6+NgvV416PfWcmNxpXu2Uh5JoartFuZ2XkyHL186SiuAJUNVv2qVx185pwSjTo9z5OTK1pIJhAayJW/GCusPl6eIJu0K+1EWOtDIbBpmklQvnAFhT44g1CvPVePxmKGce0Wfa9ufp2fL+CWGLsqPP7KsF8ZNIrz1lKUrX4Xyzf6RZ0wmN+1n33EVg8b9zAwFcqKU82R3vEnzQFWQWdcEGI0jT5G9p5ijo2ng6iAAAAAElFTkSuQmCC",
 			yearsRange: [2020, 2021, 2022],
 			yearsValue: 0,
 			chinaHours: [
@@ -135,7 +133,7 @@ export default {
 				'亥时 21:00-23:00'
 			],
 			form: {
-				isPay:0,
+				isPay: 0,
 				birthday: '2023-11-01',
 				birthHour: '23:00',
 				birthChinaHour: '子时',
@@ -165,8 +163,8 @@ export default {
 
 	},
 	methods: {
-		submitForm(){
-			let that =this
+		submitForm() {
+			let that = this
 			// api.openApi.openApiBirthdayLog({
 			// 	name:this.form.name,
 			// 	sex:this.form.sex,
@@ -174,7 +172,7 @@ export default {
 			// 	isPay:this.form.isPay
 			// })
 			uni.navigateTo({
-				url:`/pages/forecast/index?birthday=${that.form.birthday+' '+this.form.birthHour+':00'}&sex=${that.form.sex}&username=${that.form.username}`
+				url: `/pages/forecast/index?birthday=${that.form.birthday + ' ' + this.form.birthHour + ':00'}&sex=${that.form.sex}&username=${that.form.username}`
 			})
 
 
@@ -199,7 +197,7 @@ export default {
 		},
 		changeFormBirthDay(e) {
 			console.log(e.detail)
-			this.form.birthday = e.detail.value 
+			this.form.birthday = e.detail.value
 			if (this.form.type == '农历') {
 				let birthdays = this.form.birthday.split('-')
 				let c = calendar.lunar2solar(birthdays[0], birthdays[1], birthdays[2])

BIN
src/static/icon/blue_bzmp_long_rect@2x.png


BIN
src/static/icon/blue_long_rect@2x.png


BIN
src/static/icon/brown_bzmp_long_rect@2x.png


BIN
src/static/icon/brown_long_rect@2x.png


BIN
src/static/icon/green_bzmp_long_rect@2x.png


BIN
src/static/icon/green_cha@2x.png


BIN
src/static/icon/green_long_rect@2x.png


BIN
src/static/icon/green_more_popup_bg@2x.png


BIN
src/static/icon/red_bzmp_long_rect@2x.png


BIN
src/static/icon/red_long_rect@2x.png


BIN
src/static/icon/ring@2x.png


BIN
src/static/icon/seal@2x.png


BIN
src/static/icon/yellow_bzmp_long_rect@2x.png


BIN
src/static/icon/yellow_long_rect@2x.png


Some files were not shown because too many files changed in this diff