From 032a32915eb7c278deab05d82c7d9c72c45c5734 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: Wed, 16 Apr 2025 14:31:15 +0800
Subject: [PATCH] tijiao

---
 src/views/modules/order/buyorderdetail.vue |  44 +++++-
 src/views/modules/user/addJf.vue           |   7 +-
 src/views/modules/user/user.vue            | 162 ++++++++++++---------
 3 files changed, 140 insertions(+), 73 deletions(-)

diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue
index ac289aa..dc40c57 100644
--- a/src/views/modules/order/buyorderdetail.vue
+++ b/src/views/modules/order/buyorderdetail.vue
@@ -247,10 +247,41 @@
         <!-- <div style="clear:both"></div> -->
         <!-- 订单商品 -->
         <div class="liName">商品信息</div>
+        <el-table
+          :data="orderDetails.trainingClassData"
+          style="width: 100%"
+          v-if="orderDetails.orderType == 'trainingClass'"
+        >
+          <el-table-column label="商品名" min-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>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="productPrice" label="价格" width="180">
+          </el-table-column>
+          <el-table-column prop="quantity" label="数量" width="80">
+          </el-table-column>
+        </el-table>
         <el-table
           :data="orderDetails.relearnData"
           style="width: 100%"
-          v-if="orderDetails.orderType == 'relearn'"
+          v-else-if="orderDetails.orderType == 'relearn'"
         >
           <el-table-column label="商品名" min-width="280">
             <template slot-scope="scope">
@@ -281,7 +312,7 @@
         <el-table
           :data="orderDetails.vipData"
           style="width: 100%"
-          v-if="orderDetails.orderType == 'vip'"
+          v-else-if="orderDetails.orderType == 'vip'"
         >
           <el-table-column label="商品名" min-width="280">
             <template slot-scope="scope">
