diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue
index 2060d5383f1715bf0d486f3928eb0e19872cd8eb..74b05a546542a0cb0b147f990bc4b028e9e83179 100644
--- a/src/components/order-list/order-list-cell.vue
+++ b/src/components/order-list/order-list-cell.vue
@@ -11,7 +11,7 @@
           cellItem.approval_second_level != 0 ||
           cellItem.pay_status == -1
         "
-        class="cell_del_btn" 
+        class="cell_del_btn"
         @click="delOrder(cellItem.order_id)"
       >
         删除
@@ -71,16 +71,24 @@
       </el-col>
       <el-col :span="5" class="cell_specification">
         <div v-if="cellItem.order_type == 1">
-          <div>计次收费：200金币/1000次.时长收费：2000金币/月</div>
+          <div>
+            {{ cellItem.spec_type == 1 ? "计次收费" : "时长收费" }}：
+            {{ cellItem.single_money }}金币/
+            {{ cellItem.spec_type == 1 ? cellItem.spec_count + "次" : "月" }}
+          </div>
         </div>
         <div v-else-if="cellItem.order_type == 2">
-            <div>
-              {{
-                cellItem.spec_app == 0
-                  ? "申请获取应用镜像部署权限：2000金币/月"
-                  : "申请获取应用镜像开发权限：2000金币/月"
-              }}
-            </div>
+          <div>
+            {{
+              cellItem.spec_app == 0
+                ? "申请获取应用镜像部署权限：" +
+                  cellItem.single_money +
+                  "金币/月"
+                : "申请获取应用镜像开发权限：" +
+                  cellItem.single_money +
+                  "金币/月"
+            }}
+          </div>
         </div>
         <div v-else-if="cellItem.order_type == 3">
           <el-tooltip
@@ -133,13 +141,17 @@
       </el-col>
       <el-col :span="3" class="cell_specification">
         <div>
-          不限时长
+          {{
+            cellItem.duration != 0 && cellItem.duration_unit == 1
+              ? cellItem.duration + "个月"
+              : cellItem.duration != 0 && cellItem.duration_unit == 2
+              ? cellItem.duration + "年"
+              : "不限时长"
+          }}
         </div>
       </el-col>
       <el-col :span="3" class="cell_specification">
-        <div>
-          200金币
-        </div>
+        <div>{{ cellItem.total_money }}金币</div>
       </el-col>
       <el-col :span="3" class="approval_status">
         <div>
diff --git a/src/components/service-info/app-info.vue b/src/components/service-info/app-info.vue
index d0115a96e14c4596d4ae111b565c06e711485e72..28f1d7ae0d95e7f34e06958f0e6df6c7c506f68a 100644
--- a/src/components/service-info/app-info.vue
+++ b/src/components/service-info/app-info.vue
@@ -34,6 +34,19 @@
             <span v-text="data.create_date"></span>
           </li>
         </ul>
+        <div class="and_wid">
+          <div class="dbn_wkdn">
+            价&nbsp;&nbsp;格：
+            <span class="ndwa_indowa"> {{ specification && specification.single_money ? specification.single_money * duration : 0 }} </span>
+            <span class="kfdf_jffa">金币</span>
+          </div>
+          <div class="nmd_kwd">
+            月售：
+            <span class="ndwa_dn"> {{ data.mount_count }} 笔 </span>
+            <img src="@/assets/imgs/shop_ic_star.png" class="dwin_diwa" />
+            <span class="dn_wjd"> {{ data.scoreDetail.avgScore }} </span>
+          </div>
+        </div>
         <div class="commodity_information">
           <span>规&emsp;&emsp;格：</span>
           <div class="btn_container">
@@ -47,6 +60,16 @@
             </el-button>
           </div>
         </div>
+        <div class="commodity_information">
+          <span>购买时长：</span>
+          <div class="btn_container">
+            <el-input-number
+              v-model="duration"
+              :min="1"
+              :disabled="actionDisabled"
+            ></el-input-number>
+          </div>
+        </div>
         <div class="commodity_action">
           <el-button type="warning" plain @click="addToCart">
             加入购物车
@@ -80,7 +103,13 @@ export default {
       },
     ],
     specificationID: 1,
+    duration: 1,
   }),
