From bed3ee0cd8b6c96560154d5feaf23a26981d6213 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Mon, 24 Apr 2023 09:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/js/date.js                              |   9 +-
 .../cart-choose/cart-choose.vue               |  12 +-
 .../goods-list/goods-list.vue                 |   8 +-
 .../no-more/no-more.vue                       |   0
 components/wuliuPupup/data.json               |  90 ---
 components/wuliuPupup/wuliuPupup.vue          | 228 ------
 pages.json                                    | 273 ++++---
 pages/classify/order/orderDetail.vue          | 514 -------------
 pages/tabBar/classify/classify.vue            |   6 +-
 pages/tabBar/user/user.vue                    |   9 +
 pages/user/news/news.vue                      |   7 +-
 pages/user/order_list/order_list.vue          | 214 +++++-
 .../address/addNewAddress/addNewAddress.vue   |   0
 .../address/address.vue                       |   2 +-
 .../classify/cart/cart.vue                    | 121 +--
 .../goods-comment-child.vue                   |   0
 .../classify/goods-comment/data.json          |   0
 .../classify/goods-comment/goods-comment.vue  |   0
 .../classify/goods-search/goods-search.vue    |   2 +-
 .../classify/goodsDetail/goodsDetail.vue      |  16 +-
 .../classify/order/editOrder.vue              |   2 +-
 .../classify/order/order.vue                  |   4 +-
 .../classify/order/orderDetail.vue            | 691 ++++++++++++++++++
 .../classify/order/orderList.vue              |   0
 .../classify/order/pay.vue                    |  23 +-
 .../classify/order/paymentResult.vue          |   0
 .../classify/order}/trackNode/trackNode.vue   |  10 +-
 .../classify/order/wuliuPupup/wuliuPupup.vue  | 261 +++++++
 .../detail-popup/detail-popup.vue             |  19 +-
 .../settleAccounts/settleAccounts.vue         |  97 ++-
 physical-merchants/static/img/unioncard.png   | Bin 0 -> 37138 bytes
 physical-merchants/static/img/wechat.png      | Bin 0 -> 2386 bytes
 .../static}/img/wuliu/ic-delivering-G.png     | Bin
 .../static}/img/wuliu/ic-delivering.png       | Bin
 .../static}/img/wuliu/ic-order-commit-G.png   | Bin
 .../static}/img/wuliu/ic-order-commit.png     | Bin
 .../static}/img/wuliu/ic-pacakaging-G.png     | Bin
 .../static}/img/wuliu/ic-pacakaging.png       | Bin
 .../static}/img/wuliu/ic-package-failed-G.png | Bin
 .../static}/img/wuliu/ic-package-failed.png   | Bin
 .../static}/img/wuliu/ic-paied-G.png          | Bin
 .../static}/img/wuliu/ic-paied.png            | Bin
 .../static}/img/wuliu/ic-sending-G.png        | Bin
 .../static}/img/wuliu/ic-sending.png          | Bin
 physical-merchants/static/img/yl.png          | Bin 0 -> 2730 bytes
 {pages => physical-merchants}/wuliu/wuliu.vue |   0
 static/img/zfb.png                            | Bin 1780 -> 0 bytes
 uni.scss                                      |   7 +
 48 files changed, 1542 insertions(+), 1083 deletions(-)
 rename {pages/classify => components}/cart-choose/cart-choose.vue (95%)
 rename {pages/classify => components}/goods-list/goods-list.vue (98%)
 rename {pages/classify => components}/no-more/no-more.vue (100%)
 delete mode 100644 components/wuliuPupup/data.json
 delete mode 100644 components/wuliuPupup/wuliuPupup.vue
 delete mode 100644 pages/classify/order/orderDetail.vue
 rename {pages => physical-merchants}/address/addNewAddress/addNewAddress.vue (100%)
 rename {pages => physical-merchants}/address/address.vue (99%)
 rename {pages => physical-merchants}/classify/cart/cart.vue (89%)
 rename {pages => physical-merchants}/classify/goods-comment-child/goods-comment-child.vue (100%)
 rename {pages => physical-merchants}/classify/goods-comment/data.json (100%)
 rename {pages => physical-merchants}/classify/goods-comment/goods-comment.vue (100%)
 rename {pages => physical-merchants}/classify/goods-search/goods-search.vue (97%)
 rename {pages => physical-merchants}/classify/goodsDetail/goodsDetail.vue (97%)
 rename {pages => physical-merchants}/classify/order/editOrder.vue (97%)
 rename {pages => physical-merchants}/classify/order/order.vue (96%)
 create mode 100644 physical-merchants/classify/order/orderDetail.vue
 rename {pages => physical-merchants}/classify/order/orderList.vue (100%)
 rename {pages => physical-merchants}/classify/order/pay.vue (94%)
 rename {pages => physical-merchants}/classify/order/paymentResult.vue (100%)
 rename {components => physical-merchants/classify/order}/trackNode/trackNode.vue (89%)
 create mode 100644 physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
 rename {pages => physical-merchants}/settleAccounts/detail-popup/detail-popup.vue (95%)
 rename {pages => physical-merchants}/settleAccounts/settleAccounts.vue (91%)
 create mode 100644 physical-merchants/static/img/unioncard.png
 create mode 100644 physical-merchants/static/img/wechat.png
 rename {static => physical-merchants/static}/img/wuliu/ic-delivering-G.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-delivering.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-order-commit-G.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-order-commit.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-pacakaging-G.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-pacakaging.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-package-failed-G.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-package-failed.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-paied-G.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-paied.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-sending-G.png (100%)
 rename {static => physical-merchants/static}/img/wuliu/ic-sending.png (100%)
 create mode 100644 physical-merchants/static/img/yl.png
 rename {pages => physical-merchants}/wuliu/wuliu.vue (100%)
 delete mode 100644 static/img/zfb.png

diff --git a/Utils/js/date.js b/Utils/js/date.js
index bf346a8..e537735 100644
--- a/Utils/js/date.js
+++ b/Utils/js/date.js
@@ -5,7 +5,11 @@ const isNullOrEmpty = function(val) {
         return false;
     }
 }
