From 88a91b011a40705bc5793b270909aebf9fe2aef9 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 24 Jul 2024 17:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9B=B8=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 order/addCourse/addCourse.vue         |  1 +
 order/editCourse/editCourse.vue       | 12 ++++++------
 order/orderDetail/orderDetail.vue     | 14 +++++++-------
 order/productDetail/productDetail.vue | 10 +---------
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index de4eb62..40c3996 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -233,6 +233,7 @@
 					settlementPriceUnit: e.settlementPrice || 0, // 结算单价
 					serviceFee: 0, // 平台服务费（前端计算后展示，不入库）
 					mallNonAssociatedLinks: e.mallNonAssociatedLinks, // 产品链接
+					typeId: e.typeId,
 					typeName: e.typeName,
 					classificationId: e.classificationId,
 				}
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index 62b3304..c27db9d 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -85,7 +85,7 @@
 <script>
 	import { getOrderOtherTime, queryCitySettlementPrice, renew } from '@/apis/modules/order.js'
 	import { getPartnerTeamRates } from '@/apis/modules/parner.js'
-	import { productCategoryList } from '@/apis/modules/product.js'
+	import { productTypeList } from '@/apis/modules/product.js'
 	export default {
 		data() {
 			return {
@@ -132,11 +132,11 @@
 				let courses = {}
 					
 				// 产品分类
-				productCategoryList().then(res => {
-					res.classificationList.forEach(e => {
-						courses['list' + e.classificationId] = {
+				productTypeList().then(res => {
+					res.typeList.forEach(e => {
+						courses['list' + e.typeId] = {
 							shrink: false,
-							name: e.classificationName,
+							name: e.typeName,
 							deadline: '',
 							unit: '',
 							list: []
@@ -168,7 +168,7 @@
 						if (isTrial) {
 							this.calcDate(e, !e.authority)
 						}
-						courses['list' + e.classificationId].list.push(e)
+						courses['list' + e.typeId].list.push(e)
 					})
 					this.courses = courses
 				}).catch(e => {})
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index c025a07..429b4a2 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -198,7 +198,7 @@
 </template>
 
 <script>
-	import { productCategoryList, delCart } from '@/apis/modules/product.js'
+	import { productTypeList, delCart } from '@/apis/modules/product.js'
 	import { queryCustomer, queryCustomerDetails } from '@/apis/modules/client.js'
 	import { add, getDetail, renew, queryCitySettlementPrice, getOrderOtherTime } from '@/apis/modules/order.js'
 	import { getPartnerTeamRates } from '@/apis/modules/parner.js'
@@ -378,11 +378,11 @@
 			handleProduct(list) {
 				let courses = {}
 				// 产品分类
-				productCategoryList().then(res => {
-					res.classificationList.forEach(e => {
-						courses['list' + this.$util.getOrderType(e.classificationId)] = {
+				productTypeList().then(res => {
+					res.typeList.forEach(e => {
+						courses['list' + e.typeId] = {
 							shrink: false,
-							name: e.classificationName,
+							name: e.typeName,
 							deadline: '',
 							unit: 2,
 							list: []
@@ -407,7 +407,7 @@
 							e.options = 1
 							this.calcDate(e, !e.authority)
 						}
-						courses['list' + e.authority].list.push(e)
+						courses['list' + e.typeId].list.push(e)
 					})
 					this.courseList = courses
 				}).catch(e => {})
@@ -829,7 +829,7 @@
 			// 消息推送授权
 			publicNotice() {
 				uni.requestSubscribeMessage({
-					tmplIds: ['8pDVfWYqh9c-nn3CeA1NXJtBxdd1FYiCtrl5BeLvbgU'],
+					tmplIds: ['8pDVfWYqh9c-nn3CeA1NXJtBxdd1FYiCtrl5BeLvbgU', 'mg3RiI8tDNaChVQKjImXzYK63C5Il3BENfBwF0NDzDM'],
 					success: (res) => {
 						uni.switchTab({
 							url: '/pages/orders/orders'
diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue
index 0c1111c..bb6c9b3 100644
--- a/order/productDetail/productDetail.vue
+++ b/order/productDetail/productDetail.vue
@@ -109,7 +109,7 @@
 </template>
 
 <script>
-	import { detailsOfGoods, addToShoppingCart, shoppingCartList, productCategoryList } from '@/apis/modules/product.js'
+	import { detailsOfGoods, addToShoppingCart, shoppingCartList } from '@/apis/modules/product.js'
 	export default {
 		data() {
 			return {
@@ -139,7 +139,6 @@
 					mallAnnex: []
 				},
 				shopCartTotal: 0,
-				types: [],
 				dotsStyles: {
 					backgroundColor: 'rgba(83, 200, 249,0.3)',
 					border: '1px rgba(83, 200, 249,0.3) solid',
@@ -159,7 +158,6 @@
 			this.id = options.id
 			this.getInfo()
 			this.getShopCart()
-			this.getTypes()
 			// 清除订单缓存
 			try {
 				uni.removeStorageSync('orderForm')
@@ -203,12 +201,6 @@
 					this.shopCartTotal = data.total
 				}).catch(e => {})
 			},
-			// 产品分类
-			getTypes() {
-				productCategoryList().then(res => {
-					this.types = res.classificationList
-				}).catch(e => {})
-			},
 			// tab切换
 			tabChange(id) {
 				if ((id === 1 && !this.form.interfaceDiagram) || (id === 2 && (!form.mallAnnex || !form.mallAnnex.length))) return false