单位采集内容修改

src/pages/business/mhxf/unitInfoCollection/index.vue

@@ -154,7 +154,11 @@
                 />
               </u-form-item>
 
-              <view v-if="li.baseBuild.useCharacter == '厂房' || li.baseBuild.useCharacter == '仓库'">
+              <view
+                v-if="
+                  li.baseBuild.useCharacter == '生产类厂房' || li.baseBuild.useCharacter == '仓库、物流' || li.baseBuild.useCharacter == '涉及易燃易爆危险品的单位（生产、充装、储存、供应、销售等）'
+                "
+              >
                 <view style="margin: 10px 0; text-align: center">危险品生产数量（吨/月）</view>
                 <u-form-item label="甲类" prop="li.baseBuildAttach.hazardousProduceA" :borderBottom="true">
                   <u-input type="number" v-model="li.baseBuildAttach.hazardousProduceA" placeholder="请输入甲类" border="none" maxlength="24" />
@@ -323,157 +327,85 @@ const publicStores = publicStore();
 
 const checkboxValue = ref([]);
 
+//基本信息-单位使用性质下拉数据存储
+const companyNatureList = ref([
+  [
+    { value: 1, name: "餐饮场所" },
+    { value: 2, name: "超市" },
+    { value: 3, name: "宾（旅）馆" },
+    { value: 4, name: "商场" },
+    { value: 5, name: "集贸市场" },
+    { value: 6, name: "体育场馆、会堂" },
+    { value: 7, name: "影剧院、放映厅（录像厅）、礼堂等演出、放映场所" },
+    { value: 8, name: "歌舞娱乐场所（含KTV、夜总会、具有娱乐功能的餐饮场所）" },
+    { value: 9, name: "网吧" },
+    { value: 10, name: "棋牌室" },
+    { value: 11, name: "美容院(含SPA、瘦身等)" },
+    { value: 12, name: "足浴" },
+    { value: 13, name: "浴室(含洗浴、桑拿按摩、汗蒸等)" },
+    { value: 14, name: "营业性健身、休闲场所" },
+    { value: 15, name: "托儿所幼儿园" },
+    { value: 16, name: "中小学校" },
+    { value: 17, name: "大学" },
+    { value: 18, name: "教育培训机构(含早教中心、亲子活动场所等）" },
+    { value: 19, name: "养老院" },
+    { value: 20, name: "福利院" },
+    { value: 21, name: "医院" },
+    { value: 22, name: "月子会所" },
+    { value: 23, name: "公共图书馆、展览馆、博物馆" },
+    { value: 24, name: "宗教活动场所" },
+    { value: 25, name: "机场航站楼、客运车站候车室、客运码头候船厅" },
+    { value: 26, name: "政府机关" },
+    { value: 27, name: "广播电台、电视台和邮政、通信枢纽" },
+    { value: 28, name: "文物保护单位" },
+    { value: 29, name: "具有生产性质的厂房" },
+    { value: 30, name: "大型仓库、物流企业" },
+    { value: 31, name: "综合性工业企业、园区（含生产、仓库等）" },
+    { value: 32, name: "其他" },
+  ],
+]);
 //建筑-建筑结构下拉数据存储
 const buildStructureList = ref([
   [
-    {
-      value: 2,
-      name: "钢筋混凝土",
-    },
-    {
-      value: 1,
-      name: "砖混结构",
-    },
-    {
-      value: 3,
-      name: "钢结构",
-    },
-    {
-      value: 4,
-      name: "大型钢筋混凝土",
-    },
-    {
-      value: 5,
-      name: "木质结构",
-    },
-    {
-      value: 6,
-      name: "砖木结构",
-    },
+    { value: 2, name: "钢筋混凝土" },
+    { value: 1, name: "砖混结构" },
+    { value: 3, name: "钢结构" },
+    { value: 4, name: "大型钢筋混凝土" },
+    { value: 5, name: "木质结构" },
+    { value: 6, name: "砖木结构" },
   ],
 ]);
 //建筑-使用性质下拉数据存储
 const useCharacterList = ref([
   [
-    {
-      value: 1,
-      name: "大型综合体",
-    },
-    {
-      value: 2,
-      name: "餐饮场所",
-    },
-    {
-      value: 3,
-      name: "宾馆（旅馆）",
-    },
-    {
-      value: 4,
-      name: "商场",
-    },
-    {
-      value: 5,
-      name: "办公",
-    },
-    {
-      value: 6,
-      name: "科研",
-    },
-    {
-      value: 7,
-      name: "影剧院（放映厅、礼堂）",
-    },
-    {
-      value: 8,
-      name: "歌舞娱乐场所（含具有娱乐功能的茶座、餐饮场所）",
-    },
-    {
-      value: 9,
-      name: "游艺游乐场所（含网吧、棋牌、游艺厅等）",
-    },
-    {
-      value: 10,
-      name: "营业性健身休闲场所（含健身、旱冰场、洗浴、美容等）",
-    },
-
-    {
-      value: 11,
-      name: "集贸市场",
-    },
-    {
-      value: 12,
-      name: "医院",
-    },
-
-    {
-      value: 13,
-      name: "学校",
-    },
-    {
-      value: 14,
-      name: "养老机构",
-    },
-    {
-      value: 15,
-      name: "图书展览馆",
-    },
-    {
-      value: 16,
-      name: "大型宗教场所",
-    },
-    {
-      value: 17,
-      name: "体育场馆",
-    },
-    {
-      value: 18,
-      name: "客运站（航站楼、候船厅）",
-    },
-    {
-      value: 19,
-      name: "厂房",
-    },
-    {
-      value: 20,
-      name: "仓库",
-    },
-    {
-      value: 21,
-      name: "涉及易燃易爆危险品的单位（生产、充装、储存、供应、销售等）",
-    },
-    {
-      value: 22,
-      name: "其他",
-    },
+    { value: 1, name: "大型综合体" },
+    { value: 2, name: "商业" },
+    { value: 3, name: "办公" },
+    { value: 4, name: "住宿" },
+    { value: 5, name: "科研" },
+    { value: 6, name: "政府机关" },
+    { value: 7, name: "医院、医疗机构" },
+    { value: 8, name: "学校" },
+    { value: 9, name: "宗教场所" },
+    { value: 10, name: "客运站（航站楼、候船厅）" },
+    { value: 11, name: "展览、博物馆" },
+    { value: 12, name: "体育场馆" },
+    { value: 13, name: "客运站（航站楼、候船厅）" },
+    { value: 14, name: "生产类厂房" },
+    { value: 15, name: "仓库、物流" },
+    { value: 16, name: "涉及易燃易爆危险品的单位（生产、充装、储存、供应、销售等）" },
+    { value: 17, name: "其他（需具体填写）" },
   ],
 ]);
 //建筑-灭火器下拉数据存储
 const extinguishTypeList = ref([
   [
-    {
-      value: 1,
-      name: "水基型灭火器",
-    },
-    {
-      value: 2,
-      name: "干粉灭火器",
-    },
-    {
-      value: 3,
-      name: "洁净气体灭火器",
-    },
-    {
-      value: 4,
-      name: "二氧化碳灭火器",
-    },
-    {
-      value: 5,
-      name: "泡沫灭火器",
-    },
-    {
-      value: 6,
-      name: "其他灭火器",
-    },
+    { value: 1, name: "水基型灭火器" },
+    { value: 2, name: "干粉灭火器" },
+    { value: 3, name: "洁净气体灭火器" },
+    { value: 4, name: "二氧化碳灭火器" },
+    { value: 5, name: "泡沫灭火器" },
+    { value: 6, name: "其他灭火器" },
   ],
 ]);
 
