From 509f2065364205c5c96b5246a4744a84a71acaeb Mon Sep 17 00:00:00 2001
From: zhangjun1 <zhangjun@bd-apaas.com>
Date: Wed, 4 Nov 2020 11:47:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AE=A1=E8=B4=B9=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/serviceDetail.vue | 12 +++++++-----
 src/pages/workbench/yygl/app_detail.vue    | 15 +--------------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 41556ae..2439204 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -824,7 +824,7 @@ export default {
           align: "center",
         },
         {
-          prop: "spcs_type",
+          prop: "spcs_type_name",
           label: "规格类型",
           minWidth: "33.33%",
           align: "center",
@@ -1420,15 +1420,17 @@ export default {
             temp.forEach((e,idx) => {
               e.index = idx+1
               if(e.spcs_type==1){
-                e.gg = e.money+'/'+e.spcs_count
+                e.gg = e.money+'金币/'+e.spcs_count+'次'
                 e.time = '不限时长'
                 e.pv = e.spcs_count
-                e.d_price = e.money
-              }else if(e.spcs_type==1){
-                e.gg = e.money+'/月'
+                e.d_price = e.money/e.spcs_count+'金币/次'
+                e.spcs_type_name = '计次收费'
+              }else if(e.spcs_type==2){
+                e.gg = e.money+'金币/月'
                 e.time = '1个月'
                 e.pv = '不限次数'
                 e.d_price = '-'
+                e.spcs_type_name = '计时收费'
               }
             });
             this.service_size_data =temp;
diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue
index 1907fe8..f8e82df 100644
--- a/src/pages/workbench/yygl/app_detail.vue
+++ b/src/pages/workbench/yygl/app_detail.vue
@@ -487,20 +487,7 @@ export default {
           minWidth: "33.33%",
           align: "left",
           type:'input'
-        },
-        {
-          label: "操作",
-          type: "Button",
-          align: "center",
-          width: 140,
-          btnList: [
-            {
-              type: "action-delete",
-              label: "删除",
-              local: true,
-            },
-          ],
-        },
+        }
       ],
       rules: {
         name: [{ required: true, message: "请输入镜像名称", trigger: "blur" },
-- 
2.26.0