Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

@@ -348,7 +348,7 @@ export default {
 
     .judge-count-down {
       color: #d0021b;
-      font-size: 12px;
+      font-size: 12*2px;
       display: inline-block;
     }
 

@@ -89,7 +89,7 @@ const DEFUALT_CONFIG_TIP = {
 };
 
 const TEST_PRODUCT_INFO = {
-  least_price: 1119.00,
+  least_price: 0,
   max_price: 20000.00,
   max_sort_id: 10,
   min_price: 0.01,
@@ -98,7 +98,9 @@ const TEST_PRODUCT_INFO = {
   product_id: 10000068,
   product_name: 'Timberland 红色女靴',
   sale_time: '2016.01.01',
-  image: 'http://img11.static.yhbimg.com/goodsimg/2018/10/18/17/0124eed582cab20be7047c796c314cbc76.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80'
+  image: 'http://img11.static.yhbimg.com/goodsimg/2018/10/18/17/0124eed582cab20be7047c796c314cbc76.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',
+  sizeName: '',
+  colorName: '',
 };
 
 export default function() {

@@ -30,7 +30,7 @@ const {
 } = Types;
 
 const TEST_PRODUCT_INFO = {
-  least_price: 1119.00,
+  least_price: 0,
   max_price: 20000.00,
   max_sort_id: 10,
   min_price: 0.01,
@@ -40,9 +40,9 @@ const TEST_PRODUCT_INFO = {
   product_name: 'Timberland 红色女靴',
   sale_time: '2016.01.01',
   goodImg: 'http://img11.static.yhbimg.com/goodsimg/2018/10/18/17/0124eed582cab20be7047c796c314cbc76.jpg?imageMogr2/thumbnail/{width}x{height}/background/d2hpdGU=/position/center/quality/80',
-  colorName: '黑色',
-  sizeName: '42码',
-  goodPrice: 1119.00,
+  colorName: '',
+  sizeName: '',
+  goodPrice: 0,
   priceType: '现货最高求购价：',
 };
 

@@ -24,6 +24,7 @@ export default function(mergeState = {}) {
           isLogin: false,
           userHeadIco: '',
           userName: '',
+          enableQiugou: null, // 是否启用求购，默认不启用, null: 初始状态标识，需要请求api, false: 不启用， true: 启用
         },
         window: {
           statusBarStatus: false,
@@ -39,11 +40,6 @@ export default function(mergeState = {}) {
         direction: 'forword',
         homePage: true,
         user: {},
-
-        // 系统配置
-        sysConfig: {
-          enableQiugou: null, // 是否启用求购，默认不启用, null: 初始状态标识，需要请求api, false: 不启用， true: 启用
-        }
       },
       mergeState,
     ),
@@ -139,7 +135,7 @@ export default function(mergeState = {}) {
         state.user.sellerInfo = sellerInfo || {};
       },
       [Types.UPDATE_SYSTEM_CONFIG_QIUGOU](state, { enabled }) {
-        state.sysConfig.enableQiugou = enabled;
+        state.context.enableQiugou = enabled;
       },
     },
     getters: {
@@ -147,7 +143,7 @@ export default function(mergeState = {}) {
         return state.context.isLogin;
       },
       isQiugouEnabled(state) {
-        return state.sysConfig.enableQiugou;
+        return state.context.enableQiugou;
       },
     },
     actions: {
@@ -229,9 +225,9 @@ export default function(mergeState = {}) {
         // /ufo-gateway/?method=ufo.resource.getConfigTypeContent&code=bid_switch_h5
         // {"alg":"SALT_MD5","code":200,"data":"1","md5":"c13a1ace2c5883be18643551bd17ebcd","message":"操作成功"}
         // H5是否打开求购 1代表打开
-        let isEnabled = !!state.sysConfig.enableQiugou;
+        let isEnabled = !!state.context.enableQiugou;
 
-        if (state.sysConfig.enableQiugou === null) {
+        if (state.context.enableQiugou === null) {
           const resp = await this.$api.post('/api/sys/config', {
             code: 'bid_switch_h5',
           });