From e5c697e621bf17d2f828d7f45593b8db5963edc7 Mon Sep 17 00:00:00 2001
From: lzx_mac <2602107437@qq.com>
Date: Fri, 16 May 2025 15:52:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/model/order.js                                  | 18 ++++++++++++++++++
 api/model/shop.js                                   |  2 ++
 manifest.json                                       |  2 +-
 mixins/list.js                                      |  2 ++
 pages_order/components/verifyRecord/voucherCard.vue |  4 ++--
 pages_order/mine/verifyRecord.vue                   | 16 ++++++++++++----
 pages_order/order/verifyOrder.vue                   | 12 ++----------
 7 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/api/model/order.js b/api/model/order.js
index 602a5bc..7f8252b 100644
--- a/api/model/order.js
+++ b/api/model/order.js
@@ -69,6 +69,24 @@ const api = {
 		auth: true,
 		showLoading: true,
 	},
+	
+	fetchVoucher: {
+		url: '/order/overOrderList',
+		method: 'POST',
+		limit : 500,
+		auth : true,
+		showLoading : true,
+	},
+	
+	fetchStore: {
+		url: '/order/overOrderList',
+		method: 'POST',
+		limit : 500,
+		auth : true,
+		showLoading : true,
+	},
+	
+	
 }
 
 export default api
\ No newline at end of file
diff --git a/api/model/shop.js b/api/model/shop.js
index 0073a3e..e8d6190 100644
--- a/api/model/shop.js
+++ b/api/model/shop.js
@@ -40,6 +40,8 @@ const api = {
 		auth : true,
 		showLoading : true,
 	},
+	
+	
 }
 
 export default api
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index cbc1ffa..8fadf3d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "unapp模板",
-    "appid" : "__UNI__197A38F",
+    "appid" : "__UNI__C572032",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",
diff --git a/mixins/list.js b/mixins/list.js
index 23bb70e..726f9f1 100644
--- a/mixins/list.js
+++ b/mixins/list.js
@@ -46,6 +46,8 @@ export default {
 		 * @returns {Promise} 返回Promise对象
 		 */
 		getData(queryParams){
+			console.log("queryParams")
+			console.log(queryParams)
 			return new Promise((success, error) => {
 				if(!this.mixinsListApi){
 					return console.error('mixinsListApi 缺失');
diff --git a/pages_order/components/verifyRecord/voucherCard.vue b/pages_order/components/verifyRecord/voucherCard.vue
index 5da272a..62a028b 100644
--- a/pages_order/components/verifyRecord/voucherCard.vue
+++ b/pages_order/components/verifyRecord/voucherCard.vue
@@ -1,9 +1,9 @@
 <template>
   <view class="card flex voucher">
-    <image class="voucher-img" :src="data.imgUrl"></image>
+    <image class="voucher-img" :src="data.massageItem.image"></image>
     
     <view class="voucher-info">
-      <view class="voucher-name">{{ data.userName }}</view>
+      <view class="voucher-name">{{ data }}</view>
       <view class="voucher-desc">{{ `核销时间：${data.createTime}` }}</view>
     </view>
 
diff --git a/pages_order/mine/verifyRecord.vue b/pages_order/mine/verifyRecord.vue
index 8f0a55b..a7e7209 100644
--- a/pages_order/mine/verifyRecord.vue
+++ b/pages_order/mine/verifyRecord.vue
@@ -47,17 +47,24 @@
       <view class="right">
         <text>{{ `${displaySelectedMonth}总核销：` }}</text>
         <!-- todo: 对接接口字段 -->
-        <text class="highlight">{{ 12 }}</text>
+		
+        <text class="highlight">{{ 0 }}</text>
       </view>
     </view>
 
     <template v-if="current == 0" >
       <view class="list order">
-        <orderCard class="list-item"
+        <!-- <orderCard class="list-item"
           v-for="item in list"
           :key="item.id"
           :data="data"
-        ></orderCard>
+        ></orderCard> -->
+		
+		<voucherCard class="list-item"
+		  v-for="item in list"
+		  :key="item.id"
+		  :data="data"
+		></voucherCard>
       </view>
     </template>
     <template v-else-if="current == 1" >
@@ -67,7 +74,7 @@
           :key="item.id"
           :data="data"
         ></voucherCard>
-        <!-- todo: delete -->
+        
         <voucherCard class="list-item"></voucherCard>
         <voucherCard class="list-item"></voucherCard>
       </view>
@@ -86,6 +93,7 @@
     1: 'fetchStore',
   }
 
+
   export default {
 		mixins : [mixinsList],
     components: {
diff --git a/pages_order/order/verifyOrder.vue b/pages_order/order/verifyOrder.vue
index 9d2950c..83c8cab 100644
--- a/pages_order/order/verifyOrder.vue
+++ b/pages_order/order/verifyOrder.vue
@@ -26,7 +26,8 @@
 					<!-- <image class="info-qr" :src="orderDetail.qrCodeImgUrl" mode="widthFix"></image> -->
 					
 					<view class="" style="margin: 20rpx;">
-						<uv-qrcode ref="qrcode" size="300rpx" :value="orderDetail.id"></uv-qrcode>
+						<!-- <uv-qrcode ref="qrcode" size="300rpx" value="https://h5.uvui.cn"></uv-qrcode> -->
+						<uv-qrcode ref="qrcode" size="300px" :value="orderDetail.id"></uv-qrcode>
 					</view>
 					
 					<view class="info-no">{{ `订单号：${orderDetail.id}` }}</view>
@@ -48,19 +49,10 @@
 <script>
 	import productCard from '@/components/product/productCard.vue'
 
-<<<<<<< HEAD
-	// import QRCode from 'qrcode';
-
-  export default {
-    components: {
-      productCard,
-    },
-=======
 	export default {
 		components: {
 			productCard,
 		},
->>>>>>> 2ca5bd5d3ec1810a06580cd54bef3d84846fe941
 		data() {
 			return {
 				orderDetail: {},