调整

admin/src/layout/index.vue

@@ -84,6 +84,14 @@ export default {
             message: '<strong>你有（'+res.data.back+'）个转单订单，需要处理</strong>'
           });
         }
+        if(res && res.data.order_write_off > 0) {
+          this.$notify({
+            title: '订单核销',
+            duration: 10000,
+            dangerouslyUseHTMLString: true,
+            message: '<strong>你有（'+res.data.order_write_off+'）个核销订单</strong>'
+          });
+        }
       }).catch(err=>{
         console.log(err)
       })

admin/src/views/qa/problem.vue

@@ -122,10 +122,13 @@
           class="file-card"
           :body-style="{ padding: '10px' }"
         >
-          <div class="file-info">
+        <div class="file-info">
             <el-icon class="file-icon">
               <i :class="getFileIcon(file.file)"></i>
             </el-icon>
+            <span class="file-name" style="display: block;">{{ getFileName(file.file) }}</span>
+          </div>
+          <div class="file-info">
             <span class="file-name">{{ file.desc }}</span>
           </div>
           <div class="file-footer">
@@ -201,7 +204,7 @@ export default {
     // 根据文件 URL 获取文件图标
     getFileIcon(url) {
       const ext = url.split(".").pop().toLowerCase();
-      console.log(ext);
+      console.log('ext:' + ext);
       switch (ext) {
         case "pdf":
           return "el-icon-file-pdf";
@@ -215,6 +218,10 @@ export default {
           return "el-icon-file";
       }
     },
+    // 根据文件 URL 获取文件图标
+    getFileName(url) {
+      return url.substring(url.lastIndexOf("/") + 1);
+    },
     handleQacityl(val) {
       getQaList({ city_id: val }).then((res) => {
         this.getQaLists = res.data.data;

admin/vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
     proxy: {
       '/dev-api': { // 接口地址 以 api开头的都走下面的配置
         // target: 'https://www.szjinao.cn', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
-        target: 'http://0.0.0.0:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
+        target: 'http://192.168.1.4:8787', // 代理目标地址为后端服务器地址 127.0.0.1 192.168.1.2
         ws: true, // 是否支持 websocket 请求 支持
         changeOrigin: true, // 是否启用跨域
         pathRewrite: {

service/app/admin/controller/IndexController.php

@@ -64,7 +64,11 @@ class IndexController extends base
             $backs = Backs::where('admin', $request->admin->id)->where('status', 0)->count();
         }
 
-        return $this->success(['new' => $new ?? 0, 'follow' => $follow, 'back' => $backs]);
+        // 核销提醒
+        $orderWriteOff = Redis::get('CRM:USER:WRITE:OFF:' . $request->admin->id);
+        Redis::del('CRM:USER:WRITE:OFF:' . $request->admin->id);
+
+        return $this->success(['new' => $new ?? 0, 'follow' => $follow, 'back' => $backs, 'order_write_off' => $orderWriteOff]);
     }
 
     public function line()

service/app/command/SpiderDy.php

@@ -348,6 +348,10 @@ class SpiderDy extends Command
                 }
 
                 foreach ($list as $order) {
+                    // 过滤一日游
+                    if (strpos('一日游', $order->category_desc) !== false) {
+                        continue;
+                    }
 
                     $item = Orders::where('os', $order->os)->where('sn', $order->sn)->find();
 
@@ -385,6 +389,10 @@ class SpiderDy extends Command
                         }
                     }
 
+                    if ($item->order_status !== 2 && $order->order_status == 2) {
+                        Redis::incrBy('CRM:USER:WRITE:OFF:' . $item->admin_id, 1);
+                    }
+
                     $back = $item->save($order->toArray());
 
                     if ($back) {

service/app/command/SpiderMt.php

@@ -414,6 +414,10 @@ class SpiderMt extends Command
                         }
                     }
 
+                    if ($item->order_status !== 4 && $order->order_status == 4) {
+                        Redis::incrBy('CRM:USER:WRITE:OFF:' . $item->admin_id, 1);
+                    }
+
                     $back = $item->save($order->toArray());
 
                     if ($back) {

service/public/static/css/chunk-65aac34a.e6ed14dd.css

@@ -0,0 +1 @@
+@font-face{font-family:PingFang;src:url(../../static/fonts/PingFang\ SC.212ada59.ttf);font-weight:400;font-style:normal}body[data-v-2a6e779e]{font-family:PingFang!important}.infinite-list[data-v-2a6e779e]{list-style-type:none;height:calc(100vh - 154px);padding:0;margin:0}.desc_container+.desc_container[data-v-2a6e779e]{margin-top:10px;padding-top:10px}.desc_container .desc_title[data-v-2a6e779e]{font-size:18px;font-weight:500;color:#333;line-height:25px;margin-bottom:10px}.desc_container .desc_content[data-v-2a6e779e]{font-size:14px;font-weight:300}.problem .problem_form[data-v-2a6e779e]{margin-top:10px;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.problem .problem_container[data-v-2a6e779e],.problem .problem_form[data-v-2a6e779e]{display:-webkit-box;display:-ms-flexbox;display:flex}.problem .problem_container .problem_left[data-v-2a6e779e]{font-family:PingFang,sans-serif;font-weight:300;width:18%;background:#fff;padding:0 20px;border-right:2px solid #46a6ff;height:calc(100vh - 154px)}.problem .problem_container .problem_left .btn[data-v-2a6e779e]{color:#fff;padding:10px 20px;cursor:pointer;text-align:center;background:#46a6ff;border-radius:10px}.problem .problem_container .problem_left .btn+.btn[data-v-2a6e779e]{margin-top:10px}.problem .problem_container .problem_right[data-v-2a6e779e]{width:100%;background:#fff;padding:0 20px}.problem .problem_container .problem_right .problem_right_container+.problem_right_container[data-v-2a6e779e]{margin-top:20px}.problem .problem_container .problem_right .problem_right_container .title[data-v-2a6e779e]{font-size:20px;font-weight:600;margin-bottom:10px;color:#46a6ff}.problem .problem_container .problem_right .problem_right_container .title[data-v-2a6e779e]>:first-child{margin-right:40px}.problem .problem_container .problem_right .problem_right_container .desc[data-v-2a6e779e]{font-size:14px;color:#666;line-height:24px}.problem .problem_container .problem_right .problem_right_container .desc .copy-button[data-v-2a6e779e]{margin-left:300px}.image-list-horizontal[data-v-2a6e779e]{display:-webkit-box;display:-ms-flexbox;display:flex;overflow-x:auto;white-space:nowrap;padding:10px 0}.image-card[data-v-2a6e779e]{display:inline-block;width:150px;margin-right:10px}.image-preview[data-v-2a6e779e]{width:100%;height:100px;-o-object-fit:cover;object-fit:cover}.image-preview-full[data-v-2a6e779e]{width:100%;max-height:600px}.image-footer[data-v-2a6e779e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.file-list-horizontal[data-v-2a6e779e]{display:-webkit-box;display:-ms-flexbox;display:flex;overflow-x:auto;white-space:nowrap;padding:10px 0}.file-card[data-v-2a6e779e]{display:inline-block;width:400px;margin-right:10px}.file-info[data-v-2a6e779e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;overflow:hidden}.file-icon[data-v-2a6e779e]{font-size:24px;margin-right:10px}.file-name[data-v-2a6e779e]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:calc(100% - 40px)}.file-footer[data-v-2a6e779e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}

service/public/static/css/chunk-6bb75a62.2c932a1f.css

@@ -1 +0,0 @@
-@font-face{font-family:PingFang;src:url(../../static/fonts/PingFang\ SC.212ada59.ttf);font-weight:400;font-style:normal}body[data-v-481eb5dc]{font-family:PingFang!important}.infinite-list[data-v-481eb5dc]{list-style-type:none;height:calc(100vh - 154px);padding:0;margin:0}.desc_container+.desc_container[data-v-481eb5dc]{margin-top:10px;padding-top:10px}.desc_container .desc_title[data-v-481eb5dc]{font-size:18px;font-weight:500;color:#333;line-height:25px;margin-bottom:10px}.desc_container .desc_content[data-v-481eb5dc]{font-size:14px;font-weight:300}.problem .problem_form[data-v-481eb5dc]{margin-top:10px;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.problem .problem_container[data-v-481eb5dc],.problem .problem_form[data-v-481eb5dc]{display:-webkit-box;display:-ms-flexbox;display:flex}.problem .problem_container .problem_left[data-v-481eb5dc]{font-family:PingFang,sans-serif;font-weight:300;width:18%;background:#fff;padding:0 20px;border-right:2px solid #46a6ff;height:calc(100vh - 154px)}.problem .problem_container .problem_left .btn[data-v-481eb5dc]{color:#fff;padding:10px 20px;cursor:pointer;text-align:center;background:#46a6ff;border-radius:10px}.problem .problem_container .problem_left .btn+.btn[data-v-481eb5dc]{margin-top:10px}.problem .problem_container .problem_right[data-v-481eb5dc]{width:100%;background:#fff;padding:0 20px}.problem .problem_container .problem_right .problem_right_container+.problem_right_container[data-v-481eb5dc]{margin-top:20px}.problem .problem_container .problem_right .problem_right_container .title[data-v-481eb5dc]{font-size:20px;font-weight:600;margin-bottom:10px;color:#46a6ff}.problem .problem_container .problem_right .problem_right_container .title[data-v-481eb5dc]>:first-child{margin-right:40px}.problem .problem_container .problem_right .problem_right_container .desc[data-v-481eb5dc]{font-size:14px;color:#666;line-height:24px}.problem .problem_container .problem_right .problem_right_container .desc .copy-button[data-v-481eb5dc]{margin-left:300px}.image-list-horizontal[data-v-481eb5dc]{display:-webkit-box;display:-ms-flexbox;display:flex;overflow-x:auto;white-space:nowrap;padding:10px 0}.image-card[data-v-481eb5dc]{display:inline-block;width:150px;margin-right:10px}.image-preview[data-v-481eb5dc]{width:100%;height:100px;-o-object-fit:cover;object-fit:cover}.image-preview-full[data-v-481eb5dc]{width:100%;max-height:600px}.image-footer[data-v-481eb5dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.file-list-horizontal[data-v-481eb5dc]{display:-webkit-box;display:-ms-flexbox;display:flex;overflow-x:auto;white-space:nowrap;padding:10px 0}.file-card[data-v-481eb5dc]{display:inline-block;width:400px;margin-right:10px}.file-info[data-v-481eb5dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;overflow:hidden}.file-icon[data-v-481eb5dc]{font-size:24px;margin-right:10px}.file-name[data-v-481eb5dc]{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:calc(100% - 40px)}.file-footer[data-v-481eb5dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}