w-ui-v1 1.0.83 → 1.0.85

package/index.ts

@@ -15,6 +15,8 @@ import WFormMessageBox from './w-form-message-box/w-form-message-box.vue'
 import WAudio from './w-audio/w-audio.vue'
 import WReportTable from './w-report-table/w-report-table.vue'
 import WFormControlVue from './w-form-control/w-form-control.vue'
+import WScanBindingSensor from './w-scan-binding-sensor/w-scan-binding-sensor.vue'
+import WUpdateVersion from './w-update-version/w-update-version.vue'
 import {menu} from './utils/apis/menu'
 import request from './utils/http'
 import nfc from './utils/nfc'
@@ -35,7 +37,9 @@ const coms: any[] = [
   WFormMessageBox,
   WAudio,
   WReportTable,
-  WFormControlVue
+  WFormControlVue,
+  WScanBindingSensor,
+  WUpdateVersion
 ]
 // 批量组件注册
 function install(Vue: App) {

package/package.json

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

package/w-richness-user/w-richness-user.vue

@@ -0,0 +1,149 @@
+<template>
+	<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}`
+		})
+	}
+</script>
+
+<style scoped lang="scss">
+	.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>

package/w-scan-binding-sensor/w-scan-binding-sensor.vue

@@ -0,0 +1,69 @@
+<template>
+  <view class="bindBox">
+    <view class="iconBox">
+      <wd-icon name="scan" size="150rpx" @click="scan"></wd-icon>
+    </view>
+    <wd-input v-model="code" placeholder="请输入传感器编号" />
+    <wd-button @click="enter">确认</wd-button>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref ,computed} from 'vue'
+import { onShow, onLoad, onHide } from '@dcloudio/uni-app'
+defineOptions({
+		name: 'WScanBindingSensor',
+	})
+// 传感器编号
+const code =ref("")
+onShow(()=>{
+	code.value=uni.getStorageSync('sensorCode')
+})
+// 扫码
+const scan = () => {
+  uni.scanCode({
+    fail: (e) => {
+      uni.showToast({
+        title: '扫码失败',
+        icon: 'error',
+      })
+    },
+    success: (e) => {
+      if (!e.result) {
+        return uni.showToast({
+          title: '扫码结果为空',
+          icon: 'error',
+        })
+      }
+      // 判断扫码结果与当前保存的传感器编号是否一致
+      if (e.result !== uni.getStorageSync('SENSORCODE')) {
+        uni.showToast({
+          title: '更新设备成功',
+        })
+      }
+      code.value = e.result // 扫码结果
+	  uni.setStorageSync('sensorCode',e.result)
+      enter()
+    },
+  })
+}
+const enter = () => {
+  
+  uni.navigateBack()
+}
+</script>
+
+<style lang="scss" scoped>
+.bindBox {
+	background-color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+  justify-content: center;
+  padding: 32rpx;
+  .iconBox {
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>

package/w-table/w-table.vue

@@ -45,10 +45,9 @@ const pageData = ref<{
   buttons: string[]
 }>({ criterias: [], buttons: [] })
 onLoad((option: any) => {
-	console.log(option.query,'jjj')
   sourceId.value = props.sourceId || option.sourceId
   mainCode.value =  props.mainCode ||option.mainCode
-  query.value=props.query || option.query
+  query.value=props.query || (option.query?JSON.parse(option.query).join('&'):'')
   
   uni.setNavigationBarTitle({ title: option.pageTitle })
   getPageConfig()

package/w-update-version/w-update-version.vue

@@ -0,0 +1,207 @@
+<template>
+  <!-- 更新app组件 -->
+  <wd-popup
+    v-model="show"
+    custom-style="border-radius:32rpx;"
+    @close="handleClose"
+    @before-enter="beforeEnter"
+    :z-index="99999999"
+    :close-on-click-modal="false"
+    :closable="closable"
+  >
+    <view class="loadingBox" v-if="loading">
+      <wd-loading />
+    </view>
+    <view class="updateBox" v-else>
+      <wd-text text="更新提示" :bold="true" color="#333" />
+      <wd-text :text="'当前版本:' + currentVersion + ' 最新版本:' + latestVersion" color="#333" />
+      <wd-text v-if="isUpdate > 0" :text="updateContent" lineHeight="20px" :lines="4"></wd-text>
+      <wd-button v-if="isUpdate !== 0" @click="actionUpdate" style="margin-top: auto">更新</wd-button>
+      <view class="calc" v-if="enterUpdate">
+        <wd-progress :percentage="percentage" />
+        <!-- <wd-button @click="calce">取消</wd-button> -->
+      </view>
+    </view>
+  </wd-popup>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, defineEmits } from 'vue'
+defineOptions({
+	name:'WUpdateVersion'
+})
+const emit = defineEmits(['close'])
+const closable = ref(true)
+const loading = ref(false)
+const percentage = ref(0) // 进度条数字
+const entities = ref([])
+// 更新内容
+const updateContent = ref('')
+
+const prop = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  hydrocarbonProgramToken:{
+	  type: String,
+	  default: '',
+  },
+  baseUrl:{
+	  type: String,
+	  default: '',
+  }
+})
+// 计算属性,弹窗开关
+const show = computed({
+  get() {
+    return prop.show
+  },
+
+  set(value) {
+    emit('close', value)
+  },
+})
+const enterUpdate = ref(false)
+const isUpdate = ref(0)
+// 当前版本
+const currentVersion = ref('')
+
+// 最新版本
+const latestVersion = ref('')
+
+// 关闭弹窗
+const handleClose = () => {
+  show.value = false
+}
+
+// 弹框进入时检查更新
+const beforeEnter = async () => {
+  loading.value = true
+  // 获取当前应用版本号
+  const v1 = await new Promise<string>((resolve, reject) => {
+    plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
+      resolve(widgetInfo.version)
+    })
+  })
+  currentVersion.value = v1
+  // 获取接口最新版本号
+  uni.request({
+    url:
+      prop.baseUrl +
+      '/v3/mstruc/data?sourceId=x6PQag0EbU&depth=1&sortColIds=创建时间_DESC&pageNo=1&pageSize=1&c_app编码_equals=418907889311981574&c_标记删除_equals=否',
+    method: 'GET',
+    header: {
+      'hydrocarbon-program-token': prop.hydrocarbonProgramToken,
+    },
+    success: (res: any) => {
+      if (res.statusCode === 200) {
+        if (res.data.entities.length > 0) {
+          latestVersion.value = res.data.entities[0]['版本号'] // 最新版本号
+          isUpdate.value = compareVersions(currentVersion.value, latestVersion.value) // 比较版本号
+          entities.value = res.data.entities // 获取接口数据
+          updateContent.value = res.data.entities[0]['更新内容'] // 更新内容
+        }
+      }
+
+      loading.value = false
+    },
+    fail: (err) => {
+      loading.value = false
+      console.log('接口版本err：', err)
+    },
+  })
+}
+
+// 下载安装包
+const downloadApk = (code, name) => {
+  // 发起下载请求
+  const downloadTask = uni.downloadFile({
+    url:prop.baseUrl + '/v3/files/hwane27308/' + code + '/' + name,
+    success: (res) => {
+      if (res.statusCode === 200) {
+        if (!res.tempFilePath) return
+        // 下载完成后安装 APK
+        plus.runtime.install(
+          res.tempFilePath,
+          {
+            force: true, // 强制安装
+          },
+          () => {
+            // 重启应用
+            // plus.runtime.restart()
+            // 关闭更新弹框
+            show.value = false
+            percentage.value = 0
+            enterUpdate.value = false
+            closable.value = true
+          },
+        )
+      }
+    },
+  })
+
+  // 监听下载进度变化
+  downloadTask.onProgressUpdate((res) => {
+    console.log('当前进度:', res.progress + '%')
+    // 更新 UI（例如进度条）
+    percentage.value = res.progress // 假设 this.progress 是绑定的数据
+  })
+}
+
+// 版本号比对 1:大于当前版本，-1：小于当前版本，0：版本号相同
+const compareVersions = (v1, v2) => {
+  // 接口版本
+  const v2Parts = v2.split('.').map(Number)
+  // 本地版本
+  const v1Parts = v1.split('.').map(Number)
+  for (let i = 0; i < Math.max(v1Parts.length, v2Parts.length); i++) {
+    const part1 = v1Parts[i] || 0
+    const part2 = v2Parts[i] || 0
+    if (part1 !== part2) return part1 < part2 ? 1 : -1
+  }
+  return 0
+}
+
+// 更新按钮点击事件
+const actionUpdate = () => {
+  enterUpdate.value = true
+  closable.value = false
+  isUpdate.value = 0
+  // 获取最新安装包
+  downloadApk(entities.value[0]['安装包唯一编码'], entities.value[0]['安装包名称'])
+}
+// 取消更新按钮点击事件
+const calce = () => {
+  enterUpdate.value = false
+  closable.value = true
+}
+</script>
+
+<style lang="scss" scoped>
+.updateBox {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 600rpx;
+  min-height: 200rpx;
+  padding: 32rpx;
+  background-color: #fff;
+  border-radius: 32rpx;
+  .calc {
+    width: 550rpx;
+    margin-top: 40rpx;
+    text-align: center;
+  }
+}
+.loadingBox {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 600rpx;
+  height: 200rpx;
+  padding: 32rpx;
+  background-color: #fff;
+  border-radius: 32rpx;
+}
+</style>