From 12839eee8d3cd52d72aa47fbe76e5edc2628476d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 8 Jul 2022 11:12:13 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8F=AF=E8=83=BD=E5=9C=A8=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/Index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buyer/src/pages/Index.vue b/buyer/src/pages/Index.vue
index 7c1244c4..59241c85 100644
--- a/buyer/src/pages/Index.vue
+++ b/buyer/src/pages/Index.vue
@@ -52,7 +52,7 @@ export default {
   methods: {
     getIndexData () {
       // 获取首页装修数据
-      indexData({ clientType: 'PC' }).then((res) => {
+      indexData({ clientType: 'PC' }).then(async (res) => {
         if (res.success) {
           let dataJson = JSON.parse(res.result.pageData);
           // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
@@ -65,7 +65,7 @@ export default {
               this.carouselLarge = true
               this.carouselOpacity = true
             } else if (type === 'seckill') {
-              let seckill = this.getListByDay()
+              let seckill = await this.getListByDay()
               dataJson.list[i].options.list = seckill
             }
           }

From 7874931b1fd46d96b521e4e198d1a8e35cbe2d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 8 Jul 2022 11:48:12 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9win=E4=B8=8A=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/goodsDetail/ShowGoodsDetail.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index dd8f7ce2..c0ad6099 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -225,7 +225,6 @@ export default {
   width: 1200px;
   margin: 15px auto;
   display: flex;
-  overflow: scroll;
   overflow-x: hidden;
   flex-direction: row;
 
@@ -310,6 +309,9 @@ export default {
 .item-intro-img {
   width: 100%;
   min-height: 300px;
+  /deep/ img{
+    margin:0 auto;
+  }
 }
 .item-intro-img img{
   max-width: 1000px;

From f3ef286aa72768092a89b317c452cd090f336eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 8 Jul 2022 14:48:23 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/distribution/distributionOrder.vue  | 26 +++-------
 .../views/distribution/distributionOrder.vue  | 50 +++++--------------
 2 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index 058d6620..7e6fe9ab 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/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) {
diff --git a/seller/src/views/distribution/distributionOrder.vue b/seller/src/views/distribution/distributionOrder.vue
index 14ee5f38..6a531536 100644
--- a/seller/src/views/distribution/distributionOrder.vue
+++ b/seller/src/views/distribution/distributionOrder.vue
@@ -49,38 +49,7 @@ export default {
           tooltip: true,
         },
 
-        {
-          title: "实付金额",
-          key: "orderPrice",
-          width: 130,
-          sortable: false,
-          render: (h, params) => {
-            if (params.row.orderPrice == null) {
-              return h("div", this.$options.filters.unitPrice(0, "￥"));
-            } else {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.orderPrice, "￥")
-              );
-            }
-          },
-        },
-        {
-          title: "退款金额",
-          key: "returnMoney",
-          width: 130,
-          sortable: false,
-          render: (h, params) => {
-            if (params.row.orderPrice == null) {
-              return h("div", this.$options.filters.unitPrice(0, "￥"));
-            } else {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.returnMoney, "￥")
-              );
-            }
-          },
-        },
+
         {
           title: "商品名称",
           key: "goodsName",
@@ -94,27 +63,32 @@ export default {
           sortable: false,
           render: (h, params) => {
             if (params.row.distributionOrderStatus == "COMPLETE_CASH") {
-              return h("div", "提现完成");
+              return h("Tag", { props: { color: "green" } },"提现完成");
             } else if (params.row.distributionOrderStatus == "WAIT_BILL") {
-              return h("div", "待结算");
+              return h("Tag", { props: { color: "blue" } } ,"待结算");
             } else if (params.row.distributionOrderStatus == "WAIT_CASH") {
-              return h("div", "待提现");
+              return h("Tag", { props: { color: "orange" } }, "待提现");
+            } else if (params.row.distributionOrderStatus == "CANCEL") {
+              return h("Tag", { props: { color: "red" } }, "订单已取消");
+            }else if (params.row.distributionOrderStatus == "REFUND") {
+              return h("Tag", { props: { color: "magenta" } }, "退款");
             }
+
           },
         },
 
         {
           title: "佣金金额",
-          key: "rebateGrade",
+          key: "rebate",
           width: 120,
           sortable: false,
           render: (h, params) => {
-            if (params.row.rebateGrade == null) {
+            if (params.row.rebate == null) {
               return h("div", this.$options.filters.unitPrice(0, "￥"));
             } else {
               return h(
                 "div",
-                this.$options.filters.unitPrice(params.row.rebateGrade, "￥")
+                this.$options.filters.unitPrice(params.row.rebate, "￥")
               );
             }
           },

From 954cd1cda94d18a105dc68d9115cd97d6fce52e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 8 Jul 2022 18:52:03 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=94=80?=
 =?UTF-8?q?=E4=B8=AD=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/home/memberCenter/Distribution.vue  | 660 +++++++++++-------
 .../views/distribution/distributionOrder.vue  |   6 +
 2 files changed, 403 insertions(+), 263 deletions(-)

diff --git a/buyer/src/pages/home/memberCenter/Distribution.vue b/buyer/src/pages/home/memberCenter/Distribution.vue
index 279b28a3..60c6fa55 100644
--- a/buyer/src/pages/home/memberCenter/Distribution.vue
+++ b/buyer/src/pages/home/memberCenter/Distribution.vue
@@ -1,190 +1,293 @@
 <template>
-    <div class='wrapper'>
-      <card _Title='我的分销'/>
-      <!-- 分销申请 -->
-      <div v-if="status === 0">
-        <Alert type="warning">分销商申请</Alert>
-        <Form ref="form" :model="applyForm" :rules="rules">
-          <FormItem label="姓名" prop="name">
-            <Input v-model="applyForm.name"></Input>
-          </FormItem>
-          <FormItem label="身份证号" prop="idNumber">
-            <Input v-model="applyForm.idNumber"></Input>
-          </FormItem>
-          <FormItem label="银行开户行" prop="settlementBankBranchName">
-            <Input v-model="applyForm.settlementBankBranchName"></Input>
-          </FormItem>
-          <FormItem label="银行开户名" prop="settlementBankAccountName">
-            <Input v-model="applyForm.settlementBankAccountName"></Input>
-          </FormItem>
-          <FormItem label="银行账号" prop="settlementBankAccountNum">
-            <Input v-model="applyForm.settlementBankAccountNum"></Input>
-          </FormItem>
+  <div class="wrapper">
+    <card _Title="我的分销" />
+    <!-- 分销申请 -->
 
-          <FormItem>
-            <Button type="primary" :loading="applyLoading" @click="apply">提交申请</Button>
-          </FormItem>
-          </Form>
-      </div>
-      <!-- 分销审核 -->
-      <div v-if="status === 1">
-        <Alert type="success">
-          您提交的信息正在审核
-          <template slot="desc">提交认证申请后，工作人员将在三个工作日进行核对完成审核</template>
-        </Alert>
-      </div>
-      <!-- 分销提现、商品、订单 -->
-      <div v-if="status === 2">
-        <div class="box">
-          <div class="mb_20 account-price">
-            <span class="subTips">可提现金额：</span>
-            <span class="fontsize_48 global_color">￥{{ result.canRebate | unitPrice }}</span>
-            <span class="subTips">冻结金额：</span>
-            <span class="">￥{{ result.commissionFrozen | unitPrice }}</span>
-            <Button type="primary" size="small" class="ml_20" @click="withdrawApplyModal = true">申请提现</Button>
-          </div>
-        </div>
-        <Tabs :value="tabName" @on-click="tabPaneChange">
-          <TabPane label="已选商品" name="goodsChecked">
-            <Table stripe :columns="goodsColumns" :data="goodsData.records">
-              <template slot-scope="{ row }" slot="name">
-                <div class="goods-msg" @click="linkTo(`/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}`)"><img style="vertical-align:top;" :src="row.thumbnail" width="60" height="60" alt="">&nbsp; {{row.goodsName}}</div>
-              </template>
-              <template slot-scope="{ row }" slot="price">
-                <span> ￥{{ row.price | unitPrice }}</span>
-              </template>
-              <template slot-scope="{ row }" slot="commission">
-                <span> ￥{{ row.commission | unitPrice }}</span>
-              </template>
-              <template slot-scope="{ row }" slot="action">
-                <Button type="success" size="small" style="margin-right: 5px" @click="fenxiao(row)">分销商品</Button>
-                <Button type="error" size="small" @click="selectGoods(row.id, false)">取消选择</Button>
-              </template>
-            </Table>
-            <div class="page-size">
-              <Page
-                :current="params.pageNumber"
-                :total="goodsData.total"
-                :page-size="params.pageSize"
-                @on-change="changePage"
-                size="small"
-                show-total
-                show-elevator
-              ></Page>
-            </div>
-          </TabPane>
-          <TabPane label="未选商品" name="goodsUncheck">
-            <Table stripe :columns="goodsColumns" :data="goodsData.records">
-              <template slot-scope="{ row }" slot="name">
-                <div class="goods-msg" @click="linkTo(`/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}`)"><img style="vertical-align:top;" :src="row.thumbnail" width="60" height="60" alt="">&nbsp; {{row.goodsName}}</div>
-              </template>
-              <template slot-scope="{ row }" slot="price">
-                <span> ￥{{ row.price | unitPrice }}</span>
-              </template>
-              <template slot-scope="{ row }" slot="commission">
-                <span> ￥{{ row.commission | unitPrice }}</span>
-              </template>
-              <template slot-scope="{ row }" slot="action">
-                <Button type="primary" size="small" style="margin-right: 5px" @click="selectGoods(row.id, true)">选择商品</Button>
-              </template>
-            </Table>
-            <div class="page-size">
-              <Page
-                :current="params.pageNumber"
-                :total="goodsData.total"
-                :page-size="params.pageSize"
-                @on-change="changePage"
-                size="small"
-                show-total
-                show-elevator
-              ></Page>
-            </div>
-          </TabPane>
-          <TabPane label="提现记录" name="log">
-            <Table stripe :columns="logColumns" :data="logData.records">
-              <template slot-scope="{ row }" slot="sn">
-                <span>{{row.sn}}</span>
-              </template>
-              <template slot-scope="{ row }" slot="time">
-                <span>{{row.createTime}}</span>
-              </template>
-              <template slot-scope="{ row }" slot="price">
-                <span v-if="row.distributionCashStatus == 'REFUSE'" style="color: green"> +￥{{ row.price | unitPrice }}</span>
-                <span v-else style="color: red"> -￥{{ row.price | unitPrice }}</span>
-              </template>
-              <template slot-scope="{ row }" slot="status">
-                <span> {{row.distributionCashStatus == "APPLY" ? "待处理" : row.distributionCashStatus == "PASS" ? "通过" : "拒绝"}}</span>
-              </template>
-            </Table>
-            <div class="page-size">
-              <Page
-                :current="logParams.pageNumber"
-                :total="logData.total"
-                :page-size="logParams.pageSize"
-                @on-change="changePageLog"
-                size="small"
-                show-total
-                show-elevator
-              ></Page>
-            </div>
-          </TabPane>
-        </Tabs>
-      </div>
-      <!-- 未开放 -->
-      <div v-if="status === 3">
-        <Alert type="error">
-          分销功能暂未开启
-          <template slot="desc">提交认证申请后，工作人员将在三个工作日进行核对完成审核</template>
-        </Alert>
-      </div>
+    <div v-if="status === 0">
+      <Alert type="warning">分销商申请</Alert>
+      <Form ref="form" :model="applyForm" :rules="rules">
+        <FormItem label="姓名" prop="name">
+          <Input v-model="applyForm.name"></Input>
+        </FormItem>
+        <FormItem label="身份证号" prop="idNumber">
+          <Input v-model="applyForm.idNumber"></Input>
+        </FormItem>
+        <FormItem label="银行开户行" prop="settlementBankBranchName">
+          <Input v-model="applyForm.settlementBankBranchName"></Input>
+        </FormItem>
+        <FormItem label="银行开户名" prop="settlementBankAccountName">
+          <Input v-model="applyForm.settlementBankAccountName"></Input>
+        </FormItem>
+        <FormItem label="银行账号" prop="settlementBankAccountNum">
+          <Input v-model="applyForm.settlementBankAccountNum"></Input>
+        </FormItem>
 
-      <Modal v-model="withdrawApplyModal" width="530">
-        <p slot="header">
-          <Icon type="edit"></Icon>
-          <span>提现金额</span>
-        </p>
-        <div>
-          <Input
-            v-model="withdrawPrice"
-            size="large"
-            number
-            maxlength="9"
-            ><span slot="append">元</span></Input>
-        </div>
-        <div slot="footer" style="text-align: center">
-          <Button type="primary" size="large" @click="withdraw">提现</Button>
-        </div>
-      </Modal>
-      <Modal v-model="qrcodeShow" title="分销商品" width="800">
-        <Alert type="warning">
-          下载二维码或者复制链接分享商品
-        </Alert>
-        <div style="width:200px;height:200px;border:1px solid #eee;">
-          <vue-qr :text="qrcode" :callback="qrcodeData" :margin="0" colorDark="#000" colorLight="#fff" :size="200"></vue-qr>
-          <Button class="download-btn" type="success" @click="downloadQrcode">下载二维码</Button>
-        </div>
-        <div class="mt_10">商品链接：<Input style="width:400px" v-model="qrcode"></Input></div>
-      </Modal>
+        <FormItem>
+          <Button type="primary" :loading="applyLoading" @click="apply"
+            >提交申请</Button
+          >
+        </FormItem>
+      </Form>
     </div>
+    <!-- 分销审核 -->
+    <div v-if="status === 1">
+      <Alert type="success">
+        您提交的信息正在审核
+        <template slot="desc"
+          >提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
+        >
+      </Alert>
+    </div>
+    <!-- 分销提现、商品、订单 -->
+    <div v-if="status === 2">
+      <div class="tips">
+
+          <p>分销下线付款之后会生成分销订单。</p>
+          <p>
+            冻结金额：用户提现金额即为冻结金额，审核通过后扣除冻结金额，审核拒绝之后冻结金额返回可提现金额。
+          </p>
+          <p>可提现金额：分销订单佣金T+1解冻后可变为可提现金额。</p>
+
+      </div>
+
+      <div class="box">
+        <div class="mb_20 account-price">
+          <span class="subTips">可提现金额：</span>
+          <span class="fontsize_48 global_color"
+            >￥{{ result.canRebate | unitPrice }}</span
+          >
+          <span class="subTips">冻结金额：</span>
+          <span class="">￥{{ result.commissionFrozen | unitPrice }}</span>
+          <span class="subTips">返利总金额：</span>
+          <span class="">￥{{ result.rebateTotal | unitPrice }}</span>
+          <Button
+            type="primary"
+            size="small"
+            class="ml_20"
+            @click="withdrawApplyModal = true"
+            >申请提现</Button
+          >
+        </div>
+      </div>
+      <Tabs :value="tabName" @on-click="tabPaneChange">
+        <TabPane label="已选商品" name="goodsChecked">
+          <Table stripe :columns="goodsColumns" :data="goodsData.records">
+            <template slot-scope="{ row }" slot="name">
+              <div
+                class="goods-msg"
+                @click="
+                  linkTo(
+                    `/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}`
+                  )
+                "
+              >
+                <img
+                  style="vertical-align: top"
+                  :src="row.thumbnail"
+                  width="60"
+                  height="60"
+                  alt=""
+                />&nbsp; {{ row.goodsName }}
+              </div>
+            </template>
+            <template slot-scope="{ row }" slot="price">
+              <span> ￥{{ row.price | unitPrice }}</span>
+            </template>
+            <template slot-scope="{ row }" slot="commission">
+              <span> ￥{{ row.commission | unitPrice }}</span>
+            </template>
+            <template slot-scope="{ row }" slot="action">
+              <Button
+                type="success"
+                size="small"
+                style="margin-right: 5px"
+                @click="fenxiao(row)"
+                >分销商品</Button
+              >
+              <Button
+                type="error"
+                size="small"
+                @click="selectGoods(row.id, false)"
+                >取消选择</Button
+              >
+            </template>
+          </Table>
+          <div class="page-size">
+            <Page
+              :current="params.pageNumber"
+              :total="goodsData.total"
+              :page-size="params.pageSize"
+              @on-change="changePage"
+              size="small"
+              show-total
+              show-elevator
+            ></Page>
+          </div>
+        </TabPane>
+        <TabPane label="未选商品" name="goodsUncheck">
+          <Table stripe :columns="goodsColumns" :data="goodsData.records">
+            <template slot-scope="{ row }" slot="name">
+              <div
+                class="goods-msg"
+                @click="
+                  linkTo(
+                    `/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}`
+                  )
+                "
+              >
+                <img
+                  style="vertical-align: top"
+                  :src="row.thumbnail"
+                  width="60"
+                  height="60"
+                  alt=""
+                />&nbsp; {{ row.goodsName }}
+              </div>
+            </template>
+            <template slot-scope="{ row }" slot="price">
+              <span> ￥{{ row.price | unitPrice }}</span>
+            </template>
+            <template slot-scope="{ row }" slot="commission">
+              <span> ￥{{ row.commission | unitPrice }}</span>
+            </template>
+            <template slot-scope="{ row }" slot="action">
+              <Button
+                type="primary"
+                size="small"
+                style="margin-right: 5px"
+                @click="selectGoods(row.id, true)"
+                >选择商品</Button
+              >
+            </template>
+          </Table>
+          <div class="page-size">
+            <Page
+              :current="params.pageNumber"
+              :total="goodsData.total"
+              :page-size="params.pageSize"
+              @on-change="changePage"
+              size="small"
+              show-total
+              show-elevator
+            ></Page>
+          </div>
+        </TabPane>
+        <TabPane label="提现记录" name="log">
+          <Table stripe :columns="logColumns" :data="logData.records">
+            <template slot-scope="{ row }" slot="sn">
+              <span>{{ row.sn }}</span>
+            </template>
+            <template slot-scope="{ row }" slot="time">
+              <span>{{ row.createTime }}</span>
+            </template>
+            <template slot-scope="{ row }" slot="price">
+              <span
+                v-if="row.distributionCashStatus == 'VIA_AUDITING'"
+                style="color: green"
+              >
+                +￥{{ row.price | unitPrice }}</span
+              >
+              <span v-else style="color: red">
+                -￥{{ row.price | unitPrice }}</span
+              >
+            </template>
+            <template slot-scope="{ row }" slot="status">
+              <span>
+                {{
+                  row.distributionCashStatus == "APPLY"
+                    ? "待处理"
+                    : row.distributionCashStatus == "VIA_AUDITING"
+                    ? "通过"
+                    : "拒绝"
+                }}</span
+              >
+            </template>
+          </Table>
+          <div class="page-size">
+            <Page
+              :current="logParams.pageNumber"
+              :total="logData.total"
+              :page-size="logParams.pageSize"
+              @on-change="changePageLog"
+              size="small"
+              show-total
+              show-elevator
+            ></Page>
+          </div>
+        </TabPane>
+      </Tabs>
+    </div>
+    <!-- 未开放 -->
+    <div v-if="status === 3">
+      <Alert type="error">
+        分销功能暂未开启
+        <template slot="desc"
+          >提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
+        >
+      </Alert>
+    </div>
+
+    <Modal v-model="withdrawApplyModal" width="530">
+      <p slot="header">
+        <Icon type="edit"></Icon>
+        <span>提现金额</span>
+      </p>
+      <div>
+        <Input v-model="withdrawPrice" size="large" number maxlength="9"
+          ><span slot="append">元</span></Input
+        >
+      </div>
+      <div slot="footer" style="text-align: center">
+        <Button type="primary" size="large" @click="withdraw">提现</Button>
+      </div>
+    </Modal>
+    <Modal v-model="qrcodeShow" title="分销商品" width="800">
+      <Alert type="warning"> 下载二维码或者复制链接分享商品 </Alert>
+      <div style="width: 200px; height: 200px; border: 1px solid #eee">
+        <vue-qr
+          :text="qrcode"
+          :callback="qrcodeData"
+          :margin="0"
+          colorDark="#000"
+          colorLight="#fff"
+          :size="200"
+        ></vue-qr>
+        <Button class="download-btn" type="success" @click="downloadQrcode"
+          >下载二维码</Button
+        >
+      </div>
+      <div class="mt_10">
+        商品链接：<Input style="width: 400px" v-model="qrcode"></Input>
+      </div>
+    </Modal>
+  </div>
 </template>
 
 <script>
-import {distribution, applyDistribution, distCash, distCashHistory, getDistGoodsList, selectDistGoods} from '@/api/member.js'
-import { IDCard } from '@/plugins/RegExp.js';
-import {checkBankno} from '@/plugins/Foundation'
-import vueQr from 'vue-qr';
+import {
+  distribution,
+  applyDistribution,
+  distCash,
+  distCashHistory,
+  getDistGoodsList,
+  selectDistGoods,
+} from "@/api/member.js";
+import { IDCard } from "@/plugins/RegExp.js";
+import { checkBankno } from "@/plugins/Foundation";
+import vueQr from "vue-qr";
 export default {
-  name: 'Distribution',
+  name: "Distribution",
   components: { vueQr },
-  data () {
+  data() {
     return {
       status: 0, // 申请状态，0为未申请 1 申请中 2 申请完成 3 功能暂未开启
       applyForm: {}, // 申请表单
-      rules: { // 验证规则
-        name: [{required: true, message: '请输入真实姓名'}],
+      rules: {
+        // 验证规则
+        name: [{ required: true, message: "请输入真实姓名" }],
         idNumber: [
-          {required: true, message: '请输入身份证号'},
-          {pattern: IDCard, message: '请输入正确的身份证号'}
+          { required: true, message: "请输入身份证号" },
+          { pattern: IDCard, message: "请输入正确的身份证号" },
         ],
         settlementBankBranchName: [
           {
@@ -193,7 +296,6 @@ export default {
             // 可以单个或者同时写两个触发验证方式
             trigger: "blur",
           },
-
         ],
         settlementBankAccountName: [
           {
@@ -221,7 +323,7 @@ export default {
           },
         ],
       },
-      tabName: 'goodsChecked', // 当前所在tab
+      tabName: "goodsChecked", // 当前所在tab
       result: {}, // 审核结果
       applyLoading: false, // 申请加载状态
       goodsLoading: false, // 列表加载状态
@@ -229,136 +331,155 @@ export default {
       withdrawPrice: 0, // 提现金额
       goodsData: {}, // 商品数据
       logData: {}, // 日志数据
-      goodsColumns: [ // 商品表头
-        {title: '商品名称', slot: 'name', width: 400},
-        {title: '商品价格', slot: 'price'},
-        {title: '佣金', slot: 'commission'},
-        {title: '操作', slot: 'action', minWidth: 120}
+      goodsColumns: [
+        // 商品表头
+        { title: "商品名称", slot: "name", width: 400 },
+        { title: "商品价格", slot: "price" },
+        { title: "佣金", slot: "commission" },
+        { title: "操作", slot: "action", minWidth: 120 },
       ],
-      logColumns: [ // 日志表头
-        {title: '编号', slot: 'sn'},
-        {title: '申请时间', slot: 'time'},
-        {title: '提现金额', slot: 'price'},
-        {title: '提现状态', slot: 'status'}
+      logColumns: [
+        // 日志表头
+        { title: "编号", slot: "sn" },
+        { title: "申请时间", slot: "time" },
+        { title: "提现金额", slot: "price" },
+        { title: "提现状态", slot: "status" },
       ],
-      params: { // 商品请求参数
+      params: {
+        // 商品请求参数
         pageNumber: 1,
         pageSize: 20,
-        checked: true
+        checked: true,
       },
-      orderParams: { // 订单商品请求参数
+      orderParams: {
+        // 订单商品请求参数
         pageNumber: 1,
-        pageSize: 20
+        pageSize: 20,
       },
-      logParams: { // 日志参数
+      logParams: {
+        // 日志参数
         pageNumber: 1,
-        pageSize: 20
+        pageSize: 20,
+        sort: "createTime",
+        order: "desc",
       },
-      qrcode: '', // 二维码
+      qrcode: "", // 二维码
       qrcodeShow: false, // 显示二维码
-      base64Img: '', // base64编码
-      goodsNameCurr: ''// 当前分销商品名称
-    }
+      base64Img: "", // base64编码
+      goodsNameCurr: "", // 当前分销商品名称
+    };
   },
-  mounted () {
-    this.distribution()
+  mounted() {
+    this.distribution();
   },
   methods: {
-    apply () { // 申请成为分销商
-      this.$refs.form.validate(valid => {
+    apply() {
+      // 申请成为分销商
+      this.$refs.form.validate((valid) => {
         if (valid) {
-          this.applyLoading = true
-          applyDistribution(this.form).then(res => {
-            this.applyLoading = false
+          this.applyLoading = true;
+          applyDistribution(this.form).then((res) => {
+            this.applyLoading = false;
             if (res.success) {
-              this.$Message.success('申请已提交，请等待管理员审核')
+              this.$Message.success("申请已提交，请等待管理员审核");
               this.status = 1;
             }
-          })
+          });
         }
-      })
+      });
     },
-    withdraw () { // 申请提现
-      distCash({price: this.withdrawPrice}).then(res => {
-        this.withdrawApplyModal = false
+    withdraw() {
+      // 申请提现
+      distCash({ price: this.withdrawPrice }).then((res) => {
+        this.withdrawApplyModal = false;
         this.price = 0;
         if (res.success) {
-          this.$Message.success('申请已提交，请等待审核')
-          this.distribution()
-          this.getLog()
+          this.$Message.success("申请已提交，请等待审核");
+          this.distribution();
+          this.getLog();
         } else {
-          this.$Message.error(res.message)
+          this.$Message.error(res.message);
         }
-      })
+      });
     },
-    qrcodeData (data64) { // 二维码base64地址
-      this.base64Img = data64
+    qrcodeData(data64) {
+      // 二维码base64地址
+      this.base64Img = data64;
     },
-    downloadQrcode () { // 下载二维码
-      let a = document.createElement('a'); // 生成一个a元素
-      let event = new MouseEvent('click'); // 创建一个单击事件
-      a.download = this.goodsNameCurr || 'photo'
+    downloadQrcode() {
+      // 下载二维码
+      let a = document.createElement("a"); // 生成一个a元素
+      let event = new MouseEvent("click"); // 创建一个单击事件
+      a.download = this.goodsNameCurr || "photo";
       a.href = this.base64Img; // 将生成的URL设置为a.href属性
       a.dispatchEvent(event); // 触发a的单击事件
     },
-    tabPaneChange  (tab) { // tab栏切换
-      if (tab === 'goodsChecked') {
+    tabPaneChange(tab) {
+      // tab栏切换
+      if (tab === "goodsChecked") {
         this.params.checked = true;
-        this.params.pageNUmber = 1
-        this.getGoodsData()
-      } else if (tab === 'goodsUncheck') {
-        this.params.checked = false
-        this.getGoodsData()
-      } else if (tab === 'log') {
-        this.logParams.pageNumber = 1
-        this.getLog()
+        this.params.pageNUmber = 1;
+        this.getGoodsData();
+      } else if (tab === "goodsUncheck") {
+        this.params.checked = false;
+        this.getGoodsData();
+      } else if (tab === "log") {
+        this.logParams.pageNumber = 1;
+        this.getLog();
       }
     },
-    changePage (val) { // 修改页码
+    changePage(val) {
+      // 修改页码
       this.params.pageNumber = val;
-      this.getGoodsData()
+      this.getGoodsData();
     },
-    changePageLog (val) { // 修改页码 日志
+    changePageLog(val) {
+      // 修改页码 日志
       this.logParams.pageNumber = val;
-      this.getLog()
+      this.getLog();
     },
-    selectGoods (id, checked) { // 选择商品
+    selectGoods(id, checked) {
+      // 选择商品
       let params = {
         distributionGoodsId: id,
-        checked: checked
-      }
-      selectDistGoods(params).then(res => {
+        checked: checked,
+      };
+      selectDistGoods(params).then((res) => {
         if (res.success) {
-          this.$Message.success('操作成功！')
-          this.getGoodsData()
+          this.$Message.success("操作成功！");
+          this.getGoodsData();
         }
-      })
+      });
     },
-    fenxiao (row) { // 分销商品
-      this.qrcode = `${location.origin}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`
-      this.goodsNameCurr = row.goodsName
+    fenxiao(row) {
+      // 分销商品
+      this.qrcode = `${location.origin}/goodsDetail?skuId=${row.skuId}&goodsId=${row.goodsId}&distributionId=${this.result.id}`;
+      this.goodsNameCurr = row.goodsName;
       this.qrcodeShow = true;
     },
-    getGoodsData () { // 商品数据
-      getDistGoodsList(this.params).then(res => {
-        if (res.success) this.goodsData = res.result
-      })
+    getGoodsData() {
+      // 商品数据
+      getDistGoodsList(this.params).then((res) => {
+        if (res.success) this.goodsData = res.result;
+      });
     },
-    getLog () { // 提现历史
-      distCashHistory(this.logParams).then(res => {
-        if (res.success) this.logData = res.result
-      })
+    getLog() {
+      // 提现历史
+      distCashHistory(this.logParams).then((res) => {
+        if (res.success) this.logData = res.result;
+      });
     },
-    distribution () { // 获取分销商信息
+    distribution() {
+      // 获取分销商信息
       distribution().then((res) => {
         if (res.result) {
           this.result = res.result;
           let type = res.result.distributionStatus;
 
-          if (type === 'PASS') {
+          if (type === "PASS") {
             this.status = 2;
-            this.getGoodsData()
-          } else if (type === 'RETREAT' || type === 'REFUSE') {
+            this.getGoodsData();
+          } else if (type === "RETREAT" || type === "REFUSE") {
             this.status = 0;
           } else {
             this.status = 1;
@@ -367,15 +488,15 @@ export default {
           this.status = 3;
         } else {
           // 没有资格申请 先去实名认证
-          this.status = 0
+          this.status = 0;
         }
       });
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
-<style scoped lang='scss'>
+<style scoped lang="scss">
 .box {
   margin: 20px 0;
 }
@@ -392,11 +513,11 @@ export default {
 .fontsize_48 {
   font-size: 48px;
 }
-.goods-msg{
+.goods-msg {
   display: flex;
   align-items: center;
   padding: 3px;
-  &:hover{
+  &:hover {
     color: $theme_color;
     cursor: pointer;
   }
@@ -406,4 +527,17 @@ export default {
   top: -200px;
   left: 200px;
 }
+/depp/ .ivu-alert-message {
+  p {
+    margin: 4px 0;
+  }
+}
+.tips{
+  background:#f7f7f7;
+  padding: 16px;
+  border-radius: .4em;
+  >p{
+    margin: 6px 0;
+  }
+}
 </style>
diff --git a/seller/src/views/distribution/distributionOrder.vue b/seller/src/views/distribution/distributionOrder.vue
index 6a531536..694358d9 100644
--- a/seller/src/views/distribution/distributionOrder.vue
+++ b/seller/src/views/distribution/distributionOrder.vue
@@ -99,6 +99,12 @@ export default {
           width: 180,
           sortable: false,
         },
+        {
+          title: "解冻日期（T+1）",
+          key: "settleCycle",
+          width: 180,
+          sortable: false,
+        },
       ],
       data: [], // 表单数据
       total: 0, // 表单数据总数

From 34788d800eeb3db8e261ee4941b8b2190bacf471 Mon Sep 17 00:00:00 2001
From: Chopper711 <1814994716@qq.com>
Date: Wed, 13 Jul 2022 01:15:42 +0000
Subject: [PATCH 5/7] =?UTF-8?q?=E8=B6=B3=E8=BF=B9=E6=9C=AA=E8=83=BD?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/userCenter/MyTracks.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue
index b3cbb97c..48ee74ea 100644
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -112,7 +112,7 @@ export default {
       tracksList(this.params).then((res) => {
         this.spinShow = false;
         if (res.success && res.result) {
-          this.list = res.result;
+          this.list = res.result.records;
         } else {
           this.list = [];
         }

From eeadfc1db97b50a98677c79252897f397f3f70d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 13 Jul 2022 09:37:59 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E5=85=AC=E5=91=8A=E6=A8=AA=E7=BA=B5=E5=90=91=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=88=91=E7=9A=84=E8=B6=B3=E8=BF=B9=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexDecorate/modelList/Seckill.vue       |  2 +-
 buyer/src/pages/home/userCenter/MyTracks.vue  |  4 +-
 .../views/lili-floor-renovation/wap/config.js |  1 +
 .../lili-floor-renovation/wap/decorate.vue    | 45 ++++++++++++++++---
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/buyer/src/components/indexDecorate/modelList/Seckill.vue b/buyer/src/components/indexDecorate/modelList/Seckill.vue
index ea6c5da8..6b1be0bd 100644
--- a/buyer/src/components/indexDecorate/modelList/Seckill.vue
+++ b/buyer/src/components/indexDecorate/modelList/Seckill.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="seckill">
+  <div class="seckill" v-if="goodsList.length">
     <div class="aside hover-pointer" @click="goToSeckill">
       <div class="title">{{ actName }}</div>
       <div class="hour">
diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue
index b3cbb97c..d5c3b709 100644
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -111,8 +111,8 @@ export default {
       this.spinShow = true;
       tracksList(this.params).then((res) => {
         this.spinShow = false;
-        if (res.success && res.result) {
-          this.list = res.result;
+        if (res.success && res.result.records.length) {
+          this.list = res.result.records;
         } else {
           this.list = [];
         }
diff --git a/manager/src/views/lili-floor-renovation/wap/config.js b/manager/src/views/lili-floor-renovation/wap/config.js
index cc6808c4..e361fe34 100644
--- a/manager/src/views/lili-floor-renovation/wap/config.js
+++ b/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'
         }
       ]
diff --git a/manager/src/views/lili-floor-renovation/wap/decorate.vue b/manager/src/views/lili-floor-renovation/wap/decorate.vue
index 9356dec5..3a447060 100644
--- a/manager/src/views/lili-floor-renovation/wap/decorate.vue
+++ b/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",

From 00e229e7f4368dc12c6e9fe0761b05545b228cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Wed, 13 Jul 2022 18:12:30 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/order/flow/refundLog.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/manager/src/views/order/flow/refundLog.vue b/manager/src/views/order/flow/refundLog.vue
index 37e8c0cf..594f6d7f 100644
--- a/manager/src/views/order/flow/refundLog.vue
+++ b/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) {