From ef51aadc74a126d88959af14379c32e15d91eb44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=93=BC=E5=94=A7L?= <xl376837995@163.com>
Date: Mon, 15 Jan 2024 18:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E4=B9=A6=E8=A7=86=E9=A2=91=EF=BC=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=EF=BC=8C=E5=9B=BE=E4=B9=A6?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/book/book-add-or-update.vue | 835 +++++++--------
 .../modules/book/talkBook-add-or-update.vue   | 986 +++++++++---------
 src/views/modules/book/talkBook.vue           |  37 +-
 src/views/modules/medical/publish.vue         | 546 +++++-----
 src/views/modules/user/user-add-or-update.vue | 489 +++++----
 5 files changed, 1489 insertions(+), 1404 deletions(-)

diff --git a/src/views/modules/book/book-add-or-update.vue b/src/views/modules/book/book-add-or-update.vue
index b361ba0..1c3605f 100644
--- a/src/views/modules/book/book-add-or-update.vue
+++ b/src/views/modules/book/book-add-or-update.vue
@@ -1,7 +1,7 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible" @close="handlereset">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" 
-      label-width="80px">
+  <el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"
+    @close="handlereset">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="80px">
       <el-form-item label="书名" prop="name">
         <el-input v-model="dataForm.name" placeholder="书名"></el-input>
       </el-form-item>
@@ -20,7 +20,7 @@
       </el-row> -->
       <el-row>
         <el-col :span="12">
-        <!-- <el-form-item label="作者" prop="authorId">
+          <!-- <el-form-item label="作者" prop="authorId">
         <el-select
           v-model="dataForm.authorId"
           multiple
@@ -37,39 +37,31 @@
           </el-option>
         </el-select>
       </el-form-item> -->
-      <el-form-item label="作者" prop="publisherName">
-        <el-input v-model="dataForm.publisherName" placeholder="请输入作者" ></el-input>
-      </el-form-item>
+          <el-form-item label="作者" prop="publisherName">
+            <el-input v-model="dataForm.publisherName" placeholder="请输入作者"></el-input>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
-        <el-form-item label="出版社" prop="publisherId">
-        <el-select
-          v-model="dataForm.publisherId"
-          multiple
-          filterable
-          allow-create
-          default-first-option
-          placeholder="请输入出版社名称">
-          <el-option
-            v-for="item in publisherList"
-            :key="item.value + ''"
-            :label="item.value"
-            :value="item.id + ''">
-          </el-option>
-        </el-select>
-      </el-form-item>
+          <el-form-item label="出版社" prop="publisherId">
+            <el-select v-model="dataForm.publisherId" multiple filterable allow-create default-first-option
+              placeholder="请输入出版社名称">
+              <el-option v-for="item in publisherList" :key="item.value + ''" :label="item.value" :value="item.id + ''">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-col>
       </el-row>
-      
-        
-        <!-- <el-input v-model="dataForm.authorId" placeholder="作者姓名" v-show="false"></el-input> -->
+
+
+      <!-- <el-input v-model="dataForm.authorId" placeholder="作者姓名" v-show="false"></el-input> -->
 
       <el-form-item label="序言" prop="title">
         <el-input v-model="dataForm.title" placeholder="序言" :rows="3" type="textarea"></el-input>
       </el-form-item>
       <el-form-item label="拆分类型" prop="splits">
-        <el-radio-group v-model="dataForm.splits" >
-          <el-radio v-for="item in splitsTypeList" :key="item.dictType" :label="item.dictType" :value="item.dictType">{{item.dictValue}}</el-radio>          
+        <el-radio-group v-model="dataForm.splits">
+          <el-radio v-for="item in splitsTypeList" :key="item.dictType" :label="item.dictType"
+            :value="item.dictType">{{item.dictValue}}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="目录" prop="content">
@@ -78,15 +70,13 @@
       <el-form-item label="简介" prop="description">
         <el-input v-model="dataForm.description" placeholder="简介" :rows="5" type="textarea"></el-input>
       </el-form-item>
-      <el-form-item label="图书分类" prop="type">
-        <!-- <el-select v-model="dataForm.type" placeholder="图书分类">
-          <el-option v-for="item in bookList" :key="item.dictType + ''" :label="item.dictValue"
-            :value="item.dictType + ''">
-          </el-option>
-        </el-select> -->
-        <el-checkbox-group v-model="dataForm.type">
-          <el-checkbox v-for="item in bookList" :key="item.dictType" :label="item.dictType" :value="item.dictType">{{item.dictValue}}</el-checkbox>
-        </el-checkbox-group>
+      <el-form-item label="图书分类" prop="bookType">
+       <el-radio-group v-model="dataForm.bookType">
+         <el-radio :label="0">普通</el-radio>
+         <el-radio :label="1">中医经典</el-radio>
+         <el-radio :label="2">国学经典</el-radio>
+
+       </el-radio-group>
       </el-form-item>
       <el-row>
         <!-- <el-col :span="12">
@@ -101,20 +91,16 @@
         <!-- </el-col>       -->
         <el-form-item label="图书类型" prop="medicaldesBookType">
           <el-checkbox-group v-model="dataForm.medicaldesBookType">
