Merge remote-tracking branch 'origin/master'

src/views/components/his/integralOrderDetails.vue

@@ -19,7 +19,8 @@
                 <el-tag prop="status" v-for="(ite, index) in statusOptions"    v-if="item.status==ite.dictValue">{{ite.dictLabel}}</el-tag>
              </span>
              <div class="operate-button-container"  v-if="item.status==1" v-hasPermi="['his:integralOrder:sendGoods']">
-                <el-button size="mini" @click="sendVisible=true" >发货</el-button>
+                <!-- <el-button size="mini" @click="sendVisible=true" >发货</el-button> -->
+                <el-button size="mini" @click="showSend()" >发货</el-button>
              </div>
             <div class="operate-button-container"   v-if="item.deliverySn!=null" v-hasPermi="['his:integralOrder:express']">
               <el-button size="mini" @click="showExpress()" >查看物流</el-button>
@@ -90,16 +91,25 @@
            title="发货"
            :visible.sync="sendVisible"
            append-to-body @close="sendCancel">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-form-item label="快递名称" prop="deliveryName">
+            <el-select v-model="selectedExpress" placeholder="请选择快递名称" value-key="name">
+              <el-option
+                v-for="item in expressOption"
+                :key="item.name"
+                :label="item.name"
+                :value="item">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="快递公司编号" prop="deliveryCode">
-                    <el-input v-model="form.deliveryCode" placeholder="请输入快递公司编号" />
-                  </el-form-item>
-                  <el-form-item label="快递名称" prop="deliveryName">
-                    <el-input v-model="form.deliveryName" placeholder="请输入快递名称" />
-                  </el-form-item>
-                  <el-form-item label="快递单号" prop="deliverySn">
-                    <el-input v-model="form.deliverySn" placeholder="请输入快递单号" />
-                  </el-form-item>
+            <el-input v-model="form.deliveryCode" placeholder="请输入快递公司编号" disabled />
+            
+          </el-form-item>
+          
+          <el-form-item label="快递单号" prop="deliverySn">
+            <el-input v-model="form.deliverySn" placeholder="请输入快递单号" />
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
                           <el-button type="primary" @click="sendGoods">确 定</el-button>
@@ -158,10 +168,13 @@
 
 <script>
 import {getExpress, listIntegralOrder, sendgoods,getIntegralOrder, delIntegralOrder, addIntegralOrder, updateIntegralOrder, exportIntegralOrder,getOrderUserPhone } from "@/api/his/integralOrder";
