From a168fee5f88202e1cb3bec88b3d78d02c2368774 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 09 五月 2024 18:57:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingSubOrder.vue | 73 +++++++++++++++++++++++-
h5/pages/staff/meetingSub.vue | 28 +++++++-
h5/package.json | 1
h5/pages/staff/memberSel.vue | 5 +
h5/App.vue | 8 ++
h5/package-lock.json | 47 ++++++++++-----
6 files changed, 136 insertions(+), 26 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 42a8075..ee2ec51 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -142,6 +142,10 @@
.card .content {
color: #222;
}
+ .placeholder9{
+ color: #999999;
+ font-size: 28rpx;
+ }
//璁剧疆鍦嗚
checkbox .uni-checkbox-input{
border-radius: 50%;
@@ -173,7 +177,7 @@
align-items: center;
}
.main_app{
- padding: 0 30rpx;
+ padding: 30rpx;
font-size: 28rpx;
color: #222222;
}
@@ -186,5 +190,7 @@
.mr6{
margin-right: 6rpx;
}
+
+
</style>
diff --git a/h5/package-lock.json b/h5/package-lock.json
index 8e41c77..4f874c3 100644
--- a/h5/package-lock.json
+++ b/h5/package-lock.json
@@ -1,18 +1,35 @@
{
- "name": "鍥剧墖瑁佸壀 鍥涜鎷栧姩 鍥剧墖缂╂斁绉诲姩",
- "version": "1.0.0",
- "lockfileVersion": 1,
- "requires": true,
- "dependencies": {
- "uniapp-qrcode": {
- "version": "1.0.2",
- "resolved": "https://registry.npmmirror.com/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz",
- "integrity": "sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g=="
- },
- "uview-ui": {
- "version": "2.0.37",
- "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz",
- "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ=="
+ "name": "鍥剧墖瑁佸壀 鍥涜鎷栧姩 鍥剧墖缂╂斁绉诲姩",
+ "version": "1.0.0",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "鍥剧墖瑁佸壀 鍥涜鎷栧姩 鍥剧墖缂╂斁绉诲姩",
+ "version": "1.0.0",
+ "dependencies": {
+ "dayjs": "^1.11.11",
+ "uniapp-qrcode": "^1.0.2",
+ "uview-ui": "^2.0.37"
+ }
+ },
+ "node_modules/dayjs": {
+ "version": "1.11.11",
+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
+ "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+ },
+ "node_modules/uniapp-qrcode": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmmirror.com/uniapp-qrcode/-/uniapp-qrcode-1.0.2.tgz",
+ "integrity": "sha512-jcWwWz4yXsO7if/+78MMXj5VUdZTLu2D6L/IKb4mJkIw87oF11pO3WS/jS27SUcPCrX/BKcir5a2R1uvkaoR9g=="
+ },
+ "node_modules/uview-ui": {
+ "version": "2.0.37",
+ "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.37.tgz",
+ "integrity": "sha512-iBcWNmQa01Wr+z004G6XIVPDctOrJIAx7LObQceUAPxZh6kJYjIOAMp5JE1K4VpoMV5bKYDpCd0gmX+M4nTEQQ==",
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ }
+ }
}
- }
}
diff --git a/h5/package.json b/h5/package.json
index 4fc6bbe..62a8cda 100644
--- a/h5/package.json
+++ b/h5/package.json
@@ -14,6 +14,7 @@
]
},
"dependencies": {
+ "dayjs": "^1.11.11",
"uniapp-qrcode": "^1.0.2",
"uview-ui": "^2.0.37"
}
diff --git a/h5/pages/staff/meetingSub.vue b/h5/pages/staff/meetingSub.vue
index 50305f4..5dfd91e 100644
--- a/h5/pages/staff/meetingSub.vue
+++ b/h5/pages/staff/meetingSub.vue
@@ -1,9 +1,9 @@
<template>
<view class="main_app">
<view class="heade_title">
- <image class="icon" src="../../static/staff/ar_left@2x.png" mode="widthFix"></image>
- <text class="date">{{ activeDate }}</text>
- <image class="icon" src="../../static/staff/ar_right@2x.png" mode="widthFix"></image>
+ <image class="icon" src="../../static/staff/ar_left@2x.png" @click="changeDate(-1)" mode="widthFix"></image>
+ <text class="date">{{ activeDateCum }}</text>
+ <image class="icon" src="../../static/staff/ar_right@2x.png" @click="changeDate(1)" mode="widthFix"></image>
</view>
<!-- -->
<view class="meeting_list">
@@ -56,11 +56,12 @@
</template>
<script>
+ import dayjs from 'dayjs'
export default {
data() {
return {
- activeDate: '2022骞�',
- isShowDetail: true,
+ activeDate: '',
+ isShowDetail: false,
meetingList: [
{ name: '201浼氳瀹�' },
{ name: '201浼氳瀹�' },
@@ -81,6 +82,23 @@
]
};
+ },
+ computed: {
+ activeDateCum(){
+ const { activeDate } = this
+ let weeks = ['鍛ㄦ棩', '鍛ㄤ竴','鍛ㄤ簩','鍛ㄤ笁','鍛ㄥ洓','鍛ㄤ簲','鍛ㄥ叚']
+ return dayjs(activeDate).format('YYYY骞碝鏈圖鏃�') + ' ' + weeks[dayjs(activeDate).day()]
+ }
+ },
+ created() {
+ this.activeDate = dayjs().format('YYYY-MM-DD')
+ },
+ methods: {
+ changeDate(num){
+ const { activeDate } = this
+ let fn = num > 0 ? 'add' : 'subtract'
+ this.activeDate = dayjs(activeDate)[fn](1, 'days').format('YYYY-MM-DD')
+ }
}
}
</script>
diff --git a/h5/pages/staff/meetingSubOrder.vue b/h5/pages/staff/meetingSubOrder.vue
index 8c3b35f..3a25438 100644
--- a/h5/pages/staff/meetingSubOrder.vue
+++ b/h5/pages/staff/meetingSubOrder.vue
@@ -1,6 +1,45 @@
<template>
- <view>
-
+ <view class="main_app">
+ <view class="module_list">
+ <view class="item">
+ <view class="name">浼氳鏃堕棿</view>
+ <view class="line">
+ <view class="label">2022骞�22鏈�2鏃� 1000000000</view>
+ <u-icon name="arrow-right" color="#999999" size="14" />
+ </view>
+ </view>
+ <view class="item">
+ <view class="name">浼氳瀹�</view>
+ <view class="line">
+ <view class="label">aaaaaaaa</view>
+ </view>
+ </view>
+ <view class="item">
+ <view class="name">棰勭害浜�</view>
+ <view class="line">
+ <view class="label">aaaaaaaa</view>
+ </view>
+ </view>
+ <view class="empty"></view>
+ <view class="item">
+ <view class="name">
+ <text>浼氳涓婚</text>
+ <text class="star">*</text>
+ </view>
+ <view class="line">
+ <input type="text" v-model="param.aaa" placeholder="璇疯緭鍏ヤ細璁富棰�" placeholder-class="placeholder9" class="label">
+ </view>
+ </view>
+ <view class="item">
+ <view class="name">
+ <text>浼氳鍐呭</text>
+ </view>
+ <view class="line">
+ <textarea v-model="param.aaa" :maxlength="300" placeholder="璇疯緭鍏ヤ細璁唴瀹�" placeholder-class="placeholder9" class="label" />
+ </view>
+ </view>
+
+ </view>
</view>
</template>
@@ -8,12 +47,38 @@
export default {
data() {
return {
-
+ param: {}
};
}
}
</script>
<style lang="scss">
-
+.module_list{
+ .item{
+ border-bottom: 1rpx solid #E5E5E5;
+ padding: 30rpx 0;
+ .name{
+ color: #666666;
+ margin-bottom: 30rpx;
+ }
+ .line{
+ display: flex;
+ .label{
+ flex: 1;
+ }
+
+ }
+ }
+}
+.empty {
+ width: 750rpx;
+ height: 20rpx;
+ background-color: #f7f7f7;
+ margin: 0 -30rpx;
+}
+.star{
+ margin-left: 4rpx;
+ color: #e42d2d;
+}
</style>
diff --git a/h5/pages/staff/memberSel.vue b/h5/pages/staff/memberSel.vue
index 2cdf735..c6bf356 100644
--- a/h5/pages/staff/memberSel.vue
+++ b/h5/pages/staff/memberSel.vue
@@ -1,7 +1,7 @@
<template>
<view class="main_app">
<view class="search_inp df_ac">
- <u-icon size="28" class="mr12" color="#B2B2B2" name="search" />
+ <image class="mr12 search" src="../../static/ic_search@2x.png" mode="widthFix"></image>
<input type="text" placeholder="鎼滅储" placeholder-style="color: #999999;" />
</view>
<view class="member_list">
@@ -207,6 +207,9 @@
background: #f7f7f7;
border-radius: 4rpx;
padding-left: 16rpx;
+ .search{
+ width: 28rpx;
+ }
input {
flex: 1;
font-size: 28rpx;
--
Gitblit v1.9.3