zuypeng пре 1 година
родитељ
комит
05ce602886
4 измењених фајлова са 17 додато и 15 уклоњено
  1. 5 8
      src/pages.json
  2. 10 5
      src/pages/index/index.vue
  3. 1 1
      src/pages/user/index.vue
  4. 1 1
      src/utils/https.ts

+ 5 - 8
src/pages.json

@@ -35,7 +35,9 @@
     },
     {
       "path": "pages/user/index",
-      "navigationBarTitleText": "个人中心"
+      "navigationBarTitleText": "个人中心",
+      "navigationStyle": "custom",
+      "disableScroll": true
     }
   ],
   "subPackages": [
@@ -186,20 +188,14 @@
     "list": [
       {
         "pagePath": "pages/index/index",
-        "iconPath": "static/tabbar/1.png",
-        "selectedIconPath": "static/tabbar/1-1.png",
         "text": "网点"
       },
       {
         "pagePath": "pages/map/index",
-        "iconPath": "static/tabbar/2.png",
-        "selectedIconPath": "static/tabbar/2.png",
         "text": "扫码"
       },
       {
         "pagePath": "pages/user/index",
-        "iconPath": "static/tabbar/4.png",
-        "selectedIconPath": "static/tabbar/4-1.png",
         "text": "我的"
       }
     ]
@@ -207,6 +203,7 @@
   "globalStyle": {
     "navigationBarTextStyle": "black",
     "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
+    "backgroundColor": "#F8F8F8",
+    "navigationStyle": "custom"
   }
 }

+ 10 - 5
src/pages/index/index.vue

@@ -1,5 +1,8 @@
 <template>
-  <view class="content">
+  <uv-navbar placeholder leftIcon="" title="iWash洗车"
+             bg-color="linear-gradient(to right, rgb(66, 83, 216), rgb(213, 51, 186))"
+             :border="false"></uv-navbar>
+  <view class="content" :style="containerStyle">
     <!--    <image class="logo" src="/static/logo.png"/>
         <view class="text-area">
           <text class="title">{{ title }}</text>
@@ -81,6 +84,7 @@ import {checkLogin} from "@/utils/auth";
 const title = ref('Hello')
 const isLogin = ref(false)
 
+const containerStyle = ref();
 const change = () => {
   console.log("change")
 }
@@ -121,9 +125,10 @@ const initState = () => ({
 const state = reactive(initState())
 
 onLoad((e: any) => {
-  let query = decodeURIComponent(e);
-  let scanTime = e.scancode_time;
-  console.log(e)
+  const bound = uni.getMenuButtonBoundingClientRect();
+  containerStyle.value = {
+    top: `${bound.bottom + 10}px`,
+  };
   /*  if (query) {
       uni.showToast({
         title: query,
@@ -306,7 +311,7 @@ const handleNavStation = (station: any) => {
 }
 
 .content_station {
-  height: calc(100vh - 600rpx);
+  height: calc(100vh - 700rpx);
   overflow: scroll;
 }
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-
+  <uv-navbar leftIcon="" title="我的" bg-color="#19A497"></uv-navbar>
   <image src="/static/user/user-bg.png" mode="widthFix" class="bg"/>
 
   <block>

+ 1 - 1
src/utils/https.ts

@@ -16,7 +16,7 @@ isDevelopment = e === "develop" || e === "trial";
 let env: string = isDevelopment ? "dev" : "prd";
 const apis = {
     dev: {
-        serverUrl: "http://192.168.5.7:9099/api",
+        serverUrl: "https://dev-wash.kuaiyuman.cn/api",
         fileUrl: "https://zyp-1258963180.cos.ap-guangzhou.myqcloud.com/"
     },
     prd: {