预订单退款

ghsApp/src/admin/ad/list.vue

@@ -58,15 +58,7 @@
 		</div>
 		<!-- 按钮 -->
 		<div class="app-footer">
-			<div
-				class="admin-button-com middle blue"
-				@click="pageTo({
-						url: '/admin/ad/add',
-						query: {
-							type: tabIndex
-						}
-					})"
-			>
+			<div class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ad/add', query: { type: tabIndex } })" >
 				添加
 			</div>
 		</div>

ghsApp/src/admin/breakage/confirm.vue

@@ -14,8 +14,7 @@
                     <text class="item-price">
                       <text class="unit"></text>
                       <text class="price">
-                        <text v-if="item.bigCount > 0 || item.smallCount > 0">{{`${item.bigCount}`}}扎</text>
-                        <text v-if="item.smallCount > 0">/</text>
+                        <text v-if="item.bigCount > 0">{{`${item.bigCount}`}}扎</text>
                         <text v-if="item.smallCount > 0">{{`${item.smallCount}`}}支</text>
                       </text>
                     </text>

ghsApp/src/admin/breakage/index.vue

@@ -53,18 +53,18 @@
 					<view class="num_bx">
 
 						<!-- #ifdef APP-PLUS -->
-						<input style="width: 430upx" v-model="customData.bigCount" v-if="unitType == 0" type="number" />
-						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="unitType == 0">扎</text>
-						<input style="width: 430upx" v-model="customData.smallCount" v-if="unitType == 1" type="number" />
-						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="unitType == 1">支</text>
+						<input style="width: 430upx" v-model="customData.bigCount" v-if="globalUnitType == 0" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">扎</text>
+						<input style="width: 430upx" v-model="customData.smallCount" v-if="globalUnitType == 1" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
 						<!-- #endif -->
 						<!-- #ifdef MP-WEIXIN -->
-						<input style="width: 430upx" v-model="customData.bigCount" v-if="unitType == 0" :focus="isAddInputFocus" type="number" />
-						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="unitType == 0">扎</text>
-						<input style="width: 430upx" v-model="customData.smallCount" v-if="unitType == 1" type="number" />
-						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="unitType == 1">支</text>
+						<input style="width: 430upx" v-model="customData.bigCount" v-if="globalUnitType == 0" :focus="isAddInputFocus" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">扎</text>
+						<input style="width: 430upx" v-model="customData.smallCount" v-if="globalUnitType == 1" :focus="isAddInputFocus" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
 						<!-- #endif -->
-						<image @click="switchUnitType" :src="`${constant.imgUrl}/icon/switch/switch64.png`" 
+						<image @click="switchGlobalUnitType" :src="`${constant.imgUrl}/icon/switch/switch128.png`" 
 						style="width:86upx;height:86upx;" mode="widthFix"></image>
 
 					</view>
