From 9d8f5d14a01dad39b9a4c53c089640e1cc92dbdc Mon Sep 17 00:00:00 2001
From: Tuzki <1720599558@qq.com>
Date: Sat, 28 Sep 2024 17:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=B7=BB=E5=8A=A0=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E5=AD=97=E7=AC=A6=E4=B8=B2=E3=80=81=E5=AD=97=E8=8A=82?=
 =?UTF-8?q?=E5=92=8Cvoid=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在NumPy文档中，常规介绍部分现在包含了关于字符串、字节和void数据类型的信息，以及现有的数值类型。
---
 common/config.js                              |   2 +-
 pages/index/index.vue                         |  13 ++-
 subPageA/scenic/scenicdetial/scenicdetial.vue |  15 ++-
 subPageA/scenic/sceniclist/sceniclist.vue     | 106 ++++++++++++------
 subPageC/bookTicket/bookTicket.vue            |  16 +--
 5 files changed, 100 insertions(+), 52 deletions(-)

diff --git a/common/config.js b/common/config.js
index 7f871da..1e12ff7 100644
--- a/common/config.js
+++ b/common/config.js
@@ -7,7 +7,7 @@ const REAUEST_ROOTPATH = "https://eluyou.ailuquan.cn";
 // const ROOTPATH = "http://192.168.130.205:8083";
 const ROOTPATH = "https://eluyou.ailuquan.cn";
 //票务根
-const PWPATH = "http://192.168.110.113:48083";
+const PWPATH = "http://192.168.130.157:48080";
 // const PWPATH = "https://eluyou.ailuquan.cn";
 //手绘图项目名称
 const HANDDRAWNNAME = "";
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ddd9efa..6a935e4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -573,11 +573,18 @@ export default {
     },
     goToDetail: function (type, guid, region) {
       if (type == "scenic") {
-        const list = JSON.stringify(this.scenicList)
-		console.log("list",list)
+        // const list = JSON.stringify(this.scenicList)
+        let arr = this.scenicList.filter((item) => item.guid != guid.guid);
+        let list = []
+        if (arr.length <= 2) {
+          list = JSON.stringify(arr)
+        } else {
+          list = JSON.stringify(arr.slice(0, 2))
+        }
+        console.log("list", list)
         uni.navigateTo({
           // url: "/subPageA/scenic/scenicdetial/scenicdetial?guid=" + guid + `&listA=` + list,
-          url: "/subPageA/scenic/scenicdetial/scenicdetial?guid=" + guid.guid,
+          url: "/subPageA/scenic/scenicdetial/scenicdetial?guid=" + guid.guid + `&list=` + list,
         });
       } else if (type == "food") {
         uni.navigateTo({
diff --git a/subPageA/scenic/scenicdetial/scenicdetial.vue b/subPageA/scenic/scenicdetial/scenicdetial.vue
index 273e1d7..81d00ad 100644
--- a/subPageA/scenic/scenicdetial/scenicdetial.vue
+++ b/subPageA/scenic/scenicdetial/scenicdetial.vue
@@ -74,13 +74,13 @@
       <text v-if="wanleList.length == 0 || wanleList == undefined" class="mssj_adr">暂无数据</text>
       <view class="category-content">
         <view class="product-item" v-for="(p_item, p_index) in wanleList">
-          <image class="product-img" :src="p_item.thumb"></image>
+          <image class="product-img" :src="p_item.thumb || p_item.slogo"></image>
           <view class="m-content">
-            <text class="product-title1">{{ p_item.cname }}</text>
+            <text class="product-title1">{{ p_item.cname || p_item.sname }}</text>
             <text class="product-title m-blue border blue-border">{{
               p_item.slevel
             }}</text>
-            <text class="product-title">{{ p_item.address }}</text>
+            <text class="product-title">{{ p_item.address || p_item.saddress }}</text>
           </view>
         </view>
       </view>
@@ -147,12 +147,10 @@ export default {
     });
     this.guid = options.guid;
     if (options.list != "" && options.list != null) {
-      const arr = JSON.parse(options.list).filter((item) => item.cid != this.guid);
-      if (arr.length <= 2) {
+      const arr = JSON.parse(options.list);
+
         this.wanleList = arr;
-      } else {
-        this.wanleList = arr.slice(0, 2);
-      }
+
     }
     this.detailInfo(options.guid);
     this.getIsShow();
@@ -739,6 +737,7 @@ body {
       height: 200rpx;
       margin-bottom: 10rpx;
       border-radius: 14rpx;
+      flex: none;
     }
 
     .m-content {
diff --git a/subPageA/scenic/sceniclist/sceniclist.vue b/subPageA/scenic/sceniclist/sceniclist.vue
index 3a9befe..471fd5c 100644
--- a/subPageA/scenic/sceniclist/sceniclist.vue
+++ b/subPageA/scenic/sceniclist/sceniclist.vue
@@ -55,7 +55,7 @@
             <!-- 产品区 -->
             <view class="product-wrapper">
               <view class="category-item">
-                <view class="category-content" v-if="scenicList.content.length>0">
+                <view class="category-content" v-if="scenicList.content.length > 0">
                   <view class="product-item relative" v-for="(p_item, p_index) in scenicList.content"
                     @tap="gotoDetail(p_item.cid)">
 					<view class="lq_recommend" v-if="p_item.isrecommend=='YES'">
@@ -71,10 +71,11 @@
                     </view>
                   </view>
                 </view>
-				<view class="scroll-empty" v-else>
-					<image class="empty-icon" src="http://www.mescroll.com/img/mescroll-empty.png?v=1" mode="widthFix"></image>
-					<view class="empty-tip">~ 暂无相关数据 ~</view>
-				</view>
+                <view class="scroll-empty" v-else>
+                  <image class="empty-icon" src="http://www.mescroll.com/img/mescroll-empty.png?v=1" mode="widthFix">
+                  </image>
+                  <view class="empty-tip">~ 暂无相关数据 ~</view>
+                </view>
               </view>
             </view>
           </view>
@@ -84,9 +85,9 @@
       <view class="sort-page" :hidden="selectedParam.hiddenSortPanel">
         <view class="sort-group">
           <view @tap="selected" :class="[
-              pageClass.sortItemClass,
-              selectedParam.sortId == item.id ? 'sort-item-active' : '',
-            ]" data-panel="hiddenSortPanel" data-type="sortId" :data-id="item.id" v-for="(item, index) in filter.sort"
+            pageClass.sortItemClass,
+            selectedParam.sortId == item.id ? 'sort-item-active' : '',
+          ]" data-panel="hiddenSortPanel" data-type="sortId" :data-id="item.id" v-for="(item, index) in filter.sort"
             :key="index">
             {{ item.name }}
           </view>
@@ -96,9 +97,9 @@
       <view class="sort-page" :hidden="selectedParam.hiddenRegionPanel">
         <view class="sort-group">
           <view @tap="regionSelected" :class="[
-              pageClass.sortItemClass,
-              selectedParam.bm == item.bm ? 'sort-item-active' : '',
-            ]" data-panel="hiddenRegionPanel" :data-name="item.title" data-type="bm" :data-id="item.bm"
+            pageClass.sortItemClass,
+            selectedParam.bm == item.bm ? 'sort-item-active' : '',
+          ]" data-panel="hiddenRegionPanel" :data-name="item.title" data-type="bm" :data-id="item.bm"
             v-for="(item, index) in regionList" :key="index">
             {{ item.title }}
           </view>
