zm/nuttyreading-master-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

打卡新写 配置文件更新

Browse Source
This commit is contained in:
@fawn-nine
2023-10-10 17:03:28 +08:00
parent 4288b2a892
commit 783f4ea806
8 changed files with 160 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/views/modules/book/clock-add-or-update.vue
View File

@@ -63,6 +63,8 @@
</el-form-item> </el-form-item>
<el-form-item label="打卡描述" prop="productDetails"> <el-form-item label="打卡描述" prop="productDetails">
<el-upload class="avatar-uploader" :action="baseUrl + '/oss/fileoss'" accept=".jpeg,.jpg,.gif,.png" :show-file-list="false" :on-success="contentUploadSuccess" >
</el-upload>
<quill-editor v-model="dataForm.productDetails" ref="myQuillEditor" :options="editorOption" <quill-editor v-model="dataForm.productDetails" ref="myQuillEditor" :options="editorOption"
@blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @blur="onEditorBlur($event)" @focus="onEditorFocus($event)"
@ready="onEditorReady($event)" class="shangpin_editor"> @ready="onEditorReady($event)" class="shangpin_editor">
@@ -88,6 +90,22 @@
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'
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'], // 上传图片、上传视频
]
export default { export default {
data() { data() {
@@ -140,50 +158,19 @@
// 富文本编辑器配置 // 富文本编辑器配置
editorOption: { editorOption: {
modules: { modules: {
toolbar: [ toolbar: {
['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线 container: toolbarOptions,
['blockquote', 'code-block'], // 引用 代码块 handlers: {
[{ image: function (value) {
header: 1 if (value) {
}, { // 调用element的图片上传组件
header: 2 document.querySelector('.avatar-uploader input').click()
}], // 1、2 级标题 } else {
[{ this.quill.format('image', false)
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: '请输入正文' placeholder: '请输入正文'
}, },
@@ -193,6 +180,23 @@
}, },
methods: { methods: {
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('图片插入失败！')
}
},
init(id,bookid) { init(id,bookid) {
this.productPid = bookid this.productPid = bookid
this.dataForm.shupingid = id || null this.dataForm.shupingid = id || null
@@ -201,32 +205,34 @@
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (this.dataForm.productId) { if (id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/book/task/info/${id}`), url: this.$http.adornUrl('/book/clock/getBookClockDetail'),
method: 'get', method: 'get',
params: this.$http.adornParams() params: this.$http.adornParams({
'entryId': id
}),
}).then(({ }).then(({
data data
}) => { }) => {
console.log(data,666) console.log(data,666)
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm.title = data.bookTaskEntity.heading this.dataForm.title = data.entry.title
this.dataForm.video = data.bookTaskEntity.video this.dataForm.video = data.entry.video
this.dataForm.days = data.bookTaskEntity.days this.dataForm.days = data.entry.day
this.dataForm.productImages = data.bookTaskEntity.images this.dataForm.productImages = data.entry.image
this.dataForm.productDetails = data.bookTaskEntity.content this.dataForm.productDetails = data.entry.content
// console.log(this.dataForm.video, 'this.dataForm.video') // console.log(this.dataForm.video, 'this.dataForm.video')
if (this.dataForm.video != '') { if (this.dataForm.video != '') {
this.videoList.push({ this.videoList.push({
name: data.bookTaskEntity.heading, name: data.entry.title,
url: data.bookTaskEntity.video url: data.entry.video
}) })
} }
if (data.bookTaskEntity.images != "") { if (data.entry.image != "") {
var img = { var img = {
name: '', name: '',
url: data.bookTaskEntity.images url: data.entry.image
} }
var attr = [] var attr = []
attr.push(img) attr.push(img)
@@ -264,14 +270,15 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/book/task/${!this.dataForm.shupingid ? 'save' : 'update'}`),
url: this.$http.adornUrl(`/book/clock/${!this.dataForm.shupingid ? 'addBookClock' : 'updateBookClock'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'bookid': this.productPid, 'bookId': this.productPid,
'heading': this.dataForm.title, 'title': this.dataForm.title,
'images': this.dataForm.productImages, 'image': this.dataForm.productImages,
'content': this.dataForm.productDetails, 'content': this.dataForm.productDetails,
'days': this.dataForm.days, 'day': this.dataForm.days,
'video': this.dataForm.video, 'video': this.dataForm.video,
// 'video': "https://ehh-private-01.oss-cn-beijing.aliyuncs.com…3/08/28/91fd5a4c35c34763abca5d2929637164movie.mp4", // 'video': "https://ehh-private-01.oss-cn-beijing.aliyuncs.com…3/08/28/91fd5a4c35c34763abca5d2929637164movie.mp4",
'id': this.dataForm.shupingid || undefined, 'id': this.dataForm.shupingid || undefined,

37
src/views/modules/book/clock.vue
View File

@@ -4,7 +4,7 @@
<el-form-item> <el-form-item>
<!-- <el-button @click="getDataList()">查询</el-button> --> <!-- <el-button @click="getDataList()">查询</el-button> -->
<el-button v-if="isAuth('book:bookchapter:save')" type="primary" @click="addOrUpdateHandle()">增加打卡任务</el-button> <el-button v-if="isAuth('book:bookchapter:save')" type="primary" @click="addOrUpdateHandle()">增加打卡任务</el-button>
<el-button v-if="isAuth('book:bookchapter:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button> <!-- <el-button v-if="isAuth('book:bookchapter:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button> -->
<!-- <router-link :to="{path: 'book-book' , query:{ upPageIndex } }"> <!-- <router-link :to="{path: 'book-book' , query:{ upPageIndex } }">
<el-button type="primary">返回上一级</el-button> <el-button type="primary">返回上一级</el-button>
</router-link> --> </router-link> -->
@@ -35,12 +35,12 @@
</el-table-column> </el-table-column>
--> -->
<el-table-column <el-table-column
prop="days" prop="day"
align="center" align="center"
label="第N天"> label="第N天">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="heading" prop="title"
label="主题"> label="主题">
</el-table-column> </el-table-column>
@@ -52,12 +52,12 @@
label="内容"> label="内容">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="images" prop="image"
header-align="center" header-align="center"
align="center" align="center"
label="卡片"> label="卡片">
<template slot-scope="scope"> <template slot-scope="scope">
<img v-if="scope.row.images != ''" :src="scope.row.images" width="100px" /> <img v-if="scope.row.image != ''" :src="scope.row.image" width="100px" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -148,13 +148,13 @@
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
// url: this.$http.adornUrl('/forum/articles/list'), // url: this.$http.adornUrl('/forum/articles/list'),
url: this.$http.adornUrl('/book/task/list'), url: this.$http.adornUrl('/book/clock/getBookClocks'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
'page': this.pageIndex, 'page': this.pageIndex,
'limit': this.pageSize, 'limit': this.pageSize,
//'key': this.dataForm.key, //'key': this.dataForm.key,
'bookid' : this.bookid 'bookId' : this.bookid
}) })
// data: { // data: {
// 'page': this.pageIndex, // 'page': this.pageIndex,
@@ -164,8 +164,8 @@
// } // }
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.page.records
this.totalPage = data.page.totalCount this.totalPage = data.page.pages
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
@@ -197,18 +197,23 @@
}, },
// 删除 // 删除
deleteHandle (id) { deleteHandle (id) {
var ids = id ? [id] : this.dataListSelections.map(item => { // var ids = id ? [id] : this.dataListSelections.map(item => {
return item.id // return item.id
}) // })
this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', { this.$confirm(`确定对[id=${id}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/book/task/delete'), url: this.$http.adornUrl('/book/clock/delBookClock'),
method: 'post', method: 'get',
data: this.$http.adornData(ids, false) params: this.$http.adornParams({
'entryId': id
}),
// data: this.$http.adornData({
// 'entryId': id
// })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({

4
src/views/modules/order/buyorder.vue
View File

@@ -178,8 +178,8 @@
<div></div> <div></div>
<!-- <div>含快递费：10.00，优惠券：{{ fitem.couponName }}，积分抵扣：-10.00</div> --> <!-- <div>含快递费：10.00，优惠券：{{ fitem.couponName }}，积分抵扣：-10.00</div> -->
<div></div> <div></div>
<div v-if="fitem.paymentMethod == 2"><icon-svg name="weixin"></icon-svg> 微信支付</div> <div v-if="fitem.paymentMethod == 1"><icon-svg name="weixin"></icon-svg> 微信支付</div>
<div v-if="fitem.paymentMethod == 1"><icon-svg name="zhifubao"></icon-svg> 支付宝支付</div> <div v-if="fitem.paymentMethod == 2"><icon-svg name="zhifubao"></icon-svg> 支付宝支付</div>
<div v-if="fitem.paymentMethod == 4"><img src="../../../../static/img/oder_chong.png" width="22px" height="22px"> 疯币支付</div> <div v-if="fitem.paymentMethod == 4"><img src="../../../../static/img/oder_chong.png" width="22px" height="22px"> 疯币支付</div>
</div> </div>
</div> </div>

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

@@ -136,6 +136,8 @@
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="商品详情" prop="productDetails"> <el-form-item label="商品详情" prop="productDetails">
<el-upload class="avatar-uploader" :action="baseUrl + '/oss/fileoss'" accept=".jpeg,.jpg,.gif,.png" :show-file-list="false" :on-success="contentUploadSuccess" >
</el-upload>
<quill-editor v-model="dataForm.productDetails" ref="myQuillEditor" :options="editorOption" <quill-editor v-model="dataForm.productDetails" ref="myQuillEditor" :options="editorOption"
@blur="onEditorBlur($event)" @focus="onEditorFocus($event)" @blur="onEditorBlur($event)" @focus="onEditorFocus($event)"
@ready="onEditorReady($event)" class="shangpin_editor"> @ready="onEditorReady($event)" class="shangpin_editor">
@@ -161,6 +163,22 @@
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'
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'], // 上传图片、上传视频
]
export default { export default {
data() { data() {
@@ -267,50 +285,24 @@
// 富文本编辑器配置 // 富文本编辑器配置
editorOption: { editorOption: {
modules: { modules: {
toolbar: [ history: {
['bold', 'italic', 'underline', 'strike'], // 加粗 斜体 下划线 删除线 delay: 1000,
['blockquote', 'code-block'], // 引用 代码块 maxStack: 50,
[{ userOnly: false
header: 1 },
}, { toolbar: {
header: 2 container: toolbarOptions,
}], // 1、2 级标题 handlers: {
[{ image: function (value) {
list: 'ordered' if (value) {
}, { // 调用element的图片上传组件
list: 'bullet' document.querySelector('.avatar-uploader input').click()
}], // 有序、无序列表 } else {
[{ this.quill.format('image', false)
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: '请输入正文', placeholder: '请输入正文',
@@ -323,6 +315,23 @@
this.getTags() this.getTags()
}, },
methods: { methods: {
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('图片插入失败！')
}
},
handleCheckedCitiesChange(value) { handleCheckedCitiesChange(value) {
console.log(value, 'value') console.log(value, 'value')
}, },

6
src/views/modules/user/user-point-memery.vue
View File

@@ -82,7 +82,7 @@
:page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage" :page-sizes="[10, 20, 50, 100]" :page-size="pageSize" :total="totalPage"
layout="total, sizes, prev, pager, next, jumper"> layout="total, sizes, prev, pager, next, jumper">
</el-pagination> </el-pagination>
<el-dialog title="充/扣疯币明细" :close-on-click-modal="false" :visible.sync="memoryDetail" append-to-body width="30%"> <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 :model="mdetail" label-width="100px" ref="pointForm">
<el-form-item label="充/扣主题："> <el-form-item label="充/扣主题：">
@@ -94,8 +94,8 @@
<span>{{mdetail.createTime}}</span> <span>{{mdetail.createTime}}</span>
</el-form-item> </el-form-item>
<el-form-item label="充值类型："> <el-form-item label="充值类型：">
<el-tag type="danger" v-if="mdetail.changeAmount > 0">充值疯币</el-tag> <el-tag type="danger" v-if="mdetail.changeAmount > 0">充值天医币</el-tag>
<el-tag type="success" v-else>扣除疯币</el-tag> <el-tag type="success" v-else>扣除天医币</el-tag>
</el-form-item> </el-form-item>
<el-form-item label="金额：" > <el-form-item label="金额：" >
<!-- <el-input-number v-model="mdetail.pointAmount" :placeholder="mdetail.peanutCoin+'可用'"> <!-- <el-input-number v-model="mdetail.pointAmount" :placeholder="mdetail.peanutCoin+'可用'">

14
src/views/modules/user/user.vue
View File

@@ -63,7 +63,7 @@
align="center" align="center"
label="vip 有效期"> label="vip 有效期">
</el-table-column> --> </el-table-column> -->
<el-table-column prop="peanutCoin" header-align="center" align="center" label="疯币"> <el-table-column prop="peanutCoin" header-align="center" align="center" label="天医币">
</el-table-column> </el-table-column>
<!-- <el-table-column <!-- <el-table-column
prop="readTime" prop="readTime"
@@ -85,9 +85,9 @@
</el-table-column> --> </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"> <template slot-scope="scope">
<el-button type="text" size="small" @click="ck(scope.row)">充/扣疯币</el-button> <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} }"> <router-link :to="{ path: 'user-point-memery', query: {'tel':scope.row.tel, 'id':scope.row.id} }">
<el-button type="text" size="small">充/扣疯币记录</el-button> <el-button type="text" size="small">充/扣天医币记录</el-button>
</router-link> </router-link>
<el-button type="text" size="small" @click="youhui(scope.row)">优惠券列表</el-button> <el-button type="text" size="small" @click="youhui(scope.row)">优惠券列表</el-button>
<br> <br>
@@ -102,7 +102,7 @@
</el-pagination> </el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <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-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-form :model="pointForm" label-width="100px" :rules="pointFormRules" ref="pointForm">
<el-form-item label="用户"> <el-form-item label="用户">
@@ -183,10 +183,10 @@
}, },
options: [{ options: [{
value: 0, value: 0,
label: '充疯币' label: '充天医币'
}, { }, {
value: 1, value: 1,
label: '扣疯币' label: '扣天医币'
}], }],
adc: false, adc: false,
pointForm: { pointForm: {
@@ -316,7 +316,7 @@
}) })
}) })
}, },
// 充值扣款疯币 // 充值扣款天医币
ck(e) { ck(e) {
this.pointForm=e this.pointForm=e
this.adc = true this.adc = true

3
static/config/index-prod.js
View File

@@ -5,7 +5,8 @@
window.SITE_CONFIG = {}; window.SITE_CONFIG = {};
// api接口请求地址 // api接口请求地址
window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9100/pb'; // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9100/pb';
window.SITE_CONFIG['baseUrl'] = 'https://api.nuttyreading.com';
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名

3
static/config/index.js
View File

@@ -7,7 +7,8 @@
// api接口请求地址 // api接口请求地址
// window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb'; // window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.100:9200/pb';
// window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb'; // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb';
window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.110:9200/pb'; window.SITE_CONFIG['baseUrl'] = 'https://testapi.nuttyreading.com'; // 线上测试环境
// window.SITE_CONFIG['baseUrl'] = 'http://192.168.110.38:9200/pb';
// window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb'; // window.SITE_CONFIG['baseUrl'] = 'http://59.110.212.44:9200/pb';
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号