Signed-off-by: 李妹妹 <1639016684@qq.com>

pages_company/managerOrder/productDetails.vue

@@ -150,7 +150,7 @@
 				</view> -->
 
 				<!-- 规格 -->
-				<view class="spec-box">
+				<!-- <view class="spec-box">
 					<view v-for="(item,index) in attrs" :key="index">
 						<view class="title">{{item.attrName}}</view>
 						<view class="spec-list">
@@ -160,6 +160,23 @@
 							</view>
 						</view>
 					</view>
+				</view> -->
+				<view class="spec-box">
+				  <!-- 外层循环：用 item.id 做 key，不要用 index -->
+				  <view v-for="(item,index) in attrs" :key="item.id || index">
+				    <view class="title">{{item.attrName}}</view>
+				    <view class="spec-list">
+				      <!-- 内层循环：必须用 subItem 唯一值，不要用 subindex！！ -->
+				      <view 
+				        v-for="(subItem,subindex) in item.values" 
+				        :key="subItem + '-' + subindex"
+				        :class="subindex == item.index ? 'item active' : 'item'" 
+				        @click="choseSpec(index,subindex)"
+				      >
+				        {{ subItem }}
+				      </view>
+				    </view>
+				  </view>
 				</view>
 				<!-- 数量 -->
 				<view class="price-num">
@@ -204,9 +221,10 @@ import {CustomToast} from '@/components/custom-toast.vue';
 		getUserInfo
 	} from '@/api/user'
 	import {
-		getStoreProductDetail
-	} from '@/api/companyOrder.js'
+			getStoreProductDetail
+		} from '@/api/companyOrder.js'
 	import {
+		getProductDetails,
 		getCartCount,
 		addCart
 	} from '@/api/product'
@@ -259,13 +277,25 @@ import {CustomToast} from '@/components/custom-toast.vue';
 				singlePurchaseLimit:null,//商品购买上限
 				isSingle:false,
 				purchaseLimit:0, // 总限购数量
