Merge branch 'cgApplyRefund'

ghsApp/src/admin/home/workbench.vue

@@ -31,7 +31,7 @@
 			<div class="user-top" style="position: relative;">
 				<div class="app-size-28">今日概况</div>
 				<image :src="`${constant.imgUrl}/icon/notice_icon.png`" class="mind-item"></image>
-				<view class="red-mind" v-if="notifyNum>0">{{ notifyNum }}</view>
+				<view class="red-mind" v-if="notifyNum>0">{{ notifyNum>9?9:notifyNum }}</view>
 				<view class="mind-mask" @click="toNotify()"> </view>
 			</div>
 			<div class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
@@ -443,7 +443,7 @@ export default {
 			width:35upx;
 			height:35upx;
 			position:absolute;
-			right:29upx;
+			right:3upx;
 			top:6upx;
 		}
 		.mind-mask{
@@ -462,8 +462,8 @@ export default {
 			font-size:26upx;
 			text-align:center;
 			position:absolute;
-			right:-17upx;
-			top:0upx;
+			right:45upx;
+			top:1upx;
 			background-color: red;
 			color:white;
 			border:1upx solid red;

ghsApp/src/admin/notice/index.vue

@@ -5,7 +5,7 @@
                 <Tabs :tabs="tabs" :currentTab="tabIndex" @change="changeTabEvent" itemWidth="33%"></Tabs>
             </view>
             <view @click="allRead" class="set-all-read">
-                全部设为已读
+                全部标记已读
             </view>
             <view class="allot-list">
                 <block v-if="!$util.isEmpty(list.data)">
@@ -73,7 +73,7 @@ export default {
     methods: {
         allRead(){
             let that = this
-            this.$util.confirmModal({content:'全部设为已读？'},() => {
+            this.$util.confirmModal({content:'确认全部标记？'},() => {
                 allReadNotify().then(res=>{
                     if(res.code == 1){
                         that.$msg(res.msg)

ghsApp/src/api/refund/index.js

@@ -1,5 +1,13 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const rejectRefund = data => {
+	return https.post('/refund/reject', data)
+}
+
+export const passRefund = data => {
+	return https.get('/refund/pass', data)
+}
+
 export const refundWaste = data => {
 	return https.post('/refund/refund-waste', data)
 }

ghsApp/src/pages.json

@@ -95,7 +95,7 @@
 				{"path": "arrival","style": {"navigationBarTitleText": "确认发货"}},
 				{"path": "result","style": {"navigationBarTitleText": "结果"}},
 				{"path": "refund","style": {"navigationBarTitleText": "退款"}},
-				{"path": "refundDetail","style": {"navigationBarTitleText": "退款"}},
+				{"path": "refundDetail","style": {"navigationBarTitleText": "售后信息"}},
 				{"path": "ship","style": {"navigationBarTitleText": "发货"}},
 				{"path": "shipInfo","style": {"navigationBarTitleText": "发货"}},
 				{"path": "select","style": {"navigationBarTitleText": "重选花材"}},

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/refund.vue

@@ -8,7 +8,7 @@
 					</view>退货并退款</view>
 				<view style="margin-left: 30upx" class="flex" @tap="refundType=2">
 					<view class="flex-center radioBtn" :class="refundType==1?'':'active'">
-						</view>仅退款</view>
+						</view>只退款</view>
 			</view>
 		</view>
 		<view class="refund-item-list" v-if="refundType==1">
@@ -45,7 +45,7 @@
 		</view>
 		<view class="flex refund-item">
 			<view class="refund-label"><text></text>实际退款：</view>
-			<input type="digit" v-model="refundMoney">
+			<input type="digit" v-model="refundMoney" @focus="refundMoney=''">
 		</view>
 		<view class="refund-item">
 			<view class="refund-label">备注：</view>
@@ -168,11 +168,21 @@ export default {
 				refund(refundParams).then(res => {
 					if(res.code == 1){
 						uni.hideLoading()
-						this.$util.pageTo({url: '/pagesOrder/refundSuccess?id='+res.data.id,type:2})
+						if(res.data.error && res.data.error == 'hasUnClearOrder'){
+							that.needCancelRemind(res.data.clearId)
+						}else{
+							this.$util.pageTo({url: '/pagesOrder/refundSuccess?id='+res.data.id,type:2})
+						}
 					}
 				})
 			})
 		},
+		needCancelRemind(id){
+			let that = this
+			that.$util.confirmModal({content:'有结账单取消了才能退款？',okText:'去取消',cancelText:'不操作'},() => {
+				that.$util.pageTo({url: '/admin/clear/customInfo?id='+id})
+			})
+		},
 		async init() {
 			//getOriginalItem 取原有的花材结构（小菊的花材结构有变化）
 			const res = await getDetail({ id: this.option.id,getOriginalItem:1 })
@@ -240,7 +250,9 @@ export default {
 				text{color: red;}
 			}
 			.list{
-				margin-bottom: 10upx;
+				margin-bottom:18upx;
+				border-bottom:1upx solid #CCCCCC;
+				padding-bottom:14upx;
 				.list-title{
 					height: 60upx;
 					padding-bottom: 20upx;

ghsApp/src/pagesOrder/refundDetail.vue

@@ -3,49 +3,146 @@
 		<view class="flex refund-item">
 			<view class="refund-label">退款方式：</view>
 			<view class="flex list">
-				<view class="flex" >{{refundType==1?'退货并退款':'仅退款'}}</view>
+				<view class="flex" style="font-size:28upx;">{{refundType==1?'退货并退款':'只退款'}}</view>
 			</view>
 		</view>
 		<view class="refund-item-list" v-if="refundType==1">
 			<view class="refund-label">退货商品：</view>
 			<view>
 				<view class="list" v-for="(res,i) in product" :key="i">
-				<view class="flex list-title" >
-					{{res.name}} ￥{{parseFloat(res.xhUnitPrice)}} x {{res.xhNum}}{{res.xhUnitName}} = ￥{{parseFloat(res.xhPrice)}}
+				<view class="flex list-title">
+					{{res.name}} ￥{{parseFloat(res.xhUnitPrice)}}x{{res.xhNum}}{{res.xhUnitName}}=￥{{parseFloat(res.xhPrice)}}
 				</view>
 			</view>
 			</view>
 		</view>
 		<view class="flex refund-item">
 			<view class="refund-label"><text></text>退款金额：</view>
-			<view class="list">¥{{refundPrice}}</view>
+			<view class="list" style="font-size:28upx;">¥{{refundPrice}}</view>
 		</view>
-		<view class=" refund-item">
+		<view class="flex refund-item">
+			<view class="refund-label"><text></text>退款状态：</view>
+			<view class="list" style="font-size:28upx;">{{ info.status==0?'待审核':info.status==1?'已通过':info.status==2?'已驳回':info.status==3 ? '已取消':'' }}</view>
+		</view>
+		<view class=" refund-item" v-if="!$util.isEmpty(info.rejectReason)">
+			<view class="refund-label">驳回原因：</view>
+			<view class="list" style="font-size:28upx;">{{info.rejectReason?info.rejectReason:''}}</view>
+		</view>
+		<view class=" refund-item" v-if="!$util.isEmpty(info.remark)">
 			<view class="refund-label">备注信息：</view>
-			<view class="list">{{remark}}</view>
+			<view class="list" style="font-size:28upx;">{{info.remark?info.remark:''}}</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" v-if="from == 1">
+			<view class="refund-label">订单信息：</view>
+			<view class="list" style="color:#3385FF;font-weight:800;font-size:28upx;" @click="goToOrder(info)">点击查看</view>
 		</view>
-		<view style="text-align:center;">
+		<view class=" refund-item" v-if="info.smallImgList && !$util.isEmpty(info.smallImgList)">
+			<view class="refund-label">售后图片：</view>
+			<view class="list">
+				<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>
+			</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>
+
+		<uni-popup ref="rejectRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+			<view style="padding:30upx;">
+				<textarea v-model="rejectReason" style="border:1upx solid #cccccc;height:140upx;font-size:28upx;" placeholder="驳回原因..."></textarea>
+				<view style="text-align:center;">
+					<button class="admin-button-com big default" style="margin:30upx auto 10upx auto;width:45%;" @click="cancelReject()">取消</button>
+					<button class="admin-button-com big blue" style="margin:30upx auto 10upx 20upx;width:45%;" @click="confirmReject()">确认</button>
+				</view>
+			</view>
+		</uni-popup>
+
 	</view>
 </template>
 <script>
-import { refundDetail } from "@/api/refund";
+import { refundDetail,passRefund,rejectRefund } from "@/api/refund";
 export default {
 	data() {
 		return {
 			product:'',
 			refundPrice:0,
 			refundType:1,
-			remark:''
+			remark:'',
+			info:[],
+			rejectReason:'',
+			from:0
 		};
 	},
-	onShow() {
+	onLoad() {
+		if(this.option.from){
+			this.from = this.option.from
+		}
 	},
 	methods: {
+		goToOrder(info){
+			this.$util.pageTo({ url: '/pagesOrder/detail?id='+info.relateOrderId})
+		},
+		cancelReject(){
+			this.$refs.rejectRef.close()
+		},
+		reject(){
+			this.$refs.rejectRef.open('center')
+		},
+		confirmReject(){
+			let that = this
+			this.$util.confirmModal({content:'确认驳回？'},() => {
+				uni.showLoading({mask:true})
+				rejectRefund({id: this.option.id,rejectReason:this.rejectReason}).then(res=>{
+					uni.hideLoading()
+					if(res.code == 1){
+						that.cancelReject()
+						that.$msg('操作成功')
+						that.init()
+					}
+				})
+			})
+		},
+		pass(){
+			let that = this
+			this.$util.confirmModal({content:'确认通过？'},() => {
+				uni.showLoading({mask:true})
+				passRefund({id: this.option.id}).then(res=>{
+					uni.hideLoading()
+					if(res.code == 1){
+						if(res.data.error && res.data.error == 'hasUnClearOrder'){
+							that.needCancelRemind(res.data.clearId)
+						}else{
+							that.$msg('操作成功')
+							that.init()
+						}
+					}
+				})
+			})
+		},
+		needCancelRemind(id){
+			let that = this
+			that.$util.confirmModal({content:'有结账单取消了才能审核？',okText:'去取消',cancelText:'不操作'},() => {
+				that.$util.pageTo({url: '/admin/clear/customInfo?id='+id})
+			})
+		},
+		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 +155,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
 			})
 		}
 	}
@@ -92,10 +190,12 @@ export default {
 			padding-bottom: 30upx;
 			border-bottom: 1upx solid #dddddd;
 			.refund-label{
+				font-size:28upx;
 				width: 200upx;
 				text{color: red;}
 			}
 			.list{
+				font-size:28upx;
 				margin-bottom: 10upx;
 				.list-title{
 					height: 60upx;
@@ -116,7 +216,13 @@ export default {
 		.refund-item{
 			display: flex;
 			padding: 20upx 0;
-			.refund-label{width: 200upx;text{color: red;}}
+			.refund-label{
+				font-size:28upx;
+				width: 200upx;
+				text{
+					color: red;
+				}
+			}
 			input{
 				border: 1upx solid #ddd;
 			}

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('预订单多退少补')

ghsApp/src/pagesPurchase/refund.vue

@@ -8,7 +8,7 @@
 					</view>退货并退款</view>
 				<view style="margin-left: 30upx" class="flex" @tap="refundType=2">
 					<view class="flex-center radioBtn" :class="refundType==1?'':'active'">
-						</view>仅退款</view>
+						</view>只退款</view>
 			</view>
 		</view>
 		<view class="refund-item-list" v-if="refundType==1">

ghsApp/src/pagesPurchase/refundDetail.vue

@@ -3,7 +3,7 @@
 		<view class="flex refund-item">
 			<view class="refund-label">退款方式：</view>
 			<view class="flex list">
-				<view class="flex" >{{refundType==1?'退货并退款':'仅退款'}}</view>
+				<view class="flex" >{{refundType==1?'退货并退款':'只退款'}}</view>
 			</view>
 		</view>
 		<view class="refund-item-list" v-if="refundType==1">

hdApp/src/admin/home/workbench.vue

@@ -231,7 +231,7 @@ export default {
         { name: "损耗", img: `ghs/home/kcyjs.png`, url: "/admin/breakage/list",pf:1},
         { name: "任务", img: `ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1 },
         { name: "供货商", img: `ghs/home/icon_ghs.png`, url: "/pagesPurchase/order",pf:1 },
-        { name: "花材采购", img: `ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1 },
+        { name: "采购", img: `ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping",pf:1 },
         { name: "采购结账", img: `ghs/home/kcyjs.png`, url: "/admin/clear/list",pf:1 },
         { name: "花束", img: `ghs/home/hcgl.png`, url: "/admin/goods/list",pf:1 },
         { name: "绿植", img: `ghs/home/hcgl.png`, url: "/admin/goods/lz",pf:1 },

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/admin/order/refund.vue

@@ -8,7 +8,7 @@
 					</view>退货并退款</view>
 				<view style="margin-left: 30upx" class="flex" @tap="refundType=2">
 					<view class="flex-center radioBtn" :class="refundType==1?'':'active'">
-						</view>仅退款</view>
+						</view>只退款</view>
 			</view>
 		</view>
 		<view class="refund-item-list" v-if="refundType==1">

hdApp/src/admin/order/refundDetail.vue

@@ -3,7 +3,7 @@
 		<view class="flex refund-item">
 			<view class="refund-label">退款方式：</view>
 			<view class="flex list">
-				<view class="flex" >{{refundType==1?'退货并退款':'仅退款'}}</view>
+				<view class="flex" >{{refundType==1?'退货并退款':'只退款'}}</view>
 			</view>
 		</view>
 		<view class="refund-item-list" v-if="refundType==1">

hdApp/src/api/cgRefund/index.js → hdApp/src/api/cg-refund/index.js

@@ -1,5 +1,13 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const cancelRefund = data => {
+	return https.get("/cg-refund/cancel-refund", data);
+};
+
+export const createRefund = data => {
+	return https.post("/cg-refund/create-refund", data);
+};
+
 //退款详情
 export const refundDetail = data => {
 	return https.get('/refund/detail', data)

hdApp/src/api/purchase/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const getFullInfo = data => {
+	return https.get("/purchase/get-full-info", data);
+};
+
 export const getCgItemInfo = data => {
 	return https.get("/cg-item/get-cg-item-info", data);
 };

hdApp/src/pages.json

@@ -340,8 +340,8 @@
 				{ "path": "addOrderResult", "style": { "navigationBarTitleText": "结果" } },
 				{ "path": "workOrderResult", "style": { "navigationBarTitleText": "结果" } },
 				{ "path": "refund", "style": { "navigationBarTitleText": "退款" } },
-				{ "path": "refundList", "style": { "navigationBarTitleText": "退款记录" } },
-				{ "path": "refundDetail", "style": { "navigationBarTitleText": "退款详情" } },
+				{ "path": "refundList", "style": { "navigationBarTitleText": "售后记录" } },
+				{ "path": "refundDetail", "style": { "navigationBarTitleText": "售后详情" } },
 				{ "path": "ship", "style": { "navigationBarTitleText": "发货" } },
 				{ "path": "fill-form", "style": { "navigationBarTitleText": "填写收花人" } },
 				{ "path": "debtList", "style": { "navigationBarTitleText": "待结订单" } },
@@ -423,8 +423,9 @@
 				{ "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": "afterSale","style": {"navigationBarTitleText": "上传图片规范", "enablePullDownRefresh": true } },
 				{ "path": "bookReadMe","style": {"navigationBarTitleText": "预订须知", "enablePullDownRefresh": true } },
 				{ "path": "addCg","style": {"navigationBarTitleText": "新增采购", "enablePullDownRefresh": false } },
 				{ "path": "addCgConfirm","style": {"navigationBarTitleText": "确认订单", "enablePullDownRefresh": false } },

hdApp/src/pagesPurchase/afterSale.vue

@@ -0,0 +1,75 @@
+<template>
+	<view class="app-content">
+		<view class="list">
+            <view>
+				<image class="image" :src="`${constant.imgUrl}/ghs/b_hr_after2.jpg?v=3`" mode="widthFix"></image>
+			</view>
+		</view>
+		<view style="text-align:center;margin-top:40upx;">
+			<button class="admin-button-com big default go-back" style="width:260upx;" @click="goBack()">返回</button>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	name: "afterSale",
+	components: {
+	},
+	mixins: [],
+	data() {
+		return {
+			shopId:0
+		};
+	},
+	onLoad(){
+		this.shopId = this.option.shopId
+	},
+	methods: {
+		init(){
+
+		},
+		goBack(){
+			uni.navigateBack()
+		},
+		toPhone(phone){
+			uni.makePhoneCall({ phoneNumber: phone })
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.app-content{
+	padding:20upx 20upx 60upx 20upx;
+	background-color: white;
+    .title{
+		font-weight: bold;
+		font-size:36upx;
+		margin-bottom:22upx;
+	}
+	.smallTitle{
+		font-weight: bold;
+		font-size:30upx;
+		font-weight: bold;
+		margin:25upx 0 25upx 0;
+	}
+	.info{
+    	font-size:32upx;
+		margin-bottom:20upx;
+	}
+	.image{
+		width:100%;
+		margin-bottom:20upx;
+	}
+	.video{
+		margin:0 auto;
+        text-align: center;
+		margin-bottom:10upx;
+	}
+	.book-button{
+		margin-bottom:15upx;
+	}
+	.go-back{
+		margin:0 auto;
+	}
+}
+</style>

hdApp/src/pagesPurchase/gatherPay.vue

@@ -77,7 +77,7 @@ export default {
       return false
       // #endif
 
-      that.$util.confirmModal({content:'确认收到花材没有问题？此账单支付后无法再申请售后'},() => {
+      that.$util.confirmModal({content:'确认收到花材没有问题？支付后订单无法再申请售后'},() => {
         that.confirmWxPayFn()
       })
     },

hdApp/src/pagesPurchase/purDetails.vue

@@ -104,14 +104,14 @@
           <view>{{ detailInfo.status==1?'待付款' :detailInfo.status==2?'待配送' :detailInfo.status==3?'配送中' :detailInfo.status==4?'已完成' :detailInfo.status==5?'已取消' :'待付款' }}</view>
         </view>
 
-        <view v-if="detailInfo.refund == 2" class="order-info_box">
+        <view v-if="detailInfo.refundLog && 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: '/pagesPurchase/refundList',query: {id: detailInfo.id}})" class="admin-button-com">退款记录</button>
+          <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>
             </view>
         </view>
-        <view v-if="detailInfo.refund == 2" class="order-info_box">
+        <view v-if="detailInfo.refundLog && detailInfo.refundLog == 1" class="order-info_box">
           <view>退款方式：</view>
           <view style="color:red;font-weight:bold;font-size:30upx;">{{detailInfo.tkExplain||''}}</view>
         </view>
@@ -122,21 +122,26 @@
         <view class="order-info_box" v-if="detailInfo.debt == 1">
           <view>本单赊账：</view>
           <view style="font-weight:bold;color:red;font-size:29upx;">¥{{ detailInfo.realPrice ? parseFloat(detailInfo.realPrice) : 0}}</view>
+          <view class="price">
+            <button @click="clearOrder" class="admin-button-com" style="padding:20upx 15upx;">
+            结清本单
+            </button>
+          </view>
         </view>
         <view class="order-info_box" v-else>
           <view>本单赊账：</view>
           <view v-if="detailInfo.clearId > 0" style="font-weight:bold;color:#3385FF;font-size:29upx;">已结清</view>
           <view class="price" v-if="detailInfo.clearId > 0">
-            <button style="padding:20upx 15upx;" @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com">查看结账单</button>
+            <button style="padding:20upx 15upx;" @click="pageTo({url: '/admin/clear/info',query: {id: detailInfo.clearId}})" class="admin-button-com">查看账单</button>
           </view>
         </view>
         <view class="order-info_box" style="margin-top:35upx;" v-if="Number(detailInfo.debtAmount)>0">
-          <view>累计赊账：</view>
+          <view>总共赊账：</view>
           <view style="font-weight:bold;color:red;font-size:29upx;">¥{{detailInfo.debtAmount?parseFloat(detailInfo.debtAmount):0}}</view>
           <view class="price" v-if="loginStyle != 0">
-          <button @click="goToSettle(detailInfo)" class="admin-button-com" style="padding:20upx 15upx;">
-          去结清赊账
-          </button>
+            <button @click="goToSettle(detailInfo)" class="admin-button-com" style="padding:20upx 15upx;">
+            结清全部
+            </button>
           </view>
         </view>
       </view>
@@ -267,7 +272,8 @@
         <button class="admin-button-com blue big" @click="toPay">去付款</button>
       </block>
       <block v-else>
-        <!-- <button class="admin-button-com default big" @click="refundOrder" style="margin-right:80upx;" v-if="detailInfo.payStatus == 1">申请退款</button> -->
+        <button class="admin-button-com default big" @click="refundOrder" style="background-color: white;color:#3385FF;border:1upx solid #3385FF;" 
+        v-if="detailInfo.payStatus == 1">申请售后</button>
         <button class="admin-button-com blue big" @click="clearOrder" v-if="detailInfo.debt == 1">付款结清</button>
       </block>
 
@@ -361,7 +367,7 @@ export default {
 			});
 		},
     refundOrder(){
-      this.pageTo({url: '/pagesPurchase/refund?id='+this.detailInfo.id,type:2})
+      this.pageTo({url: '/pagesPurchase/refund?id='+this.detailInfo.id})
     },
     clearOrder(){
       let arr = []

hdApp/src/pagesPurchase/readMe.vue

@@ -113,7 +113,7 @@
 </template>
 <script>
 export default {
-	name: "book-what",
+	name: "readMe",
 	components: {
 	},
 	mixins: [],

hdApp/src/pagesPurchase/refund.vue

@@ -1,86 +1,103 @@
 <template>
 	<view class="app-content">
-		<view class="flex refund-item">
-			<view class="refund-label">退款方式：</view>
-			<view class="flex list">
-				<view class="flex" @tap="refundType=1" >
-					<view class="flex-center radioBtn" :class="refundType==1?'active':''">
-					</view>退货并退款</view>
-				<view style="margin-left: 30upx" class="flex" @tap="refundType=2">
-					<view class="flex-center radioBtn" :class="refundType==1?'':'active'">
-						</view>仅退款</view>
+		<view style="padding:30upx 30upx 140upx 30upx;">
+			<view class="flex refund-item">
+				<view class="refund-label">退款方式：</view>
+				<view class="flex list">
+					<view class="flex" @tap="refundType=1" >
+						<view class="flex-center radioBtn" :class="refundType==1?'active':''">
+						</view>退货并退款</view>
+					<view style="margin-left:50upx" class="flex" @tap="refundType=2">
+						<view class="flex-center radioBtn" :class="refundType==1?'':'active'">
+							</view>只退款</view>
+				</view>
 			</view>
-		</view>
-		<view class="refund-item-list" v-if="refundType==1">
-			<view class="refund-label"><text></text>选择商品：</view>
-			<view>
-				<view class="list" v-for="(res,i) in product" :key="i">
-				<view class="flex list-title" >
-					<text class="product-name">{{res.name}}</text>
-					<text class="product-num">{{ `${parseFloat(res.xhNum)}` }}{{res.xhUnitName}}</text>
-					<text class="product-price">{{`${parseFloat(res.xhUnitPrice)}`}}元/{{res.xhUnitName}}</text>
+			<view class="refund-item-list" v-if="refundType==1">
+				<view class="refund-label"><text></text>选择商品：</view>
+				<view>
+					<view class="list" v-for="(res,i) in product" :key="i">
+						<view class="flex list-title" >
+							<text class="product-name">{{res.name}}</text>
+							<text class="product-num">{{ `${parseFloat(res.xhNum)}` }}{{res.xhUnitName}}</text>
+							<text class="product-price">{{`${parseFloat(res.xhUnitPrice)}`}}元/{{res.xhUnitName}}</text>
+						</view>
+						<view class="flex list-val" style="font-size:26upx;font-weight:bold;">
+							<input type="number" placeholder="填退货数" v-model="res.refundCount" placeholder-style="color:#CCCCCC" />
+							<text style="margin-left:10upx;">{{res.xhUnitName}}</text>
+							<text style="color:green;margin-left:20upx;">可退{{Number(res.xhNum)-Number(res.refundNum)}}{{res.xhUnitName}}</text>
+						</view>
+					</view>
 				</view>
-				<view class="flex list-val" style="font-size:26upx;font-weight:bold;">
-					<input type="number" placeholder="退货数" v-model="res.refundCount" placeholder-style="color:#CCCCCC" />
-					<text style="margin-left:10upx;">{{res.xhUnitName}}</text>
-					<text style="color:green;margin-left:20upx;">可退{{Number(res.xhNum)-Number(res.refundNum)}}{{res.xhUnitName}}</text>
+			</view>
+			<view class="flex refund-item">
+				<view class="refund-label">订单金额：</view>
+				<view class="list">
+					￥{{parseFloat(orderInfo.orderPrice)||0}}
+					<text style="margin-left:25upx;font-size:25upx;color:green;" v-if="Number(orderInfo.tkPrice)>0">已退￥{{orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0}}</text>
 				</view>
 			</view>
+			<view class="flex refund-item">
+				<view class="refund-label">可退金额：</view>
+				<view class="list">￥{{couldRefundPrice}}</view>
 			</view>
-		</view>
-		<view class="flex refund-item">
-			<view class="refund-label">订单金额：</view>
-			<view class="list">
-				￥{{parseFloat(orderInfo.orderPrice)||0}}
-				<text style="margin-left:25upx;font-size:25upx;color:green;" v-if="Number(orderInfo.tkPrice)>0">已退￥{{orderInfo.tkPrice ? parseFloat(orderInfo.tkPrice) : 0}}</text>
+			<view class="flex refund-item">
+				<view class="refund-label">合计退款：</view>
+				<view class="list">￥{{refundPrice}}</view>
 			</view>
-		</view>
-		<view class="flex refund-item">
-			<view class="refund-label">可退金额：</view>
-			<view class="list">￥{{couldRefundPrice}}</view>
-		</view>
-		<view class="flex refund-item">
-			<view class="refund-label">合计退款：</view>
-			<view class="list">￥{{refundPrice}}</view>
-		</view>
-		<view class="flex refund-item">
-			<view class="refund-label"><text></text>实际退款：</view>
-			<input type="digit" v-model="refundMoney">
-		</view>
-		<view class="refund-item">
-			<view class="refund-label">备注：</view>
-			<textarea v-model="remark" />
-		</view>
-		<view style="padding:20upx 0 20upx 0;font-size:32upx;font-weight:bold;">
-			<text v-if="orderInfo.onlinePay == 2" style="color:green;">此单线上付款，提交后，钱会原路自动退回给客户</text>
-			<block v-else>
-				<text v-if="Number(orderInfo.debtPrice)>0" style="color:#3385ff;">
-				此单为欠款单，提交后，欠款金额会自动减少
-				</text>
-				<text v-else style="color:red;">此单线下付款，提交后钱不会原路退回，请线下转账给客户</text>
-			</block>
-		</view>
-		<view class="flex-center btn-box" style="margin-bottom:50upx;margin-top:20upx;padding-bottom:10upx;">
-			<view class="flex-center btn" @tap="cancelRefund">取消</view>
-			<view class="flex-center btn active" @tap="confirmRefund" style="margin-left: 80upx">确定</view>
-		</view>
+			<view class="flex refund-item">
+				<view class="refund-label"><text></text>实际退款：</view>
+				<input type="digit" v-model="refundMoney" @focus="refundMoney=''">
+			</view>
+			<view class="refund-item">
+				<view class="refund-label">备注说明：</view>
+				<textarea v-model="remark" style="height:100upx;"></textarea>
+			</view>
+			<view>
+				<form>
+					<div class="module-com input-line-wrap">
+						<div class="module-com input-line-wrap goods-wrap">
+							<div class="module-tit" style="padding-left:0upx;">
+								<span>售后图片：</span>
+								<span class="app-color-3" style="color:red;font-weight:bold;text-decoration: underline;float: right;" @click="getRule()">★上传图片规范(必看)</span>
+							</div>
+							<div class="module-det">
+								<htz-image-upload :max="9" :compress="true" v-model="refundImgData" :headers="headers"
+								@uploadSuccess="imgUploadSuccess" :quality="60" @imgDelete="imgDeleteFn" :action="getLoginInfo.imgUploadApi">
+								</htz-image-upload>
+							</div>
+						</div>
+					</div>
+				</form>
+			</view>
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="flex refund-item">
+				<view class="refund-label">审核结果：</view>
+				<view class="list">
+					<button class="admin-button-com big default" @click="noticeMe()" v-if="needNotice == 0">点我开启通知</button>
+					<button class="admin-button-com big blue" v-else>已经开启通知</button>
+				</view>
+			</view>
+			<!-- #endif -->
 
-		<view style="font-size:32upx;z-index:9999;color:red;text-align:center;font-weight:bold;margin-bottom:30upx;" 
-		v-if="!$util.isEmpty(unClear)" @click="goClear(unClear)">
-			<text>有一个待结账单 ¥{{unClear.actPrice?parseFloat(unClear.actPrice):0}}</text>
-			<text style="font-weight:bold;margin-left:15upx;">查看</text>
 		</view>
-
+		<view class="app-footer">
+			<button class="admin-button-com big default" @click="cancelRefund()">取消</button>
+			<button class="admin-button-com big blue" formType="submit" @click="confirmRefund">提交申请</button>
+		</view>
 	</view>
 </template>
 <script>
+import { mapGetters } from "vuex"
 import TuiListCell from "@/components/plugin/list-cell";
-import { getDetail,refund } from "@/api/order/index";
-import { getUnClear } from "@/api/clear"
+import { getFullInfo } from "@/api/purchase";
+import { createRefund } from "@/api/cg-refund";
+//图片上传插件来源：https://ext.dcloud.net.cn/plugin?id=2922 已改造，不能再升级 shish 20211228
+import htzImageUpload from '@/components/htz-image-upload/htz-image-upload.vue'
 export default {
-	name: "orderDetail",
+	name: "refund",
 	components: {
-		TuiListCell
+		TuiListCell,
+		htzImageUpload
 	},
 	data() {
 		return {
@@ -90,12 +107,19 @@ export default {
 			remark:'',
 			orderInfo:{},
 			couldRefundPrice:0,
-			unClear:[]
+			unClear:[],
+			refundImgData:[],
+			uploadRefundImg:[],
+			headers:{token:''},
+			needNotice:0
 		};
 	},
-	onShow() {
+	onLoad() {
+		const token = uni.getStorageSync('token')
+		this.headers.token = token
 	},
 	computed:{
+		...mapGetters(["getLoginInfo","getDictionariesInfo"]),
 		refundPrice(){
 			let price = 0
 			if(this.product){
@@ -116,6 +140,35 @@ export default {
 	watch:{
 	},
 	methods: {
+		noticeMe(){
+			// #ifdef MP-WEIXIN
+			let that = this
+			if(this.getDictionariesInfo && this.getDictionariesInfo.subscribeMessage && this.getDictionariesInfo.subscribeMessage == 1 && this.getDictionariesInfo.hdMiniMessage && this.getDictionariesInfo.hdMiniMessage.afterSale){
+				uni.requestSubscribeMessage({
+					tmplIds: [this.getDictionariesInfo.hdMiniMessage.afterSale.msgId],
+					success(res) {
+						if(res[that.getDictionariesInfo.hdMiniMessage.afterSale.msgId] && res[that.getDictionariesInfo.hdMiniMessage.afterSale.msgId] == 'accept'){
+							that.needNotice = 1
+						}
+					},
+					fail(err) {
+						console.log(err)
+					},
+					complete() {}
+				})
+			}
+			// #endif	
+		},
+		getRule(){
+			this.$util.pageTo({url:'/pagesPurchase/afterSale'})
+		},
+		imgUploadSuccess(res) {
+			var _res = JSON.parse(res.data)
+			if(_res.code == 1){
+				this.refundImgData.push(_res.data.smallUrl)
+				this.uploadRefundImg.push(_res.data.shortUrl)
+			}
+		},
 		cancelRefund(){
 			uni.navigateBack({delta: 1});
 		},
@@ -129,7 +182,7 @@ export default {
 				let hasRefundNum = ele.refundNum ? Number(ele.refundNum) : 0
 				let couldRefundNum = Number(currentNum) - Number(hasRefundNum)
 				if(Number(currentRefundCont) > Number(couldRefundNum)){
-					uni.showToast({title:ele.name+'超过可退数量',icon:'none'})
+					uni.showToast({title:ele.name+' 超过可退数量',icon:'none'})
 					hasError = true;
 					return false
 				}
@@ -151,27 +204,31 @@ export default {
 				uni.showToast({title:'请选择商品',icon:'none'})
 				return;
 			}
+			let imgData = JSON.stringify(this.uploadRefundImg)
 			let refundParams = {
 				id:this.option.id,
 				product:JSON.stringify(product),
 				price:this.refundMoney,
 				remark:this.remark,
 				refundType:this.refundType,
-				getOriginalItem:1
+				getOriginalItem:1,
+				imgList:imgData
 			};
-			that.$util.confirmModal({content:'确认退款？'},() => {
+			that.$util.confirmModal({content:'确认提交？'},() => {
 				uni.showLoading({title: "提交中",mask:true})
-				refund(refundParams).then(res => {
+				createRefund(refundParams).then(res => {
 					if(res.code == 1){
-						uni.hideLoading()
-						this.$util.pageTo({url: '/pagesOrder/refundSuccess?id='+res.data.id,type:2})
+						that.$msg('操作成功')
+						setTimeout(function(){
+							that.$util.pageTo({url: '/pagesPurchase/refundDetail?id='+res.data.id,type:2})
+						},1200)
 					}
 				})
 			})
 		},
 		async init() {
 			//getOriginalItem 取原有的花材结构（小菊的花材结构有变化）
-			const res = await getDetail({ id: this.option.id,getOriginalItem:1 })
+			const res = await getFullInfo({ id: this.option.id,getOriginalItem:1 })
 			this.orderInfo = res.data
 			
 			this.couldRefundPrice = Number(res.data.orderPrice) - Number(res.data.tkPrice)
@@ -181,27 +238,25 @@ export default {
 			this.product = res.data.product.map(ele=>{
 				return {...ele,refundCount:null}
 			})
-
-			let customId = res.data.customId ? res.data.customId : 0
-			if(Number(customId)>0){
-				getUnClear({customId:customId}).then(res=>{
-					if(res.code == 1){
-						this.unClear = res.data.info
-					}
-				})
-			}
-
-		},
-		goClear(item){
-			this.$util.pageTo({url:'/admin/clear/customInfo?id='+item.id})
-		},
+		}
 	}
 };
 </script>
 <style lang="scss" scoped>
+.module-com {
+  margin-bottom: 20upx;
+  background-color: #fff;
+  color: $fontColor2;
+  .module-tit {
+    padding: 20upx 30upx;
+    font-size: 28upx;
+  }
+  .module-det {
+    padding: 0 30upx;
+  }
+}
 	.app-content{
 		height: calc(100vh - 30upx * 2);
-		padding: 30upx;
 		background: #FFFFFF;
 		font-size: 30upx;
 		.radioBtn{
@@ -236,7 +291,9 @@ export default {
 				text{color: red;}
 			}
 			.list{
-				margin-bottom: 10upx;
+				margin-bottom:18upx;
+				border-bottom:1upx solid #CCCCCC;
+				padding-bottom:14upx;
 				.list-title{
 					height: 60upx;
 					padding-bottom: 20upx;
@@ -308,4 +365,11 @@ export default {
 			}
 		}
 	}
+.app-footer {
+  justify-content: space-evenly;
+  z-index: 9999;
+  .admin-button-com {
+    width: 46%;
+  }
+}
 </style>

hdApp/src/pagesPurchase/refundDetail.vue

@@ -2,10 +2,10 @@
   <view class="app-content">
     <view class="info-content_box">
 
-      <view class="module-com content-box proInfo">
+      <view class="module-com content-box proInfo" v-if="!$util.isEmpty(refundData.itemList)">
         <view class="commodity-view">
           <view class="infoAEdit">
-            <text>退款花材</text>
+            <text>退货花材</text>
           </view>
           <view class="commodity-list">
             <view v-for="(s, idx) in refundData.itemList" :key="idx" class="commodity-item">
@@ -30,26 +30,50 @@
 
 			<view class="content-box price-detail">
 				<div class="module-com input-line-wrap">
-
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">金额</div>
             <div class="detail-price_box red">¥{{ refundPrice }}</div>
 					</tui-list-cell>
 
-          <tui-list-cell class="line-cell" :hover="false" v-if="detailInfo.remark !=''">
+          <tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">状态</div>
+            <div class="detail-price_box">
+              {{ refundData.info.status==0?'待审核':refundData.info.status==1?'已通过':refundData.info.status==2?'已驳回':refundData.info.status==3?'已取消':'' }}
+            </div>
+					</tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false" v-if="refundData.info.rejectReason !=''">
+            <div class="tui-title">原因</div>
+            <div class="detail-price_box">{{ refundData.info.rejectReason }}</div>
+          </tui-list-cell>
+          <tui-list-cell class="line-cell" :hover="false" v-if="refundData.info.remark !=''">
             <div class="tui-title">备注</div>
             <div class="detail-price_box">{{ refundData.info.remark }}</div>
           </tui-list-cell>
-
 				</div>
 			</view>
+      <block v-if="refundData.info && refundData.info.smallImgList && !$util.isEmpty(refundData.info.smallImgList)">
+        <view style="background-color: white;border-radius: 10upx;height:200upx;">
+          <view style="font-size:26upx;padding-left:20upx;text-align:left;color:#666666;margin-bottom:20upx;padding-top:20upx;">售后图片</view>
+          <view v-for="(itemImg, indexImg) in refundData.info.smallImgList" :key="indexImg">
+            <image :src="itemImg" style="width:100upx;height:100upx;float:left;margin-left:20upx;" @click="showBig(indexImg)" mode="widthFix"></image>
+          </view>
+        </view>
+      </block>
 
     </view>
+
+    <view class="app-footer">
+      <view class="flex-center"> </view>
+      <view class="operate-btn-wrap">
+        <button class="admin-button-com big" style="margin-right:50upx;" @click.stop="cancelFn(refundData.info)" v-if="refundData.info.status == 0">取消申请</button>
+      </view>
+    </view>
+
   </view>
 </template>
-
 <script>
 import { getRefundData} from "@/api/purchase/refund";
+import { cancelRefund } from "@/api/cg-refund"
 import TuiListCell from "@/components/plugin/list-cell";
 export default {
   name: "refundDetail",
@@ -71,6 +95,24 @@ export default {
     this.initData()
   },
   methods: {
+    showBig(index){
+      if(this.refundData.info && this.refundData.info.bigImgList && !this.$util.isEmpty(this.refundData.info.bigImgList)){
+        if(this.refundData.info.bigImgList[index]){
+          uni.previewImage({ urls: [this.refundData.info.bigImgList[index]] })
+        }
+      }
+    },
+    cancelFn(){
+      let that = this
+      that.$util.confirmModal({content:'确认取消？'},() => {
+        cancelRefund({id:this.option.id}).then((res) => {
+          if(res.code == 1){
+            that.$msg(res.msg)
+            that.initData()
+          }    
+        })
+      })
+    },
     init(){
 
     },
@@ -86,7 +128,7 @@ export default {
 
 <style lang="scss" scoped>
 .info-content_box {
-  padding: 0 20upx 100upx;
+  padding: 10upx 18upx 100upx;
   & > .title {
     color: #666666;
     font-size: 28upx;
@@ -266,7 +308,7 @@ export default {
   }
   .detail-price_box {
     color: #333333;
-    font-size: 28upx;
+    font-size: 26upx;
     text-align: right;
     flex: 1;
     font-weight: 600;
@@ -281,10 +323,10 @@ export default {
   justify-content: flex-end;
   & .admin-button-com {
     padding: 0;
-    margin-right: 15upx;
-    width: 140upx;
-    height: 70upx;
-    line-height: 70upx;
+    margin-right:20upx;
+    width: 180upx;
+    height: 80upx;
+    line-height:80upx;
     text-align: center;
     color: #3385ff;
     border: 1px solid #3385ff;

hdApp/src/pagesPurchase/refundList.vue

@@ -8,9 +8,7 @@
               <text>单号：{{item.orderSn}}</text>
               <text>操作：{{item.shopAdminName}}</text>
               <text>类型：{{item.book == 1 ? '预订单多退少补' :'普通'}}</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>
 
@@ -23,7 +21,7 @@
 </template>
 <script>
 import { list } from "@/mixins";
-import { cgRefundList } from "@/api/cgRefund";
+import { cgRefundList } from "@/api/cg-refund";
 export default {
   name: "refundList",
   components: {},
@@ -34,13 +32,13 @@ export default {
   },
   onPullDownRefresh() {
     this.resetList();
-    this._list().then((res) => {
+    this.getRefundList().then((res) => {
       uni.stopPullDownRefresh();
     });
   },
   onReachBottom() {
     if (!this.list.finished) {
-      this._list().then((res) => {
+      this.getRefundList().then((res) => {
         uni.stopPullDownRefresh();
       });
     } else {
@@ -53,9 +51,12 @@ export default {
   },
   onShow() {
   	this.resetList();
-    this._list();
+    this.getRefundList();
   },
   methods: {
+    init(){
+
+    },
     goDetail(item){
       if(item.book == 1){
         this.$msg('预订单多退少补')
@@ -63,7 +64,7 @@ export default {
       }
       this.$util.pageTo({url: '/pagesPurchase/refundDetail',query: {id: item.id}})
     },
-    _list() {
+    getRefundList() {
       return cgRefundList({
         page: this.list.page,
         cgId:this.option.id