tijiao

src/api/marketing.js

@@ -35,4 +35,22 @@ export function delActivityXiaoju(params) {
         method: 'get',
         params
     })
+}
+
+// 添加编辑活动
+export function editShareInfo(data) {
+  return request({
+      url: '/zswl-cloud-shop/shareInfo/addOrUpdate',
+      method: 'post',
+      data
+  })
+}
+
+// 获取分享
+export function getShareInfo(params) {
+  return request({
+      url: '/zswl-cloud-shop/shareInfo/get',
+      method: 'get',
+      params
+  })
 }

src/components/Upload/index.vue

@@ -132,7 +132,7 @@ export default {
                   this.imgLoading = false;
                   this.url = url;
                   this.$refs[this.id].value = "";
-                  this.$emit("uploadEnd", { url, type: this.type });
+                  this.$emit("uploadEnd", { url, type: this.type,size: files.size});
                 }
               });
             })

src/main.js

@@ -76,7 +76,7 @@ Vue.mixin({
         },
         {
           value: 3,
-          label: "中数未来生活宝",
+          label: "市民请集合",
         },
       ]
     }

src/utils/config.js

@@ -2,14 +2,14 @@
  * @Author: wj 1454560336@qq.com
  * @Date: 2024-01-05 16:08:18
  * @LastEditors: wenjie 1454560336@qq.com
- * @LastEditTime: 2024-12-04 15:31:42
+ * @LastEditTime: 2025-02-27 16:03:24
  * @FilePath: \admin-manage\src\utils\config.js
  * @Description: 124234
  * 
  * Copyright (c) 2024 by ${git_name_email}, All Rights Reserved. 
  */
-// const BASE_URL = 'https://api.zonelife.cn/';
-const BASE_URL = 'https://api.dev.zonelife.cn/';
+const BASE_URL = 'https://api.zonelife.cn/';
+// const BASE_URL = 'https://api.dev.zonelife.cn/';
 // http://192.168.110.226:9002
 
 

src/views/operationManage/advertisingManage/addAdv.vue

@@ -157,7 +157,7 @@ export default {
           value: '2',
         },
         {
-          label: "生活宝",
+          label: "市民请集合",
           value: '3',
         },
       ],

src/views/operationManage/advertisingManage/index.vue

@@ -79,7 +79,7 @@
         show-overflow-tooltip
       >
        <template slot-scope="scope">
-          <span>{{scope.row.belongType ==2?'慧研学':'贵大'}}</span>
+          <span>{{scope.row.belongType |filType}}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -107,6 +107,7 @@
       >
        <template slot-scope="scope">
           <span>{{scope.row.status == 1?'显示':'隐藏'}}</span>
+
         </template>
       </el-table-column>
       <el-table-column prop="address" align="center" label="操作">
@@ -172,7 +173,7 @@ export default {
           value: '2',
         },
         {
-          label: "生活宝",
+          label: "市民请集合",
           value: '3',
         },
       ],
