Merge branch 'dev'

.beagle.yml

@@ -265,7 +265,7 @@ pipeline:
         - master
 
   deploy:
-    image: registry.cn-qingdao.aliyuncs.com/wod-devops/kubernetes:1.0
+    image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
     namespace: apaas-v3
     deployment: apaas-ui
     container: apaas-ui

src/components/shopping-cart/shopping-cart-cell.vue

@@ -128,14 +128,22 @@
                         {{ item.money }}金币/{{ item.spcs_count }}次
                       </el-button>
                       <el-button
-                      v-if="cellItems.service.request_spcs_info.spcs_type_2 && cellItems.service.request_spcs_info.spcs_type_2.length != 0"
+                        v-if="
+                          cellItems.service.request_spcs_info.spcs_type_2 &&
+                          cellItems.service.request_spcs_info.spcs_type_2
+                            .length != 0
+                        "
                         :class="
                           specificationPop.spcs_type == 2
                             ? 'shopping_cell_specification_btn active'
                             : 'shopping_cell_specification_btn'
                         "
                         size="mini"
-                        @click="changeSpecification(cellItems.service.request_spcs_info.spcs_type_2[0])"
+                        @click="
+                          changeSpecification(
+                            cellItems.service.request_spcs_info.spcs_type_2[0]
+                          )
+                        "
                         >{{
                           cellItems.service.request_spcs_info.spcs_type_2[0]
                             .money
@@ -301,10 +309,14 @@ export default {
         !this.cellItems.service.spcs_info.id
       ) {
         this.$message({
-          message: "该服务暂不支持购买",
+          message:
+            (this.cellItems.service_id == 0
+              ? this.cellItems.application.app_name
+              : this.cellItems.service.name) + "暂不支持购买",
           type: "error",
         });
         this.checkedItem = false;
+        this.$emit("changeState", { state: false, index: this.cellIndex });
       } else {
         this.$emit("changeState", { state: val, index: this.cellIndex });
       }
@@ -322,7 +334,7 @@ export default {
     },
     setSpecificationPop() {
       this.specificationPop = this.cellItems.service.spcs_info;
-      console.log(this.specificationPop)
+      console.log(this.specificationPop);
       // this.specificationApplicationPop = this.cellItems.duration_method;
     },
     changeSubscription(val) {

src/components/shopping-cart/shopping-cart-list.vue

@@ -2,6 +2,7 @@
   <div>
     <div class="shopping_list_page">
       <ShoppingCartCell
+        :ref="`cartcell_${index}`"
         v-for="(item, index) in list"
         :cellItem="item"
         :cellIsService="item.app_id == 0"
@@ -59,6 +60,7 @@ export default {
     setAllState(val) {
       for (let i = 0; i < this.checkLists.length; i++) {
         this.$set(this.checkLists, i, val);
+        this.$refs["cartcell_" + i][0].getState(val);
       }
     },
     changeCellMsg(val) {