刘文博 / gulu-vue

Download as
Browse Code »

Commit fa7712dcc0162c3b33a4583bb143c126dc37ad48

Authored by 喻鹏
2 parents 967ce241af 156736a2ed
Exists in master

修改冲突

Showing 12 changed files   Show diff stats
src/components/CommodityCard/CommodityCard.vue
Diff comments   View file @fa7712d
... ... @@ -74,7 +74,7 @@ image {
74 74 -webkit-line-clamp: 2;
75 75 text-align: justify;
76 76 overflow: hidden;
77   - font-size: 24rpx;
  77 + font-size: 26rpx;
78 78 color: #333333;
79 79 }
80 80 .info {
... ...
src/pages/addOpticsData/addOpticsData.vue
Diff comments   View file @fa7712d
1   -<template>
  1 +<template>
2 2 <view class="wrap">
3 3 <!-- 弹窗 -->
4 4 <uni-popup ref="popup" type="center">
... ... @@ -12,13 +12,13 @@
12 12 <image class="dataInfo" src="../../static/img/myOpticsData/dataInfo.png" v-else mode="aspectFit"></image>
13 13 </view>
14 14 </uni-popup>
15   - <!-- 点击弹窗部分 -->
  15 + <!-- 点击弹窗部分 -->
16 16 <view class="header">
17   - <view class="headerLeft" @click=changeTap(0)>
  17 + <view class="headerLeft" @click=changeTap(1)>
18 18 <text>如何查看验光单？</text>
19 19 <image src="../../static/dataLook.png" mode="aspectFit"></image>
20 20 </view>
21   - <view class="headerRight" @click=changeTap(1)>
  21 + <view class="headerRight" @click=changeTap(0)>
22 22 <text>如何查看眼镜框架？</text>
23 23 <image src="../../static/glassLook.png" mode="aspectFit"></image>
24 24 </view>
... ... @@ -48,21 +48,21 @@
48 48 </view>
49 49 <view class="footer">
50 50 <button class="btn" type="default" @click="toNewData(1)">新建验光单</button>
51   - </view>
52   - </view>
53   -</template>
54   -
  51 + </view>
  52 + </view>
  53 +</template>
  54 +
55 55 <script>
56 56 import UniCollapse from '@/components/UniCollapse/UniCollapse.vue'
57 57 import UniCollapseItem from '@/components/UniCollapseItem/UniCollapseItem.vue'
58 58 import UniPopup from '@/components/UniPopup/uni-popup.vue'
59 59 import store from '@/store';
60 60 export default {
61   - components: {UniCollapse,UniCollapseItem,UniPopup},
62   - data() {
63   - return {
64   - whichTap:0
65   - };
  61 + components: {UniCollapse,UniCollapseItem,UniPopup},
  62 + data() {
  63 + return {
  64 + whichTap:0
  65 + };
66 66 },
67 67 onLoad: function(option) {
68 68 //获取关心的人列表
... ... @@ -116,11 +116,11 @@
116 116 url:'../newOpticsData/newOpticsData?kinds='+item+'&index='+index
117 117 })
118 118 }
119   - }
120   - }
121   -</script>
122   -
123   -<style lang="scss">
  119 + }
  120 + }
  121 +</script>
  122 +
  123 +<style lang="scss">
124 124 .wrap{
125 125 min-height: 100vh;
126 126 width: 100%;
... ... @@ -223,5 +223,5 @@
223 223 border-radius: 4px;
224 224 border: 1px solid #979797;
225 225 }
226   -
227   -</style>
  226 +
  227 +</style>
