1

pages.json

@@ -77,12 +77,12 @@
         },
         {
             "root": "pages/live",
-            "plugins": {
-                "live-player-plugin": {
-                    "version": "1.2.9",
-                    "provider": "wx2b03c6e691cd7370"
-                }
-            },
+            // "plugins": {
+            //     "live-player-plugin": {
+            //         "version": "1.3.0",
+            //         "provider": "wx2b03c6e691cd7370"
+            //     }
+            // },
             "pages": [{
                 "path": "index"
             }, {
@@ -527,7 +527,7 @@
 		    "root": "pages/appointment",
 			// "plugins": {
 			//     "live-player-plugin": {
-			//         "version": "1.2.5",
+			//         "version": "1.3.0",
 			//         "provider": "wx2b03c6e691cd7370"
 			//     }
 			// },

pages/blindDate/editData.vue

@@ -86,7 +86,7 @@
 								 <view class="subpicker" v-if="item1.subType==2">
 								 	<picker :mode ="item1.mode" class="subpicker" range-key='Name' :disabled="item1.disabled" :range="item1.array" @change="changPicker($event,item1.field,item1.mode,item1.array)">
 								 	       <!-- <input class="subInput" disabled type="text" :disabled="item1.disabled" :placeholder="item1.placehloder" v-model="data[item1.field]" /> -->
-										   <text class="subInput">{{data[item1.field]==''?item1.placehloder : data[item1.field]}}</text>
+										   <text class="subInput" :style="{'color':data[item1.field]==''?'#B6B6B6':'#111111'}">{{data[item1.field]==''?item1.placehloder : data[item1.field]}}</text>
 								 	</picker>
 									 <!-- <u-icon style="flex-grow: 4;" name="arrow-right"></u-icon> -->
 								 </view>
@@ -272,14 +272,14 @@
 						array:[],
 						mode:"region"
 					},
-					{
-						name:"资产",
-						field:"OtherInfo",
-						placehloder:"请填写资产",
-						subType:1,
-						showType:"text",
-						disabled:false
-					},
+					// {
+					// 	name:"资产",
+					// 	field:"OtherInfo",
+					// 	placehloder:"请填写资产",
+					// 	subType:1,
+					// 	showType:"text",
+					// 	disabled:false
+					// },
 					],
 					type:2
 				},{

pages/blindDate/persondetails.vue

@@ -322,7 +322,7 @@
 							<view class="bubble" v-if="dataList.EducationType">学历:{{dataList.EducationTypeStr}}</view>
 							<view class="bubble" v-if="dataList.Job">职位:{{dataList.Job}}</view>
 							<view class="bubble" v-if="dataList.WorkUnit">工作单位:{{dataList.WorkUnit}}</view>
-							<view class="bubble" v-if="dataList.OtherInfo">资产:{{dataList.OtherInfo}}万</view>
+							<!-- <view class="bubble" v-if="dataList.OtherInfo">资产:{{dataList.OtherInfo}}万</view> -->
 							
 						</view>
 						<view class="pd-title">自我介绍</view>

pages/blindDate/userList.vue

@@ -197,13 +197,13 @@
 					pageSize:20,
 					Sex:1,
 					Age:0,
-					EndAge:100,
+					EndAge:0,
 					Height:0,
-					EndHeight:230,
+					EndHeight:0,
 					Weight:0,
-					EndWeight:200,
+					EndWeight:0,
 					YearMoney:0,
-					EndYearMoney:500,
+					EndYearMoney:0,
 					CarInfo:0,
 					HouseInfo:0,
 					EducationType:0,
@@ -222,10 +222,10 @@
 				},
 				width:0,//滑块的高度
 				cHeight:0,
-				ages:[0,100],//年龄
-				Heights:[0,230],//身高
-				Weights:[0,200],//体重
-				YearMoeys:[0,500],//年收入
+				ages:[0,0],//年龄
+				Heights:[0,0],//身高
+				Weights:[0,0],//体重
+				YearMoeys:[0,0],//年收入
 				education:[],
 				marriage:[],
 				house:[],
@@ -235,7 +235,10 @@
 		},	
 		onLoad(options) {
 			if(options && options.Sex){
-				this.msg.Sex = options.Sex
+				this.msg.Sex = options.Sex;
+				if(this.msg.Sex==2){
+						this.active =1
+				}
 			}
 			this.cHeight = this.$uiConfig.is_bang ? 60 : 52;
 			if(uni.getStorageSync('blindDate_listStyle')){//从缓存里获取图片模式