From 67fabc10ca222b2f91318b01c21f8a1518c25596 Mon Sep 17 00:00:00 2001
From: "@AliceXiaoZhan" <1936165216@qq.com>
Date: Mon, 31 Oct 2022 21:49:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                              |   2 +
 app.wxss                            |   3 ++
 assets/imgs/back@3x.png             | Bin 0 -> 1626 bytes
 assets/imgs/home_icon@3x.png        | Bin 0 -> 9538 bytes
 assets/imgs/nav_logo@3x.png         | Bin 0 -> 5167 bytes
 components/navigationBar/index.js   | 103 ++++++++++++++++++++++++++++++++++++
 components/navigationBar/index.json |   4 ++
 components/navigationBar/index.wxml |  17 ++++++
 components/navigationBar/index.wxss |  34 ++++++++++++
 pages/contactUs/contactUs.js        |   8 +++
 pages/contactUs/contactUs.json      |   7 +--
 pages/contactUs/contactUs.wxml      |  17 +++---
 pages/details/details.js            |   8 +++
 pages/details/details.json          |   6 ++-
 pages/details/details.wxml          |   5 +-
 pages/home/home.js                  |   8 +++
 pages/home/home.wxml                |   2 -
 pages/setDisplay/setDisplay.js      |   8 +++
 pages/setDisplay/setDisplay.json    |   6 ++-
 pages/setDisplay/setDisplay.wxml    |   7 ++-
 pages/setDisplay/setDisplay.wxss    |  16 ++++--
 21 files changed, 238 insertions(+), 23 deletions(-)
 create mode 100644 assets/imgs/back@3x.png
 create mode 100644 assets/imgs/home_icon@3x.png
 create mode 100644 assets/imgs/nav_logo@3x.png
 create mode 100644 components/navigationBar/index.js
 create mode 100644 components/navigationBar/index.json
 create mode 100644 components/navigationBar/index.wxml
 create mode 100644 components/navigationBar/index.wxss

diff --git a/app.js b/app.js
index 437495d..37e9ea3 100644
--- a/app.js
+++ b/app.js
@@ -1,9 +1,11 @@
 // app.js
