商品价格修改

@@ -4,8 +4,8 @@
     <view class="item-detail">
         <text class="item-title">{{item.productName}}</text>
         <view class="item-price">
-            <text class="price1" style="color:{{item.showOriginPrice ? '#d0021b' : '#444444'}}">￥{{helper.round(item.salePriceStr)}}</text>
-            <text class="price2" wx:if="{{item.showOriginPrice}}">￥{{helper.round(item.originPriceStr)}}</text>
+            <text class="price1">￥{{helper.round(item.salesPrice)}}</text>
+            <!--<text class="price2">￥{{helper.round(item.marketPrice)}}</text>-->
         </view>
     </view>
 </view>

@@ -17,11 +17,15 @@
     color: #444;
     width: 322rpx;
     max-width: 322rpx;
-    letter-spacing: 0.28px;
+    letter-spacing: 0.28rpx;
+}
+
+.price1.before-market-price {
+    color: #d0021b!important;
 }
 
 .product-item .item-price .price2 {
-    color: #444;
+    color: #b0b0b0;
     margin-left: 10rpx;
     text-decoration: line-through;
 }

@@ -71,7 +71,8 @@ Page({
             if (res.code === 200) {
                 const keyAdapter = {
                     skn: 'product_skn',
-                    salePriceStr: 'sales_price',
+                    salesPrice: 'sales_price',
+                    marketPrice: 'market_price',
                     productName: 'product_name',
                     defaultImages: 'default_images'
                 };

@@ -115,7 +115,8 @@ Page({
             if (res.code === 200) {
                 const keyAdapter = {
                     skn: 'product_skn',
-                    salePriceStr: 'sales_price',
+                    salesPrice: 'sales_price',
+                    marketPrice: 'market_price',
                     productName: 'product_name',
                     defaultImages: 'default_images'
                 };

@@ -171,7 +171,8 @@ Page({
             if (res.code === 200) {
                 const keyAdapter = {
                     skn: 'product_skn',
-                    salePriceStr: 'sales_price',
+                    salesPrice: 'sales_price',
+                    marketPrice: 'market_price',
                     productName: 'product_name',
                     defaultImages: 'default_images'
                 };
@@ -199,7 +200,8 @@ Page({
             if (res.code === 200) {
                 const keyAdapter = {
                     skn: 'product_skn',
-                    salePriceStr: 'sales_price',
+                    salesPrice: 'sales_price',
+                    marketPrice: 'market_price',
                     productName: 'product_name',
                     defaultImages: 'default_images'
                 };

@@ -68,7 +68,8 @@ Page({
             if (res.code === 200) {
                 const keyAdapter = {
                     skn: 'product_skn',
-                    salePriceStr: 'sales_price',
+                    salesPrice: 'sales_price',
+                    marketPrice: 'market_price',
                     productName: 'product_name',
                     defaultImages: 'default_images'
                 };

@@ -98,7 +98,8 @@ Page({
             if (res.code === 200) {
                 const keyAdapter = {
                     skn: 'product_skn',
-                    salePriceStr: 'sales_price',
+                    salesPrice: 'sales_price',
+                    marketPrice: 'market_price',
                     productName: 'product_name',
                     defaultImages: 'default_images'
                 };

@@ -95,7 +95,8 @@ Page({
             if (res.code === 200) {
                 const keyAdapter = {
                     skn: 'product_skn',
-                    salePriceStr: 'sales_price',
+                    salesPrice: 'sales_price',
+                    marketPrice: 'market_price',
                     productName: 'product_name',
                     defaultImages: 'default_images'
                 };