From a637993e52932ee2ed74c711901cb4ae5c38ea19 Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Mon, 18 Jul 2022 15:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                           |   3 +-
 src/pages/my/imgUpload.vue               | 681 +++++++----------------
 src/pages/orderHall/addOrder.vue         | 217 +++++---
 src/pages/orderHall/orderHall.vue        | 278 +++++----
 src/pages/orderHall/orderHallDetails.vue | 309 +++++++---
 src/static/orderHall/addOrder.png        | Bin 0 -> 7992 bytes
 6 files changed, 727 insertions(+), 761 deletions(-)
 create mode 100644 src/static/orderHall/addOrder.png

diff --git a/src/pages.json b/src/pages.json
index 7e5d859..fd12ba6 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -530,7 +530,8 @@
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": "点单大厅",
-		        "enablePullDownRefresh": false
+		        "enablePullDownRefresh": true,
+		        "onReachBottomDistance": 20
 		    } 
 		},
 		{
diff --git a/src/pages/my/imgUpload.vue b/src/pages/my/imgUpload.vue
index 256f94f..79c4810 100644
--- a/src/pages/my/imgUpload.vue
+++ b/src/pages/my/imgUpload.vue
@@ -1,520 +1,233 @@
 <template>
-    <view>
+	<view>
+		<view class="wanShan">
+			<view class="data_itm_box" style="padding: 32rpx ;">
 
-        <u--form :model="model1" ref="form1" labelPosition="top" labelWidth='auto' :labelStyle='{fontWeight:800}'>
-            <!-- 完善资料 -->
-            <!-- 这里加了 v-for  导致 ref 失效 -->
-            <view class="wanShan">
-                <view class="data_itm_box" style="padding: 32rpx ;">
+				<view class="data_itm">
+					<view class="data_itm_key label_t">
+						图片上传
+					</view>
+				</view>
+				<u-upload class="upload" accept="image" width="172rpx" height="172rpx" :fileList="fileList3"
+					@afterRead="afterRead" @delete="deletePic" name="3" multiple>
+					<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
+				</u-upload>
 
-                    <view class="data_itm">
-                        <view class="data_itm_key label_t">
-                            图片上传
-                        </view>
-                    </view>
-                    <u-upload class="upload" accept="image" width="172rpx" height="172rpx" :fileList="fileList3"
-                        @afterRead="afterRead" @delete="deletePic" name="3" multiple :maxCount="1">
-                        <image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
-                    </u-upload>
-
-                </view>
-            </view>
-            <view class="operation">
-                <button type="default" class="next" @click="submit">确定</button>
-            </view>
-        </u--form>
-        <view class="zhan_w">
-            <!-- zhanwei -->
-        </view>
-    </view>
+			</view>
+		</view>
+		<view class="operation">
+			<button type="default" class="next" @click="submit">确定</button>
+		</view>
+		<view class="zhan_w">
+			<!-- zhanwei -->
+		</view>
+	</view>
 </template>
 
 <script>
-    import http from '../../request/interface.js'
-    export default {
-        data() {
-            return {
-                
-                fileList4: [], //资质照片上传
-                fileList1: [], //实景照片上传
-                fileList2: [
-                    []
-                ], //代表作照片
-                fileList3: [], //照片上传
-                
-                model1: {
-                    userInfo: {
-                        name: '',
-                        sex: '',
-                        birthday: "2000-01-01",
-                        idCOde: '',
+	import http from '../../request/interface.js'
+	export default {
+		data() {
+			return {
+				fileList3: [], //照片上传
+				id: '',
+			};
+		},
+		onLoad(option) {
+			this.id = option.id
+		},
+		methods: {
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: http.config.baseUrl + '/file/upload',
+						filePath: url,
+						name: 'file',
+						formData: {
+							user: 'test'
+						},
+						success: (res) => {
+							if (JSON.parse(res.data).code == 200) {
+								setTimeout(() => {
+									resolve(JSON.parse(res.data).data.path)
+								}, 1000)
+							} else {
+								uni.showToast({
+									title: JSON.parse(res.data).message,
+									icon: "none",
+								});
+								this.fileList3.pop()
+							}
+						}
+					});
+				})
+			},
+			submit() {
+				let image = []
+				this.fileList3.forEach(function(item) {
+					image.push(item.url)
+				})
+				let data = image.join(',')
+				console.log(data)
+				this.http.request('/hall/addHall?id='+ this.id +'&image=' +data, {}, "POST").then(res => {
+					if (res.code == 200) {
+						uni.navigateBack()
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			}
+		}
 
-                        phoneNum: '',
-                        meeting: '',
-                        // meetingTime: '',
-                        ServerName: '',
-                        Address: '',
-                        serverInstrutor: '', //服务介绍
-                        serveTime: '09:00',
-                        serveTimeend: '17:00',
-                        jionTime: '2000-01-01',
-                        DutyPeopleName: '', //负责人名称
-                        // ServephoneNum: '', //服务商电话
-                        pasw: ''
-                    },
-                },
-                rules: {
-                    'userInfo.pasw': [{
-                        required: true,
-                        message: '请填写密码',
-                        trigger: ['blur','change']
-                    }, {
-                        min: 6,
-                        max: 20,
-                        message: '密码长度应大于等于6个字符小于20个字符!',
-                        trigger:  ['blur','change']
-                    }, {
-                        trigger:  ['blur','change'],
-                        validator: (rule, value, callback) => {
-                            var passwordreg =
-                               /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$).{6,20}$/;
-                            if (!passwordreg.test(value)) {
-                                callback(new Error('密码包含 数字,英文,字符中的两种以上'))
-                            } else {
-                                callback()
-                            }
-                        }
-                    
-                    }],
-                    'userInfo.serverInstrutor': [{
-                        type: 'string',
-                        required: true,
-                        message: '请填写服务内容介绍',
-                        trigger: ['blur', 'change']
-                    }],
-                    'userInfo.Address': [{
-                        type: 'string',
-                        required: true,
-                        message: '请填写地址',
-                        trigger: ['blur', 'change']
-                    }],
-                    'userInfo.name': [{
-                        type: 'string',
-                        required: true,
-                        message: '请填写姓名',
-                        trigger: ['blur', 'change']
-                    }, {
-                        // 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-                        validator: (rule, value, callback) => {
-                            // 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-                            return uni.$u.test.chinese(value);
-                        },
-                        message: "姓名必须为中文",
-                        // 触发器可以同时用blur和change，二者之间用英文逗号隔开
-                        trigger: ["change", "blur"],
-                    }],
-                    'userInfo.meeting': [{
-                        type: 'string',
-                        required: true,
-                        message: '请填写协会名',
-                        trigger: ['blur', 'change']
-                    }],
-                    'userInfo.sex': {
-                        type: 'string',
-                        max: 1,
-                        required: true,
-                        message: '请选择男或女',
-                        trigger: ['blur', 'change']
-                    },
-                    'userInfo.idCOde': [{
-                                required: true,
-                                message: '请输入身份证号号',
-                                trigger: ['change', 'blur'],
-                            },
-                            {
-                                // 自定义验证函数，见上说明
-                                validator: (rule, value, callback) => {
-                                    return uni.$u.test.idCard(value);
-                                },
-                                message: '身份证号码格式不正确',
-
-                                trigger: ['change', 'blur'],
-                            }
-                        ]
-                        ,
-                    'userInfo.ServerName': [{
-                        type: 'string',
-                        required: true,
-                        message: '请填写服务名称',
-                        trigger: ['blur', 'change']
-                    }, {
-                        // 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-                        validator: (rule, value, callback) => {
-                            // 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-                            return uni.$u.test.chinese(value);
-                        },
-                        message: "姓名必须为中文",
-                        // 触发器可以同时用blur和change，二者之间用英文逗号隔开
-                        trigger: ["change", "blur"],
-                    }],
-                    'userInfo.DutyPeopleName': [{
-                        type: 'string',
-                        required: true,
-                        message: '请填写姓名',
-                        trigger: ['blur', 'change']
-                    }, {
-                        // 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
-                        validator: (rule, value, callback) => {
-                            // 调用uView自带的js验证规则，详见：https://www.uviewui.com/js/test.html
-                            return uni.$u.test.chinese(value);
-                        },
-                        message: "姓名必须为中文",
-                        // 触发器可以同时用blur和change，二者之间用英文逗号隔开
-                        trigger: ["change", "blur"],
-                    }],
-                },
-            };
-        },
-        onLoad(option) {
-            console.log(option.id);
-            this.pageTypeId = option.id
-        },
-        onReady() {
-            this.$refs.form1.setRules(this.rules);
-
-            this.http.request('/association/list', {}, "GET").then((res) => {
-                res.data.records.map((v, i) => {
-                    return this.xiehuiObj[v.name] = v.id
-                })
-
-                var xieList = res.data.records.map((v, i) => {
-                    return v.name
-                })
-                this.xiecolumns.push(xieList)
-
-
-
-                console.log('this.xiehuiObj', this.xiehuiObj);
-
-            }).catch((error) => {
-                console.log("error", error);
-            })
-        },
-
-        methods: {
-            close(show) {
-                this[show] = false
-            },
-            AddItem(typNum) {
-
-                switch (typNum) {
-                    case 0:
-                        // this.$set(this.artlist, changeNum, null)
-                        this.artlist.push("")
-                        break;
-                    case 1:
-                        this.honorList.push('')
-                        break;
-                    case 2:
-                        this.StandradList.push('')
-                        this.fileList2.push([])
-                        break;
-                }
-
-
-            },
-            delItem(typNum, num) {
-                switch (typNum) {
-                    case 0:
-
-                        this.artlist.splice(num, 1)
-                        break;
-                    case 1:
-                        this.honorList.splice(num, 1)
-                        break;
-                    case 2:
-                        this.StandradList.splice(num, 1)
-
-                        break;
-                }
-
-            },
-            sexSelect(e) {
-                this.model1.userInfo.sex = e.name
-                // this.$refs.form1.validateField('userInfo.sex')
-            },
-            selectForm(sex) {
-
-                this.model1.userInfo.sex = sex
-            },
-            birthdayConfirm(e) {
-                this.showBirthday = false
-                this.model1.userInfo.birthday = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
-                // this.$refs.form1.validateField('userInfo.birthday')
-            },
-            ServeTimeConfirm(e) {
-                this.showServeTime = false
-                this.model1.userInfo.serveTime = e.value
-
-            },
-            ServeTimeConfirmend(e) {
-                this.showServeTimeend = false
-                this.model1.userInfo.serveTimeend = e.value
-            },
-            jionMeetConfirm(e) {
-                this.showJionmeet = false
-                this.model1.userInfo.jionTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
-            },
-
-            confimZu(e) {
-                this.zuShow = false
-                this.zuValue = e.value[0]
-                // console.log(e.value[0]);
-            },
-            confirmxie(e) {
-                this.xieShow = false
-                this.xieValue = e.value[0]
-                this.xiehuiId = this.xiehuiObj[this.xieValue]
-                console.log("xiehuiId", this.xiehuiId);
-            },
-            confimZheng(e) {
-                this.zhengzhiShow = false
-                this.zhengzhiValue = e.value[0]
-            },
-            confimRenCai(e) {
-                this.renCaiShow = false
-                this.renCaiValue = e.value[0]
-            },
-            confimJi(e) {
-                this.jigaunShow = false
-                this.jiguan = e.value[0]
-            },
-            // 删除图片
-            deletePic(event) {
-                this[`fileList${event.name}`].splice(event.index, 1)
-            },
-            // 删除图片
-            deletePic1(event) {
-                this.fileList2[event.name].splice(event.index, 1)
-            },
-            // 新增图片
-            async afterRead(event) {
-                // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
-                let lists = [].concat(event.file)
-                let fileListLen = this[`fileList${event.name}`].length
-                lists.map((item) => {
-                    this[`fileList${event.name}`].push({
-                        ...item,
-                        status: 'uploading',
-                        message: '上传中'
-                    })
-                })
-                for (let i = 0; i < lists.length; i++) {
-                    const result = await this.uploadFilePromise(lists[i].url)
-
-                    console.log("result", result);
-
-                    let item = this[`fileList${event.name}`][fileListLen]
-                    this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
-                        status: 'success',
-                        message: '',
-                        url: result
-                    }))
-                    fileListLen++
-                }
-                console.log("fileList", this[`fileList${event.name}`]);
-            },
-            // 新增图片
-            async afterRead1(event) {
-                // 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
-                let lists = [].concat(event.file)
-                console.log(this.fileList2[event.name])
-                let fileListLen = this.fileList2[event.name].length
-
-                lists.map((item) => {
-                    this.fileList2[event.name].push({
-                        ...item,
-                        status: 'uploading',
-                        message: '上传中'
-                    })
-                })
-                for (let i = 0; i < lists.length; i++) {
-                    const result = await this.uploadFilePromise(lists[i].url)
-
-                    console.log("result", result);
-
-                    let item = this.fileList2[event.name][fileListLen]
-                    this.fileList2[event.name].splice(fileListLen, 1, Object.assign(item, {
-                        status: 'success',
-                        message: '',
-                        url: result
-                    }))
-                    fileListLen++
-                }
-                console.log("fileList", this.fileList2[event.name]);
-            },
-
-            uploadFilePromise(url) {
-                return new Promise((resolve, reject) => {
-                    let a = uni.uploadFile({
-                        url: http.config.baseUrl + '/upload/upload',
-                        filePath: url,
-                        name: 'file',
-
-                        success: (res) => {
-
-                            setTimeout(() => {
-
-
-                                resolve(JSON.parse(res.data).data.path)
-                            }, 1000)
-                        }
-                    });
-                })
-            },
-            submit() {
-              
-                /*  
-                this.$refs.form1.validate().then(res => {
-                    this.http.request('/auth/init', data, "POST").then(res => {
-                        if (res.code == 200) {
-                            uni.navigateTo({
-                                 url: '/pages/pageHome/pageHome'
-                             })
-                            uni.showToast({
-                                title: "成功了",
-                                icon: "none",
-                            });
-                        }
-                    }).catch(e => {
-                        uni.showToast({
-                            title: e.data.message,
-                            icon: "none",
-                        });
-                    })
-                }).catch(errors => {
-                    uni.$u.toast('您的资料还未补充完整')
-                    return
-                }) */
-               
-            }
-        }
-
-    }
+	}
 </script>
 
 <style lang="scss">
