Adam / gulu-vue

Download as
Browse Code »

Commit 09a4a9a0aa68e86f0c0a8b5b85adc0cca5b04c66

Authored by BigBoss
2 parents c338b4909b eab89b2542
Exists in master

修改冲突

Showing 5 changed files   Show diff stats
1   -{
2   - "pages": [
3   - {
4   - "path" : "pages/myOrder/myOrder",
5   - "style" : {
6   - "navigationBarTitleText": "我的订单"}
7   - },
8   - {
9   - "path": "pages/cart/cart",
10   - "style": {
11   - "navigationBarTitleText": "购物车"
12   - }
13   - },
14   - {
15   - "path": "pages/index/index",
16   - "style": {
17   - "navigationBarTitleText": "商城一览"
18   - }
19   - },
20   - {
21   - "path": "pages/frameDetail/frameDetail",
22   - "style": {
23   - "navigationBarTitleText": "产品详情"
24   - }
25   - },
26   - {
27   - "path": "pages/lensDetails/lensDetails",
28   - "style": {
29   - "navigationBarTitleText": "产品详情"
30   - }
31   - },
32   - {
33   - "path" : "pages/purchaseLenses/purchaseLenses",
34   - "style" : {
35   - "navigationBarTitleText": "产品选购"
36   - }
37   - },
38   - {
39   - "path" : "pages/refundProgress/refundProgress",
40   - "style": {
41   - "navigationBarTitleText": "申请退款"
42   - }
43   - },
44   - {
45   - "path": "pages/addAddress/addAddress",
46   - "style": {
47   - "navigationBarTitleText": "新增地址"
48   - }
49   - },
50   - {
51   - "path" : "pages/confirmOrder/confirmOrder",
52   - "style" : {
53   - "navigationBarTitleText": "确认订单"}
54   - },
55   - {
56   - "path": "pages/user/user",
57   - "style": {
58   - "navigationBarTitleText": "我的"
59   - }
60   - },
61   - {
62   - "path": "pages/refundment/refundWays"
63   - },
64   - {
65   - "path": "pages/refundment/refundment"
66   - },
67   - {
68   - "path": "pages/predelivery/predelivery"
69   - },
70   - {
71   - "path": "pages/customerService/customerService",
72   - "style":{
73   - "navigationBarTitleText" : "在线客服"
74   - }
75   - },
76   - {
77   - "path": "pages/myOrderPaying/myOrderPaying",
78   - "style":{
79   - "navigationBarTitleText" : "我的订单"
80   - }
81   - },
82   - {
83   - "path": "pages/detailsChoiceArgs/detailsChoiceArgs",
84   - "style":{
85   - "navigationBarTitleText" : "镜片名称名称"
86   - }
87   - },
88   - {
89   - "path" : "pages/detailStandard/detailStandard_sun",
90   - "style": {
91   - "navigationBarTitleText": "太阳镜选购页"
92   - }
93   - },
94   - {
95   - "path" : "pages/detailStandard/detailStandard_k",
96   - "style": {
97   - "navigationBarTitleText": "镜框选购页"
98   - }
99   - }
100   -
101   - ],
102   - "globalStyle": {
103   - "navigationBarTextStyle": "black",
104   - "navigationBarTitleText": "uni-app",
105   - "navigationBarBackgroundColor": "#F8F8F8",
106   - "backgroundColor": "#F8F8F8"
107   - },
108   - "tabBar": {
109   - "color": "#C0C4CC",
110   - "selectedColor": "#fa436a",
111   - "borderStyle": "black",
112   - "backgroundColor": "#ffffff",
113   - "list": [{
114   - "pagePath": "pages/index/index",
115   - "iconPath": "static/tab-home.png",
116   - "selectedIconPath": "static/tab-home-current.png",
117   - "text": "首页"
118   - },
119   - {
120   - "pagePath": "pages/cart/cart",
121   - "iconPath": "static/tab-cart.png",
122   - "selectedIconPath": "static/tab-cart-current.png",
123   - "text": "购物车"
124   - },
125   - {
126   - "pagePath": "pages/user/user",
127   - "iconPath": "static/tab-my.png",
128   - "selectedIconPath": "static/tab-my-current.png",
129   - "text": "我的"
130   - }
131   - ]
132   - },
133   - "condition" : { //模式配置，仅开发期间生效
134   - "current": 0, //当前激活的模式(list 的索引项)
135   - "list": [
136   - {
137   - "name": "", //模式名称
138   - "path": "", //启动页面，必选
139   - "query": "" //启动参数，在页面的onLoad函数里面得到
140   - }
141   - ]
142   - }
143   -}
  1 +{
  2 + "pages" : [
  3 + {
  4 + "path" : "pages/myOrder/myOrder",
  5 + "style" : {
  6 + "navigationBarTitleText" : "我的订单"
  7 + }
  8 + },
  9 + {
  10 + "path" : "pages/cart/cart",
  11 + "style" : {
  12 + "navigationBarTitleText" : "购物车"
  13 + }
  14 + },
  15 + {
  16 + "path" : "pages/index/index",
  17 + "style" : {
  18 + "navigationBarTitleText" : "商城一览"
  19 + }
  20 + },
  21 + {
  22 + "path" : "pages/frameDetail/frameDetail",
  23 + "style" : {
  24 + "navigationBarTitleText" : "产品详情"
  25 + }
  26 + },
  27 + {
  28 + "path" : "pages/lensDetails/lensDetails",
  29 + "style" : {
  30 + "navigationBarTitleText" : "产品详情"
  31 + }
  32 + },
  33 + {
  34 + "path" : "pages/purchaseLenses/purchaseLenses",
  35 + "style" : {
  36 + "navigationBarTitleText" : "产品选购"
  37 + }
  38 + },
  39 + {
  40 + "path" : "pages/refundProgress/refundProgress",
  41 + "style" : {
  42 + "navigationBarTitleText" : "申请退款"
  43 + }
  44 + },
  45 + {
  46 + "path" : "pages/addAddress/addAddress",
  47 + "style" : {
  48 + "navigationBarTitleText" : "新增地址"
  49 + }
  50 + },
  51 + {
  52 + "path" : "pages/confirmOrder/confirmOrder",
  53 + "style" : {
  54 + "navigationBarTitleText" : "确认订单"
  55 + }
  56 + },
  57 + {
  58 + "path" : "pages/user/user",
  59 + "style" : {
  60 + "navigationBarTitleText" : "我的"
  61 + }
  62 + },
  63 + {
  64 + "path" : "pages/refundment/refundWays"
  65 + },
  66 + {
  67 + "path" : "pages/refundment/refundment"
  68 + },
  69 + {
  70 + "path" : "pages/predelivery/predelivery"
  71 + },
  72 + {
  73 + "path" : "pages/customerService/customerService",
  74 + "style" : {
  75 + "navigationBarTitleText" : "在线客服"
  76 + }
  77 + },
  78 + {
  79 + "path" : "pages/myOrderPaying/myOrderPaying",
  80 + "style" : {
  81 + "navigationBarTitleText" : "我的订单"
  82 + }
  83 + },
  84 + {
  85 + "path" : "pages/detailsChoiceArgs/detailsChoiceArgs",
  86 + "style" : {
  87 + "navigationBarTitleText" : "镜片名称名称"
  88 + }
  89 + },
  90 + {
  91 + "path" : "pages/detailStandard/detailStandard_sun",
  92 + "style" : {
  93 + "navigationBarTitleText" : "太阳镜选购页"
  94 + }
  95 + },
  96 + {
  97 + "path" : "pages/detailStandard/detailStandard_k",
  98 + "style" : {
  99 + "navigationBarTitleText" : "镜框选购页"
  100 + }
  101 + },
  102 + {
  103 + "path" : "pages/detailsChoiceArgs/compoents/MyCollapse",
  104 + "style" : {}
  105 + }
  106 + ],
  107 + "globalStyle" : {
  108 + "navigationBarTextStyle" : "black",
  109 + "navigationBarTitleText" : "uni-app",
  110 + "navigationBarBackgroundColor" : "#F8F8F8",
  111 + "backgroundColor" : "#F8F8F8"
  112 + },
  113 + "tabBar" : {
  114 + "color" : "#C0C4CC",
  115 + "selectedColor" : "#fa436a",
  116 + "borderStyle" : "black",
  117 + "backgroundColor" : "#ffffff",
  118 + "list" : [
  119 + {
  120 + "pagePath" : "pages/index/index",
  121 + "iconPath" : "static/tab-home.png",
  122 + "selectedIconPath" : "static/tab-home-current.png",
  123 + "text" : "首页"
  124 + },
  125 + {
  126 + "pagePath" : "pages/cart/cart",
  127 + "iconPath" : "static/tab-cart.png",
  128 + "selectedIconPath" : "static/tab-cart-current.png",
  129 + "text" : "购物车"
  130 + },
  131 + {
  132 + "pagePath" : "pages/user/user",
  133 + "iconPath" : "static/tab-my.png",
  134 + "selectedIconPath" : "static/tab-my-current.png",
  135 + "text" : "我的"
  136 + }
  137 + ]
  138 + },
  139 + "condition" : {
  140 + //模式配置，仅开发期间生效
  141 + "current" : 0, //当前激活的模式(list 的索引项)
  142 + "list" : [
  143 + {
  144 + "name" : "", //模式名称
  145 + "path" : "", //启动页面，必选
  146 + "query" : "" //启动参数，在页面的onLoad函数里面得到
  147 + }
  148 + ]
  149 + }
  150 +}
