From 87bd9ddcb7991253ad940534cdc0d6ed60b772a5 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 29 Nov 2024 13:31:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/pickerHospital.vue                 | 54 ++++++++++++
 components/user/callPhone.vue                      | 23 +++--
 components/user/signInOnePopup.vue                 |  4 +-
 .../components/list/gourmet/productSubmit.vue      |  7 +-
 pages_order/post/addPost.vue                       | 98 ++++++++++++----------
 5 files changed, 133 insertions(+), 53 deletions(-)
 create mode 100644 components/base/pickerHospital.vue

diff --git a/components/base/pickerHospital.vue b/components/base/pickerHospital.vue
new file mode 100644
index 0000000..6a67cbb
--- /dev/null
+++ b/components/base/pickerHospital.vue
@@ -0,0 +1,54 @@
+<template>
+	<uv-popup 
+	ref="popup" 
+	:round="30" 
+	:customStyle="{height: '50vh'}">
+		<view class="content">
+			<uv-search
+			placeholder="请输入搜索内容" 
+			v-model="queryParams[searchKey]"></uv-search>
+			
+		</view>
+	</uv-popup>
+</template>
+
+<script>
+	import mixinsList from '@/mixins/list.js'
+	export default {
+		mixins: [mixinsList],
+		props: {
+			keyName : {//展示信息的字段
+				default : 'name',
+			},
+			placeholder : {//搜索框提示词
+				default : '请输入搜索内容'
+			},
+			isPage : {//是否分页
+				default : true,
+			},
+			searchKey : {//搜索参数字段
+				default : 'name'
+			},
+			mixinsListApi : {
+				default : '',
+			},
+		},
+		data() {
+			return {
+				
+			}
+		},
+		onLoad(option) {},
+		watch: {
+		},
+		methods: {
+			
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		padding: 0 20rpx 20rpx 20rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/user/callPhone.vue b/components/user/callPhone.vue
index 0251e63..aac29a8 100644
--- a/components/user/callPhone.vue
+++ b/components/user/callPhone.vue
@@ -7,6 +7,7 @@
 
 <script>
 	import mixinsSex from '@/mixins/sex.js'
+	import { mapState } from 'vuex'
 	export default {
 		mixins: [mixinsSex],
 		props: ['phone', 'title', 'sexName', 'type', 'phoneTitle', 'pid'],
@@ -15,6 +16,9 @@
 
 			}
 		},
+		computed : {
+			...mapState(['priceMap']),
+		},
 		methods: {
 			callPhone(){
 				
@@ -33,13 +37,22 @@
 					})
 				}
 				
-				this.$api('checkGivePhone', data, res => {
-					if(res.code == 200){
-						uni.makePhoneCall({
-							phoneNumber: this.phone
-						})
+				uni.showModal({
+					title: `确定消耗${this.priceMap.phone}积分呼叫吗？`,
+					success : (r) => {
+						if(r.confirm){
+							this.$api('checkGivePhone', data, res => {
+								if(res.code == 200){
+									uni.makePhoneCall({
+										phoneNumber: this.phone
+									})
+								}
+							})
+						}
 					}
 				})
+				
+				
 			},
 		}
 	}
diff --git a/components/user/signInOnePopup.vue b/components/user/signInOnePopup.vue
index 14e6ce6..dde4a39 100644
--- a/components/user/signInOnePopup.vue
+++ b/components/user/signInOnePopup.vue
@@ -4,7 +4,7 @@
 			<view class="content">
 				<view class="title">今日签到获取积分</view>
 				
-				<view class="un">{{ headInfo.integral }}</view>
+				<view class="un">{{ priceMap.sign_points }}</view>
 				
 				<view class="uni-color-btn"
 				@click="submit">
