0720

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'

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()        
       })
     },
   }

src/views/modules/order/buyorder.vue

@@ -180,6 +180,7 @@
                     <div></div>
                     <div v-if="fitem.paymentMethod == 2"><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 == 4"><img  src="../../../../static/img/oder_chong.png"  width="22px" height="22px"> 疯币支付</div>
                   </div>
                 </div>
                 <div class="buier td3 xcenter">

src/views/modules/order/buyorderdetail.vue

@@ -21,17 +21,18 @@
           <el-button v-if="orderDetails.orderStatus == 1" @click="godeliver" class="text_button" size="mini" type="text">去发货</el-button>
         </li>
         <!-- <li><span class="infoTitle">商品总数：</span><span>{{orderDetails.}}</span></li> -->
-        <li><span class="infoTitle">订单总金额：</span><span>{{orderDetails.realMoney}}</span></li>
+        <li><span class="infoTitle">订单金额：</span><span>{{orderDetails.orderMoney}}</span></li>
         <li><span class="infoTitle">交付邮费：</span><span>￥{{orderDetails.shippingMoney}}</span></li>
-        <li><span class="infoTitle">优惠金额：</span><span>￥0.00</span></li>
+        <li><span class="infoTitle">优惠金额：</span><span></span></li>
-        <li><span class="infoTitle">会员商品优惠：</span><span>￥0.00</span></li>
+        <li><span class="infoTitle">会员商品优惠：</span><span></span></li>
-        <li><span class="infoTitle">积分抵扣：</span><span>￥0.00</span></li>
+        <li><span class="infoTitle">积分抵扣：</span><span></span></li>
-        <li><span class="infoTitle">实际支付金额：</span><span>￥112</span></li>
+        <li><span class="infoTitle">实际支付金额：</span><span>￥{{orderDetails.realMoney}}</span></li>
         <li><span class="infoTitle">创建时间：</span><span>{{orderDetails.createTime}}</span></li>
         <li><span class="infoTitle">支付时间：</span><span>{{orderDetails.paymentDate}}</span></li>
         <li style="width: 100%;"><span class="infoTitle">支付方式：</span>
           <span v-if="orderDetails.paymentMethod == 1"><icon-svg name="zhifubao"></icon-svg> <span>支付宝支付</span></span>
           <span v-if="orderDetails.paymentMethod == 2"><icon-svg name="weixin"></icon-svg> <span>微信支付</span></span>
+          <span v-if="orderDetails.paymentMethod == 4"><img  src="../../../../static/img/oder_chong.png"  width="22px" height="22px"> <span>疯币支付</span></span>
           <span v-if="orderDetails.paymentMethod == 3">
             <!-- <icon-svg name="zhifubao"></icon-svg>  -->
             <span>IOS内购</span>

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 ){
+                        if (data && data.code === 0) {
-                            console.log(data)
+                            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,
+                            lock: true,
-                text: '执行操作，请稍后',
+                            text: '执行操作，请稍后',
-                spinner: 'el-icon-loading',
+                            spinner: 'el-icon-loading',
-                background: 'rgba(0, 0, 0, 0.7)'
+                            background: 'rgba(0, 0, 0, 0.7)'
-            });
+                        });
                     this.$http({
                         url: this.$http.adornUrl(`/book/buyorder/blendSendFMS/${this.ruleForm.deliverLcd}`),
                         method: 'post',

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':'<span style="color:red;">字数超出最大允许值，服务器可能拒绝保存！</span>',
     'ok':"确认",
     'cancel':"取消",