代码提交

app.js

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

pages/index/index.wxml

@@ -179,7 +179,12 @@
         <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="goH5" data-event="book_click" data-title="文博会" data-path="CloudExpo"
         class="pbservice-item">
         <image src="https://static.ticket.sz-trip.com/uploads/20220810/ceb07b75aa3df20d7f1de22e2588332a.png" mode="widthFix"></image>
         <view>云上文博会</view>
@@ -259,17 +264,17 @@
   <view class="pic-list" style="margin-top:20rpx">
     <image bindtap="gotoUrl" data-event="dou_click" data-title="抖in苏州"
       data-url="https://m.cloud.sz-trip.com/ShakeInDetailList?id=350&class_id=27&index=1"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs0.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"></image>
     <image bindtap="gotoPath" data-event="food_click" data-title="街巷美食"
       data-path="/pages/list/{{isTest?'road':'food'}}/index"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs1.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"></image>
     <image bindtap="audioGuide" data-event="voice_click"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs2.png" mode="aspectFill">
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill">
     </image>
     <image bindtap="gotoPath" data-event="guide_click" data-title="游记攻略" data-path="/pages/list/strategy/index"
-      src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs3.png" mode="aspectFill"></image>
+      src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"></image>
-    <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
+    <!-- <image bindtap="city" data-event="city_click" src="https://static.ticket.sz-trip.com/xcxImages/index/cxzs4.png"
-      mode="aspectFill"></image>
+      mode="aspectFill"></image> -->
   </view>
   <view class="sale-road-boxes" style="margin-top:0;align-items:center">
     <image mode="heightFix" style="height:86rpx" src="{{indexSeason.ggfw}}"></image>

pages/index/index.wxss

@@ -281,7 +281,7 @@
   margin: 60rpx 0;
 }
 .pic-list image {
-  width: 122rpx;
+  width: 155.33rpx;
   height: 200rpx;
   display: block;
 }

pages/info/groupOrderInfo/index.js

@@ -127,6 +127,11 @@ Page({
       })
     }
   },
+  goOrder(){
+    wx.navigateTo({
+      url: '/pages/user/order/museumOrderInfo/index?id='+ this.data.id,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/info/groupOrderInfo/index.wxml

@@ -58,4 +58,13 @@
       <view>截屏分享给团员</view>
     </view>
   </view>
+</view>
+<view class="order-btn" bindtap="goOrder"> 
+  <view>
+    查看
+  </view>
+  <view>
+    订单
+  </view>
+
 </view>

pages/info/groupOrderInfo/index.wxss

@@ -169,4 +169,25 @@ page {
   position: absolute;
   right: 20rpx;
   top: 20rpx;
+}
+.order-btn{
+  width: 110rpx;
+height: 110rpx;
+background: #FFFFFF;
+box-shadow: 0rpx 0rpx 11rpx 0rpx rgba(17,17,17,0.2);
+border-radius: 55rpx;
+display: flex;
+flex-direction: column;
+align-items: center;
+justify-content: center;
+position: fixed;
+bottom: 120rpx;
+right: 20rpx;
+box-sizing: border-box;
+font-size: 28rpx;
+font-family: PingFang SC;
+font-weight: bold;
+color: #0B898E;
+
+
 }

pages/info/sceneProductInfo/index.js

@@ -24,7 +24,7 @@ Page({
         showAllowance: false,
         allowance_data: null,
         //购物车数量
-        producNum: 1,
+        productNum: 1,
         skuIndex: 0,
         aniSkuIndex: -1,
         cartCount: 0,
@@ -316,8 +316,10 @@ Page({
         }
         let index = e.currentTarget.dataset.index;
         this.setData({
-            skuIndex: index
+            skuIndex: index,
+            productNum:1
         })
+        
     },
     order: function (e) {
         commonApi.user_post("/product/checkStock", {
@@ -354,6 +356,7 @@ Page({
                         product = {
                             product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex]
                         }
+                        product.productNum = this.data.productNum
                     app.globalData.product = {
                         ...sku,
                         ...product
@@ -365,7 +368,7 @@ Page({
                 } else {
                     commonApi.user_post("cart/add_sku", {
                         sku_id: this.data.skuList[this.data.skuIndex].id,
-                        num: this.data.producNum
+                        num: this.data.productNum
                     }).then(res => {
                         if (res.code == 1) {
                             commonApi.user_post('cart/get_list', {}).then(res => {
@@ -702,10 +705,6 @@ Page({
                 }).exec()
             }
         })
-
-
-
-
     },
     hideSku: function () {
         this.setData({
@@ -715,15 +714,22 @@ Page({
     },
     //加减数量
     minus: function () {
-        if (this.data.producNum == 1) return;
+        if (this.data.productNum == 1) return;
         this.setData({
-            producNum: this.data.producNum - 1
+            productNum: this.data.productNum - 1
         })
     },
     add: function () {
+      if (this.data.productNum == this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num){
+        wx.showToast({
+          title: '本产品单笔限购'+this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num,
+          icon:'none'
+        });
+      }else{
         this.setData({
-            producNum: this.data.producNum + 1
+          productNum: this.data.productNum + 1
         })
+      }
     },
     //立即预定
     showOrder: function () {

pages/info/sceneProductInfo/index.wxml

@@ -130,7 +130,7 @@
       <view class="number-box">
         <text>数量</text>
         <view class="iconfont icon-sami-select" bindtap="minus"></view>
-        <view class="number">{{producNum}}</view>
+        <view class="number">{{productNum}}</view>
         <view class="iconfont icon-add-select" bindtap="add"></view>
       </view>
       <view style="height:138rpx"></view>

pages/list/movieticket/index.js

@@ -21,7 +21,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    commonApi._post("act/get_suzhou_areas").then(res=>{
+    commonApi._post("act/get_suzhou_areas_syt").then(res=>{
       res.data.unshift({
         area_id:"",
         area_title:"苏州"

pages/list/movieticket/list/ticket/index.js

@@ -36,7 +36,7 @@ Page({
             id: options.id,
             title: options.title
         })
-        commonApi._post("act/get_suzhou_areas").then(res => {
+        commonApi._post("act/get_suzhou_areas_syt").then(res => {
             res.data.unshift({
                 area_id: "",
                 area_title: "苏州"

pages/order/road/index.wxml

@@ -24,7 +24,7 @@
      <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)].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="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)].m_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>

pages/order/scene/index.js

@@ -46,7 +46,8 @@ Page({
       date:null,
 			ticket_type:app.globalData.product.sku.ticket_type || 1,
 			isCar:options.isCar
-		})
+    })
+    console.log(app.globalData);
     if (!app.globalData.product) {
       util.back();
       return;

pages/user/order/list.js

@@ -95,10 +95,14 @@ Page({
         let orderNum = 0;
         item.order_product_list.map(order=>{
           orderNum = orderNum + order.product_num;
+          ///
           // 景点线路场馆酒店四类产品的订单 如果是已支付未出票的显示出票中
           if(order.state=='PAID' && (order.product_model=='venue' || order.product_model=='ticket' || order.product_model=='hotel' || order.product_model=='line')){
             item.orderStateText="出票中"
           }
+          if(order.state=='WAIT_USE' && (order.product_model=='venue' || order.product_model=='ticket' || order.product_model=='hotel' || order.product_model=='line')){
+            item.orderStateText="已出票"
+          }
         })
         if(item.order_product_list.length==1 && item.order_product_list[0].scene_id && item.state!='UNPAID' && item.state!='CLOSED' && item.state.indexOf("REFUND")==-1 && this.data.lon && this.data.lat){
           let ajax = commonApi.user_post("order/tripplan",{