w-ui-v1 1.0.61 → 1.0.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-ui-v1",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",

package/utils/apis/pageConfig.ts

@@ -20,7 +20,7 @@ export function addPageConfig(sourceId: string) {
 }
 
 //新增页面提交保存
-export function addPageDataSave(sourceId: string,mainCode: string, data: any) {
+export function addPageDataSave(sourceId: string,mainCode: string="", data: any) {
   return request({
     url: `/v3/dtmpl/data`,
     method: 'POST',

package/utils/index.ts

@@ -0,0 +1,18 @@
+import {
+getEnum
+} from './apis/pageConfig'
+export const getEnumer=async(pageData:any)=>{
+	let params = []
+	pageData.columns.forEach((item: any) => {
+	  if (item.controlType === 'select') {
+	    params.push(`mstrucIds=${item.mstrucId}`)
+	  }
+	  if (item.controlType === 'multiselect') {
+	    params.push(`mstrucIds=${item.mstrucId}`)
+	  }
+	
+	});
+	if (!params.length) return
+	const res = await getEnum(params.join("&"))
+	return res.data?.enumMap || {}
+}

package/w-add/w-add.vue

@@ -216,7 +216,7 @@ async function handleSubmit() {
 						})
 					}
 				})
-
+                console.log(data,'jjj')
 				try {
 					const res = await addPageDataSave(sourceId.value,mainCode.value, data)
 					if (res.data.status === 'success') {

package/w-card/w-card.vue

@@ -1,11 +1,4 @@
-<script lang="ts">
-//在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
-export default {
-  options: {
-    styleIsolation: 'shared'//使css :deep()生效
-  }
-}
-</script>
+
 <script setup lang="ts">
 import WFormMessageBox from '../w-form-message-box/w-form-message-box.vue'
 import {
@@ -242,7 +235,10 @@ const getTitleValue = (value: any, title: string) => {
   <wd-card >
 	<template #title>
 	    <view class="card-title-class">
-	     {{getTitleValue(visibleItems.find((item) => item.id === page.primaryColumn?.id), page.primaryColumn?.title) || ' '}}
+	       <view class="title-icon"></view>
+		   <view style="flex: 1; word-break:break-all">
+		   	{{getTitleValue(visibleItems.find((item) => item.id === page.primaryColumn?.id), page.primaryColumn?.title) || ' '}}
+		   </view>
 	    </view>
 	  </template>
 	
@@ -251,7 +247,7 @@ const getTitleValue = (value: any, title: string) => {
 
         <!-- // 标题 -->
         <view class="lable">
-          <text>{{ item.title }}:</text>
+          <text class="lable">{{ item.title }}:</text>
         </view>
 
         <!-- // 图片 -->
@@ -349,7 +345,7 @@ const getTitleValue = (value: any, title: string) => {
     padding: 8rpx 10rpx;
 
     .lable {
-      white-space: nowrap;
+      white-space: nowrap !important;
       // font-weight: 600;
       text-align: left;
       margin-right: 20rpx;
@@ -397,8 +393,17 @@ const getTitleValue = (value: any, title: string) => {
  
 
 }
-:deep(.card-title-class){
-    font-weight: 700 !important;
+.card-title-class{
+	display: flex;
+	align-items: center;
+    font-weight: 700 ;
+	gap: 4px;
+  }
+  .title-icon{
+	  width: 8px;
+	  height: 8px;
+	  border-radius: 100%;
+	  background-color: #4d80f0;
   }
 .btn {
   margin-left: 10rpx;

package/w-edit/w-edit.vue

@@ -252,7 +252,7 @@
 						})
 						data['唯一编码'] = model.value['唯一编码']
 						try {
-							const res = await addPageDataSave(sourceId.value, data)
+							const res = await addPageDataSave(sourceId.value, null,data)
 							if (res.data.status === 'success') {
 								toast.success("保存成功")
 								uni.navigateBack({
@@ -305,7 +305,7 @@
 							})
 							data['唯一编码'] = model.value['唯一编码']
 							try {
-								const res = await addPageDataSave(sourceId.value, data)
+								const res = await addPageDataSave(sourceId.value, null,data)
 								if (res.data.status === 'success') {
 									toast.success("保存成功")
 									uni.navigateBack({
@@ -352,7 +352,7 @@
 			})
 			data['唯一编码'] = model.value['唯一编码']
 			try {
-				const res = await addPageDataSave(sourceId.value, data)
+				const res = await addPageDataSave(sourceId.value, null,data)
 				if (res.data.status === 'success') {
 					toast.success("保存成功")
 					uni.navigateBack({

package/w-form-control/w-form-control.vue

@@ -1,50 +1,115 @@
 <template>
   <view v-if="!subItem.hidden" style="border-bottom: 1px solid rgb(243 242 242);">
-    <wd-input v-if="subItem.extControlType === 'text'" :readonly="subItem.disabled" :label="subItem.title"
-      label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
-      :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-      :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
-      @clear="clear" />
-    <wd-picker v-else-if="subItem.extControlType === 'select'" :readonly="subItem.disabled" :label="subItem.title"
+   
+    <wd-picker v-if="subItem.controlType === 'select'&&subItem.extControlType === 'yes-no-switch'" :readonly="subItem.disabled" :label="subItem.title"
       label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
       :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :columns="Enumcolumn[subItem.mstrucId]"
       @confirm="(e) => { change(e) }" @clear="clear" />
-    <wd-textarea auto-height v-else-if="subItem.extControlType === 'textarea'" :readonly="subItem.disabled"
-      :label="subItem.title" label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
-      :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-      :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
-      @clear="clear" />
-    <wd-input v-else-if="subItem.extControlType === 'decimal' || subItem.extControlType === 'int'"
-      :readonly="subItem.disabled" :label="subItem.title" label-width="100px" :prop="subItem.id" clearable
-      :modelValue="modelValue" type="number" :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-      :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
-      @clear="clear" />
-    <wd-calendar v-else-if="subItem.extControlType === 'datetime'" :readonly="subItem.disabled" :label="subItem.title"
+    
+	<wd-picker v-else-if="subItem.controlType === 'radio'&&subItem.extControlType === 'yes-no-switch'" :readonly="subItem.disabled" :label="subItem.title"
+	  label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
+	  :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
+	  :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :columns="['是','否']"
+	  @confirm="(e) => { change(e) }" @clear="clear" />
+	  
+	  <wd-picker v-else-if="subItem.extControlType === 'yes-no-radio'" :readonly="subItem.disabled" :label="subItem.title"
+	    label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
+	    :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
+	    :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :columns="['是','否']"
+	    @confirm="(e) => { change(e) }" @clear="clear" />
+	  
+	  <wd-select-picker v-else-if="subItem.controlType === 'select'&&subItem.extControlType === 'multiselect'" :readonly="subItem.disabled" :label="subItem.title"
+	    label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
+	    :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
+	    :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :columns="Enumcolumn[subItem.mstrucId]?.map((item:any)=>({...item,label:item.title}))"
+	    @confirm="(e) => { change(e) }" @clear="clear" />
+	
+	  
+	  <wd-calendar :display-format="displayFormat1" v-else-if="props.subItem.controlType==='datetime'&&props.subItem.extControlType==='datetimerange'" :readonly="subItem.disabled" :label="subItem.title"
+	    label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue" type="datetimerange"
+	    :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
+	    :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }"
+	    @clear="clear" />
+	  
+	  
+    <wd-calendar v-else-if="subItem.controlType === 'datetime'" :readonly="subItem.disabled" :label="subItem.title"
       label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue" type="datetime"
       :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }"
       @clear="clear" />
+	  
+	  <wd-calendar v-else-if="subItem.extControlType === 'datetime'" :readonly="subItem.disabled" :label="subItem.title"
+	    label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue" type="datetime"
+	    :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
+	    :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }"
+	    @clear="clear" />
+		
+		<wd-calendar v-else-if="subItem.controlType === 'daterange'&&subItem.extControlType === 'daterange'" :readonly="subItem.disabled" :label="subItem.title"
+		  label-width="100px" :display-format="displayFormat2" :prop="subItem.id" clearable :modelValue="modelValue" type="daterange"
+		  :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
+		  :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }"
+		  @clear="clear" />
 
-    <wd-cell v-else-if="subItem.extControlType === 'relselect'||subItem.extControlType === 'table-entity-select'" title-width="100px" :prop="subItem.id"
+    <wd-cell v-else-if="(subItem.controlType === 'textarea'&&subItem.extControlType==='relselectvalue')||subItem.extControlType === 'entity-select'" title-width="100px" :prop="subItem.id"
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :title="subItem.title">
       <view style="text-align: left">
         <wSelectPicker @confirm="wSelectPickerconfirm" :modelValue="modelValue" :readonly="subItem.disabled"
-          :type="subItem.max === 1 ? 'radio' : 'checkbox'"
+          :type="'checkbox'"
           :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`" :source-id="subItem.sourceId" filterable
           @clear="clear" clearable />
       </view>
     </wd-cell>
+	<wd-cell v-else-if="subItem.controlType === 'text'&&subItem.extControlType==='relselectvalue'" title-width="100px" :prop="subItem.id"
+	  :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :title="subItem.title">
+	  <view style="text-align: left">
+	    <wSelectPicker @confirm="wSelectPickerconfirm" :modelValue="modelValue" :readonly="subItem.disabled"
+	      :type="'checkbox'"
+	      :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`" :source-id="subItem.sourceId" filterable
+	      @clear="clear" clearable />
+	  </view>
+	</wd-cell>
+	<wd-cell v-else-if="subItem.extControlType === 'relselect'" title-width="100px" :prop="subItem.id"
+	  :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :title="subItem.title">
+	  <view style="text-align: left">
+	    <wSelectPicker @confirm="wSelectPickerconfirm" :modelValue="modelValue" :readonly="subItem.disabled"
+	      :max="subItem.max==='1'?1:0"
+	      :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`" :source-id="subItem.sourceId" filterable
+	      @clear="clear" clearable />
+	  </view>
+	</wd-cell>
+	
+	<wd-cell v-else-if="subItem.extControlType === 'file'||subItem.extControlType === 'picture'"
+	  :rules="[{ required: subItem.required, message: `请选择${subItem.title}文件` }]" :title="subItem.title"
+	  title-width="100px" :prop="subItem.id">
+	  <wd-upload :limit="1" :accept="subItem.controlType"
+	    :header="{ 'hydrocarbon-program-token': hydrocarbonProgramToken, 'hydrocarbon-token': token }"
+	    :file-list="modelValue" :disabled="subItem.disabled" :action="`${baseUrl}/v3/upload`"
+	    @success="success"></wd-upload>
+	</wd-cell>
+	<wd-input v-else-if="subItem.controlType === 'text'" :readonly="subItem.disabled" :label="subItem.title"
+	  label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
+	  :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
+	  :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
+	  @clear="clear" />
+	<wd-input v-else-if="subItem.controlType === 'decimal' || subItem.controlType === 'int'"
+	  :readonly="subItem.disabled" :label="subItem.title" label-width="100px" :prop="subItem.id" clearable
+	  :modelValue="modelValue" type="number" :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
+	  :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
+	  @clear="clear" />
+	
+	
+	
+	
+	
+	<wd-textarea auto-height v-else-if="subItem.controlType === 'textarea'" :readonly="subItem.disabled"
+	  :label="subItem.title" label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
+	  :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
+	  :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" @input="(e) => { change(e) }"
+	  @clear="clear" />
 
-    <wd-cell v-else-if="subItem.extControlType === 'file'||subItem.extControlType === 'picture'"
-      :rules="[{ required: subItem.required, message: `请选择${subItem.title}文件` }]" :title="subItem.title"
-      title-width="100px" :prop="subItem.id">
-      <wd-upload :limit="1" :accept="subItem.extControlType"
-        :header="{ 'hydrocarbon-program-token': hydrocarbonProgramToken, 'hydrocarbon-token': token }"
-        :file-list="modelValue" :disabled="subItem.disabled" :action="`${baseUrl}/v3/upload`"
-        @success="success"></wd-upload>
-    </wd-cell>
-	<wd-cell v-else-if="subItem.extControlType === 'html'"
+    
+	<wd-cell v-else-if="subItem.controlType === 'html'"
 	  :rules="[{ required: subItem.required, message: `请输入${subItem.title}` }]" :title="subItem.title"
 	  title-width="100px" :prop="subItem.id">
 	 <editor id="editor"  class="ql-container" :placeholder="`请输入${subItem.title}`" show-img-size show-img-toolbar
@@ -60,7 +125,7 @@
 
 <script setup lang="ts">
 import wSelectPicker from '../w-select-picker/w-select-picker.vue'
-import dayjs from 'dayjs/esm/index'
+import dayjs from 'dayjs/esm/index'
 import { defineProps, ref, defineEmits, computed } from 'vue'
 const props = defineProps({
   subItem: {
@@ -86,66 +151,152 @@ const baseUrl = uni.getStorageSync('baseUrl') || '/'
 const hydrocarbonProgramToken = uni.getStorageSync('hydrocarbonProgramToken') || ''
 const token = uni.getStorageSync('token') || ''
 const modelValue = computed(() => {
-  switch (props.subItem.extControlType) {
-    case 'datetime':
-      return props.model[props.subItem.id] ? dayjs(props.model[props.subItem.id]).valueOf() : null
-    
-	case 'table-entity-select':
-    case 'relselect':
-      if (props.subItem.max === 1) {
-        return props.model[props.subItem.id] ? props.model[props.subItem.id].split('@R@')[0] : ''
-      } else {
-        if (!props.model[props.subItem.id]) return []
-
-        let selectArr = props.model[props.subItem.id].split('@,@')
+	console.log(props.model[props.subItem.id],'入')
+	// 入值
+	if((props.subItem.controlType === 'textarea'&&props.subItem.extControlType==='relselectvalue')||props.subItem.extControlType === 'entity-select'){
+		if(props.model[props.subItem.id]){
+			let dataArr1=props.model[props.subItem.id].split('@,@')
+			let dataArr2=dataArr1.map((item:any)=>{
+				return item.split("@R@")[0]
+			})
+			return dataArr2
+	    }else{
+			return[]
+		}
+		
+	}
+	
+	if((props.subItem.controlType === 'text'&&props.subItem.extControlType==='relselectvalue')){
+		if(props.model[props.subItem.id]){
+			let dataArr1=props.model[props.subItem.id].split('@,@')
+			let dataArr2=dataArr1.map((item:any)=>{
+				return item.split("@R@")[0]
+			})
+			return dataArr2
+		}else{
+			return[]
+		}
+		
+	}
+	
+	if(props.subItem.controlType==='datetime'&&props.subItem.extControlType==='datetimerange'){
+		
+		return props.model[props.subItem.id]?props.model[props.subItem.id].split("~").map((item:any)=>{
+			return dayjs(item).valueOf()
+		}):[]
+		
+		
+	}
+	
+	if(props.subItem.controlType==='daterange'&&props.subItem.extControlType==='daterange'){
+		return props.model[props.subItem.id]?props.model[props.subItem.id].split("~").map((item:any)=>{
+			return dayjs(item).valueOf()
+		}):[]
+	}
+	
+	if(props.subItem.extControlType === 'relselect'){
+		if(props.model[props.subItem.id]){
+			let dataArr1=props.model[props.subItem.id].split('@,@')
+			let dataArr2=dataArr1.map((item:any)=>{
+				return item.split("@R@")[0]
+			})
+			return dataArr2
+		}else{
+			return[]
+		}
+		
+	}
+	
+	if(props.subItem.extControlType === 'file'){
+		return props.model[props.subItem.id]?[JSON.parse(props.model[props.subItem.id])['base']]:[]
+	}
+	
+	if(props.subItem.extControlType === 'datetime'){
+		return props.model[props.subItem.id]?dayjs(props.model[props.subItem.id]).valueOf():''
+	}
+	
+	
+	return props.model[props.subItem.id] || null
+  // switch (props.subItem.controlType) {
+  //   case 'datetime':
+  //     return props.model[props.subItem.id] ? dayjs(props.model[props.subItem.id]).valueOf() : null
+  //   case 'picture':
+  //   case 'file':
+  //     return props.model[props.subItem.id] ? JSON.parse(props.model[props.subItem.id]).valid === 'new' ? [{ url: JSON.parse(props.model[props.subItem.id]).base.path }] : [{ url: baseUrl + "/v3/files" + JSON.parse(props.model[props.subItem.id]).base.path }] : []
 
-        let selectArr2 = selectArr.map((item: any) => {
-          return item.split('@R@')[0]
-        })
-
-        return selectArr2
-      }
-    case 'picture':
-    case 'file':
-      return props.model[props.subItem.id] ? JSON.parse(props.model[props.subItem.id]).valid === 'new' ? [{ url: JSON.parse(props.model[props.subItem.id]).base.path }] : [{ url: baseUrl + "/v3/files" + JSON.parse(props.model[props.subItem.id]).base.path }] : []
-
-    default:
-      return props.model[props.subItem.id] || ""
-  }
+  //   default:
+  //     return props.model[props.subItem.id] || ""
+  // }
 
 })
 
 const emit = defineEmits(['update:modelValue'])
 
-//上传
+//上传文件成功回调
 const success = (e: any) => {
   console.log(e)
-  emit('update:modelValue', JSON.stringify({ valid: "new", fileKey: JSON.parse(e.file.response).fileKey, fileName: e.file.name, base: { path: e.file.url } }))
+  emit('update:modelValue', JSON.stringify({ valid: "new", fileKey: JSON.parse(e.file.response).fileKey, fileName: e.file.name, base: {...e.file } }))
+}
+
+const displayFormat1 = (value:any) => {
+  return dayjs(value[0]).format('YYYY-MM-DD HH:mm:ss') + ' ~ ' + dayjs(value[1]).format('YYYY-MM-DD HH:mm:ss')
+}
+
+const displayFormat2=(value:any) => {
+  return dayjs(value[0]).format('YYYY-MM-DD') + ' ~ ' + dayjs(value[1]).format('YYYY-MM-DD')
 }
 
 //wSelectPicker组件确定事件
-const wSelectPickerconfirm = (e) => {
-  console.log(e)
+const wSelectPickerconfirm = (e:any) => {
+  console.log(e,'出')
   if (Array.isArray(e.selectedItems)) {
     let selectArr1 = e.selectedItems.map((item: any) => {
       return `${item.value}@R@${item.label}`
     })
-    let selectArr = selectArr1.join('@,@')
-    emit('update:modelValue', selectArr)
+    let selectArr = selectArr1
+    emit('update:modelValue', selectArr.join('@,@'))
   } else {
     emit('update:modelValue', `${e.selectedItems.value}@R@${e.selectedItems.label}`)
   }
 }
 
 //输入框事件
-const change = (e) => {
-  switch (props.subItem.extControlType) {
-    case 'datetime':
-      emit('update:modelValue', dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'))
-      break
-    default:
-      emit('update:modelValue', e.value)
-  }
+const change = (e:any) => {
+	console.log(e,'出')
+	if(props.subItem.controlType==='datetime'&&props.subItem.extControlType==='datetimerange'){
+		
+		let data=e.value.map((item:any)=>{
+			return   dayjs(item).format('YYYY-MM-DD HH:mm:ss')
+		})
+		emit('update:modelValue', data.join('~'))
+		return
+	}
+	
+	if(props.subItem.controlType==='daterange'&&props.subItem.extControlType==='daterange'){
+		
+		let data=e.value.map((item:any)=>{
+			return   dayjs(item).format('YYYY-MM-DD')
+		})
+		emit('update:modelValue', data.join('~'))
+		return
+	}
+	
+	if(props.subItem.controlType==='datetime'||props.subItem.extControlType==='datetime'){
+		
+		let data=dayjs(e.value).format('YYYY-MM-DD HH:mm:ss')
+		emit('update:modelValue', data)
+		return
+	}
+	
+	 emit('update:modelValue', e.value)
+	
+  // switch (props.subItem.controlType) {
+  //   case 'datetime':
+  //     emit('update:modelValue', dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'))
+  //     break
+  //   default:
+  //     emit('update:modelValue', e.value)
+  // }
 
 
 }

package/w-login/w-login.vue

@@ -94,6 +94,7 @@
 
 <template>
 	<view class="login">
+		<image class="footer-img" src="./footerImg.png"></image>
 		<view class="form-box">
 			<WSwitchLang v-if="props.langSwitch" />
 			<view v-if="props.loginImge" class="avatar">
@@ -108,9 +109,9 @@
 
 			<wd-form ref="form" :model="model">
 				<wd-cell-group border>
-					<wd-input v-model="model.username" label="用户名" label-width="100px" prop="username" clearable
+					<wd-input  v-model="model.username" label="用户名" label-width="100px" prop="username" clearable
 						placeholder="请输入用户名" :rules="[{ required: true, message: '请填写用户名' }]" />
-					<wd-input v-model="model.password" label="密码" label-width="100px" prop="password" show-password
+					<wd-input  v-model="model.password" label="密码" label-width="100px" prop="password" show-password
 						clearable placeholder="请输入密码" :rules="[{ required: true, message: '请填写密码' }]" />
 						<view style="padding-left: 15px;">
 							<wd-checkbox  v-model="model.remember" shape="square">记住密码</wd-checkbox>
@@ -123,7 +124,6 @@
 				</view>
 			</wd-form>
 		</view>
-		<image class="footer-img" src="./footerImg.png"></image>
 		<wd-toast />
 	</view>
 </template>
@@ -134,20 +134,27 @@
 		/* #ifdef H5 */
 		height: calc(100vh - 44px);
 		/* #endif */
-		position: relative;
+		// position: relative;
 		//设置背景颜色#4d80f0 由上到下逐渐变浅
-		background: linear-gradient(to bottom, #4d80f0 30%, #2c5def 70%);
+		// background: linear-gradient(to bottom, #4d80f0 30%, #2c5def 70%);
+		background-color: #487FFE;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-between;
 
 		.form-box {
+			box-sizing: border-box;
 			padding: 20rpx;
 			background-color: #fff;
-			border-radius: 8px;
+			border-radius: 12px 12px 0 0;
 			z-index: 1;
-			position: absolute;
-			left: 50%;
-			top: 30%;
-			transform: translate(-50%, -50%);
-			width: 650rpx;
+			// position: absolute;
+			// left: 50%;
+			// top: 30%;
+			// transform: translate(-50%, -50%);
+			width: 100%;
+			height: 70%;
 
 			.lang {
 				display: flex;
@@ -166,10 +173,12 @@
 
 
 		.footer-img {
-			position: absolute;
-			bottom: 0;
-			left: 50%;
-			transform: translateX(-50%);
+			width: 200px;
+			height: 200px;
+			// position: absolute;
+			// bottom: 0;
+			// left: 50%;
+			// transform: translateX(-50%);
 		}
 	}
 </style>

package/w-menu/w-menu.vue

@@ -145,18 +145,21 @@ function queryList() {
     <view>
       <view v-if="filtermenu.length > 0" class="menu-list">
         <slot name="topImg"></slot>
-        <wd-card v-for="(item, index) in filtermenu" :key="index" :title="item.title"
-          custom-title-class="menu-title-class">
+        <wd-card v-for="(item, index) in filtermenu" :key="index" 
+          >
+		  <template #title>
+			  <view class="menu-title-class">
+			  	 <view class="title-icon"></view> {{item.title}}
+			  </view>
+		  </template>
           <template #default>
             <wd-grid :column="4" :clickable="true">
               <wd-grid-item use-slot v-for="(subItem, subIndex) in item.items" :key="subIndex"
                 @itemclick="gotoPage(subItem)" use-text-slot>
                 <template #default>
                   <view class="grid-item">
-                    <!-- <wd-icon name="list" size="22px" color="#0083ff"></wd-icon> -->
                     <text class="grid-item-icon">{{ subItem.title }}</text>
-                    <wd-text type="primary" :text="subItem.title"></wd-text>
-                    <!-- <wd-text type="primary" text="我的订单我的订单我的订单我的订单"></wd-text> -->
+                    <view class="grid-item-title">{{subItem.title}}</view>
                   </view>
 
                 </template>
@@ -213,11 +216,28 @@ function queryList() {
     letter-spacing: 20px;
     // margin-right: 15px;
   }
+  .grid-item-title{
+	  color: #4D81F1;
+	  width: 55px;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	  white-space: nowrap;
+	  // white-space: pre-wrap;
+	  // text-align: left;
+  }
 
 }
 
-:deep(.menu-title-class) {
-  font-weight: 700 !important;
+.menu-title-class {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  font-weight: 700;
+}
+.title-icon{
+	width: 3px;
+	height: 15px;
+	background-color: #4D81F1;
 }
 
 .menu-list {