Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/console/naturalResources.vue

src/views/console/apiOrder.vue

@@ -282,7 +282,7 @@ const data = reactive({
       {required: true, message: '网络带宽不能为空', trigger: 'blur'}
       {required: true, message: '网络带宽不能为空', trigger: 'blur'}
     ],
     ],
     submitTime: [
     submitTime: [
-      {required: true, message: '申请时间不能为空', trigger: 'blur'}
+      {required: true, message: '下单时间不能为空', trigger: 'blur'}
     ],
     ],
     applyUser: [{required: true, message: '应用人不能为空', trigger: 'blur'}],
     applyUser: [{required: true, message: '应用人不能为空', trigger: 'blur'}],
     useTime: [{required: true, message: '使用期限不能为空', trigger: 'blur'}],
     useTime: [{required: true, message: '使用期限不能为空', trigger: 'blur'}],

src/views/console/myOrder.vue

@@ -314,7 +314,7 @@ const data = reactive({
       {required: true, message: '网络带宽不能为空', trigger: 'blur'}
       {required: true, message: '网络带宽不能为空', trigger: 'blur'}
     ],
     ],
     submitTime: [
     submitTime: [
-      {required: true, message: '申请时间不能为空', trigger: 'blur'}
+      {required: true, message: '下单时间不能为空', trigger: 'blur'}
     ],
     ],
     applyUser: [{required: true, message: '应用人不能为空', trigger: 'blur'}],
     applyUser: [{required: true, message: '应用人不能为空', trigger: 'blur'}],
     useTime: [{required: true, message: '使用期限不能为空', trigger: 'blur'}],
     useTime: [{required: true, message: '使用期限不能为空', trigger: 'blur'}],

src/views/console/overview.vue

@@ -105,7 +105,7 @@
               <span>AppId和AppSecret</span>
               <span>AppId和AppSecret</span>
             </div>
             </div>
           </template>
           </template>
-          <el-form-item label="AppSecret：">
+          <el-form-item label="AppId：">
             <el-tooltip
             <el-tooltip
                 effect="dark"
                 effect="dark"
                 :content="appData.appId || '-'"
                 :content="appData.appId || '-'"

src/views/marketplace/AIMarketplaceDetail.vue

@@ -566,7 +566,7 @@ function create() {
           })
           })
           .catch(() => {
           .catch(() => {
             ElMessageBox.confirm(
             ElMessageBox.confirm(
-                '订单已创建，请前往控制台-我的订单查看',
+                '订单已创建，请前往控制台-api订单查看',
                 '提示',
                 '提示',
                 {
                 {
                   confirmButtonText: '确认',
                   confirmButtonText: '确认',
@@ -613,7 +613,7 @@ const createQueryInterval = (id) => {
         clearQueryInterval()
         clearQueryInterval()
         ElMessageBox.confirm(
         ElMessageBox.confirm(
             '支付成功',
             '支付成功',
-            '请前往控制台-我的订单查看',
+            '请前往控制台-api订单查看',
             {
             {
               confirmButtonText: '确认',
               confirmButtonText: '确认',
               showCancelButton: false,
               showCancelButton: false,