1

src/components/sale/activeOrder-form.vue

@@ -8,7 +8,10 @@
     padding: 5px 10px;
     align-items: center;
   }
-
+  .disableStatus{
+    opacity: 0.3 !important;
+    cursor: auto;
+  }
 </style>
 
 <!--订单操作-->
@@ -44,7 +47,8 @@
         </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="保存" :disable="saveObj.PaymentWay===4" @click="saveOrderInfo()" />
+          <q-btn color="accent" class="q-mr-md" label="保存" v-if="saveObj.PaymentWay!==4"  @click="saveOrderInfo()" />
+          <q-btn color="accent disableStatus" class="q-mr-md" label="保存"  />
         </div>
       </div>
     </q-card>

src/components/sale/activeOrder-item.vue

@@ -62,6 +62,9 @@
             <td :rowspan="2" style="text-align: left">
               <div class="order_OfferId" @click="goOrderdetails(item,1)">{{item.Id}}
               </div>
+              <div>
+                {{item.PaymentWayName}}
+              </div>
               <div>{{item.EduSellName}}</div>
               <div>{{item.ActivityName}}</div>
               <div>活动开始时间：</div>
@@ -398,8 +401,8 @@
                   <div class="row wrap">
                     <div class="finance row" v-for="(x,j) in item.IncomeFinanceList" :index="j"
                       :style="{
-                      background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
-                      color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
+                      background:x.ColorType==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorType==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorType==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
+                      color: x.ColorType==1 ? '#2961FE':(x.ColorType==2 ? '#02C499':(x.ColorType==3 ? '#F28C1D':'#3FC4FF'))}">
                       <span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
                     </div>
                   </div>
@@ -442,8 +445,8 @@
                   <div class="row wrap">
                     <div class="finance row" v-for="(x,j) in item.ExpendFinanceList" :index="j"
                       :style="{
-                      background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
-                      color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
+                      background:x.ColorType==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorType==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorType==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
+                      color: x.ColorType==1 ? '#2961FE':(x.ColorType==2 ? '#02C499':(x.ColorType==3 ? '#F28C1D':'#3FC4FF'))}">
                       <span style="cursor: pointer" @click="goOrderdetails(item,4)">{{x.FrID}}</span>
                     </div>
                   </div>
@@ -1524,7 +1527,7 @@
   .classorder .order_OfferId {
     font-size: 18px;
     color: #2961FE;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     font-weight: bold;
     text-decoration: underline;
     cursor: pointer

src/components/sale/myActiveOrder-form.vue

@@ -23,7 +23,7 @@
           <span class="two-r">{{saveObj.EduSellName}}</span>
         </div>
         <div class="col-6 row">
-          <span class="two-left">创建时间：</span>
+          <span class="two-left">报名时间：</span>
           <span class="two-r">{{saveObj.CreateTime}}</span>
         </div>
         <div class="col-6 row">
@@ -119,15 +119,8 @@
               </div>
             </div>
             <div class="col-6 row">
-              <span class="two-left">退款：</span>
-              <div class="two-r">
-                <template v-if="saveObj.RefundPrice>0">
-                   {{getTwoWei(saveObj.RefundPrice)}}
-                </template>
-                <template v-else>
-                  <span class="redstyle">0</span>
-                </template>
-              </div>
+              <span class="two-left">开始时间：</span>
+              <span class="two-r">{{saveObj.StartTime}}</span>
             </div>
             <div class="col-6 row">
               <span class="two-left">平台税金：</span>
@@ -140,14 +133,22 @@
                 </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 class="col-6 row">
+              <span class="two-left">退款：</span>
+              <div class="two-r">
+                <template v-if="saveObj.RefundPrice>0">
+                   {{getTwoWei(saveObj.RefundPrice)}}
+                </template>
+                <template v-else>
+                  <span class="redstyle">0</span>
+                </template>
+              </div>
+            </div>
           </div>
         </div>
       </div>