购物车，学员选择

components/cats/style11.vue

@@ -59,7 +59,8 @@
 				</scroll-view>
 			</view>
 		</view>
-		<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
@@ -67,6 +68,7 @@
 <script>
 	import sidebar from '../sidebar/index';
 	import goodSku from '../goods/goodsku';
+	import goodSku2 from '../goods/goodsku2';
 	import auth from '@/components/auth/index.vue';
 	export default {
 		props: ['d', 'h'],
@@ -106,6 +108,7 @@
 		components: {
 			sidebar,
 			goodSku,
+			goodSku2,
 			auth
 		},
 		created() {
@@ -121,6 +124,7 @@
 				0;
 		},
 		mounted() {
+			this.u = uni.getStorageSync('mall_UserInfo');
 			this.CategoryIdsList = [];
 			this.CategoryIds1 = this.d[0].Id;
 			this.CategoryIds2 = this.d[0].ChildList[0].Id;

components/cats/style4.vue

@@ -81,13 +81,15 @@
 				<u-divider v-if="isover" :margin-top="20" :margin-bottom="20">没有更多商品了</u-divider>
 			</scroll-view>
 		</div>
-		<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
 
 <script>
 	import goodSku from '../goods/goodsku';
+	import goodSku2 from '../goods/goodsku2';
 	import sidebar from "../sidebar/index";
 	import auth from '@/components/auth/index.vue';
 	export default {
@@ -125,6 +127,7 @@
 		components: {
 			sidebar,
 			goodSku,
+			goodSku2,
 			auth
 		},
 		created() {

components/cats/style8.vue

@@ -57,7 +57,8 @@
 				</scroll-view>
 			</view>
 		</view>
-		<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
@@ -65,6 +66,7 @@
 <script>
 	import sidebar from "../sidebar/index";
 	import goodSku from '../goods/goodsku';
+	import goodSku2 from '../goods/goodsku2';
 	import auth from '@/components/auth/index.vue';
 	export default {
 		props: ["d", "h"],
@@ -104,7 +106,8 @@
 		components: {
 			sidebar,
 			goodSku,
-			auth
+			auth,
+			goodSku2
 		},
 		created() {
 			this.mainColor = this.$uiConfig.mainColor;
@@ -119,6 +122,7 @@
 				0;
 		},
 		mounted() {
+			this.u = uni.getStorageSync('mall_UserInfo');
 			this.CategoryIdsList = [];
 			this.CategoryIds1 = this.d[0].Id;
 			this.CategoryIds2 = this.d[0].ChildList[0].Id;

components/educationteacher/style1.vue

@@ -42,16 +42,19 @@
 				
 		
 		</view>
-		<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
 <script>
 import goodSku from '../goods/goodsku';
+import goodSku2 from '../goods/goodsku2';
 import auth from '@/components/auth/index.vue';
 export default {
 	components: {
 		goodSku,
+		goodSku2,
 		auth
 	},
 	props: ['goodList', 'goodsInfo'],
@@ -66,6 +69,7 @@ export default {
 		};
 	},
 	created() {
+		this.u = uni.getStorageSync('mall_UserInfo');
 		this.mainColor = this.$uiConfig.mainColor;
 	},
 	methods: {

components/goods/goodsku2.vue

@@ -345,8 +345,17 @@
 						SpecificationSort: this.skuObj.sign_id
 					};
 					good.DetailList.push(g);
+					// uni.navigateTo({
+					// 	url: '/pages/order-submit/order-submit?formData=' +
+					// 		encodeURIComponent(JSON.stringify(good)) +
+					// 		'&IsFormShoppingCart=2&ShoppingCartIdList=' +
+					// 		JSON.stringify(ShoppingCartIdList),
+					// 	complete(res) {
+					// 		console.log(res);
+					// 	}
+					// });
 					uni.navigateTo({
-						url: '/pages/order-submit/order-submit?formData=' +
+						url: '/pages/order-submit/order-submit2?formData=' +
 							encodeURIComponent(JSON.stringify(good)) +
 							'&IsFormShoppingCart=2&ShoppingCartIdList=' +
 							JSON.stringify(ShoppingCartIdList),

components/goods/list.vue

@@ -36,17 +36,21 @@
 				</view>
 			</u-col>
 		</u-row>
-		<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<!-- <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> -->
+		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
 
 <script>
 	import goodSku from "../goods/goodsku";
+	import goodSku2 from "../goods/goodsku2";
 	import auth from "@/components/auth/index.vue";
 	export default {
 		components: {
 			goodSku,
+			goodSku2,
 			auth,
 		},
 		props: ["list"],
@@ -63,6 +67,7 @@
 			};
 		},
 		mounted() {
+			this.u = uni.getStorageSync("mall_UserInfo");
 			this.g = this.list;
 			this.mainColor = this.$uiConfig.mainColor;
 			this.initConfig();

components/goods/style1.vue

@@ -63,7 +63,7 @@
 				</div>
 			</div>
 		</div>
-		<good-sku v-if="showSku&&!u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
 		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</div>
@@ -92,6 +92,7 @@ export default {
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.u = uni.getStorageSync('mall_UserInfo');
 	},
 	methods: {
 		openGood(item) {

components/goods/style2.vue

@@ -62,7 +62,7 @@
 			</u-col>
 		</u-row>
 
-		<good-sku v-if="showSku&&!u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
 		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
@@ -90,6 +90,7 @@ export default {
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.u = uni.getStorageSync('mall_UserInfo');
 	},
 	methods: {
 		openGood(item) {

components/goods/style3.vue

@@ -63,7 +63,7 @@
 				</div>
 			</u-col>
 		</u-row>
-		<good-sku v-if="showSku&&!u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
 		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</div>
@@ -92,6 +92,7 @@ export default {
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.u = uni.getStorageSync('mall_UserInfo');
 	},
 	methods: {
 		openGood(item) {

components/goods/style4.vue

@@ -44,7 +44,7 @@
 				</view>
 			</view>
 		</view>
-		<good-sku v-if="showSku&&!u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
 		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
@@ -72,6 +72,7 @@ export default {
 		};
 	},
 	created() {
+		this.u = uni.getStorageSync('mall_UserInfo');
 		this.mainColor = this.$uiConfig.mainColor;
 	},
 	methods: {

components/goods/style5.vue

@@ -53,7 +53,7 @@
 				</view>
 			</view>
 		</view>
-		<good-sku v-if="showSku&&!u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
 		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
@@ -81,6 +81,7 @@ export default {
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.u = uni.getStorageSync('mall_UserInfo');
 	},
 	methods: {
 		openGood(item) {

components/goods/style6.vue

@@ -46,7 +46,7 @@
 				</view>
 			</view>
 		</view>
-		<good-sku v-if="showSku&&!u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
 		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
@@ -75,6 +75,7 @@ export default {
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.u = uni.getStorageSync('mall_UserInfo');
 	},
 	methods: {
 		openGood(item) {

components/goods/style7.vue

@@ -58,7 +58,7 @@
 				</view>
 			</view>
 		</view>
-		<good-sku v-if="showSku&&!u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
 		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
@@ -87,6 +87,7 @@ export default {
 		};
 	},
 	created() {
+		this.u = uni.getStorageSync('mall_UserInfo');
 		this.mainColor = this.$uiConfig.mainColor;
 		this.IsEducation = uni.getStorageSync('basedata')
 		? (uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation?uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation:0) 

components/pingtuan/style1.vue

@@ -64,17 +64,21 @@
         </div>
       </div>
     </div>
-    <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+    <!-- <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> -->
+	<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+	<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
     <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
   </div>
 </template>
 
 <script>
 import goodSku from "../goods/goodsku";
+import goodSku2 from "../goods/goodsku2";
 import auth from "@/components/auth/index.vue";
 export default {
   components: {
     goodSku,
+	goodSku2,
     auth,
   },
   props: ["goodList", "goodsInfo"],
@@ -90,6 +94,7 @@ export default {
     };
   },
   created() {
+	  this.u = uni.getStorageSync("mall_UserInfo");
     this.mainColor = this.$uiConfig.mainColor;
     this.btnStyle = {
       backgroundColor: this.goodsInfo.buttonColor ?? this.mainColor,

components/pingtuan/style2.vue

@@ -74,16 +74,20 @@
       </u-col>
     </u-row>
 
-    <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+    <!-- <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku> -->
+	<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+	<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
     <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
   </view>
 </template>
 <script>
 import goodSku from "../goods/goodsku";
+import goodSku2 from "../goods/goodsku2"
 import auth from "@/components/auth/index.vue";
 export default {
   components: {
     goodSku,
+	goodSku2,
     auth,
   },
   props: ["goodList", "goodsInfo"],
@@ -99,6 +103,7 @@ export default {
   },
   created() {
     this.mainColor = this.$uiConfig.mainColor;
+	this.u = uni.getStorageSync("mall_UserInfo");
   },
   methods: {
     openGood(item) {

components/pingtuan/style3.vue

@@ -73,17 +73,21 @@
         </div>
       </u-col>
     </u-row>
-    <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+    <!-- <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku> -->
+	<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+	<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
     <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
   </div>
 </template>
 
 <script>
 import goodSku from "../goods/goodsku";
+import goodSku2 from "../goods/goodsku2";
 import auth from "@/components/auth/index.vue";
 export default {
   components: {
     goodSku,
+	goodSku2,
     auth,
   },
   props: ["goodList", "goodsInfo"],
@@ -99,6 +103,7 @@ export default {
   },
   created() {
     this.mainColor = this.$uiConfig.mainColor;
+	this.u = uni.getStorageSync("mall_UserInfo");
   },
   methods: {
     openGood(item) {

components/pingtuan/style4.vue

@@ -47,17 +47,21 @@
 				</view>
 			</view>
 		</view>
-		<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<!-- <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> -->
+		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
 
 <script>
 import goodSku from '../goods/goodsku';
+import goodSku2 from '../goods/goodsku2';
 import auth from '@/components/auth/index.vue';
 export default {
 	components: {
 		goodSku,
+		goodSku2,
 		auth
 	},
 	props: ['goodList', 'goodsInfo'],
@@ -73,6 +77,7 @@ export default {
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.u = uni.getStorageSync('mall_UserInfo');
 	},
 	methods: {
 		openGood(item) {

components/pingtuan/style5.vue

@@ -51,16 +51,20 @@
 				</view>
 			</view>
 		</view>
-		<good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<!-- <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> -->
+		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
 <script>
 import goodSku from '../goods/goodsku';
+import goodSku2 from '../goods/goodsku2';
 import auth from '@/components/auth/index.vue';
 export default {
 	components: {
 		goodSku,
+		goodSku2,
 		auth
 	},
 	props: ['goodList', 'goodsInfo'],
@@ -76,6 +80,7 @@ export default {
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.u = uni.getStorageSync('mall_UserInfo');
 	},
 	methods: {
 		openGood(item) {

components/pingtuan/style6.vue

@@ -47,17 +47,21 @@
 				</view>
 			</view>
 		</view>
-		<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<!-- <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku> -->
+		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
 
 <script>
 import goodSku from '../goods/goodsku';
+import goodSku2 from '../goods/goodsku2';
 import auth from '@/components/auth/index.vue';
 export default {
 	components: {
 		goodSku,
+		goodSku2,
 		auth
 	},
 	props: ['goodList', 'goodsInfo'],
@@ -73,6 +77,7 @@ export default {
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.u = uni.getStorageSync('mall_UserInfo');
 	},
 	methods: {
 		openGood(item) {

pages/cart/cart.vue

@@ -555,11 +555,20 @@
 						forms = good;
 					});
 					if (this.IsEducation != 1) {
-						uni.navigateTo({
-							url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(
-								forms)) + '&IsFormShoppingCart=1&ShoppingCartIdList=' + JSON.stringify(
-								ShoppingCartIdList)
-						});
+						if(this.u.TenantId!=27) {
+							uni.navigateTo({
+								url: '/pages/order-submit/order-submit?formData=' + encodeURIComponent(JSON.stringify(
+									forms)) + '&IsFormShoppingCart=1&ShoppingCartIdList=' + JSON.stringify(
+									ShoppingCartIdList)
+							});
+						} else {
+							uni.navigateTo({
+								url: '/pages/order-submit/order-submit2?formData=' + encodeURIComponent(JSON.stringify(
+									forms)) + '&IsFormShoppingCart=1&ShoppingCartIdList=' + JSON.stringify(
+									ShoppingCartIdList)
+							});
+						}
+						
 					} else if (this.IsEducation == 1) {
 						uni.navigateTo({
 							url: '/pages/school/course-submit?DetailList=' + encodeURIComponent(JSON.stringify(

pages/favorite/favorite.vue

@@ -95,12 +95,19 @@
       </view>
     </template>
     <good-sku
-      v-if="showSku"
+      v-if="showSku&&u.TenantId!=27"
       :option-type="2"
       borderRadius="20"
       v-model="showSku"
       :good="sku"
     ></good-sku>
+	<good-sku2
+	  v-if="showSku&&u.TenantId==27"
+	  :option-type="2"
+	  borderRadius="20"
+	  v-model="showSku"
+	  :good="sku"
+	></good-sku2>
     <auth
       v-if="showAuth"
       @changeuserinfo="reloadUserinfo"
@@ -112,6 +119,7 @@
 <script>
 import auth from "../../components/auth/index.vue";
 import goodSku from "../../components/goods/goodsku.vue";
+import goodSku2 from "../../components/goods/goodsku2.vue";
 export default {
   data() {
     return {
@@ -144,6 +152,7 @@ export default {
   components: {
     auth,
     goodSku,
+	goodSku2
   },
   created() {
     this.contentHeight = this.$utils.calcContentHeight(-40) + "px";

pages/favorite/favoriteKotra.vue

@@ -126,12 +126,19 @@
       </view>
     </template>
     <good-sku
-      v-if="showSku"
+      v-if="showSku&&u.TenantId!=27"
       :option-type="2"
       borderRadius="20"
       v-model="showSku"
       :good="sku"
     ></good-sku>
+	<good-sku2
+	  v-if="showSku&&u.TenantId==27"
+	  :option-type="2"
+	  borderRadius="20"
+	  v-model="showSku"
+	  :good="sku"
+	></good-sku2>
     <auth
       v-if="showAuth"
       @changeuserinfo="reloadUserinfo"
@@ -143,6 +150,7 @@
 <script>
 import auth from "../../components/auth/index.vue";
 import goodSku from "../../components/goods/goodsku.vue";
+import goodSku2 from "../../components/goods/goodsku2.vue";
 export default {
   data() {
     return {
@@ -176,6 +184,7 @@ export default {
   components: {
     auth,
     goodSku,
+	goodSku2
   },
   created() {
     this.contentHeight = this.$utils.calcContentHeight(-40) + "px";

pages/goods/components/goodsaction.vue

@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import auth from "@/components/auth/index";
+import auth from "@/components/auth/index";//购物车
 export default {
 	props: ['coverPic', 'goodName', 'favorite', 'goodId','totalStock','status','formid'],
 	data() {

pages/goods/goods.vue

@@ -413,9 +413,12 @@
 					:good-id="id" :total-stock="g.totalStock" :status="g.status" @buy="buy">
 				</kotragoodsaction>
 			</template>
-			<goodsku v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
+			<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku" :mask-close-able="true"
 				:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
 			</goodsku>
+			<goodsku2 v-if="!loading && showSku&&u.TenantId==27" border-radius="10" v-model="showSku" :mask-close-able="true"
+				:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
+			</goodsku2>
 		</view>
 		<u-empty text="没有找到商品，或商品已下架" mode="favor" v-if="!isExsitGoods"></u-empty>
 		<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising"
@@ -434,6 +437,7 @@
 	import goodsaction from "./components/goodsaction"; //购物车收藏
 	import kotragoodsaction from "./components/kotragoodsaction"; //韩国馆项目引用
 	import goodsku from "@/components/goods/goodsku";
+	import goodsku2 from "@/components/goods/goodsku2";
 	import auth from "@/components/auth/index";
 	import coupon from "@/components/coupons/coupons";
 	import share from "./components/share/share";
@@ -510,6 +514,7 @@
 			goodsaction,
 			kotragoodsaction,
 			goodsku,
+			goodsku2,
 			auth,
 			coupon,
 			share,

pages/pintuan/tuangood.vue

@@ -134,8 +134,10 @@
 			<u-skeleton v-if="loading" :loading="true" :animation="true" bgcolor="#FFF"></u-skeleton>
 			<goodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.cover_pic" :favorite="g.favorite" :good-id="id"
 			 :total-stock="g.totalStock" :status="g.status" @joincar="joinCar" @buy="buy"></goodsaction>
-			<goodsku v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
+			<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku" :mask-close-able="true"
 			 :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen"></goodsku>
+			 <goodsku2 v-if="!loading && showSku&&u.TenantId==27" border-radius="10" v-model="showSku" :mask-close-able="true"
+			  :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen"></goodsku2>
 		</view>
 		<u-empty text="没有找到商品，或商品已下架" mode="favor" v-if="!isExsitGoods"></u-empty>
 		<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising" @close="closeShare"></share>
@@ -151,6 +153,7 @@
 	import goodlist from "@/components/goods/list";
 	import goodsaction from "./components/goodsaction";
 	import goodsku from "@/components/goods/goodsku";
+	import goodsku2 from "@/components/goods/goodsku2";
 	import auth from "@/components/auth/index";
 	import coupon from "@/components/coupons/coupons";
 	import share from "./components/share/share";
@@ -197,6 +200,7 @@
 			goodlist,
 			goodsaction,
 			goodsku,
+			goodsku2,
 			auth,
 			coupon,
 			share,

pages/video/index.vue

@@ -186,11 +186,13 @@
 			</button>
 		</view>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
-		<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku v-if="showSku&&u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
 	</view>
 </template>
 <script>
 	import goodSku from "@/components/goods/goodsku";
+	import goodSku2 from "@/components/goods/goodsku2";
 	import auth from "@/components/auth/index";
 	export default {
 		data() {
@@ -224,6 +226,7 @@
 		},
 		components: {
 			goodSku,
+			goodSku2,
 			auth
 		},
 		onReady() {
@@ -231,6 +234,7 @@
 			this.getList();
 		},
 		onLoad(option) {
+			this.u = uni.getStorageSync('mall_UserInfo');
 			this.GoodsId = option.GoodsId;
 			this.sysheight = uni.getSystemInfoSync().windowHeight;
 			this.swiperHeight = `${this.sysheight}px`;