修改

5 years ago · 52224c76ab
44 changed files with 405 additions and 70 deletions
--- a/app.js
+++ b/app.js
@ -61,7 +61,9 @@ App({
      "REFUND":"已退款",
      "COMPLETED":"已完成",
      "EXPIRED":"已过期/已失效",
-      "REFUNDING":"退款中" 
+      "REFUNDING":"退款中" ,
+      "TICKET_ERROR":"出票失败",
+      "REFUND_FAIL":"退订失败"
    },
    orderState:{
      "UNPAID":"待付款",
@ -78,7 +80,9 @@ App({
      "REFUND":"已退款",
      "COMPLETED":"已完成",
      // "EXPIRED":"已过期/已失效",
-      "REFUNDING":"退款中" 
+      "REFUNDING":"退款中" ,
+      'REFUND_REFUSE':'退款拒绝',
+      'REFUND_ERROR':'退款异常'
    },
    codeState:['未使用','已使用','已失效','已取消'],
    weburl:"",
--- a/app.json
+++ b/app.json
@ -59,6 +59,7 @@
    "pages/user/likes/index",
    "pages/user/email/index",
    "pages/list/feiyi/index",
+    "pages/list/haoxing/index",
    "pages/list/food/index",
    "pages/list/techan/index",
    "pages/list/museum/index",
@ -115,7 +116,7 @@
  "window":{
    "backgroundTextStyle":"light",
    "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "苏州文化旅游总入口",
+    "navigationBarTitleText": "君到苏州",
    "navigationBarTextStyle":"black",
    "navigationStyle":"custom"
  },
--- a/app.wxss
+++ b/app.wxss
@ -34,6 +34,7 @@ page{
  max-height: 60%;
  background: white;
  border-radius: 12rpx;
+  overflow-y: auto;
 }
 /* 一部分list的分类需要加蓝色的圆圈可以用这个类名 */
 .common-types {
--- a/images/place3.jpg
+++ b/images/place3.jpg
--- a/pages/index/index.json
+++ b/pages/index/index.json
@ -1,5 +1,6 @@
 {
  "usingComponents": {
-    "common-image":"/pages/component/commonImage/index"
+    "common-image":"/pages/component/commonImage/index",
+    "title":"/pages/component/TitleHeader"
  }
 }
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@ -1,4 +1,5 @@
 <!--index.wxml-->
+<title title="君到苏州"></title>
 <swiper class="swiper" indicator-dots="{{true}}"
  autoplay="{{true}}" interval="{{5000}}" duration="{{300}}">
  <block wx:for="{{banner}}" wx:key="*this">
@ -7,7 +8,7 @@
    </swiper-item>
  </block>
 </swiper>
-<view wx:if="{{weather}}" class="top-box" style="right:{{right}}px;top:{{padHeight}}px;height:{{height}}px">
+<view wx:if="{{weather}}" class="top-box" style="right:30rpx;top:{{padHeight+height}}px;height:{{height}}px">
  <image src="{{weather.icon}}" mode="aspectFill"></image>
  <view class="weather-num">{{weather.max_temp}}°</view>
  <view class="weather">{{weather.weather}}</view>
@ -62,22 +63,33 @@
 </view>
 <view class="content">
  <view class="sale-road-boxes">
-    <view class="sale-box">
-      <view bindtap="gotoPath" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index" class="sale-title"><text>限时特惠</text>超值商品限时抢购</view>
-      <view class="sale-product" wx:if="{{saleProduct && isTest==false}}" bindtap="productGotoDetail" data-item="{{saleProduct.sku.product}}">
+    <view class="sale-box" bindtap="gotoPath" data-path="/pages/list/{{isTest==false?'sale':'scene'}}/index" >
+      <view class="sale-title"><text>限时特惠</text>超值商品限时抢购</view>
+      <view class="sale-product" wx:if="{{saleProduct && isTest==false}}">
        <view class="sale-product-bg"></view>
        <common-image class="sale-img" width="173rpx" height="165rpx" src="{{saleProduct.sku.headimg}}" mode="aspectFill"></common-image>
-        <!-- <image src="{{saleProduct.sku.headimg}}" class="sale-img" mode="aspectFill"></image> -->
        <image class="sale-tip-img" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/index/sale.png" mode="widthFix"></image>
        <view class="sale-info">
          <view class="sale-product-title textOver2">{{saleProduct.sku.product.title+saleProduct.sku.sku_name}}</view>
          <view class="sale-price">￥{{saleProduct.price/100}}起</view>
        </view>
      </view>
+      <view class="sale-product" wx:else>
+        <view class="sale-product-bg"></view>
+        <common-image class="sale-img" width="173rpx" height="165rpx" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/index/tehuizhanwei.jpg" mode="aspectFill"></common-image>
+        <image class="sale-tip-img" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/index/sale.png" mode="widthFix"></image>
+        <view class="sale-info">
+          <view class="sale-product-title textOver2">
+            <view>限时特惠</view>
+            <view>正在赶来</view>
+          </view>
+          <view class="sale-price">敬请期待</view>
+        </view>
+      </view>
    </view>
-    <view class="sale-box">
-      <view bindtap="gotoPath" data-path="/pages/list/road/index" class="sale-title"><text>精品线路</text>精品线路精心挑选</view>
-      <view bindtap="productGotoDetail" data-item="{{roadProduct}}" class="sale-product" wx:if="{{roadProduct}}">
+    <view class="sale-box" bindtap="gotoPath" data-path="/pages/list/road/index">
+      <view class="sale-title"><text>精品线路</text>精品线路精心挑选</view>
+      <view class="sale-product" wx:if="{{roadProduct}}">
        <view class="sale-product-bg road-product-bg"></view>
        <common-image class="sale-img" width="173rpx" height="165rpx" src="{{roadProduct.headimg}}" mode="aspectFill"></common-image>
        <!-- <image src="{{roadProduct.headimg}}" class="sale-img" mode="aspectFill"></image> -->
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@ -459,3 +459,6 @@
  letter-spacing: 3rpx;
  font-weight: 500;
 }
+.title-header .icon-fanhui1 {
+  display: none;
+}
--- a/pages/info/foodInfo/index.wxml
+++ b/pages/info/foodInfo/index.wxml
@ -1,5 +1,5 @@
 <wxs src="../../../utils/filter.wxs" module="tool" />
-<title title="产品详情"></title>
+<title title="{{info.title}}"></title>
 <swiper class="swiper" indicator-dots="{{true}}" wx:if="{{info}}"
  autoplay="{{true}}" interval="{{2000}}" duration="{{300}}">
  <block wx:for="{{info.listimg}}" wx:key="*this">
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@ -117,6 +117,7 @@
      <view class="number">{{producNum}}</view>
      <view class="iconfont icon-add-select" bindtap="add"></view>
    </view>
+    <view style="height:138rpx"></view>
    <view class="btn-box">
      <view class="mask-btn" bindtap="order">{{skuFlag=='cart'?'确认':'立即购买'}}</view>
    </view>
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@ -484,6 +484,10 @@ page {
  display: flex;
  align-items: center;
  justify-content: center;
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }
 .mask-btn {
  width: 670rpx;
--- a/pages/list/activity/index.wxml
+++ b/pages/list/activity/index.wxml
@ -41,7 +41,7 @@
          <view wx:if="{{type==2}}">{{item.source?item.source:""}}</view>
        </view>
      </view>
-      <common-image width="320rpx" height='220rpx' src="{{item.post_url || item.cover}}" mode="aspectFill"></common-image>
+      <common-image width="320rpx" height='220rpx' src="{{item.post_url || item.cover}}" defaultImage="/images/place3.jpg" mode="aspectFill"></common-image>
      <!-- <image  ></image> -->
    </view>
  </view>
--- a/pages/list/haoxing/index.js
+++ b/pages/list/haoxing/index.js
@ -0,0 +1,93 @@
+// pages/list/haoxing/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    list:[],
+    keywords:''
+  },
+  getList:function(){
+    let service="product/get_product_by_tag",data = {
+      tag_id:"21",
+      title:this.data.keywords,
+      offset:0,
+      limit:1000
+    };
+    commonApi._post(service,data).then(res=>{
+      this.setData({
+        list:res.data.list
+      })
+    })
+  },
+  search:function(e){
+    this.setData(e.detail);
+    this.setData({
+      list:[]
+    })
+    this.getList();
+  },
+  gotoDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    util.gotoDetail(item)
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.getList()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
--- a/pages/list/haoxing/index.json
+++ b/pages/list/haoxing/index.json
@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "search":"/pages/component/SearchHeader"
+  }
+}
--- a/pages/list/haoxing/index.wxml
+++ b/pages/list/haoxing/index.wxml
@ -0,0 +1,14 @@
+<!--pages/list/haoxing/index.wxml-->
+<search bind:onload="search" title="君到苏州"></search>
+<image class="topimg" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/listtop/haoxing.jpg" mode="widthFix"></image>
+<view class="content">
+  <image class="topimg" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/listtop/haoxingimg2.png" mode="widthFix"></image>
+  <view bindtap="gotoDetail" data-item="{{item}}" class="product-item" wx:for="{{list}}" style="{{index==0?'margin-top:-40rpx':''}}">
+    <image class="topimg" src="{{item.headimg}}" mode="aspectFill"></image>
+    <view class="product-bottom">
+      <text class="textOver">{{item.title}}</text>
+      <view class="price">{{item.price/100}}/</view>
+      <view class="btn">立即购买</view>
+    </view>
+  </view>
+</view>
--- a/pages/list/haoxing/index.wxss
+++ b/pages/list/haoxing/index.wxss
@ -0,0 +1,66 @@
+/* pages/list/haoxing/index.wxss */
+page {
+  background: #E3345F;
+}
+.topimg {
+  display: block;
+  width: 100%;
+  position: relative;
+  z-index: 0;
+}
+.content {
+  padding: 30rpx 17rpx;
+  position: relative;
+  z-index: 1;
+}
+.product-item {
+  padding: 14rpx 13rpx;
+  background: white;
+  border-radius: 20rpx;
+  padding-bottom: 0;
+  margin-top: 20rpx;
+}
+.product-item image {
+  position: static;
+  height: 294rpx;
+  border-radius: 13rpx;
+}
+.product-bottom {
+  margin: 0 20rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 87rpx;
+}
+.product-bottom text {
+  font-weight: bold;
+  font-size: 39rpx;
+  color: #000;
+  flex: 1;
+  margin-right: 20rpx;
+}
+.product-bottom .price {
+  color: #D4362D;
+  font-size: 39rpx;
+  margin-right: 10rpx;
+  flex-shrink: 0;
+}
+.product-bottom .price::before {
+  content: "￥";
+  font-size: 24rpx;
+}
+.product-bottom .price::after {
+  content: "起";
+  margin-left: 4rpx;
+  font-size: 24rpx;
+}
+.btn {
+  width: 160rpx;
+  line-height: 54rpx;
+  flex-shrink: 0;
+  background: #D4362D;
+  border-radius: 13rpx;
+  text-align: center;
+  color: #fff;
+  font-size: 32rpx;
+}
--- a/pages/map/index.js
+++ b/pages/map/index.js
@ -75,7 +75,7 @@ Page({
        url: '/pages/pbService/wbdw/info/index?id='+this.data.info.info.id,
      })
    }