+
 App({
     globalData: {
         id: 0
     },
   onLaunch() {
+
     // 展示本地存储能力
     /* const logs = wx.getStorageSync('logs') || []
     logs.unshift(Date.now())
diff --git a/app.wxss b/app.wxss
index bd2fa30..ce8378b 100644
--- a/app.wxss
+++ b/app.wxss
@@ -10,3 +10,6 @@
 
 
 
+
+
+
diff --git a/assets/imgs/back@3x.png b/assets/imgs/back@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2b300de478fad3e3c874541f85de131205fcf50
GIT binary patch
literal 1626
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
YzbQ*tCjuzMD*ylh07*qoM6N<$g3=ZcnE(I)

literal 0
KcmV+b0RR6000031

diff --git a/assets/imgs/home_icon@3x.png b/assets/imgs/home_icon@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd83bfd7f0c40652644584098db231744859ce08
GIT binary patch
literal 9538
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

literal 0
KcmV+b0RR6000031

diff --git a/assets/imgs/nav_logo@3x.png b/assets/imgs/nav_logo@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae49679270e2b60c037254f463bac1d520719e1c
GIT binary patch
literal 5167
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

literal 0
KcmV+b0RR6000031

diff --git a/components/navigationBar/index.js b/components/navigationBar/index.js
new file mode 100644
index 0000000..987d7e7
--- /dev/null
+++ b/components/navigationBar/index.js
@@ -0,0 +1,103 @@
+// pages/navBar/navBar.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        background: {
+            type: String,
+            value: 'rgba(255, 255, 255, 1)'
+        },
+        color: {
+            type: String,
+            value: 'rgba(0, 0, 0, 1)'
+        },
+        titleText: {
+            type: String,
+            value: '导航栏'
+        },
+        titleImg: {
+            type: String,
+            value: ''
+        },
+        backIcon: {
+            type: String,
+            value: ''
+        },
+        homeIcon: {
+            type: String,
+            value: ''
+        },
+        fontSize: {
+            type: Number,
+            value: 18
+        },
+        iconHeight: {
+            type: Number,
+            value: 19
+        },
+        iconWidth: {
+            type:Number,
+            value: 58
+        }
+    },
+    attached: function(){
+        var that = this;
+        that.setNavSize();
+        that.setStyle();
+    },
+    data: {
+
+    },
+    methods: {
+        // 通过获取系统信息计算导航栏高度
+        setNavSize: function() {
+            var that = this
+                , sysinfo = wx.getSystemInfoSync()
+                , statusHeight = sysinfo.statusBarHeight
+                , isiOS = sysinfo.system.indexOf('iOS') > -1
+                , navHeight;
+            if (!isiOS) {
+                navHeight = 48;
+            } else {
+                navHeight = 44;
+            }
+            that.setData({
+                status: statusHeight,
+                navHeight: navHeight
+            })
+        },
+        setStyle: function() {
+            var that  = this
+                , containerStyle
+                , textStyle
+                , iconStyle;
+            containerStyle = [
+                'background:' + that.data.background
+                ].join(';');
+            textStyle = [
+                'color:' + that.data.color,
+                'font-size:' + that.data.fontSize + 'px'
+            ].join(';');
+            iconStyle = [
+                'width: ' + that.data.iconWidth + 'px',
+                'height: ' + that.data.iconHeight + 'px'
+            ].join(';');
+            that.setData({
+                containerStyle: containerStyle,
+                textStyle: textStyle,
+                iconStyle: iconStyle
+            })
+        },
+        // 返回事件
+        back: function(){
+            wx.navigateBack({
+                delta: 1
+            })
+            this.triggerEvent('back', {back: 1})
+        },
+        home: function() {
+            this.triggerEvent('home', {});
+        }
+    }
+})
diff --git a/components/navigationBar/index.json b/components/navigationBar/index.json
new file mode 100644
index 0000000..7e37c03
--- /dev/null
+++ b/components/navigationBar/index.json
@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
\ No newline at end of file
diff --git a/components/navigationBar/index.wxml b/components/navigationBar/index.wxml
new file mode 100644
index 0000000..3517bf8
--- /dev/null
+++ b/components/navigationBar/index.wxml
@@ -0,0 +1,17 @@
+<view class='nav' style='height: {{status + navHeight}}px'>
+    <view class='status' style='height: {{status}}px;{{containerStyle}}'></view>
+    <view class='navbar' style='height:{{navHeight}}px;width:100%;position: fixed;top: 0;left: 0;padding-top: {{status}}px;z-index: 99;{{containerStyle}}'>
+        <view class='back-icon' wx:if="{{backIcon}}" bindtap='back' style="padding-top: {{status}}px;">
+            <image src='{{backIcon}}'></image>
+        </view>
+        <view class='home-icon' wx:if="{{homeIcon}}" bindtap='home'>
+            <image src='{{homeIcon}}'></image>
+        </view>
+        <view class='nav-icon' wx:if="{{titleImg}}">
+            <image src='{{titleImg}}' style='{{iconStyle}}'></image>
+        </view>
+        <view class='nav-title' style="padding-top: {{status}}px;" wx:if="{{titleText && !titleImg}}">
+            <text style='{{textStyle}}'>{{titleText}}</text>
+        </view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/components/navigationBar/index.wxss b/components/navigationBar/index.wxss
new file mode 100644
index 0000000..354c242
--- /dev/null
+++ b/components/navigationBar/index.wxss
@@ -0,0 +1,34 @@
+.navbar{
+    position: relative
+}
+.back-icon, .home-icon{
+    width: 28px;
+    height: 100%;
+    position: absolute;
+    transform: translateY(-50%);
+    top: 50%;
+    display: flex;
+}
+.back-icon{
+    left: 16px;
+}
+.home-icon{
+    left: 44px
+}
+.back-icon image{
+    width: 28px;
+    height: 28px;
+    margin: auto;
+}
+.home-icon image{
+    width: 20px;
+    height: 20px;
+    margin: auto;
+}
+.nav-title, .nav-icon{
+    position: absolute;
+    transform: translate(-50%, -50%);
+    left: 50%;
+    top: 50%;
+    font-weight: bold;
+}
\ No newline at end of file
diff --git a/pages/contactUs/contactUs.js b/pages/contactUs/contactUs.js
index e8d1acf..c84a8bb 100644
--- a/pages/contactUs/contactUs.js
+++ b/pages/contactUs/contactUs.js
@@ -142,5 +142,13 @@ Page({
      */
     onShareAppMessage() {
 
+    },
+    // 下拉
+  onPageScroll: function(e) {
+    if (e.scrollTop < 0) {
+      wx.pageScrollTo({
+        scrollTop: 0
+      })
     }
+  }
 })
\ No newline at end of file
diff --git a/pages/contactUs/contactUs.json b/pages/contactUs/contactUs.json
index e95d266..090a414 100644
--- a/pages/contactUs/contactUs.json
+++ b/pages/contactUs/contactUs.json
@@ -1,8 +1,9 @@
 {
     "navigationBarTitleText": "联系我们",
     "usingComponents": {
-        "van-icon": "@vant/weapp/icon/index"
-        
-      }
+        "van-icon": "@vant/weapp/icon/index",
+        "navBar": "/components/navigationBar/index"
+      },
+      "navigationStyle": "custom" 
 
 }
