include vhosts/yohoblkwap.conf;

Merge branch 'master' into release/3.0

@@ -6,7 +6,8 @@
                 disabled: color.disabled
                 disabled: color.disabled
             }">
             }">
             <div class="color-border">
             <div class="color-border">
-                <i :style="{ 'background-color': '#' + (color.colorCode || 'ffffff')}" :title="color.colorName"></i>
+                <i v-if="color.colorValue" class="color-image" :style="{ 'background-image': `url(${color.colorValue})`}" :title="color.colorName"></i>
+                <i v-else :style="{ 'background-color': '#' + (color.colorCode || 'ffffff')}" :title="color.colorName"></i>
             </div>
             </div>
             <span>{{color.colorName}}</span>
             <span>{{color.colorName}}</span>
         </div>
         </div>
@@ -124,6 +125,10 @@ export default {
             overflow: hidden;
             overflow: hidden;
         }
         }
 
 
+        .color-image {
+            background-size: cover;
+        }
+
         i {
         i {
             display: block;
             display: block;
             width: 30px;
             width: 30px;

@@ -23,6 +23,10 @@
                 <input-safe v-model="product.phrase" :maxlength="12" placeholder="最多12个字符" style="width: 400px;"/>
                 <input-safe v-model="product.phrase" :maxlength="12" placeholder="最多12个字符" style="width: 400px;"/>
             </Form-item>
             </Form-item>
 
 
+            <!-- <Form-item label="推荐短语">
+                <input-safe v-model="product.recommendPhrase" type="textarea" :maxlength="500" placeholder="最多500个字符" style="width: 400px;"/>
+            </Form-item> -->
+
             <Form-item label="商家商品编码" prop="factoryCode">
             <Form-item label="商家商品编码" prop="factoryCode">
                 <input-safe v-model="product.factoryCode" placeholder="请输入..." style="width: 400px;"/>
                 <input-safe v-model="product.factoryCode" placeholder="请输入..." style="width: 400px;"/>
             </Form-item>
             </Form-item>

@@ -19,6 +19,9 @@
         <Form-item label="商品卖点">
         <Form-item label="商品卖点">
             <input-safe v-model="product.phrase" :maxlength="12" placeholder="最多12个字符"/>
             <input-safe v-model="product.phrase" :maxlength="12" placeholder="最多12个字符"/>
         </Form-item>
         </Form-item>
+        <!-- <Form-item label="推荐短语">
+            <input-safe v-model="product.recommendPhrase" type="textarea" :maxlength="500" placeholder="最多500个字符" style="width: 400px;"/>
+        </Form-item> -->
         <Form-item label="商家商品编码" prop="factoryCode">
         <Form-item label="商家商品编码" prop="factoryCode">
             <input-safe v-model="product.factoryCode" placeholder="请输入..." />
             <input-safe v-model="product.factoryCode" placeholder="请输入..." />
         </Form-item>
         </Form-item>
@@ -476,6 +479,7 @@ export default {
             newProduct.factoryCode = this.product.factoryCode;
             newProduct.factoryCode = this.product.factoryCode;
             newProduct.goodsYears = this.product.goodsYears;
             newProduct.goodsYears = this.product.goodsYears;
             newProduct.phrase = this.product.phrase;
             newProduct.phrase = this.product.phrase;
+            newProduct.recommendPhrase = this.product.recommendPhrase;
             newProduct.goodsSeason = this.product.goodsSeason;
             newProduct.goodsSeason = this.product.goodsSeason;
             newProduct.ageLevel = this.product.ageLevel;
             newProduct.ageLevel = this.product.ageLevel;
             newProduct.seasons = this.product.seasons;
             newProduct.seasons = this.product.seasons;