JXDS18FUJT 1 жил өмнө
parent
commit
bdb1e827d2

+ 14 - 3
src/App.vue

@@ -4,7 +4,7 @@ export default {
   onLaunch: function (option) {
     const that = this;
     uni.setStorageSync("hot_startup_option", option);
-    uni.setStorageSync("NODE_ENV",process.env.NODE_ENV);
+    uni.setStorageSync("NODE_ENV", process.env.NODE_ENV);
     let updateManager = uni.getUpdateManager();
     if (!updateManager) {
       return;
@@ -65,7 +65,7 @@ export default {
       },
     });
   },
-  onLoad() {},
+  onLoad() { },
   onShow(option) {
     uni.hideTabBar()
     uni.setStorageSync("cold_startup_option", option);
@@ -94,6 +94,7 @@ page {
     "Hiragino Sans GB", "Heiti SC", "MicrosoftYaHei", "WenQuanYi Micro Hei",
     sans-serif;
 }
+
 view {
   margin: 0;
   padding: 0;
@@ -107,6 +108,7 @@ html {
 .night {
   filter: invert(1) hue-rotate(180deg);
 }
+
 .van-overlay {
   position: fixed;
   top: 0;
@@ -115,22 +117,31 @@ html {
   height: 100%;
   background-color: rgba(0, 0, 0, 0.65);
 }
+
 .uni-app-fontsize-paragraph {
   font-size: $uni-app-fontsize-paragraph;
 }
+
 .wxad {
   padding-bottom: 20rpx;
   padding-top: 20rpx;
   border-top: 2rpx dashed #a8a8a8;
   width: 100%;
 }
+
 .pl0 {
   padding-left: 0 !important;
 }
+
 .mt40 {
   margin-top: 40rpx;
 }
+
 .no-bg {
   background: transparent !important;
 }
-</style>
+
+.iPhoneX {
+  padding-bottom: constant(safe-area-inset-bottom);
+  padding-bottom: env(safe-area-inset-bottom);
+}</style>

+ 3 - 0
src/custom-tab-bar/index.wxml

@@ -1,4 +1,5 @@
 <!--miniprogram/custom-tab-bar/index.wxml-->
+<view class="ipone">
 <view class="tab-bar">
   <view class="tab-bar-border"></view>
   <view wx:for="{{list}}" wx:key="index" hidden="{{!isBazi&&index==2}}" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}" bindtap="switchTab">
@@ -10,3 +11,5 @@
 
   </view>
 </view>
+</view>
+

+ 11 - 3
src/custom-tab-bar/index.wxss

@@ -1,12 +1,19 @@
-.tab-bar {
-  position: fixed;
+.ipone{
+ padding-bottom: constant(safe-area-inset-bottom);
+padding-bottom: env(safe-area-inset-bottom);
+position: fixed;
   bottom: 0;
   left: 0;
   right: 0;
+   background: white;
+}
+.tab-bar {
+  
   height: 48px;
   background: white;
   display: flex;
-  padding-bottom: env(safe-area-inset-bottom);
+
+
 }
 
 .tab-bar-border {
@@ -26,6 +33,7 @@
   justify-content: center;
   align-items: center;
   flex-direction: column;
+  height:100%;
 }
 
 .tab-bar-item image {

+ 8 - 1
src/otherPages/forecastHistory/index.vue

@@ -5,7 +5,7 @@
                 <view class="content">
                     <view v-for="(item, index) in list" :key="index" class="item">
                         <view>
-                            {{ item.name }} {{ item.sex == '1' ? '男' : '女' }} {{ item.birthday }}
+                           <text @click="goForecast(item)">{{ item.name }} {{ item.sex == '1' ? '男' : '女' }} {{ item.birthday }}</text> 
                             <image v-if="item.isPay == 2" class="item-vip" mode="widthFix"
                                 src="/static/icon/gold_vip@2x.png">
                             </image>
@@ -67,6 +67,13 @@ export default {
         }
     },
     methods: {
+        goForecast(item){
+           uni.navigateTo({
+            url:`/pages/forecast/index?birthday=${item.birthday}&sex=${item.sex}&username=${item.name}`,
+
+           })
+
+        },
         delSingleHistory(id) {
             let that =this
             uni.showModal({

+ 50 - 120
src/pages/carVideo/index.vue

@@ -1,7 +1,7 @@
 <template>
   <loading v-if="loading"></loading>
 
-  <view v-else class="carVideo">
+  <view v-else class="carVideo iPhoneX">
     <m-privacy-popup></m-privacy-popup>
     <!-- <topbar>
       <van-search shape="round" placeholder="搜索学车视频" @search="search" />
@@ -42,10 +42,7 @@
     <view>
       <swiper indicator-color="#fff" autoplay circular style="height: 200rpx">
         <swiper-item class="swiperBanner">
-          <image
-            class="banner"
-            src="https://ndata.zzxcx.net/ctjk/mp-wx/carVideo/banner.png"
-          ></image>
+          <image class="banner" src="https://ndata.zzxcx.net/ctjk/mp-wx/carVideo/banner.png"></image>
         </swiper-item>
         <swiper-item class="swiperBanner">
           <view class="banner-ad">
@@ -55,22 +52,13 @@
       </swiper>
     </view>
     <view class="carType">
-      <view
-        v-for="(item, index) in carType"
-        @click="changeVehicle(item)"
-        :key="index"
-      >
-        <view
-          @click="
-            () => {
-              carTypeIndex = index;
-            }
-          "
-          class="col"
-          :class="{
-            col_selected: carTypeIndex == index,
-          }"
-        >
+      <view v-for="(item, index) in carType" @click="changeVehicle(item)" :key="index">
+        <view @click="() => {
+            carTypeIndex = index;
+          }
+          " class="col" :class="{
+    col_selected: carTypeIndex == index,
+  }">
           <image :class="['carType-img' + index]" :src="item.img"></image>
           <view class="h6"></view>
           <text class="carType-title">{{ item.title }}</text>
@@ -79,16 +67,10 @@
       </view>
     </view>
     <view class="point">
-      <view
-        :style="{
-          left: carTypeIndex * 172 + 'rpx',
-        }"
-        class="point-area"
-      >
-        <image
-          class=""
-          src="https://ndata.zzxcx.net/ctjk/mp-wx/carVideo/triangle1@2x.png"
-        ></image>
+      <view :style="{
+        left: carTypeIndex * 172 + 'rpx',
+      }" class="point-area">
+        <image class="" src="https://ndata.zzxcx.net/ctjk/mp-wx/carVideo/triangle1@2x.png"></image>
       </view>
     </view>
     <!-- #ifdef MP-WEIXIN-->
@@ -118,115 +100,60 @@
     </view> -->
     <view class="subject">
       <view class="subject-tab">
-        <view
-          class="subject-slider"
-          :class="{
-            left0: active == 0,
-            right0: active == 1,
-          }"
-        ></view>
-        <view
-          @click="
-            () => {
-              active = 0;
-              tabQuery.subject = 1;
-            }
-          "
-          class="subject-tabs"
-        >
+        <view class="subject-slider" :class="{
+          left0: active == 0,
+          right0: active == 1,
+        }"></view>
+        <view @click="() => {
+            active = 0;
+            tabQuery.subject = 1;
+          }
+          " class="subject-tabs">
           <span v-if="active == 0">科目一</span>
           <span style="color: #498ef5" v-else>科目一</span>
         </view>
-        <view
-          @click="
-            () => {
-              active = 1;
-              tabQuery.subject = 4;
-            }
-          "
-          class="subject-tabs"
-        >
+        <view @click="() => {
+            active = 1;
+            tabQuery.subject = 4;
+          }
+          " class="subject-tabs">
           <span v-if="active == 1">科目四</span>
           <span style="color: #498ef5" v-else>科目四</span>
         </view>
       </view>
     </view>
     <view class="tab">
