From 0308cfa37aa4875386622f168943820b2ce08786 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期三, 13 九月 2023 14:45:38 +0800
Subject: [PATCH] 小程序
---
minipro_standard/pages/mine/mine.vue | 13 ++++++
minipro_standard/pages_adjust/components/multipleMaterial.vue | 14 +++++--
minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue | 2
minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue | 56 +++++++++++++++-------------
minipro_standard/components/yty-data-picker/yty-data-picker.vue | 13 +++++-
5 files changed, 64 insertions(+), 34 deletions(-)
diff --git a/minipro_standard/components/yty-data-picker/yty-data-picker.vue b/minipro_standard/components/yty-data-picker/yty-data-picker.vue
index a01378c..f9b8b34 100644
--- a/minipro_standard/components/yty-data-picker/yty-data-picker.vue
+++ b/minipro_standard/components/yty-data-picker/yty-data-picker.vue
@@ -82,10 +82,18 @@
width: 100%;
height: 80rpx;
background-color: #f9f9f9;
- border-radius: 40rpx;
+ border-radius: 20rpx;
margin-top: 20rpx;
padding: 0 30rpx;
box-sizing: border-box;
+ }
+
+ .search_area input {
+ font-size: 28rpx;
+ }
+
+ .search_area input::-webkit-input-placeholder {
+ font-size: 28rpx;
}
.search_icon {
@@ -102,7 +110,8 @@
.list_item {
padding: 20rpx;
- border-bottom: 1px solid #f5f5f5
+ border-bottom: 1px solid #f5f5f5;
+ font-size: 28rpx;
}
@keyframes dialog-fade-in {
diff --git a/minipro_standard/pages/mine/mine.vue b/minipro_standard/pages/mine/mine.vue
index f39a243..de9726e 100644
--- a/minipro_standard/pages/mine/mine.vue
+++ b/minipro_standard/pages/mine/mine.vue
@@ -1,7 +1,8 @@
<template>
<view>
<div class="box">
- <div class="box_info" :style="{background: 'url(' + img + ')'}">
+ <!-- :style="{background: 'url(' + img + ')'}" -->
+ <div class="box_info">
<image :src="avatar" mode="widthFix" />
<div class="box_info_box">
<text>{{userInfo.realname}}</text>
@@ -10,6 +11,7 @@
<image src="@/static/mine_ic_change@2x.png" alt="" />
</div>
</div>
+ <image class="bg" src="@/static/mine_bg@2x.png" mode="widthFix"></image>
</div>
<div class="box_function">
<div class="box_function_item" v-for="(item, index) in MENU" :key="index" @click="jump(item.url)">
@@ -126,10 +128,19 @@
align-items: center;
background-repeat: no-repeat;
background-size: cover;
+ position: relative;
image {
width: 88rpx;
height: 88rpx;
}
+ .bg {
+ width: 100%;
+ height: 168rpx;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+ }
.box_info_box {
height: 88rpx;
display: flex;
diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
index 3d34724..7765a7d 100644
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ b/minipro_standard/pages_adjust/components/multipleMaterial.vue
@@ -3,7 +3,7 @@
<view class="material-content bbox p30 rp">
<view class="tc b f24 c2 mb20">閫夋嫨鐗╂枡</view>
<v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜" />
- <div class="content_total">鍏眥{form.total}}鏉℃暟鎹�12</div>
+ <div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
<view class="scroll-content">
<!-- refresher-enabled="true"
:refresher-triggered="refreshing"
@@ -12,10 +12,11 @@
scroll-y="true"
@scrolltolower="loadMore">
<view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="jump(index)">
- <view class="img36 mr20 pt10">
+ <view class="img36 mr20 pt10" style="position: relative;">
<u-checkbox-group style="display: block;" name="">
<u-checkbox :checked="item1.isActive"></u-checkbox>
</u-checkbox-group>
+ <view style="width: 18px; height: 18px; position: absolute; top: 0; left: 0; z-index: 99;"></view>
</view>
<view class="fx1">
<div class="page_content_title_top">
@@ -151,6 +152,13 @@
item.isActive = !item.isActive
}
})
+ for (let i = 0; i < this.list.length; i++) {
+ if (!this.list[i].isActive) {
+ this.isAll = []
+ return
+ }
+ }
+ this.isAll = ['all']
},
// 鎼滅储鎻愪氦
submit() {
@@ -216,8 +224,6 @@
this.loadData()
},
selectAll(e) {
- console.log(e)
- console.log(this.isAll)
this.list.forEach(element => {
element.isActive = e.length > 0 ? true : false
})
diff --git a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
index 04cb0cd..cf66e4c 100644
--- a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
+++ b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
@@ -126,7 +126,7 @@
</view>
</view>
</view>
- <view v-if="(data.status === 0 || data.status === 1) && show" style="background:#F7F7F7; height:94rpx"></view>
+ <view v-if="(data.status === 0 || data.status === 1) && show" style="background:#F7F7F7; width: 100%; height: 188rpx"></view>
<view v-if="(data.status === 0 || data.status === 1) && show" class="bottom-button">
<button class="button" @click="submit">{{ data.status === 0 ? '鍘诲嚭搴�' : '鍘诲叆搴�' }}</button>
</view>
diff --git a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
index ef0cd69..62a3024 100644
--- a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
+++ b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
@@ -256,36 +256,40 @@
// 鐐瑰嚮涓婁紶
uploadFile() {
var that = this
- uni.chooseImage({
+ uni.chooseMedia({
+ mediaType: ['image', 'video'],
+ sourceType: ['album', 'camera'],
success: (chooseImageRes) => {
- const tempFilePaths = chooseImageRes.tempFilePaths;
+ const tempFilePaths = chooseImageRes.tempFiles;
console.log(tempFilePaths)
- uni.uploadFile({
- url: baseUrl + '/ext/routeCardExt/upload',
- filePath: tempFilePaths[0],
- name: 'file',
- header: {
- 'Cookie': 'eva-auth-token=' + that.session
- },
- formData: {
- 'folder': that.path
- },
- success: (uploadFileRes) => {
- let res = JSON.parse(uploadFileRes.data)
- let type = ''
- for (let i = 0; i < fileType.length; i++) {
- if (tempFilePaths[0].indexOf(fileType[i].name) !== -1) {
- type = fileType[i].type
+ for (let i = 0; i < tempFilePaths.length; i++) {
+ uni.uploadFile({
+ url: baseUrl + '/ext/routeCardExt/upload',
+ filePath: tempFilePaths[i].tempFilePath,
+ name: 'file',
+ header: {
+ 'Cookie': 'eva-auth-token=' + that.session
+ },
+ formData: {
+ 'folder': that.path
+ },
+ success: (uploadFileRes) => {
+ let res = JSON.parse(uploadFileRes.data)
+ let type = ''
+ for (let s = 0; s < fileType.length; s++) {
+ if (tempFilePaths[i].tempFilePath.indexOf(fileType[s].name) !== -1) {
+ type = fileType[s].type
+ }
}
+ that.form.files.push({
+ fileUrl: res.data.imgaddr,
+ filename: res.data.imgname,
+ type,
+ url: res.data.url
+ })
}
- that.form.files.push({
- fileUrl: res.data.imgaddr,
- filename: res.data.imgname,
- type,
- url: res.data.url
- })
- }
- });
+ });
+ }
}
});
},
--
Gitblit v1.9.3