Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/system/index.js

@@ -298,3 +298,15 @@ export function SetRolePermission(data) {
     data
   })
 }
+
+/**
+ * 获取短信配置发送状态下拉
+ */
+export function getConfigStatus(data) {
+  return request({
+    url: '/Public/GetStoreTypeEnumList',
+    method: 'post',
+    data
+  });
+}
+

src/api/system/msg.js

+import request from '../../utils/request'
+
+/**
+ * 获取短信流水分页列表
+ */
+export function getMsgPage(data) {
+    return request({
+      url: '/Msg/GetMsgLogPageList',
+      method: 'post',
+      data
+    });
+}
+  
+/**
+ * 获取短信配置分页列表
+ */
+export function getConfigPage(data) {
+  return request({
+    url: '/Msg/GetMsgBasePageList',
+    method: 'post',
+    data
+  });
+}
+
+/**
+ * 新增修改短信配置
+ */
+export function EditMsgConfig(data) {
+  return request({
+    url: '/Msg/SetMsgBase',
+    method: 'post',
+    data
+  });
+}
+

src/components/system/post-form.vue

 <style>
-
+.post-form .tranbox .el-transfer-panel{
+  width: 300px;
+}
+.post-form .tranbox .el-button{
+  padding: 7px 10px;
+}
 </style>
 <template>
   <q-dialog v-model="persistent" persistent transition-show="scale" transition-hide="scale">
@@ -22,7 +27,7 @@
           </div>
         </div>
         <div class="text-caption q-mb-lg q-px-md text-grey-6">绑定角色</div>
-        <div class="row wrap">
+        <div class="row wrap tranbox" >
           <template>
             <el-transfer
               filterable

src/components/system/site-form.vue

@@ -10,8 +10,7 @@
         <div class="row wrap">
           <div class="col-12" style="margin-bottom:10px;">
             存储位置
-            <q-radio v-model="objOption.StoreType" :val="1" label="腾讯云COS" />
-            <q-radio v-model="objOption.StoreType" :val="2" label="阿里云" />
+            <q-radio v-model="objOption.StoreType" v-for="item in statusData" :val="item.Id" :label="item.Name" />
           </div>
           <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.Bucket" ref="Bucket"
             class="col-6 q-pr-lg q-pb-lg" label="空间名称（Bucket）" :rules="[val => !!val || '请填写空间名称']" />
@@ -39,6 +38,10 @@
   import {
     setSiteConfig,
   } from '../../api/system/sitecfg'
+  import {
+    getConfigStatus,
+  } from '../../api/system/index'
+
   export default {
     props: {
       saveObj: {
@@ -60,6 +63,7 @@
           SecretKey: '',
           ImgStyle: '',
         },
+        statusData:[], //状态数据
       }
     },
     computed: {
@@ -74,6 +78,8 @@
         this.objOption.SecretId=this.saveObj.SecretId;
         this.objOption.SecretKey=this.saveObj.SecretKey;
       }
+
+      this.getStatus();
     },
     methods: {
       //保存数据
@@ -137,6 +143,15 @@
         this.$emit('close')
         this.persistent = false
       },
+      //获去下拉状态
+      getStatus(){
+        getConfigStatus().then(res => {
+          if(res.Code==1){
+            this.statusData = res.Data;
+          }
+        })
+      },
+
     },
   }