-      <scroll-view
-        @scrolltoupper="
-          () => {
-            active = 0;
-            tabQuery.subject = 1;
-          }
-        "
-        @scrolltolower="
-          () => {
-            active = 1;
-            tabQuery.subject = 4;
-          }
-        "
-        scroll-with-animation
-        :scroll-into-view="'tab-container' + active"
-        enhanced
-        style="width: 100%; white-space: nowrap"
-        enable-flex
-        :scroll-x="true"
-      >
-        <view
-          id="tab-container0"
-          style="display: inline-block; white-space: nowrap"
-        >
+      <scroll-view @scrolltoupper="() => {
+          active = 0;
+          tabQuery.subject = 1;
+        }
+        " @scrolltolower="() => {
+      active = 1;
+      tabQuery.subject = 4;
+    }
+    " scroll-with-animation :scroll-into-view="'tab-container' + active" enhanced
+        style="width: 100%; white-space: nowrap" enable-flex :scroll-x="true">
+        <view id="tab-container0" style="display: inline-block; white-space: nowrap">
           <view class="tab-container">
-            <tab-left
-              :subject="1"
-              :query="tabQuery"
-              :leftList="leftList1"
-            ></tab-left>
-            <tab-center
-              :subject="1"
-              :query="tabQuery"
-              :centerList="centerList1"
-            ></tab-center>
-            <tab-right
-              :subject="1"
-              :query="tabQuery"
-              :rightList="rightList1"
-            ></tab-right>
+            <tab-left :subject="1" :query="tabQuery" :leftList="leftList1"></tab-left>
+            <tab-center :subject="1" :query="tabQuery" :centerList="centerList1"></tab-center>
+            <tab-right :subject="1" :query="tabQuery" :rightList="rightList1"></tab-right>
           </view>
         </view>
 
-        <view
-          id="tab-container1"
-          style="display: inline-block; white-space: nowrap"
-        >
+        <view id="tab-container1" style="display: inline-block; white-space: nowrap">
           <view class="tab-container">
