地址

ghsApp/src/api/order/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const getInfoByOrderSn = data => {
+	return https.get("/order/get-info-by-order-sn", data)
+}
+
 export const confirmReachFn = data => {
 	return https.get("/order/confirm-reach", data)
 }

ghsApp/src/pagesOrder/detail.vue

@@ -571,10 +571,10 @@ export default {
 			let customMobile = detailInfo.customMobile
 			let customSuper = detailInfo.customSuper.name
 			let address =  detailInfo.customAddress
-			if (!this.$util.isEmpty(detailInfo.showAddress)){
+			if (!this.$util.isEmpty(detailInfo.showAddress) && address != detailInfo.showAddress){
 				address += "（"+detailInfo.showAddress+"）"
 			}
-			let val = customName+" "+customMobile+"\n"+address
+			let val = address+"\n"+customName+" "+customMobile
 			const self = this
 			uni.setClipboardData({
 				data: val,

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -64,6 +64,7 @@ const time = `${new Date().getFullYear()}-${Month}-${new Date().getDate()}`;
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import SelectList from "@/components/plugin/selectList";
 import { getStockDetailApi } from "@/api/storehouse/stock";
+import { getInfoByOrderSn } from "@/api/order";
 import { list,selectShop } from "@/mixins";
 import {mapActions, mapGetters} from "vuex";
 export default {
@@ -99,8 +100,20 @@ export default {
 			this.getStockList()
 		},
 		goDetail(item){
+			let that = this
 			if(item.recordType == 1){
-				this.pageTo({ url: '/pagesPurchase/info?orderSn='+item.orderSn})
+				that.pageTo({ url: '/pagesPurchase/info?orderSn='+item.orderSn})
+			}else if(item.recordType == 5){
+				uni.showLoading()
+				getInfoByOrderSn({orderSn:item.orderSn}).then(res=>{
+					uni.hideLoading()
+					if(res.code == 1){
+						let id = res.data.info.id ? res.data.info.id : 0
+						that.pageTo({ url: '/pagesOrder/detail?id='+id})
+					}
+				})
+			}else{
+
 			}
 		},
 		getStockList() {