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

src/components/system/site-form.vue

@@ -22,6 +22,8 @@
             class="col-6 q-pr-lg q-pb-lg" label="SecretKey" :rules="[val => !!val || '请填写SecretKey']" />
           <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.CustomDomain" ref="CustomDomain"
             class="col-6 q-pr-lg q-pb-lg" label="自定义域名"/>
+          <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.UploadDomain" ref="UploadDomain"
+            class="col-6 q-pr-lg q-pb-lg" label="上传自定义域名"/>
         </div>
       </q-card-section>
       <q-separator />
@@ -62,6 +64,7 @@
           SecretId: '',
           SecretKey: '',
           ImgStyle: '',
+          UploadDomain:''
         },
         statusData:[], //状态数据
       }
@@ -77,6 +80,7 @@
         this.objOption.CustomDomain=this.saveObj.CustomDomain;
         this.objOption.SecretId=this.saveObj.SecretId;
         this.objOption.SecretKey=this.saveObj.SecretKey;
+        this.objOption.UploadDomain=this.saveObj.UploadDomain;
       }
 
       this.getStatus();

src/pages/system/msgmanage.vue

@@ -497,7 +497,10 @@
       },
       //获去下拉状态
       getStatus() {
-        getConfigStatus().then(res => {
+        let msg={
+          Type:1
+        }
+        getConfigStatus(msg).then(res => {
           if (res.Code == 1) {
             this.statusData = res.Data;
             let obj = {

src/pages/system/siteconfig.vue

@@ -89,6 +89,12 @@
             field: 'Using',
             align: 'left'
           },
+          {
+            name: 'UploadDomain',
+            label: '上传自定义域名',
+            field: 'UploadDomain',
+            align: 'left'
+          },
           {
             name: 'optioned',
             label: '操作',