1

pages/order/road/index.js

@@ -43,11 +43,11 @@ Page({
         let sku = res.data.sku.find(item=>item.id==options.skuid);
         res.data.sku = [sku];
       }
-      res.data.sku.map(item=>{
-        console.log(item);
-        item.stock>0?nums.push(1):nums.push(0)
+    //   res.data.sku.map(item=>{
+    //     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++){
           if(res.data.sku[i].id>res.data.sku[j].id){
@@ -58,7 +58,7 @@ Page({
       this.setData({
         productInfo:res.data,
         sku:res.data.sku,
-        nums:nums
+        nums:[0,0],
       })
     })
     this.initDate()
@@ -119,9 +119,16 @@ Page({
       let info = prices[selectMonth+'-'+selectDate];
       info.selectMonth = selectMonth;
       info.selectDate = selectDate;
+
+      let nums = []
+      info.info.forEach(x=>{
+          nums.push(x.stock>0?1:0)
+      })
+
       this.setData({
         selectDate:info,
-        monthIndex:selectMonth==month1?0:1
+        monthIndex:selectMonth==month1?0:1,
+        nums: nums
       })
       this.changePrice()
     }).catch(e=>{console.log(e)})
@@ -153,8 +160,26 @@ Page({
     if(info && info.product_price && info.product_price!==null && info.stock!=0){
       info.selectMonth = selectMonth;
       info.selectDate = item+1;
+      
+      let setBuyNum = false
+      let currentNums = this.data.nums
+      info.info.forEach((x,i)=>{
+        if (currentNums[i]>x.stock) {
+            currentNums[i] = x.stock
+            setBuyNum = true
+        }
+      })
+
+      if (setBuyNum) {
+          wx.showToast({
+            title: '部分规格库存不足，已自动调整购买数量',
+            icon:"none",
+          })
+      }
+
       this.setData({
-        selectDate:info
+        selectDate:info,
+        nums:currentNums
       })
       this.changePrice()
     }
@@ -184,7 +209,13 @@ Page({
       })
       return;
     }
-    if(selectDate.info[index].stock==nums[index]) return;
+    if(selectDate.info[index].stock<=nums[index]) {
+        wx.showToast({
+          title: '库存不足',
+          icon:"none",
+        })
+        return;
+    } 
     nums[index] = nums[index] + 1;
     this.setData({
       nums:nums

pages/order/road/index.wxml

@@ -35,9 +35,10 @@
   <view class="box-top">
     <view class="box-title">{{item.sku_name}}</view>
     <view class="box-tip textOver">{{item.sku_type_info}}</view>
-    <view class="iconfont icon-sami-select {{nums[index]==0?' disable':''}}" bindtap="minus" data-index="{{index}}"></view>
-    <view class="number">{{nums[index]}}</view>
-    <view class="iconfont icon-add-select {{nums[index]==selectDate.info[index].stock?' disable':''}}" bindtap="add" data-index="{{index}}"></view>
+    <view wx:if="{{selectDate.info[index].stock>0}}" class="iconfont icon-sami-select {{nums[index]==0?' disable':''}}" bindtap="minus" data-index="{{index}}"></view>
+    <view wx:if="{{selectDate.info[index].stock>0}}" class="number">{{nums[index]}}</view>
+    <view wx:if="{{selectDate.info[index].stock>0}}" class="iconfont icon-add-select {{nums[index]==selectDate.info[index].stock?' disable':''}}" bindtap="add" data-index="{{index}}"></view>
+    <view wx:else style="color: #D62828;">已售罄</view>
   </view>
   <view class="single-price" wx:if="{{selectDate}}">{{selectDate.info[index].price/100}}</view>
 </view>

pages/pbService/aiHelpYou/index.js

@@ -18,10 +18,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // let weburl = 'https://m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
-    let weburl = "https://test.m.cloud.sz-trip.com/OneDayTravelNew?token=c6374181-3976-4e73-b82a-7b66cf504e0e"
-    this.setUrl(weburl)
-    return
+    let weburl = 'https://m.cloud.sz-trip.com/aiPlay?noShowHeaderBack=true'
     if (app.globalData.configJson.isTest) {
         weburl = "https://m.cloud.sz-trip.com/ScenicComfort?a=1"
     }

pages/user/coupon/index.wxml

@@ -48,7 +48,7 @@
   <view class="coupon-rule">使用规则 <text class="iconfont icon-xia"></text></view>
 </view> -->
 <view style="height:110rpx"></view>
-<navigator url="../couponCenter/index" class="fixed-btn">前往<text>领券中心</text></navigator>
+<navigator url="../couponCenter/index" class="fixed-btn">前往<text>兑换中心</text></navigator>
 <view wx:if="{{list.length==0}}" class="common-empty" style="z-index:-1">
 	<image lazy-load mode="widthFix" src="https://static.ticket.sz-trip.com/xcxImages/other/nodata.png"></image>
 	<view>暂无内容</view>

pages/user/couponCenter/index.wxml

@@ -1,5 +1,5 @@
 <!--pages/user/couponCenter/index.wxml-->
-<title title="领取优惠券"></title>
+<title title="兑换中心"></title>
 <image lazy-load class="bg-img" style="height:calc(100% - {{height}}px)" src="https://static.ticket.sz-trip.com/xcxImages/user/coupon-bg.png" mode="aspectFill"></image>
 <view class="content" style="top:{{height}}px">
   <view class="coupon-title">【兑换优惠券】</view>

project.private.config.json

@@ -7,16 +7,16 @@
     "miniprogram": {
       "list": [
         {
-          "name": "pages/user/order/postOrderInfo/index",
-          "pathName": "pages/user/order/showOrderInfo/index",
-          "query": "id=28182512031604485734",
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/info/roadInfo/index",
+          "query": "id=3897",
           "scene": null,
           "launchMode": "default"
         },
         {
-          "name": "pages/info/roadInfo/index",
-          "pathName": "pages/info/roadInfo/index",
-          "query": "id=465058",
+          "name": "pages/user/order/postOrderInfo/index",
+          "pathName": "pages/user/order/showOrderInfo/index",
+          "query": "id=28182512031604485734",
           "launchMode": "default",
           "scene": null
         },

utils/https.js

@@ -1,8 +1,8 @@
 var app = getApp();
 import util from "../utils/util"
 // import userApi from "../utils/https/user.js";
-const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
-// let baseUrl = "https://api.cloud.sz-trip.com/api/";
+// const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
+let baseUrl = "https://api.cloud.sz-trip.com/api/";
 const env = wx.getAccountInfoSync().miniProgram.envVersion
 if (env == 'develop1') {
   baseUrl = "https://test.api.cloud.sz-trip.com/api/"