@@ -1053,96 +985,7 @@ function handleAction(value, index, ind) {
   if (value == "单位使用性质") {
     actionTitle.value = "单位使用性质";
 
-    actionsList.value = [
-      [
-        {
-          value: 1,
-          name: "餐饮场所",
-        },
-        {
-          value: 2,
-          name: "宾馆（旅馆）",
-        },
-        {
-          value: 3,
-          name: "商场",
-        },
-        {
-          value: 4,
-          name: "办公",
-        },
-        {
-          value: 5,
-          name: "科研",
-        },
-        {
-          value: 6,
-          name: "影剧院（放映厅、礼堂）",
-        },
-        {
-          value: 7,
-          name: "歌舞娱乐场所（含具有娱乐功能的茶座、餐饮场所）",
-        },
-        {
-          value: 8,
-          name: "游艺游乐场所（含网吧、棋牌、游艺厅等）",
-        },
-        {
-          value: 9,
-          name: "营业性健身休闲场所（含健身、旱冰场、洗浴、美容等）",
-        },
-
-        {
-          value: 10,
-          name: "集贸市场",
-        },
-        {
-          value: 11,
-          name: "医院",
-        },
-
-        {
-          value: 12,
-          name: "学校",
-        },
-        {
-          value: 13,
-          name: "养老机构",
-        },
-        {
-          value: 14,
-          name: "图书展览馆",
-        },
-        {
-          value: 15,
-          name: "大型宗教场所",
-        },
-        {
-          value: 16,
-          name: "体育场馆",
-        },
-        {
-          value: 17,
-          name: "客运站（航站楼、候船厅）",
-        },
-        {
-          value: 18,
-          name: "厂房",
-        },
-        {
-          value: 19,
-          name: "仓库",
-        },
-        {
-          value: 20,
-          name: "涉及易燃易爆危险品的单位（生产、充装、储存、供应、销售等）",
-        },
-        {
-          value: 21,
-          name: "其他",
-        },
-      ],
-    ];
+    actionsList.value = companyNatureList.value;
 
     actionDefaultIndex.value = 0;
   }
@@ -1258,6 +1101,7 @@ function selectAction(e) {
           el.baseBuild.buildStructure = e.name;
         }
       });
