Commit e477b7dc7eb1dbb3d1ce9d97e74ac0583d14cac3

Authored by BigBoss
1 parent 7fe7e00174
Exists in master

修改冲突

1 { 1 {
2 "pages" : [ 2 "pages" : [
3 { 3 {
4 "path" : "pages/user/user", 4 "path" : "pages/user/user",
5 "style" : { 5 "style" : {
6 "navigationBarTitleText" : "我的" 6 "navigationBarTitleText" : "我的"
7 } 7 }
8 }, 8 },
9 { 9 {
10 "path" : "pages/addOpticsData/addOpticsData", 10 "path" : "pages/addOpticsData/addOpticsData",
11 "style" : { 11 "style" : {
12 "navigationBarTitleText" : "验光数据"} 12 "navigationBarTitleText" : "验光数据"}
13 }, 13 },
14 { 14 {
15 "path" : "pages/index/index", 15 "path" : "pages/index/index",
16 "style" : { 16 "style" : {
17 "navigationBarTitleText" : "商城一览" 17 "navigationBarTitleText" : "商城一览"
18 } 18 }
19 }, 19 },
20 { 20 {
21 "path" : "pages/detailsChoiceArgs/detailsChoiceArgs", 21 "path" : "pages/detailsChoiceArgs/detailsChoiceArgs",
22 "style" : { 22 "style" : {
23 "navigationBarTitleText" : "镜片名称名称" 23 "navigationBarTitleText" : "镜片名称名称"
24 } 24 }
25 }, 25 },
26 { 26 {
27 "path" : "pages/purchaseLenses/purchaseLenses", 27 "path" : "pages/purchaseLenses/purchaseLenses",
28 "style" : { 28 "style" : {
29 "navigationBarTitleText" : "产品选购" 29 "navigationBarTitleText" : "产品选购"
30 } 30 }
31 }, 31 },
32 { 32 {
33 "path" : "pages/lensDetails/lensDetails", 33 "path" : "pages/lensDetails/lensDetails",
34 "style" : { 34 "style" : {
35 "navigationBarTitleText" : "产品详情" 35 "navigationBarTitleText" : "产品详情"
36 } 36 }
37 }, 37 },
38 { 38 {
39 "path" : "pages/myOrderPaying/myOrderPaying", 39 "path" : "pages/myOrderPaying/myOrderPaying",
40 "style" : { 40 "style" : {
41 "navigationBarTitleText" : "我的订单" 41 "navigationBarTitleText" : "我的订单"
42 } 42 }
43 }, 43 },
44 { 44 {
45 "path" : "pages/myOrder/myOrder", 45 "path" : "pages/myOrder/myOrder",
46 "style" : { 46 "style" : {
47 "navigationBarTitleText" : "我的订单" 47 "navigationBarTitleText" : "我的订单"
48 } 48 }
49 }, 49 },
50 { 50 {
51 "path" : "pages/cart/cart", 51 "path" : "pages/cart/cart",
52 "style" : { 52 "style" : {
53 "navigationBarTitleText" : "购物车" 53 "navigationBarTitleText" : "购物车"
54 } 54 }
55 }, 55 },
56 // { 56 {
57 // "path" : "pages/frameDetail/frameDetail", 57 "path" : "pages/frameDetail/frameDetail",
58 // "style" : { 58 "style" : {
59 // "navigationBarTitleText" : "产品详情" 59 "navigationBarTitleText" : "产品详情"
60 // } 60 }
61 // }, 61 },
62 { 62 {
63 "path" : "pages/refundProgress/refundProgress", 63 "path" : "pages/refundProgress/refundProgress",
64 "style" : { 64 "style" : {
65 "navigationBarTitleText" : "申请退款" 65 "navigationBarTitleText" : "申请退款"
66 } 66 }
67 }, 67 },
68 { 68 {
69 "path" : "pages/address/addAddress", 69 "path" : "pages/address/addAddress",
70 "style" : { 70 "style" : {
71 "navigationBarTitleText" : "新增地址" 71 "navigationBarTitleText" : "新增地址"
72 } 72 }
73 }, 73 },
74 { 74 {
75 "path" : "pages/address/addressList", 75 "path" : "pages/address/addressList",
76 "style" : { 76 "style" : {
77 "navigationBarTitleText" : "地址管理" 77 "navigationBarTitleText" : "地址管理"
78 } 78 }
79 }, 79 },
80 { 80 {
81 "path" : "pages/confirmOrder/confirmOrder", 81 "path" : "pages/confirmOrder/confirmOrder",
82 "style" : { 82 "style" : {
83 "navigationBarTitleText" : "确认订单" 83 "navigationBarTitleText" : "确认订单"
84 } 84 }
85 }, 85 },
86 { 86 {
87 "path" : "pages/refundment/refundWays", 87 "path" : "pages/refundment/refundWays",
88 "style" : { 88 "style" : {
89 "navigationBarTitleText" : "退款方式" 89 "navigationBarTitleText" : "退款方式"
90 } 90 }
91 }, 91 },
92 { 92 {
93 "path" : "pages/refundment/refundment", 93 "path" : "pages/refundment/refundment",
94 "style" : { 94 "style" : {
95 "navigationBarTitleText" : "申请退款" 95 "navigationBarTitleText" : "申请退款"
96 } 96 }
97 }, 97 },
98 { 98 {
99 "path" : "pages/predelivery/predelivery", 99 "path" : "pages/predelivery/predelivery",
100 "style" : { 100 "style" : {
101 "navigationBarTitleText" : "待发货" 101 "navigationBarTitleText" : "待发货"
102 } 102 }
103 }, 103 },
104 { 104 {
105 "path" : "pages/customerService/customerService", 105 "path" : "pages/customerService/customerService",
106 "style" : { 106 "style" : {
107 "navigationBarTitleText" : "在线客服" 107 "navigationBarTitleText" : "在线客服"
108 } 108 }
109 }, 109 },
110 { 110 {
111 "path" : "pages/detailStandard/detailStandard_sun", 111 "path" : "pages/detailStandard/detailStandard_sun",
112 "style" : { 112 "style" : {
113 "navigationBarTitleText" : "太阳镜选购页" 113 "navigationBarTitleText" : "太阳镜选购页"
114 } 114 }
115 }, 115 },
116 { 116 {
117 "path" : "pages/detailStandard/detailStandard_k", 117 "path" : "pages/detailStandard/detailStandard_k",
118 "style" : { 118 "style" : {
119 "navigationBarTitleText" : "镜框选购页" 119 "navigationBarTitleText" : "镜框选购页"
120 } 120 }
121 } 121 }
122 122
123 ,{ 123 ,{
124 "path" : "pages/newOpticsData/newOpticsData", 124 "path" : "pages/newOpticsData/newOpticsData",
125 "style" : {"navigationBarTitleText" : "验光数据"} 125 "style" : {"navigationBarTitleText" : "验光数据"}
126 } 126 }
127 ], 127 ],
128 "globalStyle" : { 128 "globalStyle" : {
129 "navigationBarTextStyle" : "black", 129 "navigationBarTextStyle" : "black",
130 "navigationBarTitleText" : "uni-app", 130 "navigationBarTitleText" : "uni-app",
131 "navigationBarBackgroundColor" : "#F8F8F8", 131 "navigationBarBackgroundColor" : "#F8F8F8",
132 "backgroundColor" : "#F8F8F8" 132 "backgroundColor" : "#F8F8F8"
133 }, 133 },
134 "tabBar" : { 134 "tabBar" : {
135 "color" : "#C0C4CC", 135 "color" : "#C0C4CC",
136 "selectedColor" : "#fa436a", 136 "selectedColor" : "#fa436a",
137 "borderStyle" : "black", 137 "borderStyle" : "black",
138 "backgroundColor" : "#ffffff", 138 "backgroundColor" : "#ffffff",
139 "list" : [ 139 "list" : [
140 { 140 {
141 "pagePath" : "pages/index/index", 141 "pagePath" : "pages/index/index",
142 "iconPath" : "static/tab-home.png", 142 "iconPath" : "static/tab-home.png",
143 "selectedIconPath" : "static/tab-home-current.png", 143 "selectedIconPath" : "static/tab-home-current.png",
144 "text" : "首页" 144 "text" : "首页"
145 }, 145 },
146 { 146 {
147 "pagePath" : "pages/cart/cart", 147 "pagePath" : "pages/cart/cart",
148 "iconPath" : "static/tab-cart.png", 148 "iconPath" : "static/tab-cart.png",
149 "selectedIconPath" : "static/tab-cart-current.png", 149 "selectedIconPath" : "static/tab-cart-current.png",
150 "text" : "购物车" 150 "text" : "购物车"
151 }, 151 },
152 { 152 {
153 "pagePath" : "pages/user/user", 153 "pagePath" : "pages/user/user",
154 "iconPath" : "static/tab-my.png", 154 "iconPath" : "static/tab-my.png",
155 "selectedIconPath" : "static/tab-my-current.png", 155 "selectedIconPath" : "static/tab-my-current.png",
156 "text" : "我的" 156 "text" : "我的"
157 } 157 }
158 ] 158 ]
159 }, 159 },
160 "condition" : { 160 "condition" : {
161 "current" : 0, 161 "current" : 0,
162 "list" : [ 162 "list" : [
163 { 163 {
164 "name" : "首页", 164 "name" : "首页",
165 "path" : "pages/index/index", 165 "path" : "pages/index/index",
166 "query" : "" 166 "query" : ""
167 }, { 167 }, {
168 "name" : "镜片、美瞳参数选购", 168 "name" : "镜片、美瞳参数选购",
169 "path" : "pages/purchaseLenses/purchaseLenses", 169 "path" : "pages/purchaseLenses/purchaseLenses",
170 "query" : "" 170 "query" : ""
171 }, { 171 }, {
172 "name" : "新增地址", 172 "name" : "新增地址",
173 "path" : "pages/address/addAddress", 173 "path" : "pages/address/addAddress",
174 "query" : "" 174 "query" : ""
175 }, { 175 }, {
176 "name" : "地址管理", 176 "name" : "地址管理",
177 "path" : "pages/address/addressList", 177 "path" : "pages/address/addressList",
178 "query" : "" 178 "query" : ""
179 } 179 }
180 ] 180 ]
181 } 181 }
182 } 182 }
src/pages/addOpticsData/addOpticsData.vue
1 <template> 1 <template>
2 <view class="wrap"> 2 <view class="wrap">
3 <!-- 弹窗 -->
3 <uni-popup ref="popup" type="center"> 4 <uni-popup ref="popup" type="center">
4 <!-- 给一个左边的样式 --> 5 <!-- 给一个左边弹窗的样式 -->
5 <view class="popUpWrap" :class="{'popUpWrap1': whichTap == 0}"> 6 <view class="popUpWrap" :class="{'popUpWrap1': whichTap == 0}">
6 <!-- 关闭弹窗按钮 --> 7 <!-- 关闭弹窗按钮 -->
7 <view class="closeBtn" @click="this.$refs.popup.close()"></view> 8 <view class="closeBtn" @click="this.$refs.popup.close()"></view>
9 <!-- 左 -->
8 <image class="glassInfo" src="../../static/img/myOpticsData/glassInfo.png" v-if="whichTap == 0" mode="aspectFit"></image> 10 <image class="glassInfo" src="../../static/img/myOpticsData/glassInfo.png" v-if="whichTap == 0" mode="aspectFit"></image>
11 <!-- 右 -->
9 <image class="dataInfo" src="../../static/img/myOpticsData/dataInfo.png" v-else mode="aspectFit"></image> 12 <image class="dataInfo" src="../../static/img/myOpticsData/dataInfo.png" v-else mode="aspectFit"></image>
10 </view> 13 </view>
11 </uni-popup> 14 </uni-popup>
15 <!-- 点击弹窗部分 -->
12 <view class="header"> 16 <view class="header">
13 <view class="headerLeft" @click=changeTap(0)> 17 <view class="headerLeft" @click=changeTap(0)>
14 <text>如何查看验光单?</text> 18 <text>如何查看验光单?</text>
15 <image src="../../static/dataLook.png" mode="aspectFit"></image> 19 <image src="../../static/dataLook.png" mode="aspectFit"></image>
16 </view> 20 </view>
17 <view class="headerRight" @click=changeTap(1)> 21 <view class="headerRight" @click=changeTap(1)>
18 <text>如何查看眼镜框架?</text> 22 <text>如何查看眼镜框架?</text>
19 <image src="../../static/glassLook.png" mode="aspectFit"></image> 23 <image src="../../static/glassLook.png" mode="aspectFit"></image>
20 </view> 24 </view>
21 </view> 25 </view>
26 <!-- 数据展示部分 -->
22 <view class="dataMenu"> 27 <view class="dataMenu">
23 <uni-collapse accordion="true"> 28 <uni-collapse accordion="true">
24 <view class="item" v-for="(loveItem,index) in loveList" :key="index"> 29 <view class="item" v-for="(loveItem,index) in loveList" :key="index">
25 <uni-collapse-item :title='loveItem.name' :time='getRightTime(loveItem.in_time)' :iconText='getFirstName(loveItem.name)' showAnimation='true'> 30 <uni-collapse-item :title='loveItem.name' :time='getRightTime(loveItem.in_time)' :iconText='getFirstName(loveItem.name)' showAnimation='true'>
26 <view class="loveDataInfo"> 31 <view class="loveDataInfo">
27 <view class="dataInfoItem"> 32 <view class="dataInfoItem">
28 <text>度数(SPH):</text><text>左:{{loveItem.leftSph}}</text><text>右:{{loveItem.rightSph}}</text> 33 <text>度数(SPH):</text><text>左:{{loveItem.leftSph}}</text><text>右:{{loveItem.rightSph}}</text>
29 </view> 34 </view>
30 <view class="dataInfoItem"> 35 <view class="dataInfoItem">
31 <text>散光(CYL):</text><text>左:{{loveItem.leftCyl}}</text><text>右:{{loveItem.rightCyl}}</text> 36 <text>散光(CYL):</text><text>左:{{loveItem.leftCyl}}</text><text>右:{{loveItem.rightCyl}}</text>
32 </view> 37 </view>
33 <view class="dataInfoItem"> 38 <view class="dataInfoItem">
34 <text>轴位(AXI):</text><text>左:{{loveItem.leftAxi}}</text><text>右:{{loveItem.rightAxi}}</text> 39 <text>轴位(AXI):</text><text>左:{{loveItem.leftAxi}}</text><text>右:{{loveItem.rightAxi}}</text>
35 </view> 40 </view>
36 <view class="dataInfoItem"> 41 <view class="dataInfoItem">
37 <text>瞳距(PD):</text><text>{{loveItem.pd}}</text> 42 <text>瞳距(PD):</text><text>{{loveItem.pd}}</text>
38 </view> 43 </view>
39 </view> 44 </view>
40 </uni-collapse-item> 45 </uni-collapse-item>
41 </view> 46 </view>
42 </uni-collapse> 47 </uni-collapse>
43 </view> 48 </view>
44 <view class="footer"> 49 <view class="footer">
45 <button class="btn" type="default" @click="toNewData">新建验光单</button> 50 <button class="btn" type="default" @click="toNewData">新建验光单</button>
46 </view> 51 </view>
47 </view> 52 </view>
48 </template> 53 </template>
49 54
50 <script> 55 <script>
51 import UniCollapse from '@/components/UniCollapse/UniCollapse.vue' 56 import UniCollapse from '@/components/UniCollapse/UniCollapse.vue'
52 import UniCollapseItem from '@/components/UniCollapseItem/UniCollapseItem.vue' 57 import UniCollapseItem from '@/components/UniCollapseItem/UniCollapseItem.vue'
53 import UniPopup from '@/components/UniPopup/uni-popup.vue' 58 import UniPopup from '@/components/UniPopup/uni-popup.vue'
54 import store from '@/store'; 59 import store from '@/store';
55 export default { 60 export default {
56 components: {UniCollapse,UniCollapseItem,UniPopup}, 61 components: {UniCollapse,UniCollapseItem,UniPopup},
57 data() { 62 data() {
58 return { 63 return {
59 whichTap:0 64 whichTap:0
60 }; 65 };
61 }, 66 },
62 onLoad: function(option) { 67 onLoad: function(option) {
63 //获取关心的人列表 68 //获取关心的人列表
64 store.dispatch('myLoveList/getLoveList', { 69 store.dispatch('myLoveList/getLoveList', {
65 uid: "1", 70 uid: "1",
66 }); 71 });
67 }, 72 },
68 computed:{ 73 computed:{
69 loveList() { 74 loveList() {
70 console.log(this.$store.state.myLoveList.loveList) 75 console.log(this.$store.state.myLoveList.loveList)
71 return this.$store.state.myLoveList.loveList || [] 76 return this.$store.state.myLoveList.loveList || []
72 }, 77 },
73 }, 78 },
74 methods:{ 79 methods:{
75 changeTap(item){ 80 changeTap(item){
76 this.whichTap = item 81 this.whichTap = item
77 this.$refs.popup.open() 82 this.$refs.popup.open()
78 }, 83 },
79 //给时间搞一个nice的格式 84 //给时间搞一个nice的格式
80 getRightTime(time){ 85 getRightTime(time){
81 //如果小于10 则返回'0'+m 86 //如果小于10 则返回'0'+m
82 // function add(m){return m<10?'0'+m:m} 87 // function add(m){return m<10?'0'+m:m}
83 //传给我的带有时分秒,想去除一下,但是完事IOS显示NaN,暂时不用吧 88 //传给我的带有时分秒,想去除一下,但是完事IOS显示NaN,暂时不用吧
84 // const oldTime = (new Date(time)).getTime() 89 // const oldTime = (new Date(time)).getTime()
85 // const year = new Date(oldTime).getFullYear() 90 // const year = new Date(oldTime).getFullYear()
86 // const month = new Date(oldTime).getMonth()+1 91 // const month = new Date(oldTime).getMonth()+1
87 // const day = new Date(oldTime).getDate() 92 // const day = new Date(oldTime).getDate()
88 // const newTime = add(year)+'-'+add(month)+'-'+add(day) 93 // const newTime = add(year)+'-'+add(month)+'-'+add(day)
89 94
90 // console.log(newTime) 95 // console.log(newTime)
91 // return newTime.replace(/-/g, '/') 96 // return newTime.replace(/-/g, '/')
92 return time 97 return time
93 }, 98 },
94 getFirstName(name){ 99 getFirstName(name){
95 return name.substring(0,1) 100 return name.substring(0,1)
96 }, 101 },
97 toNewData(){ 102 toNewData(){
98 uni.navigateTo({ 103 uni.navigateTo({
99 url:'../newOpticsData/newOpticsData' 104 url:'../newOpticsData/newOpticsData'
100 }) 105 })
101 } 106 }
102 } 107 }
103 } 108 }
104 </script> 109 </script>
105 110
106 <style lang="scss"> 111 <style lang="scss">
107 .wrap{ 112 .wrap{
108 min-height: 100vh; 113 min-height: 100vh;
109 width: 100%; 114 width: 100%;
110 background-color: #F2F2F2; 115 background-color: #F2F2F2;
111 .header{ 116 .header{
112 height: 304rpx; 117 height: 304rpx;
113 width: 100%; 118 width: 100%;
114 background-color: #FFFFFF; 119 background-color: #FFFFFF;
115 display: flex; 120 display: flex;
116 justify-content: space-around; 121 justify-content: space-around;
117 align-items: center; 122 align-items: center;
118 view{ 123 view{
119 height: 210rpx; 124 height: 210rpx;
120 width: 304rpx; 125 width: 304rpx;
121 background: #FDF7F5; 126 background: #FDF7F5;
122 border-radius: 4px; 127 border-radius: 4px;
123 border-radius: 4px; 128 border-radius: 4px;
124 display: flex; 129 display: flex;
125 flex-direction: column; 130 flex-direction: column;
126 align-items: center; 131 align-items: center;
127 justify-content: center; 132 justify-content: center;
128 text{ 133 text{
129 font-size: 12px; 134 font-size: 12px;
130 color: #333333; 135 color: #333333;
131 } 136 }
132 image{ 137 image{
133 height: 144rpx; 138 height: 144rpx;
134 width: 144rpx; 139 width: 144rpx;
135 } 140 }
136 } 141 }
137 } 142 }
138 .dataMenu{ 143 .dataMenu{
139 margin-top: 20rpx; 144 margin-top: 20rpx;
140 box-shadow: 0 0 4px 0 rgba(133,107,107,0.10); 145 box-shadow: 0 0 4px 0 rgba(133,107,107,0.10);
141 width: 100%; 146 width: 100%;
142 background-color: #FFFFFF; 147 background-color: #FFFFFF;
143 .item{ 148 .item{
144 padding: 0 40rpx; 149 padding: 0 40rpx;
145 .loveDataInfo{ 150 .loveDataInfo{
146 padding: 0 44rpx 0 70rpx; 151 padding: 0 44rpx 0 70rpx;
147 display: flex; 152 display: flex;
148 justify-content: space-around; 153 justify-content: space-around;
149 flex-direction: column; 154 flex-direction: column;
150 align-items: flex-start; 155 align-items: flex-start;
151 .dataInfoItem{ 156 .dataInfoItem{
152 font-size: 12px; 157 font-size: 12px;
153 color: #333333; 158 color: #333333;
154 margin-bottom: 34rpx; 159 margin-bottom: 34rpx;
155 text{ 160 text{
156 font-size: 12px; 161 font-size: 12px;
157 color: #2A2A2A; 162 color: #2A2A2A;
158 margin-right: 20rpx; 163 margin-right: 20rpx;
159 } 164 }
160 } 165 }
161 } 166 }
162 } 167 }
163 } 168 }
164 .footer{ 169 .footer{
165 width: 100%; 170 width: 100%;
166 position: fixed; 171 position: fixed;
167 bottom: 0; 172 bottom: 0;
168 left: 0; 173 left: 0;
169 .btn{ 174 .btn{
170 width: 100%; 175 width: 100%;
171 height: 112rpx; 176 height: 112rpx;
172 line-height: 112rpx; 177 line-height: 112rpx;
173 background: #FF6B4A; 178 background: #FF6B4A;
174 font-size: 16px; 179 font-size: 16px;
175 color: #FFFFFF; 180 color: #FFFFFF;
176 } 181 }
177 } 182 }
178 } 183 }
179 .popUpWrap{ 184 .popUpWrap{
180 height: 850rpx; 185 height: 850rpx;
181 width: 542rpx; 186 width: 542rpx;
182 background-color: #FFFFFF; 187 background-color: #FFFFFF;
183 border-radius: 4px; 188 border-radius: 4px;
184 border: 1px solid #979797; 189 border: 1px solid #979797;
185 .closeBtn{ 190 .closeBtn{
186 height: 28rpx; 191 height: 28rpx;
187 width: 28rpx; 192 width: 28rpx;
188 // border: 1px solid red; 193 // border: 1px solid red;
189 position: absolute; 194 position: absolute;
190 top: 20rpx; 195 top: 20rpx;
191 right: 20rpx; 196 right: 20rpx;
192 } 197 }
193 .glassInfo{ 198 .glassInfo{
194 height: 474rpx; 199 height: 474rpx;
195 width: 528rpx; 200 width: 528rpx;
196 } 201 }
197 .dataInfo{ 202 .dataInfo{
198 height: 850rpx; 203 height: 850rpx;
199 width: 542rpx; 204 width: 542rpx;
200 } 205 }
201 } 206 }
202 .popUpWrap1{ 207 .popUpWrap1{
203 height: 474rpx; 208 height: 474rpx;
204 width: 528rpx; 209 width: 528rpx;
205 border-radius: 4px; 210 border-radius: 4px;
206 border: 1px solid #979797; 211 border: 1px solid #979797;
207 } 212 }
208 213
209 </style> 214 </style>
210 215