Merge branch 'dev' of gitlab.33.cn:CassiniatSaturn/fns_backend into dev

src/const/columns/chatColumns.ts

@@ -4,22 +4,28 @@ const columns:Array<column>=
   {
     title: '发布时间',
     align:'center',
-    dataIndex: 'time',
+    dataIndex: 'created_at',
+    scopedSlots:{
+      customRender :'created_at'
+    }
   },
   {
-    title: '类型',
+    title: '问题',
     align:'center',
-    dataIndex: 'type',
+    dataIndex: 'question',
   },
   {
-    title: '内容',
+    title: '回复',
     align:'center',
-    dataIndex: 'content',
+    dataIndex: 'answer',
   },
   {
     title: '状态',
     align:'center',
-    dataIndex: 'state',
+    dataIndex: 'faq_status',
+    scopedSlots: {
+      customRender: 'faq_status', 
+    }
   },
   {
     title: '操作',

src/filter/index.ts

 import { eBannerLocation, eBannerStatus } from '@/types/banner'
 import { eUserStatus } from '@/types/user'
 import { editableProductStatus,eGuaranteeType,eProductType} from '@/types/loanProduct'
-import { activityStatus } from "@/service/ActivityService/type"
+// import { activityStatus } from "@/service/ActivityService/type"
 import moment from 'moment'
+import { activityStatus } from '@/service/ActivityService/type'
 import { eLevel } from '@/types/level'
 
 export default {

src/mock/chat.ts

@@ -2,31 +2,32 @@ import { chat } from '@/types/chat'
 
 export const chatList:Array<chat>=[
   {
-    key:'1',
+    key:1,
     time:'2020-09-21',
     type:'自动回复',
     content:'您好？请问有什么可以帮到您',
     state:'已发布'
   },
   {
-    key:'2',
+    key:2,
     time:'2020-09-21',
-    type:'常用语',
+    type:'常用问题',
     content:'没什么可以帮我',
     state:'已发布'
   },
   {
-    key:'3',
+    key:3,
     time:'2020-09-21',
-    type:'常用语',
+    type:'常用问题',
     content:'你们最近的网点在哪里',
     state:'已下架'
   },
   {
-    key:'4',
+    key:4,
     time:'2020-09-21',
     type:'自动回复',
     content:'您好？我们是中小企业协会综合服务平台',
     state:'已下架'
-  }
+  },
+  
 ]

src/service/FAQService/index.ts

+import baseAxios from '../index'
+import { eAQRStatus } from '@/types/chat'
+import { FAQItem } from './type'
+export default class FAQService {
+  static instance: FAQService
+  static getInstance() {
+    if (!FAQService.instance) {
+      FAQService.instance = new FAQService()
+    }
+    return FAQService.instance
+  }
+  AddQueAns(data:{answer:string;question: string }){
+    return baseAxios({
+      url:'/faq/admin/add',
+      method:'POST',
+      data,
+    })
+  }
+  DeleteQueAns(data:{id:string}){
+    return baseAxios({
+      url:'faq/admin/delete',
+      method:'DELETE',
+      // data
+      params: data,
+    })
+  }
+  CheckQueAnsList(data:{
+    end_time: number
+    limit: number
+    faq_status: number
+    offset: number
+    start_time: number
+    }){
+      return baseAxios({
+        url:'faq/admin/list',
+        method:'POST',
+        data
+      })
+  }
+  ModifyQueAns(data:{faq_status: eAQRStatus,id: number}){
+    return baseAxios({
+      url:'faq/admin/modify/status',
+      method:'POST',
+      data,
+    })
+  }
+  CheckMsg(data:{question:string}){
+    return baseAxios({
+      url:'faq/query/answer',
+      method:'GET',
+      data:data,
+    })
+  }
+  CheckList(){
+    return baseAxios({
+      url:'faq/query/list',
+      method:'GET',
+    })
+  }
+
+}
+

src/service/FAQService/type.ts

+export interface FAQItem{
+  answer: string,
+  question: string,
+  start_time: number,
+  end_time: number,
+  faq_status: number,
+  id: number
+  limit: number,
+  offset: number,
+  
+}
\ No newline at end of file

src/types/chat.ts

 export interface chat{
-  key:string
+  key:number
   time:string,
   type:string,
   content:string,
   state:string
+}
+export enum eAQRStatus {
+  full=0,
+  editable = 1,
+  published = 2,
+  delete=3,
 }
\ No newline at end of file

src/views/Root/Chat/const.ts

 export enum modal{
   on,
   off,
-  setDefault,
   delete
 }
\ No newline at end of file

src/views/Root/Msg/index.vue

@@ -279,7 +279,7 @@ export default Vue.extend({
       let form = this.form
       type formtype = keyof typeof form
       Object.keys(this.form).forEach(m=>{
-        this.form[m as formtype] = '' 
+        // this.form[m as formtype] = '' 
       })
       this.form['type'] = 1
     },

src/views/Root/OutletManagement/index.vue

@@ -110,6 +110,7 @@
         :rules="formRules"
         layout="horizontal"
         ref="form"
+        style="position: relative;left: 12rem;"
       >
         <FormModelItem class="base_form_item my-2" label="所属一级分行">
           <Select
@@ -176,6 +177,7 @@
           label="现属二级支行"
           prop="newSecondSubBranch"
           v-if="modalType === eModalType.edit"
+          style="position: relative;left: -0.75rem;"
         >
           <a-input
             v-model="formData.newSecondSubBranch"
@@ -189,7 +191,7 @@
         >
           <a-input v-model="formData.location" placeholder="请输入现详细地址" />
         </FormModelItem>
-        <FormModelItem class="base_form_item my-2" label="是否营业">
+        <FormModelItem class="base_form_item my-2" label="是否营业" style="position: relative;left: 1.5rem;">
           <a-switch
             default-checked
             v-model="formData.isOpen"
@@ -197,17 +199,17 @@
             un-checked-children="否"
           />
         </FormModelItem>
-        <div class="flex">
-          <FormModelItem class="base_form_item my-2" label="经度" prop="lo">
+        <div class="flex" style="position: relative;left: 1.75rem;">
+          <FormModelItem class="base_form_item my-2 mr-2" label="经纬度" prop="lo">
             <a-input class="w-32" placeholder="经度" v-model="formData.lo" />
           </FormModelItem>
-          <FormModelItem class="base_form_item my-2" prop="la">
-            <a-input class="w-32" placeholder="纬度" v-model="formData.la" />
+          <FormModelItem class="base_form_item my-2" prop="la" >
+            <a-input class="w-32 mr-2" placeholder="纬度" v-model="formData.la" />
             <a-button type="primary" @click="getLalo">自动获取</a-button>
           </FormModelItem>
         </div>
-        <div class="flex">
-          <div>
+        <div class="flex" style="position: relative;left: -12rem;">
+          <div class="flex">
             <FormModelItem class="base_form_item my-2" label="营业时间">
               <CheckBoxGroup v-model="formData.openDays">
                 <Checkbox
@@ -218,21 +220,24 @@
                   >{{ item.label }}</Checkbox
                 >
               </CheckBoxGroup>
+              <div class="flex">
+                <FormModelItem prop="startTime" class="flex justify-center mr-2">
+                  <TimePicker
+                    v-model="formData.startTime"
+                    format="HH:mm"
+                    placeholder="开始时间"
+                  ></TimePicker>
+                </FormModelItem>
+                <FormModelItem prop="endTime" class="flex justify-center">
+                  <TimePicker
+                    v-model="formData.endTime"
+                    format="HH:mm"
+                    placeholder="结束时间"
+                  ></TimePicker>
+                </FormModelItem>
+              </div>
             </FormModelItem>
-            <FormModelItem prop="startTime">
-              <TimePicker
-                v-model="formData.startTime"
-                format="HH:mm"
-                placeholder="开始时间"
-              ></TimePicker>
-            </FormModelItem>
-            <FormModelItem prop="endTime">
-              <TimePicker
-                v-model="formData.endTime"
-                format="HH:mm"
-                placeholder="结束时间"
-              ></TimePicker>
-            </FormModelItem>
+            
           </div>
           <FormModelItem class="base_form_item my-2" label="备注" prop="remark">
             <TextArea
@@ -242,7 +247,7 @@
             ></TextArea>
           </FormModelItem>
         </div>
-        <div class="flex items-center justify-center">
+        <div class="flex items-center justify-center" style="position: relative;left: -12rem;">
           <a-button @click="handleClickCancel">取消</a-button>
           <a-button type="primary" class="ml-10" @click="handleClickConfirm"
             >确认</a-button
@@ -385,7 +390,7 @@ export default Vue.extend({
         { label: "星期四", value: "4", disabled: true },
         { label: "星期五", value: "5", disabled: true },
         { label: "星期六", value: "6" },
-        { label: "星期七", value: "7" },
+        { label: "星期日", value: "7" },
       ],
       firstBranchOptions: [] as any[],
       secondBranchOptions: [] as any[],
@@ -681,7 +686,7 @@ export default Vue.extend({
   // justify-content: center;
   display: flex;
   /deep/ .ant-form-item-label {
-    margin-right: 30px;
+    padding-right: 30px;
   }
 }
 </style>
\ No newline at end of file