@@ -109,11 +110,11 @@
         <view class="filter-box">
           <scroll-view scrollY class="filter-hd">
             <view @tap="parentLevel" :class="[
-                pageClass.filterHdItemClass,
-                parentLevelItem == 'attribute_' + items.type
-                  ? 'filter-hd-item-active'
-                  : '',
-              ]" :data-parentLevelItem="'attribute_' + items.type" v-for="(items, index) in filter.attribute"
+              pageClass.filterHdItemClass,
+              parentLevelItem == 'attribute_' + items.type
+                ? 'filter-hd-item-active'
+                : '',
+            ]" :data-parentLevelItem="'attribute_' + items.type" v-for="(items, index) in filter.attribute"
               :key="index">
               {{ items.name }}
             </view>
@@ -122,19 +123,19 @@
             <view class="filter-group" v-if="parentLevelItem == 'attribute_' + items.type"
               v-for="(items, index) in filter.attribute" :key="items.dicnum">
               <view @tap="childLevel" :class="[
-                  pageClass.filterBdItem,
-                  selectedFIlter['attribute_' + items.type] == 0
-                    ? 'filter-bd-item-active'
-                    : '',
-                ]" data-id="0" :data-type="'attribute_' + items.type">
+                pageClass.filterBdItem,
+                selectedFIlter['attribute_' + items.type] == 0
+                  ? 'filter-bd-item-active'
+                  : '',
+              ]" data-id="0" :data-type="'attribute_' + items.type">
                 全部
               </view>
               <view @tap="childLevel" :class="[
