fix

components/filter-popup/filter-popup.vue

@@ -207,6 +207,20 @@ export default {
 				e.title = e.disciplineName
 			})
 			this.categories.push(list)
+			
+			const res = await courseProfessionalClass(1)
+			res.list.map(e => {
+				e.id = e.professionalClassId
+				e.title = e.professionalClassName
+			})
+			this.categories.push(res.list)
+			
+			const res1 = await courseProfessional(1)
+			res1.list.map(e => {
+				e.id = e.professionalId
+				e.title = e.professionalName
+			})
+			this.categories.push(res1.list)
 		},
 		// 学科专业确定回调
 		change(e) {
@@ -233,7 +247,6 @@ export default {
 		// 学科专业切换回调
 		async columnchange(e) {
 			const { column } = e.detail
-			console.log('change',column)
 			if (column == 0) {
 				const { list } = await courseProfessionalClass(this.categories[0][e.detail.value].id)
 				list.map(e => {

config/request.js

@@ -5,9 +5,9 @@
  */
 
 export default {
-  // baseURL: 'https://huorantech.cn/',
+  baseURL: 'https://huorantech.cn/',
-  // baseURL: 'http://192.168.31.51:9000/',
+  // baseURL: 'http://192.168.31.152:9000/',
-  baseURL: 'http://121.37.12.51/',
+  // baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },

libs/util.js

@@ -68,7 +68,7 @@ export default {
 	getBmName(val) {
 		return uni.getStorageSync('team').partnerClassificationName
 	},
-	// 返回图标。如果有图标，则直接返回，否则判断是否是数据产品，即productType=2，如果是，则取数据图标，否则则显示通用图标，这两个图标都在config/product.js里有配置
+	// 返回图标。如果有图标，则直接返回
 	getIcon(e) {
 		return e.appletIcon || Product.normalIcon
 	},

order/addCourse/addCourse.vue

@@ -279,16 +279,17 @@
 								console.log(44, e)
 								const classId = e.classificationId
 								const pid = +e.associatedProduct
+								const { mallId } = e
 								if (classId == 1 || classId == 2) {
-									list1.push(pid)
+									list1.push(mallId)
 								} else if (classId == 3) {
-									list2.push(pid)
+									list2.push(mallId)
 								} else if (classId == 4) {
-									list3.push(pid)
+									list3.push(mallId)
 								} else if (classId == 5) {
-									list0.push(pid)
+									list0.push(mallId)
 								} else if (classId == 6) {
-									list4.push(pid)
+									list4.push(mallId)
 								}
 								result.push(this.createParam(e, this.$util.getOrderType(classId)))
 								resolve()

order/editCourse/editCourse.vue

@@ -143,7 +143,6 @@
 						courses['list' + e.authority].list.push(e)
 					})
 					this.courses = courses
-					console.log('editCourse', this.courses)
 				}).catch(e => {})
 				try {
 					uni.removeStorageSync('courses')

order/orderDetail/orderDetail.vue

@@ -809,8 +809,10 @@
 	}
 }
 .ship-info {
+	height: 400rpx;
 	padding: 20rpx;
 	white-space: pre-wrap;
 	font-size: 28rpx;
+	overflow: auto;
 }
 </style>

order/shopCart/shopCart.vue

@@ -58,6 +58,7 @@
 			}
 		},
 		onShow() {
+			this.checked = []
 			// 清除产品缓存
 			try {
 				uni.removeStorageSync('orderForm')
@@ -164,6 +165,7 @@
 			submit() {
 				const list = this.checked // 已选产品
 				if (list.length) {
+					// 判断勾选的产品是否有重复的
 					if (new Set(list.map(e => e.mallId)).size !== list.length) return this.$util.errMsg('所选产品存在重复，请重新选择')
 					
 					const promises = []

pages.json

@@ -251,7 +251,7 @@
                     "path" : "scheme/scheme",
                     "style" :                                                                                    
 					{
-						"navigationBarTitleText": "",
+						"navigationBarTitleText": "方案详情",
 						"enablePullDownRefresh": false
 					}
                 },

pages/orders/orders.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view :class="[{oh: !per}]">
 		<view class="filter">
 			<uni-search-bar class="search" radius="30" placeholder="请输入学校名称，商务经理，订单号" v-model="keyword" clearButton="auto" cancelButton="none" />
 			<view :class="['sort', sort]" @click="switchSort"></view>
@@ -60,6 +60,7 @@
 		
 		<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('/order/orderDetail/orderDetail')"></uni-icons>
 		<filter-popup :data="filterData" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
+		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
 	</view>
 </template>
 
@@ -69,6 +70,7 @@
 	export default {
 		data() {
 			return {
+				per: true, // 是否有权限
 				popup: false,
 				//筛选表单数据
 				filterData: [
@@ -143,6 +145,7 @@
 			}
 		},
 		onShow() {
+			this.per = true
 			// 清除产品缓存
 			try {
 				uni.removeStorageSync('orderForm')
@@ -153,8 +156,11 @@
 		methods: {
 			// 初始化权限
 			initRole() {
-				this.tabs = []
 				const auth = uni.getStorageSync('auth')
+				if (!auth.includes('订单')) {
+					this.per = false
+				}
+				this.tabs = []
 				auth.includes('订单:我的订单') && this.tabs.push({
 					name: '我的订单',
 					id: 0
@@ -309,4 +315,7 @@
 		color: #bdbdbd;
 	}
 }
+.oh {
+	overflow: hidden;
+}
 </style>

pages/plans/plans.vue

@@ -17,8 +17,8 @@
 						<view class="line">
 							<view class="name">产品：</view>
 							<view class="val ell-wrap">
-								<view :class="['product', {ell: !item.toggle}]" v-html="item.product"></view>
+								<view :class="['product', {ell: !item.toggle}]">{{ item.productNames }}</view>
-								<view v-if="item.product.length > 14" class="toggle" @click.stop="toggle(item)">{{ item.toggle ? '收起' : '展开' }}</view>
+								<view v-if="item.productNames && item.productNames.length > 14" class="toggle" @click.stop="toggle(item)">{{ item.toggle ? '收起' : '展开' }}</view>
 							</view>
 						</view>
 						<view class="line">
@@ -109,7 +109,7 @@
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
 					const list = data.records
 					list.forEach(e => {
-						e.toggle = false
+						if (e.productNames) e.toggle = e.productNames.length < 14 // 超过了14个字才需要显示展开按钮
 					})
 					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
 					this.page++ // 每次获取了数据后page+1

team/scheme/scheme.vue

@@ -36,6 +36,7 @@
 					title: '加载中'
 				})
 				schemeFindById(this.id).then(({ data }) => {
+					if (data.productList) data.product = data.productList.map(e => e.productName).join('、')
 					this.form = data
 					uni.hideLoading()
 				}).catch(e => {