... ...
src/pages/cart/cart.vue
Diff comments   View file @09a4a9a
... ... @@ -36,7 +36,7 @@
36 36 <!-- <text class="icon">></text> -->
37 37 </view>
38 38 <view class="priceBox">
39   - <view class="price">￥{{198*this.count}}</view>
  39 + <view class="price">￥{{198}}</view>
40 40 <text>(限购{{maxCount}}副)</text>
41 41 <view class="counter">
42 42 <view class="btn" disabled="this.addDisabled" type="default" @click="counter(false)">-</view>
... ... @@ -67,7 +67,7 @@
67 67 <!-- <text class="icon">></text> -->
68 68 </view>
69 69 <view class="priceBox">
70   - <view class="price">￥{{198*this.count}}</view>
  70 + <view class="price">￥198</view>
71 71 <text>(限购{{maxCount}}副)</text>
72 72 <view class="counter">
73 73 <view class="btn" disabled="this.addDisabled" type="default" @click="counter(false)">-</view>
... ... @@ -169,7 +169,7 @@
169 169 line-height: 0;
170 170 font-size: 0;
171 171 position: relative;
172   - top: -10px;
  172 + top: -6px;
173 173 left: 4px;
174 174 -webkit-transform: rotate(45deg);
175 175 }
... ... @@ -303,7 +303,7 @@
303 303 .footer{
304 304 position: fixed;
305 305 left: 0;
306   - bottom: 50px;
  306 + bottom: 0px;
307 307 height: 112rpx;
308 308 width: 100%;
309 309 background-color: #FFFFFF;
... ...
src/pages/detailsChoiceArgs/compoents/MyCollapse.vue
Diff comments   View file @09a4a9a
... ... @@ -4,48 +4,52 @@
4 4 <view class="head">
5 5 <view>{{title}}</view>
6 6 <view v-if="title==='折射率'" class="headMid">注：折射率越高，镜片越薄，看着更美观。</view>
7   - <view class="headRighted" v-if="this.isOpen" @click="myCollapseChange(isOpen)"></view>
  7 + <view class="headRighted" v-if="isOpen" @click="myCollapseChange(isOpen)"></view>
8 8 <view class="headRight" v-else @click="myCollapseChange(isOpen)" ></view>
9 9 </view>
10 10 <view class="body">
11   - <block v-if="this.isOpen">
  11 +
  12 + <block v-if="isOpen">
  13 +
12 14 <view style="background-color: #FFFFFF;" class="funBox">
13   - <template v-if="title==='镜片种类'">
  15 + <block v-if="title==='镜片种类'">
14 16 <view class="noRange">
15   - <block v-for="(item,index) in funList" :key="item.key">
16   - <view class="boxChoiced" v-if="item.isChioce" @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
17   - <view class="boxChoice" v-else @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
  17 + <block v-for="(item) in funList" :key="item.key">
  18 + <view v-bind:class="item.isChioce?'boxChoiced':'boxChoice'"
  19 + @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
18 20 </block>
19 21 </view>
20 22 <view class="noRange">
21 23 <block v-for="(item,index) in funList2" :key="item.key">
22   - <view class="boxChoiced-C" :style="colorList[index]" v-if="item.isChioce" @click="choice2(index,item.key-1,item.isChioce)"></view>
23   - <view class="boxChoice-C" :style="colorList[index]" v-else @click="choice2(index,item.key-1,item.isChioce)"></view>
  24 + <view v-bind:class="item.isChioce?'boxChoiced-C':'boxChoice-C'"
  25 + :style="colorList[index]" @click="choice2(index,item.key-1,item.isChioce)"></view>
24 26 </block>
25 27 </view>
26   - </template>
27   - <template v-else>
28   - <view class="range" v-for="(item,index) in funList" :key="item.key">{{item.range}}</view>
  28 + </block>
  29 + <block v-else>
  30 + <view class="range" v-for="(item) in funList" :key="item.key">{{item.range}}</view>
29 31 <view class="noRange">
30   - <block v-for="(item,index) in funList" :key="item.key">
31   - <view class="boxChoiced" v-if="item.isChioce" @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
32   - <view class="boxChoice" v-else @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
  32 + <block v-for="(item) in funList" :key="item.key">
  33 + <view v-bind:class="item.isChioce?'boxChoiced':'boxChoice'"
  34 + @click="choice(item.key-1,item.isChioce)">{{item.name}}</view>
33 35 </block>
34 36 </view>
35   - <!-- 手动换行 -->
  37 +
36 38 <view class="range" v-for="(item) in funList2" :key="item.key">{{item.range}}</view>
37 39 <view class="noRange" style="max-width: 624rpx">
38 40 <block v-for="(item,index) in funList2" :key="item.key">
39   - <view class="boxChoiced" v-if="item.isChioce" @click="choice2(index,item.key-1,item.isChioce)">{{item.name}}</view>
40   - <view class="boxChoice" v-else @click="choice2(index,item.key-1,item.isChioce)">{{item.name}}</view>
  41 + <view v-bind:class="item.isChioce?'boxChoiced':'boxChoice'"
  42 + @click="choice2(index,item.key-1,item.isChioce)">{{item.name}}</view>
41 43 </block>
42 44 </view>
43   - </template>
44   -
  45 + </block>
45 46 </view>
46 47 </block>
  48 +
47 49 <block v-else>
48   - *<text v-for="(item,index) in funContent" :key="index">{{item}}</text>
  50 + *<block v-for="(item,index) in funContent" :key="index">
  51 + <text v-if="item!==null">{{item}}</text>
  52 + </block>
49 53 </block>
50 54 </view>
51 55 </view>
... ... @@ -60,18 +64,17 @@
60 64 type: Boolean,
61 65 default: true
62 66 },
63   - funList:{
64   - type: Array,
65   - default: []
  67 + funListProp:{
  68 + "name":String,
  69 + "isChioce": Number,
  70 + "key":Number
66 71 },
67   - funList2:{
  72 + funList2Prop:{
68 73 type:Array,
69   -
70 74 }
71 75 ,
72   - funContent: {
73   - type: Array,
74   - default: []
  76 + funContentProp: {
  77 + type: Array
75 78 },
76 79 title:{
77 80 type: String,
... ... @@ -88,9 +91,13 @@
88 91 "background-image: linear-gradient(180deg, #AEA8A8 1%, #624B3F 100%);",
89 92 "background-image: linear-gradient(180deg, #AEA096 1%, #5E3521 100%);",
90 93 "background-image: linear-gradient(180deg, #6F6864 1%, #352B26 100%);"
91   - ]
  94 + ],
  95 + funList: this.funListProp,
  96 + funList2: this.funList2Prop,
  97 + funContent: this.funContentProp
92 98 };
93 99 },
  100 +
