shish před 3 roky
rodič
revize
e2242081ff

+ 1 - 1
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'})">

+ 1 - 1
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": "重选花材"}},

+ 30 - 14
ghsApp/src/pagesOrder/refundDetail.vue

@@ -10,8 +10,8 @@
 			<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>
@@ -28,19 +28,20 @@
 			<view class="refund-label">驳回原因:</view>
 			<view class="list">{{info.rejectReason?info.rejectReason:''}}</view>
 		</view>
-		<view class=" refund-item">
+		<view class=" refund-item" v-if="!$util.isEmpty(info.remark)">
 			<view class="refund-label">备注信息:</view>
 			<view class="list">{{info.remark?info.remark:''}}</view>
 		</view>
-
-		<view class=" refund-item">
+		<view class=" refund-item" v-if="from == 1">
+			<view class="refund-label">订单信息:</view>
+			<view class="list" style="color:#3385FF;font-weight:800;" @click="goToOrder(info)">点击查看</view>
+		</view>
+		<view class=" refund-item" v-if="info.smallImgList && !$util.isEmpty(info.smallImgList)">
 			<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>			
+				<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>
 
@@ -59,7 +60,7 @@
 
 		<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;" placeholder="驳回原因..."></textarea>
+				<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>
@@ -79,12 +80,19 @@ export default {
 			refundType:1,
 			remark:'',
 			info:[],
-			rejectReason:''
+			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()
 		},
@@ -172,10 +180,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;
@@ -196,7 +206,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;
 			}

+ 4 - 6
hdApp/src/pagesPurchase/refundDetail.vue

@@ -30,6 +30,10 @@
 
 			<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">
 						<div class="tui-title">状态</div>
@@ -38,16 +42,10 @@
             </div>
 					</tui-list-cell>
 
-					<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="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)">