feat：“同步11.01”

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,16 +400,21 @@
     "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",
     "cupQuantity": "Cup quantity",
+    "numberOneTm": "NO.1000",
+    "candyGeneratorTm": "Generator temperature",
+    "outsideTm": "Outside temperature",
+    "outsidehd": "Humidity outside cabinet",
+    "noData": "No data available",
     "temperatureInCabinet": "Temperature in cabinet",
     "humidityInCabinet": "Humidity in cabinet",
     "showGoods": "Block or display goods",
@@ -490,9 +496,9 @@
     "turnOnSleep": "Turn on Sleep",
     "communiChannel": "Communication channel",
     "tweets": "Tweets",
-    "mq": "Mq",
+    "mq": "MQ",
     "versionNo": "Version No",
-    "url": "url",
+    "url": "URL",
     "urlPlace": "please enter the url",
     "update": "to update",
     "sureUpdate": "Are you sure you want to update",
@@ -597,9 +603,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 +1222,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 +1254,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 +1273,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 +1282,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",
@@ -1357,7 +1363,14 @@
     "D438": "Y Zero Compensation",
     "D440": "Z Zero Compensation",
     "M502": "Start out of material monitoring",
-    "M506": "Outer Loop Button"
+    "M506": "Outer Loop Button",
+    "D148": "No.1001",
+    "D195": "No.1002",
+    "D486": "No.1003",
+    "D487": "No.1004",
+    "D489": "No.1005",
+    "D396": "No.1006",
+    "D491": "No.1007"
   },
   "accountOperation": {
     "title": "Acount operation",

src/assets/language/zh.json

@@ -236,6 +236,7 @@
     "managementCenter": "设备管理中心",
     "setAlarm": "设置闹钟",
     "equipmentName": "设备名称",
+    "equipmentNameTips": "暂未设置名称",
     "selectDevice": "选择设备",
     "selectTime": "选择时间",
     "selectTheNumberOfAlarmClockRepetitions": "选择闹钟重复次数",
@@ -411,6 +412,11 @@
     "stirringTemperature": "搅拌温度",
     "cornGeneratorTemperature": "玉米发生器温度",
     "cupQuantity": "杯子剩余量",
+    "numberOneTm": "NO.1000",
+    "candyGeneratorTm": "发生器温度",
+    "outsideTm": "柜外温度",
+    "outsidehd": "柜外湿度",
+    "noData": "暂无数据",
     "showGoods": "屏蔽/显示商品",
     "editCheck": "是否确认更改？",
     "unknownError": "未知错误！",
@@ -507,9 +513,9 @@
     "turnOnSleep": "开启睡眠",
     "communiChannel": "通信通道",
     "tweets": "个推",
-    "mq": "Mq",
+    "mq": "MQ",
     "versionNo": "版本号",
-    "url": "url",
+    "url": "URL",
     "urlPlace": "请输入url",
     "update": "更新",
     "sureUpdate": "确定需要更新吗",
@@ -853,7 +859,7 @@
     "to": "至",
     "endTime": "结束时间",
     "clickSearch": "点击搜索",
-    "selectFullTime": "选择完整时间",
+    "selectFullTime": "选择年月日小时",
     "refundAmount": "退款金额",
     "refundPlace": "请选择退款商品",
     "refundCheck": "是否确认退款？",
@@ -1371,7 +1377,14 @@
     "D438": "Y零点补偿",
     "D440": "Z零点补偿",
     "M502": "启动缺物料监控",
-    "M506": "外循环按钮"
+    "M506": "外循环按钮",
+    "D148": "No.1001",
+    "D195": "No.1002",
+    "D486": "No.1003",
+    "D487": "No.1004",
+    "D489": "No.1005",
+    "D396": "No.1006",
+    "D491": "No.1007"
   },
   "accountOperation": {
     "title": "账户操作",

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,10 +178,10 @@
         }
   
         .bd4 {
-          width: 15%;
+          width: 10%;
           height: 36px;
-          margin: 10px 0 0 32px;
-  
+          margin: 10px 0 0 15px;
+          
           .outer1 {
             width: 41px;
             height: 17px;

src/styles/deviceSet/index.less

@@ -352,7 +352,7 @@
                     font-size: 13px;
                     text-align: left;
                     white-space: nowrap;
-                    line-height: 18px;
+                    line-height: 13px;
                     display: block;
                     background-color: rgba(229, 154, 109, 1);
                 }
@@ -362,7 +362,7 @@
                 height: 17px;
                 width: 50px;
                 flex: 0 0 40px;
-                margin: 6px 0 0 28px;
+                margin: 6px 0 0 30px;
 
                 .box3 {
                     width: 45px;

src/styles/distributionSet/index.less

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

src/styles/orderCenter/index.less

@@ -495,11 +495,11 @@
             }
 
             .word11 {
-              height: 13px;
+              height: 14px;
               width: 4.5rem;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
-              font-size: 13px;
+              font-size: 14px;
               white-space: nowrap;
               line-height: 14px;
               margin-top: 10px;
@@ -519,8 +519,8 @@
               width: 4.375rem;
               overflow-wrap: break-word;
               color: rgba(64, 77, 116, 1);
-              font-size: 13px;
-              line-height: 14px;
+              font-size: 14px;
+              line-height: 15px;
               display: block;
               overflow: hidden;
               text-overflow: ellipsis;
@@ -534,7 +534,7 @@
               font-size: 12px;
               text-align: left;
               white-space: nowrap;
-              line-height: 14px;
+              line-height: 12px;
               display: block;
               margin-top: 40px;
             }

src/styles/orderExport/index.less

@@ -193,7 +193,7 @@
                         white-space: nowrap;
                         line-height: 13px;
                         display: block;
-                        margin: 10px 0 0 20px;
+                        margin: 10px 10px 0 0;
                     }
                 }
 

src/styles/robotRanking/index.less

@@ -308,7 +308,7 @@ button:active {
                 }
 
                 .robotLabelName {
-                    width: 22%;
+                    width: 25%;
                 }
 
                 .mod3 {

src/views/alarmHistory/historySearch.vue

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

src/views/device/alarmClock.vue

@@ -100,17 +100,23 @@ 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.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.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 }}
@@ -75,7 +75,7 @@
         </div>
         <div class="operText">{{ $t("device.modulation") }}</div>
       </div>
-      <div class="operItem" @click="recharge()">
+      <div v-if="user.ifForeign == '0'" class="operItem" @click="recharge()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/recharge.png" />
         </div>
@@ -87,7 +87,7 @@
         </div>
         <div class="operText">{{ $t("device.parameterSetting") }}</div>
       </div>
-      <div class="operItem" @click="saveProportionPush()">
+      <div v-if="user.ifForeign == '0'" class="operItem" @click="saveProportionPush()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/saveProportion.png" />
         </div>

src/views/device/deviceSearch.vue

@@ -174,6 +174,10 @@ export default {
     const equimentTypeShow = ref(false); // 设备机型级联状态
     const equimentTypeOptions = ref([
       {
+        text: 'MG330',
+        value: 'MG330',
+      },
+      {
         text: 'MG320',
         value: 'MG320',
       },

src/views/device/deviceSet.vue

@@ -12,23 +12,23 @@
           </div>
           <div class="mod2 flex-col"></div>
         </div>
-        <van-field colon readonly v-model="deviceDetal.clientId" :label="`${$t('device.equipmentCode')}`"
+        <van-field readonly v-model="deviceDetal.clientId" :label="`${$t('device.equipmentCode')}`"
           placeholder="" />
         <div class="cust_vantBorder">
-          <van-field colon required clearable v-model="deviceDetal.name" name="name"
+          <van-field required clearable v-model="deviceDetal.name" name="name"
             :label="`${$t('device.equipmentNameLabel')}`" :placeholder="$t('device.equipmentNamePlaceholder')" :rules="[
               {
                 required: true,
                 message: $t('device.equipmentNamePlaceholder'),
               },
             ]" />
-          <van-field colon clearable v-model="deviceDetal.selfName" :label="`${$t('device.equipmentRemarksLabel')}`"
+          <van-field clearable v-model="deviceDetal.selfName" :label="`${$t('device.equipmentRemarksLabel')}`"
             :placeholder="$t('device.equipmentRemarksPlaceholder')" />
+          <div></div>
         </div>
-        <van-field colon readonly v-model="deviceDetal.adminUserName" :label="`${$t('device.affiliatedMerchant')}`"
-          placeholder="" />
+        <van-field readonly v-model="deviceDetal.adminUserName" :label="`${$t('device.affiliatedMerchant')}`" />
         <!-- 地区 -->
-        <div v-if="areaShow" class="bd7 l-flex-between">
+        <!-- <div v-if="areaShow" class="bd7 l-flex-between">
           <div class="l-flex-RC">
             <div class="cust_vantBorder">
               <div class="filedInpPad">
@@ -57,16 +57,16 @@
               <van-icon @click="areaShow = !areaShow" size="20" name="edit" />
             </template>
           </van-field>
-        </div>
-        <van-field colon readonly v-model="deviceDetal.equimentType" :label="`${$t('device.machineType')}`"
+        </div> -->
+        <van-field readonly v-model="deviceDetal.equimentType" :label="`${$t('device.machineType')}`"
           placeholder="" />
         <!-- mg280才有到期时间 -->
         <template v-if="deviceDetal?.equimentType?.indexOf('mg280') !== -1">
-          <van-field colon readonly v-model="deviceDetal.lastUseDate" :label="`${$t('device.expirationTime')}`"
+          <van-field readonly v-model="deviceDetal.lastUseDate" :label="`${$t('device.expirationTime')}`"
             placeholder="" />
         </template>
         <div class="bd9 l-f">
-          <van-field colon readonly :label="`${$t('device.equipmentLabel')}`" placeholder="">
+          <van-field readonly :label="`${$t('device.equipmentLabel')}`" placeholder="">
             <template #input>
               <div class="box2 l-flex-RC l-flex-w" v-if="tagsList.arr.length > 0">
                 <div class="word8 o-mr-6 o-p-6 c-radius-2 o-mb-10" v-for="(item, index) in tagsList.arr" :key="index">
@@ -86,11 +86,12 @@
             </template>
           </van-field>
         </div>
+        <div class="custom-line"></div>
         <div v-if="isAdmind" class="bd9 l-f">
-          <van-field colon readonly :label="`${$t('device.adRule')}`" placeholder="">
+          <van-field readonly :label="`${$t('device.adRule')}`" placeholder="">
             <template #input>
               <div class="box2 l-flex-RC l-flex-w" v-if="adRuleList.length > 0">
-                <div class="word8 o-mr-6 o-p-6 c-radius-2 o-mb-10" v-for="(item, index) in adRuleList" :key="index">
+                <div class="word8 o-mr-6 o-p-6 c-radius-2 o-mb-5" v-for="(item, index) in adRuleList" :key="index">
                   {{ item.name }}
                 </div>
               </div>
@@ -106,26 +107,28 @@
               </div>
             </template>
           </van-field>
+          <div class="custom-line"></div>
         </div>
-        <!-- 优惠码功能开关 -->
-        <!-- <van-field colon readonly :label="`${$t('device.coupon')}`" placeholder=""  v-if="user.type < 2 && user.ifForeign === '0' ">
+        <!-- 优惠券 -->
+        <!-- <van-field readonly :label="`${$t('device.coupon')}`" placeholder=""
+          v-if="user.type < 2 && user.ifForeign === '0'">
           <template #input>
             <div class="l-flex-RC">
               <span>{{ couponStatusNameComp }}</span>
-              <van-switch @change="couponStatusChg" v-model="deviceDetal.couponStatus" size="23px" active-value="1"
-                          inactive-value="0" />
+              <van-switch class="o-ml-5" @change="couponStatusChg" v-model="deviceDetal.couponStatus" size="23px"
+                active-value="1" inactive-value="0" />
             </div>
           </template>
         </van-field> -->
         <div class="cust_vantBorder">
-          <van-field colon required clearable v-model="deviceDetal.operationalName" name="operationalName"
+          <van-field required clearable v-model="deviceDetal.operationalName" name="operationalName"
             :label="`${$t('device.nameOfOperatorLabel')}`" :placeholder="$t('device.nameOfOperatorPlaceholder')" :rules="[
               {
                 required: true,
                 message: $t('device.nameOfOperatorPlaceholder'),
               },
             ]" />
-          <van-field colon required clearable v-model="deviceDetal.operationalPhone" name="operationalPhone"
+          <van-field required clearable v-model="deviceDetal.operationalPhone" name="operationalPhone"
             :label="`${$t('device.operatorTelephoneLabel')}`" :placeholder="$t('device.operatorTelephonePlaceholder')"
             :rules="[
               {
@@ -134,25 +137,29 @@
               },
             ]" />
 
