根据苏南项目修改后提交

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "小艾微纳园",
+    "name" : "苏南快递产业园",
     "appid" : "__UNI__8C5F0F6",
     "description" : "应用描述",
     "versionName" : "1.0.0",
@@ -96,7 +96,7 @@
         "versionCode" : 100
     },
     "mp-weixin" : {
-        "appid" : "wxcfa83b07b1dbd591",
+        "appid" : "wx44a0d2f4a1220d3d",
         "optimization" : {
             "subPackages" : true
         },

pages.json

@@ -24,10 +24,73 @@
                 }
             }
         },
+        {
+            "path": "pages/activity/index",
+            "style": {
+                "navigationBarTitleText": "活动核销签到",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 100,
+                "app-plus": {
+                    "bounce": "vertical",
+
+                    "titleNView": {
+                        "buttons": [{
+                            "text": "\ue534",
+                            "fontSrc": "/static/uni.ttf",
+                            "fontSize": "22px",
+                            "color": "#FFFFFF"
+                        }]
+                    }
+                },
+                "component": true,
+                "usingComponents": {
+                    "van-radio": "/wxcomponents/weapp/dist/radio/index",
+                    "van-radio-group": "/wxcomponents/weapp/dist/radio-group/index",
+                    "van-empty": "/wxcomponents/weapp/dist/empty/index",
+                    "van-button": "/wxcomponents/weapp/dist/button/index",
+                    "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                    "van-field": "/wxcomponents/weapp/dist/field/index",
+                    "van-popup": "/wxcomponents/weapp/dist/popup/index",
+                    "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                    "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                    "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                    "van-tabs": "/wxcomponents/weapp/dist/tabs/index"
+                }
+            }
+        },
         {
             "path": "pages/index/index",
             "style": {
-                "navigationBarTitleText": "首页"
+                "navigationBarTitleText": "走访上报",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 100,
+                "app-plus": {
+                    "bounce": "vertical",
+                    "titleNView": {
+                        "buttons": [{
+                            "text": "\ue534",
+                            "fontSrc": "/static/uni.ttf",
+                            "fontSize": "22px",
+                            "color": "#FFFFFF"
+                        }]
+                    }
+                },
+                "component": true,
+                "usingComponents": {
+                    "van-button": "/wxcomponents/weapp/dist/button/index",
+                    "van-toast": "/wxcomponents/weapp/dist/toast/index",
+                    "van-field": "/wxcomponents/weapp/dist/field/index",
+                    "van-picker": "/wxcomponents/weapp/dist/picker/index",
+                    "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
+                    "van-icon": "/wxcomponents/weapp/dist/icon/index",
+                    "van-tab": "/wxcomponents/weapp/dist/tab/index",
+                    "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
+                    "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
+                    "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
+                    "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
+                    "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
+                }
             }
         },
 
@@ -1149,40 +1212,7 @@
                     }
                 }
             },
-            {
-                "path": "companyreport/companyreport",
-                "style": {
-                    "navigationBarTitleText": "走访上报",
-                    "enablePullDownRefresh": true,
-                    "onReachBottomDistance": 100,
-                    "app-plus": {
-                        "bounce": "vertical",
-                        "titleNView": {
-                            "buttons": [{
-                                "text": "\ue534",
-                                "fontSrc": "/static/uni.ttf",
-                                "fontSize": "22px",
-                                "color": "#FFFFFF"
-                            }]
-                        }
-                    },
-                    "component": true,
-                    "usingComponents": {
-                        "van-button": "/wxcomponents/weapp/dist/button/index",
-                        "van-toast": "/wxcomponents/weapp/dist/toast/index",
-                        "van-field": "/wxcomponents/weapp/dist/field/index",
-                        "van-picker": "/wxcomponents/weapp/dist/picker/index",
-                        "van-dialog": "/wxcomponents/weapp/dist/dialog/index",
-                        "van-icon": "/wxcomponents/weapp/dist/icon/index",
-                        "van-tab": "/wxcomponents/weapp/dist/tab/index",
-                        "van-tabs": "/wxcomponents/weapp/dist/tabs/index",
-                        "van-datetime-picker": "/wxcomponents/weapp/dist/datetime-picker/index",
-                        "van-uploader": "/wxcomponents/weapp/dist/uploader/index",
-                        "van-checkbox": "/wxcomponents/weapp/dist/checkbox/index",
-                        "van-checkbox-group": "/wxcomponents/weapp/dist/checkbox-group/index"
-                    }
-                }
-            },
+
             {
                 "path": "companyHouse/companyHouse",
                 "style": {
@@ -1362,6 +1392,12 @@
                 "selectedIconPath": "static/homeselect.png",
                 "text": "首页"
             },
+            {
+                "pagePath": "pages/activity/index",
+                "iconPath": "static/home.png",
+                "selectedIconPath": "static/homeselect.png",
+                "text": "活动核销"
+            },
             {
                 "pagePath": "pages/mine/mine",
                 "iconPath": "static/mine.png",
@@ -1379,4 +1415,4 @@
         "enablePullDownRefresh": true
     },
     "lazyCodeLoading": "requiredComponents"
-}
+}

pages/activity/api_activity.js

@@ -0,0 +1,43 @@
+import { request } from './request'
+
+const baseUri = ''
+const parkActivity = '/wx/parkActivity'
+
+export function list(data) {
+    return request({
+        url: baseUri + parkActivity + '/list',
+        method: 'post',
+        data: data
+    })
+}
+
+export function getActivityById(id, userId) {
+    return request({
+        url: baseUri + parkActivity + '/getActivityById?id=' + id + '&userId=' + userId,
+        method: 'get'
+    })
+}
+
+export function clickCollect(data) {
+    return request({
+        url: baseUri + parkActivity + '/clickCollect',
+        method: 'post',
+        data: data
+    })
+}
+
+export function insertRegisSignInfo(data) {
+    return request({
+        url: baseUri + parkActivity + '/insertRegisSignInfo',
+        method: 'post',
+        data: data
+    })
+}
+
+export function listRegisSignInfo(data) {
+    return request({
+        url: baseUri + parkActivity + '/listRegisSignInfo',
+        method: 'post',
+        data: data
+    })
+}

pages/activity/apply-popup.vue

@@ -0,0 +1,233 @@
+<template>
+  <div class="apply">
+    <van-popup :show="show" class="form-popup">
+      <div class="popup-body">
+        <div class="popup-header">
+          <div class="title">请确认企业签到信息</div>
+          <div class="close" @click="close">
+            <i class="iconfont icon-guanbi"></i>
+          </div>
+        </div>
+        <div class="popup-center">
+          <van-form>
+            <van-field
+              readonly
+              class="input-item"
+              label="*公司名称"
+              placeholder="请填写公司名称"
+              :value="signInfo.companyName"
+            />
+            <van-field
+              readonly
+              class="input-item"
+              label="*参与人姓名"
+              placeholder="请填写参与人姓名"
+              :value="signInfo.participants"
+            />
+            <van-field
+              readonly
+              class="input-item"
+              label="*参与人职位"
+              placeholder="请填写参与人职位"
+              :value="signInfo.participantsPosition"
+            />
+            <van-field
+              readonly
+              class="input-item"
+              label="*参与总人数"
+              placeholder="请填写参与总人数"
+              :value="signInfo.participantsNumber"
+            />
+            <van-field
+              readonly
+              class="input-item"
+              label="说明"
+              :value="signInfo.remark"
+              type="textarea"
+              autosize
+            />
+          </van-form>
+        </div>
+        <div class="popup-foot-but">
+          <div class="cancel" @click="cancel()">取消</div>
+          <div class="gb" @click="confirm">确认</div>
+        </div>
+      </div></van-popup
+    >
+  </div>
+</template>
+  
+  <script>
+import { richScan } from "@/js_sdk/http";
+import vanPopup from "../../wxcomponents/weapp/dist/popup/index";
+import vanField from "../../wxcomponents/weapp/dist/popup/index";
+export default {
+  props: {
+    referenceId: {
+      // 关联id
+      type: String,
+      default: "",
+    },
+    referenceType: {
+      // 关联类型
+      type: String,
+      default: "",
+    },
+  },
+  components: {
+    vanPopup,
+    vanField,
+  },
+  data() {
+    return {
+      signInfo: {},
+      show: false,
+      companyName: "",
+      participants: "",
+      participantsPosition: "",
+      participantsPhone: "",
+      partakeNumber: "",
+      remark: "",
+    };
+  },
+  mounted() {},
+  methods: {
+    cancel() {
+      uni.navigateBack({});
+    },
+    init(signInfo) {
+      this.signInfo = signInfo;
+      this.show = true;
+    },
+    close() {
+      this.show = false;
+      this.initData();
+    },
+    initData() {
+      this.companyName = "";
+      this.participants = "";
+      this.participantsPosition = "";
+      this.participantsPhone = "";
+      this.partakeNumber = "";
+      this.remark = "";
+    },
+    confirm() {
+      const _this = this;
+
+      richScan({
+        signInCode: _this.signInfo.signInCode,
+      }).then((res) => {
+        if (res.errmsg == "成功") {
+          this.$showToast(res.data);
+          if (res.data == "签到成功") {
+            uni.navigateBack({});
+          }
+        }
+      });
+      _this.show = false;
+      _this.initData();
+    },
+  },
+};
+</script>
+  
+  <style lang="scss" type="text/scss">
+.form-popup {
+  top: 50%;
+  width: 644rpx;
+  border-radius: 15rpx;
+  .popup-body {
+    padding-bottom: 100rpx;
+    position: relative;
+    .popup-header {
+      padding: 30rpx 40rpx;
+      @include flex;
+      .title {
+        font-size: 28rpx;
+        color: #a1a1a1;
+      }
+      .close {
+        width: 80rpx;
+        text-align: right;
+        i {
+          font-size: 30rpx;
+          color: $color4;
+        }
+      }
+    }
+    .popup-center {
+      padding: 0 40rpx;
+      width: 700rpx;
+      .input-item {
+        margin-top: 30rpx;
+        .van-field__label {
+          font-size: 28rpx;
+          color: #333;
+          line-height: 60rpx;
+        }
+        .van-field__body {
+          input {
+            line-height: 60rpx;
+          }
+        }
+      }
+    }
+    .popup-foot-but {
+      box-sizing: border-box;
+      position: absolute;
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      padding: 0 0 20rpx 0rpx;
+      display: flex;
+      .gb {
+        text-align: center;
+        width: 152rpx;
+        font-size: 28rpx;
+        color: #fff;
+        background: $main;
+        line-height: 64rpx;
+        border-radius: 6rpx;
+        float: right;
+        margin-left: 295rpx;
+      }
+      .cancel {
+        text-align: center;
+        width: 152rpx;
+        font-size: 28rpx;
+        color: rgb(51, 51, 51);
+        border: 2rpx solid #ccc;
+        background: white;
+        line-height: 64rpx;
+        border-radius: 6rpx;
+        margin-left: 100rpx;
+        float: left;
+      }
+    }
+  }
+}
+
+.apply {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 700rpx;
+}
+.popup-foot-but {
+  position: absolute;
+  width: 100%;
+  bottom: 0;
+  left: 0;
+  text-align: center;
+  padding: 0 0 30rpx;
+  .gb {
+    width: 284rpx;
+    font-size: 28rpx;
+    color: #fff;
+    background: $blue;
+    line-height: 92rpx;
+    border-radius: 10rpx;
+  }
+}
+</style>
+  

