From 54d61dc1c46ff3ef4fda4a09fa96804bf8366db7 Mon Sep 17 00:00:00 2001
From: yr <1308291615@qq.com>
Date: Tue, 26 May 2020 10:09:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                               |   4 +-
 src/pages/detailStandard/detailStandard_sun.vue |   6 +-
 src/pages/frameDetail/frameDetail.vue           | 127 ++++++------------------
 3 files changed, 36 insertions(+), 101 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 66797b7..c13cd9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9615,7 +9615,7 @@
     },
     "normalize-range": {
       "version": "0.1.2",
-      "resolved": "http://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz",
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
@@ -9657,7 +9657,7 @@
     },
     "num2fraction": {
       "version": "1.2.2",
-      "resolved": "http://registry.npm.taobao.org/num2fraction/download/num2fraction-1.2.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/num2fraction/download/num2fraction-1.2.2.tgz",
       "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
       "dev": true
     },
diff --git a/src/pages/detailStandard/detailStandard_sun.vue b/src/pages/detailStandard/detailStandard_sun.vue
index 2dde0c1..5198e4b 100644
--- a/src/pages/detailStandard/detailStandard_sun.vue
+++ b/src/pages/detailStandard/detailStandard_sun.vue
@@ -285,9 +285,9 @@
                 <view class="detail2_price">
                     <span>￥{{details.data.p_sale_price*count}}</span>
                     <view class="counter">
-                            <view class="btn" disabled="this.disabled" @click="counter(false)">-</view>
-                            <text>{{count}}</text>
-                            <view class="btn" @click="counter(true)">+</view>
+                        <view class="btn" disabled="this.disabled" @click="counter(false)">-</view>
+                        <text>{{count}}</text>
+                        <view class="btn" @click="counter(true)">+</view>
                     </view>                    
                 </view>
             </view>
diff --git a/src/pages/frameDetail/frameDetail.vue b/src/pages/frameDetail/frameDetail.vue
index 68b60e9..018bb9d 100644
--- a/src/pages/frameDetail/frameDetail.vue
+++ b/src/pages/frameDetail/frameDetail.vue
@@ -265,7 +265,7 @@
       v-if="current !==2"
     >
       <view class="D4_esvalue">
-        <view>{{esvalue}}</view>
+        <view>{{esvalue}}&nbsp;&nbsp;{{goodInfo.judgeInfo.good}}</view>
         <view class="D4_2">
           <view
             class="star"
@@ -282,52 +282,26 @@
       </view>
       <view class="D4_list">
         <view
-          v-for="(assess) in assess"
+          v-for="(assess) in goodInfo.judge_tag"
           :key="assess.key"
-        >{{assess.Iassess}}</view>
+        >{{assess.name}}</view>
       </view>
     </view>
     <view
       class="D5"
       v-if="current !==2"
     >
-      <view class="D5_fixed1">
+      <view class="D5_fixed1" @click="consolg(goodInfo.prodIntro1)">
         <image src="/static/img/detail/hr.png"></image>
         <view>商品详细</view>
         <image src="/static/img/detail/hr.png"></image>
       </view>
-      <view class="D5_all">
-        <image v-bind:src="imgAll"></image>
-      </view>
-      <view class="D5_photoes">
-        <view class="D5_photoes1">
-          <view
-            v-for="(photoes) in photoes"
-            :key="photoes.value"
-          >
-            <image v-bind:src="photoes.img"></image>
-            <view>{{photoes.value}}</view>
-          </view>
-        </view>
-        <view class="D5_logo1">帕森防蓝光镜片</view>
-        <view class="D5_logo2">健康护眼，我们是认真的！</view>
-        <view class="D5_logo3">
-          <image src='/static/img/detail/logo.png'></image>
-        </view>
+      <view class="D5_all" v-html="test">
+        <!-- <block>
+          <rich-text :nodes="goodInfo.prodIntro1"></rich-text>
+        </block> -->
       </view>
     </view>