@@ -24,7 +24,7 @@
 			}
 		},
 		computed : {
-			...mapState(['headInfo']),
+			...mapState(['headInfo', 'priceMap']),
 		},
 		mounted() {
 			if(uni.getStorageSync('token')){
diff --git a/pages_order/components/list/gourmet/productSubmit.vue b/pages_order/components/list/gourmet/productSubmit.vue
index fc1fd22..57ac2ee 100644
--- a/pages_order/components/list/gourmet/productSubmit.vue
+++ b/pages_order/components/list/gourmet/productSubmit.vue
@@ -52,7 +52,12 @@
 				</view>
 				<view class="detail" v-if="totalPrice">
 					<view>
-						应付款：￥{{ totalPrice }}
+						<view class="">
+							应付款：
+						</view>
+						<view class="">
+							￥{{ totalPrice }}
+						</view>
 					</view>
 					
 					<view>
diff --git a/pages_order/post/addPost.vue b/pages_order/post/addPost.vue
index 464bc97..ad0ed5e 100644
--- a/pages_order/post/addPost.vue
+++ b/pages_order/post/addPost.vue
@@ -30,6 +30,7 @@
 			multiple 
 			width="150rpx" 
 			height="150rpx"
+			name="fileList"
 			@delete="deleteImage"
 			@afterRead="afterRead"
 			:previewFullImage="true"></uv-upload>
@@ -65,61 +66,49 @@
 			</view>
 		</view> -->
 		
-		<view class="title-input box">
+		<view class="category"
+		v-if="categoryRole.includes('code')">
+			<view class="title">
+				上传二维码（选填）
+			</view>
+			
+			<view class="images box">
+				<uv-upload 
+				:fileList="codeFileList" 
+				:maxCount="1" 
+				multiple 
+				width="150rpx" 
+				height="150rpx"
+				name="codeFileList"
+				@delete="deleteImage"
+				@afterRead="afterRead"
+				:previewFullImage="true"></uv-upload>
+			</view>
+		</view>
+		
+		<view class="title-input box"
+		v-if="categoryRole.includes('phone')">
 			<input type="text" placeholder="手机号码（选填）" v-model="form.phone"/>
 		</view>
 		
 		<view class="title-input box"
+		v-if="categoryRole.includes('address')"
 		@click="selectAddr">
 			<input type="text"
-			placeholder="选择位置（选填）" 
+			placeholder="选择位置（选填）"
 			v-model="form.address"/>
 			<uv-icon
 			size="40rpx"
 			name="map"></uv-icon>
 		</view>
 		
-		<!-- <view class="upTop"
-		>
-			<view class="title">
-				<uv-icon name="pushpin-fill"></uv-icon>
-				是否置顶
-			</view>
-			<uv-radio-group v-model="form.topId">
-				<view class="list">
-					
-					<view class="item">
-						<view class="left">
-							不需要置顶
-						</view>
-						<view class="right">
-							<uv-radio
-							size="35rpx"
-							icon-size="35rpx"
-							:disabled="!!id"
-							:name="0">
-							</uv-radio>
-						</view>
-					</view>
-					
-					<view class="item"
-					v-for="(item, index) in upTopList"
-					:key="index">
-						<view class="left">
-							置顶{{ item.day }}天{{ item.money }}元
-						</view>
-						<view class="right">
-							<uv-radio
-							size="35rpx"
-							:disabled="!!id"
-							icon-size="35rpx"
-							:name="item.id">
-							</uv-radio>
-						</view>
-					</view>
-				</view>
-			</uv-radio-group>
-		</view> -->
+		<view class="title-input box"
+		v-if="categoryRole.includes('shop')">
+			<input type="text" 
+			placeholder="关联店铺（选填）" 
+			v-model="form.shop"/>
+		</view>
+		
 		
 		<view class="configBtn"
 		@click="$refs.configPopup.open('getPublishPostNotice')">
@@ -136,14 +125,20 @@
 		ref="configPopup"
 		/>
 		
+		<pickerHospital
+		mixinsListApi="getStorePage"
+		/>
+		
 	</view>
 </template>
 
 <script>
 	import { mapState } from 'vuex'
 	import Position from '@/utils/position.js'
+	import pickerHospital from '@/components/base/pickerHospital.vue'
 	export default {
 		components : {
+			pickerHospital,
 		},
 		data() {
 			return {
@@ -155,11 +150,24 @@
 				},
 				id : 0,
 				fileList : [],
+				codeFileList : [],
 				imageMax : 9,
 			};
 		},
 		computed : {
 			...mapState(['cityList', 'category']),
+			categoryRole(){
+				if(!this.form.classId){
+					return []
+				}
+				for(let i = 0;i < this.category.length;i++){
+					let c = this.category[i]
+					if(c.id == this.form.classId){
+						return 'code,phone,address,shop'.split(',')
+					}
+				}
+				return []
+			},
 		},
 		onLoad(args) {
 			this.id = args.id
@@ -208,13 +216,13 @@
 				})
 			},
 			deleteImage(e){
-				this.fileList.splice(e.index, 1)
+				this[e.name].splice(e.index, 1)
 			},
 			afterRead(e){
 				let self = this
 				e.file.forEach(file => {
 					self.$Oss.ossUpload(file.url).then(url => {
-						self.fileList.push({
+						self[e.name].push({
 							url
 						})
 					})