style：“修复一些样式问题”

src/assets/language/en.json

@@ -413,7 +413,7 @@
     "degree": "degree",
     "volume": "volume",
     "alarmContent": "Alarm content",
-    "alarmClock":"Device alarm, please handle!",
+    "alarmClock":"Device alarm!",
     "eliminateAlarm": "Eliminate",
     "editDevice": "Device details",
     "seeMore": "See more",

src/assets/language/zh.json

@@ -413,7 +413,7 @@
     "degree": "度",
     "volume": "音量",
     "alarmContent": "报警内容",
-    "alarmClock":"设备报警，请处理！",
+    "alarmClock":"设备报警！",
     "eliminateAlarm": "消除",
     "editDevice": "设备详细信息",
     "seeMore": "查看更多",

src/styles/device/index.less

@@ -168,7 +168,7 @@
 
           .bd1 {
             width: 100%;
-            height: 18px;
+            height: 15px;
 
             .layer1 {
               background-color: #8096ec;
@@ -178,19 +178,23 @@
               margin-top: 4px;
             }
 
-            .txt1 {
-              width: 100px;
-              overflow-wrap: break-word;
-              color: rgba(64, 77, 116, 1);
-              font-size: 15px;
-              font-family: PingFangSC-Medium;
-              text-align: left;
-              white-space: nowrap;
-              line-height: 15px;
-              display: block;
-              margin: 3px 0 0 6px;
-              overflow: hidden;
-              text-overflow: ellipsis;
+            .txtBox {
+
+              width: 200px;
+              // overflow: auto;
+
+              .txt1 {
+                white-space: nowrap;
+                color: rgba(64, 77, 116, 1);
+                font-size: 15px;
+                font-family: PingFangSC-Medium;
+                text-align: left;
+                line-height: 15px;
+                display: block;
+                margin: 3px 0 0 6px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+              }
             }
 
             .layer2 {

src/styles/orderCenter/index.less

@@ -465,7 +465,7 @@
 
             .word12 {
               height: 23px;
-              width: 45px;
+              width: auto;
               overflow-wrap: break-word;
               color: rgba(77, 193, 147, 1);
               font-size: 20px;
@@ -474,7 +474,7 @@
               white-space: nowrap;
               line-height: 30px;
               display: block;
-              padding-right: 0.5em;
+              padding-right: 0.3em;
             }
 
             .word14 {

src/views/device/index.vue

@@ -55,10 +55,8 @@
                 <div class="bd1 l-flex-between">
                   <div class="l-flex-RC">
                     <div class="layer1 flex-col"></div>
-                    <span class="txt1 c-text-line1">{{ item.name }}</span>
-                    <div v-if="item.hasTodayAlarm" class="l-flex-between">
-                      <div class="box4 flex-col"></div>
-                      <span class="o-pl-2" style="color: #fe5d55">{{ $t("device.alarmClock") }}</span>
+                    <div class="txtBox">
+                      <span class="txt1">{{ item.name }}</span>
                     </div>
                   </div>
                   <div class="l-flex-RC">
@@ -67,6 +65,10 @@
                     <!-- <img class="pic1" src="../../assets/device/alarm.png" /> -->
                     <!-- <img class="pic1" src="../../assets/home/M15.png" /> -->
                     <!-- </div> -->
+                    <div v-if="item.hasTodayAlarm" class="l-flex-between o-pl-5">
+                      <div class="box4 flex-col "></div>
+                      <span class="o-pl-2" style="color: #fe5d55">{{ $t("device.alarmClock") }}</span>
+                    </div>
                     <div class="layer2 flex-col" :class="{
                       deviceOn: item.eqeStatus === 1,
                       layerLeft: item.hasTodayAlarm,
@@ -196,15 +198,15 @@
                     showDateTime(item.lastUpdateTime)
                   }}</span>
                   <span class="info2 o-ptb-5 kBordBott">{{ $t("device.volume") }}：{{ item.volume }}</span>
-                  <div class="l-flex-RC" >
+                  <div class="l-flex-RC">
                     <span class="info3 o-ptb-2 o-pr-10 kBordBott">{{ $t("device.alarmContent") }}：{{
                       item.alarmList && item.alarmList[0]
                       ? item.alarmList[0].alarmContent
                       : item.alarmContent
                     }}
-                      </span>
-                      <van-button v-if="item.alarmList && item.alarmList[0]" type="primary" size="small" color="#07c160" :text="$t('device.eliminateAlarm')"
-                       @click="clearAlarm(item.alarmList[0])"></van-button>
+                    </span>
+                    <van-button v-if="item.alarmList && item.alarmList[0]" type="primary" size="small" color="#07c160"
+                      :text="$t('device.eliminateAlarm')" @click="clearAlarm(item.alarmList[0])"></van-button>
                   </div>
                   <div class="editDeviceBtnCon l-flex-center o-mt-10">
                     <div class="l-flex-RC" @click="deviceSet(item)">

src/views/orderCenter/index.vue

@@ -243,7 +243,7 @@
         <div class="cust_vantBorder l-flex-RC">
           <div v-for="(item, index) in orderDetails" :key="index" class="card01">
             <van-checkbox v-model="isChecked[index]" @change="checkGood(index)" icon-size="20px"></van-checkbox>
-            <van-card :price="item.price" :title="item.productName" :thumb="showSugarPic(item.productNo)">
+            <van-card :price="item.price.toFixed(2)" :title="item.productName" :thumb="showSugarPic(item.productNo)">
               <template #footer>
                 <van-stepper v-model="refundNum[index]" @plus="plusRefundGood(index)" @minus="minusRefundGood(index)"
                   theme="round" button-size="22" disable-input

src/views/popPayment.vue

@@ -2,7 +2,7 @@
     <div>
         <van-nav-bar title="订单信息" />
         <van-card class="my-card" v-for="(orderDetail, index) in orderDetails" :key="index" :num="orderDetail.productNumber"
-            :price="price" :title="orderDetail.productName" :thumb="showSugarPhoto(orderDetail.productNo)" />
+            :price="orderDetail.price.toFixed(2)" :title="orderDetail.productName" :thumb="showSugarPhoto(orderDetail.productNo)" />
         <van-submit-bar :price="amount" button-color="#07c160" button-text="支付"
             @click="wxPay()" />
     </div>
@@ -25,7 +25,7 @@ export default {
         const order = ref(null);
         const orderDetails = ref([]);
         const amount = ref();
-        const price = ref();
+        // const price = ref();
 
         onMounted(async () => {
             if (status == 1) {
@@ -53,7 +53,7 @@ export default {
                 console.log("orderDetails", orderDetails.value[0]);
                 amount.value = order.value.price * 100;
                 // console.log(amount.value);
-                price.value = order.value.price.toFixed(2);
+                // price.value = order.value.price.toFixed(2);
             } else { Toast.fail(data.message); }
 
         };
@@ -89,7 +89,7 @@ export default {
             getOrder,
             orderDetails,
             showSugarPhoto,
-            price,
+            // price,
             amount
         };
     }

src/views/weChatPay.vue

@@ -24,7 +24,8 @@ export default {
 
         const wxPay = () => {
             // 处理回调接口
-            const redirectUri = encodeURIComponent('http://szwltest.sunzee.com.cn/PAY-SERVER/tOrder/callback');
+            const redirectUri = encodeURIComponent('http://szwlh.sunzee.com.cn/PAY-SERVER/tOrder/callback');
+            // const redirectUri = encodeURIComponent('http://szwltest.sunzee.com.cn/PAY-SERVER/tOrder/callback');
             const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${redirectUri}&response_type=code&scope=snsapi_base&state=${id}&connect_redirect=1#wechat_redirect`;
             console.log(url)
             window.location.replace(url);