Merge branch 'master' into dev

src/views/promotion/display_schedule/tabs/schedule.vue

@@ -872,11 +872,11 @@
           visible: true,
           type: 'formula',
           func: (row) => {
-            // 促销价是否执行，促销机制是否执行，促销规格是否执行，档期是否开展
+            // 促销价是否执行，促销机制是否执行，档期规格是否执行，档期是否开展
             row.promotionExecutionStatus = row.promotionPriceExecutionStatus == '是' && row.promotionMechanismExecutionStatus == '是' && row.specExecutionStatus == '是' && row.promotionImplementationStatus == '是' ? '是' : '否';
             return row.promotionExecutionStatus;
           },
-          formulaStr: '公式：（促销价是否执行 = 是，并且促销机制是否执行 = 是，并且促销规格是否执行 = 是，并且档期是否开展 = 是）',
+          formulaStr: '公式：（促销价是否执行 = 是，并且促销机制是否执行 = 是，并且档期规格是否执行 = 是，并且档期是否开展 = 是）',
           fill: true,
           width: 125
         }

src/views/promotion/display_schedule/tabs/snack.vue

@@ -293,7 +293,8 @@
                     submitChange(row, col);
                   }}
                   disabled={!row[col.referenceKey]}
-                  placeholder="">
+                  placeholder=""
+                  clearable>
                   {col.options.map(item => (
                     <el-option
                       key={item.value}

src/views/system/user/profile/index.vue

 <template>
   <div class="app-container">
-    <el-row :gutter="20" class="container">
+    <el-row :gutter="20"
+      class="container">
       <el-col :span="6"
         :xs="24">
         <el-card class="box-card">
@@ -91,3 +92,9 @@
 
   getUser();
 </script>
+<style lang="scss"
+  scoped>
+  .container {
+    flex-direction: row;
+  }
+</style>
\ No newline at end of file