shish 1 anno fa
parent
commit
a1f52071ae

+ 0 - 14
hdApp/src/admin/billing/result.vue

@@ -9,7 +9,6 @@
 <script>
 import appResult from "@/components/app-result";
 import { getDetB} from "@/api/order";
-import { changeHalf } from "@/api/item"
 export default {
 	name: "result",
 	components: {
@@ -24,19 +23,6 @@ export default {
 		}
 	},
 	methods: {
-		subHalf(item){
-			let that = this
-			let orderSn = this.orderInfo.orderSn
-			let remark = "开零售单"+orderSn+",减少半扎"
-			that.$util.confirmModal({content:'确认减少半扎?'},() => {
-				uni.showLoading()
-				changeHalf({productId:item.itemId,add:0,remark:remark}).then((res) => {
-					uni.hideLoading()
-					let stock = res.data.stock ? res.data.stock : 0
-					uni.showToast({title: '成功,剩 '+stock,duration:2600,icon:'success'})
-				})
-			})
-		},
 		init(){
 			let orderId = this.option.orderId?this.option.orderId:0
 			getDetB({id: orderId}).then(res => {

+ 3 - 3
hdApp/src/components/app-result.vue

@@ -60,11 +60,11 @@ export default {
 		border-radius: 20upx;
 		z-index: 1;
 		.iconchenggong {
-			font-size: 170upx;
+			font-size: 150upx;
 			color: $mainColor1;
 		}
-    .icondaizhifu {
-			font-size: 170upx;
+    	.icondaizhifu {
+			font-size: 150upx;
 			color: #ffa92e;
 		}
 		.result-title {

+ 1 - 0
hdApp/src/pages.json

@@ -441,6 +441,7 @@
 				{ "path": "info", "style": { "navigationBarTitleText": "订单详情", "enablePullDownRefresh": true } },
 				{ "path": "xj", "style": { "navigationBarTitleText": "请选择颜色"} },
 				{ "path": "refund", "style": { "navigationBarTitleText": "申请退款"} },
+				{ "path": "refundResult", "style": { "navigationBarTitleText": "申请状态"} },
 				{ "path": "refundDetail", "style": { "navigationBarTitleText": "退款详情", "enablePullDownRefresh": true } },
 				{ "path": "level", "style": { "navigationBarTitleText": "会员等级", "enablePullDownRefresh": true } },
 				{ "path": "bookProduct", "style": { "navigationBarTitleText": "预订花材", "enablePullDownRefresh": false } },

+ 1 - 1
hdApp/src/pagesPurchase/purDetails.vue

@@ -311,7 +311,7 @@
         <button class="admin-button-com blue big" v-if="detailInfo.status== 3" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">确认收货</button>
       </block>
 
-      <button class="admin-button-com blue big" v-if="detailInfo.status== 4" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">再次改价</button>
+      <!-- <button class="admin-button-com blue big" v-if="detailInfo.status== 4" @click="affirmTake()" style="margin-right:50upx;padding-left:50upx;padding-right:50upx;">再次改价</button> -->
 
       <block v-if="detailInfo.status == 1">
         <button class="admin-button-com blue big" @click="toPay">去付款</button>

+ 1 - 4
hdApp/src/pagesPurchase/refund.vue

@@ -230,10 +230,7 @@ export default {
 				uni.showLoading({title: "提交中",mask:true})
 				createRefund(refundParams).then(res => {
 					if(res.code == 1){
-						that.$msg('操作成功')
-						setTimeout(function(){
-							that.$util.pageTo({url: '/pagesPurchase/refundDetail?id='+res.data.id,type:2})
-						},1200)
+						that.$util.pageTo({url: '/pagesPurchase/refundResult?id='+res.data.id,type:2})
 					}
 				})
 			})

+ 0 - 5
hdApp/src/pagesPurchase/refundDetail.vue

@@ -60,11 +60,6 @@
         </view>
       </block>
 
-      <!-- #ifdef MP-WEIXIN -->
-      <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
-      <ad-custom unit-id="adunit-b3f48f1b6c1a39ff"></ad-custom>
-      <!-- #endif -->
-
     </view>
 
     <view class="app-footer">

+ 94 - 0
hdApp/src/pagesPurchase/refundResult.vue

@@ -0,0 +1,94 @@
+<template>
+  <view class="app-content">
+    <appResult :title="'提交成功'">
+      <button class="admin-button-com blue big" @click="goBack">返回</button>
+      <button class="admin-button-com blue big" @click="gotoDetail">查看详情</button>
+
+      <!-- #ifdef MP-WEIXIN -->
+      <view style="width:690upx;height:25upx;background-color: #f5f5f5;"></view>
+	  <view style="width:690upx;">
+      	<ad-custom unit-id="adunit-b3f48f1b6c1a39ff"></ad-custom>
+	  </view>
+      <!-- #endif -->
+
+    </appResult>
+  </view>
+</template>
+<script>
+import appResult from "@/components/app-result";
+export default {
+	name: "refundResult",
+	components: {
+		appResult
+	},
+	data(){
+		return {
+            id:0
+		}
+	},
+	methods: {
+		init(){
+		},
+		gotoDetail() {
+            this.id = this.option.id?this.option.id:0
+            this.$util.pageTo({url: '/pagesPurchase/refundDetail?id='+this.id,type:2})
+		},
+		goBack() {
+			uni.navigateBack({ delta: 1 })
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.admin-button-com {
+	margin-bottom: 40upx;
+	width: 100%;
+}
+.zuhe-box{
+	width: 100%;
+  padding:  0 20upx;
+	margin-bottom: 20upx;
+  background-color: #fff;
+	.zuhe-remark{
+		color: #333;
+		font-size: 32upx;
+    font-weight: 700;
+    line-height: 88upx;
+	}
+	.zuhe-center{
+		font-size: 28upx;
+    height: 90upx;
+    box-sizing: border-box;
+    .zuhe-title{
+      color: #666;
+    }
+    &>input{
+      border: 1px solid #eee!important;
+      border-radius: 5upx!important;
+    }
+		.zuhe-val{
+			position: relative;
+			width: 70%;
+			height: 60upx;
+			padding: 10upx;
+      color: #333;
+			border: 1px solid #868686;
+      border: none;
+			&.active:before {
+				content: ' ';
+				height: 22upx;
+				width: 22upx;
+				border-width: 2upx 2upx 0 0;
+				border-color: #868686;
+				border-style: solid;
+				-webkit-transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				transform: matrix(0.5, 0.5, -0.5, 0.5, 0, 0);
+				position: absolute;
+				top: 50%;
+				margin-top: -12upx;
+				right: 30upx;
+			}
+		}
+	}
+}
+</style>