From 9de02ff413d636cdfbaaaf134f01b929cbfb2409 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 28 八月 2023 14:39:10 +0800
Subject: [PATCH] 小程序
---
/dev/null | 22 -----------
minipro_standard/pages.json | 5 --
minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue | 16 +++++++-
minipro_standard/main.js | 2 -
minipro_standard/pages_adjust/components/Warehouse.vue | 41 ++++++++++++++++++++
5 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/minipro_standard/components/Warehouse.vue b/minipro_standard/components/Warehouse.vue
deleted file mode 100644
index e663399..0000000
--- a/minipro_standard/components/Warehouse.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
- <u-popup :show="show" mode="top" @close="close" @open="open">
- <view>
- <text>浜虹敓鑻ュ彧濡傚垵瑙侊紝浣曚簨绉嬮鎮茬敾鎵�</text>
- </view>
- </u-popup>
-</template>
-
-<script>
- export default {
- name:"Warehouse",
- data() {
- return {
-
- };
- }
- }
-</script>
-
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
diff --git a/minipro_standard/main.js b/minipro_standard/main.js
index edb2943..4686581 100644
--- a/minipro_standard/main.js
+++ b/minipro_standard/main.js
@@ -1,8 +1,6 @@
import Vue from 'vue'
import App from './App'
import mixin from './common/mixin'
-import 'vant/lib/index.css'
-
// 寮曞叆鍏ㄥ眬uView
import uView from '@/uni_modules/uview-ui'
Vue.use(uView)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 5c6f7ad..90a1b84 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -74,11 +74,6 @@
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#ffffff"
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 9e4d7b06a15aabe0141a991fe9358802a0590378
},
"tabBar": {
"color": "#666666",
diff --git a/minipro_standard/pages_adjust/components/Warehouse.vue b/minipro_standard/pages_adjust/components/Warehouse.vue
new file mode 100644
index 0000000..54504a8
--- /dev/null
+++ b/minipro_standard/pages_adjust/components/Warehouse.vue
@@ -0,0 +1,41 @@
+<template>
+ <u-popup :show="show" mode="bottom" :closeable="true" :round="10" @close="close">
+ <view class="title">
+ <text>閫夋嫨浠撳簱</text>
+ </view>
+ </u-popup>
+</template>
+
+<script>
+ export default {
+ name:"Warehouse",
+ props: {
+ show: Boolean
+ },
+ data() {
+ return {
+
+ };
+ },
+ methods: {
+ close() {
+ this.$emit('close')
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .title {
+ width: 100%;
+ height: 85rpx;
+ line-height: 85rpx;
+ text-align: center;
+ text {
+ font-size: 30rpx;
+ font-family: PingFangSC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #222222;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
index f9a42cf..0d08230 100644
--- a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
+++ b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
@@ -10,7 +10,7 @@
</view>
<view class="rework_list_item">
<text><b>*</b>鍏ュ簱浠撳簱</text>
- <view class="rework_list_item_right">
+ <view class="rework_list_item_right" @click="warehouseShow = true">
<text :class="form.warehouseName ? 'black' : ''">{{form.warehouseName ? form.warehouseName : '璇烽�夋嫨'}}</text>
<van-icon name="arrow" size="20" color="#999999" />
</view>
@@ -82,11 +82,15 @@
<button class="rework_footer_submit">鎻愪氦</button>
</view>
<u-toast ref="uToast"></u-toast>
+ <!-- 浠撳簱 -->
+ <Warehouse :show="warehouseShow" @close="close" @value="getValue" />
</view>
</template>
<script>
+ import Warehouse from '../../components/Warehouse.vue'
export default {
+ components: { Warehouse },
data() {
return {
form: {
@@ -95,10 +99,18 @@
type: '',
typeName: ''
},
- list: []
+ list: [],
+ warehouseShow: false
};
},
methods: {
+ getValue(val) {
+ this.warehouseShow = false
+ },
+ close() {
+ this.warehouseShow = false
+ },
+ // 娣诲姞鏄庣粏
addItem() {
if (!this.form.warehouseId) return this.$refs.uToast.show({ type: 'default', message: "璇烽�夋嫨鍏ュ簱浠撳簱" })
this.list.push({
--
Gitblit v1.9.3