-            <tab-left
-              :query="tabQuery"
-              :subject="4"
-              :leftList="leftList4"
-            ></tab-left>
-            <tab-center
-              :query="tabQuery"
-              :subject="4"
-              :centerList="centerList4"
-            ></tab-center>
-            <tab-right
-              :query="tabQuery"
-              :subject="4"
-              :rightList="rightList4"
-            ></tab-right>
+            <tab-left :query="tabQuery" :subject="4" :leftList="leftList4"></tab-left>
+            <tab-center :query="tabQuery" :subject="4" :centerList="centerList4"></tab-center>
+            <tab-right :query="tabQuery" :subject="4" :rightList="rightList4"></tab-right>
           </view>
         </view>
       </scroll-view>
     </view>
     <view class="wxad">
-      <ad
-        ad-type="video"
-        :ad-intervals="100"
-        unit-id="adunit-8eb44bbd7e3147d4"
-      ></ad>
+      <ad ad-type="video" :ad-intervals="100" unit-id="adunit-8eb44bbd7e3147d4"></ad>
     </view>
-
+    <view style="width: 100%;height: 48px;"></view>
     <!-- #endif -->
 
     <!-- <view class="splitLine"> </view>
@@ -801,6 +728,8 @@ swiper-item {
   background: #fff;
   min-height: 100vh;
   width: 100%;
+ // padding-bottom: constant(safe-area-inset-bottom); //兼容 IOS<11.2
+  //padding-bottom: env(safe-area-inset-bottom); //兼容 IOS>11.2
 }
 
 .swiperBanner {
@@ -810,6 +739,7 @@ swiper-item {
   justify-content: center;
   align-content: center;
   align-items: center;
+
   .banner-ad {
     padding: 30rpx;
   }

+ 7 - 7
src/pages/fortune/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content iPhoneX">
 		<image class="bg" src="https://ndata.zzxcx.net/xpgx-xcx/index/bg1.png"></image>
 		<image mode="widthFix" class="logo" src="https://ndata.zzxcx.net/xpgx-xcx/index/bg4.png"></image>
 		<view class="form">
@@ -35,13 +35,13 @@
 										style="height: 15rpx;width: 22rpx;margin-left: 8rpx;" :src="downArrowImg"></image>
 								</view>
 							</picker>
-							<picker @change="changeFormBirthDay" fields="day" mode="date">
+							<picker @change="changeFormBirthDay" :value="form.birthday" fields="day" mode="date">
 								<view class="content-inputs-row-menu">
 									{{ 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">
+							<picker @change="changeFormBirthDay" :value="form.birthday" fields="day" mode="date">
 								<view class="content-inputs-row-menu">
 									{{ form.birthday.split('-')[2] }}日 <image
 										style="height: 15rpx;width: 22rpx;margin-left: 8rpx;" :src="downArrowImg"></image>
@@ -107,9 +107,9 @@
 		</view>
 
 
-		<!-- <view>
-			<text class="title">{{ title }}</text>
-		</view> -->
+		<view style="height: 48px;width: 100%;">
+			
+		</view>
 	</view>
 </template>
 
@@ -139,7 +139,7 @@ export default {
 			],
 			form: {
 				isPay: 0,
-				birthday: '2023-11-01',
+				birthday: '1995-01-01',
 				birthHour: '23:00',
 				birthChinaHour: '子时',
 				isSave: 0, //是否保存 0:不保存 1保存

+ 6 - 1
src/pages/teacherVideo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="">
+  <view class="teacherVideo iPhoneX">
     <view class="road">
       <view class="nav">
         <view class="left">科目三真实考场</view>
@@ -55,6 +55,7 @@
     <view class="wxad">
       <ad ad-type="video" :ad-intervals="100" unit-id="adunit-8eb44bbd7e3147d4"></ad>
     </view>
+    <view style="width: 100%;height: 48px;"></view>
   </view>
 </template>
 
@@ -132,6 +133,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.teacherVideo{
+ // padding-bottom: constant(safe-area-inset-bottom);//兼容 IOS<11.2
+//padding-bottom: env(safe-area-inset-bottom);//兼容 IOS>11.2
+}
 .care {
   width: 100vw;
   height: 100vh;

+ 3 - 1
src/pages/user/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view>
+  <view class="iPhoneX">
     <scroll-view scroll-y class="bg">
       <div class="user">
         <van-cell custom-class="head-cell" is-link label-class="" center>
@@ -116,6 +116,7 @@
 			<ad unit-id="adunit-d8c1548cc9663765"></ad>
 		</view> -->
     </scroll-view>
+    <view style="height: 48px;width: 100%;"></view>
   </view>
 </template>
 
@@ -227,6 +228,7 @@ export default {
 .user .head-cell {
   background: transparent;
 }
+
 </style>
 <style lang="scss" scoped>
 .userform {