脉穴管理

src/element-ui/index.js

@@ -78,7 +78,7 @@ import {
   Notification,
   Timeline,
   TimelineItem,
-  // Drawer
+  Link,
 } from 'element-ui'
 
 Vue.use(Timeline)
@@ -146,7 +146,7 @@ Vue.use(Header)
 Vue.use(Aside)
 Vue.use(Main)
 Vue.use(Footer)
-// Vue.use(Drawer)
+Vue.use(Link)
 
 Vue.use(Loading.directive)
 

src/router/index.js

@@ -51,7 +51,9 @@ const mainRoutes = {
     { path: '/book-comments', component: _import('modules/book/bookComments'), name: 'book-comments', meta: { title: '书评管理', isTab: true } },
     { path: '/clock', component: _import('modules/book/clock'), name: 'clock', meta: { title: '打卡管理', isTab: true } },
     { path: '/talkBook', component: _import('modules/book/talkBook'), name: 'talkBook', meta: { title: '讲书管理', isTab: true } },
-    { path: '/acupointManagement', component: _import('modules/acupointManagement'), name: 'acupointManagement', meta: { title: '穴位管理', isTab: true } },
+    { path: '/acupointManagement', component: _import('modules/acupoint/acupointManagement'), name: 'acupointManagement', meta: { title: '脉穴分类管理', isTab: true } },
+    { path: '/acupointList', component: _import('modules/acupoint/acupointList'), name: 'acupointList', meta: { title: '脉穴列表', isTab: true } },
+    { path: '/acupointDetail', component: _import('modules/acupoint/acupointDetail'), name: 'acupointDetail', meta: { title: '穴位详细', isTab: true } },
   ],
   beforeEnter (to, from, next) {
     let token = Vue.cookie.get('token')

src/views/modules/acupoint/acupointDetail.vue

@@ -0,0 +1,300 @@
+<template>
+  <div>
+    <el-breadcrumb separator-class="el-icon-arrow-right">
+      <el-breadcrumb-item :to="{ path: '/acupointManagement' }"
+        >穴位管理</el-breadcrumb-item
+      >
+      <el-breadcrumb-item>{{ pageTitle }}</el-breadcrumb-item>
+    </el-breadcrumb>
+    <div style="margin-top:20px; width: 600px">
+      <el-form ref="form" :model="form" label-width="80px" :rules="formRule">
+        <el-form-item label="穴位名称" prop="title">
+          <el-input
+            v-model="form.title"
+            placeholder="请输入穴位名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="穴位别名" prop="alias">
+          <el-input
+            v-model="form.alias"
+            placeholder="请输入穴位别名"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="所属分类" prop="pointCategoryId">
+            <el-cascader
+              :options="treeList"
+              :props="cateProps"
+              :emitPath= "false"
+              
+              @change="handleChange1"
+            >
+            </el-cascader>
+          </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model="form.sort" type="number"></el-input>
+        </el-form-item>
+        <el-form-item label="封面图">
+          <el-upload
+            :limit="3"
+            class="el-uploadfeng noneBtnImg"
+            :action="baseUrl + '/oss/fileoss'"
+            list-type="picture-card"
+            multiple
+            :on-exceed="handleExceed"
+            :file-list="fileList"
+            :on-success="handleSuccess"
+            accept=".jpeg,.jpg,.gif,.png"
+            :on-remove="handleRemoveNovel"
+          >
+            <i class="el-icon-plus"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="所属经络" prop="meridian">
+          <el-input
+            type="textarea"
+            v-model="form.meridian"
+            placeholder="请输入所属经络"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="解剖" prop="anatomy">
+          <el-input
+            type="textarea"
+            v-model="form.anatomy"
+            placeholder="请输入解剖"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="定位" prop="position">
+          <el-input
+            type="textarea"
+            v-model="form.position"
+            placeholder="请输入定位"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="主治" prop="indication">
+          <el-input
+            type="textarea"
+            v-model="form.indication"
+            placeholder="请输入主治"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="配伍" prop="compatibility">
+          <el-input
+            type="textarea"
+            v-model="form.compatibility"
+            placeholder="请输入配伍"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="文献" prop="literature">
+          <el-input
+            type="textarea"
+            v-model="form.literature"
+            placeholder="请输入文献"
+          ></el-input>
+        </el-form-item>
+        <div style="text-align:center">
+          <el-button type="primary" @click="submit">保 存</el-button>
+        </div>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+// const bc = new BroadcastChannel("myChannel");
+import global from "../../common/common.vue"; //引入共用组间
+export default {
+  data() {
+    return {
+      baseUrl: global.baseUrl,
+      pageTitle: this.$route.query.title,
+      form: {
+        id: this.$route.query.cid, // 穴位内容id
+        title: "",
+        pointCategoryId: this.$route.query.pid, // 父级的分类id
+        alias: "", //别名
+        meridian: "", //所属经络
+        position: "", //定位
+        anatomy: "", //解剖
+        indication: "", //主治
+        compatibility: "", //配伍
+        literature: "", //文献
+        sort: 0,
+        imageList: []
+      },
+      treeList:[],
+      cateProps: {
+        value: "id",
+        label: "title"
+      },
+      fileList: [],
+      formRule: {
+        title: [{ required: true, message: "穴位名称不能为空" }],
+        alias: [{ required: true, message: "穴位别名不能为空" }],
+        meridian: [{ required: true, message: "所属经络不能为空" }],
+        anatomy: [{ required: true, message: "解剖不能为空" }],
+        position: [{ required: true, message: "定位不能为空" }],
+        indication: [{ required: true, message: "主治不能为空" }],
+        compatibility: [{ required: true, message: "配伍不能为空" }],
+        literature: [{ required: true, message: "文献不能为空" }]
+      }
+    };
+  },
+  created() {
+    this.getCatTreeList()
+    this.getDetail();
+    
+  },  
+  methods: {
+    handleChange1(e){
+      console.log(e,'e')
+    },
+    getCatTreeList() {
+      this.loading = true;
+      this.$http({    
+        url: this.$http.adornUrl("/book/point/getPointCategoryList"),
+        method: "post"       
+      })
+        .then(({ data }) => {
+          console.log(data, "树形结构");
+          if (data.code == 0 && data.categorys.length > 0) {
+            this.treeList = data.categorys;            
+            console.log("执行后的结果", this.cateList);
+            //
+          } else {
+            this.treeList = [];           
+          }          
+        })
+        .catch(({ e }) => {         
+          console.log(e, "e");
+        });
+    },
+    // 获取穴位详情
+    getDetail() {
+      if (this.form.id) {
+        // 编辑
+        this.$http({
+          url: this.$http.adornUrl("/book/point/getPointDetail"),
+          method: "post",
+          data: this.$http.adornData({
+            pointId: this.form.id
+          })
+        })
+          .then(({ data }) => {
+            if (data.code == 0) {
+              console.log("内容详情", data);
+              this.form.alias = data.point.alias;
+              this.form.anatomy = data.point.anatomy;
+              this.form.compatibility = data.point.compatibility;
+              this.form.imageList = data.point.imageList;
+              this.form.indication = data.point.indication;
+              this.form.literature = data.point.literature;
+              this.form.meridian = data.point.meridian;
+              this.form.pointCategoryId = data.point.pointCategoryId;
+              this.form.position = data.point.position;
+              this.form.sort = data.point.sort;
+              this.form.title = data.point.title;
+              if (data.point.imageList.length > 0) {
+                data.point.imageList.forEach((element, index) => {
+                  this.fileList.push({
+                    name: index,
+                    url: element
+                  });
+                });
+                console.log("图片列表格式", this.fileList);
+              }
+            } else {
+            }
+          })
+          .catch(({ e }) => {
+            console.log(e, "e");
+          });
+      } else {
+        
+      }
+    },
+    handleRemoveNovel(file) {
+      console.log(file, this.fileList);
+      if (this.form.imageList.length > 0) {
+        this.form.imageList.forEach((element, index) => {
+          {
+            if (element == file.url) {
+              this.form.imageList.splice(index, 1);
+            }
+          }
+        });
+        console.log("删除后", this.form.imageList);
+      }
+      //   this.dataForm.images = [];
+    },
+    handleSuccess(file, fileList) {
+      console.log(file, fileList);
+      //   this.fileList.push();
+      this.form.imageList.push(file.url);
+      //   console.log(this.fileList, 66);
+      // this.dataForm.novel = file.url
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 3 个文件`);
+    },
+    // 提交保存
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let url = "";
+          this.form.id
+            ? (url = "/book/point/editPoint")
+            : (url = "/book/point/addPoint");
+          // console.log()
+          this.$http({
+            url: this.$http.adornUrl(url),
+            method: "post",
+            data: this.$http.adornData({
+              id: this.form.id,
+              title: this.form.title,
+              pointCategoryId: this.form.pointCategoryId,
+              alias: this.form.alias, //别名
+              meridian: this.form.meridian, //所属经络
+              position: this.form.position, //定位
+              anatomy: this.form.anatomy, //解剖
+              indication: this.form.indication, //主治
+              compatibility: this.form.compatibility, //配伍
+              literature: this.form.literature, //文献
+              sort: this.form.sort,
+              imageList: this.form.imageList
+            })
+          })
+            .then(({ data }) => {
+              if (data.code == 0) {
+                this.$message.success("操作成功");
+                // bc.postMessage("updateList");               
+                  this.$nextTick(() => {
+                    this.$refs["form"].resetFields();
+                  });
+                  this.fileList = [];                
+                // this.getCatTreeList();
+              }
+            })
+            .catch(({ e }) => {
+              console.log(e, "e");
+            });
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style lang="less" scope>
+.el-uploadfeng li,
+.el-uploadfeng .el-upload {
+  width: 80px !important;
+  height: 80px !important;
+}
+.el-uploadfeng .el-icon-plus {
+  line-height: 80px;
+}
+.el-uploadfeng .el-upload--picture-card{line-height: 80px;}
+.flexbox {
+  display: flex;
+}
+</style>

src/views/modules/acupoint/acupointList.vue

@@ -0,0 +1,468 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" :model="dataForm">
+      <el-cascader
+        clearable
+        placeholder="请选择分类"
+        :options="treeList"
+        :props="cateProps"
+        :emitPath="false"
+        @change="handleChange1"
+      >
+      </el-cascader>
+      <el-form-item>
+        <!-- <el-button @click="getDataList()">查询</el-button> -->
+        <el-button
+          v-if="isAuth('book:bookchapter:save')"
+          type="primary"
+          @click="addHandle()"
+          >增加穴位</el-button
+        >
+        <router-link :to="{ path: '/acupointManagement', query: {} }">
+          <el-button type="success">管理分类</el-button>
+        </router-link>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      style="width: 100%;"
+    >
+      <el-table-column prop="title" label="穴位名称"> </el-table-column>
+      <el-table-column prop="categoryString" label="所属分类"> </el-table-column>
+      <el-table-column prop="imageList" label="封面图">
+        <template slot-scope="scope">
+          <span v-for="(item, index) in scope.row.imageList" :key="index">
+            <img :src="item" width="70" class="tableImg" />
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序"> </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="editHandle(scope.row)"
+            >修改</el-button
+          >
+          <el-button type="text" size="small" @click="deleteContent(scope.row)"
+            >删除</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
+      :title="ctitle"
+      :visible.sync="dialogVisible"
+      width="600px"
+      @close="handleClose"
+    >
+      <div style="">
+        <el-form ref="form" :model="form" label-width="80px" :rules="formRule">
+          <el-form-item label="穴位名称" prop="title">
+            <el-input
+              v-model="form.title"
+              placeholder="请输入穴位名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="穴位别名" prop="alias">
+            <el-input
+              v-model="form.alias"
+              placeholder="请输入穴位别名"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="所属分类"
+            prop="pointCategoryIds"
+            v-if="ctitle == '添加穴位'"
+          >
+            <el-cascader
+              :options="treeList"
+              :props="cateProps"
+              :emitPath="false"
+              v-model="form.pointCategoryIds"
+            >
+            </el-cascader>
+          </el-form-item>
+          <el-form-item label="排序" prop="sort">
+            <el-input v-model="form.sort" type="number"></el-input>
+          </el-form-item>
+          <el-form-item label="封面图">
+            <el-upload
+              :limit="3"
+              class="el-uploadfeng noneBtnImg"
+              :action="baseUrl + '/oss/fileoss'"
+              list-type="picture-card"
+              multiple
+              :on-exceed="handleExceed"
+              :file-list="fileList"
+              :on-success="handleSuccess"
+              accept=".jpeg,.jpg,.gif,.png"
+              :on-remove="handleRemoveNovel"
+            >
+              <i class="el-icon-plus"></i>
+            </el-upload>
+          </el-form-item>
+          <el-form-item label="所属经络" prop="meridian">
+            <el-input
+              type="textarea"
+              v-model="form.meridian"
+              placeholder="请输入所属经络"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="解剖" prop="anatomy">
+            <el-input
+              type="textarea"
+              v-model="form.anatomy"
+              placeholder="请输入解剖"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="定位" prop="position">
+            <el-input
+              type="textarea"
+              v-model="form.position"
+              placeholder="请输入定位"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="主治" prop="indication">
+            <el-input
+              type="textarea"
+              v-model="form.indication"
+              placeholder="请输入主治"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="配伍" prop="compatibility">
+            <el-input
+              type="textarea"
+              v-model="form.compatibility"
+              placeholder="请输入配伍"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="文献" prop="literature">
+            <el-input
+              type="textarea"
+              v-model="form.literature"
+              placeholder="请输入文献"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import global from "../../common/common.vue"; //引入共用组间
+export default {
+  data() {
+    return {
+      baseUrl: global.baseUrl,
+      ctitle: "",
+      dataForm: {
+        key: ""
+      },
+      form: {
+        id: null, // 穴位内容id
+        title: "",
+        pointCategoryId: null, // 父级的分类id
+        alias: "", //别名
+        meridian: "", //所属经络
+        position: "", //定位
+        anatomy: "", //解剖
+        indication: "", //主治
+        compatibility: "", //配伍
+        literature: "", //文献
+        sort: 0,
+        imageList: [],
+        pointCategoryIds: []
+      },
+      fileList: [],
+      cateId: null,
+      dataList: [],
+      treeList: [],
+
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      cateProps: {
+        value: "id",
+        label: "title"
+      },
+
+      dialogVisible: false,
+      dataListLoading: false,
+      dataListSelections: [],
+      formRule: {
+        title: [{ required: true, message: "穴位名称不能为空" }],
+        alias: [{ required: true, message: "穴位别名不能为空" }],
+        meridian: [{ required: true, message: "所属经络不能为空" }],
+        anatomy: [{ required: true, message: "解剖不能为空" }],
+        position: [{ required: true, message: "定位不能为空" }],
+        indication: [{ required: true, message: "主治不能为空" }],
+        compatibility: [{ required: true, message: "配伍不能为空" }],
+        literature: [{ required: true, message: "文献不能为空" }],
+        pointCategoryIds: [{ required: true, message: "所属分类不能为空" }]
+      }
+    };
+  },
+  created() {
+    //this.getCatTreeList();
+  },
+  activated() {
+    this.getDataList();
+    this.getCatTreeList();
+  },
+  methods: {
+    getDetail(item) {
+      this.form.id = item;
+      if (this.form.id) {
+        // 编辑
+        this.$http({
+          url: this.$http.adornUrl("/book/point/getPointDetail"),
+          method: "post",
+          data: this.$http.adornData({
+            pointId: this.form.id
+          })
+        })
+          .then(({ data }) => {
+            if (data.code == 0) {
+              console.log("内容详情", data);
+              this.form.alias = data.point.alias;
+              this.form.anatomy = data.point.anatomy;
+              this.form.compatibility = data.point.compatibility;
+              this.form.imageList = data.point.imageList;
+              this.form.indication = data.point.indication;
+              this.form.literature = data.point.literature;
+              this.form.meridian = data.point.meridian;
+              this.form.pointCategoryId = data.point.pointCategoryId;
+              this.form.position = data.point.position;
+              this.form.sort = data.point.sort;
+              this.form.title = data.point.title;
+              if (data.point.imageList.length > 0) {
+                data.point.imageList.forEach((element, index) => {
+                  this.fileList.push({
+                    name: index,
+                    url: element
+                  });
+                });
+              }
+            } else {
+            }
+          })
+          .catch(({ e }) => {
+            console.log(e, "e");
+          });
+      } else {
+      }
+    },
+    handleRemoveNovel(file) {
+      console.log(file, this.fileList);
+      if (this.form.imageList.length > 0) {
+        this.form.imageList.forEach((element, index) => {
+          {
+            if (element == file.url) {
+              this.form.imageList.splice(index, 1);
+            }
+          }
+        });
+        console.log("删除后", this.form.imageList);
+      }
+      //   this.dataForm.images = [];
+    },
+    handleSuccess(file, fileList) {
+      console.log(file, fileList);
+      //   this.fileList.push();
+      this.form.imageList.push(file.url);
+      //   console.log(this.fileList, 66);
+      // this.dataForm.novel = file.url
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(`当前限制选择 3 个文件`);
+    },
+    handleClose() {
+      console.log("关闭了");
+      this.$nextTick(() => {
+        this.$refs["form"].resetFields();
+        // this.$refs["form"].clearValidate()
+        this.form.id = null
+      });
+      console.log("form", this.form);
+      this.fileList = [];
+      this.dialogVisible = false;
+    },
+    handleChange1(e) {
+      this.cateId = e[e.length - 1];
+      console.log("e", e, this.cateId);
+      this.getDataList();
+    },
+    getCatTreeList() {
+      this.loading = true;
+      this.$http({
+        url: this.$http.adornUrl("/book/point/getPointCategoryList"),
+        method: "post"
+      })
+        .then(({ data }) => {         
+          if (data.code == 0 && data.categorys.length > 0) {
+            this.treeList = data.categorys;          
+          } else {
+            this.treeList = [];
+          }
+        })
+        .catch(({ e }) => {
+          console.log(e, "e");
+        });
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http({
+        url: this.$http.adornUrl("/book/point/getPointList"),
+        method: "post",
+        data: this.$http.adornData({
+          page: this.pageIndex,
+          limit: this.pageSize,
+          pointCategoryId: this.cateId //此项为非必选
+        })
+      })
+        .then(({ data }) => {
+          if (data.code == 0) {
+            this.dataListLoading = false;
+            // 查找分类,并将新数据添加上
+            this.dataList = data.page.records;
+            this.totalPage = data.page.total;
+          }
+        })
+        .catch(({ e }) => {
+          this.dataListLoading = false;
+          console.log(e, "e");
+        });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val;
+      this.getDataList();
+    },
+    // 多选
+    selectionChangeHandle(val) {
+      this.dataListSelections = val;
+    },
+    // 新增
+    addHandle() {
+      this.ctitle = "添加穴位";
+      this.dialogVisible = true;
+    },
+    //  修改
+    editHandle(row) {
+      this.ctitle = "编辑穴位";
+      this.getDetail(row.id);
+      this.dialogVisible = true;
+    },
+    // 删除
+    deleteContent(item) {
+      this.$confirm("确定要删除该内容?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$http({
+            url: this.$http.adornUrl("/book/point/delPoint"),
+            method: "post",
+            data: this.$http.adornData({
+              pointId: item.id
+            })
+          }).then(({ data }) => {
+            if (data.code == 0) {
+              this.$message.success("删除成功");
+              this.getDataList();
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    // 提交保存
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let url = "";
+          this.form.id
+            ? (url = "/book/point/editPoint")
+            : (url = "/book/point/addPoint");
+
+          this.form.pointCategoryId = this.form.pointCategoryIds[
+            this.form.pointCategoryIds.length - 1
+          ];
+          this.$http({
+            url: this.$http.adornUrl(url),
+            method: "post",
+            data: this.$http.adornData({
+              id: this.form.id,
+              title: this.form.title,
+              pointCategoryId: this.form.pointCategoryId,
+              alias: this.form.alias, //别名
+              meridian: this.form.meridian, //所属经络
+              position: this.form.position, //定位
+              anatomy: this.form.anatomy, //解剖
+              indication: this.form.indication, //主治
+              compatibility: this.form.compatibility, //配伍
+              literature: this.form.literature, //文献
+              sort: this.form.sort,
+              imageList: this.form.imageList
+            })
+          })
+            .then(({ data }) => {
+              if (data.code == 0) {
+                this.$message.success("操作成功");
+                // bc.postMessage("updateList");
+                this.handleClose();
+                this.getDataList();
+              }
+            })
+            .catch(({ e }) => {
+              console.log(e, "e");
+            });
+        }
+      });
+    }
+  }
+};
+</script>
+<style lang="less">
+.el-uploadfeng li,
+.el-uploadfeng .el-upload {
+  width: 80px !important;
+  height: 80px !important;
+}
+.el-uploadfeng .el-icon-plus {
+  line-height: 80px;
+}
+.el-uploadfeng .el-upload--picture-card {
+  line-height: 80px;
+}
+</style>

src/views/modules/acupoint/acupointManagement copy.vue

@@ -0,0 +1,439 @@
+<template>
+  <div>
+    <div>
+      <el-button type="primary" @click="addCateVisible = true" style="margin-bottom: 15px"
+        >添加分类</el-button
+      >
+    </div>
+    <el-table
+      :data="cateList"
+      v-loading="loading"      
+      style="width: 100%"
+      row-key="id" 
+      border
+      default-expand-all 
+    >
+      <el-table-column width="100" label="分类 ID" prop="id"> </el-table-column>
+      <el-table-column label="分类名称" prop="title"> </el-table-column>
+      <el-table-column label="排序" prop="sort"> </el-table-column>
+      <el-table-column label="穴位列表" prop="contentList" width="900">
+        <template slot-scope="scope">
+          <div
+            v-if="contentChange && 
+              scope.row.pid != 0 &&
+                scope.row.content &&
+                scope.row.content.records.length > 0
+            "
+          >
+            <div class="flexbox contentList">
+              <div
+                class="flexbox contenItem"
+                v-for="(item, index) in scope.row.content.records"
+                :key="index"
+              >
+                <span>{{ item.title }}</span>
+                <div>
+                  <i class="el-icon-edit" @click="editContent(item)"></i
+                  ><i class="el-icon-delete" @click="deleteContent(item,index,scope.row)"></i>
+                </div>
+              </div>
+              <div v-show="scope.row.content.current != scope.row.content.pages"
+                class="contenItem"
+                style="color:#409eff; border-color: #409eff; cursor: pointer;"
+              >
+              {{scope.row.content.current}}{{scope.row.content.pages}}
+                <i class="el-icon-plus"></i
+                ><el-link 
+                  type="primary"
+                  style="color:#409eff"
+                  @click="getMoreContent(scope.row,scope.$index)"
+                  >查看更多</el-link
+                >
+              </div>
+            </div>
+
+            <div style="text-align: center"></div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column width="300">
+        <template slot-scope="scope">
+          <div style="text-align: right">
+            <el-button
+              @click="addCateVisible = true"
+              type="success"
+              size="mini"
+              v-if="scope.row.pid == 0"
+              >添加子分类</el-button
+            >
+            <el-button
+              type="success"
+              size="mini"
+              v-else
+              @click="goAddContent(scope.row)"
+              >添加穴位</el-button
+            >
+            <el-button
+              type="warning"
+              size="mini"
+              @click="editCateShow(scope.row)"
+              >修改</el-button
+            >
+            <el-button type="danger" size="mini" @click="deleteCate(scope.row)"
+              >删除</el-button
+            >
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 添加/修改分类 -->
+    <el-dialog title="提示" :visible.sync="addCateVisible" width="30%" center @close="addCateClose">
+      <div style="width:280px">
+        <el-form
+          ref="cateForm"
+          :model="cateForm"
+          label-width="80px"
+          :rules="cateFormRule"
+        >
+          <el-form-item label="分类名称" prop="title">
+            <el-input
+              v-model="cateForm.title"
+              placeholder="请输入分类名称"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="父级分类">
+            <el-select v-model="cateForm.pid" placeholder="不选默认为顶级分类">
+              <el-option
+                v-for="item in treeList"
+                :label="item.title"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+            <!-- <el-cascader
+              :options="treeList"
+              :props="cateProps"
+              v-model="cateForm.pid"
+              @change="handleChange1"
+            >
+            </el-cascader> -->
+          </el-form-item>
+          <el-form-item label="paixu">
+            <el-input
+              v-model="cateForm.sort"
+              type="number"
+              placeholder="请输入排序,默认0"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addCateClose">取 消</el-button>
+        <el-button type="primary" @click="addOreEditCate">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      treeList: [],
+      cateList: [], // 渲染的数据列表
+      loading: false,
+      addCateVisible: false,
+      cateForm: {
+        sort: 0,
+        title: "",
+        pid: null,
+        id: null
+      },
+      contentChange:true,
+      cateProps: {
+        value: "id",
+        label: "title"
+      },
+      cateFormRule: {
+        title: [{ required: true, message: "分类名称不能为空" }]
+      }
+    };
+  },
+  created() {
+    this.getCatTreeList();
+  },
+  activated(){
+    console.log('激活了')
+  },
+  methods: {
+    // 点击查看更多，获取翻页内容
+    getMoreContent(row, index) {
+      console.log("加载更多",index, row);
+      if(row.content.current + 1 <= row.content.pages){
+        this.getContentList(row.id, row.content.current + 1, index)
+      }else{
+        this.$message.error('已全部加载完毕，没有更多了')
+      }
+     
+    },
+    // 获取二级分类下的内容
+    getContentList(cateId,pageIndex,index) {
+      console.log('收到的参数', cateId,pageIndex,index)      
+      this.$http({
+        url: this.$http.adornUrl("/book/point/getPointList"),
+        method: "post",
+        data: this.$http.adornData({
+          limit: 10,
+          page: pageIndex,
+          pointCategoryId: cateId //此项为非必选
+        })
+      })
+        .then(({ data }) => {          
+          if (data.code == 0) {
+            this.contentChange = false
+            console.log("date二级内容", data.page);
+            // 查找分类,并将新数据添加上
+            this.cateList.forEach(element => {
+              element.children.forEach(element1 => {
+                if(element1.id == cateId){
+                  element1.content.current = data.page.current
+                  element1.content.records = element1.content.records.concat(data.page.records)
+                  this.contentChange = true
+                }
+              })
+            })
+            console.log('追加后的数据', this.cateList)
+          }
+        })
+        .catch(({ e }) => {
+          console.log(e, "e");
+        });
+    },
+    // 添加内容
+    goAddContent(row) {
+      // this.$router.push({ name:'acupointDetail' , params: {pid:row.id, title:'添加穴位'}})
+      this.$router.push({
+        path: "/acupointDetail",
+        query: { pid: row.id, title: "添加穴位" }
+      });
+    },
+    // 删除分类
+    deleteCate(row) {
+      this.$confirm("确定删除该分类？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$http({
+            url: this.$http.adornUrl("/book/point/delPointCategory"),
+            method: "post",
+            data: this.$http.adornData({
+              pointCategoryId: row.id
+            })
+          })
+            .then(({ data }) => {
+              if (data.code == 0) {
+                this.$message.success("删除成功");
+                this.getCatTreeList();
+              }
+            })
+            .catch(({ e }) => {
+              console.log(e, "e");
+            });
+        })
+        .catch(() => {});
+    },
+    // 编辑分类
+    editCateShow(row) {
+      this.$nextTick(() => {
+        this.cateForm = {
+          title: row.title,
+          id: row.id,
+          pid: row.pid == 0 ? null : row.pid,
+          sort: row.sort
+        };
+      });
+      this.addCateVisible = true;
+    },
+    // handleChange1(e) {
+    //   console.log("e", e);
+    //   this.cateForm.pid = e[e.length - 1];
+    // },
+    // 添加或者编辑分类
+    addOreEditCate() {
+      this.$refs["cateForm"].validate(valid => {
+        if (valid) {
+          let url = "";
+          this.cateForm.id
+            ? (url = "/book/point/editPointCategory")
+            : (url = "/book/point/addPointCategory");
+          this.$http({
+            // url: this.$http.adornUrl('/book/sysdictdata/selectByType/express_name'),
+            url: this.$http.adornUrl(url),
+            method: "post",
+            data: this.$http.adornData({
+              title: this.cateForm.title,
+              pid: this.cateForm.pid ? this.cateForm.pid : 0,
+              sort: this.cateForm.sort,
+              id: this.cateForm.id
+            })
+          })
+            .then(({ data }) => {
+              console.log(data, "提交");
+              if (data.code == 0) {
+                this.$message.success("操作成功");
+                this.getCatTreeList();
+                this.addCateClose();
+              }
+            })
+            .catch(({ e }) => {
+              console.log(e, "e");
+            });
+        }
+      });
+    },
+    addCateClose() {
+      console.log("关闭了");
+      this.addCateVisible = false;
+      this.cateForm = {
+        sort: 0,
+        title: "",
+        pid: null,
+        id: null
+      };
+      this.$refs["cateForm"].resetFields();
+      this.$nextTick(() => {
+        this.$refs["cateForm"].clearValidate();
+      });
+    },
+    getCatTreeList() {
+      this.loading = true;
+      this.$http({
+        // url: this.$http.adornUrl('/book/sysdictdata/selectByType/express_name'),
+        url: this.$http.adornUrl("/book/point/getPointCategoryList"),
+        method: "post"
+        // data: this.$http.adornData({
+
+        // })
+      })
+        .then(({ data }) => {
+          console.log(data, "树形结构");
+          if (data.code == 0 && data.categorys.length > 0) {
+            this.treeList = data.categorys;
+            this.cateList = data.categorys;
+            this.cateList.forEach(element => {
+              if (element.children && element.children.length > 0) {
+                element.children.forEach(element1 => {
+                  let content = {};
+                  // content = this.getContentList(element1.id)
+                  this.$http({
+                    url: this.$http.adornUrl("/book/point/getPointList"),
+                    method: "post",
+                    data: this.$http.adornData({
+                      limit: 10,
+                      page: 1,
+                      pointCategoryId: element1.id //此项为非必选
+                    })
+                  })
+                    .then(({ data }) => {
+                      if (data.code == 0) {
+                        // console.log("date二级内容", data.page);
+                        element1.content = data.page;
+                      } else {
+                        element1.content = {};
+                      }
+                    })
+                    .catch(({ e }) => {
+                      console.log(e, "e");
+                    });
+                  // element1.content = content;
+                });
+              }
+            });
+            console.log("执行后的结果", this.cateList);
+            //
+          } else {
+            this.treeList = [];
+            this.cateList = [];
+          }
+          this.loading = false;
+        })
+        .catch(({ e }) => {
+          this.loading = false;
+          console.log(e, "e");
+        });
+    },
+    editContent(item) {
+      console.log("编辑内容");
+      this.$router.push({
+        path: "/acupointDetail",
+        query: { cid: item.id, title: "编辑穴位" }
+      });
+    },
+    deleteContent(item, index, row) {
+      console.log("删除内容");
+      this.$confirm("确定要删除该内容?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$http({
+            url: this.$http.adornUrl("/book/point/delPoint"),
+            method: "post",
+            data: this.$http.adornData({
+              pointId: item.id
+            })
+          })
+            .then(({ data }) => {
+              if (data.code == 0) {
+               this.contentChange = false
+                this.$message.success("删除成功");
+                // 找到数据并删除
+                this.cateList.forEach(element => {
+                  element.children.forEach(element1 => {
+                    if(element1.id == row.id){
+                     element1.content.records.splice(index,1)
+                     this.contentChange = true
+                    }
+                  })
+                })
+                console.log('删除后',this.cateList)
+               // this.getCatTreeList()
+              }
+            })            
+        })
+        .catch(() => {});
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.el-table__row--level-1{display: block !important;}
+.flexbox {
+  display: flex;
+}
+.contentList {
+  flex-wrap: wrap;
+}
+.contenItem {
+  line-height: 30px;
+  padding: 4px;
+  border: 1px solid #ddd;
+  border-radius: 10px;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  i {
+    padding: 5px;
+    cursor: pointer;
+  }
+  .el-icon-edit {
+    color: #409eff;
+  }
+  .el-icon-delete {
+    color: #f56c6c;
+  }
+}
+</style>

src/views/modules/acupoint/acupointManagement.vue

@@ -0,0 +1,439 @@
+<template>
+  <div>
+    <!-- <div>
+      <el-button
+        type="success"
+        @click="addCateVisible = true"
+        style="margin-bottom: 15px"
+        >添加分类</el-button
+      >
+      <router-link :to="{path: '/acupointList' , query:{  } }">
+        <el-button         
+          type="primary"         
+          >添加穴位</el-button
+        >
+        </router-link>
+    </div> -->
+    <el-tree
+      :data="treeList"
+      :props="defaultProps"
+      @node-click="handleNodeClick"
+      show-checkbox
+      node-key="catId"
+      :default-expanded-keys="expandedkey"
+      :expand-on-click-node="false"
+      default-expand-all
+    >
+      <span class="custom-tree-node" slot-scope="{ node, data }">
+        <span style="padding-right:20px">{{ node.label }}</span>
+        <span>
+          <el-button
+            v-if="node.level <= 2"
+            type="text"
+            size="mini"
+            @click="() => append(data)"
+          >
+          <i class="el-icon-plus"></i> 添加
+          </el-button>
+          <el-button  v-if="node.level != 1" type="text" size="mini" @click="() => edit(data)">
+            <i class="el-icon-edit"></i> 编辑
+          </el-button>
+          <el-button
+            v-if="node.childNodes.length == 0"
+            type="text"
+            size="mini"
+            @click="() => deleteCate(data)"
+          >
+          <i class="el-icon-delete"></i> 删除
+          </el-button>
+        </span>
+      </span>
+    </el-tree>
+    <!-- 添加/修改分类 -->
+    <el-dialog
+      :title="cateTitle"
+      :visible.sync="addCateVisible"
+      width="30%"
+      center
+      @close="addCateClose"
+    >
+      <div style="width:280px">
+        <el-form
+          ref="cateForm"
+          :model="cateForm"
+          label-width="80px"
+          :rules="cateFormRule"
+        >
+          <el-form-item label="分类名称" prop="title">
+            <el-input
+              v-model="cateForm.title"
+              placeholder="请输入分类名称"
+            ></el-input>
+          </el-form-item>          
+          <el-form-item label="paixu">
+            <el-input
+              v-model="cateForm.sort"
+              type="number"
+              placeholder="请输入排序,默认0"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addCateClose">取 消</el-button>
+        <el-button type="primary" @click="addOreEditCate">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      treeList: [
+      {
+          id:0,
+          pid:0,
+          title:'根目录',
+          children:[],
+          sort:0
+        }
+      ],
+      expandedkey: [],
+      defaultProps: {
+        children: "children",
+        label: "title"
+      }, 
+      cateTitle:'' ,   
+      cateList: [], // 渲染的数据列表
+      loading: false,
+      addCateVisible: false,
+      cateForm: {
+        sort: 0,
+        title: "",
+        pid: null,
+        id: null
+      },
+      contentChange: true,
+      cateProps: {
+        value: "id",
+        label: "title"
+      },
+      cateFormRule: {
+        title: [{ required: true, message: "分类名称不能为空" }]
+      }
+    };
+  },
+  created() {
+    this.getCatTreeList();
+  },
+  activated() {
+    console.log("激活了");
+  },
+  methods: {
+    edit(data){
+      this.cateTitle = '修改分类'
+               // this.cateForm.pid = data.id                  
+                this.$nextTick(() => {
+                this.cateForm = {
+                  title: data.title,
+                  id: data.id,
+                  pid: data.pid == 0 ? null : data.pid,
+                  sort: data.sort
+                };
+                this.addCateVisible = true
+      });
+               // this.dialogType = 'edit'
+                 
+            },
+    append(data) {                             
+                this.addCateVisible = true
+                // this.dialogType = 'add'
+                this.cateTitle = `添加分类 - 父级分类：${data.title}`
+                this.cateForm.pid = data.id               
+                // this.cateForm.showStatus = data.showStatus
+                // this.cateForm.catLevel = data.catLevel*1 + 1
+               console.log('cateForm', this.cateForm.pid, data) 
+            },
+    handleNodeClick(data) {
+      // console.log(data);
+    },
+    // 点击查看更多，获取翻页内容
+    getMoreContent(row, index) {
+      console.log("加载更多", index, row);
+      if (row.content.current + 1 <= row.content.pages) {
+        this.getContentList(row.id, row.content.current + 1, index);
+      } else {
+        this.$message.error("已全部加载完毕，没有更多了");
+      }
+    },
+    // 获取二级分类下的内容
+    getContentList(cateId, pageIndex, index) {
+      console.log("收到的参数", cateId, pageIndex, index);
+      this.$http({
+        url: this.$http.adornUrl("/book/point/getPointList"),
+        method: "post",
+        data: this.$http.adornData({
+          limit: 10,
+          page: pageIndex,
+          pointCategoryId: cateId //此项为非必选
+        })
+      })
+        .then(({ data }) => {
+          if (data.code == 0) {
+            this.contentChange = false;
+            console.log("date二级内容", data.page);
+            // 查找分类,并将新数据添加上
+            this.cateList.forEach(element => {
+              element.children.forEach(element1 => {
+                if (element1.id == cateId) {
+                  element1.content.current = data.page.current;
+                  element1.content.records = element1.content.records.concat(
+                    data.page.records
+                  );
+                  this.contentChange = true;
+                }
+              });
+            });
+            console.log("追加后的数据", this.cateList);
+          }
+        })
+        .catch(({ e }) => {
+          console.log(e, "e");
+        });
+    },
+    // 添加内容
+    goAddContent(row) {
+      // this.$router.push({ name:'acupointDetail' , params: {pid:row.id, title:'添加穴位'}})
+      this.$router.push({
+        path: "/acupointDetail",
+        query: { pid: row.id, title: "添加穴位" }
+      });
+    },
+    // 删除分类
+    deleteCate(row) {
+      this.$confirm("确定删除该分类？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$http({
+            url: this.$http.adornUrl("/book/point/delPointCategory"),
+            method: "post",
+            data: this.$http.adornData({
+              pointCategoryId: row.id
+            })
+          })
+            .then(({ data }) => {
+              if (data.code == 0) {
+                this.$message.success("删除成功");
+                this.getCatTreeList();
+              }else{
+                this.$message.error(data.msg)
+              }
+            })
+            .catch(({ e }) => {
+              console.log(e, "e");
+              
+            });
+        })
+        .catch(() => {
+          
+        });
+    },
+    // 编辑分类
+    editCateShow(row) {
+      this.$nextTick(() => {
+        this.cateForm = {
+          title: row.title,
+          id: row.id,
+          pid: row.pid == 0 ? null : row.pid,
+          sort: row.sort
+        };
+      });
+      this.addCateVisible = true;
+    },
+    // handleChange1(e) {
+    //   console.log("e", e);
+    //   this.cateForm.pid = e[e.length - 1];
+    // },
+    // 添加或者编辑分类
+    addOreEditCate() {
+      this.$refs["cateForm"].validate(valid => {
+        if (valid) {
+          let url = "";
+          this.cateForm.id
+            ? (url = "/book/point/editPointCategory")
+            : (url = "/book/point/addPointCategory");
+          this.$http({
+            // url: this.$http.adornUrl('/book/sysdictdata/selectByType/express_name'),
+            url: this.$http.adornUrl(url),
+            method: "post",
+            data: this.$http.adornData({
+              title: this.cateForm.title,
+              pid: this.cateForm.pid ? this.cateForm.pid : 0,
+              sort: this.cateForm.sort,
+              id: this.cateForm.id
+            })
+          })
+            .then(({ data }) => {
+              console.log(data, "提交");
+              if (data.code == 0) {
+                this.$message.success("操作成功");
+                this.getCatTreeList();
+                this.addCateClose();
+              }
+            })
+            .catch(({ e }) => {
+              console.log(e, "e");
+            });
+        }
+      });
+    },
+    addCateClose() {
+      console.log("关闭了");
+      this.addCateVisible = false;
+      this.cateForm = {
+        sort: 0,
+        title: "",
+        pid: null,
+        id: null
+      };
+      this.$refs["cateForm"].resetFields();
+      this.$nextTick(() => {
+        this.$refs["cateForm"].clearValidate();
+      });
+    },
+    getCatTreeList() {
+      this.loading = true;
+      this.$http({
+        // url: this.$http.adornUrl('/book/sysdictdata/selectByType/express_name'),
+        url: this.$http.adornUrl("/book/point/getPointCategoryList"),
+        method: "post"
+        // data: this.$http.adornData({
+
+        // })
+      })
+        .then(({ data }) => {
+          console.log(data, "树形结构");
+          if (data.code == 0 && data.categorys.length > 0) {
+            this.treeList[0].children = data.categorys;
+            this.cateList = data.categorys;
+            this.cateList.forEach(element => {
+              if (element.children && element.children.length > 0) {
+                element.children.forEach(element1 => {
+                  let content = {};
+                  // content = this.getContentList(element1.id)
+                  this.$http({
+                    url: this.$http.adornUrl("/book/point/getPointList"),
+                    method: "post",
+                    data: this.$http.adornData({
+                      limit: 10,
+                      page: 1,
+                      pointCategoryId: element1.id //此项为非必选
+                    })
+                  })
+                    .then(({ data }) => {
+                      if (data.code == 0) {
+                        // console.log("date二级内容", data.page);
+                        element1.content = data.page;
+                      } else {
+                        element1.content = {};
+                      }
+                    })
+                    .catch(({ e }) => {
+                      console.log(e, "e");
+                    });
+                  // element1.content = content;
+                });
+              }
+            });
+            console.log("执行后的结果", this.cateList);
+            //
+          } else {
+            this.treeList = [];
+            this.cateList = [];
+          }
+          this.loading = false;
+        })
+        .catch(({ e }) => {
+          this.loading = false;
+          console.log(e, "e");
+        });
+    },
+    editContent(item) {
+      console.log("编辑内容");
+      this.$router.push({
+        path: "/acupointDetail",
+        query: { cid: item.id, title: "编辑穴位" }
+      });
+    },
+    deleteContent(item, index, row) {
+      console.log("删除内容");
+      this.$confirm("确定要删除该内容?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$http({
+            url: this.$http.adornUrl("/book/point/delPoint"),
+            method: "post",
+            data: this.$http.adornData({
+              pointId: item.id
+            })
+          }).then(({ data }) => {
+            if (data.code == 0) {
+              this.contentChange = false;
+              this.$message.success("删除成功");
+              // 找到数据并删除
+              this.cateList.forEach(element => {
+                element.children.forEach(element1 => {
+                  if (element1.id == row.id) {
+                    element1.content.records.splice(index, 1);
+                    this.contentChange = true;
+                  }
+                });
+              });
+              console.log("删除后", this.cateList);
+              // this.getCatTreeList()
+            }
+          });
+        })
+        .catch(() => {});
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.el-table__row--level-1 {
+  display: block !important;
+}
+.flexbox {
+  display: flex;
+}
+.contentList {
+  flex-wrap: wrap;
+}
+.contenItem {
+  line-height: 30px;
+  padding: 4px;
+  border: 1px solid #ddd;
+  border-radius: 10px;
+  margin-right: 10px;
+  margin-bottom: 10px;
+  i {
+    padding: 5px;
+    cursor: pointer;
+  }
+  .el-icon-edit {
+    color: #409eff;
+  }
+  .el-icon-delete {
+    color: #f56c6c;
+  }
+}
+</style>

src/views/modules/acupointManagement.vue

@@ -1,13 +0,0 @@
-<template>
-  <div>穴位检索</div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>

src/views/modules/book/talkBook.vue

@@ -95,7 +95,7 @@
           dataForm: {
             key: ''
           },
-          dataList: [1],
+          dataList: [],
           bookid:0,
           upPageIndex:0,
           pageIndex: 1,

src/views/modules/order/buyorder.vue

@@ -191,7 +191,7 @@
                       <img  src="../../../../static/img/oder_chong.png"  width="60px" height="60px"> 
                     </div>
                     <div class="price ">
-                      <div class="bookName">疯币充值</div>
+                      <div class="bookName">天医币充值</div>
                       <div><span>￥{{ fitem.realMoney }}</span> × 1</div>                    
                     </div>
                   </div>
@@ -215,7 +215,7 @@
                     <div></div>
                     <div v-if="fitem.paymentMethod == 1"><icon-svg name="weixin"></icon-svg> 微信支付</div>
                     <div v-if="fitem.paymentMethod == 2"><icon-svg name="zhifubao"></icon-svg> 支付宝支付</div>
-                    <div v-if="fitem.paymentMethod == 4"><img  src="../../../../static/img/oder_chong.png"  width="22px" height="22px"> 疯币支付</div>
+                    <div v-if="fitem.paymentMethod == 4"><img  src="../../../../static/img/oder_chong.png"  width="22px" height="22px">天医币支付</div>
                   </div>
                 </div>
                 <div class="buier td3 xcenter">
@@ -327,7 +327,7 @@
           <el-tag v-if="scope.row.paymentMethod == 1" type="success">微信</el-tag>
           <el-tag v-if="scope.row.paymentMethod == 2" type="danger">支付宝</el-tag>          
           <el-tag v-if="scope.row.paymentMethod == 3" type="warning">ios内购</el-tag>
-          <el-tag v-if="scope.row.paymentMethod == 4" type="warnning">疯币支付</el-tag>
+          <el-tag v-if="scope.row.paymentMethod == 4" type="warnning">天医币支付</el-tag>
         </template>
       </el-table-column>
       <!-- 1 支付宝 2 微信 3 ios内购-->

src/views/modules/order/buyorderdetail.vue

@@ -38,7 +38,7 @@
         <li style="width: 100%;" v-if="orderDetails.orderStatus > 0"><span class="infoTitle">支付方式：</span>
           <span v-if="orderDetails.paymentMethod == 2"><icon-svg name="zhifubao"></icon-svg> <span>支付宝支付</span></span>
           <span v-if="orderDetails.paymentMethod == 1"><icon-svg name="weixin"></icon-svg> <span>微信支付</span></span>
-          <span v-if="orderDetails.paymentMethod == 4"><img  src="../../../../static/img/oder_chong.png"  width="22px" height="22px"> <span>疯币支付</span></span>
+          <span v-if="orderDetails.paymentMethod == 4"><img  src="../../../../static/img/oder_chong.png"  width="22px" height="22px"> <span>天医币支付</span></span>
           <span v-if="orderDetails.paymentMethod == 3">
             <!-- <icon-svg name="zhifubao"></icon-svg>  -->
             <span>IOS内购</span>
@@ -90,27 +90,29 @@
         </el-alert> -->
         <li class="flexbox deliverBox" style="width: 100%;"  v-if="orderDetails.orderStatus > 0 && sheetList && sheetList.length > 0">
           <el-row :gutter="20" style="flex-wrap:wrap; width: 100%;" class="flexbox">
-            <el-col  :md="12" :lg="12" class="item" v-for="(item, index) in sheetList" :key="index" style="margin-bottom:20px;">          
+            <el-col  :md="12" :lg="12" class="item" v-for="(item, index) in sheetList" :key="index">          
             <div class="deliver_heade"> 
               <!-- <div><span class="infoTitle">物流公司：</span><span>{{item.expressCompanyName}}</span></div> -->
               <div>
                 <span class="infoTitle">快递包裹 {{index+1}} 运单号：</span><span style="margin-right:10px">{{item.expressOrderSn}}</span>
-                <el-button  type="primary" size="mini" plain @click="seeSheetDetails(item)">查看物流进度</el-button>
+                <span v-if="item.showProduct" style="color:#409eff; cursor: pointer;" @click.stop="showProducts(item, index)">
+                  <i   class="el-icon-arrow-up myicon" ></i>隐藏包裹内商品</span>
+                <span v-else style="color:#409eff; cursor: pointer;" @click.stop="showProducts(item,index)">
+                  <i   class="el-icon-arrow-down myicon" ></i>显示包裹内商品</span>
+                <el-button  type="primary" size="mini" plain @click="seeSheetDetails(item)" style="margin-left:10px">查看物流进度</el-button>
                 <!-- 包含的订单商品信息 -->
-                <div class="" v-if="sheetList && sheetList.length > 0" style="margin-top:15px; overflow:hidden; background:#f9f9f9; padding:10px;">                  
+                <div class=""  v-if="showChange && item.showProduct" style="margin-top:15px; overflow:hidden; background:#f9f9f9; padding:10px;">                  
-                  <ul class="sheetOrdersUl" style="overflow:hidden"> 
+                  <ul class="sheetOrdersUl" style="overflow:hidden" > 
                     <li  style="flex-wrap:wrap; margin-bottom:10px; width: 100%;">
-                      <div style="width:100%" v-if="showChange">订单编号：{{item.orderSn}}                        
+                      <!-- <div style="width:100%" v-if="showChange">订单编号：{{item.orderSn}}</div>   -->
-                        <i v-if="item.showProduct" @click.stop="showProducts(item, index)" class="el-icon-arrow-up myicon" style="color:#409eff; cursor: pointer;"></i>
+                      <div >                           
-                        <i v-else @click.stop="showProducts(item,index)" class="el-icon-arrow-down myicon" style="color:#409eff; cursor: pointer;"></i>                        
-                      </div>  
-                      <div  v-if="showChange && item.showProduct">                           
                       <div class="flexbox" v-for="item2 in item.products" :key="item2.productId"  style="align-items:center; margin-bottom:10px">
                         <div class="img">
                           <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item2.productImages" width="60px" height="60px">
                         </div>
                         <div>
-                          <span>{{item2.productName}} [ ×{{item2.quantity}} ]</span>             
+                          <div><span>{{item2.productName}} [ ×{{item2.quantity}} ]</span> </div> 
+                          <div style="color:#999">所属订单：{{item2.orderSn}}</div>           
                         </div>
                       </div></div>  
                     </li>
@@ -520,7 +522,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.myicon{border: 1px solid #409eff;}
+.myicon{border: 1px solid #409eff; margin-right: 5px;}
 .booksUl{ overflow: hidden; margin-top: 15px; padding-left: 0;
   li{list-style: none; width: 50%; float: left; align-items: center; margin-bottom: 15px;}
 }

src/views/modules/shop/categorytree.vue

@@ -88,6 +88,7 @@ import { SSL_OP_NO_TLSv1_1 } from 'constants'
                 })
             },
             append(data) {
+                console.log('data',data)
                 this.dialogVisible = true
                 this.dialogType = 'add'
                 this.title = '添加分类'