From 12e562f70d4e197dbfe907054e119b1cb508b965 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Wed, 13 Oct 2021 18:52:52 +0800 Subject: [PATCH] no message --- pages/agent/factory/index.wxml | 4 +-- pages/article/publish/index.js | 56 ++++++++++++++++++++++++-------- pages/article/publish/index.wxml | 6 ++-- pages/article/publish/index.wxss | 4 +-- pages/moment/fragment/index.js | 3 ++ pages/moment/fragment/index.wxml | 6 ++++ pages/moment/recommend/index.js | 3 +- 7 files changed, 61 insertions(+), 21 deletions(-) diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml index f50150d..6088414 100644 --- a/pages/agent/factory/index.wxml +++ b/pages/agent/factory/index.wxml @@ -171,11 +171,11 @@ - + diff --git a/pages/article/publish/index.js b/pages/article/publish/index.js index 02a6ca4..0b0b1ab 100644 --- a/pages/article/publish/index.js +++ b/pages/article/publish/index.js @@ -1,5 +1,4 @@ -// pages/moment/create/index.js -import { getMomentDetail, postMoment, updateMoment } from "../../../api/moment" +import { getPreferType, getMomentDetail, postMoment, updateMoment } from "../../../api/moment" import { getFactoryList } from "../../../api/ztb" const util = require('../../../utils/util') const event = require('../../../utils/event.js') @@ -12,7 +11,8 @@ Page({ form: {}, requesting: false, factoryFlag: true, - factoryList: [] + factoryList: [], + typeList: [] }, /** * 生命周期函数--监听页面加载 @@ -34,6 +34,13 @@ Page({ } }) } + getPreferType().then(result => { + this.data.typeList = [] + for (let index = 0; index < result.data.length; index++) { + const element = result.data[index] + this.data.typeList.push({value: element.id, text: element.name }) + } + }) if(options.id){ wx.showLoading({ title: '加载中', mask: true }) getMomentDetail(options.id).then(result => { @@ -111,27 +118,50 @@ Page({ } this.pickerView = this.pickerView || this.selectComponent('#picker-view') if(this.data.factoryList.length > 0){ - this.pickerView.showPicker(this.data.factoryList) + this.pickerView.showPicker(this.data.factoryList, this.data.form.millPaperId, 0) } else { wx.showLoading({ title: '加载中', mask: true }) - getFactoryList().then(result => { - this.data.factoryList = [] - for (let index = 0; index < result.data.records.length; index++) { - const element = result.data.records[index] - this.data.factoryList.push({value: element.paperMillId, text: element.name }) + getPreferType().then(result => { + this.data.typeList = [] + for (let index = 0; index < result.data.length; index++) { + const element = result.data[index] + this.data.typeList.push({value: element.id, text: element.name }) } - this.pickerView.showPicker(this.data.factoryList) + this.pickerView.showPicker(this.data.factoryList, this.data.form.millPaperId, 0) wx.hideLoading() }).catch(err => { wx.hideLoading() }) } }, - onPickerChange: function (e) { - if(!e.detail){ + selectType: function(){ + this.pickerView = this.pickerView || this.selectComponent('#picker-view') + if(this.data.typeList.length > 0){ + this.pickerView.showPicker(this.data.typeList, this.data.form.categoryId, 1) + } else { + wx.showLoading({ title: '加载中', mask: true }) + getPreferType().then(result => { + tthis.data.typeList = [] + for (let index = 0; index < result.data.length; index++) { + const element = result.data[index] + this.data.typeList.push({value: element.id, text: element.name }) + } + this.pickerView.showPicker(this.data.typeList, this.data.form.categoryId, 1) + wx.hideLoading() + }).catch(err => { + wx.hideLoading() + }) + } + }, + onPickerChange: function ({detail}) { + if(!detail){ return } - this.setData({ ['form.millPaperId']: e.detail.value, ['form.millPaperName']: e.detail.text }) + if(detail.type == 1) { + this.setData({ ['form.categoryId']: detail.value, ['form.typeName']: detail.text }) + } else { + this.setData({ ['form.millPaperId']: detail.value, ['form.millPaperName']: detail.text }) + } } }) \ No newline at end of file diff --git a/pages/article/publish/index.wxml b/pages/article/publish/index.wxml index 70feb4f..d49fa15 100644 --- a/pages/article/publish/index.wxml +++ b/pages/article/publish/index.wxml @@ -12,10 +12,12 @@ - + #{{form.millPaperName || '选择一个纸厂'}} - + + #{{form.typeName || '选择类别'}} + diff --git a/pages/article/publish/index.wxss b/pages/article/publish/index.wxss index 924eb39..7281881 100644 --- a/pages/article/publish/index.wxss +++ b/pages/article/publish/index.wxss @@ -1,7 +1,5 @@ -/* pages/moment/create/index.wxss */ - .textarea { - min-height: 160rpx; + min-height: 280rpx; font-size: 14px; position: relative; display: block; diff --git a/pages/moment/fragment/index.js b/pages/moment/fragment/index.js index ef9bcaa..83521a9 100644 --- a/pages/moment/fragment/index.js +++ b/pages/moment/fragment/index.js @@ -86,6 +86,9 @@ Component({ util.navigateTo('/pages/article/feedback/index') } }, + postMoment: function () { + util.navigateTo('/pages/article/publish/index') + }, searchList: function(){ var tab = this.data.tabIndex == 3 ? 3 : 1 util.navigateTo(`/pages/mall/search-list/index?tab=${tab}`) diff --git a/pages/moment/fragment/index.wxml b/pages/moment/fragment/index.wxml index 981881f..bf74929 100644 --- a/pages/moment/fragment/index.wxml +++ b/pages/moment/fragment/index.wxml @@ -50,4 +50,10 @@ + + + + + + \ No newline at end of file diff --git a/pages/moment/recommend/index.js b/pages/moment/recommend/index.js index b736f5e..84eb670 100644 --- a/pages/moment/recommend/index.js +++ b/pages/moment/recommend/index.js @@ -86,7 +86,7 @@ Component({ continue } lastTime = respList[i].latestQuoteTime - if (lastTime.length > 10) { + if (lastTime && lastTime.length > 10) { lastTime = lastTime.substring(0, 10) } var itemtime = new Date(lastTime).getTime() @@ -112,6 +112,7 @@ Component({ this.setData({ finished: true, requesting: false, loading: false, token: this.data.token }) } }).catch(err => { + console.log(err) this.setData({ requesting: false, loading: false, token: this.data.token }) util.showToast(err) })