李万涛 1 年間 前
コミット
10f5ffc8e5
100 ファイル変更973 行追加638 行削除
  1. 1 1
      pages/index.vue
  2. 21 2
      pages/index/aiControlSys/index.vue
  3. 14 7
      pages/index/customMian_step1/index.vue
  4. 17 10
      pages/index/customNoMian_step1/index.vue
  5. 7 1
      pages/index/fullHouseWifi/index.vue
  6. 241 0
      pages/mall/detail - 副本/index.scss
  7. 375 0
      pages/mall/detail - 副本/index.vue
  8. 84 93
      pages/mall/detail/index.vue
  9. 83 70
      pages/my/actGoodsDetail/index.vue
  10. 85 69
      pages/my/collectDetail/index.vue
  11. 4 0
      pages/my/useLead/index.scss
  12. 41 12
      pages/my/useLead/index.vue
  13. 0 4
      unpackage/dist/build/mp-weixin/app.js
  14. 0 157
      unpackage/dist/build/mp-weixin/app.json
  15. 0 3
      unpackage/dist/build/mp-weixin/app.wxss
  16. 0 0
      unpackage/dist/build/mp-weixin/common/main.js
  17. 0 0
      unpackage/dist/build/mp-weixin/common/main.wxss
  18. 0 2
      unpackage/dist/build/mp-weixin/common/runtime.js
  19. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  20. 0 10
      unpackage/dist/build/mp-weixin/components/navBar/index.js
  21. 0 6
      unpackage/dist/build/mp-weixin/components/navBar/index.json
  22. 0 1
      unpackage/dist/build/mp-weixin/components/navBar/index.wxml
  23. 0 1
      unpackage/dist/build/mp-weixin/components/navBar/index.wxss
  24. 0 10
      unpackage/dist/build/mp-weixin/components/popup/index.js
  25. 0 6
      unpackage/dist/build/mp-weixin/components/popup/index.json
  26. 0 1
      unpackage/dist/build/mp-weixin/components/popup/index.wxml
  27. 0 1
      unpackage/dist/build/mp-weixin/components/popup/index.wxss
  28. 0 10
      unpackage/dist/build/mp-weixin/components/privacyPopup/index.js
  29. 0 6
      unpackage/dist/build/mp-weixin/components/privacyPopup/index.json
  30. 0 1
      unpackage/dist/build/mp-weixin/components/privacyPopup/index.wxml
  31. 0 1
      unpackage/dist/build/mp-weixin/components/privacyPopup/index.wxss
  32. 0 0
      unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.js
  33. 0 4
      unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.json
  34. 0 1
      unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.wxml
  35. 0 2
      unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.wxss
  36. 0 0
      unpackage/dist/build/mp-weixin/pages/index.js
  37. 0 7
      unpackage/dist/build/mp-weixin/pages/index.json
  38. 0 0
      unpackage/dist/build/mp-weixin/pages/index.wxml
  39. 0 0
      unpackage/dist/build/mp-weixin/pages/index.wxss
  40. 0 0
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.js
  41. 0 8
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.json
  42. 0 0
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.wxml
  43. 0 0
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.wxss
  44. 0 0
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.js
  45. 0 11
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.json
  46. 0 0
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.wxml
  47. 0 0
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.wxss
  48. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customMian/index.js
  49. 0 12
      unpackage/dist/build/mp-weixin/pages/index/customMian/index.json
  50. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customMian/index.wxml
  51. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customMian/index.wxss
  52. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.js
  53. 0 9
      unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.json
  54. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.wxml
  55. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.wxss
  56. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.js
  57. 0 7
      unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.json
  58. 0 1
      unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.wxml
  59. 0 1
      unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.wxss
  60. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.js
  61. 0 8
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.json
  62. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.wxml
  63. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.wxss
  64. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.js
  65. 0 11
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.json
  66. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.wxml
  67. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.wxss
  68. 0 0
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.js
  69. 0 11
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.json
  70. 0 0
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.wxml
  71. 0 0
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.wxss
  72. 0 0
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.js
  73. 0 5
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.json
  74. 0 1
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.wxml
  75. 0 0
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.wxss
  76. 0 0
      unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.js
  77. 0 7
      unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.json
  78. 0 0
      unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.wxml
  79. 0 0
      unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.wxss
  80. 0 1
      unpackage/dist/build/mp-weixin/pages/index/mainList/index.js
  81. 0 7
      unpackage/dist/build/mp-weixin/pages/index/mainList/index.json
  82. 0 1
      unpackage/dist/build/mp-weixin/pages/index/mainList/index.wxml
  83. 0 1
      unpackage/dist/build/mp-weixin/pages/index/mainList/index.wxss
  84. 0 0
      unpackage/dist/build/mp-weixin/pages/index/productLead/index.js
  85. 0 7
      unpackage/dist/build/mp-weixin/pages/index/productLead/index.json
  86. 0 1
      unpackage/dist/build/mp-weixin/pages/index/productLead/index.wxml
  87. 0 1
      unpackage/dist/build/mp-weixin/pages/index/productLead/index.wxss
  88. 0 0
      unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.js
  89. 0 7
      unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.json
  90. 0 1
      unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.wxml
  91. 0 1
      unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.wxss
  92. 0 1
      unpackage/dist/build/mp-weixin/pages/index/rule/index.js
  93. 0 7
      unpackage/dist/build/mp-weixin/pages/index/rule/index.json
  94. 0 1
      unpackage/dist/build/mp-weixin/pages/index/rule/index.wxml
  95. 0 1
      unpackage/dist/build/mp-weixin/pages/index/rule/index.wxss
  96. 0 0
      unpackage/dist/build/mp-weixin/pages/mall.js
  97. 0 8
      unpackage/dist/build/mp-weixin/pages/mall.json
  98. 0 0
      unpackage/dist/build/mp-weixin/pages/mall.wxml
  99. 0 1
      unpackage/dist/build/mp-weixin/pages/mall.wxss
  100. 0 0
      unpackage/dist/build/mp-weixin/pages/mall/detail/index.js

+ 1 - 1
pages/index.vue

xqd
@@ -97,7 +97,7 @@
 
 			<!-- 展厅地址 -->
 			<view class="productLead" style="padding-left: 0;">
-				<view class="top">
+				<view class="top" style="padding-left: 32rpx;">
 					<view class="left">
 						<view class="bottomEng">
 							ADDRESS

+ 21 - 2
pages/index/aiControlSys/index.vue

xqd
@@ -627,8 +627,27 @@
 					return this.$toast('抱歉!参数配置缺失,暂无法预览配置')
 				}
 
-				if (!(this.selHx && this.selSuo && this.selPp && this.selMb && this.selCl && this.selKt)) {
-					return this.$toast('请全部选择后预览配置')
+				// if (!(this.selHx && this.selSuo && this.selPp && this.selMb && this.selCl && this.selKt)) {
+				// 	return this.$toast('请全部选择后预览配置')
+				// }
+
+				if (!this.selHx) {
+					return this.$toast('请选择户型')
+				}
+				if (!this.selPp) {
+					return this.$toast('请选择品牌')
+				}
+				if (!this.selSuo) {
+					return this.$toast('请选择智能锁')
+				}
+				if (!this.selMb) {
+					return this.$toast('请选择智能面板')
+				}
+				if (!this.selCl) {
+					return this.$toast('请选择智能窗帘')
+				}
+				if (!this.selKt) {
+					return this.$toast('请选择智能空调')
 				}
 
 				getApp().selHx = this.selHx

+ 14 - 7
pages/index/customMian_step1/index.vue

xqd xqd xqd
@@ -237,7 +237,7 @@
 				</view>
 
 				<view class="tip">
-					<image src="/static/index/more.png" mode=""></image>
+					<image :src="picUrl+ '/static/other/info.png'" mode="" style="margin-top: 5rpx;"></image>
 					{{selHx.extend.remark}}
 				</view>
 			</view>
@@ -576,9 +576,20 @@
 				} else {
 					this.totalPrice = 0
 				}
