Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

manager/src/views/distribution/distributionOrder.vue

@@ -102,19 +102,7 @@
             slot: 'goodsMsg',
             minWidth: 150
           },
-          {
-            title: "退款金额",
-            key: "returnMoney",
-            minWidth:80,
-            sortable: false,
-            render: (h, params) => {
-              if(params.row.sellBackRebate == null){
-                return h("div", this.$options.filters.unitPrice(0, '￥'));
-              }else{
-                return h("div", this.$options.filters.unitPrice(params.row.sellBackRebate, '￥'));
-              }
-            }
-          },
+
           {
             title: "分销商",
             key: "distributionName",
@@ -134,7 +122,7 @@
           },
           {
             title: "佣金金额",
-            key: "rebateGrade",
+            key: "rebate",
             minWidth:80,
             sortable: false,
             render: (h, params) => {
@@ -237,11 +225,11 @@
       },
       filterStatusColor (status) { // 状态tag标签颜色
         const arr = [
-          {status: 'WAIT_BILL', color: 'magenta'},
-          {status: 'WAIT_CASH', color: 'warning'},
-          {status: 'COMPLETE_CASH', color: 'success'},
-          {status: 'CANCEL', color: 'default'},
-          {status: 'REFUND', color: 'error'},
+          {status: 'WAIT_BILL', color: 'blue'},
+          {status: 'WAIT_CASH', color: 'orange'},
+          {status: 'COMPLETE_CASH', color: 'green'},
+          {status: 'CANCEL', color: 'red'},
+          {status: 'REFUND', color: 'magenta'},
         ]
         for (let i=0;i<arr.length;i++) {
           if (arr[i].status === status) {

manager/src/views/lili-floor-renovation/wap/config.js

@@ -532,6 +532,7 @@ export const modelData = [
           title: [{context: "这是一条公告"}],
           color: "#666",
           bk_color: "#FFF",
+          direction:"horizontal",
           img: 'http://files.sxcfx.cn/upload/20220318/71e5d27aca82aeedf647052e1e4ceaaa.png'
         }
       ]

manager/src/views/lili-floor-renovation/wap/decorate.vue

@@ -217,6 +217,23 @@
               <Input v-model="item.bk_color" />
             </div>
           </div>
+          <div
+            class="decorate-view"
+            v-if="item.title != void 0 && !res.notTitle && res.type == 'notice'"
+          >
+            <div class="decorate-view-title">方向</div>
+            <div class="decorate-view">
+              <Select
+                style="width: 200px"
+                @on-change="changeDirection($event, item)"
+                v-model="item.direction"
+              >
+              {{item.direction}}
+                <Option label="横向" value="horizontal"></Option>
+                <Option label="纵向" value="vertical"></Option>
+              </Select>
+            </div>
+          </div>
 
           <!-- 填写标题 -->
           <div
@@ -364,10 +381,11 @@
       v-if="
         res.type != 'tpl_ad_list' &&
         res.type != 'tpl_activity_list' &&
-        !res.notAdd
+        !res.notAdd &&
+        res.direction != 'horizontal'
       "
       type="primary"
-      @click="addDecorate(res.type)"
+      @click="addDecorate(res.type, res)"
       ghost
       >添加</Button
     >
@@ -414,6 +432,14 @@ export default {
   },
   props: ["res"],
   methods: {
+    // 改变横纵切换title内容
+    changeDirection(val, data) {
+      if (val == "horizontal") {
+        const props = {...data}
+        data.title = []
+        data.title.push( props.title[0]);
+      }
+    },
     // 选择风格
     selectStyle() {
       this.styleFlag = !this.styleFlag;
@@ -455,7 +481,7 @@ export default {
     },
     // 打开图片选择器
     liliDialogFlag(flag) {
-      this.$refs.liliDialog.clearGoodsSelected()
+      this.$refs.liliDialog.clearGoodsSelected();
       this.$refs.liliDialog.goodsFlag = flag;
       this.$refs.liliDialog.flag = true;
     },
@@ -482,11 +508,16 @@ export default {
       });
     },
     //添加设置
-    addDecorate(type) {
+    addDecorate(type, data) {
       if (type === "notice") {
-        this.res.options.list[0].title.push({
-          content: "",
-        });
+        console.log(data)
+        if (data.options.list[0].direction == "vertical") {
+          this.res.options.list[0].title.push({
+            content: "",
+          });
+        } else {
+          this.$Message.error("仅纵向支持多添加");
+        }
       } else {
         let way = {
           img: "https://picsum.photos/id/264/200/200",

manager/src/views/order/flow/refundLog.vue

@@ -94,7 +94,7 @@ export default {
           title: "退款状态",
           key: "isRefund",
           fixed: "right",
-          width: 95,
+          width: 120,
           render: (h, params) => {
             if (params.row.isRefund == "1") {
               return h("div", [
@@ -102,7 +102,11 @@ export default {
               ]);
             } else {
               return h("div", [
-                h("Tag", { props: { color: "orange" } }, "未退款"),
+                  h("span", [
+                    h("Tag", { props: { color: "orange" } }, "未退款"),
+                    h("span", params.row.errorMessage || ''),
+                ]),
+                // h("Tag", { props: { color: "orange" } }, "未退款"),
               ]);
             }
           },
@@ -115,7 +119,7 @@ export default {
   methods: {
     // 初始化数据
     init() {
-      this.getDataList();  
+      this.getDataList();
     },
     // 分页 改变页码
     changePage(v) {