Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

igirl-channel-web/app/front/entry/public/js/index.js

@@ -81,6 +81,9 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
     if (to.path == "/" && location.hostname == "xwzc.xiaowangtech.com") {
     if (to.path == "/" && location.hostname == "xwzc.xiaowangtech.com") {
       router.replace({ path: '/bw/jdtrademark' });
       router.replace({ path: '/bw/jdtrademark' });
     }
     }
+    if (to.path == "/" && location.hostname == "gs.plus.jdcloud.com") {
+      router.replace({ path: '/jd/jdindustry' });
+    }
     if (to.path.includes('login')) {
     if (to.path.includes('login')) {
       store.state.reqUrl = from.path;
       store.state.reqUrl = from.path;
       store.state.reqQuery = from.query;
       store.state.reqQuery = from.query;
@@ -213,7 +216,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
           console.log("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;;", val, oldVal);
           console.log("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;;", val, oldVal);
           if (val.path == "/bw/jdindentdetail") {
           if (val.path == "/bw/jdindentdetail") {
             this.fromListPath = oldVal.path;
             this.fromListPath = oldVal.path;
-            console.log(this.fromListPath,'ttttttttttttttttttttttttttttttt');
+            console.log(this.fromListPath, 'ttttttttttttttttttttttttttttttt');
           };
           };
           if (val.fullPath == "/jd/jdtrademark" && location.hostname == "tm.plus.jdcloud.com") {
           if (val.fullPath == "/jd/jdtrademark" && location.hostname == "tm.plus.jdcloud.com") {
             this.jdSelfHeaderShow = true;
             this.jdSelfHeaderShow = true;

igirl-channel-web/app/front/vues/pages/companydetail/companydetail.js

@@ -18,7 +18,7 @@
                 employees: [],
                 employees: [],
                 logistics: [],
                 logistics: [],
                 attachFiles: [],
                 attachFiles: [],
-                payTime: '',
+                created_at: '',
                 regInfo: []
                 regInfo: []
             }
             }
         },
         },
@@ -29,8 +29,8 @@
                 console.log(this.user_Name, "bbbbbbbbbbbbbbbbbbbbbbbb");
                 console.log(this.user_Name, "bbbbbbbbbbbbbbbbbbbbbbbb");
             }
             }
         });
         });
-        if (this.$route.query.payTime) {
-            this.payTime = this.$route.query.payTime
+        if (this.$route.query.created_at) {
+            this.created_at = this.$route.query.created_at
         }
         }
         this.getChannelFrom();
         this.getChannelFrom();
         this.getDetail();
         this.getDetail();

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html

@@ -540,11 +540,11 @@
                                 </el-tooltip>
                                 </el-tooltip>
                             </template>
                             </template>
                         </el-table-column>
                         </el-table-column>
-                        <el-table-column prop="payTime" label="下单时间">
+                        <el-table-column prop="created_at" label="下单时间">
                             <template slot-scope="scope">
                             <template slot-scope="scope">
-                                <el-tooltip placement="top" :content="scope.row.payTime"
-                                    :disabled="scope.row.payTime ? false : true">
-                                    <p solt="content">{{scope.row.payTime ? scope.row.payTime : \'---\'}}
+                                <el-tooltip placement="top" :content="scope.row.created_at"
+                                    :disabled="scope.row.created_at ? false : true">
+                                    <p solt="content">{{scope.row.created_at ? scope.row.created_at : \'---\'}}
                                     </p>
                                     </p>
                                 </el-tooltip>
                                 </el-tooltip>
                             </template>
                             </template>

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -636,7 +636,7 @@
                 query: {
                 query: {
                     orderNo: row.orderNo,
                     orderNo: row.orderNo,
                     channelUserId: this.$route.query.channelUserId,
                     channelUserId: this.$route.query.channelUserId,
-                    payTime: row.payTime
+                    created_at: row.created_at
                 }
                 }
             });
             });
         },
         },
@@ -731,12 +731,13 @@
                     console.log({ ...d.data });
                     console.log({ ...d.data });
                     if (d.status == 0) {
                     if (d.status == 0) {
                         this.icbcData = d.data;
                         this.icbcData = d.data;
+                        this.icbcData.map((item, index) => {
+                            item.created_at = new Date(item.created_at).toLocaleDateString('chinese', { hour12: false }).replace(/\//g, '-')
+                        });
                         this.IndustryCountPage = d.dataCount;
                         this.IndustryCountPage = d.dataCount;
                     } else {
                     } else {
                         this.$message("请重试");
                         this.$message("请重试");
                     }
                     }
-
-
                 })
                 })
             } else {
             } else {
                 this.$message('当前未登录');
                 this.$message('当前未登录');