修改分销中展示问题

buyer/src/pages/home/memberCenter/Distribution.vue

@@ -1,7 +1,8 @@
 <template>
-    <div class='wrapper'>
-      <card _Title='我的分销'/>
+  <div class="wrapper">
+    <card _Title="我的分销" />
     <!-- 分销申请 -->
+
     <div v-if="status === 0">
       <Alert type="warning">分销商申请</Alert>
       <Form ref="form" :model="applyForm" :rules="rules">
@@ -22,7 +23,9 @@
         </FormItem>
 
         <FormItem>
-            <Button type="primary" :loading="applyLoading" @click="apply">提交申请</Button>
+          <Button type="primary" :loading="applyLoading" @click="apply"
+            >提交申请</Button
+          >
         </FormItem>
       </Form>
     </div>
@@ -30,25 +33,62 @@
     <div v-if="status === 1">
       <Alert type="success">
         您提交的信息正在审核
-          <template slot="desc">提交认证申请后，工作人员将在三个工作日进行核对完成审核</template>
+        <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="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>
+          <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>
+              <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>
@@ -57,8 +97,19 @@
               <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>
+              <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">
@@ -76,7 +127,22 @@
         <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>
+              <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>
@@ -85,7 +151,13 @@
               <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>
+              <Button
+                type="primary"
+                size="small"
+                style="margin-right: 5px"
+                @click="selectGoods(row.id, true)"
+                >选择商品</Button
+              >
             </template>
           </Table>
           <div class="page-size">
@@ -103,17 +175,32 @@
         <TabPane label="提现记录" name="log">
           <Table stripe :columns="logColumns" :data="logData.records">
             <template slot-scope="{ row }" slot="sn">
-                <span>{{row.sn}}</span>
+              <span>{{ row.sn }}</span>
             </template>
             <template slot-scope="{ row }" slot="time">
-                <span>{{row.createTime}}</span>
+              <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>
+              <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 == "PASS" ? "通过" : "拒绝"}}</span>
+              <span>
+                {{
+                  row.distributionCashStatus == "APPLY"
+                    ? "待处理"
+                    : row.distributionCashStatus == "VIA_AUDITING"
+                    ? "通过"
+                    : "拒绝"
+                }}</span
+              >
             </template>
           </Table>
           <div class="page-size">
@@ -134,7 +221,9 @@
     <div v-if="status === 3">
       <Alert type="error">
         分销功能暂未开启
-          <template slot="desc">提交认证申请后，工作人员将在三个工作日进行核对完成审核</template>
+        <template slot="desc"
+          >提交认证申请后，工作人员将在三个工作日进行核对完成审核</template
+        >
       </Alert>
     </div>
 
@@ -144,47 +233,61 @@
         <span>提现金额</span>
       </p>
       <div>
-          <Input
-            v-model="withdrawPrice"
-            size="large"
-            number
-            maxlength="9"
-            ><span slot="append">元</span></Input>
+        <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>
+      <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>
-        <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>

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, // 表单数据总数