zs 2 سال پیش
والد
کامیت
d9c806b4ba
2فایلهای تغییر یافته به همراه42 افزوده شده و 6 حذف شده
  1. 28 3
      pagesIntegral/record/index.vue
  2. 14 3
      pagesMy/logistics/index.vue

+ 28 - 3
pagesIntegral/record/index.vue

@@ -43,6 +43,9 @@
 									</view>
 								</view>
 							</view>
+							<view class="btn">
+								<button type="default" size="mini" @click="toLogi(item)">查看物流</button>
+							</view>
 						</view>
 						<view class="is_bottom" v-if="is_bottom">
 							<text>{{config.bottom_title}}</text>
@@ -120,6 +123,12 @@
 				that.clearPage();
 				that.search();
 			},
+			// 查看物流
+			toLogi(e) {
+				uni.navigateTo({
+					url: `/pagesMy/logistics/index?id=${e._id}&type=${'integral'}`
+				})
+			},
 			// 查询列表
 			async search() {
 				const that = this;
@@ -227,9 +236,11 @@
 			padding: 2vw 0 0 0;
 
 			.list {
-				margin: 0 0 1vw 0;
+				width: 92vw;
+				border: 0.5vw solid var(--f1Color);
+				margin: 2vw 2vw 0 1.5vw;
 				padding: 2vw;
-				border-bottom: 1px solid #f5f5f5;
+				border-radius: 5px;
 
 				.list_1 {
 					margin: 0 0 2vw 0;
@@ -263,9 +274,9 @@
 							flex-direction: column;
 							width: 60vw;
 							padding: 0 2vw;
+							margin: 0 0 1vw 0;
 
 							.specs {
-								margin: 1vw 0 0 0;
 								color: var(--f85Color);
 								font-size: var(--font12Size);
 							}
@@ -276,9 +287,23 @@
 						.other {
 							width: 15vw;
 							text-align: right;
+
+							.price {
+								color: var(--fFB1Color);
+							}
 						}
 					}
 				}
+
+				.btn {
+					text-align: right;
+					margin: 2vw 0 0 0;
+					border-top: 1px solid #f1fff1;
+
+					button {
+						margin: 2vw 0 0 2vw;
+					}
+				}
 			}
 		}
 	}

+ 14 - 3
pagesMy/logistics/index.vue

@@ -29,6 +29,7 @@
 		data() {
 			return {
 				id: '',
+				type: '',
 				user: {},
 				info: {},
 				is_check: '',
@@ -39,6 +40,7 @@
 		onLoad: function(e) {
 			const that = this;
 			that.$set(that, `id`, e.id || '');
+			that.$set(that, `type`, e.type || '');
 			that.watchLogin()
 		},
 		methods: {
@@ -56,7 +58,12 @@
 			async searchInfo() {
 				const that = this;
 				if (that.id) {
-					let res = await that.$api(`/orderDetail/${that.id}`, 'GET')
+					let res;
+					if (that.type == 'integral') {
+						res = await that.$api(`/zrOrder/${that.id}`, `GET`, {}, `integral`)
+					} else {
+						res = await that.$api(`/orderDetail/${that.id}`, 'GET')
+					}
 					if (res.errcode == '0') {
 						that.$set(that, `info`, res.data);
 						that.search();
@@ -70,14 +77,18 @@
 			},
 			async search() {
 				const that = this;
-				let res = await that.$api(`/orderDetail/sot/${that.info._id}`);
+				let res;
+				if (that.type == 'integral') {
+					res = await that.$api(`/zrOrder/sot/${that.info._id}`, `GET`, {}, `integral`);
+				} else {
+					res = await that.$api(`/orderDetail/sot/${that.info._id}`, `GET`);
+				}
 				if (res.errcode == '0') {
 					that.$set(that, `is_check`, res.data.is_check);
 					let list = res.data.list.map((i) => ({
 						desc: i.time,
 						title: i.context
 					}))
-					console.log(list);
 					that.$set(that, `list`, list);
 					that.$set(that, `no`, res.data.no);
 				} else {