修改计划名称不变化

src/config/env.js

@@ -1,10 +1,11 @@
 //本地环境
 // let baseUrl="http://139.186.135.156:86";
 // let baseUrl="http://10.132.108.1:85";
+//正式环境
+// let baseUrl="http://jdm.szssfj.cn/jdmApi";
+//测试环境
 // let baseUrl="http://jdm.szssfj.cn/jdmTestApi";
-//let baseUrl="http://jdm.szssfj.cn/jdmTestApi";
-//let baseUrl="http://192.168.110.35:85";
-let baseUrl="http://192.168.110.41:85";
+let baseUrl="http://localhost:85";
 // let wsUrl='ws://10.76.108.1:9326';
 export {
     baseUrl,

src/views/Home.vue

@@ -1,6 +1,6 @@
 <template>
-<!--     <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>-->
-<!--    <div class="home app_content" v-if="!isLoading">-->
+  <!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/> -->
+ <!-- <div class="home app_content" v-if="!isLoading"> -->
    <div class="home app_content">
      <!-- 导航栏 -->
      <!--		<div class="header_body">-->
@@ -139,16 +139,6 @@
 
  const getEnterpriseMerchant = (phoneNumber) => {
      getEnterpriseMerchantAuthorization({merchantTel: phoneNumber}, success => {
-            console.log("-----> : ", success);
-            if (!(success.data == null && success.data.length == 0)) {
-                useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
-            }
-        }, error => {
-        })
-    }
-
-    const getEnterpriseMerchant2 = (enterpriseNumber) => {
-        getEnterpriseMerchantAuthorization({enterpriseNumber: enterpriseNumber}, success => {
          if (!(success.data == null && success.data.length == 0)) {
              useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
          }
@@ -157,12 +147,14 @@
  }
 
  onMounted(() => {
+     // console.log(useCommon.phonenumber)
      // useCommon.SET_USER_PHONENUMBER(success.data.phonenumber);
      // new Vconsolefrom();
 
      // const access_key = '6374106c5eb449a4ad6c2430f30796e6';
      // const access_secret = '434fec85aa5846e88bbeb8fac6cf6d7f';
      // generateRandomNumber()
+     console.log(useCommon.firstLoad);
      isLoading.value = useCommon.firstLoad;
      siqCode(null, success => {
          let access_key = "";
@@ -183,17 +175,19 @@
          const signature = sha1(str).toString().toLowerCase();
 
          //深i企鉴权测试
-            // // getSiqLoginAuthTest({userId: "1430910304107227029", userName: "韦婵娟"}, success => {
+         // getSiqLoginAuthTest({userId: "1608644307579883522", userName: "汪鑫"}, success => {
          // getSiqLoginAuthTest({userId: "1795031916332843009", userName: "陈瑞"}, success => {
-            //     console.log("-----> getSiqLoginAuthTest : ", success);
+         //     console.log(success.data);
          //     useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
          //     useCommon.SET_USER_ID(success.data.userId);
+         //     console.log("-----> success.data: ", success.data);
          //     useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
          //     useCommon.SET_TOKEN(success.data.token);
+         //     console.log("-----> useCommon.userId: ", useCommon.userId);
+         //     console.log("-----> useCommon.firstLoad: ", useCommon.firstLoad);
          //      //设置已经初始化
          //     useCommon.SET_IS_FIRST_LOAD(false)
-            //     // getEnterpriseMerchant(success.data.phonenumber.toString());
-            //     getEnterpriseMerchant2(success.data.enterpriseNumber);
+         //     getEnterpriseMerchant(success.data.phonenumber.toString());
          //     isLoading.value = false;
          // }, error => {
          // })
@@ -212,7 +206,7 @@
              // console.log(err)
              console.log("鉴权", err);
              // todo 临时工
-                getEnterpriseMerchant2(useCommon.enterpriseNumber);
+             getEnterpriseMerchant(useCommon.phonenumber.toString());
          });
 
          w6s.ready(() => {
@@ -237,7 +231,7 @@
                          }
                            //设置已经初始化
                          useCommon.SET_IS_FIRST_LOAD(false)
-                            getEnterpriseMerchant2(useCommon.enterpriseNumber);
+                         getEnterpriseMerchant(success.data.phonenumber.toString());
                          isLoading.value = false;
                      }, error => {
                          console.log("error : " + error)
@@ -291,6 +285,7 @@
              height: 4rem;
              width: 100%;
              padding-bottom: 0.27rem;
+
          }
 
      }
@@ -298,7 +293,8 @@
      .boutique_box {
          position: absolute;
          width: 100%;
-            bottom: 0.5rem;
+         bottom: calc(0.5rem + constant(safe-area-inset-bottom));
+         bottom: calc(0.5rem + env(safe-area-inset-bottom));
 
          .boutique_body {
              padding: 0 0 0.27rem 0;

src/views/enforceHome.vue

@@ -1,6 +1,6 @@
 <template>
-<!--   <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
-   <div class="home app_content" v-if="!isLoading">-->
+   <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
+   <!-- <div class="home app_content" v-if="!isLoading"> -->
     <div class="home app_content">
         <!-- 导航栏 -->
         <!-- <div class="header_body">