+
       //使用性质
       useCharacterList.value[0].forEach((e) => {
         if (e.value == el.baseBuild.useCharacter) {

src/pages/login.vue

@@ -50,8 +50,8 @@
       <!--  -->
       <button class="submit" @click="submitRes">登 录</button>
 
-      <view class="switchText" @click="switchMode">
-        <text>{{ switchText }}</text>
+      <view class="switchText">
+        <text @click="switchMode">{{ switchText }}</text>
       </view>
 
       <!-- #ifdef APP-PLUS -->
@@ -128,7 +128,7 @@ function switchMode() {
 function getVerifyCode() {
   //#ifdef APP-PLUS
   if (!uni.getStorageSync("serveUrl")) {
-    proxy.$modal.msg("首次登录请先进行服务器配置");
+    proxy.$modal.msg("首次账号登录请先配置服务器");
     return;
   }
   //#endif
@@ -180,19 +180,6 @@ function env() {
   // }else{
   // }
 
-  //#ifdef H5
-  linkUrl.value = window.location.host;
-  // linkUrl.value = window.location.host;
-  // linkUrl.value='ces.cn';
-  // linkUrl.value='172.16.120.165:13203'
-  getMobileTenantConfigApi({ url: linkUrl.value });
-  //#endif
-
-  //  uni.showToast({
-  //   title: '服务器链接地址为'+linkUrl,
-  //   icon: "none",
-  // })
-
   //  let port = uni.getSystemInfoSync().platform;
   // switch (port) {
   //   case "android":
@@ -210,6 +197,21 @@ function env() {
   //     console.log("小程序");
   //     break;
   // }
+
+  //#ifdef H5
+  linkUrl.value = window.location.host;
+  // linkUrl.value = window.location.host;
+  // linkUrl.value='ces.cn';
+  // linkUrl.value='172.16.120.165:13203'
+  getMobileTenantConfigApi({ url: linkUrl.value });
+  //#endif
+
+  //#ifdef APP-PLUS
+  if (uni.getStorageSync("serveUrl")) {
+    linkUrl.value = uni.getStorageSync("serveUrl");
+    getMobileTenantConfigApi({ url: linkUrl.value });
+  }
+  //#endif
 }
 
 /** 点击提交按钮 */

src/pages/mine/index.vue

@@ -21,7 +21,7 @@
     </view>
 
     <view class="content-section">
-      <view class="mine-actions grid col-4 text-center">
+      <!-- <view class="mine-actions grid col-4 text-center">
         <view class="action-item" @click="handleJiaoLiuQun">
           <view class="iconfont icon-friendfill text-pink icon"></view>
           <text class="text">客服QQ</text>
@@ -38,7 +38,7 @@
           <view class="iconfont icon-dianzan text-green icon"></view>
           <text class="text">点赞我们</text>
         </view>
-      </view>
+      </view> -->
 
       <view class="menu-list">
         <view class="list-cell list-cell-arrow" @click="handleToEditInfo">