diff --git a/components/action-sheet/show.d.ts b/components/action-sheet/show.d.ts index e0d8eae..6d3c5ab 100644 --- a/components/action-sheet/show.d.ts +++ b/components/action-sheet/show.d.ts @@ -1,5 +1,3 @@ -/// -/// export interface ActionSheetItem { label: string; color?: string; diff --git a/pages/today/index.js b/pages/today/index.js index 96878c5..deb7feb 100644 --- a/pages/today/index.js +++ b/pages/today/index.js @@ -8,6 +8,7 @@ Page({ * 页面的初始数据 */ data: { + tapCheckHandle: undefined, aIconList: ['check-rectangle', 'star-filled', 'notification', 'info-circle'], taskList: [{'taskId':'1','title':'标题德外旗舰店1','note':'2022-11-11'},{'taskId':'2','title':'标题德外旗舰店2','note':'2022-11-11'}], todayList: [{'taskId':'1','title':'标题德外旗舰店1','note':'2022-11-11'},{'taskId':'2','title':'标题德外旗舰店2','note':'2022-11-11'}], @@ -122,37 +123,36 @@ Page({ this.setCurrentData(currentCur,categoryData); }, handleAction(e) { - console.log('testade'); console.log(e.detail); - try{ - ActionSheet.show({ + this.data.tapCheckHandle = ActionSheet.show({ theme: ActionSheetTheme.List, selector: '#t-action-sheet', context: this, items: [ { - label: '默认选项', + label: '详情xxx', }, { - label: '自定义选项', + label: '截止日期xxx', color: '#0052D9', }, { - label: '失效选项', - disabled: true, + label: '配置提醒', + color: '#0052D9', }, { - label: '警告选项', + label: '删除xxx', color: '#e34d59', }, ], - });}catch (e){ - console.log(e); - } + }); }, handleSelected(e) { console.log(e.detail); }, + selectCancel() { + this.data.tapCheckHandle.close(); + }, onLoad() { let categoryData = []; this.data.categoryMenu.forEach(index =>{ diff --git a/pages/today/index.wxml b/pages/today/index.wxml index ba5d778..49e182e 100644 --- a/pages/today/index.wxml +++ b/pages/today/index.wxml @@ -40,7 +40,7 @@ - + diff --git a/utils/api.js b/utils/api.js index 3d3e579..b479915 100644 --- a/utils/api.js +++ b/utils/api.js @@ -111,7 +111,6 @@ export function fetchPost(url, params, needToken, multiple) { // wx.redirectTo({ // url: '/pages/login/index', // }) - isUnLogin(); reject(res); return; } else if (res.data.err_code == 30022) { @@ -176,7 +175,7 @@ export function fetchGet(url, params, needToken) { resolve(res.data); } else { if (res.data.err_code == 10003 || res.data.err_code == 10006 || res.data.err_code == 20006) { - isUnLogin(); + // isUnLogin(); reject(res); return; } else if (res.data.err_code == 20005) { @@ -228,6 +227,12 @@ export default { * 任务清单 */ taskList(params) { - return fetchGet('', params, false); + return new Promise(x => { + let job = {data:'test'}; + x(job) + console.log(x + '请求成功'); + wx.hideLoading(); + }) + // return fetchGet('', params, false); }, }