Parcourir la source

fix:新增顶部navbar

jianghaili il y a 16 heures
Parent
commit
9c0267e57f
6 fichiers modifiés avec 155 ajouts et 71 suppressions
  1. 1 1
      components/nav-bar/index.vue
  2. 52 24
      my/setting/about.vue
  3. 53 26
      my/setting/mimi.vue
  4. 38 12
      my/setting/xieyi.vue
  5. 10 7
      pages/index/game/gameList.vue
  6. 1 1
      pages/my/index.vue

+ 1 - 1
components/nav-bar/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="nav-bar" :style="{ paddingTop: 12 + BarHeight + 'px' }">
     <view class="go-back">
-      <u-icon name="arrow-left" :color="color" size="32" @click="goBack"></u-icon>
+      <u-icon name="arrow-leftward" :color="color" size="32" @click="goBack"></u-icon>
     </view>
     <view class="nav-title" :style="{color:color}">
       {{ title }}

+ 52 - 24
my/setting/about.vue

@@ -1,31 +1,59 @@
 <template>
-	<view style="font-size: 14px;line-height: 26px;padding: 32upx;" class="home1">
-		<view style="font-size: 28upx;" v-html="content" ></view>
-	</view>
+  <view class="home1">
+    <navBar title="关于我们" color="#000" />
+    <view v-html="content" class="home-content"></view>
+  </view>
 </template>
 
 <script>
-	export default {
-	    data() {
-	        return {
-				content:''
-			}
-	    },
-		onLoad() {
-			this.getGuize();
-		},
-	    methods: {
-			getGuize(){
-				this.$Request.getT('/app/common/type/187').then(res =>{
-					if(res.code === 0){
-						this.content = res.data.value;
-					}
-				});
-			}
-		}
-	}
+import navBar from "@/components/nav-bar/index.vue";
+
+export default {
+  data() {
+    return {
+      content: "",
+    };
+  },
+  components: {
+    navBar,
+  },
+  onLoad() {
+    this.getGuize();
+  },
+  methods: {
+    getGuize() {
+      this.$Request.getT("/app/common/type/187").then((res) => {
+        if (res.code === 0) {
+          this.content = res.data.value;
+        }
+      });
+    },
+  },
+};
 </script>
 
-<style>
-	
+<style scoped lang="scss">
+page {
+  background: #ffffff;
+}
+.home1 {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  top: 0;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  font-size: 28rpx;
+  line-height: 52rpx;
+
+  .home-content {
+    flex: 1;
+    overflow: hidden;
+    overflow-y: auto;
+    padding: 32rpx;
+    box-sizing: border-box;
+  }
+}
 </style>

+ 53 - 26
my/setting/mimi.vue

@@ -1,33 +1,60 @@
 <template>
-	<view style="font-size: 14px;line-height: 26px;padding: 32upx;" class="home1">
-		<view style="font-size: 28upx;" v-html="content" ></view>
-	</view>
+  <view class="home1">
+    <!-- 导航栏 -->
+    <navBar title="隐私协议" color="#000" />
+    <view class="home-content" v-html="content"></view>
+  </view>
 </template>
 
 <script>
-	export default {
-	    data() {
-	        return {
-				content:''
-			}
-	    },
-		onLoad() {
-			this.getGuize();
-		},
-	    methods: {
-			getGuize(){
-				this.$Request.getT('/app/common/type/176').then(res =>{
-					if(res.code === 0){
-						this.content = res.data.value;
-					}
-				});
-			}
-		}
-	}
+import navBar from "@/components/nav-bar/index.vue";
+
+export default {
+  data() {
+    return {
+      content: "",
+    };
+  },
+  components: {
+    navBar,
+  },
+  onLoad() {
+    this.getGuize();
+  },
+  methods: {
+    getGuize() {
+      this.$Request.getT("/app/common/type/176").then((res) => {
+        if (res.code === 0) {
+          this.content = res.data.value;
+        }
+      });
+    },
+  },
+};
 </script>
 
-<style>
-	page {
-		background: #FFFFFF;
-	}
+<style scoped lang="scss">
+page {
+  background: #ffffff;
+}
+.home1 {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  top: 0;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  font-size: 28rpx;
+  line-height: 52rpx;
+
+  .home-content {
+    flex: 1;
+    overflow: hidden;
+    overflow-y: auto;
+    padding: 32rpx;
+    box-sizing: border-box;
+  }
+}
 </style>

+ 38 - 12
my/setting/xieyi.vue

@@ -1,16 +1,22 @@
 <template>
-    <view style="line-height: 26px;padding: 32upx;" class="home1">
-		<view style="font-size: 28upx;" v-html="content" ></view>
+    <view class="home1">
+    <navBar title="用户协议" color="#000" />
+		<view v-html="content" class="home-content"></view>
     </view>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-				content:''
-			}
-        },
+import navBar from "@/components/nav-bar/index.vue";
+
+export default {
+  data() {
+    return {
+      content: "",
+    };
+  },
+  components: {
+    navBar,
+  },
 		onLoad() {
 			this.getGuize();
 		},
@@ -26,8 +32,28 @@
     }
 </script>
 
-<style>
-	page{
-		background: #FFFFFF;
-	}
+<style scoped lang="scss">
+page {
+  background: #ffffff;
+}
+.home1 {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  top: 0;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  font-size: 28rpx;
+  line-height: 52rpx;
+
+  .home-content {
+    flex: 1;
+    overflow: hidden;
+    overflow-y: auto;
+    padding: 32rpx;
+    box-sizing: border-box;
+  }
+}
 </style>

+ 10 - 7
pages/index/game/gameList.vue

@@ -145,10 +145,9 @@
 
                 <!-- 工作时间-福利 -->
                 <view class="job-benefits">
-                  <text>上午9:00-下午06:30</text>
-                  <text v-for="(benefit, idx) in item.positionWelfare" :key="idx">{{
+                  <view class="text" v-for="(benefit, idx) in item.positionWelfare" :key="idx">{{
                     benefit
-                  }}</text>
+                  }}</view>
                 </view>
               </view>
 
@@ -523,8 +522,8 @@ page {
   .page-content {
     flex: 1;
     width: 100%;
-	overflow: hidden;
-	overflow-y: auto;
+    overflow: hidden;
+    overflow-y: auto;
   }
 }
 
@@ -822,9 +821,9 @@ page {
             gap: 12rpx;
             flex-wrap: nowrap;
             overflow: hidden;
+            text-overflow: ellipsis;
             width: 450rpx;
-
-            text {
+            .text {
               color: rgba(153, 153, 153, 1);
               font-family: DM Sans;
               font-size: 20rpx;
@@ -833,6 +832,10 @@ page {
               letter-spacing: 0%;
               text-align: left;
               white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              // 可选:设置最大宽度
+              max-width: 100rpx;
               flex-shrink: 0;
             }
           }

+ 1 - 1
pages/my/index.vue

@@ -359,7 +359,7 @@
               <view
                 class="flex justify-center flex-wrap"
                 style="width: 112rpx"
-                @click="goNavNoLogin('/pages/my/jobApplicant/startPage')"
+                @click="goNavNoLogin('/my/setting/about')"
               >
                 <!-- goNavNoLogin('/my/setting/about') -->
                 <!-- pages/my/jobApplicant/startPage -->