From 177f7552f9abb461d4c9b64f92235028d5e73ff8 Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期五, 28 七月 2023 15:12:55 +0800 Subject: [PATCH] # --- pages/order/orderPutOn2.vue | 5 -- pages/order/orderList.vue | 46 +++++++++++++++-------- pages/order/orderDetil.vue | 24 ++++++++++- pages/order/orderPutOn3.vue | 40 ++++++++----------- 4 files changed, 68 insertions(+), 47 deletions(-) diff --git a/pages/order/orderDetil.vue b/pages/order/orderDetil.vue index f345770..dab8390 100644 --- a/pages/order/orderDetil.vue +++ b/pages/order/orderDetil.vue @@ -43,13 +43,27 @@ export default { data() { return { - dataList: [{name:'xyz'},{name:'xx'}], + dataList: [], check: '', baseUrl: '', - token: '' + token: '', + orderNo: '' } }, onShow() { + let that = this + // #ifdef APP-NVUE + const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE + // #endif + // #ifndef APP-NVUE + const eventChannel = this.getOpenerEventChannel(); + // #endif + // 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� + eventChannel.on('orderNo', function(data) { + that.orderNo = data.orderNo + console.log(data); + }) + this.baseUrl = uni.getStorageSync('baseUrl'); this.token = uni.getStorageSync('token'); this.getOrderDetl(); @@ -58,7 +72,6 @@ set(e) { var ck = this.dataList[e].checked this.dataList[e].checked = ck ? false:true - console.log(this.dataList); }, back() { let that = this @@ -69,8 +82,13 @@ confirmList.push(that.dataList[k]) } } + this.getOpenerEventChannel().emit('orderList', {data: confirmList}); + uni.navigateBack({ + + }) }, getOrderDetl() { + console.log(this.orderNo); let that = this uni.request({ url: that.baseUrl + '/order/list/orderNo', diff --git a/pages/order/orderList.vue b/pages/order/orderList.vue index 51f869f..1e1e7ee 100644 --- a/pages/order/orderList.vue +++ b/pages/order/orderList.vue @@ -5,9 +5,9 @@ <uni-search-bar v-model="condition" placeholder=" 鎵爜 / 杈撳叆" bgColor="#EEEEEE" @confirm="search" /> </view> <scroll-view> - <view v-for="(item,i) in orderList" class="order-list"@click="selectOrderNo(i)"> - <view > - {{item.orderNo}} + <view v-for="(item,i) in orderList" class="order-list"> + <view @click="selectOrderNo(item)" class="order-item"> + {{item}} </view> </view> </scroll-view> @@ -19,29 +19,37 @@ data() { return { condition: '', - orderList: [ - {orderNo:100821212},{orderNo:10086}, - {orderNo:10086},{orderNo:10086}, - {orderNo:10086},{orderNo:10086}, - {orderNo:10086},{orderNo:10086}, - {orderNo:10086},{orderNo:10086}, - {orderNo:10086},{orderNo:10086}, - {orderNo:10086},{orderNo:10086}, - {orderNo:10086},{orderNo:10086}, - {orderNo:10086},{orderNo:10086}, - ], + orderList: [], checked: true } + }, + onShow() { + this.baseUrl = uni.getStorageSync('baseUrl'); + this.token = uni.getStorageSync('token'); + this.getOrderNoList() }, methods: { selectOrderNo(i) { let that = this - this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: that.orderList[i].orderNo}); + this.getOpenerEventChannel().emit('acceptDataFromOpenedPage', {data: i}); uni.navigateBack({ }) - } + }, + getOrderNoList() { + let that = this + uni.request({ + url: this.baseUrl + '/order/list/all', + method: 'POST', + success(res) { + res = res.data + for (var i = 0; i < res.data.length; i++) { + that.orderList.push(res.data[i].order_no) + } + } + }) + }, } } </script> @@ -63,4 +71,10 @@ .order-list:last-child { margin-bottom: 10px; } + .order-item { + display: flex; + height: 100%; + width: 100%; + align-items: center; + } </style> \ No newline at end of file diff --git a/pages/order/orderPutOn2.vue b/pages/order/orderPutOn2.vue index 18582a4..bca6b30 100644 --- a/pages/order/orderPutOn2.vue +++ b/pages/order/orderPutOn2.vue @@ -177,11 +177,6 @@ orderNo: '', } }, - onShow() { - this.baseUrl = uni.getStorageSync('baseUrl'); - this.token = uni.getStorageSync('token'); - this.getOrderNoList() - }, methods: { set(e) { var ck = this.dataList[e].checked diff --git a/pages/order/orderPutOn3.vue b/pages/order/orderPutOn3.vue index a5c035c..f026aaa 100644 --- a/pages/order/orderPutOn3.vue +++ b/pages/order/orderPutOn3.vue @@ -32,7 +32,7 @@ <view class="left-item">{{i + 1}}</view> </view> <view class="list-left-item"> - <view class="desc">璁㈠崟鍙凤細</view> + <view class="desc">鍗曞彿锛�</view> <view class="left-item"> <uni-tag :text="item.orderNo" type="primary"></uni-tag> </view> @@ -193,37 +193,30 @@ url: that.baseUrl + '/order/list/orderNo', data: {orderNo: that.orderNo} , method: 'GET', - success(result) { - result = result.data - console.log(result); - return - if (result.code === 200 && result.data) { + success(res) { + res = res.data; + if (res.code === 200) { uni.navigateTo({ url: "../order/orderDetil", - // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� success: function(res) { - res.eventChannel.emit('mat', { - data: result.data + // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹� 鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑 + res.eventChannel.emit('orderNo', { + orderNo: that.orderNo }) }, - // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� events: { - matList: function(data) { - that.checkMat(data.data) - that.focuss() + // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨� + orderList: function(data) { + for(var item in data.data) { + that.dataList.push(data.data[item]) + } + that.orderNo = '' }, }, }); - } else if (res.code == 403) { - uni.showToast({title: res.msg,icon: "none",position: 'top' - }) - setTimeout(() => {uni.reLaunch({url: '../login/login'});}, 1000); - } else { - uni.showToast({title: res.msg,icon: "none",position: 'top'}) } - } - }); + }) }, selectOrder() { let that = this @@ -238,11 +231,12 @@ events: { // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨� acceptDataFromOpenedPage: function(data) { - console.log(data); + that.orderNo = data.data + console.log(that.orderNo); + that.findOrder(that.orderNo) }, }, }); - that.matnr = '' }, set(e) { var ck = this.dataList[e].checked -- Gitblit v1.9.1