From 29f4d5fe57c311ae9df882ac2821599ab4e590d5 Mon Sep 17 00:00:00 2001
From: yr <1308291615@qq.com>
Date: Sat, 23 May 2020 16:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E8=B4=AD=E9=A1=B5=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/detailStandard/detailStandard_k.vue   |  40 ++-
 src/pages/detailStandard/detailStandard_sun.vue | 324 ++++++++++++++++++++++--
 2 files changed, 329 insertions(+), 35 deletions(-)

diff --git a/src/pages/detailStandard/detailStandard_k.vue b/src/pages/detailStandard/detailStandard_k.vue
index 4403dc1..e4124ca 100644
--- a/src/pages/detailStandard/detailStandard_k.vue
+++ b/src/pages/detailStandard/detailStandard_k.vue
@@ -18,7 +18,7 @@
         <view class="choose">
             <view class="colour">
                 <view class="colour1"><span>框架颜色</span><image src="/static/img/detail/xiala.png"></image></view>
-                <view class="colour_exp">*{{colour}}</view>
+                <view class="colour_exp">*{{this.navData.colour}}</view>
                 <view>
                 <view class="colour2">
                     <view 
@@ -37,10 +37,10 @@
             <view class="size">
                 <view class="size1">
                     <view class="size1_1">框架尺寸</view>
-                    <view><span>+￥20</span><image src="/static/img/detail/xiala.png"></image></view>
+                    <view><image src="/static/img/detail/xiala.png"></image></view>
                 </view>
                 <view class="colour"> 
-                    <view class="colour_exp">*{{colour}}</view>
+                    <view class="colour_exp">*{{this.navData.colour}}</view>
                 </view>
                 <view class="D3_list">
                     <view>
@@ -123,7 +123,7 @@
             </view>
         </view>
         <view class="zhanwei"></view>
-        <view class="button"><view>立即结算</view></view>
+        <view class="button"><view  @click="popSure(details.data.p_name,details.data.p_sale_price)" >立即结算</view></view>
     </view>
 </template>
 <script>