-
 			},
 			previewConfig() {
+				if (this.houseTypeList.length == 0 || this.serTypeList.length == 0) {
+					this.showMissItem = true
+					this.tipTxt = '抱歉!参数配置缺失,暂无法预览配置'
+					return
+				}
+				if (!this.selHx) {
+					return this.$toast('请选择户型')
+				}
+				if (!this.selXl) {
+					return this.$toast('请选择系列')
+				}
+
 				if (this.selKt.length == 0) {
 					this.showMissItem = true
 					this.tipTxt = '客厅灯至少选1盏!'
@@ -606,11 +617,7 @@
 					return
 				}
 
-				if (!this.selHx || !this.selXl) {
-					this.showMissItem = true
-					this.tipTxt = '抱歉!参数配置缺失,暂无法预览配置'
-					return
-				}
+
 				if (this.selYt.length == 0 || this.selKt.length == 0 || this.selCt.length == 0 || this.selWs.length == 0 ||
 					!this.selHx || !this.selXl) {
 					this.showMissItem = true

+ 17 - 10
pages/index/customNoMian_step1/index.vue

xqd xqd xqd
@@ -298,14 +298,7 @@
 				this.serTypeList = res.data.series
 				this.chuanglianTypeList = res.data.version
 
-				// this.selHx = res.data.house_type[0]
-				// this.selKj = res.data.space[0]
-				// this.selPp = res.data.brand[0]
-				// this.selXl = res.data.series[0]
-				// this.selBb = res.data.version[0]
-				// this.rule = res.data.rule.content
-
-				// this.getPrice(1, this.selHx.id, this.selKj.id, this.selPp.id, this.selXl.id, this.selBb.id)
+				this.rule = res.data.rule.content
 
 			} else {
 				uni.showToast({
@@ -553,9 +546,22 @@
 					return this.$toast('抱歉!参数配置缺失,暂无法预览配置')
 				}
 
-				if (!(this.selHx && this.selKj && this.selPp && this.selXl && this.selBb)) {
-					return this.$toast('请全部选择后预览配置')
+				if (!this.selHx) {
+					return this.$toast('请选择户型')
+				}
+				if (!this.selKj) {
+					return this.$toast('请选择空间')
+				}
+				if (!this.selPp) {
+					return this.$toast('请选择品牌')
 				}
+				if (!this.selXl) {
+					return this.$toast('请选择系列')
+				}
+				if (!this.selBb) {
+					return this.$toast('请选择版本')
+				}
+
 
 				getApp().selHx = this.selHx
 				getApp().selKj = this.selKj
@@ -586,6 +592,7 @@
 			},
 			goRule() {
 				getApp().content = this.rule
+				console.log('this.rule', this.rule);
 				uni.navigateTo({
 					url: '/pages/index/rule/index?type=noMain'
 				})

+ 7 - 1
pages/index/fullHouseWifi/index.vue

xqd xqd
@@ -56,7 +56,7 @@
 				分享
 			</button>
 
-			<view class="right" v-else @click="showFixInfo=true">
+			<view class="right" v-else @click="confirmConfig">
 				确认配置
 			</view>
 		</view>
@@ -188,6 +188,12 @@
 			}
 		},
 		methods: {
+			confirmConfig() {
+				if (!this.selHx) {
+					return this.$toast('请选择户型')
+				}
+				this.showFixInfo = true
+			},
 			toRule() {
 				getApp().content = this.rule
 				uni.navigateTo({

+ 241 - 0
pages/mall/detail - 副本/index.scss

xqd
@@ -0,0 +1,241 @@
+::v-deep button::after{
+	border: none!important;
+}
+.page{
+	padding-bottom: 208rpx;
+}
+.topImg{
+	width: 100%;
+	height: 850rpx;
+	border-radius: 0 0rpx 0 40rpx;
+	margin-bottom: 56rpx;
+	position: relative;
+	.indicatorBox1{
+					position: absolute;
+					z-index: 3;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					margin-top: 32rpx;
+					margin-bottom: 34rpx;
+					left: 50%;
+					bottom: 20rpx;
+					.indicator1 {
+					       @include flex(row);
+					       justify-content: center;
+							position: absolute;
+							top: 10rpx;
+					       &__dot1 {
+								width: 24rpx;
+								height: 8rpx;
+								border-radius: 4rpx;
+					            margin: 0 8rpx;
+					            transition: background-color 0.3s;				 
+								 background: #D4D4D4;
+								 // border-radius: 10rpx;
+					           &--active1 {
+					                background-color:#E77817;
+									width: 60rpx;
+					            }
+					       }
+					   }
+					   .indicator-num1 {
+					       padding: 2px 0;
+					       background-color: blue;
+					       border-radius: 100px;
+					       width: 35px;
+					       @include flex;
+					       justify-content: center;
+					
+					       &__text1 {
+					            color: red;
+					            font-size: 12px;
+					        }
+					   }
+				}
+}
+
+.cen{
+	position: relative;
+	padding-left: 40rpx;
+	font-size: 36rpx;
+	font-family: PingFang-SC-Bold, PingFang-SC;
+	font-weight: bold;
+	color: #333333;
+	padding-right: 34rpx;
+	
+	padding-bottom: 48rpx;
+	.love{
+		width: 128rpx;
+		height: 128rpx;
+		position: absolute;
+		right:48rpx;
+		top: -115rpx;
+	}
+	.water{
+		width: 714rpx;
+		height: 50rpx;
+		position: absolute;
+		top: -24rpx;
+		left: 0;
+	}
+	.halfC{
+		width: 52rpx;
+		height: 56rpx;
+		position: absolute;
+		top: -18rpx;
+		left:16rpx;
+	}
+	.txtBox{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		.left{
+			
+		}
+		.right{
+			font-size: 24rpx;
+			font-family: PingFang-SC-Medium, PingFang-SC;
+			font-weight: 500;
+			color: #666666;
+			padding-right: 30rpx;
+		}
+	}
+}
+.parmasBox{
+	border-top: 2rpx solid #EAEAEA;
+	// border-bottom: 2rpx solid #EAEAEA;
+	// margin-top: 48rpx;
+	width: 100%;
+	padding: 64rpx 0;
+	.con{
+		padding: 0 32rpx;
+		background: #FFFFFF;
+		margin-top: 0rpx;
+		padding-bottom: 0rpx;
+	
+		.title{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+		.title1{
+			font-size: 32rpx;
+			font-family: PingFang-SC-Bold, PingFang-SC;
+			font-weight: bold;
+			color: #333333;
+			display: flex;
+			// justify-content: space-between;
+			align-items: center;
+			.txt{
+				width: 90%;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+			.add{
+				width: 22rpx;
+			}
+			
+		}
+		.des{
+			margin-top: 64rpx;
+			.title3{
+				
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				// margin-bottom: 24rpx;
+				
+			}
+			.img{
+				margin-top: 24rpx;
+				width: 100%;
+				height: 800rpx;
+			}
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			margin-top: 44rpx;
+			.item{
+				width: 32%;
+				height: 64rpx;
+				border-radius: 4rpx;
+				font-size: 30rpx;
+				font-family: PingFang-SC-Medium, PingFang-SC;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-right: 10rpx;
+				// margin-bottom: 20rpx;
+			}
+			.act{
+				color: #FFFEFE;
+				background: #333333;
+			}
+			.item:nth-of-type(3n){
+				margin-right: 0;
+				}
+		}
+			
+	}
+}
+
+
+.bot{
+	height: 160rpx;
+	background: #FFFFFF;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(0,0,0,0.16);
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	padding: 0 40rpx;
+	.left{
+		display: flex;
+		align-items: center;
+		.price{
+			font-size: 42rpx;
+			font-family: DINAlternate-Bold, DINAlternate;
+			font-weight: bold;
+			color: #333333;
+		}
+		image{
+			width: 23rpx;
+			height: 12rpx;
+			margin-left: 16rpx;
+		}
+	}
+	.right{
+		width: 282rpx;
+		height: 96rpx;
+		background: #333333;
+		border-radius: 4rpx;
+		border: 2rpx solid #333333;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		
+		font-size: 32rpx;
+		font-family: PingFang-SC-Medium, PingFang-SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		margin-right: 96rpx;
+	}
+	
+}
+
+

+ 375 - 0
pages/mall/detail - 副本/index.vue

xqd
@@ -0,0 +1,375 @@
+<template>
+	<view class="">
+		<view class="page">
+			<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'详情'" :back="true" color="black"
+				background="white" />
+			<view class="topImg">
+				<u-swiper type='img' radius="0rpx 0rpx 0rpx 40rpx" :list="bannerList" keyName="image" indicator
+					indicatorMode="line" :autoplay="true" height="850rpx" imgMode="heightFix" circular
+					@change="bannerChange">
+					<view slot="indicator">
+					</view>
+				</u-swiper>
+
+				<view class="indicatorBox1">
+					<view class="indicator1">
+						<view class="indicator1__dot1" style="" v-for="(item, index) in bannerList" :key="index"
+							:class="[index === currentNum ?'indicator1__dot1--active1':'']">
+						</view>
+					</view>
+				</view>
+			</view>
+
+
+			<view class="cen">
+				<image class="water" src="/static/index/water.png" mode=""></image>
+				<image class="halfC" src="/static/index/halfCircle_275.png" mode=""></image>
+				<image class="love" :src="lovePic" mode="" @click="handleCol"></image>
+				<view class="txtBox">
+					<view class="left">
+						{{content.name}}
+					</view>
+					<view class="right">
+						{{totalCount}}人已收藏
+					</view>
+				</view>
+			</view>
+			<!-- 	<view class="parmasBox" v-for="(item,index) in parmsList" v-if="navBarTitle">
+				<view class="con">
+					<view class="title">
+						{{item.title}}
+					</view>
+					<view class="list">
+						<view class="item" v-for="(item1,index1) in item.list" :class="[index1==ids[index]?'act':'']"
+							@click="">
+							{{item1.data}}
+						</view>
+					</view>
+				</view>
+			</view> -->
+			<view class="parmasBox" v-for="(item,index) in parmsList">
+				<view class="con">
+					<view class="title">
+						{{item.title}}
+					</view>
+					<view class="list">
+						<view class="item" v-for="(item1,index1) in item.list" :class="[item1.isSelect?'act':'']"
+							@click="handleSel(item.list,index1,item[index],index)">
+							{{item1.data}}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="parmasBox" style="border-bottom: none;">
+				<view class="con" @click="handleOpenOrClose(1)">
+					<view class="title1">
+						<view class="txt">
+							商品描述
+						</view>
+						<image class="add" :src="addOrLessIcon1" mode="" :style="{height:addOrLessIcon1=='/static/index/shortLine.png'
+						?'2rpx':'22rpx'}"></image>
+					</view>
+					<view class="des" v-if="show1">
+						<u-parse :content="content1"></u-parse>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bot">
+			<view class="left">
+				<view class="price">
+					¥{{totalPrice.toFixed(2)}}
+				</view>
+				<image src="/static/index/arrDown.png" mode=""></image>
+			</view>
+			<button open-type="share" class="right">
+				一键下单
+			</button>
+			<!-- 	<view class="right" @click="testShare">
+				分享
+			</view> -->
+		</view>
+	</view>
+	</view>
+
+</template>
+
+<script>
+	import {
+		addCollReq,
+		cancelCollReq,
+		getGoodsPriceReq,
+		getMyGoodsDetailReq,
+	} from '@/api/test/index.js'
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				currIndex1: 0,
+
+				currentNum: 0,
+				show1: false,
+				addOrLessIcon1: '/static/index/add.png',
+
+				lovePic: '',
+
+				content: null,
+
+				picBase: this.$picBase,
+				bannerList: [],
+				parmsList: [],
+				content1: '',
+
+				parmsObj: {},
+
+				checkFullSel1: [],
+				checkFullSel: 0,
+				totalPrice: 0,
+
+				totalCount: 0,
+
+				navBarTitle: '',
+				ids: [],
+				cutdownRatio: 1
+			}
+		},
+		async onLoad(o) {
+			// o.id = 20
+			if (o.id) {
+				// this.ids = JSON.parse(o.ids)
+				this.navBarTitle = '首页'
+				let res = await getMyGoodsDetailReq({
+					id: o.id
+				})
+				if (res.code == 0) {
+					console.log('回显商城详情返回值: ', res);
+					this.content = res.data
+					this.bannerList = res.data.images
+					this.parmsList = res.data.skuParams
+					this.totalCount = res.data.collect_total_count
+
+					this.content1 = res.data.content
+					if (this.content.isCollect) {
+						this.lovePic = "/static/mall/love.png"
+					} else {
+						this.lovePic = "/static/mall/no_love.png"
+					}
+					this.parmsList.forEach((item, index) => {
+						this.parmsObj[item.title] = null
+						this.checkFullSel1.push(0)
+
+					})
+
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			} else {
+				let res = await getMyGoodsDetailReq({
+					id: getApp().mallItem.id
+				})
+				if (res.code == 0) {
+					console.log('进入详情返回值', res);
+					this.content = res.data
+					this.bannerList = res.data.images
+					this.parmsList = res.data.skuParams
+					this.totalCount = res.data.collect_total_count
+
+					this.content1 = res.data.content
+					if (this.content.isCollect) {
+						this.lovePic = "/static/mall/love.png"
+					} else {
+						this.lovePic = "/static/mall/no_love.png"
+					}
+					this.parmsList.forEach((item, index) => {
+						this.parmsObj[item.title] = null
+						this.checkFullSel1.push(0)
+
+					})
+
+
+
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+
+				// this.content = getApp().mallItem
+				// this.bannerList = getApp().mallItem.images
+
+
+				// this.parmsList = getApp().mallItem.skuParams
+				// this.totalCount = this.content.collect_total_count
+
+				// this.parmsList.forEach((item, index) => {
+				// 	this.parmsObj[item.title] = null
+				// 	this.checkFullSel1.push(0)
+
+				// })
+
+				// this.content1 = getApp().mallItem.content
+
+				// if (this.content.isCollect) {
+				// 	this.lovePic = "/static/mall/love.png"
+				// } else {
+				// 	this.lovePic = "/static/mall/no_love.png"
+				// }
+			}
+		},
+
+		watch: {
+			checkFullSel: {
+				async handler(n, o) {
+					let res = this.checkFullSel1.every((item, index) => {
+						return item == 1
+					})
+					if (res) {
+						let parms = []
+						Object.keys(this.parmsObj).forEach((item4, index8) => {
+							parms.push(this.parmsObj[item4])
+						})
+						console.log(parms);
+						let res = await getGoodsPriceReq({
+							goods_id: this.content.id,
+							stock: parms
+						})
+						if (res.code == 0) {
+							console.log(res);
+
+							this.totalPrice = res.data * this.cutdownRatio
+						} else {
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+						}
+					}
+
+				},
+			}
+		},
+		onShow() {
+			this.cutdownRatio = this.$getCutDown()
+		},
+		onShareAppMessage(params) {
+			let ids = []
+			this.parmsList.forEach((item, index) => {
+				item.list.forEach((item1, index1) => {
+					if (item1.isSelect) {
+						ids.push(index1)
+					}
+				})
+			})
+			console.log('选中的二维iindex数组', ids);
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.content.name,
+					imageUrl: this.$picBase + this.content.cover,
+					path: '/pages/mall/detail/index?id=' + this.content.id + '&ids=' + JSON.stringify(ids),
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
+			}
+		},
+		methods: {
+			testShare() {
+				console.log('parmsList', this.parmsList);
+				let ids = []
+				this.parmsList.forEach((item, index) => {
+					item.list.forEach((item1, index1) => {
+						if (item1.isSelect) {
+							ids.push(index1)
+						}
+					})
+				})
+
+				console.log('选中的二维iindex数组', ids);
+			},
+			handleSel(item, index1, outer, pindex) {
+				console.log('this.checkFullSel1', this.checkFullSel1);
+
+				this.checkFullSel = Date.now()
+				item.forEach(async (item2, index) => {
+					item2.isSelect = 0
+					if (index == index1) {
+						item[index1].isSelect = 1
+
+						this.parmsObj[item[index1].title] = {
+							classify: item[index1].title,
+							value: item[index1].data
+						}
+						this.checkFullSel1[pindex] = 1
+					}
+				})
+				console.log('this.parmsObj', this.parmsObj);
+			},
+			bannerChange(e) {
+				this.currentNum = e.current
+			},
+			async handleCol() {
+				if (this.lovePic == "/static/mall/no_love.png") {
+					let res = await addCollReq({
+						id: this.content.id,
+					})
+					if (res.code == 0) {
+						console.log('添加收藏返回值: ', res);
+						this.$toast('收藏成功')
+						this.totalCount += 1
+						if (this.lovePic == "/static/mall/love.png") {
+							this.lovePic = "/static/mall/no_love.png"
+						} else {
+							this.lovePic = "/static/mall/love.png"
+						}
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				} else {
+					let res = await cancelCollReq({
+						id: this.content.id,
+					})
+					if (res.code == 0) {
+						console.log('取消收藏返回值: ', res);
+						this.$toast('取消收藏成功')
+						this.totalCount -= 1
+						if (this.lovePic == "/static/mall/love.png") {
+							this.lovePic = "/static/mall/no_love.png"
+						} else {
+							this.lovePic = "/static/mall/love.png"
+						}
+					} else {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+				}
+
+			},
+
+			handleOpenOrClose(i) {
+				if (this['addOrLessIcon' + i] == '/static/index/shortLine.png') {
+					this['addOrLessIcon' + i] = '/static/index/add.png'
+					this['show' + i] = false
+				} else if (this['addOrLessIcon' + i] == '/static/index/add.png') {
+					this['addOrLessIcon' + i] = '/static/index/shortLine.png'
+					this['show' + i] = true
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

+ 84 - 93
pages/mall/detail/index.vue

xqd xqd xqd xqd xqd xqd
@@ -47,15 +47,16 @@
 					</view>
 				</view>
 			</view> -->
-			<view class="parmasBox" v-for="(item,index) in parmsList">
+			<view class="parmasBox" v-for="(item,index) in Object.keys(skuParams.attrs)">
 				<view class="con">
 					<view class="title">
-						{{item.title}}
+						{{item}}
 					</view>
 					<view class="list">
-						<view class="item" v-for="(item1,index1) in item.list" :class="[item1.isSelect?'act':'']"
-							@click="handleSel(item.list,index1,item[index],index)">
-							{{item1.data}}
+						<view class="item" @click="handleC(item,index,item1)"
+							v-for="(item1,index1) in skuParams.attrs[item]"
+							:class="[item1==saveCheckedObj[item]?'act':'']">
+							{{item1}}
 						</view>
 					</view>
 				</view>
@@ -79,7 +80,7 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					¥{{totalPrice.toFixed(2)}}
+					¥{{Number( totalPrice).toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -121,24 +122,29 @@
 
 				picBase: this.$picBase,
 				bannerList: [],
-				parmsList: [],
 				content1: '',
 
-				parmsObj: {},
-
-				checkFullSel1: [],
-				checkFullSel: 0,
 				totalPrice: 0,
 
 				totalCount: 0,
 
 				navBarTitle: '',
 				ids: [],
-				cutdownRatio: 1
+				cutdownRatio: 1,
+
+				// sku
+				skuParams: {
+					"attrs": {},
+					"sku": []
+				},
+				saveCheckedObj: null,
+				fullCheckArr: [],
+				watchValue: null,
+				conditions: [],
 			}
 		},
 		async onLoad(o) {
-			// o.id = 20
+			// o.id = 17
 			if (o.id) {
 				// this.ids = JSON.parse(o.ids)
 				this.navBarTitle = '首页'
@@ -147,23 +153,35 @@
 				})
 				if (res.code == 0) {
 					console.log('回显商城详情返回值: ', res);
+
+					this.skuParams = res.data.sku_params
+					// 动态生成判断条件对象数组
+					let c = []
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						c.push({
+							key: item,
+							value: null
+						})
+					})
+					this.conditions = c
+					// 动态生成用于判断选中激活项的对象
+					let saveCheckedObj = {}
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						saveCheckedObj[item] = null
+					})
+					this.saveCheckedObj = saveCheckedObj
+					// 动态生成用于判断sku参数是否全部选中的中间数组
+					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
+
 					this.content = res.data
 					this.bannerList = res.data.images
-					this.parmsList = res.data.skuParams
 					this.totalCount = res.data.collect_total_count
-
 					this.content1 = res.data.content
 					if (this.content.isCollect) {
 						this.lovePic = "/static/mall/love.png"
 					} else {
 						this.lovePic = "/static/mall/no_love.png"
 					}
-					this.parmsList.forEach((item, index) => {
-						this.parmsObj[item.title] = null
-						this.checkFullSel1.push(0)
-
-					})
-
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -176,84 +194,61 @@
 				})
 				if (res.code == 0) {
 					console.log('进入详情返回值', res);
+					this.skuParams = res.data.sku_params
+					// 动态生成判断条件对象数组
+					let c = []
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						c.push({
+							key: item,
+							value: null
+						})
+					})
+					this.conditions = c
+					// 动态生成用于判断选中激活项的对象
+					let saveCheckedObj = {}
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						saveCheckedObj[item] = null
+					})
+					this.saveCheckedObj = saveCheckedObj
+					// 动态生成用于判断sku参数是否全部选中的中间数组
+					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
+
+
 					this.content = res.data
 					this.bannerList = res.data.images
-					this.parmsList = res.data.skuParams
 					this.totalCount = res.data.collect_total_count
-
 					this.content1 = res.data.content
 					if (this.content.isCollect) {
 						this.lovePic = "/static/mall/love.png"
 					} else {
 						this.lovePic = "/static/mall/no_love.png"
 					}
-					this.parmsList.forEach((item, index) => {
-						this.parmsObj[item.title] = null
-						this.checkFullSel1.push(0)
-
-					})
-
-
-
 				} else {
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
 				}
-
-				// this.content = getApp().mallItem
-				// this.bannerList = getApp().mallItem.images
-
-
-				// this.parmsList = getApp().mallItem.skuParams
-				// this.totalCount = this.content.collect_total_count
-
-				// this.parmsList.forEach((item, index) => {
-				// 	this.parmsObj[item.title] = null
-				// 	this.checkFullSel1.push(0)
-
-				// })
-
-				// this.content1 = getApp().mallItem.content
-
-				// if (this.content.isCollect) {
-				// 	this.lovePic = "/static/mall/love.png"
-				// } else {
-				// 	this.lovePic = "/static/mall/no_love.png"
-				// }
 			}
 		},
 
 		watch: {
-			checkFullSel: {
-				async handler(n, o) {
-					let res = this.checkFullSel1.every((item, index) => {
-						return item == 1
-					})
-					if (res) {
-						let parms = []
-						Object.keys(this.parmsObj).forEach((item4, index8) => {
-							parms.push(this.parmsObj[item4])
-						})
-						console.log(parms);
-						let res = await getGoodsPriceReq({
-							goods_id: this.content.id,
-							stock: parms
-						})
-						if (res.code == 0) {
-							console.log(res);
-
-							this.totalPrice = res.data * this.cutdownRatio
-						} else {
-							uni.showToast({
-								title: res.message,
-								icon: 'none'
-							})
-						}
-					}
-
-				},
+			watchValue(n, o) {
+				let showPrice = this.fullCheckArr.every((item, index) => {
+					return item == 1
+				})
+				if (showPrice) {
+					const filterResult = this.skuParams.sku.filter(item => {
+						return this.conditions.every(condition => {
+							const attrValues = this.skuParams.attrs[condition.key];
+							return attrValues.includes(item[condition.key]) && item[condition.key] ===
+								condition.value;
+						});
+					});
+
+					this.totalPrice = filterResult[0].price
+					// console.log('所求价格:', filterResult[0].price);
+				}
 			}
 		},
 		onShow() {
@@ -293,23 +288,19 @@
 
 				console.log('选中的二维iindex数组', ids);
 			},
-			handleSel(item, index1, outer, pindex) {
-				console.log('this.checkFullSel1', this.checkFullSel1);
+			handleC(item, index, item1) {
+				this.fullCheckArr[index] = 1
 
-				this.checkFullSel = Date.now()
-				item.forEach(async (item2, index) => {
-					item2.isSelect = 0
-					if (index == index1) {
-						item[index1].isSelect = 1
+				// 声东击西强行触发监听
+				this.watchValue = Date.now()
+				this.saveCheckedObj[item] = item1
 
-						this.parmsObj[item[index1].title] = {
-							classify: item[index1].title,
-							value: item[index1].data
-						}
-						this.checkFullSel1[pindex] = 1
+				//此处个条件对象数组条件赋值(key==外围数组key)
+				this.conditions.forEach((item2, index2) => {
+					if (item2.key == item) {
+						item2.value = item1
 					}
 				})
-				console.log('this.parmsObj', this.parmsObj);
 			},
 			bannerChange(e) {
 				this.currentNum = e.current

+ 83 - 70
pages/my/actGoodsDetail/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -85,15 +85,15 @@
 				</view>
 			</view>
 		</view> -->
-		<view class="parmasBox" v-for="(item,index) in parmsList" :key="index">
+		<view class="parmasBox" v-for="(item,index) in Object.keys(skuParams.attrs)">
 			<view class="con">
 				<view class="title">
-					{{item.title}}
+					{{item}}
 				</view>
 				<view class="list">
-					<view class="item" v-for="(item1,index1) in item.list" :class="[item1.isSelect?'act':'']"
-						@click="handleSel(item.list,index1,item[index],index)" :key="index1">
-						{{item1.data}}
+					<view class="item" @click="handleC(item,index,item1)"
+						v-for="(item1,index1) in skuParams.attrs[item]" :class="[item1==saveCheckedObj[item]?'act':'']">
+						{{item1}}
 					</view>
 				</view>
 			</view>
@@ -118,7 +118,7 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					¥{{totalPrice.toFixed(2)}}
+					¥{{Number( totalPrice).toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -165,10 +165,6 @@
 				isSellBack: true,
 				content1: '',
 
-				parmsList: [],
-
-				checkFullSel1: [],
-				checkFullSel: 0,
 				totalPrice: 0,
 				parmsObj: {},
 
@@ -178,7 +174,16 @@
 
 				navBarTitle: '',
 				ids: [],
-				cutdownRatio: 1
+				cutdownRatio: 1,
+				// sku
+				skuParams: {
+					"attrs": {},
+					"sku": []
+				},
+				saveCheckedObj: null,
+				fullCheckArr: [],
+				watchValue: null,
+				conditions: [],
 			}
 		},
 		async onLoad(o) {
@@ -191,10 +196,28 @@
 				})
 				if (res.code == 0) {
 					console.log('换新商品或活动商品详情返回值: ', res);
+					this.skuParams = res.data.sku_params
+					// 动态生成判断条件对象数组
+					let c = []
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						c.push({
+							key: item,
+							value: null
+						})
+					})
+					this.conditions = c
+					// 动态生成用于判断选中激活项的对象
+					let saveCheckedObj = {}
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						saveCheckedObj[item] = null
+					})
+					this.saveCheckedObj = saveCheckedObj
+					// 动态生成用于判断sku参数是否全部选中的中间数组
+					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
+
 
 					this.content = res.data
 					this.bannerList = res.data.images
-					this.parmsList = res.data.skuParams
 					this.totalCount = res.data.collect_total_count
 
 
@@ -211,13 +234,6 @@
 
 						this.handleRemianTime(this.actData[0].date)
 					}
-					this.parmsList = res.data.skuParams
-
-					this.parmsList.forEach((item, index) => {
-						this.parmsObj[item.title] = null
-						this.checkFullSel1.push(0)
-
-					})
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -226,6 +242,27 @@
 				}
 			} else {
 				this.content = getApp().mallItem
+
+				this.skuParams = getApp().mallItem.sku_params
+				// 动态生成判断条件对象数组
+				let c = []
+				Object.keys(this.skuParams.attrs).forEach((item, index) => {
+					c.push({
+						key: item,
+						value: null
+					})
+				})
+				this.conditions = c
+				// 动态生成用于判断选中激活项的对象
+				let saveCheckedObj = {}
+				Object.keys(this.skuParams.attrs).forEach((item, index) => {
+					saveCheckedObj[item] = null
+				})
+				this.saveCheckedObj = saveCheckedObj
+				// 动态生成用于判断sku参数是否全部选中的中间数组
+				this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
+
+
 				this.bannerList = getApp().mallItem.images
 				this.totalCount = this.content.collect_total_count
 
@@ -239,15 +276,6 @@
 
 				this.content1 = getApp().mallItem.content
 
-				this.parmsList = getApp().mallItem.skuParams
-
-				this.parmsList.forEach((item, index) => {
-					this.parmsObj[item.title] = null
-					this.checkFullSel1.push(0)
-
-				})
-
-
 				if (getApp().isSellBack) {
 					this.actData = getApp().mallItem.activity_data
 
@@ -281,34 +309,22 @@
 			}
 		},
 		watch: {
-			checkFullSel: {
-				async handler(n, o) {
-					let res = this.checkFullSel1.every((item, index) => {
-						return item == 1
-					})
-					if (res) {
-						let parms = []
-						Object.keys(this.parmsObj).forEach((item4, index8) => {
-							parms.push(this.parmsObj[item4])
-						})
-						console.log(parms);
-						let res = await getGoodsPriceReq({
-							goods_id: this.content.id,
-							stock: parms
-						})
-						if (res.code == 0) {
-							console.log(res);
-
-							this.totalPrice = res.data * this.cutdownRatio
-						} else {
-							uni.showToast({
-								title: res.message,
-								icon: 'none'
-							})
-						}
-					}
-
-				},
+			watchValue(n, o) {
+				let showPrice = this.fullCheckArr.every((item, index) => {
+					return item == 1
+				})
+				if (showPrice) {
+					const filterResult = this.skuParams.sku.filter(item => {
+						return this.conditions.every(condition => {
+							const attrValues = this.skuParams.attrs[condition.key];
+							return attrValues.includes(item[condition.key]) && item[condition.key] ===
+								condition.value;
+						});
+					});
+
+					this.totalPrice = filterResult[0].price
+					// console.log('所求价格:', filterResult[0].price);
+				}
 			}
 		},
 		methods: {
@@ -320,20 +336,17 @@
 			onChange(e) {
 				this.timeData = e
 			},
-			handleSel(item, index1, outer, pindex) {
-				console.log('this.checkFullSel1', this.checkFullSel1);
-
-				this.checkFullSel = Date.now()
-				item.forEach(async (item2, index) => {
-					item2.isSelect = 0
-					if (index == index1) {
-						item[index1].isSelect = 1
-
-						this.parmsObj[item[index1].title] = {
-							classify: item[index1].title,
-							value: item[index1].data
-						}
-						this.checkFullSel1[pindex] = 1
+			handleC(item, index, item1) {
+				this.fullCheckArr[index] = 1
+
+				// 声东击西强行触发监听
+				this.watchValue = Date.now()
+				this.saveCheckedObj[item] = item1
+
+				//此处个条件对象数组条件赋值(key==外围数组key)
+				this.conditions.forEach((item2, index2) => {
+					if (item2.key == item) {
+						item2.value = item1
 					}
 				})
 			},

+ 85 - 69
pages/my/collectDetail/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -47,15 +47,16 @@
 					</view>
 				</view>
 			</view> -->
-			<view class="parmasBox" v-for="(item,index) in parmsList" :key="index">
+			<view class="parmasBox" v-for="(item,index) in Object.keys(skuParams.attrs)">
 				<view class="con">
 					<view class="title">
-						{{item.title}}
+						{{item}}
 					</view>
 					<view class="list">
-						<view class="item" v-for="(item1,index1) in item.list" :class="[item1.isSelect?'act':'']"
-							@click="handleSel(item.list,index1,item[index],index)" :key="index1">
-							{{item1.data}}
+						<view class="item" @click="handleC(item,index,item1)"
+							v-for="(item1,index1) in skuParams.attrs[item]"
+							:class="[item1==saveCheckedObj[item]?'act':'']">
+							{{item1}}
 						</view>
 					</view>
 				</view>
@@ -80,7 +81,7 @@
 		<view class="bot">
 			<view class="left">
 				<view class="price">
-					¥{{totalPrice.toFixed(2)}}
+					¥{{Number( totalPrice).toFixed(2)}}
 				</view>
 				<image src="/static/index/arrDown.png" mode=""></image>
 			</view>
@@ -125,20 +126,25 @@
 				totalCount: 0,
 				content1: '',
 
-				parmsList: [],
-
-				checkFullSel1: [],
-				checkFullSel: 0,
 				totalPrice: 0,
-				parmsObj: {},
 
 				navBarTitle: '',
 				ids: [],
-				cutdownRatio: 1
+				cutdownRatio: 1,
+
+				// sku
+				skuParams: {
+					"attrs": {},
+					"sku": []
+				},
+				saveCheckedObj: null,
+				fullCheckArr: [],
+				watchValue: null,
+				conditions: [],
 			}
 		},
 		async onLoad(o) {
-			// o.id = 23
+			// o.id = 17
 			if (o.id) {
 				// this.ids = JSON.parse(o.ids)
 				this.navBarTitle = '首页'
@@ -147,6 +153,28 @@
 				})
 				if (res.code == 0) {
 					console.log('我的收藏详情', res);
+
+					this.skuParams = res.data.sku_params
+					// 动态生成判断条件对象数组
+					let c = []
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						c.push({
+							key: item,
+							value: null
+						})
+					})
+					this.conditions = c
+					// 动态生成用于判断选中激活项的对象
+					let saveCheckedObj = {}
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						saveCheckedObj[item] = null
+					})
+					this.saveCheckedObj = saveCheckedObj
+					// 动态生成用于判断sku参数是否全部选中的中间数组
+					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
+
+
+
 					this.content = res.data
 					this.bannerList = this.content.images
 					this.totalCount = this.content.collect_total_count
@@ -158,15 +186,6 @@
 					}
 
 					this.content1 = this.content.content
