Merge branch 'moss_bug' into develop

* moss_bug:
  线下销售订单-新增时商品信息判空提示
  订单列表-微信支付时颜色区分

src/styles/order-list.scss

@@ -107,7 +107,7 @@
             }
             .main {
               width: 70%;
-              height: 80px;
+              // height: 80px;
               display: flex;
               flex-direction: column;
               .spec {

src/views/mallManagement/order/offline_order_list/index.vue

@@ -942,6 +942,17 @@ export default {
             if(this.oldList.length < 1) return this.$errorMsg('以旧换新需要添加旧机信息');
           }
 
+          for(let i = 0; i < this.goodsList.length; i++) {
+            if(this.goodsList[i].flag == 1) {
+              if(!this.goodsList[i].goodsId) return this.$errorMsg('请完善商品信息-商品名称');
+              if(!this.goodsList[i].goodsSpecId) return this.$errorMsg('请完善商品信息-规格型号');
+            } else {
+              if(!this.goodsList[i].goodsMaterialId) return this.$errorMsg('请完善商品信息-商品名称/规格型号');
+            }
+            if(!this.goodsList[i].num) return this.$errorMsg('请完善商品信息-订单数量');
+            if(!this.goodsList[i].price) return this.$errorMsg('请完善商品信息-单价');
+          }
+
           let orderSmallTypeText = this.orderTypeList.find(o => o.id == this.formData.orderSmallType).orderSmallTypeText;
           let oldList = this.oldList.map(item => {
             return {

src/views/mallManagement/order/order_list/index.vue

@@ -149,8 +149,8 @@
                 <span><b>下单时间</b>：{{ order.createTime }}</span>
                 <span><b>商户</b>：{{ order.companyWechatName || '无' }}</span>
                 <span><b>网点</b>：{{ order.websitName || '无' }}</span>
-                <el-tag>{{order.saleType | saleTypeFilter}}</el-tag>
-                <el-tag>{{order.payType}}</el-tag>
+                <el-tag>{{ {1: '商城销售', 2: '线下销售',}[order.saleType] }}</el-tag>
+                <el-tag :type="order.payTypeId == 'WECHAT' ? 'success' : ''">{{order.payType}}</el-tag>
                 <div class="fr">
                   <el-link type="primary" v-if="$restrict('orderNote')" :underline="false" @click="showRemark(order)">订单备注</el-link>
                   <el-link type="primary" v-if="$restrict('detail')" :underline="false" @click="queryDetail(order.orderId)">查看详情</el-link>
@@ -662,16 +662,6 @@ export default {
 	components: { 
     printPreview
   },
-  
-  filters: {
-    saleTypeFilter(val) {
-      const MAP = {
-        1: '商城销售',
-        2: '线下销售',
-      }
-      return MAP[val];
-    }
-  },
 
   data() {
     return {