From e817d196f09cbca42e2058ca576df8ca99de1d58 Mon Sep 17 00:00:00 2001
From: Sliverber <2622874537@qq.com>
Date: Tue, 26 Mar 2024 17:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E8=A1=8C=20=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=20=E9=87=91=E9=A2=9D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/channel/index.vue       | 36 ++++++++++++-----
 src/views/examine/orderDetail.vue | 65 ++++++++++++++++++++++++++++---
 src/views/order/orderDetail.vue   | 65 ++++++++++++++++++++++++++++---
 3 files changed, 145 insertions(+), 21 deletions(-)

diff --git a/src/views/channel/index.vue b/src/views/channel/index.vue
index 16a3957..7c7d7bb 100644
--- a/src/views/channel/index.vue
+++ b/src/views/channel/index.vue
@@ -30,17 +30,26 @@
         <el-table-column prop="name" label="名称" min-width="50"  align="center"/>
         <el-table-column prop="id" label="渠道ID" min-width="50"  align="center"/>
         <el-table-column prop="createTime" label="添加日期" min-width="50"  align="center"/>
-        <el-table-column prop="address" label=" 总点击/今日点击/总注册" min-width="80">
+        <el-table-column prop="address" label=" 总点击/总转化/总注册/回款率/" min-width="80">
           <template slot-scope="scope">
             <div class="cont" style="display: flex;flex-wrap: nowrap;justify-content: center;">
-              {{ scope.row.totalClickNum }}/ {{ scope.row.todayClickNum }}/ {{ scope.row.totalRegisterNum }}
+              {{ scope.row.totalClickNum }}/ {{ scope.row.totalConversionRatio }} / {{ scope.row.totalRegisterNum }}/ {{ scope.row.totalReturnRate }} 
+
+
+            </div>
+           
+          </template>
+        </el-table-column>
+        <el-table-column prop="address" label=" 今日进件/今日点击/今日转化率" min-width="80">
+          <template slot-scope="scope">
+            <div class="cont" style="display: flex;flex-wrap: nowrap;justify-content: center;">
+              {{ scope.row.todayRegisterNum }}/ {{ scope.row.todayClickNum }} / {{ scope.row.totalConversionRatio }}
 
 
             </div>
            
           </template>
         </el-table-column>
-       
         <!-- <el-table-column prop="todayClickNum" label="今日点击" min-width="50"  align="center"/>
         <el-table-column prop="totalRegisterNum" label="总注册" min-width="50"  align="center"/> -->
         <!-- <el-table-column prop="totalOrderNum" label="总订单(金额/数量)" min-width="120" /> -->
@@ -51,9 +60,9 @@
           </div>
           </template> 
          </el-table-column>
-        <el-table-column prop="totalConversionRatio" label="总转化率" min-width="50"  align="center"/>
-        <el-table-column prop="totalReturnRate" label="回款率" min-width="50"  align="center"/>
-        <el-table-column prop="todayRegisterNum" label="今日进件" min-width="50"  align="center"/>
+        <!-- <el-table-column prop="totalConversionRatio" label="总转化率" min-width="50"  align="center"/> -->
+        <!-- <el-table-column prop="totalReturnRate" label="回款率" min-width="50"  align="center"/> -->
+        <!-- <el-table-column prop="todayRegisterNum" label="今日进件" min-width="50"  align="center"/> -->
        
         <el-table-column prop="todayOrderNum" label="今日订单(金额/数量)" min-width="100"  align="center">
           <template slot-scope="scope" >
@@ -62,9 +71,18 @@
           </div>
           </template> 
          </el-table-column>
-        <el-table-column prop="todayConversionRatio" label="今日转化率" min-width="50" align="center"/>
-        <el-table-column prop="remark" label="备注 " min-width="50" />
-      
+        <!-- <el-table-column prop="todayConversionRatio" label="今日转化率" min-width="50" align="center"/> -->
+        <el-table-column prop="remark" label="备注 " min-width="30" />
+        <el-table-column prop="todayOrderNum" label="是否隐藏商品" min-width="50"  align="center">
+          <template slot-scope="scope" >
+           <div class="cont"  v-if="scope.row.storeHide==true" >
+            隐藏
+          </div>
+          <div class="cont"  v-if="scope.row.storeHide==false" >
+            展示
+          </div>
+          </template> 
+         </el-table-column>
         <!-- <el-table-column prop="price" label="单价（元）" min-width="100" /> -->
         <el-table-column label="操作" min-width="120" fixed="right" align="center">
           <template slot-scope="scope">
