diff --git a/components/container-loading/container-loading.wxml b/components/container-loading/container-loading.wxml index 04d5fea..5bc1cff 100644 --- a/components/container-loading/container-loading.wxml +++ b/components/container-loading/container-loading.wxml @@ -2,11 +2,11 @@ - 加载失败 + 加载失败,点击重试 - 暂无数据 + 暂无数据,点击刷新 diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxml b/pages/copyright/createProjectInfo/createProjectInfo.wxml index 90dc0a4..a5a84d2 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxml +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxml @@ -130,7 +130,7 @@ 优惠卷 - + @@ -164,7 +164,7 @@ 套餐包 - + diff --git a/pages/copyright/createProjectInfo/createProjectInfo.wxss b/pages/copyright/createProjectInfo/createProjectInfo.wxss index b52e0f1..989e3cf 100644 --- a/pages/copyright/createProjectInfo/createProjectInfo.wxss +++ b/pages/copyright/createProjectInfo/createProjectInfo.wxss @@ -203,7 +203,9 @@ page { background-color: #f0f0f0; } -.weui-half-screen-dialog__ft {} +.weui-half-screen-dialog__ft { + padding: 0rpx 0rpx 40rpx; +} .bottom-box { position: fixed; @@ -325,12 +327,16 @@ page { padding: 5px; width: 88vw; box-sizing: border-box; + height: 210rpx; } .l-tickets { width: 60vw; position: relative; padding: 10px; + display: flex; + flex-direction: column; + justify-content: space-between; background: radial-gradient(circle at right top, transparent 16rpx, #ffaa0017 0) right top / 100% 50% no-repeat, radial-gradient(circle at right bottom, transparent 16rpx, #ffaa0017 0) right bottom / 100% 50% no-repeat; } @@ -401,8 +407,7 @@ page { font-size: 18px; color: #5D3900; text-align: center; - margin-top: 5px; - font-weight: 800; + font-weight: bold; } .ticket-desc { diff --git a/pages/index/index.js b/pages/index/index.js index 548bb03..6ccc015 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -322,6 +322,12 @@ Page({ addPrefixToPreviewImgs(data) { const prefix = this.data.imgUrl; return data.map(item => { + const values = Object.values(item.aiSetting); + const isSuccess = values.every(value => value === "SUCCESS"); + const isCreate = values.every(value => value === "NONE"); + const isFailed = values.some(value => value === "FAILED"); + const isShow = !isSuccess && (isCreate || isFailed); + item.isShowCreate = isShow if (item.codeTypePage && item.codeTypePage.previewImgs) { const imgIds = item.codeTypePage.previewImgs.split(','); item.codeTypePage.previewImgs = imgIds.map(id => prefix + id); @@ -359,6 +365,7 @@ Page({ url: url, header: header, success(res) { + console.log('下载成功', res) _self.setData({ downloadProgress: 0, downloading: false diff --git a/pages/index/index.wxml b/pages/index/index.wxml index ba6a5c0..19b1dd0 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -87,7 +87,7 @@ {{item.gmtCreate}} 下载 重新生成 - 生成 + 生成 diff --git a/pages/index/index.wxss b/pages/index/index.wxss index c7372c0..fd00d05 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -553,5 +553,5 @@ .weui-half-screen-dialog__ft { height: 0; - /* padding: 0; */ + padding: 0rpx 0rpx 40rpx; } \ No newline at end of file diff --git a/pages/login/login.wxss b/pages/login/login.wxss index 5229d50..813c74c 100644 --- a/pages/login/login.wxss +++ b/pages/login/login.wxss @@ -144,7 +144,7 @@ wx-checkbox .wx-checkbox-input.wx-checkbox-input-checked:before { } .weui-half-screen-dialog__ft { - /* padding: 15px; */ + padding: 0rpx 0rpx 40rpx; text-align: center; } diff --git a/pages/mine/mineAccount/mineContact/mineContact.wxss b/pages/mine/mineAccount/mineContact/mineContact.wxss index b3a5abf..26c38a0 100644 --- a/pages/mine/mineAccount/mineContact/mineContact.wxss +++ b/pages/mine/mineAccount/mineContact/mineContact.wxss @@ -223,7 +223,7 @@ page { } .weui-half-screen-dialog__ft { - /* padding: 0rpx; */ + padding: 0rpx 0rpx 40rpx; } .weui-half-screen-dialog__bd { diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.wxml b/pages/mine/mineAccount/mineOrder/mineOrder.wxml index 13ab7c2..5cf8d59 100644 --- a/pages/mine/mineAccount/mineOrder/mineOrder.wxml +++ b/pages/mine/mineAccount/mineOrder/mineOrder.wxml @@ -2,7 +2,7 @@ - + diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.wxss b/pages/mine/mineAccount/mineOrder/mineOrder.wxss index 25ba17d..9c765c1 100644 --- a/pages/mine/mineAccount/mineOrder/mineOrder.wxss +++ b/pages/mine/mineAccount/mineOrder/mineOrder.wxss @@ -9,7 +9,6 @@ page { top: 0; left: 0; width: 100vw; - } .search-container { @@ -173,4 +172,10 @@ page { flex: 1; padding: 7px 10px; margin-left: 10px; +} + +.icon-position { + width: 42rpx; + height: 42rpx; + margin-right: 10rpx; } \ No newline at end of file diff --git a/pages/mine/mineIndex/mine.js b/pages/mine/mineIndex/mine.js index 9d7315f..b118adc 100644 --- a/pages/mine/mineIndex/mine.js +++ b/pages/mine/mineIndex/mine.js @@ -205,11 +205,8 @@ Page({ }, err => { wx.hideLoading() wx.showToast({ - title: '数据有误,请稍后重试', - icon: 'error', - success: () => { - wx.navigateBack() - } + title: '数据有误,请刷新页面', + icon: 'error' }) }) }, diff --git a/utils/comm.wxs b/utils/comm.wxs index 816f8d6..a85910d 100644 --- a/utils/comm.wxs +++ b/utils/comm.wxs @@ -150,7 +150,6 @@ var timeSplit = function (value) { var regex = getRegExp('-', 'g'); return value.replace(regex, '.') } - module.exports = { isEmpty: isEmpty, status: status,