diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue index b41d31a..e196cd3 100644 --- a/admin-web-master/src/components/add/addht.vue +++ b/admin-web-master/src/components/add/addht.vue @@ -147,6 +147,7 @@ import { console.error({...this.info}) // console.error(this.templateInformation) if(this.info.id) { + this.formInline.id = this.info.id if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) { this.AddData.push(this.info.cereBasicInformationShop) } @@ -290,9 +291,6 @@ import { createDate:this.updateCurrentTime(), createUser: localStorage.getItem('roleName'), } - // console.log(from) - // return - console.error(from) let info = await this.culfj() console.error(info) let c1 = { diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue index ff047a6..73f136d 100644 --- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue +++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue @@ -30,12 +30,32 @@ export default { orderId: null, orderPolite: {}, list: [], + listMsg:{} } }, + onLoad(option) { + if (option.orderId) { + NET.request(API.GetOrderDetail,{ + orderId: option.orderId + },'GET').then(res => { + console.log(res.data,'fasfasfasf') + this.listMsg = res.data + // uni.hideLoading() + // this.orderPolite = res.data + }).catch(res => { + // uni.hideLoading() + }) + } + + }, methods: { goToOrder() { + // console.log('123123123') + // this.$jump(`orderDetails`, this.listMsg) uni.navigateTo({ - url: '/pages_category_page1/orderModule/index?all=1' + // url: '/pages_category_page1/orderModule/index?all=1' + url: `/pages_category_page1/orderModule/orderDetails?detail=${encodeURIComponent(JSON.stringify(this.listMsg))}` + }) }, goToHome() { diff --git a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue index 21d40e3..d75f63b 100644 --- a/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue +++ b/ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue @@ -157,7 +157,7 @@ }) setTimeout(() => { uni.redirectTo({ - url: '../goodsModule/evaSuccessful' + url: `../goodsModule/evaSuccessful?orderId=${this.orderId}` }) }, 1500); }).catch(res => { diff --git a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue index 2acbdc5..0278ac9 100644 --- a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue +++ b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue @@ -36,8 +36,8 @@ - 广告位数量: - {{tableData.advertisingNumber || '--'}} + 轮播顺序: + {{tableData.rotationOrder || '--'}}