@@ -121,7 +121,7 @@ export default {
 	onUnload() {
 	},
 	methods: {
-		switchUnitType(){
+		switchGlobalUnitType(){
 			if(this.unitType == 0){
 				this.unitType = 1
 				this.customData.bigCount = null

ghsApp/src/api/refund/index.js

@@ -4,3 +4,7 @@ import https from '@/plugins/luch-request_0.0.7/request'
 export const refundDetail = data => {
 	return https.get('/refund/detail', data)
 }
+
+export const refundList = data => {
+	return https.get('/refund/list', data)
+}

ghsApp/src/components/module/app-footer-cart.vue

@@ -9,11 +9,9 @@
 					<text v-if="count.bigLength>0">{{count.bigLength}}扎</text>
 					<text v-if="count.smallLength>0">{{count.smallLength}}支</text>
 					<text style="margin-left:15upx;">￥{{ price }}</text>
-					</view>
-			</view>
-			<view class="cart-rg_bx" @click="confirmEvent">
-				选好了
+				</view>
 			</view>
+			<view class="cart-rg_bx" @click="confirmEvent"> 选好了 </view>
 		</div>
 	</div>
 </template>

ghsApp/src/mixins/product.js

@@ -56,12 +56,19 @@ export default {
 					const itemInfo = this.getSelectItemById(item.id, item.classId);
 					if (itemInfo && !this.$util.isEmpty(itemInfo.bigPrice) && !this.$util.isEmpty(itemInfo.smallPrice)) {
 						if(item.userPrice>0){
-							price += Number(item.bigCount) * Number(itemInfo.userPrice);
-							let currentSmallPrice = (itemInfo.userPrice/itemInfo.ratio).toFixed(2)
-							price += Number(item.smallCount)*Number(currentSmallPrice)
+							if(Number(item.bigCount) > 0){
+								price += Number(item.bigCount) * Number(itemInfo.userPrice);
+							}
+							if(Number(item.smallCount) > 0){
+								price += Number(item.smallCount) * Number(itemInfo.userPrice);	
+							}
 						}else{
-							price += item.bigCount * Number(itemInfo.bigPrice);
-							price += item.smallCount * Number(itemInfo.smallPrice);
+							if(Number(item.bigCount) > 0){
+								price += Number(item.bigCount) * Number(itemInfo.bigPrice);
+							}
+							if(Number(item.smallCount) > 0){
+								price += Number(item.smallCount) * Number(itemInfo.smallPrice);	
+							}
 						}
 					}
 				}
@@ -271,6 +278,9 @@ export default {
 			if(this.py.indexOf('bs') == 0 && this.py.length <= 2){
 				return
 			}
+			if(this.py.indexOf('yj') == 0 && this.py.length <= 2){
+				return
+			}
 			//涉及记住花材的代码和流程，请全项目搜索关键词remember_item
 			//将已选的花材按productId键名组合
 			let selectListData = []

ghsApp/src/pages.json

@@ -78,7 +78,8 @@
 				{"path": "ship","style": {"navigationBarTitleText": "发货"}},
 				{"path": "shipInfo","style": {"navigationBarTitleText": "发货"}},
 				{"path": "select","style": {"navigationBarTitleText": "重选花材"}},
-				{"path": "print","style": {"navigationBarTitleText": "连接蓝牙"}}
+				{"path": "print","style": {"navigationBarTitleText": "连接蓝牙"}},
+				{"path": "refundList","style": {"navigationBarTitleText": "退款记录", "enablePullDownRefresh": true}}
 			]
 		},
 		{

ghsApp/src/pagesOrder/arrival.vue

@@ -15,7 +15,7 @@
 									</text>
 								</view>
 								<view class="info-line">
-									<text class="item-type">{{ s.property }}</text>
+									<text class="item-type"></text>
 									<view class="item-count">
 										<input type="number" class="num" v-model="s.bigNum" placeholder="到货数量" />
 										<input type="digit" class="price" v-model="s.currentCost" placeholder="成本" />
@@ -51,7 +51,7 @@
 						<view class="detail-price_box" style="font-size: 28upx;">¥{{ kiloFee ? parseFloat(kiloFee) : 0}}</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
-						<view class="tui-title">本单服务费</view>
+						<view class="tui-title">总服务费</view>
 						<view class="detail-price_box" style="font-size: 28upx;">¥{{totalKiloFee}}</view>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">

ghsApp/src/pagesOrder/detail.vue

@@ -73,7 +73,7 @@
 					<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/refundMsg',query: {orderSn: detailInfo.orderSn}})" class="admin-button-com">退款明细</button>
+						<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">
@@ -108,28 +108,30 @@
 			<view class="flex-space title">
 				商品信息
 				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="detailInfo.status == 4">
-					<view v-if="detailInfo.refund==1" @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">
 				<view class="commodity-view">
 					<view class="commodity-list">
 						<view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" >
-							<image class="item-icon" :src="s.cover" alt="" />
-
+							<image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})" />
 							<view class="item-info">
 								<view class="info-line">
 									<text class="item-name">{{ s.name }}</text>
 									<text class="item-price">
 										<text class="unit"></text>
 										<text class="price">
-											<text>{{parseFloat(s.num)}}扎*¥{{parseFloat(s.unitPrice)}}</text>
+											<text v-if="detailInfo.stockChange == 1">{{parseFloat(s.xhNum)}}{{s.xhUnitName}}*¥{{parseFloat(s.xhUnitPrice)}}</text>
+											<text></text>
 										</text>
 									</text>
 								</view>
 								<view class="info-line">
-									<text class="item-type">订{{ parseFloat(s.preNum) }}扎</text>
-									<text class="item-count">¥{{s.userPrice>0?parseFloat(s.userPrice):parseFloat(s.price) }}</text>
+									<text class="item-type" v-if="detailInfo.book == 1">预订 {{ parseFloat(s.xhPreNum) }}{{s.xhUnitName}}*¥{{parseFloat(s.xhPreUnitPrice)}} ¥{{parseFloat(s.xhPrice)}}</text>
+									<text class="item-type" v-else></text>
+									<text class="item-count" v-if="detailInfo.stockChange == 1">¥{{s.userPrice>0?parseFloat(s.userPrice):parseFloat(s.price) }}</text>
+									<text class="item-count" v-else></text>
 								</view>
 							</view>
 						</view>
@@ -193,7 +195,7 @@
 					<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.kiloFee ? parseFloat(detailInfo.kiloFee) : 0}}</div>
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title">本单服务费</div>
+					<div class="tui-title">总服务费</div>
 					<div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.allKiloFee ? parseFloat(detailInfo.allKiloFee) : 0}}</div>
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
@@ -600,7 +602,6 @@ export default {
 	}
 	.bills-info_box {
 		padding: 30upx 20upx 30upx;
-		// border-bottom: 1upx solid #EEEEEE;
 		& > .order-info_box {
 			display: flex;
 			align-items: center;
@@ -671,8 +672,7 @@ export default {
 							color: #333;
 							font-size: 22upx;
 							.price {
-								font-size: 30upx;
-								font-weight: bold;
+								font-size: 25upx;
 							}
 						}
 						.item-type {

ghsApp/src/pagesOrder/refundList.vue

@@ -0,0 +1,106 @@
+<template>
+  <view class="app-content">
+			<block v-if="!$util.isEmpty(list.data)">
+				<view class="flex-space list" v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
+
+
+
+          <view class="label">
+              <text>日期：{{item.addTime.substr(5,11)}}</text>
+              <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>    
+
+          </view>
+          <view class="flex val">{{item.refundPrice}} <view class="iconfont iconxiangyou"></view> </view>
+
+
+
+			  </view>
+			</block>
+			<block v-else>
+				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+			</block>
+  </view>
+</template>
+<script>
+import { list } from "@/mixins";
+import { refundList } from "@/api/refund";
+export default {
+  name: "refundList",
+  components: {},
+  mixins: [list],
+  data() {
+    return {
+    };
+  },
+  onPullDownRefresh() {
+    this.resetList();
+    this._list().then((res) => {
+      uni.stopPullDownRefresh();
+    });
+  },
+  onReachBottom() {
+    if (!this.list.finished) {
+      this._list().then((res) => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+  mounted() {
+  },
+  onLoad(option) {
+  },
+  onShow() {
+  	this.resetList();
+    this._list();
+  },
+  methods: {
+    goDetail(item){
+      if(item.book == 1){
+        this.$msg('预订单多付退款')
+        return false
+      }
+      this.$util.pageTo({url: '/pagesOrder/refundMsg',query: {orderSn: item.relateOrderSn}})
+    },
+    _list() {
+      return refundList({
+        page: this.list.page,
+        orderSn:this.option.orderSn
+      }).then((res) => {
+        this.completes(res);
+        if (this.$util.isEmpty(res.data)){
+          return false
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+	.app-content{
+		.list{
+			padding: 20upx 30upx;
+			margin-bottom: 20upx;
+			background: #FFFFFF;
+			.label{
+        position: relative;
+				line-height: 50upx;
+				text{
+					display: block;
+				}
+			}
+			.val{
+				font-size: 25upx;
+				.iconfont{
+					margin-left: 12upx;
+					color: #999999;
+				}
+			}
+		}
+	}
+</style>

hdApp/src/admin/breakage/confirm.vue

@@ -14,8 +14,7 @@
                     <text class="item-price">
                       <text class="unit"></text>
                       <text class="price">
-                        <text v-if="item.bigCount > 0 || item.smallCount > 0">{{`${item.bigCount}`}}扎</text>
-                        <text v-if="item.smallCount > 0">/</text>
+                        <text v-if="item.bigCount > 0">{{`${item.bigCount}`}}扎</text>
                         <text v-if="item.smallCount > 0">{{`${item.smallCount}`}}支</text>
                       </text>
                     </text>

hdApp/src/admin/breakage/index.vue

@@ -61,18 +61,23 @@
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"><text class="unit_price">库存 {{ customData.stock }}</text></view>
-					<view class="num_bx">
-						
+					<view class="num_bx"> 
 
 						<!-- #ifdef APP-PLUS -->
-						<input v-model="customData.bigCount" type="number" />扎
+						<input style="width: 430upx" v-model="customData.bigCount" v-if="globalUnitType == 0" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">扎</text>
+						<input style="width: 430upx" v-model="customData.smallCount" v-if="globalUnitType == 1" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
 						<!-- #endif -->
 						<!-- #ifdef MP-WEIXIN -->
-						<input v-model="customData.bigCount" :focus="isAddInputFocus" type="number" />扎
+						<input style="width: 430upx" v-model="customData.bigCount" v-if="globalUnitType == 0" :focus="isAddInputFocus" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">扎</text>
+						<input style="width: 430upx" v-model="customData.smallCount" v-if="globalUnitType == 1" :focus="isAddInputFocus" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
 						<!-- #endif -->
+						<image @click="switchGlobalUnitType" :src="`${constant.imgUrl}/icon/switch/switch128.png`" 
+						style="width:86upx;height:86upx;" mode="widthFix"></image>
 
-
-						<input v-model="customData.smallCount" type="number" style="margin-left:24upx" />支
 					</view>
 				</view>
 			</template>

hdApp/src/admin/home/workbench.vue

@@ -98,7 +98,7 @@ export default {
         { name: "采购单", img: `${this.$constant.imgUrl}/ghs/home/icon_caigou.png`, url: "/pagesPurchase/shopping" },
         { name: "供应商", img: `${this.$constant.imgUrl}/ghs/home/icon_ghs.png`, url: "/pagesPurchase/order" },
         { name: "商品", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/list" },
-        { name: "商品分类", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goodsManage/category" },
+        { name: "花材", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/item/list" },
         { name: "改价", img: `${this.$constant.imgUrl}/ghs/home/gj.png`, url: "/admin/changePrice/list" },
         { name: "报损单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/breakage/list" }
       ],

hdApp/src/api/cgRefund/index.js

@@ -0,0 +1,10 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+//退款详情
+export const refundDetail = data => {
+	return https.get('/refund/detail', data)
+}
+
+export const cgRefundList = data => {
+	return https.get('/cg-refund/list', data)
+}

hdApp/src/components/module/app-commodity.vue

@@ -11,9 +11,8 @@
 					<view class="open-bx" >
 						<i class="iconfont iconjian" @click.stop="reduceItemFn()" v-if="bigCount > 0 || smallCount > 0"></i>
 						<text class="num" >
-							<text v-if="bigCount > 0 || smallCount > 0">{{ `${bigCount}` }}</text>
-							<text v-if="smallCount > 0">/</text>
-							<text v-if="smallCount > 0">{{ `${smallCount}` }}</text>
+							<text style="font-size:24upx;font-weight:bold;color:#3385ff;" v-if="bigCount > 0">{{ `${bigCount}` }}</text>
+							<text style="font-size:24upx;" v-if="smallCount > 0">{{ `${smallCount}` }}</text>
 						</text>
 						<i class="iconfont iconzeng" @click.stop="addItemFn()"></i>
 					</view>

hdApp/src/components/module/app-footer-cart.vue

@@ -4,18 +4,14 @@
 			<view class="cart-lf_bx">
 				<view class="cart-dot_bx">
 					<i class="iconfont icongouwuche"></i>
-					<view class="count" v-if="countNumber==0&&count.bigLength>0||countNumber==0&&count.smallLength>0">
-						{{ count.bigLength }}<text v-if="count.smallLength>0">/{{count.smallLength}}</text>
-					</view>
-					<text class="count" v-if="countNumber > 0">
-						{{ countNumber }}
-					</text>
 				</view>
-				<view class="price" v-if="!offPrice"> ￥{{ price }} </view>
-			</view>
-			<view class="cart-rg_bx" @click="confirmEvent">
-				选好了
+				<view class="price" v-if="!offPrice">
+					<text v-if="count.bigLength>0">{{count.bigLength}}扎</text>
+					<text v-if="count.smallLength>0">{{count.smallLength}}支</text>
+					<text style="margin-left:15upx;">￥{{ price }}</text>
+				</view>
 			</view>
+			<view class="cart-rg_bx" @click="confirmEvent"> 选好了 </view>
 		</div>
 	</div>
 </template>

hdApp/src/mixins/product.js

@@ -23,7 +23,9 @@ export default {
 			isAddModel:false,
 			isAddInputFocus:false,
 			customData: { bigCount: 0, smallCount: 0, userPrice: 0 },
-			globalItemList:[]
+			globalItemList:[],
+			//当前页面默认使用的单位 0大单位 1小单位
+			globalUnitType:0
 		};
 	},
 	onLoad(options) {
@@ -269,6 +271,9 @@ export default {
 			if(this.py.indexOf('bs') == 0 && this.py.length <= 2){
 				return
 			}
+			if(this.py.indexOf('yj') == 0 && this.py.length <= 2){
+				return
+			}
 			//涉及记住花材的代码和流程，请全项目搜索关键词remember_item
 			//将已选的花材按productId键名组合
 			let selectListData = []
@@ -341,19 +346,20 @@ export default {
 		replaceItemFn(product,multiple=0,calc='add') {
 			let item = copyObject(product)
 			if(multiple == 0){
-				if(calc == 'add'){
-					item.bigCount++
-				}
-				if(calc == 'sub'){
-					if(Number(item.bigCount) <= 0){
-						if(Number(item.smallCount) > 0){
-							item.smallCount = 0
-						}else{
-							this.$msg('不能再小了')
-						}
-					}else{
-						item.bigCount--
+				if(Number(item.smallCount)>0){
+					if(calc == 'add'){
+						item.smallCount++
+					}
+					if(calc == 'sub'){
+						item.smallCount--
+					}
+				}else{
+					if(calc == 'add'){
+						item.bigCount++
 					}
+					if(calc == 'sub'){
+						item.bigCount--
+					}					
 				}
 			}
 			console.log('........replace_item......')
@@ -393,6 +399,18 @@ export default {
 			this.itemNumPriceRefresh()
 
 
+		},
+		//大小单位切换
+		switchGlobalUnitType(){
+			if(this.globalUnitType == 0){
+				this.globalUnitType = 1
+				this.customData.userPrice = parseFloat(this.customData.smallPrice)
+				this.customData.bigCount = null
+			}else{
+				this.globalUnitType = 0
+				this.customData.userPrice = parseFloat(this.customData.bigPrice)
+				this.customData.smallCount = null
+			}
 		},
 		//显示可以修改花材的弹框
 		showAddModelFn(info) {
@@ -403,6 +421,14 @@ export default {
 					return false
 				}
 			}
+
+			//弹框时默认显示的单位
+			if(Number(info.smallCount>0)){
+				this.globalUnitType = 1
+			}else{
+				this.globalUnitType = 0
+			}
+
 			this.isAddModel = true;
 			this.customData = copyObject(info)
 			this.isAddInputFocus = false;

hdApp/src/pages.json

@@ -315,7 +315,8 @@
 				{ "path": "refundDetail", "style": { "navigationBarTitleText": "退款详情", "enablePullDownRefresh": true } },
 				{ "path": "level", "style": { "navigationBarTitleText": "会员等级", "enablePullDownRefresh": true } },
 				{ "path": "bookProduct", "style": { "navigationBarTitleText": "预订花材", "enablePullDownRefresh": true } },
-				{ "path": "bookExplain", "style": { "navigationBarTitleText": "预订说明", "enablePullDownRefresh": true } }
+				{ "path": "bookExplain", "style": { "navigationBarTitleText": "预订说明", "enablePullDownRefresh": true } },
+				{ "path": "refundList","style": {"navigationBarTitleText": "退款记录", "enablePullDownRefresh": true } }
 			]
 		},
 		{

hdApp/src/pagesPurchase/purDetails.vue

@@ -11,7 +11,8 @@
         </view>
         <view>
           <i @click.stop="callUp(detailInfo.ghsMobile)" class="iconfont icondianhua1"></i>
-        	<i @click.stop="navigate(detailInfo.lat,detailInfo.long,detailInfo.supplierName)" class="iconfont icondianhua" style="font-size:53upx;margin-left:30upx;margin-right:9upx;color:#3385ff;"></i>
+        	<i @click.stop="navigate(detailInfo.lat,detailInfo.long,detailInfo.supplierName)" class="iconfont icondianhua" 
+          style="font-size:53upx;margin-left:30upx;margin-right:9upx;color:#3385ff;"></i>
         </view>
       </view>
 
@@ -49,14 +50,7 @@
         </view>
         <view class="order-info_box">
           <view>支付方式：</view>
-          <view>{{
-						detailInfo.payWay==0?'微信'
-						:detailInfo.payWay==1?'支付宝'
-						:detailInfo.payWay==2?'余额'
-						:detailInfo.payWay==4?'现金'
-            :detailInfo.payWay==5?'银行卡'
-						:'--'
-						}}</view>
+          <view>{{ detailInfo.payWay==0?'微信' :detailInfo.payWay==1?'支付宝' :detailInfo.payWay==2?'余额' :detailInfo.payWay==4?'现金' :detailInfo.payWay==5?'银行卡' :'--' }}</view>
         </view>
         <view class="order-info_box">
           <view>采购人员：</view>
@@ -64,21 +58,14 @@
         </view>
         <view class="order-info_box">
           <view>订单状态：</view>
-          <view>{{
-						detailInfo.status==1?'待付款'
-						:detailInfo.status==2?'待配送'
-						:detailInfo.status==3?'配送中'
-						:detailInfo.status==4?'已完成'
-						:detailInfo.status==5?'已取消'
-						:'已退款'
-						 }}</view>
+          <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>退款金额：</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/refundDetail',query: {id: detailInfo.id}})" class="admin-button-com">退款明细</button>
+              <button @click="pageTo({url: '/pagesPurchase/refundList',query: {id: detailInfo.id}})" class="admin-button-com">退款记录</button>
             </view>
         </view>
         <view v-if="detailInfo.refund == 2" class="order-info_box">
@@ -117,20 +104,25 @@
           </view>
           <view class="commodity-list">
             <view v-for="(s, idx) in detailInfo.product" :key="idx" class="commodity-item" >
-              <image class="item-icon" :src="s.cover" alt="" />
+              <image class="item-icon" :src="s.cover" @click="pageTo({url:'/admin/item/detail',query:{id: s.id}})" />
               <view class="item-info">
                 <view class="info-line">
                   <text class="item-name">{{ s.name }}</text>
                   <text class="item-price">
                     <text class="unit"></text>
                     <text class="price">
-                      <text>{{parseFloat(s.itemNum)}}扎*¥{{parseFloat(s.price)}}</text>
+                      <text v-if="detailInfo.stockChange == 1">{{parseFloat(s.xhNum)}}{{s.xhUnitName}}*¥{{parseFloat(s.xhUnitPrice)}}</text>
+                      <text v-else></text>
                     </text>
                   </text>
                 </view>
                 <view class="info-line">
-                  <text class="item-type"><text v-if="Number(s.preItemNum) > Number(s.itemNum)">订{{parseFloat(s.preItemNum)}}扎</text></text>
-                  <text class="item-count">¥{{ parseFloat(s.totalPrice)||0 }}</text>
+                  <text class="item-type" v-if="detailInfo.book == 1">
+                    <text>预订 {{parseFloat(s.preItemNum)}}{{s.xhUnitName}}*¥{{parseFloat(s.xhPreUnitPrice)}} ¥{{parseFloat(s.xhPrePrice)}}</text>
+                    </text>
+                  <text class="item-type" v-else><text></text></text>
+                  <text class="item-count" v-if="detailInfo.stockChange == 1">¥{{ parseFloat(s.totalPrice)||0 }}</text>
+                  <text class="item-count" v-else></text>
                 </view>
               </view>
             </view>
@@ -190,7 +182,7 @@
             <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.kiloFee ? parseFloat(detailInfo.kiloFee) : 0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false">
-            <div class="tui-title">本单服务费</div>
+            <div class="tui-title">总服务费</div>
             <div class="detail-price_box" style="font-size: 28upx;">¥{{ detailInfo.allKiloFee ? parseFloat(detailInfo.allKiloFee) : 0}}</div>
           </tui-list-cell>
           <tui-list-cell class="line-cell" :hover="false">
@@ -457,7 +449,6 @@ export default {
               font-size: 22upx;
               .price {
                 font-size: 25upx;
-                font-weight: bold;
               }
             }
             .item-type {

hdApp/src/pagesPurchase/refundDetail.vue

@@ -98,7 +98,7 @@ export default {
       this.initData()
     },
     initData () {
-      getRefundData({ cgId: this.option.id }).then(res => {
+      getRefundData({ id: this.option.id }).then(res => {
         this.refundData = res.data
         this.prePrice = res.data.cgInfo.prePrice
         this.discountType = res.data.cgInfo.discountType

hdApp/src/pagesPurchase/refundList.vue

@@ -0,0 +1,106 @@
+<template>
+  <view class="app-content">
+			<block v-if="!$util.isEmpty(list.data)">
+				<view class="flex-space list" v-for="(item, index) in list.data" :key="index" @click="goDetail(item)">
+
+
+
+          <view class="label">
+              <text>日期：{{item.addTime.substr(5,11)}}</text>
+              <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>    
+
+          </view>
+          <view class="flex val">{{item.refundPrice}} <view class="iconfont iconxiangyou"></view> </view>
+
+
+
+			  </view>
+			</block>
+			<block v-else>
+				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+			</block>
+  </view>
+</template>
+<script>
+import { list } from "@/mixins";
+import { cgRefundList } from "@/api/cgRefund";
+export default {
+  name: "refundList",
+  components: {},
+  mixins: [list],
+  data() {
+    return {
+    };
+  },
+  onPullDownRefresh() {
+    this.resetList();
+    this._list().then((res) => {
+      uni.stopPullDownRefresh();
+    });
+  },
+  onReachBottom() {
+    if (!this.list.finished) {
+      this._list().then((res) => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+  mounted() {
+  },
+  onLoad(option) {
+  },
+  onShow() {
+  	this.resetList();
+    this._list();
+  },
+  methods: {
+    goDetail(item){
+      if(item.book == 1){
+        this.$msg('预订单多付退款')
+        return false
+      }
+      this.$util.pageTo({url: '/pagesPurchase/refundDetail',query: {id: item.id}})
+    },
+    _list() {
+      return cgRefundList({
+        page: this.list.page,
+        cgId:this.option.id
+      }).then((res) => {
+        this.completes(res);
+        if (this.$util.isEmpty(res.data)){
+          return false
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+	.app-content{
+		.list{
+			padding: 20upx 30upx;
+			margin-bottom: 20upx;
+			background: #FFFFFF;
+			.label{
+        position: relative;
+				line-height: 50upx;
+				text{
+					display: block;
+				}
+			}
+			.val{
+				font-size: 25upx;
+				.iconfont{
+					margin-left: 12upx;
+					color: #999999;
+				}
+			}
+		}
+	}
+</style>