-    <view
-      class="D6"
-      v-if="current !==2"
-    >
-      <view class="D6_v1">CHARM DETAIL</view>
-      <view class="D6_v2">细节展示</view>
-      <view>
-        <image v-bind:src="imgDetail"></image>
-      </view>
-      <view>........................................................................</view>
-      <view class="D6_v5"><span class="D6_v5_s1">优质选材 </span><span class="D6_v5_s2"> / 金属材质 光泽饱满</span></view>
-    </view>
 
     <!-- 底部菜单 -->
     <view class="botton">
@@ -339,7 +313,10 @@
         <view class="botton_image">购物车</view>
       </view>
       <view class="botton_2">
-        <view class="botton_input">加入购物车</view>
+        <view
+          class="botton_input"
+          @tap="toCart()"
+        >加入购物车</view>
         <view
           class="botton_now"
           @tap="goPerchase()"
@@ -354,6 +331,7 @@ import store from '@/store'
 export default {
   data () {
     return {
+      test: '',
       goodType: 2,
       pid: 0,
       screenItems: [
@@ -371,12 +349,7 @@ export default {
         { key: 4, img: '/static/img/detail/d6.png', standard: '框架耳长', slength: '138mm' },
         { key: 5, img: '/static/img/detail/d7.png', standard: '框架重', slength: '19mm' }
       ],
-      assess: [
-        { key: 0, Iassess: '价格实惠' },
-        { key: 1, Iassess: '美观大方' },
-        { key: 2, Iassess: '易搭配' }
-      ],
-      esvalue: '宝贝好评率 100%',
+      esvalue: '宝贝好评率',
       introduction: {
         material: '钛合金',
         func: '抗疲劳/防辐射',
@@ -414,6 +387,8 @@ export default {
       this.parameter[4].slength = `${this.goodInfo.leg_long}mm`
       this.parameter[5].slength = `${this.goodInfo.weight}mm`
       this.tag = this.goodInfo.tag
+      this.test = this.goodInfo.prodIntro1
+      this.test = this.test.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ')
     })
   },
   computed: {
@@ -667,16 +642,22 @@ export default {
     color: #333333;
     font-weight: bold;
   }
+  .D4_list{
+    display: grid;
+    grid-row-gap: 10px;
+    grid-column-gap: 4px;
+  }
   .D4_list view {
-    display: inline-block;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     font-size: 12px;
-    text-align: center;
-    margin-right: 12px;
-    width: 90px;
+    width: 118px;
     height: 24px;
-    line-height: 24px;
+    border-radius: 2px;
     background: #f2f2f2;
     color: #666666;
+    // letter-spacing: 1px;
   }
 }
 .D5 {
@@ -700,57 +681,11 @@ export default {
   }
   .D5_all {
     width: 100%;
-    height: 380px;
-    margin-bottom: 30px;
+    margin-top: 30rpx;
+    margin-right: 30rpx;
+    margin-bottom: 180rpx;
     font-family: "PingFangSC-Regular";
-    border: #999999 solid 1.5px;
-    image {
-      width: 100%;
-      height: 380px;
-    }
-  }
-  .D5_photoes1 {
-    display: grid;
-    grid-template-columns: 48% 48%;
-    grid-row-gap: 10px;
-    grid-column-gap: 4%;
-    image {
-      width: 100%;
-      height: 70px;
-    }
-    view {
-      width: 100%;
-      font-size: 14px;
-      text-align: center;
-      background: #949494;
-      font-family: "PingFangSC-Regular";
-      color: #ffffff;
-      view {
-        height: 24px;
-        line-height: 24px;
-      }
-    }
-  }
-  .D5_logo1,
-  .D5_logo2 {
-    text-align: center;
-  }
-  .D5_logo1 {
-    margin-top: 40px;
-    font-size: 24px;
-    font-weight: bold;
-    font-family: "PingFangSC-Semibold";
-  }
-  .D5_logo2 {
-    font-size: 12px;
-  }
-  .D5_logo3 {
-    width: 100%;
-    text-align: center;
-    image {
-      width: 50px;
-      height: 24px;
-    }
+    // border: #999999 solid 1.5px;
   }
 }
 .D6 {
-- 
2.0.0