diff --git a/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/buyNow/buyNow.js b/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/buyNow/buyNow.js
index 84a37af..ee2846c 100644
--- a/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/buyNow/buyNow.js
+++ b/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/buyNow/buyNow.js
@@ -73,6 +73,7 @@ Component({
popStock: 0,
// 价格
popPrice: 0,
+ popMoney: 0,
popThumb: "", // 商品图片
optionsMaxCount: 1,
submitActionTag: "-2",
@@ -148,7 +149,7 @@ Component({
}
}else{
that.data.goodsInfo.has_many_specs[i].description = that.data.goodsInfo.has_many_specs[i].specitem[0].id;
- that.selectSpecs(that.data.goodsInfo.has_many_specs[i].specitem[0], "first", i);
+ that.selectSpecs(that.data.goodsInfo.has_many_specs[i].specitem[0], "first", i);
}
}
@@ -265,8 +266,10 @@ Component({
}
let popPrice = "";
+ let popMoney = 0;
if (this.data.goods_plugin.point_goods) {
popPrice = this.data.goods_plugin.point_goods.point_option[_activeSkuIndex].goods_point; //设置默认价格
+ popMoney = this.data.goods_plugin.point_goods.point_option[_activeSkuIndex].use_money; //设置默认价格
} else {
popPrice = this.data.goodsInfo.has_many_options[_activeSkuIndex].product_price; //设置默认价格
}
@@ -277,6 +280,7 @@ Component({
popupSpecs: true,
popupModeshow: false,
popPrice: popPrice, //设置价格
+ popMoney: popMoney,
popThumb: app._isTextEmpty(this.data.goodsInfo.has_many_options[_activeSkuIndex].thumb) ? this.data.goodsInfo.thumb : this.data.goodsInfo.has_many_options[_activeSkuIndex].thumb, //设置图片
popStock: this.data.goodsInfo.has_many_options[_activeSkuIndex].stock, //设置库存
optionsId: this.data.goodsInfo.has_many_options[_activeSkuIndex].id, //设置规格ID，用于生成订单
@@ -286,14 +290,17 @@ Component({
//初始化弹窗view
initPopView() {
let popPrice = "";
+ let popMoney = 0;
if (this.data.goodsInfo.has_option == 1) {
if (this.data.goods_plugin.point_goods) {
popPrice = this.data.goods_plugin.point_goods.min_point + "-" + this.data.goods_plugin.point_goods.max_point; //设置默认价格
+ popMoney = this.data.goods_plugin.point_goods.use_moeny; //设置默认价格
} else {
popPrice = this.data.goodsInfo.min_price + "-" + this.data.goodsInfo.max_price; //设置默认价格
}
this.setData({
popPrice: popPrice, //设置默认价格
+ popMoney: popMoney,
popThumb: this.data.goodsInfo.thumb, //设置默认图片
popStock: this.data.goodsInfo.stock, //设置默认库存
goodsDescription: "选择",
@@ -317,6 +324,7 @@ Component({
if (this.data.goods_plugin.point_goods) {
popPrice = this.data.goods_plugin.point_goods.point; //设置默认价格
+ popMoney = this.data.goods_plugin.point_goods.use_money;
} else {
popPrice = this.data.goodsInfo.price; //设置默认价格
}
@@ -324,6 +332,7 @@ Component({
popThumb: this.data.goodsInfo.thumb, //设置默认图片
popStock: this.data.goodsInfo.stock, //设置默认库存
popPrice: popPrice, //设置默认价格
+ popMoney: popMoney,
goodsDescription: "",
optionsMaxCount: this.data.goodsInfo.stock,
skuImages: __optionArr2,
@@ -678,6 +687,7 @@ Component({
setGoodsSpecsChangeInfo() {
let specsManage = this.data.specsManage;
let popPrice = "";
+ let popMoney = 0;
//根据ID 排序 specsManage.sort();
specsManage.sort(function (a, b) {
return a.id - b.id;
@@ -692,12 +702,14 @@ Component({
if (goodsSpecs == this.setGoodsSpecsBySort(this.data.goodsInfo.has_many_options[i].specs)) {
if (this.data.goods_plugin.point_goods) {
popPrice = this.data.goods_plugin.point_goods.point_option[i].goods_point; //设置默认价格
+ popMoney = this.data.goods_plugin.point_goods.point_option[i].use_money; //设置默认价格
} else {
popPrice = this.data.goodsInfo.has_many_options[i].product_price; //设置默认价格
}
this.setData({
activeSkuIndex: i,
popPrice: popPrice, //设置价格
+ popMoney: popMoney,
popThumb: app._isTextEmpty(this.data.goodsInfo.has_many_options[i].thumb) ? this.data.goodsInfo.thumb : this.data.goodsInfo.has_many_options[i].thumb, //设置图片
popStock: this.data.goodsInfo.has_many_options[i].stock, //设置库存
optionsId: this.data.goodsInfo.has_many_options[i].id, //设置规格ID，用于生成订单
@@ -783,7 +795,7 @@ Component({
this.setData({specsVIPPrc});
},
});
-
+
},
//******************** 加入购物车网络操作 ***************
addCartRequest(_goodsId, _optionsId, _total) {
diff --git a/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/buyNow/buyNow.wxml b/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/buyNow/buyNow.wxml
index afb67a3..f3b3c49 100644
--- a/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/buyNow/buyNow.wxml
+++ b/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/buyNow/buyNow.wxml
@@ -28,6 +28,11 @@
+
+ {{popMoney}}
+ 元
+ +
+
{{popPrice}}
{{integral}}
@@ -102,6 +107,11 @@
+
+ {{popMoney}}
+ 元
+ +
+
{{popPrice}}
{{integral}}
diff --git a/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/foot/foot.wxml b/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/foot/foot.wxml
index 6833eb4..3290fe7 100644
--- a/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/foot/foot.wxml
+++ b/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/foot/foot.wxml
@@ -30,8 +30,9 @@
-
+
+
+
diff --git a/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/priceTitleRepertorySales/priceTitleRepertorySales.wxml b/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/priceTitleRepertorySales/priceTitleRepertorySales.wxml
index 2f31be4..33c35c8 100644
--- a/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/priceTitleRepertorySales/priceTitleRepertorySales.wxml
+++ b/yun-min-program-plugin-master/packageA/mycomponent/goodsComponent/priceTitleRepertorySales/priceTitleRepertorySales.wxml
@@ -16,13 +16,31 @@
-
- {{ goodsInfo.has_option == 1 ? (goods_plugin.point_goods.min_point == goods_plugin.point_goods.max_point ?
- goods_plugin.point_goods.min_point : goods_plugin.point_goods.min_point + "-" + goods_plugin.point_goods.max_point) : goods_plugin.point_goods.point
- }}
+
+
+
+ {{ goods_plugin.point_goods.use_money }}
+
+ 元
+
+
+
+ +
- {{integral}}
- /天
+
+
+
+ {{ goods_plugin.point_goods.point }}
+
+ {{integral}}
+
+
diff --git a/yun-min-program-plugin-master/packageA/mycomponent/goods_new/goods_new.js b/yun-min-program-plugin-master/packageA/mycomponent/goods_new/goods_new.js
index 4091619..fb543c9 100644
--- a/yun-min-program-plugin-master/packageA/mycomponent/goods_new/goods_new.js
+++ b/yun-min-program-plugin-master/packageA/mycomponent/goods_new/goods_new.js
@@ -875,7 +875,8 @@ Component({
skuImages: __optionArr2,
});
}
- } else if (this.data.goodsType == "grabGroup") {
+ }
+ else if (this.data.goodsType == "grabGroup") {
// 抢团的初始化
try {
this.setData({
@@ -917,11 +918,14 @@ Component({
optionsMaxCount: this.data.gooddatas.stock,
});
}
- } else {
+ }
+ else {
let popPrice = "";
+ let popMoney = 0;
if (this.data.goodsInfo.has_option == 1) {
if (this.data.goods_plugin.point_goods) {
popPrice = this.data.goods_plugin.point_goods.min_point + "-" + this.data.goods_plugin.point_goods.max_point; //设置默认价格
+ popMoney = this.data.goods_plugin.point_goods.use_money; //设置默认价格
} else {
popPrice = this.data.goodsInfo.min_price + "-" + this.data.goodsInfo.max_price; //设置默认价格
}
@@ -940,6 +944,7 @@ Component({
popStock: this.data.goodsInfo.stock,
popThumb: this.data.goodsInfo.thumb,
popPrice: popPrice,
+ popMoney: popMoney,
goodsDescription: "选择",
optionsMaxCount: this.data.goodsInfo.stock,
skuImages: _optionArr,
@@ -950,6 +955,7 @@ Component({
if (this.data.goods_plugin.point_goods) {
popPrice = this.data.goods_plugin.point_goods.point; //设置默认价格
+ popMoney = this.data.goods_plugin.point_goods.use_money;
} else {
popPrice = this.data.goodsInfo.price; //设置默认价格
}
@@ -958,6 +964,7 @@ Component({
popStock: this.data.goodsInfo.stock,
popThumb: this.data.goodsInfo.thumb,
popPrice: popPrice,
+ popMoney: popMoney,
goodsDescription: "",
optionsMaxCount: this.data.goodsInfo.stock,
skuImages: __optionArr2,
diff --git a/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.js b/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.js
index bd5f486..3faf6ba 100644
--- a/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.js
+++ b/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.js
@@ -291,6 +291,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ console.log('=== 调试中... ===',options);
wx.getStorage({
key: "yz_basic_info",
success: (res) => {
diff --git a/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.json b/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.json
index 9fbaa96..954c031 100644
--- a/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.json
+++ b/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.json
@@ -28,5 +28,5 @@
"city-delivery-day":"../../mycomponent/city-delivery-day/city-delivery-day",
"invoice-pop":"../../mycomponent/invoice-pop/invoice-pop",
"agency-saleman": "../../mycomponent/agency-saleman/agency-saleman"
- }
+ }
}
diff --git a/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.wxml b/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.wxml
index 7b02453..00f8077 100644
--- a/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.wxml
+++ b/yun-min-program-plugin-master/packageD/buy/myOrder_v2/myOrder_v2.wxml
@@ -496,22 +496,41 @@
预约扣除{{ reserve_deduction_love }}{{ love_name }}
+
-
- 可用{{d.coin}}{{d.name || integral}}
- {{deduction_lang?deduction_lang:'抵扣'}}{{d.amount}}{{language['元']}}
-
-
-
-
+
+
+
+ 需要额外支付{{d.coin}}{{d.name || integral}}
+
+
+
+ 可用{{d.coin}}{{d.name || integral}}
+ {{deduction_lang?deduction_lang:'抵扣'}}{{d.amount}}{{language['元']}}
+
+
+
+
+
+
+
+
+
+ 可用{{d.coin}}{{d.name || integral}}
+ {{deduction_lang?deduction_lang:'抵扣'}}{{d.amount}}{{language['元']}}
+
+
+
+
+
- {{ d.coin }}{{d.name || integral}}
- {{deduction_lang?deduction_lang:'抵扣'}}{{ d.amount }}{{language['元']}}
+ {{ d.name ? '' : '需要支付' }}{{ d.coin }}{{d.name || integral}}
+ {{deduction_lang?deduction_lang:'抵扣'}}{{ d.amount }}{{language['元']}}