commit

config/dev.js

@@ -5,13 +5,13 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    HOST: '"https://dev.jinchengjiaye.com"',//测试
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.2.52:8080"',
-    WSS_HOST: '"ws://192.168.2.52:8080"',
-    Version:'V3.5.2.2_12102'
+    // HOST: '"http://192.168.2.52:8080"',
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
+    Version: 'V3.5.2.2_121112'
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -5,11 +5,11 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.0.218:8080"',
     // WSS_HOST: '"ws://192.168.0.218:8080"',
-    // HOST: '"https://dev.jinchengjiaye.com"',//测试
-    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    HOST: '"https://lt.pawoma.cn"',
-    WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version:'V3.5.2.2_2019-12-10'
+    HOST: '"https://dev.jinchengjiaye.com"',//测试
+    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST: '"https://lt.pawoma.cn"',
+    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    Version:'V3.5.2.2_2019-12-11'
   },
   weapp: {},
   h5: {}

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "尾房宝",
-	"appid": "wx755faa4b3ec76cd3",
+	"description": "知与行联调",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/app.scss

@@ -58,4 +58,7 @@
       color: #666;
     }
   }
+}
+.wxParse-inline {
+  line-height: 50px;
 }

src/pages/project/h5Page.js

@@ -241,12 +241,13 @@ export default class Index extends Component {
   }
   // 报备客户
   reportClient() {
+
     const router = Taro.getStorageSync('router')
     const consultant = this.$router.params.consultant || router.query.consultant || ""
     const {
       userInfo: { person: { phone, tel, userId } }
     } = this.props
-
+    // debugger
     if (consultant && consultant != userId) {
       const realPhone = phone || tel
       const payload = {
@@ -254,13 +255,15 @@ export default class Index extends Component {
         phone: realPhone,
         showToast: false
       }
+
       reportClient(payload).then(res => {
         console.log('恭喜您绑定成功')
-      })
-      // .catch(err => {
-      //   console.error(err)
+        
+      }).catch(err => {
+        // debugger
+        console.error(err)
 
-      // })
+      })
     }
   }
 

src/pages/project/index.js

@@ -81,6 +81,9 @@ export default class Index extends Component {
     })
   }
   componentDidShow() {
+    Taro.showTabBar({
+      animation: false
+    })
     if (this.props.curCity.id) {
       ready.queue(() => {
         // debugger

src/utils/request.js

@@ -27,7 +27,9 @@ export const setStorage = function (key, data) {
  * @param {*} options
  */
 export const fetch = async (options) => {
-  const { url, payload, method = 'GET', showToast = true, autoLogin = true } = options
+  const { url, payload = {}, method = 'GET', showToast = true, autoLogin = true } = options
+  const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
+  // debugger
   return Taro.request({
     url,
     method,
@@ -44,7 +46,6 @@ export const fetch = async (options) => {
         title: "请检查网络",
         icon: 'none'
       })
-
       console.error(res)
       throw new Error('请检查网络')
     }
@@ -63,14 +64,14 @@ export const fetch = async (options) => {
           })
         })
       } else {
-        if (showToast) {
+        if (showMessage) {
           Taro.showToast({
             title: defaultMsg,
             icon: 'none'
           })
         }
       }
-      if (showToast) {
+      if (showMessage) {
 
         Taro.showToast({
           title: message,
@@ -91,11 +92,13 @@ export const fetch = async (options) => {
     if (err.message) {
       errMessage = err.message
     }
+    if (showMessage) {
 
-    Taro.showToast({
-      title: errMessage,
-      icon: 'none'
-    })
+      Taro.showToast({
+        title: errMessage,
+        icon: 'none'
+      })
+    }
 
     throw new Error(errMessage)
   })