update

oem/sjgj/config/appconfig.json

@@ -13,7 +13,7 @@
     "holdvolume"
   ],
   "registrationCodeRule": 0,
-  "forcedPasswordChange": false,
+  "strongPassword": false,
   "riskType": 1,
   "i18nEnabled": false
 }

oem/tss/config/appconfig.json

@@ -1,8 +1,8 @@
 {
   "appId": "com.muchinfo.tss",
   "appName": "TCE",
-  "version": "1.0.47",
-  "versionCode": "100047",
+  "version": "1.0.48",
+  "versionCode": "100048",
   "apiUrl": "http://192.168.31.210:8080/cfg?key=test_210",
   "tradeChannel": "ws",
   "showLoginAlert": true,

src/packages/mobile/views/rules/gywm/Index.vue

@@ -3,13 +3,14 @@
         <template #header>
             <app-navbar :title="$t('routes.about')" />
         </template>
-        <component :is="asyncComponent" :url="getHtmlFileUrl('gywm.htm')" />
+        <HtmlContainer style="padding: 15px;" class="content" :context="formatHtmlString(commonStore.getDocumentById(2))" />
     </app-view>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent } from 'vue'
-import { getHtmlFileUrl } from '@/filters'
+import { useCommonStore } from '@/stores/modules/common'
+import HtmlContainer from '@mobile/components/base/html-container/index.vue'
+import { formatHtmlString } from '@/filters'
 
-const asyncComponent = defineAsyncComponent(() => import('@mobile/components/base/html-panel/index.vue'))
+const commonStore = useCommonStore()
 </script>

src/packages/mobile/views/user/forget/Index.vue

@@ -61,7 +61,7 @@ import { useNavigation } from '@mobile/router/navigation'
 import { queryLoginId } from '@/services/api/account'
 import { resetPassword, sendResetVerifyCode } from '@/services/api/common'
 import cryptojs from 'crypto-js'
-import { i18n, useUserStore } from '@/stores'
+import { i18n, useUserStore, useGlobalStore } from '@/stores'
 import { getCountryCodeList } from '@/constants/unit'
 
 defineProps({
@@ -92,6 +92,7 @@ const { router } = useNavigation()
 const formRef = ref<FormInstance>()
 const loading = ref(false)
 const isCountdown = ref(false) // 是否正在倒计时
+const globalStore = useGlobalStore()
 
 const { getSystemParamValue } = useUserStore()
 const param1010 = getSystemParamValue('1010') ?? '1'
@@ -148,10 +149,13 @@ const formRules: { [key: string]: FieldRule[] } = {
         required: true,
         message: t('user.forget.tips3'),
         validator: (val) => {
-            if (validateRules.password.validate(val)) {
-                return true
+            if (globalStore.getSystemInfo('strongPassword')) {
+                if (validateRules.password.validate(val)) {
+                    return true
+                }
+                return validateRules.password.message
             }
-            return validateRules.password.message
+            return val?.length < 6 ? '密码长度不能小于6位' : true
         }
     }],
     vcode: [{

src/packages/mobile/views/user/password/Index.vue

@@ -5,12 +5,13 @@
         </template>
         <Form ref="formRef" class="g-form__container" @submit="onSubmit">
             <CellGroup inset>
-                <Field v-model="formData.OldPwd" type="password" name="OldPwd" :label="$t('user.password.oldpwd')" :placeholder="$t('common.required')"
-                    autocomplete="off" :rules="formRules.OldPwd" />
-                <Field v-model="formData.NewPwd" name="NewPwd" type="password" :label="$t('user.password.newpwd')" :placeholder="$t('common.required')"
-                    autocomplete="off" :rules="formRules.NewPwd" />
-                <Field v-model="confirmpassword" name="confirmpassword" type="password" :label="$t('user.password.confirmpwd')" :placeholder="$t('common.required')"
-                    autocomplete="off" :rules="formRules.confirmpassword" />
+                <Field v-model="formData.OldPwd" type="password" name="OldPwd" :label="$t('user.password.oldpwd')"
+                    :placeholder="$t('common.required')" autocomplete="off" :rules="formRules.OldPwd" />
+                <Field v-model="formData.NewPwd" name="NewPwd" type="password" :label="$t('user.password.newpwd')"
+                    :placeholder="$t('common.required')" autocomplete="off" :rules="formRules.NewPwd" />
+                <Field v-model="confirmpassword" name="confirmpassword" type="password"
+                    :label="$t('user.password.confirmpwd')" :placeholder="$t('common.required')" autocomplete="off"
+                    :rules="formRules.confirmpassword" />
             </CellGroup>
         </Form>
         <template #footer>
@@ -31,7 +32,7 @@ import { validateRules } from '@/constants/regex'
 import { useAccountPassword } from '@/business/user'
 import { useLogin } from '@/business/login'
 import eventBus from '@/services/bus'
-import { i18n } from '@/stores'
+import { useGlobalStore, i18n } from '@/stores'
 
 const { getGlobalUrlParams } = useNavigation()
 const { userLogout } = useLogin()
@@ -40,6 +41,7 @@ const formRef = shallowRef<FormInstance>()
 const confirmpassword = shallowRef('')
 
 const { global: { t } } = i18n
+const globalStore = useGlobalStore()
 
 // 表单验证规则
 const formRules: { [key: string]: FieldRule[] } = {
@@ -51,10 +53,13 @@ const formRules: { [key: string]: FieldRule[] } = {
         required: true,
         message: t('user.password.tips2'),
         validator: (val) => {
-            if (validateRules.password.validate(val)) {
-                return true
+            if (globalStore.getSystemInfo('strongPassword')) {
+                if (validateRules.password.validate(val)) {
+                    return true
+                }
+                return validateRules.password.message
             }
-            return validateRules.password.message
+            return val?.length < 6 ? '密码长度不能小于6位' : true
         }
     }],
     confirmpassword: [{
@@ -84,7 +89,7 @@ const onSubmit = () => {
 
 onBeforeRouteLeave((to, from, next) => {
     const params = getGlobalUrlParams()
-    if(params.forcedPasswordChange){
+    if (params.forcedPasswordChange) {
         userLogout()
     }
     next()

src/packages/mobile/views/user/register/Index.vue

@@ -193,10 +193,13 @@ const formRules: { [key: string]: FieldRule[] } = {
     required: true,
     message: t('user.register.tips2'),
     validator: (val) => {
-      if (validateRules.password.validate(val)) {
-        return true
+      if (globalStore.getSystemInfo('strongPassword')) {
+        if (validateRules.password.validate(val)) {
+          return true
+        }
+        return validateRules.password.message
       }
-      return validateRules.password.message
+      return val?.length < 6 ? '密码长度不能小于6位' : true
     }
   }],
   confirmpassword: [{

src/packages/sbyj/views/inventory/index.vue

@@ -16,7 +16,7 @@
                         </div>
                     </div>
                     <div class="g-order-list__btnbar">
-                        <Button size="small" @click="showComponent('inOut', item, 1)" round>入库申请</Button>
+                        <!-- <Button size="small" @click="showComponent('inOut', item, 1)" round>入库申请</Button> -->
                         <Button size="small" @click="showComponent('inOut', item, 2)" round>出库申请</Button>
                         <Button size="small" @click="showComponent('logs', item, 1)" round>申请记录</Button>
                     </div>