更新

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest92? true : false;
+      data.isTest = data.isTest94? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

pages/index/index.wxml

@@ -288,6 +288,10 @@
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
         <view>景区舒适度</view>
       </view> -->
+            <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image>
+        <view>安全服务</view>
+      </view>
       <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度"
       data-url="https://m.cloud.sz-trip.com/ScenicComfort" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
@@ -298,19 +302,20 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20230808/484100644e7f02f4eb722a8c2e665927.png" mode="widthFix"></image>
         <view>行李寄存</view>
       </view>
-      <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
+      <view bindtap="gotoUrl" data-event="xlqc"
+        data-url="https://jiaotonghao2.amap.com/?channel=amap&unitId=257&src=app_share#/" class="pbservice-item">
+        <image src="https://static.ticket.sz-trip.com/uploads/20230901/21668c913dd4875d05eba398e905b9f0.png" mode="widthFix"></image>
+        <view>实时路况</view>
+      </view>
+      <!-- <view bindtap="gotoPath" data-event="toilet_home_click" data-title="找厕所"
         data-path="/pages/pbService/bike/index?type=1" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb2.png" mode="widthFix"></image>
         <view>找厕所</view>
-      </view>
-      <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
+      </view> -->
+      <!-- <view bindtap="gotoPath" data-event="car_park_home_click" data-title="停车场"
         data-path="/pages/pbService/bike/index?type=2" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb3.png" mode="widthFix"></image>
         <view>停车场</view>
-      </view>
-      <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="安全服务" data-path="/pages/pbService/security/index" class="pbservice-item">
-        <image src="https://static.ticket.sz-trip.com/xcxImages/index/pb4.png" mode="widthFix"></image>
-        <view>安全服务</view>
       </view> -->
       <!-- <view bindtap="gotoPath" data-event="security_home_click" data-title="12348" data-path="/pages/index/index"
         class="pbservice-item">

pages/list/feiyi/index.js

@@ -26,6 +26,16 @@ Page({
       }
     },1)
   },
+  goodsDetail(e){
+    wx.navigateTo({
+      url: '/pages/info/postProductInfo/index?id='+e.currentTarget.dataset.goods.id,
+    })
+  },
+  goShop(e){
+    wx.navigateTo({
+      url: '/pages/list/store/index?id='+e.currentTarget.dataset.id,
+    })
+  },
   getList:function(){
     let list = this.data.list;
     if(list.length>=this.data.total) return;
@@ -45,6 +55,7 @@ Page({
     })
   },
 
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/list/feiyi/index.wxml

@@ -1,31 +1,38 @@
 <!--pages/list/feiyi/index.wxml-->
 <title title="非遗专卖"></title>
 <image src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyinew_02.jpg" mode="widthFix" class="main-img"></image>
-<navigator url="../store/index?id={{item.id}}" wx:for="{{list}}" class="store-item" catchtap="pagePoint" data-id="{{item.id}}" data-event="legacy_shop">
+<view  wx:for="{{list}}" class="store-item" >
   <image class="top-img" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_03.png" mode="widthFix"></image>
   <view class="store-in-box">
-    <view class="store-item-top">
+    <view class="store-item-top" bindtap="goShop" data-id="{{item.id}}">
       <image src="{{item.headimg}}" mode="aspectFill" class="main-store-img"></image>
       <!-- <image mode="aspectFill" src="" class="main-store-img"><image> -->
       <view class="store-main-info">
-        <view>{{item.supplier_name}}</view>
-        <view class="store-main-tags">
-          <view class="store-main-tag" wx:for="{{item.display_tags}}">{{item}}</view>
+        <view>{{item.shop_name}}</view>
+        <view class="mid-box">
+          <view class="store-main-tags">
+            <view class="store-main-tag" wx:for="{{item.display_tags}}">{{item}}</view>
+          </view>
+      <view class="store-main-price">{{item.start_price/100}}</view>
+
+        </view>
+        <view class="bottom-box">
+         <view class="store-main-location">{{item.address}}</view>
+        <view class="shopbtn">进店看看</view>
+          
         </view>
-        <view class="store-main-location">{{item.address}}</view>
       </view>
-      <view class="store-main-price">{{item.start_price/100}}</view>
     </view>
     <view class="store-product-list" wx:if="{{item.product.length>0}}">
-      <view class="product-item" wx:for="{{item.product}}">
-        <image class="product-img" src="{{item.headimg}}" mode="aspectFill" ></image>
-        <view class="product-title">{{item.title}}</view>
+      <view class="product-item" wx:for="{{item.product}}" wx:for-item="goods" bindtap="goodsDetail" data-goods="{{goods}}">
+        <image class="product-img" src="{{goods.headimg}}" mode="aspectFill" ></image>
+        <view class="product-title">{{goods.title}}</view>
         <view class="price-box">
-          <text class="now-price">{{item.price/100}}</text>
-          <text class="old-price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">￥{{item.market_price/100}}</text>
+          <text class="now-price">{{goods.price/100}}</text>
+          <text class="old-price" wx:if="{{goods.market_price && goods.market_price!=0 && goods.market_price>goods.price}}">￥{{goods.market_price/100}}</text>
         </view>
       </view>
     </view>
   </view>
   <image class="top-img" mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/feiyi/feiyi-line_06.png"></image>
-</navigator>
+</view>

pages/list/feiyi/index.wxss

@@ -35,6 +35,7 @@ page {
   object-fit: cover;
 }
 .store-main-info {
+  height: 136rpx;
   flex:1;
   font-size: 34rpx;
 }
@@ -68,12 +69,11 @@ page {
 .store-main-price {
   font-size: 44rpx;
   color: #f9e498;
-  margin-left: 20rpx;
 }
 .store-main-price:after {
   content: "起";
   font-size: 24rpx;
-  margin-left: 20rpx;
+  margin-left:8rpx;
 }
 .store-product-list {
   display: flex;
@@ -119,4 +119,28 @@ page {
   font-size: 24rpx;
   color: #ccc;
   text-decoration: line-through;
+}
+
+.shopbtn{
+width: 120rpx;
+height: 33rpx;
+background: #C7A668;
+border-radius: 16rpx;
+font-size: 23rpx;
+font-family: PingFang SC;
+font-weight: bold;
+color: #1D3256;
+line-height: 33rpx;
+text-align: center;
+}
+.mid-box{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.bottom-box{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
 }

pages/list/techan/index.js

@@ -27,7 +27,12 @@ Page({
     })
     this.getList();
   },
-  gotoDetail:function(e){
+  goodsDetail(e){
+    wx.navigateTo({
+      url: '/pages/info/postProductInfo/index?id='+e.currentTarget.dataset.goods.id,
+    })
+  },
+  goShop(e){
     let id = e.currentTarget.dataset.id;
     util.pagePoint({
       event: 'legacy_shop',
@@ -37,7 +42,7 @@ Page({
       type:'supplier'
     },1)
     wx.navigateTo({
-      url: '../store/index?type=specialty_detail&id='+id,
+      url: '/pages/list/store/index?id='+id,
     })
   },
   gotoProduct:function(e){

pages/list/techan/index.wxml

@@ -9,20 +9,28 @@
   <view class="type-text" bindtap="changeType" data-type="2" style="left:auto;right:135rpx"><text>文</text><text>创</text></view>
 </view>
 <view class="list">
-  <view bindtap="gotoDetail" data-id="{{item.id}}" class="item" wx:for="{{list}}">
-    <view class="top-info">
+  <view  class="item" wx:for="{{list}}">
+    <view class="top-info" bindtap="goShop" data-id="{{item.id}}">
       <common-image mode="aspectFill" src="{{item.headimg}}"></common-image>
       <view class="supplier-info">
         <view class="supplier-name textOver">{{item.shop_name}}</view>
-        <view class="supplier-tags">
+        <view class="mid-box">
+          <view class="supplier-tags">
           <view class="supplier-tag textOver" wx:for="{{item.display_tags}}">{{item}}</view>
         </view>
-        <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text class="textOver">{{item.address}}</text></view>
-      </view>
       <view class="supplier-price"><text>￥</text><text>{{(item.start_price/100)}}</text><text>起</text></view>
+        </view>
+        <view class="bottom-box">
+          <view class="supplier-address supplier-tags"><text class="iconfont icon-location"></text><text class="textOver">{{item.address}}</text></view>
+          <view class="btn">
+              进店看看
+          </view>
+        </view>
+
+      </view>
     </view>
     <view class="product-list">
-      <view data-item="{{item}}" class="product-item" wx:for="{{item.product}}">
+      <view data-item="{{item}}" bindtap="goodsDetail" data-goods="{{item}}" class="product-item" wx:for="{{item.product}}">
         <image src="{{item.headimg}}" mode="aspectFill"></image>
         <view class="product-title textOver2">{{item.title}}</view>
         <view class="supplier-price"><text>￥</text><text style="font-size:30rpx">{{(item.price/100)}}</text><text class="market_price" wx:if="{{item.market_price && item.market_price!=0 && item.market_price>item.price}}">{{item.market_price/100}}</text></view>

pages/list/techan/index.wxss

@@ -58,7 +58,7 @@ page {
   display: flex;
   flex-direction: column;
   height: 136rpx;
-  justify-content: space-around;
+  justify-content:space-between;
   flex: 1;
   width: 300rpx;
 }
@@ -116,4 +116,28 @@ page {
   font-size: 24rpx;
   margin-left: 10rpx;
   text-decoration: line-through;
+}
+.mid-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.bottom-box{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.btn{
+width: 120rpx;
+flex-shrink: 0;
+height: 33rpx;
+background: #C6937F;
+border-radius: 16rpx;
+line-height: 33rpx;
+text-align: center;
+
+font-size: 23rpx;
+font-family: PingFang SC;
+font-weight: 500;
+color: #FDF6E8;
 }

pages/order/road/index.js

@@ -40,7 +40,9 @@ Page({
         res.data.sku = [sku];
       }
       res.data.sku.map(item=>{
-        nums.push(0)
+        console.log(item);
+        item.stock>0?nums.push(1):nums.push(0)
+        
       })
       for(let i=0;i<res.data.sku.length;i++){
         for(let j=i+1;j<res.data.sku.length;j++){

pages/pbService/appreciate/index.wxss

@@ -39,6 +39,10 @@ page {
    margin-top: 10rpx;
    height: 50rpx;
    overflow-x: auto;
+   overflow-y:hidden;
+}
+.tags::-webkit-scrollbar{
+	display:none;
 }
 .tag {
   font-size: 26rpx;

pages/user/profile/index.wxml

@@ -50,6 +50,7 @@
 </view>
 <navigator url="../logout/index" class="profile-item">
   <text>注销账号</text>
+  <view class="info">注销后账号无法恢复，请谨慎操作</view>
   <view class="iconfont icon-you"></view>
 </navigator>
 <view class="cropper-wrapper" wx:if="{{showCropper}}">

project.private.config.json

@@ -60,6 +60,13 @@
           "pathName": "pages/pbService/group/index",
           "query": "",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/supplier/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }