diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..501e01c
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,11 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+            "type": "uniCloud",
+            "default": {
+                "launchtype": "remote"
+            }
+        }
+    ]
+}
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..dd5b400
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/recook-weapp.iml" filepath="$PROJECT_DIR$/.idea/recook-weapp.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/recook-weapp.iml b/.idea/recook-weapp.iml
new file mode 100644
index 0000000..0c8867d
--- /dev/null
+++ b/.idea/recook-weapp.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..c1ce52f
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="25cc1d84-530b-46ca-968a-663f03ba7b68" name="Default Changelist" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="1sBporjuXO2uueYx8FF4KVcz2TW" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="vue.rearranger.settings.migration" value="true" />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="25cc1d84-530b-46ca-968a-663f03ba7b68" name="Default Changelist" comment="" />
+      <created>1620356017127</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1620356017127</updated>
+      <workItem from="1620356020037" duration="14000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/components/guideOrderGoods.vue b/components/guideOrderGoods.vue
new file mode 100644
index 0000000..44e47c7
--- /dev/null
+++ b/components/guideOrderGoods.vue
@@ -0,0 +1,159 @@
+<template name="guideOrderGoods">
+	<view class="goods-box why">
+		<!-- 导购订单列表的商品信息 -->
+		<view v-for="(item,index) in goodsList" :key="index">
+			<view class="goods-item flex">
+				<navigator :url="'/pages/goodsDetail/goodsDetail?id='+item.goods_id" hover-stop-propagation @tap.stop="" class="goods-pic">
+					<u-lazy-load threshold="-100" :image="IMAGE_URL+item.mainPhotoUrl" :index="index" height="200" border-radius="10" :loading-img="IMAGE_URL + '/null05.png'" :error-img="IMAGE_URL + '/null05.png'"  img-mode="aspectFill"></u-lazy-load>
+				</navigator>
+				<view class="goods-con flex-sub flex flex-direction justify-between">
+					<view class="">
+						<view class="goods-name two-line">{{item.goodsName}}</view>
+						<view class="goods-spec-con flex justify-between">
+							<view class="goods-spec text-hidden">{{item.skuName}}</view>
+							
+							<!-- <view class="goods-num" style="color:#aaa;">×{{item.quantity}}</view> -->
+						</view>
+							<view class="flex align-center" style="margin:10rpx 0;">
+								<view class="align-center justify-start" v-if="item.isFerme">
+									<view class="tab_ferme">包税</view>
+								</view>
+								<view class="" style="font-size: 20rpx;color: #FA6400;" v-if="item.storehouse">
+									<text>不支持7天无理由退换货</text>
+								</view>
+							</view>
+					</view>
+					<view class="flex justify-between" style="font-size: 28rpx;color: #FA6400;">
+						<view class="flex">￥{{item.unitPrice | toFixed(2)}} </view>
+						<view>×{{item.quantity}}</view>
+						<view v-if="item.rStatus">{{item.rStatus}}</view>
+					</view>
+				</view>
+			</view>
+			<!-- 导购订单列表 不需要 -->
+			<!-- <view class="goods-bottom flex justify-end" style="margin: 10rpx 0;" v-if="item.orderType==1&&item.rStatus=='待发货'">
+				<button class="cu-btn lines-gray text-gray round" hover-stop-propagation @tap.stop="returnMoney(item.goodsDetailId)">申请退款</button>
+			</view>
+			<view class="goods-bottom flex justify-end" style="margin: 10rpx 0;" v-if="item.orderType==1&&item.rStatus=='已发货'">
+				<button class="cu-btn lines-gray text-gray round" hover-stop-propagation @tap.stop="toChooseType(item)">申请售后</button>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "orderGoodsReport",
+		data() {
+			return {
+				IMAGE_URL: this.IMAGE_URL
+			};
+		},
+		props: {
+			goodsList: {
+				type: Array,
+				value: null,
+			},
+			orderType:{
+				type:Number,
+				value:0
+			}
+		},
+		mounted() {
+			console.log(this.goodsList)
+		},
+		methods:{
+			//未发货申请退款
+			returnMoney(id){
+				uni.showModal({
+				    title: '提示',
+				    content: '确认申请退款吗？',
+				    success: (res)=> {
+				        if (res.confirm) {
+				            console.log('用户点击确定');
+							this.$u.post('/api/v1/order/refund',{
+								userId: uni.getStorageSync("userInfo").id,
+								orderGoodsIDs:[id]
+							}).then(res => {
+								console.log(res.data);
+								if (res.data.code == "FAIL") {
+									this.$u.toast(res.data.msg);
+									return
+								}
+								uni.navigateTo({
+									url:"/pages/afterSaleDetail/afterSaleDetail?orderGoodsId="+id
+								})
+							});
+				        } else if (res.cancel) {
+				            console.log('用户点击取消');
+				        }
+				    }
+				});
+			},
+			toChooseType(obj){
+				this.$store.commit('setReturnGoodsMsg',obj);
+				uni.navigateTo({
+					url:"/pages/chooseAftersaleType/chooseAftersaleType"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tab_ferme{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 64rpx;
+		height: 28rpx;
+		background: #FFE5ED;
+		border-radius: 15rpx;
+		margin-right: 20rpx;
+		font-size: 20rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #CC1B4F;
+	}
+	.goods-box {
+		border-bottom: 1rpx solid #EEEEEE;
+		padding: 10rpx 0;
+
+		.goods-item {
+			line-height: 40rpx;
+			padding: 10rpx 0;
+
+			.goods-pic {
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 10rpx;
+				overflow: hidden;
+				margin-right: 20rpx;
+			}
+
+			.goods-name {
+				color: #000;
+				font-size: 28rpx;
+				margin-bottom: 10rpx;
+				font-size: 32rpx;
+				color: #000;
+			}
+
+			.goods-spec {
+				background-color: #EFF1F6;
+				font-size: 20rpx;
+				padding: 0 10rpx;
+				border-radius: 10rpx;
+				color: #aaa;
+			}
+		}
+		.goods-bottom{
+			.cu-btn{
+				height: 50rpx;
+				line-height: 50rpx;
+				padding: 0 15rpx;
+				font-size: 26rpx;
+			}
+		}
+	}
+</style>
diff --git a/package-lock.json b/package-lock.json
index 8abcdf0..1cd9a32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,22 @@
 {
   "name": "recook-weapp",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "wxmp-rsa": "^1.1.1"
+      }
+    },
+    "node_modules/wxmp-rsa": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/wxmp-rsa/-/wxmp-rsa-1.1.1.tgz",
+      "integrity": "sha512-H+IHQcmVqqGUSHp/a7qtSsH49YKHoU++WNziHIi2r/q6KlM+myKjXnQkH/2DR3ZzTbZXBfm17uCgjj/A31hmLg=="
+    }
+  },
   "dependencies": {
     "wxmp-rsa": {
       "version": "1.1.1",
diff --git a/pages/orders/orders.vue b/pages/orders/orders.vue
index 99b4584..57b53e3 100644
--- a/pages/orders/orders.vue
+++ b/pages/orders/orders.vue
@@ -34,7 +34,9 @@
 									<view class="order-item-top flex justify-between align-center">
 										<view class="flex align-center">
 											<view class="text-center text-white buy" style="">买</view>
-											<view class="flex" style="font-size: 32rpx;color: #000000;">{{item2.createdAt}}<text class="cuIcon-right"
+											<view v-if="currentIndex === 0" class="flex" style="font-size: 32rpx;color: #000000;">{{item2.createdAt}}<text class="cuIcon-right"
+												 style="color: #ccc;"></text></view>
+											<view v-else class="flex" style="font-size: 32rpx;color: #000000;">{{timeFormat(item2.createdAt, 'yyyy-mm-dd hh:MM:ss')}}<text class="cuIcon-right"
 												 style="color: #ccc;"></text></view>
 										</view>
 										<view class="text-red" v-if="item2.status==0">未付款</view>
@@ -44,17 +46,19 @@
 										<view class="text-red" v-if="item2.status==4">交易已完成</view>
 										<view class="text-red" v-if="item2.status==5">交易已关闭</view>
 									</view>
-									<order-goods :goodsList="item2.goodsList"></order-goods>
+									<order-goods v-if="currentIndex === 0" :goodsList="item2.goodsList"></order-goods>
+									<guide-order-goods v-else :goodsList="item2.goods" ></guide-order-goods >
+									
 									<view class="flex justify-between order-btn">
-										<view class="">
+										<view class="" v-if="currentIndex === 0">
 											<button v-if="item2.status==1&&item2.expressStatus!=0" class="cu-btn lines-gray text-gray round" @tap.stop="checkExpress(item2.id)">查看物流</button>
 											<button v-if="item2.status==4" class="cu-btn lines-gray text-gray round" @tap.stop="checkExpress(index2,item2.id)">查看物流</button>
-												
 										</view>
-										<view>共{{item2.totalGoodsCount}}件商品 总计<text class="text-red">￥{{item2.goodsTotalAmount | toFixed(2)}}</text></view>
+										<view v-if="currentIndex === 0">共{{item2.totalGoodsCount}}件商品 总计<text class="text-red">￥{{item2.goodsTotalAmount | toFixed(2)}}</text></view>
+										<view v-else>共{{item2.goods.length}}件商品 总计<text class="text-red">￥{{item2.goodsTotalAmount | toFixed(2)}}</text></view>
 									</view>
 
-									<view class="order-btn flex justify-end align-center" hover-stop-propagation>
+									<view class="order-btn flex justify-end align-center" hover-stop-propagation v-if="currentIndex === 0">
 										<view class="">
 											<view class="" v-if="item2.status==0">
 												<button class="cu-btn lines-gray text-gray round" @tap.stop="cancelOrder(index2,item2.id)" style="margin-right: 15rpx;">取消订单</button>
@@ -80,8 +84,12 @@
 	</view>
 </template>
 
-<script>
-	export default {
+<script>
+	import guideOrderGoods from '@/components/guideOrderGoods.vue'
+	export default {
+		components:{
+			guideOrderGoods
+		},
 		data() {
 			return {
 				show: true, // 提醒文案是否显示
@@ -125,11 +133,40 @@
 				}
 			})
 		},
-		methods: {
-			OrdersDetails(id, index) {
-				uni.navigateTo({
-					url: "../orderDetail/orderDetail?orderId=" + id
-				})
+		methods: {
+			timeFormat(timestamp, fmt) {
+				// 其他更多是格式化有如下:
+				// yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合
+				timestamp = parseInt(timestamp);
+				// 如果为null,则格式化当前时间
+				if (!timestamp) timestamp = Number(new Date());
+				// 判断用户输入的时间戳是秒还是毫秒,一般前端js获取的时间戳是毫秒(13位),后端传过来的为秒(10位)
+				if (timestamp.toString().length == 10) timestamp *= 1000;
+				let date = new Date(timestamp);
+				let ret;
+				let opt = {
+					"y+": date.getFullYear().toString(), // 年
+					"m+": (date.getMonth() + 1).toString(), // 月
+					"d+": date.getDate().toString(), // 日
+					"h+": date.getHours().toString(), // 时
+					"M+": date.getMinutes().toString(), // 分
+					"s+": date.getSeconds().toString() // 秒
+					// 有其他格式化字符需求可以继续添加，必须转化成字符串
+				};
+				for (let k in opt) {
+					ret = new RegExp("(" + k + ")").exec(fmt);
+					if (ret) {
+						fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, "0")))
+					};
+				};
+				return fmt;
+			},
+			OrdersDetails(id, index) {
+				if (this.currentIndex === 0) {
+					uni.navigateTo({
+						url: "../orderDetail/orderDetail?orderId=" + id
+					})
+				}
 			},
 			toOrderPay(id) {
 				// 跳转支付页面携带参数（支付价格，创建时间）
@@ -268,7 +305,7 @@
 						page: this.navs[index].page,
 						limit: 5,
 						status: index
-					}).then(res => {
+					}).then(res => {
 						if (res.data.code == "FAIL") {
 							this.$u.toast(res.data.msg);
 							return