From d0c00b7af7e0cd0738c14317bce8d2d5a36d50d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B4=94=E5=BA=86=E6=89=8D=E4=B8=A8=E9=9D=99=E8=A7=85?=
 <cqc@cuiqingcai.com>
Date: Sat, 6 Apr 2024 18:05:59 +0800
Subject: [PATCH] Update styles of buttons (#21)

---
 ...cloud-hub-9ccd9f06-33c1-48c3-8e5d-8929dd49b79f.json |  7 +++++++
 src/components/midjourney/ReferenceImage.vue           |  2 +-
 src/components/midjourney/tasks/TaskBriefList.vue      |  4 +++-
 src/components/order/Create.vue                        |  2 +-
 src/i18n/en/order.json                                 |  6 +++++-
 src/pages/chatdoc/Manage.vue                           |  2 +-
 src/pages/console/application/Buy.vue                  |  5 ++---
 src/pages/console/order/Detail.vue                     | 10 ++++++++++
 8 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 change/@acedatacloud-hub-9ccd9f06-33c1-48c3-8e5d-8929dd49b79f.json

diff --git a/change/@acedatacloud-hub-9ccd9f06-33c1-48c3-8e5d-8929dd49b79f.json b/change/@acedatacloud-hub-9ccd9f06-33c1-48c3-8e5d-8929dd49b79f.json
new file mode 100644
index 00000000..335b5fb5
--- /dev/null
+++ b/change/@acedatacloud-hub-9ccd9f06-33c1-48c3-8e5d-8929dd49b79f.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix style bugs",
+  "packageName": "@acedatacloud/hub",
+  "email": "cqc@cuiqingcai.com",
+  "dependentChangeType": "patch"
+}
diff --git a/src/components/midjourney/ReferenceImage.vue b/src/components/midjourney/ReferenceImage.vue
index ecfee298..ec1939e5 100644
--- a/src/components/midjourney/ReferenceImage.vue
+++ b/src/components/midjourney/ReferenceImage.vue
@@ -12,7 +12,7 @@
       :on-error="onError"
       :headers="headers"
     >
-      <el-button type="primary" class="btn btn-upload">
+      <el-button round type="primary" class="btn btn-upload">
         <font-awesome-icon icon="fa-solid fa-upload" class="icon mr-2" />
         {{ $t('midjourney.button.uploadReferences') }}
       </el-button>
diff --git a/src/components/midjourney/tasks/TaskBriefList.vue b/src/components/midjourney/tasks/TaskBriefList.vue
index acb397af..c06535c2 100644
--- a/src/components/midjourney/tasks/TaskBriefList.vue
+++ b/src/components/midjourney/tasks/TaskBriefList.vue
@@ -16,7 +16,9 @@
     <div v-for="(task, taskKey) in tasks" :key="taskKey" class="task">
       <task-preview :full="false" :model-value="task" @custom="$emit('custom', $event)" />
     </div>
-    <el-button type="primary" class="btn mb-4" @click="onLoadHistory">{{ $t('midjourney.button.history') }}</el-button>
+    <el-button type="primary" round class="btn mb-4" @click="onLoadHistory">{{
+      $t('midjourney.button.history')
+    }}</el-button>
   </div>
 </template>
 
diff --git a/src/components/order/Create.vue b/src/components/order/Create.vue
index 2cd01679..f183d299 100644
--- a/src/components/order/Create.vue
+++ b/src/components/order/Create.vue
@@ -38,7 +38,7 @@
       </span>
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" size="large" class="btn-create" :loading="creating" @click="onCreateOrder">
+      <el-button type="primary" round size="large" class="btn-create" :loading="creating" @click="onCreateOrder">
         {{ $t('application.button.createOrder') }}
       </el-button>
     </el-form-item>