- 
+
+const numFormat = (money) =>{
+	return parseFloat(money).toFixed(2)
+}
+
 const timeFormat = (value, format) => {
     let date = new Date(value);
     let y = date.getFullYear();
@@ -54,5 +58,6 @@ const timeFormat = (value, format) => {
 
 export {
     isNullOrEmpty,
-    timeFormat
+    timeFormat,
+	numFormat
 }
diff --git a/pages/classify/cart-choose/cart-choose.vue b/components/cart-choose/cart-choose.vue
similarity index 95%
rename from pages/classify/cart-choose/cart-choose.vue
rename to components/cart-choose/cart-choose.vue
index 29a1a1a..0e11ea2 100644
--- a/pages/classify/cart-choose/cart-choose.vue
+++ b/components/cart-choose/cart-choose.vue
@@ -37,7 +37,7 @@
 			</view> -->
 			
 			<!-- 选分类 -->
-			<view class="choose-bottom">
+			<view class="choose-bottom marb10">
 				<!-- 类型分类 -->
 				<view class="choose-bottom-title fontwig6 font13 mart10">
 					选择规格 
@@ -54,9 +54,9 @@
 				</view>
 				
 				<!-- 数量分类 -->
-				<view class="choose-bottom-title fontwig6 font13 mart20 choose-num">
+				<view class="choose-bottom-title paddbotm10 fontwig6 font13 mart10 choose-num">
 					<view class="">购买数量</view> 
-					<uni-number-box style="transform: scale(0.9);" v-model="chooseNumber" :min="1" :max="specificationList[chooseIndex].stock"  @noMoreLess="noMoreLess" @change="changeNumValue" />
+					<uni-number-box style="transform: scale(0.9);" v-model="chooseNumber" :min="1" :max="specificationList[chooseIndex].stock || 9999999"  @noMoreLess="noMoreLess" @change="changeNumValue" />
 				</view>
 			</view>
 			
@@ -212,7 +212,7 @@
 				obj = JSON.stringify(obj)
 				
 				uni.navigateTo({
-					url: '/pages/settleAccounts/settleAccounts?goodsList='+obj
+					url: '/physical-merchants/settleAccounts/settleAccounts?goodsList='+obj
 				})
 				
 				// this.$emit("close")
@@ -225,7 +225,7 @@
 			// 去地址页
 			goAddress(){
 				uni.navigateTo({
-					url:"/pages/address/address"
+					url:"/physical-merchants/address/address"
 				})
 			},
 			
@@ -266,7 +266,7 @@
 	
 .choose-detail {
 	position: relative;
-	padding: 20rpx;
+	padding: 20rpx 20rpx 80rpx 20rpx;
 	//选择
 	.choose-top {
 		display: flex;
diff --git a/pages/classify/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
similarity index 98%
rename from pages/classify/goods-list/goods-list.vue
rename to components/goods-list/goods-list.vue
index 875037a..a76f6e2 100644
--- a/pages/classify/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -142,9 +142,9 @@
 </template>
 
 <script>
-	import noMore from '@/pages/classify/no-more/no-more.vue'
+	import noMore from '@/components/no-more/no-more.vue'
 	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
-	import cartChoose from '@/pages/classify/cart-choose/cart-choose.vue'
+	import cartChoose from '@/components/cart-choose/cart-choose.vue'
 	import { findGoodsSkuByGoodsId,getShoppingCartList } from '@/Utils/physicalObject.js'
 	import uniBadge from '@/components/uni-badge/components/uni-badge/uni-badge.vue'
 	const app = getApp();
@@ -269,7 +269,7 @@
 		methods:{
 			goCart(){
 				uni.navigateTo({
-					url:"/pages/classify/cart/cart"
+					url:"/physical-merchants/classify/cart/cart"
 				})
 			},
 			// 刷新购物车数量
@@ -290,7 +290,7 @@
 			//查看商品详情
 			goGoodsDetail(id) {
 				uni.navigateTo({
-					 url: '../../classify/goodsDetail/goodsDetail?goodsId=' + id
+					 url: '/physical-merchants/classify/goodsDetail/goodsDetail?goodsId=' + id
 			
 				})
 			},
diff --git a/pages/classify/no-more/no-more.vue b/components/no-more/no-more.vue
similarity index 100%
rename from pages/classify/no-more/no-more.vue
rename to components/no-more/no-more.vue
diff --git a/components/wuliuPupup/data.json b/components/wuliuPupup/data.json
deleted file mode 100644
index 4484546..0000000
--- a/components/wuliuPupup/data.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "data": {
-    "expressCode": "ZTO",
-    "expressCompanyName": "中通快递",
-    "number": "78672864399912",
-    "logisticsStatus": "DELIVERING",
-    "logisticsStatusDesc": "派件中",
-    "theLastMessage": "【重庆市】 快件已被【菜鸟】的【重庆九龙坡西城大院店】代收,请及时取件,如有疑问请联系(18598776063)。感谢使用中通快递,期待再次为您服务!",
-    "theLastTime": "2023-04-06 10:21:00",
-    "takeTime": "1天14小时43分",
-    "logisticsTraceDetails": [
-      {
-        "areaCode": "CN330700000000",
-        "areaName": "浙江省,金华市",
-        "subLogisticsStatus": "ACCEPT",
-        "time": 1680608263000,
-        "logisticsStatus": "ACCEPT",
-        "desc": "【金华市】 【义乌青口】(0579-85319001) 的 下骆宅仓(13335991154) 已揽收"
-      },
-      {
-        "areaCode": "CN330700000000",
-        "areaName": "浙江省,金华市",
-        "subLogisticsStatus": "TRANSPORT",
-        "time": 1680608415000,
-        "logisticsStatus": "TRANSPORT",
-        "desc": "【金华市】 快件离开 【义乌青口】 已发往 【重庆巴南转运中心】"
-      },
-      {
-        "areaCode": "CN330782000000",
-        "areaName": "浙江省,金华市,义乌市",
-        "subLogisticsStatus": "TRANSPORT",
-        "time": 1680616875000,
-        "logisticsStatus": "TRANSPORT",
-        "desc": "【金华市】 快件已经到达 【义乌中转部】"
-      },
-      {
-        "areaCode": "CN330782000000",
-        "areaName": "浙江省,金华市,义乌市",
-        "subLogisticsStatus": "TRANSPORT",
-        "time": 1680617054000,
-        "logisticsStatus": "TRANSPORT",
-        "desc": "【金华市】 快件离开 【义乌中转部】 已发往 【重庆巴南转运中心】"
-      },
-      {
-        "areaCode": "CN500113000000",
-        "areaName": "重庆,重庆市,巴南区",
-        "subLogisticsStatus": "TRANSPORT",
-        "time": 1680715359000,
-        "logisticsStatus": "TRANSPORT",
-        "desc": "【重庆市】 快件已经到达 【重庆巴南转运中心】"
-      },
-      {
-        "areaCode": "CN500113000000",
-        "areaName": "重庆,重庆市,巴南区",
-        "subLogisticsStatus": "TRANSPORT",
-        "time": 1680720424000,
-        "logisticsStatus": "TRANSPORT",
-        "desc": "【重庆市】 快件离开 【重庆巴南转运中心】 已发往 【九龙坡区】"
-      },
-      {
-        "areaCode": "CN500107000000",
-        "areaName": "重庆,重庆市,九龙坡区",
-        "subLogisticsStatus": "TRANSPORT",
-        "time": 1680730809000,
-        "logisticsStatus": "TRANSPORT",
-        "desc": "【重庆市】 快件已经到达 【九龙坡区】"
-      },
-      {
-        "areaCode": "CN500107000000",
-        "areaName": "重庆,重庆市,九龙坡区",
-        "subLogisticsStatus": "DELIVERING",
-        "time": 1680737638000,
-        "logisticsStatus": "DELIVERING",
-        "desc": "【重庆市】 【九龙坡区】 的王曾真(17783049582) 正在第1次派件, 请保持电话畅通,并耐心等待(95720为中通快递员外呼专属号码,请放心接听)"
-      },
-      {
-        "areaCode": "CN500107000000",
-        "areaName": "重庆,重庆市,九龙坡区",
-        "subLogisticsStatus": "STA_INBOUND",
-        "time": 1680747660000,
-        "logisticsStatus": "DELIVERING",
-        "desc": "【重庆市】 快件已被【菜鸟】的【重庆九龙坡西城大院店】代收,请及时取件,如有疑问请联系(18598776063)。感谢使用中通快递,期待再次为您服务!"
-      }
-    ]
-  },
-  "msg": "成功",
-  "success": true,
-  "code": 200,
-  "taskNo": "756902251154716910060287"
-}
\ No newline at end of file
diff --git a/components/wuliuPupup/wuliuPupup.vue b/components/wuliuPupup/wuliuPupup.vue
deleted file mode 100644
index d2932df..0000000
--- a/components/wuliuPupup/wuliuPupup.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<template>
-	<wybPopup ref="popup"  type="bottom" width="500" scrollY="true" radius="0" :showCloseIcon="true">
-		<view class="pd-main wuliupop backcor9">
-			<view class="pop-title fontwig6"><text>详细信息</text></view>
-			<view class="pd-main backcolorfff border-8r font14">
-				<view class="dis-flex flex-sp mart10 marb10  paddbotm10  border-b">
-					 <view class="dis-flex">
-					 	<!-- <image class="wuliu-img" src="https://pic.616pic.com/ys_bnew_img/00/07/04/1ZtrvD1AMY.jpg" mode="aspectFill"></image> -->
-						<text class="paddleft5">{{tracesData.expressCompanyName}}</text>
-						<text class="paddleft5">{{tracesData.number}}</text>
-					 </view>
-					 <view class="dis-flex ">
-					 		<text @click="copyText(tracesData.number)">复制</text>
-							<text class="paddleft5 paddtright5 fcor666">|</text>
-					 		<text @click="callPhone">打电话</text>
-					 </view>
-				 </view>
-				
-				<block v-for="(item, index) in tracesData.logisticsTraceDetails" >
-				  
-				  
-				  <trackNode  :key="index"  :is-first="index===tracesData.length-1" :is-newest="index===0" :is-main-node="item.logisticsStatus!='TRANSPORT'" :node-data="item"></trackNode>
-				</block>
-			</view>
-			
-			
-		</view>
-	</wybPopup>
-</template>
-
-<script>
-	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
-	import trackNode from '@/components/trackNode/trackNode.vue'
-	
-	let dataList = require('./data.json')
-	export default {
-		data () {
-		  return {
-		    tracesData:null,
-		// [
-		 //      {
-		 //        acceptStation: '包裹已被吴亦发同学签收', // 节点描述
-		 //        createTime: '2019-10-24 15: 27: 16',
-		 //        status: 'COMPLETE', // 节点状态
-		 //        phone: '', // 电话
-		 //        statusName: '已签收', // 节点标题
-		 //        isMainNode: true // 是否主节点,主节点前方展示icon
-		 //      },
-		 //      {
-		 //        acceptStation: '由派送员蔡小坤同志配送,电话:',
-		 //        createTime: '2019-10-24 15: 26: 41',
-		 //        status: 'DELIVERING',
-		 //        phone: '16677778888',
-		 //        statusName: '运输中',
-		 //        isMainNode: true
-		 //      },
-		 //      {
-		 //        acceptStation: '已到XXX小区快递点',
-		 //        createTime: '2019-10-24 15: 26: 41',
-		 //        status: 'DELIVERING',
-		 //        phone: '',
-		 //        statusName: '运输中',
-		 //        isMainNode: false
-		 //      },
-		 //      {
-		 //        acceptStation: '已到海宁集散中心',
-		 //        createTime: '2019-10-24 15: 26: 18',
-		 //        status: 'DELIVERING',
-		 //        phone: '',
-		 //        statusName: '运输中',
-		 //        isMainNode: false
-		 //      },
-		 //      {
-		 //        acceptStation: '已到杭州集散中心',
-		 //        createTime: '2019-10-24 15: 26: 07',
-		 //        status: 'DELIVERING',
-		 //        phone: '',
-		 //        statusName: '运输中',
-		 //        isMainNode: false
-		 //      },
-		 //      {
-		 //        acceptStation: '包裹已到达余杭区集散中心',
-		 //        createTime: '2019-10-24 15: 25: 54',
-		 //        status: 'DELIVERING',
-		 //        phone: '',
-		 //        statusName: '运输中',
-		 //        isMainNode: false
-		 //      },
-		 //      {
-		 //        acceptStation: '快递员已上门取件',
-		 //        createTime: '2019-10-24 15: 25: 17',
-		 //        status: 'DELIVERING',
-		 //        phone: '',
-		 //        statusName: '已揽收',
-		 //        isMainNode: false
-		 //      },
-		 //      {
-		 //        acceptStation: '等待快递员上门揽件',
-		 //        createTime: '2019-10-24 15: 25: 00',
-		 //        status: 'WATTING_DELIVER',
-		 //        phone: '',
-		 //        statusName: '已发货',
-		 //        isMainNode: true
-		 //      },
-			// 	{
-		 //        acceptStation: '您的包裹正在打包',
-		 //        createTime: '2019-10-24 15: 24: 00',
-		 //        status: 'WATTING_DELIVER',
-		 //        phone: '',
-		 //        statusName: '待发货',
-		 //        isMainNode: false
-		 //      },
-		 //      {
-		 //        acceptStation: '订单支付成功,等待商家发货',
-		 //        createTime: '2019-10-24 15: 22: 30',
-		 //        status: 'PAYED',
-		 //        statusName: '已支付',
-		 //        isMainNode: true
-		 //      },
-		 //      {
-		 //        acceptStation: '订单提交成功',
-		 //        createTime: '2019-10-24 15: 22: 00',
-		 //        status: 'WATTING_PAY',
-		 //        statusName: '已下单',
-		 //        isMainNode: true
-		 //      }
-		 //    ]
-		  }
-		},
-		components:{
-			wybPopup,
-			trackNode
-		},
-		created(){
-			this.tracesData=dataList.data;
-			this.tracesData.logisticsTraceDetails=this.tracesData.logisticsTraceDetails.sort((item,item2)=>{
-				
-				if(item.logisticsStatus == 'TRANSPORT'){
-					item.isMainNode=false;
-				}else{
-					item.isMainNode=true;
-				}
-				
-				return item2.time - item.time; 
-				
-			})
-		},
-		methods:{
-			show(){
-				this.$refs.popup.show();
-			},
-			// 复制
-			copyText(text){	
-				// #ifdef H5
-				this.$copyText(text).then(
-					res => {
-						uni.showToast({
-							title: '复制成功'
-						})
-					}
-				)
-				// #endif
-				// #ifndef H5
-				uni.setClipboardData({
-					data: text,
-					success: () => {
-						uni.showToast({
-							title: '复制成功'
-						})
-					}
-				})
-				// #endif
-				
-				
-			},
-			// 打电话
-			callPhone(){
-				// 	uni.showModal({
-				// 		title: '客服',
-				// 		content: '85655525652',
-				// 		success: function(res) {
-				// 			if (res.confirm) {
-				// 				uni.makePhoneCall({
-				// 					phoneNumber: '85655525652', //电话号码
-				// 					success: function(e) {
-				// 						console.log(e);
-				// 					},
-				// 					fail: function(e) {
-				// 						console.log(e);
-				
-				// 					}
-				// 				})
-				// 			}
-				// 		}
-				// 	})
-			},
-		
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-.wuliu-img{
-	width: 30px;
-	height: 30px;
-	border-radius: 50%;
-}
-
-.border-b{
-	border-bottom: 2px solid #f6f6f6;
-}
-	
-.wuliupop{
-	padding: 50px 10px 10px;
-}
-.pop-title{
-		text-align: center;
-		height: 50px;
-		line-height: 50px;
-		font-size: 18px;
-		position: fixed;
-		top:0;
-		left: 0;
-		right: 0;
-		background-color: #f6f6f6;
-	}
-</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ad62b8d..65a2571 100644
--- a/pages.json
+++ b/pages.json
@@ -27,7 +27,8 @@
 					"softinputNavBar": "none"
 				}
 			}
-		},{
+		},
+		{
 			"path": "pages/tabBar/classify/classify",
 			"style": {
 				"navigationBarTextStyle": "white",
@@ -40,97 +41,98 @@
 					"softinputNavBar": "none"
 				}
 			}
-		},{
-			"path": "pages/classify/goodsDetail/goodsDetail",
-			"style": {
-				"navigationBarTitleText": "商品详情",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/classify/goods-search/goods-search",
-			"style": {
-				"navigationBarTitleText": "搜索",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/classify/cart/cart",
-			"style": {
-				"navigationBarTitleText": "购物车",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/classify/goods-comment/goods-comment",
-			"style": {
-				"navigationBarTitleText": "查看评论",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/address/address",
-			"style": {
-				"navigationBarTitleText": "我的地址",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/address/addNewAddress/addNewAddress",
-			"style": {
-				"navigationBarTitleText": "新增地址",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/settleAccounts/settleAccounts",
-			"style": {
-				"navigationBarTitleText": "订单确认",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/classify/order/order",
-			"style": {
-				"navigationBarTitleText": "订单列表",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/classify/order/orderDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/classify/order/editOrder",
-			"style": {
-				"navigationBarTitleText": "修改订单",
-				"enablePullDownRefresh": false
-			}
 		},
 		// {
-		// 	"path": "pages/wuliu/wuliu",
+		// 	"path": "pages/classify/goodsDetail/goodsDetail",
 		// 	"style": {
-		// 		"navigationBarTitleText": "物流信息",
+		// 		"navigationBarTitleText": "商品详情",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/classify/goods-search/goods-search",
+		// 	"style": {
+		// 		"navigationBarTitleText": "搜索",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/classify/cart/cart",
+		// 	"style": {
+		// 		"navigationBarTitleText": "购物车",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/classify/goods-comment/goods-comment",
+		// 	"style": {
+		// 		"navigationBarTitleText": "查看评论",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/address/address",
+		// 	"style": {
+		// 		"navigationBarTitleText": "我的地址",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/address/addNewAddress/addNewAddress",
+		// 	"style": {
+		// 		"navigationBarTitleText": "新增地址",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/settleAccounts/settleAccounts",
+		// 	"style": {
+		// 		"navigationBarTitleText": "订单确认",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/classify/order/order",
+		// 	"style": {
+		// 		"navigationBarTitleText": "订单列表",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/classify/order/orderDetail",
+		// 	"style": {
+		// 		"navigationBarTitleText": "订单详情",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/classify/order/editOrder",
+		// 	"style": {
+		// 		"navigationBarTitleText": "修改订单",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// // {
+		// // 	"path": "pages/wuliu/wuliu",
+		// // 	"style": {
+		// // 		"navigationBarTitleText": "物流信息",
+		// // 		"enablePullDownRefresh": false
+		// // 	}
+		// // },
+		// {
+		// 	"path": "pages/classify/order/pay",
+		// 	"style": {
+		// 		"navigationBarTitleText": "收银台页",
+		// 		"enablePullDownRefresh": false
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/classify/order/paymentResult",
+		// 	"style": {
+		// 		"navigationBarTitleText": "支付结果",
 		// 		"enablePullDownRefresh": false
 		// 	}
 		// },
-		{
-			"path": "pages/classify/order/pay",
-			"style": {
-				"navigationBarTitleText": "收银台页",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/classify/order/paymentResult",
-			"style": {
-				"navigationBarTitleText": "支付结果",
-				"enablePullDownRefresh": false
-			}
-		},
 		{
 			"path": "pages/qianZhuPay/union-pay/union-pay",
 			"style": {
@@ -1077,7 +1079,104 @@
 			}
 
 		}]
-	}],
+	},{
+		"root":"physical-merchants",
+		"pages":[
+			{
+				"path": "classify/goodsDetail/goodsDetail",
+				"style": {
+					"navigationBarTitleText": "商品详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "classify/goods-search/goods-search",
+				"style": {
+					"navigationBarTitleText": "搜索",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "classify/cart/cart",
+				"style": {
+					"navigationBarTitleText": "购物车",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "classify/goods-comment/goods-comment",
+				"style": {
+					"navigationBarTitleText": "查看评论",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "address/address",
+				"style": {
+					"navigationBarTitleText": "我的地址",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "address/addNewAddress/addNewAddress",
+				"style": {
+					"navigationBarTitleText": "新增地址",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "settleAccounts/settleAccounts",
+				"style": {
+					"navigationBarTitleText": "订单确认",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "classify/order/order",
+				"style": {
+					"navigationBarTitleText": "订单列表",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "classify/order/orderDetail",
+				"style": {
+					"navigationBarTitleText": "订单详情",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "classify/order/editOrder",
+				"style": {
+					"navigationBarTitleText": "修改订单",
+					"enablePullDownRefresh": false
+				}
+			},
+			// {
+			// 	"path": "wuliu/wuliu",
+			// 	"style": {
+			// 		"navigationBarTitleText": "物流信息",
+			// 		"enablePullDownRefresh": false
+			// 	}
+			// },
+			{
+				"path": "classify/order/pay",
+				"style": {
+					"navigationBarTitleText": "收银台页",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "classify/order/paymentResult",
+				"style": {
+					"navigationBarTitleText": "支付结果",
+					"enablePullDownRefresh": false
+				}
+			}
+		]
+	}
+	
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
diff --git a/pages/classify/order/orderDetail.vue b/pages/classify/order/orderDetail.vue
deleted file mode 100644
index f107c09..0000000
--- a/pages/classify/order/orderDetail.vue
+++ /dev/null
@@ -1,514 +0,0 @@
-<template>
-	<view class="backcor9 pd-main pdb50">
-		<!-- 已送达 -->
-		<view v-if="status == 1" class="order-de-title pd-main">
-			<view class="font22 fcor333">
-				已送达
-			</view>
-			<view class="font16 fcor666 mart10">
-				感谢您的支持,如有问题可以联系我们
-			</view>
-		</view>
-		
-		<!-- 待支付 -->
-		<view v-if="status == 0" class="order-de-title pd-main">
-			<view class="font22 fcor333">
-				待支付
-			</view>
-			<view class="font16 fcor666 mart10">
-				<text class="fcorred paddtright10" >{{countdownm}}:{{countdowns}}</text>后订单自动取消
-			</view>
-		</view>
-		
-		<view v-if="status == 2" class="order-de-title pd-main">
-			<view class="font22 fcor333">
-				订单已取消
-			</view>
-			<view class="font16 fcor666 mart10">
-				您的订单已取消
-			</view>
-		</view>
-		
-		
-		<!-- 待支付时支持修改地址 -->
-		<view v-if="status == 0" class="marb20 pd-main backcolorfff border-8r">
-			<view class="flex-center-sp pd-tb10">
-				<view class="">
-					<view class="fontwig6 font18">金科才能收到你看得出纳思达</view>
-					<view class="mart5 fcor666">利<text class="paddleft10">15652365478</text></view>	
-				</view>
-				<view class="align-fs edit-msg " @click="editOrder">
-					修改
-				</view>
-			</view>
-		</view>
-		
-		<view class="marb20 pd-main backcolorfff border-8r">
-			<!-- 商品信息 -->
-			<view v-for="(item,index) in [1,2,3]" :key="index" class="marb10 flex-center-sp">
-				<view class="">
-					<image class="st-img" :src="images[0]" mode="aspectFill"></image>
-				</view>
-				<view class="flex-1 flex-center-sp">
-					<view class="width60 paddleft10">
-						<view class="marb10">单只甜玉米 单只/250-300g</view>
-						<view class="marb5">单价: ¥ 3.99/个</view>	
-						<view class="fcor666">数量: 1个</view>
-					</view>
-					<view class="font16 tr align-fs">
-						<view class="fontwig6">实付: ¥ 3.42</view>
-						<view class="fcor666">¥ 3.99</view>
-					</view>
-				</view>
-			</view>
-			
-			<!-- 当商品超过3个的时候 -->
-			<view v-if="!moreThanThree" class="goodsMore flex-center" @click="checkMore">
-				还有{{3}}种商品<text class="icon-ymt to-down"></text>
-			</view>
-			<block v-if="moreThanThree">
-				<view  v-for="(item,index) in [1,2,3]" :key="index" class="marb10 flex-center-sp">
-					<view class="">
-					<image class="st-img" :src="images[0]" mode="aspectFill"></image>
-					</view>
-					<view class="flex-1 flex-center-sp">
-					<view class="width60 paddleft10">
-						<view class="marb10">单只甜玉米 单只/250-300g</view>
-						<view class="marb5">单价: ¥ 3.99/个</view>	
-						<view class="fcor666">数量: 1个</view>
-					</view>
-					<view class="font16 tr align-fs">
-						<view class="fontwig6">实付: ¥ 3.42</view>
-						<view class="fcor666">¥ 3.99</view>
-					</view>
-					</view>
-				</view>
-			</block>
-			<view v-if="moreThanThree" class="goodsMore flex-center" @click="checkMore">
-				共{{6}}种商品<text class="icon-ymt to-up"></text>
-			</view>
-			
-			<!-- 商品金额 -->
-			<view class="flex-center-sp pd-tb10">
-				<view class="">商品金额</view>
-				<view class="fontwig6"><text class="paddtright5">¥</text>69.89</view>
-			</view>
-			<!-- 优惠券 -->
-			<view class="flex-center-sp pd-tb10">
-				<view class="">优惠券</view>
-				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>10</view>
-			</view>
-			
-			<!-- 运费 -->
-			<view class="flex-center-sp pd-tb10">
-				<view class="">运费
-				<!-- <text class="icon-ymt question fcor666 font16 paddleft5"></text> -->
-				</view>
-				<view class="fontwig6">
-					<text class="fcor666 td-lt">¥6</text>
-					<text class="paddleft10"><text class="paddtright5">¥</text>0</text>
-				</view>
-			</view>
-			
-			<!-- 积分 -->
-			<view class="flex-center-sp pd-tb10">
-				<view class="">积分</view>
-				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>2</view>
-			</view>
-			<!--支付优惠 -->
-			<view class="flex-center-sp pd-tb10">
-				<view class="">支付优惠</view>
-				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>0.01</view>
-			</view>
-			<!-- 价格总额 -->
-			<view class="tr fontwig6 pd-tb10">
-				<text class="paddtright10">已优惠<text class="fcorred">¥ 12.01</text></text>
-				<text>实付¥<text class="font20 paddleft5">58.88</text></text>
-			</view>
-			
-			<!-- 待支付时开始 -->
-			<!-- 订单编号 -->
-			<block v-if="status == 0">
-			<view class="flex-center-sp pd-tb10 bordert">
-				<view class="fcor666">订单编号</view>
-				<view class=" flex-center-sp">
-					<text class="tr flex-1">1209 2418 0001 0039</text>
-					<text class=" margle10 font12 copy-num fcor666" @click="copyText('1209 2418 0001 0039')">复制</text>
-				</view>
-			</view>
-			<!-- 下单时间 -->
-			<view class="flex-center-sp pd-tb10 ">
-				<view class="fcor666">下单时间</view>
-				<view class=" ">
-					2023-03-04 17:05:27
-				</view>
-			</view>
-			<!-- 待支付时结束 -->
-			</block>
-		</view>
-		
-		<!-- 物流信息 -->
-		<view  v-if="status == 1 ||status == 2" class=" pd-main backcolorfff border-8r">
-			<!-- 预约时间 -->
-			<!-- <view class="flex-center-sp pd-tb10">
-				<view class="fcor666">预约时间</view>
-				<view class=" ">尽快送达(预计18:10前)</view>
-			</view> -->
-			<!-- 收货信息 -->
-			<view class="flex-center-sp pd-tb10">
-				<view class="fcor666 align-fs">收货信息</view>
-				<view class=" tr">
-					<view class=" ">重庆市出厂时都曾经常吃的后面2楼</view>
-					<view class=" ">陈女士 175896546526</view>
-				</view>
-			</view>
-			<!-- 物流信息 -->
-			<view class="flex-center-sp pd-tb10 ">
-				<view class="fcor666">物流信息</view>
-				<view class=" " @click="checkWuliu">
-					查看物流信息<text class="icon-ymt to-right fcor666 font16 paddleft5"></text>
-				</view>
-			</view>
-			<!-- 订单编号 -->
-			<view class="flex-center-sp pd-tb10 bordert">
-				<view class="fcor666">订单编号</view>
-				<view class=" flex-center-sp">
-					<text class="tr flex-1">{{orderID}}</text>
-					<text class=" margle10 font12 copy-num fcor666" 
-					 @click="copyText(orderID)"
-					>复制</text>
-				</view>
-			</view>
-			<!-- 下单时间 -->
-			<view class="flex-center-sp pd-tb10 ">
-				<view class="fcor666">下单时间</view>
-				<view class=" ">
-					2023-03-04 17:05:27
-				</view>
-			</view>
-			<!-- 支付方式 -->
-			<view class="flex-center-sp pd-tb10 ">
-				<view class="fcor666">支付方式</view>
-				<view class=" ">
-					微信支付
-				</view>
-			</view>
-		</view>
-	
-	
-		<!-- 待支付时底部的按钮 -->
-		<view v-if="status == 0" class="toPay font14  backcolorfff">
-			<view class="btn" @click="cancelOrder">取消订单</view>
-			<view class="btn" @click="editOrder">修改订单</view>
-			<view class="btn bgred" @click="payOrder">立即支付{{countdownm}}:{{countdowns}}</view>
-		</view>
-		<!-- 订单取消时 -->
-		<view v-if="status == 2" class="toPay font14  backcolorfff">
-			<view class="btn oneMore" @click="oneMoreOrder">再来一单</view>
-			<view class="btn" @click="deleteOrder">删除订单</view>
-			
-		</view>
-		
-		<wuliuPopup ref="wuliu"></wuliuPopup>
-	</view>
-</template>
-
-<script>
-	import wuliuPopup from '@/components/wuliuPupup/wuliuPupup.vue'
-	const app =getApp()
-	import {getDetailByOrderNo} from '@/Utils/Api.js'
-	export default {
-		data(){
-			return{
-				// 0:代表未支付,1代表已支付,2代表已取消
-				status:0,
-				orderID:'1209 2418 0001 0039',
-				moreThanThree:false,
-				images: ["https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg","https://d1.shopxo.vip/static/upload/images/goods/2019/01/14/1547451274847894.jpg"],
-				countdownh: '', //倒计时时
-				countdownm: '', // 倒计时分
-				countdowns:'',//倒计时秒
-				timers:null,
-				// recinfo:{
-				// 	createTime:1680744355375,
-				// },
-				//
-				orderId:'',//订单id
-				recinfo: [],
-				
-			}
-		},
-		components:{
-			wuliuPopup
-		},
-		onLoad(option) {
-			this.orderId = option.id
-		},
-		onUnload() {
-			clearInterval(this.timers);
-		},
-		onShow(){
-			// 待支付状态
-			// if(this.status == 0){
-			// 	this.timers = setInterval(() => {
-			// 		this.showtime()
-			// 	}, 1000)
-			// }
-			
-			//页面显示时,加载订单信息
-			this.getDetailByOrderNo();
-			
-		},
-		methods:{
-			//查询订单详情
-			getDetailByOrderNo() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				let params = {
-					orderNo: this.orderId,
-				}
-				getDetailByOrderNo(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						this.recinfo = res.return_data;
-						// if (res.return_data.productType == 6) {
-						// 	this.getOrderByOrderNo();
-						// }
-			
-						if (res.return_data.orderStatus == 1) {
-							this.timers = setInterval(() => {
-								this.showtime()
-							}, 1000)
-						}
-					}
-				})
-			},
-			showtime() {
-				var nowtime = (new Date()).getTime();//获取当前时间
-				var	endtime = this.recinfo.createTime + 600000; //定义结束时间 600000是10分钟
-				var lefttime = endtime - nowtime; //距离结束时间的毫秒数
-				var	leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)); //计算天数
-				var	lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
-						(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
-						24); //计算小时数
-				var	leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
-					Math.floor(lefttime / (1000 * 60) % 60); //计算分钟数
-				var	lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
-						lefttime / 1000 % 60); //计算秒数
-				this.countdownh = lefth; //返回倒计时的字符串
-				this.countdownm = leftm; //返回倒计时的字符串
-				this.countdowns = lefts; //返回倒计时的字符串
-				// 倒计时结束时,显示00:00:00
-				if (lefttime < 0) {
-					clearInterval(this.timers);
-					// this.getDetailByOrderNo();
-					this.countdownh = this.countdownm = this.countdowns = "00";
-				}
-			},
-			// 查看更多商品
-			checkMore(){
-				this.moreThanThree = !this.moreThanThree
-			},
-			// 查看物流
-			checkWuliu(){
-				this.$refs.wuliu.$refs.popup.show()
-			},
-			
-			// 点击修改订单
-			editOrder(){
-				uni.navigateTo({
-					url:'/pages/classify/order/editOrder'
-				})
-			},
-			// 取消订单
-			cancelOrder(){
-				
-					let that = this;
-					uni.showModal({
-						title: '取消订单',
-						content: '确定取消此订单?',
-						success: (res) => {
-							// if (res.confirm) {
-							// 	uni.showLoading({
-							// 		title: '加载中...'
-							// 	})
-							// 	let params = {
-							// 		orderNo: this.recinfo.orderNo
-							// 	}
-							// 	cancel(params).then(res => {
-							// 		if (res.return_code == '000000') {
-							// 			uni.hideLoading();
-							// 			uni.showToast({
-							// 				title: res.return_data,
-							// 				icon: 'none',
-							// 				duration: 2000
-							// 			})
-							// 			let pages = getCurrentPages() //页面栈
-							// 			let prePage = pages[pages.length - 2] //上一页
-							// 			prePage.$vm.reFresh = Math.random() //触发上一页监听器
-							// 			uni.navigateBack() //返回上一页
-							// 		} else {
-							// 			uni.showToast({
-							// 				title: res.return_msg,
-							// 				icon: 'none',
-							// 				duration: 2000
-							// 			})
-							// 			uni.hideLoading()
-							// 		}
-							// 	})
-							// } else if (res.cancel) {
-							// 	console.log('用户点击取消');
-							// }
-						}
-					});
-				
-			},
-			// 支付订单
-			payOrder(){
-				
-			},
-			
-			// 订单取消时的再来一单
-			oneMoreOrder(){
-				
-			},
-			// 订单取消时的删除订单
-			deleteOrder(){
-				
-			},
-			// 复制的
-			copyText(text){
-				
-				
-				
-				// #ifdef H5
-				this.$copyText(text).then(
-					res => {
-						uni.showToast({
-							title: '复制成功'
-						})
-					}
-				)
-				// #endif
-				// #ifndef H5
-				uni.setClipboardData({
-					data: text,
-					success: () => {
-						uni.showToast({
-							title: '复制成功'
-						})
-					}
-				})
-				// #endif
-				
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-
-.flex-center-sp{
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-.flex-center{
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.align-fs{
-	align-self: flex-start;
-}
-.tr{
-	text-align: right;
-}
-.flex-1{
-	flex:1;
-}
-.st-img{
-	 width: 82px;
-	 height: 82px;
- }
- 
- 
- .goodsMore{
-	 padding: 10px 0;
-	 text-align: center;
-	 border-top: 1px solid #f6f6f6;
-	 border-bottom:1px solid #f6f6f6;
- }
-
-// 商品金额
-.pd-tb10{
-	padding: 10px 0;
-}
-
-.td-lt{
-	text-decoration: line-through;
-}
-
-.bordert{
-	border-top: 2px solid #f6f6f6;
-}
-
-// 复制按钮
-.copy-num{
-	padding: 0 5px;
-	border: 1px solid #666666;
-	border-radius: 5px;
-	display: inline-block;
-	vertical-align: middle;
-	
-}
-// 修改按钮
-.edit-msg{
-	border: 1px solid #D7D3D0;
-		width: 50px;
-		height: 30px;
-		line-height: 30px;
-		text-align: center;
-		border-radius: 15px;
-	}
-
-.pdb50{
-	padding-bottom: 50px;
-}
-
-// 底部待支付按钮
-.toPay{
-	height: 40px;
-	padding: 0 15px;
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
-	border-top: 1px solid #f6f6f6;
-	position: fixed;
-	bottom: 0;
-	right: 0;
-	left: 0;
-	.btn{
-		// height: 20px;
-		padding:1px 5px;
-		border-radius: 10px;
-		margin-left: 15px;
-		border:1px solid #666666;
-		color: #666666;
-		&.bgred{
-			color: #ffffff;
-			background-color: #FF2342;
-			border:1px solid #FF2342;
-		}
-		&.oneMore{
-			color: #FF2342;
-			
-			border:1px solid #FF2342;
-		}
-	}
-	
-}
-</style>
\ No newline at end of file
diff --git a/pages/tabBar/classify/classify.vue b/pages/tabBar/classify/classify.vue
index 2a5b4f5..3c9eb05 100644
--- a/pages/tabBar/classify/classify.vue
+++ b/pages/tabBar/classify/classify.vue
@@ -77,8 +77,8 @@
 	import uniBadge from '@/components/uni-badge/components/uni-badge/uni-badge.vue'
 	
 	import componentSearch from "@/components/search/search.vue";
-	import goodsList from '@/pages/classify/goods-list/goods-list.vue'
 	
+	import goodsList from '@/components/goods-list/goods-list.vue'
 	
 	import {getGoodsTypeTree,getListGoodsDetail,getShoppingCartList} from '@/Utils/physicalObject.js'
 	const app = getApp();
@@ -130,7 +130,7 @@
 		},
 		onShow(){
 			
-			console.log("121212")
+			
 				this.hackReset = false;
 				this.$nextTick(() => {
 					this.hackReset = true;
@@ -184,7 +184,7 @@
 			//搜索事件
 			toSearch() {
 				uni.navigateTo({
-					url:"/pages/classify/goods-search/goods-search"
+					url:"/physical-merchants/classify/goods-search/goods-search"
 				})
 			},
 			//导航点击
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 1385081..2117908 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -444,6 +444,15 @@
 			},
 			//跳转详情
 			jumpDetails(e, item) {
+				//实物类型
+				if(item == 12){
+					uni.navigateTo({
+						url:'/physical-merchants/classify/order/orderDetail?id='+e
+						
+					})
+					return;
+				}
+				
 				this.orderCheck(e);
 				if (item == 1 || item == 2 || item == 3) {
 					uni.navigateTo({
diff --git a/pages/user/news/news.vue b/pages/user/news/news.vue
index 866acc6..432b3b7 100644
--- a/pages/user/news/news.vue
+++ b/pages/user/news/news.vue
@@ -146,7 +146,12 @@
 					uni.navigateTo({
 						url: '/qianzhu-KFC/order-details/order-details?id=' + lists.orderNo
 					})
-				} else {
+				}else if(lists.productType == 12){
+					uni.navigateTo({
+						url:'/physical-merchants/classify/order/orderDetail?id='+lists.orderNo
+					})
+				} 
+				else {
 					uni.navigateTo({
 						url: '/pages/user/order_details/order_details?id=' + lists.orderNo
 					})
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 9890b46..cf2801b 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -43,7 +43,7 @@
 						</view>
 					</view>
 
-					<view class="width96 height22 mart10">
+					<view v-if="row.productType !=12" class="width96 height22 mart10">
 						<view class="width70 flleft fotlt ">
 							<view class="font16 fontwig6 fcor333 alijusstart">
 								<image mode="widthFix" src="../../../static/img/order2.png" v-if="row.productType == 4"
@@ -64,18 +64,66 @@
 									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
 								<image mode="widthFix" src="../../../static/img/order9.png" v-if="row.productType == 2"
 									class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
-									<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" v-if="row.productType == 12"
-										class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+									
 								<view class="width100 text1">{{row.title}}</view>
 							</view>
 						</view>
-						<view v-if="row.productType != 12" class="width30 flright fotrt fcor666 font15 fotrt">
+						<view  class="width30 flright fotrt fcor666 font15 fotrt">
 							<view class="font14 fcor333">
 								x1
 							</view>
 						</view>
 					</view>
-					
+					<!--实物start  -->
+					<view  v-if="row.productType ==12" class="width96  mart10">
+						<view v-if ="row.ext6.length>1"  class="">
+							<view class="  fotlt ">
+								<view class="font16 fontwig6 fcor333 alijusstart">
+										<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" v-if="row.productType == 12"
+											class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+									<view class="width100 text1">{{row.title}}</view>
+								</view>
+							</view>
+							<view class="po-ra mart10">
+								<scroll-view class="settle-goods" scroll-x="true"  >
+									<view class="settle-con">
+										<view class="settle-img" v-for="(item,index) in row.ext6" :key="index">
+											<image class="st-img" :src="imageUrl+item" mode="aspectFill"></image>
+										</view>
+									</view>
+								</scroll-view>
+								<view class="fix-soon fcor666">
+									<view class="fix-price">
+										<!-- <text class="fontwig6 fcor333 marb5"> ¥215</text> 
+										<text>共{{goodsData.images.length}}件
+											
+										</text> -->
+										<text class="icon-ymt to-right font14 fcor666"></text>
+									</view>
+									
+								</view>
+							</view>
+						</view>
+						
+						<view v-if ="row.ext6.length<=1" class="mart10  fotlt dis-flex flex-sp">
+							<view class="font16 fontwig6 fcor333 alijusstart">
+									<image mode="widthFix" :src="imageUrl+'orderLogo/goods.png'" v-if="row.productType == 12"
+										class="marglerig" style="width: 50rpx;height: 50rpx;"></image>
+								<view class="width100 text1">{{row.title}}</view>
+							</view>
+							
+							<view class="settle-img"  >
+								<image class="st-img" v-if="row.ext6[0]" :src="imageUrl+row.ext6[0]" mode="aspectFill"></image>
+							</view>
+							
+						</view>
+							
+						
+						
+						
+						
+					</view>
+					<!-- 实物end -->
 					<view class="width96 mart10 font12 fcor999">
 						订单编号:{{row.orderNo}}
 					</view>
@@ -122,7 +170,7 @@
 		getDictionaryByCodeType
 	} from '../../../Utils/Api.js';
 	
-	import orderList from '@/pages/classify/order/orderList.vue'
+
 	
 	let app = getApp()
 	export default {
@@ -165,7 +213,7 @@
 			}
 		},
 		components:{
-			orderList
+			
 		},
 		onLoad(option) {
 			// #ifdef H5
@@ -180,6 +228,10 @@
 			}
 			this.list = this.orderList[this.typeId];
 			this.tabbarIndex = tbIndex;
+			// this.getUserOrderList();
+			// this.getDictionaryByCodeType();
+		},
+		onShow(){
 			this.getUserOrderList();
 			this.getDictionaryByCodeType();
 		},
@@ -253,6 +305,16 @@
 						if (res.return_data.total == (this.pageNum * this.pageSize)) {
 							this.isNoMoreData = true;
 						}
+						
+						if(res.return_data.list.length>0){
+							res.return_data.list.map(item=>{
+								if(item.ext6){
+									item.ext6 = item.ext6.split(',')
+								}
+							})
+						}
+						
+						
 						this.orderList = this.orderList.concat(res.return_data.list);
 						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
 					} else {
@@ -276,21 +338,26 @@
 			},
 			//跳转详情
 			jumpDetails(e, item) {
-				this.orderCheck(e);
-				if (item == 1 || item == 2 || item == 3) {
+				
+				//实物类型
+				if(item == 12){
 					uni.navigateTo({
-						url: '/qianzhu-KFC/order-details/order-details?id=' + e
+						url:'/physical-merchants/classify/order/orderDetail?id='+e
+						
 					})
 					return;
 				}
-				//实物类型
-				if(item == 12){
+				
+				this.orderCheck(e);
+				if (item == 1 || item == 2 || item == 3) {
 					uni.navigateTo({
-						url: '/pages/classify/order/orderDetail?id='+e 
+						url: '/qianzhu-KFC/order-details/order-details?id=' + e
 					})
 					return;
 				}
 				
+				
+				
 				uni.navigateTo({
 					url: '../order_details/order_details?id=' + e
 				})
@@ -376,6 +443,23 @@
 			},
 			//去支付
 			toPayment(row) {
+
+				//实物
+				if(row.productType == 12){
+					let obj = {
+						orderNo : row.orderNo,
+						createTime:row.createTime,
+						payPrice:row.payablePrice
+					}
+					obj = JSON.stringify(obj)
+					uni.navigateTo({
+						url: '/physical-merchants/classify/order/pay?obj=' + obj
+					})
+					
+					return
+				}
+				
+				
 				let payTypes;
 				if (row.payType == 1 || row.payType == null) {
 					payTypes = 3;
@@ -394,6 +478,110 @@
 </script>
 
 <style lang="scss">
+	//实物样式
+	.po-ra{
+		 position: relative;
+	 }
+	 .settle-goods{
+		 width: auto; 
+	 }
+	 .pd10{
+		 padding: 0 10px;
+	 }
+	 .order-top-title{
+		 height: 30px;
+		 line-height: 30px;
+	 }
+	 
+	 // 再来一单
+	 .oneMoreTime {
+		 text-align: right;
+		
+		.btn{
+			margin: 10px 10px 10px 0;
+			display: inline-block;
+			width: 100px;
+			height: 30px;
+			line-height: 30px;
+			 border-radius: 15px;
+			 text-align: center;
+		}
+		
+		// 再来一单
+		 .oneMore {	 
+			 color: #FA253D;	
+			 border:1px solid #FA253D;
+			 
+		 }
+		 
+		 // 立即支付
+		 .nowPay{
+			color: #ffffff;
+			background-color:#FA253D;
+			
+		 }
+		 
+		 // 删除订单
+		 .deleOrder{
+			 color: #666666;
+			 border:1px solid #666666;
+		 }
+	 }
+	 
+	 .settle-img{
+	 	 			  font-size: 0;
+	 	 			 margin-left: 10px;
+	 	 			 .st-img{
+	 	 				 width: 82px;
+	 	 				 height: 82px;
+	 	 			 }
+	 }
+	 
+	 .settle-con{
+	 		
+	 		 display: flex;
+	 		 justify-content: flex-start;
+	 		 align-items: center;
+	 		
+	 		 
+	 		 
+			 .settle-msg{
+				 flex: 1;
+				 padding: 0 10px;
+				 .settle-title{
+					 display: flex;
+					 justify-content: space-between;
+					 align-items: center;
+				 }
+			 }
+	 		 
+	 		 
+	 }
+	 .fix-soon{
+		 			 position: absolute;
+		 			 right: 0;
+					 top:0;
+		 			width: 82px ;
+		 			height: 82px;
+		 			// line-height: 82px;
+		 			opacity: 0.8;
+		 			background-color: #ffffff;
+		 			text-align: center;
+		 }
+	
+		 // 
+	.fix-price{
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		&>text{
+			width: 100%;
+		}
+	}
+	
+	
 	page {
 		background-color: #f3f3f3;
 	}
diff --git a/pages/address/addNewAddress/addNewAddress.vue b/physical-merchants/address/addNewAddress/addNewAddress.vue
similarity index 100%
rename from pages/address/addNewAddress/addNewAddress.vue
rename to physical-merchants/address/addNewAddress/addNewAddress.vue
diff --git a/pages/address/address.vue b/physical-merchants/address/address.vue
similarity index 99%
rename from pages/address/address.vue
rename to physical-merchants/address/address.vue
index 322a935..327d610 100644
--- a/pages/address/address.vue
+++ b/physical-merchants/address/address.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-	import noMore from '@/pages/classify/no-more/no-more.vue'
+	import noMore from '@/components/no-more/no-more.vue'
 	import {
 		getDeliveryAddressList,
 		deleteAddress,
diff --git a/pages/classify/cart/cart.vue b/physical-merchants/classify/cart/cart.vue
similarity index 89%
rename from pages/classify/cart/cart.vue
rename to physical-merchants/classify/cart/cart.vue
index 25cc02c..dff8bb9 100644
--- a/pages/classify/cart/cart.vue
+++ b/physical-merchants/classify/cart/cart.vue
@@ -21,7 +21,7 @@
 									<checkbox class="mycheck" :disabled="!isEdit&&item.loseEfficacy" color="#FFC71E"
 										:value="item.id" :checked="item.whetherCheck" />
 								</checkbox-group>
-								<view class="cart-detail" >
+								<view class="cart-detail">
 									<view class="cart-img">
 										<image :src="imageUrl+item.img" class="img border-8r" mode="aspectFill"></image>
 									</view>
@@ -42,7 +42,7 @@
 													¥{{item.originalPrice}}
 												</view> -->
 											</view>
-											
+
 											<view :class="'cart-num'+(item.loseEfficacy?' pont-event ':' ')">
 
 												<uni-number-box v-model="item.num" :min="1"
@@ -82,11 +82,11 @@
 				<text v-if="isEdit" class="tool-right paddleft5 fcorred" @click="editDelete">退出编辑</text>
 				<view v-if="!isEdit" class="tool-right">
 					<view class="tool-jiesuan marRight10 ">
-					
-					<!-- <text v-if="priceOrigin > 0" class="fcor666 margle10 marRight10 font14 text-lt">¥{{priceOrigin}}</text> -->
-						合计:<text class="fcorred">¥{{priceAll}}</text>
-						
-						
+
+						<!-- <text v-if="priceOrigin > 0" class="fcor666 margle10 marRight10 font14 text-lt">¥{{priceOrigin}}</text> -->
+						合计:<text v-if="priceAll>0" class="fcorred">¥{{priceAll | numFormat}}</text>
+							<text v-else class="fcorred">¥{{priceAll}}</text>
+
 					</view>
 					<view class="jiesuan-btn fcorfff " @click="settleAccount">
 						结算
@@ -110,7 +110,7 @@
 
 <script>
 	// import cartList from '@/pages/classify/cart-list/cart-list.vue'
-	import noMore from '@/pages/classify/no-more/no-more.vue'
+	import noMore from '@/components/no-more/no-more.vue'
 	import uniNumberBox from '@/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.vue'
 	import {
 		getShoppingCartList,
@@ -134,8 +134,7 @@
 				},
 
 				// 
-				swipe_options: [
-					{
+				swipe_options: [{
 						text: '删除',
 						icon: ' delete ',
 						style: {
@@ -150,7 +149,7 @@
 					// 		backgroundColor: '#f6c133'
 					// 	}
 					// },
-					
+
 				],
 				swipe_item_index: null,
 				numberValue: 0,
@@ -171,40 +170,62 @@
 		computed: {
 			//现价金额
 			priceAll() {
-				var str = 0;
-				for (var i = 0; i < this.cartList.length; i++) {
-					if (this.cartList[i].whetherCheck) {
-						str += this.cartList[i].num * this.cartList[i].price;
-					}
+				let str = 0;
+				// for (var i = 0; i < this.cartList.length; i++) {
+				// 	if (this.cartList[i].whetherCheck) {
+				// 		str += this.cartList[i].num * this.cartList[i].price;
+				// 	}
+				// }
+
+				if (this.cartList.length > 0) {
+					this.cartList.map(item => {
+						if (item.whetherCheck) {
+							
+							str =parseFloat((str + (item.num*item.price)).toFixed(2))
+							
+						}
+					})
+
+
+					return str;
+				} else {
+					return 0;
 				}
-				return str;
+
+
 			},
 			// 原价
-			priceOrigin(){
-				var str = 0;
-				for (var i = 0; i < this.cartList.length; i++) {
-					if (this.cartList[i].whetherCheck) {
-						str += this.cartList[i].num * this.cartList[i].originalPrice;
-					}
-				}
-				return str;
-				
-				
-			}
+			// priceOrigin(){
+			// 	var str = 0;
+			// 	for (var i = 0; i < this.cartList.length; i++) {
+			// 		if (this.cartList[i].whetherCheck) {
+			// 			str += this.cartList[i].num * this.cartList[i].originalPrice;
+			// 		}
+			// 	}
+			// 	return str;
+
+
+			// }
 		},
 		onLoad() {
-			
+
 			// this.cartList.map(item=>{
 			// 	this.$set(item, 'checked', false);
 			// })
-			this.initData();
+			// this.initData();
 
 		},
+		onShow(){
+			this.initData();
+		},
 		methods: {
 			initData() {
-
+				uni.showLoading({
+						title: '加载中',
+						mask:true,
+					});
 				getShoppingCartList().then(res => {
-
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						console.log(res.return_data)
 						this.cartList = res.return_data;
@@ -261,7 +282,7 @@
 			// 单个商品的选择
 			checkClick(item) {
 				item.whetherCheck = !item.whetherCheck;
-				
+
 				if (!item.whetherCheck) {
 					if (!this.isEdit && !item.loseEfficacy) { //商品
 						this.allCheck.whetherCheck = false;
@@ -311,7 +332,7 @@
 				} else {
 					this.allCheck.whetherCheck = false
 				}
-				
+
 			},
 
 			// 判断购物车内是否有商品
@@ -357,12 +378,12 @@
 				if (!this.isHaveGoods()) return;
 
 				if (this.priceAll > 0) {
-					let selestArr = this.cartList.filter(item=>item.whetherCheck == true)
+					let selestArr = this.cartList.filter(item => item.whetherCheck == true)
 					selestArr = JSON.stringify(selestArr)
-					
+
 					// console.log(selestArr)
 					uni.navigateTo({
-						url: '/pages/settleAccounts/settleAccounts?goodsList='+selestArr
+						url: '/physical-merchants/settleAccounts/settleAccounts?goodsList=' + selestArr
 					})
 				} else {
 					uni.showToast({
@@ -441,13 +462,13 @@
 			},
 
 			changeNumValue(v, id) {
-				console.log(v,id)
+				console.log(v, id)
 				// console.log(this.cartList)
 				let params = {
 					id: id,
-					num:v
+					num: v
 				}
-				
+
 				goodsEditNum(params).then(res => {
 					if (res.return_code == '000000') {
 						uni.showToast({
@@ -462,20 +483,20 @@
 						// 		item.num = 1;
 						// 	}
 						// })
-						
-						
+
+
 						//重新刷新数据
 						this.initData();
-						
+
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none',
 							duration: 2000
 						})
 					}
-					
-					
-					
+
+
+
 				})
 
 			}
@@ -554,13 +575,13 @@
 	}
 
 
-.pont-event{
-	 pointer-events: none; 
-}
+	.pont-event {
+		pointer-events: none;
+	}
 
 	// 失效
 	.loseEfficacy {
-		
+
 		.cart-img {
 			position: relative;
 
diff --git a/pages/classify/goods-comment-child/goods-comment-child.vue b/physical-merchants/classify/goods-comment-child/goods-comment-child.vue
similarity index 100%
rename from pages/classify/goods-comment-child/goods-comment-child.vue
rename to physical-merchants/classify/goods-comment-child/goods-comment-child.vue
diff --git a/pages/classify/goods-comment/data.json b/physical-merchants/classify/goods-comment/data.json
similarity index 100%
rename from pages/classify/goods-comment/data.json
rename to physical-merchants/classify/goods-comment/data.json
diff --git a/pages/classify/goods-comment/goods-comment.vue b/physical-merchants/classify/goods-comment/goods-comment.vue
similarity index 100%
rename from pages/classify/goods-comment/goods-comment.vue
rename to physical-merchants/classify/goods-comment/goods-comment.vue
diff --git a/pages/classify/goods-search/goods-search.vue b/physical-merchants/classify/goods-search/goods-search.vue
similarity index 97%
rename from pages/classify/goods-search/goods-search.vue
rename to physical-merchants/classify/goods-search/goods-search.vue
index ace319b..0a904d6 100644
--- a/pages/classify/goods-search/goods-search.vue
+++ b/physical-merchants/classify/goods-search/goods-search.vue
@@ -22,7 +22,7 @@
 
 <script>
 	import componentSearch from "@/components/search/search.vue";
-	import goodsList from '@/pages/classify/goods-list/goods-list.vue'
+	import goodsList from '@/components/goods-list/goods-list.vue';
 	import {
 		getListGoodsDetail
 	} from '@/Utils/physicalObject.js'
diff --git a/pages/classify/goodsDetail/goodsDetail.vue b/physical-merchants/classify/goodsDetail/goodsDetail.vue
similarity index 97%
rename from pages/classify/goodsDetail/goodsDetail.vue
rename to physical-merchants/classify/goodsDetail/goodsDetail.vue
index a420630..1007509 100644
--- a/pages/classify/goodsDetail/goodsDetail.vue
+++ b/physical-merchants/classify/goodsDetail/goodsDetail.vue
@@ -143,10 +143,10 @@
 </template>
 
 <script>
-	import noMore from '@/pages/classify/no-more/no-more.vue'
-	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue'
+	import noMore from '@/components/no-more/no-more.vue'
+	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
 
-	import cartChoose from '@/pages/classify/cart-choose/cart-choose.vue'
+	import cartChoose from '@/components/cart-choose/cart-choose.vue'
 	import uniGoodsNav from '@/components/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue'
 
 
@@ -339,9 +339,9 @@
 			goComment() {
 				//要判断评论条数
 
-				uni.navigateTo({
-					url: "../goods-comment/goods-comment?gid=" + 1598348
-				})
+				// uni.navigateTo({
+				// 	url: "../goods-comment/goods-comment?gid=" + 1598348
+				// })
 			},
 
 
@@ -353,7 +353,7 @@
 				if (e.index == 0) {
 					// console.log("点击去购物车页面")
 					uni.navigateTo({
-						url: "/pages/classify/cart/cart"
+						url: "/physical-merchants/classify/cart/cart"
 					})
 					return
 
@@ -369,7 +369,7 @@
 				// if(e.index == 2){
 				// 	console.log("点击去购物车")
 				// 	uni.navigateTo({
-				// 		url:"/pages/classify/cart/cart"
+				// 		url:"/physical-merchants/classify/cart/cart"
 				// 	})
 				// 	return
 
diff --git a/pages/classify/order/editOrder.vue b/physical-merchants/classify/order/editOrder.vue
similarity index 97%
rename from pages/classify/order/editOrder.vue
rename to physical-merchants/classify/order/editOrder.vue
index ea8a411..70ed09d 100644
--- a/pages/classify/order/editOrder.vue
+++ b/physical-merchants/classify/order/editOrder.vue
@@ -50,7 +50,7 @@
 			// 收货信息
 			goEditAddress(){
 				uni.navigateTo({
-					url:'/pages/address/address'
+					url:'/physical-merchants/address/address'
 				})
 			}
 			
diff --git a/pages/classify/order/order.vue b/physical-merchants/classify/order/order.vue
similarity index 96%
rename from pages/classify/order/order.vue
rename to physical-merchants/classify/order/order.vue
index 8d57594..d37a7f0 100644
--- a/pages/classify/order/order.vue
+++ b/physical-merchants/classify/order/order.vue
@@ -104,7 +104,7 @@
 </template>
 
 <script>
-	// import detailPopup from '@/pages/settleAccounts/detail-popup/detail-popup.vue'
+	// import detailPopup from '@/physical-merchants/settleAccounts/detail-popup/detail-popup.vue'
 export default {
 	data(){
 		return{
@@ -119,7 +119,7 @@ export default {
 	methods:{
 		goOrderDetail(){
 			uni.navigateTo({
-				// url:"@/pages/classify/order/orderDetail"
+				// url:"@/physical-merchants/classify/order/orderDetail"
 			})
 		}
 	}
diff --git a/physical-merchants/classify/order/orderDetail.vue b/physical-merchants/classify/order/orderDetail.vue
new file mode 100644
index 0000000..eb9c85b
--- /dev/null
+++ b/physical-merchants/classify/order/orderDetail.vue
@@ -0,0 +1,691 @@
+<template>
+	<view class="backcor9 pd-main pdb50 headsbg">
+
+
+		<!-- 待支付 -->
+		<view v-if="recinfo.orderStatus == 1" class="order-de-title pd-main">
+			<view class="font22 fcor333">
+				待支付
+			</view>
+			<view class="font16 fcor666 mart10">
+				<text class="fcorred paddtright10">{{countdownm}}:{{countdowns}}</text>后订单自动取消
+			</view>
+		</view>
+		<!-- 其他 -->
+		<view v-if="recinfo.orderStatus != 1" v-else class="order-de-title pd-main">
+			<view class="font22 fcor333">
+				{{typeText[recinfo.orderStatus]}}
+			</view>
+			<view class="font16 fcor666 mart10">
+				您的订单{{typeText[recinfo.orderStatus]}}
+			</view>
+		</view>
+
+		<view class=" marb10 backcorfff height50 fcor333 font15 border-8r">
+			<view class="width94">感谢您信任嗨森逛,欢迎再次消费</view>
+		</view>
+
+		<!-- 待支付时支持修改地址,暂时先不弄 -->
+		<!-- <view v-if="status == 0" class="marb20 pd-main backcolorfff border-8r">
+			<view class="flex-center-sp pd-tb10">
+				<view class="">
+					<view class="fontwig6 font18">金科才能收到你看得出纳思达</view>
+					<view class="mart5 fcor666">利<text class="paddleft10">15652365478</text></view>	
+				</view>
+				<view class="align-fs edit-msg " @click="editOrder">
+					修改
+				</view>
+			</view>
+		</view> -->
+
+		<view class="marb20 pd-main backcolorfff border-8r">
+			<!-- 商品信息 -->
+			<view v-for="(item,index) in goodsList" :key="index" class="marb10 flex-center-sp">
+				<view class="">
+					<image class="st-img" :src="imageUrl+item.goodsImg" mode="aspectFill"></image>
+				</view>
+				<view class="flex-1 flex-center-sp">
+					<view class="width60 paddleft10">
+						<view class="marb10 font18 fontwig6">{{item.goodsName}}</view>
+						<view class="marb5 font12 fcor666">规格: {{item.goodsSpecName}}</view>
+						<view class="fcor666 font12">数量: {{item.saleCount}}</view>
+					</view>
+					<view class="font16 tr align-fs">
+						<view class="fontwig6" v-if="recinfo.memDiscountId">¥ {{item.goodsPrice}}</view>
+						<view class="fontwig6" v-if="!recinfo.memDiscountId">¥ {{item.goodsActualPrice}}</view>
+
+					</view>
+				</view>
+			</view>
+
+			<!-- 当商品超过3个的时候 -->
+			<view v-if="!moreThanThree&&isShow" class="goodsMore flex-center" @click="checkMore">
+				还有{{goodsList2.length}}种商品<text class="icon-ymt to-down"></text>
+			</view>
+			<block v-if="moreThanThree">
+				<view v-for="(item,index) in goodsList2" :key="index" class="marb10 flex-center-sp">
+					<view class="">
+						<image class="st-img" :src="imageUrl+item.goodsImg" mode="aspectFill"></image>
+					</view>
+					<view class="flex-1 flex-center-sp">
+						<view class="width60 paddleft10">
+							<view class="marb10 font18 fontwig6">{{item.goodsName}}</view>
+							<view class="marb5 font12 fcor666">规格: {{item.goodsSpecName}}</view>
+							<view class="fcor666 font12">数量: {{item.saleCount}}</view>
+						</view>
+						<view class="font16 tr align-fs">
+							<view class="fontwig6" v-if="recinfo.memDiscountId">¥ {{item.goodsPrice}}</view>
+							<view class="fontwig6" v-if="!recinfo.memDiscountId">¥ {{item.goodsActualPrice}}</view>
+
+						</view>
+					</view>
+				</view>
+			</block>
+			<view v-if="moreThanThree" class="goodsMore flex-center" @click="checkMore">
+				共{{recinfo.highChildOrderList.length}}种商品<text class="icon-ymt to-up"></text>
+			</view>
+
+			<!-- 商品金额 -->
+			<view class="flex-center-sp pd-tb10">
+				<view class="">商品金额</view>
+				<view class="fontwig6"><text class="paddtright5">¥</text>{{goodsPrice | numFormat}}</view>
+			</view>
+			<!-- 优惠券 -->
+			<view class="flex-center-sp pd-tb10">
+				<view class="">优惠券</view>
+				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>{{recinfo.deductionCouponPrice}}
+				</view>
+			</view>
+
+			<!-- 运费 -->
+			<view class="flex-center-sp pd-tb10">
+				<view class="">运费
+					<!-- <text class="icon-ymt question fcor666 font16 paddleft5"></text> -->
+				</view>
+				<view class="fontwig6">
+					<text class="fcor666 fcorred">¥{{recinfo.goodsOrder.freightPrice || 0}}</text>
+
+				</view>
+			</view>
+
+			<!-- 积分 -->
+			<view class="flex-center-sp pd-tb10">
+				<view class="">积分</view>
+				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>{{(recinfo.payGold / 100).toFixed(2)}}
+				</view>
+			</view>
+			<!--支付优惠 -->
+			<view class="flex-center-sp pd-tb10">
+				<view class="">支付优惠</view>
+				<view class="fontwig6 fcorred">-<text class="paddtright5">¥</text>0</view>
+			</view>
+			<!-- 价格总额 -->
+			<view class="tr fontwig6  pd-tb10">
+				<!-- <text class="paddtright10">已优惠<text class="fcorred">¥ 12.01</text></text> -->
+				<view v-if="recinfo.orderStatus == 1 ||recinfo.orderStatus == 5 " class="dis-flex flex-end">商品总金额<text class="margle10 font22">¥{{recinfo.payablePrice | numFormat}}</text> </view>
+				<view v-else class="dis-flex flex-end">实付 <text class="font22 margle10">¥{{recinfo.payRealPrice}}</text></view>
+			</view>
+
+			<!-- 待支付时开始 -->
+			<!-- 订单编号 -->
+			<block v-if="recinfo.orderStatus == 1">
+				<view class="flex-center-sp pd-tb10 bordert">
+					<view class="fcor666 width80px">订单编号</view>
+					<view class=" flex-center-sp">
+						<text class="tr flex-1">{{orderId}}</text>
+						<text class=" margle10 font12 copy-num fcor666" @click="copyText(orderId)">复制</text>
+					</view>
+				</view>
+				<!-- 下单时间 -->
+				<view class="flex-center-sp pd-tb10 ">
+					<view class="fcor666 width80px">下单时间</view>
+					<view class=" ">
+						{{recinfo.createTime | formatDate('-')}}
+					</view>
+				</view>
+				<!-- 待支付时结束 -->
+			</block>
+		</view>
+
+		<!-- 物流信息 -->
+		<view v-if="recinfo.orderStatus != 1 && recinfo.orderStatus != 5" class=" pd-main backcolorfff border-8r">
+
+			<!-- 收货信息 -->
+			<view class="flex-center-sp pd-tb10">
+				<view class="fcor666 align-fs width80px">收货信息</view>
+				<view class="flex-1 tr">
+					<view class=" ">
+						{{recinfo.goodsDeliveryAddress.regionName +' '+recinfo.goodsDeliveryAddress.address}}</view>
+					<view class=" ">{{recinfo.goodsDeliveryAddress.consignee +' '+recinfo.goodsDeliveryAddress.phone}}
+					</view>
+				</view>
+			</view>
+			<!-- 物流信息 -->
+			<view class="flex-center-sp pd-tb10 ">
+				<view class="fcor666 width80px">物流信息</view>
+				<view class=" " @click="checkWuliu">
+					查看物流信息<text class="icon-ymt to-right fcor666 font16 paddleft5"></text>
+				</view>
+			</view>
+			<!-- 订单编号 -->
+			<view class="flex-center-sp pd-tb10 bordert">
+				<view class="fcor666 width80px">订单编号</view>
+				<view class=" flex-center-sp">
+					<text class="tr flex-1">{{orderId}}</text>
+					<text class=" margle10 font12 copy-num fcor666" @click="copyText(orderId)">复制</text>
+				</view>
+			</view>
+			<!-- 下单时间 -->
+			<view class="flex-center-sp pd-tb10 ">
+				<view class="fcor666 width80px">下单时间</view>
+				<view class=" ">
+					{{recinfo.createTime | formatDate('-')}}
+				</view>
+			</view>
+			<!-- 支付方式 -->
+			<view class="flex-center-sp pd-tb10 ">
+				<view class="fcor666 width80px">支付方式</view>
+				<view class=" ">
+					<view class=" fotrt fcor333" v-if="recinfo.payType == 1">支付宝</view>
+					<view class=" fotrt fcor333" v-if="recinfo.payType == 2">微信支付</view>
+					<view class=" fotrt fcor333" v-if="recinfo.payType == 3">积分兑换</view>
+					<view class=" fotrt fcor333" v-if="recinfo.payType == 4">汇联通工会卡</view>
+					<view class=" fotrt fcor333" v-if="recinfo.payType == 5">银联</view>
+				</view>
+			</view>
+			<!-- 备注 -->
+			<view class="flex-center-sp pd-tb10 ">
+				<view class="fcor666 width80px">备注</view>
+				<view class="fcor666 font13 ">
+					{{recinfo.remarks || "暂无数据"}}
+				</view>
+			</view>
+		</view>
+		
+		<view v-if="recinfo.orderStatus == 1 || recinfo.orderStatus == 5" class=" pd-main backcolorfff border-8r">
+		
+			<!-- 收货信息 -->
+			<view class="flex-center-sp pd-tb10">
+				<view class="fcor666 align-fs width80px">收货信息</view>
+				<view class="flex-1 tr">
+					<view class=" ">
+						{{recinfo.goodsDeliveryAddress.regionName +' '+recinfo.goodsDeliveryAddress.address}}</view>
+					<view class=" ">{{recinfo.goodsDeliveryAddress.consignee +' '+recinfo.goodsDeliveryAddress.phone}}
+					</view>
+				</view>
+			</view>
+			<!-- 订单编号 -->
+			<view class="flex-center-sp pd-tb10 bordert">
+				<view class="fcor666 width80px">订单编号</view>
+				<view class=" flex-center-sp">
+					<text class="tr flex-1">{{orderId}}</text>
+					<text class=" margle10 font12 copy-num fcor666" @click="copyText(orderId)">复制</text>
+				</view>
+			</view>
+			<!-- 下单时间 -->
+			<view class="flex-center-sp pd-tb10 ">
+				<view class="fcor666 width80px">下单时间</view>
+				<view class=" ">
+					{{recinfo.createTime | formatDate('-')}}
+				</view>
+			</view>
+			<!-- 备注 -->
+			<view class="flex-center-sp pd-tb10 ">
+				<view class="fcor666 width80px ">备注</view>
+				<view class="fcor666 font13 ">
+					{{recinfo.remarks || "暂无数据"}}
+				</view>
+			</view>
+		</view>
+
+		<!-- 待支付时底部的按钮 -->
+		<view v-if="recinfo.orderStatus == 1" class="toPay font14  backcolorfff">
+			<view class="btn" @click="cancelOrder">取消订单</view>
+			<!-- <view class="btn" @click="editOrder">修改订单</view> -->
+			<view class="btn bgred" @click="payOrder">立即支付{{countdownm}}:{{countdowns}}</view>
+		</view>
+		<!--  -->
+		<!-- <view v-if="recinfo.orderStatus != 1" class="toPay font14  backcolorfff">
+			<view class="btn oneMore" @click="oneMoreOrder">再来一单</view>
+			<view class="btn" @click="deleteOrder">删除订单</view>
+			
+		</view> -->
+		<view v-if="recinfo.orderStatus != 1" class="toPay font14  backcolorfff">
+			
+			<view class="btn" @click="playPhone">联系客服</view>
+		</view>
+		<wuliuPopup ref="wuliu"></wuliuPopup>
+	</view>
+</template>
+
+<script>
+	import wuliuPopup from '@/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue'
+
+	import {
+		getDetailByOrderNo,
+		cancel
+	} from '@/Utils/Api.js'
+
+	const app = getApp()
+	export default {
+		data() {
+			return {
+				
+				countdownh: '', //倒计时时
+				countdownm: '', // 倒计时分
+				countdowns: '', //倒计时秒
+				timers: null,
+				orderId: '', //订单id
+				recinfo: {},
+				typeText: {
+					1: '待支付',
+					2: '已支付',
+					3: '已完成',
+					4: '已退款',
+					5: '已取消',
+					6: '退款中',
+					7: '退款失败'
+				},
+				imageUrl: app.globalData.imgUrl,
+				goodsList: [],
+				goodsList2: [],
+				goodsListAll: [],
+				moreThanThree: false,
+				isShow: false,
+
+
+			}
+		},
+		components: {
+			wuliuPopup
+		},
+		computed: {
+			goodsPrice() {
+				if (this.recinfo.memDiscountId) {
+					var str = 0;
+					this.goodsListAll.map(item => {
+						str = parseFloat((str + (item.saleCount * item.goodsPrice)).toFixed(2))
+					})
+
+					return str;
+				} else {
+					var str2 = 0;
+					this.goodsListAll.map(item => {
+						str2 = parseFloat((str2 + (item.saleCount * item.goodsActualPrice)).toFixed(2))
+					})
+					return str2;
+				}
+
+
+			}
+		},
+		onLoad(option) {
+			this.orderId = option.id
+			// console.log(this.orderId, "this.orderId")
+		},
+		onUnload() {
+			clearInterval(this.timers);
+		},
+		onShow() {
+			//页面显示时,加载订单信息
+			this.getDetailByOrder();
+		},
+		filters: {
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		methods: {
+			//查询订单详情
+			getDetailByOrder() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					orderNo: this.orderId,
+				}
+				getDetailByOrderNo(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.recinfo = res.return_data;
+						// if (res.return_data.productType == 6) {
+						// 	this.getOrderByOrderNo();
+						// }
+
+						this.goodsListAll = this.recinfo.highChildOrderList;
+
+						if (this.recinfo.highChildOrderList.length > 3) {
+							this.isShow = true;
+							this.goodsList = this.recinfo.highChildOrderList.slice(0, 3)
+							this.goodsList2 = this.recinfo.highChildOrderList.slice(3)
+						} else {
+							this.isShow = false;
+							this.goodsList = this.recinfo.highChildOrderList
+						}
+
+
+
+						//待付款
+						if (res.return_data.orderStatus == 1) {
+							this.timers = setInterval(() => {
+								this.showtime()
+							}, 1000)
+						}
+					}
+				})
+			},
+			showtime() {
+				var nowtime = (new Date()).getTime(); //获取当前时间
+				var endtime = this.recinfo.createTime + 600000; //定义结束时间 600000是10分钟
+				var lefttime = endtime - nowtime; //距离结束时间的毫秒数
+				var leftd = Math.floor(lefttime / (1000 * 60 * 60 * 24)); //计算天数
+				var lefth = Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd * 24) < 10 ? "0" + Math.floor((lefttime /
+					(1000 * 60 * 60) % 24) + leftd * 24) : Math.floor((lefttime / (1000 * 60 * 60) % 24) + leftd *
+					24); //计算小时数
+				var leftm = Math.floor(lefttime / (1000 * 60) % 60) < 10 ? "0" + Math.floor(lefttime / (1000 * 60) % 60) :
+					Math.floor(lefttime / (1000 * 60) % 60); //计算分钟数
+				var lefts = Math.floor(lefttime / 1000 % 60) < 10 ? "0" + Math.floor(lefttime / 1000 % 60) : Math.floor(
+					lefttime / 1000 % 60); //计算秒数
+				this.countdownh = lefth; //返回倒计时的字符串
+				this.countdownm = leftm; //返回倒计时的字符串
+				this.countdowns = lefts; //返回倒计时的字符串
+				// 倒计时结束时,显示00:00:00
+				if (lefttime < 0) {
+					clearInterval(this.timers);
+					this.getDetailByOrder();
+					this.countdownh = this.countdownm = this.countdowns = "00";
+				}
+			},
+			// 查看更多商品
+			checkMore() {
+				this.moreThanThree = !this.moreThanThree
+			},
+			// 查看物流
+			checkWuliu() {
+				let logisticsNo = this.recinfo.goodsOrder.logisticsNo;
+
+				if (!logisticsNo) {
+					uni.showToast({
+						title: '暂无数据',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+
+				this.$refs.wuliu.show(logisticsNo)
+			},
+
+			// 点击修改订单
+			editOrder() {
+				// uni.navigateTo({
+				// 	url:'/physical-merchants/classify/order/editOrder'
+				// })
+			},
+			// 取消订单
+			cancelOrder() {
+
+
+				let that = this;
+				uni.showModal({
+					title: '取消订单',
+					content: '确定取消此订单?',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中...'
+							})
+							let params = {
+								orderNo: this.recinfo.orderNo
+							}
+							cancel(params).then(res => {
+								if (res.return_code == '000000') {
+									uni.hideLoading();
+									uni.showToast({
+										title: res.return_data,
+										icon: 'none',
+										duration: 2000
+									})
+									let pages = getCurrentPages() //页面栈
+									let prePage = pages[pages.length - 2] //上一页
+									prePage.$vm.reFresh = Math.random() //触发上一页监听器
+									uni.navigateBack() //返回上一页
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: 'none',
+										duration: 2000
+									})
+									uni.hideLoading()
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+
+
+			},
+			// 支付订单
+			payOrder() {
+				let obj = {
+					orderNo : this.recinfo.orderNo,
+					createTime:this.recinfo.createTime,
+					payPrice:this.recinfo.payablePrice
+				}
+				obj = JSON.stringify(obj)
+				uni.navigateTo({
+					url: '/physical-merchants/classify/order/pay?obj=' + obj
+				})
+			},
+			//拨打客服电话
+			playPhone() {
+					uni.showModal({
+						title: '客服',
+						content: '4006780738',
+						success: function(res) {
+							if (res.confirm) {
+								uni.makePhoneCall({
+									phoneNumber: '4006780738', //电话号码
+									success: function(e) {
+										console.log(e);
+									},
+									fail: function(e) {
+										console.log(e);
+
+									}
+								})
+							}
+						}
+					})
+			},
+
+
+			// 订单取消时的再来一单
+			oneMoreOrder() {
+
+			},
+			// 订单取消时的删除订单
+			deleteOrder() {
+
+			},
+			// 复制的
+			copyText(text) {
+
+
+
+				// #ifdef H5
+				this.$copyText(text).then(
+					res => {
+						uni.showToast({
+							title: '复制成功'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: text,
+					success: () => {
+						uni.showToast({
+							title: '复制成功'
+						})
+					}
+				})
+				// #endif
+
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bottomstu {
+		position: fixed;
+		bottom: 0px;
+		border-top: 1px solid #cecdcd;
+	}
+
+	.cusservice {
+		height: 30px;
+		width: 90px;
+		margin-right: 20px;
+		border: 1px solid #6c6c6c;
+		border-radius: 25px;
+	}
+
+	.headsbg {
+		background: linear-gradient(to bottom, #3da7e7, #e8eff4) no-repeat;
+		background-size: 100% 200px;
+
+	}
+
+	.width80px {
+		width: 80px;
+	}
+
+	.flex-center-sp {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.flex-center {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.align-fs {
+		align-self: flex-start;
+	}
+
+	.tr {
+		text-align: right;
+	}
+
+	.flex-1 {
+		flex: 1;
+	}
+
+	.st-img {
+		width: 82px;
+		height: 82px;
+	}
+
+
+	.goodsMore {
+		padding: 10px 0;
+		text-align: center;
+		border-top: 1px solid #f6f6f6;
+		border-bottom: 1px solid #f6f6f6;
+	}
+
+	// 商品金额
+	.pd-tb10 {
+		padding: 10px 0;
+	}
+
+	.td-lt {
+		text-decoration: line-through;
+	}
+
+	.bordert {
+		border-top: 2px solid #f6f6f6;
+	}
+
+	// 复制按钮
+	.copy-num {
+		padding: 0 5px;
+		border: 1px solid #666666;
+		border-radius: 5px;
+		display: inline-block;
+		vertical-align: middle;
+
+	}
+
+	// 修改按钮
+	.edit-msg {
+		border: 1px solid #D7D3D0;
+		width: 50px;
+		height: 30px;
+		line-height: 30px;
+		text-align: center;
+		border-radius: 15px;
+	}
+
+	.pdb50 {
+		padding-bottom: 50px;
+	}
+
+	// 底部待支付按钮
+	.toPay {
+		height: 30px;
+		padding: 10px 15px;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		border-top: 1px solid #f6f6f6;
+		position: fixed;
+		bottom: 0;
+		right: 0;
+		left: 0;
+
+		.btn {
+			height: 20px;
+			padding: 5px;
+			border-radius: 15px;
+			margin-left: 15px;
+			border: 1px solid #666666;
+			color: #666666;
+
+			&.bgred {
+				color: #ffffff;
+				background-color: #FF2342;
+				border: 1px solid #FF2342;
+			}
+
+			&.oneMore {
+				color: #FF2342;
+
+				border: 1px solid #FF2342;
+			}
+		}
+
+	}
+</style>
diff --git a/pages/classify/order/orderList.vue b/physical-merchants/classify/order/orderList.vue
similarity index 100%
rename from pages/classify/order/orderList.vue
rename to physical-merchants/classify/order/orderList.vue
diff --git a/pages/classify/order/pay.vue b/physical-merchants/classify/order/pay.vue
similarity index 94%
rename from pages/classify/order/pay.vue
rename to physical-merchants/classify/order/pay.vue
index 100e4c2..4e5a2b0 100644
--- a/pages/classify/order/pay.vue
+++ b/physical-merchants/classify/order/pay.vue
@@ -14,7 +14,7 @@
 
 
 				<view class="dis-flex bor-b pd15-v" v-if="item == 4" @tap="paytype='4'">
-					<image class="pay-img paddtright10" src="../../../static/img/yl.png" mode="aspectFit"></image>
+					<image class="pay-img paddtright10" src="/physical-merchants/static/img/yl.png" mode="aspectFit"></image>
 					<view class="flex-1 dis-flex flex-sp  ">
 						<view class="">
 							<view class="">
@@ -29,7 +29,7 @@
 					</view>
 				</view>
 				<view class="dis-flex bor-b  pd15-v" v-if="item == 2" @tap="paytype='2'">
-					<image class="pay-img paddtright10" src="../../../static/img/wechat.png" mode="aspectFit"></image>
+					<image class="pay-img paddtright10" src="/physical-merchants/static/img/wechat.png" mode="aspectFit"></image>
 					<view class="flex-1 dis-flex flex-sp  ">
 						<view class="">
 							<view class="">
@@ -42,7 +42,7 @@
 					</view>
 				</view>
 				<view class="dis-flex bor-b  pd15-v" v-if="item == 3" @tap="paytype='3'">
-					<image class="pay-img paddtright10" src="../../../static/img/unioncard.png" mode="aspectFit">
+					<image class="pay-img paddtright10" src="/physical-merchants/static/img/unioncard.png" mode="aspectFit">
 					</image>
 					<view class="flex-1 dis-flex flex-sp  ">
 						<view class="">
@@ -230,7 +230,9 @@
 					clearInterval(this.timers);
 					// this.getDetailByOrderNo();
 					this.countdownh = this.countdownm = this.countdowns = "00";
-					
+					uni.reLaunch({
+						url:'/pages/user/order_list/order_list'
+					})
 				}
 			},
 
@@ -288,19 +290,22 @@
 								"signType": "MD5",
 								"timeStamp": res.return_data.timeStamp,
 								success: function(res) {
+									
 									uni.hideLoading();
 									uni.showToast({
 										title: '支付成功'
 									})
 									uni.reLaunch({
-										url: "/pages/classify/order/paymentResult?id=" + that
+										url: "/physical-merchants/classify/order/paymentResult?id=" + that
 											.orderNo
 										// url: '../../user/order_details/order_details?id=' +that.orderNo
 									});
 								},
 								fail: function(err) {
 									uni.hideLoading();
-									uni.navigateBack({})
+									uni.navigateBack({
+										delta:2
+									})
 								},
 							});
 							// #endif
@@ -386,7 +391,7 @@
 								title: '支付成功'
 							})
 							uni.reLaunch({
-								url: "/pages/classify/order/paymentResult?id=" + that
+								url: "/physical-merchants/classify/order/paymentResult?id=" + that
 									.orderNo
 								// url: '../../user/order_details/order_details?id=' +that.orderNo
 							});
@@ -448,7 +453,7 @@
 							title: '支付成功'
 						})
 						uni.reLaunch({
-							url: "/pages/classify/order/paymentResult?id=" + that.orderNo
+							url: "/physical-merchants/classify/order/paymentResult?id=" + that.orderNo
 							// url: '../../user/order_details/order_details?id=' +this.orderNo
 						})
 						return;
@@ -481,7 +486,7 @@
 
 		// pay(type) {
 		// 	uni.navigateTo({
-		// 		url: "/pages/classify/order/paymentResult?type=" + type
+		// 		url: "/physical-merchants/classify/order/paymentResult?type=" + type
 		// 	})
 		// }
 	}
diff --git a/pages/classify/order/paymentResult.vue b/physical-merchants/classify/order/paymentResult.vue
similarity index 100%
rename from pages/classify/order/paymentResult.vue
rename to physical-merchants/classify/order/paymentResult.vue
diff --git a/components/trackNode/trackNode.vue b/physical-merchants/classify/order/trackNode/trackNode.vue
similarity index 89%
rename from components/trackNode/trackNode.vue
rename to physical-merchants/classify/order/trackNode/trackNode.vue
index f581df6..b772432 100644
--- a/components/trackNode/trackNode.vue
+++ b/physical-merchants/classify/order/trackNode/trackNode.vue
@@ -66,15 +66,15 @@ export default {
   computed: {
     nodeIconUrl () {
 	  if (this.nodeData.logisticsStatus === 'WAIT_ACCEPT') { // 待揽收
-        return this.isNewest ? '../../static/img/wuliu/ic-paied.png' : '../../static/img/wuliu/ic-paied-G.png'
+        return this.isNewest ? '../../../static/img/wuliu/ic-paied.png' : '../../../static/img/wuliu/ic-paied-G.png'
       } else if (this.nodeData.logisticsStatus === 'ACCEPT') { // 已揽收
-        return this.isNewest ? '../../static/img/wuliu/ic-pacakaging.png' : '../../static/img/wuliu/ic-pacakaging-G.png'
+        return this.isNewest ? '../../../static/img/wuliu/ic-pacakaging.png' : '../../../static/img/wuliu/ic-pacakaging-G.png'
       } else if (this.nodeData.logisticsStatus === 'DELIVERING') { // 派件中
-        return this.isNewest ? '../../static/img/wuliu/ic-sending.png' : '../../static/img/wuliu/ic-sending-G.png'
+        return this.isNewest ? '../../../static/img/wuliu/ic-sending.png' : '../../../static/img/wuliu/ic-sending-G.png'
       } else if (this.nodeData.logisticsStatus === 'SIGN'|| this.nodeData.logisticsStatus === 'AGENT_SIGN') { // 已签收,已待签收
-        return this.isNewest ? '../../static/img/wuliu/ic-delivering.png' : '../../static/img/wuliu/ic-delivering-G.png'
+        return this.isNewest ? '../../../static/img/wuliu/ic-delivering.png' : '../../../static/img/wuliu/ic-delivering-G.png'
       }else if (this.nodeData.logisticsStatus === 'FAILED') { // 包裹异常
-        return this.isNewest ? '../../static/img/wuliu/ic-package-failed.png' : '../../static/img/wuliu/ic-package-failed-G.png'
+        return this.isNewest ? '../../../static/img/wuliu/ic-package-failed.png' : '../../../static/img/wuliu/ic-package-failed-G.png'
       }
     },
     acceptStationFixed () {
diff --git a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
new file mode 100644
index 0000000..eba84fb
--- /dev/null
+++ b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
@@ -0,0 +1,261 @@
+<template>
+	<wybPopup ref="popup"  type="bottom" width="500" scrollY="true" radius="0" :showCloseIcon="true">
+		<view class="pd-main wuliupop backcor9">
+			<view class="pop-title fontwig6"><text>物流信息</text></view>
+			<view class="pd-main backcolorfff border-8r font14">
+				<view class="dis-flex flex-sp mart10 marb10  paddbotm10  border-b">
+					 <view class="dis-flex">
+					 	<!-- <image class="wuliu-img" src="https://pic.616pic.com/ys_bnew_img/00/07/04/1ZtrvD1AMY.jpg" mode="aspectFill"></image> -->
+						<text class="paddleft5">{{tracesData.expressCompanyName}}</text>
+						<text class="paddleft5">{{tracesData.number}}</text>
+					 </view>
+					 <view class="dis-flex ">
+					 		<text @click="copyText(tracesData.number)">复制</text>
+							<text class="paddleft5 paddtright5 fcor666">|</text>
+					 		<text @click="callPhone">打电话</text>
+					 </view>
+				 </view>
+				
+				<block v-for="(item, index) in tracesData.logisticsTraceDetails" >
+				  
+				  
+				  <trackNode  :key="index"  :is-first="index===tracesData.length-1" :is-newest="index===0" :is-main-node="item.logisticsStatus!='TRANSPORT'" :node-data="item"></trackNode>
+				</block>
+			</view>
+			
+			
+		</view>
+	</wybPopup>
+</template>
+
+<script>
+	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
+	import trackNode from '../trackNode/trackNode.vue'
+	
+	import {getLogisticsMsg} from '@/Utils/physicalObject.js'
+	
+	
+	export default {
+		data () {
+		  return {
+		    tracesData:{},
+		/* [
+		      {
+		        acceptStation: '包裹已被吴亦发同学签收', // 节点描述
+		        createTime: '2019-10-24 15: 27: 16',
+		        status: 'COMPLETE', // 节点状态
+		        phone: '', // 电话
+		        statusName: '已签收', // 节点标题
+		        isMainNode: true // 是否主节点,主节点前方展示icon
+		      },
+		      {
+		        acceptStation: '由派送员蔡小坤同志配送,电话:',
+		        createTime: '2019-10-24 15: 26: 41',
+		        status: 'DELIVERING',
+		        phone: '16677778888',
+		        statusName: '运输中',
+		        isMainNode: true
+		      },
+		      {
+		        acceptStation: '已到XXX小区快递点',
+		        createTime: '2019-10-24 15: 26: 41',
+		        status: 'DELIVERING',
+		        phone: '',
+		        statusName: '运输中',
+		        isMainNode: false
+		      },
+		      {
+		        acceptStation: '已到海宁集散中心',
+		        createTime: '2019-10-24 15: 26: 18',
+		        status: 'DELIVERING',
+		        phone: '',
+		        statusName: '运输中',
+		        isMainNode: false
+		      },
+		      {
+		        acceptStation: '已到杭州集散中心',
+		        createTime: '2019-10-24 15: 26: 07',
+		        status: 'DELIVERING',
+		        phone: '',
+		        statusName: '运输中',
+		        isMainNode: false
+		      },
+		      {
+		        acceptStation: '包裹已到达余杭区集散中心',
+		        createTime: '2019-10-24 15: 25: 54',
+		        status: 'DELIVERING',
+		        phone: '',
+		        statusName: '运输中',
+		        isMainNode: false
+		      },
+		      {
+		        acceptStation: '快递员已上门取件',
+		        createTime: '2019-10-24 15: 25: 17',
+		        status: 'DELIVERING',
+		        phone: '',
+		        statusName: '已揽收',
+		        isMainNode: false
+		      },
+		      {
+		        acceptStation: '等待快递员上门揽件',
+		        createTime: '2019-10-24 15: 25: 00',
+		        status: 'WATTING_DELIVER',
+		        phone: '',
+		        statusName: '已发货',
+		        isMainNode: true
+		      },
+				{
+		        acceptStation: '您的包裹正在打包',
+		        createTime: '2019-10-24 15: 24: 00',
+		        status: 'WATTING_DELIVER',
+		        phone: '',
+		        statusName: '待发货',
+		        isMainNode: false
+		      },
+		      {
+		        acceptStation: '订单支付成功,等待商家发货',
+		        createTime: '2019-10-24 15: 22: 30',
+		        status: 'PAYED',
+		        statusName: '已支付',
+		        isMainNode: true
+		      },
+		      {
+		        acceptStation: '订单提交成功',
+		        createTime: '2019-10-24 15: 22: 00',
+		        status: 'WATTING_PAY',
+		        statusName: '已下单',
+		        isMainNode: true
+		      }
+		    ] */
+		  }
+		},
+		components:{
+			wybPopup,
+			trackNode
+		},
+		created(){
+			// this.tracesData=dataList.data;
+			// this.tracesData.logisticsTraceDetails=this.tracesData.logisticsTraceDetails.sort((item,item2)=>{
+				
+			// 	if(item.logisticsStatus == 'TRANSPORT'){
+			// 		item.isMainNode=false;
+			// 	}else{
+			// 		item.isMainNode=true;
+			// 	}
+				
+			// 	return item2.time - item.time; 
+				
+			// })
+		},
+		methods:{
+			show(logisticsNo){
+				console.log(logisticsNo)
+				this.$refs.popup.show();
+				this.getLogisticsMsg(logisticsNo)
+			},
+			//查询物流信息
+			getLogisticsMsg(num){
+				let params ={
+					num:num
+				}
+				getLogisticsMsg(params).then(res=>{
+					if (res.return_code == '000000') {
+						
+							this.tracesData=res.return_data;
+							this.tracesData.logisticsTraceDetails =JSON.parse(this.tracesData.logisticsTraceDetails) 
+							
+							this.tracesData.logisticsTraceDetails=this.tracesData.logisticsTraceDetails.sort((item,item2)=>{
+								
+								if(item.logisticsStatus == 'TRANSPORT'){
+									item.isMainNode=false;
+								}else{
+									item.isMainNode=true;
+								}
+								return item2.time - item.time; 	
+							})			
+					}else{
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+			// 复制
+			copyText(text){	
+				// #ifdef H5
+				this.$copyText(text).then(
+					res => {
+						uni.showToast({
+							title: '复制成功'
+						})
+					}
+				)
+				// #endif
+				// #ifndef H5
+				uni.setClipboardData({
+					data: text,
+					success: () => {
+						uni.showToast({
+							title: '复制成功'
+						})
+					}
+				})
+				// #endif
+				
+				
+			},
+			// 打电话
+			callPhone(){
+				uni.showModal({
+					title: '客服',
+					content: '4006780738',
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: '4006780738', //电话号码
+								success: function(e) {
+									console.log(e);
+								},
+								fail: function(e) {
+									console.log(e);
+				
+								}
+							})
+						}
+					}
+				})
+			},
+		
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.wuliu-img{
+	width: 30px;
+	height: 30px;
+	border-radius: 50%;
+}
+
+.border-b{
+	border-bottom: 2px solid #f6f6f6;
+}
+	
+.wuliupop{
+	padding: 50px 10px 10px;
+}
+.pop-title{
+		text-align: center;
+		height: 50px;
+		line-height: 50px;
+		font-size: 18px;
+		position: fixed;
+		top:0;
+		left: 0;
+		right: 0;
+		background-color: #f6f6f6;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/settleAccounts/detail-popup/detail-popup.vue b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue
similarity index 95%
rename from pages/settleAccounts/detail-popup/detail-popup.vue
rename to physical-merchants/settleAccounts/detail-popup/detail-popup.vue
index b861470..3422209 100644
--- a/pages/settleAccounts/detail-popup/detail-popup.vue
+++ b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue
@@ -24,7 +24,7 @@
 							{{item.title}}
 						</view>
 						<view class="flex-row">
-							<view class="dis-flex">
+							<view v-if="yhqId == 0 || yhqId == null" class="dis-flex">
 								<view class="fcorred">
 									¥{{item.price}}
 								</view>
@@ -32,6 +32,15 @@
 									¥{{item.originalPrice}}
 								</view>
 							</view>
+							
+							<view v-else class="dis-flex">
+								<view class="fcorred">
+									¥{{item.originalPrice}}
+								</view>
+								<!-- <view class="text-lt fcor666 margle10">
+									¥{{item.originalPrice}}
+								</view> -->
+							</view>
 							<view class="fcor666">
 								×{{item.num}}
 							</view>
@@ -197,7 +206,7 @@
 				discountList:[],//优惠券信息
 				totalPrice:0,//商品总金额
 				yhqType: 0,//选择的优惠券id
-				
+				yhqId:0,
 
 			}
 		},
@@ -251,16 +260,18 @@
 		methods: {
 
 			// //goods货品, freight运费,integral积分,coupon优惠券
-			show(str, data) {
+			show(str, data,yhqID) {
 				
 				this.goodsList = [];
 				this.postPrice = null;
 				this.discountList = [];
 				this.totalPrice = 0;
-				
+				this.yhqId = 0;
 				
 				this.keywords = str;
 				if (str == 'goods') {
+					this.yhqId = yhqID;
+					console.log(this.yhqId,"this.yhqId")
 					this.goodsList = data;
 				} else if (str == 'freight') {
 					this.postPrice = data;
diff --git a/pages/settleAccounts/settleAccounts.vue b/physical-merchants/settleAccounts/settleAccounts.vue
similarity index 91%
rename from pages/settleAccounts/settleAccounts.vue
rename to physical-merchants/settleAccounts/settleAccounts.vue
index dc543e4..524b8d8 100644
--- a/pages/settleAccounts/settleAccounts.vue
+++ b/physical-merchants/settleAccounts/settleAccounts.vue
@@ -202,7 +202,7 @@
 </template>
 
 <script>
-	import detailPopup from '@/pages/settleAccounts/detail-popup/detail-popup.vue'
+	import detailPopup from '@/physical-merchants/settleAccounts/detail-popup/detail-popup.vue'
 	import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue'
 	import {
 		getRegionFreight,
@@ -220,7 +220,7 @@
 			return {
 				useScope: 9, //实物商品
 				imageUrl: app.globalData.imgUrl, //图片地址
-				noteValue: '这是备注',
+				noteValue: '',
 
 				isMoreThanOne: false, //是否超过一个商品
 				goodsList: [], //商品列表
@@ -263,29 +263,40 @@
 			},
 			//商品金额
 			priceAll() {
-
 				var str = 0;
-				for (var i = 0; i < this.goodsList.length; i++) {
-					str += this.goodsList[i].num * this.goodsList[i].price;
-				}
+				this.goodsList.map(item=>{
+					str =parseFloat((str + (item.num*item.price)).toFixed(2))
+				})
 				return str;
 			},
 			//商品原价金额
 			priceOrigin() {
 				var str = 0;
-				for (var i = 0; i < this.goodsList.length; i++) {
-					str += this.goodsList[i].num * this.goodsList[i].originalPrice;
-				}
+				this.goodsList.map(item=>{
+					str =parseFloat((str + (item.num*item.originalPrice)).toFixed(2))
+				})
 				return str;
 			},
+			
 			//计算运费
 			postPriceAll() {
 				if (this.postPrice) {
-					if (this.priceAll >= this.postPrice.freePostPrice) {
-						return 0
-					} else {
-						return this.postPrice.freightPrice;
+					if (this.yhqId != 0) { //使用优惠券
+						if (this.priceOrigin >= this.postPrice.freePostPrice) {
+							return 0
+						} else {
+							return this.postPrice.freightPrice;
+						}
+					
+					}else{
+						if (this.priceAll >= this.postPrice.freePostPrice) {
+							return 0
+						} else {
+							return this.postPrice.freightPrice;
+						}
 					}
+					
+					
 				} else {
 					return 0;
 				}
@@ -305,12 +316,12 @@
 				if (yhqPrice >= priceAll) {
 					priceAll = 0;
 				} else {
-					priceAll = priceAll - yhqPrice;
+					priceAll =parseFloat((priceAll - yhqPrice).toFixed(2)) ;
 				}
 				// console.log("商品金额-优惠券:"+priceAll)
 			
 				//优惠券不能抵运费
-				priceAll = priceAll + freightPrice;
+				priceAll =parseFloat((priceAll + freightPrice).toFixed(2)) ;
 				// console.log("商品金额-优惠券+运费:"+priceAll)
 				if(priceAll == 0){
 					this.isShowjf = false;
@@ -319,10 +330,10 @@
 				}
 
 				//percentage 100,100积分兑换1块钱
-				let price = parseFloat(this.availIntegal / this.percentage).toFixed(2);
+				let price = parseFloat((this.availIntegal / this.percentage).toFixed(2));
 				//总积分扣得钱超出了小计金额
 				if(price >= priceAll){
-					this.availIntegalUse = priceAll*this.percentage;
+					this.availIntegalUse =parseFloat((priceAll*this.percentage).toFixed(2)) ;
 				}else {
 					//总积分扣得钱没有超过小计今额	
 					this.availIntegalUse = this.availIntegal;
@@ -333,7 +344,7 @@
 				let jifenPrice = 0;
 				if(this.isSelectJf){
 					
-					jifenPrice = parseFloat(this.availIntegalUse / this.percentage).toFixed(2);
+					jifenPrice = parseFloat((this.availIntegalUse / this.percentage).toFixed(2));
 				}else{
 					jifenPrice = 0;
 				}
@@ -343,7 +354,7 @@
 				if (jifenPrice >= priceAll) {
 					priceAll = 0;
 				} else {
-					priceAll = priceAll - jifenPrice;
+					priceAll =parseFloat((priceAll - jifenPrice).toFixed(2)) ;
 				}
 				// console.log("商品金额-优惠券+运费-积分:"+priceAll)
 				return priceAll
@@ -388,6 +399,7 @@
 			this.findUser() //查询用户相关内容
 		},
 		methods: {
+			
 			//根据区域查询包邮,运费价格
 			getRegiFreight(addressDetail) {
 				this.haveAddress = true;
@@ -456,7 +468,7 @@
 			},
 			goAddress() {
 				uni.navigateTo({
-					url: "/pages/address/address?status=" + 1
+					url: "/physical-merchants/address/address?status=" + 1
 				})
 			},
 			// 查询优惠券
@@ -495,7 +507,7 @@
 							} else if (item.discountType == 2) { //直抵券
 								this.yhqPrice = item.discountPrice;
 							} else if (item.discountType == 3) { //折扣券
-								this.yhqPrice = this.priceOrigin * parseFloat(1 - item.discountPrice).toFixed(2);
+								this.yhqPrice =parseFloat((this.priceOrigin * (1 - item.discountPrice)).toFixed(2)) ;
 							}
 						}
 					})
@@ -554,14 +566,11 @@
 				}
 				getThirdPartyByDetail(datas).then(res => {
 					if (res.return_code == '000000') {
-						let jfPercent = parseFloat(res.return_data.integralDiscount / 100).toFixed(2);
-						//
-						// this.userInfo.gold=1000;
-						// jfPercent = 0.8;
-						//
+						let jfPercent = parseFloat((res.return_data.integralDiscount / 100).toFixed(2));
+						
 						this.availIntegal =Math.floor(parseFloat(this.userInfo.gold * jfPercent)) 
 				
-						console.log(this.availIntegal)
+						
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -585,7 +594,8 @@
 			//goods货品, freight运费,integral积分,coupon优惠券
 			showPopup(str) {
 				if (str == 'goods') {
-					this.$refs.detailPopup.show(str, this.goodsList);
+					let yhqID = this.yhqId
+					this.$refs.detailPopup.show(str, this.goodsList,yhqID);
 				} else if (str == 'freight') {
 					if (!this.postPrice) {
 						uni.showToast({
@@ -601,7 +611,6 @@
 				} else if (str == 'coupon') { //优惠券
 					let obj = {};
 					obj.discountList = this.discountList;
-					// obj.totalPrice = this.priceAll;
 					obj.totalPrice = this.priceOrigin;
 					this.$refs.detailPopup.show(str, obj);
 				} else if (str == 'integral') { //积分
@@ -629,7 +638,7 @@
 						})
 						return;
 					}
-					console.log(this.PaymentPassword,"this.PaymentPassword22222222222")
+					
 					if (this.PaymentPassword ==  0) {
 						//确认设置的密码
 						this.$refs.paymentPassword.modalFun('show');
@@ -647,14 +656,6 @@
 			},
 
 			createOrder() {
-				// 
-				// uni.navigateTo({
-				// 	url: '/pages/classify/order/pay?obj=' + {}
-				// })
-				// return
-				// 
-				
-				
 				//处理商品信息
 				let childOrderList = [];
 				this.goodsList.map(item => {
@@ -673,23 +674,11 @@
 				let _this = this;
 				
 				//处理优惠券
-				// let yhqId = 0;
-				// if (_this.yhqId == 0) {
-				// 	yhqId = null;
-				// }else{
-				// 	yhqId = _this.yhqId;
-				// }
 				let yhqId = 0;
 				_this.yhqId == 0?yhqId = null:yhqId = _this.yhqId;
 				
 				
 				//处理积分
-				// let jfNum = 0;
-				// if(_this.jifenPrice == 0){
-				// 	jfNum = 0;
-				// }else{
-				// 	jfNum = _this.availIntegalUse
-				// }
 				let jfNum = 0;
 				_this.jifenPrice == 0?(jfNum = 0):(jfNum = _this.availIntegalUse)
 				
@@ -716,7 +705,7 @@
 						let obj = {
 							orderNo : res.return_data.orderNo,
 							createTime:res.return_data.createTime,
-							payPrice:res.return_data.payPrice
+							payPrice:res.return_data.payablePrice
 							
 						}
 						obj = JSON.stringify(obj)
@@ -725,14 +714,14 @@
 						
 						if(_this.priceSettle ==0&&_this.availIntegalUse!=0){
 							uni.reLaunch({
-								url: "/pages/classify/order/paymentResult?id=" + res.return_data.orderNo
+								url: "/physical-merchants/classify/order/paymentResult?id=" + res.return_data.orderNo
 							});
 							
 							return
 						}
 						
-						uni.navigateTo({
-							url: '/pages/classify/order/pay?obj=' + obj
+						uni.reLaunch({
+							url: '/physical-merchants/classify/order/pay?obj=' + obj
 						})
 						return
 					} 
diff --git a/physical-merchants/static/img/unioncard.png b/physical-merchants/static/img/unioncard.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbcc5fde3745968d7f75706fc04aea18c412c56c
GIT binary patch
literal 37138
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

literal 0
HcmV?d00001

diff --git a/physical-merchants/static/img/wechat.png b/physical-merchants/static/img/wechat.png
new file mode 100644
index 0000000000000000000000000000000000000000..263e2029f2108c5bed2ff7bb7ccf287ad1bf8856
GIT binary patch
literal 2386
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
Eg0<^|2LJ#7

literal 0
HcmV?d00001

diff --git a/static/img/wuliu/ic-delivering-G.png b/physical-merchants/static/img/wuliu/ic-delivering-G.png
similarity index 100%
rename from static/img/wuliu/ic-delivering-G.png
rename to physical-merchants/static/img/wuliu/ic-delivering-G.png
diff --git a/static/img/wuliu/ic-delivering.png b/physical-merchants/static/img/wuliu/ic-delivering.png
similarity index 100%
rename from static/img/wuliu/ic-delivering.png
rename to physical-merchants/static/img/wuliu/ic-delivering.png
diff --git a/static/img/wuliu/ic-order-commit-G.png b/physical-merchants/static/img/wuliu/ic-order-commit-G.png
similarity index 100%
rename from static/img/wuliu/ic-order-commit-G.png
rename to physical-merchants/static/img/wuliu/ic-order-commit-G.png
diff --git a/static/img/wuliu/ic-order-commit.png b/physical-merchants/static/img/wuliu/ic-order-commit.png
similarity index 100%
rename from static/img/wuliu/ic-order-commit.png
rename to physical-merchants/static/img/wuliu/ic-order-commit.png
diff --git a/static/img/wuliu/ic-pacakaging-G.png b/physical-merchants/static/img/wuliu/ic-pacakaging-G.png
similarity index 100%
rename from static/img/wuliu/ic-pacakaging-G.png
rename to physical-merchants/static/img/wuliu/ic-pacakaging-G.png
diff --git a/static/img/wuliu/ic-pacakaging.png b/physical-merchants/static/img/wuliu/ic-pacakaging.png
similarity index 100%
rename from static/img/wuliu/ic-pacakaging.png
rename to physical-merchants/static/img/wuliu/ic-pacakaging.png
diff --git a/static/img/wuliu/ic-package-failed-G.png b/physical-merchants/static/img/wuliu/ic-package-failed-G.png
similarity index 100%
rename from static/img/wuliu/ic-package-failed-G.png
rename to physical-merchants/static/img/wuliu/ic-package-failed-G.png
diff --git a/static/img/wuliu/ic-package-failed.png b/physical-merchants/static/img/wuliu/ic-package-failed.png
similarity index 100%
rename from static/img/wuliu/ic-package-failed.png
rename to physical-merchants/static/img/wuliu/ic-package-failed.png
diff --git a/static/img/wuliu/ic-paied-G.png b/physical-merchants/static/img/wuliu/ic-paied-G.png
similarity index 100%
rename from static/img/wuliu/ic-paied-G.png
rename to physical-merchants/static/img/wuliu/ic-paied-G.png
diff --git a/static/img/wuliu/ic-paied.png b/physical-merchants/static/img/wuliu/ic-paied.png
similarity index 100%
rename from static/img/wuliu/ic-paied.png
rename to physical-merchants/static/img/wuliu/ic-paied.png
diff --git a/static/img/wuliu/ic-sending-G.png b/physical-merchants/static/img/wuliu/ic-sending-G.png
similarity index 100%
rename from static/img/wuliu/ic-sending-G.png
rename to physical-merchants/static/img/wuliu/ic-sending-G.png
diff --git a/static/img/wuliu/ic-sending.png b/physical-merchants/static/img/wuliu/ic-sending.png
similarity index 100%
rename from static/img/wuliu/ic-sending.png
rename to physical-merchants/static/img/wuliu/ic-sending.png
diff --git a/physical-merchants/static/img/yl.png b/physical-merchants/static/img/yl.png
new file mode 100644
index 0000000000000000000000000000000000000000..78b29e40ce5aa0ad428c701588cb6e62acdf3018
GIT binary patch
literal 2730
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

literal 0
HcmV?d00001

diff --git a/pages/wuliu/wuliu.vue b/physical-merchants/wuliu/wuliu.vue
similarity index 100%
rename from pages/wuliu/wuliu.vue
rename to physical-merchants/wuliu/wuliu.vue
diff --git a/static/img/zfb.png b/static/img/zfb.png
deleted file mode 100644
index 2dd47c82233ee3f3684e2e4cfe20ac66f4829103..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1780
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
WYqc+9WD}JD0000<MNUMnLSTYJNNJ=1

diff --git a/uni.scss b/uni.scss
index 51d7941..81f8e0d 100644
--- a/uni.scss
+++ b/uni.scss
@@ -948,12 +948,19 @@ $uni-font-size-paragraph:30upx;
 .flex-sp{
 	justify-content: space-between;
 }
+.flex-end{
+	justify-content: flex-end;
+}
 .flex-center{
 	justify-content: center;
 }
 .align-self{
 	align-self: flex-start;
 }
+.align-end{
+	align-self: flex-end;
+	
+}
 .flex-1{
 	flex: 1;
 }