\ No newline at end of file
diff --git a/pages/contactUs/contactUs.wxml b/pages/contactUs/contactUs.wxml
index 7183f7b..383d729 100644
--- a/pages/contactUs/contactUs.wxml
+++ b/pages/contactUs/contactUs.wxml
@@ -1,18 +1,21 @@
 <!--pages/signIn/signIn.wxml-->
-
+<navBar title-text="联系我们" 
+    bindback="back"/>
 <view class="container">
-   <view class="contact_info">
-    <van-icon style="position: relative; top: -45rpx;" name="location" color="white" />
-    <text>公司地址：{{address}}</text>
+    <view class="contact_info" style="margin-top: 6rpx;">
+    <van-icon name="manager" color="white" />
+    <text style="float: right; margin-top: 0rpx;" decode="true">{{phone}}</text>
    </view>
    <view class="contact_info">
     <van-icon name="phone" color="white" />
     <text>公司电话：{{tel}}</text>
    </view>
-   <view class="contact_info" style="margin-top: 6rpx;">
-    <van-icon name="manager" color="white" />
-    <text style="float: right; margin-top: 0rpx;" decode="true">{{phone}}</text>
+   <view class="contact_info">
+    <van-icon style="position: relative; top: -45rpx;" name="location" color="white" />
+    <text>公司地址：{{address}}</text>
    </view>
+   
+   
 
    <map id="map" bindmarkertap="biaoji" data-mark="{{markers[0]}}" latitude="{{latitude}}" longitude="{{longitude}}" markers="{{markers}}" scale="17"></map>
    <view class="telPhone" bindtap="callPhone" data-phone="{{userPhone}}">
diff --git a/pages/details/details.js b/pages/details/details.js
index b284489..1787791 100644
--- a/pages/details/details.js
+++ b/pages/details/details.js
@@ -173,5 +173,13 @@ Page({
      */
     onShareAppMessage: function () {
 
+    },
+    // 下拉
+  onPageScroll: function(e) {
+    if (e.scrollTop < 0) {
+      wx.pageScrollTo({
+        scrollTop: 0
+      })
     }
+  }
 })
\ No newline at end of file
diff --git a/pages/details/details.json b/pages/details/details.json
index a246e55..dd31de3 100644
--- a/pages/details/details.json
+++ b/pages/details/details.json
@@ -4,8 +4,10 @@
     "van-row": "@vant/weapp/row/index",
   "van-col": "@vant/weapp/col/index",
   "van-icon": "@vant/weapp/icon/index",
-  "van-share-sheet": "@vant/weapp/share-sheet/index"
+  "van-share-sheet": "@vant/weapp/share-sheet/index",
+  "navBar": "/components/navigationBar/index"
   },
-  "navigationBarTitleText": "详情页"
+  "navigationBarTitleText": "详情页",
+  "navigationStyle": "custom" 
 
 }
\ No newline at end of file
diff --git a/pages/details/details.wxml b/pages/details/details.wxml
index d798a2f..34a912b 100644
--- a/pages/details/details.wxml
+++ b/pages/details/details.wxml
@@ -1,5 +1,8 @@
 <!--pages/home/home.wxml-->
 <import src="../../wxParse/wxParse.wxml"/> 
+<navBar title-text="详情页" 
+back-icon="/assets/imgs/back@3x.png"
+    bindback="back"/>
     <view class="container">
       <view class="banner">
         <van-uploader file-list="{{ fileList }}" max-count="1" />
@@ -19,7 +22,7 @@
 
           <view class="main_con">
             <view class="main_title">
-              <text>相关片场</text>
+              <text>相关推荐</text>
             </view>
             <van-row gutter="12">
               <van-col span="12" wx:for="{{detailsList}}" wx:key="index">