diff --git a/src/i18n/en/order.json b/src/i18n/en/order.json
index 0368d608..e96375fa 100644
--- a/src/i18n/en/order.json
+++ b/src/i18n/en/order.json
@@ -67,6 +67,10 @@
     "message": "Payment Successful",
     "description": "The message of the successful payment."
   },
+  "message.orderExpired": {
+    "message": "Order expired, please create a new order to pay.",
+    "description": "The message of the expired order."
+  },
   "message.createFailed": {
     "message": "Creation Failed",
     "description": "The message of the failed creation."
@@ -131,4 +135,4 @@
     "message": "Manage Order",
     "description": "The title which used show as a title of website, means the manage order."
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/chatdoc/Manage.vue b/src/pages/chatdoc/Manage.vue
index 869b419d..97879e6f 100644
--- a/src/pages/chatdoc/Manage.vue
+++ b/src/pages/chatdoc/Manage.vue
@@ -49,7 +49,7 @@
             </el-table-column>
             <el-table-column>
               <template #default="scope">
-                <el-button type="danger" size="small" @click="onDelete(scope.row.id)">
+                <el-button type="danger" round size="small" @click="onDelete(scope.row.id)">
                   {{ $t('common.button.delete') }}
                 </el-button>
               </template>
diff --git a/src/pages/console/application/Buy.vue b/src/pages/console/application/Buy.vue
index 0c4b45a0..5f15a5f3 100644
--- a/src/pages/console/application/Buy.vue
+++ b/src/pages/console/application/Buy.vue
@@ -112,7 +112,6 @@ export default defineComponent({
       application: undefined,
       loading: false,
       form: {
-        amount: 1000,
         packageId: undefined
       },
       creating: false
@@ -165,13 +164,13 @@ export default defineComponent({
       orderOperator
         .create({
           application_id: this.application?.id,
-          amount: this.form.amount,
+          amount: this.package?.amount,
           ...(this.form.packageId !== 'custom' && this.package
             ? {
                 package_id: this.package.id
               }
             : {}),
-          description: `${this.application?.service?.title} x ${this.form.amount} ${unit}`
+          description: `${this.application?.service?.title} x ${this.package?.amount} ${unit}`
         })
         .then(({ data: data }: { data: IOrderDetailResponse }) => {
           this.creating = false;
diff --git a/src/pages/console/order/Detail.vue b/src/pages/console/order/Detail.vue
index 96786cdd..0a3e1794 100644
--- a/src/pages/console/order/Detail.vue
+++ b/src/pages/console/order/Detail.vue
@@ -26,6 +26,10 @@
                     <el-descriptions-item v-if="order?.application?.service" :label="$t('order.field.api')">
                       {{ order?.application?.service?.title }}
                     </el-descriptions-item>
+                    <el-descriptions-item v-if="order?.pay_way" :label="$t('order.field.payWay')">
+                      <span v-if="order?.pay_way === PayWay.WechatPay">{{ $t('order.title.wechatPay') }}</span>
+                      <span v-if="order?.pay_way === PayWay.Stripe">{{ $t('order.title.stripe') }}</span>
+                    </el-descriptions-item>
                     <el-descriptions-item :label="$t('order.field.amount')">
                       {{ order?.amount }} {{ $t(`service.unit.${order?.application?.service?.unit}`) }}
                     </el-descriptions-item>
@@ -48,6 +52,12 @@
                 <el-alert :title="$t('order.message.paidSuccessfully')" type="success" show-icon :closable="false" />
               </el-col>
             </el-row>
+            <el-row v-if="order?.state === OrderState.EXPIRED" class="mb-5">
+              <el-col :span="14" :offset="5">
+                <el-divider border-style="dashed" />
+                <el-alert :title="$t('order.message.orderExpired')" type="error" show-icon :closable="false" />
+              </el-col>
+            </el-row>
             <el-row v-if="order?.state === OrderState.PENDING || order?.state === OrderState.FAILED">
               <el-col :span="14" :offset="5">
                 <el-divider border-style="dashed" />