diff --git a/src/views/examine/orderDetail.vue b/src/views/examine/orderDetail.vue
index a49705a..c81d725 100644
--- a/src/views/examine/orderDetail.vue
+++ b/src/views/examine/orderDetail.vue
@@ -68,6 +68,18 @@
             </div>
 
           </div>
+          <div class="title">账单列表</div>
+          <div class="li" style="display: flex; flex-wrap: nowrap; width: 100%; align-items: center; margin-top: 10px;"
+            v-for="(item, index) in zdlist" :key="index">
+            <div style="margin-right: 20px;">状态: {{ item.repaymentStatus }}</div>
+            <div style="margin-right: 20px;">还款金额: {{ item.repaymentAmount }}</div>
+            <div class="text" style="margin-right: 8px;">还款时间:</div>
+            <el-date-picker v-model="item.repaymentDeadlineStr" type="date" placeholder="选择日期"
+              :disabled="item.repaymentStatus != '待还款'">
+            </el-date-picker>
+            <el-button size="small" @click="changetime(item.id,item.repaymentDeadlineStr)" class="mr10"  :disabled="item.repaymentStatus != '待还款'"
+                v-hasPermi="['admin:channel:update']">确定</el-button>
+          </div>
           <template v-if="orderDatalist.statusStr.key === 'toBeWrittenOff' && orderDatalist.systemStore">
             <div class="description-term">提货码：{{ orderDatalist.verifyCode }}</div>
             <div class="description-term">门店名称：{{ orderDatalist.systemStore.name }}</div>
@@ -133,7 +145,11 @@
 
 <script>
 // import { integralListApi,  } from '@/api/marketing';
