From 6a3487046661a9533a7f94efba0139777ae7ffa8 Mon Sep 17 00:00:00 2001
From: mactj <tottimctj@163.com>
Date: Sun, 17 Jan 2021 02:43:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini-app/project.config.json                  |  7 +++
 mini-app/src/app.wpy                          |  3 +-
 mini-app/src/components/mall/tab/mall-bbs.wpy |  1 +
 mini-app/src/components/mall/tab/mall-car.wpy |  2 +
 .../src/components/mall/tab/mall-home.wpy     | 57 +++++++++++--------
 mini-app/src/components/mall/tab/mall-my.wpy  |  2 +
 .../src/components/mall/tab/mall-shopping.wpy | 15 ++---
 mini-app/src/components/nav-bar.wpy           | 53 ++++++++---------
 mini-app/src/pages/winery/winery-detail.wpy   | 13 ++++-
 mini-app/src/store/constant/imageDefine.js    |  1 +
 10 files changed, 93 insertions(+), 61 deletions(-)

diff --git a/mini-app/project.config.json b/mini-app/project.config.json
index bdc7665b4..31600f617 100644
--- a/mini-app/project.config.json
+++ b/mini-app/project.config.json
@@ -127,6 +127,13 @@
 					"pathName": "pages/mall/user/user-address-list",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "酒庄调查首页",
+					"pathName": "pages/index",
+					"query": "",
+					"scene": null
 				}
 			]
 		}
