feat：“同步2025.04.25“

src/components/SimpleHeader.vue

@@ -1,12 +1,4 @@
 <template>
-  <!-- <div class="block">
-    <header class="simple-header van-hairline--bottom" :style="{ position: isFixed ? 'fixed' : 'relative' }">
-      <i v-if="!isback" class="nbicon nbfanhui" @click="goBack"></i>
-      <i v-else></i>
-      <div class="simple-header-name">{{ name }}</div>
-      <i class="nbicon nbmore moreIcon"></i>
-    </header>
-  </div> -->
   <van-nav-bar v-if="!isback" :title="name" :border="isBorder" left-arrow @click-left="onClickLeft" :style="barStyle">
     <!-- 右侧语言切换 -->
     <template #right>
@@ -167,7 +159,6 @@ export default {
     };
 
     const onClickLeft = () => history.back();
-
     return {
       goBack,
       isback,
@@ -199,11 +190,12 @@ export default {
 
   .simple-header-name {
     white-space: nowrap;
-    font-size: 16px;
+    font-size: 15px;
     font-weight: 600;
   }
 }
 
+
 .block {
   width: 100%;
   height: 44px;
@@ -213,7 +205,6 @@ export default {
   visibility: hidden;
 }
 
-
 .current-lang {
   display: flex;
   align-items: center;
@@ -294,11 +285,9 @@ export default {
 
 /* 调整后的样式 */
 .van-cell {
-  --cell-vertical-padding: 12px;
-  /* 统一垂直间距 */
+  --cell-vertical-padding: 12px; /* 统一垂直间距 */
   display: flex;
-  align-items: center;
-  /* 主轴线居中 */
+  align-items: center; /* 主轴线居中 */
 }
 
 .flag {
@@ -307,11 +296,9 @@ export default {
   border-radius: 2px;
   margin-right: 12px;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
-  vertical-align: middle;
-  /* 行内元素垂直对齐 */
+  vertical-align: middle; /* 行内元素垂直对齐 */
   position: relative;
-  top: -1px;
-  /* 微调视觉平衡 */
+  top: -1px; /* 微调视觉平衡 */
 }
 
 .lang-content {

src/service/device/index.js

@@ -99,7 +99,7 @@ export function selectProducts(params) {
 
 // 远程做糖
 export function doSugar(params) {
-  return axios.get(`/SZWL-SERVER/tSugarDo/doSugar?${stringToUrl(params)}`);
+  return axios.post(`/SZWL-SERVER/tSugarDo/doSugar`, params);
 }
 
 // 查询做糖状态

src/views/device/doSugar.vue

@@ -258,8 +258,8 @@ export default {
         title: t('user.tips'),
         message: t('device.confirmMake')+ fieldValue.value +'?',
       }).then(async() => {
-        const { data } = await doSugar({ equipmentId: deviceId, productName: fieldValue.value, makeCodes: makeCodes.value });
-        if (data.code) {
+        const { data } = await doSugar({ equipmentId: deviceId, productName: fieldValue.value, makeCodes: makeCodes.value.join(',') });
+        if (data.code == "00000") {
           doSugartData.value = data.data;
           setTimeout(() => {
             doSugartType.value = false;

src/views/device/index.vue

@@ -120,7 +120,7 @@
                     </span>
 
                     <!-- 切换按钮 -->
-                    <van-switch :model-value="item.isSleep" size="18px" class="switch-button"
+                    <van-switch :model-value="item.isSleep" size="18px" class="switch-button" active-color="#2c87c8"
                       @click="changeSleep(item)" />
                   </div>
                 </div>
@@ -159,7 +159,7 @@
                     </span>
                     <!-- 操作按钮组 -->
                     <div class="button-group">
-                      <van-button size="small" type="primary" class="action-btn" @click="openCloseHead(item.id, 1)">
+                      <van-button size="small" color="#2c87c8" class="action-btn" @click="openCloseHead(item.id, 1)">
                         {{ $t("device.open") }}
                       </van-button>
                       <van-button size="small" type="danger" class="action-btn" @click="openCloseHead(item.id, 0)">

src/views/settlement/index.vue

@@ -55,7 +55,8 @@
           <div class="van-cell van-field requiredLeft">
             <div class="van-cell__title van-field__label"><span>结算方式</span></div>
             <div class="van-cell__value van-field__value radioBox">
-              <van-radio-group v-model="settMode" direction="horizontal" @change="fieldUpdate">
+              <van-radio-group :disabled="huifuMchNO == null || joinPayMchID == null || huifuMchNO == ''"
+                v-model="settMode" direction="horizontal" @change="fieldUpdate">
                 <van-radio :name="1" icon-size="18px">自动结算</van-radio>
                 <van-radio :name="2" icon-size="18px">手动提现</van-radio>
               </van-radio-group>
@@ -684,7 +685,7 @@ export default {
       huifuParams.regProvId = selectedOptions[0]?.value || '';
       huifuParams.regAreaId = selectedOptions[1]?.value || '';
       huifuParams.regDistrictId = selectedOptions[2]?.value || '';
-      huifuParams.regDetail = addParams.registeredAddress;
+      huifuParams.regDetail = registeredAddress.value;
       fieldUpdate();
     };
     onMounted(async () => {
@@ -787,9 +788,11 @@ export default {
           addParams.validityType = data.data.certValidityType;
           if (data.data.certBeginDate != null && data.data.certBeginDate != "") {
             beginDate.value = dateUtil.formatDate(data.data.certBeginDate);
+            huifuParams.certBeginDate = data.data.certBeginDate;
           }
           if (data.data.certEndDate != null && data.data.certEndDate != "") {
             endDate.value = dateUtil.formatDate(data.data.certEndDate);
+            huifuParams.certEndDate = data.data.certEndDate;
           }
           huifuParams.cardProvId = data.data.cardProvId;
           huifuParams.cardAreaId = data.data.cardAreaId;
@@ -820,9 +823,11 @@ export default {
             addParams.validityType1 = data.data.licenseValidityType;
             if (data.data.licenseBeginDate != null && data.data.licenseBeginDate != "") {
               beginDateLicense.value = dateUtil.formatDate(data.data.licenseBeginDate);
+              huifuParams.licenseBeginDate = data.data.licenseBeginDate;
             }
             if (data.data.licenseEndDate != null && data.data.licenseEndDate != "") {
               endDateLicense.value = dateUtil.formatDate(data.data.licenseEndDate);
+              huifuParams.licenseEndDate = data.data.licenseEndDate;
             }
             if (data.data.licensePic != null && data.data.certBackPic != null && data.data.certFrontPic != null && data.data.regAcctPic != null) {
               huifuPicUpStatus.value = 1;
@@ -906,7 +911,7 @@ export default {
         huifuParams.regName = addParams.regNameValue;
         huifuParams.licenseCode = addParams.licenseNo;
         huifuParams.licenseValidityType = addParams.validityType1;
-        huifuParams.regDetail = addParams.registeredAddress;
+        huifuParams.regDetail = registeredAddress.value;
         if (addParams.bankAccountType === '4') {
           huifuParams.cardType = '0';
           huifuParams.branchCode = addParams.bankChannelNo;

vue.config.js

@@ -4,28 +4,14 @@ module.exports = {
   publicPath: "/sc",
   assetsDir: 'static',
   css: {
-    // extract: false
-    extract:
-      process.env.NODE_ENV === "production"
-        ? {
-            filename: `css/[name].${version}.css`,
-            chunkFilename: `css/[name].${version}.css`,
-          }
-        : false,
+    extract: false
   },
-  filenameHashing: true,
+  filenameHashing: false,
   configureWebpack: {
     output: {
-      // 动态文件名配置
-      filename:
-        process.env.NODE_ENV === "production"
-          ? `js/[name].[contenthash:8].${version}.js`
-          : "js/[name].js",
-      chunkFilename:
-        process.env.NODE_ENV === "production"
-          ? `js/[name].[contenthash:8].${version}.js`
-          : "js/[name].js",
-    },
+      filename: `js/[name].${version}.js`,
+      chunkFilename: `js/[name].${version}.js`
+    }
   },
   devServer: {
     open: true,