页面修改

src/components/offlineService/osOrderDetails.vue

@@ -93,6 +93,12 @@
                   </span>
                 </div>
               </div>
+              <div flex="dir:left cross:center" class="item-box" v-if="dataInfo.EducationMoney>0">
+                <span class="label">套餐卡抵扣金额:</span>
+                <div class="express-address" style="width:60%">
+                  ￥{{dataInfo.EducationMoney}}
+                </div>
+              </div>
               <div flex="dir:left cross:center" class="item-box">
                 <span class="label">用户:</span>
                 <div>{{dataInfo.OrderInfo.UserName}}</div>
@@ -279,8 +285,19 @@
           </el-table-column>
           <el-table-column prop="ServiceDate" label="服务信息" width="250" align="center">
             <template slot-scope="scope">
-              服务时间: {{scope.row.ServiceDate}} {{scope.row.ServiceTime}}<br/>
-              服务人员: {{scope.row.ServicepersonalName}}
+              服务时间: {{scope.row.ServiceDate}} {{scope.row.ServiceTime}}<br />
+              服务人员:
+              <template v-if="scope.row.ServicepersonalName&&scope.row.ServicepersonalName!=''">
+                {{scope.row.ServicepersonalName}}
+              </template>
+              <template v-else>
+                到店分配
+              </template>
+              <div style="margin-top:5px;" v-if="scope.row.MemberEducationCouponList.length>0">
+                套餐卡信息：<span v-for="(childItem,childIndex) in scope.row.MemberEducationCouponList" :key="childIndex">
+                  {{childItem.Name}}
+                </span>
+              </div>
             </template>
           </el-table-column>
           <el-table-column prop="Unit_Price" label="单价" width="120" align="center">
@@ -595,7 +612,6 @@
                   this.getData();
                   this.fhDig = false;
                   this.Success(res.data.message)
-
                 } else {
                   this.Error(res.data.message);
                 }
@@ -655,7 +671,6 @@
           OrderId: this.OrderId
         }, res => {
           this.dataInfo = res.data.data;
-          console.log("this.dataInfo", this.dataInfo);
           let data = res.data.data;
           // 未付款
           if (data.PaymentTime == '' && data.DeliveryTime == '') {