kun 10/6/22:48

src/views/home/ApplyFor.vue

@@ -5,78 +5,69 @@
       <p class="title">党组织申请</p>
       <!-- 进度条 -->
       <div class="he">
-        <div class="list"
-             v-for="(item,index) in text"
-             :key="index"
-             :style="{'background-image': sub == index ? 'url('+imgUrl.bg0+')' : 'url('+imgUrl.bg1+')'}">
+        <div
+          class="list"
+          v-for="(item,index) in text"
+          :key="index"
+          :style="{'background-image': sub == index ? 'url('+imgUrl.bg0+')' : 'url('+imgUrl.bg1+')'}"
+        >
           <span :style="sub == index ? 'color:#fff' : 'color:#000'">{{item}}</span>
         </div>
       </div>
 
       <!-- 用户填写的内容 -->
-      <form action
-            method
-            onsubmit="return false"
-            enctype="multipart/form-data">
+      <form action method onsubmit="return false" enctype="multipart/form-data">
         <!-- 党组织申请1 -->
-        <div id="boxOne"
-             v-if="sub == 0">
+        <div id="boxOne" v-if="sub == 0">
           <h3>基本信息</h3>
           <div class="b">
             <div class="o">
               <label>
                 <span>社会组织名称:</span>
-                <input class="input"
-                       type="text"
-                       name="name" />
+                <input class="input" type="text" name="name" />
               </label>
               <label>
                 <span>社会组织类型:</span>
-                <select name="type"
-                        id></select>
+                <select name="type" v-model="type">
+                  <template v-for="(list,index) in types">
+                    <option :key="index" :value="index">{{list}}</option>
+                  </template>
+                </select>
               </label>
             </div>
             <div class="o">
               <label>
                 <span>流动党员数量:</span>
-                <input class="input"
-                       type="text"
-                       name="name" />
+                <input
+                  class="input"
+                  type="number"
+                  name="flow_party_person"
+                  v-model="flow_party_person"
+                />
               </label>
               <label>
                 <span>已有党员数量:</span>
-                <input class="input"
-                       type="text"
-                       name="name" />
+                <input class="input" type="number" name="party_person" v-model="party_person" />
               </label>
             </div>
             <div class="o">
               <label>
                 <span>从业人员总数:</span>
-                <input class="input"
-                       type="text"
-                       name="name" />
+                <input class="input" type="number" name="work_person" v-model="work_person" />
               </label>
               <label>
                 <span>党组织名称:</span>
-                <input class="input"
-                       type="text"
-                       name="name" />
+                <input class="input" type="text" name="party_name" v-model="party_name" />
               </label>
             </div>
             <div class="o-zero">
               <span>是否建立党组织:</span>
               <div>
                 <label for>
-                  <input type="radio"
-                         name="yn"
-                         value="yes"
-                         checked />&nbsp;&nbsp;是
+                  <input type="radio" name="is_reg_party" v-model="is_reg_party" value="1" checked />&nbsp;&nbsp;是
                 </label>&nbsp;&nbsp;&nbsp;&nbsp;
                 <label for>
-                  <input type="radio"
-                         name="yn"
-                         value="no" />&nbsp;&nbsp;否
+                  <input type="radio" name="is_reg_party" v-model="is_reg_party" value="2" />&nbsp;&nbsp;否
                 </label>
               </div>
             </div>
@@ -84,65 +75,67 @@
               <span>是否建立“功能型”党组织:</span>
               <div>
                 <label for>
-                  <input type="radio"
-                         name="ynn"
-                         value="yes"
-                         checked />&nbsp;&nbsp;是
+                  <input
+                    type="radio"
+                    name="is_reg_fun_party"
+                    v-model="is_reg_fun_party"
+                    value="1"
+                    checked
+                  />&nbsp;&nbsp;是
                 </label>&nbsp;&nbsp;&nbsp;&nbsp;
                 <label for>
-                  <input type="radio"
-                         name="ynn"
-                         value="no" />&nbsp;&nbsp;否
+                  <input type="radio" name="is_reg_fun_party" v-model="is_reg_fun_party" value="2" />&nbsp;&nbsp;否
                 </label>
               </div>
             </div>
             <div class="o-o">
               <label>登记管理机关:</label>
-              <input type="text" />
+              <input type="text" name="reg_manage" :v-model="reg_manage" />
             </div>
             <div class="o-o">
               <label>业务主管单位:</label>
-              <input type="text" />
+              <input type="text" name="supervisor" v-model="supervisor" />
             </div>
             <div class="o-two">
               <label>隶属的上一级党组织名称:</label>
-              <input type="text" />
+              <input type="text" name="party_pname" v-model="party_pname" />
             </div>
           </div>
-          <div class="btn"
-               @click="btn(1)">下一步</div>
+          <div class="btn" @click="btn(1)">下一步</div>
         </div>
         <!-- 党组织申请2 -->
-        <div id="boxTwo"
-             v-if="sub == 1">
+        <div id="boxTwo" v-if="sub == 1">
           <!-- !!!!!! -->
           <h3>党组织书记情况</h3>
           <div class="b">
             <div>
               <label for>姓名:</label>
