From ea8a9ca58ea00291c85de8c0e6183576adaa0fb8 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 25 Apr 2025 15:08:50 +0800
Subject: [PATCH] up

---
 .env.development                               |  2 ++
 .env.production                                |  3 +++
 package.json                                   |  1 +
 .../components/addLine.vue                     | 12 ++++++++++++
 .../components/addQuestions.vue                | 18 +++++++++++++-----
 src/views/PartyshistoryRecoder/line.vue        | 18 +++++++++++++++++-
 vue.config.js                                  |  2 +-
 7 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/.env.development b/.env.development
index 102e8b6..815caa3 100644
--- a/.env.development
+++ b/.env.development
@@ -4,3 +4,5 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = http://h5.ali251.langye.net
 VUE_APP_UPLOAD_API = http://h5.ali251.langye.net/api/admin/upload-file
+#VUE_APP_BASE_API = https://h5.jscnsaas.cn
+#VUE_APP_UPLOAD_API = https://h5.jscnsaas.cn/api/admin/upload-file
diff --git a/.env.production b/.env.production
index 978a001..674c819 100644
--- a/.env.production
+++ b/.env.production
@@ -5,3 +5,6 @@ ENV = 'production'
 
 VUE_APP_BASE_API = http://h5.ali251.langye.net
 VUE_APP_UPLOAD_API = http://h5.ali251.langye.net/api/admin/upload-file
+#VUE_APP_BASE_API = https://h5.jscnsaas.cn
+#VUE_APP_UPLOAD_API = https://h5.jscnsaas.cn/api/admin/upload-file
+
diff --git a/package.json b/package.json
index f2eec08..1abccdc 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "element-ui": "2.13.2",
     "gsap": "^3.12.5",
     "js-cookie": "2.2.0",
+    "less": "^3.13.1",
     "less-loader": "^5.0.0",
     "moment": "^2.29.2",
     "normalize.css": "7.0.0",
diff --git a/src/views/PartyshistoryRecoder/components/addLine.vue b/src/views/PartyshistoryRecoder/components/addLine.vue
index 447d4d2..95658ee 100644
--- a/src/views/PartyshistoryRecoder/components/addLine.vue
+++ b/src/views/PartyshistoryRecoder/components/addLine.vue
@@ -31,6 +31,17 @@
           </div>
         </div>
       </template>
+      <template v-slot:sort>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red; font-weight: 600; padding-right: 4px">*</span>
+            排序 ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.sort" clearable placeholder="请输入排序" style="width: 300px"></el-input>
+          </div>
+        </div>
+      </template>
       <template v-slot:pointer_list>
         <div class="xy-table-item">
           <div class="xy-table-item-label">点位 ：</div>
@@ -104,6 +115,7 @@
         form: {
           activity_list_id: '',
           name: "",
+          sort:0,
           pointer_list:[],
           image_id: "",
           content: "",
diff --git a/src/views/PartyshistoryRecoder/components/addQuestions.vue b/src/views/PartyshistoryRecoder/components/addQuestions.vue
index ae747dd..cbe5330 100644
--- a/src/views/PartyshistoryRecoder/components/addQuestions.vue
+++ b/src/views/PartyshistoryRecoder/components/addQuestions.vue
@@ -283,14 +283,22 @@
             writable: true,
           });
         }
+        console.log("for",this.form)
         let saveForm = []
-        this.form.pointer_list.map(item=>{
-          this.form.point_id = item
+        if(this.form.pointer_list&&this.form.pointer_list.length>0){
+          this.form.pointer_list.map(item=>{
+            this.form.point_id = item
+            saveForm.push({
+              ...this.form,
+              point_id:item
+            })
+          })
+        }else{
           saveForm.push({
-            ...this.form,
-            point_id:item
+            ...this.form
           })
-        })
+        }
+
         console.log(saveForm)
         // return
         saveForm.map((item,index)=>{
diff --git a/src/views/PartyshistoryRecoder/line.vue b/src/views/PartyshistoryRecoder/line.vue
index aec3326..495da3b 100644
--- a/src/views/PartyshistoryRecoder/line.vue
+++ b/src/views/PartyshistoryRecoder/line.vue
@@ -101,7 +101,10 @@ export default {
         table_name: "circuits",
         with_relations: ['image'],
         activity_list_id: '',
+        keyword:'',
         filter: [],
+        sort_name:'sort',
+        sort_type:'ASC'
       },
       sysInfo:false,
       listActivity: [],
@@ -125,6 +128,12 @@ export default {
             )
           }
         },
+        {
+          prop: "sort",
+          label: "排序",
+          minWidth: 80,
+          align: "center",
+        },
         {
           prop: "content",
           label: "简介",
@@ -187,7 +196,14 @@ export default {
         })
         return
       }
-      const res = await index(this.select);
+      const res = await index({
+        ...this.select,
+        filter:[{
+          key:'name',
+          op:'like',
+          value:this.select.keyword
+        }]
+      });
       this.total = res.total;
       this.list = res.data;
     },
diff --git a/vue.config.js b/vue.config.js
index 721d71d..e89c258 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: './dist',
+  outputDir: '/Users/mac/Documents/朗业/0-朗业基础库/h5/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项