pages/activity/code.vue

@@ -0,0 +1,13 @@
+<template></template>
+
+<script>
+export default {
+  onLoad() {
+    this.getScanCode();
+  },
+  methods: {},
+};
+</script>
+
+<style>
+</style>

pages/activity/index.vue

@@ -0,0 +1,411 @@
+<template>
+  <div class="detail">
+    <div class="detail-body">
+      <div class="img-text">
+        <img :src="activityDetail.annexArray[0]" alt="" />
+      </div>
+
+      <div class="collect-part">
+        <div
+          class="normal-tip by y-bg"
+          v-if="activityDetail.registrationStatus === '1'"
+        >
+          报名中
+        </div>
+        <div class="normal-tip by h-bg" v-else>报名已结束</div>
+        <div class="right">
+          <span class="num">{{ activityDetail.partakeNumber }}人参与</span>
+          <div class="icon-collect" @click="changeCollectorsStatus()">
+            <i
+              :class="[
+                'iconfont icon-wujiaoxingxingxingshoucangdianji',
+                active && 'blue',
+              ]"
+            ></i>
+          </div>
+        </div>
+      </div>
+
+      <div class="tel-part">
+        <div class="tel-name" style="line-height: 74rpx; width: 300rpx">
+          联系电话
+        </div>
+        <TelNum :num="activityDetail.contactPhone" style="width: 60%" />
+      </div>
+
+      <div class="info-part">
+        <div class="info-item">
+          <div class="custom-item-tit">
+            <span class="tit">活动举办</span>
+          </div>
+          <div class="text">{{ activityDetail.activityHold }}</div>
+        </div>
+        <div class="info-item">
+          <div class="custom-item-tit"><span class="tit">活动内容</span></div>
+          <div class="text vhtml" v-html="activityDetail.activityContent"></div>
+        </div>
+
+        <div class="info-item">
+          <div class="custom-item-tit"><span class="tit">活动时间</span></div>
+          <div class="text">
+            {{ activityDetail.activityStartTime }} —
+            {{ activityDetail.activityEndTime }}
+          </div>
+        </div>
+
+        <div class="info-item">
+          <div class="custom-item-tit"><span class="tit">活动地址</span></div>
+          <div class="text">
+            <span class="add">{{ activityDetail.activityAddress }}</span>
+            <!-- <span class="dh" @click="goAddress(activityDetail.activityAddress)"
+              >导航</span
+            > -->
+          </div>
+        </div>
+        <!-- 
+        <div class="info-item">
+          <div class="custom-item-tit"><span class="tit">报名条件</span></div>
+          <div class="text">
+            {{
+              !activityDetail.registrationConditions
+                ? "无条件"
+                : activityDetail.registrationConditions
+            }}
+          </div>
+        </div> -->
+
+        <div class="info-item">
+          <div class="custom-item-tit"><span class="tit">报名时间</span></div>
+          <div class="text">
+            {{ activityDetail.registrationStartTime }} —
+            {{ activityDetail.registrationEndTime }}
+          </div>
+        </div>
+        <div class="info-item">
+          <div class="custom-item-tit"><span class="tit">活动参与</span></div>
+          <div class="text">还有 {{ number }} 个名额</div>
+        </div>
+
+        <div class="info-item">
+          <div class="custom-item-tit"><span class="tit">附件</span></div>
+          <div class="text" style="16rpx 0px">
+            <div
+              v-for="item in activityDetail.activityFile"
+              :key="item.uid"
+              @click="openFile(item.url)"
+            >
+              {{ item.name }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="but-bottom"
+      @click="getApply()"
+      :signInfo="signInfo"
+      v-if="signInfo.signInStatus == 1"
+    >
+      到场签到
+    </div>
+    <div
+      class="but-bottom"
+      @click="getScanCode()"
+      :signInfo="signInfo"
+      v-if="!btnStatus"
+    >
+      重新扫码
+    </div>
+    <!-- 申请弹框 -->
+    <apply-popup ref="apply" />
+  </div>
+</template>
+  
+  <script>
+import TelNum from "../subPackages/components/tel-number";
+import ApplyPopup from "./apply-popup.vue";
+import {
+  getActivityById,
+  clickCollect,
+  getUserLocalStorageInfo,
+} from "@/js_sdk/http";
+export default {
+  components: {
+    TelNum,
+    ApplyPopup,
+  },
+
+  data() {
+    return {
+      btnStatus: false,
+      signInfo: {},
+      signInCode: "",
+      active: false,
+      id: "",
+      activityDetail: {
+        referenceId: "",
+      },
+      number: 0,
+    };
+  },
+
+  //   onLoad() {
+  //     this.getScanCode();
+  //   },
+  onTabItemTap() {
+    this.getScanCode();
+  },
+  methods: {
+    getScanCode() {
+      let that = this;
+      uni.scanCode({
+        success: (e) => {
+          that.signInCode = e.result;
+          that.getActivityById();
+        },
+        fail: (fail) => {
+          this.btnStatus = false;
+          //   uni.navigateTo({
+          //     url: "/pages/mine/mine",
+          //   });
+        },
+      });
+    },
+    openFile(url) {
+      uni.downloadFile({
+        url: url, // 网络文档地址
+        success: (data) => {
+          if (data.statusCode === 200) {
+            uni.saveFile({
+              tempFilePath: data.tempFilePath, //临时路径
+              success: function (res) {
+                // 保存路径
+
+                setTimeout(() => {
+                  //打开文档查看
+                  uni.openDocument({
+                    filePath: res.savedFilePath,
+                    success: function (res) {},
+                  });
+                }, 3000);
+              },
+            });
+          }
+        },
+        fail: (err) => {
+          uni.showToast({
+            title: "失败请重新下载",
+          });
+        },
+      });
+    },
+    getActivityById(a, b, c) {
+      const _this = this;
+      getActivityById(
+        "1126547436026724352",
+        _this.signInCode,
+        getUserLocalStorageInfo().user.id
+      ).then((res) => {
+        if (res.data.info) {
+          _this.annexArray = res.data.info.annexArray;
+          _this.activityDetail = res.data.info;
+          _this.activityDetail.activityContent =
+            res.data.info.activityContent.replace(
+              "<img",
+              `<img style="max-width:100%;"`
+            );
+          _this.activityDetail.registrationStartTime =
+            this.$common.transBaseDateTime(
+              _this.activityDetail.registrationStartTime
+            );
+          _this.activityDetail.registrationEndTime =
+            this.$common.transBaseToDateTime(
+              _this.activityDetail.registrationEndTime
+            );
+          _this.activityDetail.activityStartTime =
+            this.$common.transBaseDateTime(
+              _this.activityDetail.activityStartTime
+            );
+          _this.activityDetail.activityEndTime =
+            this.$common.transBaseToDateTime(
+              _this.activityDetail.activityEndTime
+            );
+          if (_this.activityDetail.collectorsStatus === "2") {
+            _this.active = true;
+          } else {
+            _this.active = false;
+          }
+          _this.number =
+            _this.activityDetail.limitPersonNumber -
+            _this.activityDetail.partakeNumber;
+          _this.activityDetail.activityFile = JSON.parse(
+            res.data.info.activityFile
+          );
+        }
+        if (res.data.signInfo) {
+          this.signInfo = res.data.signInfo;
+          if (res.data.signInfo == 2) {
+            this.$showToast("该企业已签到");
+          }
+          this.signInfo.signInCode = _this.signInCode;
+        }
+      });
+    },
+    getApply() {
+      this.$refs.apply.init(this.signInfo);
+    },
+    goAddress(address) {
+      if (address === null || undefined === address || address === "") {
+        this.$showToast("地址不能为空");
+        return false;
+      } else {
+        this.navigation(address);
+      }
+    },
+    changeCollectorsStatus() {
+      if (this.active) {
+        const _this = this;
+        clickCollect({
+          id: this.id,
+          userId: getUserLocalStorageInfo().user.id,
+          collectorsStatus: "1",
+        }).then((res) => {
+          _this.getActivityById();
+        });
+      } else {
+        const _this = this;
+        clickCollect({
+          id: this.id,
+          userId: getUserLocalStorageInfo().user.id,
+          collectorsStatus: "2",
+        }).then((res) => {
+          _this.getActivityById();
+        });
+      }
+    },
+  },
+};
+</script>
+  
+  <style lang="scss" type="text/scss" >
+// 底部按钮
+.but-bottom {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  line-height: 120rpx;
+  background: $main;
+  color: #fff;
+  font-size: 36rpx;
+  text-align: center;
+}
+
+.text {
+  font-size: 24rpx;
+  color: $text5;
+  margin-top: 32rpx;
+}
+.detail {
+  box-sizing: border-box;
+  background-color: #f2f2f2;
+  padding: 0 0 140rpx;
+  overflow-y: auto;
+
+  .detail-body {
+    .img-text {
+      img {
+        height: 420rpx;
+        width: 100%;
+      }
+    }
+    .collect-part {
+      background-color: #fff;
+      height: 120rpx;
+      padding: 0 30rpx;
+      margin-bottom: 10rpx;
+      @include flex;
+      .normal-tip {
+      }
+      .right {
+        @include flex;
+        .num {
+          margin-right: 20rpx;
+          font-size: 24rpx;
+          color: #333333;
+        }
+      }
+    }
+    .tel-part {
+      display: flex;
+      width: 100%;
+      background-color: #fff;
+      margin-bottom: 10rpx;
+      padding: 0 30rpx;
+      .tel-name {
+        color: #333;
+        font-size: 32rpx;
+        font-weight: 700;
+      }
+      .custom-tel-component {
+        width: 400rpx;
+        .left {
+          font-size: 26rpx;
+        }
+      }
+    }
+  }
+  .info-part {
+    background-color: #fff;
+    overflow-y: auto;
+    height: calc(100vh - 700rpx);
+    box-sizing: border-box;
+    padding: 40rpx 30rpx;
+    .tit {
+      padding-left: 2.667vw;
+      position: relative;
+      font-size: 4.267vw;
+      &::after {
+        content: "";
+        width: 0.8vw;
+        height: 90%;
+        background-color: #976dec;
+        border-radius: 0.4vw;
+        position: absolute;
+        left: 0;
+        top: 50%;
+        -webkit-transform: translateY(-50%);
+        transform: translateY(-50%);
+      }
+    }
+    .info-item {
+      padding: 10rpx 0rpx;
+      margin-bottom: 20rpx;
+      .custom-item-tit {
+        font-size: 32rpx;
+        font-weight: 700;
+      }
+      .text {
+        font-size: 24rpx;
+        color: $text5;
+        margin-top: 32rpx;
+        .add {
+          margin-right: 40rpx;
+        }
+        .dh {
+          width: 100rpx;
+          text-align: center;
+          display: inline-block;
+          color: $main;
+          border-left: 1rpx solid #666666;
+        }
+      }
+      &:last-child {
+        margin-bottom: 0rpx;
+      }
+    }
+  }
+}
+</style>
+  <style lang="scss">
+</style>

pages/activity/wxMap.vue

@@ -0,0 +1,96 @@
+<template />
+<script>
+import wx from 'weixin-js-sdk'
+import { getSignature, getLonAndLat } from "@/api/wechat";
+
+export default {
+  name: 'WxSignature',
+  data() {
+    return {};
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    //jsSDK 签名验证
+    getJsApiSign(mapParam){
+      let reqData = {}
+      var system = this.isIosOrAndroid()
+      if (system == 1) {
+          // 安卓
+          reqData.url = encodeURI(window.location.href.split('#')[0]);
+      } else if (system == 2) {
+          // iOS
+          // let url = window.location.href.split('smartParkH5')[0]+"smartParkH5/home";
+          reqData.url = encodeURI(window.entryUrl?window.entryUrl:window.location.href.split('#')[0])
+      }
+      
+      getSignature(reqData).then((res) => {
+        if(res.key == 200){
+          wx.config({
+              "debug": false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+              "appId": 'wx7302e8b315a9a6f3', // 必填，公众号的唯一标识
+              "timestamp": res.data.timestamp, // 必填，生成签名的时间戳
+              "nonceStr": res.data.noncestr, // 必填，生成签名的随机串
+              "signature": res.data.signature, // 必填，签名，见附录1
+              "jsApiList": ['openLocation'], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+          });
+          //通过ready接口处理成功验证
+          wx.ready(function () {
+            //导航
+            wx.openLocation({
+              latitude: mapParam.latitude, // 纬度，浮点数，范围为90 ~ -90
+              longitude: mapParam.longitude, // 经度，浮点数，范围为180 ~ -180。
+              name: mapParam.name, // 位置名
+              address: mapParam.address, // 地址详情说明
+              scale: mapParam.scale, // 地图缩放级别,整型值,范围从1~28。默认为最大
+              infoUrl: mapParam.infoUrl // 在查看位置界面底部显示的超链接,可点击跳转
+            });
+          })
+
+          wx.error(function(res){
+          });
+
+        }
+      });
+    },
+
+    // 导航
+    navigation(address){
+      let data = {
+        address : address
+      } 
+      getLonAndLat(data).then((res) => {
+        if(res.key == 200){
+          if(res.data.status == 0){
+            let mapParam = {
+              name: res.data.result.title,
+              latitude: res.data.result.location.lat,
+              longitude: res.data.result.location.lng,
+              scale: 28,
+              address: data.address,
+              infoUrl: '#'
+            }
+            this.getJsApiSign(mapParam);
+          }
+        }
+      });
+    },
+
+    //判断是iOS还是android
+    isIosOrAndroid() {
+      var isAndroid = navigator.userAgent.indexOf('Android') > -1 || navigator.userAgent.indexOf('Adr') > -1; //android终端
+      var isIos = !!navigator.userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/); //ios终端
+      if(isAndroid){
+          // 相关逻辑代码
+          return 1
+      }
+      if(isIos){
+          // 相关逻辑代码
+          return 2
+      }
+      return 0;
+    }
+
+  },
+};
+</script>

