1

src/components/newPersonalCenter/integral/RedEnvelopes.vue

@@ -44,13 +44,14 @@
                           <td>{{item.peopleNum}}</td>
                           <td class="cee">￥{{item.money}}</td>
                       </tr>
-                      
+                      <tr v-if="dataList.length<1">
+                          <td colspan="4">
+                            <div class="empty-data"><i class="iconfont icon-kong"></i>
+                                很抱歉，你想要的信息我们真的找不到了
+                            </div>
+                          </td>
+                      </tr>
                   </table>
-                  <div v-if="dataList.length==0" style="padding:15px 0;text-align:center">
-                    <div class="empty-data"><i class="iconfont icon-kong"></i>
-                        很抱歉，你想要的信息我们真的找不到了
-                    </div>
-                </div>
               </el-col>
               <el-col :span="8">
                   <p class="f14 c99">数据占比</p>
@@ -578,9 +579,15 @@ export default {
     justify-content: space-between;
     border-bottom:1px solid rgba(234,234,234,1);
 }
+.rentou-box th{
+    font-size: 14px !important;
+    font-family: 'pingfangR';
+    font-weight: 400;
+}
 .rentou-box th,.rentou-box td {
     padding: 8px  20px;
     text-align: left !important;
+    font-size: 12px
 }
 .rentou-box td{
     font-size: 14px;

src/components/trade/order/indexTwo.vue

@@ -288,10 +288,10 @@
                         <el-input size="small" v-model="ActivateCode" placeholder="请输入兑换码" style="width:200px"></el-input>
                         <el-button @click="GetCode" size="small" style="margin-left:10px">兑换</el-button>
                     </div>
-                    <p>幸福存折</p>
+                    <p class="margin-top: 10px;">幸福存折</p>
                     <div>
                         <el-input size="small" v-model="RedEnvelopeMoney" @change="RedEnvelopeMoneyChange" placeholder="请输入金额" style="width:200px;margin-right: 10px;"></el-input>
-                        <span>当前幸福存折余额：<span>{{RedEnvelopeMoneyALL}}</span></span>
+                        <span>当前幸福存折余额：<span style="color: #EE4454">{{RedEnvelopeMoneyALL}}</span></span>
                     </div>
                 </el-col>
                 <el-col class="_trip_xiangqing _coupon_box">
@@ -823,6 +823,7 @@ export default {
               fcnt=parseFloat(sumFang)/2.0+this.chosenObj.dcf+this.chosenObj.df+this.chosenObj.srf
           }
           fcnt+=this.chosenObj.dcf+this.chosenObj.df+this.chosenObj.srf
+          console.log("this.RedEnvelopeMoney", this.RedEnvelopeMoney)
           let msg={
               OrderId:0,
               TCID:this.trip.currentPriceInfo.tcid,
@@ -842,7 +843,7 @@ export default {
               OldPeopleNum:this.chosenObj.lrCount,
               SingleRoomNum:this.chosenObj.df,
               PreferPrice:this.price,
-              DiscountMoney:this.price - this.SettlementPrice - this.RedEnvelopeMoney,
+              DiscountMoney: this.RedEnvelopeMoney,
               CouponAllotIds: this.CouponIds!== '' ? this.CouponIds.slice(0,this.CouponIds.length-1) : '',
               YSeatNum:y,
               ESeatNum:f,