app端 显示问题修改

app/src/page/appoint.vue

@@ -20,7 +20,7 @@
     </div>
     <div class="context">
       <ul class="list">
-        <li v-for="l in list" v-show="l.WxVisible == 1"
+        <li v-for="l in list" 
           :class="[{'greenLi':l.remain > 0},{'redLi':l.Status == 1},{'yellowLi':l.remain == 0},{'whiteLi':l.WxOrder == 0},{'whiteLi':l.IsAllowSelect == 0}]">
           <div class="dotContainer">
             <div v-if="l.IsAllowSelect > 0">
@@ -34,7 +34,7 @@
             </div>
             <!-- 不可匹配课程 -->
             <div v-else>
-              <i class="x"></i>
+              <i class="x" v-if="l.OrderId == 0"></i>
             </div>
           </div>
           <div class="title">
@@ -58,11 +58,11 @@
             <mu-button class="appointBtn redBtn" v-if="l.remain == 0 && l.OrderId == 0" @click="isFulled">已满
             </mu-button>
             <mu-button class="appointBtn yellowBtn" v-if="l.OrderId != 0" @click="isAppointed(l)">已约</mu-button>
-            <mu-button class="appointBtn disableBtn" v-if="l.WxOrder == 0" @click="isDisable">不可约</mu-button>
+            <mu-button class="appointBtn disableBtn" v-if="l.WxOrder == 0 && l.OrderId == 0" @click="isDisable">不可约</mu-button>
           </div>
           <!-- 不可匹配课程 -->
           <div v-else>
-            <mu-button class="appointBtn disableBtn" @click="isDisable">不可约</mu-button>
+            <mu-button class="appointBtn disableBtn" @click="isDisable" v-if="l.OrderId == 0">不可约</mu-button>
           </div>
         </li>
         <div class="tips" v-if="list == ''">
@@ -253,7 +253,7 @@
             that.alertInfo('已成功预约', 'success');
             that.getList();
           } else {
-            that.alertInfo(json.Memo + ', 错误码：' + json.Code);
+            that.alertInfo(json.Memo + ' 错误码：' + json.Code);
           }
         })
       },
@@ -289,7 +289,7 @@
                 that.alertInfo('当前课程已取消预约', 'success');
                 that.getList();
               } else {
-                that.alertInfo(json.Memo + ', 错误码：' + json.Code);
+                that.alertInfo(json.Memo + ' 错误码：' + json.Code);
               }
             })
           } else {
@@ -326,7 +326,7 @@
               })
             }
           } else {
-            that.alertInfo(json.Memo + ', 错误码：' + json.Code);
+            that.alertInfo(json.Memo + ' 错误码：' + json.Code);
           }
         })
       },

app/src/page/record.vue

@@ -52,7 +52,7 @@
                             已完成
                         </span>
               <em v-if="active == 2">
-                - {{ l.NormalHour }}课时
+                - {{ l.NormalHour  + l.GiftHour}}课时
               </em>
             </div>
           </li>
@@ -151,7 +151,7 @@ export default {
               that.alertInfo('当前课程已取消预约', 'success');
               that.getList();
             } else {
-              that.alertInfo(json.Memo + ', 错误码：' + json.Code);
+              that.alertInfo(json.Memo + ' 错误码：' + json.Code);
             }
           })
         } else {
@@ -179,7 +179,7 @@ export default {
               that.num = 0
             }
           } else {
-            that.alertInfo(json.Memo + ', 错误码：' + json.Code);
+            that.alertInfo(json.Memo + ' 错误码：' + json.Code);
           }
         });
       }

tv/src/Mock/index.js

@@ -370,7 +370,7 @@ let getClassStat = function (ClassOn, dp) {
     };
 };
 
-let t = 0;//0 is on 1 is off
+let t = 1;//0 is on 1 is off
 if (t == 1) {
     // 列表测试
     Mock.mock('/api/testTable', 'post', testTable());