diff --git a/mini-app/src/app.wpy b/mini-app/src/app.wpy
index 8f647cbe8..9db0ff705 100644
--- a/mini-app/src/app.wpy
+++ b/mini-app/src/app.wpy
@@ -93,6 +93,7 @@ wepy.app({
 <config>
 {
 pages: [
+'pages/mall/index',
 'pages/index',
 'pages/form1',
 'pages/form2',
@@ -100,7 +101,7 @@ pages: [
 'pages/form4',
 'pages/form5',
 'pages/form6',
-'pages/mall/index',
+
 'pages/mall/goods-detail',
 'pages/mall/user/user-address',
 'pages/mall/user/user-address-list',
diff --git a/mini-app/src/components/mall/tab/mall-bbs.wpy b/mini-app/src/components/mall/tab/mall-bbs.wpy
index 3b01bb9e3..50d87dfe2 100644
--- a/mini-app/src/components/mall/tab/mall-bbs.wpy
+++ b/mini-app/src/components/mall/tab/mall-bbs.wpy
@@ -56,6 +56,7 @@
       <image src="https://img.yzcdn.cn/1.jpg" />
     </van-dialog>
 
+    <div style="margin-top: 100px;" />
   </div>
 </template>
 
diff --git a/mini-app/src/components/mall/tab/mall-car.wpy b/mini-app/src/components/mall/tab/mall-car.wpy
index 40e945ed5..d28f545c5 100644
--- a/mini-app/src/components/mall/tab/mall-car.wpy
+++ b/mini-app/src/components/mall/tab/mall-car.wpy
@@ -30,6 +30,8 @@
     >
       <van-checkbox style="margin-top:5px;" :value="isAllSelect" bind:change="onAllSelect">全选</van-checkbox>
     </van-submit-bar>
+
+    <div style="margin-top: 100px;" />
   </view>
 </template>
 
diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy
index 24c3b86b9..c883632d0 100644
--- a/mini-app/src/components/mall/tab/mall-home.wpy
+++ b/mini-app/src/components/mall/tab/mall-home.wpy
@@ -3,7 +3,7 @@
 
 .header-image {
   width: 100%;
-  height: 200px;
+  height: 210px;
   z-index: -1;
   position: absolute;
   top: 0;
@@ -11,7 +11,7 @@
 }
 
 .user-banner {
-  margin-top: 180px;
+  margin-top: 190px;
   border-top: 1px solid #F5F6F7;
   border-top-right-radius: 20px;
   border-top-left-radius: 20px;
@@ -26,10 +26,10 @@
   border: #fff 1px solid;
   border-radius: 20px;
   width: 270rpx;
-  height: 60px;
+  height: 42px;
   box-shadow: 4px 4px 10px #cccccc;
   background-color: #ffffff;
-  padding: 10px;
+  padding: 16px;
   display: flex;
 
   font-weight: bold;
@@ -77,12 +77,12 @@
 
 </style>
 <template>
-  <div class="container" style="margin-bottom: 80px;" >
+  <div class="container" >
     <image class="header-image" :src="navDefine.HOME_HEADER.image" />
     <div class="user-banner" />
 
 
-    <view style="margin: 10px;display: flex;flex-direction: column;">
+    <view style="margin: 0px 16px;display: flex;flex-direction: column;">
       <van-row>
         <van-col offset="1" span="4">
           <van-image round width="96rpx" height="96rpx" :src="user.userInfo.avatarUrl" />
@@ -108,7 +108,8 @@
         color="#333"
         style="margin-top: 16px;"
       >
-        <van-image slot="left-icon" :src="imageDefine.HOME_NOTICE_ICON" width="18px" height="19px" style="margin-top: 5px;margin-left: 5px" />
+        <van-image slot="left-icon" :src="imageDefine.HOME_NOTICE_ICON" width="18px" height="19px"
+                   style="margin-top: 5px;margin-left: 5px" />
       </van-notice-bar>
 
 
@@ -118,7 +119,7 @@
 
           <div class="menu-desc" @tap="onNavItem(navDefine.HOME_MENU1)">
             <div class="fxc">
-              <span style="font-size: 18px;">酒庄介绍</span>
+              <span style="font-size: 16px;">酒庄介绍</span>
               <span class="menu-desc-text">完美酿造工艺</span>
             </div>
             <van-image style="margin-left: 10px;" width="40px" height="40px" :src="navDefine.HOME_MENU1.image" />
@@ -129,7 +130,7 @@
         <van-col offset="2" span="11">
           <div class="menu-desc" @tap="onNavItem(navDefine.HOME_MENU2)">
             <div class="fxc">
-              <span>购买庄酒</span>
+              <span style="font-size: 16px;">购买庄酒</span>
               <span class="menu-desc-text">限量年份套装</span>
             </div>
             <van-image style="margin-left: 10px;" width="40px" height="40px" :src="navDefine.HOME_MENU2.image" />
@@ -144,29 +145,39 @@
         <van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">
           <van-grid-item use-slot v-for=" (item, index) in navDefine.HOME_MENU_LIST" @tap="onNavItem(item)">
 
-            <van-image round width="120rpx" height="120rpx" :src="item.icon" />
-            <span>{{item.name}} </span>
+            <van-image width="68rpx" height="68rpx" :src="item.icon" />
+            <span style="font-size: 12px;font-weight: bold;">{{item.name}} </span>
           </van-grid-item>
         </van-grid>
       </div>
 
 
-      <span style="margin:15px 0;font-weight: bold;">热门活动</span>
+      <div style="margin: 22px 2px 12px 2px; display: flex; align-items: center;">
+        <van-image :src="imageDefine.HOME_WINE_LAB" height="16px" width="5px" />
+        <span style="margin:0px 5px;font-weight: bold;">热门活动</span>
+      </div>
 
-      <van-image width="100%" height="60px" :src="navDefine.HOME_BANNER1.image"
+      <van-image width="100%" height="96px" :src="navDefine.HOME_BANNER1.image"
                  @tap="onNavItem(navDefine.HOME_BANNER1)" />
 
-
-      <span v-if="columnRecord.length > 0" style="margin:15px 0;font-weight: bold;">每日精选</span>
-
-      <div class="column-record-item" v-for="(item, index) in columnRecord" @tap="onNavItem(navDefine.HOME_BANNER2)">
-        <van-image width="100%" height="60px" :src="navDefine.HOME_BANNER2.image" />
-        <div class="column-record-item-text">
-          <span>{{item.title}} </span>
-          <span style="font-size: 12px;font-weight: normal;">{{item.createTime}} </span>
-        </div>
-
+      <div style="margin: 22px 2px 12px 2px; display: flex; align-items: center;">
+        <van-image :src="imageDefine.HOME_WINE_LAB" height="16px" width="5px" />
+        <span style="margin:0px 5px;font-weight: bold;">每日精选</span>
       </div>
+
+      <van-image width="100%" height="128px" :src="navDefine.HOME_BANNER2.image"
+                 @tap="onNavItem(navDefine.HOME_BANNER2)" />
+
+      <!--      <div class="column-record-item" v-for="(item, index) in columnRecord" @tap="onNavItem(navDefine.HOME_BANNER2)">-->
+      <!--        <van-image width="100%" height="128px" :src="navDefine.HOME_BANNER2.image" />-->
+      <!--        <div class="column-record-item-text">-->
+      <!--          <span>{{item.title}} </span>-->
+      <!--          <span style="font-size: 12px;font-weight: normal;">{{item.createTime}} </span>-->
+      <!--        </div>-->
+
+      <!--      </div>-->
+
+      <div style="margin-top: 100px;" />
     </view>
 
   </div>
diff --git a/mini-app/src/components/mall/tab/mall-my.wpy b/mini-app/src/components/mall/tab/mall-my.wpy
index 7bac04eb3..c6bfff65f 100644
--- a/mini-app/src/components/mall/tab/mall-my.wpy
+++ b/mini-app/src/components/mall/tab/mall-my.wpy
@@ -110,6 +110,8 @@
       </van-grid>
     </div>
 
+    <div style="margin-top: 100px;" />
+
   </div>
 </template>
 
diff --git a/mini-app/src/components/mall/tab/mall-shopping.wpy b/mini-app/src/components/mall/tab/mall-shopping.wpy
index dfbb2231b..010798896 100644
--- a/mini-app/src/components/mall/tab/mall-shopping.wpy
+++ b/mini-app/src/components/mall/tab/mall-shopping.wpy
@@ -11,9 +11,6 @@ module.exports.parseImage = parseImage;
   <van-nav-bar
     title="福利购"
   />
-
-
-
   <view style="margin: 10px 10px 80px 10px;">
 
 
@@ -57,7 +54,7 @@ module.exports.parseImage = parseImage;
 
     </view>
 
-
+    <div style="margin-top: 100px;" />
   </view>
 </template>
 
@@ -78,8 +75,7 @@ wepy.component({
     active: 0,
     records: [],
     currentFilter: '全部',
-    filterButtons: ['全部'],
-    isInit: false
+    filterButtons: ['全部']
 
   },
 
@@ -106,11 +102,11 @@ wepy.component({
     },
 
     async init() {
+
+      this.isInit = false
       const req = await mailApis.getGoodsList()
 
-      if (req.code === 200) {
-        this.records = req.rows
-      }
+      this.records = req.rows
 
       this.isInit = true
     }
@@ -125,6 +121,7 @@ wepy.component({
         break
       }
     }
+    this.init()
   }
 })
 </script>
diff --git a/mini-app/src/components/nav-bar.wpy b/mini-app/src/components/nav-bar.wpy
index 4f60238d3..0bbe64592 100644
--- a/mini-app/src/components/nav-bar.wpy
+++ b/mini-app/src/components/nav-bar.wpy
@@ -1,43 +1,44 @@
 <style lang="less">
 
+.a {
+  position: fixed;
+}
 </style>
 <template>
   <van-nav-bar
     bind:click-left="onBack"
     border="{{false}}"
+    z-index="100"
     custom-style="background:#AC1630;color:#FFF;"
   >
     <van-icon name="arrow-left" slot="left" color="#fff" />
-    <span style="color: #fff;"  slot="title">{{title}}</span>
+    <span style="color: #fff;" slot="title">{{title}}</span>
   </van-nav-bar>
 </template>
 <script>
-  import wepy from '@wepy/core'
+import wepy from '@wepy/core'
 
-  wepy.component({
+wepy.component({
 
-    props: {
-      title: {
-        type: String,
-        default: '贺兰山酒庄普查'
-      }
-
-    },
-    data: {
-    },
-
-    events: {
-
-    },
-
-    methods: {
-
-      onBack() {
-        wx.navigateBack()
-      }
-    },
-
-    onLoad () {
+  props: {
+    title: {
+      type: String,
+      default: '贺兰山酒庄普查'
     }
-  })
+
+  },
+  data: {},
+
+  events: {},
+
+  methods: {
+
+    onBack() {
+      wx.navigateBack()
+    }
+  },
+
+  onLoad() {
+  }
+})
 </script>
diff --git a/mini-app/src/pages/winery/winery-detail.wpy b/mini-app/src/pages/winery/winery-detail.wpy
index 5d4ce753c..0b5b31f57 100644
--- a/mini-app/src/pages/winery/winery-detail.wpy
+++ b/mini-app/src/pages/winery/winery-detail.wpy
@@ -69,9 +69,18 @@ module.exports.parseImage = parseImage;
 </wxs>
 <template>
 
-  <nav-bar title="了解酒庄" />
+  <van-nav-bar
+    bind:click-left="onBack"
+    border="{{false}}"
+    fixed
+    z-index="100"
+    custom-style="background:#AC1630;color:#FFF;"
+  >
+    <van-icon name="arrow-left" slot="left" color="#fff" />
+    <span style="color: #fff;"  slot="title">了解酒庄</span>
+  </van-nav-bar>
   <div class="bg" />
-  <div class="container">
+  <div class="container" style="margin-top: 66px;">
 
 
     <div style="display: flex;" v-for="(item,index) in wineryDefine.WINERY_LIST" @tap="onTap(item)">
diff --git a/mini-app/src/store/constant/imageDefine.js b/mini-app/src/store/constant/imageDefine.js
index 0bab2ebe8..1842d63d7 100644
--- a/mini-app/src/store/constant/imageDefine.js
+++ b/mini-app/src/store/constant/imageDefine.js
@@ -13,6 +13,7 @@ export const imageDefine = {
   TAP_BAR_ICON4_ON: imgbaseUrl + 'nav/4_td.png',
 
   HOME_TITLE_IMAGE: imgbaseUrl + 'doctor.png',
+  HOME_WINE_LAB: imgbaseUrl + 'icon/home_wine_lab.png',
   HOME_NOTICE_ICON: imgbaseUrl + 'icon/home_wine.png',
   ADDRESS_ADD_IMAGE: imgbaseUrl + 'add.png'