From df9890d55db6f07f0aa6f26c070a6a62745dcaef Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Mon, 6 Jan 2025 18:25:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/model/order.js                | 10 ++++++++++
 api/model/zhaomu.js               |  5 +++++
 components/cart/CardList.vue      |  4 ++--
 components/zhaomu/zhaomu-item.vue | 16 +++++++++++-----
 components/zhaomu/zlx-item.vue    | 18 +++++++++---------
 config.js                         |  8 ++++----
 manifest.json                     |  2 +-
 pages_my/collection.vue           |  2 +-
 pages_my/travelList.vue           | 10 ++++++++--
 pages_my/zlx-qiandao.vue          |  4 ++--
 pages_order/huodong-detail.vue    |  2 +-
 pages_order/invoiceIssuance.vue   | 15 +++++++++++++--
 pages_order/invoiceRecords.vue    | 36 ++++++++++++++++++++++++++----------
 pages_order/lvyou-detail.vue      |  2 +-
 pages_zlx/zlx-form.vue            |  2 +-
 15 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/api/model/order.js b/api/model/order.js
index 577ea14..fd5d279 100644
--- a/api/model/order.js
+++ b/api/model/order.js
@@ -27,6 +27,11 @@ const api = {
 		url: '/order_common/invoice',
 		method: 'POST', 
 	},
+	//发票列表
+	getInvoicePageList:{
+		url: '/order_common/getInvoicePageList',
+		method: 'GET', 
+	},
     // 订单活动签到
     signIn: {
 		url: '/order_common/signIn',
@@ -37,6 +42,11 @@ const api = {
 		url: '/order_common/createOrder',
 		method: 'POST', 
 	},
+	//我主理的信息
+	getTwoPageList: {
+		url: '/index_common/getTwoPageList',
+		method: 'GET', 
+	}
 }
 
 export default api
\ No newline at end of file
diff --git a/api/model/zhaomu.js b/api/model/zhaomu.js
index 12316aa..3d3cb5a 100644
--- a/api/model/zhaomu.js
+++ b/api/model/zhaomu.js
@@ -20,6 +20,11 @@ const api = {
 		url: '/shop_common/getActivityMemberPageList',
 		method: 'get',
 	},
+	//参与招募
+	shopUserAuth: {
+		url: '/shop_common/shopUserAuth',
+		method: 'POST',
+	},
 }
 
 export default api
\ No newline at end of file
diff --git a/components/cart/CardList.vue b/components/cart/CardList.vue
index 4769395..8b38568 100644
--- a/components/cart/CardList.vue
+++ b/components/cart/CardList.vue
@@ -7,7 +7,7 @@
 			</view>
 			<view class="content cardStyle_" :class="['U','S'].includes(item.state) ? 'content_border' : ''">
 				<view class="left">
-					<image :src="item.image" alt="">
+					<img :src="item.image.split(',')[0]" alt="">
 				</view>
 				<view class="right">
 					<view class="detailed">
@@ -25,7 +25,7 @@
 				<button @click.stop="skip(item,1)" v-if="item.state == 1" :style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}"
 				class="mini-btn" size="mini">活动签到</button>
 
-				<button @click.stop="skip(item,2)" v-if="item.state == 2" :style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}"
+				<button @click.stop="skip(item,2)" v-if="item.state == 2 && item.isPj == 'N'" :style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}"
 				class="mini-btn" size="mini">评价活动</button>
 
 				<button @click.stop="skip(item,3)" v-if="item.state == 2" :style="{background: '#49361D;', color: '#FFB245',margin:'0 30rpx 0 0'}"
diff --git a/components/zhaomu/zhaomu-item.vue b/components/zhaomu/zhaomu-item.vue
index 25ce3c3..b9374f0 100644
--- a/components/zhaomu/zhaomu-item.vue
+++ b/components/zhaomu/zhaomu-item.vue
@@ -7,7 +7,7 @@
 				</view>
 				<view class="right">
 					<view class="detailed">
