样式修改

4 years ago · 67fabc10ca
21 changed files with 238 additions and 23 deletions
--- 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())
--- a/app.wxss
+++ b/app.wxss
@ -10,3 +10,6 @@



+
+
+
--- a/assets/imgs/back@3x.png
+++ b/assets/imgs/back@3x.png
--- a/assets/imgs/home_icon@3x.png
+++ b/assets/imgs/home_icon@3x.png
--- a/assets/imgs/nav_logo@3x.png
+++ b/assets/imgs/nav_logo@3x.png
--- a/components/navigationBar/index.js
+++ 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', {});
+        }
+    }
+})
--- a/components/navigationBar/index.json
+++ b/components/navigationBar/index.json
@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
--- a/components/navigationBar/index.wxml
+++ 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>
--- a/components/navigationBar/index.wxss
+++ 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;
+}
--- 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
+      })
+    }
  }
 })
--- 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" 

 }
--- a/pages/contactUs/contactUs.wxml
+++ b/pages/contactUs/contactUs.wxml
@ -1,19 +1,22 @@
 <!--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}}">
        <image src='../../assets/imgs/phone.png' />
--- 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
+      })
+    }
  }
 })
--- 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" 

 }
--- 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">
--- 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
+      })
+    }
  }
 })
--- 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>
        
        
--- 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
+      })
+    }
  }
 })
--- 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" 
 }
--- 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>
--- 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 {
@ -49,3 +55,5 @@
    border-radius: 10rpx;
    margin: 0 auto;
 }
+
+