+import {getExpressList } from "@/api/his/express";
   export default {
     name: "integralOrder",
     data() {
       return {
+        selectedExpress:null,
+        expressOption:[],
         expressDialog:{
           title:"物流信息",
           open:false,
@@ -205,6 +218,17 @@ import {getExpress, listIntegralOrder, sendgoods,getIntegralOrder, delIntegralOr
         this.statusOptions = response.data;
       });
     },
+    watch: {
+      selectedExpress(newVal) {
+        if (newVal) {
+          this.form.deliveryName = newVal.name;
+          this.form.deliveryCode = newVal.code;
+        } else {
+          this.form.deliveryName = '';
+          this.form.deliveryCode = '';
+        }
+      }
+    },
     methods: {
       handlePhone(){
         const orderId = this.item.orderId;
@@ -242,6 +266,14 @@ import {getExpress, listIntegralOrder, sendgoods,getIntegralOrder, delIntegralOr
              orderId:null,
            }
       },
+      showSend(){
+        //获取快递公司信息
+        getExpressList().then(response=>{
+          this.expressOption = response.data;
+        })
+        console.log(this.expressOption)
+        this.sendVisible = true
+      },
       showExpress(){
         this.expressDialog.open=true;
         getExpress(this.item.orderId).then(response => {
@@ -251,29 +283,29 @@ import {getExpress, listIntegralOrder, sendgoods,getIntegralOrder, delIntegralOr
             }
         });
       },
-          sendGoods(){
-              this.form.orderId=this.item.orderId;
-              sendgoods(this.form).then(response => {
-                    this.msgSuccess("修改成功");
-                    this.sendVisible = false;
-                    getIntegralOrder(this.item.orderId).then(response => {
-                        this.item = response.data;
-                        this.$parent.$parent.getList();
-                    });
-
-                    this.form={
-                    deliveryCode: null,
-                    deliveryName:null,
-                    deliverySn:null,
-                    orderId:null,
-                  }
+    sendGoods(){
+        this.form.orderId=this.item.orderId;
+        sendgoods(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.sendVisible = false;
+              getIntegralOrder(this.item.orderId).then(response => {
+                  this.item = response.data;
+                  this.$parent.$parent.getList();
               });
-            },
+
+              this.form={
+              deliveryCode: null,
+              deliveryName:null,
+              deliverySn:null,
+              orderId:null,
+            }
+        });
+      },
       getDetails(orderId) {
         this.item=null;
         getIntegralOrder(orderId).then(response => {
             this.item = response.data;
-            this.prod=[JSON.parse(this.item.itemJson)];
+            this.prod=[JSON.parse(this.item.itemJson)][0];
         });
       },
     }

src/views/course/courseWatchLog/qw/statistics.vue

@@ -60,8 +60,11 @@
       <el-table-column label="看课中" align="center" prop="type1" />
       <el-table-column label="已完课" align="center" prop="type2" />
       <el-table-column label="看课中断" align="center" prop="type4" />
-
-
+      <el-table-column label="注册用户待看课数" align="center" prop="isUserWaitNumber" />
+      <el-table-column label="未注册用户待看课数" align="center" prop="noUserWaitNumber" />
+      <el-table-column label="上线率" align="center" prop="onLineRate" />
+      <el-table-column label="完课率" align="center" prop="finishedRate" />
+      <el-table-column label="消耗红包金额" align="center" prop="redAmount" />
     </el-table>
 
     <pagination

src/views/his/company/index.vue

@@ -501,7 +501,7 @@
           <el-radio v-model="revenueForm.delayAcctFlag" label="N">实时分账</el-radio>
           <el-radio v-model="revenueForm.delayAcctFlag" label="Y">延时分账</el-radio>
         </el-form-item>
-        <el-form-item label="是否使用百分比分账">
+        <el-form-item label="是否使用百分比分账" v-if="revenueForm.divFlag == 1">
           <el-switch
             v-model="revenueForm.percentageFlag"
             active-color="#13ce66"

src/views/his/statistics/appOrderCountStats.vue

@@ -59,20 +59,12 @@
 
       <div class="data-box">
         <div class="table-box">
-          <el-table
-            :data="tableData"
-            border
-            max-height="500"
-            style="width: 100%"
-          >
-            <el-table-column prop="totalOrderCount" label="订单总数" />
-            <el-table-column prop="fullPayOrderCount" label="全款支付订单数" />
-            <el-table-column prop="codOrderCount" label="物流代收支付订单数" />
-            <el-table-column prop="depositCodOrderCount" label="付定金的物流代收订单数" />
-            <el-table-column prop="noDepositCodOrderCount" label="0定金的物流代收订单数" />
-            <el-table-column prop="totalOrderAmount" label="订单总金额" />
-            <el-table-column prop="depositAmount" label="定金总金额" />
-            <el-table-column prop="codAmount" label="物流代收总金额" />
+          <el-table :data="tableData" border max-height="500" style="width: 100%">
+            <el-table-column prop="category" label="订单类型" width="180" />
+            <el-table-column prop="orderCount" label="订单数" />
+            <el-table-column prop="orderAmount" label="订单总金额（元）" />
+            <el-table-column prop="depositAmount" label="定金金额（元）" />
+            <el-table-column prop="codAmount" label="物流代收金额（元）" />
           </el-table>
         </div>
       </div>
@@ -146,7 +138,8 @@ export default {
 
       getAppOrderCount(params).then(response => {
         const vo = response.data;
-        this.tableData = vo ? [vo] : [];
+        // this.tableData = vo ? [vo] : [];
+        this.tableData = response.data || []; // 直接赋值数组
       }).catch(() => {
         this.tableData = [];
       });

src/views/his/statistics/hisOrderCountStats.vue

@@ -59,20 +59,12 @@
 
       <div class="data-box">
         <div class="table-box">
-          <el-table
-            :data="tableData"
-            border
-            max-height="500"
-            style="width: 100%"
-          >
-            <el-table-column prop="totalOrderCount" label="订单总数" />
-            <el-table-column prop="fullPayOrderCount" label="全款支付订单数" />
-            <el-table-column prop="codOrderCount" label="物流代收支付订单数" />
-            <el-table-column prop="depositCodOrderCount" label="付定金的物流代收订单数" />
-            <el-table-column prop="noDepositCodOrderCount" label="0定金的物流代收订单数" />
-            <el-table-column prop="totalOrderAmount" label="订单总金额" />
-            <el-table-column prop="depositAmount" label="定金总金额" />
-            <el-table-column prop="codAmount" label="物流代收总金额" />
+          <el-table :data="tableData" border max-height="500" style="width: 100%">
+            <el-table-column prop="category" label="订单类型" width="180" />
+            <el-table-column prop="orderCount" label="订单数" />
+            <el-table-column prop="orderAmount" label="订单总金额（元）" />
+            <el-table-column prop="depositAmount" label="定金金额（元）" />
+            <el-table-column prop="codAmount" label="物流代收金额（元）" />
           </el-table>
         </div>
       </div>
@@ -141,8 +133,7 @@ export default {
       };
 
       getHisOrderCountStats(params).then(response => {
-        const vo = response.data;
-        this.tableData = vo ? [vo] : [];
+        this.tableData = response.data || []; // 直接赋值数组
       });
     }
   }