94 101 methods:{
95 102 myCollapseChange(isopen){
96 103 this.isOpen = !isopen
... ...
src/pages/detailsChoiceArgs/detailsChoiceArgs.vue
Diff comments   View file @09a4a9a
... ... @@ -17,20 +17,20 @@
17 17 </view>
18 18 <view class="goods-data">
19 19 <!-- 实用功能折叠框 -->
20   - <MyCollapse :isOpenProps="funIsOpen" :funList="funList" :funContent="funContent" title="实用功能"></MyCollapse>
21   - <MyCollapse :isOpenProps="kindIsOpen" :funList="kindList1" :funList2="kindList2" :funContent="kindContent" title="镜片种类"></MyCollapse>
22   - <MyCollapse :isOpenProps="maIsOpen" :funList="maList1" :funList2="maList2" :funContent="maContent" title="材质选择"></MyCollapse>
23   - <MyCollapse :isOpenProps="reIsOpen" :funList="reList1" :funList2="reList2" :funContent="reContent" title="折射率"></MyCollapse>
  20 + <MyCollapse :isOpenProps="funIsOpen" :funListProp="funList" :funContentProp="funContent" title="实用功能"></MyCollapse>
  21 + <MyCollapse :isOpenProps="kindIsOpen" :funListProp="kindList1" :funList2Prop="kindList2" :funContentProp="kindContent" title="镜片种类"></MyCollapse>
  22 + <MyCollapse :isOpenProps="maIsOpen" :funListProp="maList1" :funList2Prop="maList2" :funContentProp="maContent" title="材质选择"></MyCollapse>
  23 + <MyCollapse :isOpenProps="reIsOpen" :funListProp="reList1" :funList2Prop="reList2" :funContentProp="reContent" title="折射率"></MyCollapse>
24 24  
25 25 <view class="opCollapse">
26 26 <view class="head">
27 27 <view v-if="!opIsOpen">填写验光数据</view>
28 28 <view v-else></view>
29   - <view class="headRighted" v-if="this.opIsOpen" @click="myCollapseChange(opIsOpen)"></view>
  29 + <view class="headRighted" v-if="opIsOpen" @click="myCollapseChange(opIsOpen)"></view>
30 30 <view class="headRight" v-else @click="myCollapseChange(opIsOpen)" ></view>
31 31 </view>
32 32 <view class="body">
33   - <block v-if="this.opIsOpen">
  33 + <template v-if="opIsOpen">
34 34  
35 35 <view class="goods-form">
36 36 <text class="p1">填写验光数据</text>
... ... @@ -135,8 +135,8 @@
135 135 </view>
136 136 </view>
137 137  
138   - </block>
139   - <block v-else>
  138 + </template>
  139 + <template v-else>
140 140 <view v-for="item in pickerInfoList" :key="item.key" class="bodyBox">
141 141 <template v-if="item.nameC==='验光日期'">
142 142 <text class="names">{{item.nameC}}</text>
... ... @@ -154,7 +154,7 @@
154 154 <text>右&nbsp;{{item.nameArray2[item.nameIndex2]}}</text>
155 155 </template>
156 156 </view>
157   - </block>
  157 + </template>
158 158 </view>
159 159 </view>
160 160  
... ... @@ -177,17 +177,17 @@
177 177 // 实用功能参数
178 178 funIsOpen:true, // 默认myCollapse开启
179 179 funList: [
180   - {"name":"防紫外线","isChioce":false,key:1},
181   - {"name":"防蓝光","isChioce":false,key:2},
182   - {"name":"智能变色","isChioce":false,key:3},
183   - {"name":"易清洁","isChioce":false,key:4},
184   - {"name":"防辐射","isChioce":false,key:5},
185   - {"name":"抗疲劳","isChioce":false,key:6},
  180 + {"name":"防紫外线","isChioce": false,"key":1},
  181 + {"name":"防蓝光","isChioce": false,"key":2},
  182 + {"name":"智能变色","isChioce": false,"key":3},
  183 + {"name":"易清洁","isChioce": false,"key":4},
  184 + {"name":"防辐射","isChioce": false,"key":5},
  185 + {"name":"抗疲劳","isChioce": false,"key":6},
186 186 ],
187 187 funContent:[],
188 188  
189 189 // 镜片种类参数
190   - kindIsOpen:false, // 默认myCollapse开启
  190 + kindIsOpen:true,
191 191 kindList1: [
192 192 {"name":"染色","isChioce":false,key:1},
193 193 {"name":"渐变","isChioce":false,key:2},
... ... @@ -201,7 +201,7 @@
201 201 ],
202 202 kindContent:[],
203 203 // 材质选择
204   - maIsOpen:false,
  204 + maIsOpen:true,
205 205 maList1: [
206 206 {"name":"树脂镜片","isChioce":false,key:1,"range":"0-300度","isRange":true},
207 207 {"name":"特殊镜片","isChioce":false,key:2},
... ... @@ -212,7 +212,7 @@
212 212 ],
213 213 maContent:[],
214 214 // 折射率参数
215   - reIsOpen:false,
  215 + reIsOpen:true,
216 216 reList1: [
217 217 {"name":"1.56（推荐）","isChioce":false,key:1,"range":"0-300度","isRange":true},
218 218 {"name":"1.60","isChioce":false,key:2},
... ... @@ -225,7 +225,7 @@
225 225 ],
226 226 reContent:[],
227 227 // 验光参数
228   - opIsOpen:false,
  228 + opIsOpen:true,
229 229 tablist: {
230 230 // read: true,
231 231 // seeLong: false,
... ...
src/pages/myOrder/myOrder.vue
Diff comments   View file @09a4a9a
... ... @@ -20,8 +20,7 @@
20 20 <OrderCard :order = "order" :current="current"></OrderCard>
21 21 </view>
22 22 </view>
23   - <navigator url="/pages/user/user" open-type="switchTab"><view class="footer">已显示全部</view></navigator>
24   - <!-- <view class="footer">已显示全部</view> -->
  23 + <view class="footer">已显示全部</view>
25 24 </view>
26 25 </template>
27 26 <script>
... ...