-
-					this.parmsList = this.content.skuParams
-
-					this.parmsList.forEach((item, index) => {
-						this.parmsObj[item.title] = null
-						this.checkFullSel1.push(0)
-
-					})
-
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -179,6 +198,26 @@
 				})
 				if (res.code == 0) {
 					console.log('我的收藏详情', res);
+					this.skuParams = res.data.sku_params
+					// 动态生成判断条件对象数组
+					let c = []
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						c.push({
+							key: item,
+							value: null
+						})
+					})
+					this.conditions = c
+					// 动态生成用于判断选中激活项的对象
+					let saveCheckedObj = {}
+					Object.keys(this.skuParams.attrs).forEach((item, index) => {
+						saveCheckedObj[item] = null
+					})
+					this.saveCheckedObj = saveCheckedObj
+					// 动态生成用于判断sku参数是否全部选中的中间数组
+					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
+
+
 					this.content = res.data
 					this.bannerList = this.content.images
 					this.totalCount = this.content.collect_total_count
@@ -191,14 +230,6 @@
 
 					this.content1 = this.content.content
 
-					this.parmsList = this.content.skuParams
-
-					this.parmsList.forEach((item, index) => {
-						this.parmsObj[item.title] = null
-						this.checkFullSel1.push(0)
-
-					})
-
 				} else {
 					uni.showToast({
 						title: res.message,
@@ -231,51 +262,36 @@
 			}
 		},
 		watch: {
-			checkFullSel: {
-				async handler(n, o) {
-					let res = this.checkFullSel1.every((item, index) => {
-						return item == 1
-					})
-					if (res) {
-						let parms = []
-						Object.keys(this.parmsObj).forEach((item4, index8) => {
-							parms.push(this.parmsObj[item4])
-						})
-						console.log(parms);
-						let res = await getGoodsPriceReq({
-							goods_id: this.content.id,
-							stock: parms
-						})
-						if (res.code == 0) {
-							console.log(res);
-
-							this.totalPrice = res.data * this.cutdownRatio
-						} else {
-							uni.showToast({
-								title: res.message,
-								icon: 'none'
-							})
-						}
-					}
+			watchValue(n, o) {
+				let showPrice = this.fullCheckArr.every((item, index) => {
+					return item == 1
+				})
+				if (showPrice) {
+					const filterResult = this.skuParams.sku.filter(item => {
+						return this.conditions.every(condition => {
+							const attrValues = this.skuParams.attrs[condition.key];
+							return attrValues.includes(item[condition.key]) && item[condition.key] ===
+								condition.value;
+						});
+					});
 
-				},
+					this.totalPrice = filterResult[0].price
+					// console.log('所求价格:', filterResult[0].price);
+				}
 			}
 		},
 		methods: {
-			handleSel(item, index1, outer, pindex) {
-				console.log('this.checkFullSel1', this.checkFullSel1);
+			handleC(item, index, item1) {
+				this.fullCheckArr[index] = 1
 
-				this.checkFullSel = Date.now()
-				item.forEach(async (item2, index) => {
-					item2.isSelect = 0
-					if (index == index1) {
-						item[index1].isSelect = 1
+				// 声东击西强行触发监听
+				this.watchValue = Date.now()
+				this.saveCheckedObj[item] = item1
 
-						this.parmsObj[item[index1].title] = {
-							classify: item[index1].title,
-							value: item[index1].data
-						}
-						this.checkFullSel1[pindex] = 1
+				//此处个条件对象数组条件赋值(key==外围数组key)
+				this.conditions.forEach((item2, index2) => {
+					if (item2.key == item) {
+						item2.value = item1
 					}
 				})
 			},

+ 4 - 0
pages/my/useLead/index.scss

xqd
@@ -1,3 +1,7 @@
+::v-deep button::after{
+	border: none!important;
+}
+
 .page{
 	padding-bottom: 160rpx;
 }

+ 41 - 12
pages/my/useLead/index.vue

xqd xqd xqd
@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
-		<navBar title="小程序使用指南" :back="true" color="black" background="white" />
+		<navBar :backType="navBarTitle" :title="navBarTitle?navBarTitle:'小程序使用指南'" :back="true" color="black"
+			background="white" />
 
 		<view class="content">
 			<view class="title">
@@ -12,10 +13,10 @@
 			<image :src="picBase+content.image" mode=""></image>
 		</view>
 
-		<view class="btnBox">
-			<view class="rBtn">
+		<view class="btnBox" v-if="showBtn">
+			<button open-type="share" class="rBtn">
 				一键分享
-			</view>
+			</button>
 		</view>
 	</view>
 </template>
@@ -32,18 +33,46 @@
 		data() {
 			return {
 				picBase: this.$picBase,
-				content: null
+				content: null,
+				navBarTitle: '',
+				showBtn: true,
 			}
 		},
 		async onLoad(o) {
-			let res = await getUserGuideReq()
-			if (res.code == 0) {
-				this.content = res.data
+			// o.id = 16
+			if (o.id) {
+				this.showBtn = false
+				this.navBarTitle = '首页'
+				let res = await getUserGuideReq()
+				if (res.code == 0) {
+					this.content = res.data
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
 			} else {
-				uni.showToast({
-					title: res.message,
-					icon: 'none'
-				})
+				let res = await getUserGuideReq()
+				if (res.code == 0) {
+					this.content = res.data
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			}
+		},
+		onShareAppMessage(params) {
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.content.title,
+					imageUrl: this.$picBase + this.content.image,
+					path: '/pages/my/useLead/index?id=' + this.content.id,
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
 			}
 		},
 		methods: {

+ 0 - 4
unpackage/dist/build/mp-weixin/app.js

xqd
@@ -1,4 +0,0 @@
-
-require('./common/runtime.js')
-require('./common/vendor.js')
-require('./common/main.js')

+ 0 - 157
unpackage/dist/build/mp-weixin/app.json

xqd
@@ -1,157 +0,0 @@
-{
-  "pages": [
-    "pages/index",
-    "pages/mall",
-    "pages/service",
-    "pages/my",
-    "pages/map/index",
-    "pages/qrPage/index",
-    "pages/test/index",
-    "pages/privicyPopup/index"
-  ],
-  "subPackages": [
-    {
-      "root": "pages/index",
-      "pages": [
-        "customMian_step1/index",
-        "customNoMian_step1/index",
-        "customNoMian_step2/index",
-        "customMian/index",
-        "mainDetail/index",
-        "customNoMain/index",
-        "productLead/index",
-        "fullHouseWifi/index",
-        "fullHouseWifi_step2/index",
-        "aiControlSys/index",
-        "rule/index",
-        "mainList/index",
-        "productLeadDetail/index",
-        "aiControlSys_step2/index"
-      ]
-    },
-    {
-      "root": "pages/mall",
-      "pages": [
-        "detail/index",
-        "pickKeting/index",
-        "goodsList/index"
-      ]
-    },
-    {
-      "root": "pages/service",
-      "pages": [
-        "detail/index"
-      ]
-    },
-    {
-      "root": "pages/my",
-      "pages": [
-        "actGoods/index",
-        "actGoodsDetail/index",
-        "chapinShip/index",
-        "collect/index",
-        "useLead/index",
-        "feedBack/index",
-        "userInfo/index",
-        "set/index",
-        "sellAfter/index",
-        "otherInfo/index",
-        "sellAfterDefer/index",
-        "sellAfterCon/index",
-        "inviteDetail/index",
-        "collectDetail/index",
-        "changeNewStep/index",
-        "changeNewGoods/index",
-        "aboutMe/index",
-        "protocol/index",
-        "duijiang/index"
-      ]
-    }
-  ],
-  "window": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "uni-app",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-    "navigationStyle": "custom"
-  },
-  "tabBar": {
-    "color": "#CBC8C7",
-    "selectedColor": "#F7790C",
-    "borderStyle": "black",
-    "backgroundColor": "#fff",
-    "fontSize": "22rpx",
-    "spacing": "5px",
-    "height": "50px",
-    "iconfontSrc": "static/fonts/iconfont.ttf",
-    "list": [
-      {
-        "pagePath": "pages/index",
-        "text": "首页",
-        "iconPath": "static/tabbar/index.png",
-        "selectedIconPath": "static/tabbar/index_a.png",
-        "iconfont": {
-          "text": "",
-          "selectedText": "",
-          "fontSize": "17px",
-          "color": "#333",
-          "selectedColor": "red"
-        }
-      },
-      {
-        "pagePath": "pages/mall",
-        "text": "商城",
-        "iconPath": "static/tabbar/mall.png",
-        "selectedIconPath": "static/tabbar/mall_a.png",
-        "iconfont": {
-          "text": "",
-          "selectedText": "",
-          "fontSize": "17px",
-          "color": "#333",
-          "selectedColor": "red"
-        }
-      },
-      {
-        "pagePath": "pages/service",
-        "text": "服务",
-        "iconPath": "static/tabbar/service.png",
-        "selectedIconPath": "static/tabbar/service_a.png",
-        "iconfont": {
-          "text": "",
-          "selectedText": "",
-          "fontSize": "17px",
-          "color": "#333",
-          "selectedColor": "red"
-        }
-      },
-      {
-        "pagePath": "pages/my",
-        "text": "我的",
-        "iconPath": "static/tabbar/my.png",
-        "selectedIconPath": "static/tabbar/my_a.png",
-        "iconfont": {
-          "text": "",
-          "selectedText": "",
-          "fontSize": "17px",
-          "color": "#333",
-          "selectedColor": "red"
-        }
-      }
-    ]
-  },
-  "permission": {
-    "scope.userLocation": {
-      "desc": "用于小程序使用中为您提供位置信息"
-    }
-  },
-  "requiredPrivateInfos": [
-    "getLocation",
-    "choosePoi",
-    "chooseAddress",
-    "chooseLocation"
-  ],
-  "usingComponents": {
-    "nav-bar": "/components/navBar/index",
-    "dpopup": "/components/popup/index"
-  }
-}

+ 0 - 3
unpackage/dist/build/mp-weixin/app.wxss

xqd
@@ -1,3 +0,0 @@
-@import './common/main.wxss';
-
-[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.js


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/common/main.wxss


ファイルの差分が大きいため隠しています
+ 0 - 2
unpackage/dist/build/mp-weixin/common/runtime.js


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


+ 0 - 10
unpackage/dist/build/mp-weixin/components/navBar/index.js

xqd
@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/navBar/index"],{"01e6":function(t,n,e){"use strict";e.r(n);var i=e("42f5"),a=e("dc70");for(var u in a)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return a[t]}))}(u);e("1ebb");var o=e("f0c5"),r=Object(o["a"])(a["default"],i["b"],i["c"],!1,null,"3ee39edc",null,!1,i["a"],void 0);n["default"]=r.exports},"1ebb":function(t,n,e){"use strict";var i=e("5b9d"),a=e.n(i);a.a},"42f5":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(){return i}));var i={uniIcons:function(){return Promise.all([e.e("common/vendor"),e.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(e.bind(null,"3773"))}},a=function(){var t=this.$createElement,n=(this._self._c,this.title?this.title.replace("true",""):null);this.$mp.data=Object.assign({},{$root:{g0:n}})},u=[]},"5b9d":function(t,n,e){},da93:function(t,n,e){"use strict";(function(t){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var e={data:function(){return{statusBarHeight:20,navBareight:45,windowWidth:375}},props:{backType:{type:String,default:""},navImg:{type:String,default:""},flex:{type:String,default:"left"},title:{type:String,default:" "},color:{type:String,default:"#fff"},background:{type:String,default:"transparent"},back:{type:Boolean,default:!1}},created:function(){var n=t.getSystemInfoSync(),e=n.statusBarHeight,i=n.windowWidth;this.statusBarHeight=e,this.windowWidth=i;var a=t.getMenuButtonBoundingClientRect(),u=a.top,o=a.bottom,r=a.left;this.navBareight=o-e+(u-e),this.windowWidth=r},methods:{onBack:function(){this.backType?t.switchTab({url:"/pages/index"}):(this.$emit("onBack"),t.navigateBack({delta:1}))}}};n.default=e}).call(this,e("543d")["default"])},dc70:function(t,n,e){"use strict";e.r(n);var i=e("da93"),a=e.n(i);for(var u in i)["default"].indexOf(u)<0&&function(t){e.d(n,t,(function(){return i[t]}))}(u);n["default"]=a.a}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'components/navBar/index-create-component',
-    {
-        'components/navBar/index-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("01e6"))
-        })
-    },
-    [['components/navBar/index-create-component']]
-]);

+ 0 - 6
unpackage/dist/build/mp-weixin/components/navBar/index.json

xqd
@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  },
-  "component": true
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/components/navBar/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="navbar data-v-3ee39edc" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'+('background:'+(background)+';')}}"><view class="narbar-flexd data-v-3ee39edc" style="{{'background:'+(background)+';'}}"><view style="{{'height:'+(statusBarHeight+'px')+';'}}" class="data-v-3ee39edc"></view><view class="narbar-content data-v-3ee39edc" style="{{'height:'+(navBareight+'px')+';'+('justify-content:'+(flex=='cen'?'center':'')+';')}}"><block wx:if="{{back}}"><view data-event-opts="{{[['tap',[['onBack',['$event']]]]]}}" class="left data-v-3ee39edc" style="{{'color:'+(color)+';'+('padding-top:'+(paddingTop)+';')}}" bindtap="__e"><uni-icons vue-id="3a6d4f98-1" type="arrowleft" size="25" color="{{color}}" class="data-v-3ee39edc" bind:__l="__l"></uni-icons></view></block><block wx:if="{{!back&&navImg}}"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="left data-v-3ee39edc" bindtap="__e"><image style="width:40rpx;height:40rpx;margin-right:8rpx;" showLoading="{{true}}" src="{{navImg}}" data-event-opts="{{[['tap',[['',['$event']]]]]}}" bindtap="__e" class="data-v-3ee39edc"></image></view></block><block wx:if="{{title}}"><view class="title data-v-3ee39edc" style="{{'color:'+(color)+';'}}">{{''+$root.g0+''}}</view></block></view></view><view class="navHeight data-v-3ee39edc" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'}}"></view></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/components/navBar/index.wxss

xqd
@@ -1 +0,0 @@
-.navbar.data-v-3ee39edc{background:green;position:relative}.navbar .narbar-flexd.data-v-3ee39edc{background:green;position:fixed;top:0;left:0;z-index:99;width:100%}.navbar .narbar-flexd .narbar-content.data-v-3ee39edc{padding:0 40rpx;display:flex;box-sizing:border-box;align-items:center}.navbar .narbar-flexd .narbar-content .left.data-v-3ee39edc{font-weight:600;display:flex;align-items:center}.navbar .narbar-flexd .narbar-content .title.data-v-3ee39edc{font-size:16px;color:#fff;font-weight:600}.navbar .navHeight.data-v-3ee39edc{height:60px}

+ 0 - 10
unpackage/dist/build/mp-weixin/components/popup/index.js

xqd
@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/popup/index"],{"1d23":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={props:["show","mode","round","dtitle"],methods:{close:function(){this.$emit("close")},open:function(){this.$emit("open")}}}},"30de":function(n,e,t){"use strict";var u=t("47a5"),o=t.n(u);o.a},"47a5":function(n,e,t){},"85fd":function(n,e,t){"use strict";t.r(e);var u=t("d4e5"),o=t("8cea");for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);t("30de");var c=t("f0c5"),r=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7dea3bec",null,!1,u["a"],void 0);e["default"]=r.exports},"8cea":function(n,e,t){"use strict";t.r(e);var u=t("1d23"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=o.a},d4e5:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"50d6"))}},o=function(){var n=this.$createElement;this._self._c},i=[]}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'components/popup/index-create-component',
-    {
-        'components/popup/index-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("85fd"))
-        })
-    },
-    [['components/popup/index-create-component']]
-]);

