w-ui-v1 1.0.40 → 1.0.42

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "w-ui-v1",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",
   "main": "index.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
+ 
   "peerDependencies": {
     "wot-design-uni": "^1.7.0",
     "z-paging": "^2.8.5"

package/w-detail/w-detail.vue

@@ -35,11 +35,38 @@ const pageData = ref([])
 const pageConf = ref({ groups: [] })
 
 onLoad((option: any) => {
-	sourceId.value = props.sourceId || option.sourceId
-	code.value = option.code || props.code
+	const q = decodeURIComponent(option.q) // 获取到二维码原始链接内容
+	let sc:any=getQueryParams(q)
+	sourceId.value = props.sourceId || option.sourceId ||sc.sourceId
+	code.value = option.code || props.code || sc.code
 	getPageData()
 	uni.setNavigationBarTitle({ title: "详情" })
 })
+
+//将 URL 中问号后面的参数转换为对象
+	function getQueryParams(url:string) {
+	  // 获取问号后面的部分
+	  const queryString = url.split('?')[1];
+	  
+	  if (!queryString) {
+	    return {};
+	  }
+	  
+	  // 将参数字符串分割成键值对数组
+	  const pairs = queryString.split('&');
+	  
+	  // 创建结果对象
+	  const result = {};
+	  
+	  // 遍历键值对
+	  pairs.forEach(pair => {
+	    const [key, value] = pair.split('=');
+	    // 解码URI组件并添加到结果对象
+	    result[decodeURIComponent(key)] = decodeURIComponent(value || '');
+	  });
+	  
+	  return result;
+	}
 // 获取页面配置
 function getPageConfig() {
 	detailPageConfig(sourceId.value).then((res: any) => {
@@ -238,7 +265,7 @@ function goto(type = '', PItem: any, item: any) {
 
 	.label {
 		//文字换行
-		white-space: normal;
+		white-space: nowrap;
 		word-break: break-all;
 		margin-right: 20rpx;
 	}

package/w-form-message-box/w-form-message-box.vue

@@ -85,6 +85,12 @@ function withSlot() {
   message
     .confirm({
       title: pageConf.value?.title,
+      cancelButtonProps: {
+        round:false
+      },
+      confirmButtonProps: {
+        round:false
+      },
       beforeConfirm:({ resolve }) => {
         toast.loading(`${pageConf.value?.title}中...`)
         customButtonSave(page.value.sourceId,props.itemData.code,model).then((res)=>{

package/w-search/w-search.vue

@@ -14,7 +14,7 @@
                 :placeholder="`请选择${item.title}`" :source-id="item.sourceId" filterable />
               <wd-input v-else-if="item.extControlType === 'text'" type="text" :label="item.title"
                 v-model="searchData[item.sourceId]" :placeholder="`请输入${item.title}`" clearable />
-              <wd-picker v-else-if="item.extControlType === 'select'" :columns="Enumcolumn[item.mstrucId]"
+              <wd-picker v-else-if="item.extControlType === 'multiselect'" :columns="Enumcolumn[item.mstrucId]"
                 :label="item.title" :placeholder="`请选择${item.title}`" v-model="searchData[item.sourceId]" clearable />
               <view v-else-if="item.extControlType === 'int'">
                 <wd-input type="number" :label="item.title" v-model="searchData[item.sourceId]"
@@ -32,8 +32,8 @@
                 :placeholder="`请输入${item.title}`" clearable />
             </view>
             <view class="search-btn">
-              <wd-button size="small" icon="refresh" @click="clear" type="info">重置</wd-button>
-              <wd-button size="small" icon="search" @click="search">确定</wd-button>
+              <wd-button size="small" icon="refresh" :round="false" @click="clear" type="info">重置</wd-button>
+              <wd-button size="small" icon="search" :round="false" @click="search">确定</wd-button>
 
             </view>
 
@@ -153,6 +153,9 @@ async function getEnumer() {
     if (item.extControlType === 'select') {
       params.push(`mstrucIds=${item.mstrucId}`)
     }
+    if (item.extControlType === 'multiselect') {
+      params.push(`mstrucIds=${item.mstrucId}`)
+    }
 
   });
   if (!params.length) return
@@ -164,8 +167,9 @@ async function getEnumer() {
 
 <style scoped lang="scss">
 .search-box {
+
   .left {
-    position: relative;
+    // position: relative;
 
     .search-icon {
       position: absolute;
@@ -176,7 +180,12 @@ async function getEnumer() {
   }
 
   .search-btn {
-    margin: 20rpx;
+    z-index: 1;
+    background-color: #fff;
+    height: 30px;
+    position: sticky;
+    bottom: 0;
+    padding: 20rpx;
     display: flex;
     justify-content: space-between;
 

package/w-user/w-user.vue

@@ -1,112 +1,149 @@
 <template>
-    <view class="user">
-        <view class="top-box">
-            <view class="top">
-            <view class="circle">
-                <wd-icon name="user-circle" size="120rpx" color="#bababa"></wd-icon>
-            </view>
-            <view class="username">
-                <view class="name">
-                    <text>{{ userInfo.name }}</text>
-                </view>
-                <view class="nickName">
-                    <text>昵称：{{ userInfo.nickName }}</text>
-                </view>
-            </view>
-        </view>
-        </view>
-        
-        <wd-cell-group>
-            <wd-cell title="个人信息" icon="user" v-if="userInfo.viewPersonalInfoable" :is-link="true" :clickable="true"  @click="goUserInfo"/>
-            <!-- <wd-cell title="修改密码" icon="keywords" :is-link="true" :clickable="true"  /> -->
-            <wd-cell title="退出登录" icon="logout" :is-link="true" :clickable="true" @click="quit" />
-        </wd-cell-group>
-        <wd-message-box />
-    </view>
+	<view class="user">
+		<view class="top-box">
+			<!-- 用户头部信息 -->
+			<view class="user-header">
+				<view class="user-info">
+					<!-- <img src="user.avatar" class="avatar" alt="用户头像"> -->
+					<image  class="avatar"  src="./user-avatar-fill.png" mode=""></image>
+					<view class="user-text">
+						<view class="user-name">{{ userInfo.name }}</view>
+						<view class="user-nickname">
+							昵称：{{ userInfo.nickName }}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<wd-cell-group>
+			<wd-cell title="个人信息" icon="user" v-if="userInfo.viewPersonalInfoable" :is-link="true" :clickable="true"
+				@click="goUserInfo" />
+			<!-- <wd-cell title="修改密码" icon="keywords" :is-link="true" :clickable="true"  /> -->
+			<wd-cell title="退出登录" icon="logout" :is-link="true" :clickable="true" @click="quit" />
+		</wd-cell-group>
+		<wd-message-box />
+	</view>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
-import {
-    useMessage
-} from 'wot-design-uni'
-defineOptions({
-    name: 'WUser'
-})
-const message = useMessage()
-const userInfo = ref({
-    name:uni.getStorageSync('userInfo').name,
-    nickName:uni.getStorageSync('userInfo').nickName,
-    viewPersonalInfoable:uni.getStorageSync('userInfo').viewPersonalInfoable
-})
-
-//退出登录
-const quit = () => {
-    message
-        .confirm({
-            // msg: '提示文案',
-            title: '退出登录'
-        })
-        .then(() => {
-            uni.removeStorageSync('token')
-            uni.reLaunch({
-                url: '/pages/login/login'
-            })
-        })
-        .catch(() => {
-            console.log('点击了取消按钮')
-        })
-
-}
-
-//查看用户信息
-const goUserInfo = () => {
-    uni.navigateTo({
-        url: `/pages/detail/detail?sourceId=${uni.getStorageSync('userInfo').gtmplSourceId}&code=${uni.getStorageSync('userInfo').id}`
-    })
-}
+	import { ref } from 'vue';
+	import {
+		useMessage
+	} from 'wot-design-uni'
+	defineOptions({
+		name: 'WUser'
+	})
+	const message = useMessage()
+	const userInfo = ref({
+		name: uni.getStorageSync('userInfo').name,
+		nickName: uni.getStorageSync('userInfo').nickName,
+		viewPersonalInfoable: uni.getStorageSync('userInfo').viewPersonalInfoable
+	})
+
+	//退出登录
+	const quit = () => {
+		message
+			.confirm({
+				// msg: '提示文案',
+				title: '退出登录'
+			})
+			.then(() => {
+				uni.removeStorageSync('token')
+				uni.reLaunch({
+					url: '/pages/login/login'
+				})
+			})
+			.catch(() => {
+				console.log('点击了取消按钮')
+			})
+
+	}
+
+	//查看用户信息
+	const goUserInfo = () => {
+		uni.navigateTo({
+			url: `/pages/detail/detail?sourceId=${uni.getStorageSync('userInfo').gtmplSourceId}&code=${uni.getStorageSync('userInfo').id}`
+		})
+	}
 </script>
 
 <style scoped lang="scss">
-.user {
-    background-color: #f5f5f5;
-    height: 100vh;
-
-    .top-box{
-        // display: flex;
-        // justify-content: center;
-        // padding: 10px;
-        .top {
-        display: flex;
-        align-items: center;
-        padding: 25rpx;
-        background-color: #4d80f0;
-
-        .circle {
-            background-color: #fcfcfccd;
-            border-radius: 100%;
-            margin-right: 20rpx;
-        }
-
-        .username {
-            font-size: 40rpx;
-
-            .name {
-                margin-bottom: 10rpx;
-                color: #fff;
-            }
-
-            .ic {
-                font-size: 30rpx;
-                color: #fff;
-            }
-            .nickName{
-                font-size: 12px;
-                color: #fff;
-            }
-        }
-    }
-    }
-   
-}
+	.user {
+		background-color: #f5f5f5;
+		height: 100vh;
+
+		.top-box {
+			padding: 15px;
+			.user-header {
+				border-radius: 10px;
+				margin: auto;
+				background: linear-gradient(135deg, #4a6cf7 0%, #2541b2 100%);
+				color: white;
+				padding: 30px 20px;
+				box-shadow: 0 4px 12px rgba(74, 108, 247, 0.2);
+				position: relative;
+				overflow: hidden;
+			}
+
+			.user-header::before {
+				content: "";
+				position: absolute;
+				top: -50px;
+				right: -50px;
+				width: 150px;
+				height: 150px;
+				background: rgba(255, 255, 255, 0.1);
+				border-radius: 50%;
+			}
+
+			.user-header::after {
+				content: "";
+				position: absolute;
+				bottom: -80px;
+				left: -30px;
+				width: 200px;
+				height: 200px;
+				background: rgba(255, 255, 255, 0.05);
+				border-radius: 50%;
+			}
+
+			.user-info {
+				display: flex;
+				align-items: center;
+				position: relative;
+				z-index: 1;
+			}
+
+			.avatar {
+				width: 140rpx;
+				height: 140rpx;
+				border-radius: 50%;
+				border: 3px solid rgba(255, 255, 255, 0.3);
+				margin-right: 15px;
+				object-fit: cover;
+				// background-color: #fff;
+			}
+
+			.user-text {
+				flex: 1;
+			}
+
+			.user-name {
+				font-size: 20px;
+				font-weight: 600;
+				margin-bottom: 5px;
+			}
+
+			.user-nickname {
+				font-size: 14px;
+				opacity: 0.9;
+				display: flex;
+				align-items: center;
+			}
+		}
+
+
+
+	}
 </style>