1

src/components/sale/activeOrder-form.vue

@@ -44,7 +44,7 @@
         </div>
         <div style="margin:30px 10px 70px 0;">
           <q-btn class="q-mr-md" label="取消" @click="closeEditOrder" />
-          <q-btn color="accent" class="q-mr-md" label="保存" @click="saveOrderInfo()" />
+          <q-btn color="accent" class="q-mr-md" label="保存" :disable="saveObj.PaymentWay===4" @click="saveOrderInfo()" />
         </div>
       </div>
     </q-card>

src/components/sale/activeOrder-item.vue

@@ -135,14 +135,17 @@
             </td> -->
             <!-- 应收总额 -->
             <td style="border:none">
-              <template v-if="item.Money>=0">
+              <template v-if="item.Money>0">
                 {{item.Money }}
               </template>
+              <template v-else>
+                <span class="redstyle">0</span>
+              </template>
             </td>
             <!-- 实收 -->
             <td style="border:none">
-              <template v-if="item.OrderStatus===1 ">
-                {{item.Money-item.PlatformTax}}
+              <template v-if="item.Income>0 ">
+                {{item.Income}}
               </template>
               <template v-else>
                 <span class="redstyle">0</span>
@@ -166,8 +169,8 @@
             </td> -->
             <!-- 退款 -->
             <td style="border:none">
-              <template v-if="item.OrderStatus===1&&item.Status===1">
-                {{item.Money }}
+              <template v-if="item.RefundPrice>0">
+                {{item.RefundPrice }}
               </template>
               <template v-else>
                 <span class="redstyle">0</span>
@@ -175,7 +178,7 @@
             </td>
             <!-- 平台税金 -->
             <td style="border:none">
-              <template v-if="item.PlatformTax>=0">
+              <template v-if="item.PlatformTax>0">
                 {{item.PlatformTax }}
               </template>
               <template v-else>
@@ -184,8 +187,8 @@
             </td>
             <!-- 待收金额 -->
             <td style="color:#2961FE;border:none">
-              <template v-if="item.OrderStatus===0&&item.Status===0">
-                {{item.Money }}
+              <template v-if="item.DueInMoney>0">
+                {{item.DueInMoney }}
               </template>
               <template v-else>
                 <span class="redstyle">0</span>
@@ -195,9 +198,8 @@
             <td style="border:none">
               <div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center">
                 <!-- <span style="color: #02C499">{{item.OrderStateName}}</span> -->
-                <span style="color: #02C499" v-if="item.Status ===0&&item.OrderStatus===0">待支付</span>
-                <span style="color: #02C499" v-if="item.Status ===0&&item.OrderStatus===1">正常</span>
-                <span style="color: #02C499" v-if="item.Status ===1">已取消</span>
+                <span style="color: #02C499" v-if="item.Status ===0">正常</span>
+                <span style="color: #02C499" v-if="item.Status ===1">取消</span>
               </div>
             </td>
             <td style="border:none">
@@ -1293,7 +1295,7 @@
           // Obj: {},
           // SourceID: 0,
           // TCIDList: TCIDARR,
-          OtherType: 41,
+          OtherType: 40,
           ReFinanceId: item.ActivityId,//活动id
           ReFinanceId2: item.Id,//订单id
         }

src/components/sale/myActiveOrder-form.vue

@@ -12,8 +12,8 @@
         <div
           style="background: rgba(2, 196, 153, 0.2);border-radius: 4px;text-align: center;padding: 2px 13px;margin-left: 30px">
           <!-- <span style="color: #02C499">{{Detail.OrderStateName}}</span> -->
-          <span style="color: #02C499" v-if="saveObj.Status ===0&&saveObj.OrderStatus===0">待支付</span>
-          <span style="color: #02C499" v-if="saveObj.Status ===0&&saveObj.OrderStatus===1">正常</span>
+         
+          <span style="color: #02C499" v-if="saveObj.Status ===0">正常</span>
           <span style="color: #02C499" v-if="saveObj.Status ===1">已取消</span>
         </div>
       </div>
@@ -33,8 +33,8 @@
         <div class="col-6 row">
           <span class="two-left">待收金额：</span>
           <!-- <span class="two-r">{{getTwoWei(saveObj.DueInMoney)}}</span> -->
-          <template v-if="saveObj.OrderStatus===0&&saveObj.Status===0">
-            {{getTwoWei(saveObj.Money) }}
+          <template v-if="saveObj.DueInMoney>0">
+            {{getTwoWei(saveObj.DueInMoney) }}
           </template>
           <template v-else>
             <span class="redstyle">0</span>
@@ -110,8 +110,8 @@
               <span class="two-left">实收：</span>
                 
               <div class="two-r">
-                <template v-if="saveObj.OrderStatus===1 ">
-                  {{saveObj.Money-saveObj.PlatformTax}}
+                <template v-if="saveObj.Income>0 ">
+                  {{getTwoWei(saveObj.Income)}}
                 </template>
                 <template v-else>
                   <span class="redstyle">0</span>
@@ -121,8 +121,8 @@
             <div class="col-6 row">
               <span class="two-left">退款：</span>
               <div class="two-r">
-                <template v-if="saveObj.OrderStatus===1&&saveObj.Status===1">
-                  {{saveObj.Money }}
+                <template v-if="saveObj.RefundPrice>0">
+                   {{getTwoWei(saveObj.RefundPrice)}}
                 </template>
                 <template v-else>
                   <span class="redstyle">0</span>
@@ -131,7 +131,22 @@
             </div>
             <div class="col-6 row">
               <span class="two-left">平台税金：</span>
-              <span class="two-r">{{saveObj.PlatformTax}}</span>
+              <div class="two-r">
+                 <template v-if="saveObj.PlatformTax>0">
+                   {{getTwoWei(saveObj.PlatformTax)}}
+                </template>
+                <template v-else>
+                  <span class="redstyle">0</span>
+                </template>
+              </div>
+            </div>
+            <div class="col-6 row">
+              <span class="two-left">开始时间：</span>
+              <span class="two-r">{{saveObj.StartTime}}</span>
+            </div>
+            <div class="col-6 row">
+              <span class="two-left">结束时间：</span>
+              <span class="two-r">{{saveObj.EndTime}}</span>
             </div>
           </div>
         </div>