From e634342f37fa1c036d7ad4287066d0fa0eb199e1 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 05 八月 2024 10:05:14 +0800
Subject: [PATCH] 1

---
 sub_pages/customer/trade/list.vue   |   12 +++++++-----
 manifest.json                       |    2 +-
 sub_pages/customer/trade/detail.vue |   11 +++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/manifest.json b/manifest.json
index 782394c..2848179 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx6d0ecc4e18710458",
+        "appid" : "wx1441324401626290",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index e409541..efa3ef8 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -368,19 +368,18 @@
 				}
 			},
 			async getDetail() {
-				var sharePartnerUserId = undefined
+				var params = {
+					id: this.id,
+				}
 				if (this.sharePartnerUserId && !isNaN(parseInt(this.sharePartnerUserId))) {
-					sharePartnerUserId = parseInt(this.sharePartnerUserId)
+					params.sharePartnerUserId = parseInt(this.sharePartnerUserId)
 				}
 				this.$message.showLoading()
 				const {
 					code,
 					data
 				} = await this.$http.request('get', '/api/customer/flower/list/view', {
-					params: {
-						id: this.id,
-						partnerId: sharePartnerUserId
-					}
+					params: params
 				})
 				if (code === 0) {
 					this.dto = {
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 5831078..f162d51 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -238,9 +238,10 @@
 		// #ifdef PUB_CUSTOMER
 		onShareAppMessage() {
 			let that = this;
-			var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
+			var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
 			var url =
-				`/sub_pages/customer/trade/list?category=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+				`/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
 			return {
 				title: "花满芫-商品列表",
 				path: url,
@@ -248,9 +249,10 @@
 		},
 		onShareTimeline() {
 			let that = this;
-			var name = that.currentInfo.customerDTO&&that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO&&that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO&&that.currentInfo.partnerDTO.name || ''
+			var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+				that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
 			var url =
-				`/sub_pages/customer/trade/list?category=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+				`/sub_pages/customer/trade/list?categoryId=${this.query.category}&zoneId=${this.query.zoneId}&name=${this.query.name}&shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
 			return {
 				title: "花满芫-商品列表",
 				path: url,
@@ -260,7 +262,7 @@
 		async onLoad(options) {
 			// this.list = [{},{}]
 			console.log('options', options)
-			this.query.category = options.categoryId || ''
+			this.query.category = options.categoryId || options.category || ''
 			this.query.zoneId = options.zoneId || ''
 			this.query.name = options.name || ''
 			if (this.query.name) {

--
Gitblit v1.9.3