Merge remote-tracking branch 'origin/master'

ghsApp/src/pagesOrder/detail.vue

@@ -82,7 +82,7 @@
 			</view>
 			<view class="flex-space title">
 				商品信息
-				<view class="flex" style="color: #3385ff;font-weight: 400">
+				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="detailInfo.status == 4">
 						<navigator v-if="detailInfo.refund==2" :url="`/pagesOrder/refundMsg?orderSn=${detailInfo.orderSn}`">有退款</navigator>
 						<navigator v-if="detailInfo.refund==1" :url="`/pagesOrder/refund?id=${option.id}`" style="margin-left: 20rpx;">发起退款</navigator>
 				</view>

ghsApp/src/pagesOrder/refundMsg.vue

@@ -100,7 +100,7 @@
 							{{res.itemName}}  {{`￥${res.itemPrice}`}}
 						</view>
 						<view class="flex list-val">
-							<input type="text" @focus="isMonitor = true"disabled v-model="res.bigNum"><text>扎</text>
+							<input type="text" @focus="isMonitor = true" disabled v-model="res.bigNum"><text>扎</text>
 							<input type="text" @focus="isMonitor = true" disabled v-model="res.smallNum"><text>支</text>
 						</view>
 					</view>
@@ -108,12 +108,12 @@
 				</view>
 
 				<view class="flex refund-item">
-					<view class="refund-label">总金额：</view>
+					<view class="refund-label">订单金额：</view>
 					<view class="list">{{totalMoney}}</view>
 				</view>
 
 				<view class="flex refund-item">
-					<view class="refund-label"><text>*</text>退款金额：</view>
+					<view class="refund-label"><text></text>退款金额：</view>
 					<input type="text" disabled   v-model="refundMoney">
 				</view>