From 720185aef091e45365a9cf08a7c7e78948d8a010 Mon Sep 17 00:00:00 2001
From: mactj <tottimctj@163.com>
Date: Wed, 20 Jan 2021 18:08:35 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/winery/controller/AppMerchantController.java   | 2 +-
 mini-app/src/baseDefine.js                               | 4 ++--
 mini-app/src/pages/mall/goods/goods-detail.wpy           | 9 ++++++---
 mini-app/src/pages/webView/web.wpy                       | 2 +-
 mini-app/src/pages/winery/winery-detail.wpy              | 6 +-----
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java
index 3848d4465..f8686820d 100644
--- a/hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java
+++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/AppMerchantController.java
@@ -95,7 +95,7 @@ public class AppMerchantController extends BaseController {
      * 获取商户详细信息
      */
     @PreAuthorize("@ss.hasPermi('winery:merchant:query')")
-    @GetMapping(value = "dept/{id}")
+    @GetMapping(value = "dept/{deptId}")
     public AjaxResult getInfoByDeptId(@PathVariable("deptId") String deptId) {
 
         return AjaxResult.success(iAppMerchantService.getOne(new LambdaQueryWrapper<AppMerchant>().eq(AppMerchant::getDeptId, deptId)));
diff --git a/mini-app/src/baseDefine.js b/mini-app/src/baseDefine.js
index d63b249de..bd9e0a7a7 100644
--- a/mini-app/src/baseDefine.js
+++ b/mini-app/src/baseDefine.js
@@ -4,8 +4,8 @@
  *
  */
 
-// export const baseUrl = 'http://127.0.0.1:18989/'
-export const baseUrl = 'https://mall.xiao4r.com/api/'
+export const baseUrl = 'http://127.0.0.1:18989/'
+// export const baseUrl = 'https://mall.xiao4r.com/api/'
 
 
 export const imgbaseUrl = 'https://www.xiao4r.com/xiao4rstatic/img/winery/'
diff --git a/mini-app/src/pages/mall/goods/goods-detail.wpy b/mini-app/src/pages/mall/goods/goods-detail.wpy
index 49ce5a4cd..4b3b39f49 100644
--- a/mini-app/src/pages/mall/goods/goods-detail.wpy
+++ b/mini-app/src/pages/mall/goods/goods-detail.wpy
@@ -34,7 +34,7 @@ module.exports.parseImage = parseImage;
       </swiper>
 
 
-      <van-cell :title="goodsItems.goodsName" value="内容能显示多长" label="描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息"
+      <van-cell :title="goodsItems.goodsName" value="特价" label="goodsItems.goodsAlias"
                 border="{{ false }}" />
       <van-cell title="立即下单" is-link @tap="onShowSpec" />
 
@@ -105,7 +105,7 @@ import mallApis from '../../../apis/mallApis'
 import { navDefine } from '../../../store/constant/navDefine'
 import appManager from '../../../appManager'
 
-import { shoppingCarList } from '../../../store/constant/nav/pages'
+import { shoppingCarList, wineryDetailPage } from '../../../store/constant/nav/pages'
 
 wepy.page({
   store,
@@ -218,7 +218,10 @@ wepy.page({
       this.setShoppingCarAction(this.shoppingCar)
     },
     onWinery() {
-      appManager.showToast('建设中')
+      // appManager.showToast('建设中')
+
+      appManager.navigateTo(wineryDetailPage + '?deptId=' + this.goodsItem.deptId)
+
     },
     onShppingCar() {
       appManager.navigateTo(shoppingCarList)
diff --git a/mini-app/src/pages/webView/web.wpy b/mini-app/src/pages/webView/web.wpy
index a9e9a02c4..fdfd13ca7 100644
--- a/mini-app/src/pages/webView/web.wpy
+++ b/mini-app/src/pages/webView/web.wpy
@@ -36,7 +36,7 @@ wepy.page({
 </script>
 <config>
 {
-navigationBarText: '详情',
+navigationBarTitleText: '详情',
 navigationBarTextStyle: 'black',
 
 }
diff --git a/mini-app/src/pages/winery/winery-detail.wpy b/mini-app/src/pages/winery/winery-detail.wpy
index fef7da5d1..920bf97b5 100644
--- a/mini-app/src/pages/winery/winery-detail.wpy
+++ b/mini-app/src/pages/winery/winery-detail.wpy
@@ -12,12 +12,10 @@
 
   width: 400rpx;
   height: 60px;
-
   margin-bottom: 20px;
   box-shadow: 4px 4px 10px #cccccc;
   border: #ffffff 1px solid;
   border-radius: 20px;
-
   background-color: white;
   padding: 15px 70rpx;
 
@@ -126,15 +124,13 @@ wepy.page({
   },
 
   onLoad(options) {
-
+    console.log(options)
     if (options.id) {
       this.init(options.id)
     } else if (options.deptId) {
       this.initByDept(options.deptId)
     }
-
   }
-}
 
 })
 </script>