-              <input type="text" />
+              <input type="text" name="sec_name" v-model="sec_name" />
             </div>
             <div style="display: flex;
           align-items: center;">
               <label for>姓别:</label>
               <label class="label">
-                <input type="radio"
-                       name="sex" />&nbsp;&nbsp;男&nbsp;&nbsp;&nbsp;&nbsp;
-                <input type="radio"
-                       name="sex" />&nbsp;&nbsp;女
+                <input type="radio" name="sec_sex" v-model="sec_sex" value="1" />&nbsp;&nbsp;男&nbsp;&nbsp;&nbsp;&nbsp;
+                <input
+                  type="radio"
+                  name="sec_sex"
+                  v-model="sec_sex"
+                  value="0"
+                />&nbsp;&nbsp;女
               </label>
             </div>
             <div>
               <label for>年龄:</label>
-              <input type="text" />
+              <input type="text" v-model="sec_age" name="sec_age" />
             </div>
             <div>
               <label for>行政职务:</label>
-              <input type="text" />
+              <input type="text" v-model="sec_job" name="sec_job" />
             </div>
             <div>
               <label for>近三年参加上级党组织培训次数:</label>
-              <input type="text" />
+              <input type="text" name="sec_study" v-model="sec_study" />
             </div>
           </div>
           <!-- !!!!!! -->
@@ -150,55 +143,62 @@
           <div class="b">
             <div>
               <label for>近三年发展党员数:</label>
-              <input type="text" />
+              <input type="text" name="near_party_person" v-model="near_party_person" />
             </div>
             <div style="display: flex;
           align-items: center;">
               <label for>是否建立群团组织:</label>
               <label class="label">
-                <input type="radio"
-                       name="ss" />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
-                <input type="radio"
-                       name="ss" />&nbsp;&nbsp;否
+                <input type="radio" name="is_reg_group" value="1" v-model="is_reg_group" />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+                <input
+                  type="radio"
+                  name="is_reg_group"
+                  value="2"
+                  v-model="is_reg_group"
+                />&nbsp;&nbsp;否
               </label>
             </div>
             <div>
               <label for>专职党务工作者人数:</label>
-              <input type="text" />
+              <input type="text" name="major_party_person" v-model="major_party_person" />
             </div>
             <div style="display: flex;
           align-items: center;">
               <label for>是否选派党建工作指导员:</label>
               <label class="label">
-                <input type="radio"
-                       name="ww" />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
-                <input type="radio"
-                       name="ww" />&nbsp;&nbsp;否
+                <input
+                  type="radio"
+                  name="is_choice_instructor"
+                  value="1"
+                  v-model="is_choice_instructor"
+                />&nbsp;&nbsp;是&nbsp;&nbsp;&nbsp;&nbsp;
+                <input
+                  type="radio"
+                  name="is_choice_instructor"
+                  value="2"
+                  v-model="is_choice_instructor"
+                />&nbsp;&nbsp;否
               </label>
             </div>
             <div>
               <label for>党组织年度活动经费(万元):</label>
-              <input type="text" />
+              <input type="text" name="year_money" v-model="year_money" />
             </div>
             <div>
               <label for>党组织年度活动场所面积(平米):</label>
-              <input type="text" />
+              <input type="text" name="active_year" v-model="active_year" />
             </div>
           </div>
-          <div @click="btn(2)"
-               style="display:flex;justify-content:center;margin-top:35px;">
-            <input type="submit"
-                   value="立即提交" />
+          <div @click="btn(2)" style="display:flex;justify-content:center;margin-top:35px;">
+            <input type="submit" value="立即提交" />
           </div>
         </div>
       </form>
 
       <!-- succeed -->
-      <div class="succeed"
-           v-if="sub == 2">
+      <div class="succeed" v-if="sub == 2">
         <div>
-          <img :src="imgUrl.succeed"
-               alt />
+          <img :src="imgUrl.succeed" alt />
           <span>党组织申请已提交成功！</span>
         </div>
       </div>
@@ -228,7 +228,29 @@ export default {
       },
       text: ["1 填写基本信息", "2 填写党组织信息", "3 提交审核"],
       sub: 0,
-      index_num: 0
+      index_num: 0,
+      types: [],
+      type: '',
+      supervisor: '',
+      reg_manage: '',
+      work_person: '',
+      flow_party_person: '',
+      party_person: '',
+      is_reg_party: '',
+      is_reg_fun_party: '',
+      party_name: '',
+      party_pname: '',
+      sec_name: '',
+      sec_sex: '',
+      sec_job: '',
+      sec_age: '',
+      sec_study: '',
+      near_party_person: '',
+      major_party_person: '',
+      is_reg_group: '',
+      is_choice_instructor: '',
+      year_money: '',
+      active_year: ''
     };
   },
   computed: {},