-   /* page {
+	/* page {
         background-color: #F5F5F5;
 
     }
  */
- 
 
-    .p32 {
-        padding: 20rpx !important;
-    }
 
-    .WenYiUpload {
-        margin-top: 16rpx;
-    }
+	.p32 {
+		padding: 20rpx !important;
+	}
 
-    .te /deep/ .u-form-item__body__right__content__slot {
-        flex-wrap: wrap !important;
+	.WenYiUpload {
+		margin-top: 16rpx;
+	}
 
-    }
+	.te /deep/ .u-form-item__body__right__content__slot {
+		flex-wrap: wrap !important;
 
-    image {
-        width: 100%;
-        height: 100%;
-    }
+	}
 
-    .upload {
-        padding-top: 32rpx;
-    }
+	image {
+		width: 100%;
+		height: 100%;
+	}
 
-    .data_itm_box {
-        padding: 32rpx 0rpx;
+	.upload {
+		padding-top: 32rpx;
+	}
 
-        .chen_itm {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 16rpx;
+	.data_itm_box {
+		padding: 32rpx 0rpx;
 
-            .right_img_box {
-                width: 80rpx;
-                height: 80rpx;
-                margin-left: 16rpx;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-            }
-        }
+		.chen_itm {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 16rpx;
 
-        margin-bottom: 16rpx;
-        border: 1px solid transparent;
-        padding: 0 32rpx;
-        background-color: #FFFFFF;
+			.right_img_box {
+				width: 80rpx;
+				height: 80rpx;
+				margin-left: 16rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
 
-        .data_itm {
-            .label_t {
-                font-size: 28rpx;
-                color: $black;
-                font-weight: 600;
-            }
-        }
-        .xie{
-            display: flex;justify-content: space-between; align-items: center;margin-bottom: 16rpx;
-        }
+		margin-bottom: 16rpx;
+		border: 1px solid transparent;
+		padding: 0 32rpx;
+		background-color: #FFFFFF;
+
+		.data_itm {
+			.label_t {
+				font-size: 28rpx;
+				color: $black;
+				font-weight: 600;
+			}
+		}
+
+		.xie {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-bottom: 16rpx;
+		}
 
 
 
-        .upload_box {
-            width: 166rpx;
-            height: 166rpx;
-            margin-left: 32rpx;
-            position: relative;
-            background-color: #F8F8F8;
-            margin-bottom: 64rpx;
-        }
-    }
+		.upload_box {
+			width: 166rpx;
+			height: 166rpx;
+			margin-left: 32rpx;
+			position: relative;
+			background-color: #F8F8F8;
+			margin-bottom: 64rpx;
+		}
+	}
 
 
-    .operation {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 32rpx 32rpx 48rpx;
-        position: fixed;
-        left: 0;
-        bottom: 0;
-        right: 0;
-        background-color: #FFFFFF;
-        box-shadow: 0px -4px 10px 1px rgba(192, 192, 192, 0.12);
-        z-index: 99;
+	.operation {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 32rpx 32rpx 48rpx;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		right: 0;
+		background-color: #FFFFFF;
+		box-shadow: 0px -4px 10px 1px rgba(192, 192, 192, 0.12);
+		z-index: 99;
 
-        .next {
-            width: calc(100% - 48rpx);
-            height: 80rpx;
-            line-height: 80rpx;
+		.next {
+			width: calc(100% - 48rpx);
+			height: 80rpx;
+			line-height: 80rpx;
 
-            background-color: #99241B;
-            color: #fff;
-            font-size: 32rpx;
-            font-weight: 600;
+			background-color: #99241B;
+			color: #fff;
+			font-size: 32rpx;
+			font-weight: 600;
 
-            border: none;
+			border: none;
 
-            button {
-                &::after {
-                    border: none;
-                }
-            }
-        }
-    }
+			button {
+				&::after {
+					border: none;
+				}
+			}
+		}
+	}
 
-    .zhan_w {
-        height: 160rpx;
-    }
+	.zhan_w {
+		height: 160rpx;
+	}
 </style>
diff --git a/src/pages/orderHall/addOrder.vue b/src/pages/orderHall/addOrder.vue
index a8b1560..2ee8215 100644
--- a/src/pages/orderHall/addOrder.vue
+++ b/src/pages/orderHall/addOrder.vue
@@ -5,7 +5,8 @@
 				名称
 			</view>
 			<view class="form_right">
-				<u--input placeholder="请输入名称" v-model="name" clearable border="none" inputAlign="right" style="color: #251B1D;">
+				<u--input placeholder="请输入名称" v-model="name" clearable border="none" inputAlign="right"
+					style="color: #251B1D;">
 				</u--input>
 			</view>
 		</view>
@@ -14,17 +15,16 @@
 				类型
 			</view>
 			<view class="form_right" @click="showType=true">
-				<u--input placeholder="请选择类型" clearable border="none" inputAlign="right" style="color: #251B1D;" suffixIcon="map-fill" readonly v-model="type" disabledColor="#ffffff">
+				<u--input placeholder="请选择类型" clearable border="none" inputAlign="right" style="color: #251B1D;"
+					suffixIcon="arrow-right" readonly v-model="type" disabledColor="#ffffff">
 				</u--input>
 			</view>
 		</view>
-		<u-popup :show="showType" @close="close" closeOnClickOverlay :round="5"
-			customStyle="padding: 16px;">
+		<u-popup :show="showType" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
 			<u-radio-group @change="selectForm1" v-model="type" :borderBottom="true" placement="column"
 				iconPlacement="right">
 				<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist1" :key="index"
-					:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
-					activeColor="#99241B ">
+					:label="item.name" labelSize="28rpx" labelColor="#231F1C" :name="item.name" activeColor="#99241B ">
 				</u-radio>
 				<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
 					type="default" @click="showType=false">确认</u-button>
@@ -51,7 +51,8 @@
 				截止时间
 			</view>
 			<view class="form_right" @click="chooseTime(0)">
-				<u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;" suffixIcon="map-fill" readonly v-model="eTime" disabledColor="#ffffff">
+				<u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
+					suffixIcon="calendar" readonly v-model="eTime" disabledColor="#ffffff">
 				</u--input>
 			</view>
 		</view>
@@ -60,12 +61,13 @@
 				活动时间
 			</view>
 			<view class="form_right" @click="chooseTime(1)">
-				<u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;" suffixIcon="map-fill" readonly v-model="wTime" disabledColor="#ffffff">
+				<u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
+					suffixIcon="calendar" readonly v-model="wTime" disabledColor="#ffffff">
 				</u--input>
 			</view>
 		</view>
-		<u-datetime-picker :show="showTime" v-model="timeValue" value-format="yyyy-MM-dd" mode="date"
-			@close="close" @cancel="close" @confirm="sureTime"></u-datetime-picker>
+		<u-datetime-picker :show="showTime" v-model="timeValue" value-format="yyyy-MM-dd" mode="date" @close="close"
+			@cancel="close" @confirm="sureTime"></u-datetime-picker>
 		<view class="gap">
 			接单设置
 		</view>
@@ -74,13 +76,22 @@
 				可接单用户选择
 			</view>
 			<view class="form_right" @click="showUser=true">
-				<u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;" suffixIcon="map-fill" readonly v-model="userType" disabledColor="#ffffff">
+				<u--input placeholder="请选择" clearable border="none" inputAlign="right" style="color: #251B1D;"
+					suffixIcon="arrow-right" readonly v-model="userType" disabledColor="#ffffff">
 				</u--input>
 			</view>
 		</view>
-		<u-popup :show="showUser" @close="close" closeOnClickOverlay :round="5"
-			customStyle="padding: 16px;">
-			<u-checkbox-group @change="selectForm2" v-model="radiovalue2" :borderBottom="true" placement="column"
+		<u-popup :show="showUser" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
+			<u-radio-group @change="selectForm2" v-model="userType" :borderBottom="true" placement="column"
+				iconPlacement="right">
+				<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist2" :key="index"
+					:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
+					activeColor="#99241B ">
+				</u-radio>
+				<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
+					type="default" @click="showUser=false">确认</u-button>
+			</u-radio-group>
+			<!-- <u-checkbox-group @change="selectForm2" v-model="radiovalue2" :borderBottom="true" placement="column"
 				iconPlacement="right">
 				<u-checkbox :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist2" :key="index"
 					:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.label"
@@ -88,7 +99,7 @@
 				</u-checkbox>
 				<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
 					type="default" @click="showUser=false">确认</u-button>
-			</u-checkbox-group>
+			</u-checkbox-group> -->
 		</u-popup>
 		<view class="form_line">
 			<view class="form_left">
@@ -109,11 +120,17 @@
 		<view class="gap">
 			附件上传
 		</view>
+		<view class="gap" style="line-height: 30rpx;font-size: 28rpx;">
+			可上传图片(png/jpg/jpeg/bmp/gif/tif/tiff)或pdf
+		</view>
+		<view class="gap" style="line-height: 30rpx;font-size: 28rpx;">
+			(若有图片请先上传图片)
+		</view>
 		<u-upload class="upload" accept="file" width="172rpx" height="172rpx" :fileList="fileList3"
 			@afterRead="afterRead" @delete="deletePic" name="3" multiple>
 			<image style="width: 172rpx;height: 172rpx;" src="../../static/improveData/jia.png"></image>
 		</u-upload>
-		
+
 		<view class="operation" @click="next">
 			发布
 		</view>
@@ -122,80 +139,96 @@
 
 <script>
 	import http from '../../request/interface.js'
-	export default{
-		data(){
-			return{
-				name:'',
+	export default {
+		data() {
+			return {
+				name: '',
 				typeId: '',
 				showType: false,
-				type:'',
-				radiolist1: [
-					{
-						label:'qwe',
-						id:'123',
-					},
-					{
-						label:'asd',
-						id:'124',
-					},
-					{
-						label:'zxc',
-						id:'125',
-					},
-				],
+				type: '',
+				radiolist1: [],
 				text1: '',
 				text2: '',
-				showTime:false,
+				showTime: false,
 				timeTab: 0,
-				eTime:'',
-				wTime:'',
+				eTime: '',
+				wTime: '',
 				timeValue: Number(new Date()),
-				showUser:false,
-				userType:'',
-				radiovalue2: [],
-				radiolist2: [
-					{
-						label:'qwe567',
-						id:'123',
-					},
-					{
-						label:'asd67',
-						id:'124',
-					},
-					{
-						label:'zxc67',
-						id:'125',
-					},
-				],
+				showUser: false,
+				userType: '',
+				userTypeValue: '',
+				// radiovalue2: [],
+				radiolist2: [],
 				morePer: true,
-				perNumber: 0,
+				perNumber: 1,
 				fileList3: [],
 			}
 		},
+		onShow() {
+			this.getTypeList()
+			this.getUserList()
+		},
 		methods: {
+			// 订单类型
+			getTypeList() {
+				this.http.request('/hallType/list', {}, "GET").then(res => {
+					if (res.code == 200) {
+						this.radiolist1 = res.data.records
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			// 用户类型
+			getUserList() {
+				this.http.request('/hall/yhlx', {}, "GET").then(res => {
+					if (res.code == 200) {
+						this.radiolist2 = res.data
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
 			close() {
 				this.showType = false
 				this.showTime = false
 				this.showUser = false
 			},
 			selectForm1(form) {
-				this.typeId = form
+				let _this = this
+				this.radiolist1.forEach(function(item) {
+					if (item.name == form) {
+						_this.typeId = item.code
+					}
+				})
 			},
-			chooseTime(val){
+			chooseTime(val) {
 				this.showTime = true
 				this.timeTab = val
 			},
 			sureTime(e) {
-				if(this.timeTab == 0){
+				if (this.timeTab == 0) {
 					this.eTime = uni.$u.timeFormat(e.value)
-				}else{
+				} else {
 					this.wTime = uni.$u.timeFormat(e.value)
 				}
 				this.showTime = false
 			},
 			selectForm2(form) {
-				let data = form
-				this.userType = data.join(',')
+				let _this = this
+				this.radiolist2.forEach(function(item) {
+					if (item.label == form) {
+						_this.userTypeValue = item.value
+					}
+				})
+				// let data = form
+				// this.userType = data.join(',')
 			},
 			changeTrue(e) {
 				console.log('change', e);
@@ -240,12 +273,11 @@
 							user: 'test'
 						},
 						success: (res) => {
-							console.log(res)
-							if(JSON.parse(res.data).code == 200){
+							if (JSON.parse(res.data).code == 200) {
 								setTimeout(() => {
 									resolve(JSON.parse(res.data).data.path)
 								}, 1000)
-							}else{
+							} else {
 								uni.showToast({
 									title: JSON.parse(res.data).message,
 									icon: "none",
@@ -256,16 +288,41 @@
 					});
 				})
 			},
-			next(){
-				
+			next() {
+				let image = []
+				this.fileList3.forEach(function(item) {
+					image.push(item.url)
+				})
+				let data = image.join(',')
+				this.http.request('/hall/addHall', {
+					activityTime: this.wTime,
+					content: this.text2,
+					deadline: this.eTime,
+					demand: this.text1,
+					isMultiple: this.morePer,
+					quantity: this.perNumber,
+					receiverType: this.userTypeValue,
+					title: this.name,
+					type: this.typeId,
+					enclosure: data
+				}, "POST").then(res => {
+					if (res.code == 200) {
+						uni.navigateBack()
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
 			}
-			
+
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.form_line{
+	.form_line {
 		width: 686rpx;
 		padding: 0 32rpx;
 		display: flex;
@@ -274,13 +331,13 @@
 		justify-content: space-between;
 		height: 104rpx;
 		border-bottom: 1rpx solid #dadbde;
-		
-		.form_right{
+
+		.form_right {
 			width: 450rpx;
 		}
 	}
-	
-	.form_box{
+
+	.form_box {
 		width: 686rpx;
 		padding: 0 32rpx;
 		display: flex;
@@ -289,25 +346,24 @@
 		justify-content: space-between;
 		height: 104rpx;
 	}
-	
-	.text_box{
+
+	.text_box {
 		width: 686rpx;
 		padding: 0 32rpx;
 	}
-	
+
 	.gap {
 		color: #AFADB0;
-		height: 50rpx;
 		background: #F5F5F5;
 		opacity: 1;
 		padding: 10rpx 32rpx;
 		font-size: 32rpx;
 	}
-	
+
 	.upload {
 		padding: 32rpx;
 	}
-	
+
 	.operation {
 		width: 654rpx;
 		height: 96rpx;
@@ -319,5 +375,4 @@
 		font-size: 36rpx;
 		font-weight: 600;
 	}
-	
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/orderHall/orderHall.vue b/src/pages/orderHall/orderHall.vue
index c7c1236..88b5f79 100644
--- a/src/pages/orderHall/orderHall.vue
+++ b/src/pages/orderHall/orderHall.vue
@@ -1,154 +1,177 @@
 <template>
-	<view class="page">
-		<view class="nav">
-			<view class="list" v-for="(item,index) in list" :key="item.text" @click="onNav(item.id,index)">
-				<view :class="['text',action == index?'on':'']">{{item.text}}</view> 
-			</view>
+	<view class="">
+		<view class="">
+			<u-loading-page :loading="load"></u-loading-page>
 		</view>
-		<view class="main" v-if="isShow == 1">
-			<view class="mainList" v-for="item in mainList" :key="item.img">
-				<view class="mainListImg">
-					<img class='img' :src="item.img" alt="">
-				</view>
-				<view class="text">
-					<view class="text1">象山县打造公益文化特色团队</view>
-					<view class="text2">这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需…</view>
-					<view class="text3">
-						<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
-						<view class="time">截止时间：2022/06/19</view>
-					</view>
+		<view class="page">
+			<view class="nav">
+				<view class="list" v-for="(item,index) in list" :key="index" @click="onNav(item.code,index)">
+					<view :class="['text',action == index?'on':'']">{{item.text}}</view>
 				</view>
 			</view>
-		</view>
-		<view class="main" v-if="isShow == 2">
-			<view class="mainList" v-for="item in mainList" :key="item.img">
-				<view class="mainListImg">
-					<img class='img' :src="item.img" alt="">
-				</view>
-				<view class="text">
-					<view class="text1">象山县队</view>
-					<view class="text2">这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需…</view>
-					<view class="text3">
-						<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
-						<view class="time">截止时间：2022/06/19</view>
-					</view>
-				</view>
+			<view class="addIcon" @click="toAddOrder">
+				<image src="../../static/orderHall/addOrder.png"></image>
 			</view>
-		</view>
-		<view class="main" v-if="isShow == 3">
-			<view class="mainList" v-for="item in mainList" :key="item.img">
-				<view class="mainListImg">
-					<img class='img' :src="item.img" alt="">
-				</view>
-				<view class="text">
-					<view class="text1">象山县333333队</view>
-					<view class="text2">这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需…</view>
-					<view class="text3">
-						<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
-						<view class="time">截止时间：2022/06/19</view>
+			<view class="main" v-if="mainList.length > 0">
+				<view class="mainList" v-for="(item,i) in mainList" :key="i">
+					<view class="mainListImg" @click="toDetail(item.id)">
+						<img class='img' :src="item.cover" alt="">
+					</view>
+					<view class="text">
+						<view class="text1">{{item.title}}</view>
+						<view class="text2">{{item.content}}</view>
+						<view class="text3">
+							<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
+							<view class="time">截止时间：{{item.deadline}}</view>
+						</view>
 					</view>
 				</view>
+				
 			</view>
-		</view>
-		<view class="main" v-if="isShow == 4">
-			<view class="mainList" v-for="item in mainList" :key="item.img">
-				<view class="mainListImg">
-					<img class='img' :src="item.img" alt="">
-				</view>
-				<view class="text">
-					<view class="text1">象山县444444444队</view>
-					<view class="text2">这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需…</view>
-					<view class="text3">
-						<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
-						<view class="time">截止时间：2022/06/19</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="main" v-if="isShow == 5">
-			<view class="mainList" v-for="item in mainList" :key="item.img">
-				<view class="mainListImg">
-					<img class='img' :src="item.img" alt="">
-				</view>
-				<view class="text">
-					<view class="text1">象山县555555队</view>
-					<view class="text2">这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需求清单这里是需…</view>
-					<view class="text3">
-						<img class='mainListTime' src="../../static/orderHall/mainListTime.png" alt="">
-						<view class="time">截止时间：2022/06/19</view>
-					</view>
-				</view>
+			<view v-else>
+				<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" >
+				</u-empty>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				isShow: '1',
-				list:[
-					{
-						text:'全部',
-						id: 1
+	export default {
+		data() {
+			return {
+				load:true,
+				list: [{
+						text: '全部',
+						code: ''
 					},
 					{
-						text:'订购',
-						id: 2
+						text: '订购',
+						code: 'order'
 					},
 					{
-						text:'公益',
-						id: 3
+						text: '公益',
+						code: 'gy'
 					},
 					{
-						text:'演出',
-						id: 4
+						text: '演出',
+						code: 'show'
 					},
 					{
-						text:'其他',
-						id: 5
+						text: '其他',
+						code: 'other'
 					}
 				],
-				mainList:[
-					{
-						img:'../../static/RewardWork/fightVirus.png'
-					},
-					{
-						img:'../../static/RewardWork/fightVirus.png'
-					}
-				],
-				action:0
+				mainList: [],
+				action: 0,
+				pages: 1,
+				size: 20,
+				type: '',
 			}
 		},
-		methods:{
-			onNav(val,index){
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.pages = 1
+			this.mainList = []
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉
+		onReachBottom() {
+			this.pages++
+			this.getData();
+		},
+		onShow() {
+			this.getData()
+		},
+		methods: {
+			getData() {
+				let _this = this
+				this.http.request('/hall/list', {
+					page: this.pages,
+					size: this.size,
+					type: this.type,
+				}, "GET").then(res => {
+					if (res.code == 200) {
+						if(res.data.records.length > 0){
+							res.data.records.forEach(function(item){
+								if (item.enclosure) {
+									let fileArr = item.enclosure.split(',')
+									let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
+									if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs == 'gif' || gs == 'tif' || gs == 'tiff') {
+										item.enclosure = fileArr[0]
+									}
+									else if (gs == 'pdf') {
+										item.enclosure = '../../static/fileImg/pdfS.png'
+									} 
+								}
+								_this.mainList.push(item)
+							})
+						}else{
+							this.pages--
+						}
+						this.load = false
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			onNav(val, index) {
 				this.action = index
-				this.isShow = val
+				this.type = val
+				this.pages = 1
+				this.mainList = []
+				this.getData()
+			},
+			toDetail(val){
+				uni.navigateTo({
+					url: `/pages/orderHall/orderHallDetails?id=` + val
+				})
+			},
+			toAddOrder(){
+				uni.navigateTo({
+					url: `/pages/orderHall/addOrder`
+				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.on{
+	page{
+		background-color: #f8f8f8;
+	}
+	image{
+		width: 100%;
+		height: 100%;
+	}
+	.on {
 		font-weight: 600;
 	}
-	.page{
-		.nav{
+
+	.page {
+		.nav {
 			display: flex;
-			.list{
+
+			.list {
 				width: 20%;
 				height: 76rpx;
 				background: #FFFFFF;
-				.text{
+
+				.text {
 					font-size: 28rpx;
 					font-weight: 400;
 					color: #251B1D;
 					line-height: 70rpx;
 					text-align: center;
 					position: relative;
-					&.on::after{
+
+					&.on::after {
 						content: '';
 						position: absolute;
 						height: 6rpx;
@@ -161,44 +184,54 @@
 				}
 			}
 		}
-		.main{
+
+		.main {
 			padding: 32rpx;
-			background-color: #F4F5F7;
-			.mainList{
+			// background-color: #F4F5F7;
+
+			.mainList {
 				margin-bottom: 32rpx;
 				border-radius: 16rpx;
 				overflow: hidden;
-				.mainListImg{
+
+				.mainListImg {
 					height: 400rpx;
-					.img{
+
+					.img {
 						width: 100%;
 						height: 100%;
 					}
 				}
-				.text{
+
+				.text {
 					padding: 32rpx;
 					background-color: #FFF;
-					.text1{
+
+					.text1 {
 						font-size: 28rpx;
 						font-weight: 600;
 						color: #251B1D;
 						margin-bottom: 5rpx;
 					}
-					.text2{
+
+					.text2 {
 						font-size: 24rpx;
 						font-weight: 400;
 						color: #989898;
 					}
-					.text3{
+
+					.text3 {
 						display: flex;
 						margin-top: 16rpx;
-						.mainListTime{
+
+						.mainListTime {
 							width: 26rpx;
 							height: 26rpx;
 							margin-top: 4rpx;
 							margin-right: 8rpx;
 						}
-						.time{
+
+						.time {
 							font-size: 24rpx;
 							font-weight: 400;
 							color: #989898;
@@ -207,5 +240,14 @@
 				}
 			}
 		}
+	
+		.addIcon{
+			position: fixed;
+			right: 24rpx;
+			bottom: 242rpx;
+			width: 104rpx;
+			height: 104rpx;
+			border-radius: 50%;
+		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/orderHall/orderHallDetails.vue b/src/pages/orderHall/orderHallDetails.vue
index d6062be..a7a505d 100644
--- a/src/pages/orderHall/orderHallDetails.vue
+++ b/src/pages/orderHall/orderHallDetails.vue
@@ -1,172 +1,315 @@
 <template>
-	<view class="page">
-		<view class="return" @click="back">
-			<image src="../../static/orderLeftArrow.png" mode="scaleToFill"></image>
+	<view class="">
+		<view class="">
+			<u-loading-page :loading="load"></u-loading-page>
 		</view>
-		<view class="pageImg">
-			<img class='img' src="../../static/RewardWork/fightVirus.png" alt="">
-		</view>
-		<view class="main">
-			<view class="mainTitle">“善行象山、走进晓塘”文艺演出招募</view>
-			<view class="textList">
-				<view class="type">
-					<img class='textImg' src="../../static/orderHall/text.png" alt="">
-					<view class="text1">需求清单</view>
+		<view class="page">
+			<view class="return" @click="back">
+				<image src="../../static/orderLeftArrow.png" mode="scaleToFill"></image>
+			</view>
+			<view class="pageImg">
+				<u-swiper v-if="list.length > 0" :list="list" :autoplay="true" @change="e => currentNum = e.current"
+					indicatorStyle="right: 20px" height='440rpx'>
+					<view slot="indicator" class="indicator-num">
+						<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
+					</view>
+				</u-swiper>
+			</view>
+			<view class="main">
+				<view class="mainTitle">{{data.title}}</view>
+				<view class="textList">
+					<view class="type">
+						<img class='textImg' src="../../static/orderHall/text.png" alt="">
+						<view class="text1">需求清单</view>
+					</view>
+					<view class="text2">{{data.demand}}</view>
 				</view>
-				<view class="text2">主持人2位，歌手8位，舞者5位，志愿者10位</view>
-			</view>
-			<view class="textList">
-				<view class="type">
-					<img class='textImg' src="../../static/orderHall/text.png" alt="">
-					<view class="text1">具体内容</view>
+				<view class="textList">
+					<view class="type">
+						<img class='textImg' src="../../static/orderHall/text.png" alt="">
+						<view class="text1">具体内容</view>
+					</view>
+					<view class="text2">
+						{{data.content}}
+					</view>
+				</view>
+				<view class="file_box" v-for="(item,index) in list2" :key="index" @click="downLoad(item.url)">
+					<view class="file_box_left">
+						<image :src="item.img" class="file_box_left_img"></image>
+					</view>
+					<view class="file_box_right">
+						<view class="file_box_name">
+							{{item.name}}
+						</view>
+					</view>
 				</view>
-				<view class="text2">为推动社会慈善事业发展、弘扬行善美德、关爱弱势群体为主题，由象山县慈善总会主办，县义工分会等承办，晓塘乡总工会、晓塘乡团委、晓塘乡妇联协办的“善行象山、走进晓塘”文艺演出活动招募演出人员与志愿者。</view>
 			</view>
-			<view class="pdf">
-				<img class='pdfImg' src="../../static/fileImg/pdfS.png" alt="">
-				<view class="text3">演出节目表与日程安排.pdf</view>
+			<view class="line"></view>
+			<view class="form">
+				<view class="formList">
+					<view class="left">类型：</view>
+					<view class="right">{{data.typeName}}</view>
+				</view>
+				<view class="formList">
+					<view class="left">可接单人数：</view>
+					<view class="right"><text style="color: #99241B;">{{data.jdrs}}</text>/{{data.quantity}}</view>
+				</view>
+				<view class="formList">
+					<view class="left">截止时间：</view>
+					<view class="right">{{data.deadline}}</view>
+				</view>
+				<view class="formList">
+					<view class="left">活动时间：</view>
+					<view class="right">{{data.activityTime}}</view>
+				</view>
 			</view>
-		</view>
-		<view class="line"></view>
-		<view class="form">
-			<view class="formList">
-				<view class="left">类型：</view>
-				<view class="right">演出</view>
+			<view class="orderBtn" v-if="data.isBaoming">
+				<view class="btnQ" @click="baoQ">取消接单</view>
 			</view>
-			<view class="formList">
-				<view class="left">可接单人数：</view>
-				<view class="right"><text style="color: #99241B;">1</text>/5</view>
+			<view class="orderBtn" v-else>
+				<view class="btn" @click="bao">申请接单</view>
 			</view>
-			<view class="formList">
-				<view class="left">截止时间：</view>
-				<view class="right">2022-06-02</view>
-			</view>
-			<view class="formList">
-				<view class="left">结束时间：</view>
-				<view class="right">2022-06-27</view>
-			</view>
-		</view>
-		<view class="orderBtn">
-			<view class="btn">申请接单</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	export default{
-		data(){
-			return{
-				
+	export default {
+		data() {
+			return {
+				load: true,
+				id: '',
+				data: {},
+				list: [],
+				list2: [],
+				currentNum: 0,
 			}
 		},
-		methods:{
+		onLoad(op) {
+			this.id = op.id
+		},
+		onShow() {
+			this.getData()
+		},
+		methods: {
+			getData() {
+				let _this = this
+				this.http.request('/hall/details', {
+					id: this.id,
+				}, "GET").then(res => {
+					if (res.code == 200) {
+						//判断封面图片
+						if (res.data.enclosure) {
+							let fileArr = res.data.enclosure.split(',')
+							fileArr.forEach(function(item) {
+								let gs = item.substr(item.lastIndexOf(".") + 1)
+								if (gs == 'jpg' || gs == 'jpeg' || gs == 'png' || gs == 'bmp' || gs ==
+									'gif' || gs == 'tif' || gs == 'tiff') {
+									_this.list.push(item)
+								} else if (gs == 'pdf') {
+									_this.list2.push({
+										name: res.data.name + '.' + gs,
+										img: '../../static/fileImg/pdfS.png',
+										url: item,
+									})
+								}
+							})
+						}
+						this.data = res.data
+						this.load = false
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
 			back() {
 				uni.navigateBack()
+			},
+			//点击文件
+			downLoad(val) {
+				this.contractUrl = val
+				uni.navigateTo({
+					url: "/pages/ArtWorks/webView?url=" + this.contractUrl
+				})
+			},
+			bao() {
+				this.http.request('/hallUser/singUp?hallId='+this.id, {}, "POST").then(res => {
+					if (res.code == 200) {
+						this.getData()
+						this.load = true
+						this.list = []
+						this.list2 = []
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
+			},
+			baoQ(){
+				this.http.request('/hallUser/qxSingUp?hallId='+this.id, {}, "POST").then(res => {
+					if (res.code == 200) {
+						this.getData()
+						this.load = true
+						this.list = []
+						this.list2 = []
+					}
+				}).catch(e => {
+					uni.showToast({
+						title: e.data.message,
+						icon: "none",
+					});
+				})
 			}
 		}
 	}
 </script>
-	
+
 <style lang="scss" scoped>
-	.page{
+	.page {
 		.return {
 			position: fixed;
 			left: 24rpx;
 			top: 110rpx;
-		
+			z-index: 10;
+
 			image {
 				width: 48rpx;
 				height: 48rpx;
 			}
 		}
-		.pageImg{
+
+		.pageImg {
 			height: 440rpx;
-			.img{
+
+			.img {
 				width: 100%;
 				height: 100%;
 			}
 		}
-		.main{
+
+		.main {
 			padding: 32rpx;
-			.mainTitle{
+
+			.mainTitle {
 				font-size: 36rpx;
 				font-weight: 600;
 				color: #251B1D;
 				margin-bottom: 28rpx;
 			}
-			.textList{
+
+			.textList {
 				margin-bottom: 24rpx;
-				.type{
+
+				.type {
 					display: flex;
 					height: 48rpx;
 					line-height: 48rpx;
-					.textImg{
+
+					.textImg {
 						width: 28rpx;
 						height: 28rpx;
 						margin-top: 10rpx;
 						margin-right: 8rpx;
 					}
-					.text1{
+
+					.text1 {
 						font-size: 28rpx;
 						font-weight: 500;
 						color: #32333C;
 					}
 				}
-				.text2{
+
+				.text2 {
 					font-size: 28rpx;
 					font-weight: 400;
 					color: #32333C;
 					line-height: 48rpx;
 				}
 			}
-			.pdf{
-				display: flex;
-				padding: 24rpx 30rpx;
+
+			.file_box {
+				width: 92%;
+				height: 64px;
+				margin: 10px 4%;
+				font-family: PingFangSC-Semibold, PingFang SC;
+				font-weight: 600;
+				color: #251B1D;
 				background: #F4F5F7;
-				border-radius: 12rpx;
-				.pdfImg{
-					width: 80rpx;
-					height: 80rpx;
-					margin-right: 24rpx;
+				border-radius: 6px;
+				overflow: hidden;
+
+				.file_box_left {
+					width: 40px;
+					height: 40px;
+					margin-top: 12px;
+					margin-left: 12px;
+					float: left;
+
+					.file_box_left_img {
+						width: 40px;
+						height: 40px;
+					}
 				}
-				.text3{
-					
+
+				.file_box_right {
+					margin-left: 20px;
+					float: left;
+
+					.file_box_name {
+						height: 64px;
+						line-height: 64px;
+						font-size: 16px;
+						font-weight: 600;
+						color: #251B1D;
+					}
 				}
 			}
 		}
-		.line{
+
+		.line {
 			height: 16rpx;
 			background: #F4F5F7;
 		}
-		.form{
+
+		.form {
 			padding: 32rpx 32rpx 24rpx;
 			margin-bottom: 132rpx;
-			.formList{
+
+			.formList {
 				display: flex;
 				justify-content: space-between;
 				height: 40rpx;
 				line-height: 40rpx;
 				margin-bottom: 40rpx;
-				.left{
+
+				.left {
 					font-size: 28rpx;
 					font-weight: 400;
 					color: #AFADB0;
 				}
-				.right{
+
+				.right {
 					font-size: 28rpx;
 					font-weight: 400;
 					color: #251B1D;
 				}
 			}
 		}
-		.orderBtn{
+
+		.orderBtn {
 			width: 100%;
 			height: 132rpx;
 			background-color: #FFF;
 			position: fixed;
 			left: 0;
 			bottom: 0;
-			.btn{
+
+			.btn {
 				width: calc(100% - 64rpx);
 				height: 96rpx;
 				line-height: 96rpx;
@@ -178,6 +321,18 @@
 				color: #FFFFFF;
 				margin: auto;
 			}
+			.btnQ {
+				width: calc(100% - 64rpx);
+				height: 96rpx;
+				line-height: 96rpx;
+				text-align: center;
+				background: #F9F2F2;
+				border-radius: 8rpx;
+				font-size: 32rpx;
+				font-weight: 600;
+				color: #99241B;
+				margin: auto;
+			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/static/orderHall/addOrder.png b/src/static/orderHall/addOrder.png
new file mode 100644
index 0000000000000000000000000000000000000000..571a4b7ee4378c2c18fdc50624d205fa22459a10
GIT binary patch
literal 7992
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

literal 0
HcmV?d00001