1

mer_mer_admin/.env.development

@@ -4,6 +4,7 @@ ENV = 'development'
 # base api
 # VUE_APP_BASE_API = '/dev-api'
 VUE_APP_BASE_API = 'http://39.105.58.247:20800'
+#VUE_APP_BASE_API = 'http://127.0.0.1:20800'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

mer_mer_admin/.env.production

@@ -3,5 +3,5 @@ ENV = 'production'
 
 # base api
 # VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://127.0.0.1:8080'
+VUE_APP_BASE_API = 'http://39.105.58.247:20800'
 

mer_plat_admin/.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-# VUE_APP_BASE_API = '/prod-api'
-VUE_APP_BASE_API = 'http://127.0.0.1:8080'
+#VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://39.105.58.247:20800'
 

mer_plat_admin/src/components/linkaddress/linkData.json

@@ -241,6 +241,18 @@
 	    "sort": 0,
 	    "add_time": 1626837579
 	  },
+	  {
+		  "id": 172,
+		  "cate_id": 5,
+		  "type": 3,
+		  "name": "二手交易",
+		  "url": "/pages/goods/order_list/index?orderType=secondHand",
+		  "param": " ",
+		  "example": "/pages/goods/order_list/index?orderType=secondHand",
+		  "status": 1,
+		  "sort": 0,
+		  "add_time": 1626837579
+		},
       {
         "id": 18,
         "cate_id": 5,

mer_plat_admin/src/filters/order.js

@@ -46,10 +46,11 @@ export function orderExpressStatusFilter(status) {
   const statusMap = {
     0: '待支付',
     1: '待接单',
-    2: '待收件',
+    2: '待取件',
     3: '配送中',
-    4: '已收件',
-    5: '已完成',
+    4: '待收件',
+    5: '已收件',
+	6: '已完成',
     9: '已取消',
   };
   return statusMap[status];

mer_uniapp/pages/substitute_fast_mail/my_fast_mail/index.vue

@@ -85,7 +85,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="fast-item" v-if="item.courier!=null">
+					<view class="fast-item" v-if="item.courier!=null && (item.status==2 || item.status==3 ||  item.status==4)">
 						<view class="flex-between-center">
 							<view>
 								快递员姓名：{{item.courier || ''}}
@@ -97,7 +97,7 @@
 							</view>
 						</view>
 					</view>
-					<view v-if="item.status==3 ||  item.status==4">
+					<view v-if="item.status==2 || item.status==3 ||  item.status==4">
 						<view class="refundTypeStatus line1">
 							{{ item.status| expressStatusFilter}}
 							<span class="tips ml20">{{item.status| orderExpressTipsStatusFilter}}</span>