-            <el-checkbox v-for="item in medicaldesBookTypeList" :key="item.dictType" :label="item.dictType" :value="item.dictType">{{item.dictValue}}</el-checkbox>
+            <el-checkbox v-for="item in medicaldesBookTypeList" :key="item.dictType" :label="item.dictType"
+              :value="item.dictType">{{item.dictValue}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-col :span="12">
-          <el-form-item label="是否可听" >
+          <el-form-item label="是否可听">
             <!-- <el-input v-model="dataForm.salePrice" placeholder="优惠价格"></el-input> -->
-            <el-switch
-            style="display: block"
-            v-model="dataForm.canListen"
-            active-color="#13ce66"
-            inactive-color="#ff4949"
-            active-text="可听"
-            inactive-text="不可听">
-          </el-switch>
+            <el-switch style="display: block" v-model="dataForm.canListen" active-color="#13ce66"
+              inactive-color="#ff4949" active-text="可听" inactive-text="不可听">
+            </el-switch>
           </el-form-item>
         </el-col>
       </el-row>
@@ -122,7 +108,7 @@
         <el-radio-group v-model="dataForm.clockIn">
           <!-- <el-radio :label="3">听书</el-radio> -->
           <el-radio :label="1">参与打卡</el-radio>
-          <el-radio :label="2">不参与打卡</el-radio>          
+          <el-radio :label="2">不参与打卡</el-radio>
 
         </el-radio-group>
       </el-form-item>
@@ -130,7 +116,7 @@
         <el-radio-group v-model="dataForm.teachIn">
           <!-- <el-radio :label="3">听书</el-radio> -->
           <el-radio :label="1">参与</el-radio>
-          <el-radio :label="0">不参与</el-radio>          
+          <el-radio :label="0">不参与</el-radio>
 
         </el-radio-group>
       </el-form-item>
@@ -144,7 +130,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="免费章节数" prop="freeChapterCount" label-width="250">
-        <el-input-number v-model="dataForm.freeChapterCount"  :min="0" :max="10" label="免费章节数"></el-input-number>
+        <el-input-number v-model="dataForm.freeChapterCount" :min="0" :max="10" label="免费章节数"></el-input-number>
       </el-form-item>
       <!-- <el-form-item label="置顶" prop="istop">
         <el-radio-group v-model="dataForm.istop">
@@ -162,28 +148,15 @@
         <el-input v-model="dataForm.publisherId" placeholder="出版商名称"></el-input>
       </el-form-item> -->
       <el-form-item label="文件上传" prop="novel">
-        <el-upload
-          class="upload-demo"
-          :action= "baseUrl + '/oss/fileoss'"
-          :on-preview="handlePreview"
-          :on-remove="handleRemoveNovel"
-          :before-remove="beforeRemove"
-          :on-success="handleNovelSuccess"
-          multiple
-          :limit="3"
-          :on-exceed="handleExceed"
-          :file-list="fileListNovel">
+        <el-upload class="upload-demo" :action="baseUrl + '/oss/fileoss'" :on-preview="handlePreview"
+          :on-remove="handleRemoveNovel" :before-remove="beforeRemove" :on-success="handleNovelSuccess" multiple
+          :limit="3" :on-exceed="handleExceed" :file-list="fileListNovel">
           <el-button size="small" type="primary">点击上传</el-button>
         </el-upload>
       </el-form-item>
       <el-form-item label="插图" prop="images">
-        <el-upload
-        :action= "baseUrl + '/oss/fileoss'"
-          list-type="picture-card"
-          :on-preview="handlePictureCardPreview"
-          :file-list="fileList"
-          :on-success="handlePicSuccess"
-          :on-remove="handleRemove">
+        <el-upload :action="baseUrl + '/oss/fileoss'" list-type="picture-card" :on-preview="handlePictureCardPreview"
+          :file-list="fileList" :on-success="handlePicSuccess" :on-remove="handleRemove">
           <i class="el-icon-plus"></i>
         </el-upload>
         <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
@@ -198,7 +171,7 @@
     </el-form-item> -->
       <el-form-item label="排序" prop="sort">
         <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
-      </el-form-item>      
+      </el-form-item>
       <!-- <el-form-item label="删除标记" prop="delFlag">
       <el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
     </el-form-item> -->
@@ -213,348 +186,398 @@
 
 
 <script>
-import global from '../../common/common.vue'     //引入共用组间
-export default {
-  data() {
-    return {
-      baseUrl:global.baseUrl,
-      visible: false,
-      bookList: [],
-      medicaldesBookTypeList:[
-        {dictType:1,dictValue:"中医基础"},
-        {dictType:2,dictValue:"中医经典"},
-        {dictType:3,dictValue:"各家学说"},
-        {dictType:4,dictValue:"中医临床"},
-        {dictType:5,dictValue:"文学"},
-        {dictType:6,dictValue:"哲学"},
-      ],
-      props: {
-        dictType: '',
-        dictValue: ''
-      },
-      authorList:[],
-      restaurants: [],
-      author:'',
-      publisherList:[],
-      fileList:[],
-      fileListNovel:[],
-      dialogImageUrl: '',
-      dialogVisible: false,
-      dataForm: {
-        id: 0,
-        name: '',
-        publisherName:'',
-        splits:0,
-        authorId: [],
-        description: '',
-        title: '',
-        content: '',
-        type:[],
-        medicaldesBookType:[],
-        // price: '',
-        salePrice:'',
-        // istop: '',
-        isVip:0,
-        freeChapterCount:0,
-        // isSale: '',
-        publisherId: [],
-        images: '',
-        pid: '',
-        level: '',
-        createTime: '',
-        updateTime: '',
-        sort: '',
-        delFlag: '',
-        novel: '',
-        canListen: false,
-        clockIn: 2, 
-        teachIn: 0,  
-      },
-      splitsTypeList:[],
-      dataRule: {
-        
-        // name: [
-        //   { required: true, message: '书名不能为空', trigger: 'blur' }
-        // ],
-        // authorId: [
-        //   { required: true, message: '作者id不能为空', trigger: 'blur' }
-        // ],
-        // description: [
-        //   { required: true, message: '简介不能为空', trigger: 'blur' }
-        // ],
-        // title: [
-        //   { required: true, message: '序言不能为空', trigger: 'blur' }
-        // ],
-        // content: [
-        //   { required: true, message: '内容不能为空', trigger: 'blur' }
-        // ],
-        // type: [
-        //   { required: true, message: '类型不能为空', trigger: 'blur' }
-        // ],
-        // price: [
-        //   { required: true, message: '价格不能为空', trigger: 'blur' }
-        // ],
-        // istop: [
-        //   { required: true, message: '置顶不能为空', trigger: 'blur' }
-        // ],
-        // publisherId: [
-        //   { required: true, message: '出版商id不能为空', trigger: 'blur' }
-        // ],
-        // images: [
-        //   { required: true, message: '插图不能为空', trigger: 'blur' }
-        // ],
-        // pid: [
-        //   { required: true, message: '父id不能为空', trigger: 'blur' }
-        // ],
-        // level: [
-        //   { required: true, message: '层级不能为空', trigger: 'blur' }
-        // ],
-        // createTime: [
-        //   { required: true, message: '创建日期不能为空', trigger: 'blur' }
-        // ],
-        // updateTime: [
-        //   { required: true, message: '更新日期不能为空', trigger: 'blur' }
-        // ],
-        // sort: [
-        //   { required: true, message: '排序不能为空', trigger: 'blur' }
-        // ],
-        // splits: [
-        //    { required: true, message: '拆分类类型不能为空', trigger: 'blur' }
-        //  ]
-      }
-    }
-  },
-  created() {
-    this.getBookList()
-    this.loadAll()
-  },
-  mounted(){
-    // this.restaurants = this.loadAll();
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || 0
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.$http({
-            url: this.$http.adornUrl(`/book/book/info/${this.dataForm.id}`),
-            method: 'get',
-            params: this.$http.adornParams()
-          }).then(({ data }) => {
-            if (data && data.code === 0) {
-              this.dataForm.name = data.book.name
-              this.dataForm.publisherName = data.book.dataForm
-              // this.dataForm.authorId = data.book.authorId
-              this.dataForm.description = data.book.description
-              this.dataForm.title = data.book.title
-              this.dataForm.content = data.book.content
-              // this.dataForm.type = data.book.type
-              // this.dataForm.price = data.book.price
-              // this.dataForm.salePrice = data.book.salePrice
-              // this.dataForm.istop = data.book.istop
-              this.dataForm.isVip = data.book.isVip
-              // this.dataForm.isSale = data.book.isSale
-              this.dataForm.freeChapterCount = data.book.freeChapterCount
-              this.dataForm.splits = data.book.splits
-              // this.dataForm.publisherId = data.book.publisherId
-              this.dataForm.images = data.book.images
-              this.dataForm.pid = data.book.pid
-              this.dataForm.level = data.book.level
-              this.dataForm.createTime = data.book.createTime
-              this.dataForm.updateTime = data.book.updateTime
-              this.dataForm.sort = data.book.sort
-              this.dataForm.delFlag = data.book.delFlag
-              this.dataForm.novel = data.book.novel
-              this.dataForm.clockIn = data.book.clockIn
-              this.dataForm.teachIn = data.book.teachIn
-              var checklist = data.book.type
-              var medicaldeschecklist = data.book.medicaldesBookType
-              var authorList = data.book.authorId
-              var publisherlish = data.book.publisherId
-              if(data.book.authorId != ""){
-                this.dataForm.authorId = authorList.split(',')
-              }
-              if(data.book.publisherId != ""){
-                this.dataForm.publisherId = publisherlish.split(',')
-              }
-              
-              this.dataForm.type = checklist.split(',')
-              this.dataForm.medicaldesBookType = medicaldeschecklist.split(',')
-              for (let i = 0; i < this.dataForm.medicaldesBookType .length; i++) {
-                this.dataForm.medicaldesBookType [i] = parseInt(this.dataForm.medicaldesBookType [i]);
-              }
-              console.log(this.dataForm.type)
-              console.log('2222222222',this.dataForm.medicaldesBookType)
-              if (data.book.images != "") {
-                var img = { name: '', url: data.book.images }
-                var attr = []
-                attr.push(img)
-                this.fileList = attr
-              }
-              if (data.book.novel != "" && data.book.novel != null && data.book.novel != 'undefined') {
-                var novel = { name: '电子书文件', url: data.book.novel }
-                var attr = []
-                attr.push(novel)
-                this.fileListNovel = attr
-              }
-            }
-          })
-        }
-      })
-    },
-    // 表单提交
-    dataFormSubmit() {
-      console.log('11111',this.dataForm.medicaldesBookType)
-      if(this.dataForm.medicaldesBookType.length == 0){
-        this.$message.error("请选择图书类型");
-        return
-      }
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.$http({
-            url: this.$http.adornUrl(`/book/book/${!this.dataForm.id ? 'save' : 'update'}`),
-            method: 'post',
-            data: this.$http.adornData({
-              'id': this.dataForm.id || undefined,
-              'name': this.dataForm.name,
-              'authorId': this.dataForm.authorId.join(','),
-              'description': this.dataForm.description,
-              'title': this.dataForm.title,
-              'publisherName': this.dataForm.publisherName,
-              'content': this.dataForm.content,
-              'type': this.dataForm.type.join(','),
-              "medicaldesBookType": this.dataForm.medicaldesBookType.join(','),
-              // 'price': this.dataForm.price,
-              // 'salePrice': this.dataForm.salePrice,
-              // 'istop': this.dataForm.istop,
-              'isVip': this.dataForm.isVip,
-              // 'isSale': this.dataForm.isSale,
-              'freeChapterCount': this.dataForm.freeChapterCount,
-              'publisherId': this.dataForm.publisherId.join(','),
-              'images': this.dataForm.images,
-              'pid': this.dataForm.pid,
-              'level': this.dataForm.level,
-              'createTime': this.dataForm.createTime,
-              'updateTime': this.dataForm.updateTime,
-              'sort': this.dataForm.sort,
-              'delFlag': this.dataForm.delFlag,
-              'novel': this.dataForm.novel,
-              'splits': this.dataForm.splits,
-              'canListen': this.dataForm.canListen,
-              'clockIn': this.dataForm.clockIn,
-              'teachIn': this.dataForm.teachIn
-            })
-          }).then(({ data }) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.visible = false
-                  this.$emit('refreshDataList')
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }
-      })
-    },
-    handlePicSuccess(res, file) {
-      if (res.msg == "success") {
-        this.dataForm.images = res.url;    
-        this.$message.success("上传成功");
-      } else {
-        this.$message.error("上传失败");
-      }
-    },
-    //图书分类
-    getBookList() {
-      this.$http({
-        url: this.$http.adornUrl('/book/sysdictdata/selectByType/book_type'),
-        method: 'get',
-        // params: this.$http.adornParams({
-        //   'type': 'book_type',
-        // })
-      }).then(({ data }) => {
-        console.log(data)
-        this.bookList = data.dataList
-      })
+  import global from '../../common/common.vue' //引入共用组间
+  export default {
+    data() {
+      return {
+        baseUrl: global.baseUrl,
+        visible: false,
+        bookList: [{
+            dictType: 0,
+            dictValue: "普通"
+          },
+          {
+            dictType: 1,
+            dictValue: "中医经典"
+          },
+          {
+            dictType: 2,
+            dictValue: "国学经典"
+          }
+        ],
+        medicaldesBookTypeList: [{
+            dictType: 1,
+            dictValue: "中医基础"
+          },
+          {
+            dictType: 2,
+            dictValue: "中医经典"
+          },
+          {
+            dictType: 3,
+            dictValue: "各家学说"
+          },
+          {
+            dictType: 4,
+            dictValue: "中医临床"
+          },
+          {
+            dictType: 5,
+            dictValue: "文学"
+          },
+          {
+            dictType: 6,
+            dictValue: "哲学"
+          },
+        ],
+        props: {
+          dictType: '',
+          dictValue: ''
+        },
+        authorList: [],
+        restaurants: [],
+        author: '',
+        publisherList: [],
+        fileList: [],
+        fileListNovel: [],
+        dialogImageUrl: '',
+        dialogVisible: false,
+        dataForm: {
+          id: 0,
+          name: '',
+          publisherName: '',
+          splits: 0,
+          authorId: [],
+          description: '',
+          title: '',
+          bookType: 0,
+          content: '',
+          type: [],
+          medicaldesBookType: [],
+          // price: '',
+          salePrice: '',
+          // istop: '',
+          isVip: 0,
+          freeChapterCount: 0,
+          // isSale: '',
+          publisherId: [],
+          images: '',
+          pid: '',
+          level: '',
+          createTime: '',
+          updateTime: '',
+          sort: '',
+          delFlag: '',
+          novel: '',
+          canListen: false,
+          clockIn: 2,
+          teachIn: 0,
+        },
+        splitsTypeList: [],
+        dataRule: {
 
-      // 获取图书拆分类型
-      this.$http({
-        url: this.$http.adornUrl('/book/sysdictdata/selectByType/splitsType'),
-        method: 'get',        
-      }).then(({ data }) => {     
-        this.splitsTypeList = data.dataList
-      })
+          // name: [
+          //   { required: true, message: '书名不能为空', trigger: 'blur' }
+          // ],
+          // authorId: [
+          //   { required: true, message: '作者id不能为空', trigger: 'blur' }
+          // ],
+          // description: [
+          //   { required: true, message: '简介不能为空', trigger: 'blur' }
+          // ],
+          // title: [
+          //   { required: true, message: '序言不能为空', trigger: 'blur' }
+          // ],
+          // content: [
+          //   { required: true, message: '内容不能为空', trigger: 'blur' }
+          // ],
+          // type: [
+          //   { required: true, message: '类型不能为空', trigger: 'blur' }
+          // ],
+          // price: [
+          //   { required: true, message: '价格不能为空', trigger: 'blur' }
+          // ],
+          // istop: [
+          //   { required: true, message: '置顶不能为空', trigger: 'blur' }
+          // ],
+          // publisherId: [
+          //   { required: true, message: '出版商id不能为空', trigger: 'blur' }
+          // ],
+          // images: [
+          //   { required: true, message: '插图不能为空', trigger: 'blur' }
+          // ],
+          // pid: [
+          //   { required: true, message: '父id不能为空', trigger: 'blur' }
+          // ],
+          // level: [
+          //   { required: true, message: '层级不能为空', trigger: 'blur' }
+          // ],
+          // createTime: [
+          //   { required: true, message: '创建日期不能为空', trigger: 'blur' }
+          // ],
+          // updateTime: [
+          //   { required: true, message: '更新日期不能为空', trigger: 'blur' }
+          // ],
+          // sort: [
+          //   { required: true, message: '排序不能为空', trigger: 'blur' }
+          // ],
+          // splits: [
+          //    { required: true, message: '拆分类类型不能为空', trigger: 'blur' }
+          //  ]
+        }
+      }
     },
-    handleRemove(file) {
-      this.dataForm.images = '';
+    created() {
+      this.getBookList()
+      this.loadAll()
     },
-    handlePictureCardPreview(file) {
-      this.dataForm.images = file.url;
-      this.dialogVisible = true;
+    mounted() {
+      // this.restaurants = this.loadAll();
     },
-    handleDownload(file) {
-      console.log(file)
-    },
-    handlereset(){
-      this.fileList = [],
-      this.fileListNovel = [],
-      this.visible = false
-    },
-    handlePreview(file) {
-      console.log(file);
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-    },
-    beforeRemove(file, fileList) {
-      return this.$confirm(`确定移除 ${ file.name }？`);
-    },
-    handleRemoveNovel(file) {
-      this.dataForm.novel = '';
-    },
-    handleNovelSuccess(file){
-      this.dataForm.novel = file.url
-    },
-    // querySearch(queryString, cb) {
-    //     var restaurants = this.restaurants;
-    //     var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
-    //     // 调用 callback 返回建议列表的数据
-    //     console.log(results)
-    //     cb(results);
-    // },
-    // createFilter(queryString) {
-    //     return (restaurant) => {
-    //       return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
-    //     };
-    // },
-    loadAll() {
+    methods: {
+      init(id) {
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          if (this.dataForm.id) {
+            this.$http({
+              url: this.$http.adornUrl(`/book/book/info/${this.dataForm.id}`),
+              method: 'get',
+              params: this.$http.adornParams()
+            }).then(({
+              data
+            }) => {
+              if (data && data.code === 0) {
+                this.dataForm.name = data.book.name
+                this.dataForm.publisherName = data.book.dataForm
+                // this.dataForm.authorId = data.book.authorId
+                this.dataForm.description = data.book.description
+                this.dataForm.title = data.book.title
+                this.dataForm.bookType = data.book.bookType
+                this.dataForm.content = data.book.content
+                // this.dataForm.type = data.book.type
+                // this.dataForm.price = data.book.price
+                // this.dataForm.salePrice = data.book.salePrice
+                // this.dataForm.istop = data.book.istop
+                this.dataForm.isVip = data.book.isVip
+                // this.dataForm.isSale = data.book.isSale
+                this.dataForm.freeChapterCount = data.book.freeChapterCount
+                this.dataForm.splits = data.book.splits
+                // this.dataForm.publisherId = data.book.publisherId
+                this.dataForm.images = data.book.images
+                this.dataForm.pid = data.book.pid
+                this.dataForm.level = data.book.level
+                this.dataForm.createTime = data.book.createTime
+                this.dataForm.updateTime = data.book.updateTime
+                this.dataForm.sort = data.book.sort
+                this.dataForm.delFlag = data.book.delFlag
+                this.dataForm.novel = data.book.novel
+                this.dataForm.clockIn = data.book.clockIn
+                this.dataForm.teachIn = data.book.teachIn
+                var checklist = data.book.type
+                var medicaldeschecklist = data.book.medicaldesBookType
+                var authorList = data.book.authorId
+                var publisherlish = data.book.publisherId
+                if (data.book.authorId != "") {
+                  this.dataForm.authorId = authorList.split(',')
+                }
+                if (data.book.publisherId != "") {
+                  this.dataForm.publisherId = publisherlish.split(',')
+                }
+
+                this.dataForm.type = checklist.split(',')
+                this.dataForm.medicaldesBookType = medicaldeschecklist.split(',')
+                for (let i = 0; i < this.dataForm.medicaldesBookType.length; i++) {
+                  this.dataForm.medicaldesBookType[i] = parseInt(this.dataForm.medicaldesBookType[i]);
+                }
+                console.log(this.dataForm.type)
+                console.log('2222222222', this.dataForm.medicaldesBookType)
+                if (data.book.images != "") {
+                  var img = {
+                    name: '',
+                    url: data.book.images
+                  }
+                  var attr = []
+                  attr.push(img)
+                  this.fileList = attr
+                }
+                if (data.book.novel != "" && data.book.novel != null && data.book.novel != 'undefined') {
+                  var novel = {
+                    name: '电子书文件',
+                    url: data.book.novel
+                  }
+                  var attr = []
+                  attr.push(novel)
+                  this.fileListNovel = attr
+                }
+              }
+            })
+          }
+        })
+      },
+      // 表单提交
+      dataFormSubmit() {
+        console.log('11111', this.dataForm.medicaldesBookType)
+        if (this.dataForm.medicaldesBookType.length == 0) {
+          this.$message.error("请选择图书类型");
+          return
+        }
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.$http({
+              url: this.$http.adornUrl(`/book/book/${!this.dataForm.id ? 'save' : 'update'}`),
+              method: 'post',
+              data: this.$http.adornData({
+                'id': this.dataForm.id || undefined,
+                'name': this.dataForm.name,
+                'authorId': this.dataForm.authorId.join(','),
+                'description': this.dataForm.description,
+                'title': this.dataForm.title,
+                'bookType': this.dataForm.bookType,
+                'publisherName': this.dataForm.publisherName,
+                'content': this.dataForm.content,
+                'type': this.dataForm.type.join(','),
+                "medicaldesBookType": this.dataForm.medicaldesBookType.join(','),
+                // 'price': this.dataForm.price,
+                // 'salePrice': this.dataForm.salePrice,
+                // 'istop': this.dataForm.istop,
+                'isVip': this.dataForm.isVip,
+                // 'isSale': this.dataForm.isSale,
+                'freeChapterCount': this.dataForm.freeChapterCount,
+                'publisherId': this.dataForm.publisherId.join(','),
+                'images': this.dataForm.images,
+                'pid': this.dataForm.pid,
+                'level': this.dataForm.level,
+                'createTime': this.dataForm.createTime,
+                'updateTime': this.dataForm.updateTime,
+                'sort': this.dataForm.sort,
+                'delFlag': this.dataForm.delFlag,
+                'novel': this.dataForm.novel,
+                'splits': this.dataForm.splits,
+                'canListen': this.dataForm.canListen,
+                'clockIn': this.dataForm.clockIn,
+                'teachIn': this.dataForm.teachIn
+              })
+            }).then(({
+              data
+            }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          }
+        })
+      },
+      handlePicSuccess(res, file) {
+        if (res.msg == "success") {
+          this.dataForm.images = res.url;
+          this.$message.success("上传成功");
+        } else {
+          this.$message.error("上传失败");
+        }
+      },
+      //图书分类
+      getBookList() {
         this.$http({
-        url: this.$http.adornUrl('/book/author/bookAuthorList'),
-        method: 'get',
-      }).then(({ data }) => {
-        this.authorList = data.list
-      })
+          url: this.$http.adornUrl('/book/sysdictdata/selectByType/book_type'),
+          method: 'get',
+          // params: this.$http.adornParams({
+          //   'type': 'book_type',
+          // })
+        }).then(({
+          data
+        }) => {
+          console.log(data)
+          // this.bookList = data.dataList
+        })
+
+        // 获取图书拆分类型
         this.$http({
-        url: this.$http.adornUrl('/book/publisher/publisherList'),
-        method: 'get',
-      }).then(({ data }) => {
-        this.publisherList = data.list
-      })
-      
-    },
-    // handleSelect(item) {
-    //   this.dataForm.authorId = item.id
-    //     console.log(item);
-    //   }
+          url: this.$http.adornUrl('/book/sysdictdata/selectByType/splitsType'),
+          method: 'get',
+        }).then(({
+          data
+        }) => {
+          this.splitsTypeList = data.dataList
+        })
+      },
+      handleRemove(file) {
+        this.dataForm.images = '';
+      },
+      handlePictureCardPreview(file) {
+        this.dataForm.images = file.url;
+        this.dialogVisible = true;
+      },
+      handleDownload(file) {
+        console.log(file)
+      },
+      handlereset() {
+        this.fileList = [],
+          this.fileListNovel = [],
+          this.visible = false
+      },
+      handlePreview(file) {
+        console.log(file);
+      },
+      handleExceed(files, fileList) {
+        this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+      },
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${ file.name }？`);
+      },
+      handleRemoveNovel(file) {
+        this.dataForm.novel = '';
+      },
+      handleNovelSuccess(file) {
+        this.dataForm.novel = file.url
+      },
+      // querySearch(queryString, cb) {
+      //     var restaurants = this.restaurants;
+      //     var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+      //     // 调用 callback 返回建议列表的数据
+      //     console.log(results)
+      //     cb(results);
+      // },
+      // createFilter(queryString) {
+      //     return (restaurant) => {
+      //       return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+      //     };
+      // },
+      loadAll() {
+        this.$http({
+          url: this.$http.adornUrl('/book/author/bookAuthorList'),
+          method: 'get',
+        }).then(({
+          data
+        }) => {
+          this.authorList = data.list
+        })
+        this.$http({
+          url: this.$http.adornUrl('/book/publisher/publisherList'),
+          method: 'get',
+        }).then(({
+          data
+        }) => {
+          this.publisherList = data.list
+        })
+
+      },
+      // handleSelect(item) {
+      //   this.dataForm.authorId = item.id
+      //     console.log(item);
+      //   }
+    }
+
   }
-  
-}
 </script>
diff --git a/src/views/modules/book/talkBook-add-or-update.vue b/src/views/modules/book/talkBook-add-or-update.vue
index c4c6b4b..9798abc 100644
--- a/src/views/modules/book/talkBook-add-or-update.vue
+++ b/src/views/modules/book/talkBook-add-or-update.vue
@@ -1,18 +1,7 @@
 <template>
-  <el-dialog
-    :title="!dataForm.productId ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-    @close="handlereset"
-    lock-scroll
-    width="750px"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      label-width="100px"
-    >
+  <el-dialog :title="!dataForm.productId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"
+    @close="handlereset" lock-scroll width="750px">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="100px">
       <!-- <el-form-item label="所属分类" prop="poids">
         <el-cascader v-model="dataForm.poids" :options="categorys" :props="props" clearable></el-cascader>
       </el-form-item> -->
@@ -24,72 +13,53 @@
       </el-form-item> -->
       <!-- 关联的图书ids -->
       <el-form-item label="标题" prop="title">
-        <el-input
-          v-model="dataForm.title"
-          placeholder="请输入讲书标题"
-        ></el-input>
+        <el-input v-model="dataForm.title" placeholder="请输入讲书标题"></el-input>
       </el-form-item>
       <el-form-item label="讲书章节" prop="chapter" :required="true">
-        <el-input
-          style="width: 150px;"
-          v-model.number="dataForm.chapter"
-          @input="numberChange"
-          placeholder="请输入章节序号"
-          type="number"
-          min="1"
-        ></el-input>
+        <el-input style="width: 150px;" v-model.number="dataForm.chapter" @input="numberChange" placeholder="请输入章节序号"
+          type="number" min="1"></el-input>
         <br /><span style="color: #999;">请输入大于0的整数,且为必填项</span>
       </el-form-item>
       <el-form-item label="音频">
-        <el-upload
-          :limit="1"
-          class="el-uploadvideo "
-          v-loading="loading"
-          element-loading-text="正在保存到服务器，请勿离开..."
-          element-loading-spinner="el-icon-loading"
-          element-loading-background="rgba(255, 255, 255, 0.8)"
-          :class="{
+        <el-upload :limit="1" class="el-uploadvoices" v-loading="voicesLoading" element-loading-text="正在保存到服务器，请勿离开..."
+          element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.8)" :class="{
             uoloadSty: dataForm.showBtnDealImg,
             disUoloadSty: dataForm.noneBtnImg
-          }"
-          :action="baseUrl + '/oss/fileoss'"
-          :file-list="voiceList"
-          :on-success="videohandlePicSuccess"
-          accept=".mp3"
-          :on-remove="videohandleRemove"
-          :show-file-list="true"
-          :on-progress="uploadVideoProcess"
-        >
+          }" :action="baseUrl + '/oss/fileoss'" :file-list="voiceList" :on-success="voicesSuccess" accept=".mp3"
+          :on-remove="voicesRemove" :show-file-list="true" :on-progress="voicesProcess">
           <!-- <i class="el-icon-plus"></i>  -->
-          <el-button slot="trigger" size="small" type="primary"
-            >上传文件</el-button
-          >
+          <el-button slot="trigger" size="small" type="primary">上传文件</el-button>
         </el-upload>
-        <el-progress
-          v-show="progressFlag"
-          :percentage="loadProgress"
-        ></el-progress>
+        <el-progress v-show="voicesFlag" :percentage="voicesLoad"></el-progress>
         <div>
-          <audio
-            id="resource"
-            :src="dataForm.voices"
-            controls
-            v-show="true"
-          ></audio>
+          <audio id="resource" :src="dataForm.voices" controls v-show="true"></audio>
         </div>
       </el-form-item>
 
+      <el-form-item label="视频">
+        <el-upload :limit="1" class="el-uploadvideo " v-loading="videoLoading" element-loading-text="正在保存到服务器，请勿离开..."
+          element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.8)"
+          :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
+          :action="baseUrl + '/oss/fileoss'" :file-list="videoList" :on-success="videoSuccess" accept=".mp4"
+          :on-remove="videoRemove" :show-file-list="true" :on-progress="uploadVideo">
+          <!-- <i class="el-icon-plus"></i> -->
+          <el-button slot="trigger" size="small" type="primary">上传文件</el-button>
+        </el-upload>
+        <el-progress v-show="videoFlag" :percentage="videoLoad"></el-progress>
+        <div>
+          <video controls width="250" v-if="dataForm.video != ''">
+            <source :src="dataForm.video" type="video/mp4" />
+
+          </video>
+        </div>
+      </el-form-item>
+
+
+
       <el-form-item label="轮播图" prop="images">
-        <el-upload
-          :limit="3"
-          class="el-uploadfeng"
-          :action="baseUrl + '/oss/fileoss'"
-          list-type="picture-card"         
-          :file-list="swiperfileList"
-          :on-success="bannerHandlePicSuccess"
-          accept=".jpeg,.jpg,.gif,.png"
-          :on-remove="bannerHandleRemove"
-        >
+        <el-upload :limit="3" class="el-uploadfeng" :action="baseUrl + '/oss/fileoss'" list-type="picture-card"
+          :file-list="swiperfileList" :on-success="bannerHandlePicSuccess" accept=".jpeg,.jpg,.gif,.png"
+          :on-remove="bannerHandleRemove">
           <i class="el-icon-plus"></i>
         </el-upload>
         <!-- <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
@@ -99,15 +69,9 @@
       </el-form-item>
 
       <el-form-item label="内容" prop="content">
-        <quill-editor
-          v-model="dataForm.content"
-          ref="myQuillEditor"
-          :options="editorOption"
-          @blur="onEditorBlur($event)"
-          @focus="onEditorFocus($event)"
-          @ready="onEditorReady($event)"
-          class="shangpin_editor"
-        >
+        <quill-editor v-model="dataForm.content" ref="myQuillEditor" :options="editorOption"
+          @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @ready="onEditorReady($event)"
+          class="shangpin_editor">
         </quill-editor>
       </el-form-item>
       <!-- <el-form-item label="排序" prop="sort">
@@ -116,131 +80,126 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="handlereset">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" :disabled="loading"
-        >确定</el-button
-      >
+      <el-button type="primary" @click="dataFormSubmit()" :disabled="loading">确定</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import { quillEditor } from "vue-quill-editor";
-import global from "../../common/common.vue"; //引入共用组间
+  import {
+    quillEditor
+  } from "vue-quill-editor";
+  import global from "../../common/common.vue"; //引入共用组间
 
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
+  import "quill/dist/quill.core.css";
+  import "quill/dist/quill.snow.css";
+  import "quill/dist/quill.bubble.css";
 
-export default {
-  data() {
-    // 自定义校验规则
-    var checkMoney = (rule, value, callback) => {
-      if (!value) {
-        return callback(new Error("章节序号不能为空,且必须大于0"));
-      }
-      // setTimeout(() => {
-      if (!Number.isInteger(value)) {
-        callback(new Error("请输入数字值"));
-      } else {
-        if (value <= 0) {
-          callback(new Error("章节序号必须要大于0"));
-        } else {
-          callback();
+  export default {
+    data() {
+      // 自定义校验规则
+      var checkMoney = (rule, value, callback) => {
+        if (!value) {
+          return callback(new Error("章节序号不能为空,且必须大于0"));
         }
-      }
-      // }, 100);
-    };
-    return {
-      loading: false,
-      progressFlag: false,
-      loadProgress: 0,
-      baseUrl: global.baseUrl,
-      visible: false,
-      categorys: [],
-      fileList: [], // 封面图
-      swiperfileList: [],
-      dialogVisible: false,
-      props: {
-        value: "catId",
-        label: "name",
-        children: "children",
-        checkStrictly: true
-      },
-      dataForm: {
-        productId: 0,
-        talkid: null,
-        limitCountImg: 1, // 图片数量
-        title: "",
-        productPid: "",
-        voices: "",
-        chapter: null,
-        content: "",
-        images:[]
-      },
-      voiceList: [],
-      swiperfileList:[],
-      dataRule: {
-        title: [
-          {
+        // setTimeout(() => {
+        if (!Number.isInteger(value)) {
+          callback(new Error("请输入数字值"));
+        } else {
+          if (value <= 0) {
+            callback(new Error("章节序号必须要大于0"));
+          } else {
+            callback();
+          }
+        }
+        // }, 100);
+      };
+      return {
+        loading: false,
+        voicesLoading: false,
+        videoLoading: false,
+        voicesFlag: false,
+        voicesLoad: 0,
+        videoFlag: false,
+        videoLoad: 0,
+        baseUrl: global.baseUrl,
+        visible: false,
+        categorys: [],
+        fileList: [], // 封面图
+        swiperfileList: [],
+        dialogVisible: false,
+        props: {
+          value: "catId",
+          label: "name",
+          children: "children",
+          checkStrictly: true
+        },
+        dataForm: {
+          productId: 0,
+          talkid: null,
+          limitCountImg: 1, // 图片数量
+          title: "",
+          productPid: "",
+          voices: "",
+          video: "",
+          chapter: null,
+          content: "",
+          images: []
+        },
+        voiceList: [],
+        videoList: [],
+        swiperfileList: [],
+        dataRule: {
+          title: [{
             required: true,
             message: "书评标题不能为空",
             trigger: "blur"
-          }
-        ],
+          }],
 
-        chapter: [
-          {
+          chapter: [{
             validator: checkMoney,
             trigger: "blur"
-          }
-        ]
-      },
+          }]
+        },
 
-      // 富文本编辑器配置
-      editorOption: {
-        modules: {
-          toolbar: [
-            ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
-            ["blockquote", "code-block"], // 引用  代码块
-            [
-              {
-                header: 1
-              },
-              {
-                header: 2
-              }
-            ], // 1、2 级标题
-            [
-              {
-                list: "ordered"
-              },
-              {
-                list: "bullet"
-              }
-            ], // 有序、无序列表
-            [
-              {
-                script: "sub"
-              },
-              {
-                script: "super"
-              }
-            ], // 上标/下标
-            [
-              {
-                indent: "-1"
-              },
-              {
-                indent: "+1"
-              }
-            ], // 缩进
-            [
-              {
+        // 富文本编辑器配置
+        editorOption: {
+          modules: {
+            toolbar: [
+              ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
+              ["blockquote", "code-block"], // 引用  代码块
+              [{
+                  header: 1
+                },
+                {
+                  header: 2
+                }
+              ], // 1、2 级标题
+              [{
+                  list: "ordered"
+                },
+                {
+                  list: "bullet"
+                }
+              ], // 有序、无序列表
+              [{
+                  script: "sub"
+                },
+                {
+                  script: "super"
+                }
+              ], // 上标/下标
+              [{
+                  indent: "-1"
+                },
+                {
+                  indent: "+1"
+                }
+              ], // 缩进
+              [{
                 direction: "rtl"
-              }
-            ], // 文本方向
-            [
-              {
+              }], // 文本方向
+              [{
                 size: [
                   "12",
                   "14",
@@ -253,333 +212,378 @@ export default {
                   "32",
                   "36"
                 ]
-              }
-            ], // 字体大小
-            [
-              {
+              }], // 字体大小
+              [{
                 header: [1, 2, 3, 4, 5, 6]
-              }
-            ], // 标题
-            [
-              {
-                color: []
-              },
-              {
-                background: []
-              }
-            ], // 字体颜色、字体背景颜色
-            // [{ font: ['songti'] }], // 字体种类
-            [
-              {
+              }], // 标题
+              [{
+                  color: []
+                },
+                {
+                  background: []
+                }
+              ], // 字体颜色、字体背景颜色
+              // [{ font: ['songti'] }], // 字体种类
+              [{
                 align: []
-              }
-            ], // 对齐方式
-            ["clean"], // 清除文本格式
-            ["image", "video"] // 链接、图片、视频
-          ]
-        },
-        placeholder: "请输入正文"
-      }
-    };
-  },
-  created() {},
-  methods: {
-    init(id, bookid) {
-      this.productPid = bookid;
-      this.dataForm.talkid = id || null;
-      console.log(id, this.productPid, "this.productPid");
-      this.dataForm.productId = bookid || 0;
-      this.visible = true;
-      this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
-        if (this.dataForm.talkid) {
-          this.$http({
-            url: this.$http.adornUrl(`/book/teach/getTeachDetail`),
-            method: "get",
-            params: this.$http.adornParams({
-              teachId: id
-            })
-          }).then(({ data }) => {
-            // console.log(data, 666);
-            if (data && data.code === 0) {
-              this.dataForm.title = data.bookTeach.title;
-              this.dataForm.voices = data.bookTeach.voices;
-              this.dataForm.content = data.bookTeach.content;
-              this.dataForm.chapter = data.bookTeach.chapter;
-              if(data.bookTeach.images != ''){
-                let arr = data.bookTeach.images.split(';');
-                // console.log('转换成的数组',arr)
-                arr.forEach( (item,index) => {
-                  this.swiperfileList.push({
-                    name: index,
-                    url:item
-                  })
-                })                
-              }
-              // console.log('初始化图片', this.swiperfileList)
-              if (this.dataForm.voices != "") {
-                this.voiceList.push({
-                  name: data.bookTeach.title,
-                  url: data.bookTeach.voices
-                });
-              }
-              // else {
-              // console.log(data.bookBuyConfig.productImageList)
-              // let arr = []
-              //  let arr1 = []
-
-              //   arr = data.bookBuyConfig.productImageList.split(',');
-              //   console.log(arr)
-              //   arr.forEach((item, index) => {
-              //     arr1.push({
-              //       name: index,
-              //       url: item
-              //     })
-              //   });
-              //   this.swiperfileList = arr1
-              // }
-            }
-          });
-        } else {
-          console.log("为新增数据");
+              }], // 对齐方式
+              ["clean"], // 清除文本格式
+              ["image", "voices"] // 链接、图片、视频
+            ]
+          },
+          placeholder: "请输入正文"
         }
-      });
+      };
     },
-    bannerHandlePicSuccess(res, file) {
-      // 轮播图上传成功
-      if (res.msg == "success") {
-        this.swiperfileList.push({
-          name: file.name,
-          url: res.url
+    created() {},
+    methods: {
+      init(id, bookid) {
+        this.productPid = bookid;
+        this.dataForm.talkid = id || null;
+        console.log(id, this.productPid, "this.productPid");
+        this.dataForm.productId = bookid || 0;
+        this.visible = true;
+        this.$nextTick(() => {
+          this.$refs["dataForm"].resetFields();
+          if (this.dataForm.talkid) {
+            this.$http({
+              url: this.$http.adornUrl(`/book/teach/getTeachDetail`),
+              method: "get",
+              params: this.$http.adornParams({
+                teachId: id
+              })
+            }).then(({
+              data
+            }) => {
+              // console.log(data, 666);
+              if (data && data.code === 0) {
+                this.dataForm.title = data.bookTeach.title;
+                this.dataForm.voices = data.bookTeach.voices;
+                this.dataForm.video = data.bookTeach.video;
+                this.dataForm.content = data.bookTeach.content;
+                this.dataForm.chapter = data.bookTeach.chapter;
+                if (data.bookTeach.images != '') {
+                  let arr = data.bookTeach.images.split(';');
+                  // console.log('转换成的数组',arr)
+                  arr.forEach((item, index) => {
+                    this.swiperfileList.push({
+                      name: index,
+                      url: item
+                    })
+                  })
+                }
+                // console.log('初始化图片', this.swiperfileList)
+                if (this.dataForm.voices != "") {
+                  this.voiceList.push({
+                    name: data.bookTeach.title,
+                    url: data.bookTeach.voices
+                  });
+                }
+                if (this.dataForm.video != '') {
+                  this.videoList.push({
+                    name: data.bookTeach.title,
+                    url: data.bookTeach.video
+                  })
+                }
+                // else {
+                // console.log(data.bookBuyConfig.productImageList)
+                // let arr = []
+                //  let arr1 = []
+
+                //   arr = data.bookBuyConfig.productImageList.split(',');
+                //   console.log(arr)
+                //   arr.forEach((item, index) => {
+                //     arr1.push({
+                //       name: index,
+                //       url: item
+                //     })
+                //   });
+                //   this.swiperfileList = arr1
+                // }
+              }
+            });
+          } else {
+            console.log("为新增数据");
+          }
         });
-        // this.dataForm.images.push(res.url)
-        // console.log(this.swiperfileList)
-        this.$message.success("上传成功");
-      } else {
-        this.$message.error("上传失败");
-      }
-    },
-    bannerHandleRemove(file, fileList) {
+      },
+      bannerHandlePicSuccess(res, file) {
+        // 轮播图上传成功
+        if (res.msg == "success") {
+          this.swiperfileList.push({
+            name: file.name,
+            url: res.url
+          });
+          // this.dataForm.images.push(res.url)
+          // console.log(this.swiperfileList)
+          this.$message.success("上传成功");
+        } else {
+          this.$message.error("上传失败");
+        }
+      },
+      bannerHandleRemove(file, fileList) {
         // 轮播图删除操作
         this.swiperfileList = fileList
-       
-      },      
-    numberChange() {
-      console.log("改变了input值");
-    },
-    dealImgChange(file, fileList) {
-      this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
-    },
-    // 表单提交
-    dataFormSubmit() {
-      // console.log('userid', this.$store.state.user.id)
-      this.$refs["dataForm"].validate(valid => {
-        if (valid && this.dataForm.chapter > 0) { 
-          var imageslist = []
-          let arr = []
-          // console.log('this.swiperfileList',this.swiperfileList)
-          if(this.swiperfileList.length > 0){
-            arr = this.swiperfileList.map( item => {
-              return item.url
-            })
-          }
-          imageslist = arr.join(";");
-          console.log(imageslist,'imageslist')         
-          this.$http({
-            url: this.$http.adornUrl(
-              `/book/teach/${
+
+      },
+      numberChange() {
+        console.log("改变了input值");
+      },
+      dealImgChange(file, fileList) {
+        this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
+      },
+      // 表单提交
+      dataFormSubmit() {
+        // console.log('userid', this.$store.state.user.id)
+        this.$refs["dataForm"].validate(valid => {
+          if (valid && this.dataForm.chapter > 0) {
+            var imageslist = []
+            let arr = []
+            // console.log('this.swiperfileList',this.swiperfileList)
+            if (this.swiperfileList.length > 0) {
+              arr = this.swiperfileList.map(item => {
+                return item.url
+              })
+            }
+            imageslist = arr.join(";");
+            console.log(imageslist, 'imageslist')
+            this.$http({
+              url: this.$http.adornUrl(
+                `/book/teach/${
                 !this.dataForm.talkid ? "addTeach1" : "updateTeach"
               }`
-            ),
-            method: "post",
-            data: this.$http.adornData({
-              bookId: parseInt(this.productPid),
-              chapter: this.dataForm.chapter,
-              title: this.dataForm.title,
-              voices: this.dataForm.voices,
-              content: this.dataForm.content,
-              images:imageslist,  // 轮播图
-              // 'video': "https://ehh-private-01.oss-cn-beijing.aliyuncs.com…3/08/28/91fd5a4c35c34763abca5d2929637164movie.mp4",
-              teachId: this.dataForm.talkid || undefined
-            })
-          }).then(({ data }) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: "操作成功",
-                type: "success",
-                duration: 1500,
-                onClose: () => {
-                  this.visible = false;
-                  this.dataForm.productDetails = "";
-                  this.dataForm.video = "";
-                  this.voiceList = [];
-                  this.swiperfileList = []
-                  this.dataForm.images = []
-                  this.$refs["dataForm"].resetFields();
-                  // this.$refs['dataForm'].reset()
-                  this.$emit("refreshDataList");
-                }
-              });
-            } else {
-              this.$message.error(data.msg);
-            }
-          });
+              ),
+              method: "post",
+              data: this.$http.adornData({
+                bookId: parseInt(this.productPid),
+                chapter: this.dataForm.chapter,
+                title: this.dataForm.title,
+                voices: this.dataForm.voices,
+                video: this.dataForm.video,
+                content: this.dataForm.content,
+                images: imageslist, // 轮播图
+                // 'voices': "https://ehh-private-01.oss-cn-beijing.aliyuncs.com…3/08/28/91fd5a4c35c34763abca5d2929637164movie.mp4",
+                teachId: this.dataForm.talkid || undefined
+              })
+            }).then(({
+              data
+            }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false;
+                    this.dataForm.productDetails = "";
+                    this.dataForm.voices = "";
+                    this.dataForm.video = "";
+                    this.voiceList = [];
+                    this.swiperfileList = []
+                    this.dataForm.images = []
+                    this.$refs["dataForm"].resetFields();
+                    // this.$refs['dataForm'].reset()
+                    this.$emit("refreshDataList");
+                  }
+                });
+              } else {
+                this.$message.error(data.msg);
+              }
+            });
+          } else {
+            this.$message.error("章节序号必须大于0!");
+          }
+        });
+      },
+      changeTime(e) {
+        console.log(e);
+      },
+      // 字符串图片地址
+      getStringImgUrl() {
+        let arr = this.swiperfileList.map(item => item.url);
+        if (arr.length <= 0) {
+          return null;
         } else {
-          this.$message.error("章节序号必须大于0!");
+          return arr.toString();
         }
+      },
+
+      // 音频
+      voicesProcess(event, file, fileList) {
+        this.voicesFlag = true; // 显示进度条
+        this.voicesLoad = parseInt(event.percent); // 动态获取文件上传进度
+        console.log("this.voicesLoad", this.voicesLoad);
+        if (this.voicesLoad >= 100) {
+          this.voicesLoad = 99;
+          this.voicesloading = true;
+          this.loading = true;
+          // setTimeout( () => {this.voicesFlag = false}, 1000) // 一秒后关闭进度条
+        }
+      },
+
+      voicesSuccess(res, file) {
+        console.log(res, "res");
+        if (res.msg == "success") {
+          // this.dataForm.productImages = res.url;
+          this.voiceList.push({
+            name: file.name,
+            url: res.url
+          });
+          this.dataForm.voices = res.url;
+          // console.log(this.dataForm.productImages,'productImages')
+          this.voicesLoad = 100;
+          setTimeout(() => {
+            this.voicesFlag = false;
+            this.voicesloading = false;
+            this.loading = false;
+            this.$message.success("上传成功");
+          }, 1000); // 一秒后关闭进度条
+        } else {
+          this.$message.error("上传失败");
+        }
+      },
+
+      voicesRemove(file, fileList) {
+        this.dataForm.voices = "";
+        this.voiceList = fileList;
+      },
+
+
+      // 视频
+
+      uploadVideo(event, file, fileList) {
+        this.videoFlag = true; // 显示进度条
+        this.videoLoad = parseInt(event.percent); // 动态获取文件上传进度
+        console.log('this.loadProgress', this.videoLoad)
+        if (this.videoLoad >= 100) {
+          this.videoLoad = 99
+          this.videoloading = true;
+          this.loading = true
+          // setTimeout( () => {this.progressFlag = false}, 1000) // 一秒后关闭进度条
+        }
+      },
+
+      videoSuccess(res, file) {
+        console.log(res, 'res')
+        if (res.msg == "success") {
+          // this.dataForm.productImages = res.url;
+          this.videoList.push({
+            name: file.name,
+            url: res.url
+          })
+          this.dataForm.video = res.url
+          // console.log(this.dataForm.productImages,'productImages')
+          this.loadProgress = 100
+          setTimeout(() => {
+            this.progressFlag = false;
+            this.videoloading = false;
+            this.loading = false;
+            this.$message.success("上传成功");
+          }, 1000) // 一秒后关闭进度条
+        } else {
+          this.$message.error("上传失败");
+        }
+      },
+
+      videoRemove(file, fileList) {
+        this.dataForm.video = '';
+        this.videoList = fileList
+
+      },
+
+
+      // 清空
+
+      handlereset() {
+        (this.fileList = []), (this.voiceList = []), (this.videoList = []); // 清空视频列表
+        this.dataForm.voices = "";
+        this.visible = false;
+        this.swiperfileList = []
+        this.dataForm.images = []
+        this.$refs["dataForm"].resetFields();
+        this.dataForm.productDetails = "";
+        this.voicesFlag = false;
+        this.videoFlag = false;
+        this.voicesloading = false;
+        this.videoloading = false;
+        this.loading = false;
+        // this.$refs['dataForm'].reset()
+      },
+
+
+      // 失去焦点事件
+      onEditorBlur(quill) {
+        console.log("editor blur!", quill);
+      },
+      // 获得焦点事件
+      onEditorFocus(quill) {
+        //console.log('editor focus!', quill)
+      },
+      // 准备富文本编辑器
+      onEditorReady(quill) {
+        // console.log('editor ready!', quill)
+      }
+    },
+    components: {
+      quillEditor
+    },
+    mounted() {
+      this.$bus.$on("haveBookIds", data => {
+        // console.log('haveBookIds', data)
+        data.bookIds.length > 0 ?
+          (this.dataForm.Books = data.bookIds) :
+          (this.dataForm.Books = []);
       });
     },
