文档修复

pages/index/index.wxml

@@ -179,16 +179,16 @@
         <image src="https://static.ticket.sz-trip.com/uploads/20220907/d50f492083b419b9b538de274423084c.png" mode="widthFix"></image>
         <view>数字博物馆</view>
       </view>
-      <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
+      <!-- <view bindtap="gotoUrl" data-event="book_click" data-title="文博会" data-url="https://yscbh.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view>
-      </view>
-      <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
+      </view> -->
+      <!-- <view bindtap="gotoUrl" data-event="investment_click" data-title="投资导引图" data-url="https://hot-map.sz-trip.com/"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb1.png" mode="widthFix"></image>
         <view>投资导引图</view>
-      </view>
+      </view> -->
       <!-- <view bindtap="gotoUrl" data-title="数字文物"
         data-url="https://foxnut-gffcu6t2.pai.tcloudbase.com/suzhouguobao/index.html#/" class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/xcxImages/index/newpb12.png" mode="widthFix"></image>

pages/info/postProductInfo/index.js

@@ -32,18 +32,23 @@ Page({
     allowance_data: null,
     showAllowance: false,
     tjList: [], //推荐商品列表
+    iShop:false,
+    supplierId:null
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    console.log(options);
     let rect = wx.getMenuButtonBoundingClientRect(),
       that = this;
     let height = (rect.top - device.statusBarHeight) * 2 + rect.height + device.statusBarHeight;
     this.setData({
       top: height,
-      id: options.id
+      id: options.id,
+      iShop:options.iShop||false,
+      supplierId:options.supplierId
     })
     // 获取购物车按钮的位置
     wx.createSelectorQuery().select('#cart').boundingClientRect(function (res) {

pages/info/postProductInfo/index.wxml

@@ -107,15 +107,23 @@
 </view>
 <view style="height:140rpx"></view>
 <view class="fixed-bottom">
-  <navigator url="/pages/user/service/index" catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
+<view class="['left-img',{{!iShop?'no-shop':''}}]">
+  <navigator wx:if="{{iShop}}" url="/pages/list/store/index?id={{supplierId}}" catchtap="pagePoint" data-event='product_customservice' class="shop-box">
+  <view class="shop-box">
+    <image class="icon-shop" src="https://static.ticket.sz-trip.com/uploads/20230220/cc7bfaf50dccd354c56a1ad40d730b2e.png" mode="aspectFill"/>
+    <view>店铺</view>
+  </view>
+  </navigator>
+  <navigator url="/pages/user/service/index"  catchtap="pagePoint" data-event='product_customservice' class="kefu-box">
     <view class="iconfont icon-kefu"></view>
     <view>客服</view>
   </navigator>
-  <view bindtap="like" class="kefu-box" style="margin-left:70rpx">
+  <view bindtap="like" class="kefu-box">
     <view class="iconfont {{isLike==1?'icon-shoucang':'icon-xin'}}"></view>
     <view>收藏</view>
   </view>
-  <view style="flex:1"></view>
+</view>
+
   <view class="btns">
     <view class="btn" bindtap="showCart">加入购物车</view>
     <view class="btn" bindtap="showOrder" wx:if="{{info && info.flag==1}}">立即购买</view>

pages/info/postProductInfo/index.wxss

@@ -408,6 +408,7 @@ page {
   font-size: 23rpx;
   justify-content: space-between;
   text-align: center;
+  padding-left: 0;
 }
 
 .fixed-bottom .iconfont {
@@ -901,3 +902,25 @@ page {
   color: #999999;
   font-size: 10px;
 }
+.icon-shop{
+  width: 34rpx;
+  height: 36rpx;
+}
+.left-img{
+  display: flex;
+  width: 290rpx;
+  flex-shrink: 0;
+  justify-content: space-between;
+  padding: 0 40rpx;
+  box-sizing: border-box;
+}
+.no-shop{
+  width: 230rpx;
+}
+.shop-box{
+  display:flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  height: 70rpx;
+}

pages/list/store/index.js

@@ -44,6 +44,8 @@ Page({
       },
       type:item.type
     },1)
+    item.iShop = true
+    item.supplierId = this.data.id
     util.gotoDetail(item);
   },
   getList(){

pages/old/linkman/add/index.wxss

@@ -6,7 +6,7 @@ page {
   display: flex;
   align-items: center;
   height: 185rpx;
-  font-size: 49rpx;
+  font-size: 31rpx;
   font-weight: 500;
   margin: 0 30rpx;
   justify-content: space-between;
@@ -17,7 +17,7 @@ page {
   flex: 1;
 }
 .input-item textarea.weui-input {
-  height: 120rpx;
+  height: 40rpx;
 }
 .picker {
   height: 80rpx;
@@ -45,7 +45,7 @@ page {
   right: 27rpx;
   bottom: 27rpx;
   justify-content: space-between;
-  font-size: 49rpx;
+  font-size: 31rpx;
   font-weight: bold;
 }
 .btns view {

pages/order/hotel/index.wxml

@@ -68,7 +68,7 @@
     </view>
   </view>
 </view>
-<coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon>
+<!-- <coupon id="coupon" money="{{CtripHotelCart.price_sum * (numberIndex+1)}}" sku="{{CtripHotelCart.id}}"></coupon> -->
 <!-- 支付按钮 -->
 <view style="height:{{100 }}rpx"></view>
 <view class="fixed-bottom">

pages/order/hotel/index.wxss

@@ -164,7 +164,7 @@ page {
   z-index: 98;
 }
 .price-all {
-  line-height: 100rpx;
+  /* line-height: 100rpx; */
   flex: 1;
 }
 .price-all text {

pages/order/scene/index.js

@@ -191,13 +191,13 @@ Page({
   order: function () {
     let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;
     let linkmanIds = [];
-    if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
-      wx.showToast({
-        title: '请选择' + productNum + "个出行人",
-        icon: "none"
-      })
-      return;
-    }
+    // if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) {
+    //   wx.showToast({
+    //     title: '请选择' + productNum + "个出行人",
+    //     icon: "none"
+    //   })
+    //   return;
+    // }
     if (!date) {
       wx.showToast({
         title: '请选择使用日期',

pages/search/list/index.wxml

@@ -28,7 +28,7 @@
     </view>
   </navigator>
   <!-- 景点、门票 -->
-  <view class="product-item" wx:if="{{item.ext.type=='scenic' || item.ext.type=='ticket'}}">
+  <view class="product-item" wx:if="{{item.ext.type=='scenic' || item.ext.type=='ticket'||item.ext.type=='tenscenic'}}">
     <common-image class="product-img" src="{{item.ext.headimg}}" mode="aspectFill"></common-image>
     <!-- <image></image> -->
     <view class="product-info">
@@ -40,7 +40,7 @@
       <view class="price-box">
         <view class="textOver" wx:if="{{item.ext.distance}}">距您直线距离{{item.ext.distance}}km</view>
         <view wx:else></view>
-        <view class="price"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
+        <view wx:if="{{item.ext.type!='tenscenic'}}" class="price"><text>￥</text><text>{{item.ext.price/100}}</text><text>起</text></view>
       </view>
     </view>
   </view>

pages/user/address/add/index.wxml

@@ -16,7 +16,11 @@
         <view class="picker" style="line-height:90rpx;height:90rpx;">
       {{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}{{multiArray[2][multiIndex[2]]}}
         </view>
+       
       </picker>
+      <view>
+           >
+        </view>
     </view>
     <view class="input-item">
       <text class="input-label">详细地址</text>

utils/util.js

@@ -200,9 +200,20 @@ const gotoDetail = (item,isPagePoint) =>{
         pagePointData.id = item.id
         pagePoint(pagePointData,1)
       }
-      wx.navigateTo({
-        url: '/pages/info/postProductInfo/index?id='+item.id
-      })
+      try {
+        if (item.iShop) {
+          wx.navigateTo({
+            url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId
+          })
+        }else{
+          wx.navigateTo({
+            url: '/pages/info/postProductInfo/index?id='+item.id
+          })
+        }
+      } catch (error) {
+        
+      }
+
       break;
     case "line":
       // 产品 线路