@@ -137,8 +137,17 @@ export default {
     data(){
         return{
             count: 1,
-            colour: '1.56非球面防蓝光_亚黑色',
+            // colour: '1.56非球面防蓝光_亚黑色',
             chooseNum : '',
+            //传参
+            navData:{
+                pid: "26",
+                p_root_index: "2",
+                name:'',
+                price:'',
+                colour: '1.56非球面防蓝光_亚黑色',
+            },
+            //尺寸
             parameter:[
                 {key: 0,img:'/static/img/detail/d2.png', standard:'框架宽', slength:139},
                 {key: 1,img:'/static/img/detail/d3.png', standard:'镜片宽', slength:51},
@@ -168,7 +177,8 @@ export default {
     onLoad:function(){
         store.dispatch('detailStandard_k/fetch', {
 			uid: "1",
-			pid: "26",
+            pid: "26",
+            p_root_index: "2"
 		});
         // console.log(this.$store.state.detailStandard_k.list+'ssss');
     },
@@ -181,11 +191,11 @@ export default {
             }
         },
         colourChange(index,e){
-            this.colour = e ; //颜色选择
-            // console.log(index,e);
+            this.navData.colour = e ; //颜色选择
+            console.log(index,e);
 
         },
-        viewChoose(index){
+        viewChoose(index,e){
             this.chooseNum = index
         },
         popArgs(){
@@ -195,7 +205,17 @@ export default {
 				fail: () => {},
 				complete: () => {}
 			});
-        }
+        },
+        //跳转确认订单页及传参
+        popSure(name,price){
+            this.navData.name = name;
+            this.navData.price = price;
+            var navData = JSON.stringify(this.navData); 
+            uni.navigateTo({
+				url: '../confirmOrder/confirmOrder?index='+navData,
+            });
+            console.log(this.navData)
+        },
     }
 
 }
diff --git a/src/pages/detailStandard/detailStandard_sun.vue b/src/pages/detailStandard/detailStandard_sun.vue
index 748cfd2..4dc4988 100644
--- a/src/pages/detailStandard/detailStandard_sun.vue
+++ b/src/pages/detailStandard/detailStandard_sun.vue
@@ -18,7 +18,7 @@
         <view class="choose">
             <view class="colour">
                 <view class="colour1"><text>框架颜色</text><image src="/static/img/detail/xiala.png"></image></view>
-                <view class="colour_exp">*{{colour}}</view>
+                <view class="colour_exp">*{{navData.colour}}</view>
                 <view>
                 <view class="colour2">
                     <view 
@@ -64,7 +64,7 @@
                     >
                     <view 
                     class="split_colour2"
-                    @click="splitChoose(index)"
+                    @click="splitChoose(index,items.name)"
                     v-bind:class="{'split_colour2 split_colour2_actived' : isSplit == index}"
                     >{{items.name}}</view>
                     </view>
@@ -75,10 +75,10 @@
             <view class="size">
                 <view class="size1">
                     <view class="size1_1">框架尺寸</view>
-                    <view><span>+￥20</span><image src="/static/img/detail/xiala.png"></image></view>
+                    <view><image src="/static/img/detail/xiala.png"></image></view>
                 </view>
                 <view class="colour"> 
-                    <view class="colour_exp">*{{colour}}</view>
+                    <view class="colour_exp">*{{navData.colour}}</view>
                 </view>
                 <view class="D3_list">
                     <view>
@@ -160,8 +160,113 @@
                 <view class="buy3_2" @click="popArgs">立即去选</view>
             </view>
         </view>
+					<template >
+    					<view class="goods-form">
+						    <text class="p1">填写验光数据</text>
+						    <text class="p2">没有验光数据？请到线下眼镜店验光哦～</text>
+						    <view class="picker" >
+						        <view class="picker-choice">
+						                    <view class="choice-left">
+						                        <text class="p11">{{pickerInfoList[0].nameC}}</text>
+						                        <text class="p12">{{pickerInfoList[0].nameE}}</text>
+						                    </view>
+						                    <text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
+						                    <text class="p14">{{pickerInfoList[0].nameArray1[pickerInfoList[0].nameIndex1]}}</text>
+						                    <picker @change="bindPickerChange01" :value="pickerInfoList[0].nameIndex1" :range="pickerInfoList[0].nameArray1">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						                    <text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
+						                    <text class="p14">{{pickerInfoList[0].nameArray2[pickerInfoList[0].nameIndex2]}}</text>
+						                    <picker @change="bindPickerChange02" :value="pickerInfoList[0].nameIndex2" :range="pickerInfoList[0].nameArray2">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						        </view>
+						    </view>
+						    <view class="picker" >
+						        <view class="picker-choice">
+						                    <view class="choice-left">
+						                        <text class="p11">{{pickerInfoList[1].nameC}}</text>
+						                        <text class="p12">{{pickerInfoList[1].nameE}}</text>
+						                    </view>
+						                    <text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
+						                    <text class="p14">{{pickerInfoList[1].nameArray1[pickerInfoList[1].nameIndex1]}}</text>
+						                    <picker @change="bindPickerChange11" :value="pickerInfoList[1].nameIndex1" :range="pickerInfoList[1].nameArray1">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						                    <text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
+						                    <text class="p14">{{pickerInfoList[1].nameArray2[pickerInfoList[1].nameIndex2]}}</text>
+						                    <picker @change="bindPickerChange12" :value="pickerInfoList[1].nameIndex2" :range="pickerInfoList[1].nameArray2">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						        </view>
+						    </view>
+						    <view class="picker" >
+						        <view class="picker-choice">
+						                    <view class="choice-left">
+						                        <text class="p11">{{pickerInfoList[2].nameC}}</text>
+						                        <text class="p12">{{pickerInfoList[2].nameE}}</text>
+						                    </view>
+						                    <text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
+						                    <text class="p14">{{pickerInfoList[2].nameArray1[pickerInfoList[2].nameIndex1]}}</text>
+						                    <picker @change="bindPickerChange21" :value="pickerInfoList[2].nameIndex1" :range="pickerInfoList[2].nameArray1">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						                    <text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
+						                    <text class="p14">{{pickerInfoList[2].nameArray2[pickerInfoList[2].nameIndex2]}}</text>
+						                    <picker @change="bindPickerChange22" :value="pickerInfoList[2].nameIndex2" :range="pickerInfoList[2].nameArray2">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						        </view>
+						    </view>
+						    <view class="picker" >
+						        <view class="picker-choice">
+						                    <view class="choice-left">
+						                        <text class="p11">{{pickerInfoList[3].nameC}}</text>
+						                        <text class="p12">{{pickerInfoList[3].nameE}}</text>
+						                    </view>
+						                    <text class="p13">左&nbsp;&nbsp;&nbsp;(OD)</text>
+						                    <text class="p14">{{pickerInfoList[3].nameArray1[pickerInfoList[3].nameIndex1]}}</text>
+						                    <picker @change="bindPickerChange31" :value="pickerInfoList[3].nameIndex1" :range="pickerInfoList[3].nameArray1">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						                    <text class="p13">右&nbsp;&nbsp;&nbsp;(OS)</text>
+						                    <text class="p14">{{pickerInfoList[3].nameArray2[pickerInfoList[3].nameIndex2]}}</text>
+						                    <picker @change="bindPickerChange32" :value="pickerInfoList[3].nameIndex2" :range="pickerInfoList[3].nameArray2">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						        </view>
+						    </view>
+						    <view class="picker" >
+						        <view class="picker-choice">
+						                    <view class="choice-left">
+						                        <text class="p11">{{pickerInfoList[4].nameC}}</text>
+						                    </view>
+						                    <text class="p13-date">年&nbsp;&nbsp;&nbsp;(Y)</text>
+						                    <text class="p14" style="width: 34px;">{{pickerInfoList[4].nameArray1[pickerInfoList[4].nameIndex1]}}</text>
+						                    <picker @change="bindPickerChange41" :value="pickerInfoList[4].nameIndex1" :range="pickerInfoList[4].nameArray1">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						                    <text class="p13-date">月&nbsp;&nbsp;&nbsp;(M)</text>
+						                    <text class="p14" style="width: 30px;">{{pickerInfoList[4].nameArray2[pickerInfoList[4].nameIndex2]}}</text>
+						                    <picker @change="bindPickerChange42" :value="pickerInfoList[4].nameIndex2" :range="pickerInfoList[4].nameArray2">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						                    <text class="p13-date">日&nbsp;&nbsp;&nbsp;(D)</text>
+						                    <text class="p14" style="width: 30px;">{{pickerInfoList[4].nameArray3[pickerInfoList[4].nameIndex3]}}</text>
+						                    <picker @change="bindPickerChange43" :value="pickerInfoList[4].nameIndex3" :range="pickerInfoList[4].nameArray3">
+						                        <image src="../../static/detail-tabicon.png" ></image>
+						                    </picker>
+						        </view>
+						    </view>
+						    <view class="confirm">
+						        <image :src="tablist.confirm ? tabicon[0] : tabicon[1]" @click="changeConfirm"></image>
+						        <text>确认以上输入信息来源于我的验光数据!</text>
+						    </view>
+						</view>
+					
+					</template> 
         <view class="zhanwei"></view>
-        <view class="button"><view>立即结算</view></view>
+        <view class="button" @click="popSure(details.data.p_name,details.data.p_sale_price)" ><view>立即结算</view></view>
     </view>
 </template>
 <script>
@@ -175,9 +280,20 @@ export default {
     data(){
         return{
             count: 1,
-            colour: '1.56非球面防蓝光_亚黑色',
             chooseNum : '',
             isSplit: '' ,
+
+            //传参
+            navData:{
+                pid: "26",
+                p_root_index: "4",
+                name:'',
+                price:'',
+                split: '1.56非球面防蓝光',
+                colour: '1.56非球面防蓝光_亚黑色',
+            },
+
+            //尺寸
             parameter:[
                 {key: 0,img:'/static/img/detail/d2.png', standard:'框架宽', slength:139},
                 {key: 1,img:'/static/img/detail/d3.png', standard:'镜片宽', slength:51},
@@ -205,15 +321,21 @@ export default {
                 {key: 6,img:'/static/img/detail/Kuang/g3.png',is_actived:false},
                 {key: 7,img:'/static/img/detail/Kuang/g2.png',is_actived:false},
             ],
-            //折射率
-            split:[
-                {number: 1.56},
-                {number: 1.60},
-                {number: 1.67},
-                {number: 1.71},
-                {number: 1.74}
-
-            ]
+            opIsOpen:true,
+            tablist: {
+				// read: true,
+				// seeLong: false,
+				confirm: false
+				},
+			tabicon:['/static/detail-button.png','/static/detail-button-unselected.png'],
+            // 度数相关数据                
+			pickerInfoList:[
+				{nameC:"度数",nameE:"(SPH)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:0},
+				{nameC:"散光",nameE:"(CYL)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:1},
+				{nameC:"散光轴位",nameE:"(AXI)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:2},
+				{nameC:"双眼瞳距",nameE:"(PD)",nameArray1:[1.5,2.5,3.5,4.5],nameIndex1:0,nameArray2:[1.5,2.5,3.5,4.5],nameIndex2:0,key:3},
+				{nameC:"验光日期",nameE:'',nameArray1:[2017,2018,2019,2020,2021],nameIndex1:0,nameArray2:[1,2,3,4,5,6,7],nameIndex2:0,nameArray3:[1,2,3,4,5,6],nameIndex3:0}
+			],
         }
     },
 
@@ -225,10 +347,9 @@ export default {
     onLoad:function(){
         store.dispatch('detailStandard_k/fetch', {
 			uid: "1",
-			pid: "26",
-		});
-        console.log(this.$store.state.detailStandard_k.list.data+'ssswwwwwwwws');
-        console.log("ssssssssssssssssssssssssssss")
+            pid: "26",
+            p_root_index: "4"
+        });
     },
     methods: {
         counter(isadd){
@@ -239,16 +360,18 @@ export default {
             }
         },
         colourChange(index,e){
-            this.colour = e ; //颜色选择
-            // console.log(index,e);
+            this.navData.colour = e ; //颜色选择
 
         },
         viewChoose(index){
             this.chooseNum = index
         },
-        splitChoose(index){
+        //折射率选择
+        splitChoose(index,e){
             this.isSplit = index
+            this.navData.split = e 
         },
+        //跳转镜片选购页
         popArgs(){
             uni.navigateTo({
 				url: '../detailsChoiceArgs/detailsChoiceArgs',
@@ -256,7 +379,58 @@ export default {
 				fail: () => {},
 				complete: () => {}
 			});
-        }
+        },
+        //跳转确认订单页及传参
+        popSure(name,price){
+            this.navData.name = name;
+            this.navData.price = price;
+            var navData = JSON.stringify(this.navData); 
+            uni.navigateTo({
+				url: '../confirmOrder/confirmOrder?index='+navData,
+            });
+            console.log(this.navData)
+        },
+        //验光表
+        changeConfirm() {
+	        this.tablist.confirm = !this.tablist.confirm
+		},
+		bindPickerChange01: function(e) {
+		    this.pickerInfoList[0].nameIndex1 = e.target.value 
+		},
+		bindPickerChange02: function(e) {
+		    this.pickerInfoList[0].nameIndex2 = e.target.value 
+		},
+		
+		bindPickerChange11: function(e) {
+		    this.pickerInfoList[1].nameIndex1 = e.target.value 
+		},
+		bindPickerChange12: function(e) {
+		    this.pickerInfoList[1].nameIndex2 = e.target.value 
+		},
+		
+		bindPickerChange21: function(e) {
+		    this.pickerInfoList[2].nameIndex1 = e.target.value 
+		},
+		bindPickerChange22: function(e) {
+		    this.pickerInfoList[2].nameIndex2 = e.target.value 
+		},
+		
+		bindPickerChange31: function(e) {
+		    this.pickerInfoList[3].nameIndex1 = e.target.value 
+		},
+		bindPickerChange32: function(e) {
+		    this.pickerInfoList[3].nameIndex2 = e.target.value 
+		},   
+			
+		bindPickerChange41: function(e) {
+		    this.pickerInfoList[4].nameIndex1 = e.target.value 
+		},
+		bindPickerChange42: function(e) {
+		    this.pickerInfoList[4].nameIndex2 = e.target.value 
+			},         
+	    bindPickerChange43: function(e) {
+		    this.pickerInfoList[4].nameIndex3 = e.target.value 
+	    },
     }
 
 }
@@ -557,7 +731,7 @@ hr{
     border-radius: 8px;
     padding-top: 20px;
     box-sizing: border-box;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
 }
 .buy1{
     font-family: PingFangSC-Medium;
@@ -599,7 +773,107 @@ hr{
 }
 .zhanwei{
     background: #F2F2F2;
-    height: 120rpx;
+    height: 200rpx;
+}
+.goods-form {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #fff;
+    width: 100%;
+    padding-top:20px;
+    padding-bottom:20px;
+    box-sizing: border-box;
+	    
+	.p1 {
+        font-size: 16px;
+        color: #333333;
+        letter-spacing: -0.3px;
+        text-align: justify;
+        line-height: 24px;
+        margin: 4px 0;
+	    }
+    .p2 {
+        font-size: 12px;
+        color: #999999;
+        letter-spacing: -0.23px;
+        margin-bottom: 18rpx;
+    }
+    image{
+        width: 28rpx;
+        height: 26rpx;
+    }
+    .confirm {
+        display: flex;
+        align-items: center;
+        font-size: 12px;
+        color: #666666;
+        letter-spacing: -0.23px;
+	    width: 684rpx;
+        image{
+            margin-right:25rpx;
+        }
+    }
+    .picker{
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+		width: 100%;
+		image{
+			width: 10px;
+			height: 10px;
+			margin-right: 5px;
+		}
+		.picker-choice{
+			display: flex;
+			width: 684rpx;
+			align-items: center;
+	        margin-bottom: 40rpx;
+			.choice-left{
+				width: 210rpx;
+				.p11 {
+					font-size: 14px;
+					color: #333333;
+					letter-spacing: -0.26px;
+					text-align: justify;
+					line-height: 24px;
+					// margin-right: 10px;
+				}
+				.p12 {
+					font-size: 10px;
+					color: #3F3F3F;
+					letter-spacing: -0.19px;
+					text-align: justify;
+					line-height: 24px;
+				}
+	            
+	            
+			}
+			.p13 {
+				font-size: 10px;
+				color: #999999;
+				letter-spacing: -0.19px;
+				margin-right: 10px;
+			}
+	        .p13-date {
+	            font-size: 10px;
+				color: #999999;
+				letter-spacing: -0.19px;
+				margin-right: 5px;
+	        }
+			.p14 {
+				font-size: 14px;
+				color: #666666;
+				letter-spacing: -0.26px;
+				text-align: center;
+				width: 124rpx;
+				border-bottom: 1px solid #CFCFCF;
+			}
+	        
+		}
+	}
 }
 .button{
     position: fixed;
-- 
2.0.0