Browse Source

首页开发中5

JXDS18FUJT 1 year ago
parent
commit
41662d91cc
5 changed files with 78 additions and 13 deletions
  1. 3 2
      src/api/index.ts
  2. 32 0
      src/api/openApi/index.ts
  3. 22 0
      src/api/openApi/type.d.ts
  4. 17 3
      src/pages/forecast/index.vue
  5. 4 8
      src/pages/index/index.vue

+ 3 - 2
src/api/index.ts

@@ -1,5 +1,6 @@
 import login from "./login";
-
+import openApi from "./openApi";
 export default{
-    login
+    login,
+    openApi
 }

+ 32 - 0
src/api/openApi/index.ts

@@ -0,0 +1,32 @@
+import { Axios, AxiosPromise } from "axios";
+import request from "../request";
+export default {
+    openApiGanZhiList(params:{
+        color?:string
+        five?:string
+        name:string
+
+    }):AxiosPromise<openApiRes.openApiGanZhiGet8ziByDate>{
+        return request({
+            params,
+            method: 'GET',
+            url: "/open-api/gan/zhi/list",
+           
+        })
+    },
+    openApiGanZhiGet8ziByDate(params:{
+        birthDay:string,
+        isSave:number,
+        sex:number,
+        username:string
+      
+
+    }):AxiosPromise<openApiRes.openApiGanZhiGet8ziByDate>{
+        return request({
+            params,
+            method: 'GET',
+            url: "/open-api/gan/zhi/get8ziByDate",
+          
+        })
+    }
+}

+ 22 - 0
src/api/openApi/type.d.ts

@@ -0,0 +1,22 @@
+interface commonRes {
+    code: number
+    msg: string
+
+}
+declare namespace openApiRes {
+    interface openApiGanZhiGet8ziByDate extends commonRes {
+        data: {
+            username: string
+            sex:0|1
+            birthDay:string
+            nongDay:string
+            score:number
+            riYuan:string
+            
+
+        }
+
+    }
+}
+
+

+ 17 - 3
src/pages/forecast/index.vue

@@ -5,7 +5,7 @@
             <view class="user">
                 <view style="width:50%">
                     <text>【姓 名】</text>
-                    <text>张三</text>
+                    <text>{{ userData.username }}</text>
                 </view>
                 <view style="width:50%">
                     <text>【性 别】</text>
@@ -106,15 +106,29 @@
 
 <script lang="ts">
 import Vue from 'vue';
+import api from '@/api'
 export default Vue.extend({
     data() {
         return {
-            title: '国学'
+            title: '国学',
+            form:{
+                birthDay:'1997-05-16 23:00:00',
+                isSave:0,
+                sex:0,
+                username:''
+            },
+            userData:{
+
+            }
         }
     },
     onLoad() {
+        api.openApi.openApiGanZhiGet8ziByDate(this.form).then(res=>{
+            this.userData = res.data.data
+            
 
-
+        })
+        
     },
     methods: {
 

+ 4 - 8
src/pages/index/index.vue

@@ -24,8 +24,6 @@
 								:class="{ 'content-inputs-row-radioChecked': form.type == '农历' }" checked="true">
 								农历排盘 <!-- <view style="width: 100%;height: 100%;"></view> -->
 							</view>
-
-
 						</view>
 					</view>
 					<view style="height: auto;" class="content-inputs-row">
@@ -94,7 +92,10 @@
 						</view>
 					</view>
 					<view class="content-button">
-						<view class="content-button-submit">开始排盘</view>
+						<navigator url="/pages/forecast/index">
+							<view class="content-button-submit">开始排盘</view>
+						</navigator>
+						
 					</view>
 				</view>
 
@@ -310,11 +311,6 @@ export default Vue.extend({
 						background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAAAXNSR0IArs4c6QAABFpJREFUWEfNmF1sU2UYx//POd0YruccI0FJMAG5kAgS4MJFE4NL9Ia1Z3jBFKPBDyImGsSeojdCsoRxo2srfiViRjRqwlIudG3HDSaFaDR4MY1OgxcOZBok86PnlLjOnvcxb78sW7u1XZk9lz3P87y/vu97no8/oYEn0NO5iVT1fgbdQ8B6gFcD0AEwABugXxk4T+Av2HU/jYxe/bbeZahWh2e74V2m6U8TsAegjbX65e14nIGhjGO/+3YS6Vp8FwTr7oZnq1d/DkSHCFiRWwb8GzElWBFnAWV85qqYuHKT85d8d/Mf2o2eG2idQryBhLKNiX0EuiXvh9/BfHhyuf1mNAp3PsB5wV7wee9QFPUjAFsLQc4yi8HJ5c7oQoGLi/b1Qb31b62HSDkAYFvh9zEh3EdfS6R/qAZXFSxgajsA5UMCvAxcAIvnI3EnVssxVLMJ+DUTpLxOwFqGPFLxWCTmfFLJviKY5dd3M+E4gVQwD//j2nvfOCUv9eKffduht6n6MRA9zGBXAZ4MxewPZkeeAxY0tQcF6GQOCnwkHLMPLh5nbgTL1AcAejkPxztDMefjcqtrwOSdIkU9J48Pgo+EE9cHqghg+fQBKBIOaRZuV/mdK4H1d8Nja8a53EVnDIfjqV3XY6dmxwyYxjABDwEY051UV38SWWlTAgv4tCApyiCAnzyU2vLKCJylAMvdOY8xBmAdWATDcSdcAssnT+NCLk8x+8Jxe3QpoEpH6td7QJSQeS7jpNbKJJzbMcuvWSAlxODPIzH73qWEKsGZRhLAfcVdK4Dp50F0O7PoXWyuavRPyRxHpIyA+cdw3F5Plr9zM8jztSwzkx326lozeqMA1fxyFWJa/yVXvji7hSzTkKXiVTCOh+OpPc1esJ54lt8YAuEpAbxIgV4jSoydTOKJyIjzfj2Bmm0b6NUeJ1beY8ZJuWOyV7rTBXcdjdlfNXuxeuLtN/W7VJDMpd9RwNSnCLSCIFaGYs5UPYGabbtvu3dlm0e9AuBPskw9A1D7pY7UsmgUM81erJ54/X1ot6eNDMDZVgXLtOhR8lQLX/5WTBeUTxetmWBbtiTlu4sWLOKt0vYETCNJs9ue8kbx/2h9ii3PnEZR7lpZaz3hodTmpWqtX+qFlmXjGwC3sRAHIgkndE3PXz6MEPOJUNx+pJ5y0qit5ddPyBmz6jAiA5ePb8w8EInbhxpdsBa/oF8/zEQH5x3fioFacuAtm1pKEoE81hnXfqaZEkG7qr/DRLvqkgiKcOWiCoAJZrF/sYNK4es7mrvojYgqRbgKMtQZQAxe6nBO1Tq0lMlQwdx4ln8al6GKcJWEO4AvAxRnEp8hq4xn2b14+WI6JX1WrfEanjZ1DSA2SuEOxD0ArZLvisLdWNp+K1mQAqp9JAsqikVHmYQ7vNpeEEmpc0MtX91/Nvw9mIem086xpkmdlQACOzo3QagPAHT3LHFYBUjqaD9LcRjgL+G6pxsRh/8FXsBF6DXA4sQAAAAASUVORK5CYII=);
 						content: '';
 						display: inline-block;
-
-
-
-
-
 					}
 
 					.content-inputs-row-radioChecked {