diff --git a/pages/home/home.js b/pages/home/home.js
index dcd5f02..f94963b 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -151,5 +151,13 @@ Page({
      */
     onShareAppMessage: function () {
 
+    },
+     // 下拉
+  onPageScroll: function(e) {
+    if (e.scrollTop < 0) {
+      wx.pageScrollTo({
+        scrollTop: 0
+      })
     }
+  }
 })
\ No newline at end of file
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index 98e20fa..be26087 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -2,7 +2,6 @@
 <view class="container">
     <view class="banner">
         <swiper indicator-dots="{{ true }}" autoplay="{{ false }}" interval="{{ 2000 }}" duration="{{ 500 }}" indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,1)">
-
             <block wx:for="{{bannerList}}" wx:key="index" catchtap='navmap'>
                 <swiper-item>
                     <view class="item">
@@ -95,7 +94,6 @@
                 </van-col>
             </van-row>
         </view>
-
     </view>
         
         
diff --git a/pages/setDisplay/setDisplay.js b/pages/setDisplay/setDisplay.js
index 5c68b01..85550bc 100644
--- a/pages/setDisplay/setDisplay.js
+++ b/pages/setDisplay/setDisplay.js
@@ -171,5 +171,13 @@ onChange(event) {
      */
     onShareAppMessage() {
 
+    },
+    // 下拉
+  onPageScroll: function(e) {
+    if (e.scrollTop < 0) {
+      wx.pageScrollTo({
+        scrollTop: 0
+      })
     }
+  }
 })
\ No newline at end of file
diff --git a/pages/setDisplay/setDisplay.json b/pages/setDisplay/setDisplay.json
index 89c4a51..22358a0 100644
--- a/pages/setDisplay/setDisplay.json
+++ b/pages/setDisplay/setDisplay.json
@@ -4,8 +4,10 @@
         "van-sidebar": "@vant/weapp/sidebar/index",
         "van-sidebar-item": "@vant/weapp/sidebar-item/index",
         "van-notify": "@vant/weapp/notify/index",
-        "van-divider": "@vant/weapp/divider/index"
+        "van-divider": "@vant/weapp/divider/index",
+        "navBar": "/components/navigationBar/index"
     },
     "enablePullDownRefresh": true,
-    "onReachBottomDistance":100
+    "onReachBottomDistance":100,
+    "navigationStyle": "custom" 
 }
\ No newline at end of file
diff --git a/pages/setDisplay/setDisplay.wxml b/pages/setDisplay/setDisplay.wxml
index 51ead6a..e544982 100644
--- a/pages/setDisplay/setDisplay.wxml
+++ b/pages/setDisplay/setDisplay.wxml
@@ -1,4 +1,8 @@
 <!--pages/signIn/signIn.wxml-->
+<navBar title-text="片场展示" 
+   
+    bindback="back"/>
+
 <view class="container">
   <van-sidebar class="left_side" active-key="{{ activeKey }}" bind:change="onChange">
     <van-sidebar-item wx:for="{{displayList}}" wx:key="index" title="{{item.cate_name}}" />
@@ -17,5 +21,4 @@
     </block>
 
   </view>
-
-</view>
\ No newline at end of file
+</view>
diff --git a/pages/setDisplay/setDisplay.wxss b/pages/setDisplay/setDisplay.wxss
index 0d5c2c7..08b1dd6 100644
--- a/pages/setDisplay/setDisplay.wxss
+++ b/pages/setDisplay/setDisplay.wxss
@@ -8,6 +8,7 @@
     width: 203rpx !important;
     min-height: 100vh;
     border-right: 1px solid #f6f6f6;
+    padding-top: 75rpx;
 }
 .left_side .van-sidebar-item__text {
     width: 203rpx !important;
@@ -27,15 +28,20 @@
 .left_side .van-sidebar-item__text {
     height: 47rpx;
     width: 100%;
-    font-size: 36rpx;
+    font-size: 34rpx;
     color: #666;
 }
 .left_side .van-sidebar-item {
     width: 203rpx;
 }
+.left_side .van-sidebar-item--selected {
+    /* border-left: 6rpx solid #000; */
+    /* color: #000; */
+    background: #000;
+}
 .left_side .van-sidebar-item--selected .van-sidebar-item__text {
-    border-left: 6rpx solid #000;
-    color: #000;
+    color: #fff;
+    font-size: 38rpx;
 }
 
 .right_con {
@@ -48,4 +54,6 @@
     height: 290rpx;
     border-radius: 10rpx;
     margin: 0 auto;
-}
\ No newline at end of file
+}
+
+