style：“优化一些样式和英文名”

src/assets/language/en.json

@@ -7,8 +7,8 @@
   "dateSelectList": {
     "today": "Today",
     "yesterday": "Yesterday",
-    "thisWeek": "This week",
-    "thisMonth": "This month",
+    "thisWeek": "Week",
+    "thisMonth": "Month",
     "other": "Other"
   },
   "typeSelectList": {
@@ -46,10 +46,10 @@
     "overseas": "Hong Kong, Macao, Taiwan and overseas"
   },
   "navBar": {
-    "homePage": "home page",
-    "deviceInformation": "Device Information",
-    "machineRanking": "Machine ranking",
-    "personalCenter": "Personal Center"
+    "homePage": "Home",
+    "deviceInformation": "Device",
+    "machineRanking": "Ranking",
+    "personalCenter": "My Center"
   },
   "accountPer": {
     "usernameLabel": "account number",
@@ -236,6 +236,7 @@
     "managementCenter": "Device Management Center",
     "setAlarm": "set alarm",
     "equipmentName": "Equipment name",
+    "equipmentNameTips": "No name has been set",
     "selectDevice": "Select Device",
     "selectTime": "Select time",
     "selectTheNumberOfAlarmClockRepetitions": "Select the number of alarm clock repetitions",
@@ -370,7 +371,7 @@
     "equipmentCode": "Equipment Code",
     "equipmentRemarksLabel": "Equipment Remarks",
     "equipmentRemarksPlaceholder": "Please enter device notes",
-    "affiliatedMerchant": "affiliated merchant",
+    "affiliatedMerchant": "Business Owner",
     "affiliatedArea": "Affiliated Area",
     "machineType": "Machine Type",
     "expirationTime": "Expiration Time",
@@ -399,12 +400,12 @@
     "search": "search",
     "totalNumberOfRuns": "Total number of runs",
     "totalNumberOfEquipment": "Total number of equipment",
-    "affiliatedMerchants": "affiliated merchants",
+    "affiliatedMerchants": "Business Owner",
     "sleepState": "Sleep State",
     "sleeping": "sleeping",
     "notSleeping": "Not sleeping",
     "lastRefreshTime": "Recent refresh time",
-    "machineUniqueCode": "Machine unique code",
+    "machineUniqueCode": "Device Code",
     "furnaceHeadTemperature": "furnace head temperature",
     "stirringTemperature": "Stirring temperature",
     "cornGeneratorTemperature": "Corn generator temperature",
@@ -597,9 +598,9 @@
   },
   "home": {
     "theLatestMessageIsDisplayedHereYouHaveAMessageToRead": "这里显示最新的消息，您有一条消息待阅读",
-    "totalEquipment": "totalEquipment",
-    "running": "running",
-    "dataOverview": "Data overview",
+    "totalEquipment": "Total Devices",
+    "running": "Running",
+    "dataOverview": "Data Overview",
     "orderData": "orderData",
     "totalIncome": "Total income",
     "productNum": "Sales volume",
@@ -1216,17 +1217,17 @@
   },
   "robotRanking": {
     "machineSalesRanking": "Machine sales ranking",
-    "dailySalesRanking": "Daily sales ranking",
+    "dailySalesRanking": "Daily sales",
     "today": "Today",
     "yesterday": "Yesterday",
     "other": "Other",
-    "salesRankingThisWeek": "Sales ranking this week",
+    "salesRankingThisWeek": "Weekly sales",
     "thisWeek": "This week",
     "lastWeek": "last week",
-    "salesRankingThisMonth": "Sales ranking this month",
+    "salesRankingThisMonth": "Monthly sales",
     "thisMonth": "This month",
     "lastMonth": "Last month",
-    "salesRankingThisYear": "Sales ranking this year",
+    "salesRankingThisYear": "Annual sales",
     "thisYear": "This year",
     "lastYear": "Last year",
     "yearPopTitle": "Please select a year",
@@ -1248,15 +1249,15 @@
   },
   "user": {
     "personalCenter": "Personal Center",
-    "essentialInformation": "essential information",
-    "systemId": "System id",
+    "essentialInformation": "Basic Information",
+    "systemId": "System ID",
     "myAccount": "My Account",
-    "myName": "My name",
-    "region": "region",
+    "myName": "My Name",
+    "region": "Region",
     "regionPlace": "Please select a region",
-    "phoneNumber": "phone number",
+    "phoneNumber": "Phone",
     "phoneNumberPlace": "Please enter your mobile number",
-    "mailbox": "mailbox",
+    "mailbox": "Email",
     "mailboxPlace": "Please enter your email address",
     "associateParent": "Associate Parent",
     "associateParentPlace": "Please enter the related superior",
@@ -1267,7 +1268,7 @@
     "standbyWithdrawalAccountNo": "Standby withdrawal account No",
     "changePassword": "Change Password",
     "selfRecharging": "Self recharging",
-    "logOut": "Log out",
+    "logOut": "Sign out",
     "logOutTips": "tips",
     "cancelLog": "cancel",
     "confirmLog": "confirm",
@@ -1276,7 +1277,7 @@
     "corrPhonePlace": "Please enter the correct mobile number",
     "bindWechat": "Bind WeChat",
     "airwallex": "Airwallex",
-    "currencySymbol": "Custom Currency",
+    "currencySymbol": "Currency",
     "currencySymbolPlace": "Please enter currency symbol",
     "szPayType": "Sunzee payment",
     "scPayType": "Sevencloud payment",

src/assets/language/zh.json

@@ -236,6 +236,7 @@
     "managementCenter": "设备管理中心",
     "setAlarm": "设置闹钟",
     "equipmentName": "设备名称",
+    "equipmentNameTips": "暂未设置名称",
     "selectDevice": "选择设备",
     "selectTime": "选择时间",
     "selectTheNumberOfAlarmClockRepetitions": "选择闹钟重复次数",
@@ -853,7 +854,7 @@
     "to": "至",
     "endTime": "结束时间",
     "clickSearch": "点击搜索",
-    "selectFullTime": "选择完整时间",
+    "selectFullTime": "选择年月日小时",
     "refundAmount": "退款金额",
     "refundPlace": "请选择退款商品",
     "refundCheck": "是否确认退款？",

src/service/device/index.js

@@ -174,5 +174,5 @@ export function customLogo(params) {
 
 // 日志下载
 export function downloadLog(params) {
-  return axios.get(`/SZWL-SERVER/tEquipment/downloadLog?${stringToUrl(params)}`,{responseType:'blob', timeout: 15000});
+  return axios.get(`/SZWL-SERVER/tEquipment/downloadLog?${stringToUrl(params)}`,{responseType:'blob', timeout: 12000});
 }

src/styles/alarmClock/index.less

@@ -75,7 +75,7 @@
       padding: 10px 15px;
 
       .TextGroup2 {
-        width: 20%;
+        width: 25%;
 
         .bd3 {
           .word3 {
@@ -144,7 +144,7 @@
       .ImageText2 {
         height: 17px;
         width: 10%;
-        margin: 9px 0 0 32px;
+        margin: 9px 0 0 20px;
 
         .group3 {
           width: 40px;
@@ -178,9 +178,9 @@
       }
 
       .bd4 {
-        width: 15%;
+        width: 10%;
         height: 36px;
-        margin: 10px 0 0 32px;
+        margin: 10px 0 0 15px;
 
         .outer1 {
           width: 41px;

src/styles/distributionSet/index.less

@@ -20,6 +20,7 @@
             color: #434d74;
 
             .leftNum {
+                padding-left: 5px;
                 color: #df5e4c;
             }
         }

src/styles/robotRanking/index.less

@@ -78,7 +78,7 @@ button:active {
 .group5 {
     width: 39px;
     height: 16px;
-    margin-left: -80px;
+    margin-right: 50px;
     .icon2 {
       width: 18px;
       height: 18px;
@@ -337,7 +337,7 @@ button:active {
                 }
 
                 .robotLabelName {
-                    width: 22%;
+                    width: 25%;
                 }
 
                 .mod3 {

src/views/alarmHistory/historySearch.vue

@@ -31,15 +31,15 @@
       </div>
     </van-popup>
     <van-popup v-model:show="createStartDateShow" round position="bottom">
-      <van-datetime-picker v-model="createStartDate" type="datehour" :title="$t('alarmHistory.selectFullTime')"
+      <van-datetime-picker type="datehour" :title="$t('alarmHistory.selectFullTime')"
         :min-date="minDate" :max-date="maxDate" @confirm="createStartDateConFirm($event)"
-        @cancel="createStartDateCancel()" />
+        @cancel="createStartDateShow = false" />
       <!-- 			<van-datetime-picker v-model="createStartDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
               @confirm="createStartDateConFirm($event)" @cancel="createStartDateCancel()" :min-date="minDate" /> -->
     </van-popup>
     <van-popup v-model:show="createEndDateShow" round position="bottom">
-      <van-datetime-picker v-model="createEndDate" type="datehour" :title="$t('alarmHistory.selectFullTime')"
-        :min-date="minDate" :max-date="maxDate" @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" />
+      <van-datetime-picker type="datehour" :title="$t('alarmHistory.selectFullTime')"
+        :min-date="minDate" :max-date="maxDate" @confirm="createEndDateConFirm($event)" @cancel="createEndDateShow = false" />
       <!-- 			<van-datetime-picker v-model="createEndDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
               @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" :min-date="minDate" /> -->
     </van-popup>
@@ -71,9 +71,9 @@ export default {
     const createStartDate = ref('');
     const createStartDateShow = ref(false);
     const createStartDateClick = () => {
-      if (createStartDate.value === '') {
-        createStartDate.value = new Date();
-      }
+      // if (createStartDate.value === '') {
+      //   createStartDate.value = new Date();
+      // }
       createStartDateShow.value = true;
     }
     const createStartDateConFirm = (data) => {
@@ -88,9 +88,9 @@ export default {
     const createEndDate = ref('');
     const createEndDateShow = ref(false);
     const createEndDateClick = () => {
-      if (createEndDate.value === '') {
-        createEndDate.value = new Date();
-      }
+      // if (createEndDate.value === '') {
+      //   createEndDate.value = new Date();
+      // }
       createEndDateShow.value = true;
     }
     const createEndDateConFirm = (data) => {

src/views/device/alarmClock.vue

@@ -100,17 +100,26 @@ export default {
     }
 
     const showWeek = (e) => {
-      if (e === '1,2,3,4,5,6,7,') { return t('device.everyDay') }
-      if (e === '1,2,3,4,5,') { return t('device.weekday2') }
-      if (e === '6,7,') { return t('device.weekend2') }
+      // if (e === '1,2,3,4,5,6,7,') { return t('device.everyDay') }
+      if(e.indexOf('1') > -1 && e.indexOf('2') > -1 && e.indexOf('3') > -1 && e.indexOf('4') > -1 && e.indexOf('5') > -1 && e.indexOf('6') > -1 && e.indexOf('7') > -1) {
+        return t('device.everyDay')
+      }
+      if(e.indexOf('1') > -1 && e.indexOf('2') > -1 && e.indexOf('3') > -1 && e.indexOf('4') > -1 && e.indexOf('5') > -1 && e.indexOf('6') == -1 && e.indexOf('7') == -1 ) {
+        return t('device.weekday2')
+      }
+      // if (e === '1,2,3,4,5,') { return t('device.weekday2') }
+      // if (e === '6,7,') { return t('device.weekend2') }
+      if(e.indexOf('1') == -1 && e.indexOf('2') == -1 && e.indexOf('3') == -1 && e.indexOf('4') == -1 && e.indexOf('5') == -1 &&e.indexOf('6') > -1 && e.indexOf('7') > -1) {
+        return t('device.weekend2')
+      }
       let retVal = '';
-      if (e.indexOf('1') > -1) { retVal = retVal + `${t('device.monday')},` }
-      if (e.indexOf('2') > -1) { retVal = retVal + `${t('device.tuesday')},` }
-      if (e.indexOf('3') > -1) { retVal = retVal + `${t('device.wednesday')},` }
-      if (e.indexOf('4') > -1) { retVal = retVal + `${t('device.thursday')},` }
-      if (e.indexOf('5') > -1) { retVal = retVal + `${t('device.friday')},` }
-      if (e.indexOf('6') > -1) { retVal = retVal + `${t('device.saturday')},` }
-      if (e.indexOf('7') > -1) { retVal = retVal + `${t('device.sunday')}` }
+      if (e.indexOf('1') > -1) { retVal = retVal + `${t('device.monday')} ` }
+      if (e.indexOf('2') > -1) { retVal = retVal + `${t('device.tuesday')} ` }
+      if (e.indexOf('3') > -1) { retVal = retVal + `${t('device.wednesday')} ` }
+      if (e.indexOf('4') > -1) { retVal = retVal + `${t('device.thursday')} ` }
+      if (e.indexOf('5') > -1) { retVal = retVal + `${t('device.friday')} ` }
+      if (e.indexOf('6') > -1) { retVal = retVal + `${t('device.saturday')} ` }
+      if (e.indexOf('7') > -1) { retVal = retVal + `${t('device.sunday')} ` }
       return retVal;
     }
 

src/views/device/deviceOper.vue

@@ -5,7 +5,7 @@
     <slot name="title">
       <div class="van-dialog__header">{{ $t("device.commonOperations") }}</div>
       <div class="txt1" style="padding: 0.2em 1em">
-        {{ $t("device.equipmentName") }}: {{ device.name }}
+        {{ $t("device.equipmentName") }}: {{ device.name != null ? device.name : $t("device.equipmentNameTips") }}
       </div>
       <div class="txt1" style="padding: 0.2em 1em">
         {{ $t("device.equipmentNo") }}: {{ device.clientId }}

src/views/device/index.vue

@@ -56,7 +56,7 @@
                   <div class="l-flex-RC">
                     <div class="layer1 flex-col"></div>
                     <div class="txtBox">
-                      <span class="txt1">{{ item.name }}</span>
+                      <span class="txt1">{{ item.name == null ? item.clientId.slice(-6) : item.name }}</span>
                     </div>
                   </div>
                   <div class="l-flex-RC">
@@ -83,14 +83,14 @@
                 }}</span>
                 <div class="contentBottomCon" v-if="item.checkType">
                   <img class="pic1" referrerpolicy="no-referrer" src="../../assets/home/line.png" />
-                  <div class="layer2 flex-row justify-between o-ptb-8 kBordBott">
-                    <span class="info1 o-ptb-8 kBordBott">{{ $t("device.sleepState") }}：{{
+                  <div class="layer2 flex-row justify-between o-ptb-7 kBordBott">
+                    <span class="info1 o-ptb-7 kBordBott">{{ $t("device.sleepState") }}：{{
                       item.isSleep
                       ? $t("device.sleeping")
                       : $t("device.notSleeping")
                     }}</span>
                   </div>
-                  <div v-if="item.isSleep" class="layer3 o-ptb-8">
+                  <div v-if="item.isSleep" class="layer3 o-ptb-7">
                     <span class="word1">
                       <div v-if="!sleepDescBoxShow">
                         <van-field colon center class="word2" v-model="item.sleepDesc"
@@ -116,7 +116,7 @@
                   <!-- <span class="txt5 o-ptb-10 kBordBott l-flex-RC"><span>一键重启炉头：</span>
                     <van-button type="primary">重启</van-button>
                   </span> -->
-                  <div class="word4 o-ptb-8">
+                  <div class="word4 o-ptb-7">
                     <span class="word3 o-pr-5" v-if="item.machineType == '0' || item.machineType == null">{{
                       $t("device.furnHeadStatus") }}: </span>
                     <span class="word3 o-pr-5" v-else>{{ $t("device.deviceStatus") }}: </span>
@@ -132,10 +132,10 @@
                   </span> -->
 
                   <!-- 设备地址 -->
-                  <!-- <span class="txt1 o-ptb-8">{{ item.fullName }}</span> -->
+                  <!-- <span class="txt1 o-ptb-7">{{ item.fullName }}</span> -->
                   <!-- 定位： -->
                   <!-- <div>
-                    <span v-if="item.latitude" class="txt5 o-ptb-8 kBordBott l-flex-RC">
+                    <span v-if="item.latitude" class="txt5 o-ptb-7 kBordBott l-flex-RC">
                       <span class="info1">{{
                         $t("device.position") }}：</span>
                       <van-button @click="viewPosiClk(item)" type="primary">{{
@@ -146,14 +146,14 @@
 
                   <!-- 定位： -->
                   <div>
-                    <span v-if="item.latitude" class="txt5 o-ptb-8 kBordBott l-flex-RC">
+                    <span v-if="item.latitude" class="txt5 o-ptb-7 kBordBott l-flex-RC">
                       <span class="info1">{{ $t("device.position") }}：</span>
-                      <a class="clickable-link o-ptb-8" @click="viewPosiClk(item)">{{ item.fullName }}</a>
+                      <a class="clickable-link o-ptb-7" @click="viewPosiClk(item)">{{ item.fullName }}</a>
                     </span>
                   </div>
 
 
-                  <van-row class="layer5 o-ptb-8 kBordBott" justify="space-between"
+                  <van-row class="layer5 o-ptb-7 kBordBott" justify="space-between"
                     v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'POP320'">
                     <van-col class="word5">{{ $t("device.furnaceHeadTemperature") }}：{{
                       item.furnaceTm
@@ -164,7 +164,7 @@
                     <van-col class="word5">{{ $t("device.humidityInCabinet") }}：{{ item.cabinetHd
                     }}{{ $t("device.humidity") }}</van-col>
                   </van-row>
-                  <van-row class="layer5 o-ptb-8 kBordBott" justify="space-between" v-else>
+                  <van-row class="layer5 o-ptb-7 kBordBott" justify="space-between" v-else>
                     <van-col class="word5">{{ $t("device.stirringTemperature") }}：{{
                       item.stirTm
                     }}{{ $t("device.degree") }}</van-col>
@@ -175,7 +175,7 @@
                     }}</van-col>
                   </van-row>
                   <template v-if="item.isMaterialUse === '1' && (item.machineType == '0' || item.machineType == null)">
-                    <van-row justify="space-between" class="sugarTxt o-ptb-8 kBordBott">
+                    <van-row justify="space-between" class="sugarTxt o-ptb-7 kBordBott">
                       <van-col>
                         {{ $t("device.whiteSugar") }}：{{ Format_calcuDecial(item.whiteSugar) }}%
                       </van-col>
@@ -189,12 +189,12 @@
                         {{ $t("device.blueSugar") }}：{{ Format_calcuDecial(item.blueSugar) }}%
                       </van-col>
                     </van-row>
-                    <div class="sugarTxt o-ptb-8 kBordBott">
+                    <div class="sugarTxt o-ptb-7 kBordBott">
                       <span>{{ $t("device.stick") }}：{{
                         Format_calcuDecial(item.stick)
                       }}%</span>
                     </div>
-                    <van-row gutter="50" class="sugarTxt o-ptb-8 kBordBott">
+                    <van-row gutter="50" class="sugarTxt o-ptb-7 kBordBott">
                       <van-col>
                         {{ $t("device.water") }}：{{ Format_calcuDecial(item.water) }}%
                       </van-col>
@@ -203,17 +203,17 @@
                       </van-col>
                     </van-row>
                     <!-- 一键补料 -->
-                    <span class="txt5 o-ptb-8 kBordBott l-flex-RC"><span>{{ $t("device.oneKeyFeed") }}：</span>
+                    <span class="txt5 o-ptb-7 kBordBott l-flex-RC"><span>{{ $t("device.oneKeyFeed") }}：</span>
                       <!-- <van-button @click="replenishmentClk(item)" type="primary">{{ $t("device.replenishment") }}
                       </van-button> -->
-                      <a class="replenishment o-ptb-8" @click="replenishmentClk(item)">{{ $t("device.replenishment") }}</a>
+                      <a class="replenishment o-ptb-7" @click="replenishmentClk(item)">{{ $t("device.replenishment") }}</a>
                     </span>
                   </template>
-                  <span class="info1 o-ptb-8 kBordBott">{{ $t("device.lastRefreshTime") }}：{{
+                  <span class="info1 o-ptb-7 kBordBott">{{ $t("device.lastRefreshTime") }}：{{
                     showDateTime(item.lastUpdateTime)
                   }}</span>
-                  <span class="info2 o-ptb-8 kBordBott">{{ $t("device.volume") }}：{{ item.volume }}</span>
-                  <div class="l-flex-RC">
+                  <span class="info2 o-ptb-7 kBordBott">{{ $t("device.volume") }}：{{ item.volume }}</span>
+                  <div class="l-flex-RC o-ptb-7">
                     <span class="info3 o-pr-10 kBordBott">{{ $t("device.alarmContent") }}：{{
                       item.alarmList && item.alarmList[0]
                       ? item.alarmList[0].alarmContent
@@ -238,7 +238,7 @@
                     </div>
                   </div>
                 </div>
-                <div class="bd6 l-flex-center o-ptb-8" @click="item.checkType = !item.checkType">
+                <div class="bd6 l-flex-center o-ptb-7" @click="item.checkType = !item.checkType">
                   <div class="l-flex-RC">
                     <span class="info2 o-mr-2">{{
                       item.checkType ? $t("device.stow") : $t("device.seeMore")

src/views/device/viewLogs/index.vue

@@ -1,5 +1,4 @@
 <template>
-  <!--  修改logo  -->
   <div class="viewLogsPage flex-col">
     <s-header :name="$t('device.viewLogs')" :noback="false"></s-header>
     <div class="block2 flex-row justify-between">
@@ -9,7 +8,7 @@
     <div class="wrap1 flex-col o-pt-15">
       <van-field v-model="logsTime" is-link readonly label="日期" placeholder="点击选择时间" @click="chooseTime()" />
       <van-popup v-model:show="showPicker" round position="bottom">
-        <van-datetime-picker v-model="logsTime" type="date" :min-date="minDate" :max-date="maxDate"
+        <van-datetime-picker type="date" :min-date="minDate" :max-date="maxDate"
                              @confirm="selectTime" @cancel="showPicker = false" />
       </van-popup>
       <van-button v-if="!downloading" round :disabled="logsTime === ''" type="primary" class="volumeChangeButton"
@@ -54,18 +53,18 @@ export default ({
     const showPicker = ref(false);
     const downloading = ref(false);
     const logsTime = ref(null);
-    const curDate = new Date(); // 获取当前时间日期
+    // const curDate = new Date(); // 获取当前时间日期
 
     // 计算最小日期为当前日期7天前
     const minDate = computed(() => {
-      const minTimestamp = curDate.getTime() - 6 * 24 * 3600 * 1000;
+      const minTimestamp = (new Date()).getTime() - 6 * 24 * 3600 * 1000;
       const minDate = dateUtil.formateDate(new Date(minTimestamp), "yyyy-MM-dd");
       return new Date(minDate);
     });
 
     // 计算最大日期为当前日期
     const maxDate = computed(() => {
-      return curDate;
+      return new Date();
     });
 
 
@@ -86,7 +85,7 @@ export default ({
 
 
     const selectTime = (time) => {
-      // console.log('selectTime function is called', time);
+      console.log('selectTime function is called', time);
       logsTime.value = dateUtil.formateDate(time, "yyyy-MM-dd");
       showPicker.value = false;
     };

src/views/discountCode/codeSearch.vue

@@ -44,20 +44,20 @@
       </div>
     </van-popup>
     <van-popup v-model:show="createStratDateShow" round position="bottom">
-      <van-datetime-picker v-model="createStratDate" type="datetime" :title="$t('discountCode.selectFullTime')"
-        @confirm="createStratDateConFirm($event)" @cancel="createStratDateCancel()" :min-date="minDate" />
+      <van-datetime-picker type="datetime" :title="$t('discountCode.selectFullTime')"
+        @confirm="createStratDateConFirm($event)" @cancel="createStratDateShow = false" :min-date="minDate" />
     </van-popup>
     <van-popup v-model:show="createEndDateShow" round position="bottom">
-      <van-datetime-picker v-model="createEndDate" type="datetime" :title="$t('discountCode.selectFullTime')"
-        @confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" :min-date="minDate" />
+      <van-datetime-picker type="datetime" :title="$t('discountCode.selectFullTime')"
+        @confirm="createEndDateConFirm($event)" @cancel="createEndDateShow = false" :min-date="minDate" />
     </van-popup>
     <van-popup v-model:show="useStratDateShow" round position="bottom">
-      <van-datetime-picker v-model="useStratDate" type="datetime" :title="$t('discountCode.selectFullTime')"
-        @confirm="useStratDateConFirm($event)" @cancel="useStratDateCancel()" :min-date="minDate" />
+      <van-datetime-picker type="datetime" :title="$t('discountCode.selectFullTime')"
+        @confirm="useStratDateConFirm($event)" @cancel="useStratDateShow = false" :min-date="minDate" />
     </van-popup>
     <van-popup v-model:show="useEndDateShow" round position="bottom">
-      <van-datetime-picker v-model="useEndDate" type="datetime" :title="$t('discountCode.selectFullTime')"
-        @confirm="useEndDateConFirm($event)" @cancel="useEndDateCancel()" :min-date="minDate" />
+      <van-datetime-picker type="datetime" :title="$t('discountCode.selectFullTime')" @confirm="useEndDateConFirm($event)"
+        @cancel="useEndDateShow = false" :min-date="minDate" />
     </van-popup>
   </div>
 </template>
@@ -80,27 +80,27 @@ export default {
     // 创建开始时间
     const createStratDate = ref('');
     const createStratDateShow = ref(false);
-    const createStratDateClick = () => { if (createStratDate.value === '') { createStratDate.value = new Date(); } createStratDateShow.value = true; }
+    const createStratDateClick = () => { createStratDateShow.value = true; }
     const createStratDateConFirm = (data) => { createStratDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss"); createStratDateShow.value = false; }
-    const createStratDateCancel = () => { createStratDate.value = dateUtil.formateDate(new Date(createStratDate.value), "yyyy-MM-dd hh:mm:ss"); createStratDateShow.value = false; }
+    // const createStratDateCancel = () => { createStratDate.value = dateUtil.formateDate(new Date(createStratDate.value), "yyyy-MM-dd hh:mm:ss"); createStratDateShow.value = false; }
     // 创建结束时间
     const createEndDate = ref('');
     const createEndDateShow = ref(false);
-    const createEndDateClick = () => { if (createEndDate.value === '') { createEndDate.value = new Date(); } createEndDateShow.value = true; }
+    const createEndDateClick = () => { createEndDateShow.value = true; }
     const createEndDateConFirm = (data) => { createEndDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss"); createEndDateShow.value = false; }
-    const createEndDateCancel = () => { createEndDate.value = dateUtil.formateDate(new Date(createEndDate.value), "yyyy-MM-dd hh:mm:ss"); createEndDateShow.value = false; }
+    // const createEndDateCancel = () => { createEndDate.value = dateUtil.formateDate(new Date(createEndDate.value), "yyyy-MM-dd hh:mm:ss"); createEndDateShow.value = false; }
     // 使用起始时间
     const useStratDate = ref('');
     const useStratDateShow = ref(false);
-    const useStratDateClick = () => { if (useStratDate.value === '') { useStratDate.value = new Date(); } useStratDateShow.value = true; }
+    const useStratDateClick = () => { useStratDateShow.value = true; }
     const useStratDateConFirm = (data) => { useStratDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss"); useStratDateShow.value = false; }
-    const useStratDateCancel = () => { useStratDate.value = dateUtil.formateDate(new Date(useStratDate.value), "yyyy-MM-dd hh:mm:ss"); useStratDateShow.value = false; }
+    // const useStratDateCancel = () => { useStratDate.value = dateUtil.formateDate(new Date(useStratDate.value), "yyyy-MM-dd hh:mm:ss"); useStratDateShow.value = false; }
     // 使用结束时间
     const useEndDate = ref('');
     const useEndDateShow = ref(false);
-    const useEndDateClick = () => { if (useEndDate.value === '') { useEndDate.value = new Date(); } useEndDateShow.value = true; }
+    const useEndDateClick = () => { useEndDateShow.value = true; }
     const useEndDateConFirm = (data) => { useEndDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss"); useEndDateShow.value = false; }
-    const useEndDateCancel = () => { useEndDate.value = dateUtil.formateDate(new Date(useEndDate.value), "yyyy-MM-dd hh:mm:ss"); useEndDateShow.value = false; }
+    // const useEndDateCancel = () => { useEndDate.value = dateUtil.formateDate(new Date(useEndDate.value), "yyyy-MM-dd hh:mm:ss"); useEndDateShow.value = false; }
 
     // 提交搜索表单触发搜索
     const onSubmit = () => {
@@ -122,22 +122,22 @@ export default {
       createStratDateShow,
       createStratDateClick,
       createStratDateConFirm,
-      createStratDateCancel,
+      // createStratDateCancel,
       createEndDate,
       createEndDateShow,
       createEndDateClick,
       createEndDateConFirm,
-      createEndDateCancel,
+      // createEndDateCancel,
       useStratDate,
       useStratDateShow,
       useStratDateClick,
       useStratDateConFirm,
-      useStratDateCancel,
+      // useStratDateCancel,
       useEndDate,
       useEndDateShow,
       useEndDateClick,
       useEndDateConFirm,
-      useEndDateCancel,
+      // useEndDateCancel,
       onSubmit
     };
   },

src/views/distributionSet/index.vue

@@ -9,7 +9,7 @@
             <div class="leftCon l-flex-RC">
               <img class="leftImg o-mr-6" src="../../assets//distributionSet/leftIcon.png" alt="" />
               <span class="leftTxt c-text-15 c-text-w6">
-                {{ $t('distributionSet.total') }}<span class="leftNum c-text-20">3</span>
+                {{ $t('distributionSet.total') }}<span class="leftNum c-text-20">{{ total }}</span>
                 {{ $t('distributionSet.leftTitle') }}
               </span>
             </div>
@@ -108,6 +108,8 @@ export default {
   setup() {
     const { t } = useI18n();
     const router = useRouter();
+
+    const total =  ref(0);
     // 点击去详情
     const toDetail = (e) => {
       if (e) {
@@ -139,6 +141,7 @@ export default {
     const tabChg = (e) => {
       tabActive.value = e;
       onRefresh(1);
+      total.value = 0;
     };
     // 分页
     const pageNo = ref(1);
@@ -195,7 +198,7 @@ export default {
         // 加载状态结束
         loading.value = false;
         // // 总共
-        // ruleTotal.value = data.total;
+        total.value = data.total;
         if (ruleData.tableData.length >= data.total) {
           finished.value = true;
         }
@@ -217,6 +220,7 @@ export default {
       tabActive,
       tabList,
       Format_time,
+      total,
     };
   },
 };

src/views/orderCenter/index.vue

@@ -60,7 +60,7 @@
           </div>
         </div>
         <kNoData v-else></kNoData>
-        <div class="o-mtb-10" style="height: 10px; background: #f5f5f5"></div>
+        <div class="o-mt-5" style="height: 10px; background: #f5f5f5"></div>
         <!-- 时间 -->
         <div class="c-text-c c-text-18">
           {{ Format_time(searchParams.startDate, 'YYYY-MM-DD') }}--{{ Format_time(searchParams.endDate, 'YYYY-MM-DD')

src/views/orderCenter/orderSearch.vue

@@ -38,12 +38,12 @@
       </div>
     </van-popup>
     <van-popup v-model:show="startDateShow" round position="bottom">
-      <van-datetime-picker v-model="startDate" type="datetime" :title="$t('orderCenter.selectFullTime')"
-        @confirm="startDateConFirm($event)" @cancel="startDateCancel()" :min-date="minDate" />
+      <van-datetime-picker type="datehour" :title="$t('orderCenter.selectFullTime')"
+        @confirm="startDateConFirm($event)" @cancel="startDateCancel()" :min-date="minDate" :max-date="maxDate" />
     </van-popup>
     <van-popup v-model:show="endDateShow" round position="bottom">
-      <van-datetime-picker v-model="endDate" type="datetime" :title="$t('orderCenter.selectFullTime')"
-        @confirm="endDateConFirm($event)" @cancel="endDateCancel()" :min-date="minDate" />
+      <van-datetime-picker type="datehour" :title="$t('orderCenter.selectFullTime')"
+        @confirm="endDateConFirm($event)" @cancel="endDateCancel()" :min-date="minDate" :max-date="maxDate" />
     </van-popup>
   </div>
 </template>
@@ -59,6 +59,7 @@ export default {
     const startDateShow = ref(false);
     const endDateShow = ref(false);
     const minDate = new Date(2018, 1, 1);
+    const maxDate = new Date();
 
     const userName = ref(''); // 用户名
     const sn = ref(''); // 订单编号
@@ -96,12 +97,17 @@ export default {
     const onSubmit = () => {
       console.log('startTime.value', startTime.value)
       if (userName.value == '' && sn.value == '' && trxNo.value == '' && clientId.value == '') {
-        if (startTime.value != '' || endTime.value != '') {
-          Toast("请输入正确时间");
-          return;
-        } else {
+        // if (startTime.value != '' || endTime.value != '') {
+        //   Toast("请输入正确时间");
+        //   return;
+        // } else {
           Toast("请输入搜索条件");
           return;
+        // }
+      } else {
+        if (startTime.value == '' || endTime.value == '') {
+          Toast("请输入指定订单日期");
+          return;
         }
       }
       const searchParam = {
@@ -139,6 +145,7 @@ export default {
       onSubmit,
       startTime,
       endTime,
+      maxDate,
     };
   },
   components: {},

src/views/settlement/index.vue

@@ -55,7 +55,7 @@
             <!-- 商户名称 -->
             <div class="cell-input">
               <van-popover v-model:show="regNameVisible" trigger="manual" placement="top" popover-class="custom-popover"
-                :offset="[25, ]" theme="dark">
+                :offset="[25,]" theme="dark">
                 <template #reference>
                   <van-field v-model="regNameValue" name="regNameValue" :label="$t('huifuMch.huifuRegName')"
                     :placeholder="$t('huifuMch.huifuRegNamePlaceholder')"
@@ -67,8 +67,8 @@
             </div>
             <!-- 商户简称 -->
             <div class="cell-input">
-              <van-popover v-model:show="shortNameVisible" trigger="manual" placement="bottom" popover-class="custom-popover"
-                :offset="[25, 0]" theme="dark">
+              <van-popover v-model:show="shortNameVisible" trigger="manual" placement="bottom"
+                popover-class="custom-popover" :offset="[25, 0]" theme="dark">
                 <template #reference>
                   <van-field v-model="shortNameValue" name="shortNameValue" :label="$t('huifuMch.shortNameLabel')"
                     :placeholder="$t('huifuMch.shortNamePlaceholder')"
@@ -169,7 +169,7 @@
               <span
                 :style="{ color: signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? '#00ff80' : (conStat == 5 && huifuAuditStatus == '2' ? '#00ff80' : '#FFA500')) : '#FFA500' }">
                 <!-- {{ signStatus == "签约成功" && conStat == "5" ? signStatus : "待签约" }} -->
-                {{ signStatus == '签约成功' ? (conStat == nul && huifuMchID == null ? signStatus : (conStat == 5 &&
+                {{ signStatus == '签约成功' ? (conStat == null && huifuMchID == null ? signStatus : (conStat == 5 &&
                   huifuAuditStatus == '2' ?
                   signStatus : '待签约')) : '待签约' }}
               </span>
@@ -797,6 +797,10 @@ export default {
               huifuPicUpStatus.value = 1;
             }
           }
+          if (data.data.status === '0') {
+            huifuPicUpStatus.value = 0;
+            console.log(huifuPicUpStatus.value)
+          }
         }
       }
     }

src/views/taskMessage/proportion/index.vue

@@ -27,6 +27,9 @@
           <div v-for="(item, index) in alarmHistoryList" :key="index" class="listItem">
             <div class="itemBox">
               <div class="itemRow">
+                <span class="itemTitle">{{ $t('taskMessage.equipmentName') }}:&nbsp;</span>{{ item.equipmentName != null ? item.equipmentName : item.clientId.slice(-6) }}
+              </div>
+              <div class="itemRow">
                 <span class="itemTitle">{{ $t('taskMessage.equipmentNo') }}:&nbsp;</span>{{ item.clientId }}
               </div>
               <div class="itemRow" v-if="item.type >= 1">

src/views/user.vue

@@ -25,30 +25,32 @@
         </div>
         <div class="userInfoBox">
           <!-- 地区 -->
-          <div v-if="!areaShow" class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.region") }}: </span>
-            <div class="cust_vantBorder">
-              <div class="filedInpPad">
-                <van-field @click-input="fieldValueInpClk" readonly clearable v-model="fieldValue"
-                  :placeholder="$t('user.regionPlace')">
-                  <template #right-icon>
-                    <div class="l-flex-RC">
-                      <van-icon v-if="fieldValue" @click="
-                        fieldValue = '';
-                      accountDetail.areaId = '';
-                      " class="o-mr-6" name="clear" />
-                      <van-icon @click="fieldValueInpClk" name="arrow-down" />
-                    </div>
-                  </template>
-                </van-field>
+          <div v-if="isInland">
+            <div v-if="!areaShow" class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.region") }}: </span>
+              <div class="cust_vantBorder">
+                <div class="filedInpPad">
+                  <van-field @click-input="fieldValueInpClk" readonly clearable v-model="fieldValue"
+                    :placeholder="$t('user.regionPlace')">
+                    <template #right-icon>
+                      <div class="l-flex-RC">
+                        <van-icon v-if="fieldValue" @click="
+                          fieldValue = '';
+                        accountDetail.areaId = '';
+                        " class="o-mr-6" name="clear" />
+                        <van-icon @click="fieldValueInpClk" name="arrow-down" />
+                      </div>
+                    </template>
+                  </van-field>
+                </div>
               </div>
+              <van-icon name="edit" class="editIcon" @click="editClk(4)" />
+            </div>
+            <div v-else class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.region") }}: </span>
+              <span>{{ fieldValue }}</span>
+              <van-icon name="edit" class="editIcon" @click="editClk(4)" />
             </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(4)" />
-          </div>
-          <div v-else class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.region") }}: </span>
-            <span>{{ fieldValue }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(4)" />
           </div>
           <!-- 手机号 -->
           <div v-if="!phoneNumberShow" class="userInfo l-flex-between">
@@ -87,24 +89,26 @@
             <van-icon name="edit" class="editIcon" @click="editClk(2)" />
           </div>
           <!-- 关联上级 -->
-          <div v-if="!relationType" class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
-            <div class="cust_vantBorder">
-              <van-field class="relationClass" v-model="cofficentForm.associateParent"
-                :placeholder="$t('user.associateParentPlace')">
-                <template #button>
-                  <van-button type="primary" @click="mailboxChg(cofficentForm.associateParent, 1)">{{
-                    $t("user.confirmLog") }}
-                  </van-button>
-                </template>
-              </van-field>
+          <div v-if="isInland">
+            <div v-if="!relationType" class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
+              <div class="cust_vantBorder">
+                <van-field class="relationClass" v-model="cofficentForm.associateParent"
+                  :placeholder="$t('user.associateParentPlace')">
+                  <template #button>
+                    <van-button type="primary" @click="mailboxChg(cofficentForm.associateParent, 1)">{{
+                      $t("user.confirmLog") }}
+                    </van-button>
+                  </template>
+                </van-field>
+              </div>
+              <van-icon name="edit" class="editIcon" @click="editClk(1)" />
+            </div>
+            <div v-else class="userInfo l-flex-between">
+              <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
+              <span>{{ relationAdminName }}</span>
+              <van-icon name="edit" class="editIcon" @click="editClk(1)" />
             </div>
-            <van-icon name="edit" class="editIcon" @click="editClk(1)" />
-          </div>
-          <div v-else class="userInfo l-flex-between">
-            <span class="userInfoLeft">{{ $t("user.associateParent") }}: </span>
-            <span>{{ relationAdminName }}</span>
-            <van-icon name="edit" class="editIcon" @click="editClk(1)" />
           </div>
 
           <!-- 自定义货币符号 -->