Merge branch 'dev' of http://111.2.21.141:33001/menghui.song/FenghuaDigitalDoorplatePhase1_ZheZhengDing into ssjDev

src/pages.json

@@ -15,7 +15,7 @@
     {
       "path": "pages/home/home",
       "style": {
-        "navigationBarTitleText": "奉化数字门牌"
+        "navigationBarTitleText": "奉化数字门牌-承诺列表"
       }
     },
     {

src/pages/blank/blank.vue

@@ -246,6 +246,7 @@ export default {
       const res = await dd.getAuthCode({
         corpId: '50329019'
       })
+      sessionStorage.setItem('accountId', res.accountId);
       if(res) {
         const loginRes  =  await ZzdLogin({
           code: res.code

src/pages/digitalDoorIndex/index.vue

@@ -0,0 +1,92 @@
+<script>
+import TemplateImg from "@/static/images/digitalDoor/composite.png";
+import PersonImg from "@/static/images/digitalDoor/person.png";
+import HouseImg from "@/static/images/digitalDoor/house.png"
+import InterestImg from "@/static/images/digitalDoor/interest.png"
+import EnterPromise from "@/static/images/digitalDoor/enterprise.png"
+
+export default {
+  data() {
+    return {
+      list: [
+        {
+          text: '综合查询',
+          icon: TemplateImg,
+          url:'/subPages/pages/digitalDoor/generalInquiry/index'
+        },
+        {
+          text: '人员管理',
+          icon: PersonImg
+        },
+        {
+          text: '房屋管理',
+          icon: HouseImg
+        },
+        {
+          text: '企业管理',
+          icon: TemplateImg
+        },
+        {
+          text: '兴趣点管理',
+          icon: InterestImg
+        },
+        {
+          text: '企业承诺',
+          icon: EnterPromise,
+          url: '/pages/home/home'
+        }
+      ]
+    }
+  },
+  methods: {
+    handleClick(item) {
+      console.log(item)
+      uni.navigateTo({
+        url: item.url
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <view>
+    <van-list class="list">
+      <van-cell v-for="item in list" :key="item.text">
+        <template>
+          <view class="text-group" @click="handleClick(item)">
+            <img :src="item.icon" alt="">
+            <view class="text-overflow">{{ item.text }}</view>
+          </view>
+        </template>
+      </van-cell>
+    </van-list>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.list {
+  padding: 30rpx 30rpx;
+  border-radius: 20px;
+  border: 1px solid #eee;
+}
+
+.text-group {
+  display: flex;
+  align-items: center;
+  padding: 10rpx 0;
+
+  img {
+    width: 20px;
+    height: 20px;
+    margin-right: 20rpx;
+  }
+}
+
+.text-overflow {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: inline-block;
+  white-space: nowrap;
+}
+</style>

src/pages/message/message.vue

@@ -1,5 +1,6 @@
 <script>
 import RemindList from '@/components/bussinessComponents/remind-list/index.vue'
+import buriedPoint from "@/utils/dd.buriedPoint";
 export default {
   data() {
     return {
@@ -8,7 +9,10 @@ export default {
   },
   components: {
     RemindList
-  }
+  },
+  onLoad() {
+    buriedPoint('消息','2','pages/message/message')
+  },
 }
 </script>
 

src/pages/my/my.vue

@@ -186,6 +186,7 @@ import {getUserInfo, updateUserInfo, getMyDoorplateAll, getPersonalHouseNumber}
 import { storageUserInfo } from "@/utils/index";
 import { DOOR_TYPE } from "@/utils/const";
 import Vue from "vue";
+import buriedPoint from "@/utils/dd.buriedPoint";
 const app = getApp();
 
 export default {
@@ -223,6 +224,9 @@ export default {
     this.userInfo = uni.getStorageSync("userInfo") || {};
     this.bindStatus = app.globalData.bindStatus;
     this.getUserInfo();
+
+    buriedPoint("我的",'3','pages/my/my')
+
   },
   onShow() {
     if (app.globalData.doorplateInfo.code) {

src/subPages/pages/commitment/home/index.vue

@@ -6,6 +6,7 @@ import EnterPriseList from "./components/enterpriseList/index.vue";
 import TemplateList from "./components/templateList/index.vue";
 import RecentlySearch from "./components/recentlySearch/index.vue";
 import {searchCommitment} from "@/api/commitment";
+import buriedPoint from "@/utils/dd.buriedPoint";
 
 
 export default {
@@ -17,6 +18,9 @@ export default {
     TemplateList,
     RecentlySearch
   },
+  onLoad(){
+    buriedPoint('经营承诺','1-3','subPages/pages/commitment/home/index')
+  },
   data() {
     return {
       activeIndex: 0, // 当前激活的菜单索引

src/subPages/pages/commitment/remindDetail/index.vue

@@ -1,5 +1,6 @@
 <script>
 import {downFileBase64, reminderDetails} from "@/api/commitment";
+import buriedPoint from "@/utils/dd.buriedPoint";
 
 export default {
   watch: {
@@ -22,6 +23,9 @@ export default {
       reminderDetail: {},
     }
   },
+  onLoad(){
+    buriedPoint('提醒详情','3-2','subPages/pages/commitment/remindDetail/index')
+  },
   methods: {
     handleGetDetail() {
       reminderDetails({

src/subPages/pages/digitalDoor/generalInquiry/index.vue

@@ -0,0 +1,79 @@
+<script>
+export default {
+  data() {
+    return {
+      searchKey: ''
+    }
+  },
+  methods: {
+    search() {
+      uni.navigateTo({
+        url: '/pages/search/search?searchKey=' + this.searchKey
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <view class="box">
+    <view class="content">
+      <van-field
+          style="border-radius: 5px 0 0 5px;width: 80%;height: 50px"
+          v-model="searchKey"
+          center
+          clearable
+          placeholder="请输入内容"
+      >
+      </van-field>
+      <van-button style="width: 20%;border-radius: 0 5px 5px 0" type="primary" size="large" color="#198bfe" @click="search">查询</van-button>
+    </view>
+    <view class="desc">
+      <view class="title">说明:</view>
+      <view class="desc-content">
+        <view>1. 请先勾选查询范围进行缓存查询，未勾选则无法查询选定范围的数据。</view>
+        <view>
+          2. 综合查询仅部分信息字段中支持查询（人员的查询范围为姓名、身份证号、联系方式、户籍地、居住地；
+          房屋的查询范围为产权证号、房屋地址；
+          企业的查询范围为企业名称、招牌名称、统一社会信用代码、企业注册地地址、法人代表。）
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.box {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+
+  .content {
+    box-sizing: border-box;
+    padding: 10px;
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    align-content: center;
+    justify-content: center;
+  }
+}
+
+.desc {
+  height: 300px;
+  padding: 16px;
+  color: #666;
+}
+
+.title {
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 8px;
+}
+
+.desc-content {
+  font-size: 12px;
+  line-height: 1.5;
+  color: #333;
+}
+</style>

src/subPages/pages/register/register.vue

@@ -448,7 +448,7 @@ export default {
                 btnValue: '编辑'
             });
             uni.navigateTo({
-                url: '/pages/home/home'
+                url: '/pages/digitalDoorIndex/index'
             });
         },
 

src/subPages/pages/scanCode/scanCode.vue

@@ -83,7 +83,7 @@ export default {
             };
             // app.globalData.NBID = params.NBID;
             uni.switchTab({
-              url: '/pages/home/home'
+              url: '/pages/digitalDoorIndex/index'
             });
           } else {
             uni.showToast({
@@ -119,7 +119,7 @@ export default {
         code: id
       }
       uni.switchTab({
-        url: '/pages/home/home'
+        url: '/pages/digitalDoorIndex/index'
       });
     }
   },

src/subPages/pages/scanCode/searchDoorplate.vue

@@ -91,7 +91,7 @@ export default {
 				Type: doorplateType,
 				code: val.code
 			};
-			uni.switchTab({
+			uni.navigateTo({
               url: '/pages/home/home'
             });
 		}

src/utils/dd.buriedPoint.js

@@ -0,0 +1,65 @@
+/* eslint-disable */
+const buriedPoint = (name, id, url) => {
+    const userInfo = uni.getStorageSync("userInfo");
+
+
+
+
+
+    // 单页应用 或 “单个页面”需异步补充PV日志参数还需进行如下埋点：
+    aplus_queue.push({
+        action: 'aplus.setMetaInfo',
+        arguments: ['aplus-waiting', 'MAN']
+    });
+    // 单页应用路由切换后 或 在异步获取到pv日志所需的参数后再执行sendPV：
+    aplus_queue.push({
+        action: 'aplus.sendPV',
+        arguments: [{
+            is_auto: false
+        }, {
+            // 当前你的应用信息，此两行请勿修改
+            sapp_id: '39367',
+            sapp_name: 'FH_SZMP',
+            // 自定义PV参数key-value键值对（只能是这种平铺的json，不能做多层嵌套），如：
+            page_id: id,
+            page_name: name,
+            page_url: url
+        }]
+    })
+
+
+
+    // 如采集用户信息是异步行为需要先执行这个BLOCK埋点
+    aplus_queue.push({
+        action: 'aplus.setMetaInfo',
+        arguments: ['_hold', 'BLOCK']
+    });
+
+    // 设置会员昵称
+    aplus_queue.push(
+        {
+            action: "aplus.setMetaInfo",
+            arguments: ["_user_nick", userInfo.username]
+        });
+
+
+    // 设置用户ID，用户设备ID可不做上报，若上报可使用开放平台JSAPI获取UUID
+    //用户id需要埋政钉用户真实信息，用户ID必须用accountId，可通过开放平台“获取用户详情”接口获取。
+    aplus_queue.push({
+        action: "aplus.setMetaInfo",
+        arguments: ["_user_id", sessionStorage.getItem('accountId')]
+    });
+    // aplus_queue.push({
+    //     action: "aplus.setMetaInfo",
+    //     arguments: ["_dev_id", "当前用户设备ID"]
+    // });
+
+    // 如采集用户信息是异步行为，需要先设置完用户信息后再执行这个START埋点
+    // 此时被block住的日志会携带上用户信息逐条发出
+    aplus_queue.push({
+        action: 'aplus.setMetaInfo',
+        arguments: ['_hold', 'START']
+    });
+}
+
+export default buriedPoint