服务申请

src/components/order-list/order-list-cell.vue

@@ -72,9 +72,9 @@
       <el-col :span="5" class="cell_specification">
         <div v-if="cellItem.order_type == 1">
           <div>
-            {{ cellItem.spec_type == 1 ? "计次收费" : "时长收费" }}：
+            {{ cellItem.spcs_type == 1 ? "计次收费" : "时长收费" }}：
             {{ cellItem.single_money }}金币/
-            {{ cellItem.spec_type == 1 ? cellItem.spec_count + "次" : "月" }}
+            {{ cellItem.spcs_type == 1 ? cellItem.spcs_count + "次" : "月" }}
           </div>
         </div>
         <div v-else-if="cellItem.order_type == 2">
@@ -440,7 +440,7 @@ export default {
       if (this.cellItem.order_type == 1) {
         query = {
           service_id: parseFloat(this.cellItem.service_id),
-          spec_id: this.cellItem.svc_spec_id,
+          spcs_id: this.cellItem.spcs_id,
           duration: this.cellItem.duration,
           duration_unit: this.cellItem.duration_unit,
         };

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

@@ -360,7 +360,7 @@ export default {
       let query = {
         id: this.cellItems.id,
         duration: this.cellItems.duration,
-        spec_id: this.cellItems.spec_id,
+        spec_id: this.specificationPop.id,
         duration_method: this.cellItems.duration_method,
         is_subscribe: Number(this.cellItems.is_subscribe),
       };

src/pages/service_shop/shop_car_apply.vue

@@ -163,7 +163,7 @@ export default {
             this.service_arr[0]["size"] ="应用镜像部署权限："+data.price+"金币/月";
             this.service_arr[0]["applytype"] =
               "申请方式：" + (app_data.duration_unit == 1 ? "月" : "年");
-            this.service_arr[0]["num"] = app_data.duration;
+            this.service_arr[0]["num"] = `${app_data.duration}个月`;
             this.service_arr[0]["count"] = app_data.duration*parseFloat(data.price)+'金币';
             this.service_arr[0]["isMg"] = false;
             this.service_arr[0]["isapp"] = true;
@@ -183,7 +183,7 @@ export default {
             //服务
             this.post_arr = [data];
             this.post_arr[0].service_id = parseInt(service_data.service_id);
-            this.post_arr[0].spec_id = parseInt(service_data.spec_id);
+            this.post_arr[0].spec_id = parseInt(service_data.spcs_id);
             this.post_arr[0].duration_method = parseInt(
               service_data.duration_unit
             );
@@ -203,20 +203,22 @@ export default {
             this.service_arr[0]["size"] = "";
             this.service_arr[0]["count"] = "";
             data.request_spcs_info.forEach((el) => {
-              if (service_data.spec_id == el.id) {
+              if (service_data.spcs_id == el.id) {
                   let size = "";
-
+                  let count = "";
                   if (el.spcs_type==1) {
-                    size = `${el.money}金币/${el.spcs_count}次`
+                    size = `计次收费：${el.money}金币/${el.spcs_count}次`;
                     this.service_arr[0]["num"] = "不限时长"
+                    count = el.money;
                   } else {
-                    size = `${el.money}金币/${el.duration_unit == 1 ? "月" : "年"}`
+                    size = `${el.money}金币/${el.duration_unit == 1 ? "月" : "年"}`;
                     this.service_arr[0]["num"] = service_data.duration;
+                    count = service_data.duration*el.money;
                   }
 
                   this.service_arr[0]["size"] = size;
-                  this.service_arr[0]["count"] = service_data.duration*el.money+'金币';
-                  this.all_cost = service_data.duration*el.money
+                  this.service_arr[0]["count"] = count+'金币';
+                  this.all_cost = count;
               }
             });
             this.service_arr[0]["applytype"] =
@@ -378,7 +380,7 @@ export default {
               this.service_arr[l]["size"] ="应用镜像部署权限："+e.application.price+"金币/月";
               this.service_arr[l]["applytype"] =
                 "申请方式：" + (e.duration_method == 1 ? "月" : "年");
-              this.service_arr[l]["num"] = e.duration;
+              this.service_arr[l]["num"] = `${e.duration}${e.duration_unit == 1 ? "个月" : "年"}`;
               this.service_arr[l]["count"] = e.duration*parseFloat(e.application.price)+'金币';
               this.service_arr[l]["isMg"] = false;
               this.service_arr[l]["isapp"] = true;
@@ -402,7 +404,7 @@ export default {
               let spcs_type_2 = e.service.request_spcs_info.spcs_type_2 || [];
               spcs_type_1.forEach((el,ind) => {
                 if (e.spec_id == el.id) {
-                  this.service_arr[l]["size"] = `时长收费：${el.money}金币/${el.spcs_count}次 * ${e.duration}`;
+                  this.service_arr[l]["size"] = `计次收费：${el.money}金币/${el.spcs_count}次`;
                   this.service_arr[l]["num"] = "不限时长";
                   this.service_arr[l]["count"] = e.duration*el.money+'金币';
                   temp_cost = this.floatAdd(temp_cost, e.duration*el.money);
@@ -410,8 +412,8 @@ export default {
               });
               spcs_type_2.forEach((el,ind) => {
                 if (e.spec_id == el.id) {
-                  this.service_arr[l]["size"] = `应用镜像部署权限：${el.money}金币/${el.duration_unit == 1 ? "月" : "年"}`;
-                  this.service_arr[l]["num"] = e.duration;
+                  this.service_arr[l]["size"] = `时长收费：${el.money}金币/${el.duration_unit == 1 ? "月" : "年"}`;
+                  this.service_arr[l]["num"] = `${e.duration}${el.duration_unit == 1 ? "个月" : "年"}`;
                   this.service_arr[l]["count"] = e.duration*el.money+'金币';
                   temp_cost = this.floatAdd(temp_cost, e.duration*el.money);
                 }