diff --git a/mini-app/TodoList.md b/mini-app/TodoList.md
index b8166fad3..3e1ba670e 100644
--- a/mini-app/TodoList.md
+++ b/mini-app/TodoList.md
@@ -1,9 +1,38 @@
-卖酒小程序:
+注X:完成
+
+域名[]
+注册[X]
+登录[X]
+首页装修[x]
+资讯/酒庄信息管理[x]
+采集酒庄介绍(图标/图片)[0/12]
+采集产品介绍(图标/图片)[0/12]
+
+产品追溯[]
+新品推荐(就产品列表)[x]
+视频直播[]
+
+商品列表[x]
+商品管理[x]
+商品详情[x]
+地址管理[x]
+订单生成[x]
+订单管理[x]
+生成支付[x]
+支付回调[x]
+
+紫环会[] ----这是啥
+
+
+退款申请[]
+物流追踪[]
+发货单excel输出[x]
+发货单excel倒入[x]
+
+小程序图标[]
+我的页面图标/图片[]
+
+
+
+
 
-应用名称/图标
-我的页面保留哪些功能
-商品信息
-酒庄信息/图标
-支付回调
-订单管理
-退货管理
diff --git a/mini-app/src/apis/mailApis.js b/mini-app/src/apis/mallApis.js
similarity index 100%
rename from mini-app/src/apis/mailApis.js
rename to mini-app/src/apis/mallApis.js
diff --git a/mini-app/src/apis/merchanApis.js b/mini-app/src/apis/merchanApis.js
new file mode 100644
index 000000000..4852382c8
--- /dev/null
+++ b/mini-app/src/apis/merchanApis.js
@@ -0,0 +1,24 @@
+
+import request from '../js/request'
+import { baseUrl, MINI_DEPTID } from '../baseDefine'
+import { formHeader, jsonHeader } from './xiao4rApis'
+
+/**
+ * 酒庄相关接口
+ */
+class MerchanApis {
+  getMerchantList(data) {
+    return request.get({
+      url: baseUrl + 'winery/merchant/list',
+      data: data
+    })
+  }
+
+  getMerchantInfo(id) {
+    return request.get({
+      url: baseUrl + 'winery/merchant/' + id
+    })
+  }
+}
+
+export default new MerchanApis()
diff --git a/mini-app/src/app.wpy b/mini-app/src/app.wpy
index 6736f0810..e0aedab91 100644
--- a/mini-app/src/app.wpy
+++ b/mini-app/src/app.wpy
@@ -109,7 +109,8 @@ pages: [
 'pages/mall/order/order-detail-list',
 'pages/mall/order/order-check',
 'pages/mall/shopping-car/shopping-car-list',
-'pages/winery/winery-detail'
+'pages/winery/winery-detail',
+'pages/winery/winery-list'
 
 ],
 navigateToMiniProgramAppIdList: [
@@ -158,6 +159,7 @@ usingComponents: {
 "van-tabs": "./vant/tabs/index",
 "van-tab": "./vant/tab/index",
 "van-submit-bar": "./vant/submit-bar/index",
+"van-tag": "./vant/tag/index",
 
 "van-area": "./vant/area/index"
 }
diff --git a/mini-app/src/baseDefine.js b/mini-app/src/baseDefine.js
index b935fe8ec..2d618e2d3 100644
--- a/mini-app/src/baseDefine.js
+++ b/mini-app/src/baseDefine.js
@@ -4,9 +4,9 @@
  *
  */
 
-// export const baseUrl = 'http://127.0.0.1:18989/'
+export const baseUrl = 'http://127.0.0.1:18989/'
 // export const baseUrl = 'http://36.1.51.30:18989/'
-export const baseUrl = 'http://41.liyiren.me:8696/'
+// export const baseUrl = 'http://41.liyiren.me:8696/'
 // export const baseUrl = 'http://36.1.50.18:18989/'
 // export const baseUrl = 'https://www.xiao4r.com/wine/winery/'
 
diff --git a/mini-app/src/components/mall/tab/mall-shopping.wpy b/mini-app/src/components/mall/tab/mall-shopping.wpy
index 0ab4948b9..e1c594bd5 100644
--- a/mini-app/src/components/mall/tab/mall-shopping.wpy
+++ b/mini-app/src/components/mall/tab/mall-shopping.wpy
@@ -64,7 +64,7 @@ import wepy from '@wepy/core'
 import store from '@/store'
 import { mapActions, mapState } from '@wepy/x'
 import appManager from '../../../appManager'
-import mailApis from '../../../apis/mailApis'
+import mallApis from '../../../apis/mallApis'
 import defaultMix from '../../../mixins/defaultMix'
 import { goodsDetailPage } from '../../../store/constant/nav/pages'
 
@@ -105,7 +105,7 @@ wepy.component({
     async init() {
 
       this.isInit = false
-      const req = await mailApis.getGoodsList()
+      const req = await mallApis.getGoodsList()
 
       this.records = req.rows
 
diff --git a/mini-app/src/mixins/defaultMix.js b/mini-app/src/mixins/defaultMix.js
index 03f867d8b..a86330c06 100644
--- a/mini-app/src/mixins/defaultMix.js
+++ b/mini-app/src/mixins/defaultMix.js
@@ -17,14 +17,13 @@ export default {
     }
   },
   created () {
-    console.log('created page')
 
     let pages = getCurrentPages()
-    console.log(pages)
+    // console.log(pages)
     let currPage = null
     if (pages.length) {
       currPage = pages[pages.length - 1]
     }
-    console.log(currPage)
+    console.log("currPage:", currPage)
   }
 }
diff --git a/mini-app/src/pages/mall/goods/goods-detail.wpy b/mini-app/src/pages/mall/goods/goods-detail.wpy
index 5de5d97a4..1254dd749 100644
--- a/mini-app/src/pages/mall/goods/goods-detail.wpy
+++ b/mini-app/src/pages/mall/goods/goods-detail.wpy
@@ -101,7 +101,7 @@ module.exports.parseImage = parseImage;
 import wepy from '@wepy/core'
 import store from '@/store'
 import { mapActions, mapState } from '@wepy/x'
-import mailApis from '../../../apis/mailApis'
+import mallApis from '../../../apis/mallApis'
 import { navDefine } from '../../../store/constant/navDefine'
 import appManager from '../../../appManager'
 
@@ -162,11 +162,11 @@ wepy.page({
     callAppLaunch() {
     },
     async init(id) {
-      const goodsReq = await mailApis.getGoodsById(id)
+      const goodsReq = await mallApis.getGoodsById(id)
       this.goodsItem = goodsReq.data
       // const ids = this.goodsItem.goodsSpec.split(',')
       // console.log(ids)
-      // const goodsSpecReq = await mailApis.getGoodsSpecByIds(ids)
+      // const goodsSpecReq = await mallApis.getGoodsSpecByIds(ids)
 
       // this.goodsSpec = goodsSpecReq.rows[0]
     },
diff --git a/mini-app/src/pages/winery/winery-detail.wpy b/mini-app/src/pages/winery/winery-detail.wpy
index 0b5b31f57..288d27e47 100644
--- a/mini-app/src/pages/winery/winery-detail.wpy
+++ b/mini-app/src/pages/winery/winery-detail.wpy
@@ -139,6 +139,9 @@ wepy.page({
       console.log(item)
 
     },
+    onBack() {
+      wx.navigateBack()
+    },
 
     async init(id) {
 
diff --git a/mini-app/src/pages/winery/winery-list.wpy b/mini-app/src/pages/winery/winery-list.wpy
new file mode 100644
index 000000000..dc14a639e
--- /dev/null
+++ b/mini-app/src/pages/winery/winery-list.wpy
@@ -0,0 +1,209 @@
+<style lang="less">
+page {
+  //background-color: #eeeeee;
+
+}
+
+
+.bg {
+  z-index: -1;
+  height: 100%;
+  position: fixed;
+  width: 200rpx;
+  background-color: #AC1630;
+}
+
+.winery-item {
+
+  width: 654rpx;
+  //height: 60px;
+
+  margin-bottom: 20px;
+  box-shadow: 4px 4px 10px #cccccc;
+  border: #ffffff 1px solid;
+  border-radius: 20px;
+
+  background-color: white;
+  display: flex;
+  flex-direction: column;
+
+}
+
+.winery-item-icon {
+  position: absolute;
+  width: 60px;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-items: center;
+  justify-content: center;
+  text-align: center;
+  background-color: white;
+  box-shadow: 4px 4px 10px #cccccc;
+  margin-top: 93px;
+  margin-left: 50rpx;
+  border: #ffffff 1px solid;
+  border-radius: 50%;
+  z-index: 99;
+}
+
+.winery-item-arrow {
+
+  position: absolute;
+  width: 45px;
+  height: 45px;
+  display: flex;
+  align-items: center;
+  justify-items: center;
+  justify-content: center;
+  background-color: white;
+  box-shadow: 4px 4px 10px #cccccc;
+  margin-top: 18.5px;
+  margin-left: 500rpx;
+  border: #ffffff 1px solid;
+  border-radius: 50%;
+
+}
+
+.banner {
+  margin-top: 200px;
+  border-top: 1px solid white;
+  border-top-right-radius: 20px;
+  border-top-left-radius: 20px;
+  text-align: left;
+  background-color: white;
+  height: 20px;
+  width: 100%;
+  z-index: 1;
+
+}
+
+
+</style>
+
+<wxs module="filters" lang="babel">
+const parseImage = (imageKey) => {
+return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey
+}
+module.exports.parseImage = parseImage;
+</wxs>
+<template>
+
+
+  <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" style="margin-top: 66px;width: 100%;">
+
+    <image :src="imageDefine.WINERY_HEADER" style="width:100%;height:218px;position: absolute;" />
+    <div class="banner" />
+
+    <div class="container" style="margin: 20px;">
+      <div style="display: flex;flex-direction: column;">
+        <span style="font-size: 22px;color: #98002E;font-weight: bold;">贺兰山东麓葡萄酒</span>
+        <span style="font-size: 14px;color: #333;margin-top: 10px;">贺兰山东麓位于北纬37度至39度之间，是种植葡萄的最佳地带，全年日照达3000小时且年降水量不超过200毫升，同时贺兰山东麓戈壁滩上的砂土富含丰富的矿物质。日照、土壤、水分、海拔和纬度都有助于种植葡萄，这些天然的馈赠让贺兰山东麓葡萄酒香气浓郁、纯正，口感圆润、协调。</span>
+        <span style="font-size: 16px;color: #333;margin-top: 24px;font-weight: bold;">
+          酒庄列表({{records.length}})
+        </span>
+      </div>
+
+      <div style="display: flex;margin-top: 10px;" v-for="(item,index) in records" @tap="onTap(item)">
+        <div class="winery-item-icon">
+          <van-image style="margin-top: 5px;" round width="50px" height="50px" :src="filters.parseImage(item.avatar)" />
+        </div>
+
+        <div class="winery-item">
+          <van-image :src="filters.parseImage(item.avatar)" width="100%" height="128px" />
+          <div style="margin-left: 20px;margin-top:20px;display: flex;align-items: center;">
+            <span style="font-size: 20px;font-weight: bold;width: 120px;">{{item.mchName}}</span>
+            <span style="color: #999;font-size: 12px;width: 200px;margin-left: 8px;">{{item.subtitle}}</span>
+          </div>
+
+
+          <div style="margin: 19px 8px 15px 8px;">
+            <van-tag color="#F8F4E8" text-color="#CCA049" style="margin-right: 8px;">xxxxxxxxxxx大赛·金奖</van-tag>
+            <van-tag color="#EDF4FA" text-color="#828E99">xxxxxxxxxx大赛·银奖</van-tag>
+          </div>
+        </div>
+
+
+
+<!--        <div class="winery-item-arrow">-->
+<!--          <van-icon name="arrow" />-->
+<!--        </div>-->
+      </div>
+
+    </div>
+
+  </div>
+
+</template>
+
+<script>
+import wepy from '@wepy/core'
+import store from '@/store'
+import { mapActions, mapState } from '@wepy/x'
+import defaultMix from '../../mixins/defaultMix'
+import merchanApis from '../../apis/merchanApis'
+
+wepy.page({
+  store,
+  hooks: {},
+
+  mixins: [defaultMix],
+  data: {
+    pageIndex: 0,
+    records: []
+  },
+
+  computed: {
+    ...mapState({
+      'imageDefine': state => state.imageDefine,
+      'userInfo': state => state.user.userInfo,
+      'wineryDefine': state => state.wineryDefine
+    })
+  },
+
+  methods: {
+    ...mapActions([
+      'setUserAction'
+    ]),
+    handleViewTap() {
+      console.log('handleVieTap clicked')
+    },
+    onTap(item) {
+      console.log(item)
+    },
+    onBack() {
+      wx.navigateBack()
+    },
+    async init(id) {
+
+    }
+
+  },
+
+  onLoad(options) {
+    merchanApis.getMerchantList().then(r => {
+      this.records = r.rows
+    })
+  }
+
+})
+</script>
+<config>
+{
+navigationBarTitleText: '',
+usingComponents: {
+
+}
+}
+</config>
diff --git a/mini-app/src/store/constant/imageDefine.js b/mini-app/src/store/constant/imageDefine.js
index 1842d63d7..774de3c63 100644
--- a/mini-app/src/store/constant/imageDefine.js
+++ b/mini-app/src/store/constant/imageDefine.js
@@ -15,6 +15,7 @@ export const imageDefine = {
   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'
+  ADDRESS_ADD_IMAGE: imgbaseUrl + 'add.png',
+  WINERY_HEADER: imgbaseUrl + 'winery/winery-header.png'
 
 }
diff --git a/mini-app/src/store/constant/nav/home.js b/mini-app/src/store/constant/nav/home.js
index 4fa1cb24f..d10c02edd 100644
--- a/mini-app/src/store/constant/nav/home.js
+++ b/mini-app/src/store/constant/nav/home.js
@@ -1,4 +1,5 @@
 import { imgbaseUrl } from '../../../baseDefine'
+import { wineryListPage } from './pages'
 
 const homeImg = imgbaseUrl + 'home/'
 
@@ -38,7 +39,7 @@ export const homeBanner = {
 
 export const menu1 = {
   image: homeImg + 'home_menu1.png',
-  path: ''
+  path: wineryListPage
 }
 export const menu2 = {
   image: homeImg + 'home_menu2.png',
diff --git a/mini-app/src/store/constant/nav/pages.js b/mini-app/src/store/constant/nav/pages.js
index 773ba4b4d..b7cd9619e 100644
--- a/mini-app/src/store/constant/nav/pages.js
+++ b/mini-app/src/store/constant/nav/pages.js
@@ -4,3 +4,5 @@ export const orderDetailListPage = '/pages/mall/order/order-detail-list'
 export const orderCheck = '/pages/mall/order/order-check'
 export const userAddressListPage = '/pages/mall/user/user-address-list'
 export const goodsDetailPage = '/pages/mall/goods/goods-detail'
+export const wineryListPage = '/pages/winery/winery-list'
+export const wineryDetailPage = '/pages/winery/winery-detail'