fix：“优化子商家修改功能”

src/assets/language/en.json

@@ -56,6 +56,7 @@
     "usernamePlaceholder": "Please enter the account number",
     "passwordLabel": "password",
     "passwordPlaceholder": "Please input a password",
+    "editPasswordPlaceholder": "If it's empty, it stays the same by default",
     "nameLabel": "full name",
     "namePlaceholder": "Please enter your name",
     "phoneLabel": "Telephone",

src/assets/language/zh.json

@@ -56,6 +56,7 @@
     "usernamePlaceholder": "请输入账号",
     "passwordLabel": "密码",
     "passwordPlaceholder": "请输入密码",
+    "editPasswordPlaceholder": "为空默认不修改",
     "nameLabel": "姓名",
     "namePlaceholder": "请输入姓名",
     "phoneLabel": "电话",

src/views/accountPer/add.vue

@@ -9,7 +9,7 @@
             { required: true, message: $t('accountPer.usernamePlaceholder') },
           ]" />
         <van-field v-model="password" name="password" type="password" :label="$t('accountPer.passwordLabel')"
-          :placeholder="$t('accountPer.passwordPlaceholder')" 
+          :placeholder="passwordPlaceholder" 
           :rules="[
             { required: havePassword, message: $t('accountPer.passwordPlaceholder') },
           ]"
@@ -108,6 +108,7 @@ export default {
       equipmentIdShow.value = false;
       equipmentIdText.value = selectedOptions[0].text;
     };
+    const passwordPlaceholder = ref("");
     const havePassword = ref(true);
     let addParams = reactive({
       username: "",
@@ -138,8 +139,10 @@ export default {
         addParams.roleList = accoutPerSet.roleList[0];
         addParams.equipmentIds = accoutPerSet.equipmentIds;
         havePassword.value = false;
+        passwordPlaceholder.value = t('accountPer.editPasswordPlaceholder')
       } else {
         pageTitle.value = t("accountPer.addAccount");
+        passwordPlaceholder.value = t('accountPer.passwordPlaceholder');
         havePassword.value = true;
       }
       getSysRoleListFun();
@@ -287,7 +290,8 @@ export default {
       selEquipConfirm,
       cofficentForm,
       busiEquipInpClk,
-      havePassword
+      havePassword,
+      passwordPlaceholder
     };
   },
 };

src/views/device/deviceOper.vue

@@ -113,12 +113,13 @@
         <div class="operText">{{ $t("device.showGoods") }}</div>
       </div>
       <!-- DIY花型 -->
-      <!-- <div class="operItem" v-if="device.equimentType == 'MG320' || device.equimentType == 'MG330'" @click="diyFlowerClk()">
+      <!-- v-if="device.equimentType == 'MG320' || device.equimentType == 'MG330'" -->
+      <div class="operItem" v-if="user.type < 1" @click="diyFlowerClk()">
         <div class="operIcon">
           <img class="operImg" src="../../assets/device/operIcon/diyFlower.png" />
         </div>
         <div class="operText">{{ $t("device.diyFlower") }}</div>
-      </div> -->
+      </div>
       <!-- 修改机器密码 -->
       <div v-if="user.type < 3" class="operItem" @click="changePasswordClk()">
         <div class="operIcon">