Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-master-html

src/router/index.js

@@ -45,6 +45,7 @@ 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: 'activity-list', meta: { title: '充/扣记录', isTab: true } },
   ],
   beforeEnter (to, from, next) {
     let token = Vue.cookie.get('token')

src/views/modules/order/buyorder.vue

@@ -29,13 +29,13 @@
     </div>
     <el-form :inline="true" size="mini" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="订单编号" clearable></el-input>
+        <el-input style="width:200px" v-model="dataForm.key" placeholder="订单编号/收件人姓名/手机号" clearable></el-input>
       </el-form-item>
       <!-- 按时间筛选 -->
       <el-form-item>
         <div class="block">
-          <el-date-picker size="mini" v-model="dataForm.time" type="datetimerange" :picker-options="timePickerOptions"
+          <el-date-picker size="mini" value-format="timestamp" v-model="dataForm.time" type="datetimerange" :picker-options="timePickerOptions"
-            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" @change="test">
           </el-date-picker>
         </div>
       </el-form-item>
@@ -218,8 +218,8 @@
       </el-table-column>
       <el-table-column prop="orderSn" header-align="center" align="center" label="订单编号">
       </el-table-column>
-      <el-table-column prop="userName" header-align="center" align="center" label="下单人姓名">
+      <!-- <el-table-column prop="userName" header-align="center" align="center" label="下单人姓名">
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column
             prop="shippingUser"
             header-align="center"
@@ -266,9 +266,9 @@
         <template slot-scope="scope">
           <div class="detailsFonts">
           <span>实收：<b style="font-size: 16px; color: #fda328;">￥{{scope.row.realMoney}}</b></span>
-          <span>优惠券：-</span>
+          <span v-if="scope.row.couponId">优惠券：-</span>
-          <span>运费：+{{scope.row.shippingMoney}}</span>
+          <span v-if="scope.row.shippingMoney">运费：+{{scope.row.shippingMoney}}</span>
-          <span>积分抵扣：-</span>
+          <!-- <span >积分抵扣：-</span> -->
         </div>
         </template>
       </el-table-column>
@@ -284,6 +284,7 @@
       </el-table-column>
       <el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态">
         <template slot-scope="scope">
+          <el-tag v-if="scope.row.orderStatus == 0" type="success">待付款</el-tag>
           <el-tag v-if="scope.row.orderStatus == 1" type="success">待发货</el-tag>
           <el-tag v-if="scope.row.orderStatus == 2" type="danger">已发货</el-tag>
           <el-tag v-if="scope.row.orderStatus == 3" type="warning">已完成</el-tag>
@@ -536,7 +537,8 @@ export default {
           'page': this.pageIndex,
           'limit': this.pageSize,
           'key': this.dataForm.key,
-          'time': this.dataForm.time,
+          'startTime': this.dataForm.time[0],
+          'endTime': this.dataForm.time[1],
           'orderStatus': this.tabChange.tabActiveName,   // 订单状态参数
           'isPrint': this.tabChange.isPrint,
           'orderorderType': this.tabChange.orderName,
@@ -762,7 +764,9 @@ export default {
       this.splitDeliverVisible = val
       // this.oprateOrder = {}
       this.getDataList()
-
+    },
+    test(e){
+      console.log(e)
     },
     // 关闭万能弹窗
     closeanyDialogDialog() {

src/views/modules/order/paypaymentorder.vue

@@ -22,17 +22,17 @@
         align="center"
         width="50">
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="id"
         header-align="center"
         align="center"
         label="id">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
-        prop="userId"
+        prop="userName"
         header-align="center"
         align="center"
-        label="用户id">
+        label="用户">
       </el-table-column>
       <el-table-column
         prop="rechargeAmount"
@@ -63,6 +63,10 @@
         header-align="center"
         align="center"
         label="充值状态">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.rechargeStatus == 'success'" type="success">成功</el-tag>
+          <el-tag v-else type="error">失败</el-tag>
+        </template>
       </el-table-column>
       <el-table-column
         prop="createTime"

src/views/modules/order/transactiondetails.vue

@@ -23,16 +23,16 @@
         width="50">
       </el-table-column>
       <el-table-column
-        prop="transactionId"
+        prop="createTime"
         header-align="center"
         align="center"
-        label="">
+        label="操作时间">
       </el-table-column>
       <el-table-column
-        prop="userId"
+        prop="userName"
         header-align="center"
         align="center"
-        label="用户id">
+        label="用户">
       </el-table-column>
       <el-table-column
         prop="orderType"
@@ -45,13 +45,17 @@
         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>
+        </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="relationId"
         header-align="center"
         align="center"
         label="关联id">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="remark"
         header-align="center"
@@ -71,7 +75,7 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.transactionId)">修改</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.transactionId)">明细</el-button>
           <el-button type="text" size="small" @click="deleteHandle(scope.row.transactionId)">删除</el-button>
         </template>
       </el-table-column>

src/views/modules/shop/shopproduct-add-or-update.vue

@@ -1,13 +1,7 @@
 <template>
-  <el-dialog class="productsDialog" center :title="!dataForm.productId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"
+  <el-dialog :title="!dataForm.productId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"
-    @close="handlereset" lock-scroll>
+    @close="handlereset" lock-scroll width="750px">
-    <el-steps :active="steps" simple style="margin-bottom: 15px;">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="100px">
-      <el-step title="基本信息" icon="el-icon-edit"></el-step>
-      <el-step title="商品详情" icon="el-icon-upload"></el-step>
-    </el-steps>
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" 
-      label-width="100px">
-      <div class="steps1" v-if="steps == 1">
       <el-form-item label="所属分类" prop="poids">
         <el-cascader v-model="dataForm.poids" :options="categorys" :props="props" clearable></el-cascader>
       </el-form-item>
@@ -17,16 +11,15 @@
           </el-option>
         </el-select>
       </el-form-item>
-
       <el-form-item label="商品名称" prop="productName">
         <el-input v-model="dataForm.productName" placeholder="商品名称"></el-input>
       </el-form-item>
+
       <el-form-item label="商品图" prop="productImages">
         <el-upload :limit="dataForm.limitCountImg" class="el-uploadfeng "
           :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
-            :action= "baseUrl + '/oss/fileoss'"  list-type="picture-card"
+          :action="baseUrl + '/oss/fileoss'" list-type="picture-card" :on-preview="handlePictureCardPreview"
-            :on-preview="handlePictureCardPreview" :file-list="fileList" :on-success="handlePicSuccess"
+          :file-list="fileList" :on-success="handlePicSuccess" accept=".jpeg,.jpg,.gif,.png" :on-remove="handleRemove">
-            accept=".jpeg,.jpg,.gif,.png"  :on-remove="handleRemove">
           <i class="el-icon-plus"></i>
         </el-upload>
         <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
@@ -36,9 +29,9 @@
       <el-form-item label="商品轮播图" prop="productImageList">
         <el-upload :limit="5" class="el-uploadfeng noneBtnImg"
           :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
-            :action= "baseUrl + '/oss/fileoss'" list-type="picture-card"
+          :action="baseUrl + '/oss/fileoss'" list-type="picture-card" :on-preview="handlePictureCardPreview"
-            :on-preview="handlePictureCardPreview" :file-list="swiperfileList" :on-success="bannerHandlePicSuccess"
+          :file-list="swiperfileList" :on-success="bannerHandlePicSuccess" accept=".jpeg,.jpg,.gif,.png"
-            accept=".jpeg,.jpg,.gif,.png" :on-remove="bannerHandleRemove">
+          :on-remove="bannerHandleRemove">
           <i class="el-icon-plus"></i>
         </el-upload>
         <!-- <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
@@ -74,7 +67,8 @@
       </div>
       <div>
         <el-form-item label="出版时间" prop="pubDate" style="width: 50%; float: left;">
-            <el-date-picker  @change="changed"  format="yyyy 年 MM 月 dd 日" v-model="dataForm.pubDate" type="date"  placeholder="选择日期时间">
+          <el-date-picker @change="changeTime" format="yyyy 年 MM 月 dd 日" v-model="dataForm.pubDate" type="date"
+            placeholder="选择日期时间">
           </el-date-picker>
           <!-- <el-input placeholder="出版时间" v-model=""></el-input> -->
         </el-form-item>
@@ -93,48 +87,44 @@
       <div style="clear: both;">
         <el-form-item label="是否包邮" prop="isFreeMail">
           <el-radio-group v-model="dataForm.isFreeMail">
-            <el-radio :label="0">是</el-radio>
+            <el-radio :label="'0'">是</el-radio>
-            <el-radio :label="1">否</el-radio>
+            <el-radio :label="'1'">否</el-radio>
           </el-radio-group>
         </el-form-item>
       </div>
+      <el-form-item label="商品详情" prop="productDetails">
+        <quill-editor v-model="dataForm.productDetails" ref="myQuillEditor" :options="editorOption"
+          @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @change="onEditorChange($event)"
+          @ready="onEditorReady($event)" class="shangpin_editor">
+        </quill-editor>        
+      </el-form-item>
       <!-- <el-form-item label="排序" prop="sort">
         <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
       </el-form-item> -->
-      </div>
-      <div></div>
-      <div class="steps2" v-if="steps == 2">
-        <div style="margin-bottom: 15px;"><b>商品详情</b></div>
-        <quill-editor v-model="dataForm.productDetails" ref="myQuillEditor" height:400px :options="editorOption"
-          @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @change="onEditorChange($event)"
-          @ready="onEditorReady($event)">
-        </quill-editor>
-      </div>
     </el-form>
     <span slot="footer" class="dialog-footer">
-      <!-- <el-button @click="handlereset">取消</el-button> -->
+      <el-button @click="handlereset">取消</el-button>
-      <el-button type="warning" @click="steps = 1" plain size="mini">添加基本信息</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-      <el-button type="success" @click="steps = 2" plain size="mini">添加商品详情</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" plain size="mini">确 定</el-button>
-      <el-button type="default" @click="handlereset" plain size="mini">关 闭</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import { quillEditor } from 'vue-quill-editor'
+  import {
-import global from '../../common/common.vue'     //引入共用组间
+    quillEditor
+  } from 'vue-quill-editor'
+  import global from '../../common/common.vue' //引入共用组间
 
-import 'quill/dist/quill.core.css'
+  import 'quill/dist/quill.core.css'
-import 'quill/dist/quill.snow.css'
+  import 'quill/dist/quill.snow.css'
-import 'quill/dist/quill.bubble.css'
+  import 'quill/dist/quill.bubble.css'
 
-export default {
+  export default {
     data() {
       return {
-      baseUrl:global.baseUrl,  
+        pointMemery:[], // 花生币操作记录
+        baseUrl: global.baseUrl,
         goodsTypeList: [],
-      steps: 1,
         visible: false,
         categorys: [],
         fileList: [], // 封面图
@@ -147,21 +137,21 @@ export default {
           checkStrictly: true
         },
         dataForm: {
-        hDprice:null, // 活动价
+          hDprice: null, // 活动价
           productId: 0,
           limitCountImg: 1, // 图片数量
           productImageList: '', // 轮播图
           showBtnDealImg: true,
           noneBtnImg: false,
           productName: '',
-        productStock:null, // 商品库存
+          productStock: null, // 商品库存
           price: '',
           author: '',
           publisher: '',
           weight: '',
           pubDate: '',
           format: '', // 开本
-        isFreeMail:'', // 是否包邮
+          isFreeMail: '', // 是否包邮
           pageNum: '',
           quality: '', // 内文用纸
           sumSales: null, // 总销量
@@ -176,30 +166,46 @@ export default {
           poids: []
         },
         dataRule: {
-        productName: [
+          productName: [{
-          { required: true, message: '商品名称不能为空', trigger: 'blur' }
+            required: true,
-        ],
+            message: '商品名称不能为空',
-        price: [
+            trigger: 'blur'
-          { required: true, message: '商品价格不能为空', trigger: 'blur' }
+          }],
-        ],
+          price: [{
-        weight: [
+            required: true,
-          { required: true, message: '商品重量不能为空', trigger: 'blur' }
+            message: '商品价格不能为空',
-        ],
+            trigger: 'blur'
-        goodsType: [
+          }],
-          { required: true, message: '商品类型不能为空', trigger: 'blur' }
+          weight: [{
-        ],
+            required: true,
-        poids: [
+            message: '商品重量不能为空',
-          { required: true, message: '商品父id不能为空', trigger: 'blur' }
+            trigger: 'blur'
-        ],
+          }],
-        productImages: [
+          goodsType: [{
-          { required: true, message: '商品图不能为空', trigger: 'blur' }
+            required: true,
-        ],
+            message: '商品类型不能为空',
-        productDetails: [
+            trigger: 'blur'
-          { required: true, message: '商品详情不能为空', trigger: 'blur' }
+          }],
-        ],
+          poids: [{
-        productStock: [
+            required: true,
-          { required: true, message: '商品库存不能为空', trigger: 'blur' }
+            message: '商品父id不能为空',
-        ],
+            trigger: 'blur'
+          }],
+          productImages: [{
+            required: true,
+            message: '商品图不能为空',
+            trigger: 'blur'
+          }],
+          // productDetails: [{
+          //   required: true,
+          //   message: '商品详情不能为空',
+          //   trigger: 'blur'
+          // }],
+          productStock: [{
+            required: true,
+            message: '商品库存不能为空',
+            trigger: 'blur'
+          }],
           // updateTime: [
           //   { required: true, message: '更新时间不能为空', trigger: 'blur' }
           // ],
@@ -216,16 +222,44 @@ export default {
             toolbar: [
               ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
               ['blockquote', 'code-block'], // 引用  代码块
-            [{ header: 1 }, { header: 2 }], // 1、2 级标题
+              [{
-            [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+                header: 1
-            [{ script: 'sub' }, { script: 'super' }], // 上标/下标
+              }, {
-            [{ indent: '-1' }, { indent: '+1' }], // 缩进
+                header: 2
-            [{ direction: 'rtl' }], // 文本方向
+              }], // 1、2 级标题
-            [{ size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36'] }], // 字体大小
+              [{
-            [{ header: [1, 2, 3, 4, 5, 6] }], // 标题
+                list: 'ordered'
-            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+              }, {
+                list: 'bullet'
+              }], // 有序、无序列表
+              [{
+                script: 'sub'
+              }, {
+                script: 'super'
+              }], // 上标/下标
+              [{
+                indent: '-1'
+              }, {
+                indent: '+1'
+              }], // 缩进
+              [{
+                direction: 'rtl'
+              }], // 文本方向
+              [{
+                size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36']
+              }], // 字体大小
+              [{
+                header: [1, 2, 3, 4, 5, 6]
+              }], // 标题
+              [{
+                color: []
+              }, {
+                background: []
+              }], // 字体颜色、字体背景颜色
               // [{ font: ['songti'] }], // 字体种类
-            [{ align: [] }], // 对齐方式
+              [{
+                align: []
+              }], // 对齐方式
               ['clean'], // 清除文本格式
               ['image', 'video'] // 链接、图片、视频
             ]
@@ -248,7 +282,9 @@ export default {
               url: this.$http.adornUrl(`/book/shopproduct/info/${this.dataForm.productId}`),
               method: 'get',
               params: this.$http.adornParams()
-          }).then(({ data }) => {
+            }).then(({
+              data
+            }) => {
               if (data && data.code === 0) {
                 this.dataForm.productName = data.shopProduct.productName
                 this.dataForm.price = data.shopProduct.price
@@ -261,7 +297,7 @@ export default {
                 this.dataForm.updateTime = data.shopProduct.updateTime
                 this.dataForm.delFlag = data.shopProduct.delFlag
                 this.dataForm.sort = data.shopProduct.sort
-              this.dataForm.publisher= data.shopProduct.publisher
+                this.dataForm.publisher = data.shopProduct.publisher
                 this.dataForm.author = data.shopProduct.author
                 this.dataForm.pubDate = data.shopProduct.pubDate
                 this.dataForm.pageNum = data.shopProduct.pageNum
@@ -273,14 +309,19 @@ export default {
                 this.dataForm.productStock = data.shopProduct.productStock
                 this.dataForm.hDprice = data.shopProduct.activityPrice
                 if (data.shopProduct.productImages != "") {
-                var img = { name: '', url: data.shopProduct.productImages }
+                  var img = {
+                    name: '',
+                    url: data.shopProduct.productImages
+                  }
                   var attr = []
                   attr.push(img)
                   this.fileList = attr
                 }
-              if (data.shopProduct.productImageList == null || data.shopProduct.productImageList[0] == '' || data.shopProduct.productImageList == "") {
+                if (data.shopProduct.productImageList == null || data.shopProduct.productImageList[0] == '' ||
+                  data.shopProduct.productImageList == "") {
                   return this.swiperfileList = []
-              }else{
+                }
+              } else {
                 // 有轮播图
                 console.log(data.shopProduct.productImageList)
                 let arr = []
@@ -289,11 +330,13 @@ export default {
                 arr = data.shopProduct.productImageList.split(',');
                 console.log(arr)
                 arr.forEach((item, index) => {
-                  arr1.push({ name: index, url: item })
+                  arr1.push({
+                    name: index,
+                    url: item
+                  })
                 });
                 this.swiperfileList = arr1
               }
-            }
             })
           }
         })
@@ -303,7 +346,9 @@ export default {
         this.$http({
           url: this.$http.adornUrl('/book/sysdictdata/selectByType/goodsType'),
           method: 'get',
-      }).then(({ data }) => {
+        }).then(({
+          data
+        }) => {
           console.log(data.dataList)
           this.goodsTypeList = data.dataList
         })
@@ -339,13 +384,15 @@ export default {
                 'publisher': this.dataForm.publisher,
                 'pubDate': this.dataForm.pubDate,
                 'format': this.dataForm.format, // 开本
-              'isFreeMail' : this.dataForm.isFreeMail,
+                'isFreeMail': this.dataForm.isFreeMail,
                 'pageNum': this.dataForm.pageNum,
                 'quality': this.dataForm.quality, // 内文用纸
-              'productStock' : this.dataForm.productStock , // 库存    
+                'productStock': this.dataForm.productStock, // 库存
-              'activityPrice' : this.dataForm.hDprice
+                'activityPrice': this.dataForm.hDprice
               })
-          }).then(({ data }) => {
+            }).then(({
+              data
+            }) => {
               if (data && data.code === 0) {
                 this.$message({
                   message: '操作成功',
@@ -354,9 +401,8 @@ export default {
                   onClose: () => {
                     this.visible = false
                     this.$refs['dataForm'].resetFields()
-                  this.$refs['dataForm'].reset()
+                    // this.$refs['dataForm'].reset()
                     this.$emit('refreshDataList')
-                  this.steps = 1
                   }
                 })
               } else {
@@ -366,7 +412,7 @@ export default {
           }
         })
       },
-    changed(e){
+      changeTime(e) {
         console.log(e)
       },
       getTreeList() {
@@ -374,7 +420,9 @@ export default {
           url: this.$http.adornUrl(`/book/shopcategory/listTree`),
           method: 'get',
           params: this.$http.adornParams()
-      }).then(({ data }) => {
+        }).then(({
+          data
+        }) => {
           this.categorys = data.data;
         })
       },
@@ -385,7 +433,10 @@ export default {
       bannerHandlePicSuccess(res, file) {
         // 轮播图上传成功
         if (res.msg == "success") {
-        this.swiperfileList.push({ name: file.name, url: res.url })
+          this.swiperfileList.push({
+            name: file.name,
+            url: res.url
+          })
           console.log(this.swiperfileList)
           this.$message.success("上传成功");
         } else {
@@ -395,9 +446,9 @@ export default {
       // 字符串图片地址
       getStringImgUrl() {
         let arr = this.swiperfileList.map(item => item.url)
-      if(arr.length <= 0){
+        if (arr.length <= 0) {
           return null
-      }else{
+        } else {
           return arr.toString()
         }
       },
@@ -405,7 +456,10 @@ export default {
         // console.log(res,'res')
         if (res.msg == "success") {
           this.dataForm.productImages = res.url;
-        this.fileList.push({ name: file.name, url: res.url })      
+          this.fileList.push({
+            name: file.name,
+            url: res.url
+          })
           //  console.log(this.dataForm.productImages,'productImages')
           this.$message.success("上传成功");
         } else {
@@ -433,14 +487,18 @@ export default {
       },
       // 获得焦点事件
       onEditorFocus(quill) {
-      console.log('editor focus!', quill)
+        //console.log('editor focus!', quill)
       },
       // 准备富文本编辑器
       onEditorReady(quill) {
-      console.log('editor ready!', quill)
+       // console.log('editor ready!', quill)
       },
       // 内容改变事件
-    onEditorChange({ quill, html, text }) {
+      onEditorChange({
+        quill,
+        html,
+        text
+      }) {
         console.log('editor change!', quill, html, text)
         this.content = html
       }
@@ -456,36 +514,37 @@ export default {
         deep: true
       },
     }
-}
+  }
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
+  // .disUoloadSty {
+  //   .el-upload--picture-card {
+  //     display: none;
+  //     /* 上传按钮隐藏 */
+  //   }
+  // }
+
+  // .el-form-item {
+  //   /deep/ .el-form-item__label {
+  //     font-size: 12px;
+  //   }
+  // }
+
+  .el-uploadfeng {
+   .el-upload-list__item {
+      width: 120px;
+      height: 120px;
+    }
 
-.productsDialog{height: 800px; overflow-y: scroll;}
-.disUoloadSty {
     .el-upload--picture-card {
-    display: none;
+      width: 120px;
-    /* 上传按钮隐藏 */
+      height: 120px;
+      line-height: 120px;
     }
-}
-
-.el-form-item {
-  /deep/ .el-form-item__label {
-    font-size: 12px;
-  }
-}
-
-.el-uploadfeng {
-  /deep/ .el-upload-list__item {
-    width: 60px;
-    height: 60px;
   }
 
-  /deep/ .el-upload--picture-card {
+  .shangpin_editor .ql-editor {
-    width: 60px;
+    height: 150px;
-    height: 60px;
-    line-height: 70px;
-
   }
-}
 </style>

src/views/modules/shop/shopproduct-add-or-update11.vue

@@ -0,0 +1,491 @@
+<template>
+  <el-dialog class="productsDialog" center :title="!dataForm.productId ? '新增' : '修改'" :close-on-click-modal="false" :visible.sync="visible"
+    @close="handlereset" lock-scroll>
+    <el-steps :active="steps" simple style="margin-bottom: 15px;">
+      <el-step title="基本信息" icon="el-icon-edit"></el-step>
+      <el-step title="商品详情" icon="el-icon-upload"></el-step>
+    </el-steps>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" 
+      label-width="100px">
+      <div class="steps1" v-if="steps == 1">
+        <el-form-item label="所属分类" prop="poids">
+          <el-cascader v-model="dataForm.poids" :options="categorys" :props="props" clearable></el-cascader>
+        </el-form-item>
+        <el-form-item label="商品类型" prop="goodsType">
+          <el-select v-model="dataForm.goodsType" placeholder="请选择">
+            <el-option v-for="item in goodsTypeList" :key="item.dictType" :label="item.dictValue" :value="item.dictType">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="商品名称" prop="productName">
+          <el-input v-model="dataForm.productName" placeholder="商品名称"></el-input>
+        </el-form-item>
+        <el-form-item label="商品图" prop="productImages">
+          <el-upload :limit="dataForm.limitCountImg" class="el-uploadfeng "
+            :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
+            :action= "baseUrl + '/oss/fileoss'"  list-type="picture-card"
+            :on-preview="handlePictureCardPreview" :file-list="fileList" :on-success="handlePicSuccess"
+            accept=".jpeg,.jpg,.gif,.png"  :on-remove="handleRemove">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+            <img width="100%" :src="dataForm.productImages" alt="">
+          </el-dialog>
+        </el-form-item>
+        <el-form-item label="商品轮播图" prop="productImageList">
+          <el-upload :limit="5" class="el-uploadfeng noneBtnImg"
+            :class="{ uoloadSty: dataForm.showBtnDealImg, disUoloadSty: dataForm.noneBtnImg }"
+            :action= "baseUrl + '/oss/fileoss'" list-type="picture-card"
+            :on-preview="handlePictureCardPreview" :file-list="swiperfileList" :on-success="bannerHandlePicSuccess"
+            accept=".jpeg,.jpg,.gif,.png" :on-remove="bannerHandleRemove">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <!-- <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
+            <img width="100%" :src="dataForm.productImageList" alt="">
+          </el-dialog> -->
+          <span>图片尺寸：600*600px，支持图片类型：.jpeg,.jpg,.gif,.png， 最多上传5张图片</span>
+        </el-form-item>
+        <div>
+          <el-form-item label="活动价" prop="price" style="width: 50%; float: left;">
+            <el-input v-model="dataForm.price" placeholder="活动价"></el-input>
+          </el-form-item>
+          <el-form-item label="商品价格" prop="hDprice" style="width: 50%; float: left;">
+            <el-input v-model="dataForm.hDprice" placeholder="商品价格"></el-input>
+          </el-form-item>
+          <el-form-item label="商品重量" prop="weight" style="width: 50%; float: right;">
+            <el-input style="width: 80%;" v-model="dataForm.weight" placeholder="商品重量"></el-input><span
+              style="display: inline-block; float: right; width: 10%;">克</span>
+          </el-form-item>
+          <el-form-item label="商品库存" prop="productStock" style="width: 50%; float: right;">
+            <el-input v-model="dataForm.productStock" placeholder="商品库存"></el-input>      
+          </el-form-item>
+        </div>
+        <!-- <el-form-item label="上架状态" prop="publishStatus">
+          <el-input v-model="dataForm.publishStatus" placeholder="上架状态"></el-input>
+        </el-form-item> -->
+        <div>
+          <el-form-item label="出版社" prop="publisher" style="width: 50%; float: left;">
+            <el-input placeholder="出版社" v-model="dataForm.publisher"></el-input>
+          </el-form-item>
+          <el-form-item label="作者" prop="author" style="width: 50%; float: right;">
+            <el-input placeholder="作者" v-model="dataForm.author"></el-input>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="出版时间" prop="pubDate" style="width: 50%; float: left;">
+            <el-date-picker  @change="changed"  format="yyyy 年 MM 月 dd 日" v-model="dataForm.pubDate" type="date"  placeholder="选择日期时间">
+            </el-date-picker>            
+            <!-- <el-input placeholder="出版时间" v-model=""></el-input> -->
+          </el-form-item>
+          <el-form-item label="页数" prop="pageNum" style="width: 50%; float: right;">
+            <el-input placeholder="页数" v-model="dataForm.pageNum"></el-input>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="内文用纸材质" prop="quality" style="width: 50%; float: left;">
+            <el-input v-model="dataForm.quality" placeholder="内文用纸材质"></el-input>
+          </el-form-item>
+          <el-form-item label="开本" prop="format" style="width: 50%; float: right;">
+            <el-input v-model="dataForm.format" placeholder="16开或其他规格"></el-input>
+          </el-form-item>          
+        </div>
+        <div style="clear: both;">
+           <el-form-item label="是否包邮" prop="isFreeMail">
+          <el-radio-group v-model="dataForm.isFreeMail">
+            <el-radio :label="'0'">是</el-radio>
+            <el-radio :label="'1'">否</el-radio>
+          </el-radio-group>
+      </el-form-item>
+        </div>
+        <!-- <el-form-item label="排序" prop="sort">
+        <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+      </el-form-item> -->
+      </div>
+      <div></div>
+      <div class="steps2" v-if="steps == 2">
+        <div style="margin-bottom: 15px;"><b>商品详情</b></div>
+        <quill-editor v-model="dataForm.productDetails" ref="myQuillEditor" height:400px :options="editorOption"
+          @blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @change="onEditorChange($event)"
+          @ready="onEditorReady($event)">
+        </quill-editor>
+      </div>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <!-- <el-button @click="handlereset">取消</el-button> -->
+      <el-button type="warning" @click="steps = 1" plain size="mini">添加基本信息</el-button>
+      <el-button type="success" @click="steps = 2" plain size="mini">添加商品详情</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" plain size="mini">确 定</el-button>
+      <el-button type="default" @click="handlereset" plain size="mini">关 闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { quillEditor } from 'vue-quill-editor'
+import global from '../../common/common.vue'     //引入共用组间
+
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+export default {
+  data() {
+    return {
+      baseUrl:global.baseUrl,  
+      goodsTypeList: [],
+      steps: 1,
+      visible: false,
+      categorys: [],
+      fileList: [], // 封面图
+      swiperfileList: [],
+      dialogVisible: false,
+      props: {
+        value: "catId",
+        label: "name",
+        children: "children",
+        checkStrictly: true
+      },
+      dataForm: {
+        hDprice:null, // 活动价
+        productId: 0,
+        limitCountImg: 1,  // 图片数量
+        productImageList: '', // 轮播图
+        showBtnDealImg: true,
+        noneBtnImg: false,
+        productName: '',
+        productStock:null, // 商品库存
+        price: '',
+        author: '',
+        publisher: '',
+        weight: '',
+        pubDate: '',
+        format: '', // 开本
+        isFreeMail:'', // 是否包邮
+        pageNum: '',
+        quality: '', // 内文用纸
+        sumSales: null,  // 总销量
+        publishStatus: '',
+        productPid: '',
+        productImages: '',
+        createTime: '',
+        updateTime: '',
+        delFlag: '',
+        sort: '',
+        goodsType: '',      // 商品类型
+        poids: []
+      },
+      dataRule: {
+        productName: [
+          { required: true, message: '商品名称不能为空', trigger: 'blur' }
+        ],
+        price: [
+          { required: true, message: '商品价格不能为空', trigger: 'blur' }
+        ],
+        weight: [
+          { required: true, message: '商品重量不能为空', trigger: 'blur' }
+        ],
+        goodsType: [
+          { required: true, message: '商品类型不能为空', trigger: 'blur' }
+        ],
+        poids: [
+          { required: true, message: '商品父id不能为空', trigger: 'blur' }
+        ],
+        productImages: [
+          { required: true, message: '商品图不能为空', trigger: 'blur' }
+        ],
+        productDetails: [
+          { required: true, message: '商品详情不能为空', trigger: 'blur' }
+        ],
+        productStock: [
+          { required: true, message: '商品库存不能为空', trigger: 'blur' }
+        ],
+        // updateTime: [
+        //   { required: true, message: '更新时间不能为空', trigger: 'blur' }
+        // ],
+        // delFlag: [
+        //   { required: true, message: '删除标记不能为空', trigger: 'blur' }
+        // ],
+        // sort: [
+        //   { required: true, message: '排序不能为空', trigger: 'blur' }
+        // ]
+      },
+      // 富文本编辑器配置
+      editorOption: {
+        modules: {
+          toolbar: [
+            ['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线
+            ['blockquote', 'code-block'], // 引用  代码块
+            [{ header: 1 }, { header: 2 }], // 1、2 级标题
+            [{ list: 'ordered' }, { list: 'bullet' }], // 有序、无序列表
+            [{ script: 'sub' }, { script: 'super' }], // 上标/下标
+            [{ indent: '-1' }, { indent: '+1' }], // 缩进
+            [{ direction: 'rtl' }], // 文本方向
+            [{ size: ['12', '14', '16', '18', '20', '22', '24', '28', '32', '36'] }], // 字体大小
+            [{ header: [1, 2, 3, 4, 5, 6] }], // 标题
+            [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
+            // [{ font: ['songti'] }], // 字体种类
+            [{ align: [] }], // 对齐方式
+            ['clean'], // 清除文本格式
+            ['image', 'video'] // 链接、图片、视频
+          ]
+        },
+        placeholder: '请输入正文'
+      },
+    }
+  },
+  created() {
+    this.getTreeList()
+  },
+  methods: {
+    init(id) {
+      this.dataForm.productId = id || 0
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.productId) {
+          this.$http({
+            url: this.$http.adornUrl(`/book/shopproduct/info/${this.dataForm.productId}`),
+            method: 'get',
+            params: this.$http.adornParams()
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.dataForm.productName = data.shopProduct.productName
+              this.dataForm.price = data.shopProduct.price
+              this.dataForm.goodsType = data.shopProduct.goodsType
+              this.dataForm.weight = data.shopProduct.weight
+              this.dataForm.publishStatus = data.shopProduct.publishStatus
+              this.dataForm.productPid = data.shopProduct.productPid
+              this.dataForm.productImages = data.shopProduct.productImages
+              this.dataForm.createTime = data.shopProduct.createTime
+              this.dataForm.updateTime = data.shopProduct.updateTime
+              this.dataForm.delFlag = data.shopProduct.delFlag
+              this.dataForm.sort = data.shopProduct.sort
+              this.dataForm.publisher= data.shopProduct.publisher
+              this.dataForm.author = data.shopProduct.author
+              this.dataForm.pubDate = data.shopProduct.pubDate
+              this.dataForm.pageNum = data.shopProduct.pageNum  
+              this.dataForm.quality = data.shopProduct.quality
+              this.dataForm.format = data.shopProduct.format
+              this.dataForm.isFreeMail = data.shopProduct.isFreeMail
+              this.dataForm.productDetails = data.shopProduct.productDetails
+              this.dataForm.poids = data.shopProduct.poids
+              this.dataForm.productStock = data.shopProduct.productStock
+              this.dataForm.hDprice = data.shopProduct.activityPrice
+              if (data.shopProduct.productImages != "") {
+                var img = { name: '', url: data.shopProduct.productImages }
+                var attr = []
+                attr.push(img)
+                this.fileList = attr
+              }
+              if (data.shopProduct.productImageList == null || data.shopProduct.productImageList[0] == '' || data.shopProduct.productImageList == "") {
+                return this.swiperfileList = []
+              }else{
+                 // 有轮播图
+                console.log(data.shopProduct.productImageList)
+                let arr = []
+                let arr1 = []
+
+                arr = data.shopProduct.productImageList.split(',');
+                console.log(arr)
+                arr.forEach((item, index) => {
+                  arr1.push({ name: index, url: item })
+                });
+                this.swiperfileList = arr1
+              }
+            }
+          })
+        }
+      })
+    },
+    // 获取商品类型
+    getGoodsTypeList() {
+      this.$http({
+        url: this.$http.adornUrl('/book/sysdictdata/selectByType/goodsType'),
+        method: 'get',
+      }).then(({ data }) => {
+        console.log(data.dataList)
+        this.goodsTypeList = data.dataList
+      })
+    },
+    dealImgChange(file, fileList) {
+      this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
+    },
+    // 表单提交
+    dataFormSubmit() {
+      this.$refs['dataForm'].validate((valid) => {
+        this.dataForm.productImageList = this.getStringImgUrl()
+        //  console.log(this.dataForm.productImageList)
+        if (valid) {
+          this.$http({
+            url: this.$http.adornUrl(`/book/shopproduct/${!this.dataForm.productId ? 'save' : 'update'}`),
+            method: 'post',
+            data: this.$http.adornData({
+              'productId': this.dataForm.productId || undefined,
+              'productName': this.dataForm.productName,
+              'price': this.dataForm.price,
+              'weight': this.dataForm.weight,
+              'publishStatus': this.dataForm.publishStatus,
+              'productPid': this.dataForm.poids[this.dataForm.poids.length - 1],
+              'productImages': this.dataForm.productImages,
+              'productImageList': this.dataForm.productImageList,
+              'createTime': this.dataForm.createTime,
+              'updateTime': this.dataForm.updateTime,
+              'delFlag': this.dataForm.delFlag,
+              'sort': this.dataForm.sort,
+              'goodsType': this.dataForm.goodsType,
+              'productDetails': this.dataForm.productDetails,
+              'author': this.dataForm.author,
+              'publisher': this.dataForm.publisher,
+              'pubDate': this.dataForm.pubDate,
+              'format': this.dataForm.format, // 开本
+              'isFreeMail' : this.dataForm.isFreeMail,
+              'pageNum': this.dataForm.pageNum,
+              'quality': this.dataForm.quality, // 内文用纸   
+              'productStock' : this.dataForm.productStock , // 库存    
+              'activityPrice' : this.dataForm.hDprice
+            })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {                           
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                  this.$refs['dataForm'].resetFields()
+                  this.$refs['dataForm'].reset()
+                  this.$emit('refreshDataList')
+                  this.steps = 1
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }
+      })
+    },
+    changed(e){
+      console.log(e)
+    },
+    getTreeList() {
+      this.$http({
+        url: this.$http.adornUrl(`/book/shopcategory/listTree`),
+        method: 'get',
+        params: this.$http.adornParams()
+      }).then(({ data }) => {
+        this.categorys = data.data;       
+      })
+    },
+    handlePictureCardPreview(file) {
+      this.dataForm.productImages = file.url;
+      this.dialogVisible = true;
+    },
+    bannerHandlePicSuccess(res, file) {
+      // 轮播图上传成功      
+      if (res.msg == "success") {
+        this.swiperfileList.push({ name: file.name, url: res.url })
+        console.log(this.swiperfileList)
+        this.$message.success("上传成功");
+      } else {
+        this.$message.error("上传失败");
+      }
+    },
+    // 字符串图片地址
+    getStringImgUrl() {
+      let arr = this.swiperfileList.map(item => item.url)
+      if(arr.length <= 0){
+        return null
+      }else{
+      return arr.toString()
+      }
+    },
+    handlePicSuccess(res, file) {
+      // console.log(res,'res')
+      if (res.msg == "success") {
+        this.dataForm.productImages = res.url;  
+        this.fileList.push({ name: file.name, url: res.url })      
+       //  console.log(this.dataForm.productImages,'productImages')
+        this.$message.success("上传成功");
+      } else {
+        this.$message.error("上传失败");
+      }
+    },
+    bannerHandleRemove(file, fileList) {
+      // 轮播图删除操作      
+      this.swiperfileList = fileList
+    },
+    handleRemove(file, fileList) {
+      this.dataForm.productImages = '';
+      this.dataForm.noneBtnImg = fileList.length >= this.dataForm.limitCountImg;
+    },
+    handlereset() {
+      this.fileList = [],
+        this.visible = false
+        this.swiperfileList = []
+        this.$refs['dataForm'].resetFields()
+        this.$refs['dataForm'].reset()
+    },
+    // 失去焦点事件
+    onEditorBlur(quill) {
+      console.log('editor blur!', quill)
+    },
+    // 获得焦点事件
+    onEditorFocus(quill) {
+      console.log('editor focus!', quill)
+    },
+    // 准备富文本编辑器
+    onEditorReady(quill) {
+      console.log('editor ready!', quill)
+    },
+    // 内容改变事件
+    onEditorChange({ quill, html, text }) {
+      console.log('editor change!', quill, html, text)
+      this.content = html
+    }
+  },
+  components: {
+    quillEditor
+  },
+  watch: {
+    visible: {
+      handler(val, oldVal) {
+        this.getGoodsTypeList()
+      },
+      deep: true
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+
+.productsDialog{height: 800px; overflow-y: scroll;}
+.disUoloadSty {
+  .el-upload--picture-card {
+    display: none;
+    /* 上传按钮隐藏 */
+  }
+}
+
+.el-form-item {
+  /deep/ .el-form-item__label {
+    font-size: 12px;
+  }
+}
+
+.el-uploadfeng {
+  /deep/ .el-upload-list__item {
+    width: 60px;
+    height: 60px;
+  }
+
+  /deep/ .el-upload--picture-card {
+    width: 60px;
+    height: 60px;
+    line-height: 70px;
+
+  }
+}
+</style>

src/views/modules/user/user-add-or-update.vue

@@ -48,7 +48,7 @@
       </el-form-item>
       <el-form-item label="花生币" prop="peanutCoin">
         <!-- <el-input v-model="dataForm.peanutCoin" placeholder="花生币"></el-input> -->
-        <el-input-number v-model="dataForm.peanutCoin"  label="花生币"></el-input-number>
+        <el-input-number disabled v-model="dataForm.peanutCoin"  label="花生币"></el-input-number>
       </el-form-item>
       <!-- <el-form-item label="阅读时间" prop="readTime">
       <el-input v-model="dataForm.readTime" placeholder="阅读时间"></el-input>
@@ -104,9 +104,9 @@ export default {
         // name: [
         //   { required: true, message: '姓名不能为空', trigger: 'blur' }
         // ],
-        age: [
+        // age: [
-          { required: true, message: '年龄不能为空', trigger: 'blur' }
+        //   { required: true, message: '年龄不能为空', trigger: 'blur' }
-        ],
+        // ],
         // sex: [
         //   { required: true, message: '性别不能为空', trigger: 'blur' }
         // ],
@@ -183,7 +183,6 @@ export default {
                 attr.push(img)
                 this.fileList = attr
               }              
-
             }
           })
         }

src/views/modules/user/user-point-memery.vue

@@ -0,0 +1,236 @@
+<template>
+  <div class="mod-config">
+    <!-- <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item >
+        <el-input v-model="dataForm.key" placeholder="参数名" clearable>
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+      </el-form-item>
+    </el-form>    -->
+    <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"
+        header-align="center"
+        align="center"
+        label="操作时间">
+      </el-table-column>   
+      <el-table-column
+        prop="userName"
+        header-align="center"
+        align="center"
+        label="用户">
+      </el-table-column>
+      <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="变动金额">
+        <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>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+        prop="relationId"
+        header-align="center"
+        align="center"
+        label="关联id">
+      </el-table-column> -->
+      <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>
+      <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 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>
+    <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-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>
+
+<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> -->
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { memoryUsage } from 'process';
+
+export default {
+  data() {
+    return {
+      dataForm: {
+          key: ''
+        },
+        memoryDetail:false,
+        headers: [
+      {
+        prop: 'remark',
+        label: '充/扣主题',
+      },
+      {
+        prop: 'createTime',
+        label: '操作时间',
+      },
+      {
+        prop: 'changeAmount',
+        label: '充值类型',
+      },
+      {
+        prop: 'changeAmount',
+        label: '充值类型',
+      },
+    ],
+      query: {
+        id: 0,
+        tel:''
+      },
+      mdetail:{}, // 
+      dataListLoading: false,
+      dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+     
+     
+    }
+  },
+  created(){
+     // this.getDataList()
+  },
+  activated() {
+  this.query.id = this.$route.query.id;
+  this.query.tel = this.$route.query.tel;
+  // 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/list?'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': 1,
+            'limit': 200,
+            'key': this.query.tel
+          })
+        }).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()
+      },
+ 
+  }
+  
+}
+</script>
+<style lang="less" scoped>
+ /deep/ .el-form-item{margin-bottom: 1px solid #eee; margin-bottom: 10px;}
+</style>

src/views/modules/user/user.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
+      <el-form-item >
         <el-input v-model="dataForm.key" placeholder="参数名" clearable>
         </el-input>
       </el-form-item>
@@ -12,7 +12,7 @@
           :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>
     </el-form>
-    <el-table :data="dataList" border v-loading="dataListLoading" @selection- change="selectionChangeHandle"
+    <el-table :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle"
       style="width: 100%;">
       <el-table-column type="selection" header-align="center" align="center" width="50">
       </el-table-column>
@@ -52,6 +52,10 @@
         label="密码">
       </el-table-column> -->
       <el-table-column prop="vip" header-align="center" align="center" label="会员类型">
+        <template slot-scope="scope">
+          <span v-if="scope.row.vip == '1'">VIP</span>
+          <span v-if="scope.row.vip == '0'">普通会员</span>
+        </template>
       </el-table-column>
       <!-- <el-table-column
         prop="vipValidtime"
@@ -82,6 +86,9 @@
       <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="ck(scope.row)">充/扣疯币</el-button>
+          <router-link :to="{ path: 'user-point-memery', query: {'tel':scope.row.tel, 'id':scope.row.id} }">
+            <el-button type="text" size="small">充/扣疯币记录</el-button>
+          </router-link>
           <el-button type="text" size="small" @click="youhui(scope.row)">优惠券列表</el-button>
           <br>
           <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
@@ -89,19 +96,23 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination @size-change="sizeChangeHandle" @current- change="currentChangeHandle" :current-page="pageIndex"
+    <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>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <el-dialog title="充/扣疯币" :close-on-click-modal="false" :visible.sync="adc" append-to-body width="30%" :before-close="closeDia">
+      <el-form :model="pointForm" label-width="100px" :rules="pointFormRules" ref="pointForm">
 
-    <el-dialog title="充/扣疯币" :close-on-click-modal="false" :visible.sync="adc" append-to-body width="30%">
-      <el-form :model="pointForm" label-width="100px">
         <el-form-item label="用户">
           {{pointForm.tel}} <span v-if="pointForm.name!=''">({{pointForm.name}})</span> 
+          <span>账户余额：<em style="font-style: normal; font-size: 16px; color: #17B3A3;">{{pointForm.peanutCoin}}</em></span>         
         </el-form-item>
-        <el-form-item label="充值类型">
+        <!-- <el-form-item label="充/扣主题">
+         <el-input v-model="pointForm.title"></el-input>
+        </el-form-item> -->
+        <el-form-item label="充值类型" prop="pointType">
           <!-- <el-input v-model="pointForm.pointType" placeholder="0-普通 1-vip"></el-input>
              -->
           <el-select v-model="pointForm.pointType" placeholder="请选择">
@@ -109,14 +120,19 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="金额">
+        <el-form-item label="金额" prop="pointAmount">
-          <el-input-number v-model="pointForm.pointAmount" placeholder="">
+          <el-input-number v-model="pointForm.pointAmount" :placeholder="pointForm.peanutCoin+'可用'">
           </el-input-number>          
         </el-form-item>
+
+        <el-form-item label="充扣明细">
+          <el-input type="textarea" rows="5" v-model="pointForm.remark" placeholder="操作说明">
+          </el-input>
+        </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="adc=false">取消</el-button>
+        <el-button @click="closeDia">取消</el-button>
-        <el-button type="primary" @click="huaSheng">确定</el-button>
+        <el-button type="primary" @click="huaSheng(pointForm.peanutCoin)">确定</el-button>
       </span>
     </el-dialog>
 
@@ -159,6 +175,12 @@
         dataForm: {
           key: ''
         },
+        pointFormRules:{
+        pointAmount:[
+          { required: true, message: '请输入金额', trigger: 'blur' },           
+          ],
+          pointType:{ required: true, message: '请选择操作类型', trigger: 'blur' }
+        },
         options: [{
           value: 0,
           label: '充疯币'
@@ -169,6 +191,9 @@
         adc: false,
         pointForm: {
           pointType: 0,
+          remark:'',
+          // title:'',
+          pointAmount:0
         },
         dataList: [],
         pageIndex: 1,
@@ -200,7 +225,7 @@
           params: this.$http.adornParams({
             'page': 1,
             'limit': 200,
-            'key': ''
+            'key': this.dataForm.key
           })
         }).then(({
           data
@@ -254,6 +279,11 @@
           this.$refs.addOrUpdate.init(id)
         })
       },
+      closeDia(){
+        this.adc = false
+        this.$refs.pointForm.resetFields();
+        // this.pointForm.pointType == 0
+      },
       // 删除
       deleteHandle(id) {
         var ids = id ? [id] : this.dataListSelections.map(item => {
@@ -291,20 +321,26 @@
         this.pointForm=e
         this.adc = true
       },
-      huaSheng(){
+      huaSheng(point){
-        console.log(this.pointForm)
+       // console.log(this.pointForm.pointAmount, point)
+        if(this.pointForm.pointAmount > point && this.pointForm.pointType == 1){
+          return this.$message.error('扣除金额不能大于总金额')
+        }
+        this.$refs['pointForm'].validate((valid) => {
         this.$http({
-          url: this.$http.adornUrl(`/book/user/pointChange?pointType=${this.pointForm.pointType}&pointAmount=${this.pointForm.pointAmount}&id=${this.pointForm.id}`),
+          url: this.$http.adornUrl(`/book/user/pointChange?pointType=${this.pointForm.pointType}&note=${this.pointForm.remark}&pointAmount=${this.pointForm.pointAmount}&id=${this.pointForm.id}`),
           method: 'get',
           params: this.$http.adornParams()
         }).then(({
           data
         }) => {
           if (data && data.code === 0) {
+            this.$message.success('操作成功')
             this.getDataList()
             this.adc = false
           }
         })
+      })
       },
 
       // 个人优惠券