-						<view class="title">{{item.enTitle}}</view>
+						<view class="title">{{item.title}}</view>
 						<view class="date">{{item.startTime}}</view>
 						<view class="address">
 							<view class="img-box">
@@ -23,8 +23,8 @@
 			</view>
 			<view class="bottom-box">
 				<view class="bottom-box-l">
-					<uv-avatar-group :urls="urls" size="45rpx" gap="0.1"></uv-avatar-group>
-					<view class="num">4人参加</view>
+					<uv-avatar-group :urls="urls" keyName="headImage" size="45rpx" gap="0.1"></uv-avatar-group>
+					<view class="num">{{item.num}}人参加</view>
 				</view>
 				<view class="bottom-box-r" @click="toZhaomu(item)">
 					参与招募
@@ -59,6 +59,7 @@
 				handler(val){
 					this.iconTextArr = val.iconText.split("，");
 					this.imgArr = val.image.split(",")
+					this.urls = val.popularizeRecruitLogList;
 				},
 				immediate:true
 			}
@@ -72,8 +73,13 @@
 				})
 			},
 			toZhaomu(item) {
-				uni.navigateTo({
-					url: `/pages_order/lvyou-detail?travelId=${item.id}`
+				let params = {
+					recruitId:item.id,
+				}
+				this.$api('shopUserAuth',params,res=>{
+					if(res.code == 200) {
+						this.$Toast('参与成功')
+					}
 				})
 			}
 		}
diff --git a/components/zhaomu/zlx-item.vue b/components/zhaomu/zlx-item.vue
index 1d19f13..84646ff 100644
--- a/components/zhaomu/zlx-item.vue
+++ b/components/zhaomu/zlx-item.vue
@@ -1,14 +1,14 @@
 <template>
 	<view class="cardList">
-		<view class="content">
+		<view class="content" >
 			<view class="left">
-				<img src="https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg" alt="">
+				<img :src="item.image.split(',')[0]" alt="">
 			</view>
 			<view class="right">
 				<view class="detailed">
-					<view class="title">夏日去撒野旅游计划</view>
-					<view class="date">2024.08.23 12:00</view>
-					<view class="address">成都市东丽湖露营地</view>
+					<view class="title">{{item.title}}</view>
+					<view class="date">{{item.createTime}}</view>
+					<view class="address">{{item.address}}</view>
 				</view>
 				<view class="price" v-if="showBottom">
 					<view class="num-box">20/40</view>
@@ -23,10 +23,10 @@
 <script>
 	export default {
 		props: {
-			showBottom:{
-				type:Boolean,
-				default:true
-			}
+			item: {
+				type: Object,
+				default: ()=>{}
+			},
 		},
 		data() {
 			return {
diff --git a/config.js b/config.js
index e5f5c44..59295c5 100644
--- a/config.js
+++ b/config.js
@@ -13,14 +13,14 @@ const type = 'prod'
 // 环境配置
 const config = {
 	dev : {
-		baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
-		// baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
+		// baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
+		baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
 		// baseUrl : 'http://h5.xzaiyp.top/popularize-admin',
 	},
 	prod : {
-		baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
+		// baseUrl : 'http://test-lzx.natapp1.cc/popularize-admin',
 		// baseUrl : 'http://h5.xzaiyp.top/popularize-admin',
-		// baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
+		baseUrl : 'https://popularize-admin.hhlm1688.com/popularize-admin',
 	}
 }
 
diff --git a/manifest.json b/manifest.json
index 3df937f..fa716f2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "vtrip",
-    "appid" : "__UNI__EFB8158",
+    "appid" : "__UNI__53D8233",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/pages_my/collection.vue b/pages_my/collection.vue
index 617d1af..7bc4ef3 100644
--- a/pages_my/collection.vue
+++ b/pages_my/collection.vue
@@ -5,7 +5,7 @@
         <view class="content contentPosition_">
             <view class="info cardStyle_" v-for="(item, index) in cardListData" :key="index">
                 <view class="left">
-                    <image :src="item.image" alt="">
+                    <image :src="item.image.split(',')[0]" alt="">
                 </view>
                 <view class="right">
                     <view class="detailed">
diff --git a/pages_my/travelList.vue b/pages_my/travelList.vue
index 6a455b1..9c842d8 100644
--- a/pages_my/travelList.vue
+++ b/pages_my/travelList.vue
@@ -50,8 +50,9 @@
                     </view>
                     <view class="data">
                         <text>¥{{item.price}}</text>
-                        <text>11/40</text>
-                        <text class="btn">已开票</text>
+                        <text>{{item.num}}/{{item.sum}}</text>
+                        <text class="btn" v-if="item.state == 0">报名中</text>
+						<text class="btn-2" v-if="item.state == 1">已结束</text>
                     </view>
                 </view>
             </view>
@@ -254,6 +255,11 @@
                         padding: 10rpx 40rpx;
                         border-radius: 30rpx 0px 0px 30rpx;
                     }
+					.btn-2 {
+					    color: $uni-color-primary;
+					    padding: 10rpx 40rpx;
+					    border-radius: 30rpx 0px 0px 30rpx;
+					}
                 }
             }
         }
