售后申请

ghsApp/src/pagesOrder/detail.vue

@@ -140,14 +140,14 @@
 					<view>过期时间：</view>
 					<view>{{detailInfo.deadline?detailInfo.deadline.substr(5,11):''}}</view>
 				</view>
-				<view v-if="detailInfo.refund == 2" class="order-info_box">
+				<view v-if="detailInfo.refundLog == 1" class="order-info_box">
 					<view>累计退款：</view>
 					<view style="color:red;font-weight:bold;font-size:30upx;">{{parseFloat(detailInfo.tkPrice)}}</view>
-					<view class="price" v-if="detailInfo.refund==2">
-						<button @click="pageTo({url: '/pagesOrder/refundList',query: {orderSn: detailInfo.orderSn}})" class="admin-button-com">退款记录</button>
+					<view class="price" v-if="detailInfo.refundLog==1">
+						<button @click="pageTo({url: '/pagesOrder/refundList',query: {orderSn: detailInfo.orderSn}})" class="admin-button-com">售后记录</button>
 					</view>
 				</view>
-				<view v-if="detailInfo.refund == 2" class="order-info_box">
+				<view v-if="detailInfo.refundLog == 1" class="order-info_box">
 					<view>退款方式：</view>
 					<view style="color:red;font-weight:bold;font-size:30upx;">{{detailInfo.tkExplain||''}}</view>
 				</view>
@@ -160,7 +160,7 @@
 			<view class="flex-space title">
 				商品信息
 				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="detailInfo.status == 4">
-					<view @click.stop="goRefund()" style="margin-left: 20upx;">发起退款</view>
+					<view @click.stop="goRefund()" style="margin-left: 20upx;">发起售后</view>
 				</view>
 			</view>
 			<view class="module-com content-box">

ghsApp/src/pagesOrder/refundDetail.vue

@@ -20,16 +20,42 @@
 			<view class="refund-label"><text></text>退款金额：</view>
 			<view class="list">¥{{refundPrice}}</view>
 		</view>
+		<view class="flex refund-item">
+			<view class="refund-label"><text></text>退款状态：</view>
+			<view class="list">{{ info.status==0?'待审核':info.status==1?'已通过':info.status==2?'已驳回':info.status==3 ? '已取消':'' }}</view>
+		</view>
 		<view class=" refund-item">
-			<view class="refund-label">备注信息：</view>
-			<view class="list">{{remark}}</view>
+			<view class="refund-label">客户备注：</view>
+			<view class="list">{{info.hdRemark?info.hdRemark:''}}</view>
 		</view>
-		<view style="text-align:center;">
-			<button class="admin-button-com big blue" style="margin:30upx auto 10upx auto;width:50%;" @click="goBack()">返回</button>
+		<view class=" refund-item">
+			<view class="refund-label">我的备注：</view>
+			<view class="list">{{info.remark?info.remark:''}}</view>
 		</view>
-		<view style="text-align:center;">
+
+		<view class=" refund-item">
+			<view class="refund-label">售后图片：</view>
+			<view class="list">
+				<block v-if="info.smallImgList && !$util.isEmpty(info.smallImgList)">
+					<block v-for="(itemImg, indexImg) in info.smallImgList" :key="indexImg">
+						<image :src="itemImg" style="width:100upx;height:100upx;float:left;margin-left:20upx;margin-bottom:10upx;" @click="showBig(indexImg)" mode="widthFix"></image>
+					</block>
+				</block>			
+			</view>
+		</view>
+
+		<view style="text-align:center;" v-if="info.status==0">
+			<button class="admin-button-com big blue" style="margin:30upx auto 10upx auto;width:50%;background-color: green;border:1upx solid green;color:white;" @click="pass()">通过</button>
+		</view>
+		<view style="text-align:center;" v-if="info.status==0">
+			<button class="admin-button-com big blue" style="margin:30upx auto 10upx auto;width:50%;background-color: red;border:1upx solid red;color:white;" @click="reject()">驳回</button>
+		</view>
+		<view style="text-align:center;" v-if="info.status==1">
 			<button class="admin-button-com big blue" style="margin:20upx auto 10upx auto;width:50%;" @click="goWaste()">去报损</button>
 		</view>
+		<view style="text-align:center;">
+			<button class="admin-button-com big default" style="margin:30upx auto 10upx auto;width:50%;" @click="goBack()">返回</button>
+		</view>
 	</view>
 </template>
 <script>
@@ -40,12 +66,26 @@ export default {
 			product:'',
 			refundPrice:0,
 			refundType:1,
-			remark:''
+			remark:'',
+			info:[]
 		};
 	},
 	onShow() {
 	},
 	methods: {
+		reject(){
+
+		},
+		pass(){
+
+		},
+		showBig(index){
+			if(this.info.bigImgList && !this.$util.isEmpty(this.info.bigImgList)){
+				if(this.info.bigImgList[index]){
+					uni.previewImage({ urls: [this.info.bigImgList[index]] })
+				}
+			}
+		},
 		goBack(){
 			uni.navigateBack()
 		},
@@ -58,6 +98,7 @@ export default {
 				this.refundType = res.data.info.refundType||0;
 				this.refundPrice = res.data.info.refundPrice ? parseFloat(res.data.info.refundPrice) : 0
 				this.remark = res.data.info.remark;
+				this.info = res.data.info
 			})
 		}
 	}