-    else if(this.data.info.info.type=='restaurant'){
+    else if(this.data.info.info.type=='restaurant' || this.data.info.info.type=='tenscenic'){
      wx.navigateTo({
        url: '/pages/info/foodInfo/index?id='+this.data.info.info.id,
      })
@ -116,7 +116,7 @@ Page({
  },
  getList:function(){
    this.mapCtx = wx.createMapContext("map");
-    let types = ['','scenic','venue','post','restaurant','relic','show','cinema'],that = this;
+    let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema'],that = this;
    this.mapCtx.getRegion({
      type: 'gcj02',
      success: function(res) {
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@ -30,14 +30,14 @@
    <text style="color:#00B3C8" class="iconfont icon-location"></text>
    <text>文物</text>
  </view>
-  <!-- <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-type="6">
-    <text style="color:#EB3C70" class="iconfont icon-location"></text>
-    <text>演出</text>
-  </view> -->
  <view class="right-menu-item{{type==7?' active':''}}" bindtap="changeType" data-type="7">
    <text style="color:#9342CB" class="iconfont icon-location"></text>
    <text>影院</text>
  </view>
+  <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-type="6">
+    <text style="color:#EB3C70" class="iconfont icon-location"></text>
+    <text>运河十景</text>
+  </view>
 </view>
 <view class="map-item" wx:if="{{showInfo && info}}">
  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@ -33,7 +33,7 @@
  position: fixed;
  margin-top: 60rpx;
  right: 0;
-  width: 105rpx;
+  /* width: 105rpx; */
  background: #FFFFFF;
  border-radius: 20rpx 0px 0px 20rpx;
  font-size: 27rpx;
@ -48,10 +48,11 @@
  text-align: center;
 }
 .right-menu-item.active {
-  background: #0B898E;
+  background: #0A9947;
  color: #fff;
  margin: 0;
-  border-color: #0B898E;
+  padding: 0 10rpx;
+  border-color: #0A9947;
 }
 .right-menu-item.active+view {
  border-top: none;
@ -72,11 +73,11 @@
  background: #00B3C8;
  border-color: #00B3C8;
 }
-.right-menus .right-menu-item:nth-child(6).active {
+.right-menus .right-menu-item:nth-child(7).active {
  background: #EB3C70;
  border-color: #EB3C70;
 }
-.right-menus .right-menu-item:nth-child(7).active {
+.right-menus .right-menu-item:nth-child(6).active {
  background: #9342CB;
  border-color: #9342CB;
 }
--- a/pages/order/card/index.wxml
+++ b/pages/order/card/index.wxml
@ -13,6 +13,8 @@
    <view class="iconfont icon-add-select" bindtap="add"></view>
  </view>
 </view>
+<contact wx:if="{{type==0}}" bind:setLinkman="setLinkman"></contact>
+<address wx:else bind:setAddress="setAddress"></address>
 <view class="box" wx:if="{{product.sku.sku_model.recharge.length>0}}">
  <view class="box-title">
    <view style="flex:1">请选择充值金额</view>
@ -31,8 +33,7 @@
  </view>
 </view>
 <coupon id="coupon" money="{{productNum *(product.sku.price +  1 * (product.sku.sku_model.recharge[skuIndex] || 0)) + 1 *postFee}}" sku="{{product.sku.id}}"></coupon>
-<contact wx:if="{{type==0}}" bind:setLinkman="setLinkman"></contact>
-<address wx:else bind:setAddress="setAddress"></address>
+
 <view class="box" wx:if="{{type==1}}">
  <view class="box-title">
    <view style="flex:1">运费</view>
--- a/pages/order/hotel/index.js
+++ b/pages/order/hotel/index.js
@ -62,11 +62,10 @@ Page({
        end_date:CtripHotelCart.endDate,
        start_date:CtripHotelCart.startDate
      }).then(res=>{
-        res.data.splice(0,1);
+        res.data.splice(1,1);
        this.setData({
          priceInfo:res.data
        })
-        console.log(res)
      })
    },
    inputTel:function(e){
@ -285,6 +284,13 @@ Page({
        })
        return false;
      }
+      if(!this.data.tel){
+        wx.showToast({
+          title: '请填写手机号',
+          icon:"none"
+        })
+        return false;
+      }
      let selectLinkman = [];
      customerName.map(item=>{
        selectLinkman.push(item.name);
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@ -100,6 +100,7 @@
        <view>-{{coupon.activity.money/100}}</view>
      </view>
    </view>
+    <view style="height:100rpx"></view>
  </view>
 </view>
 <view class="mask" style="align-items:flex-end" wx:if="{{showMask}}">
@ -116,7 +117,7 @@
        <view class="linkman-nickname">{{item.name}}</view>
        <view class="linkman-info">
          <view class="linkman-tel" style="margin-bottom:20rpx">手机号 {{item.tel}}</view>
-          <view class="linkman-tel">身份证 {{item.id_number}}</view>
+          <view class="linkman-tel">{{item.title}} {{item.id_number}}</view>
        </view>
        <view class="iconfont {{item.selected==1?'icon-gou':'icon-quan'}}" bindtap="selectIt" data-item="{{item}}"></view>
      </view>
--- a/pages/order/hotel/index.wxss
+++ b/pages/order/hotel/index.wxss
@ -195,6 +195,7 @@ page {
  width: 100%;
  max-height: 60%;
  min-height: 30%;
+  overflow-y: auto;
 }
 .mask-title {
  text-align: center;
@ -415,6 +416,7 @@ page {
  width: 700rpx;
  padding: 0 25rpx;
  background: #F7F7F7;
+  overflow-y: auto;
 }
 .btns {
  display: flex;
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@ -2,7 +2,7 @@
 <title title="确认订单"></title>
 <address bind:setAddress="setAddress"></address>
 <view class="box topbox" wx:for="{{product}}">
-  <view class="header-title" wx:if="{{from=='cart'}}">
+  <view class="header-title textOver" wx:if="{{from=='cart'}}">
    供应商：{{item.product.supplier_name}}
  </view>
  <view class="skuinfo">
--- a/pages/order/postOrder/index.wxss
+++ b/pages/order/postOrder/index.wxss
@ -40,7 +40,7 @@ page {
 }
 .right-info {
  flex: 1;
-  width: 100%;
+  width: 400rpx;
 }
 .sku-name {
  font-size: 32rpx;
@ -112,7 +112,7 @@ page {
  align-items: center;
  justify-content: space-between;
  background: white;
-  z-index: 1;
+  z-index: 2;
  box-shadow: 0px 0px 16rpx 0px rgba(6, 0, 1, 0.1);
 }
 .fixed-btn {
--- a/pages/order/road/index.js
+++ b/pages/order/road/index.js
@ -139,7 +139,7 @@ Page({
    if(!selectMonth) return
    let info = this.data.prices[selectMonth+'-'+(item+1)];
    console.log(info)
-    if(info && info.m_price && info.m_price!==null && info.stock!=0){
+    if(info && info.product_price && info.product_price!==null && info.stock!=0){
      info.selectMonth = selectMonth;
      info.selectDate = item+1;
      this.setData({
--- a/pages/order/road/index.wxml
+++ b/pages/order/road/index.wxml
@ -23,8 +23,8 @@
    </view>
     <view class="day-item{{selectDate.selectMonth==month[monthIndex] && selectDate.selectDate==(index+1)?' active':''}}" wx:for="{{monthIndex==1?monthDays2[0]:monthDays1[0]}}">
      <view class="date-item-in" bindtap="selectDate" data-item="{{item}}">
-        <view class="date-num{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].m_price!=null?' active':''}}">{{(index+1)>=10?(index+1):("0"+(index+1))}}</view>
-        <view class="price" wx:if="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].m_price!==null && prices[month[monthIndex]+'-'+(index+1)].stock!==null}}">￥{{prices[month[monthIndex]+'-'+(index+1)].m_price/100}}</view>
+        <view class="date-num{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!=null?' active':''}}">{{(index+1)>=10?(index+1):("0"+(index+1))}}</view>
+        <view class="price" wx:if="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].product_price!==null && prices[month[monthIndex]+'-'+(index+1)].stock!==null}}">￥{{prices[month[monthIndex]+'-'+(index+1)].product_price/100}}</view>
        <view class="date-price-place" wx:elif="{{prices[month[monthIndex]+'-'+(index+1)] && prices[month[monthIndex]+'-'+(index+1)].stock==0}}">售罄</view>
        <view class="date-price-place" wx:else></view>
      </view>
--- a/pages/order/roadOrder/index.js
+++ b/pages/order/roadOrder/index.js
@ -253,6 +253,49 @@ Page({
    })
    
  },
+  // 一日游合同确认签字
+  // ondayConfirm:function(){
+  //   let linkmans = this.data.linkmans,tourist_info=[],sku=this.data.sku;
+  //   sku.map((item,index)=>{
+  //     if(item.num>0){
+  //       let linkman = linkmans[index];
+  //       if(linkman.length<item.num){
+  //         wx.showToast({
+  //           title: '请先选择出行人',
+  //           icon:"none"
+  //         })
+  //         orderFlag = false;
+  //       }
+  //       for(let i=0;i<linkman.length;i++){
+  //         let l = linkman[i];
+  //         if(!l || !l.id){
+  //           wx.showToast({
+  //             title: '请先选择出行人',
+  //             icon:"none"
+  //           })
+  //           orderFlag = false
+  //         }
+  //         else {
+  //           tourist_info.push({
+  //             user_id:l.id,
+  //             name:l.name,
+  //             tel:l.tel,
+  //             id_number:l.id_number,
+  //             is_main:tourist_info.length===0
+  //           })
+  //         }
+  //       }
+  //     }
+  //   })
+  //   commonApi.user_post("Oneday/getContractUrl",{
+  //     total_price:this.data.price,
+  //     supplier_id:this.data.product.supplier_id,
+  //     product_id:this.data.product.id,
+  //     tourist_info:tourist_info
+  //   }).then(res=>{
+  //     console.log(res)
+  //   })
+  // },
  /**
   * 生命周期函数--监听页面初次渲染完成
   */
--- a/pages/order/roadOrder/index.wxml
+++ b/pages/order/roadOrder/index.wxml
@ -30,6 +30,13 @@
  </view>
 </view>
 <coupon money="{{price}}" sku="{{sku_ids}}"></coupon>
+<!-- <view class="user-box">
+  <view class="user-item" style="border:none">
+    <image style="width:32rpx" src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/other/hetong.png" mode="widthFix"></image>
+    <text style="flex:1;margin:0 15rpx">一日游合同</text>
+    <view class="add-btn" bindtap="ondayConfirm" style="width:152rpx">点击确认</view>
+  </view>
+</view> -->
 <view style="height:113rpx"></view>
 <view class="fixed-bottom">
  <view class="order-all-price">订单金额：<text>¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}</text></view>
@ -42,7 +49,7 @@
      <view bindtap="cancel">取消</view>
      <view bindtap="confirm">确定</view>
    </view>
-    <navigator url="/pages/user/linkman/add/index" class="add-btn">添加出行人</navigator>
+    <navigator url="/pages/user/linkman/add/index" class="add-btn" style="margin-bottom:24rpx">添加出行人</navigator>
    <view class="linkmanlist-item" wx:for="{{linkmanList}}" style="{{item.disable?'opacity:0.5':''}}">
      <view class="linkmanlist-item-top">
        <navigator bindtap="gotoEdit" data-item="{{item}}" url="/pages/user/linkman/add/index?id={{item.id}}&from=order" class="iconfont icon-bianji1"></navigator>
--- a/pages/order/roadOrder/index.wxss
+++ b/pages/order/roadOrder/index.wxss
@ -132,6 +132,7 @@ page {
  width: 700rpx;
  padding: 0 25rpx;
  background: #F7F7F7;
+  overflow-y: auto;
 }
 .btns {
  display: flex;
@ -148,7 +149,6 @@ page {
  border-radius: 40rpx;
  font-size: 29rpx;
  color: #000;
-  margin-bottom: 24rpx;
 }
 .fixed-bottom .order-all-price text {
  flex: 1;
--- a/pages/pbService/bus/lineinfo/index.js
+++ b/pages/pbService/bus/lineinfo/index.js
@ -10,7 +10,8 @@ Page({
    id:null,
    start:[],
    end:[],
-    now:null
+    now:null,
+    busNum:0
  },

  /**
@ -26,8 +27,15 @@ Page({
    commonApi._post("pbservice/Publicbus/busLineDetail",{
      line_id:this.data.id
    }).then(res=>{
+      let num = 0;
+      res.data.StandInfo.map(item=>{
+        if(item.BusInfo){
+          num++;
+        }
+      })
      this.setData({
-        info:res.data
+        info:res.data,
+        busNum:num
      })
    })
  },
--- a/pages/pbService/bus/lineinfo/index.wxml
+++ b/pages/pbService/bus/lineinfo/index.wxml
@ -1,7 +1,7 @@
 <!--pages/pbService/bus/lineinfo/index.wxml-->
 <title title="线路详情"></title>
 <view class="line-top" wx:if="{{info}}">
-  <view class="line-name">{{info.LName}}路<text class="line-num">（4辆正在行驶）</text></view>
+  <view class="line-name">{{info.LName}}路<text class="line-num">（{{busNum}}辆正在行驶）</text></view>
  <view class="line-direction">{{info.LDirection}}</view>
  <view class="line-time">首：{{info.LFStdFTime}}   末：{{info.LFStdETime}}</view>
 </view>
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@ -24,10 +24,10 @@
 <view class="pb-box">
  <view class="pb-title">交通出行</view>
  <view class="pb-list">
-    <view class="pb-item" bindtap="gotoPath" data-path="/pages/pbService/bus/index">
+    <!-- <view class="pb-item" bindtap="gotoPath" data-path="/pages/pbService/bus/index">
      <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
      <view>实时公交</view>
-    </view>
+    </view> -->
    <view class="pb-item" bindtap="gotoPath" data-path="/pages/pbService/bike/index?type=2">
      <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
      <view>停车场</view>
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@ -18,7 +18,10 @@ Page({
    keywords:"",
    areaObj:{},
    comfortObj:{},
-    searchText:""
+    searchText:"",
+    sceneLevel:[],
+    sceneLevelIndex:-1,
+    sceneLevelObj:{}
  },

  /**
@ -54,6 +57,20 @@ Page({
        areaObj:areaObj
      })
    })
+    commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
+      console.log(res)
+      let sceneLevelObj = {};
+      res.data.map(item=>{
+        sceneLevelObj[item.level] = item.name;
+      })
+      res.data.unshift({
+        name:"不选择"
+      })
+      this.setData({
+        sceneLevel:res.data,
+        sceneLevelObj:sceneLevelObj
+      })
+    })
    this.getList();
  },
  changeArea:function(e){
@ -74,6 +91,15 @@ Page({
    })
    this.getList()
  },
+  changeSceneLevel:function(e){
+    this.setData({
+      sceneLevelIndex:e.detail.value,
+      list:[],
+      pageNo:1,
+      total:1
+    })
+    this.getList()
+  },
  getList:function(){
    if(this.data.total<=this.data.list.length) return;
    commonApi._post("pbservice/Comfort/getComfort",{
@ -81,7 +107,8 @@ Page({
      comfort_level:this.data.comfortIndex>0?this.data.comfortLevel[this.data.comfortIndex].level:null,
      area_key:this.data.areaIndex>0?this.data.areas[this.data.areaIndex].area_code:null,
      page_no:this.data.pageNo,
-      page_num:10
+      page_num:10,
+      scene_level:this.data.sceneLevelIndex>0?this.data.sceneLevel[this.data.sceneLevelIndex].level:null
    }).then(res=>{
      this.setData({
        list:this.data.list.concat(res.data.rows),
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@ -7,6 +7,12 @@
    <view class="my-search-btn" bindtap="search">搜索</view>
  </view>
  <view class="select-box">
+    <picker mode="selector" value="{{sceneLevelIndex}}" range="{{sceneLevel}}" range-key="name" bindchange="changeSceneLevel">
+      <view class="picker feiyi-picker">
+        <text style="{{sceneLevelIndex>0?'color:#0B898E':''}}">{{sceneLevelIndex>0?sceneLevel[sceneLevelIndex].name:"景区等级"}}</text>
+        <view class="iconfont icon-xia"></view>
+      </view>
+    </picker>
    <picker mode="selector" value="{{comfortIndex}}" range="{{comfortLevel}}" range-key="desc" bindchange="changeComfortLevel">
      <view class="picker feiyi-picker">
        <text style="{{comfortIndex>0?'color:#0B898E':''}}">{{comfortIndex>0?comfortLevel[comfortIndex].desc:"舒适度"}}</text>
@ -31,8 +37,8 @@
  <view class="comfort-tip">
    <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/pbservice/comfort1.png" mode="widthFix"></image>
    <text style="margin-right:30rpx">{{areaObj[item.area]}}</text>
-    <!-- <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/pbservice/comfort2.png" mode="widthFix"></image>
-    <text>4A级</text> -->
+    <image src="https://fastadmin.oss-cn-shenzhen.aliyuncs.com/xcxImages/pbservice/comfort2.png" mode="widthFix"></image>
+    <text>{{sceneLevelObj[item.scene_level]}}</text>
  </view>
  <view class="progress-item">
    <progress percent="{{item.in_count/item.ins_carry_capacity * 100}}" color="{{comfortObj[item.comfort_level].color}}" stroke-width="{{40 * radio}}" border-radius="{{20 * radio}}"></progress>
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@ -100,7 +100,6 @@ page {
  justify-content: space-between;
  margin-top: 30rpx;
  margin-bottom: 20rpx;
-  padding: 0 100rpx;
 }
 .picker .iconfont {
  font-size: 16rpx;
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@ -1,10 +1,10 @@
 <!--pages/search/list/index.wxml-->
-<title title="苏州文化旅游总入口"></title>
+<title title="君到苏州"></title>
 <view class="my-top-search">
  <view class="my-search-box">
    <view class="iconfont icon-sousuo"></view>
    <input value="{{oldKeyword}}" bindinput="inputKeyword" type="text" placeholder="搜索"></input>
-    <view bindtap="search" class="my-search-btn" bindtap="search">搜索1</view>
+    <view bindtap="search" class="my-search-btn" bindtap="search">搜索</view>
  </view>
  <view class="search-types">
    <view wx:for="{{types}}" class="search-type{{typeIndex==index?' active':''}}" bindtap="changeType" data-index="{{index}}">{{item.name}}</view>
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@ -52,6 +52,7 @@
 </navigator>
 <view class="box" wx:if="{{info}}">
  <view class="box-title">{{info.order_product_list[0].sku_name}} <text style="margin-left:10rpx">{{info.order_product_list[0].order_product_extend.days}}晚</text></view>
+  <view style="margin:10rpx auto;font-size:26rpx;color:#333">房间数：{{info.order_product_list[0].product_num}}间</view>
  <view class="hotel-tips"><text class="hotel-date">{{info.order_product_list[0].order_product_extend.start_date_text}}</text><view class="hotel-days-num">{{info.order_product_list[0].order_product_extend.days}}晚</view><text class="hotel-date">{{info.order_product_list[0].order_product_extend.end_date_text}}</text></view>
  <view class="hotel-tip">{{info.order_product_list[0].sku_model.bed_type}}  |  {{info.order_product_list[0].sku_model.breakfast}}  |  {{info.order_product_list[0].sku_model.area}}  |  {{info.order_product_list[0].sku_model.max_room_num}}人入住</view>
 </view>
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@ -85,6 +85,10 @@ Page({
    let item = e.currentTarget.dataset.item;
    util.gotoOrder(item)
  },
+  gotoProductDetail:function(e){
+    let item = e.currentTarget.dataset.item;
+    util.orderMoreTime({order_product_list:[item]})
+  },
  changeType:function(e){
    let type = e.currentTarget.dataset.type;
    this.setData({
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@ -23,7 +23,7 @@
    <text>订单号：{{item.order_id}}</text>
    <text class="status">{{orderState[item.state]}}</text>
  </view>
-  <view class="order-info" wx:for="{{item.order_product_list}}">
+  <view data-item="{{item}}" class="order-info" wx:for="{{item.order_product_list}}">
    <image src="{{item.product_model=='movie'?item.product_img:item.sku_headimg}}" mode="aspectFill"></image>
    <view class="sku-title textOver2">{{item.product_model=='movie'?item.product_title:(item.product_title+item.sku_name)}}</view>
    <view class="sku-tips">
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@ -67,10 +67,18 @@
  </view>
 </view>
 <view class="box" wx:if="{{info}}">
-  <view class="box-title">订单信息</view>
+  <view class="box-title">出行人信息</view>
+  <view wx:for="{{info.order_product_list[0].contacts_info}}">
+    <view class="detail-item">
+      <text>姓名：{{item.name}}</text>
+    </view>
    <view class="detail-item">
-    <text>姓名：<text wx:for="{{info.order_product_list[0].contacts_info}}">{{(index!=0?'、':'')+item.name}}</text></text>
+      <text>{{item.title}}：{{item.id_number}}</text>
+    </view>
  </view>
+</view>
+<view class="box" wx:if="{{info}}">
+  <view class="box-title">订单信息</view>
  <view class="detail-item">
    <text>订单编号：{{info.order_id}}</text>
  </view>
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@ -11,6 +11,7 @@ Page({
  data: {
    info:null,
    orderState:app.globalData.orderState,
+    productState:app.globalData.productState,
    product_model:null,
    isRefund:false,
    feeInfoFlag:false,
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@ -14,6 +14,7 @@
 </view>
 <view class="box" wx:if="{{info}}" style="padding-bottom:0">
  <view wx:if="{{info.order_product_list && info.order_product_list.length>0}}" class="product-info" wx:for="{{info.order_product_list}}">
+    <view class="product-info-top">
      <image src="{{item.sku_headimg}}" mode="aspectFill"></image>
      <view class="title-box textOver2">
        <view class="title textOver2">{{item.product_title}}</view>
@ -24,7 +25,10 @@
        <view>x{{item.product_num}}</view>
      </view>
    </view>
-  <view class="detail-item" style="border-top:1rpx solid #d8d8d8">
+    <view class="product-price">邮费：{{item.post_fee==0?'包邮':('￥'+item.post_fee/100)}} 实付：￥{{item.paid_money/100}}</view>
+    <view class="product-state">{{productState[item.state]}}</view>
+  </view>
+  <view class="detail-item">
    <text>商品总价</text>
    <text>￥{{info.total_money/100}}</text>
  </view>
--- a/pages/user/order/postOrderInfo/index.wxss
+++ b/pages/user/order/postOrderInfo/index.wxss
@ -23,13 +23,23 @@ page {
  margin: 20rpx 30rpx;
 }
 .product-info {
-  display: flex;
-  justify-content: space-between;
  color: #333;
  font-size: 24rpx;
  padding-bottom: 20rpx;
-  /* border-bottom: 1rpx solid #d8d8d8; */
-  margin-bottom: 10rpx;
+  border-bottom: 1rpx solid #d8d8d8;
+  margin-bottom: 20rpx;
+}
+.product-info-top {
+  display: flex;
+  justify-content: space-between;
+}
+.product-price,.product-state {
+  text-align: right;
+  color: #666;
+}
+.product-state {
+  margin-top: 10rpx;
+  color: #0B898E;
 }
 .product-info image {
  width: 140rpx;
--- a/project.config.json
+++ b/project.config.json
@ -67,9 +67,10 @@
 					"scene": null
 				},
 				{
-					"id": -1,
-					"name": "景区舒适度",
-					"pathName": "pages/pbService/sceneComfort/index",
+					"id": 1,
+					"name": "好行",
+					"pathName": "pages/list/haoxing/index",
+					"query": "",
 					"scene": null
 				}
 			]