From eab89b254277cc1b6a1a43e44ad2aace1feb7b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=BB=E9=B9=8F?= <1242402566@qq.com>
Date: Tue, 12 May 2020 23:33:52 +0800
Subject: [PATCH] updates

---
 src/pages.json                                     | 293 +++++++++++----------
 src/pages/cart/cart.vue                            |   8 +-
 .../detailsChoiceArgs/compoents/MyCollapse.vue     |  65 +++--
 src/pages/detailsChoiceArgs/detailsChoiceArgs.vue  |  38 +--
 src/pages/myOrder/myOrder.vue                      |   3 +-
 5 files changed, 210 insertions(+), 197 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index 38fcca7..4969318 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,143 +1,150 @@
-{
-	"pages": [ 
-        {
-            "path" : "pages/myOrder/myOrder",
-            "style" : {
-				"navigationBarTitleText": "我的订单"}
-        },
-		{
-			"path": "pages/cart/cart",
-			"style": {
-				"navigationBarTitleText": "购物车"
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "商城一览"
-			}
-		},
-		{
-			"path": "pages/frameDetail/frameDetail",
-			"style": {
-				"navigationBarTitleText": "产品详情"
-			}
-		},
-		{
-			"path": "pages/lensDetails/lensDetails",
-			"style": {
-				"navigationBarTitleText": "产品详情"
-			}
-		},
-        {
-            "path" : "pages/purchaseLenses/purchaseLenses",
-            "style" : {
-				"navigationBarTitleText": "产品选购"
-			}
-        },
-		{
-            "path" : "pages/refundProgress/refundProgress",
-			"style": {
-				"navigationBarTitleText": "申请退款"
-			}
-        },
-		{
-			"path": "pages/addAddress/addAddress",
-			"style": {
-				"navigationBarTitleText": "新增地址"
-			}
-		},
-        {
-            "path" : "pages/confirmOrder/confirmOrder",
-            "style" : {
-				"navigationBarTitleText": "确认订单"}
-        },
-		{
-			"path": "pages/user/user",
-			"style": {
-				"navigationBarTitleText": "我的"
-			}
-		},
-		{
-			"path": "pages/refundment/refundWays"
-		},
-		{
-			"path": "pages/refundment/refundment"
-		},
-		{
-			"path": "pages/predelivery/predelivery"
-		},
-		{
-			"path": "pages/customerService/customerService",
-			"style":{
-				"navigationBarTitleText" : "在线客服"
-			}
-		},
-		{
-			"path": "pages/myOrderPaying/myOrderPaying",
-			"style":{
-				"navigationBarTitleText" : "我的订单"
-			}
-		},
-		{
-			"path": "pages/detailsChoiceArgs/detailsChoiceArgs",
-			"style":{
-				"navigationBarTitleText" : "镜片名称名称"
-			}
-		},
-		{
-            "path" : "pages/detailStandard/detailStandard_sun",
-			"style": {
-				"navigationBarTitleText": "太阳镜选购页"
-			}
-		},
-		{
-            "path" : "pages/detailStandard/detailStandard_k",
-			"style": {
-				"navigationBarTitleText": "镜框选购页"
-			}
-        }
-        
-    ],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
-	},
-	"tabBar": {
-		"color": "#C0C4CC",
-		"selectedColor": "#fa436a",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tab-home.png",
-				"selectedIconPath": "static/tab-home-current.png",
-				"text": "首页"
-			},
-			{
-				"pagePath": "pages/cart/cart",
-				"iconPath": "static/tab-cart.png",
-				"selectedIconPath": "static/tab-cart-current.png",
-				"text": "购物车"
-			},
-			{
-				"pagePath": "pages/user/user",
-				"iconPath": "static/tab-my.png",
-				"selectedIconPath": "static/tab-my-current.png",
-				"text": "我的"
-			}
-		]
-	},
-	"condition" : { //模式配置，仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
-	}
-}
+{
+    "pages" : [
+        {
+            "path" : "pages/myOrder/myOrder",
+            "style" : {
+                "navigationBarTitleText" : "我的订单"
+            }
+        },
+        {
+            "path" : "pages/cart/cart",
+            "style" : {
+                "navigationBarTitleText" : "购物车"
+            }
+        },
+        {
+            "path" : "pages/index/index",
+            "style" : {
+                "navigationBarTitleText" : "商城一览"
+            }
+        },
+        {
+            "path" : "pages/frameDetail/frameDetail",
+            "style" : {
+                "navigationBarTitleText" : "产品详情"
+            }
+        },
+        {
+            "path" : "pages/lensDetails/lensDetails",
+            "style" : {
+                "navigationBarTitleText" : "产品详情"
+            }
+        },
+        {
+            "path" : "pages/purchaseLenses/purchaseLenses",
+            "style" : {
+                "navigationBarTitleText" : "产品选购"
+            }
+        },
+        {
+            "path" : "pages/refundProgress/refundProgress",
+            "style" : {
+                "navigationBarTitleText" : "申请退款"
+            }
+        },
+        {
+            "path" : "pages/addAddress/addAddress",
+            "style" : {
+                "navigationBarTitleText" : "新增地址"
+            }
+        },
+        {
+            "path" : "pages/confirmOrder/confirmOrder",
+            "style" : {
+                "navigationBarTitleText" : "确认订单"
+            }
+        },
+        {
+            "path" : "pages/user/user",
+            "style" : {
+                "navigationBarTitleText" : "我的"
+            }
+        },
+        {
+            "path" : "pages/refundment/refundWays"
+        },
+        {
+            "path" : "pages/refundment/refundment"
+        },
+        {
+            "path" : "pages/predelivery/predelivery"
+        },
+        {
+            "path" : "pages/customerService/customerService",
+            "style" : {
+                "navigationBarTitleText" : "在线客服"
+            }
+        },
+        {
+            "path" : "pages/myOrderPaying/myOrderPaying",
+            "style" : {
+                "navigationBarTitleText" : "我的订单"
+            }
+        },
+        {
+            "path" : "pages/detailsChoiceArgs/detailsChoiceArgs",
+            "style" : {
+                "navigationBarTitleText" : "镜片名称名称"
+            }
+        },
+        {
+            "path" : "pages/detailStandard/detailStandard_sun",
+            "style" : {
+                "navigationBarTitleText" : "太阳镜选购页"
+            }
+        },
+        {
+            "path" : "pages/detailStandard/detailStandard_k",
+            "style" : {
+                "navigationBarTitleText" : "镜框选购页"
+            }
+        },
+        {
+            "path" : "pages/detailsChoiceArgs/compoents/MyCollapse",
+            "style" : {}
+        }
+    ],
+    "globalStyle" : {
+        "navigationBarTextStyle" : "black",
+        "navigationBarTitleText" : "uni-app",
+        "navigationBarBackgroundColor" : "#F8F8F8",
+        "backgroundColor" : "#F8F8F8"
+    },
+    "tabBar" : {
+        "color" : "#C0C4CC",
+        "selectedColor" : "#fa436a",
+        "borderStyle" : "black",
+        "backgroundColor" : "#ffffff",
+        "list" : [
+            {
+                "pagePath" : "pages/index/index",
+                "iconPath" : "static/tab-home.png",
+                "selectedIconPath" : "static/tab-home-current.png",
+                "text" : "首页"
+            },
+            {
+                "pagePath" : "pages/cart/cart",
+                "iconPath" : "static/tab-cart.png",
+                "selectedIconPath" : "static/tab-cart-current.png",
+                "text" : "购物车"
+            },
+            {
+                "pagePath" : "pages/user/user",
+                "iconPath" : "static/tab-my.png",
+                "selectedIconPath" : "static/tab-my-current.png",
+                "text" : "我的"
+            }
+        ]
+    },
+    "condition" : {
+        //模式配置，仅开发期间生效
+        "current" : 0, //当前激活的模式(list 的索引项)
+        "list" : [
+            {
+                "name" : "", //模式名称
+                "path" : "", //启动页面，必选
+                "query" : "" //启动参数，在页面的onLoad函数里面得到
+            }
+        ]
+    }
+}
diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index 25e9787..d824c1b 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -36,7 +36,7 @@
 						<!-- <text class="icon">></text> -->
 						</view>
 						<view class="priceBox">
-							<view class="price">￥{{198*this.count}}</view>
+							<view class="price">￥{{198}}</view>
 							<text>(限购{{maxCount}}副)</text>
 							<view class="counter">
 								<view class="btn" disabled="this.addDisabled" type="default" @click="counter(false)">-</view>
@@ -67,7 +67,7 @@
 					<!-- <text class="icon">></text> -->
 					</view>
 					<view class="priceBox">
-						<view class="price">￥{{198*this.count}}</view>
+						<view class="price">￥198</view>
 						<text>(限购{{maxCount}}副)</text>
 						<view class="counter">
 							<view class="btn" disabled="this.addDisabled" type="default" @click="counter(false)">-</view>
@@ -169,7 +169,7 @@
 				line-height: 0;
 				font-size: 0;
 				position: relative;
-				top: -10px;
+				top: -6px;
 				left: 4px;
 				-webkit-transform: rotate(45deg);
 			}
@@ -303,7 +303,7 @@
 		.footer{
 			position: fixed;
 			left: 0;
-			bottom: 50px;
+			bottom: 0px;
 			height: 112rpx;
 			width: 100%;
 			background-color: #FFFFFF;
diff --git a/src/pages/detailsChoiceArgs/compoents/MyCollapse.vue b/src/pages/detailsChoiceArgs/compoents/MyCollapse.vue
index 3bbf9f9..3ab45b4 100644
--- a/src/pages/detailsChoiceArgs/compoents/MyCollapse.vue
+++ b/src/pages/detailsChoiceArgs/compoents/MyCollapse.vue
@@ -4,48 +4,52 @@
 		<view class="head">
 			<view>{{title}}</view>
 			<view v-if="title==='折射率'" class="headMid">注：折射率越高，镜片越薄，看着更美观。</view>
-			<view class="headRighted" v-if="this.isOpen" @click="myCollapseChange(isOpen)"></view>
+			<view class="headRighted" v-if="isOpen" @click="myCollapseChange(isOpen)"></view>
 			<view class="headRight" v-else @click="myCollapseChange(isOpen)" ></view> 
 		</view>
 		<view class="body">
-			<block v-if="this.isOpen">
+			
+			<block v-if="isOpen">
+				
 				<view style="background-color: #FFFFFF;" class="funBox">
-					<template v-if="title==='镜片种类'">
+					<block v-if="title==='镜片种类'">
 						<view class="noRange">
-							<block v-for="(item,index) in funList" :key="item.key">
-								<view class="boxChoiced" v-if="item.isChioce" @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
-								<view class="boxChoice" v-else @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
+							<block v-for="(item) in funList" :key="item.key">
+								<view  v-bind:class="item.isChioce?'boxChoiced':'boxChoice'" 
+								@click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
 							</block>
 						</view>
 						<view class="noRange">
 							<block v-for="(item,index) in funList2" :key="item.key">
-								<view class="boxChoiced-C" :style="colorList[index]"  v-if="item.isChioce" @click="choice2(index,item.key-1,item.isChioce)"></view>
-								<view class="boxChoice-C" :style="colorList[index]" v-else @click="choice2(index,item.key-1,item.isChioce)"></view>
+								<view v-bind:class="item.isChioce?'boxChoiced-C':'boxChoice-C'" 
+								:style="colorList[index]" @click="choice2(index,item.key-1,item.isChioce)"></view>
 							</block>
 						</view>
-					</template>
-					<template v-else>
-						<view class="range" v-for="(item,index) in funList" :key="item.key">{{item.range}}</view>
+					</block>
+					<block v-else>
+						<view class="range" v-for="(item) in funList" :key="item.key">{{item.range}}</view>
 						<view class="noRange">
-							<block v-for="(item,index) in funList" :key="item.key">
-								<view class="boxChoiced" v-if="item.isChioce" @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
-								<view class="boxChoice" v-else @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
+							<block v-for="(item) in funList" :key="item.key">
+								<view   v-bind:class="item.isChioce?'boxChoiced':'boxChoice'"
+								  @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
 							</block>
 						</view>
-						<!-- 手动换行 -->
+						
 						<view class="range" v-for="(item) in funList2" :key="item.key">{{item.range}}</view>
 						<view class="noRange" style="max-width: 624rpx">
 							<block v-for="(item,index) in funList2" :key="item.key">
-								<view class="boxChoiced" v-if="item.isChioce" @click="choice2(index,item.key-1,item.isChioce)">{{item.name}}</view>
-								<view class="boxChoice" v-else @click="choice2(index,item.key-1,item.isChioce)">{{item.name}}</view>
+								<view v-bind:class="item.isChioce?'boxChoiced':'boxChoice'"
+								@click="choice2(index,item.key-1,item.isChioce)">{{item.name}}</view>
 							</block>
 						</view>
-					</template>
-					
+					</block>
 				</view>
 			</block>
+			
 			<block v-else>
-				*<text v-for="(item,index) in funContent" :key="index">{{item}}</text>
+				*<block v-for="(item,index) in funContent" :key="index">
+					<text v-if="item!==null">{{item}}</text>
+				</block>
 			</block>
 		</view>
 	</view>
@@ -60,18 +64,17 @@
 				type: Boolean,
 				default: true
 			},
