退款

pages/login/settled.vue

@@ -391,9 +391,10 @@
 					}] : []
 					this.businessLicenseImg = configService.apiUrl + '/' + obj.businessLicense
 					this.identityOneImg = configService.apiUrl + '/' + obj.identityOne
+					this.identityTwoImg = configService.apiUrl + '/' + obj.identityTwo
+					console.log(this.identityOneImg)
 					this.headPhotoImg = obj.headPhoto ? obj.headPhoto.split(',').filter(id => id !== '') : []
 					obj.headPhoto = obj.headPhoto ? obj.headPhoto.split(',').filter(id => id !== '') : []
-					this.identityTwoImg = configService.apiUrl + '/' + obj.identityTwo
 					obj.locality = obj.locality ? obj.locality : ''
 					this.form = obj
 				}

pages/order/details.vue

@@ -11,7 +11,7 @@
 		<view class="content">
 			<view class="status">
 				<view class="status_title">
-					{{product.state}} <span v-if="product.differenceMinutes>0">,剩余</span> 
+					{{product.state}} <span v-if="product.differenceMinutes>0 && product.state == '待支付'">, 剩余</span> 
 					<u-count-down :timestamp="product.differenceMinutes*60" :show-days="false" font-size="36rpx" @end="getDetail"
 						v-if="product.differenceMinutes>0 && product.state == '待支付'"></u-count-down>
 

pages/order/index.vue

@@ -43,7 +43,7 @@
 		<mescroll-uni class="list" :fixed="false" ref="mescrollRef" @up="getList" @init="mescrollInit" :use="false"
 			v-if="tabIndex ==0">
 			<view class="order_item" v-for="(item,index) in orderList" :key="item.id" @click="geDetail(item)">
-				<view class="order_id">
+				<view class="order_id" v-if="item.stateCode && !item.refundType">
 					<view class="id_left">
 						订单编号：{{item.orderId}}
 					</view>
@@ -61,6 +61,26 @@
 						已使用
 					</view>
 				</view>
+				<view class="order_id" v-if="item.stateCode == 4 && item.refundType ">
+					<view class="id_left">
+						订单编号：{{item.orderId}}
+					</view>
+					<view class="id_right"  v-if="item.refundType ==0">
+						未退款
+					</view>
+					<view class="id_right"  v-if="item.refundType ==1">
+						已退款
+					</view>
+					<view class="id_right"  v-if="item.refundType ==2">
+						退款中
+					</view>
+					<view class="id_right"  v-if="item.refundType ==3">
+						退款失败
+					</view>
+					<view class="id_right"  v-if="item.refundType ==99">
+						挂起
+					</view>
+				</view>
 				<!-- 普通订单 -->
 				<view class="order_product" v-if="item.categoryId != 1945013773786701826">
 					<view class="img">
@@ -900,10 +920,12 @@
 				success: function(res) {
 					that.merchantId = res.data.merchantId
 					that.serviceList = []
+					that.orderList = []
 					let page = {
 						num: 1,
 						size: 10
 					}
+					that.getList(page)
 					that.getserviceList(page)
 				}
 			})

pages/order/record.vue

@@ -40,7 +40,7 @@
 				<!-- 用户提交 -->
 				<view class="" v-if="item.refundType == 0">
 					<view class="information">
-						退货金额：¥ {{item.refundPrice}}
+						退款金额：¥ {{item.refundPrice}}
 					</view>
 					<view class="information">
 						联系方式：{{item.phone}}
@@ -112,6 +112,7 @@
 			return {
 				list: [],
 				orderNo: '',
+				reOrderId:'',
 				reasonList: [{
 						name: '商品已使用',
 						check: false,
@@ -143,8 +144,8 @@
 				}
 				this.$http.get("/app/order/locaOrder/afterSaleDetails?orderNo=" + this.orderNo).then(res => {
 					if (res.data.code == 200) {
-						console.log(res)
 						this.list = res.data.result
+						console.log(this.list)
 					}
 				})
 			},
@@ -204,7 +205,7 @@
 			// 同意退款
 			agree(item){
 				let data = {
-					reOrderId:this.orderNo
+					reOrderId:this.reOrderId
 				}
 				this.$http.post("/app/order/locaOrder/agreeRefund",data).then(res => {
 					if (res.statusCode == 200) {
@@ -224,6 +225,7 @@
 		},
 		onLoad(options) {
 			this.orderNo = options.orderId
+			this.reOrderId = options.orderId
 		}
 	}
 </script>

pages/product/usable.vue

@@ -43,7 +43,7 @@
 				保存
 			</view>
 		</view>
-		<rangTime ref="rangTime" :mode="mode" @onSubmit="onEndTimeChange" />
+		<rangTime ref="rangTime" :mode="mode" :title="'选择售卖时间'" @onSubmit="onEndTimeChange" />
 	</view>
 </template>
 <script>

pages/store/businessInfor.vue

@@ -56,7 +56,7 @@
 				<view class="customize">
 					<view class="title">地理位置</view>
 					<view class=" booder-top" style="padding-bottom: 16upx" :style="{ 'display': mapIsHidden }">
-						<map :key="mapKey" style="width: 100%; height: 218upx;" :latitude="latitude" scale="14" zIndex="100"
+						<map :key="mapKey" style="width: 100%; height: 218upx;z-index:99" :latitude="latitude" scale="14" zIndex="100"
 							:longitude="longitude" :markers="marker" @tap="handleMarkerTap"></map>
 					</view>