pages/index/components/goReport.vue

@@ -0,0 +1,416 @@
+<template>
+  <div class="goreport">
+    <div class="form gaisideshurukuang">
+      <uni-forms
+        ref="baseForm"
+        style="font-size: 26rpx"
+        :modelValue="form"
+        label-width="170rpx"
+      >
+        <uni-forms-item
+          label="走访公司"
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div
+            @click="chosseAboutCompany()"
+            style="height: 73rpx; line-height: 73rpx"
+          >
+            {{
+              !form.companyId
+                ? "请选择走访公司"
+                : companyAllList[form.companyIndex].label
+            }}
+          </div>
+        </uni-forms-item>
+        <uni-forms-item
+          label="走访时间："
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div style="line-height: 73rpx">
+            <!-- <picker
+              style="float: left; width: 100%; height: 40rpx; color: #777"
+              mode="time"
+              :value="form.interviewTime"
+              @change="getInterviewTime"
+            >
+              {{ !form.interviewTime ? "请选择走访时间" : form.interviewTime }}
+            </picker> -->
+            <uni-datetime-picker
+              type="datetime"
+              v-model="form.interviewTime"
+              :border="false"
+            />
+          </div>
+        </uni-forms-item>
+
+        <uni-forms-item
+          label="走访类型："
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div style="height: 73rpx; line-height: 73rpx">
+            <picker
+              style="float: left; width: 100%; height: 40rpx; color: #777"
+              :range="dic_SelectList.interviewType"
+              :value="0"
+              @change="bindPickerChange"
+              range-key="label"
+            >
+              {{
+                !form.interviewType
+                  ? "请选择"
+                  : dic_SelectList.interviewType[form.interviewTypeIndex].label
+              }}
+            </picker>
+          </div>
+        </uni-forms-item>
+        <uni-forms-item
+          label="是否需要处理"
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div style="height: 73rpx; line-height: 73rpx">
+            <uni-data-checkbox
+              v-model="form.isStatus"
+              :localdata="range"
+              @change="change"
+            ></uni-data-checkbox>
+          </div>
+        </uni-forms-item>
+      </uni-forms>
+    </div>
+
+    <div class="form" style="margin-bottom: 146rpx">
+      <van-row>
+        <van-col :span="24"> 走访记录 </van-col>
+        <van-col :span="24">
+          <div class="margint16rpx">
+            <uni-easyinput
+              type="textarea"
+              inputBorder
+              class="textarea_info"
+              style="background: #f9f9f9; margin-top: 16rpx"
+              v-model="form.interviewRecord"
+              placeholder="请输入"
+            />
+          </div>
+        </van-col>
+      </van-row>
+    </div>
+    <van-popup :show="show" bind:close="onClose" round position="bottom">
+      <div style="display: flex; justify-content: space-between">
+        <div style="margin: 32rpx" @click="show = false">取消</div>
+        <div style="margin: 32rpx" @click="getSelectValue()">确认</div>
+      </div>
+      <uni-easyinput
+        v-model="companyName"
+        placeholder="请输入内容"
+      ></uni-easyinput>
+      <picker-view
+        indicator-style="height: 50px;"
+        style="width: 100%; height: 300px"
+        @change="getRowValue"
+        :value="value"
+      >
+        <picker-view-column>
+          <view
+            v-for="item in filtedCompanyAllList"
+            style="line-height: 50px; text-align: center"
+            >{{ item.label }}</view
+          >
+        </picker-view-column>
+      </picker-view>
+    </van-popup>
+    <view class="btn-view">
+      <button class="btn" @click="takeParamsGoBack(0)">保存</button>
+      <button
+        class="btn"
+        @click="takeParamsGoBack(1)"
+        style="margin-left: 10rpx"
+      >
+        添加
+      </button>
+    </view>
+  </div>
+</template>
+
+  <script>
+import multipleSelect from "../../subPackages/components/momo-multipleSelect/momo-multipleSelect";
+
+import {
+  getByCodes,
+  addInterview,
+  getBySaveStatus,
+  editInterview,
+  getCompanyAll,
+} from "@/js_sdk/http.js";
+import vanRow from "../../../wxcomponents/weapp/dist/row";
+import vanCol from "../../../wxcomponents/weapp/dist/col";
+
+// import { findYuanQuList } from "@/js_sdk/http.js";
+const form = {
+  id: null,
+  isStatus: null,
+  interviewTime: null,
+  interviewType: null,
+  interviewTypeIndex: null,
+  companyId: null,
+  companyIndex: null,
+  projectType: "",
+  interviewRecord: "",
+  associationCompanyString: [],
+};
+export default {
+  components: {
+    vanRow,
+    vanCol,
+    multipleSelect,
+  },
+  data() {
+    return {
+      companyName: "",
+      value: 0,
+      isSelectedIndex: null,
+      isStatus: 2,
+      range: [
+        { value: 2, text: "是" },
+        { value: 1, text: "否" },
+      ],
+      defaultSelected: [],
+      dic_key: ["interviewType"],
+      dic_SelectList: {},
+      companyIndex: null,
+      companyAllList: [],
+      show: false,
+      active: 0,
+      form: { ...form },
+      index: 0,
+    };
+  },
+  computed: {
+    filtedCompanyAllList() {
+      let companyAllList;
+      if (this.companyName) {
+        companyAllList = this.companyAllList.filter((e) =>
+          e.label.includes(this.companyName)
+        );
+      } else {
+        companyAllList = this.companyAllList;
+      }
+      return companyAllList;
+    },
+  },
+  mounted() {
+    this.getCompanyAll();
+    this.getByCodes();
+  },
+  methods: {
+    getRowValue(e) {
+      this.isSelectedIndex = e.detail.value[0];
+    },
+    getSelectValue() {
+      if (this.isSelectedIndex == null) {
+        this.form.companyIndex = 0;
+        this.form.companyId = this.companyAllList[0].value;
+      } else {
+        this.form.companyIndex = this.isSelectedIndex;
+        this.form.companyId = this.companyAllList[this.form.companyIndex].value;
+      }
+      this.$forceUpdate();
+      this.show = false;
+    },
+    changeLog(e) {},
+    async getBySaveStatus() {
+      const token = uni.getStorageSync("laocui_user_info");
+      let data = await getBySaveStatus(JSON.parse(token).user.id);
+      this.form.id = data.id ? data.id : null;
+      this.form.isStatus = Number(data.isStatus);
+      this.form.interviewTime = data.interviewTime ? data.interviewTime : "";
+      this.form.interviewRecord = data.interviewRecord
+        ? data.interviewRecord
+        : "";
+      if (
+        data.id &&
+        data.interviewType != null &&
+        data.interviewType != "null"
+      ) {
+        this.getInterviewLableByApiList(data);
+      }
+      if (data.id && data.companyId != null) {
+        this.getCompanyIdByApiList(data);
+      }
+    },
+    getCompanyIdByApiList(params) {
+      this.form.companyId = params.companyId;
+
+      let companyIndex = this.companyAllList.findIndex(
+        (e) => e.value == params.companyId
+      );
+      this.form.companyIndex = companyIndex;
+    },
+    getInterviewLableByApiList(params) {
+      let interviewTypeIndex = this.dic_SelectList.interviewType.findIndex(
+        (e) => e.value == params.interviewType
+      );
+      this.form.interviewType =
+        this.dic_SelectList.interviewType[interviewTypeIndex].value;
+      this.form.interviewTypeIndex = interviewTypeIndex;
+    },
+    getInterviewTime(e) {
+      this.form.interviewTime = e.detail.value;
+    },
+    async takeParamsGoBack(e) {
+      const token = uni.getStorageSync("laocui_user_info");
+      let data;
+      if (e == 1) {
+        if (this.form.companyId == null) {
+          return this.$showToast("请选择走访公司");
+        }
+        if (this.form.interviewTime == null || this.form.interviewTime == "") {
+          return this.$showToast("请选择走访时间");
+        }
+        if (this.form.interviewType == null) {
+          return this.$showToast("请选择走访类型");
+        }
+        if (this.form.isStatus == null) {
+          return this.$showToast("请选择是否需要处理");
+        }
+      }
+
+      if (e == 0) {
+        data = await editInterview({
+          ...this.form,
+          status: e,
+          createdBy: JSON.parse(token).user.id,
+          InterviewUserId: JSON.parse(token).user.id,
+        });
+      } else {
+        data = await addInterview({
+          ...this.form,
+          status: e,
+          createdBy: JSON.parse(token).user.id,
+          InterviewUserId: JSON.parse(token).user.id,
+        });
+      }
+
+      if (data.code == 200) {
+        if (e == 1) {
+          this.$emit("changeActive");
+          this.$showToast("提交成功");
+          this.form = { ...form };
+        }
+        if (e == 0) {
+          this.$showToast("保存成功");
+        }
+      }
+    },
+    getCompany(e) {
+      this.form.companyIndex = e.detail.value;
+      this.form.companyId = this.companyAllList[e.detail.value].value;
+    },
+    chosseAboutCompany() {
+      this.show = true;
+      // this.$refs.popup.open('top')
+    },
+    async getCompanyAll() {
+      let companyAllList = await getCompanyAll();
+      this.companyAllList = companyAllList.map((e) => {
+        return {
+          label: e.qymc,
+          value: e.id,
+        };
+      });
+      this.getBySaveStatus();
+    },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dic_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      this.dic_SelectList.interviewType[0].id;
+    },
+    confirm(e) {
+      let associationCompanyString = [];
+      let associationCompany = [];
+      for (var p in e) {
+        associationCompanyString.push(e[p].label);
+        associationCompany.push(e[p].value);
+      }
+      this.form.associationCompanyString = associationCompanyString.join(",");
+      this.form.associationCompany = associationCompany.join(",");
+    },
+    bindPickerChange(e) {
+      this.form.interviewTypeIndex = e.detail.value;
+      this.form.interviewType =
+        this.dic_SelectList.interviewType[e.detail.value].value;
+    },
+  },
+  // onLoad: function (){
+  // 	this.$refs.findYuanQuList()
+  // },
+};
+</script>
+
+  <style lang="scss">
+.btn-view {
+  width: 100%;
+  height: 100rpx;
+  padding: 20rpx 10%;
+  background-color: #ffffff;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+}
+.btn {
+  width: 40%;
+  height: 90rpx;
+  border-radius: 8rpx 8rpx 8rpx 8rpx;
+  background: #1d18bc;
+  line-height: 90rpx;
+  color: white;
+  float: left;
+}
+.gaisideshurukuang {
+  font-size: 26rpx !important;
+  .is-input-border {
+    border-top: none !important;
+    border-left: none !important;
+    border-right: none !important;
+    border: none;
+    border-radius: 0 !important;
+  }
+  .uni-forms-item {
+    border-bottom: 2rpx solid #cccccc !important;
+    margin-top: 42rpx !important;
+    padding-bottom: 42rpx !important;
+  }
+  .uni-forms-item__content {
+    border-bottom: 2rpx solid #cccccc !important;
+  }
+}
+.goreport {
+  .textarea_info {
+    textarea {
+      background: #f9f9f9;
+    }
+  }
+  .form {
+    width: calc(100% - 128rpx);
+    margin: 32rpx;
+    background: #ffffff;
+    padding: 32rpx;
+
+    .label {
+      height: 53rpx;
+      line-height: 53rpx;
+    }
+    .is-input-border {
+      border-top: none !important;
+      border-left: none !important;
+      border-right: none !important;
+      border-radius: 0 !important;
+    }
+    .uni-forms-item {
+      border-bottom: 2rpx solid #cccccc !important;
+      margin-top: 42rpx !important;
+      padding-bottom: 42rpx !important;
+    }
+  }
+}
+</style>

pages/index/components/handlereport.vue

@@ -0,0 +1,162 @@
+<template>
+  <van-popup :show="show" @close="onClose" round closeable>
+    <div class="height554rpx width622rpx allpd32rpx" style="margin-top: 70rpx">
+      <div class="width100 height35px marginb16 mt32rpx">
+        <div class="handlefont width20 float_left height35px l35pxheight">
+          处理人:
+        </div>
+        <div class="width80 float_left">
+          <uni-easyinput
+            :inputBorder="true"
+            v-model="form.handleUserName"
+            placeholder="请输入"
+          ></uni-easyinput>
+        </div>
+      </div>
+      <div class="width100 mb32rpx">
+        <div class="handlefont width100 mb32rpx">处理说明</div>
+        <div class="width100">
+          <uni-easyinput
+            v-model="form.handleResult"
+            autoHeight
+            type="textarea"
+            placeholder="请输入"
+          ></uni-easyinput>
+        </div>
+      </div>
+      <div class="width100">
+        <div class="button_row cancel_btn" @click="onClose()">取消</div>
+        <div class="button_row ok_btn" @click="dialogInputConfirm()">确认</div>
+      </div>
+    </div>
+  </van-popup>
+</template>
+
+<script>
+import vanPopup from "../../../wxcomponents/weapp/dist/popup/index";
+import vanField from "../../../wxcomponents/weapp/dist/field/index";
+import { editInterview } from "@/js_sdk/http.js";
+export default {
+  name: "handlereport",
+  data() {
+    return {
+      show: false,
+      form: {
+        name: "",
+        message: "",
+      },
+    };
+  },
+  components: {
+    vanPopup,
+    vanField,
+  },
+  methods: {
+    openDianlog(item) {
+      this.form = { ...item };
+      this.show = true;
+    },
+    onClose() {
+      this.show = false;
+    },
+    getNowDate() {
+      var date = new Date();
+      var sign2 = ":";
+      var year = date.getFullYear(); // 年
+      var month = date.getMonth() + 1; // 月
+      var day = date.getDate(); // 日
+      var hour = date.getHours(); // 时
+      var minutes = date.getMinutes(); // 分
+      var seconds = date.getSeconds(); //秒
+      var weekArr = [
+        "星期一",
+        "星期二",
+        "星期三",
+        "星期四",
+        "星期五",
+        "星期六",
+        "星期天",
+      ];
+      var week = weekArr[date.getDay()];
+      // 给一位数的数据前面加 “0”
+      if (month >= 1 && month <= 9) {
+        month = "0" + month;
+      }
+      if (day >= 0 && day <= 9) {
+        day = "0" + day;
+      }
+      if (hour >= 0 && hour <= 9) {
+        hour = "0" + hour;
+      }
+      if (minutes >= 0 && minutes <= 9) {
+        minutes = "0" + minutes;
+      }
+      if (seconds >= 0 && seconds <= 9) {
+        seconds = "0" + seconds;
+      }
+      return (
+        year +
+        "-" +
+        month +
+        "-" +
+        day +
+        " " +
+        hour +
+        sign2 +
+        minutes +
+        sign2 +
+        seconds
+      );
+    },
+    async dialogInputConfirm() {
+      if (!this.form.handleUserName || this.form.handleUserName.length == 0) {
+        this.$showToast("请填写处理人名称");
+        return;
+      }
+      if (!this.form.handleResult || this.form.handleResult.length == 0) {
+        this.$showToast("请填写处理说明");
+        return;
+      }
+      this.form.handleTime = this.getNowDate();
+      let data = await editInterview({ ...this.form });
+      if (data.code == 200) {
+        this.$showToast("登记完成");
+
+        this.show = false;
+        this.$emit("changeActive");
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.handlefont {
+  font-size: 28rpx;
+  font-family: Segoe UI-Regular, Segoe UI;
+  font-weight: 400;
+  color: #777777;
+}
+.button_row {
+  color: #ffffff;
+  background: #1d18bc;
+  width: 140rpx;
+  height: 50rpx;
+  border-radius: 8rpx 8rpx 8rpx 8rpx;
+  opacity: 1;
+  text-align: center;
+  line-height: 50rpx;
+  font-size: 24rpx;
+  border: 2rpx solid #1d18bc;
+}
+.cancel_btn {
+  position: absolute;
+  top: 545rpx;
+  left: 20rpx;
+}
+.ok_btn {
+  position: absolute;
+  right: 20rpx;
+  top: 545rpx;
+}
+</style>

pages/index/components/reportDetails.vue

@@ -0,0 +1,427 @@
+<template>
+  <div class="goreport">
+    <div class="form gaisideshurukuang">
+      <uni-forms
+        ref="baseForm"
+        style="font-size: 26rpx"
+        :modelValue="form"
+        label-width="170rpx"
+      >
+        <uni-forms-item
+          label="走访公司"
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div
+            @click="chosseAboutCompany()"
+            style="height: 73rpx; line-height: 73rpx"
+          >
+            <picker
+              style="float: left; width: 440rpx; height: 40rpx; color: #777"
+              @change="getCompany"
+              range-key="label"
+              :range="companyAllList"
+            >
+              {{
+                !form.companyId
+                  ? "请选择走访公司"
+                  : companyAllList[form.companyIndex].label
+              }}
+            </picker>
+          </div>
+        </uni-forms-item>
+        <uni-forms-item
+          label="走访时间："
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div style="height: 73rpx; line-height: 73rpx">
+            <picker
+              style="float: left; width: 100%; height: 40rpx; color: #777"
+              mode="date"
+              :value="form.interviewTime"
+              @change="getInterviewTime"
+            >
+              {{ !form.interviewTime ? "请选择走访时间" : form.interviewTime }}
+            </picker>
+          </div>
+        </uni-forms-item>
+
+        <uni-forms-item
+          label="走访类型："
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div style="height: 73rpx; line-height: 73rpx">
+            <picker
+              style="float: left; width: 100%; height: 40rpx; color: #777"
+              :range="dic_SelectList.interviewType"
+              :value="0"
+              @change="bindPickerChange"
+              range-key="label"
+            >
+              {{
+                !form.interviewType
+                  ? "请选择"
+                  : dic_SelectList.interviewType[form.interviewTypeIndex].label
+              }}
+            </picker>
+          </div>
+        </uni-forms-item>
+        <uni-forms-item
+          label="是否需要处理"
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div style="height: 73rpx; line-height: 73rpx; width: 100%">
+            <span style="color: #777" v-if="form.isStatus == 2">是</span>
+            <span style="color: #777" v-if="form.isStatus == 1">否</span>
+          </div>
+        </uni-forms-item>
+      </uni-forms>
+    </div>
+
+    <div class="form zoufangjilu" style="margin-bottom: 146rpx">
+      <van-row>
+        <van-col :span="24"> 走访记录 </van-col>
+        <van-col :span="24">
+          <div class="margint16rpx">
+            <uni-easyinput
+              type="textarea"
+              inputBorder
+              class="textarea_info"
+              style="margin-top: 16rpx"
+              v-model="form.interviewRecord"
+              placeholder="请输入"
+            />
+          </div>
+        </van-col>
+      </van-row>
+      <uni-forms
+        v-if="form.isStatus != 1"
+        ref="baseForm"
+        style="font-size: 26rpx"
+        :modelValue="form"
+        label-width="170rpx"
+      >
+        <uni-forms-item
+          label="处理人"
+          class="mt42rpx mb42rpx border_bottom_ccc"
+        >
+          <div style="height: 73rpx; line-height: 73rpx; width: 100%">
+            <input
+              v-model="form.handleUserName"
+              style="
+                height: 73rpx;
+                line-height: 73rpx;
+                width: 100%;
+                color: #777;
+              "
+            />
+            <!-- <span style="color: #777">{{ form.handleUserName }}</span> -->
+          </div>
+        </uni-forms-item>
+        <div style="margin-top: 16rpx">
+          <van-row>
+            <van-col :span="24" style="margin-top: 15rpx"> 处理结果 </van-col>
+            <van-col :span="24">
+              <div class="margint16rpx">
+                <uni-easyinput
+                  type="textarea"
+                  inputBorder
+                  class="textarea_info"
+                  style="margin-top: 16rpx"
+                  v-model="form.handleResult"
+                  placeholder="请输入"
+                />
+              </div>
+            </van-col>
+          </van-row>
+        </div>
+
+        <uni-forms-item
+          label="处理时间"
+          class="mt42rpx pd42rpx border_bottom_ccc"
+        >
+          <div style="height: 73rpx; line-height: 73rpx; width: 100%">
+            <span style="color: #777">{{ form.handleTime }}</span>
+          </div>
+        </uni-forms-item>
+      </uni-forms>
+    </div>
+    <!-- <multiple-select
+        v-model="show"
+        model="false"
+        :all-show="false"
+        :data="companyAllList"
+        :default-selected="defaultSelected"
+        @confirm="confirm"
+      ></multiple-select> -->
+    <view class="btn-view">
+      <button
+        class="btn"
+        @click="dialogInputConfirm()"
+        style="margin-left: 10rpx"
+      >
+        编辑完成
+      </button>
+    </view>
+  </div>
+</template>
+    
+    <script>
+import multipleSelect from "../../../subPackages/components/momo-multipleSelect/momo-multipleSelect";
+
+import {
+  getByCodes,
+  addInterview,
+  getBySaveStatus,
+  editInterview,
+  getCompanyAll,
+  getInterviewDetails,
+} from "@/js_sdk/http.js";
+import vanRow from "../../../wxcomponents/weapp/dist/row";
+import vanCol from "../../../wxcomponents/weapp/dist/col";
+
+// import { findYuanQuList } from "@/js_sdk/http.js";
+const form = {
+  id: null,
+  isStatus: null,
+  interviewTime: null,
+  interviewType: null,
+  interviewTypeIndex: null,
+  companyId: null,
+  companyIndex: null,
+  projectType: "",
+  interviewRecord: "",
+  associationCompanyString: [],
+};
+export default {
+  components: {
+    vanRow,
+    vanCol,
+    multipleSelect,
+  },
+  data() {
+    return {
+      id: "",
+      isStatus: 2,
+      range: [
+        { value: 2, text: "是" },
+        { value: 1, text: "否" },
+      ],
+      defaultSelected: [],
+      dic_key: ["interviewType"],
+      dic_SelectList: {},
+      companyIndex: null,
+      companyAllList: [],
+      defaultSelected: [],
+      show: false,
+      active: 0,
+      form: { ...form },
+      index: 0,
+    };
+  },
+  onLoad: function (option) {
+    this.getCompanyAll();
+    this.id = option.id; //打印出上个页面传递的参数。\
+    this.getByCodes();
+  },
+  methods: {
+    async dialogInputConfirm() {
+      let data = await editInterview({ ...this.form });
+      if (data.code == 200) {
+        this.$showToast("修改成功");
+        uni.navigateBack({});
+      }
+    },
+    async getInterviewDetails() {
+      let detail = await getInterviewDetails(this.id);
+      this.form = detail;
+      this.getCompanyIdByApiList({ companyId: detail.companyId });
+      this.getInterviewLableByApiList({
+        interviewType: this.form.interviewType,
+      });
+      this.form.isStatus = detail.isStatus;
+    },
+
+    getCompanyIdByApiList(params) {
+      this.form.companyId = params.companyId;
+
+      let companyIndex = this.companyAllList.findIndex(
+        (e) => e.value == params.companyId
+      );
+      this.form.companyIndex = companyIndex;
+    },
+    getInterviewLableByApiList(params) {
+      let interviewTypeIndex = this.dic_SelectList.interviewType.findIndex(
+        (e) => e.value == params.interviewType
+      );
+      this.form.interviewType =
+        this.dic_SelectList.interviewType[interviewTypeIndex].value;
+      this.form.interviewTypeIndex = interviewTypeIndex;
+    },
+    getInterviewTime(e) {
+      this.form.interviewTime = e.detail.value;
+    },
+    async takeParamsGoBack(e) {
+      const token = uni.getStorageSync("laocui_user_info");
+      let data;
+      if (this.form.id) {
+        data = await editInterview({
+          ...this.form,
+          status: e,
+          createdBy: JSON.parse(token).user.id,
+        });
+      } else {
+        if (this.form.companyId == null) {
+          return this.$showToast("请选择走访公司");
+        }
+        if (this.form.interviewTime == null || this.form.interviewTime == "") {
+          return this.$showToast("请选择走访时间");
+        }
+        if (this.form.interviewType == null) {
+          return this.$showToast("请选择走访类型");
+        }
+        if (this.form.isStatus == null) {
+          return this.$showToast("请选择是否需要处理");
+        }
+        data = await addInterview({
+          ...this.form,
+          status: e,
+          createdBy: JSON.parse(token).user.id,
+        });
+      }
+
+      if (data.code == 200) {
+        if (e == 1) {
+          this.$emit("changeActive");
+          this.$showToast("提交成功");
+          this.form = { ...form };
+        }
+        if (e == 0) {
+          this.$showToast("保存成功");
+        }
+      }
+    },
+    getCompany(e) {
+      this.form.companyIndex = e.detail.value;
+      this.form.companyId = this.companyAllList[e.detail.value].value;
+    },
+    chosseAboutCompany() {
+      this.show = true;
+    },
+    async getCompanyAll() {
+      let companyAllList = await getCompanyAll();
+      this.getInterviewDetails();
+      this.companyAllList = companyAllList.map((e) => {
+        return {
+          label: e.qymc,
+          value: e.id,
+        };
+      });
+    },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dic_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+    },
+    confirm(e) {
+      let associationCompanyString = [];
+      let associationCompany = [];
+      for (var p in e) {
+        associationCompanyString.push(e[p].label);
+        associationCompany.push(e[p].value);
+      }
+      this.form.associationCompanyString = associationCompanyString.join(",");
+      this.form.associationCompany = associationCompany.join(",");
+    },
+    bindPickerChange(e) {
+      this.form.interviewTypeIndex = e.detail.value;
+      this.form.interviewType =
+        this.dic_SelectList.interviewType[e.detail.value].value;
+    },
+  },
+  // onLoad: function (){
+  // 	this.$refs.findYuanQuList()
+  // },
+};
+</script>
+    
+    <style lang="scss">
+.gaisideshurukuang {
+  .btn-view {
+    width: 100%;
+    height: 100rpx;
+    padding: 20rpx 10%;
+    background-color: #ffffff;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+  .btn {
+    width: 80%;
+    height: 90rpx;
+    border-radius: 50rpx 50rpx 50rpx 50rpx;
+    background: #1d18bc;
+    line-height: 90rpx;
+    color: white;
+  }
+  font-size: 26rpx !important;
+  .is-input-border {
+    border-top: none !important;
+    border-left: none !important;
+    border-right: none !important;
+    border: none;
+    border-radius: 0 !important;
+  }
+  .uni-forms-item {
+    margin-bottom: 0px;
+    border-bottom: 2rpx solid #cccccc !important;
+  }
+}
+.btn-view {
+  width: 100%;
+  height: 100rpx;
+  padding: 20rpx 10%;
+  background-color: #ffffff;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+}
+.btn {
+  width: 80%;
+  height: 90rpx;
+  border-radius: 50rpx 50rpx 50rpx 50rpx;
+  background: #1d18bc;
+  line-height: 90rpx;
+  color: white;
+}
+.goreport {
+  .uni-forms-item {
+    margin-bottom: 0px;
+    border-bottom: 2rpx solid #cccccc !important;
+  }
+  .textarea_info {
+    textarea {
+      background: #f9f9f9;
+    }
+  }
+  .is-disabled {
+    background: white !important;
+    color: #777;
+  }
+  .form {
+    width: calc(100% - 128rpx);
+    margin: 32rpx;
+    background: #ffffff;
+    padding: 32rpx;
+
+    .label {
+      height: 53rpx;
+      line-height: 53rpx;
+    }
+    .is-input-border {
+    }
+    .uni-forms-item {
+      border-bottom: 2rpx solid #cccccc !important;
+    }
+  }
+}
+</style>
+    

pages/index/components/reportHistory.vue

@@ -0,0 +1,275 @@
+<template>
+  <div class="reportHistory">
+    <div class="list">
+      <div
+        class="list-row"
+        v-for="(item, index) in pageList"
+        :key="index"
+        @click="jumpDetailsPage(item, item.id)"
+      >
+        <div class="cell_1 width100">
+          <div class="width100 height44rpx mb8rpx">
+            <div class="report_title" @click="jumpDetailsPage(item, item.id)">
+              走访类型：
+
+              {{ getDicType(item.interviewType) }}
+            </div>
+          </div>
+          <div class="width100 height40rpx mb8rpx border_bottom_f5f5f5">
+            <div class="second_title height40rpx">
+              是否需要处理：
+              {{ item.isStatus == "1" ? "否" : "是" }}
+            </div>
+          </div>
+          <div
+            class="width60 float_left list_date height40rpx lh40rpx margint8rpx"
+          >
+            {{ item.interviewTime }}
+          </div>
+          <div
+            class="width40 float_left margint8rpx"
+            v-if="
+              !(
+                (item.handleUserName || item.handleUserName == 'null') &&
+                (item.handleResult || item.handleResult == 'null')
+              )
+            "
+          >
+            <van-button
+              color="#1D18BC"
+              class="colorfffff height40rpx float_right"
+              size="mini"
+              v-if="item.isStatus == 2"
+              @click="openHandleReportDialog(item)"
+            >
+              处理登记
+            </van-button>
+          </div>
+        </div>
+      </div>
+      <div class="list-row" v-if="pageList.length == 0">
+        <van-empty
+          class="disblock marginauto"
+          style="background: white"
+          description="暂无数据"
+        />
+      </div>
+      <handle-report ref="handleReport" @changeActive="getInterviewList()" />
+    </div>
+  </div>
+</template>
+
+<script>
+import vanTab from "../../../wxcomponents/weapp/dist/tab/index";
+import vanTabs from "../../../wxcomponents/weapp/dist/tabs/index";
+import vanButton from "../../../wxcomponents/weapp/dist/button/index";
+import vanEmpty from "../../../wxcomponents/weapp/dist/empty/index";
+import vanDivider from "../../../wxcomponents/weapp/dist/divider/index";
+import handleReport from "./handlereport.vue";
+import { getInterviewList, getByCodes } from "@/js_sdk/http.js";
+const form = {
+  status: [],
+  chaoxiang: [],
+  statusArray: [],
+  chaoxiangArray: [],
+  zaitiTypeArray: [],
+  roomSize1: "",
+  roomSize2: "",
+  guidePrice1: "",
+  guidePrice2: "",
+  loupan_value: null,
+  groupIds: null,
+  pageNum: 1,
+  dic_key: ["interviewType"],
+  dic_SelectList: {},
+  pageSize: 10,
+  total: 0,
+  mnpBuildingIds: "",
+};
+
+export default {
+  components: {
+    vanTab,
+    vanTabs,
+    vanEmpty,
+    vanDivider,
+    vanButton,
+    handleReport,
+  },
+  name: "reportHistoryr.vue",
+  data() {
+    return {
+      dic_key: ["interviewType"],
+      dic_SelectList: {},
+      pageList: [],
+      search: {
+        pageSize: 10,
+        pageNum: 1,
+      },
+    };
+  },
+  mounted() {
+    this.getInterviewList();
+    this.getByCodes();
+
+    // this.findYuanQuList()
+    // this.getByCodes()
+  },
+  onLoad() {
+    this.getInterviewList();
+  },
+  methods: {
+    jumpDetailsPage(item, id) {
+      if (item.isStatus == 2 && !item.handleUserName && !item.handleResult) {
+        return;
+      }
+      uni.navigateTo({
+        url:
+          "/pages/subPackages/companyreport/components/reportDetails?id=" + id,
+      });
+    },
+    changeActive() {
+      this.$emit("changeActive");
+      const token = uni.getStorageSync("laocui_user_info");
+      this.search.createdBy = JSON.parse(token).user.id;
+      this.getInterviewList();
+      this.getByCodes();
+    },
+    async getByCodes() {
+      let data = await getByCodes(JSON.stringify(this.dic_key));
+      this.dic_SelectList = this.$common.handleDicList(data);
+      this.dic_SelectList.interviewType[0].id;
+    },
+    getDicType(value) {
+      if (!value) return;
+
+      let interviewType = this.dic_SelectList.interviewType;
+      console.log(interviewType);
+      let index = interviewType.findIndex((e) => e.value == value);
+      if (index != -1) return interviewType[index].label;
+    },
+    async getMoreListData() {
+      let that = this;
+
+      that.search.pageNum = that.search.pageNum + 1;
+      let list = await getInterviewList(that.search);
+
+      if (list.rows == 0) {
+        that.$showToast("没有更多数据了");
+      } else {
+        list.rows.forEach((e) => {
+          that.pageList.push(e);
+        });
+      }
+    },
+
+    async getInterviewList() {
+      const token = uni.getStorageSync("laocui_user_info");
+      this.search.createdBy = JSON.parse(token).user.id;
+      this.search.pageNum = 1;
+      this.search.pageSize = 10;
+      this.search.total = 0;
+      let data = await getInterviewList(this.search);
+      this.pageList = data.rows;
+    },
+    openHandleReportDialog(item) {
+      this.$refs.handleReport.openDianlog(item);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+/deep/.van-cell {
+  padding: 0 0 0 28rpx !important;
+}
+.inputClass {
+  padding: 0 0 0 28rpx !important;
+}
+.reportHistory {
+  .search_btn {
+    margin-left: 18rpx;
+    width: calc(100% - 18rpx);
+    height: 60rpx;
+  }
+  .reset_btn {
+    color: #2628a9 !important;
+    width: 100%;
+    height: 60rpx;
+  }
+  .list-row {
+    width: calc(100% - 64rpx);
+    padding: 32rpx;
+    background: #ffffff;
+    margin-bottom: 16rpx;
+    display: flex;
+    //height: 278rpx;
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+  }
+  .second_title {
+    float: left;
+    width: 50%;
+
+    font-size: 28rpx;
+    font-family: PingFang SC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #777777;
+  }
+
+  .list {
+    width: calc(100% - 64rpx);
+
+    margin: 32rpx;
+  }
+
+  .form {
+    width: calc(100% - 128rpx);
+    margin: 32rpx;
+    background: #ffffff;
+    padding: 32rpx;
+
+    .label {
+      height: 53rpx;
+      line-height: 53rpx;
+    }
+  }
+
+  .checklist-box {
+    margin: 0 !important;
+    margin-right: 16rpx !important;
+  }
+
+  .labelcolmt26 {
+    input {
+      border-radius: 8rpx 8rpx 8rpx 8rpx;
+      border: 2rpx solid #cccccc;
+      text-align: center;
+    }
+    .van-col {
+      margin-top: 26rpx !important;
+    }
+
+    label {
+      color: #333333;
+      font-size: 30rpx;
+      margin-top: 10rpx !important;
+    }
+
+    .uni-data-checklist {
+      margin-top: -10rpx !important;
+    }
+  }
+
+  .status {
+    .uni-data-checklist {
+      margin-top: 0rpx !important;
+    }
+
+    label {
+      color: #333333;
+      font-size: 30rpx;
+      padding-right: 0rpx !important;
+    }
+  }
+}
+</style>

pages/index/index.vue

@@ -1,183 +1,159 @@
 <template>
-  <view>
-    <image src="../../static/index/banner.png" class="banner"></image>
-    <div class="map">
-      <div
-        class="mapdom"
-        style="float: left"
-        v-for="(item, index) in mapList"
-        :key="index"
-        @click="jumpPage(item.path)"
-      >
-        <img class="mapIcon" :src="item.url" />
-        <div class="maptxt">{{ item.label }}</div>
-      </div>
-    </div>
-  </view>
+  <div>
+    <van-tabs
+      class="companyreport"
+      :active="active"
+      @change="onChange"
+      title-active-color="#1D18BC"
+    >
+      <van-tab title="走访上报" class="housemange">
+        <go-report ref="goReport" @changeActive="changeActive" />
+      </van-tab>
+      <van-tab title="上报历史">
+        <report-history ref="reportHistory" />
+      </van-tab>
+    </van-tabs>
+  </div>
 </template>
-<script>
-// import {demo} from "@/js_sdk/http"
-import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
+  
+  <script>
+import goReport from "./components/goReport.vue";
+import reportHistory from "./components/reportHistory.vue";
+import { findYuanQuList } from "@/js_sdk/http.js";
+const form = {
+  status: [],
+  chaoxiang: [],
+};
 export default {
+  components: {
+    goReport,
+    reportHistory,
+  },
   data() {
     return {
-      mapList: [
-        // {
-        //   label: "经发填报",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/1@2x.png",
-        //   path: "/pages/subPackages/companyHouse/companyHouse",
-        // },
-        {
-          label: "企业库",
-          url: "https://pgy.idea-sf.com/fileService/static/slices/2@2x.png",
-          path: "/pages/subPackages/companyHouse/companyHouse",
-        },
-        {
-          label: "走访上报",
-          url: "https://pgy.idea-sf.com/fileService/static/slices/3@2x.png",
-          path: "/pages/subPackages/companyreport/companyreport",
-        },
-        // {
-        //   label: "上市跟进",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/4@2x.png",
-        // },
-
-        {
-          label: "招商管理",
-          url: "https://pgy.idea-sf.com/fileService/static/slices/5@2x.png",
-          path: "/pages/subPackages/merchants/merchants",
-        },
-        // {
-        //   label: "我的待办",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/7@2x.png",
-        //   path: "/pages/subPackages/todo/index",
-        // },
-        {
-          label: "我的待阅",
-          url: "https://pgy.idea-sf.com/fileService/static/slices/6@2x.png",
-          path: "/pages/subPackages/toread/index",
-        },
-        // {
-        //   label: "会议室审核",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/12@2x.png",
-        //   path: "/pages/subPackages/meetingroom/meetingroom",
-        // },
-
-        // {
-        //   label: "安全自检管理",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/8@2x.png",
-        //   path: "/pages/subPackages/secureselftest/index",
-        // },
-        // {
-        //   label: "安全自检计划",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/9@2x.png",
-        //   path: "/pages/subPackages/secureselfplan/index",
-        // },
-
-        // {
-        //   label: "报修派单",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/11@2x.png",
-        //   path: "/pages/subPackages/repairDispatch-app/index",
-        // },
-        // {
-        //   label: "报修处理",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/10@2x.png",
-        //   path: "/pages/subPackages/repairprocessing-app/index",
-        // },
-
-        // {
-        //   label: "整改填报",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/15@2x.png",
-        //   path: "/pages/subPackages/modifyReport/index",
-        // },
-        // {
-        //   label: "整改派单",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/14@2x.png",
-        //   path: "/pages/subPackages/modifySend/index",
-        // },
-        // {
-        //   label: "整改处理",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/13@2x.png",
-        //   path: "/pages/subPackages/modifyHandle/index",
-        // },
-        // {
-        //   label: "活动核销",
-        //   url: "https://pgy.idea-sf.com/fileService/static/slices/1@2x.png",
-        //   path: "/pages/subPackages/activity/index",
-        // },
-      ],
+      active: 0,
     };
   },
-  onShareAppMessage() {},
-  mounted() {
-    // demo();
-  },
-  onLoad() {
-    this.getUserPower();
+  // onLoad: function (){
+  // 	this.$refs.findYuanQuList()
+  // },
+  onShow() {
+    this.$refs.reportHistory.getInterviewList();
   },
   methods: {
-    // getUserLocalStorageInfo
-    async getUserPower() {
-      if (getUserLocalStorageInfo().user.id == 1) return;
-      let that = this;
-      let newList = [];
-      let { data } = await getUserPower(getUserLocalStorageInfo().user.id);
-      for (let i = 0; i < that.mapList.length; i++) {
-        let index = data.findIndex((e) => e == that.mapList[i].label);
-        if (index != -1) {
-          newList.push(that.mapList[i]);
-        }
-      }
-      that.mapList = newList;
+    onLoadMore() {},
+    getChaoxiang() {},
+    getStatus() {},
+    changeActive() {
+      this.active = 1;
+      this.$refs.reportHistory.getInterviewList();
     },
-    jumpPage(path) {
-      uni.navigateTo({
-        url: path,
-        fail: (fail) => {},
-      });
+    onChange(e) {
+      this.active = e.detail.name;
     },
   },
+  onPullDownRefresh: function () {
+    // 加载数据
+  },
+
+  onReachBottom() {
+    if (this.active == 1) {
+      this.$refs.reportHistory.getMoreList();
+    }
+    console.log("滑动到距离底部100px的时候触发,可以放 。。业务逻辑");
+  }, //下拉执行的时候触发 （下拉刷新）
 };
 </script>
-
-<style lang="scss">
-page {
-  background: white;
+  
+  <style lang="scss">
+.gaisideshurukuang {
+  .uni-forms-item__label {
+    font-size: 26rpx !important;
+  }
 }
-.banner {
-  width: 100%;
-  height: 450rpx;
-  position: absolute;
-  z-index: 1;
+.float_left {
+  float: left;
+}
+.chuzu_label {
+  width: 312rpx;
+  height: 36rpx;
+  font-size: 26rpx;
+  font-family: PingFang SC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  line-height: 36rpx;
 }
-.mapdom {
-  width: 25%;
-  height: 184rpx;
+.chuzu_vlaue {
+  width: 86rpx;
+  font-size: 32rpx;
+  font-family: PingFang SC-Bold, PingFang SC;
+  font-weight: bold;
+  color: #ec7359;
+  line-height: 38rpx;
 }
-.maptxt {
-  width: 100%;
+.mb14rpx {
+  margin-bottom: 14rpx;
+}
+.height34rpx {
   height: 34rpx;
+}
+.height50rpx {
+  height: 50rpx;
+}
+.roomstatus {
+  height: 50rpx;
+  line-height: 50rpx;
   font-size: 24rpx;
+  padding: 0rpx 16rpx;
+  float: left;
+  border-radius: 8rpx 8rpx 8rpx 8rpx;
   font-family: PingFang SC-Medium, PingFang SC;
   font-weight: 500;
-  color: #333333;
-  text-align: center;
-}
-.mapIcon {
-  width: 160rpx;
-  height: 160rpx;
-  //background: linear-gradient(141deg, #89BCFF 0%, #2782FA 100%);
-  display: block;
-  margin: auto;
-}
-.map {
-  position: absolute;
-  z-index: 2;
-  width: calc(100% - 64rpx);
-  height: 450rpx;
-  border-radius: 48rpx 48rpx 0rpx 0rpx;
-  background: white;
-  margin-top: 402rpx;
-  padding: 48rpx 32rpx;
+  color: #1d18bc;
+  border: 2rpx solid #1d18bc;
+  margin-left: 16rpx;
+}
+.roomstatus:first-child {
+  margin-left: 0;
+}
+.height50px {
+  height: 50rpx;
+}
+.mb8rpx {
+  margin-bottom: 8rpx;
+}
+.width100 {
+  width: 100%;
+}
+.height36rpx {
+  height: 36rpx;
+}
+.height40rpx {
+  height: 40rpx;
+}
+.height66rpx {
+  height: 66rpx;
+}
+.height44rpx {
+  height: 44rpx;
+}
+
+.total {
+  padding: 8rpx 32rpx 8rpx 0;
+  text-align: right;
+  background: #ffffff;
+}
+.gaisideshurukuang {
+  .is-input-border {
+    border-top: none;
+    border-left: none;
+    border-right: none;
+    border: none;
+    border-radius: 0;
+  }
+  .uni-forms-item {
+    border-bottom: 2rpx solid #cccccc;
+  }
 }
 </style>
+  

pages/login/login.vue

@@ -124,7 +124,7 @@ export default {
           this.$auth.setUser(res.data.token);
           this.$auth.setUserInfo(res.data);
           uni.switchTab({
-            url: "/pages/index/index",
+            url: "/pages/companyreport/companyreport",
           });
         } else {
           this.captchaImageRefresh(this.loginForm);

pages/mine/mine.vue

@@ -35,6 +35,25 @@
             <div class="border"></div>
           </div>
         </div>
+        <!-- <div
+          class="labelpage_row"
+          style="margin-top: 48rpx"
+          @click="confirmActivy()"
+        >
+          <img height="44rpx" src="../../static/mine/editpassword.png" alt="" />
+          <div class="labelpage_text">
+            <div class="labelpage_name">活动核销</div>
+            <div class="labelpage_value">
+              <img
+                src="../../static/mine/youjiantou.png"
+                style="width: 44rpx; height: 44rpx"
+                alt=""
+              />
+            </div>
+            <div class="border"></div>
+          </div>
+        </div> -->
+        <!-- activity/index -->
         <div
           class="labelpage_row"
           style="margin-top: 48rpx"
@@ -85,6 +104,11 @@ export default {
         },
       });
     },
+    confirmActivy() {
+      uni.navigateTo({
+        url: "/pages/subPackages/activity/index",
+      });
+    },
     editPassWord() {
       uni.navigateTo({
         url: "/pages/subPackages/password/index",
@@ -131,7 +155,7 @@ export default {
 }
 .labelpage {
   width: calc(100% - 96rpx);
-  height: 308rpx;
+
   padding: 96rpx 48rpx;
   border-radius: 12rpx 12rpx 12rpx 12rpx;
   background: #ffffff;

pages/subPackages/companyDetails/companyDetails.vue

@@ -12,7 +12,7 @@
                   style="margin-top: -7rpx; float: right; width: 100%"
                 >
                   {{ getDicType("type", form.settleInType) }}
-<!--									{{form.settleInType}}-->
+                  <!--									{{form.settleInType}}-->
                 </div>
               </div>
             </div>
@@ -29,12 +29,14 @@
                 <span
                   v-for="(item, index) in qymcString"
                   :key="index"
-                  v-if="qymcString&&qymcString.length > 0"
+                  v-if="qymcString && qymcString.length > 0"
                 >
                   {{ item }}
                   ·
                 </span>
-                <span v-if="!qymcString||qymcString.length == 0"> 暂无标签 </span>
+                <span v-if="!qymcString || qymcString.length == 0">
+                  暂无标签
+                </span>
               </div>
               <van-icon
                 @click="jumpChosseTags()"
@@ -194,7 +196,7 @@
                 />
               </view>
               <view
-                v-if="!form.frsfzh||form.frsfzh.length == 0"
+                v-if="!form.frsfzh || form.frsfzh.length == 0"
                 class="width100 mt24rpx padb24rpx border_bottom_ccc list_date height40rpx"
               >
                 <view class="input_title float_left">法人身份证：</view>
@@ -207,7 +209,7 @@
               </view>
 
               <view
-                v-if="form.frsfzh&&form.frsfzh.length != 0"
+                v-if="form.frsfzh && form.frsfzh.length != 0"
                 class="width100 mt24rpx padb24rpx border_bottom_ccc list_date"
                 style="height: 194rpx"
               >
@@ -309,7 +311,7 @@
 
                 <div class="input_value float_left">
                   {{ getDicType("type", form.settleInType) }}
-									{{form.settleInType+"123123123"}}
+                  {{ form.settleInType + "123123123" }}
                 </div>
               </view>
 
@@ -383,7 +385,7 @@
                     padding-bottom: 10rpx;
                   "
                 >
-                  {{ form.jyfw?form.jyfw.length:0 }}/2000
+                  {{ form.jyfw ? form.jyfw.length : 0 }}/2000
                 </div>
               </view>
               <view class="width100 mt24rpx list_date height40rpx">
@@ -427,7 +429,9 @@
                     margi-bottom: 10rpx;
                   "
                 >
-                  {{ form.honorInformation?form.honorInformation.length:0 }}/2000
+                  {{
+                    form.honorInformation ? form.honorInformation.length : 0
+                  }}/2000
                 </div>
                 <view
                   class="custom-image-box"
@@ -722,7 +726,7 @@ export default {
       },
       form: {
         id: "",
-				settleInType:null,
+        settleInType: null,
       },
       // value: true,
       value1: true,
@@ -783,7 +787,6 @@ export default {
       if (index != -1) return interviewType[index].label;
     },
     getDicType(type, value) {
-
       if (type == "money" && this.dic_SelectList.CURRENCY) {
         let CURRENCY = this.dic_SelectList.CURRENCY;
         let index = CURRENCY.findIndex((e) => e.value == value);
@@ -792,34 +795,30 @@ export default {
         else return "暂无";
       }
       if (type == "type" && this.dic_SelectList.MNP_BUILDING_TYPE) {
-				console.log(type)
-				console.log(value)
-				if(value){
-					let MNP_BUILDING_TYPE = this.dic_SelectList.MNP_BUILDING_TYPE;
-					let index = MNP_BUILDING_TYPE.findIndex((e) => e.value == value);
-					console.log('indexindexindexindex',index)
-					if (index != -1) {
-						console.log(MNP_BUILDING_TYPE)
-						console.log(MNP_BUILDING_TYPE[index].label)
-						return MNP_BUILDING_TYPE[index].label;
-
-					}
-					else return "暂无"
-				}else{
-					return ""
-				}
-
+        console.log(type);
+        console.log(value);
+        if (value) {
+          let MNP_BUILDING_TYPE = this.dic_SelectList.MNP_BUILDING_TYPE;
+          let index = MNP_BUILDING_TYPE.findIndex((e) => e.value == value);
+          console.log("indexindexindexindex", index);
+          if (index != -1) {
+            console.log(MNP_BUILDING_TYPE);
+            console.log(MNP_BUILDING_TYPE[index].label);
+            return MNP_BUILDING_TYPE[index].label;
+          } else return "暂无";
+        } else {
+          return "";
+        }
       }
       if (type == "zt" && this.dic_SelectList.SETTLE_IN_STATUS) {
-				// console.log('entryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatus',value)
-				// console.log('entryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatus',this.dic_SelectList.SETTLE_IN_STATUS)
+        // console.log('entryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatus',value)
+        // console.log('entryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatusentryStatus',this.dic_SelectList.SETTLE_IN_STATUS)
 
-				let SETTLE_IN_STATUS = this.dic_SelectList.SETTLE_IN_STATUS;
+        let SETTLE_IN_STATUS = this.dic_SelectList.SETTLE_IN_STATUS;
         let index = SETTLE_IN_STATUS.findIndex((e) => e.value == value);
         if (index != -1) return SETTLE_IN_STATUS[index].label;
         else return "暂无";
       }
-
     },
     async getByCodes() {
       try {
@@ -883,10 +882,10 @@ export default {
         that.findCompanyTags(e);
         that.form = detail.data;
         that.form.qymcString = qymcString;
-        if (detail.data.ryxxzp&&detail.data.ryxxzp.length > 0) {
+        if (detail.data.ryxxzp && detail.data.ryxxzp.length > 0) {
           that.form.ryxxzp = detail.data.ryxxzp.split(",");
         }
-        if (detail.data.frsfzh&&detail.data.frsfzh.length > 0) {
+        if (detail.data.frsfzh && detail.data.frsfzh.length > 0) {
           let sfzlist = detail.data.frsfzh.split(",");
           that.form.frsfzh_fanmian = sfzlist[0];
 

pages/utils/constant.js

@@ -1,5 +1,5 @@
 // 系统常量
-export const BASE_URI = "https://iot-park.idea-sf.com/mnpserver"; // 测试
+export const BASE_URI = "http://192.168.2.109:9012"; // 测试
 // export const BASE_URI = "http://192.168.3.94:9010"; // 老潘本地
 // export const BASE_URI = "http://192.168.2.107:9011"; // 洮洮本地
 // export const BASE_URI = "http://192.168.2.103:9010"; // 老崔本地
@@ -11,4 +11,4 @@ export default {
     // 基础地址
     BASE_URI,
 
-};
+};

pages/原index/index.vue

@@ -0,0 +1,183 @@
+<template>
+  <view>
+    <image src="../../static/index/banner.png" class="banner"></image>
+    <div class="map">
+      <div
+        class="mapdom"
+        style="float: left"
+        v-for="(item, index) in mapList"
+        :key="index"
+        @click="jumpPage(item.path)"
+      >
+        <img class="mapIcon" :src="item.url" />
+        <div class="maptxt">{{ item.label }}</div>
+      </div>
+    </div>
+  </view>
+</template>
+<script>
+// import {demo} from "@/js_sdk/http"
+import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
+export default {
+  data() {
+    return {
+      mapList: [
+        // {
+        //   label: "经发填报",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/1@2x.png",
+        //   path: "/pages/subPackages/companyHouse/companyHouse",
+        // },
+        {
+          label: "企业库",
+          url: "https://pgy.idea-sf.com/fileService/static/slices/2@2x.png",
+          path: "/pages/subPackages/companyHouse/companyHouse",
+        },
+        {
+          label: "走访上报",
+          url: "https://pgy.idea-sf.com/fileService/static/slices/3@2x.png",
+          path: "/pages/subPackages/companyreport/companyreport",
+        },
+        // {
+        //   label: "上市跟进",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/4@2x.png",
+        // },
+
+        {
+          label: "招商管理",
+          url: "https://pgy.idea-sf.com/fileService/static/slices/5@2x.png",
+          path: "/pages/subPackages/merchants/merchants",
+        },
+        // {
+        //   label: "我的待办",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/7@2x.png",
+        //   path: "/pages/subPackages/todo/index",
+        // },
+        {
+          label: "我的待阅",
+          url: "https://pgy.idea-sf.com/fileService/static/slices/6@2x.png",
+          path: "/pages/subPackages/toread/index",
+        },
+        // {
+        //   label: "会议室审核",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/12@2x.png",
+        //   path: "/pages/subPackages/meetingroom/meetingroom",
+        // },
+
+        // {
+        //   label: "安全自检管理",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/8@2x.png",
+        //   path: "/pages/subPackages/secureselftest/index",
+        // },
+        // {
+        //   label: "安全自检计划",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/9@2x.png",
+        //   path: "/pages/subPackages/secureselfplan/index",
+        // },
+
+        // {
+        //   label: "报修派单",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/11@2x.png",
+        //   path: "/pages/subPackages/repairDispatch-app/index",
+        // },
+        // {
+        //   label: "报修处理",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/10@2x.png",
+        //   path: "/pages/subPackages/repairprocessing-app/index",
+        // },
+
+        // {
+        //   label: "整改填报",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/15@2x.png",
+        //   path: "/pages/subPackages/modifyReport/index",
+        // },
+        // {
+        //   label: "整改派单",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/14@2x.png",
+        //   path: "/pages/subPackages/modifySend/index",
+        // },
+        // {
+        //   label: "整改处理",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/13@2x.png",
+        //   path: "/pages/subPackages/modifyHandle/index",
+        // },
+        // {
+        //   label: "活动核销",
+        //   url: "https://pgy.idea-sf.com/fileService/static/slices/1@2x.png",
+        //   path: "/pages/subPackages/activity/index",
+        // },
+      ],
+    };
+  },
+  onShareAppMessage() {},
+  mounted() {
+    // demo();
+  },
+  onLoad() {
+    this.getUserPower();
+  },
+  methods: {
+    // getUserLocalStorageInfo
+    async getUserPower() {
+      if (getUserLocalStorageInfo().user.id == 1) return;
+      let that = this;
+      let newList = [];
+      let { data } = await getUserPower(getUserLocalStorageInfo().user.id);
+      for (let i = 0; i < that.mapList.length; i++) {
+        let index = data.findIndex((e) => e == that.mapList[i].label);
+        if (index != -1) {
+          newList.push(that.mapList[i]);
+        }
+      }
+      that.mapList = newList;
+    },
+    jumpPage(path) {
+      uni.navigateTo({
+        url: path,
+        fail: (fail) => {},
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+page {
+  background: white;
+}
+.banner {
+  width: 100%;
+  height: 450rpx;
+  position: absolute;
+  z-index: 1;
+}
+.mapdom {
+  width: 25%;
+  height: 184rpx;
+}
+.maptxt {
+  width: 100%;
+  height: 34rpx;
+  font-size: 24rpx;
+  font-family: PingFang SC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #333333;
+  text-align: center;
+}
+.mapIcon {
+  width: 160rpx;
+  height: 160rpx;
+  //background: linear-gradient(141deg, #89BCFF 0%, #2782FA 100%);
+  display: block;
+  margin: auto;
+}
+.map {
+  position: absolute;
+  z-index: 2;
+  width: calc(100% - 64rpx);
+  height: 450rpx;
+  border-radius: 48rpx 48rpx 0rpx 0rpx;
+  background: white;
+  margin-top: 402rpx;
+  padding: 48rpx 32rpx;
+}
+</style>