01

js_sdk/http.js

@@ -11,7 +11,12 @@ export function login(data) {
         '/wx/auth/login_by_app_main?' + qs.stringify(data), {}, {})
 
 }
-
+export function loginByCompany(data) {
+    return $http.post(
+        '/wx/auth/loginByCompany',
+        data, {}
+    )
+}
 export function addRectificationManagement(data) {
 
     return $http.post(
@@ -19,9 +24,16 @@ export function addRectificationManagement(data) {
         data, {}
     )
 }
+export function loginByWeixin2(code) {
+
+    return $http.post(
+        '/wx/auth/login_by_weixin2',
+        code, {}
+    )
+}
 export function getUserLocalStorageInfo() {
     const userInfo = JSON.parse(
-        uni.getStorageSync("laocui_user_info"));
+        uni.getStorageSync("USERINFO"));
     return userInfo
 }
 export function uploadPDF() {

js_sdk/request/requestConfig.js

@@ -55,6 +55,9 @@ $http.requestStart = function (options) {
     requestNum += 1;
     //请求前加入token
     options.headers['Authorization'] = 'Bearer ' + uni.getStorageSync('laocui_user_token');
+    console.log(uni.getStorageSync('USERINFO'))
+    options.headers['requestHanderAuth'] = JSON.parse(uni.getStorageSync('USERINFO')).requestHanderAuth;
+
     // console.log("请求开始前", options);
     return options;
 }

pages.json

@@ -26,6 +26,32 @@
                 }
             }
         },
+        {
+            "path": "pages/login2/login",
+            "style": {
+                "navigationBarTitleText": "登录",
+                "app-plus": {
+                    "titleNView": {
+                        "buttons": [
+                            {
+                                "text": "\ue534",
+                                "fontSrc": "/static/uni.ttf",
+                                "fontSize": "22px",
+                                "color": "#FFFFFF"
+                            }
+                        ]
+                    }
+                },
+                "usingComponents": {
+                    "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"
+                }
+            }
+        },
         {
             "path": "pages/index/index",
             "style": {
@@ -1211,4 +1237,4 @@
         "enablePullDownRefresh": true
     },
     "lazyCodeLoading": "requiredComponents"
-}
+}

pages/index/components/activity.vue

@@ -1,132 +1,182 @@
 <template>
-    <div class="activity">
-        <div v-for="(item,index) in activityList" :key="index+100" class="activityItem">
-          <img :src="item.img" class="itemBg">
-          <div class="activityItemRight">
-             <div class="activityItemRightTop">
-               <span class="activityItemRightName">{{item.name}}</span>
-               <span class="activityItemRightType">{{item.type}}</span>
-             </div>
-             <div class="canyu">36人参与</div>
-             <div class="activityItemRightBottom">
-               <div class="shoucang" @click="clickColl(index)"><image :src="item.isColl?heartSel:heart" class="scImg"> 收藏</div>
-               <div :class="item.isSign?'baoming':'baoming2'">{{ item.isSign ? '去报名' : '报名结束' }}</div>
-             </div>
+  <div class="activity">
+    <div v-for="(item, index) in activityList" class="activityItem">
+      <img :src="item.img" class="itemBg" />
+      <div class="activityItemRight">
+        <div class="activityItemRightTop">
+          <span class="activityItemRightName">{{ item.name }}</span>
+          <span class="activityItemRightType">{{ item.type }}</span>
+        </div>
+        <div class="canyu">36人参与</div>
+        <div class="activityItemRightBottom">
+          <div class="shoucang" @click="clickColl(index)">
+            <img :src="item.isColl ? heartSel : heart" class="scImg" /> 收藏
+          </div>
+          <div
+            :class="item.isSign ? 'baoming' : 'baoming2'"
+            @click="baoming(item)"
+          >
+            {{ item.isSign ? "去报名" : "报名结束" }}
           </div>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