-                  pageClass.filterBdItem,
-                  selectedFIlter['attribute_' + items.type] == item.dicnum
-                    ? 'filter-bd-item-active'
-                    : '',
-                ]" :data-id="item.dicnum" :data-type="'attribute_' + items.type"
+                pageClass.filterBdItem,
+                selectedFIlter['attribute_' + items.type] == item.dicnum
+                  ? 'filter-bd-item-active'
+                  : '',
+              ]" :data-id="item.dicnum" :data-type="'attribute_' + items.type"
                 v-for="(item, childIndex) in items.child" :key="childIndex">
                 {{ item.dicname }}
               </view>
@@ -393,10 +394,16 @@ export default {
     },
     gotoDetail(e) {
       console.log(e);
-      const list = JSON.stringify(this.scenicList.content)
-	  console.log("list",list)
+      let arr = this.scenicList.content.filter((item) => item.cid != e);
+      let list = []
+      if (arr.length <= 2) {
+        list = JSON.stringify(arr)
+      } else {
+        list = JSON.stringify(arr.slice(0, 2))
+      }
+      console.log("list", list)
       uni.navigateTo({
-        url: `/subPageA/scenic/scenicdetial/scenicdetial?guid=` + e + `&list=`+list,
+        url: `/subPageA/scenic/scenicdetial/scenicdetial?guid=` + e + `&list=` + list,
       });
     },
     getRedisRegion: function () {
@@ -576,12 +583,14 @@ page {
   background: #fff;
   z-index: 3;
 }
+
 .search-tip-bar {
   display: flex;
   height: 60rpx;
   border-bottom: 2rpx solid #e5e5e5;
   justify-content: space-between;
 }
+
 .search-tip-item {
   width: 33.333333%;
   height: 60rpx;
@@ -589,6 +598,7 @@ page {
   font-size: 28rpx;
   line-height: 60rpx;
 }
+
 .search-tip-item:after {
   display: inline-block;
   margin: -2rpx 0 0 6rpx;
@@ -600,12 +610,14 @@ page {
   content: "";
   vertical-align: middle;
 }
+
 .search-tip-item.active:after {
   border-top: 0;
   border-right: 8rpx solid transparent;
   border-bottom: 8rpx solid #666;
   border-left: 8rpx solid transparent;
 }
+
 .scroll-view {
   position: absolute;
   top: 60rpx;
@@ -614,30 +626,36 @@ page {
   left: 0;
   z-index: 4;
 }
+
 .list-container {
   width: 100%;
   background: #fff;
 }
+
 .list-wrap {
   box-sizing: border-box;
   padding: 0 30rpx;
   width: 100%;
   border-top: 1px solid #e1e1e1;
 }
+
 .list-item {
   display: flex;
   padding: 30rpx 0;
   border-bottom: 1px solid #eee;
 }
+
 .list-item .item-pic {
   width: 240rpx;
   height: 180rpx;
   border-radius: 6rpx;
 }
+
 .list-item .item-info {
   margin-left: 20rpx;
   flex: 1;
 }
+
 .list-item .item-info .title {
   display: -webkit-box;
   overflow: hidden;
@@ -648,6 +666,7 @@ page {
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }
+
 .list-item .item-info .attr .tip {
   display: inline-block;
   margin-right: 12rpx;
@@ -659,33 +678,39 @@ page {
   font-size: 20rpx;
   line-height: 32rpx;
 }
+
 .list-item .item-info .data {
   display: flex;
   margin-top: 10rpx;
   justify-content: space-between;
 }
+
 .list-item .item-info .data .myd,
 .list-item .item-info .data .sell {
   color: #05a9f0;
   font-size: 26rpx;
   line-height: 40rpx;
 }
+
 .list-item .item-info .data .myd1,
 .list-item .item-info .data .sell {
   color: #999;
   font-size: 28rpx;
   line-height: 40rpx;
 }
+
 .list-item .item-info .data .price {
   color: #999;
   font-size: 24rpx;
   line-height: 40rpx;
 }
+
 .list-item .item-info .data .price .num {
   color: #ff4f32;
   font-size: 32rpx;
   line-height: 40rpx;
 }
+
 .sort-page {
   position: absolute;
   top: 210rpx !important;
@@ -695,9 +720,11 @@ page {
   z-index: 10;
   background: rgba(0, 0, 0, 0.5);
 }
+
 .sort-group {
   background: #fff;
 }
+
 .sort-item {
   position: relative;
   padding: 0 30rpx;
@@ -707,9 +734,11 @@ page {
   font-size: 28rpx;
   line-height: 78rpx;
 }
+
 .sort-item-active {
   color: #1677ff;
 }
+
 .sort-item-active:after {
   position: absolute;
   top: 50%;
@@ -722,6 +751,7 @@ page {
   background-size: contain;
   content: "";
 }
+
 .filter-page {
   position: absolute;
   top: 210rpx !important;
@@ -732,6 +762,7 @@ page {
   background: #fff;
   height: auto;
 }
+
 .filter-box {
   position: absolute;
   top: 0;
@@ -740,11 +771,13 @@ page {
   left: 0;
   display: -webkit-box;
 }
+
 .filter-hd {
   width: 220rpx;
   height: 100%;
   background: #f2f6f9;
 }
+
 .filter-hd-item {
   position: relative;
   padding: 0 20rpx;
@@ -752,11 +785,13 @@ page {
   font-size: 28rpx;
   line-height: 80rpx;
 }
+
 .filter-bd-item-active,
 .filter-hd-item-active {
   background: #fff;
   color: #1677ff;
 }
+
 .filter-bd-item-active:after {
   position: absolute;
   top: 50%;
@@ -769,11 +804,13 @@ page {
   background-size: contain;
   content: "";
 }
+
 .filter-bd {
   padding: 0 20rpx;
   height: 100%;
   -webkit-box-flex: 1;
 }
+
 .filter-bd-item {
   position: relative;
   padding: 0 20rpx;
@@ -782,6 +819,7 @@ page {
   font-size: 28rpx;
   line-height: 78rpx;
 }
+
 .control-bar-block {
   position: absolute;
   right: 0;
@@ -792,6 +830,7 @@ page {
   height: 80rpx;
   background: #fafafa;
 }
+
 .control-back-btn {
   margin-right: 20rpx;
   width: 170rpx;
@@ -803,6 +842,7 @@ page {
   font-size: 26rpx;
   line-height: 76rpx;
 }
+
 .control-confirm-btn {
   height: 80rpx;
   border-radius: 10rpx;
@@ -978,6 +1018,7 @@ page {
               margin: 0 20rpx;
 
               justify-content: space-between;
+
               .product-item {
                 width: 100%;
                 display: flex;
@@ -1002,6 +1043,7 @@ page {
                     padding-bottom: 12rpx;
                     padding-top: 10rpx;
                   }
+
                   .product-title {
                     width: fit-content;
                     font-size: 24rpx;
@@ -1010,10 +1052,10 @@ page {
                   }
 				  .product-con{ font-size: 28rpx;color: #999;
 				  height: 40rpx;
-				   overflow: hidden; 			  
-				      
+				   overflow: hidden;
+
 				      text-overflow: ellipsis;
-				      white-space: nowrap; 	
+				      white-space: nowrap;
 				  image{width: 24rpx;margin-right: 8rpx;}
 				  }
                 }
diff --git a/subPageC/bookTicket/bookTicket.vue b/subPageC/bookTicket/bookTicket.vue
index 065a819..ed25cc8 100644
--- a/subPageC/bookTicket/bookTicket.vue
+++ b/subPageC/bookTicket/bookTicket.vue
@@ -61,7 +61,7 @@
               @change="changeCount($event, ticket)" />
           </view>
           <view class="m-ticket-count-value" v-else>
-            <uni-number-box :min="ticket.qmxTicketInfoVO.minBuyNum" :max="ticket.qmxTicketInfoVO.maxBuyNum"
+            <uni-number-box :min="0" :max="maxBuyNums" :disabled="!ticket.date"
               v-model="ticket.num" @change="changeCount($event, ticket)" />
           </view>
         </view>
@@ -344,7 +344,7 @@
       </view>
     </uni-popup>
     <!-- 新增 -->
-    <uni-popup ref="mAddPerson" type="bottom" border-radius="10px 10px 0 0" :safe-area="false" :mask-click="false">
+    <uni-popup ref="mAddPerson" type="bottom" border-radius="10px 10px 0 0" :safe-area="false" >
       <view class="m-purchase-notice m-pop-bg">
         <view class="m-green-bg"></view>
         <view class="m-red-bg"></view>
@@ -846,7 +846,11 @@ export default {
           }
         }
       } else {
-        this.ticket.date = that.parseTime(new Date())
+        if (this.ticket.datesettings == 1){
+          this.ticket.date = that.parseTime(new Date())
+        }else{
+          this.ticket.date = null
+        }
         const params = {
           ticketId: that.ticket.id,
           date: that.parseTime(new Date()),
@@ -1139,11 +1143,7 @@ export default {
       this.$refs.scroll.close();
       this.$refs.mAddPerson.open();
       this.titleName = "编辑";
-      if (this.ticket && this.ticket.qmxId == null) {
-        this.baseFormData = val;
-      } else {
-        this.baseFormData = val;
-      }
+      this.baseFormData = JSON.parse(JSON.stringify(val));
     },
     //删除游客信息
     del(val) {