Commit 54d61dc1c46ff3ef4fda4a09fa96804bf8366db7
1 parent
acc7ee230c
Exists in
master
详情页
Showing
3 changed files
with
36 additions
and
101 deletions
Show diff stats
package-lock.json
| ... | ... | @@ -9615,7 +9615,7 @@ |
| 9615 | 9615 | }, |
| 9616 | 9616 | "normalize-range": { |
| 9617 | 9617 | "version": "0.1.2", |
| 9618 | - "resolved": "http://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz", | |
| 9618 | + "resolved": "https://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz", | |
| 9619 | 9619 | "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", |
| 9620 | 9620 | "dev": true |
| 9621 | 9621 | }, |
| ... | ... | @@ -9657,7 +9657,7 @@ |
| 9657 | 9657 | }, |
| 9658 | 9658 | "num2fraction": { |
| 9659 | 9659 | "version": "1.2.2", |
| 9660 | - "resolved": "http://registry.npm.taobao.org/num2fraction/download/num2fraction-1.2.2.tgz", | |
| 9660 | + "resolved": "https://registry.npm.taobao.org/num2fraction/download/num2fraction-1.2.2.tgz", | |
| 9661 | 9661 | "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", |
| 9662 | 9662 | "dev": true |
| 9663 | 9663 | }, | ... | ... |
src/pages/detailStandard/detailStandard_sun.vue
| ... | ... | @@ -285,9 +285,9 @@ |
| 285 | 285 | <view class="detail2_price"> |
| 286 | 286 | <span>￥{{details.data.p_sale_price*count}}</span> |
| 287 | 287 | <view class="counter"> |
| 288 | - <view class="btn" disabled="this.disabled" @click="counter(false)">-</view> | |
| 289 | - <text>{{count}}</text> | |
| 290 | - <view class="btn" @click="counter(true)">+</view> | |
| 288 | + <view class="btn" disabled="this.disabled" @click="counter(false)">-</view> | |
| 289 | + <text>{{count}}</text> | |
| 290 | + <view class="btn" @click="counter(true)">+</view> | |
| 291 | 291 | </view> |
| 292 | 292 | </view> |
| 293 | 293 | </view> | ... | ... |
src/pages/frameDetail/frameDetail.vue
| ... | ... | @@ -265,7 +265,7 @@ |
| 265 | 265 | v-if="current !==2" |
| 266 | 266 | > |
| 267 | 267 | <view class="D4_esvalue"> |
| 268 | - <view>{{esvalue}}</view> | |
| 268 | + <view>{{esvalue}} {{goodInfo.judgeInfo.good}}</view> | |
| 269 | 269 | <view class="D4_2"> |
| 270 | 270 | <view |
| 271 | 271 | class="star" |
| ... | ... | @@ -282,52 +282,26 @@ |
| 282 | 282 | </view> |
| 283 | 283 | <view class="D4_list"> |
| 284 | 284 | <view |
| 285 | - v-for="(assess) in assess" | |
| 285 | + v-for="(assess) in goodInfo.judge_tag" | |
| 286 | 286 | :key="assess.key" |
| 287 | - >{{assess.Iassess}}</view> | |
| 287 | + >{{assess.name}}</view> | |
| 288 | 288 | </view> |
| 289 | 289 | </view> |
| 290 | 290 | <view |
| 291 | 291 | class="D5" |
| 292 | 292 | v-if="current !==2" |
| 293 | 293 | > |
| 294 | - <view class="D5_fixed1"> | |
| 294 | + <view class="D5_fixed1" @click="consolg(goodInfo.prodIntro1)"> | |
| 295 | 295 | <image src="/static/img/detail/hr.png"></image> |
| 296 | 296 | <view>商品详细</view> |
| 297 | 297 | <image src="/static/img/detail/hr.png"></image> |
| 298 | 298 | </view> |
| 299 | - <view class="D5_all"> | |
| 300 | - <image v-bind:src="imgAll"></image> | |
| 301 | - </view> | |
| 302 | - <view class="D5_photoes"> | |
| 303 | - <view class="D5_photoes1"> | |
| 304 | - <view | |
| 305 | - v-for="(photoes) in photoes" | |
| 306 | - :key="photoes.value" | |
| 307 | - > | |
| 308 | - <image v-bind:src="photoes.img"></image> | |
| 309 | - <view>{{photoes.value}}</view> | |
| 310 | - </view> | |
| 311 | - </view> | |
| 312 | - <view class="D5_logo1">帕森防蓝光镜片</view> | |
| 313 | - <view class="D5_logo2">健康护眼，我们是认真的！</view> | |
| 314 | - <view class="D5_logo3"> | |
| 315 | - <image src='/static/img/detail/logo.png'></image> | |
| 316 | - </view> | |
| 299 | + <view class="D5_all" v-html="test"> | |
| 300 | + <!-- <block> | |
| 301 | + <rich-text :nodes="goodInfo.prodIntro1"></rich-text> | |
| 302 | + </block> --> | |
| 317 | 303 | </view> |
| 318 | 304 | </view> |
| 319 | - <view | |
| 320 | - class="D6" | |
| 321 | - v-if="current !==2" | |
| 322 | - > | |
| 323 | - <view class="D6_v1">CHARM DETAIL</view> | |
| 324 | - <view class="D6_v2">细节展示</view> | |
| 325 | - <view> | |
| 326 | - <image v-bind:src="imgDetail"></image> | |
| 327 | - </view> | |
| 328 | - <view>........................................................................</view> | |
| 329 | - <view class="D6_v5"><span class="D6_v5_s1">优质选材 </span><span class="D6_v5_s2"> / 金属材质 光泽饱满</span></view> | |
| 330 | - </view> | |
| 331 | 305 | |
| 332 | 306 | <!-- 底部菜单 --> |
| 333 | 307 | <view class="botton"> |
| ... | ... | @@ -339,7 +313,10 @@ |
| 339 | 313 | <view class="botton_image">购物车</view> |
| 340 | 314 | </view> |
| 341 | 315 | <view class="botton_2"> |
| 342 | - <view class="botton_input">加入购物车</view> | |
| 316 | + <view | |
| 317 | + class="botton_input" | |
| 318 | + @tap="toCart()" | |
| 319 | + >加入购物车</view> | |
| 343 | 320 | <view |
| 344 | 321 | class="botton_now" |
| 345 | 322 | @tap="goPerchase()" |
| ... | ... | @@ -354,6 +331,7 @@ import store from '@/store' |
| 354 | 331 | export default { |
| 355 | 332 | data () { |
| 356 | 333 | return { |
| 334 | + test: '', | |
| 357 | 335 | goodType: 2, |
| 358 | 336 | pid: 0, |
| 359 | 337 | screenItems: [ |
| ... | ... | @@ -371,12 +349,7 @@ export default { |
| 371 | 349 | { key: 4, img: '/static/img/detail/d6.png', standard: '框架耳长', slength: '138mm' }, |
| 372 | 350 | { key: 5, img: '/static/img/detail/d7.png', standard: '框架重', slength: '19mm' } |
| 373 | 351 | ], |
| 374 | - assess: [ | |
| 375 | - { key: 0, Iassess: '价格实惠' }, | |
| 376 | - { key: 1, Iassess: '美观大方' }, | |
| 377 | - { key: 2, Iassess: '易搭配' } | |
| 378 | - ], | |
| 379 | - esvalue: '宝贝好评率 100%', | |
| 352 | + esvalue: '宝贝好评率', | |
| 380 | 353 | introduction: { |
| 381 | 354 | material: '钛合金', |
| 382 | 355 | func: '抗疲劳/防辐射', |
| ... | ... | @@ -414,6 +387,8 @@ export default { |
| 414 | 387 | this.parameter[4].slength = `${this.goodInfo.leg_long}mm` |
| 415 | 388 | this.parameter[5].slength = `${this.goodInfo.weight}mm` |
| 416 | 389 | this.tag = this.goodInfo.tag |
| 390 | + this.test = this.goodInfo.prodIntro1 | |
| 391 | + this.test = this.test.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ') | |
| 417 | 392 | }) |
| 418 | 393 | }, |
| 419 | 394 | computed: { |
| ... | ... | @@ -667,16 +642,22 @@ export default { |
| 667 | 642 | color: #333333; |
| 668 | 643 | font-weight: bold; |
| 669 | 644 | } |
| 645 | + .D4_list{ | |
| 646 | + display: grid; | |
| 647 | + grid-row-gap: 10px; | |
| 648 | + grid-column-gap: 4px; | |
| 649 | + } | |
| 670 | 650 | .D4_list view { |
| 671 | - display: inline-block; | |
| 651 | + display: flex; | |
| 652 | + justify-content: center; | |
| 653 | + align-items: center; | |
| 672 | 654 | font-size: 12px; |
| 673 | - text-align: center; | |
| 674 | - margin-right: 12px; | |
| 675 | - width: 90px; | |
| 655 | + width: 118px; | |
| 676 | 656 | height: 24px; |
| 677 | - line-height: 24px; | |
| 657 | + border-radius: 2px; | |
| 678 | 658 | background: #f2f2f2; |
| 679 | 659 | color: #666666; |
| 660 | + // letter-spacing: 1px; | |
| 680 | 661 | } |
| 681 | 662 | } |
| 682 | 663 | .D5 { |
| ... | ... | @@ -700,57 +681,11 @@ export default { |
| 700 | 681 | } |
| 701 | 682 | .D5_all { |
| 702 | 683 | width: 100%; |
| 703 | - height: 380px; | |
| 704 | - margin-bottom: 30px; | |
| 684 | + margin-top: 30rpx; | |
| 685 | + margin-right: 30rpx; | |
| 686 | + margin-bottom: 180rpx; | |
| 705 | 687 | font-family: "PingFangSC-Regular"; |
| 706 | - border: #999999 solid 1.5px; | |
| 707 | - image { | |
| 708 | - width: 100%; | |
| 709 | - height: 380px; | |
| 710 | - } | |
| 711 | - } | |
| 712 | - .D5_photoes1 { | |
| 713 | - display: grid; | |
| 714 | - grid-template-columns: 48% 48%; | |
| 715 | - grid-row-gap: 10px; | |
| 716 | - grid-column-gap: 4%; | |
| 717 | - image { | |
| 718 | - width: 100%; | |
| 719 | - height: 70px; | |
| 720 | - } | |
| 721 | - view { | |
| 722 | - width: 100%; | |
| 723 | - font-size: 14px; | |
| 724 | - text-align: center; | |
| 725 | - background: #949494; | |
| 726 | - font-family: "PingFangSC-Regular"; | |
| 727 | - color: #ffffff; | |
| 728 | - view { | |
| 729 | - height: 24px; | |
| 730 | - line-height: 24px; | |
| 731 | - } | |
| 732 | - } | |
| 733 | - } | |
| 734 | - .D5_logo1, | |
| 735 | - .D5_logo2 { | |
| 736 | - text-align: center; | |
| 737 | - } | |
| 738 | - .D5_logo1 { | |
| 739 | - margin-top: 40px; | |
| 740 | - font-size: 24px; | |
| 741 | - font-weight: bold; | |
| 742 | - font-family: "PingFangSC-Semibold"; | |
| 743 | - } | |
| 744 | - .D5_logo2 { | |
| 745 | - font-size: 12px; | |
| 746 | - } | |
| 747 | - .D5_logo3 { | |
| 748 | - width: 100%; | |
| 749 | - text-align: center; | |
| 750 | - image { | |
| 751 | - width: 50px; | |
| 752 | - height: 24px; | |
| 753 | - } | |
| 688 | + // border: #999999 solid 1.5px; | |
| 754 | 689 | } |
| 755 | 690 | } |
| 756 | 691 | .D6 { | ... | ... |