From 08f60a2b1ba69407399b117b563f484891e819ed Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Fri, 22 Aug 2025 16:39:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E5=90=88=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                                |  2 +-
 pages/info/postProductInfo/index.wxml |  6 +++++-
 pages/info/postProductInfo/index.wxss | 10 ++++++++++
 pages/info/roadInfo/index.js          |  1 +
 pages/order/WineSceneOrder/index.js   |  1 +
 pages/order/orderList/index.js        |  1 +
 pages/order/postOrder/index.js        |  1 +
 pages/order/scene/index.js            |  1 +
 pages/order/showOrderNew/index.js     |  1 +
 subPackages/gwcOrder/index.js         |  1 +
 utils/https.js                        |  4 ++--
 11 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app.js b/app.js
index 8f07bc1..4267b37 100644
--- a/app.js
+++ b/app.js
@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest115? true : false;
+            data.isTest = data.isTest114? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index b074660..5f260fa 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -40,7 +40,11 @@
             <view>已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}}</view>
         </view>
         <view style="padding: 20rpx 20rpx 20rpx 26rpx;">
-            <view class="flex"></view>
+            <view class="select-img">
+                <image src="{{info.headimg}}"></image>
+                <text class="select-img">款式选择</text>
+                <image wx:for="{{info.sku}}" wx:key="index" src="{{item.headimg}}"></image>
+            </view>
 
             <view class="title textOver2">{{info.title}}</view>
             <!-- <view class="hotel-custom" style="padding:26rpx 0">
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 8e4e39d..c57475c 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -1049,3 +1049,13 @@ height: 133rpx;
     width: 29rpx;
     height: 29rpx;
 }
+
+.select-img{
+    display: flex;
+}
+.select-img image{
+    width: 80rpx;
+    height: 80rpx;
+    border-radius: 13rpx;
+    margin-right:20rpx;
+}
\ No newline at end of file
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index e213db5..3e90786 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -220,6 +220,7 @@ Page({
                 res.data.forEach(v => {
                     v.sku.is_compose = 1;
                     v.num = this.data.producNum;
+                    v.sku.compose_sku_id = v.compose_sku_id
                 });
                 util.orderByShoppingCart(res.data,app)
             }
diff --git a/pages/order/WineSceneOrder/index.js b/pages/order/WineSceneOrder/index.js
index 9676795..d218f29 100644
--- a/pages/order/WineSceneOrder/index.js
+++ b/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: '',
diff --git a/pages/order/orderList/index.js b/pages/order/orderList/index.js
index 48b3f7a..ced412f 100644
--- a/pages/order/orderList/index.js
+++ b/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 => {
diff --git a/pages/order/postOrder/index.js b/pages/order/postOrder/index.js
index 2f9c76c..425694b 100644
--- a/pages/order/postOrder/index.js
+++ b/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)
     })
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index 3cbd68f..3a8690c 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -490,6 +490,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 : '',
diff --git a/pages/order/showOrderNew/index.js b/pages/order/showOrderNew/index.js
index 1118f99..99eff0f 100644
--- a/pages/order/showOrderNew/index.js
+++ b/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 : '',
diff --git a/subPackages/gwcOrder/index.js b/subPackages/gwcOrder/index.js
index 485496a..fe0d79d 100644
--- a/subPackages/gwcOrder/index.js
+++ b/subPackages/gwcOrder/index.js
@@ -382,6 +382,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 : '',
diff --git a/utils/https.js b/utils/https.js
index ac1e739..c120ad9 100644
--- a/utils/https.js
+++ b/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/"