BF-202210271038\Administrator před 2 roky
rodič
revize
6953ec115b

+ 4 - 5
components/en-utils/en-nav/en-nav.vue

@@ -1,8 +1,7 @@
 <template>
   <view class="" :style="[{ 'background':bgckgroundBox}]">
     <view class="header"  :style="[{'height': customBarH + 'px','background':bgckgroundBox, 'padding-top': statusBarH + 'px'}]">
-      <view class="flexbox"  :class="{'flexbox-xcx':(isXcx && rightShow)}"
-            :style="[{'height': customBarH + 'px'}]">
+      <view class="flexbox" :style="[{'height': customBarH + 'px'}]">
         <view class="left-button" @tap="goBack">
           <image class="back-img"  :src="'/static/img/common/back'+(titleColor==='#fff'?'-white':'')+'.png'" mode="aspectFill"></image>
         </view>
@@ -18,7 +17,7 @@
       </view>
     </view>
     <view class="box-title">
-      <view class="" :style="[{'height': customBarH + 'px', 'padding-top': statusBarH + 'px'}]">
+      <view class="" :style="[{'height': (customBarH+statusBarH) + 'px', 'padding-top': statusBarH + 'px'}]">
       </view>
     </view>
   </view>
@@ -159,7 +158,7 @@
           font-size: 32rpx;
         }
         .r-but{
-          background-color:#FF0000 ;
+
           color: #fff;
           font-size: 12px;
           padding: 5px;
@@ -180,7 +179,7 @@
 
 
   .box-title {
-
+    //background-color:#FF0000 ;
   }
 
 

+ 1 - 1
manifest.json

@@ -2,7 +2,7 @@
     "name" : "LCOCO",
     "appid" : "__UNI__9075D31",
     "description" : "",
-    "versionName" : "1.0.20",
+    "versionName" : "1.0.21",
     "versionCode" : 101,
     "transformPx" : false,
     /* 5+App特有相关 */

+ 7 - 6
pages.json

@@ -177,13 +177,14 @@
       "path": "pages/my/editInformation",
       "style": {
         "navigationBarTitleText": "",
+        "navigationBarTextStyle": "white",
         "enablePullDownRefresh": false
       }
     },
     {
       "path": "pages/my/edit/nickname",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "修改昵称",
         "navigationBarTextStyle": "black",
         "enablePullDownRefresh": false
       }
@@ -191,7 +192,7 @@
     {
       "path": "pages/my/edit/age",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "设置性别",
         "navigationBarTextStyle": "black",
         "enablePullDownRefresh": false
       }
@@ -199,7 +200,7 @@
     {
       "path": "pages/my/edit/school",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "设置学习",
         "navigationBarTextStyle": "black",
         "enablePullDownRefresh": false
       }
@@ -207,7 +208,7 @@
     {
       "path": "pages/my/edit/we-chat",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "设置微信",
         "navigationBarTextStyle": "black",
         "enablePullDownRefresh": false
       }
@@ -215,7 +216,7 @@
     {
       "path": "pages/my/edit/about-me",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "设置签名",
         "navigationBarTextStyle": "black",
         "enablePullDownRefresh": false
       }
@@ -223,7 +224,7 @@
     {
       "path": "pages/my/edit/making-friends",
       "style": {
-        "navigationBarTitleText": "",
+        "navigationBarTitleText": "交友目的",
         "navigationBarTextStyle": "black",
         "enablePullDownRefresh": false
       }

+ 6 - 6
pages/my/editInformation.vue

@@ -5,12 +5,12 @@
         <text class="nav-right sys-weight-600 sys-color-white">预览</text>
       </template>
     </en-nav>
-    <scroll-view class="information-data" :scroll-y="true" :style="{'height':'calc(100% - '+navHeight+'px)'}">
+    <scroll-view class="information-data" :scroll-y="true" :style="{'height':'calc(100vh - '+navHeight+'px)'}">
       <view class="information-top">
         <view class="top-head">
-            <view class="head-box">
-               <image class="head-img" src="/static/img/temporary/4.png" mode="aspectFill"></image>
-            </view>
+          <view class="head-box">
+            <image class="head-img" src="/static/img/temporary/4.png" mode="aspectFill"></image>
+          </view>
         </view>
         <view class="information-proportion">
           <view class="proportion-text sys-color-white sys-weight-400">资料已完善20%</view>
@@ -98,7 +98,7 @@
             <view class="item-title-proportion sys-weight-600 sys-color-black sys-height-44">+30%</view>
           </view>
           <view class="item-from">
-           <view class="from-item" @click="goToUrl(1)">
+            <view class="from-item" @click="goToUrl(1)">
               <view class="from-item-title sys-height-44 sys-weight-400">昵称</view>
               <view class="from-item-data">
                 <view class="item-data-text  sys-height-44 sys-color-gray-9 sys-weight-400">江湖救急</view>
@@ -106,7 +106,7 @@
                   <text class="iconfont  sys-color-gray-9 sys-weight-400"> &#xe62b;</text>
                 </view>
               </view>
-           </view>
+            </view>
 
             <view class="from-item" @click="goToUrl(2)">
               <view class="from-item-title sys-height-44 sys-weight-400" >出生日期</view>

+ 3 - 3
pages/my/index.vue

@@ -1,8 +1,8 @@
 <template>
   <view class="my-box">
     <my-nav @navHeight="setNavHeight"></my-nav>
-    <view class="my-data" :style="{'height':'calc(100% - '+navHeight+'rpx)'}">
-      <scroll-view :scroll-y="true" :style="{'height':'calc(100% - '+navHeight+'rpx)'}">
+    <view class="my-data" :style="{'height':'calc(100vh - '+navHeight+'rpx)'}">
+      <scroll-view :scroll-y="true" :style="{'height':'calc(100vh - '+navHeight+'rpx)'}">
         <view class="my-item">
           <view class="my-content">
             <view class="content-basic">
@@ -94,7 +94,7 @@
           <view class="my-tag">
             <view class="tag-item" @click="setTagNum(0)" :class="{'tag-pitch':tagNum===0}">动态</view>
             <view class="tag-item" @click="setTagNum(1)" :class="{'tag-pitch':tagNum===1}">赞过</view>
-            <view class="tag-item" @click="setTagNum(2)" :class="{'tag-pitch':tagNum===2}">活动</view>
+<!--            <view class="tag-item" @click="setTagNum(2)" :class="{'tag-pitch':tagNum===2}">活动</view>-->
           </view>
         </view>
         <view class="halving-line"></view>