-          <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
-            :placeholder="$t('device.advertisingRulesPlaceholder')" />
+          <!-- <van-field clearable v-model="deviceDetal.timeRuleId" :label="`${$t('device.advertisingRulesLabel')}:`"
+            :placeholder="$t('device.advertisingRulesPlaceholder')" /> -->
         </div>
+        <div class="custom-line"></div>
         <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver1"
-            :label="`${$t('device.messageReceiver1')}:`"
+            :label="`${$t('device.messageReceiver1')}`"
             :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
-        </div>
-        <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver2"
-            :label="`${$t('device.messageReceiver2')}:`"
+            :label="`${$t('device.messageReceiver2')}`"
             :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
-        </div>
-        <div class="cust_vantBorder">
           <van-field clearable label-width="32%" v-model="deviceDetal.messageReceiver3"
-            :label="`${$t('device.messageReceiver3')}:`"
+            :label="`${$t('device.messageReceiver3')}`"
             :placeholder="$t('device.equipmentmessageReceiverPlaceholder')" />
         </div>
-        <van-field colon readonly label-width="18%" :label="`${$t('device.paymentMethod')}`" placeholder="">
+        <div class="custom-line"></div>
+        <!-- <div class="cust_vantBorder">
+        </div>
+        <div class="cust_vantBorder">
+        </div> -->
+        <!-- 支付方式 -->
+        <!-- <van-field v-if="user.ifForeign == '0'" colon readonly label-width="18%" :label="`${$t('device.paymentMethod')}`"
+          placeholder="">
           <template #input>
             <div class="van-cell__value van-field__value radioBox">
               <van-radio-group v-model="deviceDetal.payType" direction="horizontal">