+ 0 - 6
unpackage/dist/build/mp-weixin/components/popup/index.json

xqd
@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup"
-  },
-  "component": true
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/components/popup/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="data-v-7dea3bec"><u-popup vue-id="9b043d7c-1" show="{{show}}" mode="{{mode}}" round="{{round}}" data-event-opts="{{[['^close',[['close']]],['^open',[['open']]]]}}" bind:close="__e" bind:open="__e" class="data-v-7dea3bec" bind:__l="__l" vue-slots="{{['default']}}"><view class="topBar data-v-7dea3bec"><view class="left data-v-7dea3bec">X</view><view class="cen data-v-7dea3bec">{{''+title+''}}</view><view class="close data-v-7dea3bec">X</view></view></u-popup></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/components/popup/index.wxss

xqd
@@ -1 +0,0 @@
-.topBar.data-v-7dea3bec{height:112rpx;background:#f9f9f9;border-radius:24rpx 24rpx 0rpx 0rpx;display:flex;align-items:center;justify-content:space-between}.topBar .left.data-v-7dea3bec{width:10%;display:flex;align-items:center;justify-content:center}.topBar .cen.data-v-7dea3bec{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.topBar .close.data-v-7dea3bec{width:24rpx;height:24rpx;color:#666;width:10%;display:flex;align-items:center;justify-content:center}

+ 0 - 10
unpackage/dist/build/mp-weixin/components/privacyPopup/index.js

xqd
@@ -1,10 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/privacyPopup/index"],{"14bf":function(n,t,e){},7923:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uniPopup:function(){return e.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(e.bind(null,"1c63"))}},i=function(){var n=this.$createElement;this._self._c},c=[]},"7c5e":function(n,t,e){"use strict";e.r(t);var u=e("7923"),i=e("ec66");for(var c in i)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(c);e("974c");var o=e("f0c5"),r=Object(o["a"])(i["default"],u["b"],u["c"],!1,null,"2f94559f",null,!1,u["a"],void 0);t["default"]=r.exports},"974c":function(n,t,e){"use strict";var u=e("14bf"),i=e.n(u);i.a},b6b5:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{title:"用户隐私保护提示",desc1:"感谢您使用本产品,您使用本产品前应当仔细阅读并同意",urlTitle:"《小程序隐私保护指引》",desc2:"当您点击同意并开始使用产品服务时,即表示你已理解并同意该条款内容,该条款将对您产生法律约束力。如您拒绝,将无法更好的体验产品。"}},methods:{openPrivacyContract:function(){n.openPrivacyContract({})},handleAgreePrivacyAuthorization:function(){getApp().globalData.showPrivacy=!1,this.$emit("confirm"),this.$refs.popup.close()},handleDisagree:function(){this.$refs.popup.close()}}};t.default=e}).call(this,e("bc2e")["default"])},ec66:function(n,t,e){"use strict";e.r(t);var u=e("b6b5"),i=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=i.a}}]);
-;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
-    'components/privacyPopup/index-create-component',
-    {
-        'components/privacyPopup/index-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("7c5e"))
-        })
-    },
-    [['components/privacyPopup/index-create-component']]
-]);