@@ -935,6 +966,15 @@ export default {
           // console.log(data.result,'data.result')
           this.orderDetails = data.result;
 
+          if (this.orderDetails.orderType == "trainingClass") {
+            this.orderDetails.trainingClassData = [
+              {
+                productName: this.orderDetails.remark,
+                productPrice: this.orderDetails.orderPrice,
+                quantity: 1
+              }
+            ];
+          }
           if (this.orderDetails.orderType == "relearn") {
             this.orderDetails.relearnData = [
               {
diff --git a/src/views/modules/user/addJf.vue b/src/views/modules/user/addJf.vue
index add14fd..f1f4eac 100644
--- a/src/views/modules/user/addJf.vue
+++ b/src/views/modules/user/addJf.vue
@@ -90,7 +90,6 @@
 
           <el-form-item label="充值积分" prop="score">
             <el-input-number
-              :min="0"
               v-model="addPointsForm.score"
               placeholder="请输入积分"
             >
@@ -386,6 +385,10 @@ export default {
       this.dialogVisible = true;
     },
     handleSubmit: debounce(async function() {
+      if (this.addPointsForm.score <= 0) {
+        this.$message.error("积分不能小于0");
+        return false;
+      }
       this.$refs["addPointsForm"].validate(valid => {
         if (valid) {
           this.$http({
@@ -399,7 +402,7 @@ export default {
               remark: this.addPointsForm.detail
                 ? this.addPointsForm.detail
                 : "",
-                actType: this.addPointsForm.type
+              actType: this.addPointsForm.type
             })
           }).then(({ data }) => {
             if (data && data.code === 0) {
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index ab825f3..846df11 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -6,11 +6,17 @@
       @keyup.enter.native="getDataList()"
     >
       <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="参数名" clearable  size="small">
+        <el-input
+          v-model="dataForm.key"
+          placeholder="参数名"
+          clearable
+          size="small"
+        >
         </el-input>
       </el-form-item>
       <el-form-item>
-        <el-select  size="small"
+        <el-select
+          size="small"
           v-model="dataForm.vipType"
           placeholder="请选择类型"
           clearable
@@ -25,14 +31,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button  size="small"
+        <el-button
+          size="small"
           @click="
             pageIndex = 1;
             getDataList();
           "
           >查询</el-button
         >
-        <el-button  size="small"
+        <el-button
+          size="small"
           v-if="isAuth('book:user:save')"
           type="primary"
           @click="addOrUpdateHandle()"
@@ -41,7 +49,7 @@
         <!-- <el-button type="primary" @click="addOrUpdateHandle()"
           >合并账号</el-button
         > -->
-        <el-button type="primary"  size="small" @click="addOpenCourse()"
+        <el-button type="primary" size="small" @click="addOpenCourse()"
           >批量开通课程</el-button
         >
         <!-- <el-button v-if="isAuth('book:user:delete')" type="danger" @click="deleteHandle()"
@@ -73,7 +81,7 @@
             <el-image
               v-if="scope.row.avatar && scope.row.avatar != ''"
               style="width: 30px; height: 30px;cursor: pointer;"
-              :src="scope.row.avatar "
+              :src="scope.row.avatar"
               :preview-src-list="[scope.row.avatar]"
             >
             </el-image>
@@ -185,24 +193,23 @@
         min-width="80"
         ><template slot-scope="scope">
           <div>
-             <router-link
-            :to="{
-              path: 'user-point-memery',
-              query: {
-                tel: scope.row.tel,
-                id: scope.row.id,
-                userName: scope.row.nickname
-              }
-            }"
-          >
-            <span
-              style="text-decoration: underline;font-weight: bold;color: #ff9b1a;"
+            <router-link
+              :to="{
+                path: 'user-point-memery',
+                query: {
+                  tel: scope.row.tel,
+                  id: scope.row.id,
+                  userName: scope.row.nickname
+                }
+              }"
             >
-              {{ scope.row.peanutCoin }}
-            </span>
-          </router-link>
+              <span
+                style="text-decoration: underline;font-weight: bold;color: #ff9b1a;"
+              >
+                {{ scope.row.peanutCoin }}
+              </span>
+            </router-link>
           </div>
-         
 
           <el-button
             style="color: #ff9b1a;padding: 0;position: absolute;top: 4px;right: 0px;font-weight: 500;"
@@ -222,23 +229,24 @@
         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;"
+          <div>
+            <router-link
+              :to="{
+                path: 'user-point-jf',
+                query: {
+                  tel: scope.row.tel,
+                  id: scope.row.id,
+                  userName: scope.row.nickname
+                }
+              }"
             >
-              {{ scope.row.jf }}
-            </span>
-          </router-link></div>
-          
+              <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;"
@@ -258,16 +266,17 @@
         label="湖分"
       >
         <template slot-scope="scope">
-          <div><router-link
-            :to="{ path: '/userPoints', query: { id: scope.row.id } }"
-          >
-            <span
-              style="text-decoration: underline;font-weight: bold;color: #16aa68;"
+          <div>
+            <router-link
+              :to="{ path: '/userPoints', query: { id: scope.row.id } }"
             >
-              {{ scope.row.contributionScore }}
-            </span>
-          </router-link></div>
-          
+              <span
+                style="text-decoration: underline;font-weight: bold;color: #16aa68;"
+              >
+                {{ scope.row.contributionScore }}
+              </span>
+            </router-link>
+          </div>
 
           <el-button
             style="color: #16aa68;padding: 0;position: absolute;top: 4px;right: 0px;"
@@ -279,7 +288,7 @@
           </el-button>
         </template>
       </el-table-column>
-    
+
       <el-table-column
         prop="peanutCoin"
         header-align="center"
@@ -289,16 +298,20 @@
       >
         <template slot-scope="scope">
           <!-- <el-button style="background-color: #467cfd;color: #fff;" type="text" size="small"> -->
-            <router-link
-              :to="{
-                path: '/userCourse',
-                query: { id: scope.row.id }
-              }"
+          <router-link
+            :to="{
+              path: '/userCourse',
+              query: { id: scope.row.id }
+            }"
+          >
+            <el-button
+              type="text"
+              size="small"
+              style="color: #467cfd;border: 1px solid #467cfdcc;padding: 4px;"
             >
-              <el-button type="text" size="small" style="color: #467cfd;border: 1px solid #467cfdcc;padding: 4px;">
-                课程列表
-              </el-button>
-            </router-link>
+              课程列表
+            </el-button>
+          </router-link>
           <!-- </el-button> -->
         </template>
       </el-table-column>
@@ -311,16 +324,20 @@
       >
         <template slot-scope="scope">
           <!-- <el-button style="color: #365089;" type="text" size="small"> -->
-            <router-link
-              :to="{
-                path: '/userCertificate',
-                query: { id: scope.row.id }
-              }"
+          <router-link
+            :to="{
+              path: '/userCertificate',
+              query: { id: scope.row.id }
+            }"
+          >
+            <el-button
+              type="text"
+              size="small"
+              style="color: #365089; border: 1px solid #365089cc;padding: 4px;"
             >
-              <el-button type="text" size="small" style="color: #365089; border: 1px solid #365089cc;padding: 4px;">
-                证书列表
-              </el-button>
-            </router-link>
+              证书列表
+            </el-button>
+          </router-link>
           <!-- </el-button> -->
         </template>
       </el-table-column>
@@ -578,7 +595,8 @@ export default {
       },
       pointFormRules: {
         pointAmount: [
-          { required: true, message: "请输入金额", trigger: "blur" }
+          { required: true, message: "请输入金额", trigger: "blur" },
+         
         ],
         pointType: {
           required: true,
@@ -886,9 +904,14 @@ export default {
     },
     huaSheng(point) {
       // console.log(this.pointForm.pointAmount, point)
+      if (this.pointForm.pointAmount<=0) {
+        this.$message.error("金额不能小于0");
+        return false
+      }
       if (this.pointForm.pointAmount > point && this.pointForm.pointType == 1) {
         return this.$message.error("扣除金额不能大于总金额");
       }
+     
       this.$refs["pointForm"].validate(valid => {
         this.$http({
           url: this.$http.adornUrl(
@@ -975,8 +998,9 @@ export default {
   padding: 4px 0 !important;
   box-sizing: border-box;
 }
-/deep/ .mod-config .el-table .cell, .el-table th div {
-  padding:  0 !important;
+/deep/ .mod-config .el-table .cell,
+.el-table th div {
+  padding: 0 !important;
   box-sizing: border-box;
 }
 </style>