Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

wesley88
2 parents b300d3f1 2002eaa8
Showing 6 changed files with 74 additions and 38 deletions
admin-web-master/src/components/add/addht.vue
ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue
ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.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 =  {
@@ -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() {
@@ -157,7 +157,7 @@
           })
           setTimeout(() => {
             uni.redirectTo({
-              url: '../goodsModule/evaSuccessful'
+              url: `../goodsModule/evaSuccessful?orderId=${this.orderId}`
             })
           }, 1500);
         }).catch(res => {
@@ -36,8 +36,8 @@
 							</u-col>
 							<u-col span="5" >
 								<view class="form-item">
-									<view class="label">广告位数量：</view>
-									<text>{{tableData.advertisingNumber || '--'}}</text>
+									<view class="label">轮播顺序：</view>
+									<text>{{tableData.rotationOrder || '--'}}</text>
 								</view>
 							</u-col>
 					<!-- 		<u-col span="5" >
@@ -54,7 +54,7 @@
 							</u-col>
 							<u-col span="5" >
 								<view class="form-item">
-									<view class="label">播放时长：</view>
+									<view class="label">播放时长(秒)：</view>
 									<text>{{tableData.playDuration || '--'}}</text>
 								</view>
 							</u-col>
@@ -224,8 +224,9 @@
 		},
 		onLoad(options) {
 			this.imgurl = this.$img
-			const item = JSON.parse(decodeURIComponent(options.item))
-			console.log(options.item, '1123123213')
+			
+			const item = decodeURIComponent(JSON.parse(options.item))
+			
 			this.record = item
 			let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
 				.cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item
@@ -85,7 +85,7 @@
 				</view>
 				<view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '线上广告位'">
 					<view class="label">所属端</view>
-					<text>{{record.cereAdvertisingInformation.applicationTime}}</text>
+					<text>{{record.cereAdvertisingInformation.affiliation}}</text>
 				</view>
 				<view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '实体广告位'">
 					<view class="label">广告材质</view>
@@ -116,10 +116,7 @@
 					<view class="label">所属区域</view>
 					<text>{{record.cereBasicInformationVenue.district}}</text>
 				</view>
-				<view class="form-item">
-					<view class="label">详细位置</view>
-					<text>{{record.cereBasicInformationVenue.detailedLocation}}</text>
-				</view>
+				
 			</u-read-more>
 		</view>
@@ -226,27 +223,8 @@
 		},
 		onLoad(options) {
 			this.imgurl = this.$img
-			const item = JSON.parse(decodeURIComponent(options.item));
-			console.log(item)
+			const item = JSON.parse(options.item)
 			this.heData = item || {}
-			this.pageindex.contractId = this.heData.id
-			if (this.mapType == '商铺') {
-				this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1).then(res => {
-					if (res.data.data.content.length == 0) {
-						this.btnShow = true
-					} else {
-						this.btnShow = false
-						this.myshopMsg = res.data.data.content[0]
-						this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
-						console.log(this.myshopMsg.shopPhotos)
-						this.myshopMsg.shopPhotos.map(item => {
-							item = this.imgurl + item
-						})
-		
-					}
-				})
-			}
-			
 			this.record = item
 			let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
 				.cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item
@@ -254,7 +232,7 @@
 				.cereAdvertisingInformation && item.cereAdvertisingInformation.locationDiagram ? item
 				.cereAdvertisingInformation.locationDiagram : ''
 			this.lunbo = imgsList.split(',')
-			console.log(this.lunbo)
+			
 			let pageHe = {
 				pageNumber: 0,
 				pageSize: 10,
@@ -271,11 +249,50 @@
 				this.mapType = '广告位'
 				pageHe.shopNumber = `gg${item.cereAdvertisingInformation.id}`
 			}
-
+			this.pageindex.contractId = this.heData.id
+			if (this.mapType == '商铺') {
+				this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1).then(res => {
+					if (res.data.data.content.length == 0) {
+						this.btnShow = true
+					} else {
+						this.btnShow = false
+						this.myshopMsg = res.data.data.content[0]
+						this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
+						this.myshopMsg.shopPhotos.map(item => {
+							item = this.imgurl + item
+						})
+		
+					}
+				})
+			}
+			
+			
 		},
 		onShow() {
-
+			let pageHe = {
+				pageNumber: 0,
+				pageSize: 10,
+				shopNumber: '',
+				dataStatus: 1
+			}
+			if (this.mapType == '商铺') {
+				pageHe.shopNumber = `sp${this.record.cereBasicInformationShop.id}`
+				this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1).then(res => {
+					if (res.data.data.content.length == 0) {
+						this.btnShow = true
+					} else {
+						this.btnShow = false
+						this.myshopMsg = res.data.data.content[0]
+						this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
+						console.log(this.myshopMsg.shopPhotos)
+						this.myshopMsg.shopPhotos.map(item => {
+							item = this.imgurl + item
+						})
+					
+					}
+				})
+			}
 		},
 		methods: {
 			getQuit(urls,type) {