diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index f320a6e..b7d518b 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -11,7 +11,7 @@ Page({
* 页面的初始数据
*/
data: {
- autoPlay: true,
+ autoPlay: false,
fixed: false,
type: 1,
top: 0,
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 7f02116..c852edb 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -3,10 +3,11 @@
-
+
-
+
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index ff73fe6..89f1a60 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -5,12 +5,12 @@ page {
.swiper {
width: 100%;
- height: 420rpx;
+ height: 750rpx;
}
.swiper image,
.swiper video {
- height: 420rpx;
+ height: 750rpx;
display: block;
width: 100%;
}
@@ -20,7 +20,6 @@ page {
background: white;
position: relative;
z-index: 1;
- margin-top: -20rpx;
padding: 20rpx 40rpx;
}
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 38c3acb..b82804d 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -826,6 +826,12 @@ Page({
}
console.log(app.globalData.product);
console.log(ticket_type);
+
+ // todo 判断是否组合产品
+ // this.getComposeSku()
+ // return
+
+
if (ticket_type != 2) {
let today = util.formatDate(new Date()),
end_date = util.formatDate(new Date(new Date().getTime() + 30 * 24 * 60 * 60 * 1000));
@@ -1029,6 +1035,17 @@ Page({
})
},
+ // 组合产品获取购买的sku
+ getComposeSku () {
+ commonApi.user_post("product/get_sku_compose_list", {
+ sku_id: "190720"
+ }).then(res => {
+ if (res&&Array.isArray(res.data)&&res.data.length>0) {
+ util.orderByShoppingCart(res.data,app)
+ }
+ })
+ },
+
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/project.private.config.json b/project.private.config.json
index 3034e43..b247163 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -6,6 +6,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "pages/info/postProductInfo/index",
+ "pathName": "pages/info/postProductInfo/index",
+ "query": "id=108419",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "pages/pbService/web/index",
"pathName": "pages/pbService/web/index",
diff --git a/utils/util.js b/utils/util.js
index 80d287f..1609034 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -561,6 +561,79 @@ const detailPagePoint = function (url, res) {
}
+// app 要传进来 util 获取不到
+const orderByShoppingCart = function (listData, app) {
+ let productType,flag,isCar;
+ commonApi.user_post('wx/get_user_keep', {
+ jumpurl: '/pages/user/cartlist/list',
+ title: '购物车',
+ type: 'mini'
+ }).then(res => {
+ if (res.data.subscribe == 0) {
+ this.setData({
+ wxqrcode: res.data.qrcode,
+ showQrCode: true
+ })
+ } else {
+ app.globalData.couponInfo = null;
+ let list = listData, product = [], product1 = []
+ list.map(item => {
+ // item.product.type="post";
+ if (item.product.type == 'post') {
+ product.push({
+ product: item.product,
+ sku: item.sku,
+ productNum: item.num
+ })
+ } else {
+ product1.push(item)
+ app.globalData.list = product1
+ }
+ if (item.product.type.includes('post')) {
+ productType = 'post'
+ }
+ })
+ if (product.length == 0 && product1.length == 0) {
+ wx.showToast({
+ title: '请先选择产品',
+ icon: 'none'
+ })
+ return;
+ }
+ if (product.length > 0 && product1.length > 0) {
+ flag = "mix";
+ isCar = "multiple"
+ }
+ if (product1.length > 1) {
+ isCar = "multiple"
+ } else {
+ isCar = "single"
+ }
+ console.log(product1,'product1');
+
+ app.globalData.listName = null
+ if (product1.length>0) {
+ app.globalData.listName = 'car'
+ }
+
+ app.globalData.postProduct = product;
+ if (app.globalData.list) {
+ app.globalData.index = 0
+ app.globalData.product = app.globalData.list[app.globalData.index]
+ }
+ if (productType == 'post') {
+ wx.navigateTo({
+ url: '/pages/order/postOrder/index?from=cart&flag=' + flag,
+ })
+ } else {
+ wx.navigateTo({
+ url: '/subPackages/gwcOrder/index?isCar=' + isCar,
+ })
+ }
+ }
+ })
+}
+
module.exports = {
formatTime: formatTime,
@@ -586,4 +659,5 @@ module.exports = {
getGlobalPagePoint: getGlobalPagePoint,
clearGlobalPagePoint: clearGlobalPagePoint,
detailPagePoint: detailPagePoint,
+ orderByShoppingCart: orderByShoppingCart,
}