diff --git a/pages_my/zlx-qiandao.vue b/pages_my/zlx-qiandao.vue
index b3cb51a..c9e2c9c 100644
--- a/pages_my/zlx-qiandao.vue
+++ b/pages_my/zlx-qiandao.vue
@@ -52,8 +52,8 @@
 		},
 		methods:{
 			getactivityMemberPageList(){
-				this.$api('activityMemberPageList',this.params,res=>{
-					
+				this.$api('activityMemberPageList',{type:0},res=>{
+					this.cardListData = res.result.records;
 				})
 			},
 			qiandaoClick() {
diff --git a/pages_order/huodong-detail.vue b/pages_order/huodong-detail.vue
index 28c5504..1f26d99 100644
--- a/pages_order/huodong-detail.vue
+++ b/pages_order/huodong-detail.vue
@@ -220,7 +220,7 @@ import { error } from '../uni_modules/uv-ui-tools/libs/function'
 				this.chooseIndex = i
 			},
 			confirmClick(typePrice) {
-				this.$api('createOrder',{id:this.activityId,typePrice:typePrice},res=>{
+				this.$api('createOrder',{id:this.activityId,typePrice:typePrice,type:0},res=>{
 					if(res.code === 200) {
 						uni.requestPaymentWxPay(res)
 						.then(res => {
diff --git a/pages_order/invoiceIssuance.vue b/pages_order/invoiceIssuance.vue
index 460d1dc..a9fe4a0 100644
--- a/pages_order/invoiceIssuance.vue
+++ b/pages_order/invoiceIssuance.vue
@@ -32,7 +32,7 @@
                 </uv-radio-group>
             </view>
             <view class="iptInfo" v-if="radioValue">
-                    <uv-form-item label="企业名称" labelWidth="180rpx" borderBottom>
+                    <uv-form-item :label="radioValue === '0' ? '姓名' : '企业名称'" labelWidth="180rpx" borderBottom>
                         <uv-input placeholder="请输入内容" fontSize="29rpx" color="#fff" v-model="invoicingInfo.name" border="none"></uv-input>
                     </uv-form-item>
                     <uv-form-item :label="radioValue === '0' ? '身份证号' : '税号'" labelWidth="180rpx" borderBottom>
@@ -66,13 +66,24 @@
                     name: '',
                     no: '',
                     emil: ''
-                }
+                },
+				activityItem:{}
 			}
 		},
         onLoad({orderId}) {
             this.orderId = orderId
+			console.log("发票标识："+orderId)
+			this.toOrderDetails("orderId");
         },
 		methods: {
+			//查询订单详情信息
+			toOrderDetails(orderId) {
+				this.$api('orderInfo',{orderId:this.orderId},res=>{
+					if(res.code == 200) {
+						this.activityItem = res.result
+					}
+				})
+			},
             toInvoiceRecords() {
                 let params = {}
                 params = this.invoicingInfo;
diff --git a/pages_order/invoiceRecords.vue b/pages_order/invoiceRecords.vue
index 2854aab..b1edc14 100644
--- a/pages_order/invoiceRecords.vue
+++ b/pages_order/invoiceRecords.vue
@@ -3,19 +3,24 @@
         <view class="head-box"></view>
         <Navbar title="开票记录" :autoBack="true" :bgColor="bgColor" leftIconSize="18px" height="100rpx" :leftIconColor="leftIconColor" :titleStyle="{color:fontColor}" />
         <view class="content contentPosition_">
-            <view class="info cardStyle_">
-                <view class="left">
-                    <image src="https://img0.baidu.com/it/u=4274003247,920124130&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1031" alt="">
+            <view class="info cardStyle_" v-for="(item, index) in list" :key="index">
+                <view class="left" v-if="item.noType == 0">
+                    <image :src="item.activityList[0].image.split(',')[0]" alt="">
                 </view>
+				<view class="left" v-if="item.noType == 1">
+					<image :src="item.travelList[0].image.split(',')[0]" alt="">
+				</view>
                 <view class="right">
                     <view class="detailed">
-                        <view class="title">夏日去撒野旅游计划～</view>
-                        <view class="date">2024.10.28 10:00</view>
-                        <view class="address">成都市东丽湖露营地32号</view>
+                        <view class="title" v-if="item.noType == 0">{{item.activityList[0].title}}</view>
+						 <view class="title" v-if="item.noType == 1">{{item.travelList[0].title}}</view>
+                        <view class="date">{{item.createTime}}</view>
+						<view class="date">{{item.name}}</view>
+                        <view class="address">{{item.emil}}</view>
                     </view>
                     <view class="data">
                         <text>标准票</text>
-                        <text>×3</text>
+                        <text>×1</text>
                         <text class="btn">已开票</text>
                     </view>
                 </view>
@@ -35,7 +40,7 @@ export default {
     },
     data() {
         return {
-
+			list:[]
         };
     },
     components: {
@@ -48,13 +53,24 @@ export default {
 
     },
     created() {
-
+		
     },
+	onShow() {
+		console.log("进入了发票管理")
+		this.getInvoicePageList();
+	},
     mounted() {
+		
 
     },
     methods: {
-
+		getInvoicePageList(){
+			this.$api('getInvoicePageList',res=>{
+				if(res.code == 200) {
+					this.list = res.result.records
+				}
+			})
+		}
     }
 };
 </script>
diff --git a/pages_order/lvyou-detail.vue b/pages_order/lvyou-detail.vue
index 71bf716..aa56772 100644
--- a/pages_order/lvyou-detail.vue
+++ b/pages_order/lvyou-detail.vue
@@ -146,7 +146,7 @@
 		},
 		methods:{
 			toBaoming() {
-				this.$api('createOrder',{id:this.travelId,typePrice:1},res=>{
+				this.$api('createOrder',{id:this.travelId,typePrice:1,type:1},res=>{
 					if(res.code === 200) {
 						uni.requestPaymentWxPay(res)
 						.then(res => {
diff --git a/pages_zlx/zlx-form.vue b/pages_zlx/zlx-form.vue
index 4674cb7..21df1d4 100644
--- a/pages_zlx/zlx-form.vue
+++ b/pages_zlx/zlx-form.vue
@@ -9,7 +9,7 @@
 				<view class="user-msg">
 					<view class="user-msg-top">
 						<view>{{userInfo.nickName}}</view>
-						<view class="level-box">普通用户</view>
+						<!-- <view class="level-box">普通用户</view> -->
 					</view>
 					<view class="id-box">
 						<text>ID:{{userInfo.id}}</text>