diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..684d827 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "files.associations": { + "*.ttml": "xml", + "*.ttss": "css" + } +} \ No newline at end of file diff --git a/http/php/api.ts b/http/php/api.ts new file mode 100644 index 0000000..b42ecd9 --- /dev/null +++ b/http/php/api.ts @@ -0,0 +1,33 @@ +import { request } from './request' +// 会员签入 登录 +export const douyincheckIn = (data : object | any) => { + return request('douyin/checkIn', 'POST', data, true) +} +// 登出 +export const userlogout = () => { + return request('user/logout', 'POST', '', true) +} +// 查询绑定状态 +export const searchstorestatus = (data : object) => { + return request('meituan/searchstorestatus', 'POST', data, true) +} +// 团购核销准备 +export const fulfilmentcertificateprepare = (data : object) => { + return request('douyin/fulfilmentcertificateprepare', 'POST', data, true) +} +// 获取uisdk 绑定 链接 +export const getuisdk = (data : object) => { + return request('douyin/getuisdk', 'POST', data, true) +} +// 团购核销 +export const certificateprepares = (data : object) => { + return request('douyin/certificateprepare', 'POST', data, true) +} +// 团购核销记录 +export const orderlist = (data : object) => { + return request('douyin/orderlist', 'POST', data, true) +} +// 团购核销撤销 +export const fulfilmentcertificatecanceles = (data : object) => { + return request('douyin/fulfilmentcertificatecancel', 'POST', data, true) +} diff --git a/http/php/request.ts b/http/php/request.ts new file mode 100644 index 0000000..f0ae0a2 --- /dev/null +++ b/http/php/request.ts @@ -0,0 +1,80 @@ +//服务器接口地址 +const baseURL : string = 'https://czgdoumei.sxczgkj.com/index.php/api/' +// 封装公共请求方法 +function request(url : string, method : "GET" | "POST" | undefined, data : object | any, toast : boolean) { + let networkType = '' + uni.getNetworkType({ + success: (res) => { + networkType = res.networkType + } + }); + if (networkType == 'none') { + uni.showToast({ + title: '网络异常，请检查网络', + icon: 'none' + }) + return false; + } + if (toast) { + uni.showLoading({ + title: '加载中', + mask: true + }) + } + return new Promise(async (resolve, reject) => { + let header : any + header = { + 'content-type': 'application/json', + 'clinttype':uni.getStorageSync('clint_type'), + 'bausertoken': uni.getStorageSync('phpuserinfo').token + }; + uni.request({ + url: baseURL + url, + method: method, + data: data, + header: header, + success(res : any) { + if (res.data.code != 1) { + //是否提示错误 + if (toast) { + uni.showToast({ + title: res.data.msg || res.data.message, + icon: 'none' + }) + setTimeout(() => { + uni.hideLoading() + }, 1000) + } + if (res.data.code == 401) { + uni.showToast({ + title: res.message || res.msg, + icon: "none", + success: () => { + // uni.removeStorageSync('logintoken'); + // uni.removeStorageSync('token'); + uni.reLaunch({ + url: '/pages/index/index' + }) + } + }) + } + uni.hideLoading() + reject(res.message | res.msg); + } else { + uni.hideLoading() + resolve(res.data.data); + } + }, + fail(err) { + uni.hideLoading() + //请求失败 + uni.showToast({ + title: '无法连接到服务器', + icon: 'none' + }) + reject(err) + } + }) + }) +} +export { request, baseURL } \ No newline at end of file diff --git a/pageProduct/add-Product/timer.vue b/pageProduct/add-Product/timer.vue index dd7a8bf..0556a3b 100644 --- a/pageProduct/add-Product/timer.vue +++ b/pageProduct/add-Product/timer.vue @@ -91,7 +91,8 @@ const hour = times.value[0][indexArr[0]] const month = times.value[1][indexArr[1]] const s = times.value[2][indexArr[2]] - return `${hour}:${month}:${s}` + // return `${hour}:${month}:${s}` + return `${hour}:${month}` } //获取$event.detail.value function getEnentDetailValue(e) { @@ -152,11 +153,11 @@ function returnBasicTimeConstructor() { return { startTime: { - value: '00:00:00', + value: '00:00', index: [0, 0, 0] }, endTime: { - value: '00:00:00', + value: '23:59', index: [0, 0, 0] } } @@ -190,13 +191,13 @@ } // 触发定时器保存事件将数据给到添加商品页面 function emitTimerSave() { - const par={ - days:list.value[0].cycleChecked.join(','), - startTime:list.value[0].startTime.value, - endTime:list.value[0].endTime.value + const par = { + days: list.value[0].cycleChecked.join(','), + startTime: list.value[0].startTime.value, + endTime: list.value[0].endTime.value } console.log(par); - uni.$emit('timerSave',par) + uni.$emit('timerSave', par) go.back() } @@ -207,14 +208,14 @@ function returnTimeIndex(time) { console.log(time); - return time.split(':').map(v=>{ - return v*1 + return time.split(':').map(v => { + return v * 1 }) } function returnTimer(res) { return [{ - cycleChecked: res.days ? res.days.split(',').filter(v=>v) : [], + cycleChecked: res.days ? res.days.split(',').filter(v => v) : [], startTime: res.startTime ? { value: res.startTime, index: returnTimeIndex(res.startTime) diff --git a/pages.json b/pages.json index 7b19f3b..cd90984 100644 --- a/pages.json +++ b/pages.json @@ -8,8 +8,7 @@ "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue" } }, - "pages": [ - { + "pages": [{ "pageId": "PAGES_INDEX", "path": "pages/index/index", "style": { @@ -760,13 +759,28 @@ { "root": "pageBwc", "pages": [{ - "pageId": "PAGES_BWC", - "path": "index/index", - "style": { - "navigationBarTitleText": "霸王餐" - } + "pageId": "PAGES_BWC", + "path": "index/index", + "style": { + "navigationBarTitleText": "霸王餐" } - ] + }] + }, + { + "root": "pagewriteoff", + "pages": [{ + "pageId": "PAGES_WEITEOFF", + "path": "index/index", + "style": { + "navigationBarTitleText": "核销列表" + } + }, { + "pageId": "PAGES_WEITEOFF_RECORD", + "path": "index/record", + "style": { + "navigationBarTitleText": "核销记录" + } + }] }, { "root": "pageBooking", @@ -877,11 +891,10 @@ } }, { - "path" : "quan/quan", + "path": "quan/quan", "pageId": "PAGES_ORDER_QUAN", - "style" : - { - "navigationBarTitleText" : "券包" + "style": { + "navigationBarTitleText": "券包" } } @@ -1094,44 +1107,42 @@ { "root": "pageNotification", "pages": [{ - "pageId": "PAGES_NOTIFICATION_INDEX", - "path": "index", - "style": { - "navigationBarTitleText": "订阅通知" - } + "pageId": "PAGES_NOTIFICATION_INDEX", + "path": "index", + "style": { + "navigationBarTitleText": "订阅通知" } - ] + }] }, { "root": "pageCreditBuyer", "pages": [{ - "pageId": "PAGES_CREDIT_BUYER_INDEX", - "path": "index", - "style": { - "navigationBarTitleText": "挂账管理" - } - },{ - "pageId": "PAGES_CREDIT_BUYER_ADDDEBTOR", - "path": "addDebtor", - "style": { - "navigationBarTitleText": "挂账人" - } - },{ - "pageId": "PAGES_CREDIT_BUYER_REPAYMENTRECORD", - "path": "rePaymentRecord", - "style": { - "navigationBarTitleText": "账单付款记录" - } - },{ - "pageId": "PAGES_CREDIT_BUYER_DETAIL", - "path": "creditDetail", - "style": { - "navigationBarTitleText": "查看明细" - } + "pageId": "PAGES_CREDIT_BUYER_INDEX", + "path": "index", + "style": { + "navigationBarTitleText": "挂账管理" } - ] + }, { + "pageId": "PAGES_CREDIT_BUYER_ADDDEBTOR", + "path": "addDebtor", + "style": { + "navigationBarTitleText": "挂账人" + } + }, { + "pageId": "PAGES_CREDIT_BUYER_REPAYMENTRECORD", + "path": "rePaymentRecord", + "style": { + "navigationBarTitleText": "账单付款记录" + } + }, { + "pageId": "PAGES_CREDIT_BUYER_DETAIL", + "path": "creditDetail", + "style": { + "navigationBarTitleText": "查看明细" + } + }] } - + ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/index/index.vue b/pages/index/index.vue index 00559e2..e42a5a2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -284,8 +284,11 @@ // pageUrl: 'PAGES_RED_INDEX', // entId: 'ENT_MCH_MEMBER' // }, - - + { + title: '核销管理', + icon: '/static/indexImg/pagewriteoff.svg', + pageUrl: 'PAGES_WEITEOFF' + }, { title: '退出登录', icon: '/static/indexImg/icon-login-out.svg', @@ -373,6 +376,7 @@ /* #endif */ /* #ifndef H5 */ padding-top: calc(84rpx + 44px); + /* #endif */ >view { text-align: center; diff --git a/pagewriteoff/components/commodity.vue b/pagewriteoff/components/commodity.vue new file mode 100644 index 0000000..8d09884 --- /dev/null +++ b/pagewriteoff/components/commodity.vue @@ -0,0 +1,255 @@ + + + + + \ No newline at end of file diff --git a/pagewriteoff/components/dialogs.vue b/pagewriteoff/components/dialogs.vue new file mode 100644 index 0000000..23c74c2 --- /dev/null +++ b/pagewriteoff/components/dialogs.vue @@ -0,0 +1,155 @@ + + + + + \ No newline at end of file diff --git a/pagewriteoff/index/index.vue b/pagewriteoff/index/index.vue new file mode 100644 index 0000000..88805bb --- /dev/null +++ b/pagewriteoff/index/index.vue @@ -0,0 +1,267 @@ + + + + + \ No newline at end of file diff --git a/pagewriteoff/index/record.vue b/pagewriteoff/index/record.vue new file mode 100644 index 0000000..8c0172e --- /dev/null +++ b/pagewriteoff/index/record.vue @@ -0,0 +1,360 @@ + + + + + \ No newline at end of file diff --git a/static/indexImg/pagewriteoff.svg b/static/indexImg/pagewriteoff.svg new file mode 100644 index 0000000..a3ee822 --- /dev/null +++ b/static/indexImg/pagewriteoff.svg @@ -0,0 +1,20 @@ + + + +