Merge branch 'dongjian' into develop

pages/other_package/productInfo/productInfo.vue

@@ -44,7 +44,7 @@
 
 			<!-- 具体规格 -->
 			<view class="content_concrete">
-				<view class="concrete_item concrete_item_but" @click="checkSpecification(true)">
+				<view class="concrete_item concrete_item_but" @click="checkSpecification(true,'n')">
 					<view class="concrete_item_">
 						<view class="concrete_item_title">规格</view>
 						<view class="concrete_item_value">
@@ -385,6 +385,10 @@ export default {
 		},
 		async checkSpecification(val, type) {
 			const source = this.source;
+			if(type == 'n' && this.ji == 1){
+				type = 'buy';
+			}
+			console.log('afsdfsd',source,type)
 			if (source && source === "supply_chain") {
 				this.openShow = true;
 				return;
@@ -501,7 +505,7 @@ export default {
 				goodsNum: this.orderInfo.quantity,// 商品数量
 			}
 			console.log('selectTempl',selectTempl)
-			if(isBy){
+			if(this.ji == 1){
 				params['specsId'] = selectTempl;
 				uni.navigateTo({
 					url: `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(params)}`,
@@ -510,20 +514,20 @@ export default {
 			}
 			const resp = await addGoods(params);
 			if (resp && resp.bizcode === 100) {
-				// if (isBy) {
-				// 	uni.navigateTo({
-				// 		url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}&ji=${this.ji}`,
-				// 	})
-				// } else {
+				if (isBy) {
+					uni.navigateTo({
+						url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}`,
+					})
+				} else {
 					uni.showToast({
 						title: '成功加入购物车',
 						icon: 'success', // 可选 success/loading/none
 						duration: 2000 // 持续时长，单位ms
 					});
-				// }
-				setTimeout(() => {
-					this.checkSpecification(false, null);
-				}, 2000)
+				}
+				// setTimeout(() => {
+				// 	this.checkSpecification(false, null);
+				// }, 2000)
 			}
 		},
 		// 跳转到分享页面