ghsApp/src/pagesOrder/refundList.vue

@@ -10,7 +10,7 @@
               <text>类型：{{item.book == 1 ? '预订单多退少补' :'普通'}}</text>
               <text v-if="!$util.isEmpty(item.remark)">备注：{{item.remark}}</text>
 
-              <text style="position:absolute;right:-425upx;top:0upx;">{{ item.status==0?'退款中':item.status==1?'已完成':'退款中' }}</text>    
+              <text style="position:absolute;right:-425upx;top:0upx;">{{ item.status==0?'待审核':item.status==1?'已通过':item.status==2?'已驳回':item.status==3 ? '已取消':'' }}</text>    
 
           </view>
           <view class="flex val">¥{{parseFloat(item.refundPrice)}} <view class="iconfont iconxiangyou"></view> </view>
@@ -57,6 +57,9 @@ export default {
     this._list();
   },
   methods: {
+    init(){
+
+    },
     goDetail(item){
       if(item.book == 1){
         this.$msg('预订单多退少补')

hdApp/src/admin/order/detail.vue

@@ -164,7 +164,7 @@
             <view class="msg-list" v-if="Number(orderInfo.tkPrice)>0" style="position:relative;">
               <view class="label">退款：</view>
               <view class="value" style="color:red;font-weight:bold;">-￥{{ orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0 }}</view>
-              <button class="admin-button-com mini-btn" @click="pageTo({url: '/admin/order/refundList',query: {orderSn: orderInfo.orderSn}})" style="position:absolute;right:0upx;top:0upx;">退款记录</button>
+              <button class="admin-button-com mini-btn" @click="pageTo({url: '/admin/order/refundList',query: {orderSn: orderInfo.orderSn}})" style="position:absolute;right:0upx;top:0upx;">售后记录</button>
             </view>
             <view class="msg-list">
               <view class="label">实际：</view>

hdApp/src/pages.json

@@ -340,7 +340,7 @@
 				{ "path": "addOrderResult", "style": { "navigationBarTitleText": "结果" } },
 				{ "path": "workOrderResult", "style": { "navigationBarTitleText": "结果" } },
 				{ "path": "refund", "style": { "navigationBarTitleText": "退款" } },
-				{ "path": "refundList", "style": { "navigationBarTitleText": "退款记录" } },
+				{ "path": "refundList", "style": { "navigationBarTitleText": "售后记录" } },
 				{ "path": "refundDetail", "style": { "navigationBarTitleText": "退款详情" } },
 				{ "path": "ship", "style": { "navigationBarTitleText": "发货" } },
 				{ "path": "fill-form", "style": { "navigationBarTitleText": "填写收花人" } },
@@ -423,7 +423,7 @@
 				{ "path": "level", "style": { "navigationBarTitleText": "会员等级", "enablePullDownRefresh": true } },
 				{ "path": "bookProduct", "style": { "navigationBarTitleText": "预订花材", "enablePullDownRefresh": false } },
 				{ "path": "bookExplain", "style": { "navigationBarTitleText": "预订说明", "enablePullDownRefresh": true } },
-				{ "path": "refundList","style": {"navigationBarTitleText": "退款记录", "enablePullDownRefresh": true } },
+				{ "path": "refundList","style": {"navigationBarTitleText": "售后记录", "enablePullDownRefresh": true } },
 				{ "path": "readMe","style": {"navigationBarTitleText": "购买须知", "enablePullDownRefresh": true } },
 				{ "path": "bookReadMe","style": {"navigationBarTitleText": "预订须知", "enablePullDownRefresh": true } },
 				{ "path": "addCg","style": {"navigationBarTitleText": "新增采购", "enablePullDownRefresh": false } },

hdApp/src/pagesPurchase/purDetails.vue

@@ -108,7 +108,7 @@
           <view>累计退款：</view>
           <view style="color:red;font-weight:bold;font-size:30upx;">¥{{detailInfo.tkPrice?parseFloat(detailInfo.tkPrice):0}}</view>
             <view class="price" v-if="detailInfo.refundLog && detailInfo.refundLog == 1">
-              <button @click="pageTo({url: '/pagesPurchase/refundList?id='+detailInfo.id})" class="admin-button-com">退款记录</button>
+              <button @click="pageTo({url: '/pagesPurchase/refundList?id='+detailInfo.id})" class="admin-button-com">售后记录</button>
             </view>
         </view>
         <view v-if="detailInfo.refundLog && detailInfo.refundLog == 1" class="order-info_box">