diff --git a/api/goods/index.js b/api/goods/index.js
index ffe6ee8..904f6a0 100644
--- a/api/goods/index.js
+++ b/api/goods/index.js
@@ -92,5 +92,5 @@ export const editGoodsSeckillPrice = param => {
}
// 是否有货
export const getGoodsStock = param => {
- return request.get('goods/getGoodsStock', param)
+ return request.post('goods/getGoodsStock', param)
}
\ No newline at end of file
diff --git a/components/goods-sku-popup/index.vue b/components/goods-sku-popup/index.vue
index 9c28eb4..bd422d6 100644
--- a/components/goods-sku-popup/index.vue
+++ b/components/goods-sku-popup/index.vue
@@ -1,1381 +1,1455 @@
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
diff --git a/pages/goods/components/SkuPopup.vue b/pages/goods/components/SkuPopup.vue
index 9d9b438..ca482e5 100644
--- a/pages/goods/components/SkuPopup.vue
+++ b/pages/goods/components/SkuPopup.vue
@@ -184,9 +184,17 @@
},
selectedOld(e) {
this.selectSku = e
+ this.$emit('getSku', {
+ selectSku: this.selectSku,
+ shopNum: this.shopNum
+ })
},
numChange(e) {
this.shopNum = e
+ this.$emit('getSku', {
+ selectSku: this.selectSku,
+ shopNum: this.shopNum
+ })
},
// sku组件 开始-----------------------------------------------------------
openSkuPopup() {
@@ -194,10 +202,6 @@
},
closeSkuPopup() {
- this.$emit('getSku', {
- selectSku: this.selectSku,
- shopNum: this.shopNum
- })
// console.log("监听 - 关闭sku组件")
},
diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index 5713b39..4d4bc1a 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -117,17 +117,17 @@
-
+
已选
{{selectSku.title.name}}-{{selectSku.value.name}}{{selectShop}}件
-
+
-
+
已选
- {{selectShop}}件
+ {{selectNum}}件
@@ -284,12 +284,15 @@
-
+
加入购物车
-
+
立即购买
+
+ 无货
+
@@ -304,12 +307,15 @@
-
+
加入购物车
-
+
立即购买
+
+ 无货
+
@@ -484,11 +490,11 @@
name: '运损换新'
}],
selectSku: '',
- selectShop: 1,
+ selectNum: 1,
multiIndex: [0, 0, 0],
multiArray: [],
multiData: [],
- stockValue: '南京市',
+ stockValue: '有货',
addressResult: {
province: '江苏省',
city: '南京市',
@@ -552,7 +558,7 @@
methods: {
async getGoodsStockInfor() {
let params = {
- goods_id: this.goodsId,
+ list:[{goods_id:this.goodsId,num:this.selectNum}],
province: this.addressResult ? this.addressResult.province : '江苏省',
city: this.addressResult ? this.addressResult.city : '南京市',
district: this.addressResult ? this.addressResult.district : '玄武区'
@@ -836,8 +842,9 @@
})
},
onGetSku(e) {
+ console.log(e)
this.selectSku = e.selectSku
- this.selectShop = e.shopNum
+ this.selectNum = e.shopNum
},
// 更新购物车数量
onAddCart(total) {
diff --git a/pages/sureOrder/index.vue b/pages/sureOrder/index.vue
index cfd0b43..78d7685 100644
--- a/pages/sureOrder/index.vue
+++ b/pages/sureOrder/index.vue
@@ -1,18 +1,20 @@
-
-
+
+
-
-
-
-
- 送货上门
-
-
- 到店自取
+
+
+
+
+ 送货上门
+
+
+ 到店自取
- {{buyType=='zq'?'到店自取':'送货上门'}}
-
-
+ {{buyType=='zq'?'到店自取':'送货上门'}}
+
+
请点击添加收货地址
@@ -22,7 +24,7 @@
{{ region }}
{{ order.address.detail }}
-
+
@@ -40,7 +42,9 @@
- {{ order.extractShop.region.province }} {{ order.extractShop.region.city }}{{ order.extractShop.region.region }} {{ order.extractShop.address }}
+ {{ order.extractShop.region.province }}
+ {{ order.extractShop.region.city }}{{ order.extractShop.region.region }}
+ {{ order.extractShop.address }}
@@ -53,7 +57,9 @@
- 请选择门店
+ 请选择门店
+
@@ -75,823 +81,906 @@
-
-
-
-
-
-
- 街边取
-
-
- 如果您不方便，只需要在街边稍候，送到您的手上
-
-
-
-
-
-
-
-
- 预计到店时间
-
-
- {{timer}}
- 请选择
-
-
-
-
-
- 您期待的收货时间
-
+
+
+
+
+
+
+ 街边取
+
+
+ 如果您不方便，只需要在街边稍候，送到您的手上
+
+
+
+
+
+
+
+
+ 预计到店时间
+
+
+ {{timer}}
+ 请选择
+
+
+
+
+
+ 您期待的收货时间
+
{{timer}}
请选择
-
-
-
-
-
-
- {{cityInfo.shop_name}}
-
-
-
-
-
-
-
-
- {{ item.goods_name }}
+
+
+
+
+
+
+ {{cityInfo.shop_name}}
+
+
+
+
+
+
+
+
+ {{ item.goods_name }}
-
- {{ props.group.name }}:
- {{ props.value.name }}；
-
-
-
- ￥ {{item.goods_price_min?Number(item.goods_price_min):item.goods_price_min}}
-
-
-
- x{{ item.total_num }}
-
-
-
-
-
- 留言
-
-
-
-
-
-
- 商品总额
-
-
- ￥{{ order.orderTotalPrice?Number(order.orderTotalPrice):order.orderTotalPrice }}
-
-
-
-
- 运费
-
-
- ￥{{ order.expressPrice?Number(order.expressPrice):order.expressPrice }}
+
+ {{ props.group.name }}:
+ {{ props.value.name }}；
+
+
+
+ ￥ {{item.goods_price_min?Number(item.goods_price_min):item.goods_price_min}}
+
+
+
+ x{{ item.total_num }}
+
+
+
+
+
+ 留言
+
+
+
+
+
+
+ 商品总额
+
+
+ ￥{{ order.orderTotalPrice?Number(order.orderTotalPrice):order.orderTotalPrice }}
+
+
+
+
+ 运费
+
+
+ ￥{{ order.expressPrice?Number(order.expressPrice):order.expressPrice }}
不在配送范围
-
-
-
-
- 商品数量
-
-
- {{order.orderTotalNum}}件
-
-
-
-
- 优惠券
-
-
- -￥{{ order.couponMoney }}
- {{order.couponList.length}}张可用
-
+
+
+
+
+ 商品数量
+
+
+ {{order.orderTotalNum}}件
+
+
+
+
+ 优惠券
+
+
+ -￥{{ order.couponMoney }}
+ {{order.couponList.length}}张可用
+
无优惠券可用
-
-
-
-
-
-
-
-
-
-
- 共{{order.orderTotalNum}}件，合计：
- ￥{{ order.orderPayPrice?Number(order.orderPayPrice):order.orderPayPrice }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 共{{order.orderTotalNum}}件，合计：
+ ￥{{ order.orderPayPrice?Number(order.orderPayPrice):order.orderPayPrice }}
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
\ No newline at end of file
+ }
+
+ .footer {
+ width: 100%;
+ height: 120rpx;
+ position: fixed;
+ background-color: #FFF;
+ bottom: 0;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ z-index: 22;
+
+ .meetPrice {
+ margin-left: 26rpx;
+ font-size: 24rpx;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ color: #000000;
+
+ .type {
+ font-size: 24rpx;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 400;
+ color: #F42B17;
+ margin-left: 12rpx;
+ }
+
+ .price {
+ font-size: 40rpx;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 600;
+ color: #F42B17;
+ }
+ }
+
+ .btn {
+ width: 214rpx;
+ height: 74rpx;
+ background: linear-gradient(180deg, #FD5D06 0%, #F3211A 100%);
+ border-radius: 100rpx 100rpx 100rpx 100rpx;
+ opacity: 1;
+ text-align: center;
+ font-size: 28rpx;
+ font-family: PingFang SC, PingFang SC;
+ font-weight: 500;
+ color: #FFFFFF;
+ line-height: 74rpx;
+ margin-right: 20rpx;
+ }
+
+
+ }
+