From 848d6adce4e26280eabca6e5dcb7560c1868e55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Mon, 14 Apr 2025 15:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |    3 +-
 src/views/modules/order/buyorderdetail.vue    | 1448 +++++++++-------
 .../modules/order/set-deliver-dialog.vue      |    2 +-
 .../modules/{user => points}/addPoints.vue    |  101 +-
 src/views/modules/points/cateList.vue         | 1501 +++++++++++++++++
 src/views/modules/points/userPoints.vue       |  686 ++++++++
 src/views/modules/user/addJf.vue              |  456 +++++
 src/views/modules/user/user-point-jf.vue      |  720 ++++++++
 src/views/modules/user/user-point-memery.vue  |  421 +++--
 src/views/modules/user/user.vue               |   53 +-
 src/views/modules/user/userPoints.vue         |    2 +-
 11 files changed, 4587 insertions(+), 806 deletions(-)
 rename src/views/modules/{user => points}/addPoints.vue (84%)
 create mode 100644 src/views/modules/points/cateList.vue
 create mode 100644 src/views/modules/points/userPoints.vue
 create mode 100644 src/views/modules/user/addJf.vue
 create mode 100644 src/views/modules/user/user-point-jf.vue

diff --git a/src/router/index.js b/src/router/index.js
index 7fce71a..d77adf8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -45,7 +45,8 @@ const mainRoutes = {
     { path: '/buyorder-mergeorder', component: _import('modules/order/buyorder-mergeorder'), name: 'buyorder-mergeorder', meta: { title: '合并发货', isTab: true } },
     { path: '/buyorder-print', component: _import('modules/order/buyorder-print'), name: 'buyorder-print', meta: { title: '打印面单', isTab: true } },
     { path: '/activity-list', component: _import('modules/activity/activityList'), name: 'activity-list', meta: { title: '活动列表', isTab: true } },
-    { path: '/user-point-memery', component: _import('modules/user/user-point-memery'), name: 'user-point-memery', meta: { title: '充/扣记录', isTab: true } },
+    { path: '/user-point-memery', component: _import('modules/user/user-point-memery'), name: 'user-point-memery', meta: { title: '天医币充/扣记录', isTab: true } },
+    { path: '/user-point-jf', component: _import('modules/user/user-point-jf'), name: 'user-point-jf', meta: { title: '积分充/扣记录', isTab: true } },
     { path: '/user-add-course', component: _import('modules/user/user-add-course'), name: 'user-add-course', meta: { title: '开通课程', isTab: true } },
     { path: '/order-epay', component: _import('modules/order/order-errorpay'), name: 'order-epay', meta: { title: '充值异常列表', isTab: true } },
     { path: '/xieyi_list', component: _import('modules/xieyi/xieyi'), name: 'xieyi_list', meta: { title: '协议管理', isTab: true } },
diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue
index 65ab857..00f846e 100644
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -2,61 +2,119 @@
   <div class="mod-config">
     <!-- 订单详细更新 -->
     <div class="orderType">
-      <span v-if="orderDetails.orderStatus == 0" class="item hightLight0">待付款</span>
-      <span v-if="orderDetails.orderStatus == 1" class="item hightLight1">待发货</span>
-      <span v-if="orderDetails.orderStatus == 2" class="item hightLight2">已发货</span>
-      <span v-if="orderDetails.orderStatus == 3" class="item hightLight3">已完成</span>
+      <span v-if="orderDetails.orderStatus == 0" class="item hightLight0"
+        >待付款</span
+      >
+      <span v-if="orderDetails.orderStatus == 1" class="item hightLight1"
+        >待发货</span
+      >
+      <span v-if="orderDetails.orderStatus == 2" class="item hightLight2"
+        >已发货</span
+      >
+      <span v-if="orderDetails.orderStatus == 3" class="item hightLight3"
+        >已完成</span
+      >
     </div>
     <div>
       <ul class="list">
         <div v-if="orderDetails.userInfo">
           <div class="liName">用户信息</div>
-          <li><span
-              class="infoTitle">用户名：</span><span>{{orderDetails.userInfo.userName !== null ? orderDetails.userInfo.userName : '暂无'}}</span>
+          <li>
+            <span class="infoTitle">用户名：</span
+            ><span>{{
+              orderDetails.userInfo.userName !== null
+                ? orderDetails.userInfo.userName
+                : "暂无"
+            }}</span>
           </li>
           <!-- <li><span class="infoTitle">用户ID：</span><span>{{orderDetails.userId}}</span></li> -->
-          <li><span class="infoTitle">联系电话：</span><span>{{orderDetails.userInfo.userPhone}}</span></li>
+          <li>
+            <span class="infoTitle">联系电话：</span
+            ><span>{{ orderDetails.userInfo.userPhone }}</span>
+          </li>
           <li style="clear:both"></li>
           <!-- <li><span class="infoTitle">电 话：</span><span>187898544875</span></li> -->
           <!-- <li><span class="infoTitle">地 址：</span><span>天津市天津市天津市天津市天津市天津市</span></li> -->
           <li class="line"></li>
         </div>
         <div class="liName">订单信息</div>
-        <li><span class="infoTitle">订单ID：</span><span>{{orderDetails.orderSn}}</span></li>
-        <li><span class="infoTitle">订单状态：</span>
-          <span v-if="orderDetails.orderStatus == 0" class="hightLight">待付款</span>
-          <span v-if="orderDetails.orderStatus == 1" class="hightLight">待发货</span>
-          <span v-if="orderDetails.orderStatus == 2" class="hightLight">已发货</span>
-          <span v-if="orderDetails.orderStatus == 3" class="hightLight">已完成</span>
+        <li>
+          <span class="infoTitle">订单ID：</span
+          ><span>{{ orderDetails.orderSn }}</span>
+        </li>
+        <li>
+          <span class="infoTitle">订单状态：</span>
+          <span v-if="orderDetails.orderStatus == 0" class="hightLight"
+            >待付款</span
+          >
+          <span v-if="orderDetails.orderStatus == 1" class="hightLight"
+            >待发货</span
+          >
+          <span v-if="orderDetails.orderStatus == 2" class="hightLight"
+            >已发货</span
+          >
+          <span v-if="orderDetails.orderStatus == 3" class="hightLight"
+            >已完成</span
+          >
           <!-- <el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发货</el-button>           -->
         </li>
         <!-- <li><span class="infoTitle">商品总数：</span><span>{{orderDetails.}}</span></li> -->
-        <li><span class="infoTitle">订单金额：</span><span>￥{{orderDetails.orderPrice}}</span></li>
-        <li><span class="infoTitle">交付邮费：</span><span>￥{{orderDetails.shippingPrice}}</span></li>
+        <li>
+          <span class="infoTitle">订单金额：</span
+          ><span>￥{{ orderDetails.orderPrice }}</span>
+        </li>
+        <li>
+          <span class="infoTitle">交付邮费：</span
+          ><span>￥{{ orderDetails.shippingPrice }}</span>
+        </li>
 
-        <li v-if="orderDetails.orderStatus > 0"><span
-            class="infoTitle">实际支付金额：</span><span>￥{{orderDetails.realPrice}}</span></li>
-        <li><span class="infoTitle">创建时间：</span><span>{{orderDetails.createTime}}</span></li>
-        <li v-if="orderDetails.orderStatus > 0"><span
-            class="infoTitle">支付时间：</span><span>{{orderDetails.paymentDate}}</span></li>
-        <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>
+        <li v-if="orderDetails.orderStatus > 0">
+          <span class="infoTitle">实际支付金额：</span
+          ><span>￥{{ orderDetails.realPrice }}</span>
+        </li>
+        <li>
+          <span class="infoTitle">创建时间：</span
+          ><span>{{ orderDetails.createTime }}</span>
+        </li>
+        <li v-if="orderDetails.orderStatus > 0">
+          <span class="infoTitle">支付时间：</span
+          ><span>{{ orderDetails.paymentDate }}</span>
+        </li>
+        <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 == 3">
             <!-- <icon-svg name="zhifubao"></icon-svg>  -->
             <span>IOS内购</span>
           </span>
         </li>
-       
-        <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2&&orderDetails.orderStatus > 0">
+
+        <li
+          style="width: 100%;"
+          v-if="orderDetails.paymentMethod == 2 && orderDetails.orderStatus > 0"
+        >
           <span class="infoTitle">商家订单号：</span>
-          <span>{{orderDetails.outTradeNo}}</span>
+          <span>{{ orderDetails.outTradeNo }}</span>
         </li>
-        <li style="width: 100%;" v-if="orderDetails.paymentMethod == 2&&orderDetails.orderStatus > 0">
+        <li
+          style="width: 100%;"
+          v-if="orderDetails.paymentMethod == 2 && orderDetails.orderStatus > 0"
+        >
           <span class="infoTitle">支付宝订单号：</span>
-          <span>{{orderDetails.tradeNo}}</span>
+          <span>{{ orderDetails.tradeNo }}</span>
         </li>
         <li class="line"></li>
         <div style="clear:both"></div>
@@ -64,7 +122,10 @@
           <div class="liName">优惠信息</div>
           <!-- <li><span class="infoTitle">优惠金额：</span><span>0</span></li>
           <li><span class="infoTitle">会员商品优惠：</span><span>0</span></li> -->
-          <li><span class="infoTitle">积分抵扣：</span><span>{{orderDetails.districtPrice}}</span></li>
+          <li>
+            <span class="infoTitle">积分抵扣：</span
+            ><span>{{ orderDetails.districtPrice }}</span>
+          </li>
           <li class="line"></li>
         </div>
         <div style="clear:both"></div>
@@ -74,11 +135,20 @@
           <el-table-column label="商品名" width="280">
             <template slot-scope="scope">
               <div class="flexbox">
-                <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="scope.row.productImage"
-                  width="30px" height="30px">
-                <div class="proname">{{ scope.row.productName}}
-                  <i v-if="scope.row.books && scope.row.books.length > 0" @click.stop="seeBooks(scope.row.books)"
-                    class="el-icon-view" style="color:#409eff; cursor: pointer;"></i>
+                <img
+                  style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;"
+                  :src="scope.row.productImage"
+                  width="30px"
+                  height="30px"
+                />
+                <div class="proname">
+                  {{ scope.row.productName }}
+                  <i
+                    v-if="scope.row.books && scope.row.books.length > 0"
+                    @click.stop="seeBooks(scope.row.books)"
+                    class="el-icon-view"
+                    style="color:#409eff; cursor: pointer;"
+                  ></i>
                 </div>
               </div>
             </template>
@@ -89,51 +159,126 @@
           </el-table-column>
         </el-table>
         <div v-if="orderDetails.consignee" style="margin-top:20px">
-          <div class="liName">物流信息 <a href="#" @click="changeAddressShow" v-if="orderDetails.orderStatus <= 1"><i
-                class="el-icon-edit"></i>修改收货信息</a></div>
+          <div class="liName">
+            物流信息
+
+            <a
+              href="#"
+              @click="changeAddressShow"
+              v-if="orderDetails.orderStatus <= 1&&pageType != 'user'"
+              ><i class="el-icon-edit" ></i>修改收货信息</a
+            >
+          </div>
           <div style="background:#f9f9f9; padding:5px; overflow:hidden; ">
-            <li><span
-                class="infoTitle">收货人：</span><span>{{orderDetails.consignee.consigneeName}}</span>&nbsp;&nbsp;&nbsp;<span>{{orderDetails.consignee.consigneeMobile}}</span>
+            <li>
+              <span class="infoTitle">收货人：</span
+              ><span>{{ orderDetails.consignee.consigneeName }}</span
+              >&nbsp;&nbsp;&nbsp;<span>{{
+                orderDetails.consignee.consigneeMobile
+              }}</span>
             </li>
-            <li><span
-                class="infoTitle">收货地址：</span><span>{{orderDetails.consignee.province}}-{{orderDetails.consignee.city}}-{{orderDetails.consignee.county}}-{{orderDetails.consignee.address}}</span>
+            <li>
+              <span class="infoTitle">收货地址：</span
+              ><span
+                >{{ orderDetails.consignee.province }}-{{
+                  orderDetails.consignee.city
+                }}-{{ orderDetails.consignee.county }}-{{
+                  orderDetails.consignee.address
+                }}</span
+              >
             </li>
           </div>
         </div>
         <!-- <el-alert title="`该订单下共有 2 条物流信息`" type="info">
         </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">
+        <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"
+            >
               <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>
-                  <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>
+                  <span class="infoTitle"
+                    >快递包裹 {{ index + 1 }} 运单号：</span
+                  ><span style="margin-right:10px">{{
+                    item.expressOrderSn
+                  }}</span>
+                  <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="showChange && item.showProduct"
-                    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">
-                      <li style="flex-wrap:wrap; margin-bottom:10px; width: 100%;">
+                      <li
+                        style="flex-wrap:wrap; margin-bottom:10px; width: 100%;"
+                      >
                         <!-- <div style="width:100%" v-if="showChange">订单编号：{{item.orderSn}}</div>   -->
                         <div>
-                          <div class="flexbox" v-for="item2 in item.products" :key="item2.productId"
-                            style="align-items:center; margin-bottom:10px">
+                          <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">
+                              <img
+                                style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;"
+                                :src="item2.productImages"
+                                width="60px"
+                                height="60px"
+                              />
                             </div>
                             <div>
-                              <div><span>{{item2.productName}} [ ×{{item2.quantity}} ]</span> </div>
-                              <div style="color:#999">所属订单：{{item2.orderSn}}</div>
+                              <div>
+                                <span
+                                  >{{ item2.productName }} [ ×{{
+                                    item2.quantity
+                                  }}
+                                  ]</span
+                                >
+                              </div>
+                              <div style="color:#999">
+                                所属订单：{{ item2.orderSn }}
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -143,24 +288,52 @@
                 </div>
               </div>
             </el-col>
-
           </el-row>
         </li>
         <li class="line" style="margin:10px 0;"></li>
-        <li style="text-align: right;width: 100%;" v-if="orderDetails.orderStatus==0||orderDetails.orderStatus==1">
-          <el-button type="danger" style="" size="mini" plain @click="deleteOrder()">删除订单</el-button>
-        </li>
-
+        <div v-if="pageType != 'user'">
+          <li
+            style="text-align: right;width: 100%;"
+            v-if="
+              orderDetails.orderStatus == 0 || orderDetails.orderStatus == 1
+            "
+          >
+            <el-button
+              type="danger"
+              style=""
+              size="mini"
+              plain
+              @click="deleteOrder()"
+              >删除订单</el-button
+            >
+          </li>
+        </div>
       </ul>
     </div>
     <!-- 抽屉 -->
-    <el-dialog title="物流详情" :visible.sync="tracesShow" @close="drawerHandleClose">
+    <el-dialog
+      title="物流详情"
+      :visible.sync="tracesShow"
+      @close="drawerHandleClose"
+      append-to-body
+    >
       <div class="deliver_info">
-        <div>运单信息：{{currentSheet.expressCompanyName}} - {{currentSheet.expressOrderSn}}</div>
-        <div class="scroll" style="padding: 10px;" v-if="traces && traces.length > 0">
+        <div>
+          运单信息：{{ currentSheet.expressCompanyName }} -
+          {{ currentSheet.expressOrderSn }}
+        </div>
+        <div
+          class="scroll"
+          style="padding: 10px;"
+          v-if="traces && traces.length > 0"
+        >
           <el-timeline :reverse="reverse">
-            <el-timeline-item v-for="(activity, index2) in traces" :key="index2" :icon="activity.icon"
-              :timestamp="activity.acceptTime">
+            <el-timeline-item
+              v-for="(activity, index2) in traces"
+              :key="index2"
+              :icon="activity.icon"
+              :timestamp="activity.acceptTime"
+            >
               {{ activity.acceptStation }}
             </el-timeline-item>
           </el-timeline>
@@ -168,9 +341,20 @@
         <div v-else class="noinfo">-暂无物流信息-</div>
       </div>
     </el-dialog>
-    <el-dialog title="修改收货信息" :visible.sync="changeAddVisible" width="500" :close="changeAddHandleClose">
+    <el-dialog
+      title="修改收货信息"
+      :visible.sync="changeAddVisible"
+      width="500"
+      :close="changeAddHandleClose"
+      append-to-body
+    >
       <div>
-        <el-form ref="addressFormRef" :model="addressForm" label-width="120px" :rules="addressFormRule">
+        <el-form
+          ref="addressFormRef"
+          :model="addressForm"
+          label-width="120px"
+          :rules="addressFormRule"
+        >
           <el-form-item label="收货人:" prop="name">
             <el-input v-model="addressForm.name"></el-input>
           </el-form-item>
@@ -181,25 +365,52 @@
             <!-- <el-input v-model="addressForm.address"></el-input> -->
             <!-- 省市区-->
             <!-- 省 -->
-            <el-select v-model="addressForm.provinceCode" placeholder="请选择省份" style="width:200px"
-              @change="provinceChange">
-              <el-option v-for="item in provinceEntity" :key="item.regionCode" :label="item.provName"
-                :value="item.regionCode">
+            <el-select
+              v-model="addressForm.provinceCode"
+              placeholder="请选择省份"
+              style="width:200px"
+              @change="provinceChange"
+            >
+              <el-option
+                v-for="item in provinceEntity"
+                :key="item.regionCode"
+                :label="item.provName"
+                :value="item.regionCode"
+              >
               </el-option>
             </el-select>
-            <el-select v-model="addressForm.cityCode" placeholder="请选择市" @change="cityChange">
-              <el-option v-for="item in cityEntity.cityList" :key="item.regionCode" :label="item.cityName"
-                :value="item.regionCode">
+            <el-select
+              v-model="addressForm.cityCode"
+              placeholder="请选择市"
+              @change="cityChange"
+            >
+              <el-option
+                v-for="item in cityEntity.cityList"
+                :key="item.regionCode"
+                :label="item.cityName"
+                :value="item.regionCode"
+              >
               </el-option>
             </el-select>
-            <el-select v-model="addressForm.countyCode" placeholder="请选择区" @change="countyChange">
-              <el-option v-for="item in countyEntity.countyList" :key="item.regionCode" :label="item.countyName"
-                :value="item.regionCode">
+            <el-select
+              v-model="addressForm.countyCode"
+              placeholder="请选择区"
+              @change="countyChange"
+            >
+              <el-option
+                v-for="item in countyEntity.countyList"
+                :key="item.regionCode"
+                :label="item.countyName"
+                :value="item.regionCode"
+              >
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="详细地址:" prop="addressXX">
-            <el-input type="textarea" v-model="addressForm.addressXX"></el-input>
+            <el-input
+              type="textarea"
+              v-model="addressForm.addressXX"
+            ></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -208,17 +419,28 @@
         <el-button type="primary" @click="changeAddress">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog center title="商品包含的书籍信息" :visible.sync="booksShow" width="500" :close="booksHandleClose">
+    <el-dialog
+      center
+      title="商品包含的书籍信息"
+      :visible.sync="booksShow"
+      width="500"
+      :close="booksHandleClose"
+      append-to-body
+    >
       <div>
-        <span>该商品共包含了 {{currBookLIst.length}} 个书籍</span>
+        <span>该商品共包含了 {{ currBookLIst.length }} 个书籍</span>
         <ul class="booksUl ">
           <li class="flexbox" v-for="item in currBookLIst" :key="item.id">
             <div class="img">
-              <img style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;" :src="item.images" width="100px"
-                height="100px">
+              <img
+                style="padding: 2px; border:1px solid #f1f1f1; margin-right: 5px;"
+                :src="item.images"
+                width="100px"
+                height="100px"
+              />
             </div>
             <div>
-              <span>{{item.name}}[{{item.id}}]</span>
+              <span>{{ item.name }}[{{ item.id }}]</span>
             </div>
           </li>
         </ul>
@@ -228,571 +450,579 @@
       </span>
     </el-dialog>
     <!-- <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> -->
-    <setDeliverDialog ref="setDeliverDialog" :visible="setDeliverVisible" :selectData="orderList"
-      @closeDeliverDialog='closeDeliverDialog'></setDeliverDialog>
+    <setDeliverDialog
+      ref="setDeliverDialog"
+      :visible="setDeliverVisible"
+      :selectData="orderList"
+      @closeDeliverDialog="closeDeliverDialog"
+    ></setDeliverDialog>
   </div>
 </template>
 
 <script>
-  import AddOrUpdate from './buyorderdetail-add-or-update'
-  import setDeliverDialog from './set-deliver-dialog'
-  export default {
-    data() {
-      return {
-        orderList: [],
-        dataForm: {
-          key: ''
-        },
-        traces: [], // 物流轨迹
-        tracesShow: false,
-        currentSheet: {},
+import AddOrUpdate from "./buyorderdetail-add-or-update";
+import setDeliverDialog from "./set-deliver-dialog";
+export default {
+  props: ["orderSn", "pageType"],
+  data() {
+    return {
+      orderList: [],
+      dataForm: {
+        key: ""
+      },
+      traces: [], // 物流轨迹
+      tracesShow: false,
+      currentSheet: {},
 
-        reverse: true,
-        activities: [],
-        deliverData: [], // 物流信息
+      reverse: true,
+      activities: [],
+      deliverData: [], // 物流信息
 
-        setDeliverVisible: false,
-        dataListLoading: false,
-        dataListSelections: [],
-        // addOrUpdateVisible: false,
-        query: {
-          orderSn: 0,
-          ordertype: null
-        },
-        changeAddVisible: false,
-        orderDetails: {},
-        addressForm: {
-          provinceCode: null, //省份串码
-          provinceName: null,
-          cityCode: null, //市区串码
-          cityName: null,
-          countyCode: null, //省份串码
-          countyName: null,
-          name: '',
-          tel: '',
-          addressXX: ''
-        },
-        provinceEntity: [], // 城市列表
-        cityEntity: [], // 市
-        countyEntity: [], // 区
-        optionProps: {
-          checkStrictly: true,
-          value: "regionCode",
-          label: "provName",
-          children: "children"
-        },
-        addressFormRule: {
-          name: [{
+      setDeliverVisible: false,
+      dataListLoading: false,
+      dataListSelections: [],
+      // addOrUpdateVisible: false,
+      query: {
+        orderSn: 0,
+        ordertype: null
+      },
+      changeAddVisible: false,
+      orderDetails: {},
+      addressForm: {
+        provinceCode: null, //省份串码
+        provinceName: null,
+        cityCode: null, //市区串码
+        cityName: null,
+        countyCode: null, //省份串码
+        countyName: null,
+        name: "",
+        tel: "",
+        addressXX: ""
+      },
+      provinceEntity: [], // 城市列表
+      cityEntity: [], // 市
+      countyEntity: [], // 区
+      optionProps: {
+        checkStrictly: true,
+        value: "regionCode",
+        label: "provName",
+        children: "children"
+      },
+      addressFormRule: {
+        name: [
+          {
             required: true,
-            message: '请输入收货人信息',
-            trigger: 'blur'
-          }],
-          tel: [{
+            message: "请输入收货人信息",
+            trigger: "blur"
+          }
+        ],
+        tel: [
+          {
             required: true,
-            message: '请输入收货联系电话信息',
-            trigger: 'blur'
-          }],
-          county: [{
+            message: "请输入收货联系电话信息",
+            trigger: "blur"
+          }
+        ],
+        county: [
+          {
             required: true,
-            message: '请选择收货地址',
-            trigger: 'blur'
-          }],
-          addressXX: [{
+            message: "请选择收货地址",
+            trigger: "blur"
+          }
+        ],
+        addressXX: [
+          {
             required: true,
-            message: '请输入详细地址信息',
-            trigger: 'blur'
-          }],
-        },
-        sheetList: [], // 面单列表
-        currBookLIst: [],
-        booksShow: false,
-        showChange: true,
-      }
-    },
-    components: {
-      AddOrUpdate
-    },
-    activated() {
-      this.query.orderSn = this.$route.query.orderSn;
+            message: "请输入详细地址信息",
+            trigger: "blur"
+          }
+        ]
+      },
+      sheetList: [], // 面单列表
+      currBookLIst: [],
+      booksShow: false,
+      showChange: true
+    };
+  },
+  components: {
+    AddOrUpdate
+  },
+  activated() {
+    this.query.orderSn = this.$route.query.orderSn;
+    this.query.ordertype = this.$route.query.ordertype;
+    // console.log(this.$route.query.orderSn)
+    this.getData();
+    // this.getOrderSheetList()
+  },
+  methods: {
+    init() {
+      this.query.orderSn = this.orderSn;
       this.query.ordertype = this.$route.query.ordertype;
       // console.log(this.$route.query.orderSn)
-      this.getData()
-      // this.getOrderSheetList()
+      this.getData();
     },
-    methods: {
-      showProducts(item, index) {
-        this.showChange = false
-        this.sheetList[index].showProduct = !item.showProduct
-        this.showChange = true
-        //  console.log(this.sheetList,'this.sheetList[index].showProduct')
-      },
-      seeBooks(arr) {
-        this.currBookLIst = arr
-        this.booksShow = true
-      },
-      booksHandleClose() {
-        this.currBookLIst = []
-        this.booksShow = false
-      },
-      drawerHandleClose() {
-        // console.log('关闭')
-        this.traces = []
-        this.tracesShow = false
-        this.currentSheet = {}
-      },
-      // 获取某一快递的物流进度
-      seeSheetDetails(item) {
-        // console.log('正在查询快递进度',item)
-        this.currentSheet = item
-        let loading = this.$loading({
-          lock: true,
-          text: '正在获取物流信息...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        // var mobileLeng = this.orderDetails.consignee.consigneeMobile.length
-        this.$http({
-          url: this.$http.adornUrl('/book/buyOrder/searchExpress'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'expressOrderSn': item.expressOrderSn,
-            // 'expressCompanyCode': item.expressCompanyCode,
-            // 'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng)
-          })
-        }).then(({
-          data
-        }) => {
+    showProducts(item, index) {
+      this.showChange = false;
+      this.sheetList[index].showProduct = !item.showProduct;
+      this.showChange = true;
+      //  console.log(this.sheetList,'this.sheetList[index].showProduct')
+    },
+    seeBooks(arr) {
+      this.currBookLIst = arr;
+      this.booksShow = true;
+    },
+    booksHandleClose() {
+      this.currBookLIst = [];
+      this.booksShow = false;
+    },
+    drawerHandleClose() {
+      // console.log('关闭')
+      this.traces = [];
+      this.tracesShow = false;
+      this.currentSheet = {};
+    },
+    // 获取某一快递的物流进度
+    seeSheetDetails(item) {
+      // console.log('正在查询快递进度',item)
+      this.currentSheet = item;
+      let loading = this.$loading({
+        lock: true,
+        text: "正在获取物流信息...",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      // var mobileLeng = this.orderDetails.consignee.consigneeMobile.length
+      this.$http({
+        url: this.$http.adornUrl("/book/buyOrder/searchExpress"),
+        method: "get",
+        params: this.$http.adornParams({
+          expressOrderSn: item.expressOrderSn
+          // 'expressCompanyCode': item.expressCompanyCode,
+          // 'customerName': this.orderDetails.consignee.consigneeMobile.substring(mobileLeng-4, mobileLeng)
+        })
+      })
+        .then(({ data }) => {
           if (data.code == 0) {
             if (data.express.traces.length > 0) {
-              this.traces = data.express.traces
-              this.tracesShow = true
+              this.traces = data.express.traces;
+              this.tracesShow = true;
               // console.log(data,'data')
-              loading.close()
+              loading.close();
             } else {
-              this.$message('暂无物流信息哦~');
-              loading.close()
+              this.$message("暂无物流信息哦~");
+              loading.close();
             }
           }
-
-        }).catch(({
-          e
-        }) => {
-          console.log(e, 'e')
-          loading.close()
         })
-      },
-      countyChange(e) {
-        // console.log(e,'countyName')
-        this.countyEntity.countyList.find((val, index, arr) => {
-          this.addressForm.countyName = val.countyName
-          return val.regionCode == e
-        })
-        // console.log('this.addressForm.countyName', this.addressForm)
-      },
-      cityChange(e) {
-        //  console.log('修改了市',e)
-        this.addressForm.countyCode = null
-        this.countyEntity = this.cityEntity.cityList.find((val, index, arr) => {
-          this.addressForm.cityName = val.cityName
-          return val.regionCode == e
-        })
-        // console.log(' this.addressForm.cityName',  this.addressForm.cityName)
-      },
-      provinceChange(e) {
-        // console.log('修改了省份',e)
-        this.addressForm.cityCode = null;
-        this.addressForm.countyCode = null
-        this.cityEntity = this.provinceEntity.find((val, index, arr) => {
-          this.addressForm.provinceName = val.provName
-          return val.regionCode == e
-        })
-        // console.log('this.addressForm.provinceName',this.addressForm.provinceName)
-      },
-      changeAddHandleClose() {
-        this.changeAddVisible = false
-        this.addressForm.provinceCode = null
-        this.addressForm.cityCode = null;
-        this.addressForm.countyCode = null
-        this.addressForm.provinceName = null
-        this.addressForm.cityName = null;
-        this.addressForm.countyName = null
-        this.provinceEntity = []
-        this.cityEntity = []
-        this.countyEntity = []
-        this.$refs['addressFormRef'].clearValidate()
-        this.$nextTick(() => {
-          this.addressForm.name = ''
-          this.addressForm.tel = ''
-          this.addressForm.addressXX = ''
-          // this.$refs['addressFormRef'].resetFields();
-        })
-        // $refs[formName].resetFields()
-        // console.log('关闭了', this.addressForm)
-      },
-      changeAddressShow() {
-        this.$http({
-          url: this.$http.adornUrl('/api/province/getProvince'),
-          method: 'post',
-          // params: this.$http.adornParams({
-          //   'orderId': this.query.orderId
-          // })
-        }).then(({
-          data
-        }) => {
+        .catch(({ e }) => {
+          console.log(e, "e");
+          loading.close();
+        });
+    },
+    countyChange(e) {
+      // console.log(e,'countyName')
+      this.countyEntity.countyList.find((val, index, arr) => {
+        this.addressForm.countyName = val.countyName;
+        return val.regionCode == e;
+      });
+      // console.log('this.addressForm.countyName', this.addressForm)
+    },
+    cityChange(e) {
+      //  console.log('修改了市',e)
+      this.addressForm.countyCode = null;
+      this.countyEntity = this.cityEntity.cityList.find((val, index, arr) => {
+        this.addressForm.cityName = val.cityName;
+        return val.regionCode == e;
+      });
+      // console.log(' this.addressForm.cityName',  this.addressForm.cityName)
+    },
+    provinceChange(e) {
+      // console.log('修改了省份',e)
+      this.addressForm.cityCode = null;
+      this.addressForm.countyCode = null;
+      this.cityEntity = this.provinceEntity.find((val, index, arr) => {
+        this.addressForm.provinceName = val.provName;
+        return val.regionCode == e;
+      });
+      // console.log('this.addressForm.provinceName',this.addressForm.provinceName)
+    },
+    changeAddHandleClose() {
+      this.changeAddVisible = false;
+      this.addressForm.provinceCode = null;
+      this.addressForm.cityCode = null;
+      this.addressForm.countyCode = null;
+      this.addressForm.provinceName = null;
+      this.addressForm.cityName = null;
+      this.addressForm.countyName = null;
+      this.provinceEntity = [];
+      this.cityEntity = [];
+      this.countyEntity = [];
+      this.$refs["addressFormRef"].clearValidate();
+      this.$nextTick(() => {
+        this.addressForm.name = "";
+        this.addressForm.tel = "";
+        this.addressForm.addressXX = "";
+        // this.$refs['addressFormRef'].resetFields();
+      });
+      // $refs[formName].resetFields()
+      // console.log('关闭了', this.addressForm)
+    },
+    changeAddressShow() {
+      this.$http({
+        url: this.$http.adornUrl("/api/province/getProvince"),
+        method: "post"
+        // params: this.$http.adornParams({
+        //   'orderId': this.query.orderId
+        // })
+      })
+        .then(({ data }) => {
           // console.log('获取地址三级列表', data)
           if (data.code == 0) {
-            this.provinceEntity = data.provinceEntity
-            this.addressForm.addressXX = this.orderDetails.consignee.address
-            this.addressForm.provinceCode = this.orderDetails.consignee.provinceCode
-            this.addressForm.cityCode = this.orderDetails.consignee.cityCode
-            this.addressForm.countyCode = this.orderDetails.consignee.countyCode
-            this.addressForm.provinceName = this.orderDetails.consignee.provinceCode
-            this.addressForm.cityName = this.orderDetails.consignee.cityCode
-            this.addressForm.countyName = this.orderDetails.consignee.countyCode
-            this.addressForm.name = this.orderDetails.consignee.consigneeName
-            this.addressForm.tel = this.orderDetails.consignee.consigneeMobile
+            this.provinceEntity = data.provinceEntity;
+            this.addressForm.addressXX = this.orderDetails.consignee.address;
+            this.addressForm.provinceCode = this.orderDetails.consignee.provinceCode;
+            this.addressForm.cityCode = this.orderDetails.consignee.cityCode;
+            this.addressForm.countyCode = this.orderDetails.consignee.countyCode;
+            this.addressForm.provinceName = this.orderDetails.consignee.provinceCode;
+            this.addressForm.cityName = this.orderDetails.consignee.cityCode;
+            this.addressForm.countyName = this.orderDetails.consignee.countyCode;
+            this.addressForm.name = this.orderDetails.consignee.consigneeName;
+            this.addressForm.tel = this.orderDetails.consignee.consigneeMobile;
             // console.log(this.provinceEntity,'this.provinceEntity')
             this.cityEntity = this.provinceEntity.find((val, index, arr) => {
-              return val.regionCode == this.addressForm.provinceCode
-            })
-            this.countyEntity = this.cityEntity.cityList.find((val, index, arr) => {
-              return val.regionCode == this.addressForm.cityCode
-            })
+              return val.regionCode == this.addressForm.provinceCode;
+            });
+            this.countyEntity = this.cityEntity.cityList.find(
+              (val, index, arr) => {
+                return val.regionCode == this.addressForm.cityCode;
+              }
+            );
           }
-        }).catch(e => {
-          console.log(e, 'e')
         })
-        this.changeAddVisible = true
-        // console.log('显示修改收货地址')
-      },
-      // 修改收货信息
-      changeAddress() {
-        this.$refs['addressFormRef'].validate((valid) => {
-          if (valid) {
-            // console.log('修改收货地址')
-            this.$http({
-              url: this.$http.adornUrl('/book/buyOrder/modifyConsigneeAddress'),
-              method: 'post',
-              data: this.$http.adornData({
-                'orderSn': this.query.orderSn,
-                // 'province': this.addressForm.provinceName,
-                // 'city':  this.addressForm.cityName,
-                //  'county':  this.addressForm.countyName,
-                'address': this.addressForm.addressXX,
-                'consigneeName': this.addressForm.name,
-                'consigneeMobile': this.addressForm.tel,
-                "provinceCode": this.addressForm.provinceCode,
-                "cityCode": this.addressForm.cityCode,
-                "countyCode": this.addressForm.countyCode,
-                //'orderId': this.addressForm.orderId
-
-              })
-            }).then(({
-              data
-            }) => {
-              // console.log('修改地址返回值', data)
-              this.$message.success('修改地址成功！')
-              this.changeAddHandleClose()
-              this.getData()
-
-            }).catch(e => {
-              console.log(e, 'e')
+        .catch(e => {
+          console.log(e, "e");
+        });
+      this.changeAddVisible = true;
+      // console.log('显示修改收货地址')
+    },
+    // 修改收货信息
+    changeAddress() {
+      this.$refs["addressFormRef"].validate(valid => {
+        if (valid) {
+          // console.log('修改收货地址')
+          this.$http({
+            url: this.$http.adornUrl("/book/buyOrder/modifyConsigneeAddress"),
+            method: "post",
+            data: this.$http.adornData({
+              orderSn: this.query.orderSn,
+              // 'province': this.addressForm.provinceName,
+              // 'city':  this.addressForm.cityName,
+              //  'county':  this.addressForm.countyName,
+              address: this.addressForm.addressXX,
+              consigneeName: this.addressForm.name,
+              consigneeMobile: this.addressForm.tel,
+              provinceCode: this.addressForm.provinceCode,
+              cityCode: this.addressForm.cityCode,
+              countyCode: this.addressForm.countyCode
+              //'orderId': this.addressForm.orderId
             })
+          })
+            .then(({ data }) => {
+              // console.log('修改地址返回值', data)
+              this.$message.success("修改地址成功！");
+              this.changeAddHandleClose();
+              this.getData();
+            })
+            .catch(e => {
+              console.log(e, "e");
+            });
+        } else {
+          return false;
+        }
+      });
+    },
+
+    // 获取数据列表
+    getData() {
+      this.dataListLoading = true;
+      this.$http({
+        // url: this.$http.adornUrl(`/book/buyOrder/appGetOrderInfo/${this.query.ordertype}`),
+        url: this.$http.adornUrl(`/book/buyOrder/orderDetail`),
+        method: "get",
+        params: this.$http.adornParams({
+          orderSn: this.query.orderSn
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          // console.log(data.result,'data.result')
+          this.orderDetails = data.result;
+          if (data.result.expressOrders) {
+            data.result.expressOrders.forEach(element => {
+              element.showProduct = false;
+            });
+            this.sheetList = data.result.expressOrders;
+          }
+        } else {
+          this.orderDetails = {};
+          return this.$message.error("商品详情获取失败，请重试");
+        }
+        this.dataListLoading = false;
+      });
+    },
+    closeDeliverDialog(val) {
+      this.setDeliverVisible = false;
+      this.getData();
+    },
+    // 去发货
+    godeliver() {
+      this.orderList[0] = this.query.orderSn;
+      this.setDeliverVisible = true;
+    },
+
+    // 删除订单
+    deleteOrder() {
+      this.$confirm(`确定对订单进行删除操作?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.$http({
+          url: this.$http.adornUrl("/book/buyOrder/orderDel"),
+          method: "post",
+          params: this.$http.adornParams({
+            orderSn: this.orderDetails.orderSn
+          })
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.$message({
+              message: "删除成功",
+              type: "success",
+              duration: 1500,
+              onClose: () => {
+                this.$router.push({
+                  path: "/order-buyorder"
+                });
+              }
+            });
           } else {
-            return false;
+            this.$message.error(data.msg);
           }
         });
-      },
-
-      // 获取数据列表
-      getData() {
-        this.dataListLoading = true
-        this.$http({
-          // url: this.$http.adornUrl(`/book/buyOrder/appGetOrderInfo/${this.query.ordertype}`),
-          url: this.$http.adornUrl(`/book/buyOrder/orderDetail`),
-          method: 'get',
-          params: this.$http.adornParams({
-            'orderSn': this.query.orderSn,
-          })
-        }).then(({
-          data
-        }) => {
-          if (data && data.code === 0) {
-            // console.log(data.result,'data.result')
-            this.orderDetails = data.result
-            if (data.result.expressOrders) {
-              data.result.expressOrders.forEach(element => {
-                element.showProduct = false
-              });
-              this.sheetList = data.result.expressOrders
-            }
-
-          
-          } else {
-            this.orderDetails = {}
-            return this.$message.error('商品详情获取失败，请重试')
-          }
-          this.dataListLoading = false
-        })
-      },
-      closeDeliverDialog(val) {
-        this.setDeliverVisible = false
-        this.getData()
-      },
-      // 去发货
-      godeliver() {
-        this.orderList[0] = this.query.orderSn
-        this.setDeliverVisible = true
-      },
-
-      // 删除订单
-      deleteOrder() {
-        this.$confirm(`确定对订单进行删除操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/book/buyOrder/orderDel'),
-            method: 'post',
-            params: this.$http.adornParams({
-              'orderSn': this.orderDetails.orderSn
-            })
-          }).then(({
-            data
-          }) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '删除成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.$router.push({
-                    path: "/order-buyorder",
-                  });
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        })
-      }
-    },
-    components: {
-      setDeliverDialog
+      });
     }
+  },
+  components: {
+    setDeliverDialog
   }
+};
 </script>
 
 <style lang="less" scoped>
-  .myicon {
-    border: 1px solid #409eff;
-    margin-right: 5px;
-  }
+.myicon {
+  border: 1px solid #409eff;
+  margin-right: 5px;
+}
 
-  .booksUl {
-    overflow: hidden;
-    margin-top: 15px;
-    padding-left: 0;
+.booksUl {
+  overflow: hidden;
+  margin-top: 15px;
+  padding-left: 0;
 
-    li {
-      list-style: none;
-      width: 50%;
-      float: left;
-      align-items: center;
-      margin-bottom: 15px;
-    }
-  }
-
-  .sheetOrdersUl {
-    padding-left: 0;
-
-    li {
-      width: 100%;
-    }
-  }
-
-  .orderType {
-    overflow: hidden;
-    margin-bottom: 20px;
-
-    .item {
-      color: #fff;
-      display: inline-block;
-      padding: 10px;
-      border-radius: 0 20px 20px 0;
-    }
-
-    .hightLight0 {
-      background-color: #e6a23c;
-    }
-
-    .hightLight1 {
-      background-color: #409eff;
-    }
-
-    .hightLight2 {
-      background-color: #f56c6c;
-    }
-
-    .hightLight3 {
-      background-color: #67c23a;
-    }
-  }
-
-  .noinfo {
-    color: #ddd;
-    text-align: center;
-    padding: 20px;
-  }
-
-  .scroll {
-    margin-top: 15px;
-    height: 300px;
-  }
-
-  .deliverBox {
-    flex-wrap: wrap;
-    justify-content: space-between;
-
-    .item {
-      padding-right: 15px;
-      min-width: 300px;
-
-      .deliver_heade {
-        margin-top: 15px;
-      }
-    }
-  }
-
-  .el-timeline {
-    li {
-      float: none;
-    }
-  }
-
-  .flexbox {
-    display: flex;
-  }
-
-  .deliver_info {
-    border-radius: 10px;
-  }
-
-  .infoTitle {
-    display: inline;
-  }
-
-  ul.list {
-    overflow: hidden;
-    color: #515a6e;
-
-    li {
-      list-style: none;
-      width: 50%;
-      line-height: 26px;
-      float: left;
-      font-size: 12px;
-
-    }
-
-    .hightLight {
-      color: #f56c6c;
-    }
-
-    .line {
-      width: 100%;
-      border-bottom: 1px solid #eee;
-      margin: 10px 0;
-    }
-  }
-
-  .liName {
-    font-size: 12px;
-    margin-bottom: 10px;
-    font-weight: bold;
-  }
-
-  .text_button {
-    padding: 0;
-  }
-
-  .el-icon-truck:before {
-    content: "\e740";
-  }
-
-  .el-timeline-item:first-child {
-    .el-timeline-item__node {
-      background-color: rgb(11, 189, 135);
-    }
-
-    color: rgb(11, 189, 135) !important;
-  }
-
-  .el-timeline-item {
-    width: 100%;
-    position: relative;
-    padding-bottom: 20px;
-  }
-
-  .el-timeline-item__node--large {
-    left: -2px;
-    width: 14px;
-    height: 14px;
-  }
-
-  .el-timeline-item__node {
-    position: absolute;
-    background-color: #e4e7ed;
-    border-radius: 50%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .el-timeline-item__node--normal {
-    left: -1px;
-    width: 12px;
-    height: 12px;
-  }
-
-  .el-timeline-item__wrapper {
-    position: relative;
-    padding-left: 28px;
-    top: -3px;
-  }
-
-  .el-timeline li {
+  li {
     list-style: none;
+    width: 50%;
+    float: left;
+    align-items: center;
+    margin-bottom: 15px;
+  }
+}
+
+.sheetOrdersUl {
+  padding-left: 0;
+
+  li {
+    width: 100%;
+  }
+}
+
+.orderType {
+  overflow: hidden;
+  margin-bottom: 20px;
+
+  .item {
+    color: #fff;
+    display: inline-block;
+    padding: 10px;
+    border-radius: 0 20px 20px 0;
   }
 
-  .el-timeline-item__tail {
-    position: absolute;
-    left: 4px;
-    height: 100%;
-    border-left: 2px solid #e4e7ed;
+  .hightLight0 {
+    background-color: #e6a23c;
   }
 
-  .el-timeline .el-timeline-item:last-child .el-timeline-item__tail {
-    display: none;
+  .hightLight1 {
+    background-color: #409eff;
   }
 
-  .el-timeline-item__timestamp {
-    color: #c3c3c3;
-    font-size: 14px;
-    ;
+  .hightLight2 {
+    background-color: #f56c6c;
   }
 
-  /deep/ .el-select-dropdown {
-    width: 200px !important;
+  .hightLight3 {
+    background-color: #67c23a;
+  }
+}
+
+.noinfo {
+  color: #ddd;
+  text-align: center;
+  padding: 20px;
+}
+
+.scroll {
+  margin-top: 15px;
+  height: 300px;
+}
+
+.deliverBox {
+  flex-wrap: wrap;
+  justify-content: space-between;
+
+  .item {
+    padding-right: 15px;
+    min-width: 300px;
+
+    .deliver_heade {
+      margin-top: 15px;
+    }
+  }
+}
+
+.el-timeline {
+  li {
+    float: none;
+  }
+}
+
+.flexbox {
+  display: flex;
+}
+
+.deliver_info {
+  border-radius: 10px;
+}
+
+.infoTitle {
+  display: inline;
+}
+
+ul.list {
+  overflow: hidden;
+  color: #515a6e;
+
+  li {
+    list-style: none;
+    width: 50%;
+    line-height: 26px;
+    float: left;
+    font-size: 12px;
   }
 
-  :deep(.el-select-dropdown__list) {
-    width: 200px !important;
+  .hightLight {
+    color: #f56c6c;
   }
 
-  /deep/ .el-select-dropdown__list {
-    width: 200px !important;
+  .line {
+    width: 100%;
+    border-bottom: 1px solid #eee;
+    margin: 10px 0;
   }
-</style>
\ No newline at end of file
+}
+
+.liName {
+  font-size: 12px;
+  margin-bottom: 10px;
+  font-weight: bold;
+}
+
+.text_button {
+  padding: 0;
+}
+
+.el-icon-truck:before {
+  content: "\e740";
+}
+
+.el-timeline-item:first-child {
+  .el-timeline-item__node {
+    background-color: rgb(11, 189, 135);
+  }
+
+  color: rgb(11, 189, 135) !important;
+}
+
+.el-timeline-item {
+  width: 100%;
+  position: relative;
+  padding-bottom: 20px;
+}
+
+.el-timeline-item__node--large {
+  left: -2px;
+  width: 14px;
+  height: 14px;
+}
+
+.el-timeline-item__node {
+  position: absolute;
+  background-color: #e4e7ed;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.el-timeline-item__node--normal {
+  left: -1px;
+  width: 12px;
+  height: 12px;
+}
+
+.el-timeline-item__wrapper {
+  position: relative;
+  padding-left: 28px;
+  top: -3px;
+}
+
+.el-timeline li {
+  list-style: none;
+}
+
+.el-timeline-item__tail {
+  position: absolute;
+  left: 4px;
+  height: 100%;
+  border-left: 2px solid #e4e7ed;
+}
+
+.el-timeline .el-timeline-item:last-child .el-timeline-item__tail {
+  display: none;
+}
+
+.el-timeline-item__timestamp {
+  color: #c3c3c3;
+  font-size: 14px;
+}
+
+/deep/ .el-select-dropdown {
+  width: 200px !important;
+}
+
+:deep(.el-select-dropdown__list) {
+  width: 200px !important;
+}
+
+/deep/ .el-select-dropdown__list {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/modules/order/set-deliver-dialog.vue b/src/views/modules/order/set-deliver-dialog.vue
index 6ded56c..c8aa8a3 100644
--- a/src/views/modules/order/set-deliver-dialog.vue
+++ b/src/views/modules/order/set-deliver-dialog.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-dialog title="发货配置" :close-on-click-modal="false" :visible.sync="visible" width='500px'
-            :before-close="beforeCloseDialog">
+            :before-close="beforeCloseDialog" append-to-body>
             <!-- <el-steps :active="stepsActive" simple style="margin-bottom: 20px;;">
                     <el-step title="获取电子面单" icon="el-icon-tickets"></el-step>
                     <el-step title="打印电子面单" icon="el-icon-printer"></el-step>
diff --git a/src/views/modules/user/addPoints.vue b/src/views/modules/points/addPoints.vue
similarity index 84%
rename from src/views/modules/user/addPoints.vue
rename to src/views/modules/points/addPoints.vue
index 713a5cb..e47cf48 100644
--- a/src/views/modules/user/addPoints.vue
+++ b/src/views/modules/points/addPoints.vue
@@ -15,8 +15,54 @@
           <!-- <div style="background-color: #f0f0f0;padding:0 10px;box-sizing: border-box;color: #000;">
                         <p>绑定用户</p>
                     </div> -->
-          <el-form-item label="用户：" prop="user" class="form_item">
-            <div style="display: flex;align-items: center;">
+                    <template v-if="pageType == 'label'">
+            <el-form-item label="手机号/邮箱：" prop="userKey" class="form_item">
+              <div style="display: flex;align-items: center;">
+                <el-autocomplete
+                v-if="!isEdit"
+                  style="width: 400px;"
+                  v-model="addPointsForm.userKey"
+                  :fetch-suggestions="loadAll"
+                  placeholder="请输入手机号/邮箱"
+                  @select="handleSelect"
+                >
+                  <template #default="{ item }">
+                    <div class="custom-item">
+                      <span>{{ item.tel ? item.tel : item.email }}</span>
+                      <span
+                        style="color: gray; margin-left: 10px;"
+                        v-if="item.name"
+                        >({{ item.name }})</span
+                      >
+                    </div>
+                  </template>
+                </el-autocomplete>
+                <span v-if="isEdit">{{ addPointsForm.userKey }}</span>
+              </div>
+            </el-form-item>
+            <el-form-item
+              label="用户姓名："
+              style="width: 400px;"
+              v-if="addPointsForm.userId"
+              prop="user"
+              class="form_item"
+            >
+              <div>
+                <!-- <span
+                style="width: 110px;display: inline-block;text-align: right;"
+                >用户姓名：</span
+              > -->
+                {{
+                  addPointsForm.userName
+                    ? addPointsForm.userName
+                    : "-"
+                }}
+              </div></el-form-item
+            >
+          </template>
+          <template  v-if="pageType == 'user'"> 
+ <el-form-item label="用户：" prop="user" class="form_item" >
+            <div style="display: flex;align-items: center;" >
               {{ dataInfo.tel ? dataInfo.tel : dataInfo.email }}
               <span v-if="dataInfo.name">（ {{ dataInfo.name }}）</span>
              
@@ -41,6 +87,8 @@
                 </el-option
               ></el-select></div
           ></el-form-item>
+          </template>
+         
           <el-form-item label="充值湖分" prop="score">
             <el-input-number
               :min="0"
@@ -51,7 +99,7 @@
           </el-form-item>
 
           <el-form-item label="充值明细">
-            <el-input
+            <el-input   style="width: 400px;"
               type="textarea"
               rows="5"
               v-model="addPointsForm.detail"
@@ -153,22 +201,7 @@ export default {
       addForm: {},
       audioFileList: [],
       isFresh: false,
-      dataRule: {
-        type: [
-          {
-            required: true,
-            message: "请选择湖分分类"
-            // trigger: "change",
-          }
-        ],
-        score: [
-          {
-            required: true,
-            message: "请输入湖分"
-            // trigger: "change",
-          }
-        ]
-      }
+      dataRule: { }
     };
   },
   components: {
@@ -301,7 +334,35 @@ export default {
       this.addPointsForm = {};
       this.fileList = [];
       this.isEdit = type == "edit" ? true : false;
-
+if(this.pageType == 'label'){
+  this.dataRule= {
+     
+        score: [
+          {
+            required: true,
+            message: "请输入湖分"
+            // trigger: "change",
+          }
+        ]
+      }
+}else{
+  this.dataRule= {
+        type: [
+          {
+            required: true,
+            message: "请选择湖分分类"
+            // trigger: "change",
+          }
+        ],
+        score: [
+          {
+            required: true,
+            message: "请输入湖分"
+            // trigger: "change",
+          }
+        ]
+      }
+}
       if (data) {
         this.addPointsForm = {
           // courseId: data.id,
diff --git a/src/views/modules/points/cateList.vue b/src/views/modules/points/cateList.vue
new file mode 100644
index 0000000..31e548d
--- /dev/null
+++ b/src/views/modules/points/cateList.vue
@@ -0,0 +1,1501 @@
+<template>
+  <div class="mod-config">
+  
+    <commonTree
+      source="tags"
+      axiosType="raw"
+      axiosResultKey="market"
+      @changeCurrentNode="changeCurrentNode"
+      ref="commonTree"
+      :dataList="treeDataList"
+      @getCommonShopDataList="getCommonShopDataList"
+      @handleClickNodes="handleClickNodes"
+      :urlList="urlList"
+    ></commonTree>
+    <div
+      v-if="isFresh"
+      v-loading="!isFresh"
+      style="width: calc(100% - 360px); height: 100%; overflow-y: scroll; float: right; border: 1px solid #bababa;   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); border-radius: 10px;position: relative;"
+    >
+    <div class="border_box info_box">
+          <div class="title_box">
+            <div class="title"><span class="line"></span>基本标签信息</div>
+          </div>
+          <div class="addFormBox">
+            <el-form :model="addForm" ref="addForm" label-width="80px">
+              <el-form-item label="标签名称" prop="title" class="form_item">
+                <el-input
+                  placeholder="请输入标签名称"
+                  style="width: 100%"
+                  v-model="addForm.title"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+
+              <el-form-item label="排序" prop="sort" class="form_item">
+                <el-input-number
+                  placeholder="请输入标签排序"
+                  style="width: 100%"
+                  v-model="addForm.sort"
+                  :min="0"
+                  clearable
+                  @keyup.native="UpNumber"
+                  @keydown.native="UpNumber"
+                >
+                </el-input-number>
+              </el-form-item>
+              <el-form-item
+                label="是否为最终级"
+                prop="isLast"
+                label-width="120px"
+                class="form_item"
+              >
+                <el-switch
+                  v-model="addForm.isLast"
+                  active-color="#13ce66"
+                  :active-value="1"
+                  :inactive-value="0"
+                  active-text="是"
+                  inactive-text="否"
+                  @change="handleChangeIsLast"
+                >
+                </el-switch>
+              </el-form-item>
+            </el-form>
+          </div>
+        </div>
+        <div
+        style="padding-top: 0;padding-bottom: 0;"          class="border_box tree_content_box"
+          v-if="currentNode && currentNode.data.isLast == 1"
+        >
+          <div class="title_box" style="margin-bottom: 10px; height: 40px">
+            <div class="title">
+              <span class="line"></span>证书列表
+              <el-button
+                plain
+                type="primary"
+                style="margin-left: 20px"
+                @click="openTable('addForm')"
+                size="mini"
+                >新增</el-button
+              >
+
+              <!-- <div style="" class="button_box"> -->
+              <!-- <el-button plain type="danger" @click="handleCheckAllChange(true)" size="mini">清空</el-button> -->
+
+              <!-- </div> -->
+            </div>
+          </div>
+          <!-- :isNoSearch="true" -->
+          <commonShop
+           
+            :CustomEdit="true"
+            :otherInfo="{
+              httpType: 'raw',
+              resultValueName: 'certificateList'
+            }"
+            :defaultForm="{
+                tel:'',
+                title:'',
+              labelId: addForm.id
+            }"
+            axiosType="raw"
+            getAssociatedGoodsListKey="id"
+            :isNoPaging="true"
+           
+            :isShowPagination="true"
+            getAssociatedGoodsListValue="result"
+            :tableColumnList="tableColumnList"
+            :currentId="addForm.id ? addForm.id : ''"
+            currentType="bookMarketId"
+            :dataList="associatedGoodsList"
+            :urlList="urlList"
+            @delete="dataFormDelete"
+            @edit="handleDataFormEdit"
+            :isEdit="isEdit"
+            ref="commonShop"
+            :style="`height: calc(100vh - 340px); `"
+          >
+            <template slot="searchFormItem" slot-scope="slotProps">
+           
+             
+              <el-form-item
+                label="手机号:"
+                prop="title"
+                class="form_item"
+                style="width: 240px;"
+              >
+                <el-input
+                  size="small"
+                  placeholder="请输入手机号"
+                  style="width: 100%"
+                  v-model="slotProps.dataForm.tel"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+              <el-form-item
+                label="证书名称:"
+                prop="title"
+                class="form_item"
+                style="width: 240px;"
+              >
+                <el-input
+                  size="small"
+                  placeholder="请输入证书名称"
+                  style="width: 100%"
+                  v-model="slotProps.dataForm.title"
+                  clearable
+                >
+                </el-input>
+              </el-form-item>
+            </template>
+            <template slot="tableItem" slot-scope="slotProps">
+              <el-table-column
+                label="序号"
+                width="50"
+                align="center"
+                prop="certificateNo"
+              >
+                <template slot-scope="scope">
+              {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
+            </template>
+              </el-table-column> <el-table-column
+                width="180"
+                prop="toSociologySort"
+                header-align="center"
+                align="center"
+                label="用户信息"
+              >
+                <template slot-scope="scope">
+                  <div>
+                    <span
+                      >姓名：{{
+                        scope.row.user.name ? scope.row.user.name : "-"
+                      }}</span
+                    >
+                  </div>
+                  <div v-if="scope.row.user.tel">
+                    <span>手机号：{{ scope.row.user.tel }}</span>
+                  </div>
+                  <div v-else-if="scope.row.user.email">
+                    <span>邮箱：{{ scope.row.user.email }}</span>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="湖分"
+                width="120"
+                align="center"
+                prop="certificateNo"
+              >
+              
+              </el-table-column>
+              <el-table-column
+                label="描述"
+               
+                align="center"
+                prop="certificateNo"
+              >
+              
+              </el-table-column>
+             
+            
+
+            
+              <el-table-column
+                prop="createTime"
+                header-align="center"
+                align="center"
+                width="140"
+                label="创建日期"
+              >
+              </el-table-column>
+            </template>
+          </commonShop>
+
+          <!-- <div
+                style="  border: 1px dashed #bababa;"
+                v-if="currentNode && currentNode.data.isLast == 1"
+              ></div> -->
+        </div>
+        <div class="submitButton submitButtonBox">
+          <el-button
+            type="primary"
+            @click="dataFormSubmit('addForm')"
+            size="small"
+            style="float: right;margin-right: 20px;"
+            >确定</el-button
+          >
+          <!-- </div> -->
+        </div>
+    </div>
+
+    <!-- <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+     
+        
+      </el-form> -->
+    <addCertificate v-if="currentNode.data&&currentNode.data.id"
+      ref="addCertificate"
+      :data="addCertificateForm"
+      :labelId="currentNode.data.id"
+      pageType="label"
+      @refresh="refresh"
+    ></addCertificate>
+    <commonShopTable
+      title="课程"
+      CustomOperationText="选择"
+      :otherInfo="{
+        httpType: 'raw',
+        httpDataValueName: 'records',
+        httpDataTotalName: 'total'
+      }"
+      :defaultForm="{
+        keywords: '',
+        id: addForm.id
+      }"
+      :urlList="urlList"
+      :tableColumnList="tableColumnList"
+      marketIdKey="marketId"
+      ref="commonShopTable"
+      :currentId="addForm.id"
+      currentType="bookMarketId"
+      @submit="handleSubmitShopTable"
+    >
+      <template slot="searchFormItem" slot-scope="slotProps">
+        <el-form-item label="课程名称" prop="keywords" class="form_item">
+          <el-input
+            size="small"
+            placeholder="请输入课程名称"
+            style="width: 100%"
+            v-model="slotProps.dataForm.keywords"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+        <!-- <el-form-item label="商品类型" prop="goodsType" class="form_item">
+                <el-select size="small" v-model="dataForm.goodsType" placeholder="请选择" style="width: 100%" clearable>
+                  <el-option v-for="item in goodsTypeList" :key="item.dictType" :label="item.dictValue"
+                    :value="item.dictType">
+                  </el-option>
+                </el-select>
+              </el-form-item> -->
+      </template>
+
+      <template slot="tableItem" slot-scope="slotProps">
+        <el-table-column label="课程ID" width="70" align="center" prop="id">
+          <!-- <template slot-scope="scope">
+              {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
+            </template> -->
+        </el-table-column>
+        <el-table-column
+          prop="title"
+          header-align="center"
+          align="center"
+          label="课程名称"
+        >
+        </el-table-column>
+
+        <el-table-column
+          header-align="center"
+          align="center"
+          label="课程图"
+          width="120"
+        >
+          <template slot-scope="scope">
+            <img
+              v-if="scope.row.image != ''"
+              :src="scope.row.image"
+              width="25"
+              height="35"
+              class="tableImg"
+            />
+          </template>
+        </el-table-column>
+      </template>
+    </commonShopTable>
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></add-or-update>
+  </div>
+</template>
+
+<script>
+import previewimage from "@/views/components/preview-image.vue";
+import { quillEditor } from "vue-quill-editor";
+import global from "../../common/common.vue"; //引入共用组间
+import debounce from "lodash/debounce"; //导入lodash中的debounce
+import AddOrUpdate from "@/views/components/commonBookTags/bookTagsForm.vue";
+import addCertificate from "./addPoints.vue";
+import commonShop from "@/views/components/commonBookTags/shopproduct.vue";
+import commonShopTable from "@/views/components/commonBookTags/shopproductTable.vue";
+import commonTree from "@/views/components/commonBookTags/tags.vue";
+
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
+const toolbarOptions = [
+  ["bold", "italic", "underline", "strike"], // 加粗，斜体，下划线，删除线
+  ["blockquote", "code-block"], //引用，代码块
+  [{ header: 1 }, { header: 2 }], // 几级标题
+  [{ list: "ordered" }, { list: "bullet" }], // 有序列表，无序列表
+  [{ script: "sub" }, { script: "super" }], // 下角标，上角标
+  [{ indent: "-1" }, { indent: "+1" }], // 缩进
+  [{ direction: "rtl" }], // 文字输入方向
+  [{ size: ["small", false, "large", "huge"] }], // 字体大小
+  [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+  [{ color: [] }, { background: [] }], // 颜色选择
+  [
+    {
+      font: [
+        "SimSun",
+        "SimHei",
+        "Microsoft-YaHei",
+        "KaiTi",
+        "FangSong",
+        "Arial"
+      ]
+    }
+  ], // 字体
+  [{ align: [] }], // 居中
+  ["clean"], // 清除样式,
+  ["link", "image"] // 上传图片、上传视频
+];
+// import dialogComponent from './seckillprodrelation'
+export default {
+  data() {
+    return {
+      disabled: false,
+      restaurants: [],
+
+      options: [],
+      state: "",
+      timeout: null,
+      addCertificateForm: {},
+      baseUrl: global.baseUrl,
+      isEdit: false,
+      checkAll: false,
+      isIndeterminate: true,
+      dialogVisible: false,
+      urlList: {
+        treeList: "/master/userCertificate/userCertificateLabelList",
+        delete: "/master/userCertificate/delUserCertificateLabel",
+        deleteShop: "/master/userCertificate/delCertificate",
+        saveShop: "/master/userCertificate/editCertificate",
+        add: "/master/userCertificate/saveUserCertificateLabel",
+        edit: "/master/userCertificate/editUserCertificateLabel",
+        hasBindProductList:
+          "/master/userCertificate/userCertificateList",
+        CanBindProductList: "/master/courseMedical/getCourseListCanMedical",
+        editCourse: "/master/courseMedical/updateCourseToMedicalSort"
+      },
+      activeName: "first",
+      addForm: {},
+      audioFileList: [],
+      isFresh: false,
+      dataRule: {
+        name: [
+          {
+            required: true,
+            message: "标签名称不能为空"
+            // trigger: "change",
+          }
+        ]
+      },
+      fimages: "",
+      currentNode: {},
+      treeDataList: [],
+      associatedGoodsList: [], //已关联商品列表
+
+      isact: "", //当前hover的节点
+      isactTitle: "", //记录修改节点名称
+      curNode: undefined, //当前选中节点
+      isUpdateGroup: false, //是否在修改模板组
+      filterText: "",
+      indexRecord: [], //记录节点轨迹
+      isBreak: false, //是否结束循环
+      defaultProps: {
+        children: "children",
+        label: "title"
+      },
+      dataForm: {
+        key: ""
+      },
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false,
+      tableColumnList: [
+        { label: "商品ID", width: 70, align: "center", prop: "productId" },
+        {
+          label: "商品名称",
+          align: "center",
+          prop: "product.productName",
+          headerAlign: "center"
+        },
+        {
+          label: "价格",
+          align: "center",
+          prop: "product.price",
+          headerAlign: "center"
+        },
+        {
+          label: "活动价",
+          width: 120,
+          align: "center",
+          prop: "product.activityPrice",
+          headerAlign: "center"
+        },
+        {
+          label: "库存",
+          width: 120,
+          align: "center",
+          prop: "product.productStock",
+          headerAlign: "center"
+        },
+        {
+          label: "商品图",
+          width: 120,
+          align: "center",
+          prop: "product.productImages",
+          headerAlign: "center",
+          slot: "productImages"
+        }
+      ],
+      // 富文本编辑器配置
+      editorOption: {
+        modules: {
+          history: {
+            delay: 1000,
+            maxStack: 50,
+            userOnly: false
+          },
+          toolbar: {
+            container: toolbarOptions,
+            handlers: {
+              image: function(value) {
+                // if (value) {
+                // 调用element的图片上传组件
+                document.querySelector(".avatar-uploader11 input").click();
+                // } else {
+                //   this.quill.format("image", false);
+                // }
+              }
+            }
+          }
+        },
+        placeholder: "请输入简介说明"
+      }
+    };
+  },
+  components: {
+    AddOrUpdate,
+    addCertificate,
+    commonShop,
+    commonTree,
+    commonShopTable,
+    quillEditor,
+    previewimage
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  activated() {
+    this.isEdit = false;
+    this.getDataList();
+  },
+  methods: {
+    refresh(){
+      this.$nextTick(()=>{
+ this.$refs.commonShop.getAssociatedGoodsList()
+      })
+     
+    },
+    getCate(id) {
+      this.linshiids = [];
+
+      this.$http({
+        url: this.$http.adornUrl("/master/userManage/catalogueListByCourse"),
+        method: "post",
+        data: this.$http.adornData({
+          courseId: id
+        })
+      })
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            console.log("data", "data++++++++++++++++++++");
+            this.addCertificateForm.cate = data.list;
+            // this.addCertificateForm.cate
+          } else {
+            this.addCertificateForm.cate = [];
+            this.linshiids = [];
+          }
+        })
+        .catch(e => {
+          console.log("数据报错");
+        });
+    },
+
+    handleDataFormEdit(data) {
+      console.log("data at line 472:", data);
+
+      // this.$nextTick(() => {
+      //   this.$refs.addCertificate.init("edit", {
+      //     certificateNo:data.certificateNo,
+      //     id:data.id,
+      //     userId:data.userId,
+      //     userKey:data.user.tel||data.user.email,
+      //     userName:data.user.name,
+      //     courseId:data.courseId,
+      //     courseName:data.title,
+      //     labelId:data.labelId,
+      //     images:data.certificateUrl,
+      //   },);
+      // });
+
+      // this.selectChange(data.id)
+    },
+
+    onprogress() {
+      this.$message("上传中，请勿关闭或进行其他操作");
+    },
+    audioHandleRemove(file, fileList) {
+      console.log(file, fileList);
+      this.audioFileList = [];
+      this.addForm.media = "";
+    },
+    audioUploadSuccess(res, file) {
+      this.audioFileList = [];
+      this.audioFileList.push(file);
+      this.$message.success("上传成功");
+      console.log(this.audioFileList, res, "上传成功");
+      this.addForm.media = res.url;
+    },
+    // 失去焦点事件
+    onEditorBlur(quill) {
+      //  console.log('editor blur!', quill)
+    },
+    // 获得焦点事件
+    onEditorFocus(quill) {
+      //console.log('editor focus!', quill)
+    },
+    // 准备富文本编辑器
+    onEditorReady(quill) {
+      // console.log('editor ready!', quill)
+    },
+    contentUploadSuccess888(res, file) {
+      console.log(res);
+    },
+    contentUploadSuccess(res, file) {
+      // console.log(res)
+      let quill = this.$refs.myQuillEditor.quill;
+      // 如果上传成功
+      if (res) {
+        // 获取光标所在位置
+        let length = quill.getSelection().index;
+        // 插入图片，res为服务器返回的图片链接地址
+        quill.insertEmbed(length, "image", res.url);
+        // 调整光标到最后
+        quill.setSelection(length + 1);
+      } else {
+        // 提示信息，需引入Message
+        this.$message.error("图片插入失败！");
+      }
+    },
+    UpNumber(e) {
+      e.target.value = e.target.value.replace(/[^\d]/g, "");
+    },
+    dataFormEdit() {
+      this.checkAll = false;
+      this.isEdit = !this.isEdit;
+    },
+    handleCheckAllChange(val) {
+      this.$nextTick(() => {
+        this.$refs.commonShop.handleCheckAllChange(val);
+      });
+    },
+    clearCourse() {
+      this.addCertificateForm.courseId = "";
+      this.addCertificateForm.courseName = "";
+      this.addCertificateForm.courseImg = "";
+    },
+    handleSubmitShopTable: debounce(async function(ids, data) {
+      console.log("ids at line 492:", ids, data);
+      this.addCertificateForm = {
+        courseId: ids,
+        courseName: data.title,
+        courseImg: data.image
+      };
+      if (this.$refs.commonShopTable) {
+        this.$refs.commonShopTable.close();
+      }
+      // await this.$http
+      //     .request({
+      //         url: this.$http.adornUrl(`${this.urlList.saveShop}`),
+      //         method: "POST",
+      //         data: {
+      //             courseId: ids,
+      //             medicalId: this.addForm.id
+      //         },
+      //         header: {
+      //             //默认 无 说明：请求头
+      //             "Content-Type": "application/json"
+      //         }
+      //     })
+      //     .then(async ({ data }) => {
+      //         if (data && data.code === 0) {
+      //             this.$message.success(data.msg);
+
+      //             if (this.$refs.commonShop) {
+      //                 // this.$refs.commonShop.getAssociatedGoodsList.dataForm={
+      //                 //   ...this.$refs.commonShop.getAssociatedGoodsList.dataForm,
+      //                 //   id:this.addForm.id ? this.addForm.id : null
+      //                 // }
+
+      //                 this.$refs.commonShop.getAssociatedGoodsList();
+      //             }
+      //             if (this.$refs.commonShopTable) {
+      //                 this.$refs.commonShopTable.close();
+      //             }
+      //         } else {
+      //             this.$message.error(data.msg);
+      //         }
+      //     });
+    }, 200),
+    openTable() {
+      this.restaurants = [];
+
+      this.$refs.addCertificate.init("add", {});
+      this.$forceUpdate();
+      //   this.dialogVisible = true;
+      // this.isEdit = false;
+      // this.$nextTick(() => {
+      //   this.$refs.commonShopTable.dataForm.marketId = this.addForm.id;
+      //   this.$refs.commonShopTable.open(this.addForm.id);
+      // });
+    },
+    selectCourse() {
+      // this.dialogVisible = true;
+      this.isEdit = false;
+      this.$nextTick(() => {
+        this.$refs.commonShopTable.dataForm.marketId = this.addForm.id;
+        this.$refs.commonShopTable.open(this.addForm.id);
+      });
+    },
+    handleChangeIsLast(e) {
+      console.log("🚀 ~ handleChangeIsLast ~ e:", e);
+      this.$nextTick(() => {
+        if (e == 1) {
+          if (this.$refs.commonShop) {
+            // this.$refs.commonShop.getAssociatedGoodsList.dataForm={
+            //   ...this.$refs.commonShop.getAssociatedGoodsList.dataForm,
+            //   id:this.addForm.id ? this.addForm.id : null
+            // }
+            this.$refs.commonShop.getAssociatedGoodsList();
+          }
+        }
+      });
+    },
+
+    async getCommonShopDataList(type, id, form) {
+      this.isFresh = false;
+      this.isEdit = false;
+      this.isFresh = true;
+      console.log("🚀 ~ getCommonShopDataList ~ type, id:", type, id);
+
+      this.currentNode = { data: { ...form } };
+      this.addForm = form;
+      if (this.addForm.isLast == 0) {
+        this.activeName = "first";
+      }
+      //   this.fimages = this.addForm.icon;
+      //   this.audioFileList = [];
+      //   if (this.addForm.mediaType == 2 && this.addForm.media != "") {
+      //     this.audioFileList.push({
+      //       url: this.addForm.media,
+      //       name: "audio--"
+      //     });
+      //   }
+
+      await this.getDataList();
+      // this.$refs.commonTree.setCurrentNodeShow();
+      this.$nextTick(() => {
+        // this.$refs.commonShop.clear();
+        // this.$refs.commonShop.bookMarketId = null;
+        if (form.isLast == 1) {
+          if (this.$refs.commonShop) {
+            // this.$refs.commonShop.getAssociatedGoodsList.dataForm={
+            //   ...this.$refs.commonShop.getAssociatedGoodsList.dataForm,
+            //   id:this.addForm.id ? this.addForm.id : null
+            // }
+            this.$refs.commonShop.getAssociatedGoodsList();
+          }
+        }
+      });
+    },
+    delImg() {
+      this.fimages = "";
+      this.addForm.icon = "";
+    },
+    handlePicSuccess(res, file) {
+      this.fimages = res.url;
+      //   this.addForm.icon = res.url;
+      this.$message.success("上传成功");
+      //  console.log(res, "上传");
+    },
+    handlePicSuccess11() {
+      console.log("上传音频---");
+    },
+    handlePicSuccess111() {
+      console.log("上传音频");
+    },
+
+    //新增修改
+    dataFormSubmit: debounce(async function(formName) {
+      //    return false
+      if (this.addForm.title == "" || !this.addForm.title) {
+        this.$message.error("请输入标签名称");
+        return false;
+      }
+
+      if (!this.addForm.content) {
+        this.addForm.content = "";
+      }
+      console.log(this.addForm, "this.addForm-----------");
+      await this.$refs[formName].validate(async valid => {
+        if (valid) {
+          await this.$http({
+            url: this.$http.adornUrl(
+              this.addForm.id ? this.urlList.edit : this.urlList.add
+            ),
+            method: "post",
+            data: this.$http.adornData({
+              ...this.addForm
+            })
+          }).then(async ({ data }) => {
+            if (data && data.code === 0) {
+              // var status = await this.correlationShop(data.result.id);
+              await this.getDataList();
+              this.$nextTick(async () => {
+                this.$refs.commonTree.setCurrentNodeShow(data.labelId);
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false;
+                  }
+                });
+                // this.$refs.commonShopTable.getAssociatedGoodsList();
+                // if (data.Medical.icon && data.Medical.icon != "") {
+                //   this.fimages = data.Medical.icon;
+                // }
+
+                // this.addForm = data.Medical;
+                // this.audioFileList = [];
+                // if (this.addForm.mediaType == 2 && this.addForm.media != "") {
+                //   this.audioFileList.push({
+                //     url: this.addForm.media,
+                //     name: "audio"
+                //   });
+                // }
+                ///    this.currentNode = { data: { ...data.Medical } };
+              });
+            } else {
+              this.$message.error(data.msg);
+              setTimeout(() => {
+                this.addForm = { ...this.currentNode.data };
+              }, 500);
+
+              // console.log('this.addForm at line 550:', this.addForm)
+              // console.log('this.addForm at line 550:', this.currentNode)
+            }
+          });
+        }
+      });
+    }, 200),
+    //新增修改
+    dataFormDelete: debounce(async function(row, deleteType) {
+      console.log("row at line 515:", row);
+      this.$confirm(
+        `确定要删除${deleteType != "all" ? "该" : "所有"}证书吗?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      )
+        .then(async () => {
+          // var lableIds = row[0].bookLabelId;
+          var productIds = row[0].id;
+
+          // //    return false
+          // var selectShopArr = this.$refs.commonShop.selectShopArr;
+          // console.log(selectShopArr, "1111");
+
+          // if (selectShopArr.length == 0) {
+          //   this.$message.error("请选择已关联的商品");
+          //   return false;
+          // }
+          this.$refs.commonShop.dataListLoading = true;
+          await this.$http
+            .request({
+              url: this.$http.adornUrl(`${this.urlList.deleteShop}`),
+              method: "POST",
+              data: {
+                id: productIds
+                // marketId: this.addForm.id
+              },
+              header: {
+                //默认 无 说明：请求头
+                "Content-Type": "application/json"
+              }
+            })
+            .then(async ({ data }) => {
+              if (data && data.code === 0) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(data.msg);
+              }
+              this.$nextTick(() => {
+                // this.$refs.commonShop.selectShopArr = [];
+                if (this.$refs.commonShop) {
+                  //     this.$refs.commonShop.getAssociatedGoodsList.dataForm={
+                  //   ...this.$refs.commonShop.getAssociatedGoodsList.dataForm,
+                  //   id:this.addForm.id ? this.addForm.id : null
+                  // }
+                  this.$refs.commonShop.getAssociatedGoodsList();
+                }
+              });
+            });
+        })
+        .catch(() => {});
+    }, 200),
+    setCheckedKeys() {
+      this.$refs.tree.setCheckedKeys([0]);
+    },
+    changeCurrentNode(val) {
+      this.changeCurrentNode = val;
+      this.$forceUpdate();
+    },
+    handlereset() {
+      this.currentNode = null;
+      this.isFresh = false;
+      this.isFresh = true;
+    },
+    handleClickNodes(node, data, type) {
+      this.isEdit = false;
+      this.addForm = {};
+      // console.log(this.$refs.tree.handleClickNodes(), "当前选中节点");
+      console.log(node, data, "当前选中节点");
+      this.currentNode = node ? node : {};
+
+      this.isFresh = false;
+      this.isFresh = true;
+
+      var form = {};
+      switch (type) {
+        case "add":
+          form = { ...data };
+          break;
+        case "edit":
+          form = { ...node.data };
+          break;
+        case "addChildren":
+          form = {
+            children: [],
+            delFlag: 0,
+            isLast: 0,
+            icon: "",
+            content: "",
+            pid: data.id,
+            sort: 0,
+            title: ""
+          };
+          break;
+      }
+      this.addForm = { ...form };
+      this.$nextTick(() => {
+        this.$refs.commonShop.clear();
+        // this.$refs.commonShop.bookMarketId = null;
+        this.$refs.commonShop.getDataList(type == "edit" ? form.id : "");
+      });
+    },
+    addOrUpdateHandle() {
+      var addform = {
+        children: [],
+        delFlag: 0,
+        isLast: 0,
+        pid: 0,
+        sort: 0,
+        title: "",
+        icon: ""
+      };
+      this.handleClickNodes({ data: addform }, addform, "add");
+      // if (!this.currentNode) {
+      //   this.$message.error("请先选择分类");
+      //   return;
+      // }
+    },
+
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.title.indexOf(value) !== -1;
+    },
+
+    // renderContent(h, { node, data, store }) {
+    //   return;
+    //   `<span
+    //       style="flex: 1; display: flex; align-items: center; justify-content: space-between; padding-right: 8px;"
+    //       on-mouseenter={() => this.mouseenteract(data)}
+    //       on-mouseleave={() => this.mouseleaveact(data)}
+    //     >
+    //       <span>
+    //         <span>{node.label}</span>
+    //       </span>
+    //       {this.isact == data ? (
+    //         <span>
+    //           {this.isact.typeName == "模板组" ? (
+    //             <el-button
+    //               class="m-r-10"
+    //               type="text"
+    //               icon="el-icon-edit"
+    //               on-click={() => this.handleUpdateGroup(node, data)}
+    //             ></el-button>
+    //           ) : (
+    //             <span></span>
+    //           )}
+    //           <el-button
+    //             type="text"
+    //             icon="el-icon-delete"
+    //             on-click={(e) => this.handleDelete(node, data, e)}
+    //           ></el-button>
+    //         </span>
+    //       ) : (
+    //         <span></span>
+    //       )}
+    //     </span>`;
+    // },
+    updateRenderContent(h, { node, data, store }) {
+      return `
+          <span style="flex: 1; display: flex; align-items: center; justify-content: space-between; padding-right: 8px;">
+            <span>
+              {this.isact == data ? (
+                <input
+                  type="text"
+                  onChange={this.handleChangeTitle.bind(this)}
+                  value={node.label}
+                />
+              ) : (
+                <span>{node.label}</span>
+              )}
+            </span>
+            {this.isact == data ? (
+              <span>
+                {this.isact.typeName == "模板组" ? (
+                  <span>
+                    <el-button
+                      class="m-r-10"
+                      type="text"
+                      icon="el-icon-check"
+                      on-click={() => this.updateGroup(node, data)}
+                    ></el-button>
+                    <el-button
+                      class="m-r-10"
+                      type="text"
+                      icon="el-icon-close"
+                      on-click={(e) => this.cancelUpdate(node, data, e)}
+                    ></el-button>
+                  </span>
+                ) : (
+                  <span></span>
+                )}
+              </span>
+            ) : (
+              <span></span>
+            )}
+          </span>`;
+    },
+    //获取鼠标进入节点的数据
+    mouseenteract(da) {
+      this.isact = da;
+    },
+    mouseleaveact(da) {
+      this.isact = "";
+    },
+    handleNodeClick(pdata) {
+      this.curNode = pdata;
+      document
+        .getElementsByClassName("el-tree-node__content")[0]
+        .setAttribute("class", "el-tree-node__content");
+    },
+    handleDelete(node, data, e) {
+      e.stopPropagation();
+      //存在则添加到子级
+      const parent = node.parent;
+      const children = parent.data.nodes || parent.data;
+      //若parent.data是对象，操作的是子级；如果是数组，操作的是最外层
+      if (Array.isArray(parent.data)) {
+        const parentIndex = parent.data.findIndex(d => d.id === data.id);
+        parent.data.splice(parentIndex, 1);
+      } else {
+        const childIndex = children.findIndex(d => d.id === data.id);
+        children.splice(childIndex, 1);
+      }
+      this.curNode = undefined;
+    },
+    //新增组
+    handleAddGroup() {
+      /**
+             *  如果模版深度最多两层，取消该部分注释
+             * //最多只有两层组 不可能添加在dept2的组上 curNode存在 并且  深度超过1
+               if (this.curNode != undefined && this.curNode.depth != 1) { 
+               this.$message.warning("不能添加超过两层");  
+               return; 
+             }
+             */
+
+      //如果isUpdateGroup 已经是true了 说明重复点击了
+      if (this.isUpdateGroup) {
+        return;
+      }
+
+      let id = ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+        (
+          c ^
+          (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))
+        ).toString(16)
+      );
+      let newChild = {
+        parentId: "", //如果有这个id 是插入第二层 否则是第一层 可有可无
+        text: "", //必须有 this.templateContent.tempName
+        nodes: [],
+        id: id,
+        typeName: "模板组",
+        temporaryData: "1" //用来区分临时数据
+      };
+      /* 如果模版深度最多两层，以下条件改成该部分注释
+              this.curNode && this.curNode.depth == 1 
+            */
+      this.indexRecord = [];
+      if (this.curNode) {
+        if (!this.curNode.nodes) {
+          this.$message.warning("模板不可添加");
+          return;
+        }
+        newChild.parentId = this.curNode.id;
+        /* 如果模版深度最多两层，以下条件改成该部分注释
+                  const index = this.treeDataList.findIndex(
+                    item => item.id == this.curNode.id
+                  );
+                  this.treeDataList[index].nodes.push(newChild);
+                */
+        //找到tree中的index轨迹
+        this.getTemplateTreeNode(this.curNode.id, this.treeDataList, 0);
+        //按照index轨迹插入节点
+        this.insertNode(
+          newChild,
+          this.treeDataList,
+          this.indexRecord,
+          this.indexRecord.length
+        );
+        this.isBreak = false;
+      } else if (this.curNode == undefined) {
+        //没有选中的时候 添加到最外层
+        newChild.depth = 1;
+        this.treeDataList.push(newChild);
+      }
+      //调用出updateRender的input
+      this.isact = newChild;
+      this.isUpdateGroup = true;
+    },
+    //递归遍历获得选中node
+    getTemplateTreeNode(target, list, dept) {
+      //空数组直接返回
+      if (list.length == 0) return;
+      let dataLen = list.length;
+      for (let i = 0; i < dataLen; i++) {
+        //如果不匹配
+        if (target != list[i].id) {
+          //存在nodes 遍历nodes里的节点
+          if (list[i].nodes) {
+            this.indexRecord[dept] = i;
+            let recordDept = dept + 1;
+            this.getTemplateTreeNode(target, list[i].nodes, recordDept);
+          } else {
+            //不存在nodes 继续遍历
+            continue;
+          }
+        } else {
+          //匹配，则修改下标数组
+          this.indexRecord[dept] = i;
+          this.isBreak = true;
+          break;
+        }
+        //删除不匹配的轨迹 如果已经break了说明已经找到正确的节点，就不用再删了
+        if (!this.isBreak) {
+          this.indexRecord.pop();
+        }
+      }
+    },
+    //插入节点
+    insertNode(insertChild, tree, indexArr, len) {
+      let index = indexArr.length - len;
+      if (len == 0) {
+        tree.push(insertChild);
+      } else {
+        this.insertNode(
+          insertChild,
+          tree[indexArr[index]].nodes,
+          indexArr,
+          len - 1
+        );
+      }
+    },
+    //修改组
+    handleUpdateGroup() {
+      this.isUpdateGroup = true;
+    },
+    //修改组名时获取title
+    handleChangeTitle(e) {
+      let value = e.target.value;
+      this.isactTitle = value;
+    },
+    updateGroup(node, data) {
+      //先handleChangeTitle获取title 再调用
+      setTimeout(() => {
+        if (this.isactTitle.trim() == "") {
+          this.$message.warning("名称不能为空");
+          return;
+        }
+        //修改数据组
+        this.isUpdateGroup = false;
+        const parent = node.parent;
+        const children = parent.data.nodes || parent.data;
+        const index = children.findIndex(d => d.id === data.id);
+        let temp = data;
+        temp.text = this.isactTitle;
+        children.splice(index, 1, temp);
+      }, 500);
+    },
+    cancelUpdate(node, data, e) {
+      this.$message.info("已取消");
+      this.isUpdateGroup = false;
+      //如果是插入操作 需要移除数据
+      if (this.isact.temporaryData) {
+        this.handleDelete(node, data, e);
+      }
+    },
+    // 获取数据列表
+
+    async getDataList() {
+      this.dataListLoading = true;
+      await this.$http({
+        url: this.$http.adornUrl(this.urlList.treeList),
+        method: "get"
+        // params: this.$http.adornParams({
+        //   'page': this.pageIndex,
+        //   'limit': this.pageSize,
+        //   'key': this.dataForm.key
+        // })
+      }).then(({ data }) => {
+        console.log("🚀 ~ getDataList ~ data:", data);
+        if (data && data.code === 0) {
+          this.treeDataList = data.labelList;
+          // this.totalPage = data.page.totalCount
+        } else {
+          this.treeDataList = [];
+          // this.totalPage = 0
+        }
+        this.dataListLoading = false;
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val;
+      this.getDataList();
+    },
+    // 多选
+    selectionChangeHandle(val) {
+      this.dataListSelections = val;
+    }
+    // // 新增 / 修改
+    // addOrUpdateHandle(row) {
+    //   this.addOrUpdateVisible = true;
+    //   this.$nextTick(() => {
+    //     this.$refs.addOrUpdate.init(row);
+    //   });
+    // },
+  }
+};
+</script>
+<style lang="less" scoped>
+.delImgBtn {
+  cursor: pointer;
+  display: inline-block;
+  margin-left: 10px;
+}
+
+.el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+
+.avatar-uploader .el-upload:hover {
+  border-color: #409eff;
+}
+
+.avatar-uploader-icon {
+  border: 1px dashed #d9d9d9;
+  border-color: #409eff;
+  font-size: 28px;
+  color: #8c939d;
+  width: 70px;
+  height: 70px;
+  line-height: 70px;
+  text-align: center;
+}
+
+.avatar {
+  width: 70px;
+  border: 1px dashed #409eff;
+  // border-color: #409eff;
+  height: 70px;
+  display: block;
+}
+
+.tree_box {
+  width: 350px !important;
+  height: 100%;
+  float: left;
+  border: 1px solid #bababa;
+  border-radius: 10px;
+  padding: 15px;
+  box-sizing: border-box;
+  // background: #fafafa;
+}
+
+.flexBox {
+  display: flex;
+}
+
+.subBox {
+  border: 1px solid #d6d6d6;
+  border-radius: 10px;
+  overflow: hidden;
+  width: 49%;
+  padding: 10px;
+}
+
+.border_box {
+  // height: 100px;
+  // margin-bottom: 10px;
+
+  .title_box {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 10px;
+
+    .button_box {
+      // width: 200px;
+      float: right;
+    }
+  }
+
+  .title {
+    width: 300px;
+    min-width: 200px;
+
+    float: left;
+    display: flex;
+    align-items: center;
+    font-weight: 600;
+    font-size: 16px;
+
+    // color: #17b3a3;
+    .line {
+      width: 4px;
+      height: 20px;
+      margin-right: 8px;
+      background: #17b3a3;
+    }
+  }
+}
+
+.border_box {
+  width: 100%;
+  // float: right;
+  background: #fffefe;
+margin-top: 4px;
+  border-radius: 10px;
+  padding: 15px 15px;
+  box-sizing: border-box;
+}
+
+.tree_content_box {
+  height: calc(100% - 180px) !important;
+
+  .shopFormBox {
+    width: auto !important;
+  }
+}
+
+.mod-config {
+  width: 100%;
+  height: 82vh;
+  overflow: hidden;
+}
+
+.el-tree-node__content {
+  .el-button {
+    display: none;
+  }
+}
+
+.el-tree-node__content:hover {
+  .el-button {
+    display: inline;
+  }
+}
+
+.dataType {
+  margin: 20px 0;
+  justify-content: center;
+}
+
+.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+  background-color: #eaebed;
+  color: #4796ec;
+  font-weight: bold;
+}
+
+.el-tree {
+  height: 350px;
+  overflow-y: auto !important;
+
+  .el-tree-node__content span {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+}
+
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+
+// .el-card {
+//   background: none !important;
+// }
+p {
+  margin: 0;
+  margin-bottom: 10px;
+}
+
+.submitButtonBox {
+  // margin-top: 20px;
+  // display: flex;
+  // align-items: center;
+  // justify-content: space-between;
+}
+
+.submitButton {
+  // float: right;
+  text-align: center;
+  margin: 15px auto;
+}
+
+// .el-tree-node__content .el-button {
+//   // width: 120px !important;
+
+//   display: block !important;
+// }
+// ::v-deep .el-tree .el-tree-node__content span:nth-child(2) {
+//   width: 120px;
+//   display: flex !important;
+//   align-items: center !important;
+//   justify-content: space-between !important;
+// }
+// /deep/.el-table__row--level-1 {
+//   display: block !important;
+// }
+
+.addFormBox {
+  overflow: hidden;
+
+  .form_item {
+    width: 33%;
+    float: left;
+    margin-bottom: 0;
+  }
+}
+
+.custom-tree-container {
+  height: calc(100% - 100px);
+
+  .filter-tree {
+    height: 100%;
+  }
+}
+
+.info_bg {
+  background: #e0dede;
+  height: 28px;
+  line-height: 28px;
+  padding-left: 10px;
+  // padding: 8px 5px;
+  box-sizing: border-box;
+  // margin-top: -10px;
+  border-radius: 4px;
+  font-size: 14px;
+  width: calc(100% - 120px);
+  float: left;
+}
+
+.shopFormBox {
+  min-width: auto !important;
+}
+
+.ql-container {
+  min-height: 200px;
+}
+
+/deep/ .quill-editor {
+  min-height: 200px !important;
+}
+.loading-spinner {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  font-size: 24px;
+}
+</style>
diff --git a/src/views/modules/points/userPoints.vue b/src/views/modules/points/userPoints.vue
new file mode 100644
index 0000000..bcb2f5e
--- /dev/null
+++ b/src/views/modules/points/userPoints.vue
@@ -0,0 +1,686 @@
+<template>
+  <div class="mod-config">
+    
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
+   
+      <el-form-item label="">
+        <el-form-item
+          label="湖分分类"
+          
+          prop="user"
+          class="form_item"
+        >
+          <div>
+            <el-select  size="small"
+            clearable
+              :show-all-levels="false"
+              v-model="selectLabelId"
+              :options="cateOptions"
+              placeholder="湖分分类"
+              @change="handleChange"
+            >
+              <el-option
+                v-for="item in cateOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option
+            ></el-select></div
+        ></el-form-item>
+        <!-- <el-form-item label="证书名称">
+          <el-input
+            v-model="dataForm.title"
+            placeholder="请输入证书名称"
+            clearable
+          >
+          </el-input>
+        </el-form-item> -->
+        <!-- <el-form-item label="">
+        <el-input v-model="dataForm.userInfo" placeholder="用户手机/邮箱/姓名" clearable>
+        </el-input>
+      </el-form-item> -->
+
+        <!-- <el-select v-model="dataForm.expire" placeholder="证书分类" 
+        @change="
+        pageIndex = 1;
+            getDataList();">
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select> -->
+      </el-form-item>
+      <el-form-item>
+        <el-button  size="small"
+          @click="
+            pageIndex = 1;
+            getDataList();
+          "
+          >查询</el-button
+        >
+        <!-- <el-button
+          @click="
+            dataForm = {};
+            selectLabelId=[]
+            
+          "
+          >重置</el-button
+        > -->
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="showAddD" type="primary"  size="small">充值</el-button>
+      </el-form-item>
+      <el-form-item style="float:right">
+        <div v-if="user.id" class="flexbox userInfo" style="margin-bottom: 0;">
+          <div>
+            用户信息：{{ user.name }}{{ user.tel ? user.tel : user.email }}
+          </div>
+          <!-- <div>
+            <span v-if="user.vip == 0">（普通用户）</span>
+            <span v-else-if="user.vip == 2">（吴门医述VIP）</span>
+            <span v-else-if="user.vip == 1">（超级VIP）</span>
+            <span v-else-if="user.vip == 3">（众妙之门VIP）</span>
+          </div> -->
+         
+        </div>
+      </el-form-item>
+    </el-form>
+    <!-- <div style="color: rgb(22, 170, 104);font-weight: bold;text-align: right;">总湖分：{{ user.jf }}</div> -->
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;"
+    >
+      <el-table-column
+        label="序号"
+        width="100"
+        align="center"
+        prop="certificateNo"
+      >
+        <template slot-scope="scope">
+          {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="title"
+        header-align="center"
+        align="center"
+        width="140"
+        label="湖分类型"
+        ><template slot-scope="scope">
+          <span>{{ getPointsType(scope.row.type) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="score" width="140"
+        header-align="center"
+        align="center"
+        label="湖分"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="detail"
+        header-align="center"
+        align="center"
+        label="描述"
+      >
+      </el-table-column>
+
+      <!-- <el-table-column
+                header-align="center"
+                align="center"
+                label="课程图"
+                width="140"
+              >
+                <template slot-scope="scope">
+                  <img
+                    v-if="scope.row.image != ''"
+                    :src="scope.row.image"
+                    width="25"
+                    height="35"
+                    class="tableImg"
+                  />
+                </template>
+              </el-table-column> -->
+
+      <el-table-column
+        prop="createTime"
+        header-align="center"
+        align="center"
+        width="180"
+        label="创建日期"
+      >
+      </el-table-column>
+    <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作"
+      >
+        <template slot-scope="scope">
+         
+          <el-button type="danger" @click="dataFormDelete(scope.row)" plain size="mini"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column> 
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[50, 100, 200]"
+      :page-size="pageSize"
+      :total="total"
+      layout="total, sizes, prev, pager, next, jumper"
+    >
+    </el-pagination>
+
+    <el-dialog
+      title="充值湖分"
+      :close-on-click-modal="false"
+      :visible.sync="youVisible"
+      append-to-body
+      width="60%"
+      @close="dialogClose"
+    >
+      <el-form
+        style="width:100%"
+        :model="youForm"
+        label-width="100px"
+        ref="youForm"
+        :rules="youFormRule"
+      >
+        <el-form-item label="用户">
+          {{ user.tel }} <span v-if="user.name != ''">{{ user.name }}</span>
+          <span v-if="user.vip == 0">普通用户</span>
+          <span v-else-if="user.vip == 2">（吴门医述VIP）</span>
+          <span v-else-if="user.vip == 1">（超级VIP）</span>
+          <span v-else-if="user.vip == 3">（众妙之门VIP）</span>
+        </el-form-item>
+
+        <el-form-item label="充值原因：" prop="come" style="width: 400px">
+          <el-input
+            v-model="youForm.come"
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogClose">取消</el-button>
+        <el-button @click="submit" type="primary">确认开通</el-button>
+      </span>
+    </el-dialog>
+    <addCertificate
+      @refresh="
+        pageIndex = 1;
+        getDataList();
+      "
+      ref="addCertificate"
+      :data="addCertificateForm"
+      pageType="user"
+      :dataInfo="user"
+    ></addCertificate>
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce"; //导入lodash中的debounce
+import addCertificate from "@/views/modules/points/addPoints.vue";
+// import AddOrUpdate from './user-add-or-update'
+export default {
+  data() {
+    return {
+      cateOptions: [],
+      selectLabelId: "",
+      dataForm: {
+        key: "",
+        expire: "",
+        userInfo: ""
+      },
+      statusOptions: [
+        {
+          value: "0",
+          label: "有效"
+        },
+        {
+          value: "-1",
+          label: "已过期"
+        }
+      ],
+
+      userId: this.$route.query.id,
+      user: {},
+      pointFormRules: {
+        pointAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" }
+        ],
+        pointType: {
+          required: true,
+          message: "请选择操作类型",
+          trigger: "blur"
+        }
+      },
+      youFormRule: {
+        catalogueId: [
+          { required: true, message: "请选择开通的分部", trigger: "blur" }
+        ],
+        days: [{ required: true, message: "请选择开通时长", trigger: "blur" }]
+      },
+      options: [],
+      timeOptions: [
+        // 开通时长
+        {
+          value: "30",
+          label: "30天"
+        },
+        {
+          value: "60",
+          label: "60天"
+        },
+        {
+          value: "90",
+          label: "90天"
+        },
+        {
+          value: "120",
+          label: "120天"
+        },
+        {
+          value: "150",
+          label: "150天"
+        },
+        {
+          value: "180",
+          label: "180天"
+        },
+        {
+          value: "365",
+          label: "365天"
+        },
+        {
+          value: "730",
+          label: "730天"
+        }
+      ],
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      total: 0,
+      totalLaoding: false,
+      dataListLoading: false,
+      dataListSelections: [],
+
+      youVisible: false,
+      linshiids: [],
+
+      youForm: {
+        courseId: null,
+        cate: [],
+        catalogueId: "",
+        days: "",
+        come: "" //管理员开通(原因)
+      },
+      linshilist: [
+        {
+          title: "1"
+        },
+        {
+          title: "2"
+        },
+        { title: "3" }
+      ]
+    };
+  },
+  components: {
+    addCertificate
+    // AddOrUpdate
+  },
+  created() {
+    this.userId = this.$route.query.id;
+    console.log(this.$route.query);
+    console.log(this.userId, "onsole.log(this.$route.query)");
+    this.init();
+  },
+  activated() {
+    this.userId = this.$route.query.id;
+    this.init();
+    // this.getDataList()
+    // this.getcourpeList()
+  },
+  methods: {
+    getPointsType(type) {
+      var str = "";
+      //在线教学 01 学术期刊 03 太湖讲堂 05 创作技术 07 注册邀请 11 课程邀请 13
+      switch (type) {
+        case "01":
+          return "在线教学";
+
+        case "03":
+          return "学术期刊";
+
+        case "05":
+          return "太湖讲堂";
+
+        case "07":
+          return "创作技术";
+
+        case "11":
+          return "注册邀请";
+
+        case "13":
+          return "课程邀请";
+      }
+    },
+    dataFormDelete: debounce(async function(row, deleteType) {
+      console.log("row at line 515:", row);
+      this.$confirm(
+        `确定要删除${deleteType != "all" ? "该" : "所有"}湖分嘛?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      )
+        .then(async () => {
+          // var lableIds = row[0].bookLabelId;
+          var productIds = row.id;
+
+          await this.$http
+            .request({
+              url: this.$http.adornUrl(`/master/userContribution/delUserContribution`),
+              method: "POST",
+              data: {
+                id: productIds
+                // marketId: this.addForm.id
+              },
+              header: {
+                //默认 无 说明：请求头
+                "Content-Type": "application/json"
+              }
+            })
+            .then(async ({ data }) => {
+              if (data && data.code === 0) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(data.msg);
+              }
+              this.$nextTick(() => {
+                // this.$refs.commonShop.selectShopArr = [];
+               this.getDataList()
+              });
+            });
+        })
+        .catch(() => {});
+    }, 200),
+    getCateList() {
+      // this.$http({
+      //   url: this.$http.adornUrl(
+      //     "/master/userCertificate/userCertificateLabelList"
+      //   ),
+      //   method: "post",
+      //   data: this.$http.adornData({})
+      // }).then(({ data }) => {
+      //   if (data && data.code === 0) {
+      this.cateOptions = [
+        {
+          value: "01",
+          label: "在线教学"
+        },
+        {
+          value: "03",
+          label: "学术期刊"
+        },
+        {
+          value: "05",
+          label: "太湖讲堂"
+        },
+        {
+          value: "07",
+          label: "创作技术"
+        },
+        {
+          value: "11",
+          label: "注册邀请"
+        },
+        {
+          value: "13",
+          label: "课程邀请"
+        }
+      ];
+      // } else {
+      //   this.cateOptions = [];
+      // }
+
+      // if (data.code !== 0) return this.$message.error(data.msg);
+      // });
+    },
+    delay(val) {
+      this.$nextTick(() => {
+        this.$refs.addCertificate.init("edit", { val });
+      });
+    },
+    delaySubmit(data) {
+      this.$http({
+        url: this.$http.adornUrl("/master/userCourseBuy/delayUserCourseBuy"),
+        method: "post",
+        data: this.$http.adornData(data)
+      })
+        .then(({ data }) => {
+          if (data && data.code == 0) {
+            this.$message.success("操作成功!");
+            this.getDataList();
+          } else {
+            this.$message.error("操作失败!");
+          }
+        })
+        .catch(err => {
+          this.$message.error(err.msg);
+        });
+    },
+
+    submit() {
+      console.log(this.youForm, "youForm");
+      this.youForm.catalogueId = this.linshiids.join(",");
+      this.$refs["youForm"].validate(valid => {
+        if (valid) {
+          let data = {
+            userId: this.userId,
+            ...this.youForm
+          };
+          delete data.cate;
+          console.log("data", data);
+          this.$http({
+            url: this.$http.adornUrl(
+              "/master/userCourseBuy/insertUserCourseBuy"
+            ),
+            method: "post",
+            data: this.$http.adornData(data)
+          })
+            .then(({ data }) => {
+              if (data.code !== 0) return this.$message.error(data.msg);
+              this.$message.success("开课成功!");
+              this.getDataList();
+              this.dialogClose();
+            })
+            .catch(e => {
+              console.log("表单提交报错");
+            });
+        }
+      });
+    },
+    dialogClose() {
+      this.youVisible = false;
+      this.linshiids = [];
+      this.$nextTick(() => {
+        this.youForm.cate = [];
+        this.options = [];
+
+        this.$refs["youForm"].resetFields();
+        console.log(this.youForm, "youForm");
+      });
+      console.log(this.youForm, "youForm");
+    },
+    selectChange(val) {
+      console.log("options", this.options);
+      this.getCate(val);
+    },
+    remoteMethod(query) {
+      console.log(query, "query", this.youForm.key);
+      // return false
+      if (this.youForm.key !== "") {
+        let data = {
+          // page: this.pageIndex,
+          // limit: this.pageSize,
+          title: query //关键字
+          // medicalId: "",
+          // sociologyId: "",
+          // type: 0
+        };
+        this.totalLaoding = true;
+        this.$http({
+          url: this.$http.adornUrl("/master/userManage/courseAndChildrenList"),
+          method: "post",
+          data: this.$http.adornData(data)
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.options = data.list;
+          } else {
+            this.options = [];
+          }
+          this.totalLaoding = false;
+          if (data.code !== 0) return this.$message.error(data.msg);
+        });
+      } else {
+        this.options = [];
+        this.totalLaoding = false;
+      }
+    },
+    showAddD() {
+      this.$nextTick(() => {
+        this.$refs.addCertificate.init("add", {});
+      });
+    },
+
+    init() {
+      this.getCateList();
+      // if (!this.userId) {
+      //   setTimeout(() => {
+      //     this.init();
+      //   }, 1000);
+      // }
+      this.$http({
+        url: this.$http.adornUrl(`/book/user/info/${this.userId}`),
+        method: "get",
+        params: this.$http.adornParams()
+      }).then(({ data }) => {
+        if (data && data.code !== 0) return this.$message.error(data.msg);
+
+        this.user = data.user;
+        this.getDataList();
+      });
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http({
+        // url: this.$http.adornUrl('/book/user/list'),
+        url: this.$http.adornUrl("/master/userContribution/listByPage"),
+        method: "post",
+        data: this.$http.adornData({
+          current: this.pageIndex,
+          limit: this.pageSize,
+          userId: this.userId, //用户id
+          userName: "",
+          // "userId": "",
+          tel: "",
+          email: "",
+          type: this.selectLabelId //课程名
+        })
+      }).then(({ data }) => {
+        if (data && data.code !== 0) return this.$message.error(data.msg);
+        console.log(data, "data");
+        this.dataList = data.result.records;
+        this.totalPage = data.result.pages;
+        this.total = data.result.total;
+        this.dataListLoading = false;
+      });
+    },
+
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val;
+      this.getDataList();
+    },
+    // // 多选
+    // selectionChangeHandle(val) {
+    //   this.dataListSelections = val
+    // },
+    // 新增 / 修改
+    closeDia() {
+      this.adc = false;
+      this.$refs.pointForm.resetFields();
+      // this.pointForm.pointType == 0
+    },
+    getCate(id) {
+      this.linshiids = [];
+
+      this.$http({
+        url: this.$http.adornUrl("/master/userManage/catalogueListByCourse"),
+        method: "post",
+        data: this.$http.adornData({
+          courseId: id
+        })
+      })
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            console.log("data", "data++++++++++++++++++++");
+            this.youForm.cate = data.list;
+            // this.youForm.cate
+          } else {
+            this.youForm.cate = [];
+            this.linshiids = [];
+          }
+        })
+        .catch(e => {
+          console.log("数据报错");
+        });
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+/deep/ .width100 .el-input__inner {
+  width: 100%;
+}
+.flexbox {
+  display: flex;
+}
+.userInfo {
+  margin-bottom: 20px;
+}
+.userInfo * {
+  font-size: 16px;
+}
+</style>
diff --git a/src/views/modules/user/addJf.vue b/src/views/modules/user/addJf.vue
new file mode 100644
index 0000000..add14fd
--- /dev/null
+++ b/src/views/modules/user/addJf.vue
@@ -0,0 +1,456 @@
+<template>
+  <div class="mod-config">
+    <el-dialog
+      :title="`${isEdit ? '编辑' : '充值/扣除'}积分`"
+      :visible.sync="dialogVisible"
+      width="600px"
+    >
+      <div v-if="dialogVisible">
+        <el-form
+          :model="addPointsForm"
+          ref="addPointsForm"
+          label-width="110px"
+          :rules="dataRule"
+        >
+          <!-- <div style="background-color: #f0f0f0;padding:0 10px;box-sizing: border-box;color: #000;">
+                        <p>绑定用户</p>
+                    </div> -->
+          <template v-if="pageType == 'label'">
+            <el-form-item
+              label="手机号/邮箱："
+              prop="userKey"
+              class="form_item"
+            >
+              <div style="display: flex;align-items: center;">
+                <el-autocomplete
+                  v-if="!isEdit"
+                  style="width: 400px;"
+                  v-model="addPointsForm.userKey"
+                  :fetch-suggestions="loadAll"
+                  placeholder="请输入手机号/邮箱"
+                  @select="handleSelect"
+                >
+                  <template #default="{ item }">
+                    <div class="custom-item">
+                      <span>{{ item.tel ? item.tel : item.email }}</span>
+                      <span
+                        style="color: gray; margin-left: 10px;"
+                        v-if="item.name"
+                        >({{ item.name }})</span
+                      >
+                    </div>
+                  </template>
+                </el-autocomplete>
+                <span v-if="isEdit">{{ addPointsForm.userKey }}</span>
+              </div>
+            </el-form-item>
+            <el-form-item
+              label="用户姓名："
+              style="width: 400px;"
+              v-if="addPointsForm.userId"
+              prop="user"
+              class="form_item"
+            >
+              <div>
+                <!-- <span
+                style="width: 110px;display: inline-block;text-align: right;"
+                >用户姓名：</span
+              > -->
+                {{ addPointsForm.userName ? addPointsForm.userName : "-" }}
+              </div></el-form-item
+            >
+          </template>
+          <template v-if="pageType == 'user'">
+            <el-form-item label="用户：" prop="user" class="form_item">
+              <div style="display: flex;align-items: center;">
+                {{ dataInfo.tel ? dataInfo.tel : dataInfo.email }}
+                <span v-if="dataInfo.name">（ {{ dataInfo.name }}）</span>
+              </div>
+            </el-form-item>
+
+            <el-form-item label="积分分类" prop="type" class="form_item">
+              <div>
+                <el-select
+                  :show-all-levels="false"
+                  v-model="addPointsForm.type"
+                  :options="cateOptions"
+                  placeholder="请选择积分分类"
+                  @change="handleChange"
+                >
+                  <el-option
+                    v-for="item in cateOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option
+                ></el-select></div
+            ></el-form-item>
+          </template>
+
+          <el-form-item label="充值积分" prop="score">
+            <el-input-number
+              :min="0"
+              v-model="addPointsForm.score"
+              placeholder="请输入积分"
+            >
+            </el-input-number>
+          </el-form-item>
+
+          <el-form-item label="充值明细">
+            <el-input
+              style="width: 400px;"
+              type="textarea"
+              rows="5"
+              v-model="addPointsForm.detail"
+              placeholder="操作说明"
+            >
+            </el-input>
+          </el-form-item>
+
+          <!-- <el-select v-model="dataForm.expire" placeholder="证书分类" 
+        @change="
+        pageIndex = 1;
+            getDataList();">
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select> -->
+          <!-- </el-form-item> -->
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleSubmit('addPointsForm')">
+          确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { quillEditor } from "vue-quill-editor";
+import global from "../../common/common.vue"; //引入共用组间
+import debounce from "lodash/debounce"; //导入lodash中的debounce
+import AddOrUpdate from "@/views/components/commonBookTags/bookTagsForm.vue";
+import commonShop from "@/views/components/commonBookTags/shopproduct.vue";
+import commonShopTable from "@/views/components/commonBookTags/shopproductTable.vue";
+import commonTree from "@/views/components/commonBookTags/tags.vue";
+
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
+const toolbarOptions = [
+  ["bold", "italic", "underline", "strike"], // 加粗，斜体，下划线，删除线
+  ["blockquote", "code-block"], //引用，代码块
+  [{ header: 1 }, { header: 2 }], // 几级标题
+  [{ list: "ordered" }, { list: "bullet" }], // 有序列表，无序列表
+  [{ script: "sub" }, { script: "super" }], // 下角标，上角标
+  [{ indent: "-1" }, { indent: "+1" }], // 缩进
+  [{ direction: "rtl" }], // 文字输入方向
+  [{ size: ["small", false, "large", "huge"] }], // 字体大小
+  [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
+  [{ color: [] }, { background: [] }], // 颜色选择
+  [
+    {
+      font: [
+        "SimSun",
+        "SimHei",
+        "Microsoft-YaHei",
+        "KaiTi",
+        "FangSong",
+        "Arial"
+      ]
+    }
+  ], // 字体
+  [{ align: [] }], // 居中
+  ["clean"], // 清除样式,
+  ["link", "image"] // 上传图片、上传视频
+];
+// import dialogComponent from './seckillprodrelation'
+export default {
+  props: ["data", "pageType", "dataInfo"],
+  data() {
+    return {
+      selectLabelId: "",
+      isUploading: false, // 上传过程中是否显示加载动画
+      isUploading: false, // 上传过程中是否显示加载动画
+      isEdit: false, // 上传过程中是否显示加载动画
+      dialogImageUrl: "",
+      dialogVisibleImg: false,
+      disabled: false,
+      restaurants: [],
+      fileList: [],
+      options: [],
+      cateOptions: [],
+      state: "",
+      timeout: null,
+      addPointsForm: {},
+      baseUrl: global.baseUrl,
+      isEdit: false,
+      checkAll: false,
+      isIndeterminate: true,
+      dialogVisible: false,
+      urlList: {},
+      activeName: "first",
+      addForm: {},
+      audioFileList: [],
+      isFresh: false,
+      dataRule: {}
+    };
+  },
+  components: {
+    AddOrUpdate,
+    commonShop,
+    commonTree,
+    commonShopTable,
+    quillEditor
+  },
+  watch: {
+    filterText(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  activated() {
+    this.isEdit = false;
+    // this.getDataList();
+  },
+  methods: {
+    remoteMethod(query) {
+      console.log(query, "query", this.addPointsForm.key);
+      // return false
+      if (this.addPointsForm.key !== "") {
+        let data = {
+          title: query //关键字
+        };
+        this.totalLaoding = true;
+        this.$http({
+          url: this.$http.adornUrl("/master/userManage/courseAndChildrenList"),
+          method: "post",
+          data: this.$http.adornData(data)
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.options = data.list;
+          } else {
+            this.options = [];
+          }
+          this.totalLaoding = false;
+          if (data.code !== 0) return this.$message.error(data.msg);
+        });
+      } else {
+        this.options = [];
+        this.totalLaoding = false;
+      }
+    },
+    handleChange() {},
+    getCateList() {
+      // this.$http({
+      //   url: this.$http.adornUrl(
+      //     "/master/userCertificate/userCertificateLabelList"
+      //   ),
+      //   method: "post",
+      //   data: this.$http.adornData({})
+      // }).then(({ data }) => {
+      //   if (data && data.code === 0) {
+      //     this.cateOptions = data.labelList;
+      //   } else {
+      //     this.cateOptions = [];
+      //   }
+      //   this.totalLaoding = false;
+      //   if (data.code !== 0) return this.$message.error(data.msg);
+      // });
+      this.cateOptions = [
+        {
+          value: 0,
+          label: "充值积分"
+        },
+        {
+          value: 1,
+          label: "扣除积分"
+        }
+      ];
+    },
+    loadAll(queryString, cb) {
+      if (queryString == "") {
+        return false;
+      }
+      this.$http({
+        // url: this.$http.adornUrl('/book/user/list'),
+        url: this.$http.adornUrl("/book/user/getUserList"),
+        method: "post",
+        data: this.$http.adornData({
+          page: 1,
+          limit: 9999,
+          key: queryString
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          var arr = data.user.records;
+          console.log("arr at line 467:", arr);
+          cb(arr);
+        } else {
+          cb([]);
+        }
+      });
+    },
+
+    createStateFilter(queryString) {
+      return state => {
+        return (
+          state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
+        );
+      };
+    },
+    handleSelect(item) {
+      console.log(item);
+      this.addPointsForm.userKey = item.tel ? item.tel : item.email;
+      this.addPointsForm.userName = item.name;
+      this.addPointsForm.userId = item.id;
+    },
+    init(type, data) {
+      this.getCateList();
+      console.log("data at line 372:", data);
+      this.addPointsForm = {};
+      this.fileList = [];
+      this.isEdit = type == "edit" ? true : false;
+      if (this.pageType == "label") {
+        this.dataRule = {
+          score: [
+            {
+              required: true,
+              message: "请输入积分"
+              // trigger: "change",
+            }
+          ]
+        };
+      } else {
+        this.dataRule = {
+          type: [
+            {
+              required: true,
+              message: "请选择积分分类"
+              // trigger: "change",
+            }
+          ],
+          score: [
+            {
+              required: true,
+              message: "请输入积分"
+              // trigger: "change",
+            }
+          ]
+        };
+      }
+      if (data) {
+        this.addPointsForm = {
+          // courseId: data.id,
+          // courseName: data.title,
+          // courseImg: data.image,
+          // images: data.image
+          // userId: data.userId
+        };
+        this.remoteMethod(this.addPointsForm.courseName);
+        if (this.addPointsForm.images) {
+          this.fileList = this.addPointsForm.images
+            .split(",")
+            .map((image, i) => ({
+              uid: i, // 假设 id 是唯一标识符
+              name: i, // 文件名
+              status: "done", // 状态
+              url: image // 文件 URL
+            }));
+          console.log("this.fileList at line 308:", this.fileList);
+        }
+      } else {
+        this.addPointsForm = {};
+      }
+      if (this.pageType == "label") {
+        if (data.userId) {
+          this.addPointsForm.userKey = data.tel ? data.tel : data.email;
+          this.addPointsForm.userName = data.name;
+          this.addPointsForm.userId = data.id;
+        }
+      } else {
+        this.addPointsForm.userKey = this.dataInfo.tel
+          ? this.dataInfo.tel
+          : this.dataInfo.email;
+        this.addPointsForm.userName = this.dataInfo.name;
+        this.addPointsForm.userId = this.dataInfo.id;
+      }
+
+      this.dialogVisible = true;
+    },
+    handleSubmit: debounce(async function() {
+      this.$refs["addPointsForm"].validate(valid => {
+        if (valid) {
+          this.$http({
+            url: this.$http.adornUrl(
+              "/master/jfTransactionDetails/saveJfTransactionDetails"
+            ),
+            method: "post",
+            data: this.$http.adornData({
+              userId: this.dataInfo.id,
+              changeAmount: this.addPointsForm.score,
+              remark: this.addPointsForm.detail
+                ? this.addPointsForm.detail
+                : "",
+                actType: this.addPointsForm.type
+            })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: "操作成功",
+                type: "success"
+              });
+              this.dialogVisible = false;
+              this.$nextTick(() => {
+                this.$emit("refresh");
+              });
+            } else {
+              this.$message.error(data.msg);
+            }
+          });
+        }
+      });
+    }, 200),
+
+    onSuccessImg(response, file, fileList) {
+      // 上传成功后，直接将返回的 URL 放到 file 对象中
+      file.uploading = false;
+      file.url = response.url; // 假设返回的数据包含文件的 url 地址
+      this.fileList = fileList; // 更新 fileList
+    },
+
+    beforeUpload(file) {
+      // 在文件上传之前，设置文件的上传状态
+      file.uploading = true;
+    },
+    onProgress(event, file, fileList) {
+      // 进度更新时，文件状态可以继续保持上传中
+      file.uploading = true;
+    },
+    handleRemove(file) {
+      this.fileList = this.fileList.filter(f => f.uid !== file.uid); // 删除文件
+    },
+    handleDownload(file) {
+      const link = document.createElement("a");
+      link.href = file.url;
+      link.download = file.name;
+      link.click();
+    },
+    selectChange(val) {
+      console.log("options", this.options);
+      //   this.getCate(val)
+    },
+    handlePictureCardPreview(file) {
+      // 图片预览逻辑
+    }
+  }
+};
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/modules/user/user-point-jf.vue b/src/views/modules/user/user-point-jf.vue
new file mode 100644
index 0000000..2012fc2
--- /dev/null
+++ b/src/views/modules/user/user-point-jf.vue
@@ -0,0 +1,720 @@
+<template>
+  <div class="mod-config">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
+      <el-form-item label="">
+        <el-form-item label="积分类型" prop="user" class="form_item">
+          <div>
+            <el-select
+              size="small"
+              clearable
+              :show-all-levels="false"
+              v-model="actType"
+              :options="cateOptions"
+              placeholder="积分类型"
+              @change="handleChange"
+            >
+              <el-option
+                v-for="item in cateOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option
+            ></el-select></div
+        ></el-form-item>
+        <!-- <el-form-item label="证书名称">
+          <el-input
+            v-model="dataForm.title"
+            placeholder="请输入证书名称"
+            clearable
+          >
+          </el-input>
+        </el-form-item> -->
+        <!-- <el-form-item label="">
+        <el-input v-model="dataForm.userInfo" placeholder="用户手机/邮箱/姓名" clearable>
+        </el-input>
+      </el-form-item> -->
+
+        <!-- <el-select v-model="dataForm.expire" placeholder="证书分类" 
+        @change="
+        pageIndex = 1;
+            getDataList();">
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select> -->
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          size="small"
+          @click="
+            pageIndex = 1;
+            getDataList();
+          "
+          >查询</el-button
+        >
+        <!-- <el-button
+          @click="
+            dataForm = {};
+            actType=[]
+            
+          "
+          >重置</el-button
+        > -->
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="showAddD" type="primary" size="small"
+          >充值</el-button
+        >
+      </el-form-item>
+      <el-form-item style="float:right">
+        <div v-if="user.id" class="flexbox userInfo" style="margin-bottom: 0;">
+          <div>
+            用户信息：{{ user.name }}{{ user.tel ? user.tel : user.email }}
+          </div>
+          <!-- <div>
+            <span v-if="user.vip == 0">（普通用户）</span>
+            <span v-else-if="user.vip == 2">（吴门医述VIP）</span>
+            <span v-else-if="user.vip == 1">（超级VIP）</span>
+            <span v-else-if="user.vip == 3">（众妙之门VIP）</span>
+          </div> -->
+        </div>
+      </el-form-item>
+    </el-form>
+    <!-- <div style="color: rgb(22, 170, 104);font-weight: bold;text-align: right;">总湖分：{{ user.jf }}</div> -->
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;"
+    >
+      <el-table-column
+        label="序号"
+        width="100"
+        align="center"
+        prop="certificateNo"
+      >
+        <template slot-scope="scope">
+          {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="title"
+        header-align="center"
+        align="center"
+        width="140"
+        label="积分类型"
+        ><template slot-scope="scope">
+          <span>{{ getPointsType(scope.row.actType) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="changeAmount"
+        width="140"
+        header-align="center"
+        align="center"
+        label="积分"
+        ><template slot-scope="scope">
+          <span :style="`color:${scope.row.changeAmount < 0 ? 'red' : ''}`">{{
+            scope.row.changeAmount
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        label="描述"
+      >
+      </el-table-column>
+
+      <!-- <el-table-column
+                header-align="center"
+                align="center"
+                label="课程图"
+                width="140"
+              >
+                <template slot-scope="scope">
+                  <img
+                    v-if="scope.row.image != ''"
+                    :src="scope.row.image"
+                    width="25"
+                    height="35"
+                    class="tableImg"
+                  />
+                </template>
+              </el-table-column> -->
+
+      <el-table-column
+        prop="createTime"
+        header-align="center"
+        align="center"
+        width="180"
+        label="创建日期"
+      >
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作"
+      >
+        <template slot-scope="scope">
+          <!-- <el-button
+            type="danger"
+            @click="dataFormDelete(scope.row)"
+            plain
+            size="mini"
+            >删除</el-button
+          > -->
+          <el-button
+            @click="handleClickDetail(scope.row)"
+            type="text"
+            size="mini"
+            v-if="scope.row.orderSn"
+            >订单详情</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[50, 100, 200]"
+      :page-size="pageSize"
+      :total="total"
+      layout="total, sizes, prev, pager, next, jumper"
+    >
+    </el-pagination>
+
+    <el-dialog
+      title="充值湖分"
+      :close-on-click-modal="false"
+      :visible.sync="youVisible"
+      append-to-body
+      width="60%"
+      @close="dialogClose"
+    >
+      <el-form
+        style="width:100%"
+        :model="youForm"
+        label-width="100px"
+        ref="youForm"
+        :rules="youFormRule"
+      >
+        <el-form-item label="用户">
+          {{ user.tel }} <span v-if="user.name != ''">{{ user.name }}</span>
+          <span v-if="user.vip == 0">普通用户</span>
+          <span v-else-if="user.vip == 2">（吴门医述VIP）</span>
+          <span v-else-if="user.vip == 1">（超级VIP）</span>
+          <span v-else-if="user.vip == 3">（众妙之门VIP）</span>
+        </el-form-item>
+
+        <el-form-item label="充值原因：" prop="come" style="width: 400px">
+          <el-input
+            v-model="youForm.come"
+            type="textarea"
+            :rows="2"
+            placeholder="请输入内容"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogClose">取消</el-button>
+        <el-button @click="submit" type="primary">确认开通</el-button>
+      </span>
+    </el-dialog>
+    <addCertificate
+      @refresh="
+        pageIndex = 1;
+        getDataList();
+      "
+      ref="addCertificate"
+      :data="addCertificateForm"
+      pageType="user"
+      :dataInfo="user"
+    ></addCertificate>
+
+    <el-dialog
+      title="充/扣积分明细"
+      :close-on-click-modal="false"
+      :visible.sync="memoryDetail"
+      append-to-body
+      width="80%"
+    >
+      <div>
+        充/扣主题：<span>{{ mdetail.remark }}</span>
+      </div>
+      <div>
+        操作时间：<span>{{ mdetail.createTime }}</span>
+      </div>
+
+      <div>
+        积分：
+        <span :style="`color:${mdetail.changeAmount < 0 ? 'red' : ''}`">{{
+          mdetail.changeAmount
+        }}</span>
+      </div>
+      <div>
+        订单详情：<buyorderdetail
+          v-if="memoryDetail"
+          ref="buyorderdetail"
+          :orderSn="mdetail.orderSn"
+          pageType="user"
+        ></buyorderdetail>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeDia">关 闭</el-button>
+        <!-- <el-button type="primary" @click="huaSheng">确 定</el-button> -->
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import debounce from "lodash/debounce"; //导入lodash中的debounce
+import addCertificate from "./addJf.vue";
+import buyorderdetail from "@/views/modules/order/buyorderdetail";
+// import AddOrUpdate from './user-add-or-update'
+export default {
+  data() {
+    return {
+      mdetail: {},
+      cateOptions: [],
+      actType: "",
+      dataForm: {
+        key: "",
+        expire: "",
+        userInfo: ""
+      },
+      statusOptions: [
+        {
+          value: "0",
+          label: "有效"
+        },
+        {
+          value: "-1",
+          label: "已过期"
+        }
+      ],
+
+      userId: this.$route.query.id,
+      user: {},
+      pointFormRules: {
+        pointAmount: [
+          { required: true, message: "请输入金额", trigger: "blur" }
+        ],
+        pointType: {
+          required: true,
+          message: "请选择操作类型",
+          trigger: "blur"
+        }
+      },
+      youFormRule: {
+        catalogueId: [
+          { required: true, message: "请选择开通的分部", trigger: "blur" }
+        ],
+        days: [{ required: true, message: "请选择开通时长", trigger: "blur" }]
+      },
+      options: [],
+      memoryDetail: false,
+      timeOptions: [
+        // 开通时长
+        {
+          value: "30",
+          label: "30天"
+        },
+        {
+          value: "60",
+          label: "60天"
+        },
+        {
+          value: "90",
+          label: "90天"
+        },
+        {
+          value: "120",
+          label: "120天"
+        },
+        {
+          value: "150",
+          label: "150天"
+        },
+        {
+          value: "180",
+          label: "180天"
+        },
+        {
+          value: "365",
+          label: "365天"
+        },
+        {
+          value: "730",
+          label: "730天"
+        }
+      ],
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      total: 0,
+      totalLaoding: false,
+      dataListLoading: false,
+      dataListSelections: [],
+
+      youVisible: false,
+      linshiids: [],
+
+      youForm: {
+        courseId: null,
+        cate: [],
+        catalogueId: "",
+        days: "",
+        come: "" //管理员开通(原因)
+      },
+      linshilist: [
+        {
+          title: "1"
+        },
+        {
+          title: "2"
+        },
+        { title: "3" }
+      ]
+    };
+  },
+  components: {
+    addCertificate,
+    buyorderdetail
+
+    // AddOrUpdate
+  },
+  created() {
+    this.userId = this.$route.query.id;
+    console.log(this.$route.query);
+    console.log(this.userId, "onsole.log(this.$route.query)");
+    this.init();
+  },
+  activated() {
+    this.userId = this.$route.query.id;
+    this.init();
+    // this.getDataList()
+    // this.getcourpeList()
+  },
+  methods: {
+    async handleClickDetail(row) {
+      console.log("row at line 375:", row);
+      this.memoryDetail = true;
+      this.mdetail = row;
+      // master/jfTransactionDetails/getJfTransactionDetailsById
+      this.$nextTick(() => {
+        this.$refs.buyorderdetail.init();
+      });
+    },
+    getPointsType(type) {
+      var str = "";
+      //在线教学 01 学术期刊 03 太湖讲堂 05 创作技术 07 注册邀请 11 课程邀请 13
+      switch (type) {
+        case 0:
+          return "充值积分";
+
+        case 1:
+          return "扣除积分";
+      }
+    },
+    dataFormDelete: debounce(async function(row, deleteType) {
+      console.log("row at line 515:", row);
+      this.$confirm(
+        `确定要删除${deleteType != "all" ? "该" : "所有"}湖分嘛?`,
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+      )
+        .then(async () => {
+          // var lableIds = row[0].bookLabelId;
+          var productIds = row.id;
+
+          await this.$http
+            .request({
+              url: this.$http.adornUrl(
+                `/master/userContribution/delUserContribution`
+              ),
+              method: "POST",
+              data: {
+                id: productIds
+                // marketId: this.addForm.id
+              },
+              header: {
+                //默认 无 说明：请求头
+                "Content-Type": "application/json"
+              }
+            })
+            .then(async ({ data }) => {
+              if (data && data.code === 0) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(data.msg);
+              }
+              this.$nextTick(() => {
+                // this.$refs.commonShop.selectShopArr = [];
+                this.getDataList();
+              });
+            });
+        })
+        .catch(() => {});
+    }, 200),
+    getCateList() {
+      // this.$http({
+      //   url: this.$http.adornUrl(
+      //     "/master/userCertificate/userCertificateLabelList"
+      //   ),
+      //   method: "post",
+      //   data: this.$http.adornData({})
+      // }).then(({ data }) => {
+      //   if (data && data.code === 0) {
+      this.cateOptions = [
+        {
+          value: 0,
+          label: "充值积分"
+        },
+        {
+          value: 1,
+          label: "扣除积分"
+        }
+      ];
+      // } else {
+      //   this.cateOptions = [];
+      // }
+
+      // if (data.code !== 0) return this.$message.error(data.msg);
+      // });
+    },
+    delay(val) {
+      this.$nextTick(() => {
+        this.$refs.addCertificate.init("edit", { val });
+      });
+    },
+    delaySubmit(data) {
+      this.$http({
+        url: this.$http.adornUrl("/master/userCourseBuy/delayUserCourseBuy"),
+        method: "post",
+        data: this.$http.adornData(data)
+      })
+        .then(({ data }) => {
+          if (data && data.code == 0) {
+            this.$message.success("操作成功!");
+            this.getDataList();
+          } else {
+            this.$message.error("操作失败!");
+          }
+        })
+        .catch(err => {
+          this.$message.error(err.msg);
+        });
+    },
+
+    submit() {
+      console.log(this.youForm, "youForm");
+      this.youForm.catalogueId = this.linshiids.join(",");
+      this.$refs["youForm"].validate(valid => {
+        if (valid) {
+          let data = {
+            userId: this.userId,
+            ...this.youForm
+          };
+          delete data.cate;
+          console.log("data", data);
+          this.$http({
+            url: this.$http.adornUrl(
+              "/master/userCourseBuy/insertUserCourseBuy"
+            ),
+            method: "post",
+            data: this.$http.adornData(data)
+          })
+            .then(({ data }) => {
+              if (data.code !== 0) return this.$message.error(data.msg);
+              this.$message.success("开课成功!");
+              this.getDataList();
+              this.dialogClose();
+            })
+            .catch(e => {
+              console.log("表单提交报错");
+            });
+        }
+      });
+    },
+    dialogClose() {
+      this.youVisible = false;
+      this.linshiids = [];
+      this.$nextTick(() => {
+        this.youForm.cate = [];
+        this.options = [];
+
+        this.$refs["youForm"].resetFields();
+        console.log(this.youForm, "youForm");
+      });
+      console.log(this.youForm, "youForm");
+    },
+    selectChange(val) {
+      console.log("options", this.options);
+      this.getCate(val);
+    },
+    remoteMethod(query) {
+      console.log(query, "query", this.youForm.key);
+      // return false
+      if (this.youForm.key !== "") {
+        let data = {
+          // page: this.pageIndex,
+          // limit: this.pageSize,
+          title: query //关键字
+          // medicalId: "",
+          // sociologyId: "",
+          // type: 0
+        };
+        this.totalLaoding = true;
+        this.$http({
+          url: this.$http.adornUrl("/master/userManage/courseAndChildrenList"),
+          method: "post",
+          data: this.$http.adornData(data)
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.options = data.list;
+          } else {
+            this.options = [];
+          }
+          this.totalLaoding = false;
+          if (data.code !== 0) return this.$message.error(data.msg);
+        });
+      } else {
+        this.options = [];
+        this.totalLaoding = false;
+      }
+    },
+    showAddD() {
+      this.$nextTick(() => {
+        this.$refs.addCertificate.init("add", {});
+      });
+    },
+
+    init() {
+      this.getCateList();
+      // if (!this.userId) {
+      //   setTimeout(() => {
+      //     this.init();
+      //   }, 1000);
+      // }
+      this.$http({
+        url: this.$http.adornUrl(`/book/user/info/${this.userId}`),
+        method: "get",
+        params: this.$http.adornParams()
+      }).then(({ data }) => {
+        if (data && data.code !== 0) return this.$message.error(data.msg);
+
+        this.user = data.user;
+        this.getDataList();
+      });
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+      this.$http({
+        // url: this.$http.adornUrl('/book/user/list'),
+        url: this.$http.adornUrl("/master/jfTransactionDetails/listByPage"),
+        method: "post",
+        data: this.$http.adornData({
+          current: this.pageIndex,
+          limit: this.pageSize,
+          userId: this.userId, //用户id
+          userName: "",
+          // "userId": "",
+          tel: "",
+          email: "",
+          actType: this.actType //课程名
+        })
+      }).then(({ data }) => {
+        if (data && data.code !== 0) return this.$message.error(data.msg);
+        console.log(data, "data");
+        this.dataList = data.result.records;
+        this.totalPage = data.result.pages;
+        this.total = data.result.total;
+        this.dataListLoading = false;
+      });
+    },
+
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val;
+      this.getDataList();
+    },
+    // // 多选
+    // selectionChangeHandle(val) {
+    //   this.dataListSelections = val
+    // },
+    // 新增 / 修改
+    closeDia() {
+      this.adc = false;
+      this.$refs.pointForm.resetFields();
+      // this.pointForm.pointType == 0
+    },
+    getCate(id) {
+      this.linshiids = [];
+
+      this.$http({
+        url: this.$http.adornUrl("/master/userManage/catalogueListByCourse"),
+        method: "post",
+        data: this.$http.adornData({
+          courseId: id
+        })
+      })
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            console.log("data", "data++++++++++++++++++++");
+            this.youForm.cate = data.list;
+            // this.youForm.cate
+          } else {
+            this.youForm.cate = [];
+            this.linshiids = [];
+          }
+        })
+        .catch(e => {
+          console.log("数据报错");
+        });
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+/deep/ .width100 .el-input__inner {
+  width: 100%;
+}
+.flexbox {
+  display: flex;
+}
+.userInfo {
+  margin-bottom: 20px;
+}
+.userInfo * {
+  font-size: 16px;
+}
+</style>
diff --git a/src/views/modules/user/user-point-memery.vue b/src/views/modules/user/user-point-memery.vue
index fffe331..cda7d46 100644
--- a/src/views/modules/user/user-point-memery.vue
+++ b/src/views/modules/user/user-point-memery.vue
@@ -9,23 +9,50 @@
         <el-button @click="getDataList()">查询</el-button>
       </el-form-item>
     </el-form>    -->
-    <div style="margin:15px 0;font-weight:bold">当前用户：{{userName}} / {{query.tel}}</div>
-    <el-table :data="dataList" border v-loading="dataListLoading" style="width: 100%;">
+    <div style="margin:15px 0;font-weight:bold">
+      当前用户：{{ userName }} / {{ query.tel }}
+    </div>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;"
+    >
       <!-- <el-table-column type="selection"  header-align="center" align="center" width="50">
       </el-table-column> -->
-      <el-table-column prop="createTime" sortable header-align="center" align="center" label="操作时间">
+      <el-table-column
+        prop="createTime"
+        sortable
+        header-align="center"
+        align="center"
+        label="操作时间"
+      >
       </el-table-column>
       <!-- <el-table-column prop="userName" header-align="center" align="center" label="用户">
         <template slot-scope="scope">
 
         </template>
       </el-table-column> -->
-      <el-table-column prop="orderType" header-align="center" align="center" label="充值 支付 赠送优惠券.....">
+      <el-table-column
+        prop="orderType"
+        header-align="center"
+        align="center"
+        label="充值 支付 赠送优惠券....."
+      >
       </el-table-column>
-      <el-table-column prop="changeAmount" header-align="center" align="center" label="变动金额">
+      <el-table-column
+        prop="changeAmount"
+        header-align="center"
+        align="center"
+        label="变动金额"
+      >
         <template slot-scope="scope">
-          <span v-if="scope.row.changeAmount > 0" style="color: red;">{{scope.row.changeAmount}}</span>
-          <span v-if="scope.row.changeAmount < 0" style="color: #54a966;">{{scope.row.changeAmount}}</span>
+          <span v-if="scope.row.changeAmount > 0" style="color: red;">{{
+            scope.row.changeAmount
+          }}</span>
+          <span v-if="scope.row.changeAmount < 0" style="color: #54a966;">{{
+            scope.row.changeAmount
+          }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column
@@ -34,51 +61,85 @@
         align="center"
         label="关联id">
       </el-table-column> -->
-       <el-table-column prop="note" header-align="center" align="center" label="说明">
-       
+      <el-table-column
+        prop="note"
+        header-align="center"
+        align="center"
+        label="说明"
+      >
       </el-table-column>
-      <el-table-column prop="remark" header-align="center" align="center" label="备注">       
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        label="备注"
+      >
       </el-table-column>
-      <el-table-column prop="userBalance" header-align="center" align="center" label="余额">
+      <el-table-column
+        prop="userBalance"
+        header-align="center"
+        align="center"
+        label="余额"
+      >
       </el-table-column>
-      <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作"
+      >
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row)">明细</el-button>
+          <el-button
+            v-if="scope.row.remark.includes('订单编号为')"
+            type="text"
+            size="small"
+            @click="addOrUpdateHandle(scope.row)"
+            >订单详情</el-button
+          >
           <!-- <el-button type="text" size="small" @click="deleteHandle(scope.row.transactionId)">删除</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
+      @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="充/扣天医币明细" :close-on-click-modal="false" :visible.sync="memoryDetail" append-to-body width="30%">
-      <el-form :model="mdetail" label-width="100px" ref="pointForm">
+    <el-dialog
+      title="充/扣积分明细"
+      :close-on-click-modal="false"
+      :visible.sync="memoryDetail"
+      append-to-body
+      width="80%"
+    >
+      <div>
+        充/扣主题：<span>{{ mdetail.remark }}</span>
+      </div>
+      <div>
+        操作时间：<span>{{ mdetail.createTime }}</span>
+      </div>
 
-        <el-form-item label="充/扣主题：">
-          <!-- <el-input v-model="pointForm.remark"></el-input> -->
-          <span>{{mdetail.remark}}</span>
-        </el-form-item>
-        <el-form-item label="操作时间：">
-          <!-- <el-input v-model="pointForm.remark"></el-input> -->
-          <span>{{mdetail.createTime}}</span>
-        </el-form-item>
-        <el-form-item label="充值类型：">
-          <el-tag type="danger" v-if="mdetail.changeAmount > 0">充值天医币</el-tag>
-          <el-tag type="success" v-else>扣除天医币</el-tag>
-        </el-form-item>
-        <el-form-item label="金额：">
-          <!-- <el-input-number v-model="mdetail.pointAmount" :placeholder="mdetail.peanutCoin+'可用'">
-  </el-input-number>           -->
-          <span>{{mdetail.changeAmount}}</span>
-        </el-form-item>
+      <div>
+        积分：
+        <span :style="`color:${mdetail.changeAmount < 0 ? 'red' : ''}`">{{
+          mdetail.changeAmount
+        }}</span>
+      </div>
+      <div>
+        订单详情：<buyorderdetail
+          v-if="memoryDetail"
+          ref="buyorderdetail"
+          :orderSn="mdetail.orderSn"
+          pageType="user"
+        ></buyorderdetail>
+      </div>
 
-        <el-form-item label="充扣明细：">
-          <span>{{mdetail.note}}</span>
-          <!-- <el-input type="textarea" rows="5" v-model="mdetail.note" placeholder="操作说明">
-  </el-input> -->
-        </el-form-item>
-      </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="closeDia">关 闭</el-button>
         <!-- <el-button type="primary" @click="huaSheng">确 定</el-button> -->
@@ -88,147 +149,161 @@
 </template>
 
 <script>
-  import {
-    memoryUsage
-  } from 'process';
+import buyorderdetail from "@/views/modules/order/buyorderdetail";
+import { memoryUsage } from "process";
 
-  export default {
-    data() {
-      return {
-        dataForm: {
-          key: ''
+export default {
+  data() {
+    return {
+      dataForm: {
+        key: ""
+      },
+      memoryDetail: false,
+      headers: [
+        {
+          prop: "remark",
+          label: "充/扣主题"
         },
-        memoryDetail: false,
-        headers: [{
-            prop: 'remark',
-            label: '充/扣主题',
-          },
-          {
-            prop: 'createTime',
-            label: '操作时间',
-          },
-          {
-            prop: 'changeAmount',
-            label: '充值类型',
-          },
-          {
-            prop: 'changeAmount',
-            label: '充值类型',
-          },
-        ],
-        query: {
-          id: 0,
-          tel: ''
+        {
+          prop: "createTime",
+          label: "操作时间"
         },
-        mdetail: {}, //
-        dataListLoading: false,
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 20,
-        totalPage: 0,
-        userName:'',
+        {
+          prop: "changeAmount",
+          label: "充值类型"
+        },
+        {
+          prop: "changeAmount",
+          label: "充值类型"
+        }
+      ],
+      query: {
+        id: 0,
+        tel: ""
+      },
+      mdetail: {}, //
+      dataListLoading: false,
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      userName: ""
+    };
+  },
+  created() {
+    // this.getDataList()
+  },
+  activated() {
+    this.query.id = this.$route.query.id;
+    this.query.tel = this.$route.query.tel;
+    this.userName = this.$route.query.userName;
 
+    // console.log(this.$route.query.orderId)
+    this.getDataList();
+  },
+  components: {
+    buyorderdetail
+
+    // AddOrUpdate
+  },
+  methods: {
+    closeDia() {
+      this.memoryDetail = false;
+      this.mdetail = {};
+    },
+    huaSheng() {
+      this.$http({
+        url: this.$http.adornUrl(
+          `/book/user/pointChange?&note=${this.mdetail.note}&id=${this.mdetail.id}`
+        ),
+        method: "get",
+        params: this.$http.adornParams()
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message.success("操作成功");
+          this.getDataList();
+          this.closeDia();
+        }
+      });
+    },
+    // 获取数据列表
+    getDataList() {
+      this.dataListLoading = true;
+
+      this.$http({
+        url: this.$http.adornUrl("/book/transactiondetails/getTransactionList"),
+        method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+        data: {
+          page: this.pageIndex,
+
+          limit: this.pageSize,
+
+          userId: this.query.id
+        },
+        header: {
+          //默认 无 说明：请求头
+          "Content-Type": "application/json"
+        }
+      }).then(res => {
+        if (res.data.code === 0) {
+          this.dataList = res.data.page.records;
+          this.totalPage = res.data.page.total;
+          this.dataListLoading = false;
+        }
+      });
+
+      // this.$http({
+      //   url: this.$http.adornUrl('/book/transactiondetails/getTransactionList'),
+      //   method: 'post',
+      //   params: this.$http.adornParams({
+      //     'page': 1,
+      //     'limit': 200,
+      //     'userId': this.query.id
+      //   })
+      // }).then(({
+      //   data
+      // }) => {
+      //   if (data && data.code === 0) {
+      //     this.dataList = data.page.list
+      //     this.totalPage = data.page.totalCount
+      //     this.dataListLoading = false
+      //   }
+      // })
+    },
+    // 新增 / 修改
+    addOrUpdateHandle(row) {
+      const regex = /订单编号为\s*-\s*(\d+)/; // 正则表达式提取数字部分
+      const match = row.remark.match(regex);
+
+      if (match) {
+        const orderSn = match[1]; // match[1] 是捕获的数字部分
+        this.mdetail = row;
+        this.mdetail.orderSn = orderSn;
+        this.memoryDetail = true;
+        
+
+        this.$nextTick(() => {
+          this.$refs.buyorderdetail.init();
+        });
       }
     },
-    created() {
-      // this.getDataList()
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val;
+      this.pageIndex = 1;
+      this.getDataList();
     },
-    activated() {
-      this.query.id = this.$route.query.id;
-      this.query.tel = this.$route.query.tel;
-      this.userName = this.$route.query.userName
-
-      // console.log(this.$route.query.orderId)
-      this.getDataList()
-    },
-
-    methods: {
-      closeDia() {
-        this.memoryDetail = false
-        this.mdetail = {}
-      },
-      huaSheng() {
-        this.$http({
-          url: this.$http.adornUrl(`/book/user/pointChange?&note=${this.mdetail.note}&id=${this.mdetail.id}`),
-          method: 'get',
-          params: this.$http.adornParams()
-        }).then(({
-          data
-        }) => {
-          if (data && data.code === 0) {
-            this.$message.success('操作成功')
-            this.getDataList()
-            this.closeDia()
-          }
-        })
-      },
-      // 获取数据列表
-      getDataList() {
-        this.dataListLoading = true
-
-        this.$http({
-          url: this.$http.adornUrl('/book/transactiondetails/getTransactionList'),
-          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-          data: {
-            'page': this.pageIndex,
-
-            'limit': this.pageSize,
-
-            'userId': this.query.id
-          },
-          header: { //默认 无 说明：请求头
-            'Content-Type': 'application/json'
-          },
-        }).then(res => {
-            if (res.data.code === 0) {
-              this.dataList = res.data.page.records
-              this.totalPage = res.data.page.total
-              this.dataListLoading = false
-            }
-        })
-
-        // this.$http({
-        //   url: this.$http.adornUrl('/book/transactiondetails/getTransactionList'),
-        //   method: 'post',
-        //   params: this.$http.adornParams({
-        //     'page': 1,
-        //     'limit': 200,
-        //     'userId': this.query.id
-        //   })
-        // }).then(({
-        //   data
-        // }) => {
-        //   if (data && data.code === 0) {
-        //     this.dataList = data.page.list
-        //     this.totalPage = data.page.totalCount
-        //     this.dataListLoading = false
-        //   }
-        // })
-      },
-      // 新增 / 修改
-      addOrUpdateHandle(row) {
-        this.memoryDetail = true
-        this.mdetail = row
-      },
-      // 每页数
-      sizeChangeHandle(val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle(val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val;
+      this.getDataList();
     }
-
   }
+};
 </script>
 <style lang="less" scoped>
-  /deep/ .el-form-item {
-    margin-bottom: 1px solid #eee;
-    margin-bottom: 10px;
-  }
+/deep/ .el-form-item {
+  margin-bottom: 1px solid #eee;
+  margin-bottom: 10px;
+}
 </style>
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 65bfa18..ab825f3 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -214,6 +214,42 @@
           </el-button>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="peanutCoin"
+        header-align="center"
+        align="center"
+        min-width="80"
+        label="积分"
+      >
+        <template slot-scope="scope">
+          <div><router-link
+            :to="{
+              path: 'user-point-jf',
+              query: {
+                tel: scope.row.tel,
+                id: scope.row.id,
+                userName: scope.row.nickname
+              }
+            }"
+          >
+            <span
+              style="text-decoration: underline;font-weight: bold;color: #3983ff;"
+            >
+              {{ scope.row.jf }}
+            </span>
+          </router-link></div>
+          
+
+          <el-button
+            style="color: #3983ff;padding: 0;position: absolute;top: 4px;right: 0px;"
+            type="text"
+            size="small"
+            @click="handleJF(scope.row)"
+          >
+            【充/扣】
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="peanutCoin"
         header-align="center"
@@ -243,6 +279,7 @@
           </el-button>
         </template>
       </el-table-column>
+    
       <el-table-column
         prop="peanutCoin"
         header-align="center"
@@ -518,6 +555,12 @@
       pageType="user"
       :dataInfo="currentuserInfo"
     ></addCertificate>
+    <addJF
+      @refresh="getDataList()"
+      ref="addJF"
+      pageType="user"
+      :dataInfo="currentuserInfo"
+    ></addJF>
   </div>
 </template>
 
@@ -525,7 +568,8 @@
 import userCouponList from "../coupon/userCouponList";
 import OpenVip from "./user-open-vip";
 import AddOrUpdate from "./user-add-or-update";
-import addCertificate from "./addPoints.vue";
+import addCertificate from "@/views/modules/points/addPoints.vue";
+import addJF from "./addJf.vue";
 export default {
   data() {
     return {
@@ -581,6 +625,7 @@ export default {
     AddOrUpdate,
     userCouponList,
     addCertificate,
+    addJF,
     OpenVip
   },
   activated() {
@@ -833,6 +878,12 @@ export default {
         this.$refs.addCertificate.init("add", {});
       });
     },
+    handleJF(val) {
+      this.currentuserInfo = val;
+      this.$nextTick(() => {
+        this.$refs.addJF.init("add", {});
+      });
+    },
     huaSheng(point) {
       // console.log(this.pointForm.pointAmount, point)
       if (this.pointForm.pointAmount > point && this.pointForm.pointType == 1) {
diff --git a/src/views/modules/user/userPoints.vue b/src/views/modules/user/userPoints.vue
index 12d9498..bcb2f5e 100644
--- a/src/views/modules/user/userPoints.vue
+++ b/src/views/modules/user/userPoints.vue
@@ -239,7 +239,7 @@
 
 <script>
 import debounce from "lodash/debounce"; //导入lodash中的debounce
-import addCertificate from "./addPoints.vue";
+import addCertificate from "@/views/modules/points/addPoints.vue";
 // import AddOrUpdate from './user-add-or-update'
 export default {
   data() {