From 8456962ef1c43dc0f26cf265df1d366962371a4c Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 14 Apr 2022 19:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   4 +-
 common/utils/sotrageSync.js                   |  22 -------
 pages.json                                    |   7 ++
 pages/index/index.vue                         |   4 +-
 pages/order/detail/index.vue                  |   4 +-
 pages/order/saleAfter/saleAfterApply.vue      |   8 ++-
 .../components/SubmitLogistics.vue            |  31 ++++++++-
 .../order/saleAfter/saleAfterDetail/index.vue |   8 +--
 pages/order/saleAfter/saleAfterEdit.vue       |  11 +++-
 pages/order/saleAfter/saleAfterSelect.vue     |  62 +++++++++++++++++-
 static/{ => common}/tabbar/account-active.png | Bin
 static/{ => common}/tabbar/account.png        | Bin
 .../{ => common}/tabbar/category-active.png   | Bin
 static/{ => common}/tabbar/category.png       | Bin
 static/{ => common}/tabbar/home-active.png    | Bin
 static/{ => common}/tabbar/home.png           | Bin
 .../tabbar/shopping-cart-active.png           | Bin
 static/{ => common}/tabbar/shopping-cart.png  | Bin
 static/testImg/1.png                          | Bin 6878 -> 0 bytes
 static/testImg/2.png                          | Bin 6119 -> 0 bytes
 static/testImg/3.png                          | Bin 2654 -> 0 bytes
 21 files changed, 119 insertions(+), 42 deletions(-)
 delete mode 100644 common/utils/sotrageSync.js
 rename static/{ => common}/tabbar/account-active.png (100%)
 rename static/{ => common}/tabbar/account.png (100%)
 rename static/{ => common}/tabbar/category-active.png (100%)
 rename static/{ => common}/tabbar/category.png (100%)
 rename static/{ => common}/tabbar/home-active.png (100%)
 rename static/{ => common}/tabbar/home.png (100%)
 rename static/{ => common}/tabbar/shopping-cart-active.png (100%)
 rename static/{ => common}/tabbar/shopping-cart.png (100%)
 delete mode 100644 static/testImg/1.png
 delete mode 100644 static/testImg/2.png
 delete mode 100644 static/testImg/3.png

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 7308d2e94c8a5528f6f64ee878b6bd01c0057990..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6878
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

diff --git a/static/testImg/2.png b/static/testImg/2.png
deleted file mode 100644
index 37a476e734228b438ffff791561b97f367d5a786..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6119
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
b6b5VgFAo{#1I7Q$J({|*wo<i%dGP-M=dcy7

diff --git a/static/testImg/3.png b/static/testImg/3.png
deleted file mode 100644
index ba13e5f65b6ef17b491793279d5c71bbdff228ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2654
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
M07*qoM6N<$f(Skf5dZ)H