Commit 47ce8df3 authored by 黄奎's avatar 黄奎

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents 35e1649d 6bf2a4c9
...@@ -193,7 +193,6 @@ ...@@ -193,7 +193,6 @@
this.fu = this.$uiConfig.secondary; this.fu = this.$uiConfig.secondary;
this.secondary = this.$uiConfig.secondary; this.secondary = this.$uiConfig.secondary;
this.skuObj = this.skued.id ? this.skued : null; this.skuObj = this.skued.id ? this.skued : null;
console.log("this.skuObj", this.skuObj);
if (this.skuObj) { if (this.skuObj) {
this.goodimage = this.skuObj.pic_url || this.g.cover_pic; this.goodimage = this.skuObj.pic_url || this.g.cover_pic;
this.goodamount = this.skuObj.stock; this.goodamount = this.skuObj.stock;
...@@ -268,7 +267,6 @@ ...@@ -268,7 +267,6 @@
var RgbValue = fucolor.replace("rgb(", "").replace(")", ""); var RgbValue = fucolor.replace("rgb(", "").replace(")", "");
var RgbValueArry = RgbValue.split(","); var RgbValueArry = RgbValue.split(",");
var grayLevel = RgbValueArry[0] * 0.299 + RgbValueArry[1] * 0.587 + RgbValueArry[2] * 0.114; var grayLevel = RgbValueArry[0] * 0.299 + RgbValueArry[1] * 0.587 + RgbValueArry[2] * 0.114;
console.log(grayLevel)
if (grayLevel >= 192) { if (grayLevel >= 192) {
this.btn1.color = this.mc; this.btn1.color = this.mc;
} else { } else {
...@@ -298,7 +296,6 @@ ...@@ -298,7 +296,6 @@
return sColor; return sColor;
}, },
joinCar() { joinCar() {
console.log("商品信息", this.g);
if (this.skuObj && this.skuObj.id) { if (this.skuObj && this.skuObj.id) {
var postMsg = { var postMsg = {
GoodsId: this.skuObj.goods_id, GoodsId: this.skuObj.goods_id,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment