Squashed commit of the following:

commit f4013faae26cf93b95d25e48763df7f6c0c01166
Author: yin_yu820 <895937358@qq.com>
Date:   Wed Mar 29 09:10:34 2023 +0800

    修改冲突

commit 7925e388d083a7f527f565072de11915c0af4b75
Merge: 30c3521 843968a
Author: yin_yu820 <895937358@qq.com>
Date:   Wed Mar 29 09:07:33 2023 +0800
    Merge remote-tracking branch 'HS_MZAP/master'
commit 30c35212c26b12136ee2164ad7213ae9a1753220
Author: yin_yu820 <895937358@qq.com>
Date:   Wed Mar 29 08:56:04 2023 +0800

    登录token功能，场所检查情况上报（未完成）

commit 843968a92d262499d1c2ca990a7185e8bb2ee46a
Author: guoqing <1624870927@qq.com>
Date:   Tue Mar 28 09:55:45 2023 +0800

    更新

commit 58a862f98e5a1c4454ebeb476d52f5540ab3b4e7
Author: guoqing <1624870927@qq.com>
Date:   Tue Mar 28 09:54:56 2023 +0800

    更新

commit 4d5fc19bd1dc5328a646d50bad9f3cc4d7ac32a8
Author: guoqing <1624870927@qq.com>
Date:   Tue Mar 28 09:15:22 2023 +0800

    更新

package.json

@@ -11,6 +11,7 @@
     "axios": "^1.3.4",
     "core-js": "^3.8.3",
     "normalize.css": "^8.0.1",
+    "qs": "^6.11.1",
     "vant": "^4.1.0",
     "vue": "^3.2.13",
     "vue-router": "^4.0.3",

src/App.vue

@@ -1,9 +1,9 @@
 <template>
 	<router-view></router-view>
 	<van-tabbar v-model="active" route  v-show="showStatus" >
-        <van-tabbar-item replace to="/toBeDone" name="toBeDone" icon="notes-o">我的待办</van-tabbar-item>
-        <van-tabbar-item replace to="/siteMan" name="siteMan" icon="shop-o">场所管理</van-tabbar-item>
-        <van-tabbar-item replace to="/activityMan" name="activityMan" icon="newspaper-o">活动管理</van-tabbar-item>
+        <van-tabbar-item replace to="/setting" name="toBeDone" icon="notes-o">我的待办</van-tabbar-item>
+        <van-tabbar-item replace to="/setting" name="siteMan" icon="shop-o">场所管理</van-tabbar-item>
+        <van-tabbar-item replace to="/setting" name="activityMan" icon="newspaper-o">活动管理</van-tabbar-item>
         <van-tabbar-item replace to="/setting" name="setting" icon="friends-o">个人中心</van-tabbar-item>
     </van-tabbar>
 </template>

src/api/index.js

@@ -26,6 +26,17 @@ export default  {
                 return http.get(this.url,params)
             }
         }
