Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

config/dev.js

@@ -5,12 +5,12 @@ 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.0.84:8080"',
-    // WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://192.168.0.84:8080"',
+    WSS_HOST: '"ws://192.168.0.84:8080"',
   },
   weapp: {},
   h5: {}

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行联调",
-	"appid": "wxda1f84b79b3edeb3",
+	"appid": "wxd9ee3a9480a4e544",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/pages/project/detail/index.js

@@ -65,8 +65,10 @@ export default class Index extends Component {
     ready.queue(() => {
       // 分享场景需要先授权手机, 再授权头像
       const options = wx.getLaunchOptionsSync()
+      console.log('-------options----->', options)
       if (sceneInShare(options.scene)) {
         const { person = {} } = this.props.userInfo || {}
+        console.log('-------person----->', person)
         if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
           Taro.reLaunch({ url: '/pages/auth/index' })
           return
@@ -79,13 +81,13 @@ export default class Index extends Component {
 
       this.initPageData()
     })
-    console.log('---------------after componentWillMount---------------')
   }
 
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
+
   initPageData() {
     const router = Taro.getStorageSync('router')
     const id = this.$router.params.id || router.query.id

src/pages/project/index.js

@@ -103,7 +103,7 @@ export default class Index extends Component {
       const payload = { location: `${location.longitude},${location.latitude}` }
 
       getLocationCity(payload).then(res => {
-
+        console.log(res,"!!!!!!!!!!!!!!!!!11res=========")
         let curCity = cityList.filter(item => {
           return item.name == res.name || ''
         })
@@ -134,9 +134,37 @@ export default class Index extends Component {
       this.updateCity(defaultCity)
     })
   }
+  updateCity(payload) {
+    const NanJing = {
+      citycode: "025",
+      id: 320100,
+      initial: "N",
+      lat: "32.041544",
+      leveltype: 2,
+      lng: "118.767413",
+      name: "南京市",
+      parentid: 320000,
+      pinyin: "Nanjing",
+      shortname: "南京",
+      status: 1,
+      zipcode: "320100"
+    }
+
+    const appId = accountInfo.miniProgram.appId;
+    let params;
+
+    switch (appId) {
+      // 知与行联调
+      case 'wxd9ee3a9480a4e544':
+        params = NanJing;
+        break;
+
+      default:
+        params = payload;
+        break;
+    }
 
-  updateCity (payload) {
-    this.props.dispatchCitySelected(payload).then(res => {
+    this.props.dispatchCitySelected(params).then(res => {
       this.loadData()
     })
   }

src/utils/request.js

@@ -94,7 +94,7 @@ export const fetch = async (options) => {
       icon: 'none'
     })
 
-    throw new Error(err)
+    throw new Error(errMessage)
   })
 }
 

src/utils/tools.js

@@ -5,7 +5,7 @@ import Taro from '@tarojs/taro';
  * @param {*} scene 
  */
 export function sceneInShare(scene) {
-  return [1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048].indexOf(scene) > -1
+  return [1007, 1008, 1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048, 1049].indexOf(scene) > -1
 }
 
 /**