组合下单

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(() => {

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">

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;
+}

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)
             }

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

@@ -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 : '',

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 : '',

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 : '',

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/"