+ 0 - 6
unpackage/dist/build/mp-weixin/components/privacyPopup/index.json

xqd
@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/components/privacyPopup/index.wxml

xqd
@@ -1 +0,0 @@
-<uni-popup vue-id="4a802978-1" type="center" is-mask-click="{{false}}" data-ref="popup" class="data-v-2f94559f vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="popup-box data-v-2f94559f"><view class="weui-half-screen-dialog__hd data-v-2f94559f">{{''+title+''}}</view><view class="weui-half-screen-dialog__bd data-v-2f94559f"><text class="weui-half-screen-dialog__tips data-v-2f94559f">{{desc1}}</text><text data-event-opts="{{[['tap',[['openPrivacyContract',['$event']]]]]}}" class="weui-half-screen-dialog__tips color-8BC21F data-v-2f94559f" bindtap="__e">{{''+urlTitle+''}}</text><text class="weui-half-screen-dialog__tips data-v-2f94559f">{{desc2}}</text></view><view class="weui-half-screen-dialog__ft data-v-2f94559f"><button data-event-opts="{{[['tap',[['handleDisagree',['$event']]]]]}}" class="weui-btn data-v-2f94559f" bindtap="__e">拒绝</button><button class="weui-btn agree data-v-2f94559f" id="agree-btn" type="default" open-type="agreePrivacyAuthorization" data-event-opts="{{[['agreeprivacyauthorization',[['handleAgreePrivacyAuthorization',['$event']]]]]}}" bindagreeprivacyauthorization="__e">同意</button></view></view></uni-popup>