-import { orderDetailApi, getLogisticsInfoApi,changePrice } from '@/api/order';
+import {
+  infobyconditionApi
+} from '@/api/user'
+import { orderDetailApi, getLogisticsInfoApi, changePrice } from '@/api/order';
+import {  changetime } from '@/api/marketing';
 export default {
   name: 'OrderDetail',
   props: {
@@ -151,11 +167,36 @@ export default {
       modal2: false,
       result: [],
       repaymentAmount: '',
-      id: ''
+      id: '',
+      zdlist: []
     };
   },
   mounted() { },
   methods: {
+    changetime(id,repaymentDeadlineStr){
+      let repaymentDeadlineStrs=repaymentDeadlineStr
+      let date = new Date(repaymentDeadlineStrs);
+      let year = date.getFullYear();
+      let month = (date.getMonth() + 1).toString().padStart(2, '0');
+      let day = date.getDate().toString().padStart(2, '0');
+      repaymentDeadlineStrs = `${year}-${month}-${day}`;
+     
+      setTimeout(() => {
+        let data = {
+          repaymentDeadlineStr: repaymentDeadlineStrs,
+          // repaymentAmount:repaymentDeadlineStrs
+        }
+        changetime(id, data).then((res) => {
+          // console.log("11111111111111111---------"+JSON.stringify(res))
+       
+          if (res.code == 500) {
+            this.$message.error(res.msg);
+          }
+
+
+        });
+      }, 200);
+    },
     openLogistics() {
       this.getOrderData();
       this.modal2 = true;
@@ -166,6 +207,17 @@ export default {
         this.result = res.list;
       });
     },
+    getzdinfo() {
+      let data = {
+        page: 1,
+        limit: 20,
+        type: '6',
+        userId: this.orderDatalist.uid,
+      }
+      infobyconditionApi(data).then(async (res) => {
+        this.zdlist = res.list;
+      });
+    },
     async sunchange() {
       console.log(this.orderDatalist, 'this.orderDatalistthis.orderDatalist');
       if (typeof this.repaymentAmount === 'string') {
@@ -181,10 +233,10 @@ export default {
               payPrice: this.repaymentAmount,
               orderNo: this.orderDatalist.orderId
             }
-           await changePrice(data).then((res) => {
+            await changePrice(data).then((res) => {
               console.log(res, 'resres');
-             
-           
+
+
               this.getDetail(this.id);
             }).catch(error => {
               console.error(error); // 打印捕获的错误
@@ -200,10 +252,11 @@ export default {
       this.loading = true;
       orderDetailApi({ orderNo: this.id })
         .then((res) => {
-          console.log(res,'resres');
+          console.log(res, 'resres');
           this.orderDatalist = res;
           this.repaymentAmount = res.payPrice
           this.loading = false;
+          this.getzdinfo()
         })
         .catch(() => {
           this.orderDatalist = null;
diff --git a/src/views/order/orderDetail.vue b/src/views/order/orderDetail.vue
index a49705a..c81d725 100644
--- a/src/views/order/orderDetail.vue
+++ b/src/views/order/orderDetail.vue
@@ -68,6 +68,18 @@
             </div>
 
           </div>
+          <div class="title">账单列表</div>
+          <div class="li" style="display: flex; flex-wrap: nowrap; width: 100%; align-items: center; margin-top: 10px;"
+            v-for="(item, index) in zdlist" :key="index">
+            <div style="margin-right: 20px;">状态: {{ item.repaymentStatus }}</div>
+            <div style="margin-right: 20px;">还款金额: {{ item.repaymentAmount }}</div>
+            <div class="text" style="margin-right: 8px;">还款时间:</div>
+            <el-date-picker v-model="item.repaymentDeadlineStr" type="date" placeholder="选择日期"
+              :disabled="item.repaymentStatus != '待还款'">
+            </el-date-picker>
+            <el-button size="small" @click="changetime(item.id,item.repaymentDeadlineStr)" class="mr10"  :disabled="item.repaymentStatus != '待还款'"
+                v-hasPermi="['admin:channel:update']">确定</el-button>
+          </div>
           <template v-if="orderDatalist.statusStr.key === 'toBeWrittenOff' && orderDatalist.systemStore">
             <div class="description-term">提货码：{{ orderDatalist.verifyCode }}</div>
             <div class="description-term">门店名称：{{ orderDatalist.systemStore.name }}</div>
@@ -133,7 +145,11 @@
 
 <script>
 // import { integralListApi,  } from '@/api/marketing';
-import { orderDetailApi, getLogisticsInfoApi,changePrice } from '@/api/order';
+import {
+  infobyconditionApi
+} from '@/api/user'
+import { orderDetailApi, getLogisticsInfoApi, changePrice } from '@/api/order';
+import {  changetime } from '@/api/marketing';
 export default {
   name: 'OrderDetail',
   props: {
@@ -151,11 +167,36 @@ export default {
       modal2: false,
       result: [],
       repaymentAmount: '',
-      id: ''
+      id: '',
+      zdlist: []
     };
   },
   mounted() { },
   methods: {
+    changetime(id,repaymentDeadlineStr){
+      let repaymentDeadlineStrs=repaymentDeadlineStr
+      let date = new Date(repaymentDeadlineStrs);
+      let year = date.getFullYear();
+      let month = (date.getMonth() + 1).toString().padStart(2, '0');
+      let day = date.getDate().toString().padStart(2, '0');
+      repaymentDeadlineStrs = `${year}-${month}-${day}`;
+     
+      setTimeout(() => {
+        let data = {
+          repaymentDeadlineStr: repaymentDeadlineStrs,
+          // repaymentAmount:repaymentDeadlineStrs
+        }
+        changetime(id, data).then((res) => {
+          // console.log("11111111111111111---------"+JSON.stringify(res))
+       
+          if (res.code == 500) {
+            this.$message.error(res.msg);
+          }
+
+
+        });
+      }, 200);
+    },
     openLogistics() {
       this.getOrderData();
       this.modal2 = true;
@@ -166,6 +207,17 @@ export default {
         this.result = res.list;
       });
     },
+    getzdinfo() {
+      let data = {
+        page: 1,
+        limit: 20,
+        type: '6',
+        userId: this.orderDatalist.uid,
+      }
+      infobyconditionApi(data).then(async (res) => {
+        this.zdlist = res.list;
+      });
+    },
     async sunchange() {
       console.log(this.orderDatalist, 'this.orderDatalistthis.orderDatalist');
       if (typeof this.repaymentAmount === 'string') {
@@ -181,10 +233,10 @@ export default {
               payPrice: this.repaymentAmount,
               orderNo: this.orderDatalist.orderId
             }
-           await changePrice(data).then((res) => {
+            await changePrice(data).then((res) => {
               console.log(res, 'resres');
-             
-           
+
+
               this.getDetail(this.id);
             }).catch(error => {
               console.error(error); // 打印捕获的错误
@@ -200,10 +252,11 @@ export default {
       this.loading = true;
       orderDetailApi({ orderNo: this.id })
         .then((res) => {
-          console.log(res,'resres');
+          console.log(res, 'resres');
           this.orderDatalist = res;
           this.repaymentAmount = res.payPrice
           this.loading = false;
+          this.getzdinfo()
         })
         .catch(() => {
           this.orderDatalist = null;