+  computed: {
+    actionDisabled() {
+      return this.specifications.length == 0;
+    },
+  },
   methods: {
     changeSpecification({ value }) {
       this.specificationID = value;
@@ -253,6 +282,55 @@ export default {
   margin-left: 20px;
   font-size: 16px;
 }
+.and_wid {
+  background-color: #f9fafc;
+  border-radius: 8px;
+  padding: 20px;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 20px;
+  align-items: center;
+}
+.dbn_wkdn {
+  color: #8890a7;
+  font-size: 14px;
+}
+.ndwa_indowa {
+  color: #e56600;
+  font-size: 26px;
+  font-weight: bold;
+}
+.kfdf_jffa {
+  color: #e56600;
+  font-size: 14px;
+}
+.nmd_kwd {
+  color: #8890a7;
+}
+.ndwa_dn {
+  color: #242c43;
+}
+.dn_wjd {
+  color: #ea7d19;
+  font-size: 18px;
+  position: relative;
+}
+.dwin_diwa {
+  width: 14px;
+  height: 14px;
+  margin-left: 20px;
+  margin-right: 4px;
+  position: relative;
+}
+.dn_wjd::after {
+  content: "";
+  position: absolute;
+  width: 2px;
+  height: 16px;
+  background-color: #e3e5ef;
+  top: 5px;
+  left: -35px;
+}
 </style>
 
 <style>
diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue
index 7896323460f34b7190b7c5f9f1d0e0e2aa50aedc..9ce68e1dd251e459ae2201b867d231edbfca83ba 100644
--- a/src/components/service-info/service-info.vue
+++ b/src/components/service-info/service-info.vue
@@ -18,13 +18,21 @@
     </div>
     <div class="main_container">
       <div class="main_container-left" v-if="data.cover">
-        <img :src="data.cover" width="100%" v-if="data.type!=='workflow'" />
-        <workflows-view :zoom="0.6" :id="parseInt(data.workflows_id)" :hideDetail="true" v-if="data.type=='workflow'"></workflows-view>
+        <img :src="data.cover" width="100%" v-if="data.type !== 'workflow'" />
+        <workflows-view
+          :zoom="0.6"
+          :id="parseInt(data.workflows_id)"
+          :hideDetail="true"
+          v-if="data.type == 'workflow'"
+        ></workflows-view>
         <map-view
           v-if="data.type === 'Map Service'"
           :id="data.portal_id"
         ></map-view>
-        <process-view :id="parseInt(data.workflows_id)" v-if="data.type=='workflow'"></process-view>
+        <process-view
+          :id="parseInt(data.workflows_id)"
+          v-if="data.type == 'workflow'"
+        ></process-view>
       </div>
       <div class="main_container-right">
         <ul class="service_base_info">
@@ -53,15 +61,46 @@
             <span v-text="data.descript"></span>
           </li>
         </ul>
+        <div class="and_wid">
+          <div class="dbn_wkdn">
+            价&nbsp;&nbsp;格：<span class="ndwa_indowa">
+              {{ specification && specification.single_money ? specification.single_money : 0 }}
+            </span>
+            <span class="kfdf_jffa">金币</span>
+          </div>
+          <div class="nmd_kwd">
+            月售：<span class="ndwa_dn">{{ data.mount_count }} 笔 </span
+            ><img src="@/assets/imgs/shop_ic_star.png" class="dwin_diwa" />
+            <span class="dn_wjd">{{ data.scoreDetail.avgScore }}</span>
+          </div>
+        </div>
         <div class="commodity_information">
-          <span>规&emsp;&emsp;格：</span>
-          <span v-if="actionDisabled" class="commodity_text">暂无</span>
+          <span>计次收费规格：</span>
+          <span v-if="data.spce_type_1 && data.spce_type_1.length == 0" class="commodity_text"
+            >暂无</span
+          >
+          <div v-else class="btn_container">
+            <el-button
+              v-for="(item, index) in data.spce_type_1"
+              :key="'spcs_' + index"
+              :type="item.id === specification.id ? 'primary' : 'default'"
+              @click="changeSpecification(item, 0)"
+            >
+              {{ item.name }}
+            </el-button>
+          </div>
+        </div>
+        <div class="commodity_information">
+          <span>时长收费规格：</span>
+          <span v-if="data.spce_type_2 && data.spce_type_2.length == 0" class="commodity_text"
+            >暂无</span
+          >
           <div v-else class="btn_container">
             <el-button
-              v-for="(item, index) in specifications"
+              v-for="(item, index) in data.spce_type_2"
               :key="'spcs_' + index"
               :type="item.id === specification.id ? 'primary' : 'default'"
-              @click="changeSpecification(item)"
+              @click="changeSpecification(item, 1)"
             >
               {{ item.name }}
             </el-button>
@@ -76,31 +115,21 @@
             v-text="(specification && specification.descript) || '-'"
           ></span>
         </div>
-        <div class="commodity_information">
-          <span>购买方式：</span>
-          <span v-if="actionDisabled" class="commodity_text">暂无</span>
-          <div v-else class="btn_container">
-            <el-button
-              v-for="(item, index) in types"
-              v-text="item.name"
-              :key="'type_' + index"
-              :type="item.value === type ? 'primary' : 'default'"
-              @click="changeType(item)"
-            >
-            </el-button>
-          </div>
-        </div>
         <div class="commodity_information">
           <span>购买时长：</span>
-          <div class="btn_container">
+          <div v-if="showTime" class="btn_container">
             <el-input-number
               v-model="duration"
               :min="1"
               :disabled="actionDisabled"
-            ></el-input-number>
+            ></el-input-number
+            >月
+          </div>
+          <div v-else class="btn_container">
+            <el-button type="primary"> 不限时长 </el-button>
           </div>
         </div>
-        <div class=" commodity_action">
+        <div class="commodity_action">
           <el-button
             type="warning"
             plain
@@ -125,14 +154,14 @@
 <script>
 import helper from "@/services/helper.js";
 import MapView from "./map-view";
-import workflowsView from '@/components/work-flow/workflows-view'
-import processView from '@/components/service-info/process-view'
+import workflowsView from "@/components/work-flow/workflows-view";
+import processView from "@/components/service-info/process-view";
 
 export default {
   components: {
     MapView,
     workflowsView,
-    processView
+    processView,
   },
   props: {
     data: {
@@ -145,6 +174,7 @@ export default {
     type: 0, // 购买方式 1：按月，2：按年
     specification: {}, // 规格
     duration: 1, // 时长
+    showTime: false,
   }),
   computed: {
     specifications() {
@@ -170,8 +200,13 @@ export default {
     dateTransform(datestr = "") {
       return helper.dateStringTransform(datestr);
     },
-    changeSpecification(specification) {
+    changeSpecification(specification, type) {
       this.specification = specification;
+      if (type == 0) {
+        this.showTime = false;
+      } else if (type == 1) {
+        this.showTime = true;
+      }
     },
     changeType({ value }) {
       this.type = value;
@@ -408,6 +443,55 @@ export default {
   margin-left: 20px;
   font-size: 16px;
 }
+.and_wid {
+  background-color: #f9fafc;
+  border-radius: 8px;
+  padding: 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20px;
+}
+.dbn_wkdn {
+  color: #8890a7;
+  font-size: 14px;
+}
+.ndwa_indowa {
+  color: #e56600;
+  font-size: 26px;
+  font-weight: bold;
+}
+.kfdf_jffa {
+  color: #e56600;
+  font-size: 14px;
+}
+.nmd_kwd {
+  color: #8890a7;
+}
+.ndwa_dn {
+  color: #242c43;
+}
+.dn_wjd {
+  color: #ea7d19;
+  font-size: 18px;
+  position: relative;
+}
+.dwin_diwa {
+  width: 14px;
+  height: 14px;
+  margin-left: 20px;
+  margin-right: 4px;
+  position: relative;
+}
+.dn_wjd::after {
+  content: "";
+  position: absolute;
+  width: 2px;
+  height: 16px;
+  background-color: #e3e5ef;
+  top: 5px;
+  left: -35px;
+}
 </style>
 
 <style>
diff --git a/src/components/service-list/service_shop_menu.vue b/src/components/service-list/service_shop_menu.vue
index 1f7897777e123f6941cd083bb9c8cf2e8e424e16..53959fd40cad3260affa3577bbcae299e838936d 100644
--- a/src/components/service-list/service_shop_menu.vue
+++ b/src/components/service-list/service_shop_menu.vue
@@ -53,12 +53,12 @@ export default {
         if (response.data.success == 1) {
           let arr = response.data.data[0].Child;
           let shopArr = [];
-          arr.forEach((item) => {
-            if (item.visit_url == "/services_shop") {
-              shopArr = item.Child;
-            }
-          });
-          shopArr.forEach((item) => {
+          let asd = arr.find(item => {
+            return item.visit_url == "/services_shop"
+          })
+          shopArr = asd.Child;
+          if (shopArr && shopArr.length != 0) {
+            Array.from(shopArr).forEach((item) => {
             let uri = item.visit_url.substring(6);
             if (uri.indexOf("/") != -1) {
               uri = uri.substring(0, uri.indexOf("/"));
@@ -98,6 +98,7 @@ export default {
                 break;
             }
           });
+          }
           this.menuList = shopArr;
         }
       });
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue
index 8d95e739745f57b031e3ec322c9e2296e99678b3..03f2c87bbaa275966e98e815e2b9c1df5d8aa9bd 100644
--- a/src/components/shop-cloud/shop-cloud.vue
+++ b/src/components/shop-cloud/shop-cloud.vue
@@ -5,24 +5,40 @@
       <el-breadcrumb-item>{{ name }}</el-breadcrumb-item>
     </el-breadcrumb>
     <block-radius>
-      <el-form ref="form" :inline="true" :rules="ruleBasis" :model="form" class="form_block">
+      <el-form
+        ref="form"
+        :inline="true"
+        :rules="ruleBasis"
+        :model="form"
+        class="form_block"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item class="form_item">
               <div class="form_item_title">申请组织：</div>
-              <el-input v-model="form.department_name" :disabled="true" placeholder="请输入申请组织"></el-input>
+              <el-input
+                v-model="form.department_name"
+                :disabled="true"
+                placeholder="请输入申请组织"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item class="form_item" prop="link_man">
               <div class="form_item_title">部门联系人：</div>
-              <el-input v-model="form.link_man" placeholder="请输入联系人姓名"></el-input>
+              <el-input
+                v-model="form.link_man"
+                placeholder="请输入联系人姓名"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item class="form_item" prop="phone">
               <div class="form_item_title">联系电话：</div>
-              <el-input v-model="form.phone" placeholder="请输入联系人电话"></el-input>
+              <el-input
+                v-model="form.phone"
+                placeholder="请输入联系人电话"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -41,13 +57,19 @@
                   <el-col :span="12">
                     <el-form-item prop="namespace" class="form_item">
                       <div class="form_item_title">工作区域名称：</div>
-                      <el-input v-model="formNew.namespace" placeholder="请输入工作区域英文名称"></el-input>
+                      <el-input
+                        v-model="formNew.namespace"
+                        placeholder="请输入工作区域英文名称"
+                      ></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
                     <el-form-item prop="workplace" class="form_item">
                       <div class="form_item_title">中文名称：</div>
-                      <el-input v-model="formNew.workplace" placeholder="请输入工作区域中文名称"></el-input>
+                      <el-input
+                        v-model="formNew.workplace"
+                        placeholder="请输入工作区域中文名称"
+                      ></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
@@ -66,7 +88,11 @@
                   <el-col :span="6">
                     <el-form-item prop="cpu" class="form_item input_has_right">
                       <div class="form_item_title">CPU：</div>
-                      <el-select v-model="formNew.cpu" @change="changeCPU" placeholder="请选择CPU使用量">
+                      <el-select
+                        v-model="formNew.cpu"
+                        @change="changeCPU"
+                        placeholder="请选择CPU使用量"
+                      >
                         <el-option
                           v-for="item in optionsCPU"
                           :key="item.value"
@@ -78,7 +104,10 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item prop="memory" class="form_item input_has_right">
+                    <el-form-item
+                      prop="memory"
+                      class="form_item input_has_right"
+                    >
                       <div class="form_item_title">内存：</div>
                       <el-select
                         v-model="formNew.memory"
@@ -96,7 +125,10 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item prop="containerGroup" class="form_item input_has_right">
+                    <el-form-item
+                      prop="containerGroup"
+                      class="form_item input_has_right"
+                    >
                       <div class="form_item_title">容器组：</div>
                       <el-input-number
                         v-model="formNew.containerGroup"
@@ -145,7 +177,10 @@
                     <div class="form_item_title">内存：</div>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item prop="perCPUs" class="form_item input_has_left_right">
+                    <el-form-item
+                      prop="perCPUs"
+                      class="form_item input_has_left_right"
+                    >
                       <div class="input_left">最高</div>
                       <el-input-number
                         v-model="formNew.perCPUs"
@@ -158,7 +193,10 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item prop="perCPU" class="form_item input_has_left_right">
+                    <el-form-item
+                      prop="perCPU"
+                      class="form_item input_has_left_right"
+                    >
                       <div class="input_left">默认</div>
                       <el-input-number
                         v-model="formNew.perCPU"
@@ -171,7 +209,10 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item prop="perRAMs" class="form_item input_has_left_right">
+                    <el-form-item
+                      prop="perRAMs"
+                      class="form_item input_has_left_right"
+                    >
                       <div class="input_left">最高</div>
                       <el-input-number
                         v-model="formNew.perRAMs"
@@ -184,7 +225,10 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
-                    <el-form-item prop="perRAM" class="form_item input_has_left_right">
+                    <el-form-item
+                      prop="perRAM"
+                      class="form_item input_has_left_right"
+                    >
                       <div class="input_left">默认</div>
                       <el-input-number
                         v-model="formNew.perRAM"
@@ -200,15 +244,18 @@
                     <div class="form_title">其他信息</div>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item prop="appDuration" class="form_item input_has_right_select">
+                    <el-form-item
+                      prop="appDuration"
+                      class="form_item input_has_right"
+                    >
                       <div class="form_item_title">申请时长：</div>
                       <el-input-number
                         v-model="formNew.appDuration"
                         controls-position="right"
-                        :min="0"
+                        :min="1"
                         :max="1000"
                       ></el-input-number>
-                      <el-select
+                      <!-- <el-select
                         v-model="formNew.durType"
                         class="input_right_select"
                         placeholder="请选择申请时长"
@@ -219,13 +266,17 @@
                           :label="item.label"
                           :value="item.value"
                         ></el-option>
-                      </el-select>
+                      </el-select> -->
+                      <div class="input_right">月</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="24">
                     <el-form-item class="form_item">
                       <div class="form_item_title">申请文件：</div>
-                      <info-list :list_arr="docTemplate" class="doc_template"></info-list>
+                      <info-list
+                        :list_arr="docTemplate"
+                        class="doc_template"
+                      ></info-list>
                       <upload-file
                         :multiple="false"
                         :unique="false"
@@ -248,7 +299,11 @@
             <el-col :span="12">
               <div class="select_title">选择要进行调整的工作区域：</div>
               <div class="form_item">
-                <el-select v-model="workSpace" @change="getForm" placeholder="请选择">
+                <el-select
+                  v-model="workSpace"
+                  @change="getForm"
+                  placeholder="请选择"
+                >
                   <el-option
                     v-for="(item, index) in workSpaceOptions"
                     :key="index"
@@ -280,28 +335,32 @@
                             :src="require('@/assets/imgs/' + item.src + '.png')"
                           />
                           <span class="now_spec_card_title">
-                            {{
-                            item.title
-                            }}
+                            {{ item.title }}
                           </span>
                           <span class="now_spec_card_val">
                             {{
-                            item.val +
-                            " " +
-                            (item.title == "CPU"
-                            ? "核"
-                            : item.title == "内存"
-                            ? "GB"
-                            : "个")
+                              item.val +
+                              " " +
+                              (item.title == "CPU"
+                                ? "核"
+                                : item.title == "内存"
+                                ? "GB"
+                                : "个")
                             }}
                           </span>
                         </div>
                       </div>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item prop="cpu" class="form_item input_has_right">
+                      <el-form-item
+                        prop="cpu"
+                        class="form_item input_has_right"
+                      >
                         <div class="form_item_title">申请CPU调整为：</div>
-                        <el-select v-model="formOld.cpu" placeholder="请选择CPU使用量">
+                        <el-select
+                          v-model="formOld.cpu"
+                          placeholder="请选择CPU使用量"
+                        >
                           <el-option
                             v-for="item in optionsCPU"
                             :key="item.value"
@@ -313,7 +372,10 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item prop="memory" class="form_item input_has_right">
+                      <el-form-item
+                        prop="memory"
+                        class="form_item input_has_right"
+                      >
                         <div class="form_item_title">申请内存调整为：</div>
                         <el-select
                           v-model="formOld.memory"
@@ -331,7 +393,10 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item prop="containerGroup" class="form_item input_has_right">
+                      <el-form-item
+                        prop="containerGroup"
+                        class="form_item input_has_right"
+                      >
                         <div class="form_item_title">申请容器组调整为：</div>
                         <el-input-number
                           v-model="formOld.containerGroup"
@@ -352,7 +417,7 @@
                           :stripe="true"
                           :datas="dataDiskList"
                           @primary-del="delItem"
-                          max-height="260"
+                          :maxheight="260"
                         ></table-um>
                       </el-form-item>
                     </el-col>
@@ -409,20 +474,18 @@
                             :src="require('@/assets/imgs/' + item.src + '.png')"
                           />
                           <span class="now_rqz_card_title">
-                            {{
-                            item.title
-                            }}
+                            {{ item.title }}
                           </span>
                           <div class="now_rqz_card_val_div">
                             <span class="now_rqz_card_val">
                               最高&nbsp;{{ item.max }}&nbsp;{{
-                              item.title == "CPU" ? "核" : "GB"
+                                item.title == "CPU" ? "核" : "GB"
                               }}
                             </span>
                             <br />
                             <span class="now_rqz_card_val">
                               默认&nbsp;{{ item.default }}&nbsp;{{
-                              item.title == "CPU" ? "核" : "GB"
+                                item.title == "CPU" ? "核" : "GB"
                               }}
                             </span>
                           </div>
@@ -436,7 +499,10 @@
                       <div class="form_item_title">内存：</div>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item prop="perCPUs" class="form_item input_has_left_right">
+                      <el-form-item
+                        prop="perCPUs"
+                        class="form_item input_has_left_right"
+                      >
                         <div class="input_left">最高</div>
                         <el-input-number
                           v-model="formOld.perCPUs"
@@ -449,7 +515,10 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item prop="perCPU" class="form_item input_has_left_right">
+                      <el-form-item
+                        prop="perCPU"
+                        class="form_item input_has_left_right"
+                      >
                         <div class="input_left">默认</div>
                         <el-input-number
                           v-model="formOld.perCPU"
@@ -462,7 +531,10 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item prop="perRAMs" class="form_item input_has_left_right">
+                      <el-form-item
+                        prop="perRAMs"
+                        class="form_item input_has_left_right"
+                      >
                         <div class="input_left">最高</div>
                         <el-input-number
                           v-model="formOld.perRAMs"
@@ -475,7 +547,10 @@
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item prop="perRAM" class="form_item input_has_left_right">
+                      <el-form-item
+                        prop="perRAM"
+                        class="form_item input_has_left_right"
+                      >
                         <div class="input_left">默认</div>
                         <el-input-number
                           v-model="formOld.perRAM"
@@ -497,12 +572,14 @@
                               class="now_spec_card_time_img"
                               :src="require('@/assets/imgs/ic_shijian.png')"
                             />
-                            <span class="now_spec_card_time_title">当前工作区域到期时间</span>
+                            <span class="now_spec_card_time_title"
+                              >当前工作区域到期时间</span
+                            >
                             <span class="now_spec_card_time_val">
                               {{
-                              helper.dateStringTransform(
-                              paramsOld.cloud_end_time
-                              )
+                                helper.dateStringTransform(
+                                  paramsOld.cloud_end_time
+                                )
                               }}
                             </span>
                           </div>
@@ -515,7 +592,7 @@
                         <el-input-number
                           v-model="formOld.appDuration"
                           controls-position="right"
-                          :min="0"
+                          :min="1"
                           :max="1000"
                         ></el-input-number>
                         <el-select
@@ -535,7 +612,10 @@
                     <el-col :span="22">
                       <el-form-item class="form_item">
                         <div class="form_item_title">申请文件：</div>
-                        <info-list :list_arr="docTemplate" class="doc_template"></info-list>
+                        <info-list
+                          :list_arr="docTemplate"
+                          class="doc_template"
+                        ></info-list>
                         <upload-file
                           :multiple="false"
                           :unique="false"
@@ -554,11 +634,41 @@
           </div>
         </el-tab-pane>
       </el-tabs>
-      <div class="btn_footer" v-if="!(activeName == 1 && !formShow)">
-        <el-button class="submit" @click="submitApp">提交申请</el-button>
+    </block-radius>
+    <block-radius v-if="!(activeName == 1 && !formShow)">
+      <div class="btn_footer fyzj_item">
+        <div class="fyzj">
+          <p class="fyzj_p">
+            <span v-if="getSumCoin > 20000" class="yebz">
+              余额不足，请联系超级管理员进行充值
+            </span>
+            费用总计：<span class="fyzj_span">
+              {{ getSumCoin }}
+            </span>
+            <span class="fyzj_qian">金币</span>
+          </p>
+          <p class="ckfymx">
+            <span @click="dialogFymx = true" class="ckfymx_a">
+              查看费用明细
+            </span>
+            <span class="ckfymx_qian">账户余额：20,000 金币</span>
+          </p>
+        </div>
+        <el-button
+          :class="getSumCoin <= 20000 ? 'submit' : 'nosubmit'"
+          :disabled="getSumCoin > 20000"
+          @click="submitApp"
+        >
+          提交申请
+        </el-button>
       </div>
     </block-radius>
-    <el-dialog title="申请信息确认" :visible.sync="dialogVisible" width="580px" class="cloud_dia">
+    <el-dialog
+      title="申请信息确认"
+      :visible.sync="dialogVisible"
+      width="580px"
+      class="cloud_dia"
+    >
       <el-row>
         <el-col :span="24">
           <span class="dia_item_title">申请组织：</span>
@@ -575,9 +685,7 @@
         <el-col :span="10">
           <span class="dia_item_title">申请类型：</span>
           <span class="dia_item_val">
-            {{
-            activeName == 0 ? "新资源申请" : "已有资源升级"
-            }}
+            {{ activeName == 0 ? "新资源申请" : "已有资源升级" }}
           </span>
         </el-col>
         <el-col :span="10" v-if="activeName == '1'">
@@ -588,7 +696,10 @@
           <span class="dia_item_title">上传申请文件：</span>
           <span class="dia_item_val">{{ diaForm.apply_file_name }}</span>
         </el-col>
-        <el-col :span="24" v-else-if="activeName == '1' && diaForm.apply_file_name">
+        <el-col
+          :span="24"
+          v-else-if="activeName == '1' && diaForm.apply_file_name"
+        >
           <span class="dia_item_title">上传申请文件：</span>
           <span class="dia_item_val">{{ diaForm.apply_file_name }}</span>
         </el-col>
@@ -607,9 +718,7 @@
               <div class="dia_block_item_in">
                 <span class="dia_block_item_title">描述信息：</span>
                 <span class="dia_block_item_val">
-                  {{
-                  diaForm.workplacedesc
-                  }}
+                  {{ diaForm.workplacedesc }}
                 </span>
               </div>
             </div>
@@ -625,17 +734,22 @@
               </div>
               <div class="dia_block_item_in">
                 <span class="dia_block_item_title">容器组：</span>
-                <span class="dia_block_item_val">{{ diaForm.containerGroup }}个</span>
+                <span class="dia_block_item_val"
+                  >{{ diaForm.containerGroup }}个</span
+                >
               </div>
               <div
                 class="dia_block_item_in"
-                v-if="diaForm.dataDisk && diaForm.perDataDisk && Number(diaForm.dataDisk) != 0 && Number(diaForm.perDataDisk) != 0"
+                v-if="
+                  diaForm.dataDisk &&
+                  diaForm.perDataDisk &&
+                  Number(diaForm.dataDisk) != 0 &&
+                  Number(diaForm.perDataDisk) != 0
+                "
               >
                 <span class="dia_block_item_title">数据盘：</span>
                 <span class="dia_block_item_val">
-                  {{ diaForm.dataDisk }}块，每块{{
-                  diaForm.perDataDisk
-                  }}GB
+                  {{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB
                 </span>
               </div>
               <!-- <div class="dia_block_item_in" v-if="diaForm.dataDisk != 0">
@@ -648,15 +762,23 @@
               <div class="dia_block_item_in">
                 <span class="dia_block_item_title">CPU：</span>
                 <p class="dia_block_item_val">
-                  <span class="val_has_2">最高&nbsp;{{ diaForm.perCPUs }}核</span>
-                  <span class="val_has_2">默认&nbsp;{{ diaForm.perCPU }}核</span>
+                  <span class="val_has_2"
+                    >最高&nbsp;{{ diaForm.perCPUs }}核</span
+                  >
+                  <span class="val_has_2"
+                    >默认&nbsp;{{ diaForm.perCPU }}核</span
+                  >
                 </p>
               </div>
               <div class="dia_block_item_in">
                 <span class="dia_block_item_title">内存：</span>
                 <p class="dia_block_item_val">
-                  <span class="val_has_2">最高&nbsp;{{ diaForm.perRAMs }}GB</span>
-                  <span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}GB</span>
+                  <span class="val_has_2"
+                    >最高&nbsp;{{ diaForm.perRAMs }}GB</span
+                  >
+                  <span class="val_has_2"
+                    >默认&nbsp;{{ diaForm.perRAM }}GB</span
+                  >
                 </p>
               </div>
             </div>
@@ -682,11 +804,15 @@
                 </div>
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">内存：</span>
-                  <span class="dia_block_item_val">{{ paramsOld.memory }}GB</span>
+                  <span class="dia_block_item_val"
+                    >{{ paramsOld.memory }}GB</span
+                  >
                 </div>
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">容器组：</span>
-                  <span class="dia_block_item_val">{{ paramsOld.containers }}个</span>
+                  <span class="dia_block_item_val"
+                    >{{ paramsOld.containers }}个</span
+                  >
                 </div>
               </div>
               <span class="dia_item_all_title">单个容器组规格：</span>
@@ -694,15 +820,23 @@
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">CPU：</span>
                   <p class="dia_block_item_val">
-                    <span class="val_has_2">最高&nbsp;{{ paramsOld.one_cpu_max }}核</span>
-                    <span class="val_has_2">默认&nbsp;{{ paramsOld.one_cpu_min }}核</span>
+                    <span class="val_has_2"
+                      >最高&nbsp;{{ paramsOld.one_cpu_max }}核</span
+                    >
+                    <span class="val_has_2"
+                      >默认&nbsp;{{ paramsOld.one_cpu_min }}核</span
+                    >
                   </p>
                 </div>
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">内存：</span>
                   <p class="dia_block_item_val">
-                    <span class="val_has_2">最高&nbsp;{{ paramsOld.one_memory_max }}GB</span>
-                    <span class="val_has_2">默认&nbsp;{{ paramsOld.one_memory_min }}GB</span>
+                    <span class="val_has_2"
+                      >最高&nbsp;{{ paramsOld.one_memory_max }}GB</span
+                    >
+                    <span class="val_has_2"
+                      >默认&nbsp;{{ paramsOld.one_memory_min }}GB</span
+                    >
                   </p>
                 </div>
               </div>
@@ -711,9 +845,7 @@
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">到期时间：</span>
                   <span class="dia_block_item_val">
-                    {{
-                    helper.dateStringTransform(paramsOld.cloud_end_time)
-                    }}
+                    {{ helper.dateStringTransform(paramsOld.cloud_end_time) }}
                   </span>
                 </div>
               </div>
@@ -732,28 +864,36 @@
                 </div>
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">容器组：</span>
-                  <span class="dia_block_item_val">{{ diaForm.containerGroup }}个</span>
+                  <span class="dia_block_item_val"
+                    >{{ diaForm.containerGroup }}个</span
+                  >
                 </div>
                 <div
                   class="dia_block_item_in"
-                  v-if="diaForm.dataDisk && diaForm.perDataDisk && Number(diaForm.dataDisk) != 0 && Number(diaForm.perDataDisk) != 0"
+                  v-if="
+                    diaForm.dataDisk &&
+                    diaForm.perDataDisk &&
+                    Number(diaForm.dataDisk) != 0 &&
+                    Number(diaForm.perDataDisk) != 0
+                  "
                 >
                   <span class="dia_block_item_title">新增数据盘：</span>
                   <span class="dia_block_item_val">
-                    {{ diaForm.dataDisk }}块，每块{{
-                    diaForm.perDataDisk
-                    }}GB
+                    {{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB
                   </span>
                 </div>
-                <div class="dia_block_item_in" v-if="delDataDiskList.length != 0">
+                <div
+                  class="dia_block_item_in"
+                  v-if="delDataDiskList.length != 0"
+                >
                   <span class="dia_block_item_title">删除数据盘：</span>
                   <span class="dia_block_item_val">
                     {{
-                    delDataDiskList
-                    .map((item) => {
-                    return item.name;
-                    })
-                    .join("、")
+                      delDataDiskList
+                        .map((item) => {
+                          return item.name;
+                        })
+                        .join("、")
                     }}
                   </span>
                 </div>
@@ -763,15 +903,21 @@
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">CPU：</span>
                   <p class="dia_block_item_val">
-                    <span class="val_has_2">最高&nbsp;{{ diaForm.perCPUs }}核</span>
-                    <span class="val_has_2">默认&nbsp;{{ diaForm.perCPU }}核</span>
+                    <span class="val_has_2">
+                      最高&nbsp;{{ diaForm.perCPUs }}核
+                    </span>
+                    <span class="val_has_2">
+                      默认&nbsp;{{ diaForm.perCPU }}核
+                    </span>
                   </p>
                 </div>
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">内存：</span>
                   <p class="dia_block_item_val">
-                    <span class="val_has_2">最高&nbsp;{{ diaForm.perRAMs }}GB</span>
-                    <span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}GB</span>
+                    <span class="val_has_2">om=[] </span>
+                    <span class="val_has_2">
+                      默认&nbsp;{{ diaForm.perRAM }}GB
+                    </span>
                   </p>
                 </div>
               </div>
@@ -781,9 +927,9 @@
                   <span class="dia_block_item_title">是否续期：</span>
                   <span class="dia_block_item_val">
                     {{
-                    diaForm.appDuration && diaForm.appDuration != 0
-                    ? "是"
-                    : "否"
+                      diaForm.appDuration && diaForm.appDuration != 0
+                        ? "是"
+                        : "否"
                     }}
                   </span>
                 </div>
@@ -793,8 +939,8 @@
                 >
                   <span class="dia_block_item_title">续期时长：</span>
                   <span class="dia_block_item_val">
-                    {{ diaForm.appDuration
-                    }}{{ diaForm.durType == 1 ? "个月" : "年" }}
+                    {{ diaForm.appDuration }}
+                    {{ diaForm.durType == 1 ? "个月" : "年" }}
                   </span>
                 </div>
               </div>
@@ -802,12 +948,79 @@
           </div>
         </el-col>
       </el-row>
+      <div class="fyzj_dia">
+        <div class="fyzj_dia_init">
+          <p v-if="activeName == '1'" class="fyzj_2">
+            升级费用：<span class="fyzj_2_num">2000000000 金币</span>
+          </p>
+          <p v-if="activeName == '1'" class="fyzj_2">
+            原规格抵扣费用：<span class="fyzj_2_num">2000 金币</span>
+          </p>
+          <div class="fyzj_1">
+            费用总计：
+            <p>
+              <span class="fyzj_1_num"> 2 </span
+              ><span class="fyzj_1_jb">金币</span>
+            </p>
+          </div>
+          <p class="fyzj_2">
+            账户余额：<span class="fyzj_2_num">2000 金币</span>
+          </p>
+        </div>
+        <div class="clear_xxx"></div>
+      </div>
       <div class="btn_footer">
         <el-button class="cancel" @click="cancel">取消</el-button>
-        <el-button class="submit" @click="determineSubmit">确定提交</el-button>
+        <el-button class="submit1" @click="determineSubmit">确定提交</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      title="费用明细"
+      :visible.sync="dialogFymx"
+      width="580px"
+      class="cloud_dia"
+    >
+      <div class="fymx_ts">
+        <i class="el-icon-warning-outline"></i>
+        <p>
+          计费说明：云资源服务依据用户选取的CPU、内存、数据盘个数及大小进行分级计费，具体计费规
+          则请线下联系技术支持人员咨询。
+        </p>
+      </div>
+      <div v-if="activeName == '1'" class="sjfy_title">升级费用</div>
+      <table-um
+        ref="apply_service_state_table"
+        :headers="jifeiHeader"
+        :stripe="true"
+        :datas="jifeiList1"
+        :maxheight="260"
+      ></table-um>
+      <div v-if="activeName == '1'" class="sjfy_title">
+        原规格抵扣费用
+        <el-tooltip
+          class="tool_item"
+          effect="dark"
+          content="未用完的按剩余时间及原购买规格价格核算后优先抵扣本订单金额，超出部分退还至用户账户"
+          placement="top"
+          offset="5"
+        >
+          <img class="tool_img" src="@/assets/imgs/tool_ic_tips.png" />
+        </el-tooltip>
       </div>
+      <table-um
+        v-if="activeName == '1'"
+        ref="apply_service_state_table"
+        :headers="jifeiHeader2"
+        :stripe="true"
+        :datas="jifeiList2"
+        :maxheight="260"
+      ></table-um>
     </el-dialog>
-    <ApassDialog ref="dialog" msg="确认删除该数据盘吗？" :submit="dialogSubmit"></ApassDialog>
+    <ApassDialog
+      ref="dialog"
+      msg="确认删除该数据盘吗？"
+      :submit="dialogSubmit"
+    ></ApassDialog>
   </div>
 </template>
 
@@ -830,6 +1043,106 @@ export default {
   props: {
     name: { type: String, default: "" },
   },
+  computed: {
+    getSumCoin() {
+      let sumCM = 0;
+      let sumDisk = 0;
+      if (this.activeName == "0") {
+        if (this.formNew.cpu == "8") {
+          if (this.formNew.memory == "16") {
+            sumCM += 10880;
+          } else if (this.formNew.memory == "32") {
+            sumCM += 16310;
+          }
+        } else if (this.formNew.cpu == "16") {
+          if (this.formNew.memory == "32") {
+            sumCM += 21750;
+          } else if (this.formNew.memory == "64") {
+            sumCM += 32610;
+          }
+        }
+        if (
+          this.formNew.dataDisk >= 1 &&
+          this.formNew.perDataDisk >= 1 &&
+          this.formNew.appDuration >= 1
+        ) {
+          sumDisk +=
+            this.formNew.dataDisk *
+            this.formNew.perDataDisk *
+            this.formNew.appDuration *
+            4.2;
+          this.jifeiList1[2] = {
+            name: "数据盘",
+            num: `${this.formNew.dataDisk}个数据盘，每个数据盘${this.formNew.perDataDisk}GB`,
+            time: `${this.formNew.appDuration}个月`,
+            sum: `${sumDisk}金币`,
+          };
+        } else {
+          this.jifeiList1.splice(2);
+        }
+        this.jifeiList1[0].num = `${
+          this.formNew.cpu >= 1 ? this.formNew.cpu : 0
+        }核+${this.formNew.memory >= 1 ? this.formNew.memory : 0}G`;
+        this.jifeiList1[0].time = `${
+          this.formNew.appDuration >= 1 ? this.formNew.appDuration : 0
+        }个月`;
+        this.jifeiList1[0].sum = `${sumCM}金币`;
+        this.jifeiList1[1].num = `${
+          this.formNew.containerGroup >= 1 ? this.formNew.containerGroup : 0
+        }个`;
+        this.jifeiList1[1].time = `${
+          this.formNew.appDuration >= 1 ? this.formNew.appDuration : 0
+        }个月`;
+      } else if (this.activeName == "1") {
+        if (this.formOld.cpu == "8") {
+          if (this.formOld.memory == "16") {
+            sumCM += 10880;
+          } else if (this.formOld.memory == "32") {
+            sumCM += 16310;
+          }
+        } else if (this.formOld.cpu == "16") {
+          if (this.formOld.memory == "32") {
+            sumCM += 21750;
+          } else if (this.formOld.memory == "64") {
+            sumCM += 32610;
+          }
+        }
+        if (
+          this.formOld.dataDisk >= 1 &&
+          this.formOld.perDataDisk >= 1 &&
+          this.formOld.appDuration >= 1
+        ) {
+          sumDisk +=
+            this.formOld.dataDisk *
+            this.formOld.perDataDisk *
+            this.formOld.appDuration *
+            4.2;
+          this.jifeiList1[2] = {
+            name: "数据盘",
+            num: `${this.formOld.dataDisk}个数据盘，每个数据盘${this.formOld.perDataDisk}GB`,
+            time: `${this.formOld.appDuration}个月`,
+            sum: `${sumDisk}金币`,
+          };
+        } else {
+          this.jifeiList1.splice(2);
+        }
+        this.jifeiList1[0].num = `${
+          this.formOld.cpu >= 1 ? this.formOld.cpu : 0
+        }核+${this.formOld.memory >= 1 ? this.formOld.memory : 0}G`;
+        this.jifeiList1[0].time = `${
+          this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0
+        }个月`;
+        this.jifeiList1[0].sum = `${sumCM}金币`;
+        this.jifeiList1[1].num = `${
+          this.formOld.containerGroup >= 1 ? this.formOld.containerGroup : 0
+        }个`;
+        this.jifeiList1[1].time = `${
+          this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0
+        }个月`;
+      }
+      return sumCM + sumDisk;
+    },
+  },
   data() {
     var checkName = (rule, value, callback) => {
       let self = this;
@@ -910,9 +1223,11 @@ export default {
           { required: true, message: "请输入描述信息", trigger: "blur" },
           { max: 100, message: "长度应小于100个字符", trigger: "blur" },
         ],
-        cpu: [{ required: true, message: "请选择CPU使用量", trigger: "blur" }],
+        cpu: [
+          { required: true, message: "请选择CPU使用量", trigger: "change" },
+        ],
         memory: [
-          { required: true, message: "请选择内存使用量", trigger: "blur" },
+          { required: true, message: "请选择内存使用量", trigger: "change" },
         ],
         containerGroup: [
           { required: true, message: "请输入容器组规格", trigger: "blur" },
@@ -998,9 +1313,11 @@ export default {
         workplacedesc: [
           { required: true, message: "请输入描述信息", trigger: "blur" },
         ],
-        cpu: [{ required: true, message: "请选择CPU使用量", trigger: "blur" }],
+        cpu: [
+          { required: true, message: "请选择CPU使用量", trigger: "change" },
+        ],
         memory: [
-          { required: true, message: "请选择内存使用量", trigger: "blur" },
+          { required: true, message: "请选择内存使用量", trigger: "change" },
         ],
         containerGroup: [
           { required: true, message: "请输入容器组规格", trigger: "blur" },
@@ -1051,6 +1368,70 @@ export default {
       dataDiskList: [],
       delDataDiskList: [],
       del_item: {},
+      dialogFymx: false,
+      jifeiHeader: [
+        {
+          label: "名称",
+          prop: "name",
+          align: "center",
+        },
+        {
+          label: "数量规格",
+          prop: "num",
+          align: "center",
+        },
+        {
+          label: "购买时长",
+          prop: "time",
+          align: "center",
+        },
+        {
+          label: "小计",
+          prop: "sum",
+          align: "center",
+        },
+      ],
+      jifeiHeader2: [
+        {
+          label: "名称",
+          prop: "name",
+          align: "center",
+        },
+        {
+          label: "数量规格",
+          prop: "num",
+          align: "center",
+        },
+        {
+          label: "购买时长",
+          prop: "time",
+          align: "center",
+        },
+        {
+          label: "小计",
+          prop: "sum",
+          align: "center",
+          type: "html",
+          getHtml: (str) => {
+            return `<span style="color: #e15260">-${str.sum}</span>`;
+          },
+        },
+      ],
+      jifeiList1: [
+        { name: "CPU+内存", num: "0核+0G", time: "0个月", sum: "0金币" },
+        { name: "容器组", num: "0个", time: "0个月", sum: "-" },
+        // { name: "数据盘", num: "0个数据盘，每个数据盘0GB", time: "0个月", sum: "2000金币" },
+      ],
+      jifeiList2: [
+        { name: "CPU+内存", num: "0核+0G", time: "0个月", sum: "0金币" },
+        { name: "容器组", num: "0个", time: "0个月", sum: "-" },
+        {
+          name: "数据盘",
+          num: "0个数据盘，每个数据盘0GB",
+          time: "0个月",
+          sum: "2000金币",
+        },
+      ],
     };
   },
   mounted() {
@@ -1141,6 +1522,26 @@ export default {
         this.form.link_man = paramsOld.apply_connect_username;
         this.form.phone = paramsOld.apply_connect_mobile;
         this.formShow = true;
+        this.jifeiList2 = [
+          {
+            name: "CPU+内存",
+            num: `${this.formOld.cpu}核+${this.formOld.memory}G"`,
+            time: "0个月",
+            sum: "0金币",
+          },
+          {
+            name: "容器组",
+            num: `${this.formOld.containerGroup}个`,
+            time: "0个月",
+            sum: "",
+          },
+          {
+            name: "数据盘",
+            num: `${this.dataDiskList.length}个数据盘，共计${this.dataDiskList.length}GB"`,
+            time: "0个月",
+            sum: "2000金币",
+          },
+        ];
       } else {
         this.formShow = false;
       }
@@ -1327,21 +1728,20 @@ export default {
       }
     },
     changeCPU(val) {
-      console.log(val);
       this.formOld.memory = "";
       this.formNew.memory = "";
       if (val == "8") {
         this.optionsRAM = [
-        { value: "16", label: "16" },
-        { value: "32", label: "32" },
-      ]
+          { value: "16", label: "16" },
+          { value: "32", label: "32" },
+        ];
       } else if (val == "16") {
         this.optionsRAM = [
-        { value: "32", label: "32" },
-        { value: "64", label: "64" },
-      ]
+          { value: "32", label: "32" },
+          { value: "64", label: "64" },
+        ];
       }
-    }
+    },
   },
 };
 </script>
@@ -1501,9 +1901,19 @@ export default {
 .btn_footer {
   display: flex;
   justify-content: flex-end;
-  margin: 40px 20px 10px;
+  margin: 0 20px;
 }
 .btn_footer .submit {
+  width: 220px;
+  background-color: #e56600;
+  color: #f8f9fd;
+}
+.btn_footer .nosubmit {
+  width: 220px;
+  background-color: #a9aec0;
+  color: #ffffff;
+}
+.btn_footer .submit1 {
   width: 100px;
   background-color: #0f2683;
   color: #f8f9fd;
@@ -1567,6 +1977,135 @@ export default {
 .up_f {
   width: calc(50% - 10px);
 }
+.fyzj_item {
+  position: relative;
+}
+.fyzj {
+  color: #242c43;
+  font-size: 18px;
+  margin-right: 10px;
+  text-align: right;
+  position: absolute;
+  top: -10px;
+  right: 230px;
+}
+.fyzj_p {
+  margin-bottom: 6px;
+}
+.fyzj_span {
+  color: #e56600;
+  font-size: 24px;
+  font-weight: bold;
+}
+.fyzj_qian {
+  color: #e56600;
+  font-size: 14px;
+}
+.ckfymx {
+  color: #a9aec0;
+  font-size: 14px;
+}
+.ckfymx_a {
+  color: #515fe7;
+  cursor: pointer;
+}
+.ckfymx_qian {
+  display: inline-block;
+  margin-left: 20px;
+  position: relative;
+}
+.ckfymx_qian::after {
+  content: "";
+  position: absolute;
+  width: 1px;
+  height: 16px;
+  background: #bcc1d0;
+  left: -10px;
+  top: 2px;
+}
+.yebz {
+  color: #e15260;
+  font-size: 18px;
+  margin-right: 20px;
+}
+.fymx_ts {
+  background-color: #f4f7fc;
+  border-radius: 8px;
+  padding: 12px;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+}
+.fymx_ts i {
+  position: relative;
+  top: 4px;
+  color: #8890a7;
+}
+.fymx_ts p {
+  width: calc(100% - 22px);
+  color: #58617a;
+}
+.sjfy_title {
+  margin: 10px 20px;
+  position: relative;
+  color: #242c43;
+  font-size: 16px;
+}
+.sjfy_title::after {
+  content: "";
+  position: absolute;
+  width: 8px;
+  height: 8px;
+  background-color: #515fe7;
+  border-radius: 50%;
+  left: -15px;
+  top: 8px;
+}
+.tool_img {
+  width: 16px;
+  height: 16px;
+  position: relative;
+  top: 2px;
+  left: 2px;
+}
+.fyzj_dia {
+  height: 100%;
+}
+.fyzj_dia_init {
+  float: right;
+  text-align: right;
+  padding: 10px;
+}
+.fyzj_1 {
+  color: #242c43;
+  font-size: 18px;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+}
+.fyzj_1_num {
+  color: #e56600;
+  font-size: 24px;
+  font-weight: bold;
+}
+.fyzj_1_jb {
+  color: #e56600;
+  font-size: 14px;
+}
+.fyzj_2 {
+  min-width: 140px;
+  color: #8890a7;
+  font-size: 14px;
+  margin: 10px 0;
+  display: flex;
+  justify-content: space-between;
+}
+.fyzj_2_num {
+  color: #58617a;
+}
+.clear_xxx {
+  clear: both;
+}
 </style>
 <style>
 .form_block .el-input .el-input__inner {
diff --git a/src/components/shopping-cart/shopping-cart-com.vue b/src/components/shopping-cart/shopping-cart-com.vue
index 14f4e3065996877988c30f3e81d303bf6cdc6dc5..7cd4832da2f216438bfe467718cba73de53d4db6 100644
--- a/src/components/shopping-cart/shopping-cart-com.vue
+++ b/src/components/shopping-cart/shopping-cart-com.vue
@@ -4,7 +4,9 @@
       <div class="shopping_all_head">
         <el-row>
           <el-col :span="2" class="shopping_all_head_item">
-            <el-checkbox v-model="checkShopAll" @change="checkAll">全选</el-checkbox>
+            <el-checkbox v-model="checkShopAll" @change="checkAll"
+              >全选</el-checkbox
+            >
           </el-col>
           <el-col :span="9" class="shopping_all_head_item">服务信息</el-col>
           <el-col :span="5" class="shopping_all_head_item">规格</el-col>
@@ -40,31 +42,38 @@
       <div class="shopping_cart_options">
         <el-row>
           <el-col :span="2" class="shopping_cart_options_cell">
-            <el-checkbox v-model="checkShopAll" @change="checkAll">全选</el-checkbox>
+            <el-checkbox v-model="checkShopAll" @change="checkAll"
+              >全选</el-checkbox
+            >
           </el-col>
           <el-col :span="3" class="shopping_cart_options_del">
-            <span v-if="getNum == 0" class="shopping_cart_options_del_service">删除选中服务</span>
+            <span v-if="getNum == 0" class="shopping_cart_options_del_service"
+              >删除选中服务</span
+            >
             <span
               v-else
               @click="delSelectService"
               class="shopping_cart_options_del_service_act"
-            >删除选中服务</span>
+              >删除选中服务</span
+            >
           </el-col>
           <el-col :span="15" class="shopping_cart_options_num">
-            共 {{ list.length }} 项服务，已选择
-            <span>{{ getNum }}</span> 项
+            共 {{ list.length }} 项服务，已选择 <span>{{ getNum }}</span> 项，共
+            <span>{{ getSumCoin }}</span> 金币
           </el-col>
           <el-col :span="4" class="shopping_cart_options_cell">
             <el-button
               v-if="getNum == 0"
               :disabled="true"
               class="shopping_cart_options_cell_btn"
-            >一键申请</el-button>
+              >一键申请</el-button
+            >
             <el-button
               v-else
               @click="oneClickApplication"
               class="shopping_cart_options_cell_btn_act"
-            >一键申请</el-button>
+              >一键申请</el-button
+            >
           </el-col>
         </el-row>
       </div>
@@ -97,6 +106,15 @@ export default {
       );
       return num;
     },
+    getSumCoin() {
+      let sum = 0;
+      this.checkList.forEach((item, index) => {
+        if (item) {
+          sum += 10;
+        }
+      });
+      return sum;
+    },
     getCartState() {
       return this.$store.state.cartState;
     },
@@ -129,7 +147,6 @@ export default {
       this.$refs.shoppingList.setAllState(val);
     },
     changeState(val) {
-      console.log(val);
       this.$set(this.checkList, val.index, val.state);
       if (this.checkList.indexOf(false) == -1) {
         this.checkShopAll = true;
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index 6e9c8f922f2568b0ce61798c0c7f2cb0dfa863a1..6acf71f22a541c00dd88ac7bbe641404f446187b 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -51,6 +51,7 @@
         :data="selectedTabsPage"
         :size="size"
         :height="height"
+        :max-height="maxheight"
         :border="border"
         @select="select"
         @select-all="selectAll"
@@ -200,6 +201,13 @@
               <img src="@/assets/imgs/list_ic_hot.png" alt v-if="scope.row['hot']" />
               {{ scope.row[item.prop] }}
             </span>
+            <span
+              v-else-if="item.type === 'html'"
+              class="table_html"
+              v-html="
+                item.getHtml ? item.getHtml(scope.row) : scope.row[item.prop]
+              "
+            ></span>
             <!-- others -->
             <span v-else-if="item.type === 'click'" style="cursor: pointer;color: #274fee;" @click="gotopage(item.url,scope.row[item.id])">{{ scope.row[item.prop] }}</span>
             <span v-else>{{ scope.row[item.prop] }}</span>
@@ -380,6 +388,10 @@ export default {
     params: {
       type: Object,
       default: () => {}
+    },
+    maxheight: {
+      type: [String, Number],
+      default: ""
     }
   },
   data() {
diff --git a/src/pages/service_shop/gzfwDetail.vue b/src/pages/service_shop/gzfwDetail.vue
index 56ac7324e91c3bf9f86d6a13da688341bc33d682..3039b841d0aa6e3b1f7e36650a8d274ed941d461 100644
--- a/src/pages/service_shop/gzfwDetail.vue
+++ b/src/pages/service_shop/gzfwDetail.vue
@@ -88,6 +88,7 @@ export default {
             ],
             descript: datas.descript,
             serviceRequestSpcs: specificationData,
+            scoreDetail: datas.scoreDetail,
           };
 
           this.detailData = [
diff --git a/src/pages/service_shop/sjfwDetail.vue b/src/pages/service_shop/sjfwDetail.vue
index 56ac7324e91c3bf9f86d6a13da688341bc33d682..3039b841d0aa6e3b1f7e36650a8d274ed941d461 100644
--- a/src/pages/service_shop/sjfwDetail.vue
+++ b/src/pages/service_shop/sjfwDetail.vue
@@ -88,6 +88,7 @@ export default {
             ],
             descript: datas.descript,
             serviceRequestSpcs: specificationData,
+            scoreDetail: datas.scoreDetail,
           };
 
           this.detailData = [
diff --git a/src/pages/service_shop/skfwDetail.vue b/src/pages/service_shop/skfwDetail.vue
index 6eb82c7e339bf4f53753dbb99b8c3fb6a7f6f24e..b53901c68c7373161712d5cc34006861fad7763c 100644
--- a/src/pages/service_shop/skfwDetail.vue
+++ b/src/pages/service_shop/skfwDetail.vue
@@ -94,6 +94,7 @@ export default {
             ],
             descript: datas.descript,
             serviceRequestSpcs: specificationData,
+            scoreDetail: datas.scoreDetail,
           };
 
           this.detailData = [
diff --git a/src/pages/service_shop/zhfwDetail.vue b/src/pages/service_shop/zhfwDetail.vue
index 53a92611da613f1591546c27cda46b14de5b5bc6..1e7075ab8c6e52450d7d46e1350d93d7d1f9844d 100644
--- a/src/pages/service_shop/zhfwDetail.vue
+++ b/src/pages/service_shop/zhfwDetail.vue
@@ -89,6 +89,7 @@ export default {
             ],
             descript: datas.descript,
             serviceRequestSpcs: specificationData,
+            scoreDetail: datas.scoreDetail,
           };
           this.detailData = [
             {
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue
index 89930cf292a6f966396f97fdbb54840abff05ce3..fbacf654d4a96f536523622a626e4895c8156425 100644
--- a/src/pages/user/order/order_detail.vue
+++ b/src/pages/user/order/order_detail.vue
@@ -269,23 +269,30 @@
             <div v-if="orderDetail.order_type == 1">
               <div>
                 <span class="detail_service_specification_gg">
-                  {{ orderDetail.spec_app == 0 ? "计次收费：" : "时长收费：" }}
+                  {{ orderDetail.spec_type == 0 ? "计次收费：" : "时长收费：" }}
+                </span>
+                <span class="detail_service_specification_val">
+                  {{ orderDetail.single_money }}金币/
+                  {{
+                    orderDetail.spec_type == 1
+                      ? orderDetail.spec_count + "次"
+                      : "月"
+                  }}
                 </span>
-                <span class="detail_service_specification_val"
-                  >2000金币/月</span
-                >
               </div>
             </div>
             <div v-else-if="orderDetail.order_type == 2">
               <div>
-                <span class="detail_service_specification_gg">{{
-                  orderDetail.spec_app == 0
-                    ? "申请获取应用镜像部署权限："
-                    : "申请获取应用镜像开发权限："
-                }}</span>
-                <span class="detail_service_specification_val"
-                  >2000金币/月</span
-                >
+                <span class="detail_service_specification_gg">
+                  {{
+                    orderDetail.spec_app == 0
+                      ? "申请获取应用镜像部署权限："
+                      : "申请获取应用镜像开发权限："
+                  }}
+                </span>
+                <span class="detail_service_specification_val">
+                  {{ orderDetail.single_money }}金币/月
+                </span>
               </div>
             </div>
             <div v-else-if="orderDetail.order_type == 3">
@@ -314,20 +321,31 @@
             <div>
               <span class="detail_service_money_title">总价：</span>
               <span class="detail_service_specification_val"
-                >12793017230金币</span
+                >{{ orderDetail.total_money }}金币</span
+              >
+              <span
+                v-if="
+                  orderDetail.apply_type == 1 &&
+                  orderDetail.amounts_payable - orderDetail.total_money > 0
+                "
+                class="adhekadwn"
               >
-              <span v-if="1" class="adhekadwn">（升级费用：3000金币，原规格抵扣：1000金币）</span>
+                （升级费用：
+                {{ orderDetail.amounts_payable }}金币，原规格抵扣：
+                {{ orderDetail.amounts_payable - orderDetail.total_money }}
+                金币）
+              </span>
             </div>
           </el-col>
         </el-row>
       </div>
       <div v-if="orderDetail.order_type == 2">
         <div class="detail_s_title">业务领域：</div>
-        <div class="detail_app_scence">{{ orderDetail.app_desc }}</div>
+        <div class="detail_app_scence">{{ orderDetail.business_area }}</div>
       </div>
       <div v-if="orderDetail.order_type == 2">
         <div class="detail_s_title">上线时间：</div>
-        <div class="detail_app_scence">{{ orderDetail.app_func }}</div>
+        <div class="detail_app_scence">{{ helper.dateStringTransform(orderDetail.app_create_date) }}</div>
       </div>
       <div v-if="orderDetail.order_type == 2">
         <div class="detail_s_title">应用简介：</div>
diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue
index 8069516ec2dc2d13da63e95ea3cd8dd3b59f61e3..ff3e635c4f42f6d9fa686e9f819afce55dd7eb8d 100644
--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -1146,8 +1146,12 @@ export default {
             let request = this.$refs.fwcs_zhfw_www.getTableData().concat();
             let arr = [];
             request.pop();
-            request.forEach(item => {
-              arr.push({key: item.requestEncoding, val: item.requestValue, field_type: "text"})
+            request.forEach((item) => {
+              arr.push({
+                key: item.requestEncoding,
+                val: item.requestValue,
+                field_type: "text",
+              });
             });
             bodys = JSON.stringify(arr);
           }
@@ -1393,127 +1397,135 @@ export default {
       }
     },
     registePt() {
-      console.log(this.jkwds);
-      // this.$refs.form.validate((valid) => {
-      //   if (valid) {
-      //     if (this.cover.length != 0) {
-      //       let contentType = "";
-      //       if (this.activeBtn == 1 && !this.is_portal) {
-      //         this.addPortalItem();
-      //       } else {
-      //         if (this.activeBtn == 0 || this.activeBtn == 3) {
-      //           contentType = this.sjfwQqt;
-      //         } else if (this.activeBtn == 4) {
-      //           if (this.activeZh == 1) {
-      //             contentType = this.zhfwQqt;
-      //           }
-      //         }
-      //         let query = {
-      //           name: this.form.name,
-      //           sectors: this.form.area,
-      //           organization: this.form.origin,
-      //           cover: this.cover[0],
-      //           openness: this.form.resource,
-      //           descript: this.form.desc,
-      //           data_service_type1: this.btnList[this.activeBtn].id,
-      //           data_service_type2:
-      //             this.activeBtn == 0
-      //               ? 12
-      //               : this.activeBtn == 1
-      //               ? this.skfwQqt
-      //               : this.activeBtn == 4
-      //               ? this.zhyyVal
-      //               : 0,
-      //           portal_id: this.portal_id,
-      //           encode_method: this.form.code,
-      //           doc_file: this.jkwds.length != 0 ? this.jkwds[0] : "",
-      //           urls: [
-      //             {
-      //               name: "",
-      //               response_type:
-      //                 this.activeBtn == 3 ? this.gz_fhsjgs : "JSON",
-      //               req_auth_mthod: 0,
-      //               req_auth_token: this.tokenVal,
-      //               method: this.select,
-      //               url: this.serviceUrl,
-      //               request_fields:
-      //                 this.dataType == "body"
-      //                   ? this.request_fields
-      //                   : this.body_fields,
-      //               request_query_fields:
-      //                 this.dataType == "param"
-      //                   ? this.request_fields
-      //                   : this.param_fields,
-      //               response_fields: this.response_fields,
-      //               content_type: contentType,
-      //             },
-      //           ],
-      //         };
-      //         this.$api.workbench.serviceAdd(query).then((response) => {
-      //           if (response.data.success == 1) {
-      //             this.$message.success("服务注册成功");
-      //             this.$router.push("/fwgl/" + this.$store.getters.level);
-      //           } else {
-      //             console.log(response.data.errMsg);
-      //             this.$message.error(response.data.errMsg);
-      //           }
-      //         });
-      //       }
-      //     } else {
-      //       this.$message.error("请上传服务封面");
-      //     }
-      //   } else {
-      //     this.$message.error("请完善服务基本信息");
-      //   }
-      // });
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.activeBtn == 3 && this.jkwds.length == 0) {
+            this.$message.error("请上传接口文档");
+          } else {
+            if (this.cover.length != 0) {
+              let contentType = "";
+              if (this.activeBtn == 1 && !this.is_portal) {
+                this.addPortalItem();
+              } else {
+                if (this.activeBtn == 0 || this.activeBtn == 3) {
+                  contentType = this.sjfwQqt;
+                } else if (this.activeBtn == 4) {
+                  if (this.activeZh == 1) {
+                    contentType = this.zhfwQqt;
+                  }
+                }
+                let query = {
+                  name: this.form.name,
+                  sectors: this.form.area,
+                  organization: this.form.origin,
+                  cover: this.cover[0],
+                  openness: this.form.resource,
+                  descript: this.form.desc,
+                  data_service_type1: this.btnList[this.activeBtn].id,
+                  data_service_type2:
+                    this.activeBtn == 0
+                      ? 12
+                      : this.activeBtn == 1
+                      ? this.skfwQqt
+                      : this.activeBtn == 4
+                      ? this.zhyyVal
+                      : 0,
+                  portal_id: this.portal_id,
+                  encode_method: this.form.code,
+                  doc_file: this.jkwds.length != 0 ? this.jkwds[0] : "",
+                  urls: [
+                    {
+                      name: "",
+                      response_type:
+                        this.activeBtn == 3 ? this.gz_fhsjgs : "JSON",
+                      req_auth_mthod: 0,
+                      req_auth_token: this.tokenVal,
+                      method: this.select,
+                      url: this.serviceUrl,
+                      request_fields:
+                        this.dataType == "body"
+                          ? this.request_fields
+                          : this.body_fields,
+                      request_query_fields:
+                        this.dataType == "param"
+                          ? this.request_fields
+                          : this.param_fields,
+                      response_fields: this.response_fields,
+                      content_type: contentType,
+                    },
+                  ],
+                };
+                this.$api.workbench.serviceAdd(query).then((response) => {
+                  if (response.data.success == 1) {
+                    this.$message.success("服务注册成功");
+                    this.$router.push("/fwgl/" + this.$store.getters.level);
+                  } else {
+                    console.log(response.data.errMsg);
+                    this.$message.error(response.data.errMsg);
+                  }
+                });
+              }
+            } else {
+              this.$message.error("请上传服务封面");
+            }
+          }
+        } else {
+          this.$message.error("请完善服务基本信息");
+        }
+      });
     },
     registeOne() {
       this.$refs.form.validate((valid) => {
         if (valid) {
           if (this.cover.length != 0) {
-            let urls = [];
-            this.liucheng_list.forEach((item) => {
-              urls.push({
-                name: item.one_input,
-                response_type: "JSON",
-                req_auth_mthod: 0,
-                req_auth_token: item.tokenVal,
-                method: item.select,
-                url: item.serviceUrl,
-                request_fields:
-                  item.dataType == "body"
-                    ? item.request_fields
-                    : item.body_fields,
-                request_query_fields:
-                  item.dataType == "param"
-                    ? item.request_fields
-                    : item.param_fields,
-                response_fields: item.response_fields,
-                content_type: "JSON",
+            if (this.jkwds.length == 0) {
+              this.$message.error("请上传接口文档");
+            } else {
+              let urls = [];
+              this.liucheng_list.forEach((item) => {
+                urls.push({
+                  name: item.one_input,
+                  response_type: "JSON",
+                  req_auth_mthod: 0,
+                  req_auth_token: item.tokenVal,
+                  method: item.select,
+                  url: item.serviceUrl,
+                  request_fields:
+                    item.dataType == "body"
+                      ? item.request_fields
+                      : item.body_fields,
+                  request_query_fields:
+                    item.dataType == "param"
+                      ? item.request_fields
+                      : item.param_fields,
+                  response_fields: item.response_fields,
+                  content_type: "JSON",
+                });
               });
-            });
-            let query = {
-              name: this.form.name,
-              sectors: this.form.area,
-              organization: this.form.origin,
-              cover: this.cover[0],
-              openness: this.form.resource,
-              descript: this.form.desc,
-              data_service_type1: this.btnList[this.activeBtn].id,
-              data_service_type2: 24,
-              portal_id: this.portal_id,
-              encode_method: this.form.code,
-              urls: urls,
-            };
-            this.$api.workbench.serviceAdd(query).then((response) => {
-              if (response.data.success == 1) {
-                this.$message.success("服务注册成功");
-                this.$router.push("/fwgl/" + this.$store.getters.level);
-              } else {
-                console.log(response.data.errMsg);
-                this.$message.error(response.data.errMsg);
-              }
-            });
+              let query = {
+                name: this.form.name,
+                sectors: this.form.area,
+                organization: this.form.origin,
+                cover: this.cover[0],
+                openness: this.form.resource,
+                descript: this.form.desc,
+                data_service_type1: this.btnList[this.activeBtn].id,
+                data_service_type2: 24,
+                portal_id: this.portal_id,
+                encode_method: this.form.code,
+                urls: urls,
+                doc_file: this.jkwds.length != 0 ? this.jkwds[0] : "",
+              };
+              this.$api.workbench.serviceAdd(query).then((response) => {
+                if (response.data.success == 1) {
+                  this.$message.success("服务注册成功");
+                  this.$router.push("/fwgl/" + this.$store.getters.level);
+                } else {
+                  console.log(response.data.errMsg);
+                  this.$message.error(response.data.errMsg);
+                }
+              });
+            }
           } else {
             this.$message.error("请上传服务封面");
           }