Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

@@ -2,7 +2,7 @@ const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	// baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
-	baseUrlNew: 'http://192.168.1.120:8090/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.7",
-    "versionCode" : 117,
+    "versionName" : "1.1.8",
+    "versionCode" : 118,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages/grain_pulse/distribution/distribution.nvue

@@ -105,8 +105,8 @@
 		},
 		methods: {
 			coordinate(item){
-				this.nowLocation.latitude = item.latitude
-				this.nowLocation.longitude = item.longitude
+				// this.nowLocation.latitude = item.latitude
+				// this.nowLocation.longitude = item.longitude
 				this.getList()
 			},
 			getList(val) {
@@ -370,7 +370,8 @@
 	}
 	.left {
 		flex-direction: row;
-		flex:2;
+		flex:3;
+
 	}
 
 	.left-img {