Merge branch 'develop' of git.yoho.cn:fe/yoho-brand-shop into develop

@@ -12,7 +12,12 @@ const config = {
     },
     },
     appid: 'wxe8bfc9b404772199',  // appid业务中使用
     appid: 'wxe8bfc9b404772199',  // appid业务中使用
     unionType: '100000000011369', // 渠道号后台写死
     unionType: '100000000011369', // 渠道号后台写死
-    mini_app_type: '3'            // 小程序类型
+    mini_app_type: '3',            // 小程序类型
+    resourceContentCode: {
+        home: {
+            top: '72c65730150543d295532c942b0e5a33'
+        }
+    }
 };
 };
 
 
 export default config;
 export default config;

-/**
- * 资源码配置文件
- */
-export default {
-    home: {
-        top: '72c65730150543d295532c942b0e5a33'
-    }
-};

@@ -108,7 +108,7 @@ Page({
             skus: [],
             skus: [],
             pids: []
             pids: []
         };
         };
-        this.loadEnsurePayment({productSku: this.orderData.productSku});
+        this.loadEnsurePayment({buyNumber: this.orderData.buyNumber, productSku: this.orderData.productSku});
 
 
         yas.pageOpenReport();
         yas.pageOpenReport();
     },
     },

@@ -15,10 +15,10 @@
                         <view class="name row">{{good.product_name}}</view>
                         <view class="name row">{{good.product_name}}</view>
                         <view class="row">
                         <view class="row">
                             <view class="color">
                             <view class="color">
-                                颜色:{{good.color_name}}
+                                颜色：{{good.color_name}}
                             </view>
                             </view>
                             <view class="size">
                             <view class="size">
-                                尺码:{{good.size_name}}
+                                尺码：{{good.size_name}}
                             </view>
                             </view>
                         </view>
                         </view>
                         <view class="row price-wrap">
                         <view class="row price-wrap">
@@ -29,7 +29,7 @@
                                 ¥{{good.sales_price}}
                                 ¥{{good.sales_price}}
                             </view>
                             </view>
                             <view class="count">
                             <view class="count">
-                                ×{{good.buy_number}}
+                                × {{good.buy_number}}
                             </view>
                             </view>
                         </view>
                         </view>
                     </view>
                     </view>

@@ -6,7 +6,6 @@
     position: relative;
     position: relative;
     display: block;
     display: block;
     background: #fff;
     background: #fff;
-    /* margin: 10rpx 0; */
     margin-bottom: 20rpx;
     margin-bottom: 20rpx;
     border-top: 1rpx solid #e0e0e0;
     border-top: 1rpx solid #e0e0e0;
     border-bottom: 1rpx solid #e0e0e0;
     border-bottom: 1rpx solid #e0e0e0;
@@ -84,13 +83,18 @@ image {
 }
 }
 
 
 .order-good .name {
 .order-good .name {
-    font-size: 25.2rpx;
     max-width: 70%;
     max-width: 70%;
     overflow: hidden;
     overflow: hidden;
     text-overflow: ellipsis;
     text-overflow: ellipsis;
     display: -webkit-box;
     display: -webkit-box;
     -webkit-line-clamp: 2;
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;
     -webkit-box-orient: vertical;
+    font-family: PingFang-SC-Regular;
+    font-size: 28rpx;
+    color: #444;
+    letter-spacing: -0.4rpx;
+    line-height: 34rpx;
+    min-height: 68rpx;
 }
 }
 
 
 .order-good .row:nth-child(2) {
 .order-good .row:nth-child(2) {
@@ -106,16 +110,20 @@ image {
     overflow: hidden;
     overflow: hidden;
     white-space: nowrap;
     white-space: nowrap;
     vertical-align: bottom;
     vertical-align: bottom;
+    font-family: PingFang-SC-Regular;
+    font-size: 24rpx;
+    color: #B0B0B0;
+    letter-spacing: -0.34rpx;
 }
 }
 
 
 .order-good .row .size {
 .order-good .row .size {
     display: inline-block;
     display: inline-block;
-    max-width: 200rpx;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
     vertical-align: bottom;
     vertical-align: bottom;
     padding-left: 20rpx;
     padding-left: 20rpx;
+    font-family: PingFang-SC-Regular;
+    font-size: 24rpx;
+    color: #B0B0B0;
+    letter-spacing: -0.34rpx;
 }
 }
 
 
 .order-good .color, .order-good .size {
 .order-good .color, .order-good .size {
@@ -130,14 +138,17 @@ image {
 }
 }
 
 
 .order-good .price {
 .order-good .price {
-    color: #e01;
+    color: #d0021b;
 }
 }
 
 
 .order-good .count {
 .order-good .count {
     display: block;
     display: block;
-    color: #999;
     text-align: right;
     text-align: right;
-    line-height: 40.5rpx;
+    font-family: PingFang-SC-Regular;
+    font-size: 24rpx;
+    color: #B0B0B0;
+    letter-spacing: -0.34rpx;
+    margin-top: 40rpx;
 }
 }
 
 
 .order .footer {
 .order .footer {

@@ -133,67 +133,6 @@ image {
     border: 0;
     border: 0;
 }
 }
 
 
-.order-good .deps {
-    margin-left: 121.5rpx;
-}
-
-.order-good .name {
-    font-size: 25.2rpx;
-    max-width: 70%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-}
-
-.order-good .row:nth-child(2) {
-    height: 40.5rpx;
-    line-height: 40.5rpx;
-    width: 90%;
-}
-
-.order-good .row .color {
-    display: inline-block;
-    max-width: 200rpx;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    vertical-align: bottom;
-}
-
-.order-good .row .size {
-    display: inline-block;
-    max-width: 200rpx;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    vertical-align: bottom;
-    padding-left: 20rpx;
-}
-
-.order-good .color, .order-good .size {
-    color: #b6b6b6;
-}
-
-.order-good .price-wrap {
-    position: absolute;
-    top: 0rpx;
-    right: 27rpx;
-    text-align: right;
-}
-
-.order-good .price {
-    color: #e01;
-}
-
-.order-good .count {
-    display: block;
-    color: #999;
-    text-align: right;
-    line-height: 40.5rpx;
-}
-
 .order-page .order .footer {
 .order-page .order .footer {
     text-align: right;
     text-align: right;
     border-top: 1rpx solid #e0e0e0;
     border-top: 1rpx solid #e0e0e0;

 import wx from '../../utils/wx';
 import wx from '../../utils/wx';
-import resource from '../../common/resource';
+import config from '../../common/config';
 import Yas from '../../common/yas';
 import Yas from '../../common/yas';
 import indexModel from '../../models/index/index';
 import indexModel from '../../models/index/index';
 
 
@@ -11,7 +11,6 @@ let {windowHeight} = app.getSystemInfo();
 
 
 Page({
 Page({
     data: {
     data: {
-        resource,
         productList: [],
         productList: [],
         floatFilter: false,
         floatFilter: false,
         filterInitialTop: 0,
         filterInitialTop: 0,
@@ -25,7 +24,8 @@ Page({
         totalPage: 0,
         totalPage: 0,
         pullRefresh: false,
         pullRefresh: false,
         showBackTop: false,
         showBackTop: false,
-        showCopyright: false
+        showCopyright: false,
+        resource: config.resourceContentCode
     },
     },
     onLoad: function () {
     onLoad: function () {
         this.productList({ page: 1, limit: 20});
         this.productList({ page: 1, limit: 20});