+ 0 - 1
unpackage/dist/build/mp-weixin/components/privacyPopup/index.wxss

xqd
@@ -1 +0,0 @@
-.popup-box.data-v-2f94559f{width:80vw;overflow:hidden;background:#fff;padding:30rpx;border-radius:24rpx}.popup-box .weui-half-screen-dialog__hd.data-v-2f94559f{font-size:48rpx;font-family:Source Han Sans CN-Bold,Source Han Sans CN;font-weight:700;color:#000;line-height:56rpx}.popup-box .weui-half-screen-dialog__bd.data-v-2f94559f{margin-top:48rpx;text-indent:2em}.popup-box .weui-half-screen-dialog__bd .weui-half-screen-dialog__tips.data-v-2f94559f{font-size:28rpx;font-family:Source Han Sans CN-Normal,Source Han Sans CN;font-weight:400;color:#000;line-height:33rpx}.popup-box .weui-half-screen-dialog__ft.data-v-2f94559f{display:flex;justify-content:space-evenly;align-items:center;margin-top:48rpx}.popup-box .weui-half-screen-dialog__ft .weui-btn.data-v-2f94559f{padding:0 60rpx;margin:0;background:none;font-size:32rpx;font-family:Source Han Sans CN-Normal,Source Han Sans CN;font-weight:400;color:#000;line-height:80rpx}.popup-box .weui-half-screen-dialog__ft .agree.data-v-2f94559f{color:#fff;background:linear-gradient(90deg,#8bc21f,#7ab30a)}.popup-box .color-8BC21F.data-v-2f94559f{color:#8bc21f!important}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.js


+ 0 - 4
unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.json

xqd
@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.wxml

xqd
@@ -1 +0,0 @@
-<view data-ref="limepainter" class="lime-painter vue-ref"><block wx:if="{{canvasId&&size}}"><view style="{{(styles)}}"><block wx:if="{{use2dCanvas}}"><canvas class="lime-painter__canvas" style="{{(size)}}" id="{{canvasId}}" type="2d"></canvas></block><block wx:else><canvas class="lime-painter__canvas" style="{{(size)}}" canvas-id="{{canvasId}}" id="{{canvasId}}" width="{{boardWidth*dpr}}" height="{{boardHeight*dpr}}"></canvas></block></view></block><slot></slot></view>

+ 0 - 2
unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.wxss

xqd
@@ -1,2 +0,0 @@
-.lime-painter,
-.lime-painter__canvas{width:100%}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index.js


+ 0 - 7
unpackage/dist/build/mp-weixin/pages/index.json

xqd
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "首页",
-  "usingComponents": {
-    "u-swiper": "/uni_modules/uview-ui/components/u-swiper/u-swiper",
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.js


+ 0 - 8
unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.json

xqd
@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.js


+ 0 - 11
unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.json

xqd
@@ -1,11 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
-    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
-    "u--textarea": "/uni_modules/uview-ui/components/u--textarea/u--textarea",
-    "u-button": "/uni_modules/uview-ui/components/u-button/u-button"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customMian/index.js


+ 0 - 12
unpackage/dist/build/mp-weixin/pages/index/customMian/index.json

xqd
@@ -1,12 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
-    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
-    "u--textarea": "/uni_modules/uview-ui/components/u--textarea/u--textarea",
-    "u-button": "/uni_modules/uview-ui/components/u-button/u-button",
-    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customMian/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customMian/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.js


+ 0 - 9
unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.json

xqd
@@ -1,9 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
-    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.js


+ 0 - 7
unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.json

xqd
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="page data-v-013fded9"><nav-bar vue-id="121fdf82-1" title="定制我家的无主灯" back="{{true}}" color="black" background="white" class="data-v-013fded9" bind:__l="__l"></nav-bar><view class="con data-v-013fded9"><u-parse vue-id="121fdf82-2" content="{{content}}" class="data-v-013fded9" bind:__l="__l"></u-parse></view></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.wxss

xqd
@@ -1 +0,0 @@
-.data-v-013fded9 .u-line{width:56rpx!important}.page.data-v-013fded9{padding-bottom:54rpx}.con.data-v-013fded9{padding:28rpx 32rpx}.con .item.data-v-013fded9{display:flex;flex-direction:column;align-items:center;margin-bottom:64rpx}.con .item .label.data-v-013fded9{font-size:36rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;position:relative;margin-bottom:32rpx}.con .item .label image.data-v-013fded9{width:56rpx;height:20rpx;position:absolute;top:-10rpx;left:-10rpx}.con .item image.data-v-013fded9{height:686rpx;width:100%;border-radius:0 40rpx 0 40rpx}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.js


+ 0 - 8
unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.json

xqd
@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.js


+ 0 - 11
unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.json

xqd
@@ -1,11 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
-    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
-    "u--textarea": "/uni_modules/uview-ui/components/u--textarea/u--textarea",
-    "u-button": "/uni_modules/uview-ui/components/u-button/u-button"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.js


+ 0 - 11
unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.json

xqd
@@ -1,11 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup",
-    "u-icon": "/uni_modules/uview-ui/components/u-icon/u-icon",
-    "u--input": "/uni_modules/uview-ui/components/u--input/u--input",
-    "u--textarea": "/uni_modules/uview-ui/components/u--textarea/u--textarea",
-    "u-button": "/uni_modules/uview-ui/components/u-button/u-button"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.js


+ 0 - 5
unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.json

xqd
@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="page data-v-6fe0fa3c"><nav-bar vue-id="ed4b4408-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'定制我家的全屋WIFI'}}" back="{{true}}" color="black" background="white" class="data-v-6fe0fa3c" bind:__l="__l"></nav-bar><image class="topImg data-v-6fe0fa3c" src="{{picUrl+'/static/other/c1.png'}}" mode></image><view class="cen data-v-6fe0fa3c"><image class="water data-v-6fe0fa3c" src="/static/index/water.png" mode></image><image class="halfC data-v-6fe0fa3c" src="/static/index/halfCircle_275.png" mode></image>定制我家的全屋WIFI</view><view class="parmasBox data-v-6fe0fa3c"><view class="con data-v-6fe0fa3c"><view class="top data-v-6fe0fa3c"><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">户型</view><view class="des data-v-6fe0fa3c">{{''+selHx.value+''}}</view></view></view></view></view><view class="parmasBox data-v-6fe0fa3c"><view class="con data-v-6fe0fa3c"><view class="top data-v-6fe0fa3c"><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">收货人</view><view class="des data-v-6fe0fa3c">{{''+shareCon.name+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">电话</view><view class="des data-v-6fe0fa3c">{{''+shareCon.phone+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">收货地址</view><view class="des data-v-6fe0fa3c">{{''+shareCon.address+''}}</view></view><view class="item data-v-6fe0fa3c"><view class="name data-v-6fe0fa3c">备注</view><view class="des data-v-6fe0fa3c">{{''+shareCon.remark+''}}</view></view></view></view></view></view>

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.wxss


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.js


+ 0 - 7
unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.json

xqd
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-swiper": "/uni_modules/uview-ui/components/u-swiper/u-swiper"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.wxml


ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.wxss


+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/mainList/index.js

xqd
@@ -1 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/mainList/index"],{"1c46":function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={components:{},data:function(){return{picUrl:this.$picUrl,picBase:this.$picBase,list:[],name:""}},onLoad:function(e){this.name=e.name,this.list=getApp().typeList,console.log("传过来的列表",this.list)},methods:{goDetail:function(t,n){getApp().ktItem=t,getApp().ktIndex=n,getApp().ktName=this.name,e.navigateTo({url:"/pages/index/mainDetail/index"})}}};t.default=n}).call(this,n("543d")["default"])},3591:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return o})),n.d(t,"a",(function(){return i}));var i={uLoadmore:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(n.bind(null,"c6fd2"))}},a=function(){var e=this.$createElement;this._self._c},o=[]},7316:function(e,t,n){"use strict";n.r(t);var i=n("1c46"),a=n.n(i);for(var o in i)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return i[e]}))}(o);t["default"]=a.a},"77ab":function(e,t,n){"use strict";(function(e,t){var i=n("4ea4");n("d716");i(n("66fd"));var a=i(n("bb90"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(a.default)}).call(this,n("bc2e")["default"],n("543d")["createPage"])},9389:function(e,t,n){"use strict";var i=n("efb5"),a=n.n(i);a.a},bb90:function(e,t,n){"use strict";n.r(t);var i=n("3591"),a=n("7316");for(var o in a)["default"].indexOf(o)<0&&function(e){n.d(t,e,(function(){return a[e]}))}(o);n("9389");var u=n("f0c5"),c=Object(u["a"])(a["default"],i["b"],i["c"],!1,null,"22fe0046",null,!1,i["a"],void 0);t["default"]=c.exports},efb5:function(e,t,n){}},[["77ab","common/runtime","common/vendor"]]]);

+ 0 - 7
unpackage/dist/build/mp-weixin/pages/index/mainList/index.json

xqd
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/mainList/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="page data-v-22fe0046"><nav-bar vue-id="03562e14-1" title="{{name}}" back="{{true}}" color="black" background="white" class="data-v-22fe0046" bind:__l="__l"></nav-bar><view class="con data-v-22fe0046"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0',index],[[['list','',index]]]]]]]}}" class="item data-v-22fe0046" bindtap="__e"><view class="topBox data-v-22fe0046"><image src="{{picBase+item.cover}}" mode class="data-v-22fe0046"></image></view><view class="bottom data-v-22fe0046"><view class="txt data-v-22fe0046">{{''+item.name+''}}</view></view></view></block></view><u-loadmore vue-id="03562e14-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-22fe0046" bind:__l="__l"></u-loadmore></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/mainList/index.wxss

xqd
@@ -1 +0,0 @@
-.data-v-22fe0046 .u-line{width:56rpx!important}.page.data-v-22fe0046{padding-bottom:54rpx}.con.data-v-22fe0046{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-22fe0046{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item .topBox.data-v-22fe0046{position:relative}.con .item .topBox image.data-v-22fe0046{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .bottom.data-v-22fe0046{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-22fe0046{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/productLead/index.js


+ 0 - 7
unpackage/dist/build/mp-weixin/pages/index/productLead/index.json

xqd
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-loadmore": "/uni_modules/uview-ui/components/u-loadmore/u-loadmore"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/productLead/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="page data-v-b43a20ac"><nav-bar vue-id="5d58823e-1" title="产品指南" back="{{true}}" color="black" background="white" class="data-v-b43a20ac" bind:__l="__l"></nav-bar><view class="con data-v-b43a20ac"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['goDetail',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-b43a20ac" bindtap="__e"><image src="{{picBase+item.image}}" mode class="data-v-b43a20ac"></image><view class="bottom data-v-b43a20ac"><view class="txt data-v-b43a20ac">{{''+item.title+''}}</view></view></view></block></view><u-loadmore vue-id="5d58823e-2" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line="{{true}}" class="data-v-b43a20ac" bind:__l="__l"></u-loadmore></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/productLead/index.wxss

xqd
@@ -1 +0,0 @@
-.data-v-b43a20ac .u-line{width:56rpx!important}.page.data-v-b43a20ac{padding-bottom:54rpx}.con.data-v-b43a20ac{width:100%;display:flex;flex-wrap:wrap;padding:24rpx 32rpx;padding-left:28rpx}.con .item.data-v-b43a20ac{width:336rpx;background:#fff;border-radius:24rpx;border:2rpx solid #f1f1f1;margin-right:16rpx;margin-bottom:24rpx}.con .item image.data-v-b43a20ac{width:100%;height:292rpx;border-radius:30rpx 30rpx 0 0}.con .item .bottom.data-v-b43a20ac{display:flex;justify-content:center;align-items:center;height:76rpx}.con .item .bottom .txt.data-v-b43a20ac{width:85%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.js


+ 0 - 7
unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.json

xqd
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="page data-v-0c03d974"><nav-bar vue-id="76bf8a26-1" backType="{{navBarTitle}}" title="{{navBarTitle?navBarTitle:'产品指南'}}" back="{{true}}" color="black" background="white" class="data-v-0c03d974" bind:__l="__l"></nav-bar><view class="content data-v-0c03d974"><view class="title data-v-0c03d974">{{''+content.title+''}}</view><view class="p data-v-0c03d974"><u-parse vue-id="76bf8a26-2" content="{{content.content}}" class="data-v-0c03d974" bind:__l="__l"></u-parse></view><image style="margin-bottom:64rpx;" src="{{picBase+content.image}}" mode class="data-v-0c03d974"></image></view><block wx:if="{{showBtn}}"><view class="btnBox data-v-0c03d974"><button class="rBtn data-v-0c03d974" open-type="share">分享</button></view></block></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.wxss

xqd
@@ -1 +0,0 @@
-.data-v-0c03d974 button::after{border:none!important}.page.data-v-0c03d974{padding-bottom:160rpx}.content.data-v-0c03d974{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-0c03d974{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-0c03d974{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;margin-bottom:50rpx}.content image.data-v-0c03d974{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}.btnBox.data-v-0c03d974{height:160rpx;background:#fff;box-shadow:0rpx 0rpx 8rpx 0rpx rgba(0,0,0,.16);position:fixed;bottom:0;width:calc(100% - 64rpx);display:flex;align-items:center;justify-content:space-between;padding:0 32rpx}.btnBox .rBtn.data-v-0c03d974{width:100%;height:96rpx;background:#333;border-radius:4rpx;border:2rpx solid #333;display:flex;justify-content:center;align-items:center;font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#fff}

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/rule/index.js

xqd
@@ -1 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/rule/index"],{"18d0":function(n,e,t){"use strict";var u=t("2247"),o=t.n(u);o.a},"18fe":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={components:{},data:function(){return{content:""}},onLoad:function(n){this.content=getApp().content,console.log(this.content)},methods:{}};e.default=u},2247:function(n,e,t){},"449f":function(n,e,t){"use strict";t.r(e);var u=t("67f5"),o=t("ac81");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("18d0");var r=t("f0c5"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"2daba840",null,!1,u["a"],void 0);e["default"]=a.exports},"67f5":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"5d44"))}},o=function(){var n=this.$createElement;this._self._c},c=[]},6953:function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("d716");u(t("66fd"));var o=u(t("449f"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},ac81:function(n,e,t){"use strict";t.r(e);var u=t("18fe"),o=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=o.a}},[["6953","common/runtime","common/vendor"]]]);

+ 0 - 7
unpackage/dist/build/mp-weixin/pages/index/rule/index.json

xqd
@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "enablePullDownRefresh": false,
-  "usingComponents": {
-    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse"
-  }
-}

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/rule/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="page data-v-2daba840"><nav-bar vue-id="9790385e-1" title="挑选规则" back="{{true}}" color="black" background="white" class="data-v-2daba840" bind:__l="__l"></nav-bar><view class="content data-v-2daba840"><u-parse vue-id="9790385e-2" content="{{content}}" class="data-v-2daba840" bind:__l="__l"></u-parse></view></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/index/rule/index.wxss

xqd
@@ -1 +0,0 @@
-.content.data-v-2daba840{padding:48rpx 32rpx 0 32rpx}.content .title.data-v-2daba840{font-size:40rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333;margin-bottom:50rpx}.content .p.data-v-2daba840{font-size:30rpx;font-family:PingFang-SC-Bold,PingFang-SC;color:#333;line-height:50rpx;text-indent:2rem;margin-bottom:50rpx}.content image.data-v-2daba840{width:686rpx;height:686rpx;border-radius:0 40rpx 0 40rpx}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/mall.js


+ 0 - 8
unpackage/dist/build/mp-weixin/pages/mall.json

xqd
@@ -1,8 +0,0 @@
-{
-  "navigationBarTitleText": "分类",
-  "usingComponents": {
-    "u-search": "/uni_modules/uview-ui/components/u-search/u-search",
-    "u-sticky": "/uni_modules/uview-ui/components/u-sticky/u-sticky",
-    "u-tabs": "/uni_modules/uview-ui/components/u-tabs/u-tabs"
-  }
-}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/mall.wxml


+ 0 - 1
unpackage/dist/build/mp-weixin/pages/mall.wxss

xqd
@@ -1 +0,0 @@
-.data-v-6844eab8 .u-tabs__wrapper__nav__line{background:#f7790c!important}.searchAndTab.data-v-6844eab8{background:#fff;padding-top:24rpx;position:fixed;width:100%;top:173rpx}.searchAndTab .searchBox.data-v-6844eab8{padding:0 32rpx}.content.data-v-6844eab8{display:flex}.content .leftMenu.data-v-6844eab8{width:212rpx;height:calc(100vh - 380rpx);background:#fff;overflow-y:scroll}.content .leftMenu .item.data-v-6844eab8{height:98rpx;font-size:28rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#080f18;display:flex;align-items:center;justify-content:flex-start;padding:0 20rpx;word-wrap:break-word;word-break:break-all;position:relative}.content .leftMenu .halfCircle.data-v-6844eab8{position:absolute;right:0rpx;top:40rpx;z-index:0}.content .leftMenu .act.data-v-6844eab8{background:#f2f2f2}.content .rightDes.data-v-6844eab8{width:100%;background:#f2f2f2;padding:48rpx 28rpx 52rpx 28rpx;overflow-y:scroll;box-sizing:border-box;height:calc(100vh - 380rpx)}.content .rightDes .item .top.data-v-6844eab8{display:flex;align-items:center;justify-content:space-between}.content .rightDes .item .bottom.data-v-6844eab8{display:flex;flex-wrap:wrap;margin-top:32rpx}.content .rightDes .item .bottom image.data-v-6844eab8{width:136rpx;height:136rpx;margin-right:30rpx;margin-bottom:30rpx;border-radius:12rpx}

ファイルの差分が大きいため隠しています
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/mall/detail/index.js


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません