gift完成picker对接

@@ -129,22 +129,7 @@ Component({
         },
         },
 
 
         bindPlus() {
         bindPlus() {
-            if (!this.data.colorSelected) {
-                if (this.data.pickerData.view.goodsList.length) {
-                    this.data.pickerData.view.goodsList.map((value, index, array) => {
-                        if (value.selected) {
-                            this.setData({colorSelected: true})
-                        }
-                    })
-                } else {
-                    this.triggerEvent('errorToast', {
-                        title: '请选择颜色',
-                        titleClassName: 'wetoast-title',
-                        duration: 1000
-                    })
-                    return;
-                }
-            }
+            this.checkColor();
 
 
             if (!this.data.selectedSKU) {
             if (!this.data.selectedSKU) {
                 this.triggerEvent('errorToast', {
                 this.triggerEvent('errorToast', {
@@ -184,13 +169,34 @@ Component({
             this.setData({pickerData});
             this.setData({pickerData});
         },
         },
         goPayment() {
         goPayment() {
+            this.checkColor();
             this.triggerEvent('goPayment', this.data)
             this.triggerEvent('goPayment', this.data)
         },
         },
         addShopCart() {
         addShopCart() {
+            this.checkColor();
             this.triggerEvent('addShopCart', this.data)
             this.triggerEvent('addShopCart', this.data)
         },
         },
         chooseSizeColorCompleted() {
         chooseSizeColorCompleted() {
+            this.checkColor();
             this.triggerEvent('chooseSizeColorCompleted', this.data)
             this.triggerEvent('chooseSizeColorCompleted', this.data)
+        },
+        checkColor() {
+            if (!this.data.colorSelected) {
+                if (this.data.pickerData.view.goodsList.length) {
+                    this.data.pickerData.view.goodsList.map((value, index, array) => {
+                        if (value.selected) {
+                            this.setData({colorSelected: true})
+                        }
+                    })
+                } else {
+                    this.triggerEvent('errorToast', {
+                        title: '请选择颜色',
+                        titleClassName: 'wetoast-title',
+                        duration: 1000
+                    })
+                    return;
+                }
+            }
         }
         }
     }
     }
 })
 })

@@ -220,7 +220,7 @@ Page(extend({}, Actionsheet, {
     },
     },
 
 
     onShareAppMessage: function (res) {
     onShareAppMessage: function (res) {
-        var that = this
+        var that = this;
 
 
         let param = {
         let param = {
             FROM: res.from,
             FROM: res.from,
@@ -353,7 +353,6 @@ Page(extend({}, Actionsheet, {
 
 
     // 立即支付
     // 立即支付
     goPayment: function (event) {
     goPayment: function (event) {
-        console.log(event.detail)
         this.setData(event.detail);
         this.setData(event.detail);
         // console.log('######')
         // console.log('######')
         if (this.data.isLimitBuy == true || this.data.is_deposit_advance == "Y" || this.data.is_secKill == "Y" || this.data.is_advance == "Y" || this.data.bundle_type == 2 || this.data.store_show_status === 3 || this.data.store_show_status === 4) {
         if (this.data.isLimitBuy == true || this.data.is_deposit_advance == "Y" || this.data.is_secKill == "Y" || this.data.is_advance == "Y" || this.data.bundle_type == 2 || this.data.store_show_status === 3 || this.data.store_show_status === 4) {
@@ -415,7 +414,6 @@ Page(extend({}, Actionsheet, {
     },
     },
 
 
     goShoppingCart: function () {
     goShoppingCart: function () {
-        debugger
         tt.switchTab({
         tt.switchTab({
             url: '/pages/shopCart/shopCart'
             url: '/pages/shopCart/shopCart'
         })
         })
@@ -435,7 +433,7 @@ Page(extend({}, Actionsheet, {
         };
         };
 
 
         that2.showLoadingToast()
         that2.showLoadingToast()
-        api.get({data: param}).then(function (data) {
+        api.get({data: param}).then((data)=> {
             that2.hideLoadingToast()
             that2.hideLoadingToast()
             this.setData({pickerShow: false})
             this.setData({pickerShow: false})