@@ -168,17 +175,22 @@
               </van-radio-group>
             </div>
           </template>
-        </van-field>
+        </van-field> -->
+        <!-- 新支付方式，暂时没用屏蔽掉，后续再添加 -->
+        <!-- <van-field v-model="paymentValue" is-link readonly :label="`${$t('device.paymentMethod')}`" placeholder="选择支付方式" @click="showPayment = true" />
+        <van-popup v-model:show="showPayment" round position="bottom">
+          <van-picker :columns="paymentColumns" @cancel="showPayment = false" @confirm="onConfirm" />
+        </van-popup> -->
         <!-- 通信通道 -->
         <template v-if="isAdmind">
-          <van-field colon readonly :label="`${$t('device.communiChannel')}`" placeholder="">
+          <van-field readonly :label="`${$t('device.communiChannel')}`" placeholder="">
             <template #input>
               <div class="van-cell__value van-field__value radioBox">
                 <van-radio-group v-model="deviceDetal.channel" direction="horizontal">
-                  <van-radio name="1" icon-size="18px">{{
+                  <van-radio name="1" icon-size="16px">{{
                     $t("device.tweets")
                   }}</van-radio>
-                  <van-radio name="2" icon-size="18px">{{
+                  <van-radio name="2" icon-size="16px">{{
                     $t("device.mq")
                   }}</van-radio>
                 </van-radio-group>
@@ -188,28 +200,28 @@
         </template>
         <!-- 花型种类 -->
         <template v-if="isAdmind && machineType === '0'">
-          <van-field colon readonly :label="`${$t('device.flowerType')}`" placeholder="">
+          <van-field readonly :label="`${$t('device.flowerType')}`" placeholder="">
             <template #input>
               <div class="van-cell__value van-field__value radioBox">
                 <van-radio-group v-model="deviceDetal.flowers" direction="horizontal">
-                  <van-radio name="18" icon-size="18px">18</van-radio>
-                  <van-radio name="22" icon-size="18px">22</van-radio>
-                  <van-radio name="26" icon-size="18px">26</van-radio>
-                  <van-radio name="30" icon-size="18px">30</van-radio>
-                  <van-radio name="42" icon-size="18px">42</van-radio>
+                  <van-radio name="18" icon-size="16px">18</van-radio>
+                  <van-radio name="22" icon-size="16px">22</van-radio>
+                  <van-radio name="26" icon-size="16px">26</van-radio>
+                  <van-radio name="30" icon-size="16px">30</van-radio>
+                  <van-radio name="42" icon-size="16px">42</van-radio>
                 </van-radio-group>
               </div>
             </template>
           </van-field>
         </template>
         <!-- 版本号 -->
-        <van-field colon readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
+        <van-field readonly v-model="deviceDetal.apkVersion" :label="`${$t('device.versionNo')}`" placeholder="" />
         <!-- url -->
         <div v-if="isAdmind" class="cust_vantBorder">
-          <van-field colon clearable class="input1" v-model="deviceDetal.url" :label="$t('device.url')"
+          <van-field center clearable class="input1" v-model="deviceDetal.url" :label="$t('device.url')"
             :placeholder="$t('device.urlPlace')">
             <template #button>
-              <van-button @click="updateUrlClk" type="primary">&nbsp;&nbsp;{{ $t("device.update")
+              <van-button class="updateBtn" @click="updateUrlClk" type="primary">&nbsp;&nbsp;{{ $t("device.update")
               }}&nbsp;&nbsp;</van-button>
             </template>
           </van-field>
@@ -218,7 +230,6 @@
           <van-button round type="primary" class="info7" native-type="submit">{{
             $t("device.submitAndPushDeviceUpdates") }}</van-button>
         </div>
-
       </div>
     </van-form>
     <!-- 地区弹窗 -->
@@ -311,6 +322,16 @@ export default {
     const isAdmind = ref(false);
     // 设备类型
     const machineType = ref('0');
+
+    const paymentColumns = [t("device.onlinePayment"), t("device.offlinePayment"), t("device.onlineAndOfflinePayment")];
+    const paymentValue = ref('');
+    const showPayment = ref(false);
+    const onConfirm = (value, index) => {
+      paymentValue.value = value;
+      deviceDetal.value.payType = index;
+      console.log(deviceDetal.value.payType);
+      showPayment.value = false;
+    };
     // 初始化页面获取列表
     onMounted(async () => {
       // 加载样式
@@ -330,7 +351,7 @@ export default {
     const getLabelDetail = () => {
       Api_getGetEquipmentToLabel({ equipmentId: route.query.deviceId }).then(
         (res) => {
-          console.log("res", res);
+          // console.log("res", res);
           if (res.data.code === "00000") {
             tagsList.arr = res.data.data;
             // 储存数据到vuex
@@ -376,7 +397,7 @@ export default {
     const getDetail = (id) => {
       Api_getAdRuleDetail({ id }).then((res) => {
         const resData = res.data.data;
-        console.log("resData", resData);
+        // console.log("resData", resData);
         adRuleList.value = [{ name: resData.name, id: resData.id }];
       });
     };
@@ -398,9 +419,11 @@ export default {
           channel: item.channel,
           messageReceiver1: item.messageReceiver1,
           messageReceiver2: item.messageReceiver2,
-          messageReceiver3: item.messageReceiver3
+          messageReceiver3: item.messageReceiver3,
+          payType: item.payType
         };
       })[0];
+      console.log(params);
       const { data } = await updateDevice(params);
       if (data.code === "00000") {
         Toast.success(t("device.modificationSucceeded"));
@@ -506,10 +529,23 @@ export default {
       adRuleList,
       machineType,
       user,
+      paymentValue,
+      paymentColumns,
+      onConfirm,
+      showPayment,
     };
   },
 };
 </script>
 <style lang="less" scoped>
 @import "../../common/style/common";
+@import "../../styles/deviceSet/index.less";
+
+.custom-line {
+  height: 1px;
+  background-color: #ebedf0;
+  /* 设置线条颜色 */
+  // margin-bottom: 10px; /* 根据需要调整线条与上方内容的间距 */
+  margin: 0 15px;
+}
 </style>

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-5 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>
@@ -130,7 +130,7 @@
                   <!-- <span class="txt5 o-ptb-10 kBordBott l-flex-RC"><span>远程开门：</span>
                     <van-button type="primary">开门</van-button>
                   </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-5 kBordBott l-flex-RC">
                       <span class="info1">{{
@@ -142,12 +142,12 @@
                   </div> -->
                   <!-- 定位-->
                   <div>
-                    <span v-if="item.latitude" class="txt5 o-ptb-4 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
@@ -158,7 +158,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>
@@ -169,7 +169,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>
@@ -183,12 +183,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>
@@ -196,15 +196,15 @@
                         {{ $t("device.wasteWater") }}：{{ Format_calcuDecial(item.wasteWater) }}%
                       </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>
                     </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>
+                  <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-8 kBordBott">{{ $t("device.alarmContent") }}：{{
                       item.alarmList && item.alarmList[0]

src/views/device/paramsSet/paramsSetInfo.vue

@@ -9,6 +9,15 @@
           <span class="txt2">{{ $t('device.equipmentName') }}：{{ deviceDetal ? deviceDetal.name : "" }}</span>
         </div>
       </div>
+      <div class="" v-if="type == '3'">
+        <van-field :label="$t('device.numberOneTm')" :model-value="(deviceDetal.numberOne == null ? $t('device.noData') : deviceDetal.numberOne + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.furnaceHeadTemperature')" :model-value="(deviceDetal.furnaceTm == null ? $t('device.noData') : deviceDetal.furnaceTm + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.candyGeneratorTm')" :model-value="(deviceDetal.candyGeneratorTm == null ? $t('device.noData') : deviceDetal.candyGeneratorTm + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.temperatureInCabinet')" :model-value="(deviceDetal.cabinetTm == null ? $t('device.noData') : deviceDetal.cabinetTm + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.humidityInCabinet')" :model-value="(deviceDetal.cabinetHd == null? $t('device.noData') : deviceDetal.cabinetHd + $t('device.humidity'))" readonly />
+        <van-field :label="$t('device.outsideTm')" :model-value="(deviceDetal.outsideTm == null ? $t('device.noData') : deviceDetal.outsideTm + $t('device.degree'))" readonly />
+        <van-field :label="$t('device.outsidehd')" :model-value="(deviceDetal.outsideHd == null? $t('device.noData') : deviceDetal.outsideHd + $t('device.humidity'))" readonly />
+      </div>
       <div class="paramsList" v-for="(item, key) in paramsList" :key="key">
         <van-field v-model="item.val" v-if="item.name != 'M502' && item.name != 'M506'" name="phone" type="tel"
           :label="paramName[key]">
@@ -43,17 +52,19 @@ export default {
     const { t } = useI18n();
     const route = useRoute();
     const deviceId = route.query.deviceId;
-    const deviceDetal = ref(null);
+    const deviceDetal = ref([]);
     const paramsTitle = ref("");
     const paramsList = ref([]);
     const comParams = ref([]);
     const paramName = ref([]);
     const checked = ref([]);
+    const type = ref("");
 
     // 初始化页面获取列表
     onMounted(async () => {
       // 加载样式
       styleUrl('paramsSet');
+      type.value = route.query.type;
       if (route.query.type === "0") {
         paramsTitle.value = t('device.generalParameterConfiguration');
       }
@@ -151,10 +162,14 @@ export default {
       paramName,
       checked,
       onUpdateValue,
+      type,
     };
   },
 };
 </script>
 <style lang="less" scoped>
 @import "../../../common/style/common";
+.paramsValue {
+  margin: 0 40px;
+}
 </style>

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();
     });
 
 

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,28 @@ 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 +123,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,7 @@ export default {
   setup() {
     const { t } = useI18n();
     const router = useRouter();
+    const total =  ref(0);
     // 点击去详情
     const toDetail = (e) => {
       if (e) {
@@ -139,6 +140,7 @@ export default {
     const tabChg = (e) => {
       tabActive.value = e;
       onRefresh(1);
+      total.value = 0;
     };
     // 分页
     const pageNo = ref(1);
@@ -195,7 +197,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 +219,7 @@ export default {
       tabActive,
       tabList,
       Format_time,
+      total,
     };
   },
 };

src/views/merchantManage/index.vue

@@ -30,17 +30,17 @@
                 <!-- <div class="group6 flex-col"></div> -->
               </div>
               <span class="word4"
-                v-html="`${$t('merchantManage.telephone')}:` + (item.phone == null ? '' : item.phone)"></span>
+                v-html="`${$t('merchantManage.telephone')}：` + (item.phone == null ? '' : item.phone)"></span>
               <span class="word5"
-                v-html="`${$t('merchantManage.mailbox')}:` + (item.email == null ? '' : item.email)"></span>
+                v-html="`${$t('merchantManage.mailbox')}：` + (item.email == null ? '' : item.email)"></span>
               <span class="word6"
-                v-html="`${$t('merchantManage.loginTime')}:` + (item.loginDate == null ? '' : item.loginDate)"></span>
+                v-html="`${$t('merchantManage.loginTime')}：` + (item.loginDate == null ? '' : Format_time(item.loginDate))"></span>
               <span class="info6"
-                v-html="`${$t('merchantManage.loginIPAddress')}:` + (item.loginIp == null ? '' : item.loginIp)"></span>
+                v-html="`${$t('merchantManage.loginIPAddress')}：` + (item.loginIp == null ? '' : item.loginIp)"></span>
               <span class="txt2"
-                v-html="`${$t('merchantManage.managementSystemId')}:` + (item.managerId == null ? '' : item.managerId)"></span>
+                v-html="`${$t('merchantManage.managementSystemId')}：` + (item.managerId == null ? '' : item.managerId)"></span>
               <div class="box3 flex-col">
-                <span class="txt3" v-html="`${$t('merchantManage.creationTime')}:` + Format_time(item.createDate)"></span>
+                <span class="txt3" v-html="`${$t('merchantManage.creationTime')}：` + Format_time(item.createDate)"></span>
               </div>
               <div class="button-container">
                 <van-button v-if="user.type < 2" class="btn1" round type="success" @click="autoLogin(item.id)">切换登陆</van-button>

src/views/orderCenter/index.vue

@@ -58,7 +58,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') }}
@@ -99,14 +99,18 @@
                     <template #price>
                       <div class="pricBox flex-row align-end" :class="{ orderError: item.status === 0 }">
                         <span class="txt9">{{ item.statusText }}：</span>
+                        <!-- 订单明细 - 线下支付 ￥ -->
                         <!-- <span class="info5">&yen;</span> -->
                         <span class="info5">{{ currencySymbol }}</span>
                         <span class="word12" v-if="item.status === 3">{{ item.price.toFixed(2) }}</span>
                         <span class="word12" v-else>{{ item.refundAmount == null ? item.price.toFixed(2) : (item.price -
                           item.refundAmount).toFixed(2) }}</span>
-                        <!-- <span class="word14">{{ $t('orderCenter.dividingDomesticService') }}：&yen;{{ showSubcom(item)}}</span> -->
-                        <span class="word14">{{ $t('orderCenter.dividingDomesticService') }}：{{ currencySymbol
-                        }}{{ showSubcom(item) }}</span>
+                        <!-- 分佣￥ -->
+                        <!-- <span class="word14">{{ $t('orderCenter.dividingDomesticService') }}：&yen;{{ showSubcom(item)
+                        }}</span> -->
+                        <span v-if="user.ifForeign === '0'" class="word14">{{ $t('orderCenter.dividingDomesticService')
+                        }}：{{ currencySymbol }}{{ showSubcom(item)
+}}</span>
                       </div>
                     </template>
                     <template #price-top>
@@ -398,9 +402,15 @@ export default {
     const showSugerPhoto = (row) => {
       if (row.orderDetails != null) {
         if (row.orderDetails.length > 0) {
+          if (row.orderDetails[0].productNo == 'A99') {
+            return require(`../../assets/order/spunSugar/goods/A30.png`);
+          }
           return require(`../../assets/order/spunSugar/goods/${row.orderDetails[0].productNo}.png`);
         } else {
           if (row.productNo != null) {
+            if (row.productNo == 'A99') {
+              return require(`../../assets/order/spunSugar/goods/A30.png`);
+            }
             return require(`../../assets/order/spunSugar/goods/${row.productNo}.png`);
           }
           if (row.machineType == null || row.machineType == '0') {
@@ -419,6 +429,9 @@ export default {
     };
     // 订单明细商品图片路径处理
     const showSugarPic = (row) => {
+      if (row == 'A99') {
+        return require(`../../assets/order/spunSugar/goods/A30.png`);
+      }
       return require(`../../assets/order/spunSugar/goods/${row}.png`);
     };
     // 如果是空数据
@@ -745,7 +758,7 @@ export default {
         clientId:
           searchParams.clientId === "" ? null : searchParams.clientId,
         equipmentId:
-          searchParams.equipmentId === "" ? null : searchParams.equipmentId, 
+          searchParams.equipmentId === "" ? null : searchParams.equipmentId,
         payType:
           searchParams.payType === "" ? null : searchParams.payType,
         companyType: searchParams.companyType,

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/orderExport/index.vue

@@ -58,9 +58,9 @@
             <div v-for="(item, index) in tableData" :key="index" class="orderItem">
               <div class="mod9 flex-row">
                 <!-- <span class="info7">&yen;</span> -->
+                <span class="word9">{{ $t("orderExport.totalSales") }}</span>
                 <span class="info7">{{ currencySymbol }}</span>
                 <span class="info8">{{ item.priceTotal }}</span>
-                <span class="word9">{{ $t("orderExport.totalSales") }}</span>
               </div>
               <div class="mod10 flex-row">
                 <span class="txt3 o-mr-10">{{ item.username }}</span>

src/views/settlement/index.vue

@@ -55,8 +55,8 @@
           <div v-if="altMerchantType == 12" class="requiredLeft">
             <!-- 商户名称 -->
             <div class="cell-input">
-              <van-popover v-model:show="regNameVisible" trigger="manual" placement="top" 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="regNameValue" name="regNameValue" :label="$t('huifuMch.huifuRegName')"
                     :placeholder="$t('huifuMch.huifuRegNamePlaceholder')"
@@ -798,6 +798,10 @@ export default {
               huifuPicUpStatus.value = 1;
             }
           }
+          if (data.data.status === '0') {
+            huifuPicUpStatus.value = 0;
+            console.log(huifuPicUpStatus.value)
+          }
         }
       }
     }
@@ -1253,5 +1257,4 @@ export default {
 <style lang="less" scoped>
 @import "../../common/style/common.less";
 @import "../../styles/joinpayMch/index.less";
-
 </style>

src/views/taskMessage/proportion/index.vue

@@ -27,13 +27,16 @@
           <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">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.agencyName
                 }}<span class="itemTitle discount">{{ $t('taskMessage.proportion') }}:&nbsp;</span>{{
-  item.agencyProportion
-}}%
+  item.agencyProportion }}%
               </div>
               <div class="itemRow" v-if="item.type >= 2">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.merchantName