文中提及跳转

pages/activity-entry/activity-entry.js

@@ -101,7 +101,7 @@ Page({
             formInto: funcFormInto
             formInto: funcFormInto
         })
         })
 
 
-        this.inspectForm()
+        // this.inspectForm()
 
 
     },
     },
 
 
@@ -197,20 +197,6 @@ Page({
 
 
     inspectForm: function () {
     inspectForm: function () {
 
 
-        let activityTime = this.data.activityTimes[this.data.activityIndex]
-        if (activityTime.residue*1 == 0) {
-            this.setData({
-                isSubmit: false,
-                errorSession: '',
-            })
-            return false
-        } else {
-            this.setData({
-                errorSession: '',
-            })
-        }
-        
-
         let formInto = this.data.formInto
         let formInto = this.data.formInto
         if (formInto.name === '') {
         if (formInto.name === '') {
             this.setData({
             this.setData({
@@ -242,6 +228,19 @@ Page({
             })
             })
         }
         }
 
 
+        let activityTime = this.data.activityTimes[this.data.activityIndex]
+        if (activityTime.residue*1 == 0) {
+            this.setData({
+                isSubmit: false,
+                errorSession: '',
+            })
+            return false
+        } else {
+            this.setData({
+                errorSession: '',
+            })
+        }
+
         if (formInto.quantity === 0) {
         if (formInto.quantity === 0) {
             this.setData({
             this.setData({
                 isSubmit: false,
                 isSubmit: false,

pages/activity/activity.js

@@ -90,7 +90,7 @@ Page({
             url: '/api/v1/activity/getList',
             url: '/api/v1/activity/getList',
             data: { 
             data: { 
                 listType: type,
                 listType: type,
-                pageSize: 20,
+                pageSize: 1000,
                 pageNo: 1,
                 pageNo: 1,
             },
             },
             success: function(res) {
             success: function(res) {

pages/home/home.wxss

@@ -267,7 +267,7 @@
 }
 }
 
 
 .notice-bar {
 .notice-bar {
-    width: 330rpx !important;
+    width: 400rpx !important;
     line-height: 72rpx;
     line-height: 72rpx;
     font-size: 28rpx;
     font-size: 28rpx;
     color: #333 !important;
     color: #333 !important;
@@ -287,6 +287,6 @@
 } 
 } 
 
 
 .banner-image {
 .banner-image {
-    width: 54rpx;
-    height: 32rpx;
+    width: 40rpx;
+    height: 40rpx;
 }
 }
\ No newline at end of file

pages/strategy/strategy.js

@@ -155,6 +155,41 @@ Page({
         })
         })
     },
     },
 
 
+
+    shopDetail(e) {
+        let datasetId = e.currentTarget.dataset.id
+        let id = ''
+        if (datasetId == '21a0cbbd39604380bc46fba38ac5fb63') {
+            // 海错图展馆
+            id = 1
+        } else if (datasetId == 'b8f04379bf164b7f8bca69be14146a17') {
+            // 拾光花坊
+            id = 2
+        } else if (datasetId == 'd8922a8f759245d4949b62693099edb5') {
+            // 元养水韵SPA馆
+            id = 3
+        } else if (datasetId == 'd0e5ff414f794e15bc33c4e11f5356a8') {
+            // 原味舒食
+            id = 4
+        } else if (datasetId == '81078c007c034d46b7dfe59935d84f7a') {
+            // 原野MOJITO
+            id = 5
+        } else if (datasetId == '29e79743f0f94e5eb726e0ebdfe64248') {
+            // 星空影院
+            id = 6
+        } else if (datasetId == '559d980e9eaf4459883fb3a556d24347') {
+           // 儿童营地信息
+           
+        } else if (datasetId == 'c0a2d795a7a54dcd9459dd1b969c1771') {
+           // 住宿信息
+        }
+        if (id != '') {
+            wx.navigateTo({
+                url: '/pages/shop-detail/shop-detail?id=' + id
+            })
+        }
+    },
+
     // 攻略详情文中提及
     // 攻略详情文中提及
     getParksByParkIds(parkIds) {
     getParksByParkIds(parkIds) {
         if (!parkIds) {
         if (!parkIds) {

pages/strategy/strategy.wxml

@@ -31,7 +31,7 @@
                 <text>文中提及</text>
                 <text>文中提及</text>
             </view>
             </view>
             <block wx:for="{{relation}}" wx:for-index="index" wx:for-item="item" wx:key="index">
             <block wx:for="{{relation}}" wx:for-index="index" wx:for-item="item" wx:key="index">
-                <view class="relation-item row con-b">
+                <view class="relation-item row con-b" data-id="{{item.id}}" bindtap="shopDetail">
                     <image mode="widthFix" src="{{item.cover}}"></image>
                     <image mode="widthFix" src="{{item.cover}}"></image>
                     <view class="relation-item-info col">
                     <view class="relation-item-info col">
                         <text>{{item.title}}</text>
                         <text>{{item.title}}</text>