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

config/index.js

@@ -10,8 +10,8 @@ const dev = {
 	baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
 	// baseUrlNew1: 'http://192.168.110.82:9527/',
-	// baseUrlNew1: 'https://api2.eliangeyun.com/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew1: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.105",
-    "versionCode" : 21105,
+    "versionName" : "2.1.106",
+    "versionCode" : 21106,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},
@@ -205,14 +205,14 @@
         "nativePlugins" : {
             "FUN-AmapLocation" : {
                 "__plugin_info__" : {
-                    "name" : "持续定位、后台定位、高德定位、保活 - [试用版，仅用于自定义调试基座]",
+                    "name" : "持续定位、后台定位、高德定位、保活",
                     "description" : "持续定位、后台定位、高德定位, 后台保活，购前先测是否符合需求[反馈819589789@qq.com] ",
                     "platforms" : "Android",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=2018",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
+                    "android_package_name" : "uni.UNI7297DA2",
+                    "ios_bundle_id" : "uni.UNI7297DA2",
                     "isCloud" : true,
-                    "bought" : 0,
+                    "bought" : 1,
                     "pid" : "2018",
                     "parameters" : {}
                 }

pages/reimbursement/request_funds.vue

@@ -173,7 +173,7 @@
 					success: (chooseImageRes) => {
 						let a = chooseImageRes.tempFiles
 						uni.uploadFile({
-							url: baseUrlNew + 'pb/appendix/api/uploadFiles',
+							url: baseUrlNew + 'appendix/api/uploadFiles',
 							// url: baseUrlNew+'appendix/api/uploadFiles', //仅为示例，非真实的接口地址
 							files: a,
 							formData: {