Merge branch 'master' into dev_techan

pages/info/roadInfo/index.js

@@ -164,11 +164,11 @@ Page({
     },
     order: function () {
         // todo 判断组合产品
-        // if (this.data.info.is_compose == 1) {
+        if (this.data.info.is_compose == 1) {
-        //     // 打开规格弹窗
+            // 打开规格弹窗
-        //     this.setData({skuFlag: true})
+            this.setData({skuFlag: true})
-        //     return
+            return
-        // }
+        }
 
 
         commonApi.user_post('wx/get_user_keep', {
@@ -211,13 +211,19 @@ Page({
 
     // 组合产品获取购买的sku
     getComposeSku () {
+        let skuId = this.data.info.sku[this.data.skuIndex].id
         commonApi.user_post("product/get_sku_compose_list", {
-            sku_id: "190720"
+            sku_id: skuId
         }).then(res => {
             if (res&&Array.isArray(res.data)&&res.data.length>0) {
                 res.data.forEach(v => {
-                    v.sku.is_compose = 1
+                    v.sku.is_compose = 1;
+                    v.num = this.data.producNum;
+                    v.sku.compose_sku_id = v.compose_sku_id
                 });
+                app.globalData.list = []
+                app.globalData.postProduct = []
+                app.globalData.product = null
                 util.orderByShoppingCart(res.data,app)
             }
         })
@@ -497,9 +503,12 @@ Page({
 
     setSimpleValue: function (e) {
         let keyname = e.currentTarget.dataset.keyname
-        let val = e.currentTarget.dataset.val
+        let val = e.currentTarget.dataset.value
         let param = {}
         param[keyname] = val
+        // this.setData({
+        //     skuFlag: false
+        // })
         this.setData(param)
     },
     minus: function () {

pages/order/WineSceneOrder/index.js

@@ -268,6 +268,7 @@ Page({
         type: product.product.type,
         product_id: product.product.id,
         sku_id: product.sku.id,
+        compose_sku_id: product.sku.compose_sku_id,
         start_time: '',
         end_time: '',
         use_date: '',

pages/order/orderList/index.js

@@ -76,6 +76,7 @@ Page({
   },
   order: function (){
     console.log(app.globalData.createDate);
+
     app.globalData.createDate.coupon_id= this.data.coupon ? this.data.coupon.id : null;
 	  let service = "order/create", postData = {data: JSON.stringify(app.globalData.createDate)}
 	  commonApi.user_post(service, postData).then(res => {

pages/order/postOrder/index.js

@@ -157,6 +157,7 @@ Page({
         product_num: item.productNum,
         remark: item.remark,
         is_batch_shipment: item.sku.batch_shipment,
+        compose_sku_id: item.sku.compose_sku_id,
       }
       product_list.push(productItem)
     })

pages/order/scene/index.js

@@ -497,6 +497,7 @@ Page({
         type: product.product.type,
         product_id: product.product.id,
         sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+        compose_sku_id: product.sku.compose_sku_id,
         start_time: time.start_time,
         end_time: time.end_time,
         use_date: date ? date.date : '',

pages/order/scene/index.wxml

@@ -40,10 +40,10 @@
       <view class="s-price">
         {{product.sku.price/100}}
       </view>
-      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum==1 && !product.sku.is_compose}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d2dce6169a5e8332ccd54579afddf8bc.png" mode=""/>
-      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && productNum>1 && !product.sku.is_compose}}" bindtap="minus" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/d8699afa39e73bcc7f50ed617c93bb54.png" mode=""/>
       <view class="number-box">{{productNum}}</view>
-      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
+      <image lazy-load wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="add" style="width: 46rpx;height: 46rpx;" src="https://static.ticket.sz-trip.com/uploads/20240725/cdb68a174f17b7036374580a8aa46641.png" mode=""/>
       <!-- <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view> -->
     </view>
     <view class="text1">

pages/order/showOrderNew/index.js

@@ -418,6 +418,7 @@ Page({
         type: product.product.type,
         product_id: product.product.id,
         sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+        compose_sku_id: product.sku.compose_sku_id,
         start_time: time.start_time,
         end_time: time.end_time,
         use_date: date ? date.date : '',

pages/user/order/postOrderInfo/index.js

@@ -191,6 +191,8 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
+    util.gotoDetail(item)
+    return
     if (item.is_package == 1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id

pages/user/order/sceneOrderInfo/index.js

@@ -226,6 +226,16 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
+
+    util.gotoDetail(item)
+    return
+    // 组合产品 跳线路
+    if (item.compose_product_id) {
+        wx.navigateTo({
+            url: '/pages/info/roadInfo/index?id='+item.compose_product_id
+          })
+        return
+    }
     if (item.is_package == 1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id

pages/user/order/sceneOrderInfo/index.wxml

@@ -26,7 +26,7 @@
     </view>
   </view>
   <view bindtap="nextCodeImg" class="iconfont icon-you"></view>
-  <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}  <view class="copy-box" bindtap="copy">复制</view></view>
+  <view class="code-text">{{codeImgs[codeIndex].text}}:{{codeImgs[codeIndex].code}}  <view class="copy-box" data-num="{{codeImgs[codeIndex].code}}" bindtap="copy">复制</view></view>
   <view class="code-state">{{codeImgs[codeIndex].state}} {{codeIndex+1}}/{{codeImgs.length}}</view>
 </view>
 

pages/user/order/sceneOrderInfo/index.wxss

@@ -198,7 +198,7 @@ page {
 }
 .code-box {
   text-align: center;
-  height: 440rpx;
+  min-height: 440rpx;
   position: relative;
 }
 .code-box .iconfont {
@@ -210,7 +210,7 @@ page {
   left: 40rpx;
   text-align: center;
   margin-top: 125rpx;
-  z-index: 5;
+  z-index: 1;
 }
 .code-box .iconfont.icon-you {
   left: auto;
@@ -330,7 +330,8 @@ page {
 	text-align: center;
 	font-weight: 500;
 	font-size: 23rpx;
-	color: #0E8790;
+    color: #0E8790;
+    height: 40rpx;
 }
 
 .goods-line{

pages/user/order/showOrderInfo/index.js

@@ -223,6 +223,9 @@ Page({
   goDetail(e){
     console.log(e.currentTarget.dataset);
     let item = e.currentTarget.dataset.set
+    util.gotoDetail(item)
+    return
+
     if (item.is_package==1) {
         wx.navigateTo({
             url:"/pages/info/postProductInfo/index?id="+item.product_id

project.config.json

@@ -54,60 +54,39 @@
     "ignoreUploadUnusedFiles": true
   },
   "compileType": "miniprogram",
-  "libVersion": "2.14.0",
+  "libVersion": "3.8.9",
   "appid": "wx4bb7b6050831f585",
   "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
   "condition": {
-    "search": {
-      "list": []
-    },
-    "conversation": {
-      "list": []
-    },
-    "plugin": {
-      "list": []
-    },
-    "game": {
-      "currentL": -1,
-      "list": []
-    },
-    "gamePlugin": {
-      "list": []
-    },
     "miniprogram": {
       "list": [
         {
-          "id": 0,
           "name": "pages/user/bindtel/index",
           "pathName": "pages/user/bindtel/index",
           "query": "id=0000000000LINELINEINFO18082257199008",
           "scene": null
         },
         {
-          "id": 1,
           "name": "好行",
           "pathName": "pages/list/haoxing/index",
           "query": "",
           "scene": null
         },
         {
-          "id": 2,
           "name": "pages/list/activitynew/index",
           "pathName": "pages/list/activitynew/index",
           "query": "id=0000000000LINELINEINFO18082257199008",
           "scene": null
         },
         {
-          "id": -1,
           "name": "微旅行",
           "pathName": "pages/list/minitrip/index",
           "query": "",
           "scene": null
         },
         {
-          "id": -1,
           "name": "一日游",
           "pathName": "pages/list/oneday/index",
           "query": "",

project.private.config.json

@@ -19,62 +19,6 @@
           "query": "id=457643",
           "scene": null,
           "launchMode": "default"
-        },
-        {
-          "name": "pages/order/pay/index",
-          "pathName": "pages/order/pay/index",
-          "query": "id=28182508211650158717&token=de4306f5-7f80-4a0f-a7ae-af63cf089fa4",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FmeetingLotus2025%253Ftoken%253D180c8775-e37f-4f91-a638-1d7f90069c52%2526lon%253D120.63327853732639%2526lat%253D31.26709312760416",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/info/postProductInfo/index",
-          "pathName": "pages/info/postProductInfo/index",
-          "query": "id=457632",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/login/index",
-          "pathName": "pages/login/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "活动首页",
-          "pathName": "subPackages/indexGQ/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/pbService/web/index",
-          "pathName": "pages/pbService/web/index",
-          "query": "weburl=https%253A%252F%252Fm.cloud.sz-trip.com%252FaiPlay",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/info/showInfo/index",
-          "pathName": "pages/info/showInfo/index",
-          "query": "id=13170",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "pages/order/showOrderNew/index",
-          "pathName": "pages/order/showOrderNew/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
         }
       ]
     }

subPackages/gwcOrder/index.js

@@ -321,8 +321,9 @@ Page({
     commonApi._post("product/get_sku_detail_id", {
         sku_id: sku_id
     }).then(res => {
-        this.data.product.sku = res.data
+        let skuInfo = {...this.data.product.sku, ...res.data, is_compose: this.data.product.sku.is_compose || 0}
-        app.globalData.product.sku = res.data
+        this.data.product.sku = skuInfo
+        app.globalData.product.sku = skuInfo
         this.setData({
             singlePrice: this.data.gp_id ? this.data.product.sku.event_price : e.detail.price,
             product: this.data.product
@@ -387,6 +388,7 @@ Page({
         type: product.product.type,
         product_id: product.product.id,
         sku_id: (date && date.sku_id) ? date.sku_id : product.sku.id,
+        compose_sku_id: product.sku.compose_sku_id,
         start_time: time.start_time,
         end_time: time.end_time,
         use_date: date ? date.date : '',

subPackages/gwcOrder/index.wxml

@@ -16,9 +16,9 @@
   <view class="box">
     <view class="box-title">
       <view style="flex:1">{{product && product.isGroup!=1?'购票数量':'预约人数'}}</view>
-      <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="minus"></view>
+      <view class="iconfont icon-sami-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="minus"></view>
       <view class="number-box">{{productNum}}</view>
-      <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity'}}" bindtap="add"></view>
+      <view class="iconfont icon-add-select" wx:if="{{!kjId && !gp_id && type!='activity' && !product.sku.is_compose}}" bindtap="add"></view>
     </view>
   </view>
   <contact wx:if="{{isLogin}}" type="{{type}}" bind:setLinkman="setLinkman" productNum="{{productNum}}" is_authentication="{{is_authentication}}" is_real_name="{{is_real_name}}"></contact>

utils/util.js

@@ -180,6 +180,14 @@ const gotoDetail = (item,isPagePoint) =>{
     },
     type: item.type
   }
+  // 组合产品 跳线路
+  if (item.compose_product_id) {
+    wx.navigateTo({
+        url: '/pages/info/roadInfo/index?id='+item.compose_product_id
+      })
+    return
+}
+  
 
   if (item.is_package === 1) {
     wx.navigateTo({
@@ -339,6 +347,14 @@ const orderMoreTime = function(item){
   if(item && item.order_product_list && item.order_product_list[0]){
     let info = item.order_product_list[0];
     console.log(info)
+    // 组合产品 跳线路
+    if (info.compose_product_id) {
+        wx.navigateTo({
+            url: '/pages/info/roadInfo/index?id='+info.compose_product_id
+          })
+        return
+    }
+
     if (info.is_package === 1) {
         wx.navigateTo({
             url: '/pages/info/postProductInfo/index?id='+info.product_id,
@@ -578,6 +594,7 @@ const orderByShoppingCart = function (listData, app) {
             app.globalData.couponInfo = null;
             let list = listData, product = [], product1 = []
             list.map(item => {
+                item.num = item.num || 1;
                 // item.product.type="post";
                 if (item.product.type == 'post') {
                     product.push({