-    changeTime(e) {
-      console.log(e);
-    },   
-    // 字符串图片地址
-    getStringImgUrl() {
-      let arr = this.swiperfileList.map(item => item.url);
-      if (arr.length <= 0) {
-        return null;
-      } else {
-        return arr.toString();
-      }
-    },
-    handlePicSuccess(res, file) {
-      // console.log(res,'res')
-      if (res.msg == "success") {
-        // this.dataForm.productImages = res.url;
-        this.fileList.push({
-          name: file.name,
-          url: res.url
-        });
-        this.dataForm.voices = res.url;
-        console.log(this.dataForm.voices, "voices");
-        this.$message.success("上传成功");
-      } else {
-        this.$message.error("上传失败");
-      }
-    },
-    uploadVideoProcess(event, file, fileList) {
-      this.progressFlag = true; // 显示进度条
-      this.loadProgress = parseInt(event.percent); // 动态获取文件上传进度
-      console.log("this.loadProgress", this.loadProgress);
-      if (this.loadProgress >= 100) {
-        this.loadProgress = 99;
-        this.loading = true;
-        // setTimeout( () => {this.progressFlag = false}, 1000) // 一秒后关闭进度条
-      }
-    },
 
-    videohandlePicSuccess(res, file) {
-      console.log(res, "res");
-      if (res.msg == "success") {
-        // this.dataForm.productImages = res.url;
-        this.voiceList.push({
-          name: file.name,
-          url: res.url
-        });
-        this.dataForm.voices = res.url;
-        // console.log(this.dataForm.productImages,'productImages')
-        this.loadProgress = 100;
-        setTimeout(() => {
-          this.progressFlag = false;
-          this.loading = false;
-          this.$message.success("上传成功");
-        }, 1000); // 一秒后关闭进度条
-      } else {
-        this.$message.error("上传失败");
+    watch: {
+      visible: {
+        handler(val, oldVal) {
+          // this.getGoodsTypeList()
+        },
+        deep: true
       }
-    },
-
-    handleRemove(file, fileList) {
-      this.dataForm.productImages = "";
-      this.fileList = fileList;
-      this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
-    },
-    videohandleRemove(file, fileList) {
-      this.dataForm.voices = "";
-      this.voiceList = fileList;
-    },
-    handlereset() {
-      (this.fileList = []), (this.voiceList = []); // 清空视频列表
-      this.dataForm.voices = "";
-      this.visible = false;
-      this.swiperfileList = []
-      this.dataForm.images = []     
-      this.$refs["dataForm"].resetFields();
-      this.dataForm.productDetails = "";
-      this.progressFlag = false;
-      this.loading = false;
-      // this.$refs['dataForm'].reset()
-    },
-    // 失去焦点事件
-    onEditorBlur(quill) {
-      console.log("editor blur!", quill);
-    },
-    // 获得焦点事件
-    onEditorFocus(quill) {
-      //console.log('editor focus!', quill)
-    },
-    // 准备富文本编辑器
-    onEditorReady(quill) {
-      // console.log('editor ready!', quill)
     }
-  },
-  components: {
-    quillEditor
-  },
-  mounted() {
-    this.$bus.$on("haveBookIds", data => {
-      // console.log('haveBookIds', data)
-      data.bookIds.length > 0
-        ? (this.dataForm.Books = data.bookIds)
-        : (this.dataForm.Books = []);
-    });
-  },
-
-  watch: {
-    visible: {
-      handler(val, oldVal) {
-        // this.getGoodsTypeList()
-      },
-      deep: true
-    }
-  }
-};
+  };
 </script>
 
 <style lang="less">
