Merge branch 'ldx' into dev

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

@@ -75,7 +75,7 @@
         </div>
       </el-col>
       <el-col :span="5">
-        <div class="shopping_cell_specification">
+        <div v-if="cellItems.service_id != 0 && getSpecification" class="shopping_cell_specification">
           <div class="shopping_cell_specification_val">
             <div class="shopping_cell_specification_val_specification">
               计次收费：{{ getSpecification }}
@@ -98,7 +98,7 @@
                     >
                       <el-button
                         v-for="(item, index) in cellItems.service
-                          .request_spcs_info"
+                          .request_spcs_info.spcs_type_1"
                         :key="'specification' + index"
                         :class="
                           specificationPop == item.id
@@ -108,39 +108,11 @@
                         size="mini"
                         @click="changeSpecification(item.id)"
                       >
-                        {{
-                          index +
-                          1 +
-                          ". " +
-                          "访问次数：" +
-                          item.pv +
-                          "/日，" +
-                          "访问量：" +
-                          item.count +
-                          "/日"
-                        }}
+                       
                       </el-button>
                     </div>
                     <div class="no_option" v-else>暂无规格</div>
                   </div>
-                  <div v-else>
-                    <div class="shopping_cell_specification_title">规格：</div>
-                    <div>
-                      <el-button
-                        v-for="(item, index) in appSpecificationBtns"
-                        :key="'specification' + index"
-                        :class="
-                          specificationPop == item.id
-                            ? 'shopping_cell_specification_btn active'
-                            : 'shopping_cell_specification_btn'
-                        "
-                        size="mini"
-                        @click="changeSpecification(item)"
-                      >
-                        {{ index + 1 + ". " + item.value }}
-                      </el-button>
-                    </div>
-                  </div>
                 </div>
                 <div class="pop_footer">
                   <el-button
@@ -259,36 +231,7 @@ export default {
   }),
   computed: {
     getSpecification() {
-      if (this.cellIsService) {
-        let arr = [];
-        if (
-          this.cellItems.service.request_spcs_info &&
-          this.cellItems.service.request_spcs_info.length != 0
-        ) {
-          let requestArr = this.cellItems.service.request_spcs_info;
-          requestArr.forEach((item) => {
-            arr.push(item.id);
-          });
-        }
-        let num = arr.indexOf(this.cellItems.spec_id);
-        let specification = "";
-        if (num != -1) {
-          specification =
-            "访问次数：" +
-            this.cellItems.service.request_spcs_info[num].pv +
-            "/日，" +
-            "访问量：" +
-            this.cellItems.service.request_spcs_info[num].count +
-            "/日";
-        }
-        return specification;
-      } else {
-        if (this.cellItems.spec_id == 1) {
-          return "部署";
-        } else {
-          return "开发";
-        }
-      }
+      console.log()
     },
   },
   mounted() {},
@@ -463,8 +406,8 @@ export default {
 }
 .shopping_cell_specification {
   width: 80%;
-  height: 100px;
-  margin: 0 10%;
+  height: 70px;
+  margin: 15px 10%;
   background-color: #f9fafc;
   border-radius: 8px;
   padding: 10px;

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

@@ -124,9 +124,10 @@ export default {
     },
     getSumCoin() {
       let sum = 0;
+      console.log(this.checkList)
       this.checkList.forEach((item, index) => {
         if (item) {
-          sum += item.total_money;
+          sum += this.list[index].total_money;
         }
       });
       return sum;

src/pages/user/questions-answers/my-qa.vue

@@ -239,7 +239,13 @@ export default {
       this.refreshData();
     },
     refreshData() {
-      this.$emit("refresh", this.pagination);
+      if (this.activeName == "0") {
+          this.getQList();
+        } else if (this.activeName == "1") {
+          this.getAList();
+        } else if (this.activeName == "2") {
+          this.getDeleteList();
+        }
     },
     pageResize() {
       let listWidth = this.$refs.commodityCardIn.clientWidth;

src/pages/workbench/fwgl/cloud-detail.vue

@@ -342,6 +342,10 @@ export default {
           title: "剩余使用天数：",
           info: "1000天",
         },
+        {
+          title: "支付总价：",
+          info: "0 金币",
+        },
         {
           title: "到期时间：",
           info: "2020-06-02 15:54:21",
@@ -698,7 +702,8 @@ export default {
           this.list_arr[3].url = data.apply_file; //  application file url
           this.list_arr[6].info = data.bgn_time; //  get time
           this.list_arr[7].info = data.time_remaining; //  remaining days
-          this.list_arr[8].info = data.end_time; //  maturity time
+          this.list_arr[8].info = data.amounts_payable;
+          this.list_arr[9].info = data.end_time; //  maturity time
           this.list_arr_my[0].info = data.first_level_time || "暂未提交"; //  submit application time
           this.list_arr_my[1].info = data.second_level_time || "暂未获取"; //  super get time
           this.super_status = data.second_level; //  super status