Pārlūkot izejas kodu

style:“优化部分样式”

soobin 1 gadu atpakaļ
vecāks
revīzija
c9651e2c3c

BIN
src/assets/accountOperation/right.png


BIN
src/assets/line.png


BIN
src/assets/right.png


+ 1 - 1
src/components/NavBar.vue

@@ -37,7 +37,7 @@
     <van-tabbar-item replace to="/home" icon="home-o">{{ $t('navBar.homePage') }}</van-tabbar-item>
     <van-tabbar-item replace to="/device" icon="setting-o">{{ $t('navBar.deviceInformation')}}</van-tabbar-item>
     <van-tabbar-item replace to="/robotranking" icon="bar-chart-o">{{ $t('navBar.machineRanking')}}</van-tabbar-item>
-    <van-tabbar-item replace to="/user" icon="friends-o">{{ $t('navBar.personalCenter') }}</van-tabbar-item>
+    <van-tabbar-item replace to="/user" icon="user-o">{{ $t('navBar.personalCenter') }}</van-tabbar-item>
   </van-tabbar>
   <!-- </div> -->
 </template>

+ 1 - 1
src/styles/accountOperation/index.less

@@ -83,7 +83,7 @@
           position: absolute;
           width: 6px;
           height: 12px;
-          background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
+          background: url('../../assets/accountOperation/right.png') top center no-repeat;
           background-size: 100%;
           right: 0.55rem;
           top: 0.5rem;

+ 1 - 1
src/styles/taskMessage/index.less

@@ -63,7 +63,7 @@
           position: absolute;
           width: 6px;
           height: 12px;
-          background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
+          background: url('../../assets/right.png') top center no-repeat;
           background-size: 100%;
           right: 0.55rem;
           top: 0.5rem;

+ 1 - 1
src/styles/user/index.less

@@ -288,7 +288,7 @@
                         position: absolute;
                         width: 6px;
                         height: 12px;
-                        background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
+                        background: url('../../assets/right.png') top center no-repeat;
                         background-size: 100%;
                         right: 0.55rem;
                         top: 0.5rem;

+ 7 - 7
src/views/changePassword.vue

@@ -23,11 +23,11 @@ import md5 from 'js-md5';
 import { ref } from 'vue';
 import { showToast, showFailToast } from 'vant';
 import sHeader from "@/components/SimpleHeader";
-// import { useRouter, useRoute } from "vue-router";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
+// import { useRouter } from "vue-router";
 import { updatePassword } from '@/service/changePassword';
 import { useI18n } from 'vue-i18n';