@@ -238,16 +260,89 @@ export default {
       let s = this.sub;
       s = n;
       this.sub = s;
+      if (this.sub == 2) {
+        let sid = localStorage.token
+        let _this = this
+        // console.log(_this.type,
+        //   _this.reg_manage, _this.supervisor, _this.work_person, _this.flow_party_person,
+        //   _this.party_person, _this.is_reg_party, _this.is_reg_fun_party,
+        //   _this.party_name, _this.party_pname, _this.sec_name,
+        //   _this.sec_sex, _this.sec_job, _this.sec_age,
+        //   _this.sec_study, _this.near_party_person,
+        //   _this.major_party_person, _this.is_reg_group,
+        //   _this.is_choice_instructor, _this.year_money, _this.active_year
+        // )
+        this.$http({
+          method: 'post',
+          url: 'v1/user/apply',
+          data: {
+            sid: sid,
+            type: _this.type,
+            supervisor: _this.supervisor,
+            reg_manage: _this.reg_manage,
+            work_person: _this.work_person,
+            flow_party_person: _this.flow_party_person,
+            party_person: _this.party_person,
+            is_reg_party: _this.is_reg_party,
+            is_reg_fun_party: _this.is_reg_fun_party,
+            party_name: _this.party_name,
+            party_pname: _this.party_pname,
+            sec_name: _this.sec_name,
+            sec_sex: _this.sec_sex,
+            sec_job: _this.sec_job,
+            sec_age: _this.sec_age,
+            sec_study: _this.sec_study,
+            near_party_person: _this.near_party_person,
+            major_party_person: _this.major_party_person,
+            is_reg_group: _this.is_reg_group,
+            is_choice_instructor: _this.is_choice_instructor,
+            year_money: _this.year_money,
+            active_year: _this.active_year
+          }
+        }).then(res => {
+          console.log(res);
+
+          // if (res.code === 200) {
+          //   console.log(res.data)
+          // } else {
+          //   _this.$message.error('请求数据有问题！')
+          // }
+        })
+          // eslint-disable-next-line handle-callback-err
+          .catch(err => {
+            console.log(err)
+          })
+      }
+    },
+    getData() {
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/user/get-society-type',
+        data: {}
+      }).then(res => {
+        if (res.data.code === 200) {
+          _this.types = res.data.data
+        } else {
+          _this.$message.error('请求数据有问题！')
+        }
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
     }
   },
-  created() {},
-  mounted() {}
+  created() {
+    this.getData()
+  },
+  mounted() { }
 };
 </script>
 
 <style lang='scss' scoped>
 .wr {
- min-width: 1280px;
+  min-width: 1280px;
   box-sizing: border-box;
 
   .footer {
@@ -359,6 +454,8 @@ export default {
             background-color: #ffffff;
             border: solid 1px #c7c7c7;
             outline: none;
+            padding-left: 30px;
+            box-sizing: border-box;
           }
 
           .label {
@@ -420,6 +517,8 @@ export default {
             border: solid 1px #c7c7c7;
             margin-left: 28px;
             outline: none;
+            padding-left: 30px;
+            box-sizing: border-box;
           }
         }
 
@@ -451,6 +550,8 @@ export default {
             border: solid 1px #c7c7c7;
             margin-left: 28px;
             outline: none;
+            padding-left: 30px;
+            box-sizing: border-box;
           }
         }
 
@@ -597,6 +698,8 @@ export default {
               border: solid 1px #c7c7c7;
               outline: none;
               box-sizing: border-box;
+              padding-left: 30px;
+              box-sizing: border-box;
 
               /* 清除默认的箭头样式 */
               appearance: none;
@@ -615,6 +718,8 @@ export default {
               border: solid 1px #c7c7c7;
               outline: none;
               box-sizing: border-box;
+              padding-left: 30px;
+              box-sizing: border-box;
             }
 
             span {

src/views/home/NewsDetails.vue

@@ -7,7 +7,7 @@
           <dt>
             <img class="one" :src="bgData.cover" alt />
             <span
-              @click="collection()"
+              @click="collection(bgData.id)"
               class="iconfont icon-changyongtubiao-mianxing-"
               :class="coll ? 'colorTrue' : 'colorFalse'"
             ></span>
@@ -71,18 +71,34 @@ export default {
         wjx: require("../../../static/img/wjx.png")
       },
       list: [1, 2, 3, 4, 5, 6, 7, 8, 9],
-      bgData: []
+      bgData: [],
+      id: Number
     };
   },
   computed: {},
   watch: {},
   methods: {
-    collection() {
+    collection(article_id) {
       if (!localStorage.token) {
         alert('请先登录~')
         return;
       }
       this.coll = !this.coll;
+      let _this = this
+      this.$http({
+        method: 'post',
+        url: 'v1/article/collection',
+        data: {
+          sid: _this.id,
+          article_id: article_id
+        }
+      }).then(res => {
+        console.log(res)
+      })
+        // eslint-disable-next-line handle-callback-err
+        .catch(err => {
+          console.log(err)
+        })
     },
     getData(id) {
       let _this = this
@@ -106,9 +122,9 @@ export default {
     }
   },
   created() {
-    let id = this.$route.params.id
+    this.id = this.$route.params.id
     let type = this.$route.params.type
-    this.getData(id)
+    this.getData(this.id)
   },
   mounted() { }
 };