11.23

pages/index/customMian_step1/index.vue

@@ -58,7 +58,6 @@
 			</view>
 
 			<view class="label" style="margin-bottom:32rpx;" @click="toSel('挑选客厅灯',1)">
-				<!-- <view class="label" style="margin-bottom:32rpx;" @click="toKtDetail('挑选客厅灯',1)"> -->
 				<view class="txt">
 					挑选客厅灯
 				</view>
@@ -67,12 +66,12 @@
 			</view>
 
 			<view class="parms3">
-				<!-- <image @click="handleSel('kt',item,index)" class="item3 " :src="picBase+item.cover"
-					:class="[selKt.includes(item)?'act3':'']" v-for="(item,index) in brandTypeList"> -->
-
-				<image @click="goDetail(item,index,'挑选客厅灯')" class="item3 " :src="picBase+item.cover"
+				<!-- <image @click="goDetail(item,index,'挑选客厅灯')" class="item3 " :src="picBase+item.cover"
 					:class="[selKt.includes(item)?'act3':'']" v-for="(item,index) in brandTypeList.slice(0,4)">
+				</image> -->
 
+				<image @click="goDetail(item,index,'挑选客厅灯')" class="item3 " :src="picBase+item.cover"
+					:class="[selKtIndex==index?'act3':'']" v-for="(item,index) in brandTypeList.slice(0,4)">
 				</image>
 			</view>
 
@@ -85,11 +84,12 @@
 			</view>
 
 			<view class="parms3">
-				<!-- <image @click="handleSel('ct',item,index)" class="item3 " :src="picBase+item.cover"
-					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList">
+				<!-- <image @click="goDetail(item,index,'挑选餐厅灯')" class="item3 " :src="picBase+item.cover"
+					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList.slice(0,4)">
 				</image> -->
+
 				<image @click="goDetail(item,index,'挑选餐厅灯')" class="item3 " :src="picBase+item.cover"
-					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList.slice(0,4)">
+					:class="[selCtIndex==index?'act3':'']" v-for="(item,index) in lockTypeList.slice(0,4)">
 				</image>
 			</view>
 
@@ -102,11 +102,13 @@
 			</view>
 
 			<view class="parms3">
-				<!-- <image @click="handleSel('ws',item,index)" class="item3 " :src="picBase+item.cover"
-					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList">
+				<!-- <image @click="goDetail(item,index,'挑选卧室灯')" class="item3 " :src="picBase+item.cover"
+					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList.slice(0,4)">
 				</image> -->
+
 				<image @click="goDetail(item,index,'挑选卧室灯')" class="item3 " :src="picBase+item.cover"
-					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList.slice(0,4)">
+					v-for="(item,index) in chuanglianTypeList.slice(0,4)"
+					:class="[selWsIndex.indexOf(index)!=-1?'act3':'']">
 				</image>
 			</view>
 
@@ -119,12 +121,12 @@
 			</view>
 
 			<view class="parms3">
-				<!-- <image @click="handleSel('yt',item,index)" class="item3 " :src="picBase+item.cover"
-					:class="[selYt.includes(item)?'act3':'']" v-for="(item,index) in pannelTypeList">
+				<!-- <image @click="goDetail(item,index,'挑选阳台灯')" class="item3 " :src="picBase+item.cover"
+					:class="[selYt.includes(item)?'act3':'']" v-for="(item,index) in pannelTypeList.slice(0,4)">
 				</image> -->
 
 				<image @click="goDetail(item,index,'挑选阳台灯')" class="item3 " :src="picBase+item.cover"
-					:class="[selYt.includes(item)?'act3':'']" v-for="(item,index) in pannelTypeList.slice(0,4)">
+					:class="[selYtIndex==index?'act3':'']" v-for="(item,index) in pannelTypeList.slice(0,4)">
 				</image>
 			</view>
 
@@ -313,6 +315,13 @@
 				selCt: [],
 				selWs: [],
 				selYt: [],
+
+				selKtIndex: -1,
+				selCtIndex: -1,
+				selWsIndex: [],
+				selYtIndex: -1,
+
+
 				totalPrice: 0,
 
 				pConfig: -1,