-import { getLoginUser } from "@/common/js/utils";
+// import { getLoginUser } from "@/common/js/utils";
 import { styleUrl } from '../common/js/utils';
 
 export default {
@@ -35,8 +35,8 @@ export default {
     // 引入语言
     const { t } = useI18n();
     const router = useRouter();
-    // const route = useRoute();
-    const user = getLoginUser();
+    const route = useRoute();
+    // const user = getLoginUser();
     const password = ref('');
     const passwordCheck = ref('');
     // 加载样式
@@ -48,8 +48,8 @@ export default {
         return false;
       }
       const { data } = await updatePassword({
-        // username: route.query.name,
-        username: user.username,
+        username: route.query.name,
+        // username: user.username,
         password: md5(password.value)
       });
       if (data.code === '00000') {

+ 1 - 1
src/views/device/alarmClock.vue

@@ -17,7 +17,7 @@
         <img
             class="img2"
             referrerpolicy="no-referrer"
-            src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a"
+            src="../../assets/line.png"
         />
       </div>
       <div v-for="(item, index) in list" :key="index" >

+ 1 - 1
src/views/device/deviceSet.vue

@@ -8,7 +8,7 @@
           <div class="mod1 flex-col">
             <span class="word2">{{ $t("device.essentialInformation") }}</span>
             <img class="pic1" referrerpolicy="no-referrer"
-              src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a" />
+              src="../../assets/line.png" />
           </div>
           <div class="mod2 flex-col"></div>
         </div>

+ 36 - 36
src/views/device/diyFlower/index.vue

@@ -8,41 +8,41 @@
         <span class="c-text-color c-text-14">{{ equipmentName }}</span>
       </div>
     </div>
-  </div>
-  <van-cell center :title="checked ? $t('DIYFlower.openStatus') : $t('DIYFlower.closeStatus')" size="large"
-    title-style="color: #404d74;">
-    <template #right-icon>
-      <van-switch :model-value="checked" @update:model-value="updateStatus" size="24" />
-    </template>
-  </van-cell>
-  <van-collapse v-if="checked" v-model="activeNames">
-    <van-collapse-item :title="$t('DIYFlower.shape')" name="1" size="large" title-style="color: #404d74;">
-      <van-row class="goods">
-        <van-col v-for="(item, index) in shapeData" :key="index" class="goodsCon o-mlr-5 o-mb-20" span="11">
-          <div class="l-flex-RC">
-            <van-image width="50" height="50" fit="contain" :src="showSugerPhoto(item)" />
-            <span class="o-ml-10" style="color: #000;word-wrap: break-word; width: 50px;">{{ item.name }}</span>
-            <van-checkbox class="o-ml-10" shape="square" v-model="shapeStates[index]" @change="shapeChange(index)" />
-          </div>
-        </van-col>
-      </van-row>
-    </van-collapse-item>
-    <van-collapse-item :title="$t('DIYFlower.sugar')" name="2" size="large" title-style="color: #404d74;">
-      <van-row class="goods">
-        <van-col v-for="(item, index) in sugarData" :key="index" class="goodsCon o-mlr-5 o-mb-20" span="11">
-          <div class="l-flex-RC">
-            <van-image width="50" height="50" fit="contain" :src="showSugerPhoto(item)" />
-            <span class="o-ml-10" style="color: #000;word-wrap: break-word; width: 50px;">{{ item.name }}</span>
-            <van-checkbox class="o-ml-10" shape="square" v-model="sugarStates[index]" @change="sugarChange(index)" />
-          </div>
-        </van-col>
-      </van-row>
-    </van-collapse-item>
-  </van-collapse>
-  <div class="l-flex-center" v-if="checked" style="margin: 16px">
-    <van-button round block class="Btn" type="primary" native-type="submit" @click="updateShowGoods()">
-      {{ $t('device.submitAndPushDeviceUpdates') }}
-    </van-button>
+    <van-cell center :title="checked ? $t('DIYFlower.openStatus') : $t('DIYFlower.closeStatus')" size="large"
+      title-style="color: #404d74;">
+      <template #right-icon>
+        <van-switch :model-value="checked" @update:model-value="updateStatus" size="24" />
+      </template>
+    </van-cell>
+    <van-collapse v-if="checked" v-model="activeNames">
+      <van-collapse-item :title="$t('DIYFlower.shape')" name="1" size="large" title-style="color: #404d74;">
+        <van-row class="goods">
+          <van-col v-for="(item, index) in shapeData" :key="index" class="goodsCon o-mlr-5 o-mb-20" span="11">
+            <div class="l-flex-RC">
+              <van-image width="50" height="50" fit="contain" :src="showSugerPhoto(item)" />
+              <span class="o-ml-10" style="color: #000;word-wrap: break-word; width: 50px;">{{ item.name }}</span>
+              <van-checkbox class="o-ml-10" shape="square" v-model="shapeStates[index]" @change="shapeChange(index)" />
+            </div>
+          </van-col>
+        </van-row>
+      </van-collapse-item>
+      <van-collapse-item :title="$t('DIYFlower.sugar')" name="2" size="large" title-style="color: #404d74;">
+        <van-row class="goods">
+          <van-col v-for="(item, index) in sugarData" :key="index" class="goodsCon o-mlr-5 o-mb-20" span="11">
+            <div class="l-flex-RC">
+              <van-image width="50" height="50" fit="contain" :src="showSugerPhoto(item)" />
+              <span class="o-ml-10" style="color: #000;word-wrap: break-word; width: 50px;">{{ item.name }}</span>
+              <van-checkbox class="o-ml-10" shape="square" v-model="sugarStates[index]" @change="sugarChange(index)" />
+            </div>
+          </van-col>
+        </van-row>
+      </van-collapse-item>
+    </van-collapse>
+    <div class="l-flex-center" v-if="checked" style="margin: 16px">
+      <van-button round block class="Btn" type="primary" native-type="submit" @click="updateShowGoods()">
+        {{ $t('device.submitAndPushDeviceUpdates') }}
+      </van-button>
+    </div>
   </div>
 </template>
 
@@ -85,9 +85,9 @@ export default {
       const name = route.query.name || "";
       const diyFlowerStatus = route.query.diyFlowerStatus || "";
 
+      cofficentForm.equipmentId = id;
       if (diyFlowerStatus == "1") {
         checked.value = true;
-        cofficentForm.equipmentId = id;
         getList();
       }
       if (id) {

+ 1 - 1
src/views/device/modulation.vue

@@ -9,7 +9,7 @@
           <span class="info1">{{ $t('device.equipmentName') }}:{{ deviceDetal ? deviceDetal.name : '' }}</span>
         </div>
         <img class="img1" referrerpolicy="no-referrer"
-             src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a" />
+             src="../../assets/line.png" />
       </div>
       <div class="box4 flex-row justify-between">
         <span class="word3">{{ $t('device.slideSliderToAdjustVolume') }} : {{ volume }}</span>

+ 7 - 3
src/views/device/viewLogs/index.vue

@@ -11,8 +11,7 @@
         <van-date-picker :min-date="minDate" :max-date="maxDate" @confirm="selectTime" @cancel="showPicker = false" />
       </van-popup>
       <van-cell-group>
-        <van-field readonly v-model="message" rows="2" autosize label="使用教程" type="textarea"
-          show-word-limit />
+        <van-field readonly v-model="message" rows="2" autosize label="使用教程" type="textarea" show-word-limit />
       </van-cell-group>
       <div class="button-container">
         <van-button round style="padding: 1em 2em;" type="primary" @click="uploadLogBtn">上传</van-button>
@@ -213,7 +212,12 @@ export default ({
       // 文件名
       const newFileName = fileName.value;
       try {
-        const response = await fetch(fileUrl);
+        const response = await fetch(fileUrl, {
+          headers: {
+            'Cache-Control': 'no-store', // 禁用缓存
+            'Pragma': 'no-cache',
+          }
+        });
         console.log('response', response);
 
         // 将文件内容创建为Blob

+ 1 - 1
src/views/merchantManage/set.vue

@@ -14,7 +14,7 @@
             </div>
             <!-- <div class="section2 flex-col"></div> -->
             <img class="img1" referrerpolicy="no-referrer"
-              src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a" />
+              src="../../assets/line.png" />
           </div>
           <div v-if="tabType === '0'">
             <!-- <div class="wrap2 l-flex-RC">

+ 1 - 1
src/views/orderExport/index.vue

@@ -49,7 +49,7 @@
                 </div>
               </div>
               <img class="img2" referrerpolicy="no-referrer"
-                src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a" />
+                src="../../assets/line.png" />
             </div>
           </div>
           <!-- <van-pull-refresh disabled v-model="refreshing" @refresh="onRefresh"> -->

+ 1 - 1
src/views/robotRanking.vue

@@ -27,7 +27,7 @@
                 </div>
               </div>
               <img class="img1" referrerpolicy="no-referrer"
-                src="https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng8947935ab81635fdedd8124b11e305eef66286421b69c84fef22233014a3fa9a" />
+                src="../assets/line.png" />
             </div>
           </div>
           <div class="l-f l-flex-e o-plr-15">

+ 1 - 1
src/views/taskMessage/index.less

@@ -63,7 +63,7 @@
           position: absolute;
           width: 6px;
           height: 12px;
-          background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
+          background: url('../../assets/right.png') top center no-repeat;
           background-size: 100%;
           right: 0.55rem;
           top: 0.5rem;