Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-huozhuapp

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
-	// baseUrlNew: 'https://api.changyuntong56.com',
+	baseUrlNew: 'https://api.changyuntong56.com',
 	// baseUrlNew: 'https://apitest.changyuntong56.com',
-	baseUrlNew: 'http://192.168.110.9:8099',
+	// baseUrlNew: 'http://192.168.110.9:8099',
 	// baseUrlNew: 'https://apitest.eliangeyun.com',
 	// baseUrlNew: 'http://192.168.110.67:8999/',
 	h5Appid: 'wxb66b599f7f61b46f',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "畅运通-货主端",
     "appid" : "__UNI__DCD13AC",
     "description" : "畅运通",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "1.0.9",
+    "versionCode" : 109,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/order/index.vue

@@ -140,7 +140,7 @@
 						<!-- <image class="jt-icon" src="@/static/images/order/position.png" mode='widthFix'
 								@click.stop="toMap(good)">
 							</image> -->
-						<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'"
+						<view v-if="good.cargoOwnerStatus=='运输中'||good.cargoOwnerStatus=='已完结'||good.cargoOwnerStatus=='待收货'||good.cargoOwnerStatus=='已终止'"
 						 style='border:1px solid #2772FB'	class="start normal look-map" @click.stop="toMap(good)">
 							查看轨迹</view>
 						<view class="stop" @click.stop="accept(good,1)" v-if="good.cargoOwnerStatus=='待接单'">接受

pages/order/map.nvue

@@ -13,7 +13,7 @@
 <script>
 	const img = '/static/logo.png';
 	import * as config from '@/config'
-	// let baseUrl = config.def().baseUrlNew
+	let baseUrl = config.def().baseUrlNew
 	export default {
 		data() {
 			return {