-/deep/ .el-uploadvideo .el-upload-list li {
-  height: auto !important;
-}
-// .disUoloadSty {
-//   .el-upload--picture-card {
-//     display: none;
-//     /* 上传按钮隐藏 */
-//   }
-// }
-
-// .el-form-item {
-//   /deep/ .el-form-item__label {
-//     font-size: 12px;
-//   }
-// }
-.el-uploadvideo {
-  .el-progress {
-    display: none !important;
-  }
-}
-.el-uploadfeng {
-  .el-upload-list__item {
-    width: 120px;
-    height: 120px;
+  /deep/ .el-uploadvoices .el-upload-list li {
+    height: auto !important;
   }
 
-  .el-upload--picture-card {
-    width: 120px;
-    height: 120px;
-    line-height: 120px;
-  }
-}
+  // .disUoloadSty {
+  //   .el-upload--picture-card {
+  //     display: none;
+  //     /* 上传按钮隐藏 */
+  //   }
+  // }
 
-.shangpin_editor .ql-editor {
-  height: 150px;
-}
+  // .el-form-item {
+  //   /deep/ .el-form-item__label {
+  //     font-size: 12px;
+  //   }
+  // }
+  .el-uploadvoices {
+    .el-progress {
+      display: none !important;
+    }
+  }
+
+  .el-uploadfeng {
+    .el-upload-list__item {
+      width: 120px;
+      height: 120px;
+    }
+
+    .el-upload--picture-card {
+      width: 120px;
+      height: 120px;
+      line-height: 120px;
+    }
+  }
+
+  .shangpin_editor .ql-editor {
+    height: 150px;
+  }
 </style>
diff --git a/src/views/modules/book/talkBook.vue b/src/views/modules/book/talkBook.vue
index 4448372..d603aec 100644
--- a/src/views/modules/book/talkBook.vue
+++ b/src/views/modules/book/talkBook.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="mod-config">      
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">       
+    <div class="mod-config">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
           <!-- <el-button @click="getDataList()">查询</el-button> -->
           <el-button v-if="isAuth('book:bookchapter:save')" type="primary" @click="addOrUpdateHandle()">增加讲书目录</el-button>
@@ -14,18 +14,18 @@
         :data="dataList"
         border
         v-loading="dataListLoading"
-        @selection-change="selectionChangeHandle"       
+        @selection-change="selectionChangeHandle"
         style="width: 100%;">
-        
+
         <el-table-column width="100"
-          prop="chapter"         
+          prop="chapter"
           align="center"
           label="章节序号">
         </el-table-column>
         <el-table-column
           prop="title"
           label="标题">
-        </el-table-column>        
+        </el-table-column>
         <el-table-column
           prop="content"
           header-align="center"
@@ -40,9 +40,19 @@
           label="音频">
           <template slot-scope="scope">
             <span v-if="scope.row.voices == ''">暂未上传音频</span>
-            <audio v-else id="resource" :src="scope.row.voices" controls  v-show='true' style="width: 350px;"></audio> 
+            <audio v-else id="resource" :src="scope.row.voices" controls  v-show='true' style="width: 350px;"></audio>
           </template>
-        </el-table-column>       
+        </el-table-column>
+           <el-table-column width="200"
+             prop="video"
+             header-align="center"
+             align="center"
+             label="视频">
+             <template slot-scope="scope">
+               <span v-if="scope.row.video == ''">暂未上传视频</span>
+               <span else>{{scope.row.video}}</span>
+             </template>
+           </el-table-column>
         <!-- <el-table-column
           prop="createTime"
           header-align="center"
@@ -67,9 +77,9 @@
           align="center"
           width="150"
           label="操作">
-          <template slot-scope="scope">  
+          <template slot-scope="scope">
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.teachId)">修改</el-button>
-            <router-link :to="{path: 'commentsList' , query:{ teachId : scope.row.teachId} }">        
+            <router-link :to="{path: 'commentsList' , query:{ teachId : scope.row.teachId} }">
               <el-button type="text" size="small">评论管理</el-button>
             </router-link>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.teachId)">删除</el-button>
