diff --git a/.gitignore b/.gitignore
index 1fc5661..88bd84a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .hbuilderx/
 .history/
-unpackage/dist/dev/
-unpackage/dist/build/.automator/
+# unpackage/dist/dev/
+# unpackage/dist/build/.automator/
 node_moudel/
 package-lock.json
\ No newline at end of file
diff --git a/common/utils/sotrageSync.js b/common/utils/sotrageSync.js
deleted file mode 100644
index 3b9f305..0000000
--- a/common/utils/sotrageSync.js
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-/*
- * @Author: ch
- * @Date: 2022-03-23 14:07:07
- * @LastEditors: ch
- * @LastEditTime: 2022-03-23 14:14:37
- * @Description: file content
- */
-import { ToAsyncAwait } from '@/common/utils';
-
-const getStorageSync = (key )=> ToAsyncAwait(async ()=>{
-	return Promise((resolve, reject)=>{
-		try{
-			cosnt val = await uni.getStorageSync(key);
-			resolve(val)
-		}catch (e){
-			reject(e)
-		}
-		
-	}) 
-})
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 5cffb7f..fed3fca 100644
--- a/pages.json
+++ b/pages.json
@@ -183,6 +183,13 @@
 				"navigationBarBackgroundColor" : "#F8F8F8"
 			}
 		},
+		{
+			"path": "pages/order/saleAfter/saleAfterSelect",
+			"aliasPath" : "/saleAfterSelect",
+			"style": {
+				"navigationBarTitleText": "申请售后"
+			}
+		},
 		{
 			"path": "pages/order/saleAfter/saleAfterApply",
 			"aliasPath" : "/saleAfterApply",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9de4172..a5f1347 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-04-12 18:55:04
+ * @LastEditTime: 2022-04-14 17:37:40
  * @Description: file content
 -->
 <template>
@@ -30,7 +30,7 @@
 				<text class="category--title">{{item.name}}</text>
 			</view>
 		</view>
-		<Seckill :data="seckillData"></Seckill>
+		<Seckill :data="seckillData" v-if="seckillData.activityTimeVO"></Seckill>
 
 		<view class="title">甄选推荐</view>
 		<Pick :data="recommendedGoodsList"></Pick>
diff --git a/pages/order/detail/index.vue b/pages/order/detail/index.vue
index 40edaa5..0eb8ca3 100644
--- a/pages/order/detail/index.vue
+++ b/pages/order/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-04-13 17:43:55
+ * @LastEditTime: 2022-04-14 18:02:14
  * @Description: file content
 -->
 <template>
@@ -11,7 +11,7 @@
 		<UiWhiteBox>
 			<UiGoodsInfo v-for="(item, index) in orderInfo.products" :data="item" :key="index">
 				<template slot="operation">
-					<UiButton size="min" @click="$Router.push(`/saleAfterApply?type=1&id=${item.orderProductId}`)">申请售后</UiButton>
+					<UiButton size="min" @click="$Router.push(`/saleAfterSelect?id=${item.orderProductId}`)">申请售后</UiButton>
 				</template>
 			</UiGoodsInfo>
 		</UiWhiteBox>
diff --git a/pages/order/saleAfter/saleAfterApply.vue b/pages/order/saleAfter/saleAfterApply.vue
index 8a8e3ee..8de3b57 100644
--- a/pages/order/saleAfter/saleAfterApply.vue
+++ b/pages/order/saleAfter/saleAfterApply.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-11 13:51:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-14 17:23:39
+ * @LastEditTime: 2022-04-14 17:59:09
  * @Description: file content
 -->
 <template>
@@ -86,7 +86,11 @@ export default {
 		};
 	},
 	onShow(){
-		this.$Route.query.
+		if(this.$Route.query.type == 2){
+			uni.setNavigationBarTitle({title:'申请退货退款'});
+		}else{
+			uni.setNavigationBarTitle({title:'申请退款'});
+		}
 		this.receiveSelected =  this.receiveStatusData.find(i => i.value == this.$Route.query.status) || {};
 	},
 	methods: {
diff --git a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue b/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
index 2bf4bfb..fa542fe 100644
--- a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
+++ b/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-14 13:44:30
  * @LastEditors: ch
- * @LastEditTime: 2022-04-14 14:58:49
+ * @LastEditTime: 2022-04-14 19:25:37
  * @Description: file content
 -->
 <template>
@@ -17,7 +17,7 @@
 				<view>•请填写真实退货物流信息，逾期未填写，退货申请将关闭</view>
 			</view>
 			<view class="footer">
-				<UiButton size="min">撤销申请</UiButton>
+				<UiButton size="min" @click="cancelShow = true">撤销申请</UiButton>
 			</view>
 		</UiWhiteBox>
 		<UiWhiteBox class="box">
@@ -50,15 +50,40 @@
 		</UiWhiteBox>
 
 		<UiButton class="submit-btn" size="max" type="gradual">确认提交</UiButton>
+
+		<u-modal :show="cancelShow" @confirm="cancelSaleAfter" showCancelButton @cancel="cancelShow = false" 
+			content="你将撤销本次申请，撤销后，保障期内你可以再次申请售后服务" cancelText="我再想想"></u-modal>
 	</view>
 </template>
 <script>
 import UiButton from '../../../../../components/UiButton.vue'
 import UiCell from '../../../../../components/UiCell.vue'
 import UiWhiteBox from '../../../../../components/UiWhiteBox.vue'
+import {ApiPostCancelSaleAfter} from '@/common/api/order.js';
 export default {
 	components: { UiWhiteBox, UiButton, UiCell },
-	
+	props:{
+		data : {
+			type : Object,
+			default : ()=>({})
+		}
+	},
+	data(){
+		return {
+			cancelShow : false
+		}
+	},
+	methods:{
+		async cancelSaleAfter(){
+			const {error, result} = await ApiPostCancelSaleAfter({refundId : this.data.refundId});
+			if(error){
+				uni.$u.toast(error.message);
+				return false;
+			}
+			this.$emit('reload');
+			this.cancelShow = false;
+		},
+	}
 }
 </script>
 <style lang="scss" scoped>
diff --git a/pages/order/saleAfter/saleAfterDetail/index.vue b/pages/order/saleAfter/saleAfterDetail/index.vue
index b0bc1fd..bee7554 100644
--- a/pages/order/saleAfter/saleAfterDetail/index.vue
+++ b/pages/order/saleAfter/saleAfterDetail/index.vue
@@ -2,15 +2,15 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-04-14 15:47:50
+ * @LastEditTime: 2022-04-14 19:18:28
  * @Description: file content
 -->
 <template>
 	<view>
 		<StatusTips :data="orderInfo"></StatusTips>
 		<AwaitExamine :data="orderInfo" v-if="orderInfo.refundStatus == 1" @reload="getOrderInfo"></AwaitExamine>
-		<SubmitLogistics v-if="orderInfo.refundStatus == 3"></SubmitLogistics>
-		<LogisticsInfo v-if="[4,5,6].includes(orderInfo.refundStatus)"></LogisticsInfo>
+		<SubmitLogistics :data="orderInfo" v-if="orderInfo.refundStatus == 3"></SubmitLogistics>
+		<LogisticsInfo :data="orderInfo" v-if="[4,5,6].includes(orderInfo.refundStatus)"></LogisticsInfo>
 		<GoodsInfo :data="orderInfo"></GoodsInfo>
 	</view>
 </template>
@@ -49,7 +49,7 @@ export default {
 				uni.$u.toast(error.message);
 				return false;
 			}
-			this.orderInfo = result;
+			this.orderInfo = {...result, refundStatus : 3};
 		}
 		
 	}
