Changpeng Duan 4 anni fa
parent
commit
a7b1d8cc9f
4 ha cambiato i file con 1705 aggiunte e 1594 eliminazioni
  1. 3 3
      app/src/page/appoint.vue
  2. BIN
      genkey/screen/GoAllOut.keystore
  3. 1699 1590
      pc/src/views/courseEdit.vue
  4. 3 1
      tv/src/views/Index.vue

+ 3 - 3
app/src/page/appoint.vue

@@ -27,7 +27,7 @@
               <!--正常-->
               <i class="dot" v-if="l.remain>0 && l.WxOrder != 0"></i>
               <i class="cubes" v-if="l.Status==1"></i>
-              <!--满-->
+              <!--满-->
               <i class="tri" v-if="l.remain == 0 && l.remain == 0"></i>
               <!--不可约-->
               <i class="x" v-if="l.WxOrder==0"></i>
@@ -55,7 +55,7 @@
               @click="appointNow(l)">
               预约
             </mu-button>
-            <mu-button class="appointBtn redBtn" v-if="l.remain == 0 && l.OrderId == 0" @click="isFulled">
+            <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 && l.OrderId == 0" @click="isDisable">不可约</mu-button>
@@ -266,7 +266,7 @@
       },
       isFulled() {
         let that = this;
-        that.$alert('当前课程满,请选择其他课程或其他时间预约', '提示', {
+        that.$alert('当前课程满,请选择其他课程或其他时间预约', '提示', {
           okLabel: '知道了'
         }).then(() => {
           that.getList();

BIN
genkey/screen/GoAllOut.keystore


File diff suppressed because it is too large
+ 1699 - 1590
pc/src/views/courseEdit.vue


+ 3 - 1
tv/src/views/Index.vue

@@ -205,8 +205,10 @@ export default {
           // 户外版使用HotsPotDataServiceIP
           if(runVersion == 'outDoor'){
             headapi = json.Rs.HotsPotDataServiceIP;
+            // 内网测试版
+            // headapi = 'http://192.168.0.3:19096/v1/Sensors/';
             if(!json.Rs.HotsPotDataServiceIP){
-              that.$message.error("为获取到HotsPotDataServiceIP");
+              that.$message.error("获取到HotsPotDataServiceIP");
               return false
             }
           }else{

Some files were not shown because too many files changed in this diff