From ed3f9a35d931c5482cb2d10c52bf0e2af6d6165d Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 5 May 2023 14:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=95=E6=A8=A1=E7=89=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/.version                                |  4 +-
 crmeb/app/adminapi/route/order.php            |  4 +-
 .../notify/smsConfig/components/loginFrom.vue | 44 +++++++++++--------
 .../src/pages/notify/smsConfig/index.vue      |  9 +++-
 template/admin/src/router/modules/setting.js  |  2 +-
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/crmeb/.version b/crmeb/.version
index 723a6ca0d..35f4eaead 100644
--- a/crmeb/.version
+++ b/crmeb/.version
@@ -1,5 +1,5 @@
-version=CRMEB-KY v4.7.0
-version_code=470
+version=CRMEB-KY v5.0.0
+version_code=500
 platform=gitee
 app_id=ze7x9rxsv09l6pvsyo
 app_key=fuF7U9zaybLa5gageVQzxtxQMFnvU2OI
diff --git a/crmeb/app/adminapi/route/order.php b/crmeb/app/adminapi/route/order.php
index b459e9e78..b3522cb7d 100644
--- a/crmeb/app/adminapi/route/order.php
+++ b/crmeb/app/adminapi/route/order.php
@@ -42,6 +42,8 @@ Route::group('order', function () {
     Route::get('refund/:id', 'v1.order.StoreOrder/refund')->name('StoreOrderRefund')->option(['real_name' => '订单退款表单']);
     //订单退款
     Route::put('refund/:id', 'v1.order.StoreOrder/update_refund')->name('StoreOrderUpdateRefund')->option(['real_name' => '订单退款']);
+    //获取电子面单模版
+    Route::get('express/temp', 'v1.order.StoreOrder/express_temp')->option(['real_name' => '快递公司电子面单模版']);
     //获取物流信息
     Route::get('express/:id', 'v1.order.StoreOrder/get_express')->name('StoreOrderUpdateExpress')->option(['real_name' => '获取物流信息']);
     //获取物流公司
@@ -102,7 +104,7 @@ Route::group('order', function () {
     Route::get('delivery/list', 'v1.order.DeliveryService/get_delivery_list')->option(['real_name' => '订单列表获取配送员']);
     //电子面单模板列表
     Route::get('expr/temp', 'v1.order.StoreOrder/expr_temp')->option(['real_name' => '电子面单模板列表']);
-    Route::get('express/temp', 'v1.order.StoreOrder/express_temp')->option(['real_name' => '快递公司电子面单模版']);
+
     //更多操作打印电子面单
     Route::get('order_dump/:order_id', 'v1.order.StoreOrder/order_dump')->option(['real_name' => '更多操作打印电子面单']);
 })->middleware([
diff --git a/template/admin/src/pages/notify/smsConfig/components/loginFrom.vue b/template/admin/src/pages/notify/smsConfig/components/loginFrom.vue
index d93d301f6..be1d5b5df 100644
--- a/template/admin/src/pages/notify/smsConfig/components/loginFrom.vue
+++ b/template/admin/src/pages/notify/smsConfig/components/loginFrom.vue
@@ -94,25 +94,33 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.maxInpt{
-    max-width 400px
-    margin-left auto
-    margin-right auto
+.maxInpt {
+  max-width: 400px;
+  margin-left: auto;
+  margin-right: auto;
 }
-.page-account-container{
-    text-align center
-    padding 50px 0
+
+.page-account-container {
+  text-align: center;
+  padding: 50px 0;
 }
-.page-account-top{
-    margin-bottom 20px
+
+.page-account-top {
+  margin-bottom: 20px;
+}
+
+.page-account-top-tit {
+  font-size: 21px;
+  color: #1890FF;
+}
+
+.page-account-other {
+  text-align: center;
+  color: #1890FF;
+  font-size: 12px;
+
+  span {
+    cursor: pointer;
+  }
 }
-.page-account-top-tit
-    font-size 21px
-    color #1890FF
-.page-account-other
-    text-align center
-    color #1890FF
-    font-size 12px
-    span
-        cursor pointer
 </style>
diff --git a/template/admin/src/pages/notify/smsConfig/index.vue b/template/admin/src/pages/notify/smsConfig/index.vue
index 0cfc96e24..f02f94beb 100644
--- a/template/admin/src/pages/notify/smsConfig/index.vue
+++ b/template/admin/src/pages/notify/smsConfig/index.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <div class="i-layout-page-header header-title">
-      <span class="ivu-page-header-title" v-if="!isShowList">短信账户</span>
+      <span class="ivu-page-header-title" v-if="!isShowList"
+        >一号通账户<span class="title-tips">快速开通短信接口、物流接口、商品采集接口、电子面单接口等</span></span
+      >
       <div v-if="isShowList" class="acea-row row-between-wrapper picTxt">
         <div slot="content">
           <Avatar class="dashboard-workplace-header-avatar" :src="imgUrl" />
@@ -367,4 +369,9 @@ export default {
   text-align: center;
   padding: 0px 10px;
 }
+.title-tips {
+  font-size: 14px;
+  color: #999;
+  margin-left: 10px;
+}
 </style>
diff --git a/template/admin/src/router/modules/setting.js b/template/admin/src/router/modules/setting.js
index a446ea570..131d212b6 100644
--- a/template/admin/src/router/modules/setting.js
+++ b/template/admin/src/router/modules/setting.js
@@ -138,7 +138,7 @@ export default {
       name: `${pre}config`,
       meta: {
         auth: ['setting-sms-sms-config'],
-        title: '短信账户',
+        title: '一号通账户',
       },
       component: () => import('@/pages/notify/smsConfig/index'),
     },