diff --git a/mini-app/TodoList.md b/mini-app/TodoList.md
index 3e1ba670e..fe0c381e4 100644
--- a/mini-app/TodoList.md
+++ b/mini-app/TodoList.md
@@ -1,17 +1,12 @@
 注X:完成
 
-域名[]
+域名[x]
 注册[X]
 登录[X]
 首页装修[x]
 资讯/酒庄信息管理[x]
-采集酒庄介绍(图标/图片)[0/12]
-采集产品介绍(图标/图片)[0/12]
-
-产品追溯[]
-新品推荐(就产品列表)[x]
-视频直播[]
-
+采集酒庄介绍(图标/图片)[6/12]
+采集产品介绍(图标/图片)[6/12]
 商品列表[x]
 商品管理[x]
 商品详情[x]
@@ -20,18 +15,20 @@
 订单管理[x]
 生成支付[x]
 支付回调[x]
+紫环会[x]
+发货单excel输出[x]
+我的[x]
+******---------------******
 
-紫环会[] ----这是啥
-
-
+公众号专题链接列表[]
+产品追溯[]
+视频直播[]
+新品推荐[]
+用户协议/隐私政策[]
+小程序图标[]
 退款申请[]
 物流追踪[]
-发货单excel输出[x]
-发货单excel倒入[x]
-
-小程序图标[]
-我的页面图标/图片[]
-
+发货单excel导入[]
 
 
 
diff --git a/mini-app/project.config.json b/mini-app/project.config.json
index 3517b1361..373e59553 100644
--- a/mini-app/project.config.json
+++ b/mini-app/project.config.json
@@ -139,6 +139,13 @@
 					"id": -1,
 					"name": "订单列表",
 					"pathName": "pages/mall/order/order-list",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "\bwebview",
+					"pathName": "pages/webView/web",
 					"scene": null
 				}
 			]