+    },
+    activityMan : {
+        siteInspectionList : {
+            url:`${config.baseUrl}/csjcqk/siteInspection/list`,
+            name:'测试',
+            get : function(params){
+                return http.get(this.url,params)
+            }
+        }
+        
+        
     },
     yin : {
         TokenLogin : {

src/router/index.js

@@ -33,6 +33,14 @@ const routes = [{
             isShowTarbar: true,
         }
     }, {
+        path: '/siteInspectionList',
+        name: 'siteInspectionList',
+        component: () =>
+            import ('../views/activityMan/siteInspection/siteInspectionList.vue'),
+        meta: {
+            isShowTarbar: true,
+        }
+    },{
         path: '/toBeDone',
         name: 'toBeDone',
         component: () =>
@@ -48,22 +56,6 @@ const routes = [{
         meta: {
             isShowTarbar: true,
         }
-    }, {
-        path: '/siteMan',
-        name: 'siteMan',
-        component: () =>
-            import ('../views/siteMan/siteMan.vue'),
-        meta: {
-            isShowTarbar: true,
-        }
-    }, {
-        path: '/activityMan',
-        name: 'activityMan',
-        component: () =>
-            import ('../views/activityMan/activityMan.vue'),
-        meta: {
-            isShowTarbar: true,
-        }
     }, {
         path: '/placeActivityList',
         name: 'placeActivityList',

src/store/index.js

@@ -1,13 +1,19 @@
 import { createStore } from "vuex";
 const TOKEN_Key="MZ_USER";
+const PCTOKEN_Key="MZ_TOKEN";
 const store =createStore({
     state:{
-        user:JSON.parse(window.localStorage.getItem(TOKEN_Key)),
+        user:window.localStorage.getItem(TOKEN_Key),
+        pctoken:window.localStorage.getItem(PCTOKEN_Key)
     },
     mutations:{
         setUser(state,data){
             state.user=data;
-            window.localStorage.setItem(TOKEN_Key,JSON.stringify(state.user));
+            window.localStorage.setItem(TOKEN_Key,state.user);
+        },
+        setPcToken(state,data){
+            state.pctoken=data;
+            window.localStorage.setItem(PCTOKEN_Key,state.pctoken);
         },
     },
 });

src/utils/request.js

@@ -1,14 +1,25 @@
 import axios from "axios"; //引入axios
 import sysConfig from '@/config' //引入配置文件
-axios.defaults.baseURL = sysConfig.baseUrl //设置请求时间
+import store from "../store/index"
+import qs from "qs"
+
+// console.log(process.env.NODE_ENV)
+
+axios.defaults.baseURL = sysConfig.baseURL   //设置请求时间
 axios.defaults.timeout = sysConfig.timeout //设置请求超时时间
-axios.defaults.withCredentials = true
-axios.defaults.headers = { 'Content-Type': 'application/json; charset=utf-8' };
+const ContentType = sysConfig.ContentType
+
+//axios.defaults.headers["Content-Type"] = "application/json";
+// axios.defaults.withCredentials = true
+// axios.defaults.headers = { 'Content-Type': 'application/json; charset=utf-8' };
+
+axios.defaults.headers["Content-Type"] = "application/x-www-form-urlencoded";
+
 
 /** 请求发送前拦截，用于配置求情内容，如headers参数等 */
 axios.interceptors.request.use(
     (config) => {
-        config.params.api_key = sysConfig.api_key
+        config.headers.token=window.localStorage.getItem('MZ_TOKEN');
         return config
     },
     (error) => {
@@ -16,16 +27,53 @@ axios.interceptors.request.use(
     }
 )
 
+function error1(res){
+	if (res.status == 408 || res.status == 401) {// 需要重新登录
+        store.commit('setPcToken',"");
+		console.log(res.data);
+        // window.xm.showToast({
+        //     message:res.data
+        // })
+	}else if(res.status === 404){
+        console.log("404，路径找不到："+res.data.path);
+        // window.xm.showToast({
+        //     message:"404，路径找不到："+res.data.path
+        // })
+	}else if(res.status === 503){
+        console.log("服务不可用");
+        // window.xm.showToast({
+        //     message:"服务不可用"
+        // })
+	}else if(res.status === 504){
+        console.log("网络连接错误");
+        // window.xm.showToast({
+        //     message:"网络连接错误"
+        // })
+	}else{
+        console.log(res.data);
+        // window.xm.showToast({
+        //     message:res.data
+        // })
+	}
+}
+
 /** 请求发送后返回拦截，用于处理数据格式等 */
 axios.interceptors.response.use(
     (response) => {
         return response
     },
     (error) => {
+		if(error.request){
+			error1(error.request);
+		} else if(error.response){
+
+		}
         return error
     }
 )
 
+
+
 //封装http请求
 
 var http = {
@@ -34,14 +82,15 @@ var http = {
      * @param {*} url       请求地址
      * @param {*} params    请求参数，拼接再url地址栏后面，无需求时忽略该参数
      * @param {*} config    请求的config相关配置
-     * @returns 
+     * @returns
      */
     get: function(url, params = {}, config = {}) {
         return new Promise((resolve, reject) => {
             axios({
-                url: url,
+                url: url+"?"+params,
                 method: 'get',
-                params: params,
+                //params: qs.stringify(params),
+                //params: params,
                 config: config
             }).then((response) => {
                 resolve(response.data)
@@ -54,11 +103,11 @@ var http = {
 
     /**
      * post请求
-     * @param {*} url      请求地址 
+     * @param {*} url      请求地址
      * @param {*} data     请求参数
      * @param {*} params   请求参数，拼接再url地址栏后面，无需求时忽略该参数
      * @param {*} config   请求的config相关配置
-     * @returns 
+     * @returns
      */
     post: function(url, data = {}, params = {}, config = {}) {
         return new Promise((resolve, reject) => {
@@ -67,9 +116,16 @@ var http = {
                 method: 'post',
                 data: data,
                 params: params,
+                //params: qs.stringify(params),
                 config: config
             }).then((response) => {
-                resolve(response.data)
+				//if(response.data && response.data.statusCode !== 200){
+				// 	error(response.data);
+				// 	reject(response.data)
+				// }
+				// resolve(response.data);
+
+                resolve(response);
             }).catch((error) => {
                 reject(error)
             })

src/views/activityMan/activityMan.vue

@@ -1,6 +0,0 @@
-<template>
-    <div class="about">
-      <h1>activityMan</h1>
-    </div>
-  </template>
-  

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -1,5 +1,6 @@
 <template>
   <van-nav-bar
+    fixed
     title="场所活动"
     left-text=""
     right-text="上报"

src/views/activityMan/siteInspection/siteInspectionList.vue

@@ -0,0 +1,89 @@
+<template>
+    <van-nav-bar
+      title="场所检查"
+      left-text=""
+      left-arrow
+      @click-left="onClickLeft"
+    />
+    <van-search
+    v-model="value"
+    shape="round"
+    placeholder="请输入搜索关键词"
+  />
+    <van-list
+      v-model:loading="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      @load="onLoad"
+    >
+      <van-button type="primary" size="small" to="/placeActivity">新增</van-button>
+      <van-cell v-for="item in list" :key="item" :title="item" label="2222" is-link>
+        <template #value>
+          11111
+        </template>
+      </van-cell>
+    </van-list>
+  </template>
+  
+  <script>
+  import { ref } from "vue";
+  import  qs  from "qs";
+
+  export default {
+		data() {
+			return{
+                title:'民宗干事',
+				username:"",
+				sms:"",
+				password:"",
+				password2:"",
+				con1:"0",
+                searchForm: {
+                    siteName: {
+                        id: ''
+                    }
+                },
+			}
+		},
+
+		async created(){
+			let aa=qs.stringify({
+            'current': 1,
+            'size': 10,
+            'orders': [],
+            ...this.searchForm
+            },  { allowDots: true, arrayFormat: 'indices' })
+      
+			console.log(aa);
+			let id=this.$route.query.id;
+
+      
+
+			var res = await this.$API.activityMan.siteInspectionList.get(aa);
+            console.log(res);
+
+
+		},
+
+		methods:{
+			onClickLeft(){
+				history.back();
+			},
+        },
+    };
+
+
+  
+  </script>
+  
+  <style>
+  .van-button {
+    top: -5px;
+  }
+  
+  .van-list {
+    height: 80%;
+    margin-top: 5px;
+  }
+  
+  </style>

src/views/activityMan/siteInspection/siteInspectionView.vue

@@ -0,0 +1,383 @@
+<template>
+    <van-nav-bar
+      title="信息上报中心"
+      left-text=""
+      left-arrow
+      @click-left="onClickLeft"
+    />
+    <div class="main">
+      <p class="title">场所检查情况上报</p>
+      <div class="formArea">
+        <p class="miniTitle">基础信息</p>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.activity"
+            center
+            label="活动名称:"
+            placeholder="请填写活动名称"
+            input-align="right"
+          />
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.place"
+            readonly
+            required
+            label="场所名称:"
+            placeholder="请选择"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showPlace = true"
+          />
+          <van-popup v-model:show="showPlace" round position="bottom">
+            <van-picker
+              title="活动场所"
+              :columns="places"
+              @cancel="showPlace = false"
+              @confirm="getPlace"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.activityTime"
+            center
+            readonly
+            label="活动时间:"
+            placeholder="请选择时间"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showAct = true"
+          />
+          <van-popup v-model:show="showAct" round position="bottom">
+            <van-picker-group
+              title="活动时间"
+              :tabs="['选择日期', '选择时间']"
+              next-step-text="下一步"
+              @confirm="getTime"
+              @cancel="showAct = false"
+            >
+              <van-date-picker v-model="currentDate" />
+              <van-time-picker v-model="currentTime" />
+            </van-picker-group>
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.countPerson"
+            center
+            label="参会人数:"
+            placeholder="请填写参会人数"
+            input-align="right"
+            type="digit"
+          />
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.list"
+            center
+            required
+            label="已知名单:"
+            placeholder="请选择参会已知名单"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showPerson = true"
+          />
+          <van-dialog
+            v-model:show="showPerson"
+            title="选择人员名单"
+            show-cancel-button
+            @confirm="reselected"
+          >
+            <person-list @selected="selected"></person-list>
+          </van-dialog>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.portname"
+            center
+            label="报告人:"
+            placeholder="请选择报告人"
+            input-align="right"
+            right-icon="arrow-down"
+          />
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.area"
+            center
+            label="参加范围:"
+            placeholder="请填写参加范围"
+            input-align="right"
+          />
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.activityPlace"
+            center
+            readonly
+            label="活动地点:"
+            placeholder="请填写参加地点"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showArea = true"
+          />
+          <van-popup v-model:show="showArea" round position="bottom">
+            <van-cascader
+              v-model="cascaderValue"
+              title="请选择所在地区"
+              :options="options"
+              @close="showArea = false"
+              @finish="onFinish"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.address"
+            center
+            label="详细地址:"
+            placeholder="请填写活参加地点"
+            input-align="right"
+            right-icon="location"
+          />
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.money"
+            center
+            label="经费来源:"
+            placeholder="请选择"
+            input-align="right"
+          />
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.activityName"
+            center
+            label="活动负责人:"
+            placeholder="请选择活动负责人"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showReport = true"
+          />
+          <van-dialog
+            v-model:show="showReport"
+            title="选择活动负责人"
+            show-cancel-button
+          >
+            <person-list></person-list>
+          </van-dialog>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="placeActivity.tel"
+            center
+            type="tel"
+            label="联系方式:"
+            placeholder="请填写联系方式"
+            input-align="right"
+          />
+        </van-cell-group>
+        <van-cell-group>
+          <van-field name="uploader" label="安全预案:">
+            <template #input>
+              <van-uploader>
+                <van-button icon="plus">上传文件</van-button>
+              </van-uploader>
+            </template>
+          </van-field>
+        </van-cell-group>
+        <van-cell-group>
+          <div class="rowTextArea">
+            <van-field
+              v-model="placeActivity.into"
+              center
+              rows="2"
+              type="textarea"
+              label="主题内容:"
+              label-align="top"
+            />
+          </div>
+        </van-cell-group>
+      </div>
+      <div class="subbtn">
+        <van-button type="primary">提交</van-button>
+        <van-button type="default" hairline>取消</van-button>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  import { reactive, ref } from "vue";
+  import personList from "../personList.vue";
+  export default {
+    components: { personList },
+    setup() {
+      // 返回
+      const onClickLeft = () => {
+        history.back();
+      };
+      // 活动信息
+      const placeActivity = reactive({
+        activity: "",
+        place: "",
+        activityTime: "",
+        countPerson: "",
+        list: "",
+        portname: "",
+        area: "",
+        activityPlace: "",
+        address: "",
+        money: "",
+        activityName: "",
+        tel: "",
+        file: "",
+        into: "",
+      });
+      // 场所名称
+      const places = [
+        { text: "杭州", value: "Hangzhou" },
+        { text: "宁波", value: "Ningbo" },
+        { text: "温州", value: "Wenzhou" },
+        { text: "绍兴", value: "Shaoxing" },
+        { text: "湖州", value: "Huzhou" },
+      ];
+      let showPlace = ref(false);
+      const getPlace = ({ selectedOptions }) => {
+        showPlace.value = false;
+        placeActivity.place = selectedOptions[0].text;
+      };
+      // 获取活动时间
+      let showAct = ref(false);
+      let currentDate = ref(["" + new Date().getFullYear(), "01", "01"]);
+      let currentTime = ref(["00", "00"]);
+      const getTime = () => {
+        showAct.value = false;
+        placeActivity.activityTime = `${currentDate.value.join(
+          "-"
+        )} ${currentTime.value.join(":")}`;
+      };
+      // 已知名单
+      let showPerson = ref(false);
+      // 活动负责人
+      let showReport = ref(false);
+      const show = () => {
+        showPerson = true;
+      };
+      let list = "";
+      const selected = (val) => {
+        
+        list = val;
+      };
+      const reselected = () => {
+        placeActivity.list = list;
+      };
+      // 地区选择
+      let showArea = ref(false);
+      const cascaderValue = ref("");
+      // 选项列表，children 代表子选项，支持多级嵌套
+      const options = [
+        {
+          text: "浙江省",
+          value: "330000",
+          children: [{ text: "杭州市", value: "330100" }],
+        },
+        {
+          text: "江苏省",
+          value: "320000",
+          children: [{ text: "南京市", value: "320100" }],
+        },
+      ];
+      // 全部选项选择完毕后，会触发 finish 事件
+      const onFinish = ({ selectedOptions }) => {
+        showArea.value = false;
+        placeActivity.activityPlace = selectedOptions
+          .map((option) => option.text)
+          .join("/");
+      };
+      return {
+        placeActivity,
+        // 活动场所
+        showPlace,
+        places,
+        getPlace,
+        // 活动时间
+        showAct,
+        currentDate,
+        currentTime,
+        getTime,
+        // 返回
+        onClickLeft,
+        // 人员选择
+        showPerson,
+        showReport,
+        selected,
+        reselected,
+        // 地区选择
+        showArea,
+        options,
+        onFinish,
+        cascaderValue,
+      };
+    },
+  };
+  </script>
+  
+  <style scoped>
+  * {
+    margin: 0;
+    padding: 0;
+  }
+  .main p {
+    height: 40px;
+    line-height: 40px;
+    color: #36a7f3;
+    border-bottom: 1px solid #eee;
+  }
+  .title {
+    font-size: 20px;
+    font-weight: 700;
+    padding-left: 20px;
+  }
+  .miniTitle {
+    font-size: 16px;
+  }
+  .formArea {
+    padding: 0px 20px;
+  }
+  .formArea .van-cell-group .van-field__label {
+    height: 40px;
+  }
+  .formArea .van-cell-group .van-cell {
+    line-height: 40px;
+  }
+  .van-cell__value .van-field__right-icon .van-icon-location {
+    color: #36a7f3!important;
+  }
+  .rowTextArea::v-deep .van-field__value {
+    width: 98%;
+    border: 2px solid #ccc;
+    border-radius: 10px;
+  }
+  .rowTextArea::v-deep .van-cell {
+    display: flow-root;
+  }
+  .subbtn {
+    margin: 20px;
+    text-align: center;
+  }
+  .subbtn .van-button {
+    width: 40%;
+    margin: 5px;
+  }
+  .van-uploader .van-button {
+    border: none;
+    color: #36a7f3;
+    top: -4px;
+  }
+  .van-dialog {
+    width: 80%;
+    top: 50%;
+  }
+  </style>

src/views/placeManage/placePerson.vue

@@ -18,7 +18,7 @@
     </van-search>
   </div>
   <div class="PersonList">
-    <div class="PersonItem" v-for="item in Person.PersonList" :key="item.id">
+    <div class="PersonItem" v-for="item in Person.PersonList" :key="item.id" @click="goPlacePersonInfo">
       <van-row>
         <van-col span="18">
             <p>{{item.name}}（<span style="color:#36a7f3;">{{item.id}}</span>）</p>
@@ -43,6 +43,7 @@
 
 <script>
 import { reactive,ref } from "vue";
+import { useRouter } from 'vue-router'
 export default {
   setup() {
     const value = ref("");
@@ -92,6 +93,11 @@ export default {
             },
         ]
     })
+    //跳转
+    let router = useRouter()
+    const goPlacePersonInfo = ()=>{
+      router.push("/placePersoninfo")
+    }
     //返回
     const goback = () => {
       history.back();
@@ -101,7 +107,8 @@ export default {
       value,
       value1,
       option1,
-      Person
+      Person,
+      goPlacePersonInfo
     };
   },
 };

src/views/placeManage/placePersoninfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <van-nav-bar title="人员档案信息" left-arrow @click-left="goback" />
+  <van-nav-bar title="人员档案信息" left-arrow @click="goback" />
   <div class="banner">
     <h2>扎实提升“三力”</h2>
     <h2>深入推进“三化”</h2>

src/views/placeManage/placeRegister.vue

@@ -6,7 +6,7 @@
       <p class="miniTitle">基础信息</p>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.place"
+          v-model="placeActivity.religion"
           readonly
           label="所属宗教:"
           placeholder="请选择宗教"
@@ -25,7 +25,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.activityPlace"
+          v-model="placeActivity.district"
           center
           readonly
           label="所属县(区):"
@@ -56,7 +56,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.money"
+          v-model="placeActivity.place"
           center
           label="场所名称:"
           placeholder="请填写场所名称"
@@ -65,7 +65,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.money"
+          v-model="placeActivity.name"
           center
           label="联络人姓名:"
           placeholder="请填写联络人姓名"
@@ -74,7 +74,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.money"
+          v-model="placeActivity.tel"
           center
           label="联系方式:"
           placeholder="请填写联络人联系方式"
@@ -84,14 +84,14 @@
       <van-cell-group>
         <van-field name="uploader" label="外景照片:">
           <template #input>
-            <van-uploader :after-read="afterRead" />
+            <van-uploader v-model="placeActivity.fileList1" :after-read="afterRead" />
           </template>
         </van-field>
       </van-cell-group>
       <van-cell-group>
         <van-field name="uploader" label="内景照片:">
           <template #input>
-            <van-uploader :after-read="afterRead" />
+            <van-uploader v-model="placeActivity.fileList2" :after-read="afterRead" />
           </template>
         </van-field>
       </van-cell-group>
@@ -112,20 +112,14 @@ export default {
     };
     //场所录入
     const placeActivity = reactive({
-      activity: "",
-      place: "",
-      activityTime: "",
-      countPerson: "",
-      list: "",
-      portname: "",
-      area: "",
-      activityPlace: "",
-      address: "",
-      money: "",
-      activityName: "",
-      tel: "",
-      file: "",
-      into: "",
+      religion: "",//所属宗教
+      district: "",//所属县区
+      address: "",//具体地址
+      place: "",//场所
+      name: "",//联系人姓名
+      tel: "",//联系方式
+      fileList1:[],//外景图片
+      fileList2: [],//内景图片
     });
     // 宗教名称
     const places = [

src/views/siteMan/siteMan.vue

@@ -1,6 +0,0 @@
-<template>
-    <div class="about">
-      <h1>siteMan</h1>
-    </div>
-  </template>
-  

src/views/tab_a/tabAll.vue

@@ -19,7 +19,7 @@
 		<div class="tabtitle2">（</div>
 		<div class="tabtitle3">15</div>
 		<div class="tabtitle4">）</div>
-		<van-icon name="ellipsis" class="tabtitle5" />
+		<van-icon name="ellipsis" class="tabtitle5" @click="goToBeDone" />
 	</div>
 
 	<div class="flexll">
@@ -66,6 +66,8 @@
 
 <script>
 import tool from "@/tool";
+import  qs  from "qs";
+
 	export default {
 		data() {
 			return{
@@ -87,12 +89,14 @@ import tool from "@/tool";
 		},
 
 		methods:{
+            goToBeDone() {
+              this.$router.push("/toBeDone");
+            },
+
 			onClickLeft(){
 				history.back();
 			},
 
-
-
 			async TokenLogin(){
 
 				let that=this;
@@ -109,15 +113,22 @@ import tool from "@/tool";
 				// })
 
 
-				const inputForm ={
+
+				//添加PCtoken过期判断，（请求拦截到token过期，会设置PCtoken为空，为空的时候再调用免登功能）
+				if(this.$store.state.pctoken==""||this.$store.state.pctoken==undefined){
+					const inputForm =qs.stringify({
 					'token': "ssssssss"
+					},  { allowDots: true, arrayFormat: 'indices' })
+					var res = await this.$API.yin.TokenLogin.get(inputForm);
+					//console.log(res);
+					//存PCtoken
+					this.$store.commit('setPcToken',res.PcToken);
+					this.$store.commit('setUser',res.account);
 				}
-				var res = await this.$API.yin.TokenLogin.get(inputForm);
-				console.log(res);
 
-				//this.$store.commit('setUser',data);
 
 
+				//this.$store.commit('setUser',data);
 				// if (res.type == 1) {
 				// 	this.$router.replace({
 				// 		path: "/main",

src/views/tab_a/tab_a.vue

@@ -1,9 +1,9 @@
 <template>
     <router-view></router-view>
     <van-tabbar v-model="active" route >
-        <van-tabbar-item replace to="/toBeDone" name="toBeDone" icon="notes-o">我的待办</van-tabbar-item>
-        <van-tabbar-item replace to="/siteMan" name="siteMan" icon="shop-o">场所管理</van-tabbar-item>
-        <van-tabbar-item replace to="/activityMan" name="activityMan" icon="newspaper-o">活动管理</van-tabbar-item>
+        <van-tabbar-item replace to="/setting" name="toBeDone" icon="notes-o">我的待办</van-tabbar-item>
+        <van-tabbar-item replace to="/setting" name="siteMan" icon="shop-o">场所管理</van-tabbar-item>
+        <van-tabbar-item replace to="/setting" name="activityMan" icon="newspaper-o">活动管理</van-tabbar-item>
         <van-tabbar-item replace to="/setting" name="setting" icon="friends-o">个人中心</van-tabbar-item>
     </van-tabbar>
 </template>

src/views/toBeDone/toBeDone.vue

@@ -7,7 +7,7 @@
   >
     <van-tab title="待处理">
       <div class="list1">
-        <van-row class="list-item" v-for="item in toBeDone.DoneList1" :key="item.dateTime">
+        <van-row class="list-item" v-for="item in toBeDone.DoneList1" :key="item.dateTime" @click="goToBeDoneinfo">
           <van-col span="6" class="list-item-left">
             <div>
               <p style="color: #a3a3a3">{{item.dateTime}}</p>
@@ -31,7 +31,7 @@
     </van-tab>
     <van-tab title="已处理">
       <div class="list1">
-        <van-row class="list-item" v-for="item in toBeDone.DoneList2" :key="item.dateTime">
+        <van-row class="list-item" v-for="item in toBeDone.DoneList2" :key="item.dateTime" @click="goToBeDoneinfo">
           <van-col span="6" class="list-item-left">
             <div>
               <p style="color: #a3a3a3">{{item.dateTime}}</p>
@@ -58,6 +58,7 @@
 
 <script>
 import {reactive,ref} from "vue"
+import { useRouter } from 'vue-router'
 export default {
   beforeCreate() {
     this.dealWith()
@@ -186,13 +187,19 @@ export default {
         }
       })
     }
+    //跳转
+    let router = useRouter()
+    const goToBeDoneinfo = ()=>{
+      router.push("/toBeDone_details")
+    }
     const goback = ()=>{
       history.back();
     }
     return {
       goback,
       toBeDone,
-      dealWith
+      dealWith,
+      goToBeDoneinfo
     }
   }
 };