Merge branch 'dev' of https://gitee.com/fengyuze178/xdd-uniapp-new into dev

pages/chose-city/chose-city.vue

@@ -350,6 +350,14 @@ export default {
         url: `/pages/shop/GoodsCon/index?id=${productId}&from=${this.getOptionsParams()}`
       })
     },
+    goToExhibition(linkExhibitionId) {
+      if (!linkExhibitionId) {
+        return
+      }
+      uni.navigateTo({
+        url: `/pkg_product/views/expoDetails?id=${linkExhibitionId}&from=${this.getOptionsParams()}`
+      })
+    },
     getOptionsParams() {
       // 0、特产；1、文玩;2、七彩云上；3、特色礼品；4、康养食材；5、千县名品；6、景点门票
       let from = ''
@@ -392,6 +400,9 @@ export default {
             case 2:
               this.goToGoods(banner.linkProductId)
               break
+            case 3:
+              this.goToExhibition(banner.linkExhibitionId)
+              break
             default:
               break
           }