@@ -195,6 +196,20 @@ export default {
   //     deep: true,
   //   },
   // },
+  
+  filters: {
+    filType: function(value) {
+      let v = ''
+      if (value == 1) {
+        return "贵大";
+      }else if (value == 2) {
+        return "慧研学";
+      }else if (value == 3) {
+        return "市民请集合";
+      }
+      return v;
+    }
+  },
   methods: {
     handleSearch(){
       this.query.currentPage = 1

src/views/operationManage/appMenuManage/addMenu.vue

@@ -130,7 +130,7 @@ export default {
           value: '2',
         },
         {
-          label: "生活宝",
+          label: "市民请集合",
           value: '3',
         },
       ],

src/views/operationManage/marketingManage/shareSetting.vue

@@ -10,20 +10,20 @@
 <template>
     <div class="updatePassword app-container">
         <el-form :model="form" status-icon :rules="rules" ref="form" label-width="100px" class="demo-form">
-            <el-form-item label="分享标题" prop="old">
-                <el-input type="text" class="item-width-300" v-model="form.old" autocomplete="off"></el-input>
+            <!-- <el-form-item label="分享标题" prop="shareTitle">
+                <el-input type="text" class="item-width-300" v-model="form.shareTitle" autocomplete="off"></el-input>
+            </el-form-item> -->
+            <el-form-item label="分享描述" prop="shareDescribe">
+                <el-input type="text"  class="item-width-300" v-model="form.shareDescribe" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="分享描述" prop="pwd">
-                <el-input type="text"  class="item-width-300" v-model="form.pwd" autocomplete="off"></el-input>
-            </el-form-item>
-            <el-form-item label="分享封面" prop="pwd1">
+            <el-form-item label="分享封面" prop="shareImg">
                  <Upload
-                type="imgUrl"
-                id="imgUrl"
+                type="shareImg"
+                id="shareImg"
                 width="150px"
                 height="150px"
                 uploadType="SHOP_INFO"
-                :imgUrl="form.imgUrl"
+                :imgUrl="form.shareImg"
                 @uploadEnd="uploadEnd"
                 ></Upload>
             </el-form-item>
@@ -37,8 +37,7 @@
 
 <script>
 import Upload from '@/components/Upload'
-import {updateLoginPassword} from '@/api/auth'
-import { removeToken } from '@/utils/auth'
+import {editShareInfo,getShareInfo} from '@/api/marketing'
 
     export default {
         components: {
@@ -48,18 +47,18 @@ import { removeToken } from '@/utils/auth'
             return {
                 loading:false,
                 form: {
-                    old:'',
-                    pwd:'',
-                    imgUrl:'',
+                    "shareDescribe": "",
+                    "shareImg": "",
+                    "shareTitle": ""
                 },
                 rules: {
-                    old:[
-                        { required:true,message:'请填写旧密码', trigger: 'blur' }
+                    shareTitle:[
+                        { required:true,message:'请填写分享标题', trigger: 'blur' }
                     ],
-                    pwd: [
-                      { required:true,message:'请填写旧密码', trigger: 'blur' }
+                    shareDescribe: [
+                      { required:true,message:'请填写分享描述', trigger: 'blur' }
                     ],
-                    imgUrl: [
+                    shareImg: [
                         {  required:true,message:'请上传分享封面', trigger: 'change' }
                     ],
                     
@@ -67,11 +66,14 @@ import { removeToken } from '@/utils/auth'
             }
         },
         methods: {
+            uploadEnd(val){
+                this.form[val.type] = val.url
+            },
             submitForm(formName) {
                 this.$refs[formName].validate((v) => {
                     if(v){
                         this.loading = true
-                        updateLoginPassword(this.form).then(res=>{
+                        editShareInfo(this.form).then(res=>{
                             this.loading = false
                             if(res.state == 'Success'){
                                 this.$notify({
@@ -79,7 +81,7 @@ import { removeToken } from '@/utils/auth'
                                     message: '操作成功',
                                     type: 'success'
                                 });
-                                this.resetForm('form')
+                                // this.resetForm('form')
                             }
                         })
                     }
@@ -88,6 +90,23 @@ import { removeToken } from '@/utils/auth'
             resetForm(formName) {
                 this.$refs[formName].resetFields();
             },
+
+            getShareInfo(){
+                getShareInfo({id:1}).then(res=>{
+                    if(res.state == 'Success'){
+                        this.form = {
+                            id:res.content.id,
+                            shareDescribe:res.content.shareDescribe,
+                            shareImg:res.content.shareImg,
+                            shareTitle:res.content.shareTitle,
+                        } 
+                    }
+                })
+            },
+            
+        },
+        created () {
+            this.getShareInfo();
         },
   
     }

src/views/operationManage/shopManage/shopAdd3.vue

@@ -428,6 +428,48 @@
             </el-date-picker>
             <el-checkbox v-model="perSonObj['checked'+(index+1)]" @change="checkChange($event,index)" :disabled="!setQuery.bnfList[index].bnfCertBeginDate">  长期</el-checkbox>
           </el-form-item>
+          <el-form-item label="电话：" :prop="'bnfList.'+index+'.bnfMobile'" :rules="{ required: true, message: '请输入受益人电话', trigger: 'blur' }">
+            <el-input
+              v-model="item.bnfMobile"
+              size="small"
+              :maxlength="11"
+              class="item-width-300"
+              placeholder="请输入受益人电话"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="是否是自然人：">
+            <el-checkbox v-model="setQuery.bnfList[index].bnfNatrlPrsn" true-label="1" false-label="0"> </el-checkbox>
+          </el-form-item>
+           <el-form-item label="身份证正面：" :prop="'bnfList.'+index+'.bnfPicList.'+0+'.file_img'" :rules="{ required: true, message: '请上传受益人身份证正面', trigger: 'change' }">
+            <Upload
+             :type="[index,0,'A0042']"
+              id="bnfPicList0"
+              width="250px"
+              height="150px"
+              :disabled="mode == 'detail'"
+              uploadType="YIN_LIAN_AUTH"
+              :imgUrl="setQuery.bnfList[index].bnfPicList[0].file_img"
+              @uploadEnd="uploadEnd1"
+            ></Upload>
+            <div class="notice">
+              (图片支持jpg, png, bmp格式，建议上传100kb~500kb大小文件)
+            </div>
+          </el-form-item>
+           <el-form-item label="身份证反面：" :prop="'bnfList.'+index+'.bnfPicList.'+1+'.file_img'"  :rules="{ required: true, message: '请上传受益人身份证反面面', trigger: 'change' }">
+            <Upload
+              :type="[index,1,'A0043']"
+              id="bnfPicList1"
+              width="250px"
+              height="150px"
+              :disabled="mode == 'detail'"
+              uploadType="YIN_LIAN_AUTH"
+              :imgUrl="setQuery.bnfList[index].bnfPicList[1].file_img"
+              @uploadEnd="uploadEnd1"
+            ></Upload>
+            <div class="notice">
+              (图片支持jpg, png, bmp格式，建议上传100kb~500kb大小文件)
+            </div>
+          </el-form-item>
           <el-form-item label="家庭地址：" :prop="'bnfList.'+index+'.bnfHomeAddr'" :rules="{ required: true, message: '请输入家庭地址', trigger: 'blur' }">
             <el-input
               v-model="item.bnfHomeAddr"
@@ -436,8 +478,8 @@
               placeholder="请输入受益人家庭地址"
             ></el-input>
            <el-button size="small" class="ml10" type="danger" v-if="setQuery.bnfList.length>1" @click="delPerson(index)">删除受益人</el-button> 
-
           </el-form-item>
+            
         </div>
         <el-form-item>
            <el-button size="small" @click="addPerson">添加受益人</el-button>
@@ -676,6 +718,24 @@ export default {
             bnfCertno: "",
             bnfName: "",
             bnfHomeAddr: "",
+            "bnfMobile": "",
+            "bnfNatrlPrsn": '1',//受益人是否为特定自然人 1-是 0-否
+            "bnfPicList": [
+              {
+              "document_type": "0042",
+              "document_name": "受益人证明材料",
+              "file_img": "",
+              "file_path": "",
+              "file_size": ""
+              },
+              {
+              "document_type": "0043",
+              "document_name": "受益人证明材料",
+              "file_img": "",
+              "file_path": "",
+              "file_size": ""
+              }
+            ]
           },
         ],
         detailDistrict: "",
@@ -1468,6 +1528,29 @@ export default {
                 })
               }
 
+              if(!this.setQuery.bnfList[0].bnfMobile){
+                this.setQuery.bnfList[0].bnfMobile = ''
+              }
+               if(!this.setQuery.bnfList[0].bnfNatrlPrsn){
+                this.setQuery.bnfList[0].bnfNatrlPrsn = '1'
+              }
+              if(!this.setQuery.bnfList[0].bnfPicList){
+                this.setQuery.bnfList[0].bnfPicList = [	{
+                  "document_type": "0042",
+                  "document_name": "受益人证明材料",
+                  "file_img": "",
+                  "file_path": "",
+                  "file_size": ""
+                  },
+                  {
+                  "document_type": "0043",
+                  "document_name": "受益人证明材料",
+                  "file_img": "",
+                  "file_path": "",
+                  "file_size": ""
+                  }]
+              }
+
               // 提取图片
               this.setQuery.pic_list.map((item) => {
                 for (const key in this.picObj) {
@@ -1591,6 +1674,23 @@ export default {
       };
       picUpload(obj).then((res) => {});
     },
+    // 图片统一上传
+    uploadEnd1(val) {
+      console.log(val);
+      // this.setQuery[this.picObj[val.type]] = val.url
+      this.$set(this.setQuery.bnfList[val.type[0]].bnfPicList[val.type[1]], 'file_img', val.url);
+      this.$set(this.setQuery.bnfList[val.type[0]].bnfPicList[val.type[1]], 'file_size', val.size);
+      // this.setQuery.idCardImg = val.url
+      let obj = {
+        accesseId:this.$route.query.accesseId||this.accesseId,
+        epId: this.$route.query.id,
+        fileUrl: val.url,
+        picType: val.type[2],
+      };
+      picUpload(obj).then((res) => {
+         this.$set(this.setQuery.bnfList[val.type[0]].bnfPicList[val.type[1]], 'file_path', res.content.file_path);
+      });
+    },
     // 股东信息
     shareholderInfo() {
       let obj = {

src/views/studyManage/menuManage/addMenu.vue

@@ -165,6 +165,10 @@ export default {
           label: "慧研学",
           value: '2',
         },
+        {
+          label: "市民请集合",
+          value: '3',
+        },
       ],
       setQuery: {
         "columnImg": "",

src/views/studyManage/menuManage/index.vue

@@ -78,7 +78,8 @@
         show-overflow-tooltip
       >
        <template slot-scope="scope">
-          <span>{{scope.row.belongType ==2?'慧研学':'贵大'}}</span>
+          <!-- <span>{{scope.row.belongType ==2?'慧研学':'贵大'}}</span> -->
+          <span>{{scope.row.belongType | filType}}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -151,6 +152,19 @@ export default {
   //     deep: true,
   //   },
   // },
+  filters: {
+    filType: function(value) {
+      let v = ''
+      if (value == 1) {
+        return "贵大";
+      }else if (value == 2) {
+        return "慧研学";
+      }else if (value == 3) {
+        return "市民请集合";
+      }
+      return v;
+    }
+  },
   methods: {
     handleSearch(){
       this.query.currentPage = 1