Merge remote-tracking branch 'origin/master'

src/assets/language/en.json

@@ -443,7 +443,7 @@
     "deleteDevice": "Delete Device",
     "noPosition": "No positioning",
     "equipLocation": "Equipment location",
-    "position": "position",
+    "position": "Position",
     "view": "view",
     "oneKeyFeed": "One key feeding",
     "replenishment": "replenishment",

src/views/device/deviceOper.vue

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

src/views/device/index.vue

@@ -99,54 +99,59 @@
                     src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a"
                   />
                   <div
-                    class="layer6_7 flex-row justify-between o-ptb-10 kBordBott"
+                    class="layer6_7 flex-row justify-between o-ptb-5 kBordBott"
                   >
-                    <span class="word8 c-text-line1"
+                    <span class="info4 o-ptb-5 kBordBott"
                       >{{ $t("device.sleepState") }}：{{
                         item.isSleep
                           ? $t("device.sleeping")
                           : $t("device.notSleeping")
                       }}</span
                     >
-                    <!-- <van-switch size="24px" v-model="item.isSleep" /> -->
                   </div>
-				  <div v-if="item.isSleep" class="layer8_1 o-ptb-10">
+				  <div v-if="item.isSleep" class="layer8_1 o-ptb-8">
 					  <span class="word8_1">
 					  	<div v-if="!sleepDescBoxShow" >
-							<span>{{ $t("device.sleepDesc") }}: 
 								<van-field
+								  colon
+								  center
 								  class="word8_2"
 								  v-model="item.sleepDesc"
 								  :placeholder="$t('device.sleepDescPlace')"
+								  :label="$t('device.sleepDesc')"
+								  label-width="auto"
 								>
-								<template #button>
+								<template #button class="button_1">
 									<van-button
+
+									  size="small"
 									  type="primary"
 									  @click="sleepDescChg(item.sleepDesc, item.id)"
 									  >{{ $t("device.confirm") }}
 									</van-button>
-									<van-icon name="edit" class="editIcon" @click="editSleepDesc()" />
+									<!-- <van-icon name="edit" class="editIcon1" @click="editSleepDesc()" /> -->
+									<van-button
+									  size="small"
+									  type="primary"
+									  @click="editSleepDesc()"
+									  >{{ $t("device.cancel") }}</van-button>
 								</template>
 								</van-field>
-							</span>
+							<!-- </span> -->
 					  	</div>
 					  	<div v-else>
-					  	  <span class="word8_3" >{{ $t("device.sleepDesc") }}: 
-						  {{item.sleepDesc ==null ? $t("device.SuspendBusiness") : item.sleepDesc}}</span>
-					  	  <van-icon name="edit" class="editIcon" @click="editSleepDesc()" />
+					  	  <span class="word8_3 o-pr-10" >{{ $t("device.sleepDesc") }}:</span>
+						  <span class="word8_3">{{item.sleepDesc ==null ? $t("device.SuspendBusiness") : item.sleepDesc}}</span>
+					  	  <van-icon name="edit" size="18" class="editIcon" @click="editSleepDesc()" />
 					  	</div>
 					  </span>
 				  </div>
                   <!-- <span class="txt5 o-ptb-10 kBordBott l-flex-RC"><span>一键重启炉头：</span>
                     <van-button type="primary">重启</van-button>
                   </span> -->
-                  <div class="word9 o-ptb-10 kBordBott l-flex-between">
-                    <span>
-                      {{ $t("device.furnHeadStatus") }}: {{
-                        item.eqeStatus === 1
-                          ? $t("device.opened")
-                          : $t("device.closed")
-                      }}
+                  <div class="word9 o-ptb-10">
+                    <span class="word8_3 o-pr-5" >{{ $t("device.furnHeadStatus") }}: </span>
+					<span>{{item.eqeStatus === 1 ? $t("device.opened") : $t("device.closed")}}
                     </span>
                     <!-- <div class="l-flex-RC">
                       <van-button type="primary">开启</van-button>
@@ -157,14 +162,16 @@
                     <van-button type="primary">开门</van-button>
                   </span> -->
                   <span class="txt5 o-ptb-8">{{ item.fullName }}</span>
-                  <span
-                    v-if="item.latitude"
-                    class="txt5 o-ptb-5 kBordBott l-flex-RC"
-                    ><span>{{ $t("device.position") }}：</span>
-                    <van-button @click="viewPosiClk(item)" type="primary">{{
-                      $t("device.view")
-                    }}</van-button>
-                  </span>
+				  <div>					  
+					  <span
+						v-if="item.latitude"
+						class="txt5 o-ptb-5 kBordBott l-flex-RC"
+						><span class="txt6">{{ $t("device.position") }}：</span>
+						<van-button @click="viewPosiClk(item)" type="primary">{{
+						  $t("device.view")
+						}}</van-button>
+					  </span>
+				  </div>
                   <van-row
                     class="layer7 o-ptb-10 kBordBott"
 					justify="space-between"
