yinxiangke 12 時間 前
コミット
ef7cf6f22b

+ 15 - 0
jd_logistics-app/api/mine.js

@@ -0,0 +1,15 @@
+import request from "@/utils/request.js";
+
+
+
+/**
+ * 月结二维码
+ * 
+ */
+export function getQrcode(data) {
+  return request.get('system/front/qrcode', data);
+}
+
+
+
+

+ 1 - 1
jd_logistics-app/api/order.js

@@ -24,7 +24,7 @@ export function payResult(data) {
  * 
  */
 export function getOrderListApi(data) {
-  return request.get('mini/order/list', data);
+  return request.get('system/front/order/list', data);
 }
 /**
  * 查询订单列表

+ 3 - 0
jd_logistics-app/pages.json

@@ -47,6 +47,9 @@
 			{
 				"navigationBarTitleText" : "到付月结码"
 			}
+		},
+		{
+			"path": "pages/about/index"
 		}
 	],
 	"subPackages": [

+ 10 - 3
jd_logistics-app/pages/mine/settlementCode.vue

@@ -13,7 +13,7 @@
 
 		<!-- 二维码邀请内容 -->
 		<view  class="tab-content">
-			<scroll-view scroll-y class="scroll-view">
+			<!-- <scroll-view scroll-y class="scroll-view"> -->
 				<!-- 店铺信息 -->
 				<view class="store-info">
 					<view class="store-name">月结卡号</view>
@@ -66,7 +66,7 @@
 					</view>
 				</view> -->
 			
-			</scroll-view>
+			<!-- </scroll-view> -->
 		</view>
 
 	</view>
@@ -82,6 +82,7 @@
 		onLoad,
 		onShow
 	} from '@dcloudio/uni-app' // 导入 UniApp 的生命周期
+	import {getQrcode} from '@/api/mine.js'
 
 	// 当前选中的tab
 	const currentTab = ref(0)
@@ -105,7 +106,7 @@
 	onLoad((option) => {
 		tenantId.value = option.tenantId
 		inviteType.value = option.inviteType
-		
+		getCode()
 	})
 
 	onShow(() => {
@@ -117,6 +118,12 @@
 		// 	getShopInfo()
 		// }
 	})
+	
+	// 获取月结码
+	const getCode = async () =>{
+		let res = await getQrcode({orderType:inviteType.value});
+		console.log(res)
+	}
 
 	// 切换Tab
 	const switchTab = (index) => {

+ 25 - 2
jd_logistics-app/pages/order/index.vue

@@ -88,7 +88,7 @@
 	const currentTab = ref(0)
 
 	// 订单数据
-	const ordersList = ref([{},{},{},{},{}])
+	const ordersList = ref([])
 
 
 	// 获取状态类名
@@ -114,6 +114,29 @@
 	})
 
 	onShow(() => {
+		
+		uni.setStorageSync('senderAddress',{
+			id: '20',
+			name: '姓名',
+			phone: '13000000000',
+			address: '编辑一下地址',
+			provinceName: '天津市',
+			cityName: '天津市',
+			countyName: '和平区',
+			isDefault: false
+		})
+		uni.setStorageSync('receiverAddress',{
+			id: '30',
+			name: '姓名',
+			phone: '13000000000',
+			address: '编辑一下地址',
+			provinceName: '天津市',
+			cityName: '天津市',
+			countyName: '和平区',
+			isDefault: false
+		})
+		
+		
 		// 可以在这里初始化数据
 		getOrderList(false)
 	})
@@ -134,7 +157,7 @@
 
 	// 获取收益明细列表
 	const getOrderList = async (isLoadMore = false) => {
-		return
+		
 		if (loadState.value) return
 
 		if (!isLoadMore) {