... ...
src/pages/address/addressList.vue
Diff comments   View file @fa7712d
... ... @@ -133,6 +133,9 @@ export default {
133 133 text-align: center;
134 134 margin-right: 20rpx;
135 135 text {
  136 + display: flex;
  137 + justify-content: center;
  138 + align-items: center;
136 139 font-size: 12px;
137 140 color: #ffffff;
138 141 letter-spacing: -0.23px;
... ... @@ -161,7 +164,7 @@ export default {
161 164 }
162 165 }
163 166 .arrow {
164   - width: 6px;
  167 + width: 12px;
165 168 height: 12px;
166 169 position: absolute;
167 170 right: 40rpx;
... ...
src/pages/confirmOrder/confirmOrder.vue
Diff comments   View file @fa7712d
... ... @@ -39,6 +39,7 @@
39 39 <image
40 40 class="arrow"
41 41 src="../../static/right.png"
  42 + mode="aspectFill"
42 43 ></image>
43 44 </view>
44 45 <view class="content">
... ... @@ -108,7 +109,7 @@
108 109 <view class="rightText">
109 110 <view class="choosePayWay">
110 111 <image
111   - src="../../static/store.png"
  112 + src="../../static/chat_logo.png"
112 113 mode="aspectFill"
113 114 ></image>
114 115 <text>微信支付</text>
... ... @@ -158,6 +159,7 @@
158 159 </checkbox-group>
159 160 </view> -->
160 161 </view>
  162 + <view class="last_zhanwei"></view>
161 163 <view class="footer">
162 164 <view class="footerLeft">实付金额:<text>¥{{Number(skuInfo.real_price) * count}}</text></view>
163 165 <view class="footerRight">
... ... @@ -378,7 +380,7 @@ export default {
378 380 }
379 381 image {
380 382 height: 28rpx;
381   - width: 28rpx;
  383 + width: 30rpx;
382 384 }
383 385 .addressText {
384 386 font-size: 28rpx;
... ... @@ -536,13 +538,15 @@ export default {
536 538 margin-right: 20rpx;
537 539 text-align: right;
538 540 .choosePayWay {
  541 + display: flex;
  542 + align-items: center;
539 543 text {
540 544 color: #333333;
541 545 }
542 546 image {
543   - height: 26rpx;
544   - width: 30rpx;
545   - margin-right: 20px;
  547 + height: 36rpx;
  548 + width: 40rpx;
  549 + margin-right: 8px;
546 550 }
547 551 }
548 552 .randomSubstraction {
... ... @@ -642,6 +646,9 @@ export default {
642 646 text-align: center;
643 647 margin-right: 20rpx;
644 648 text {
  649 + display: flex;
  650 + justify-content: center;
  651 + align-items: center;
645 652 font-size: 12px;
646 653 color: #ffffff;
647 654 letter-spacing: -0.23px;
... ... @@ -659,7 +666,7 @@ export default {
659 666 width: 100%;
660 667 image {
661 668 width: 24px;
662   - height: 26px;
  669 + height: 28px;
663 670 margin: 12rpx 32rpx 0 40rpx;
664 671 }
665 672 .address {
... ... @@ -670,11 +677,15 @@ export default {
670 677 }
671 678 }
672 679 .arrow {
673   - width: 6px;
  680 + width: 12px;
674 681 height: 12px;
675 682 position: absolute;
676 683 right: 40rpx;
677 684 bottom: 104rpx;
678 685 }
679 686 }
  687 +.last_zhanwei{
  688 + background: #f2f2f2;
  689 + height: 60px;
  690 +}
680 691 </style>
... ...
src/pages/index/index.vue
Diff comments   View file @fa7712d
... ... @@ -111,7 +111,7 @@ export default {
111 111 components: {
112 112 UniDrawer: UniDrawer,
113 113 HMfilterDropdown: HMfilterDropdown,
114   - Card: Card
  114 + Card: Card,
115 115 },
116 116 data () {
117 117 return {
... ... @@ -120,23 +120,23 @@ export default {
120 120 loadingText: '~~到底了~~',
121 121 filterDropdownValue: [],
122 122 filterData: [],
123   - searchText: ''
  123 + searchText: '',
124 124 }
125 125 },
126 126 computed: {
127 127 goodsList () {
128 128 // 也可以从 getters 获取
129   - // console.log('index-list=====>',this.$store.state.index.list)
  129 + // console.log('index-list=====>',this.$store.state.index.list)
130 130 return this.$store.state.index.list
131 131 },
132 132 categoryList () {
133 133 return this.$store.state.index.categoryList
134   - }
  134 + },
135 135 },
136 136 filters: {
137 137 outData (value) {
138 138 return JSON.stringify(value)
139   - }
  139 + },
140 140 },
141 141 onLoad () {
142 142 store.dispatch('index/category')
... ... @@ -172,7 +172,7 @@ export default {
172 172 this.keyWords = keyword
173 173 store.dispatch('index/search', {
174 174 params: {},
175   - keyword
  175 + keyword,
176 176 })
177 177 },
178 178 // 接收菜单结果
... ... @@ -195,7 +195,7 @@ export default {
195 195 if (this.categoryList[i].value === 'filter') {
196 196 params = {
197 197 ...selectedPayload,
198   - ...params
  198 + ...params,
199 199 }
200 200 } else {
201 201 params[`${this.categoryList[i].value}`] = value[i][0]
... ... @@ -204,7 +204,7 @@ export default {
204 204 }
205 205 store.dispatch('index/search', {
206 206 params,
207   - keyword: this.keyWords
  207 + keyword: this.keyWords,
208 208 })
209 209 }
210 210 }
... ...
src/pages/user/user.vue
Diff comments   View file @fa7712d
... ... @@ -72,7 +72,7 @@
72 72 </view>
73 73 <view class="myOrder">
74 74 <view class="orderHeader">
75   - <text>全部订单</text>
  75 + <text>我的订单</text>
76 76 <view
77 77 class="btn"
78 78 @click="toMyOrder('10')"
... ... @@ -130,56 +130,58 @@
130 130 <image src="../../static/right.png" mode="aspectFit"></image>
131 131 </view> -->
132 132 <view class="item">
  133 + <image
  134 + src="../../static/address-icon.png"
  135 + mode="aspectFit"
  136 + ></image>
133 137 <view class="left">
  138 + <text @tap="toAddress">地址管理</text>
134 139 <image
135   - src="../../static/address-icon.png"
  140 + class="image2"
  141 + src="../../static/right.png"
136 142 mode="aspectFit"
137 143 ></image>
138   - <text @tap="toAddress">地址管理</text>
139 144 </view>
  145 +
  146 + </view>
  147 + <view class="item">
140 148 <image
141   - src="../../static/right.png"
  149 + src="../../static/img/user/introduce.png"
142 150 mode="aspectFit"
143 151 ></image>
144   - </view>
145   - <view class="item">
146 152 <view class="left">
  153 + <text @tap="introduce">系统介绍</text>
147 154 <image
148   - src="../../static/img/user/introduce.png"
  155 + src="../../static/right.png"
149 156 mode="aspectFit"
150 157 ></image>
151   - <text @tap="introduce">系统介绍</text>
152 158 </view>
  159 + </view>
  160 + <view class="item">
153 161 <image
154   - src="../../static/right.png"
  162 + src="../../static/img/user/joinUs.png"
155 163 mode="aspectFit"
156 164 ></image>
157   - </view>
158   - <view class="item">
159 165 <view class="left">
  166 + <text @tap="joinUs">加入我们</text>
160 167 <image
161   - src="../../static/img/user/joinUs.png"
  168 + src="../../static/right.png"
162 169 mode="aspectFit"
163 170 ></image>
164   - <text @tap="joinUs">加入我们</text>
165 171 </view>
  172 + </view>
  173 + <view class="item">
166 174 <image
167   - src="../../static/right.png"
  175 + src="../../static/img/user/service.png"
168 176 mode="aspectFit"
169 177 ></image>
170   - </view>
171   - <view class="item">
172   - <view class="left">
  178 + <view class="left lastLeft">
  179 + <text>联系客服</text>
173 180 <image
174   - src="../../static/img/user/service.png"
  181 + src="../../static/right.png"
175 182 mode="aspectFit"
176 183 ></image>
177   - <text>联系客服</text>
178 184 </view>
179   - <image
180   - src="../../static/right.png"
181   - mode="aspectFit"
182   - ></image>
183 185 </view>
184 186 </view>
185 187 <view class="recommend">
... ... @@ -358,7 +360,7 @@ export default {
358 360 background-color: #f2f2f2;
359 361 }
360 362 .userInfo {
361   - background-image: linear-gradient(270deg, #ffa481 0%, #ff6b4a 66%);
  363 + background-image: linear-gradient(270deg, #f79067 0%, #FF5F3B 66%);
362 364 width: 100%;
363 365 height: 240rpx;
364 366 color: #ffffff;
... ... @@ -423,8 +425,8 @@ export default {
423 425 align-items: center;
424 426 image {
425 427 margin-right: 32rpx;
426   - width: 30rpx;
427   - height: 34rpx;
  428 + width: 40rpx;
  429 + height: 44rpx;
428 430 }
429 431 }
430 432 image {
... ... @@ -454,7 +456,7 @@ export default {
454 456 flex-direction: row;
455 457 justify-content: space-between;
456 458 align-items: center;
457   - border-bottom: 1px solid #e9e9e9;
  459 + border-bottom: 1px solid #F5F5F5;
458 460 font-weight: bold;
459 461 font-size: 18px;
460 462 color: #333333;
... ... @@ -508,9 +510,8 @@ export default {
508 510 justify-content: space-between;
509 511 align-items: center;
510 512 .item {
511   - display: flex;
512   - justify-content: space-between;
513   - border-bottom: 1px solid #f2f2f2;
  513 + display: grid;
  514 + grid-template-columns: 10% 90%;
514 515 align-items: center;
515 516 height: 72rpx;
516 517 width: 100%;
... ... @@ -519,16 +520,23 @@ export default {
519 520 color: #333333;
520 521 display: flex;
521 522 align-items: center;
  523 + justify-content: space-between;
  524 + height: 72rpx;
  525 + border-bottom: 1px solid #F2F2F2;
522 526 image {
523   - margin-right: 32rpx;
524   - width: 30rpx;
525   - height: 34rpx;
  527 + margin-right: 0;
  528 + height: 16px;
  529 + width: 8px;
526 530 }
527 531 }
528 532 image {
529   - height: 16px;
530   - width: 8px;
  533 + margin-right: 32rpx;
  534 + width: 40rpx;
  535 + height: 44rpx;
531 536 }
  537 + .lastLeft{
  538 + border-bottom: none;
  539 + }
532 540 }
533 541 }
534 542 .recommend {
... ...
src/static/chat_logo.png
Diff comments   View file @fa7712d

3.92 KB
src/static/icon-data.png
Diff comments   View file @fa7712d

1.01 KB | W: | H:

1.09 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
src/static/img/user/dataWrite.png
Diff comments   View file @fa7712d

382 Bytes | W: | H:

515 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
src/static/img/user/introduce.png
Diff comments   View file @fa7712d

488 Bytes | W: | H:

618 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
src/static/img/user/joinUs.png
Diff comments   View file @fa7712d

1.97 KB | W: | H:

2.07 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
src/static/joinUs (2).png
Diff comments   View file @fa7712d

488 Bytes | W: | H:

618 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin