diff --git a/src/views/modules/book/book.vue b/src/views/modules/book/book.vue index 75a71e5..6a40a7e 100644 --- a/src/views/modules/book/book.vue +++ b/src/views/modules/book/book.vue @@ -313,12 +313,14 @@ export default { voicesHandle(id){ //allVoices this.$http({ - url: this.$http.adornUrl('/book/bookchaptercontent/allVoices'), + // url: this.$http.adornUrl('/book/bookchaptercontent/allVoices'), + url: this.$http.adornUrl('/book/bookchaptercontent/AllVOices'), method: 'get', params: this.$http.adornParams({ 'id':id }) - }).then(res => { + }).then(res => { + console.log('book/bookchaptercontent/AllVOices') this.$message({ message: '成功', type: 'success' diff --git a/src/views/modules/book/bookchaptercontent-add-or-update.vue b/src/views/modules/book/bookchaptercontent-add-or-update.vue index afece12..052e6cf 100644 --- a/src/views/modules/book/bookchaptercontent-add-or-update.vue +++ b/src/views/modules/book/bookchaptercontent-add-or-update.vue @@ -264,7 +264,7 @@ export default { getContent() { this.dialogVisible = true this.ue.ready(() => { - this.dataForm.otherContent = this.ue.getContent() + this.dataForm.otherContent = this.ue.getContent() }) }, } diff --git a/src/views/modules/order/buyorder.vue b/src/views/modules/order/buyorder.vue index 6246e5e..16e1fda 100644 --- a/src/views/modules/order/buyorder.vue +++ b/src/views/modules/order/buyorder.vue @@ -180,6 +180,7 @@
微信支付
支付宝支付
+
疯币支付
diff --git a/src/views/modules/order/buyorderdetail.vue b/src/views/modules/order/buyorderdetail.vue index a7808ff..c0f80f2 100644 --- a/src/views/modules/order/buyorderdetail.vue +++ b/src/views/modules/order/buyorderdetail.vue @@ -21,17 +21,18 @@ 去发货 -
  • 订单总金额:{{orderDetails.realMoney}}
  • +
  • 订单金额:{{orderDetails.orderMoney}}
  • 交付邮费:¥{{orderDetails.shippingMoney}}
  • -
  • 优惠金额:¥0.00
  • -
  • 会员商品优惠:¥0.00
  • -
  • 积分抵扣:¥0.00
  • -
  • 实际支付金额:¥112
  • +
  • 优惠金额:
  • +
  • 会员商品优惠:
  • +
  • 积分抵扣:
  • +
  • 实际支付金额:¥{{orderDetails.realMoney}}
  • 创建时间:{{orderDetails.createTime}}
  • 支付时间:{{orderDetails.paymentDate}}
  • 支付方式: 支付宝支付 微信支付 + 疯币支付 IOS内购 diff --git a/src/views/modules/order/orderdeliver-split.vue b/src/views/modules/order/orderdeliver-split.vue index 6b2e479..cc5ca09 100644 --- a/src/views/modules/order/orderdeliver-split.vue +++ b/src/views/modules/order/orderdeliver-split.vue @@ -211,7 +211,13 @@ export default { // // getProductsCodeList // 普通发货 - submit1(){ + submit1() { + const loading = this.$loading({ + lock: true, + text: '请稍后', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.$refs['ruleForm'].validate((valid) => { if (valid) { this.$http({ @@ -223,8 +229,9 @@ export default { data: this.productsIdsList // 是个数组 // 传orderid }).then(({ data }) => { - if(data && data.code === 0 ){ - console.log(data) + if (data && data.code === 0) { + loading.close(); + // console.log(data) this.beforeCloseDialog() return this.$message.success('发货成功') } @@ -252,7 +259,7 @@ export default { }) }, //混合发货 - submit() { + submit() { this.$refs['ruleForm'].validate((valid) => { if (valid) { // console.log(this.allOrder) @@ -266,11 +273,11 @@ export default { type: 'warning' }).then(() => { let loading = this.$loading({ - lock: true, - text: '执行操作,请稍后', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); + lock: true, + text: '执行操作,请稍后', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }); this.$http({ url: this.$http.adornUrl(`/book/buyorder/blendSendFMS/${this.ruleForm.deliverLcd}`), method: 'post', diff --git a/static/plugins/ueditor-1.4.3.3/lang/zh-cn/zh-cn.js b/static/plugins/ueditor-1.4.3.3/lang/zh-cn/zh-cn.js index 4d5178f..6b825ab 100644 --- a/static/plugins/ueditor-1.4.3.3/lang/zh-cn/zh-cn.js +++ b/static/plugins/ueditor-1.4.3.3/lang/zh-cn/zh-cn.js @@ -85,7 +85,8 @@ UE.I18N['zh-cn'] = { }, 'elementPathTip':"元素路径", 'wordCountTip':"字数统计", - 'wordCountMsg':'当前已输入{#count}个字符, 您还可以输入{#leave}个字符。 ', + // 'wordCountMsg': '当前已输入{#count}个字符, 您还可以输入{#leave}个字符。 ', + 'wordCountMsg': ' ', 'wordOverFlowMsg':'字数超出最大允许值,服务器可能拒绝保存!', 'ok':"确认", 'cancel':"取消",