-				courseId:null,
-				companyUserId:null,
-				companyId:null
+				courseId:null
 			};
 		},
 		onLoad(options) {
-			console.log("qxj options:",options);
+			console.log("qxj options:" + JSON.stringify(options));
+			uni.setStorageSync('urlInfo', options);
+			if (options.userId != null) {
+				uni.setStorageSync('tuiUserId', options.userId);
+			} else if (options.hasOwnProperty('q') && options.q) {
+				// 通过下面这步解码，可以拿到url的值
+				const url = decodeURIComponent(options.q)
+				this.url = url;
+				// // 对url中携带的参数提取处理
+				const obj = this.utils.urlToObj(url)
+				uni.setStorageSync('tuiUserId', obj.userId);
+			}
+			if(options.courseId){
+				this.courseId=options.courseId
+			}
 			uni.showShareMenu({
 				withShareTicket: true,
 				//小程序的原生菜单中显示分享按钮，才能够让发送给朋友与分享到朋友圈两个按钮可以点击
@@ -275,6 +305,9 @@ import {CustomToast} from '@/components/custom-toast.vue';
 			this.productId = options.productId;
 			this.companyUserId= options.companyUserId
 			this.companyId = options.companyId
+			// if (this.utils.checkToken()) {
+			// 	this.getCartCount();
+			// }
 		},
 		onShow() {
 			this.getProductDetails();
@@ -290,7 +323,7 @@ import {CustomToast} from '@/components/custom-toast.vue';
 				var user = JSON.parse(uni.getStorageSync('userInfo'))
 				return {
 					title: this.product.productName,
-					path: '/pages_company/managerOrder/productDetails?productId=' + this.product.productId + "&userId=" + user.userId +"&companyId="+this.companyId+"&companyUserId="+this.companyUserId,
+					path: '/pages/shopping/productDetails?productId=' + this.product.productId + "&userId=" + user.userId +"&companyId="+this.companyId+"&companyUserId="+this.companyUserId,
 					imageUrl: 'https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/app/vip/share.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
@@ -305,7 +338,7 @@ import {CustomToast} from '@/components/custom-toast.vue';
 					imageUrl: 'https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/app/vip/share.png' //分享图标，路径可以是本地文件路径、代码包文件路径或者网络图片路径.支持PNG及JPG。显示图片长宽比是 5:4
 				}
 			}
-
+		
 		},
 		methods: {
 			getuser() {
@@ -402,10 +435,10 @@ import {CustomToast} from '@/components/custom-toast.vue';
 							if (type == "buy") {
 								uni.navigateTo({
 									url: '/pages/shopping/confirmOrder?type=' + this.type + "&cartIds=" + res
-										.id + "&orderType=" + this.orderType + "&storeId=" + this.storeId +"&companyId="+this.companyId+"&companyUserId="+this.companyUserId
+										.id + "&orderType=" + this.orderType + "&storeId=" + this.storeId +"&courseId="+this.courseId
 								})
 							} else {
-								//this.getCartCount()
+								this.getCartCount()
 								uni.showToast({
 									icon: 'success',
 									title: "添加成功",
@@ -424,7 +457,7 @@ import {CustomToast} from '@/components/custom-toast.vue';
 			},
 			getProductDetails() {
 				let data = {
-					productId:this.productId,
+					productId: this.productId,
 					companyId:this.companyId,
 					companyUserId:this.companyUserId
 				};
@@ -433,7 +466,7 @@ import {CustomToast} from '@/components/custom-toast.vue';
 						this.loadding = false
 						if (res.code == 200) {
 							this.product = res.product;
-							this.remainingPurchaseLimit = res.remainingPurchaseLimit;
+							this.remainingPurchaseLimit = res.product.purchaseLimit;
 							this.singlePurchaseLimit = res.product.singlePurchaseLimit!==0?res.product.singlePurchaseLimit:null
 							// 如果接口返回了总限购数量和已购买数量，也保存
 							if (res.product.purchaseLimit !== null) {
@@ -472,11 +505,11 @@ import {CustomToast} from '@/components/custom-toast.vue';
 								icon: 'none',
 								title: res.msg,
 							});
-							// setTimeout(function() {
-							// 	uni.reLaunch({
-							// 		url: '/pages/home/index',
-							// 	})
-							// }, 2000)
+							setTimeout(function() {
+								uni.reLaunch({
+									url: '/pages/home/index',
+								})
+							}, 2000)
 
 						}
 					},
@@ -551,8 +584,8 @@ import {CustomToast} from '@/components/custom-toast.vue';
 			},
 			// 规格选择
 			choseSpec(index, subIndex) {
-				this.attrs[index].index = subIndex;
-				this.$forceUpdate();
+				//this.attrs[index].index = subIndex;
+				this.$set(this.attrs[index], 'index', subIndex);
 				let productAttr = this.attrs;
 				let values = [];
 				for (let i = 0; i < productAttr.length; i++) {
@@ -572,7 +605,7 @@ import {CustomToast} from '@/components/custom-toast.vue';
 				if (valueSelect != null && valueSelect.length > 0) {
 					this.productValueSelect = valueSelect[0];
 				}
-				//console.log("qxj productValueSelect:" + JSON.stringify(this.productValueSelect));
+				console.log("qxj productValueSelect:" + JSON.stringify(this.productValueSelect));
 				this.updateSpecNum();
 
 			},

pages_course/videovip.vue

@@ -549,7 +549,7 @@
 					@getuserinfo="userInfologin"  v-if="authType==0&&!isquestion">{{isLogin&&isAddKf==1 ? '提交答案领取奖励' : '立即学习'}}</button> -->
 				
 				<template>
-					<button class="author-btn" @click="openList" v-if="isLogin&&isAddKf==1&&isShu&& (showTabFeaturedComments || showTabColumnIntro || showTabReviewPoints)">{{ showTabFeaturedComments ? '去留言' : showTabColumnIntro ? '栏目介绍' : '评价得积分' }}
+					<button class="author-btn" @click="openList" v-if="isLogin&&isAddKf==1&&isShu&&(showTabFeaturedComments || showTabColumnIntro || showTabReviewPoints)">{{ showTabFeaturedComments ? '去留言' : showTabColumnIntro ? '栏目介绍' : '评价得积分' }}
 					<image v-if="showTabReviewPoints&&!showTabFeaturedComments&&!showTabColumnIntro" src="/static/images/jifen.png"></image></button>
 					<button class="author-btn" @click="submit" v-if="isLogin&&isAddKf==1&&remainTime==0&&!isShu&&tabIndex==2">评价得积分
 					<image src="/static/images/jifen.png"></image>

pages_index/course.vue

@@ -70,7 +70,7 @@
 				<view class="course-grid" :class="{ 'list-dimmed': courseRefreshing }">
 					<view
 						v-for="(course, idx) in courseList"
-						:key="course.courseId || idx"
+						:key="course.courseId"
 						class="course-card"
 						@click="onCourseClick(course)"
 					>

pages_user/user/integralOrderDetails.vue

@@ -397,7 +397,7 @@
 							font-weight: bold;
 							color: #FFFFFF;
 							line-height: 30upx;
-							float: left;
+							// float: left;
 							margin-top: 7upx;
 						}
 					}

pages_user/user/refundOrderDetail.vue

@@ -508,7 +508,7 @@
 								font-weight: bold;
 								color: #FFFFFF;
 								line-height: 30upx;
-								float: left;
+								// float: left;
 								margin-top: 7upx;
 							}
 						}