diff --git a/mini-app/src/app.wpy b/mini-app/src/app.wpy
index e0aedab91..b67dc68cf 100644
--- a/mini-app/src/app.wpy
+++ b/mini-app/src/app.wpy
@@ -110,7 +110,8 @@ pages: [
 'pages/mall/order/order-check',
 'pages/mall/shopping-car/shopping-car-list',
 'pages/winery/winery-detail',
-'pages/winery/winery-list'
+'pages/winery/winery-list',
+'pages/webView/web'
 
 ],
 navigateToMiniProgramAppIdList: [
diff --git a/mini-app/src/appManager.js b/mini-app/src/appManager.js
index a7922e85a..55ceb3089 100644
--- a/mini-app/src/appManager.js
+++ b/mini-app/src/appManager.js
@@ -1,6 +1,7 @@
 import store from '@/store'
 import eventHub from './common/eventHub'
 import userApis from './apis/userApis'
+import { webViewPage } from './store/constant/nav/pages'
 
 class AppManager {
   login(callBack) {
@@ -29,8 +30,6 @@ class AppManager {
           self.setRemoteUserInfo(req2.userInfo)
         }
 
-
-
         wx.hideLoading()
 
         if (callBack) {
@@ -95,7 +94,7 @@ class AppManager {
     }
 
     if (!path) {
-      this.showToast('建设中')
+      this.showToast('建设中，敬请期待.')
       return
     }
 
@@ -107,6 +106,12 @@ class AppManager {
   showToast(msg) {
     wx.showToast({ title: msg, icon: 'none' })
   }
+
+  navWeb(url) {
+    store.state.currWebUrl = url
+
+    this.navigateTo(webViewPage)
+  }
 }
 
 export default new AppManager()
diff --git a/mini-app/src/components/mall/order/order-detail-list-body.wpy b/mini-app/src/components/mall/order/order-detail-list-body.wpy
index 20d57a30d..4463b8b23 100644
--- a/mini-app/src/components/mall/order/order-detail-list-body.wpy
+++ b/mini-app/src/components/mall/order/order-detail-list-body.wpy
@@ -64,7 +64,7 @@ module.exports.parseOrderStatus = parseOrderStatus;
   <div style="width: 100%;">
 
     <van-loading wx:if="{{ !isInit }}" style="margin-top: 20px; display: flex;align-items: center;flex-direction: column;"></van-loading>
-    <view class="contianer" style="margin: 10px;" wx:else>
+    <view class="" style="margin: 10px;" wx:else>
 
 
       <div v-if="records.length < 1" style="display: flex;flex-direction: column;align-items: center;width: 100%;">
diff --git a/mini-app/src/components/mall/order/order-list-body.wpy b/mini-app/src/components/mall/order/order-list-body.wpy
index 156e0f64b..91322f456 100644
--- a/mini-app/src/components/mall/order/order-list-body.wpy
+++ b/mini-app/src/components/mall/order/order-list-body.wpy
@@ -63,7 +63,7 @@ module.exports.parseOrderStatus = parseOrderStatus;
 
     <van-loading wx:if="{{ !isInit }}"
                  style="margin-top: 20px; display: flex;align-items: center;flex-direction: column;"></van-loading>
-    <view class="contianer" style="margin: 10px;" wx:else>
+    <view class="" style="margin: 10px;" wx:else>
 
 
       <div v-if="records.length < 1" style="display: flex;flex-direction: column;align-items: center;width: 100%;">
diff --git a/mini-app/src/components/mall/tab/mall-bbs.wpy b/mini-app/src/components/mall/tab/mall-bbs.wpy
index bfd132ec9..f8a7cee41 100644
--- a/mini-app/src/components/mall/tab/mall-bbs.wpy
+++ b/mini-app/src/components/mall/tab/mall-bbs.wpy
@@ -4,63 +4,68 @@
   width: 100%;
   height: 536rpx;
   z-index: -10;
-
 }
 
+
 </style>
 <template>
-  <div class="contianer">
+  <view style="background-color: white;flex-direction: column;display: flex; align-items: center;padding-bottom: 600px;">
 
-    <van-image :src="imageDefine.BBS_BG">
+    <van-image :src="imageDefine.BBS_BG" width="400rpx" height="400rpx" style="margin-top: 100px;" />
+    <span style="margin-top: 10px;font-size: 26px;color: #940D46;font-weight: bold;">敬请期待</span>
+    <span style="margin-top: 10px;font-size: 14px;color: #999;">即将上线更多福利，记得关注哦～</span>
 
-<!--    <van-panel v-for="(item,index) in list" :key="index" :title="item.user" desc="三星客户" status=" " use-footer-slot>-->
-<!--      <van-row>-->
-<!--        <van-col span="8">-->
-<!--          <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" />-->
-<!--        </van-col>-->
-<!--        <van-col span="8">span: 8</van-col>-->
-<!--      </van-row>-->
+    <van-button round type="info" @tap="onButton" style="margin-top: 10px;">先逛逛葡萄酒</van-button>
 
-<!--      <view style="display: flex;font-size: 14px;">{{item.context}}</view>-->
+    <!--    <van-panel v-for="(item,index) in list" :key="index" :title="item.user" desc="三星客户" status=" " use-footer-slot>-->
+    <!--      <van-row>-->
+    <!--        <van-col span="8">-->
+    <!--          <van-image src="https://img.yzcdn.cn/vant/cat.jpeg" />-->
+    <!--        </van-col>-->
+    <!--        <van-col span="8">span: 8</van-col>-->
+    <!--      </van-row>-->
 
-<!--      <van-grid column-num="3" border="{{ false }}">-->
-<!--        <van-grid-item use-slot v-for=" 3 " wx:for-item="index">-->
-<!--          <image-->
-<!--            style="width: 100%; height: 90px;"-->
-<!--            src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg"-->
-<!--          />-->
-<!--        </van-grid-item>-->
-<!--      </van-grid>-->
+    <!--      <view style="display: flex;font-size: 14px;">{{item.context}}</view>-->
 
-<!--      <van-divider />-->
-<!--      <view style="display: flex;font-size: 14px;">-->
-<!--        <span style="color: cornflowerblue;">用户xxx<span-->
-<!--          style="color: #333333;">的回复: 内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺</span></span>-->
+    <!--      <van-grid column-num="3" border="{{ false }}">-->
+    <!--        <van-grid-item use-slot v-for=" 3 " wx:for-item="index">-->
+    <!--          <image-->
+    <!--            style="width: 100%; height: 90px;"-->
+    <!--            src="https://img.yzcdn.cn/vant/apple-{{ index + 1 }}.jpg"-->
+    <!--          />-->
+    <!--        </van-grid-item>-->
+    <!--      </van-grid>-->
 
-<!--      </view>-->
-<!--      <view slot="footer">-->
-<!--        <view style="display: flex;justify-content: flex-end;">-->
-<!--          <van-button v-if="true" size="small">删除</van-button>-->
-<!--          <van-button v-if="true" size="small" type="danger" style="margin-left: 10px;">编辑</van-button>-->
-<!--          <van-button size="small" type="danger" style="margin-left: 10px;" @tap="onReply(item)">回复</van-button>-->
-<!--        </view>-->
-<!--      </view>-->
-<!--    </van-panel>-->
+    <!--      <van-divider />-->
+    <!--      <view style="display: flex;font-size: 14px;">-->
+    <!--        <span style="color: cornflowerblue;">用户xxx<span-->
+    <!--          style="color: #333333;">的回复: 内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺内容很牛逼，挺</span></span>-->
+
+    <!--      </view>-->
+    <!--      <view slot="footer">-->
+    <!--        <view style="display: flex;justify-content: flex-end;">-->
+    <!--          <van-button v-if="true" size="small">删除</van-button>-->
+    <!--          <van-button v-if="true" size="small" type="danger" style="margin-left: 10px;">编辑</van-button>-->
+    <!--          <van-button size="small" type="danger" style="margin-left: 10px;" @tap="onReply(item)">回复</van-button>-->
+    <!--        </view>-->
+    <!--      </view>-->
+    <!--    </van-panel>-->
 
 
-<!--    <van-dialog-->
-<!--      use-slot-->
-<!--      title="标题"-->
-<!--      show="{{ isShowInput }}"-->
-<!--      show-cancel-button-->
-<!--      bind:close="onCloseInput"-->
-<!--      bind:confirm="onConfirmInput"-->
-<!--    >-->
-<!--      <image src="https://img.yzcdn.cn/1.jpg" />-->
-<!--    </van-dialog>-->
+    <!--    <van-dialog-->
+    <!--      use-slot-->
+    <!--      title="标题"-->
+    <!--      show="{{ isShowInput }}"-->
+    <!--      show-cancel-button-->
+    <!--      bind:close="onCloseInput"-->
+    <!--      bind:confirm="onConfirmInput"-->
+    <!--    >-->
+    <!--      <image src="https://img.yzcdn.cn/1.jpg" />-->
+    <!--    </van-dialog>-->
+
+    <!--    <div style="margin-top: 100px;" />-->
+  </view>
 
-<!--    <div style="margin-top: 100px;" />-->
-  </div>
 </template>
 
 <script>
@@ -96,6 +101,9 @@ wepy.component({
     },
     onConfirmInput() {
       this.isShowInput = false
+    },
+    onButton() {
+      this.$emit('changeTab', 1)
     }
   },
 
diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy
index 12bd15915..9e9d336fe 100644
--- a/mini-app/src/components/mall/tab/mall-home.wpy
+++ b/mini-app/src/components/mall/tab/mall-home.wpy
@@ -77,7 +77,7 @@
 
 </style>
 <template>
-  <div class="container" >
+  <div class="container">
     <image class="header-image" :src="navDefine.HOME_HEADER.image" />
     <div class="user-banner" />
 
@@ -128,7 +128,7 @@
 
 
         <van-col offset="1" span="11">
-          <div class="menu-desc" @tap="onNavItem(navDefine.HOME_MENU2)">
+          <div class="menu-desc" @tap="onBuy()">
             <div class="fxc">
               <span style="font-size: 16px;">购买庄酒</span>
               <span class="menu-desc-text">限量年份套装</span>
@@ -193,6 +193,7 @@ import orderApis from '../../../apis/orderApis'
 import appManager from '../../../appManager'
 import { navDefine } from '../../../store/constant/navDefine'
 import xiao4rApis from '../../../apis/xiao4rApis'
+import { webViewPage } from '../../../store/constant/nav/pages'
 
 wepy.component({
   store,
@@ -220,39 +221,13 @@ wepy.component({
 
   methods: {
 
+    onBuy() {
+
+      this.$emit('changeTab', 1)
+    },
+
     onShoppingCar() {
       appManager.navigateTo(navDefine.SHOPPING_CAR_LIST)
-      return
-
-      // xiao4rApis.test({
-      //
-      //   channel_bs: '28',
-      //   clientType: 'mini',
-      //   fee: '0.01',
-      //   kh: '29000051611',
-      //   openId: appManager.getOpenid(),
-      //   org_no: '29',
-      //   userId: '2475772'
-      //
-      // }).then(r => {
-      //   let payData = r.data.payMsg
-      //   wx.requestPayment({
-      //     appId: payData.appId,
-      //     timeStamp: payData.timeStamp,
-      //     nonceStr: payData.nonceStr,
-      //     package: payData.packageValue,
-      //     signType: payData.signType,
-      //     paySign: payData.paySign,
-      //     success: function(res) {
-      //
-      //     },
-      //     fail: function(res) {
-      //     }
-      //   })
-      // })
-
-
-
     }
   },
 
diff --git a/mini-app/src/components/mall/tab/mall-my.wpy b/mini-app/src/components/mall/tab/mall-my.wpy
index db0e1b87e..2f7ba214c 100644
--- a/mini-app/src/components/mall/tab/mall-my.wpy
+++ b/mini-app/src/components/mall/tab/mall-my.wpy
@@ -95,7 +95,7 @@
       <van-divider />
       <van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">
         <van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU1" @tap="onNavItem(item)">
-          <van-image width="48rpx" height="40rpx" :src="item.icon" />
+          <van-image width="48rpx" height="48rpx" :src="item.icon" />
           <span style="margin-top: 10px;">{{item.name}} </span>
         </van-grid-item>
       </van-grid>
@@ -106,7 +106,7 @@
       <van-divider />
       <van-grid column-num="3" border="{{ false }}" style="margin-top: 15px;">
         <van-grid-item use-slot v-for=" (item, index) in navDefine.MY_MENU2" @tap="onNavItem(item)">
-          <van-image width="48rpx" height="40rpx" :src="item.icon" />
+          <van-image width="48rpx" height="48rpx" :src="item.icon" />
           <span style="margin-top: 10px;">{{item.name}} </span>
         </van-grid-item>
       </van-grid>
diff --git a/mini-app/src/components/mall/tab/mall-shopping.wpy b/mini-app/src/components/mall/tab/mall-shopping.wpy
index 4771080f3..914c235f0 100644
--- a/mini-app/src/components/mall/tab/mall-shopping.wpy
+++ b/mini-app/src/components/mall/tab/mall-shopping.wpy
@@ -11,7 +11,7 @@ module.exports.parseImage = parseImage;
   <van-nav-bar
     title="福利购"
   />
-  <view class="contianer" style="margin: 10px 16px 80px 16px;">
+  <view class="" style="margin: 10px 16px 80px 16px;">
 
 
     <van-image class="banner" :src="imageDefine.SHOPPING_BANNER" width="686rpx"
diff --git a/mini-app/src/pages/mall/index.wpy b/mini-app/src/pages/mall/index.wpy
index 5661e8477..5b6e635ec 100644
--- a/mini-app/src/pages/mall/index.wpy
+++ b/mini-app/src/pages/mall/index.wpy
@@ -90,9 +90,9 @@ module.exports.getTime = getTime;
       我的
     </van-tabbar-item>
   </van-tabbar>
-  <mall-home v-if="pageIndex === 0" />
+  <mall-home v-if="pageIndex === 0" @changeTab="changeTab" />
   <mall-shopping v-else-if="pageIndex === 1" />
-  <mall-bbs v-else-if="pageIndex === 2" />
+  <mall-bbs v-else-if="pageIndex === 2" @changeTab="changeTab" />
   <mall-my v-else-if="pageIndex === 3" />
   <dialog-registration />
 
@@ -143,6 +143,9 @@ wepy.page({
       this.pageIndex = event.$wx.detail
     },
     callAppLaunch() {
+    },
+    changeTab(index) {
+      this.pageIndex = index
     }
 
   },
diff --git a/mini-app/src/pages/mall/order/order-check.wpy b/mini-app/src/pages/mall/order/order-check.wpy
index fbc747cda..13a7c7969 100644
--- a/mini-app/src/pages/mall/order/order-check.wpy
+++ b/mini-app/src/pages/mall/order/order-check.wpy
@@ -29,7 +29,7 @@ module.exports.parseImage = parseImage;
   <nav-bar title="确认订单" />
 
 
-  <div class="contianer" style="width: 100%;margin:15px;">
+  <div class="" style="width: 100%;margin:15px;">
 
     <van-loading v-if="!isInit" style="margin-top: 20px;justify-content: center;"></van-loading>
     <view wx:else>
diff --git a/mini-app/src/pages/mall/user/user-address-list.wpy b/mini-app/src/pages/mall/user/user-address-list.wpy
index e6ba5f498..21e545c54 100644
--- a/mini-app/src/pages/mall/user/user-address-list.wpy
+++ b/mini-app/src/pages/mall/user/user-address-list.wpy
@@ -87,8 +87,9 @@
       </div>
 
 
-
-      <van-button round type="info" size="large" @tap="onAdd" style="margin-top: 20px;">+ 新建收获地址</van-button>
+      <div style="margin-top: 20px;">
+        <van-button round type="info" size="large" @tap="onAdd">+ 新建收获地址</van-button>
+      </div>
 
     </view>
   </div>
diff --git a/mini-app/src/pages/webView/web.wpy b/mini-app/src/pages/webView/web.wpy
new file mode 100644
index 000000000..a9e9a02c4
--- /dev/null
+++ b/mini-app/src/pages/webView/web.wpy
@@ -0,0 +1,43 @@
+<style lang="less">
+
+
+
+</style>
+<template>
+
+  <web-view src="{{currWebUrl}}" />
+
+</template>
+
+<script>
+import wepy from '@wepy/core'
+import store from '@/store'
+import { mapActions, mapState } from '@wepy/x'
+
+wepy.page({
+  store,
+  hooks: {
+
+  },
+
+  data: {
+    url: ''
+
+  },
+  computed: mapState(['currWebUrl']),
+
+  methods: {
+
+  },
+  ready() {
+    this.url = store.state.currWebUrl
+  }
+})
+</script>
+<config>
+{
+navigationBarText: '详情',
+navigationBarTextStyle: 'black',
+
+}
+</config>
diff --git a/mini-app/src/pages/winery/winery-list.wpy b/mini-app/src/pages/winery/winery-list.wpy
index 889fb0766..cdc3ae2fb 100644
--- a/mini-app/src/pages/winery/winery-list.wpy
+++ b/mini-app/src/pages/winery/winery-list.wpy
@@ -85,7 +85,16 @@ page {
 const parseImage = (imageKey) => {
 return 'https://winery-1257413599.cos.ap-beijing.myqcloud.com/' + imageKey
 }
+const parseAwards = (value) => {
+if (!value) {
+return []
+}
+
+return value.split(',')
+}
+
 module.exports.parseImage = parseImage;
+module.exports.parseAwards = parseAwards;
 </wxs>
 <template>
 
@@ -122,23 +131,26 @@ module.exports.parseImage = parseImage;
 
         <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;">
+          <div style="margin-left: 20px;margin-top:35px;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 style="margin: 19px 15px 15px 8px;">
+
+
+            <van-tag v-for="(awardItem,index) in filters.parseAwards(item.award)"
+                     :color="index === 0 ? '#F8F4E8' : '#EDF4FA' " :text-color="index === 0 ? '#CCA049' : '#828E99'"
+                     style="margin-right: 8px;">{{awardItem}}
+            </van-tag>
           </div>
         </div>
 
 
-
-<!--        <div class="winery-item-arrow">-->
-<!--          <van-icon name="arrow" />-->
-<!--        </div>-->
+        <!--        <div class="winery-item-arrow">-->
+        <!--          <van-icon name="arrow" />-->
+        <!--        </div>-->
       </div>
 
     </div>
diff --git a/mini-app/src/store/constant/nav/my.js b/mini-app/src/store/constant/nav/my.js
index d98ec22d2..3ab3a804d 100644
--- a/mini-app/src/store/constant/nav/my.js
+++ b/mini-app/src/store/constant/nav/my.js
@@ -29,7 +29,7 @@ export const myMenuList2 = [
     icon: imgbaseUrl + '/my/tool_2.png',
     path: orderDetailListPage
   }, {
-    name: '优惠券',
+    name: '条款政策',
     icon: imgbaseUrl + '/my/tool_3.png',
     path: ''
   }
diff --git a/mini-app/src/store/constant/nav/pages.js b/mini-app/src/store/constant/nav/pages.js
index b7cd9619e..b3ec18d3f 100644
--- a/mini-app/src/store/constant/nav/pages.js
+++ b/mini-app/src/store/constant/nav/pages.js
@@ -6,3 +6,4 @@ 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'
+export const webViewPage = '/pages/webView/web'
diff --git a/mini-app/src/store/index.js b/mini-app/src/store/index.js
index 3a36cbcc6..09cc83ec1 100644
--- a/mini-app/src/store/index.js
+++ b/mini-app/src/store/index.js
@@ -15,7 +15,8 @@ export default new Vuex.Store({
         avatarUrl: 'https://img.yzcdn.cn/vant/cat.jpeg'
       },
       token: '',
-      company: '企业名称'
+      company: '企业名称',
+      currWebUrl: ''
     },
     // 订单
     order: {},