Commit e477b7dc7eb1dbb3d1ce9d97e74ac0583d14cac3
1 parent
7fe7e00174
Exists in
master
修改冲突
Showing
2 changed files
with
13 additions
and
8 deletions
Show diff stats
src/pages.json
| ... | ... | @@ -53,12 +53,12 @@ |
| 53 | 53 | "navigationBarTitleText" : "购物车" |
| 54 | 54 | } |
| 55 | 55 | }, |
| 56 | - // { | |
| 57 | - // "path" : "pages/frameDetail/frameDetail", | |
| 58 | - // "style" : { | |
| 59 | - // "navigationBarTitleText" : "产品详情" | |
| 60 | - // } | |
| 61 | - // }, | |
| 56 | + { | |
| 57 | + "path" : "pages/frameDetail/frameDetail", | |
| 58 | + "style" : { | |
| 59 | + "navigationBarTitleText" : "产品详情" | |
| 60 | + } | |
| 61 | + }, | |
| 62 | 62 | { |
| 63 | 63 | "path" : "pages/refundProgress/refundProgress", |
| 64 | 64 | "style" : { | ... | ... |
src/pages/addOpticsData/addOpticsData.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="wrap"> |
| 3 | + <!-- 弹窗 --> | |
| 3 | 4 | <uni-popup ref="popup" type="center"> |
| 4 | - <!-- 给一个左边的样式 --> | |
| 5 | + <!-- 给一个左边弹窗的样式 --> | |
| 5 | 6 | <view class="popUpWrap" :class="{'popUpWrap1': whichTap == 0}"> |
| 6 | 7 | <!-- 关闭弹窗按钮 --> |
| 7 | 8 | <view class="closeBtn" @click="this.$refs.popup.close()"></view> |
| 9 | + <!-- 左 --> | |
| 8 | 10 | <image class="glassInfo" src="../../static/img/myOpticsData/glassInfo.png" v-if="whichTap == 0" mode="aspectFit"></image> |
| 11 | + <!-- 右 --> | |
| 9 | 12 | <image class="dataInfo" src="../../static/img/myOpticsData/dataInfo.png" v-else mode="aspectFit"></image> |
| 10 | 13 | </view> |
| 11 | - </uni-popup> | |
| 14 | + </uni-popup> | |
| 15 | + <!-- 点击弹窗部分 --> | |
| 12 | 16 | <view class="header"> |
| 13 | 17 | <view class="headerLeft" @click=changeTap(0)> |
| 14 | 18 | <text>如何查看验光单？</text> |
| ... | ... | @@ -19,6 +23,7 @@ |
| 19 | 23 | <image src="../../static/glassLook.png" mode="aspectFit"></image> |
| 20 | 24 | </view> |
| 21 | 25 | </view> |
| 26 | + <!-- 数据展示部分 --> | |
| 22 | 27 | <view class="dataMenu"> |
| 23 | 28 | <uni-collapse accordion="true"> |
| 24 | 29 | <view class="item" v-for="(loveItem,index) in loveList" :key="index"> | ... | ... |