webapp / GreenwayWeb

Commit ac14574199be70176af5f955c10a0af6878041cc

Authored by wesley88
2 parents b300d3f1 2002eaa8

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

Inline Side-by-side
Showing 6 changed files with 74 additions and 38 deletions
admin-web-master/src/components/add/addht.vue
  View file @ac14574
... ... @@ -147,6 +147,7 @@ import {
147 147 console.error({...this.info})
148 148 // console.error(this.templateInformation)
149 149 if(this.info.id) {
  150 + this.formInline.id = this.info.id
150 151 if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) {
151 152 this.AddData.push(this.info.cereBasicInformationShop)
152 153 }
... ... @@ -290,9 +291,6 @@ import {
290 291 createDate:this.updateCurrentTime(),
291 292 createUser: localStorage.getItem('roleName'),
292 293 }
293   - // console.log(from)
294   - // return
295   - console.error(from)
296 294 let info = await this.culfj()
297 295 console.error(info)
298 296 let c1 = {
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/evaSuccessful.vue
  View file @ac14574
... ... @@ -30,12 +30,32 @@ export default {
30 30 orderId: null,
31 31 orderPolite: {},
32 32 list: [],
  33 + listMsg:{}
33 34 }
34 35 },
  36 + onLoad(option) {
  37 + if (option.orderId) {
  38 + NET.request(API.GetOrderDetail,{
  39 + orderId: option.orderId
  40 + },'GET').then(res => {
  41 + console.log(res.data,'fasfasfasf')
  42 + this.listMsg = res.data
  43 + // uni.hideLoading()
  44 + // this.orderPolite = res.data
  45 + }).catch(res => {
  46 + // uni.hideLoading()
  47 + })
  48 + }
  49 +
  50 + },
35 51 methods: {
36 52 goToOrder() {
  53 + // console.log('123123123')
  54 + // this.$jump(`orderDetails`, this.listMsg)
37 55 uni.navigateTo({
38   - url: '/pages_category_page1/orderModule/index?all=1'
  56 + // url: '/pages_category_page1/orderModule/index?all=1'
  57 + url: `/pages_category_page1/orderModule/orderDetails?detail=${encodeURIComponent(JSON.stringify(this.listMsg))}`
  58 +
39 59 })
40 60 },
41 61 goToHome() {
... ...
ceres-uniapp-master/pages_category_page1/goodsModule/evaluate.vue
  View file @ac14574
... ... @@ -157,7 +157,7 @@
157 157 })
158 158 setTimeout(() => {
159 159 uni.redirectTo({
160   - url: '../goodsModule/evaSuccessful'
  160 + url: `../goodsModule/evaSuccessful?orderId=${this.orderId}`
161 161 })
162 162 }, 1500);
163 163 }).catch(res => {
... ...
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
  View file @ac14574
... ... @@ -36,8 +36,8 @@
36 36 </u-col>
37 37 <u-col span="5" >
38 38 <view class="form-item">
39   - <view class="label">广告位数量：</view>
40   - <text>{{tableData.advertisingNumber || '--'}}</text>
  39 + <view class="label">轮播顺序：</view>
  40 + <text>{{tableData.rotationOrder || '--'}}</text>
41 41 </view>
42 42 </u-col>
43 43 <!-- <u-col span="5" >
... ... @@ -54,7 +54,7 @@
54 54 </u-col>
55 55 <u-col span="5" >
56 56 <view class="form-item">
57   - <view class="label">播放时长：</view>
  57 + <view class="label">播放时长(秒)：</view>
58 58 <text>{{tableData.playDuration || '--'}}</text>
59 59 </view>
60 60 </u-col>
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
  View file @ac14574
... ... @@ -224,8 +224,9 @@
224 224 },
225 225 onLoad(options) {
226 226 this.imgurl = this.$img
227   - const item = JSON.parse(decodeURIComponent(options.item))
228   - console.log(options.item, '1123123213')
  227 +
  228 + const item = decodeURIComponent(JSON.parse(options.item))
  229 +
229 230 this.record = item
230 231 let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
231 232 .cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
  View file @ac14574
... ... @@ -85,7 +85,7 @@
85 85 </view>
86 86 <view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '线上广告位'">
87 87 <view class="label">所属端</view>
88   - <text>{{record.cereAdvertisingInformation.applicationTime}}</text>
  88 + <text>{{record.cereAdvertisingInformation.affiliation}}</text>
89 89 </view>
90 90 <view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '实体广告位'">
91 91 <view class="label">广告材质</view>
... ... @@ -116,10 +116,7 @@
116 116 <view class="label">所属区域</view>
117 117 <text>{{record.cereBasicInformationVenue.district}}</text>
118 118 </view>
119   - <view class="form-item">
120   - <view class="label">详细位置</view>
121   - <text>{{record.cereBasicInformationVenue.detailedLocation}}</text>
122   - </view>
  119 +
123 120 </u-read-more>
124 121 </view>
125 122  
... ... @@ -226,27 +223,8 @@
226 223 },
227 224 onLoad(options) {
228 225 this.imgurl = this.$img
229   - const item = JSON.parse(decodeURIComponent(options.item));
230   - console.log(item)
  226 + const item = JSON.parse(options.item)
231 227 this.heData = item || {}
232   - this.pageindex.contractId = this.heData.id
233   - if (this.mapType == '商铺') {
234   - this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1).then(res => {
235   - if (res.data.data.content.length == 0) {
236   - this.btnShow = true
237   - } else {
238   - this.btnShow = false
239   - this.myshopMsg = res.data.data.content[0]
240   - this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
241   - console.log(this.myshopMsg.shopPhotos)
242   - this.myshopMsg.shopPhotos.map(item => {
243   - item = this.imgurl + item
244   - })
245   -
246   - }
247   - })
248   - }
249   -
250 228 this.record = item
251 229 let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
252 230 .cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item
... ... @@ -254,7 +232,7 @@
254 232 .cereAdvertisingInformation && item.cereAdvertisingInformation.locationDiagram ? item
255 233 .cereAdvertisingInformation.locationDiagram : ''
256 234 this.lunbo = imgsList.split(',')
257   - console.log(this.lunbo)
  235 +
258 236 let pageHe = {
259 237 pageNumber: 0,
260 238 pageSize: 10,
... ... @@ -271,11 +249,50 @@
271 249 this.mapType = '广告位'
272 250 pageHe.shopNumber = `gg${item.cereAdvertisingInformation.id}`
273 251 }
274   -
  252 + this.pageindex.contractId = this.heData.id
  253 + if (this.mapType == '商铺') {
  254 + this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1).then(res => {
  255 + if (res.data.data.content.length == 0) {
  256 + this.btnShow = true
  257 + } else {
  258 + this.btnShow = false
  259 + this.myshopMsg = res.data.data.content[0]
  260 + this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
  261 + this.myshopMsg.shopPhotos.map(item => {
  262 + item = this.imgurl + item
  263 + })
  264 +
  265 + }
  266 + })
  267 + }
  268 +
  269 +
275 270  
276 271 },
277 272 onShow() {
278   -
  273 + let pageHe = {
  274 + pageNumber: 0,
  275 + pageSize: 10,
  276 + shopNumber: '',
  277 + dataStatus: 1
  278 + }
  279 + if (this.mapType == '商铺') {
  280 + pageHe.shopNumber = `sp${this.record.cereBasicInformationShop.id}`
  281 + this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1).then(res => {
  282 + if (res.data.data.content.length == 0) {
  283 + this.btnShow = true
  284 + } else {
  285 + this.btnShow = false
  286 + this.myshopMsg = res.data.data.content[0]
  287 + this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
  288 + console.log(this.myshopMsg.shopPhotos)
  289 + this.myshopMsg.shopPhotos.map(item => {
  290 + item = this.imgurl + item
  291 + })
  292 +
  293 + }
  294 + })
  295 + }
279 296 },
280 297 methods: {
281 298 getQuit(urls,type) {
... ...