diff --git a/pages/order/saleAfter/saleAfterEdit.vue b/pages/order/saleAfter/saleAfterEdit.vue
index d3c3863..aa5f4ab 100644
--- a/pages/order/saleAfter/saleAfterEdit.vue
+++ b/pages/order/saleAfter/saleAfterEdit.vue
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-04-11 13:51:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-14 16:42:51
+ * @LastEditTime: 2022-04-14 17:55:55
  * @Description: file content
 -->
 <template>
 	<view>
 		<view class="box">
-			<UiCell title="货物状态" @click="receiveShow = true" v-if="!$Route.query.status">
+			<UiCell title="货物状态" @click="receiveShow = true" v-if="params.refundType == 1">
 				<input class="input" slot="value" disabled placeholder="请选择" :value="receiveSelected.label"/>
 			</UiCell>
 			<UiCell title="退款原因" @click="refundShow=true">
@@ -112,6 +112,13 @@ export default {
 			// console.log(this.params.evidenceImages);
 			this.receiveSelected =  this.receiveStatusData.find(i => i.value == this.params.receiveStatus) || {};
 			this.refundSelected =  this.refundReasonData.find(i => i.value == this.params.refundType) || {};
+			
+
+			if(result.refundType == 2){
+				uni.setNavigationBarTitle({title:'修改退货退款申请'});
+			}else{
+				uni.setNavigationBarTitle({title:'修改退款申请'});
+			}
 		},
 		async getOssCon(){
 			const {error, result} = await ApiPostGetOssConfig({
diff --git a/pages/order/saleAfter/saleAfterSelect.vue b/pages/order/saleAfter/saleAfterSelect.vue
index cf2eeb4..f35fdd2 100644
--- a/pages/order/saleAfter/saleAfterSelect.vue
+++ b/pages/order/saleAfter/saleAfterSelect.vue
@@ -2,16 +2,72 @@
  * @Author: ch
  * @Date: 2022-04-14 16:50:37
  * @LastEditors: ch
- * @LastEditTime: 2022-04-14 17:10:58
+ * @LastEditTime: 2022-04-14 18:57:54
  * @Description: file content
 -->
 <template>
 	<view>
-
+		<UiWhiteBox>
+			<!-- <ui-goods-info -->
+			<UiGoodsInfo class="goods-info" ></UiGoodsInfo>
+		</UiWhiteBox>
+		<UiWhiteBox>
+			<view class="title">选择售后类型</view>
+			<view class="item item__first" @click="$Router.push(`/saleAfterApply?type=1`)">
+				<view>申请退款</view>
+				<text>没有收到货，或已协商同意不退货只退款</text>
+			</view>
+			<view class="item" @click="$Router.push(`/saleAfterApply?type=2&status=2`)">
+				<view>申请退货退款</view>
+				<text>已收到货，需要退还收到的货物</text>
+			</view>
+		</UiWhiteBox>
 	</view>
 </template>
 <script>
+import UiGoodsInfo from '../../../components/UiGoodsInfo.vue'
+import UiWhiteBox from '../../../components/UiWhiteBox.vue'
 export default {
-	
+	components: { UiWhiteBox, UiGoodsInfo },
+	data(){
+		return {
+			
+		}
+	},
+	methods : {
+		getOrderInfo(){
+
+		}
+	}
 }
 </script>
+<style lang="scss" scoped>
+page{
+	background: $color-grey1;
+}
+.title{
+	height: 98rpx;
+	line-height: 98rpx;
+	border-bottom: 2rpx solid $color-grey2;
+	padding: 0 30rpx;
+	color: $color-grey5;
+}
+.item{
+	padding: 40rpx 0;
+	margin: 0 40rpx;
+	&__first{
+		border-bottom: 2rpx solid $color-grey2;
+	}
+	view{
+		font-weight: bold;
+		margin-bottom:20rpx;
+	}
+	text{
+		color: $color-grey4;
+		font-size: $font-size-sm;
+	}
+}
+.goods-info{
+	border: 0;
+}
+</style>
\ No newline at end of file
diff --git a/static/tabbar/account-active.png b/static/common/tabbar/account-active.png
similarity index 100%
rename from static/tabbar/account-active.png
rename to static/common/tabbar/account-active.png
diff --git a/static/tabbar/account.png b/static/common/tabbar/account.png
similarity index 100%
rename from static/tabbar/account.png
rename to static/common/tabbar/account.png
diff --git a/static/tabbar/category-active.png b/static/common/tabbar/category-active.png
similarity index 100%
rename from static/tabbar/category-active.png
rename to static/common/tabbar/category-active.png
diff --git a/static/tabbar/category.png b/static/common/tabbar/category.png
similarity index 100%
rename from static/tabbar/category.png
rename to static/common/tabbar/category.png
diff --git a/static/tabbar/home-active.png b/static/common/tabbar/home-active.png
similarity index 100%
rename from static/tabbar/home-active.png
rename to static/common/tabbar/home-active.png
diff --git a/static/tabbar/home.png b/static/common/tabbar/home.png
similarity index 100%
rename from static/tabbar/home.png
rename to static/common/tabbar/home.png
diff --git a/static/tabbar/shopping-cart-active.png b/static/common/tabbar/shopping-cart-active.png
similarity index 100%
rename from static/tabbar/shopping-cart-active.png
rename to static/common/tabbar/shopping-cart-active.png
diff --git a/static/tabbar/shopping-cart.png b/static/common/tabbar/shopping-cart.png
similarity index 100%
rename from static/tabbar/shopping-cart.png
rename to static/common/tabbar/shopping-cart.png
diff --git a/static/testImg/1.png b/static/testImg/1.png
deleted file mode 100644
index 7308d2e..0000000
Binary files a/static/testImg/1.png and /dev/null differ
diff --git a/static/testImg/2.png b/static/testImg/2.png
deleted file mode 100644
index 37a476e..0000000
Binary files a/static/testImg/2.png and /dev/null differ
diff --git a/static/testImg/3.png b/static/testImg/3.png
deleted file mode 100644
index ba13e5f..0000000
Binary files a/static/testImg/3.png and /dev/null differ