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

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/index.js

@@ -101,7 +101,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
         })

src/utils/request.js

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