+import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
 export default {
   name: "activity",
-  data(){
-    return{
-      heartSel:'https://www.idea-co-sf.com/gardenProduct/image/heartSel.png',
-      heart:'https://www.idea-co-sf.com/gardenProduct/image/heart.png',
-      activityList:[
-        {name:'互联网私募如何入门？',type:'培训活动',img:'https://www.idea-co-sf.com/gardenProduct/image/img1.png',isColl:true ,isSign:true},
-        {name:'公募基金中的大数据啊啊啊？',type:'活动',img:'https://www.idea-co-sf.com/gardenProduct/image/img2.png',isColl:false,isSign:true},
-        {name:'年度小艾杯篮球赛开...？',type:'体育',img:'https://www.idea-co-sf.com/gardenProduct/image/img3.png',isColl:false,isSign:false},
-      ]
-    }
+  data() {
+    return {
+      heartSel: "https://www.idea-co-sf.com/gardenProduct/image/heartSel.png",
+      heart: "https://www.idea-co-sf.com/gardenProduct/image/heart.png",
+      activityList: [
+        {
+          name: "互联网私募如何入门？",
+          type: "培训活动",
+          img: "https://www.idea-co-sf.com/gardenProduct/image/img1.png",
+          isColl: true,
+          isSign: true,
+        },
+        {
+          name: "公募基金中的大数据啊啊啊？",
+          type: "活动",
+          img: "https://www.idea-co-sf.com/gardenProduct/image/img2.png",
+          isColl: false,
+          isSign: true,
+        },
+        {
+          name: "年度小艾杯篮球赛开...？",
+          type: "体育",
+          img: "https://www.idea-co-sf.com/gardenProduct/image/img3.png",
+          isColl: false,
+          isSign: false,
+        },
+      ],
+    };
   },
-  methods:{
-    clickColl(index){
+  methods: {
+    clickColl(index) {
       // console.log(index)
-      this.activityList[index].isColl = !this.activityList[index].isColl
+      this.activityList[index].isColl = !this.activityList[index].isColl;
       // item.isColl = !item.isColl
-    }
-  }
-}
+    },
+    baoming(item) {
+      if (item.isSign) {
+        if (getUserLocalStorageInfo().userType == 3) {
+          uni.showModal({
+            title: "提示",
+            cancelText: "暂不",
+            confirmText: "去切换",
+            content: "您还不是企业用户，请切换登录身份后再进行相关操作。",
+            success: function (res) {
+              if (res.confirm) {
+                uni.navigateTo({
+                  url: "/pages/login2/login",
+                  success: function (e) {
+                    // uni.$emit('userType', 'OK')
+                  },
+                });
+              } else if (res.cancel) {
+                console.log("用户点击取消");
+              }
+            },
+          });
+        }
+      }
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-    .activity{
-         .activityItem{
-           width: 702rpx;
-           height: 216rpx;
-           background: #F5F7FA;
-           padding: 0 24rpx;
-           display: flex;
-           align-items: center;
-           box-sizing: border-box;
-           border-radius: 16rpx;
-           margin: 12rpx 0;
-           .itemBg{
-             width: 220rpx;
-             height: 160rpx;
-           }
-           .activityItemRight{
-             display: flex;
-             flex-direction: column;
-             margin-left: 24rpx;
-             .activityItemRightTop{
-               width: 420rpx;
-               display: flex;
-               justify-content: space-between;
-               .activityItemRightName{
-                 width: 280rpx;
-                 white-space: nowrap;
-                 overflow: hidden;
-                 text-overflow: ellipsis;
-                 color: #18172A;
-                 font-size: 28rpx;
-               }
-               .activityItemRightType{
-                 padding: 2rpx 12rpx;
-                 background: rgba(3, 101, 249, 0.20);
-                 color: rgba(3, 101, 249, 1);
-                 border-radius: 4rpx;
-                 font-size: 24rpx;
-               }
-             }
-             .canyu{
-               font-size: 28rpx;
-               color: rgba(102, 102, 102, 1);
-               margin: 14rpx 0;
-             }
-             .activityItemRightBottom{
-               display: flex;
-               justify-content: space-between;
-               align-items: center;
-               .shoucang{
-                 display: flex;
-                 align-items: center;
-                 font-size: 28rpx;
-                 color: rgba(141, 146, 155, 1);
-                 .scImg{
-                   width: 32rpx;
-                   height: 28rpx;
-                   margin-right: 8rpx;
-                 }
-               }
-               .baoming{
-                 width: 160rpx;
-                 height: 60rpx;
-                 display: flex;
-                 align-items: center;
-                 justify-content: center;
-                 font-size: 28rpx;
-                 background: linear-gradient( 316deg, #84AAFF 0%, #0365F9 100%);
-                 border-radius: 32rpx;
-                 font-size: 28rpx;
-                 color: white;
-               }
-               .baoming2{
-                 width: 160rpx;
-                 height: 60rpx;
-                 display: flex;
-                 align-items: center;
-                 justify-content: center;
-                 font-size: 28rpx;
-                 background: rgba(226, 232, 239, 1);
-                 border-radius: 32rpx;
-                 font-size: 28rpx;
-                 color: rgba(141, 146, 155, 1);
-               }
-             }
-           }
-         }
+.activity {
+  .activityItem {
+    width: 702rpx;
+    height: 216rpx;
+    background: #f5f7fa;
+    padding: 0 24rpx;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
+    border-radius: 16rpx;
+    margin: 12rpx 0;
+    .itemBg {
+      width: 220rpx;
+      height: 160rpx;
+    }
+    .activityItemRight {
+      display: flex;
+      flex-direction: column;
+      margin-left: 24rpx;
+      .activityItemRightTop {
+        width: 420rpx;
+        display: flex;
+        justify-content: space-between;
+        .activityItemRightName {
+          width: 280rpx;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          color: #18172a;
+          font-size: 28rpx;
+        }
+        .activityItemRightType {
+          padding: 2rpx 12rpx;
+          background: rgba(3, 101, 249, 0.2);
+          color: rgba(3, 101, 249, 1);
+          border-radius: 4rpx;
+          font-size: 24rpx;
+        }
+      }
+      .canyu {
+        font-size: 28rpx;
+        color: rgba(102, 102, 102, 1);
+        margin: 14rpx 0;
+      }
+      .activityItemRightBottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .shoucang {
+          display: flex;
+          align-items: center;
+          font-size: 28rpx;
+          color: rgba(141, 146, 155, 1);
+          .scImg {
+            width: 32rpx;
+            height: 28rpx;
+            margin-right: 8rpx;
+          }
+        }
+        .baoming {
+          width: 160rpx;
+          height: 60rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 28rpx;
+          background: linear-gradient(316deg, #84aaff 0%, #0365f9 100%);
+          border-radius: 32rpx;
+          font-size: 28rpx;
+          color: white;
+        }
+        .baoming2 {
+          width: 160rpx;
+          height: 60rpx;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 28rpx;
+          background: rgba(226, 232, 239, 1);
+          border-radius: 32rpx;
+          font-size: 28rpx;
+          color: rgba(141, 146, 155, 1);
+        }
+      }
     }
+  }
+}
 </style>

pages/index/components/enterpriseSide.vue

@@ -1,123 +1,131 @@
 <template>
-    <div class="enterpriseSide">
-      <div style="padding:0 24rpx;background: white">
+  <div class="enterpriseSide">
+    <div style="padding: 0 24rpx; background: white">
       <div class="searchTop">
         <image :src="locationIcon" class="locationIcon"></image>
         <picker @change="bindPickerChange" :value="index" :range="array">
-          <input v-model="searchArea" class="searchArea" disabled >
+          <input v-model="searchArea" class="searchArea" disabled />
         </picker>
         <image :src="dhIcon" class="dhIcon"></image>
         <image :src="vector" class="vector"></image>
       </div>
-      <div class="parkBgBox" :style="{'background-image':`url(${parkBg})`}">
+      <div class="parkBgBox" :style="{ 'background-image': `url(${parkBg})` }">
         <div class="parkNameBox">这里是园区名称</div>
       </div>
       <div class="map2">
         <div
-            class="mapdom2"
-            style="float: left"
-            v-for="(item, index) in mapList"
-            :key="index"
-            @click="jumpPage(item.path)"
+          class="mapdom2"
+          style="float: left"
+          v-for="(item, index) in mapList"
+          :key="index"
+          @click="jumpPage(item.path, item.isMustCompany)"
         >
           <img class="mapIcon2" :src="item.url" />
           <div class="maptxt">{{ item.label }}</div>
         </div>
       </div>
-      </div>
-      <div class="noticeBody">
-        <image :src="tongzhi" class="tongzhiImg"></image>
-        <div class="columLine"></div>
-        <div class="noticeBox">
-          <div class="noticeItem" v-for="item in 2">
-            <div class="noticeTag">物业</div>
-            <div class="noticeInfo">新年伊始，PAER招商开始啦啦啦啦啦啦</div>
-            <div class="noticeTime">1小时前</div>
-          </div>
+    </div>
+    <div class="noticeBody">
+      <image :src="tongzhi" class="tongzhiImg"></image>
+      <div class="columLine"></div>
+      <div class="noticeBox">
+        <div class="noticeItem" v-for="item in 2">
+          <div class="noticeTag">物业</div>
+          <div class="noticeInfo">新年伊始，PAER招商开始啦啦啦啦啦啦</div>
+          <div class="noticeTime">1小时前</div>
         </div>
       </div>
-      <div class="parkDynamic">
-        <div class="parkDynamicTitle">
-          <div class="columLineBlue"></div>
-          <div class="titleName">园区动态</div>
-        </div>
-        <div class="parkDynamicTab">
-           <div v-for="(item,index) in tabList" :key="index" class="tabItem" :class="selectTab===item.name?'selectTabItem':''" @click="clickTab(item)">
-             {{item.name}}
-           </div>
-        </div>
-        <activity v-show="selectTab==='活动'"></activity>
-        <dynamic v-show="selectTab==='动态'"></dynamic>
+    </div>
+    <div class="parkDynamic">
+      <div class="parkDynamicTitle">
+        <div class="columLineBlue"></div>
+        <div class="titleName">园区动态</div>
       </div>
-      <div class="serviceEvaluation">
-        <div class="parkDynamicTitle">
-          <div class="columLineBlue"></div>
-          <div class="titleName">服务评价</div>
-        </div>
-        <div class="wyInfo">
-          <div class="wyName">
-            <image :src="wyhead" class="wyhead"></image>
-            <span>XXXX物业</span>
-          </div>
-          <span style="color: #666666;font-size: 28rpx">好评率：100%</span>
+      <div class="parkDynamicTab">
+        <div
+          v-for="(item, index) in tabList"
+          :key="index"
+          class="tabItem"
+          :class="selectTab === item.name ? 'selectTabItem' : ''"
+          @click="clickTab(item)"
+        >
+          {{ item.name }}
         </div>
-        <div class="evaluationBox">
-          <div class="evaluationBoxName">点击笑脸给出您对园区服务的评价</div>
-          <van-rate
-              :value="value"
-              :size="32"
-              color="#ffd21e"
-              :void-icon="voidMyIcon"
-              :icon="myIcon"
-              gutter="32rpx"
-              void-color="#eee"
-              bind:change="onChange"
-          />
+      </div>
+      <activity v-show="selectTab === '活动'"></activity>
+      <dynamic v-show="selectTab === '动态'"></dynamic>
+    </div>
+    <div class="serviceEvaluation">
+      <div class="parkDynamicTitle">
+        <div class="columLineBlue"></div>
+        <div class="titleName">服务评价</div>
+      </div>
+      <div class="wyInfo">
+        <div class="wyName">
+          <image :src="wyhead" class="wyhead"></image>
+          <span>XXXX物业</span>
         </div>
+        <span style="color: #666666; font-size: 28rpx">好评率：100%</span>
+      </div>
+      <div class="evaluationBox">
+        <div class="evaluationBoxName">点击笑脸给出您对园区服务的评价</div>
+        <van-rate
+          :value="value"
+          :size="32"
+          color="#ffd21e"
+          :void-icon="voidMyIcon"
+          :icon="myIcon"
+          gutter="32rpx"
+          void-color="#eee"
+          bind:change="onChange"
+        />
       </div>
-      <div class="contactInfo">
-          <div class="infoBox">
-            <span class="infoTitle">客服电话（24小时）</span>
-            <span class="phoneNumber">0510-680**808</span>
-          </div>
-        <image :src="phoneCall" class="phoneCall"></image>
+    </div>
+    <div class="contactInfo">
+      <div class="infoBox">
+        <span class="infoTitle">客服电话（24小时）</span>
+        <span class="phoneNumber">0510-680**808</span>
       </div>
+      <image :src="phoneCall" class="phoneCall"></image>
     </div>
+  </div>
 </template>
 
 <script>
 import vanRate from "../../../wxcomponents/weapp/dist/rate/index";
 import dynamic from "./dynamic.vue";
 import Activity from "./activity.vue";
+import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
 export default {
   components: {
     Activity,
     vanRate,
-    dynamic
+    dynamic,
   },
   name: "enterpriseSide",
-  data(){
-    return{
-      locationIcon:'https://www.idea-co-sf.com/gardenProduct/image/locationIcon.png',
-      dhIcon:'https://www.idea-co-sf.com/gardenProduct/image/dhIcon.png',
-      vector:'https://www.idea-co-sf.com/gardenProduct/image/Vector.png',
-      tongzhi:'https://www.idea-co-sf.com/gardenProduct/image/tongzhi.png',
-      wyhead:'https://www.idea-co-sf.com/gardenProduct/image/wyHead.png',
-      myIcon:'https://www.idea-co-sf.com/gardenProduct/image/icon.png',
-      voidMyIcon:'https://www.idea-co-sf.com/gardenProduct/image/voidIcon.png',
-      phoneCall:'https://www.idea-co-sf.com/gardenProduct/image/phoneCall.png',
-      value:'5',
-      searchArea: '当前园区名称',
+  data() {
+    return {
+      locationIcon:
+        "https://www.idea-co-sf.com/gardenProduct/image/locationIcon.png",
+      dhIcon: "https://www.idea-co-sf.com/gardenProduct/image/dhIcon.png",
+      vector: "https://www.idea-co-sf.com/gardenProduct/image/Vector.png",
+      tongzhi: "https://www.idea-co-sf.com/gardenProduct/image/tongzhi.png",
+      wyhead: "https://www.idea-co-sf.com/gardenProduct/image/wyHead.png",
+      myIcon: "https://www.idea-co-sf.com/gardenProduct/image/icon.png",
+      voidMyIcon: "https://www.idea-co-sf.com/gardenProduct/image/voidIcon.png",
+      phoneCall: "https://www.idea-co-sf.com/gardenProduct/image/phoneCall.png",
+      value: "5",
+      searchArea: "当前园区名称",
       index: 0,
-      array:['中国', '美国', '巴西', '日本'],
-      parkBg:'https://www.idea-co-sf.com/gardenProduct/image/parkBg.png',
-      tabList:[
-        {name:'活动' },
-        {name:'周边' },
-        {name:'房源' },
-        {name:'动态' },
+      array: ["中国", "美国", "巴西", "日本"],
+      parkBg: "https://www.idea-co-sf.com/gardenProduct/image/parkBg.png",
+      tabList: [
+        { name: "活动" },
+        { name: "周边" },
+        { name: "房源" },
+        { name: "动态" },
       ],
-      selectTab:'活动',
+      selectTab: "活动",
       mapList: [
         {
           label: "待办提醒",
@@ -128,11 +136,13 @@ export default {
           label: "企业账单",
           url: "https://www.idea-co-sf.com/gardenProduct/image/qyzdIcon.png",
           path: "/pages/subPackages/companyHouse/companyHouse",
+          isMustCompany: true,
         },
         {
           label: "经发填报",
           url: "https://www.idea-co-sf.com/gardenProduct/image/jftbIcon.png",
           path: "/pages/subPackages/companyHouse/companyHouse",
+          isMustCompany: true,
         },
         {
           label: "园区周边",
@@ -143,11 +153,13 @@ export default {
           label: "报事报修",
           url: "https://www.idea-co-sf.com/gardenProduct/image/bsbxIcon.png",
           path: "/pages/subPackages/reportRepair/index",
+          isMustCompany: true,
         },
         {
           label: "活动报名",
           url: "https://www.idea-co-sf.com/gardenProduct/image/hdbmIcon.png",
           path: "/pages/subPackages/companyHouse/companyHouse",
+          // isMustCompany: true,
         },
         {
           label: "入驻申请",
@@ -158,6 +170,7 @@ export default {
           label: "退租申请",
           url: "https://www.idea-co-sf.com/gardenProduct/image/tzsqIcon.png",
           path: "/pages/subPackages/companyHouse/companyHouse",
+          isMustCompany: true,
         },
         {
           label: "关于园区",
@@ -165,262 +178,282 @@ export default {
           path: "/pages/subPackages/companyHouse/companyHouse",
         },
       ],
-    }
+    };
   },
-  methods:{
-    bindPickerChange(e){
-      console.log(e)
-      this.searchArea = this.array[e.detail.value]
+  methods: {
+    bindPickerChange(e) {
+      console.log(e);
+      this.searchArea = this.array[e.detail.value];
     },
-    jumpPage(path) {
-      console.log(path)
-      uni.navigateTo({
-        url: path,
-        fail: (fail) => {
-          console.log(fail)
-        },
-      });
+    jumpPage(path, isMustCompany) {
+      console.log(path);
+      if (isMustCompany && getUserLocalStorageInfo().userType == 3) {
+        uni.showModal({
+          title: "提示",
+          cancelText: "暂不",
+          confirmText: "去切换",
+          content: "您还不是企业用户，请切换登录身份后再进行相关操作。",
+          success: function (res) {
+            if (res.confirm) {
+              uni.navigateTo({
+                url: "/pages/login2/login",
+                success: function (e) {
+                  // uni.$emit('userType', 'OK')
+                },
+              });
+            } else if (res.cancel) {
+              console.log("用户点击取消");
+            }
+          },
+        });
+      } else {
+        uni.navigateTo({
+          url: path,
+          fail: (fail) => {
+            console.log(fail);
+          },
+        });
+      }
     },
-    clickTab(item){
-      this.selectTab = item.name
-    }
-  }
-}
+    clickTab(item) {
+      this.selectTab = item.name;
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-    .enterpriseSide{
-      background: #F5F7FA;
-      .searchTop{
-        //margin: 24rpx;
-        background: white;
-        position: relative;
-        display: flex;
-        align-items: center;
-        .searchArea{
-          position: relative;
-          width: 532rpx;
-          height: 64rpx;
-          background: #F5F7FA;
-          border-radius: 32rpx;
-          padding-left: 68rpx;
-          font-size: 28rpx;
-        }
-        .locationIcon{
-          position: absolute;
-          width: 28rpx;
-          height: 28rpx;
-          left: 24rpx;
-          z-index: 10;
-        }
-        .dhIcon{
-          width: 48rpx;
-          height: 48rpx;
-          margin-left: 16rpx;
-        }
-        .vector{
-          position: absolute;
-          width: 16rpx;
-          height: 8rpx;
-          left: 552rpx;
-        }
-      }
-      .parkBgBox{
-        position: relative;
-        background-repeat: no-repeat;
-        background-size: 100%;
-        width: 702rpx;
-        height: 320rpx;
-        margin-top: 24rpx;
-        .parkNameBox{
-          position: absolute;
-          box-sizing: border-box;
-          width: 100%;
-          height: 64rpx;
-          background: rgba(3, 19, 41, 0.60);
-          display: flex;
-          align-items: center;
-          padding-left: 24rpx;
-          bottom: 0;
-          color: white;
-          font-size: 28rpx;
-          border-radius: 0 0 16rpx 16rpx;
-        }
-      }
-      .map2 {
-        box-sizing: border-box;
-        //position: absolute;
-        z-index: 2;
-        width: 100%;
-        //height: 770rpx;
-        //border-radius: 48rpx 48rpx 0rpx 0rpx;
-        background: white;
-        //margin-top: 402rpx;
-        padding: 36rpx 0 0 0;
-        overflow-y: auto;
-        display: grid;
-        grid-template-columns: repeat(5,1fr);
-      }
-      .mapIcon2{
-        width: 92rpx;
-        height: 92rpx;
-        display: block;
-        margin: auto;
-      }
-      .mapdom2{
-        height: 184rpx;
-      }
-      .noticeBody{
-        padding: 24rpx 28rpx;
-        background: white;
+.enterpriseSide {
+  background: #f5f7fa;
+  .searchTop {
+    //margin: 24rpx;
+    background: white;
+    position: relative;
+    display: flex;
+    align-items: center;
+    .searchArea {
+      position: relative;
+      width: 532rpx;
+      height: 64rpx;
+      background: #f5f7fa;
+      border-radius: 32rpx;
+      padding-left: 68rpx;
+      font-size: 28rpx;
+    }
+    .locationIcon {
+      position: absolute;
+      width: 28rpx;
+      height: 28rpx;
+      left: 24rpx;
+      z-index: 10;
+    }
+    .dhIcon {
+      width: 48rpx;
+      height: 48rpx;
+      margin-left: 16rpx;
+    }
+    .vector {
+      position: absolute;
+      width: 16rpx;
+      height: 8rpx;
+      left: 552rpx;
+    }
+  }
+  .parkBgBox {
+    position: relative;
+    background-repeat: no-repeat;
+    background-size: 100%;
+    width: 702rpx;
+    height: 320rpx;
+    margin-top: 24rpx;
+    .parkNameBox {
+      position: absolute;
+      box-sizing: border-box;
+      width: 100%;
+      height: 64rpx;
+      background: rgba(3, 19, 41, 0.6);
+      display: flex;
+      align-items: center;
+      padding-left: 24rpx;
+      bottom: 0;
+      color: white;
+      font-size: 28rpx;
+      border-radius: 0 0 16rpx 16rpx;
+    }
+  }
+  .map2 {
+    box-sizing: border-box;
+    //position: absolute;
+    z-index: 2;
+    width: 100%;
+    //height: 770rpx;
+    //border-radius: 48rpx 48rpx 0rpx 0rpx;
+    background: white;
+    //margin-top: 402rpx;
+    padding: 36rpx 0 0 0;
+    overflow-y: auto;
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+  }
+  .mapIcon2 {
+    width: 92rpx;
+    height: 92rpx;
+    display: block;
+    margin: auto;
+  }
+  .mapdom2 {
+    height: 184rpx;
+  }
+  .noticeBody {
+    padding: 24rpx 28rpx;
+    background: white;
+    display: flex;
+    align-items: center;
+    margin: 24rpx 0;
+    .tongzhiImg {
+      width: 86rpx;
+      height: 96rpx;
+    }
+    .columLine {
+      width: 2rpx;
+      height: 80rpx;
+      background: #e7eaf0;
+      margin: 0 16rpx;
+    }
+    .noticeBox {
+      display: flex;
+      flex-direction: column;
+      .noticeItem {
         display: flex;
         align-items: center;
-        margin: 24rpx 0;
-        .tongzhiImg{
-          width: 86rpx;
-          height: 96rpx;
+        margin: 8rpx 0;
+        .noticeTag {
+          width: 56rpx;
+          height: 30rpx;
+          background: #ffffff;
+          border-radius: 4rpx 4rpx 4rpx 4rpx;
+          border: 2rpx solid #0365f9;
+          color: #0365f9;
+          font-size: 22rpx;
+          text-align: center;
         }
-        .columLine{
-          width: 2rpx;
-          height: 80rpx;
-          background: #E7EAF0;
-          margin: 0 16rpx;
-
+        .noticeInfo {
+          width: 326rpx;
+          font-size: 24rpx;
+          color: #18172a;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          margin: 0 24rpx;
         }
-        .noticeBox{
-          display: flex;
-          flex-direction: column;
-          .noticeItem{
-            display: flex;
-            align-items: center;
-            margin: 8rpx 0;
-            .noticeTag{
-              width: 56rpx;
-              height: 30rpx;
-              background: #FFFFFF;
-              border-radius: 4rpx 4rpx 4rpx 4rpx;
-              border: 2rpx solid #0365F9;
-              color: #0365F9;
-              font-size: 22rpx;
-              text-align: center;
-            }
-            .noticeInfo{
-              width: 326rpx;
-              font-size: 24rpx;
-              color: #18172A;
-              overflow: hidden;
-              white-space: nowrap;
-              text-overflow: ellipsis;
-              margin: 0 24rpx;
-            }
-            .noticeTime{
-              color: #666666;
-              font-size: 24rpx;
-            }
-          }
+        .noticeTime {
+          color: #666666;
+          font-size: 24rpx;
         }
       }
-      .parkDynamic{
-        width: 100%;
-        background: white;
-        padding: 24rpx;
-        box-sizing: border-box;
-        .parkDynamicTab{
-          display: flex;
-          padding: 26px 0;
-          .tabItem{
-            color: #666666;
-            font-size: 28rpx;
-            margin: 0 32rpx;
-          }
-          .selectTabItem{
-            color:#18172A;
-            border-bottom:6rpx solid #034DF7;
-          }
-        }
+    }
+  }
+  .parkDynamic {
+    width: 100%;
+    background: white;
+    padding: 24rpx;
+    box-sizing: border-box;
+    .parkDynamicTab {
+      display: flex;
+      padding: 26px 0;
+      .tabItem {
+        color: #666666;
+        font-size: 28rpx;
+        margin: 0 32rpx;
       }
-      .serviceEvaluation{
-        width: 100%;
-        background: white;
-        padding: 24rpx;
-        box-sizing: border-box;
-        margin-top: 24rpx;
-        .wyInfo{
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          .wyName{
-            display: flex;
-            align-items: center;
-            font-size: 36rpx;
-            color: rgba(24, 23, 42, 1);
-            margin: 38rpx 8rpx 24rpx 8rpx;
-            .wyhead{
-              width: 88rpx;
-              height: 88rpx;
-              margin-right: 24rpx;
-            }
-          }
-        }
-        .evaluationBox{
-          width: 702rpx;
-          height: 196rpx;
-          //margin: 24rpx;
-          padding: 42rpx 0 42rpx 48rpx;
-          background: #F5F7FA;
-          border-radius: 8rpx;
-          box-sizing: border-box;
-          .evaluationBoxName{
-            font-size: 28rpx;
-            color: #18172A;
-            margin-bottom: 32rpx;
-          }
-        }
+      .selectTabItem {
+        color: #18172a;
+        border-bottom: 6rpx solid #034df7;
       }
-
-      .contactInfo{
+    }
+  }
+  .serviceEvaluation {
+    width: 100%;
+    background: white;
+    padding: 24rpx;
+    box-sizing: border-box;
+    margin-top: 24rpx;
+    .wyInfo {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .wyName {
         display: flex;
-        justify-content: space-between;
         align-items: center;
-        padding: 30rpx 48rpx;
-        box-sizing: border-box;
-        background: white;
-        margin: 4rpx 0 74rpx 0;
-        .infoBox{
-          display: flex;
-          flex-direction: column;
-          .infoTitle{
-            color: #666666;
-            font-size: 28rpx;
-            margin-bottom: 16rpx;
-          }
-          .phoneNumber{
-            color: #18172A;
-            font-size: 40rpx;
-            font-weight: 600;
-          }
-        }
-        .phoneCall{
+        font-size: 36rpx;
+        color: rgba(24, 23, 42, 1);
+        margin: 38rpx 8rpx 24rpx 8rpx;
+        .wyhead {
           width: 88rpx;
           height: 88rpx;
+          margin-right: 24rpx;
         }
       }
-
-      .columLineBlue{
-        width: 10rpx;
-        height: 32rpx;
-        background: linear-gradient( 180deg, #509FFF 0%, #034DF7 100%);
-        border-radius: 1px 1px 1px 1px;
-        margin-right: 16rpx;
+    }
+    .evaluationBox {
+      width: 702rpx;
+      height: 196rpx;
+      //margin: 24rpx;
+      padding: 42rpx 0 42rpx 48rpx;
+      background: #f5f7fa;
+      border-radius: 8rpx;
+      box-sizing: border-box;
+      .evaluationBoxName {
+        font-size: 28rpx;
+        color: #18172a;
+        margin-bottom: 32rpx;
       }
-      .titleName{
-        color: #18172A;
-        font-size: 36rpx;
-        font-weight: 500;
+    }
+  }
+
+  .contactInfo {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx 48rpx;
+    box-sizing: border-box;
+    background: white;
+    margin: 4rpx 0 74rpx 0;
+    .infoBox {
+      display: flex;
+      flex-direction: column;
+      .infoTitle {
+        color: #666666;
+        font-size: 28rpx;
+        margin-bottom: 16rpx;
       }
-      .parkDynamicTitle{
-        display:flex;
-        align-items: center;
+      .phoneNumber {
+        color: #18172a;
+        font-size: 40rpx;
+        font-weight: 600;
       }
     }
+    .phoneCall {
+      width: 88rpx;
+      height: 88rpx;
+    }
+  }
+
+  .columLineBlue {
+    width: 10rpx;
+    height: 32rpx;
+    background: linear-gradient(180deg, #509fff 0%, #034df7 100%);
+    border-radius: 1px 1px 1px 1px;
+    margin-right: 16rpx;
+  }
+  .titleName {
+    color: #18172a;
+    font-size: 36rpx;
+    font-weight: 500;
+  }
+  .parkDynamicTitle {
+    display: flex;
+    align-items: center;
+  }
+}
 </style>

pages/index/index.vue

@@ -1,42 +1,71 @@
 <template>
   <view>
-    <div class="managementBody" v-show="userType">
-    <image src="https://www.idea-co-sf.com/gardenProduct/image/banner.png" class="banner"></image>
+    <div class="managementBody" v-show="userType == 2">
+      <image
+        src="https://www.idea-co-sf.com/gardenProduct/image/banner.png"
+        class="banner"
+      ></image>
       <div class="needBox">
         <div class="needLeft">
-          <div class="needLeftLeft" @click="toMsgPage('/pages/subPackages/todo/index')">
-            <span style="color: #18172A;font-size: 4.5vw;margin-bottom: 1vw">我的待办</span>
-            <span style="color: #666666;font-size: 3.5vw">需处理待办<span style="color: #0365F9;font-weight: 600;margin-left: 0.5vw">3</span></span>
+          <div
+            class="needLeftLeft"
+            @click="toMsgPage('/pages/subPackages/todo/index')"
+          >
+            <span style="color: #18172a; font-size: 4.5vw; margin-bottom: 1vw"
+              >我的待办</span
+            >
+            <span style="color: #666666; font-size: 3.5vw"
+              >需处理待办<span
+                style="color: #0365f9; font-weight: 600; margin-left: 0.5vw"
+                >3</span
+              ></span
+            >
           </div>
-          <img src="https://www.idea-co-sf.com/gardenProduct/image/dbImage.png" class="needImg">
+          <img
+            src="https://www.idea-co-sf.com/gardenProduct/image/dbImage.png"
+            class="needImg"
+          />
         </div>
-        <div class="needRight" @click="toMsgPage('/pages/subPackages/toread/index')">
+        <div
+          class="needRight"
+          @click="toMsgPage('/pages/subPackages/toread/index')"
+        >
           <div class="needLeftLeft">
-            <span style="color: #18172A;font-size: 4.5vw;margin-bottom: 1vw">我的待阅</span>
-            <span style="color: #666666;font-size: 3.5vw">需处理待阅<span style="color: #22B565;font-weight: 600;margin-left: 0.5vw">12</span></span>
+            <span style="color: #18172a; font-size: 4.5vw; margin-bottom: 1vw"
+              >我的待阅</span
+            >
+            <span style="color: #666666; font-size: 3.5vw"
+              >需处理待阅<span
+                style="color: #22b565; font-weight: 600; margin-left: 0.5vw"
+                >12</span
+              ></span
+            >
           </div>
-          <img src="https://www.idea-co-sf.com/gardenProduct/image/dyImage.png" class="needImg">
+          <img
+            src="https://www.idea-co-sf.com/gardenProduct/image/dyImage.png"
+            class="needImg"
+          />
         </div>
       </div>
       <div class="titleTips">
         <div class="myLine"></div>
         <div>服务入口</div>
       </div>
-    <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 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>
     </div>
-    </div>
-<!--    企业端页面-->
-    <div class="enterpriseBody" v-show="!userType">
+    <!--    企业端页面-->
+    <div class="enterpriseBody" v-show="userType == 1 || userType == 3">
       <enterprise-side></enterprise-side>
     </div>
   </view>
@@ -46,10 +75,10 @@
 import { getUserPower, getUserLocalStorageInfo } from "@/js_sdk/http";
 import EnterpriseSide from "./components/enterpriseSide.vue";
 export default {
-  components: {EnterpriseSide},
+  components: { EnterpriseSide },
   data() {
     return {
-      userType:true,
+      userType: false,
       mapList: [
         // {
         //   label: "智慧党建",
@@ -63,17 +92,17 @@ export default {
         // },
         {
           label: "企业库",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/qyk.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/qyk.png",
           path: "/pages/subPackages/companyHouse/companyHouse",
         },
         {
           label: "走访上报",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/zfsb.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/zfsb.png",
           path: "/pages/subPackages/companyreport/companyreport",
         },
         {
           label: "会议室审核",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/tupian1.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/tupian1.png",
         },
         // {
         //   label: "上市跟进",
@@ -81,7 +110,7 @@ export default {
         // },
         {
           label: "招商管理",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/zsgl.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/zsgl.png",
           path: "/pages/subPackages/merchants/merchants",
         },
         // {
@@ -107,32 +136,32 @@ export default {
 
         {
           label: "报修派单",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/bxpd.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/bxpd.png",
           path: "/pages/subPackages/repairDispatch-app/index",
         },
         {
           label: "报修处理",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/bxcl.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/bxcl.png",
           path: "/pages/subPackages/repairprocessing-app/index",
         },
         {
           label: "房间管理",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/fjgl.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/fjgl.png",
           // path: "/pages/subPackages/repairprocessing-app/index",
         },
         {
           label: "园区通知",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/tzfb.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/tzfb.png",
           // path: "",
         },
         {
           label: "物业通知",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/tupian2.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/tupian2.png",
           // path: "",
         },
         {
           label: "活动发布",
-          url: 'https://www.idea-co-sf.com/gardenProduct/image/hdfb.png',
+          url: "https://www.idea-co-sf.com/gardenProduct/image/hdfb.png",
           path: "/pages/subPackages/activityPromulgate/list",
         },
         // {
@@ -179,16 +208,16 @@ export default {
     // demo();
   },
   onLoad(e) {
-    uni.$on('userType', (userType) => {
-      if (userType==='OK'){
-        this.userType = !this.userType
-      }
-    });
+    // uni.$on("userType", (userType) => {
+    //   if (userType === "OK") {
+    //     this.userType = !this.userType;
+    //   }
+    // });
 
     this.getUserPower();
   },
   methods: {
-    toMsgPage(e){
+    toMsgPage(e) {
       uni.navigateTo({
         url: e,
         fail: (fail) => {},
@@ -196,17 +225,40 @@ export default {
     },
     // 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]);
-        }
+      console.log(getUserLocalStorageInfo());
+      that.userType = getUserLocalStorageInfo().userType;
+      if (that.userType == 3) {
+        uni.showModal({
+          title: "提示",
+          cancelText: "暂不",
+          confirmText: "去切换",
+          content: "您还不是企业用户，请切换登录身份后再进行相关操作。",
+          success: function (res) {
+            if (res.confirm) {
+              uni.navigateTo({
+                url: "/pages/login2/login",
+                success: function (e) {
+                  // uni.$emit('userType', 'OK')
+                },
+              });
+            } else if (res.cancel) {
+              console.log("用户点击取消");
+            }
+          },
+        });
       }
-      that.mapList = newList;
+      // if (getUserLocalStorageInfo().user.id == 1) return;
+
+      // 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({
@@ -222,7 +274,7 @@ export default {
 page {
   background: white;
 }
-.managementBody{
+.managementBody {
   padding: 4vw;
 }
 .banner {
@@ -241,7 +293,7 @@ page {
   font-size: 24rpx;
   font-family: PingFang SC-Medium, PingFang SC;
   font-weight: 500;
-  color: #18172A;
+  color: #18172a;
   text-align: center;
   margin-top: 8rpx;
 }
@@ -263,12 +315,12 @@ page {
   padding: 24rpx 12rpx;
   overflow-y: auto;
 }
-.needBox{
+.needBox {
   display: flex;
   align-items: center;
   justify-content: space-between;
   margin: 2vw 0;
-  .needLeft{
+  .needLeft {
     display: flex;
     justify-content: space-around;
     background: rgba(238, 244, 255, 1);
@@ -277,35 +329,35 @@ page {
     width: 45vw;
     height: 23vw;
   }
-  .needRight{
+  .needRight {
     display: flex;
     justify-content: space-around;
-    background: #DEF6F8;
+    background: #def6f8;
     border-radius: 8rpx;
     align-items: center;
     width: 45vw;
     height: 23vw;
   }
-  .needLeftLeft{
+  .needLeftLeft {
     display: flex;
     flex-direction: column;
   }
-  .needImg{
+  .needImg {
     width: 100rpx;
     height: 100rpx;
   }
 }
-.titleTips{
+.titleTips {
   display: flex;
   align-items: center;
   font-size: 4.7vw;
   font-weight: 600;
-  color:#18172A;
-  margin:4vw 0 2vw 0;
-  .myLine{
+  color: #18172a;
+  margin: 4vw 0 2vw 0;
+  .myLine {
     width: 13rpx;
     height: 40rpx;
-    background: linear-gradient( 180deg, #509FFF 0%, #034DF7 100%);
+    background: linear-gradient(180deg, #509fff 0%, #034df7 100%);
     margin-right: 20rpx;
   }
 }

pages/login/login.vue

@@ -1,12 +1,30 @@
 <template>
   <div class="login">
-    <img src="https://www.idea-co-sf.com/gardenProduct/image/logobig.png" alt="" class="logobig" />
+    <img
+      src="https://www.idea-co-sf.com/gardenProduct/image/logobig.png"
+      alt=""
+      class="logobig"
+    />
     <div class="logTit">
       <span class="titletxt">园区管理平台产品化）</span>
       <p class="titletxt2">（管理端）</p>
     </div>
     <div class="loginBox">
-      <div class="inputBox">
+      <button
+        open-type="getPhoneNumber"
+        class="login_button"
+        style="
+          padding: 20rpx;
+          background: #07c160;
+          color: white;
+          margin-top: 25vh;
+        "
+        @getphonenumber="getPhoneNumber"
+      >
+        授权手机号快捷登录
+      </button>
+
+      <!-- <div class="inputBox">
         <img
           src="https://www.idea-co-sf.com/gardenProduct/image/comicon.png"
           alt=""
@@ -70,7 +88,7 @@
           @click="goqy"
           >前往企业端</van-button
         >
-      </div>
+      </div> -->
     </div>
     <div class="bottomTips">
       2022@copyrigtht IOT - Park-tech. supported by 中国移动
@@ -80,7 +98,7 @@
 </template>
 <script>
 import Dialog from "../..//wxcomponents/weapp/dist/dialog/dialog.js";
-import { login } from "@/js_sdk/http.js";
+import { loginByWeixin2 } from "@/js_sdk/http.js";
 
 export default {
   data() {
@@ -101,6 +119,24 @@ export default {
     this.captchaImageRefresh(this.loginForm);
   },
   methods: {
+    getPhoneNumber(e) {
+      wx.login({
+        success(res) {
+          console.log(res);
+          let data = {
+            loginCode: res.code,
+            phoneCode: e.detail.code,
+          };
+          loginByWeixin2(data).then((e) => {
+            console.log(e.data.user_);
+            wx.setStorageSync("USERINFO", JSON.stringify(e.data.user_));
+            uni.switchTab({
+              url: "/pages/index/index",
+            });
+          });
+        },
+      });
+    },
     goqy() {
       uni.navigateTo({
         url: "/pages/subPackages/gocompnay/index",

pages/login2/login.vue

@@ -0,0 +1,477 @@
+<template>
+  <div class="login">
+    <img
+      src="https://www.idea-co-sf.com/gardenProduct/image/logobig.png"
+      alt=""
+      class="logobig"
+    />
+    <div class="logTit">
+      <span class="titletxt">园区管理平台产品化</span>
+      <p class="titletxt2">（管理端）</p>
+    </div>
+    <div class="logintype" v-if="loginStatus">
+      <div
+        @click="changeLoginType('个人')"
+        :class="loginType == '个人' ? 'checkbox ischecked' : 'checkbox'"
+      >
+        个人
+      </div>
+      <div
+        @click="changeLoginType('管理')"
+        :class="loginType == '管理' ? 'checkbox ischecked' : 'checkbox'"
+      >
+        管理
+      </div>
+    </div>
+    <div class="loginBox" v-if="loginType == '个人'">
+      <div class="inputBox">
+        <img
+          src="https://www.idea-co-sf.com/gardenProduct/image/comicon.png"
+          alt=""
+          style="height: 60rpx"
+        />
+        <input
+          type="text"
+          placeholder="请输入账号"
+          v-model="loginForm.userName"
+        />
+      </div>
+      <div class="inputBox">
+        <img
+          src="https://www.idea-co-sf.com/gardenProduct/image/pswicon.svg"
+          alt=""
+        />
+        <input
+          type="password"
+          placeholder="请输入密码"
+          v-model="loginForm.password"
+        />
+      </div>
+      <div class="inputBox">
+        <img
+          src="https://www.idea-co-sf.com/gardenProduct/image/yzmicon.svg"
+          alt=""
+        />
+        <input
+          type="text"
+          placeholder="验证码"
+          class="yanzhengma"
+          v-model="loginForm.code"
+        />
+        <img
+          :src="loginForm.captchaImage"
+          @click="captchaImageRefresh(loginForm)"
+          class="yanzhengImg"
+        />
+      </div>
+      <div class="pswBox" @click="forgetPsw()">
+        <p>忘记密码？</p>
+      </div>
+      <div>
+        <van-button
+          type="default"
+          class="loginbtn"
+          size="large"
+          color="#1f1fbe"
+          @click="UserLogin"
+          >登 录</van-button
+        >
+      </div>
+      <!-- <div style="display: flex; justify-content: space-between">
+        <van-button
+          style="margin-top: 15rpx; width: 49%"
+          type="default"
+          size="large"
+          color="#1f1fbe"
+          @click="gozhfw"
+          >前往智慧法务</van-button
+        >
+        <van-button
+          style="margin-top: 15rpx; width: 49%"
+          type="default"
+          size="large"
+          color="#1f1fbe"
+          @click="goqy"
+          >前往企业端</van-button
+        >
+      </div> -->
+    </div>
+    <div class="loginBox" v-if="loginType == '管理'">
+      <div class="inputBox">
+        <img
+          src="https://www.idea-co-sf.com/gardenProduct/image/comicon.png"
+          alt=""
+          style="height: 60rpx"
+        />
+        <input
+          type="text"
+          placeholder="请输入账号"
+          v-model="loginForm.userName"
+        />
+      </div>
+      <div class="inputBox">
+        <img
+          src="https://www.idea-co-sf.com/gardenProduct/image/pswicon.svg"
+          alt=""
+        />
+        <input
+          type="password"
+          placeholder="请输入密码"
+          v-model="loginForm.password"
+        />
+      </div>
+      <div class="inputBox">
+        <img
+          src="https://www.idea-co-sf.com/gardenProduct/image/yzmicon.svg"
+          alt=""
+        />
+        <input
+          type="text"
+          placeholder="验证码"
+          class="yanzhengma"
+          v-model="loginForm.code"
+        />
+        <img
+          :src="loginForm.captchaImage"
+          @click="captchaImageRefresh(loginForm)"
+          class="yanzhengImg"
+        />
+      </div>
+      <div class="pswBox" @click="forgetPsw()">
+        <p>忘记密码？</p>
+      </div>
+      <div>
+        <van-button
+          type="default"
+          class="loginbtn"
+          size="large"
+          color="#1f1fbe"
+          @click="login"
+          >登 录</van-button
+        >
+      </div>
+      <!-- <div style="display: flex; justify-content: space-between">
+        <van-button
+          style="margin-top: 15rpx; width: 49%"
+          type="default"
+          size="large"
+          color="#1f1fbe"
+          @click="gozhfw"
+          >前往智慧法务</van-button
+        >
+        <van-button
+          style="margin-top: 15rpx; width: 49%"
+          type="default"
+          size="large"
+          color="#1f1fbe"
+          @click="goqy"
+          >前往企业端</van-button
+        >
+      </div> -->
+    </div>
+    <div class="bottomTips">
+      2022@copyrigtht IOT - Park-tech. supported by 中国移动
+    </div>
+    <van-dialog id="van-toast" />
+  </div>
+</template>
+<script>
+import Dialog from "../..//wxcomponents/weapp/dist/dialog/dialog.js";
+import { login, loginByCompany } from "@/js_sdk/http.js";
+
+export default {
+  data() {
+    return {
+      loginStatus: true,
+      loginType: "个人",
+      loginForm: {
+        userName: "",
+        password: "",
+        code: "",
+        type: "FRAME",
+        captchaId: "",
+        captchaImage: "",
+        rememberMe: true,
+      },
+    };
+  },
+  mounted() {
+    // login()
+    this.captchaImageRefresh(this.loginForm);
+  },
+  methods: {
+    changeLoginType(e) {
+      console.log(this.loginType);
+      this.loginStatus = false;
+      this.loginType = e;
+      this.loginStatus = true;
+    },
+    getPhoneNumber(e) {
+      wx.login({
+        success(res) {
+          console.log(res);
+          let data = {
+            loginCode: res.code,
+            phoneCode: e.detail.code,
+          };
+          loginByWeixin2(data).then((e) => {
+            console.log(e.data.user);
+            wx.setStorageSync("USERINFO", JSON.stringify(e.data.user));
+            uni.switchTab({
+              url: "/pages/index/index",
+            });
+          });
+        },
+      });
+    },
+    goqy() {
+      uni.navigateTo({
+        url: "/pages/subPackages/gocompnay/index",
+      });
+    },
+    gozhfw() {
+      wx.navigateToMiniProgram({
+        appId: "wx15404cced62d7b37",
+        success(res) {
+          // 打开成功
+        },
+        fail(e) {
+          console.log(e);
+        },
+      });
+    },
+    captchaImageRefresh: function (_form) {
+      _form.captchaId = this.$common.uuid(8);
+      _form.captchaImage =
+        this.$constant.BASE_URI +
+        "/captcha/captchaImage?type=math&captchaId=" +
+        _form.captchaId +
+        "&s=" +
+        Math.random();
+    },
+    forgetPsw() {
+      wx.showModal({
+        title: "提示！",
+        content: "管理端修改密码需要拨打客服电话咨询，是否拨打？",
+        success: function (res) {
+          if (res.confirm) {
+            uni.makePhoneCall({
+              phoneNumber: "", //电话号码
+              success: function (e) {},
+              fail: function (e) {},
+            });
+          }
+        },
+      });
+    },
+    UserLogin() {
+      const _this = this;
+      if (!this.loginForm.userName || !this.loginForm.password) {
+        uni.showModal({
+          title: "提示",
+          content: "请输入账号和密码",
+          icon: "error",
+          showCancel: false,
+        });
+        return;
+      }
+      wx.login({
+        success(e) {
+          console.log(e);
+          _this.loginForm.loginCode = e.code;
+          loginByCompany(_this.loginForm).then((res) => {
+            if (res.msg == "正常") {
+              uni.showToast({
+                title: "登录成功",
+                icon: "none",
+                mask: true,
+                duration: 2000,
+              });
+              wx.setStorageSync("USERINFO", JSON.stringify(res.user_));
+              uni.switchTab({
+                url: "/pages/index/index",
+              });
+            } else {
+              _this.captchaImageRefresh(_this.loginForm);
+            }
+          });
+        },
+      });
+      // this.$auth.setUserType(this.$auth.TYPE_FRAME);
+    },
+    login() {
+      const _this = this;
+      if (!this.loginForm.userName || !this.loginForm.password) {
+        uni.showModal({
+          title: "提示",
+          content: "请输入账号和密码",
+          icon: "error",
+          showCancel: false,
+        });
+        return;
+      }
+      wx.login({
+        success(e) {
+          console.log(e);
+          _this.loginForm.loginCode = e.code;
+          login(_this.loginForm).then((res) => {
+            console.log(res);
+            if (res.errmsg == "成功") {
+              uni.showToast({
+                title: "登录成功",
+                icon: "none",
+                mask: true,
+                duration: 2000,
+              });
+              console.log(res.data.user);
+              wx.setStorageSync("USERINFO", JSON.stringify(res.data.user));
+              uni.switchTab({
+                url: "/pages/index/index",
+              });
+            } else {
+              _this.captchaImageRefresh(_this.loginForm);
+            }
+          });
+        },
+      });
+
+      // this.$auth.setUserType(this.$auth.TYPE_FRAME);
+    },
+    onShareAppMessage: function () {},
+  },
+};
+</script>
+<style lang="scss">
+.login {
+  background: white;
+  height: 100%;
+  overflow: hidden;
+  .logintype {
+    width: 100%;
+    display: flex;
+    position: absolute;
+    top: 76vw;
+    justify-content: center;
+    .checkbox {
+      padding: 15rpx 20rpx;
+      border: 1px solid #1f1fbe;
+      border-radius: 0.2rem;
+      color: #1f1fbe;
+      width: 28.5%;
+      text-align: center;
+    }
+    .ischecked {
+      background: #1f1fbe;
+      color: white;
+    }
+  }
+  .logTit {
+    width: 80vw;
+    left: 10vw;
+    top: 60vw;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    position: absolute;
+    z-index: 1;
+    color: rgba(51, 51, 51, 1);
+    font-size: 4vw;
+    p {
+      color: rgba(102, 102, 102, 1);
+      font-size: 4vw;
+      margin-top: 0.5vw;
+    }
+
+    .titletxt {
+      font-size: 48rpx;
+      font-family: Taipei Sans TC Beta-Bold, Taipei Sans TC Beta;
+      font-weight: bold;
+      color: #333333;
+    }
+    .titletxt2 {
+      font-size: 32rpx;
+      font-family: PingFang SC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #666666;
+    }
+  }
+  .logobig {
+    width: 100vw;
+    height: 100vh;
+    position: absolute;
+    left: 0;
+    z-index: 0;
+  }
+
+  .loginBox {
+    width: 70vw;
+    left: 15vw;
+    top: 85vw;
+    position: absolute;
+  }
+  .inputBox {
+    position: relative;
+    display: flex;
+    align-items: center;
+    img {
+      position: absolute;
+      width: 7vw;
+      // padding-top: 40px;
+    }
+    .yanzhengImg {
+      right: 0;
+      width: 20vw;
+      height: 10vw;
+    }
+    .yanzhengImgBox {
+      height: 50px;
+      display: flex;
+      align-items: center;
+    }
+    input {
+      background: black;
+      width: 100%;
+      height: 76rpx;
+      padding: 5rpx 0 5rpx 70rpx;
+      background-color: rgba(255, 255, 255, 1);
+      border: 1rpx solid rgba(29, 24, 188, 0.05);
+      margin: 5rpx 0;
+      font-size: 4vw;
+    }
+    input::-webkit-input-placeholder {
+      color: rgba(153, 153, 153, 1);
+    }
+    .yanzhengma {
+      width: 60%;
+    }
+  }
+  .pswBox {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    margin: 20px 0;
+    color: rgba(29, 24, 188, 1);
+  }
+  .van-button {
+    margin-top: 15rpx;
+    border-radius: 60px;
+  }
+  .loginbtn {
+    margin-top: 50rpx;
+  }
+  .bottomTips {
+    width: 100vw;
+    position: fixed;
+    bottom: 15px;
+    text-align: center;
+    color: #999999;
+    font-size: 2vw;
+  }
+  @media screen and (max-height: 454px) {
+    .bottomTips {
+      display: none;
+    }
+  }
+}
+</style>

pages/mine/mine.vue

@@ -81,7 +81,7 @@ export default {
     return {
       userInfo: {},
       getUserLocalStorageInfo: getUserLocalStorageInfo(),
-      userType: true
+      userType: true,
     };
   },
   onLoad() {
@@ -90,16 +90,13 @@ export default {
   },
 
   methods: {
-    changeUserType(){
-      this.$nextTick(()=>{
-        uni.switchTab({
-          url: "/pages/index/index",
-          success: function (e) {
-            uni.$emit('userType', 'OK')
-          }
-        })
-      })
-
+    changeUserType() {
+      uni.navigateTo({
+        url: "/pages/login2/login",
+        success: function (e) {
+          // uni.$emit('userType', 'OK')
+        },
+      });
     },
     outLogin() {
       wx.showModal({

pages/subPackages/companyreport/companyreport.vue

@@ -153,6 +153,11 @@ export default {
   }
   .uni-forms-item {
     border-bottom: 2rpx solid #cccccc;
+    display: flex;
+    align-items: center;
+    margin-top: 0rpx !important;
+    margin-bottom: 0rpx !important;
+    padding-bottom: 0rpx !important;
   }
 }
 </style>

pages/subPackages/companyreport/components/goReport.vue

@@ -5,12 +5,9 @@
         ref="baseForm"
         style="font-size: 26rpx"
         :modelValue="form"
-        label-width="170rpx"
+        label-width="190rpx"
       >
-        <uni-forms-item
-          label="走访公司"
-          class="mt42rpx pd42rpx border_bottom_ccc"
-        >
+        <uni-forms-item label="走访公司" class="border_bottom_ccc">
           <div
             @click="chosseAboutCompany()"
             style="height: 73rpx; line-height: 73rpx"
@@ -22,10 +19,7 @@
             }}
           </div>
         </uni-forms-item>
-        <uni-forms-item
-          label="走访时间："
-          class="mt42rpx pd42rpx border_bottom_ccc"
-        >
+        <uni-forms-item label="走访时间：" class="border_bottom_ccc">
           <div style="line-height: 73rpx">
             <!-- <picker
               style="float: left; width: 100%; height: 40rpx; color: #777"
@@ -43,10 +37,7 @@
           </div>
         </uni-forms-item>
 
-        <uni-forms-item
-          label="走访类型："
-          class="mt42rpx pd42rpx border_bottom_ccc"
-        >
+        <uni-forms-item label="走访类型：" class="border_bottom_ccc">
           <div style="height: 73rpx; line-height: 73rpx">
             <picker
               style="float: left; width: 100%; height: 40rpx; color: #777"
@@ -63,11 +54,15 @@
             </picker>
           </div>
         </uni-forms-item>
-        <uni-forms-item
-          label="是否需要处理"
-          class="mt42rpx pd42rpx border_bottom_ccc"
-        >
-          <div style="height: 73rpx; line-height: 73rpx">
+        <uni-forms-item label="是否需要处理" class="border_bottom_ccc">
+          <div
+            style="
+              height: 73rpx;
+              line-height: 73rpx;
+              display: flex;
+              align-items: center;
+            "
+          >
             <uni-data-checkbox
               v-model="form.isStatus"
               :localdata="range"
@@ -398,8 +393,6 @@ export default {
   }
   .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;
@@ -430,7 +423,8 @@ export default {
     .uni-forms-item {
       border-bottom: 2rpx solid #cccccc !important;
       margin-top: 42rpx !important;
-      padding-bottom: 42rpx !important;
+      margin-bottom: 0 !important;
+      // padding-bottom: 42rpx !important;
     }
   }
 }

pages/subPackages/companyreport/components/reportHistory.vue

@@ -135,8 +135,8 @@ export default {
     },
     changeActive() {
       this.$emit("changeActive");
-      const token = uni.getStorageSync("laocui_user_info");
-      this.search.createdBy = JSON.parse(token).user.id;
+      // const token = uni.getStorageSync("laocui_user_info");
+      // this.search.createdBy = JSON.parse(token).user.id;
       this.getInterviewList();
       this.getByCodes();
     },
@@ -169,8 +169,8 @@ export default {
     },
 
     async getInterviewList() {
-      const token = uni.getStorageSync("laocui_user_info");
-      this.search.createdBy = JSON.parse(token).user.id;
+      // 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;

pages/subPackages/merchants/components/mymechants.vue

@@ -60,6 +60,7 @@
         <van-tab
           v-for="item in dic_SelectList.project_status"
           :title="item.label"
+          :key="item.id"
           :name="item.value"
         ></van-tab>
       </van-tabs>
@@ -201,7 +202,7 @@ export default {
       dic_key: ["project_status"],
       dic_SelectList: {},
       rowId: "",
-      created_by: getUserLocalStorageInfo().user.id,
+      // created_by: getUserLocalStorageInfo().user.id,
       projectStatusList: [
         { name: "跟进中", value: 1 },
         { name: "已确认", value: 2 },
@@ -213,7 +214,7 @@ export default {
       acitvy: 0,
       form: {
         ...form,
-        truename: getUserLocalStorageInfo().user.truename,
+        truename: "",
       },
       active: 0,
       formData: {},
@@ -333,7 +334,7 @@ export default {
   },
   onLoad() {},
   mounted() {
-    this.form.truename = getUserLocalStorageInfo().user.truename;
+    // this.form.truename = getUserLocalStorageInfo().user.truename;
     this.findYuanQuList();
     this.getByCodes();
     this.firstfindCompanyInfoList();
@@ -390,6 +391,7 @@ export default {
       this.firstfindCompanyInfoList();
     },
     async firstfindCompanyInfoList() {
+      console.log(this.form);
       this.form.pageNum = 1;
       let data = await findCompanyInfoList({
         ...this.form,

pages/subPackages/repairprocessing-app/index.vue

@@ -87,10 +87,10 @@ export default {
     };
   },
   onShow() {
-    this.parmas =
-      getUserLocalStorageInfo().user.id +
-      getUserLocalStorageInfo().user.truename +
-      getUserLocalStorageInfo().user.phone;
+    // this.parmas =
+    //   getUserLocalStorageInfo().user.id +
+    //   getUserLocalStorageInfo().user.truename +
+    //   getUserLocalStorageInfo().user.phone;
     this.getByCodes();
   },
 
@@ -114,7 +114,7 @@ export default {
     selectData() {
       const _this = this;
       _this.recordList = [];
-      _this.params;
+
       getRepairList(this.params).then((res) => {
         console.log(res.data);
         if (res.data) {

pages/subPackages/toread/index.vue

@@ -71,7 +71,7 @@ export default {
   },
   onShow() {
     // this.getByCodes();
-    this.search.userId = getUserLocalStorageInfo().user.id;
+    this.search.userId = getUserLocalStorageInfo().id;
     this.getreadList();
   },
   methods: {

pages/utils/constant.js

@@ -1,10 +1,10 @@
 // 系统常量
 // export const BASE_URI = "http://192.168.2.111:9011"; // 正式
-export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
+// export const BASE_URI = 'https://www.idea-co-sf.com/gardenProductApi'
 // 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"; // 老崔本地
-// export const BASE_URI = "http://192.168.2.112:9011"; // 许峰本地
+export const BASE_URI = "http://192.168.2.106:9011"; // 许峰本地
 // export const BASE_URI = "http://192.168.2.112:9010"; // 陈凡本地
 
 export default {

unpackage/dist/dev/mp-weixin/app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/login/login",
+    "pages/login2/login",
     "pages/index/index",
     "pages/mine/mine"
   ],

unpackage/dist/dev/mp-weixin/pages/index/components/activity.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/index/components/activity.wxss

@@ -0,0 +1,265 @@
+@charset "UTF-8";
+/* 文字尺寸 */
+/*文字颜色*/
+/* 边框颜色 */
+/* 图片加载中颜色 */
+/* 行为相关颜色 */
+.normal-tip {
+  font-size: 24rpx;
+  line-height: 40rpx;
+  padding: 4rpx 10rpx;
+}
+.normal-tip.by {
+  border-radius: 20rpx;
+}
+.normal-tip.yd {
+  border-radius: 5rspx;
+}
+.fixed-page-content {
+  width: 100%;
+  height: 100%;
+  padding-bottom: 120rpx;
+  box-sizing: border-box;
+}
+.page-content {
+  width: 100%;
+  height: 100%;
+}
+.white-box {
+  width: 100%;
+  font-size: 28rpx;
+  padding: 0 40rpx;
+  background-color: #ffffff;
+  box-sizing: border-box;
+}
+.white-box:not(:last-child) {
+  margin-bottom: 30rpx;
+}
+.white-box .flex-item {
+  align-items: center;
+}
+.white-box .flex-item .tel-box {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+.white-box .flex-item .tel-box .custom-tel-component {
+  margin-left: 20rpx;
+}
+.white-box .cell-item {
+  color: var(--Black);
+  padding: 30rpx 0;
+  display: flex;
+  justify-content: space-between;
+  position: relative;
+}
+.white-box .cell-item::after {
+  position: absolute;
+  box-sizing: border-box;
+  content: ' ';
+  pointer-events: none;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  border-bottom: 2rpx solid #ebedf0;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+}
+.white-box .cell-item > .label {
+  flex: 1;
+  width: 30%;
+}
+.white-box .cell-item > .label .tips {
+  font-size: 22rpx;
+  color: var(--greyColor);
+}
+.white-box .cell-item > .label.required {
+  position: relative;
+}
+.white-box .cell-item > .label.required::after {
+  content: '*';
+  color: var(--Red);
+  position: absolute;
+  font-size: 30rpx;
+  top: -15rpx;
+  left: -15rpx;
+}
+.white-box .cell-item > .tit {
+  color: var(--Black);
+  flex: 1;
+  width: 70%;
+  text-align: right;
+}
+.white-box .cell-item > .tit .van-radio-group {
+  display: flex;
+  justify-content: flex-end;
+}
+.white-box .cell-item > .tit .van-radio-group .van-radio:not(:first-child) {
+  margin-left: 30rpx;
+}
+.white-box .block-cell-item {
+  color: var(--Black);
+  padding: 30rpx 0;
+  position: relative;
+}
+.white-box .block-cell-item::after {
+  position: absolute;
+  box-sizing: border-box;
+  content: " ";
+  pointer-events: none;
+  right: 16rpx;
+  bottom: 0;
+  left: 16rpx;
+  border-bottom: 2rpx solid #ebedf0;
+  -webkit-transform: scaleY(0.5);
+  transform: scaleY(0.5);
+}
+.white-box .block-cell-item .label {
+  width: 100%;
+  padding-bottom: 30rpx;
+}
+.white-box .block-cell-item .label.required {
+  position: relative;
+}
+.white-box .block-cell-item .label.required::after {
+  content: '*';
+  color: var(--Red);
+  position: absolute;
+  font-size: 30rpx;
+  top: -15rpx;
+  left: -15rpx;
+}
+.white-box .block-cell-item .label .tips {
+  font-size: 22rpx;
+  color: var(--greyColor);
+}
+.white-box .block-cell-item .tit {
+  width: 100%;
+  color: var(--Black);
+}
+.white-box .block-cell-item .tit .van-radio-group {
+  display: flex;
+  justify-content: flex-end;
+}
+.white-box .block-cell-item .tit .van-radio-group .van-radio:not(:first-child) {
+  margin-left: 30rpx;
+}
+.white-box .block-cell-item .tit .textarea {
+  background-color: #F8F8F8;
+  font-size: 30rpx;
+  color: #B7B7B7;
+  border-radius: 10rpx;
+  padding: 30rpx;
+  word-break: break-all;
+}
+.white-box .custom-white-box-content {
+  padding-bottom: 30rpx;
+}
+.z-bg {
+  background: #6600ff;
+  color: #fff;
+}
+.l-bg {
+  background: #0000FF;
+  color: #fff;
+}
+.h-bg {
+  background: #F87A7A;
+  color: #fff;
+}
+.z-br {
+  background: #fff;
+  border: 1px solid #6600ff;
+  color: #6600ff;
+}
+.chaochuyincang {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.activity .activityItem {
+  width: 702rpx;
+  height: 216rpx;
+  background: #f5f7fa;
+  padding: 0 24rpx;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  border-radius: 16rpx;
+  margin: 12rpx 0;
+}
+.activity .activityItem .itemBg {
+  width: 220rpx;
+  height: 160rpx;
+}
+.activity .activityItem .activityItemRight {
+  display: flex;
+  flex-direction: column;
+  margin-left: 24rpx;
+}
+.activity .activityItem .activityItemRight .activityItemRightTop {
+  width: 420rpx;
+  display: flex;
+  justify-content: space-between;
+}
+.activity .activityItem .activityItemRight .activityItemRightTop .activityItemRightName {
+  width: 280rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: #18172a;
+  font-size: 28rpx;
+}
+.activity .activityItem .activityItemRight .activityItemRightTop .activityItemRightType {
+  padding: 2rpx 12rpx;
+  background: rgba(3, 101, 249, 0.2);
+  color: #0365f9;
+  border-radius: 4rpx;
+  font-size: 24rpx;
+}
+.activity .activityItem .activityItemRight .canyu {
+  font-size: 28rpx;
+  color: #666666;
+  margin: 14rpx 0;
+}
+.activity .activityItem .activityItemRight .activityItemRightBottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.activity .activityItem .activityItemRight .activityItemRightBottom .shoucang {
+  display: flex;
+  align-items: center;
+  font-size: 28rpx;
+  color: #8d929b;
+}
+.activity .activityItem .activityItemRight .activityItemRightBottom .shoucang .scImg {
+  width: 32rpx;
+  height: 28rpx;
+  margin-right: 8rpx;
+}
+.activity .activityItem .activityItemRight .activityItemRightBottom .baoming {
+  width: 160rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  background: linear-gradient(316deg, #84aaff 0%, #0365f9 100%);
+  border-radius: 32rpx;
+  font-size: 28rpx;
+  color: white;
+}
+.activity .activityItem .activityItemRight .activityItemRightBottom .baoming2 {
+  width: 160rpx;
+  height: 60rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 28rpx;
+  background: #e2e8ef;
+  border-radius: 32rpx;
+  font-size: 28rpx;
+  color: #8d929b;
+}
+