fix:“优化订单搜索功能，开放远程开启触摸屏功能”

src/assets/language/en.json

@@ -935,6 +935,7 @@
     "onlinePayment": "Online payment",
     "offlinePayment": "Offline payment",
     "paymentSucceeded": "Payment succeeded",
+    "noOrderData": "The order data is empty",
     "unpaid": "Unpaid",
     "paid": "Paid",
     "refundInProgress": "Refund in progress",
@@ -956,7 +957,7 @@
     "orderNoPlaceholder": "Please enter the order number",
     "orderSerialNumberLabel": "Order serial number",
     "orderSerialNumberPlaceholder": "Please enter the order serial number",
-    "equipmentNoPlaceholder": "Please enter the Machine number",
+    "equipmentNoPlaceholder": "Please enter the full Machine number",
     "orderDate": "Order Date",
     "startTime": "start time",
     "to": "to",

src/assets/language/ja.json

@@ -936,6 +936,7 @@
         "onlinePayment": "オンライン決済",
         "offlinePayment": "オフライン決済",
         "paymentSucceeded": "支払い成功",
+        "noOrderData": "註文データは空です",
         "unpaid": "未払い",
         "paid": "支払済み",
         "refundInProgress": "払い戻し中",
@@ -957,7 +958,7 @@
         "orderNoPlaceholder": "注文番号を入力",
         "orderSerialNumberLabel": "注文のシリアルナンバー",
         "orderSerialNumberPlaceholder": "注文のシリアルナンバーを入力",
-        "equipmentNoPlaceholder": "機器番号を入力",
+        "equipmentNoPlaceholder": "全ての機器番号の入力をお願いします。",
         "orderDate": "注文日",
         "startTime": "開始時間",
         "to": "まで",

src/assets/language/zh.json

@@ -937,6 +937,7 @@
     "onlinePayment": "线上支付",
     "offlinePayment": "线下支付",
     "paymentSucceeded": "支付成功",
+    "noOrderData": "数据为空",
     "unpaid": "未支付",
     "paid": "已支付",
     "refundInProgress": "退款中",
@@ -958,7 +959,7 @@
     "orderNoPlaceholder": "请输入订单编号",
     "orderSerialNumberLabel": "商户单号",
     "orderSerialNumberPlaceholder": "请输入商户单号",
-    "equipmentNoPlaceholder": "请输入设备编号",
+    "equipmentNoPlaceholder": "请输入完整的设备编号",
     "orderDate": "订单日期",
     "startTime": "开始时间",
     "to": "至",

src/components/commom/kDialog/index.less

@@ -49,9 +49,9 @@
 
         .mod8 {
           background-color: rgba(77, 106, 221, 1);
-          border-radius: 0.5rem;
-          // height: 1rem;
-          width: 3rem;
+          border-radius: 20px;
+          height: 30px;
+          padding: 0 20px;
           justify-content: center;
           align-items: center;
 

src/styles/deviceSet/index.less

@@ -1,4 +1,4 @@
-body * {
+.deviceSetPage * {
     box-sizing: border-box;
     flex-shrink: 0;
 }

src/styles/merchantManage/index.less

@@ -206,8 +206,9 @@
                         justify-content: center;
 
                         .btn1 {
-                            margin: 0 25px;
-                            padding: 0 20px;
+                            margin: 0 20px;
+                            padding: 0 10px;
+                            width: 100px;
                         }
                     }
 

src/styles/robotRanking/index.less

@@ -1,4 +1,4 @@
-body * {
+.robotRanking * {
     box-sizing: border-box;
     flex-shrink: 0;
 }
@@ -123,6 +123,11 @@ button:active {
             background-color: #4d6add !important;
         }
 
+        .van-tabs__nav--line {
+            
+            height: 40px;
+        }
+
         .van-tab--active .van-tab__text--ellipsis {
             color: #4d6add;
         }
@@ -255,12 +260,12 @@ button:active {
                             // width: 55%;
 
                             .group4 {
-                                width: 2.2rem;
+                                // width: 2.2rem;
                                 // height: 16px;
 
                                 .layer3 {
-                                    width: 0.5rem;
-                                    height: 0.5rem;
+                                    width: 15px;
+                                    height: 15px;
                                     margin-right: 5px;
                                     background: url("../../assets/home/titleIcon.png") top center no-repeat;
                                     background-size: 100%;
@@ -271,11 +276,11 @@ button:active {
                                     // height: 14px;
                                     overflow-wrap: break-word;
                                     color: rgba(64, 77, 116, 1);
-                                    font-size: 0.5rem;
+                                    font-size: 15px;
                                     font-family: PingFangSC-Semibold;
                                     text-align: left;
                                     white-space: nowrap;
-                                    line-height: 0.5rem;
+                                    line-height: 15px;
                                     display: block;
                                 }
                             }
@@ -286,8 +291,8 @@ button:active {
                             cursor: pointer;
 
                             .label2 {
-                                width: 0.5rem;
-                                height: 0.5rem;
+                                width: 17px;
+                                height: 17px;
                                 // margin-right: 5px;
                             }
                         }

src/views/device/deviceOper.vue

@@ -180,7 +180,7 @@
         <div class="operText">{{ $t("device.lockDevice") }}</div>
       </div>
       <!-- 远程重启触摸屏 -->
-      <div v-if="user.type < 2" class="operItem" @click="restartAndroid()">
+      <div class="operItem" @click="restartAndroid()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/restartAndroid.png" />
         </div>

src/views/orderCenter/index.vue

@@ -177,7 +177,7 @@
             </div>
             <div class="orderDetailBox flex-row justify-between">
               <span class="title">{{ $t('orderCenter.equipmentNo') }}</span>
-              <span class="content">{{ refundObject.clientId.slice(-6) }}</span>
+              <span class="content">{{ refundObject.clientId }}</span>
             </div>
             <div class="orderDetailBox flex-row justify-between">
               <span class="title">{{ $t('orderCenter.state') }}</span>
@@ -646,7 +646,9 @@ export default {
         loading.value = false;
       } else {
         // error.value = true;
-        showFailToast("数据加载失败");
+        showToast(t('orderCenter.noOrderData'));
+        finished.value = true;
+        loading.value = false;
       }
     };
     // 搜索表单点击

src/views/orderCenter/orderSearch.vue

@@ -109,10 +109,25 @@ export default {
         //   Toast("请输入正确时间");
         //   return;
         // } else {
-          showToast("请输入搜索条件");
+        showToast("请输入搜索条件");
         return;
         // }
-      } 
+      }
+      if (clientId.value != '' || userName.value != '') {
+        if (startTime.value == '' || endTime.value == '') {
+          showToast("请输入指定订单日期，不超过1个月");
+          return;
+        } else {
+          let start = new Date(startTime.value);
+          let end = new Date(endTime.value);
+          let diff = (end - start) / 1000 / 60 / 60 / 24;
+          if (diff > 30) {
+            showToast("时间最多不超过1个月");
+            return;
+          }
+        }
+
+      }
       // else {
       //   if (startTime.value == '' || endTime.value == '') {
       //     showToast("请输入指定订单日期");