@@ -904,7 +911,6 @@ export default {
           }
 
           .txt4 {
-            width: 176px;
             overflow-wrap: break-word;
             color: rgba(64, 77, 116, 1);
             font-size: 15px;
@@ -914,6 +920,8 @@ export default {
             line-height: 15px;
             display: block;
             margin: 3px 0 0 6px;
+			overflow: hidden;
+			text-overflow: ellipsis;
           }
 
           .layer2 {
@@ -945,7 +953,8 @@ export default {
           width: 100%;
           color: rgba(64, 77, 116, 1);
           font-size: 14px;
-          display: block;
+          display: flex;
+		  align-items: center;
         }
 
         .sugarTxt {
@@ -969,10 +978,14 @@ export default {
 
         .contentBottomCon {
           /deep/ .van-button--primary {
-            width: auto;
-            padding: 0 10px;
-            height: 34px !important;
+            width: 50px;
+            padding: 0 0;
+			margin: 0 8px 0 0;
+            height: 30px !important;
           }
+		  .button_1 {
+			  
+		  }
 
           .pic1 {
             width: 100%;
@@ -994,23 +1007,42 @@ export default {
 		  
 		  .layer8_1 {
 			  width: 100%;
+			  display: flex;
+			  align-items: center;
 			  
 			.word8_1 {
+				text-overflow: ellipsis;
 				width: 100%;
 				font-size: 14px;
 
 			}
 			.word8_2 {
-				width: 75%;
+				width: 100%;
+				padding: 0 0;
+					
+				/deep/.van-field__control {
+				  border: 0.5px solid #ccc; /* 添加边框 */			  
+				}
 			}
 			.word8_3 {
+				color: rgba(64, 77, 116, 1);
 				width: 70%;
 			}
 			
-			.editIcon {
+			.editIcon1 {
 			  font-size: 20px;
 			  color: #4d6add;
-			}  
+			  padding:  0 0px 5px;
+			    display: flex; /* 让元素变成弹性盒子 */
+			    // justify-content: center; /* 水平居中 */
+			    align-items: center; /* 垂直居中 */ 
+			  
+			}
+			.editIcon {
+				font-size: 20px;
+				color: #4d6add;
+				padding: 0 0 0px 5px;    
+			} 
 		  }
 
           .word9 {

src/views/device/modulation.vue

@@ -16,9 +16,9 @@
       </div>
       <div class="box4 flex-row justify-between">
         <span class="word3">{{$t('device.slideSliderToAdjustVolume')}}</span>
-        <span class="word4">{{volume}}%</span>
+        <span class="word4">{{volume}}</span>
       </div>
-      <van-slider v-model="volume"/>
+      <van-slider v-model="volume" :max="15"/>
       <van-button round type="primary" class="volumeChangeButton" @click="volumeChange()">{{$t('device.submitModification')}}</van-button>
       <!-- <div class="box6 flex-col"><span class="word5">提交修改</span></div> -->
     </div>
@@ -27,15 +27,16 @@
 <script>
 import { onMounted, ref } from 'vue';
 import sHeader from "@/components/SimpleHeader";
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { getDeviceDetal, updateVolume } from '@/service/device'
-import { Toast } from 'vant';
+import { Toast, Dialog } from 'vant';
 import { useI18n } from 'vue-i18n';
 
 export default {
   setup() {
     const { t } = useI18n();
     const route = useRoute();
+	const router = useRouter();
     const deviceId = route.query.deviceId;
     const deviceDetal = ref(null);
     const volume = ref(0);
@@ -56,11 +57,17 @@ export default {
     }
     // 音量调节保存
     const volumeChange = async () => {
-        const volumeB = 15 / 100 ;
-        const volumeC = parseInt(volume.value * volumeB);
-        const { data } = await updateVolume({id: deviceId, volume: volumeC.toString()});
-        if (data.code === '00000') {
-            Toast.success(t('device.modificationSucceeded'));
+        // const volumeB = 15 / 100 ;
+        // const volumeC = parseInt(volume.value * volumeB);
+        const { data } = await updateVolume({id: deviceId, volume: volume.value.toString()});
+        if (data.code) {
+			Dialog.alert({
+			  confirmButtonColor: '#4d6add',
+			  message: t('device.sentSuccessfully'),
+			}).then(() => {
+			 //返回上一页
+			  router.go(-1);
+			});
         } else { Toast.fail(data.message); }
         console.log('volumeChange', {equipmentId: deviceId, volume: volume.value.toString()});
     }

src/views/device/toDaySugarList.vue

@@ -11,7 +11,7 @@
 			  class="o-pt-20"
 			  v-model:loading="loading"
 			  :finished="finished"
-			  finished-text="没有更多了"
+			  :finished-text="$t('public.noMore')"
 			  @load="selectSugarListFun"
 			>
 			  <van-cell v-for="(item, index) in list" :key="index" :title="item" />

src/views/joinpayMch/index.less

@@ -52,6 +52,7 @@
   }
   .requiredLeft {
     /deep/ .van-cell__title {
+	  width: 30%;
       position: relative;
       &::after{
         content: '*';

src/views/orderCenter/index.vue

@@ -88,9 +88,9 @@
               <div v-for="(item, index) in orderList" :key="index">
                 <div class="section5 flex-col" @click="orderClick(item)">
                   <div class="flex-row align-center">
-                    <div class="sugerPhto" v-if="showSugerPhoto(item)">
+<!--                    <div class="sugerPhto" v-if="showSugerPhoto(item)">
                       <img class="sugerImg" :src="showSugerPhoto(item)" />
-                    </div>
+                    </div> -->
                     <div class="flex-col">
                       <div class="flex-row align-center">
                         <div class="main10 flex-col"></div>