..

src/app.jsx

@@ -87,11 +87,11 @@ class App extends Component {
         'token': token,
       },
       // 生产
-      // url: 'wss://bm.jishutao.com/webSocketServer',
+      url: 'wss://bm.jishutao.com/webSocketServer',
       // 本地
       // url: 'wss://172.16.1.199:8080/webSocketServer'
       // 测试
-      url: 'wss://uat.jishutao.com/webSocketServer'
+      // url: 'wss://uat.jishutao.com/webSocketServer'
     })
 
     //连接成功

src/components/common/addressPicker/index.jsx

@@ -77,7 +77,7 @@ class AddressPicker extends Component {
     const { provinces, citys, areas, value } = this.state
     const { pickerShow } = this.props
     return (
-      <View className={pickerShow ? 'address-picker-container show' : 'address-picker-container'} onClick={this.handlePickerShow.bind(this, false)}>
+      <View className={pickerShow ? 'address-picker-containers' : 'address-picker-container'} onClick={this.handlePickerShow.bind(this, false)}>
         <View className="picker-content" onClick={e => { e.stopPropagation() }}>
           <View className="dialog-header">
             <View className="dialog-button cancel" onClick={this.handlePickerShow.bind(this, false)}>取消</View>

src/components/common/addressPicker/index.less

@@ -2,7 +2,7 @@
   width: 100%;
   height: 100vh;
   display: flex;
-  z-index: 12;
+  z-index: 999;
   background: rgba(0, 0, 0, 0.7);
   flex-direction: column;
   justify-content: center;
@@ -11,15 +11,36 @@
   bottom: 0px;
   left: 0px;
   visibility: hidden;
-  &.show {
-      visibility: visible;
-      .picker-content {
-          transform: translateY(0);
-          transition: all 0.4s ease;
-      }
+  // &.show {
+  //     visibility: visible;
+  //     .picker-content {
+  //         transform: translateY(0);
+  //         transition: all 0.4s ease;
+  //     }
+  // }
+}
+
+.address-picker-containers {
+  width: 100%;
+  height: 100vh;
+  display: flex;
+  z-index: 999;
+  background: rgba(0, 0, 0, 0.7);
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  position: fixed;
+  bottom: 0px;
+  left: 0px;
+  visibility: visible;
+
+  .picker-content {
+    transform: translateY(0);
+    transition: all 0.4s ease;
   }
 }
 
+
 .picker-content {
   position: absolute;
   width: 100%;
@@ -29,8 +50,8 @@
   transition: all 0.4s ease;
 
   .picker-view-wrap {
-      width: 100%;
-      height: 500px;
+    width: 100%;
+    height: 500px;
   }
 }
 
@@ -48,17 +69,18 @@
   align-items: center;
 
   .dialog-title {
-      color: #333;
+    color: #333;
   }
 
   .dialog-button {
-      display: inline-block;
-      text-align: center;
-      font-size: 32px;
-      color: #E28E81;
-      padding: 30px;
-      &.cancel {
-          color: #666;
-      }
+    display: inline-block;
+    text-align: center;
+    font-size: 32px;
+    color: #E28E81;
+    padding: 30px;
+
+    &.cancel {
+      color: #666;
+    }
   }
 }

src/pages/addEnterprise/index.less

@@ -15,6 +15,8 @@
       .atit {
         width: 172px;
         margin-right: 16px;
+        font-size: 32px;
+        color: #333333;
 
         .atip {
           display: inline-block;

src/pages/egressDetails/index.jsx

@@ -253,13 +253,14 @@ class EgressDetails extends Component {
       Taro.showToast({ title: "请填写审批意见", icon: "none" });
       return;
     }
-    // Taro.showLoading({ title: "加载中..." });
-
-    let isSuperior = this.state.dtails.publicType == 1
-      ? (this.state.dtails.type == 0 ? 2 : this.state.dtails.type == 1 && 3)
-      : this.state.dtails.assistProcess == 2
-        ? 4
-        : 1
+    Taro.showLoading({ title: "提交中..." });
+    let isSuperior = this.state.dtails.techStartProcess == 1  // 技术审核
+      ? 3
+      : this.state.dtails.publicType == 1   // 营销审核
+        ? 2
+        : this.state.dtails.assistProcess == 2  // 协单审核
+          ? 4
+          : 1  // 上级审核
     examinePublicRelease(
       isSuperior,
       {

src/utils/config.js

@@ -1,7 +1,7 @@
 // 本地
-// export const resourceAddress = 'http://172.16.1.199/:3000/upload;'
+export const resourceAddress = 'http://172.16.1.199/:3000/upload;'
 // 生产
 // export const resourceAddress = 'https://s.jishutao.com/upload';
 // 测试
-export const resourceAddress = 'https://static.jishutao.com/upload';
+// export const resourceAddress = 'https://static.jishutao.com/upload';
 

src/utils/servers/baseUrl.js

@@ -7,8 +7,8 @@ const getBaseUrl = (url) => {
     BASE_URL = 'https://bm.jishutao.com'
   } else {
     // 生产环境
-    // BASE_URL = 'http://172.16.1.199:8080'
-    BASE_URL = 'https://uat.jishutao.com'
+    BASE_URL = 'http://172.16.1.199:8080'
+    // BASE_URL = 'https://uat.jishutao.com'
     // BASE_URL = 'https://bm.jishutao.com'
   }
   return BASE_URL