shish 4 лет назад
Родитель
Сommit
119a613fe9

+ 67 - 0
mallApp/src/components/module/app-order-item.vue

@@ -0,0 +1,67 @@
+<template>
+	<div class="list-module">
+		<block v-if="!$util.isEmpty(info)">
+			<div class="list-left">
+				<div class="image">
+					<image :src="info.cover" mode="aspectFill" style="width:130upx;height:130upx;"></image>
+				</div>
+				<div class="list-msg">
+					<div class="title">{{ info.name}}</div>
+				</div>
+			</div>
+			<div class="list-right">
+				<div class="price">¥{{info.unitPrice?parseFloat(info.unitPrice):0}}</div>
+				<div class="num">X{{info.num}}</div>
+			</div>
+		</block>
+	</div>
+</template>
+<script>
+export default {
+	name: 'orderItem',
+	props: {
+		info: {
+			type: Object,
+			default: () => {}
+		},
+        goodsStyleId:'',
+	},
+	data() {
+		return {}
+	},
+	computed: {
+	},
+	mounted() {
+	},
+	methods: {}
+}
+</script>
+<style lang="scss" scoped>
+.list-module {
+	@include disFlex(center, space-between);
+	padding: 20upx 0;
+	border-bottom: 1upx solid $borderColor;
+	.list-left {
+		@include disFlex(flex-start, space-between);
+		.list-msg {
+			margin-left: 30upx;
+			.title {
+				font-size: 28upx;
+				color: $fontColor2;
+				margin-bottom: 10upx;
+			}
+			.desc {
+				color: $fontColor3;
+			}
+		}
+	}
+	.list-right {
+		text-align: right;
+		color: $fontColor2;
+		.price {
+			margin-bottom: 70upx;
+			color: #333;
+		}
+	}
+}
+</style>

+ 1 - 0
mallApp/src/pages/billing/affirmGhs.vue

@@ -135,6 +135,7 @@ export default {
 			uni.showLoading({mask:true})
 			uni.showLoading({mask:true})
 			buyItem(params).then(res => {
 			buyItem(params).then(res => {
 				uni.hideLoading()
 				uni.hideLoading()
+				this.removeMemory()
 				if(res.code && res.code == 1){
 				if(res.code && res.code == 1){
 					this.$util.pageTo({ url: "/pages/callback/index", type: 2, query: { pageStatus: 1, ...res.data } })
 					this.$util.pageTo({ url: "/pages/callback/index", type: 2, query: { pageStatus: 1, ...res.data } })
 				}
 				}

+ 7 - 9
mallApp/src/pages/order/detail.vue

@@ -7,8 +7,6 @@
       <div class="page-top-det">
       <div class="page-top-det">
         <div>
         <div>
           <div class="page-status">{{ data.status | constantfilter('ORDER_STATUS') }}</div>
           <div class="page-status">{{ data.status | constantfilter('ORDER_STATUS') }}</div>
-          <div class="page-prompt" v-if="data.status == 0">请尽快支付哟~</div>
-          <div class="page-prompt" v-if="data.status == 1 || data.status == 2">请耐心等待~</div>
         </div>
         </div>
         <div class="page-status-img">
         <div class="page-status-img">
           <img :src="statusImg" alt />
           <img :src="statusImg" alt />
@@ -22,6 +20,11 @@
           <block v-if="!$util.isEmpty(data.goodsInfoList)">
           <block v-if="!$util.isEmpty(data.goodsInfoList)">
             <list-module v-for="(items, subIndex) in data.goodsInfoList" :key="subIndex" :info="items" />
             <list-module v-for="(items, subIndex) in data.goodsInfoList" :key="subIndex" :info="items" />
           </block>
           </block>
+
+          <block v-if="!$util.isEmpty(data.itemList)">
+            <orderItem v-for="(info, idx) in data.itemList" :key="idx" :info="info" ></orderItem>
+          </block>
+
         </div>
         </div>
       </div>
       </div>
       <div class="module-com order-msg">
       <div class="module-com order-msg">
@@ -124,16 +127,14 @@
 </template>
 </template>
 <script>
 <script>
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
+import orderItem from "@/components/module/app-order-item";
 import ListModule from "@/components/module/app-order-list";
 import ListModule from "@/components/module/app-order-list";
 import AppCouponSel from "@/components/app-coupon-sel";
 import AppCouponSel from "@/components/app-coupon-sel";
 import { getDetail } from "@/api/order";
 import { getDetail } from "@/api/order";
 import { getShopUser } from "@/utils/auth";
 import { getShopUser } from "@/utils/auth";
 export default {
 export default {
   name: "order-detail",
   name: "order-detail",
-  components: {
-    ListModule,
-    AppCouponSel
-  },
+  components: { ListModule, AppCouponSel,orderItem },
   data() {
   data() {
     return {
     return {
       constant: this.$constant,
       constant: this.$constant,
@@ -159,9 +160,6 @@ export default {
       return img;
       return img;
     }
     }
   },
   },
-  onLoad() {
-    // this.init()
-  },
   methods: {
   methods: {
     init() {
     init() {
       this.getDetail().then(() => {
       this.getDetail().then(() => {