@@ -371,8 +380,10 @@
 		onShow() {
 			this.cutdownRatio = this.$getCutDown()
 			console.log('哪种折扣价格', this.cutdownRatio);
-			console.log('确定选择的那一项', getApp().chooseItem_kt);
+			console.log('确定选择的那一项', getApp().chooseItem_kt, getApp().index_kt, getApp().chooseType);
 			if (getApp().chooseItem_kt) {
+
+				console.log('121112122-------------');
 				let index = getApp().index_kt
 				let item = getApp().chooseItem_kt
 				let type = ''
@@ -385,10 +396,12 @@
 				} else {
 					type = 'yt'
 				}
+
+				this.handleSel(type, item, index, 2)
+
 				getApp().chooseItem_kt = null
 				getApp().index_kt = null
 				getApp().chooseType = null
-				this.handleSel(type, item, index, 2)
 			}
 		},
 		methods: {
@@ -407,14 +420,32 @@
 				}
 
 				if (name == '挑选卧室灯') {
-					if (this.selHx.value == '一室两厅' && this.selWs.length == 1) {
-						this.showHuxing = true
+					// if (this.selHx.value == '一室一厅' && this.selWs.length == 1) {
+					// 	this.showHuxing = true
+					// 	return
+					// } else if (this.selHx.value == '两室两厅' && this.selWs.length == 2) {
+					// 	this.showHuxing = true
+					// 	return
+					// } else if (this.selHx.value == '三室两厅' && this.selWs.length == 3) {
+					// 	this.showHuxing = true
+					// 	return
+					// }
+
+					if (this.selHx.value == '一室一厅' && this.selWs.length == 1) {
+						// this.showHuxing = true
+
+						this.showMissItem = true
+						this.tipTxt = '一室一厅户型应该选择1盏卧室灯！'
 						return
 					} else if (this.selHx.value == '两室两厅' && this.selWs.length == 2) {
-						this.showHuxing = true
+						// this.showHuxing = true
+						this.showMissItem = true
+						this.tipTxt = '两室两厅户型应该选择2盏卧室灯！'
 						return
 					} else if (this.selHx.value == '三室两厅' && this.selWs.length == 3) {
-						this.showHuxing = true
+						// this.showHuxing = true
+						this.showMissItem = true
+						this.tipTxt = '三室两厅户型应该选择3盏卧室灯！'
 						return
 					}
 				}
@@ -464,14 +495,31 @@
 					return this.$toast('请选择系列')
 				}
 				if (type == 3) {
-					if (this.selHx.value == '一室两厅' && this.selWs.length == 1) {
-						this.showHuxing = true
+					// if (this.selHx.value == '一室两厅' && this.selWs.length == 1) {
+					// 	this.showHuxing = true
+					// 	return
+					// } else if (this.selHx.value == '两室两厅' && this.selWs.length == 2) {
+					// 	this.showHuxing = true
+					// 	return
+					// } else if (this.selHx.value == '三室两厅' && this.selWs.length == 3) {
+					// 	this.showHuxing = true
+					// 	return
+					// }
+					if (this.selHx.value == '一室一厅' && this.selWs.length == 1) {
+						// this.showHuxing = true
+
+						this.showMissItem = true
+						this.tipTxt = '一室一厅户型应该选择1盏卧室灯！'
 						return
 					} else if (this.selHx.value == '两室两厅' && this.selWs.length == 2) {
-						this.showHuxing = true
+						// this.showHuxing = true
+						this.showMissItem = true
+						this.tipTxt = '两室两厅户型应该选择2盏卧室灯！'
 						return
 					} else if (this.selHx.value == '三室两厅' && this.selWs.length == 3) {
-						this.showHuxing = true
+						// this.showHuxing = true
+						this.showMissItem = true
+						this.tipTxt = '三室两厅户型应该选择3盏卧室灯！'
 						return
 					}
 				}
@@ -509,6 +557,8 @@
 					this.currHouseIndex1 = index
 					this.selHx = item
 
+					console.log('selHx---------------', this.selHx);
+
 					let p = {
 						type: this.type ? this.type : 2,
 						house_type: this.selHx.id
@@ -519,6 +569,16 @@
 					if (res.code == 0) {
 						console.log('新户型返回值', res);
 						this.serTypeList = res.data.series
+
+						this.selKt = []
+						this.selCt = []
+						this.selWs = []
+						this.selYt = []
+
+						this.selKtIndex = -1
+						this.selCtIndex = -1
+						this.selWsIndex = []
+						this.selYtIndex = -1
 					} else {
 						uni.showToast({
 							title: res.message,
@@ -576,6 +636,8 @@
 				if (type == 'kt') {
 					// 只能单选
 					this.selKt = [item]
+					this.selKtIndex = index
+
 
 					// 支持对选与取消当前选择
 					// if (!this.selKt.includes(item)) {
@@ -591,6 +653,7 @@
 
 				} else if (type == 'ct') {
 					this.selCt = [item]
+					this.selCtIndex = index
 
 					// if (!this.selCt.includes(item)) {
 					// 	this.selCt.push(item)
@@ -605,19 +668,21 @@
 				} else if (type == 'ws') {
 					// this.selWs = [item]
 
-					if (!this.selWs.includes(item)) {
+					if (!this.selWsIndex.includes(index)) {
 						this.selWs.push(item)
+						this.selWsIndex.push(index)
 					} else {
 						if (mode == 1) {
 							let i = this.selWs.findIndex((item1, index1) => {
 								return item1 == item
 							})
 							this.selWs.splice(i, 1)
+							this.selWsIndex.splice(i, 1)
 						}
 					}
 				} else if (type == 'yt') {
 					this.selYt = [item]
-
+					this.selYtIndex = index
 					// if (!this.selYt.includes(item)) {
 					// 	this.selYt.push(item)
 					// } else {
@@ -629,6 +694,11 @@
 					// 	}
 					// }
 				}
+
+				console.log('kt-----', this.selKt);
+				console.log('ct-----', this.selCt);
+				console.log('ws-----', this.selWs);
+				console.log('yt-----', this.selYt);
 				let wsIds1 = []
 				this.selKt.forEach((item, index) => {
 					wsIds1.push(item.id)
@@ -685,14 +755,23 @@
 					return
 				}
 
-				if (this.selHx.value == '一室两厅' && this.selWs.length != 1) {
-					this.showHuxing = true
+				console.log('fffffffffffffffffffff', this.selHx.value, this.selWs.length);
+
+				if (this.selHx.value == '一室一厅' && this.selWs.length != 1) {
+					// this.showHuxing = true
+
+					this.showMissItem = true
+					this.tipTxt = '一室一厅户型应该选择1盏卧室灯！'
 					return
 				} else if (this.selHx.value == '两室两厅' && this.selWs.length != 2) {
-					this.showHuxing = true
+					// this.showHuxing = true
+					this.showMissItem = true
+					this.tipTxt = '两室两厅户型应该选择2盏卧室灯！'
 					return
 				} else if (this.selHx.value == '三室两厅' && this.selWs.length != 3) {
-					this.showHuxing = true
+					// this.showHuxing = true
+					this.showMissItem = true
+					this.tipTxt = '三室两厅户型应该选择3盏卧室灯！'
 					return
 				}
 				if (this.selYt.length == 0) {

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>jiancaiPro</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.1f39b4d6.js></script><script src=/static/js/index.6e3acb6c.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.0107c3f4.js></script><script src=/static/js/index.23b8b943.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-my-test-index.3002cd38.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-my-test-index"],{"0fea":function(t,n,e){"use strict";e("7a82"),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;n.default={components:{},data:function(){return{}},onLoad:function(t){},methods:{}}},1842:function(t,n,e){"use strict";e.r(n);var a=e("0fea"),u=e.n(a);for(var o in a)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(o);n["default"]=u.a},"2daa":function(t,n,e){var a=e("24fb");n=a(!1),n.push([t.i,'@charset "UTF-8";\n/* 水平间距 */\n/* 水平间距 */',""]),t.exports=n},3294:function(t,n,e){"use strict";var a=e("8bf0"),u=e.n(a);u.a},"57ae":function(t,n,e){"use strict";e.r(n);var a=e("e245"),u=e("1842");for(var o in u)["default"].indexOf(o)<0&&function(t){e.d(n,t,(function(){return u[t]}))}(o);e("3294");var r=e("f0c5"),c=Object(r["a"])(u["default"],a["b"],a["c"],!1,null,"c5b61fee",null,!1,a["a"],void 0);n["default"]=c.exports},"8bf0":function(t,n,e){var a=e("2daa");a.__esModule&&(a=a.default),"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var u=e("4f06").default;u("58243d86",a,!0,{sourceMap:!1,shadowMode:!1})},e245:function(t,n,e){"use strict";e.d(n,"b",(function(){return a})),e.d(n,"c",(function(){return u})),e.d(n,"a",(function(){}));var a=function(){var t=this.$createElement,n=this._self._c||t;return n("v-uni-view",{staticClass:"page"},[n("navBar",{attrs:{title:"测试",back:!0,color:"black",background:"white"}})],1)},u=[]}}]);