-			funList:{
-				type: Array,
-				default: []
+			funListProp:{
+				"name":String,
+				"isChioce": Number,
+				"key":Number
 			},
-			funList2:{
+			funList2Prop:{
 				type:Array,
-				
 			}
 			,
-			funContent: {
-				type: Array,
-				default: []
+			funContentProp: {
+				type: Array
 			},
 			title:{
 				type: String,
@@ -88,9 +91,13 @@
 					"background-image: linear-gradient(180deg, #AEA8A8 1%, #624B3F 100%);",
 					"background-image: linear-gradient(180deg, #AEA096 1%, #5E3521 100%);",
 					"background-image: linear-gradient(180deg, #6F6864 1%, #352B26 100%);"
-				]
+				],
+				funList: this.funListProp,
+				funList2: this.funList2Prop,
+				funContent: this.funContentProp
 			};
 		},
+
 		methods:{
 			myCollapseChange(isopen){
 				this.isOpen = !isopen
diff --git a/src/pages/detailsChoiceArgs/detailsChoiceArgs.vue b/src/pages/detailsChoiceArgs/detailsChoiceArgs.vue
index 36aade9..f529538 100644
--- a/src/pages/detailsChoiceArgs/detailsChoiceArgs.vue
+++ b/src/pages/detailsChoiceArgs/detailsChoiceArgs.vue
@@ -17,20 +17,20 @@
 		</view>
 		<view class="goods-data">
 			<!-- 实用功能折叠框 -->
-			<MyCollapse :isOpenProps="funIsOpen" :funList="funList"  :funContent="funContent" title="实用功能"></MyCollapse>
-			<MyCollapse :isOpenProps="kindIsOpen" :funList="kindList1" :funList2="kindList2"  :funContent="kindContent" title="镜片种类"></MyCollapse>
-			<MyCollapse :isOpenProps="maIsOpen" :funList="maList1" :funList2="maList2" :funContent="maContent" title="材质选择"></MyCollapse>
-			<MyCollapse :isOpenProps="reIsOpen" :funList="reList1" :funList2="reList2" :funContent="reContent" title="折射率"></MyCollapse>
+			<MyCollapse :isOpenProps="funIsOpen" :funListProp="funList"  :funContentProp="funContent" title="实用功能"></MyCollapse>
+			<MyCollapse :isOpenProps="kindIsOpen" :funListProp="kindList1" :funList2Prop="kindList2"  :funContentProp="kindContent" title="镜片种类"></MyCollapse>
+			<MyCollapse :isOpenProps="maIsOpen" :funListProp="maList1" :funList2Prop="maList2" :funContentProp="maContent" title="材质选择"></MyCollapse>
+			<MyCollapse :isOpenProps="reIsOpen" :funListProp="reList1" :funList2Prop="reList2" :funContentProp="reContent" title="折射率"></MyCollapse>
 			
 			<view class="opCollapse">
 				<view class="head">
 					<view v-if="!opIsOpen">填写验光数据</view>
 					<view v-else></view>
-					<view class="headRighted" v-if="this.opIsOpen" @click="myCollapseChange(opIsOpen)"></view>
+					<view class="headRighted" v-if="opIsOpen" @click="myCollapseChange(opIsOpen)"></view>
 					<view class="headRight" v-else @click="myCollapseChange(opIsOpen)" ></view> 
 				</view>
 				<view class="body">
-					<block v-if="this.opIsOpen">
+					<template v-if="opIsOpen">
 						
 						<view class="goods-form">
 						    <text class="p1">填写验光数据</text>
@@ -135,8 +135,8 @@
 						    </view>
 						</view>
 					
-					</block>
-					<block v-else>
+					</template>
+					<template v-else>
 						<view v-for="item in pickerInfoList" :key="item.key" class="bodyBox">
 							<template v-if="item.nameC==='验光日期'">
 								<text class="names">{{item.nameC}}</text>
@@ -154,7 +154,7 @@
 									<text>右&nbsp;{{item.nameArray2[item.nameIndex2]}}</text>
 							</template>
 						</view>
-					</block>
+					</template>
 				</view>
 			</view>
 		
@@ -177,17 +177,17 @@
 				// 实用功能参数
 				funIsOpen:true, // 默认myCollapse开启
 				funList: [
-					{"name":"防紫外线","isChioce":false,key:1},
-					{"name":"防蓝光","isChioce":false,key:2},
-					{"name":"智能变色","isChioce":false,key:3},
-					{"name":"易清洁","isChioce":false,key:4},
-					{"name":"防辐射","isChioce":false,key:5},
-					{"name":"抗疲劳","isChioce":false,key:6},
+					{"name":"防紫外线","isChioce": false,"key":1},
+					{"name":"防蓝光","isChioce": false,"key":2},
+					{"name":"智能变色","isChioce": false,"key":3},
+					{"name":"易清洁","isChioce": false,"key":4},
+					{"name":"防辐射","isChioce": false,"key":5},
+					{"name":"抗疲劳","isChioce": false,"key":6},
 				],
 				funContent:[],
 				
 				// 镜片种类参数
-				kindIsOpen:false, // 默认myCollapse开启
+				kindIsOpen:true, 
 				kindList1: [
 					{"name":"染色","isChioce":false,key:1},
 					{"name":"渐变","isChioce":false,key:2},
@@ -201,7 +201,7 @@
 				],
 				kindContent:[],
 				// 材质选择
-				maIsOpen:false,
+				maIsOpen:true,
 				maList1: [
 					{"name":"树脂镜片","isChioce":false,key:1,"range":"0-300度","isRange":true},
 					{"name":"特殊镜片","isChioce":false,key:2},
@@ -212,7 +212,7 @@
 				],
 				maContent:[],
 				// 折射率参数
-				reIsOpen:false,
+				reIsOpen:true,
 				reList1: [
 					{"name":"1.56（推荐）","isChioce":false,key:1,"range":"0-300度","isRange":true},
 					{"name":"1.60","isChioce":false,key:2},
@@ -225,7 +225,7 @@
 				],
 				reContent:[],
 				// 验光参数
-				opIsOpen:false,
+				opIsOpen:true,
 				tablist: {
 				        // read: true,
 				        // seeLong: false,
diff --git a/src/pages/myOrder/myOrder.vue b/src/pages/myOrder/myOrder.vue
index d3ad1a7..3f81338 100644
--- a/src/pages/myOrder/myOrder.vue
+++ b/src/pages/myOrder/myOrder.vue
@@ -20,8 +20,7 @@
 				<OrderCard :order = "order" :current="current"></OrderCard>
 			</view>
 		</view>
-		<navigator url="/pages/user/user" open-type="switchTab"><view class="footer">已显示全部</view></navigator>
-		<!-- <view class="footer">已显示全部</view> -->
+		<view class="footer">已显示全部</view>
 	</view>
 </template>
 <script>
-- 
2.0.0