Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

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

@@ -230,7 +230,7 @@ export default {
       }
     },
     viewDetail(val) {
-      this.$router.push("/user/order_detail/" + val);
+      this.$router.push("/user/order_list/detail/" + val);
     },
     delOrder() {
       this.$api.user

src/components/shop-card.vue

@@ -4,17 +4,9 @@
       <img :src="data.cover" width="100%" />
     </div>
     <div class="shop_card-top">
-      <p
-        class="shop_card-title text_clip_2"
-        v-text="data.name"
-        :title="data.name"
-      ></p>
+      <p class="shop_card-title text_clip_2" v-text="data.name" :title="data.name"></p>
       <p class="shop_card-text under_text">
-        <span
-          class="text_clip"
-          v-text="data.department_name"
-          :title="data.department_name"
-        ></span>
+        <span class="text_clip" v-text="data.department_name" :title="data.department_name"></span>
         <span>
           <img :src="require('../assets/imgs/shop_ic_star.png')" />
           <span v-text="data.score"></span>
@@ -22,18 +14,12 @@
       </p>
     </div>
     <div class="shop_card-bottom">
-      <p class="shop_card-text summary text_clip_2" v-if="data.descript">
+      <p class="shop_card-text summary text_clip_2" v-if="showSummary && data.descript">
         <span v-text="data.descript"></span>
       </p>
       <p class="shop_card-text update_time">
-        <img
-          :src="require('@/assets/imgs/shop_ic_updatetime.png')"
-          style="margin-right: 5px;"
-        />
-        <span
-          class="text_clip"
-          v-text="'更新时间：' + helper.dateStringTransform(data.update_date)"
-        ></span>
+        <img :src="require('@/assets/imgs/shop_ic_updatetime.png')" style="margin-right: 5px;" />
+        <span class="text_clip" v-text="'更新时间：' + helper.dateStringTransform(data.update_date)"></span>
       </p>
       <div class="shop_card-text access">
         <span>
@@ -79,6 +65,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showSummary: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {

src/components/shop-cloud/shop-cloud.vue

@@ -476,7 +476,7 @@
                           :max="10"
                           placeholder="请设置内存最高使用量"
                         ></el-input-number>
-                        <div class="input_right">核</div>
+                        <div class="input_right">GB</div>
                       </el-form-item>
                     </el-col>
                     <el-col :span="11">
@@ -489,7 +489,7 @@
                           :max="10"
                           placeholder="请设置内存默认使用量"
                         ></el-input-number>
-                        <div class="input_right">核</div>
+                        <div class="input_right">GB</div>
                       </el-form-item>
                     </el-col>
                     <el-col :span="24">
@@ -659,8 +659,8 @@
               <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 }}G</span>
-                  <span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}G</span>
+                  <span class="val_has_2">最高&nbsp;{{ diaForm.perRAMs }}GB</span>
+                  <span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}GB</span>
                 </p>
               </div>
             </div>
@@ -686,7 +686,7 @@
                 </div>
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">内存：</span>
-                  <span class="dia_block_item_val">{{ paramsOld.memory }}核</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>
@@ -705,8 +705,8 @@
                 <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 }}核</span>
-                    <span class="val_has_2">默认&nbsp;{{ paramsOld.one_memory_min }}核</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>
@@ -732,7 +732,7 @@
                 </div>
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">内存：</span>
-                  <span class="dia_block_item_val">{{ diaForm.memory }}核</span>
+                  <span class="dia_block_item_val">{{ diaForm.memory }}GB</span>
                 </div>
                 <div class="dia_block_item_in">
                   <span class="dia_block_item_title">容器组：</span>
@@ -774,8 +774,8 @@
                 <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 }}核</span>
-                    <span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}核</span>
+                    <span class="val_has_2">最高&nbsp;{{ diaForm.perRAMs }}GB</span>
+                    <span class="val_has_2">默认&nbsp;{{ diaForm.perRAM }}GB</span>
                   </p>
                 </div>
               </div>

src/components/shop-list.vue

@@ -10,6 +10,7 @@
         <shop-card
           :data="item"
           :showImg="showImg"
+          :showSummary="showSummary"
           :detail-path="detailPath"
         ></shop-card>
       </li>
@@ -45,6 +46,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showSummary: {
+      type: Boolean,
+      default: false,
+    }
   },
   methods: {
     goto() {

src/pages/service_shop/services_shop.vue

@@ -32,6 +32,7 @@
       detail-path="/shop/sjfwDetail/"
       :data="hot_datas"
       :showImg="false"
+      :showSummary="true"
     ></shop-list>
 
     <!-- 精品地图 -->
@@ -41,6 +42,7 @@
       detail-path="/shop/skfwDetail/"
       :data="map_datas"
       :showImg="true"
+      :showSummary="false"
     ></shop-list>
 
     <!-- 综合应用 -->
@@ -50,6 +52,7 @@
       detail-path="/shop/zhfwDetail/"
       :data="comprehensive_datas"
       :showImg="true"
+      :showSummary="false"
     ></shop-list>
   </div>
 </template>

src/router/index.js

@@ -318,7 +318,7 @@ export default new Router({
               component: () => import("@/pages/user/order/order_list"),
             },
             {
-              path: "/user/order_detail/:id", // 订单管理页
+              path: "/user/order_list/detail/:id", // 订单管理页
               name: "orderDetail",
               component: () => import("@/pages/user/order/order_detail"),
             },