商城修改

components/goods/goodsku2.vue

@@ -233,7 +233,7 @@
 						if (this.notes) {
 							this.$nextTick(() => {
 								this.g.goodsRelevanceList.forEach(item => {
-									this.goodprice = (parseFloat(this.skuObj.price) * 1 + parseFloat(
+									this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.g.attr_groups[0].service_time) + parseFloat(
 										item
 										.RelevancePrice)).toFixed(2);
 								})
@@ -241,7 +241,7 @@
 
 						} else {
 							this.$nextTick(() => {
-								this.goodprice = (parseFloat(this.skuObj.price) * 1).toFixed(2);
+								this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.g.attr_groups[0].service_time)).toFixed(2);
 							});
 
 						}
@@ -257,9 +257,9 @@
 									// this.goodprice2 =(parseFloat(this.goodprice)+parseFloat(item.RelevancePrice)).toFixed(2);
 									this.goodprice = this.g.price_min && this.g.price_min != '' ? (
 											parseFloat(
-												this.g.price_min) + parseFloat(item.RelevancePrice))
+												this.g.price_min)* parseFloat(this.g.attr_groups[0].service_time) + parseFloat(item.RelevancePrice))
 										.toFixed(2) :
-										(parseFloat(this.g.price_content) + parseFloat(item
+										(parseFloat(this.g.price_content) * parseFloat(this.g.attr_groups[0].service_time)+ parseFloat(item
 											.RelevancePrice))
 										.toFixed(2)
 								})
@@ -269,9 +269,9 @@
 
 						} else {
 							this.$nextTick(() => {
-								this.goodprice = this.g.price_min && this.g.price_min != '' ? this.g
-									.price_min : this.g
-									.price_content;
+								this.goodprice = this.g.price_min && this.g.price_min != '' ?parseFloat(this.g
+									.price_min) * parseFloat(this.g.attr_groups[0].service_time) : parseFloat(this.g
+									.price_content)* parseFloat(this.g.attr_groups[0].service_time);
 							});
 
 						}
@@ -312,24 +312,24 @@
 			// this.g = this.good;
 		},
 		methods: {
-			checkboxChange(n) {
-				this.notes = !this.notes
-				if (!this.notes) {
-					this.g.goodsRelevanceList.forEach(item => {
-						this.goodprice = (parseFloat(this.goodprice) - parseFloat(item
-							.RelevancePrice)).toFixed(2);
-					})
-					// this.goodprice = this.goodprice+this.g.goodsRelevanceList[0].RelevancePrice
-				} else {
-					this.g.goodsRelevanceList.forEach(item => {
-						this.goodprice = (parseFloat(this.goodprice) + parseFloat(item
-							.RelevancePrice)).toFixed(2);
-					})
-				}
-				// if(n.length>0) {
-				// 	this.goodprice = this.goodprice+this.g.goodsRelevanceList[0].RelevancePrice
-				// }
-			},
+			// checkboxChange(n) {
+			// 	this.notes = !this.notes
+			// 	if (!this.notes) {
+			// 		this.g.goodsRelevanceList.forEach(item => {
+			// 			this.goodprice = (parseFloat(this.goodprice) - parseFloat(item
+			// 				.RelevancePrice)).toFixed(2);
+			// 		})
+			// 		// this.goodprice = this.goodprice+this.g.goodsRelevanceList[0].RelevancePrice
+			// 	} else {
+			// 		this.g.goodsRelevanceList.forEach(item => {
+			// 			this.goodprice = (parseFloat(this.goodprice) + parseFloat(item
+			// 				.RelevancePrice)).toFixed(2);
+			// 		})
+			// 	}
+			// 	// if(n.length>0) {
+			// 	// 	this.goodprice = this.goodprice+this.g.goodsRelevanceList[0].RelevancePrice
+			// 	// }
+			// },
 			getfu() {
 
 				let fucolor = this.colorRgb(this.fu);
@@ -499,7 +499,7 @@
 					this.sku = unchosen;
 					this.skuObj = null;
 					this.goodimage = this.g.cover_pic;
-					this.goodprice = this.g.price_min && this.g.price_min != '' ? this.g.price_min : this.g.price_content;
+					this.goodprice = this.g.price_min && this.g.price_min != '' ? parseFloat(this.g.price_min)* parseFloat(this.g.attr_groups[0].service_time) : parseFloat(this.g.price_content)* parseFloat(this.g.attr_groups[0].service_time);
 					this.goodamount = this.g.goods_stock;
 				} else {
 					this.sku = chosen;
@@ -572,7 +572,8 @@
 
 				if (this.skuObj != null) {
 					this.goodimage = this.skuObj.pic_url || this.g.cover_pic;
-					this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc)).toFixed(2);
+					// this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc)).toFixed(2);
+					this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.g.attr_groups[0].service_time)).toFixed(2);
 					this.goodamount = this.skuObj.stock;
 				}
 			},
@@ -584,21 +585,24 @@
 			valChange(e) {
 				this.gc = e.value;
 				if (this.skuObj) {
-					this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc)).toFixed(2);
 					// this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc)).toFixed(2);
+					this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.g.attr_groups[0].service_time)).toFixed(2);
 					if (this.notes) {
 						this.$nextTick(() => {
 							this.g.goodsRelevanceList.forEach(item => {
-								this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc) +
-									parseFloat(item.RelevancePrice)).toFixed(2);
+								// this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc) +
+								// 	parseFloat(item.RelevancePrice)).toFixed(2);
 								// this.goodprice = (parseFloat(this.goodprice) + parseFloat(item.RelevancePrice))
 								// 	.toFixed(2);
+								this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.g.attr_groups[0].service_time) +
+									parseFloat(item.RelevancePrice)).toFixed(2);
 							})
 						})
 
 					} else {
 						this.$nextTick(() => {
-							this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc)).toFixed(2);
+							// this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.gc)).toFixed(2);
+							this.goodprice = (parseFloat(this.skuObj.price) * parseFloat(this.g.attr_groups[0].service_time)).toFixed(2);
 						})
 
 					}

components/goods/style1.vue

@@ -63,17 +63,20 @@
 				</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&&!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>
 </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'],

components/goods/style3.vue

@@ -63,17 +63,20 @@
 				</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&&!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>
 </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'],

components/goods/style4.vue

@@ -44,17 +44,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&&!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: ['goodList', 'goodsInfo'],

components/goods/style5.vue

@@ -53,16 +53,19 @@
 				</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" 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 auth from '@/components/auth/index.vue';
+import goodSku2 from '../goods/goodsku2';
 export default {
 	components: {
 		goodSku,
+		goodSku2,
 		auth
 	},
 	props: ['goodList', 'goodsInfo'],

components/goods/style6.vue

@@ -46,17 +46,20 @@
 				</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&&!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: ['goodList', 'goodsInfo'],

components/goods/style7.vue

@@ -58,17 +58,20 @@
 				</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&&!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: ['goodList', 'goodsInfo'],