@@ -89,7 +99,7 @@
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
   </template>
-  
+
   <script>
     import AddOrUpdate from './talkBook-add-or-update'
     export default {
@@ -172,7 +182,7 @@
         // 新增 / 修改
         addOrUpdateHandle (id) {
           this.addOrUpdateVisible = true
-          this.$nextTick(() => {          
+          this.$nextTick(() => {
             this.$refs.addOrUpdate.init(id, this.bookid)
           })
         },
@@ -188,7 +198,7 @@
           }).then(() => {
             this.$http({
               url: this.$http.adornUrl('/book/teach/delTeach'),
-              method: 'post',              
+              method: 'post',
               // data: this.$http.adornData(ids, false)
               //  data: {'teachId': id}
                 data: this.$http.adornData({
@@ -213,4 +223,3 @@
       }
     }
   </script>
-  
\ No newline at end of file
diff --git a/src/views/modules/medical/publish.vue b/src/views/modules/medical/publish.vue
index 18fa60f..1ad38db 100644
--- a/src/views/modules/medical/publish.vue
+++ b/src/views/modules/medical/publish.vue
@@ -1,288 +1,288 @@
 <template>
-    <div class="mod-config">
-        <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-            <el-form-item label="分类">
-                <el-select v-model="dataForm.dictType" placeholder="请选择分类">
-                    <el-option v-for="(item,index) in typeList" :key="index" :label="item.dictValue" :value="item.dictType">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="书名">
-                <el-input v-model="dataForm.bookName" placeholder="请输入书名"></el-input>
-            </el-form-item>
-        <el-form-item>
-            <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
-            <el-button v-if="isAuth('book:shopproduct:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        </el-form-item>
-        </el-form>
-        <el-table
-        :data="dataList"
-        border
-        v-loading="dataListLoading"
-        style="width: 100%;">
-        <el-table-column
-            header-align="center"
-            align="center"
-            label="分类">
-            <template slot-scope="scope"> 
-                {{ filterAA(scope.row.typeId) }}
-            </template>
-        </el-table-column>
-        <el-table-column label="书名" align="center">
-            <template slot-scope="scope"> 
-                {{ scope.row.book.name }}
-            </template>
-        </el-table-column> 
-        <el-table-column
-            fixed="right"
-            header-align="center"
-            align="center"
-            width="150"
-            label="操作">
-            <template slot-scope="scope">
-            <el-button type="text" size="small" @click="editOrUpdateHandle(scope.row)">修改</el-button>
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-            </template>
-        </el-table-column>
-        </el-table>
-        <el-pagination
-        @size-change="sizeChangeHandle"
-        @current-change="currentChangeHandle"
-        :current-page="pageIndex"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="pageSize"
-        :total="totalPage"
-        layout="total, sizes, prev, pager, next, jumper">
-        </el-pagination>
-        <!-- 弹窗, 新增 / 修改 -->
-        <el-dialog :visible.sync="addOrUpdateVisible" :append-to-body="true" :title="titlesub" width="50%" @close="cancleClose">
-            <el-form :inline="true" :model="addForm" ref="addFormRef" :rules="addFormRule">
-                <el-row type="flex" justify="center">
-                    <el-form-item label="分类" prop="typeId">
-                        <el-select v-model="addForm.typeId" placeholder="请选择分类" style="width: 500px;">
-                            <el-option v-for="(item,index) in typeList" :key="index" :label="item.dictValue" :value="item.dictType">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-row>
-                <el-row type="flex" justify="center">
-                    <el-form-item label="书名" prop="bookId">
-                        <el-select v-model="addForm.bookId" placeholder="请选择书名" style="width: 500px;">
-                            <el-option v-for="item in booknameList" :key="item.id" :label="item.name" :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-row>
-                <el-row type="flex" justify="center">
-                    <el-form-item label="排序" label-width="48px">
-                        <el-input style="width:500px" v-model="addForm.sort"></el-input>
-                    </el-form-item>
-                </el-row>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="cancleClose">取 消</el-button>
-                <el-button type="primary" @click="addOreEditCate">确 定</el-button>
-            </span>
-        </el-dialog>
-        <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @showchooseBookf = "showchooseBookf"></add-or-update>
+  <div class="mod-config">
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item label="分类">
+        <el-select v-model="dataForm.dictType" placeholder="请选择分类">
+          <el-option v-for="(item,index) in typeList" :key="index" :label="item.dictValue" :value="item.dictType">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="书名">
+        <el-input v-model="dataForm.bookName" placeholder="请输入书名"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="pageIndex = 1;getDataList()">查询</el-button>
+        <el-button v-if="isAuth('book:shopproduct:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="dataList" border v-loading="dataListLoading" style="width: 100%;">
+      <el-table-column header-align="center" align="center" label="分类">
+        <template slot-scope="scope">
+          {{ filterAA(scope.row.typeId) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="书名" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.book.name }}
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="editOrUpdateHandle(scope.row)">修改</el-button>
+          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <el-dialog :visible.sync="addOrUpdateVisible" :append-to-body="true" :title="titlesub" width="50%"
+      @close="cancleClose">
+      <el-form :inline="true" :model="addForm" ref="addFormRef" :rules="addFormRule">
+        <el-row type="flex" justify="center">
+          <el-form-item label="分类" prop="typeId">
+            <el-select v-model="addForm.typeId" placeholder="请选择分类" style="width: 500px;">
+              <el-option v-for="(item,index) in typeList" :key="index" :label="item.dictValue" :value="item.dictType">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-form-item label="书名" prop="bookId">
+            <el-select v-model="addForm.bookId" placeholder="请选择书名" style="width: 500px;">
+              <el-option v-for="item in booknameList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-form-item label="排序" label-width="48px">
+            <el-input style="width:500px" v-model="addForm.sort"></el-input>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="cancleClose">取 消</el-button>
+        <el-button type="primary" @click="addOreEditCate">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" @showchooseBookf = "showchooseBookf"></add-or-update>
         <choose-book v-if="chooseBookVisible" :bookIds = bookIds ref="chooseBook" :chooseBookVisible = chooseBookVisible @closeBookf = "closeBookf"></choose-book>   -->
-    </div>
+  </div>
 </template>
 <script>
-export default {
-    data () {
-        return {
-            typeList: [], //类型列表
-            booknameList: [],
-            dataForm: {
-                dictType: '',//分类
-                bookName: '',//书名
-            },
-            addForm: {
-                "id": '',//新增不传
-                "bookId": '',
-                "typeId": '',
-                "sort": ''
-            },
-            editId: '',
-            addFormRule: {
-                typeId: [{required: true, message: "请选择分类" }],
-                bookId: [{required: true, message: "请选择书名"}]
-            },
-            dataList: [],
-            // publishStatus: false,
-            pageIndex: 1,
-            pageSize: 10,
-            totalPage: 0,
-            dataListLoading: false,
-            dataListSelections: [],
-            addOrUpdateVisible: false,
-            bookIds:[],
-            titlesub: '新增'
-        }
+  export default {
+    data() {
+      return {
+        typeList: [], //类型列表
+        booknameList: [],
+        dataForm: {
+          dictType: '', //分类
+          bookName: '', //书名
+        },
+        addForm: {
+          "id": '', //新增不传
+          "bookId": '',
+          "typeId": '',
+          "sort": ''
+        },
+        editId: '',
+        addFormRule: {
+          typeId: [{
+            required: true,
+            message: "请选择分类"
+          }],
+          bookId: [{
+            required: true,
+            message: "请选择书名"
+          }]
+        },
+        dataList: [],
+        // publishStatus: false,
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        dataListSelections: [],
+        addOrUpdateVisible: false,
+        bookIds: [],
+        titlesub: '新增'
+      }
     },
     components: {
-    // AddOrUpdate,
-    // chooseBook
+      // AddOrUpdate,
+      // chooseBook
     },
-    activated () {
-        this.gettypeList()
-        this.getDataList()
+    activated() {
+      this.gettypeList()
+      this.getDataList()
     },
     methods: {
-        gettypeList () {
-            this.$http({
-                url: this.$http.adornUrl('/book/medicaldes/typeList?label=medicaldesBookType'),
-                method: 'post',
-            }).then(({data}) => {
-                if (data && data.code === 0) {
-                    this.typeList = data.result
-                
-                } else {
-                    this.typeList = []
-                }
-            })
-        },
-        // 获取数据列表
-        getDataList () {
-            this.dataListLoading = true
-            this.$http({
-            url: this.$http.adornUrl('/book/medicaldes/bookRelationListByType'),
-            method: 'post',
-            data: this.$http.adornData({
-                "dictType": this.dataForm.dictType,
-                "bookName": this.dataForm.bookName,
-                "current": this.pageIndex,
-                "limit": this.pageSize
-            })
-            }).then(({data}) => {
-            if (data && data.code === 0) {
-                this.dataList = data.result.records
-                this.totalPage = data.result.total
-            } else {
-                this.dataList = []
-                this.totalPage = 0
-            }
-            this.dataListLoading = false
-            })
-        },
-        getbookname() {
-            // 获取数据列表
+      gettypeList() {
         this.$http({
-            url: this.$http.adornUrl('/book/book/list'),
-            method: 'get',
-            params: this.$http.adornParams({
+          url: this.$http.adornUrl('/book/medicaldes/typeList?label=medicaldesBookType'),
+          method: 'post',
+        }).then(({
+          data
+        }) => {
+          if (data && data.code === 0) {
+            this.typeList = data.result
+
+          } else {
+            this.typeList = []
+          }
+        })
+      },
+      // 获取数据列表
+      getDataList() {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/book/medicaldes/bookRelationListByType'),
+          method: 'post',
+          data: this.$http.adornData({
+            "dictType": this.dataForm.dictType,
+            "bookName": this.dataForm.bookName,
+            "current": this.pageIndex,
+            "limit": this.pageSize
+          })
+        }).then(({
+          data
+        }) => {
+          if (data && data.code === 0) {
+            this.dataList = data.result.records
+            this.totalPage = data.result.total
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      getbookname() {
+        // 获取数据列表
+        this.$http({
+          url: this.$http.adornUrl('/book/medicaldes/bookList'),
+          method: 'get',
+          params: this.$http.adornParams({
             'page': 1,
             'limit': 1000000,
             'bookName': '',
-            'publisherName' : '',
-            'authorName' : ''
-            })
-            }).then(({ data }) => {
-                if (data && data.code === 0) {
-                    this.booknameList = data.page.list
-                } else {
-                    this.booknameList = []
-                }
-            })
-            
-        },
-        filterAA(val){
-            var aa = this.typeList.filter(obj => obj.dictType == val)
-            return aa[0].dictValue
-        },
-        // 每页数
-        sizeChangeHandle (val) {
-            this.pageSize = val
-            this.pageIndex = 1
-            this.getDataList()
-        },
-        // 当前页
-        currentChangeHandle (val) {
-            this.pageIndex = val
-            this.getDataList()
-        },
-        // 多选
-        selectionChangeHandle (val) {
-            this.dataListSelections = val
-        },
-        // 新增 / 修改
-        editOrUpdateHandle (row) {
-            this.titlesub = '修改'
-            this.getbookname()
-            this.editId = row.id
-            this.addForm.bookId = row.bookId
-            this.addForm.typeId = row.typeId.toString()
-            this.addForm.sort = row.sort
-            this.addOrUpdateVisible = true
-            
-        },
-        addOrUpdateHandle() {
-            this.getbookname()
-            this.editId = ''
-            this.titlesub = '新增'
-            this.addOrUpdateVisible = true
-        },
-        cancleClose() {
-            this.addOrUpdateVisible = false
-            this.$refs["addFormRef"].resetFields();
-            this.addForm = {
-                "id": '',//新增不传
-                "bookId": '',
-                "typeId": '',
-                "sort": ''
-            }
-        },
-        // 删除
-        deleteHandle (id) {
-            this.$confirm('请确认是否删除?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-            }).then(() => {
-            this.$http({
-                url: this.$http.adornUrl(`/book/medicaldes/delBookRelation?id=${id}`),
-                method: 'post',
-            }).then(({data}) => {
-                if (data && data.code === 0) {
-                this.$message({
-                    message: '操作成功',
-                    type: 'success',
-                    duration: 1500,
-                    onClose: () => {
-                    this.getDataList()
-                    }
-                })
-                } else {
-                this.$message.error(data.msg)
-                }
-            })
-            })
-        },
-        addOreEditCate() {
-            this.$refs["addFormRef"].validate(valid => {
-                if(valid) {
-                    this.$http({
-                        url: this.$http.adornUrl('/book/medicaldes/saveOrUpdateBookRelation'),
-                        method: 'post',
-                        data: this.$http.adornData({
-                            "id": this.editId, //新增不传
-                            "bookId": this.addForm.bookId,
-                            "typeId": this.addForm.typeId,
-                            "sort": this.addForm.sort
-                        })
-                    }).then(({data}) => {
-                        if (data && data.code === 0) {
-                            this.$message.success("成功");
-                            this.addOrUpdateVisible = false
-                            this.getDataList()
-                        } else {
-                            this.$message.error("失败");
-                        }
-                    })
-                }
-            })
+            'publisherName': '',
+            'authorName': ''
+          })
+        }).then(({
+          data
+        }) => {
+          if (data && data.code === 0) {
+            this.booknameList = data.page.list
+          } else {
+            this.booknameList = []
+          }
+        })
+
+      },
+      filterAA(val) {
+        var aa = this.typeList.filter(obj => obj.dictType == val)
+        return aa[0].dictValue
+      },
+      // 每页数
+      sizeChangeHandle(val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle(val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle(val) {
+        this.dataListSelections = val
+      },
+      // 新增 / 修改
+      editOrUpdateHandle(row) {
+        this.titlesub = '修改'
+        this.getbookname()
+        this.editId = row.id
+        this.addForm.bookId = row.bookId
+        this.addForm.typeId = row.typeId.toString()
+        this.addForm.sort = row.sort
+        this.addOrUpdateVisible = true
+
+      },
+      addOrUpdateHandle() {
+        this.getbookname()
+        this.editId = ''
+        this.titlesub = '新增'
+        this.addOrUpdateVisible = true
+      },
+      cancleClose() {
+        this.addOrUpdateVisible = false
+        this.$refs["addFormRef"].resetFields();
+        this.addForm = {
+          "id": '', //新增不传
+          "bookId": '',
+          "typeId": '',
+          "sort": ''
         }
+      },
+      // 删除
+      deleteHandle(id) {
+        this.$confirm('请确认是否删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl(`/book/medicaldes/delBookRelation?id=${id}`),
+            method: 'post',
+          }).then(({
+            data
+          }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        })
+      },
+      addOreEditCate() {
+        this.$refs["addFormRef"].validate(valid => {
+          if (valid) {
+            this.$http({
+              url: this.$http.adornUrl('/book/medicaldes/saveOrUpdateBookRelation'),
+              method: 'post',
+              data: this.$http.adornData({
+                "id": this.editId, //新增不传
+                "bookId": this.addForm.bookId,
+                "typeId": this.addForm.typeId,
+                "sort": this.addForm.sort
+              })
+            }).then(({
+              data
+            }) => {
+              if (data && data.code === 0) {
+                this.$message.success("成功");
+                this.addOrUpdateVisible = false
+                this.getDataList()
+              } else {
+                this.$message.error("失败");
+              }
+            })
+          }
+        })
+      }
     }
-}
-</script>
+  }
+</script>
\ No newline at end of file
diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue
index 533b710..04b5b62 100644
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@@ -1,7 +1,8 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible" @close="handlereset">
+  <el-dialog :title="!dataForm.id ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"
+    @close="handlereset">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
-      label-width="80px">
+      label-width="120px">
       <el-form-item label="姓名" prop="name">
         <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
@@ -12,36 +13,35 @@
         <el-input v-model="dataForm.password" placeholder="密码"></el-input>
       </el-form-item>
       <div v-if="dataForm.id">
-      <el-form-item label="年龄" prop="age">
-        <el-input v-model="dataForm.age" placeholder="年龄"></el-input>
-      </el-form-item>
-      <el-form-item label="性别" prop="sex">
-        <!-- <el-input v-model="dataForm.sex" placeholder="性别"></el-input> -->
-        <el-radio v-model="dataForm.sex" :label=2>保密</el-radio>
-        <el-radio v-model="dataForm.sex" :label=1>男</el-radio>
-        <el-radio v-model="dataForm.sex" :label=0>女</el-radio>
-      </el-form-item>
-      <el-form-item label="头像" prop="avatar">
-        <!-- <el-input v-model="dataForm.avatar" placeholder="头像"></el-input> -->
-        <el-upload :action= "baseUrl + '/oss/fileoss'" list-type="picture-card"
-          :on-preview="handlePictureCardPreview" :file-list="fileList" :on-success="handlePicSuccess"
-          :on-remove="handleRemove">
-          <i class="el-icon-plus"></i>
-        </el-upload>
-        <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
-          <img width="100%" :src="dataForm.avatar" alt="">
-        </el-dialog>
-      </el-form-item>
-      <el-form-item label="昵称" prop="nickname">
-        <el-input v-model="dataForm.nickname" placeholder="昵称"></el-input>
-      </el-form-item>      
-      <!-- <el-form-item label="密码" prop="password">
+        <el-form-item label="年龄" prop="age">
+          <el-input v-model="dataForm.age" placeholder="年龄"></el-input>
+        </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <!-- <el-input v-model="dataForm.sex" placeholder="性别"></el-input> -->
+          <el-radio v-model="dataForm.sex" :label=2>保密</el-radio>
+          <el-radio v-model="dataForm.sex" :label=1>男</el-radio>
+          <el-radio v-model="dataForm.sex" :label=0>女</el-radio>
+        </el-form-item>
+        <el-form-item label="头像" prop="avatar">
+          <!-- <el-input v-model="dataForm.avatar" placeholder="头像"></el-input> -->
+          <el-upload :action="baseUrl + '/oss/fileoss'" list-type="picture-card" :on-preview="handlePictureCardPreview"
+            :file-list="fileList" :on-success="handlePicSuccess" :on-remove="handleRemove">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+            <img width="100%" :src="dataForm.avatar" alt="">
+          </el-dialog>
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickname">
+          <el-input v-model="dataForm.nickname" placeholder="昵称"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="密码" prop="password">
         <el-input v-model="dataForm.password" placeholder="密码"></el-input>
       </el-form-item> -->
-      <!-- <el-form-item label="会员类型" prop="vip">
+        <!-- <el-form-item label="会员类型" prop="vip">
         <el-input v-model="dataForm.vip" placeholder="0-普通 1-vip"></el-input>
       </el-form-item> -->
-      <!-- <el-form-item label="vip 有效期" prop="vipValidtime">
+        <!-- <el-form-item label="vip 有效期" prop="vipValidtime">
         <el-date-picker
           v-model="dataForm.vipValidtime"
           type="datetime"
@@ -51,17 +51,17 @@
         </el-date-picker>
          <el-input v-model="dataForm.vipValidtime" placeholder="vip 有效期"></el-input>
       </el-form-item> -->
-      <el-form-item label="花生币" prop="peanutCoin">
-        <!-- <el-input v-model="dataForm.peanutCoin" placeholder="花生币"></el-input> -->
-        <el-input-number disabled v-model="dataForm.peanutCoin"  label="花生币"></el-input-number>
-      </el-form-item>
-      <!-- <el-form-item label="阅读时间" prop="readTime">
+        <el-form-item label="花生币" prop="peanutCoin">
+          <!-- <el-input v-model="dataForm.peanutCoin" placeholder="花生币"></el-input> -->
+          <el-input-number disabled v-model="dataForm.peanutCoin" label="花生币"></el-input-number>
+        </el-form-item>
+        <!-- <el-form-item label="阅读时间" prop="readTime">
       <el-input v-model="dataForm.readTime" placeholder="阅读时间"></el-input>
     </el-form-item>
     <el-form-item label="最后登录时间" prop="lastLoginTime">
       <el-input v-model="dataForm.lastLoginTime" placeholder="最后登录时间"></el-input>
     </el-form-item> -->
-      <!-- <el-form-item label="创建时间" prop="createTime">
+        <!-- <el-form-item label="创建时间" prop="createTime">
       <el-input v-model="dataForm.createTime" placeholder="创建时间"></el-input>
     </el-form-item>
     <el-form-item label="更新时间" prop="updateTime">
@@ -70,7 +70,27 @@
     <el-form-item label="删除标记" prop="delFlag">
       <el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
     </el-form-item> -->
-  </div>
+        <el-form-item label="脉六权限" prop="pointPower">
+          <el-radio v-model="dataForm.pointPower" :label='0'>否</el-radio>
+          <el-radio v-model="dataForm.pointPower" :label='1'>是</el-radio>
+        </el-form-item>
+        <el-form-item label="时辰取穴权限" prop="tgdzPower">
+          <el-radio v-model="dataForm.tgdzPower" :label='0'>否</el-radio>
+          <el-radio v-model="dataForm.tgdzPower" :label='1'>是</el-radio>
+        </el-form-item>
+        <el-form-item label="五运六气权限" prop="wylqPower">
+          <el-radio v-model="dataForm.wylqPower" :label='0'>否</el-radio>
+          <el-radio v-model="dataForm.wylqPower" :label='1'>是</el-radio>
+        </el-form-item>
+        <el-form-item label="吴门验方权限" prop="prescriptAPower">
+          <el-radio v-model="dataForm.prescriptAPower" :label='0'>否</el-radio>
+          <el-radio v-model="dataForm.prescriptAPower" :label='1'>是</el-radio>
+        </el-form-item>
+        <el-form-item label="肿瘤古方权限" prop="prescriptBPower">
+          <el-radio v-model="dataForm.prescriptBPower" :label='0'>否</el-radio>
+          <el-radio v-model="dataForm.prescriptBPower" :label='1'>是</el-radio>
+        </el-form-item>
+      </div>
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="handlereset">取消</el-button>
@@ -80,16 +100,16 @@
 </template>
 
 <script>
-import global from '../../common/common.vue'     //引入共用组间
-export default {
-  data() {
-    return {
-      baseUrl:global.baseUrl,  
-      visible: false,      
-      dialogVisible: false,     
-      fileList: [],
-      pickerOptions:{
-        shortcuts: [{
+  import global from '../../common/common.vue' //引入共用组间
+  export default {
+    data() {
+      return {
+        baseUrl: global.baseUrl,
+        visible: false,
+        dialogVisible: false,
+        fileList: [],
+        pickerOptions: {
+          shortcuts: [{
             text: '今天',
             onClick(picker) {
               picker.$emit('pick', new Date());
@@ -109,144 +129,171 @@ export default {
               picker.$emit('pick', date);
             }
           }]
-      },
-      dataForm: {
-        id: 0,
-        name: '',        
-        age: '',
-        sex: 2,
-        avatar: '',
-        nickname: '',
-        tel: '',
-        password: '',
-        vip: '',
-        vipValidtime: '',
-        peanutCoin: '',
-        readTime: '',
-        lastLoginTime: '',
-        createTime: '',
-        updateTime: '',
-        delFlag: '',
-      },
-      dataRule: {
-        name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: '密码不能为空', trigger: 'blur' }
-        ],
-        // age: [
-        //   { required: true, message: '年龄不能为空', trigger: 'blur' }
-        // ],
-        // sex: [
-        //   { required: true, message: '性别不能为空', trigger: 'blur' }
-        // ],
-        // avatar: [
-        //   { required: true, message: '头像不能为空', trigger: 'blur' }
-        // ],
-        // nickname: [
-        //   { required: true, message: '昵称不能为空', trigger: 'blur' }
-        // ],
-        tel: [
-          { required: true, message: '电话不能为空', trigger: 'blur' },
-          {
-            validator: function(rule, value, callback) {
-              if (/^1[34578]\d{9}$/.test(value) == false) {
-                callback(new Error("手机号格式错误"));
-              } else {
-                callback();
-              }
+        },
+        dataForm: {
+          id: 0,
+          name: '',
+          age: '',
+          sex: 2,
+          avatar: '',
+          nickname: '',
+          tel: '',
+          password: '',
+          vip: '',
+          vipValidtime: '',
+          peanutCoin: '',
+          readTime: '',
+          lastLoginTime: '',
+          createTime: '',
+          updateTime: '',
+          delFlag: '',
+          pointPower: 0,
+          tgdzPower: 0,
+          wylqPower: 0,
+          prescriptAPower: 0,
+          prescriptBPower: 0,
+        },
+        dataRule: {
+          name: [{
+            required: true,
+            message: '姓名不能为空',
+            trigger: 'blur'
+          }],
+          password: [{
+            required: true,
+            message: '密码不能为空',
+            trigger: 'blur'
+          }],
+          // age: [
+          //   { required: true, message: '年龄不能为空', trigger: 'blur' }
+          // ],
+          // sex: [
+          //   { required: true, message: '性别不能为空', trigger: 'blur' }
+          // ],
+          // avatar: [
+          //   { required: true, message: '头像不能为空', trigger: 'blur' }
+          // ],
+          // nickname: [
+          //   { required: true, message: '昵称不能为空', trigger: 'blur' }
+          // ],
+          tel: [{
+              required: true,
+              message: '电话不能为空',
+              trigger: 'blur'
             },
-            trigger: "blur"
-          }
-        ],
-        // password: [
-        //   { required: true, message: '密码不能为空', trigger: 'blur' }
-        // ],
-        // vip: [
-        //   { required: true, message: '0-普通 1-vip不能为空', trigger: 'blur' }
-        // ],
-        // vipValidtime: [
-        //   { required: true, message: 'vip 有效期不能为空', trigger: 'blur' }
-        // ],
-        // peanutCoin: [
-        //   { required: true, message: '花生币不能为空', trigger: 'blur' }
-        // ],
-        // readTime: [
-        //   { required: true, message: '阅读时间不能为空', trigger: 'blur' }
-        // ],
-        // lastLoginTime: [
-        //   { required: true, message: '最后登录时间不能为空', trigger: 'blur' }
-        // ],
-        // createTime: [
-        //   { required: true, message: '创建时间不能为空', trigger: 'blur' }
-        // ],
-        // updateTime: [
-        //   { required: true, message: '更新时间不能为空', trigger: 'blur' }
-        // ],
-        // delFlag: [
-        //   { required: true, message: '删除标记不能为空', trigger: 'blur' }
-        // ]
-      }
-    }
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || 0
-      this.visible = true
-      this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
-        if (this.dataForm.id) {
-          this.$http({
-            url: this.$http.adornUrl(`/book/user/info/${this.dataForm.id}`),
-            method: 'get',
-            params: this.$http.adornParams()
-          }).then(({ data }) => {
-            if (data && data.code === 0) {
-              this.dataForm.name = data.user.name
-              this.dataForm.age = data.user.age
-              this.dataForm.sex = data.user.sex              
-              this.dataForm.avatar = data.user.avatar
-              this.dataForm.nickname = data.user.nickname
-              this.dataForm.tel = data.user.tel
-              this.dataForm.password = data.user.password
-              this.dataForm.vip = data.user.vip
-              this.dataForm.vipValidtime = data.user.vipValidtime
-              this.dataForm.peanutCoin = data.user.peanutCoin
-              this.dataForm.readTime = data.user.readTime
-              this.dataForm.lastLoginTime = data.user.lastLoginTime
-              this.dataForm.createTime = data.user.createTime
-              this.dataForm.updateTime = data.user.updateTime
-              this.dataForm.delFlag = data.user.delFlag
-              if (data.user.avatar && data.user.avatar != "") {
-                var img = { name: '', url: data.user.avatar }
-                var attr = []
-                attr.push(img)
-                this.fileList = attr
-              }              
+            {
+              validator: function(rule, value, callback) {
+                if (/^1[34578]\d{9}$/.test(value) == false) {
+                  callback(new Error("手机号格式错误"));
+                } else {
+                  callback();
+                }
+              },
+              trigger: "blur"
             }
-          })
+          ],
+          // password: [
+          //   { required: true, message: '密码不能为空', trigger: 'blur' }
+          // ],
+          // vip: [
+          //   { required: true, message: '0-普通 1-vip不能为空', trigger: 'blur' }
+          // ],
+          // vipValidtime: [
+          //   { required: true, message: 'vip 有效期不能为空', trigger: 'blur' }
+          // ],
+          // peanutCoin: [
+          //   { required: true, message: '花生币不能为空', trigger: 'blur' }
+          // ],
+          // readTime: [
+          //   { required: true, message: '阅读时间不能为空', trigger: 'blur' }
+          // ],
+          // lastLoginTime: [
+          //   { required: true, message: '最后登录时间不能为空', trigger: 'blur' }
+          // ],
+          // createTime: [
+          //   { required: true, message: '创建时间不能为空', trigger: 'blur' }
+          // ],
+          // updateTime: [
+          //   { required: true, message: '更新时间不能为空', trigger: 'blur' }
+          // ],
+          // delFlag: [
+          //   { required: true, message: '删除标记不能为空', trigger: 'blur' }
+          // ]
         }
-      })
+      }
     },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs['dataForm'].validate((valid) => {
-        let myData = {}
-        if(!this.dataForm.id){
-          myData = {
-            'name': this.dataForm.name,
-            'tel': this.dataForm.tel,
+    methods: {
+      init(id) {
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          if (this.dataForm.id) {
+            this.$http({
+              url: this.$http.adornUrl(`/book/user/info/${this.dataForm.id}`),
+              method: 'get',
+              params: this.$http.adornParams()
+            }).then(({
+              data
+            }) => {
+              if (data && data.code === 0) {
+                this.dataForm.name = data.user.name
+                this.dataForm.age = data.user.age
+                this.dataForm.sex = data.user.sex
+                this.dataForm.avatar = data.user.avatar
+                this.dataForm.nickname = data.user.nickname
+                this.dataForm.tel = data.user.tel
+                this.dataForm.password = data.user.password
+                this.dataForm.vip = data.user.vip
+                this.dataForm.vipValidtime = data.user.vipValidtime
+                this.dataForm.peanutCoin = data.user.peanutCoin
+                this.dataForm.readTime = data.user.readTime
+                this.dataForm.lastLoginTime = data.user.lastLoginTime
+                this.dataForm.createTime = data.user.createTime
+                this.dataForm.updateTime = data.user.updateTime
+                this.dataForm.delFlag = data.user.delFlag
+                this.dataForm.pointPower = data.user.pointPower
+                this.dataForm.tgdzPower = data.user.tgdzPower
+                this.dataForm.wylqPower = data.user.wylqPower
+                this.dataForm.prescriptAPower = data.user.prescriptAPower
+                this.dataForm.prescriptBPower = data.user.prescriptBPower
+                if (data.user.avatar && data.user.avatar != "") {
+                  var img = {
+                    name: '',
+                    url: data.user.avatar
+                  }
+                  var attr = []
+                  attr.push(img)
+                  this.fileList = attr
+                }
+              }
+            })
           }
-        }else{
-          myData = {
-            'id': this.dataForm.id,
+        })
+      },
+      // 表单提交
+      dataFormSubmit() {
+        this.$refs['dataForm'].validate((valid) => {
+          let myData = {}
+          if (!this.dataForm.id) {
+            myData = {
+              'name': this.dataForm.name,
+              'tel': this.dataForm.tel,
+            }
+          } else {
+            myData = {
+              'id': this.dataForm.id,
               'name': this.dataForm.name,
               'age': this.dataForm.age,
               'sex': this.dataForm.sex,
               'avatar': this.dataForm.avatar,
               'nickname': this.dataForm.nickname,
               'tel': this.dataForm.tel,
+              'pointPower': this.dataForm.pointPower,
+              'tgdzPower': this.dataForm.tgdzPower,
+              'wylqPower': this.dataForm.wylqPower,
+              'prescriptAPower': this.dataForm.prescriptAPower,
+              'prescriptBPower': this.dataForm.prescriptBPower,
               // 'password': this.dataForm.password,
               // 'vip': this.dataForm.vip,
               // 'vipValidtime': this.dataForm.vipValidtime,
@@ -256,54 +303,56 @@ export default {
               // 'createTime': this.dataForm.createTime,
               // 'updateTime': this.dataForm.updateTime,
               // 'delFlag': this.dataForm.delFlag
-          }
-        }
-        console.log('myData', myData)       
-        if (valid) {
-          this.$http({
-            url: this.$http.adornUrl(`/book/user/${!this.dataForm.id ? 'save' : 'update'}`),
-            method: 'post',
-            data: this.$http.adornData(myData)
-          }).then(({ data }) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {                 
-                  this.visible = false
-                  this.$emit('refreshDataList')
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
             }
-          })
+          }
+          console.log('myData', myData)
+          if (valid) {
+            this.$http({
+              url: this.$http.adornUrl(`/book/user/${!this.dataForm.id ? 'save' : 'update'}`),
+              method: 'post',
+              data: this.$http.adornData(myData)
+            }).then(({
+              data
+            }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          }
+        })
+      },
+      handlePictureCardPreview(file) {
+        this.dataForm.avatar = file.url;
+        this.dialogVisible = true;
+      },
+      handlePicSuccess(res, file) {
+        if (res.msg == "success") {
+          this.dataForm.avatar = res.url;
+          this.$message.success("上传成功");
+        } else {
+          this.$message.error("上传失败");
         }
-      })
-    },    
-    handlePictureCardPreview(file) {
-      this.dataForm.avatar = file.url;
-      this.dialogVisible = true;
-    }, 
-    handlePicSuccess(res, file) {
-      if (res.msg == "success") {
-        this.dataForm.avatar = res.url;
-        this.$message.success("上传成功");
-      } else {
-        this.$message.error("上传失败");
-      }
-    }, 
-    handleRemove(file) {
-      this.dataForm.avatar = '';
-    },
-    handlereset(){
-      // console.log('关闭了')
-       this.$refs['dataForm'].resetFields() 
-       this.dataForm.password = ''   
-      this.fileList = [],
-      this.visible = false
-    },
+      },
+      handleRemove(file) {
+        this.dataForm.avatar = '';
+      },
+      handlereset() {
+        // console.log('关闭了')
+        this.$refs['dataForm'].resetFields()
+        this.dataForm.password = ''
+        this.fileList = [],
+          this.visible = false
+      },
+    }
   }
-}
-</script>
+</script>
\ No newline at end of file