diff --git a/common/config.js b/common/config.js index 8471e0c..ff0a685 100644 --- a/common/config.js +++ b/common/config.js @@ -6,8 +6,8 @@ * loginTimeoutPage = "/pages/login/index", // 登录超时或失效的情况下，跳转到的登录页面 */ module.exports = { - // baseUrl: 'http://192.168.2.113:7201', - baseUrl: 'https://supervise.yxtsoft.com/lpkapi', + baseUrl: 'http://192.168.2.106:7201', + // baseUrl: 'https://supervise.yxtsoft.com/lpkapi', // baseUrl: 'http://jianguan.yyundong.com/api', tokenName: "Authorization", // 请求头中token的名字，与服务器端对应 loginTimeoutCode: "5001", // 登录超时或失效的情况下，服务器端返回的错误码 diff --git a/common/request.api.js b/common/request.api.js index e7368bb..ed0dfaf 100644 --- a/common/request.api.js +++ b/common/request.api.js @@ -8,6 +8,8 @@ export default { cardList: (params = {}) => request.post("/lpkgiftcard/gifCardByCustomerSid", params, {}, {}, true), // 提货卡详情 cardDetail: (params = {}) => request.get("/lpkgiftcard/getGifCardBySid/" + params, params, {}, {}, true), + // 提货日期 周六日的日期组合 + isSaturAndSun: (params = {}) => request.get("/lpkgiftcard/isSaturAndSun/" + params, params, {}, {}, true), // 提货卡预约初始化 cardBooking: (params = {}) => request.get("/lpkgiftcard/getReservationBySid/" + params, params, {}, {}, true), // 提货卡预约保存 diff --git a/pages - 副本.json b/pages - 副本.json deleted file mode 100644 index 306d99a..0000000 --- a/pages - 副本.json +++ /dev/null @@ -1,126 +0,0 @@ -{ - "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages - { - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/card/card_detail", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/card/card_detail2", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/card/card", - "style": { - "navigationStyle": "custom" - } - }, - { - "path": "pages/card/card_booking", - "style": { - "navigationBarTitleText": "预约提货", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/card/card_record", - "style": { - "navigationBarTitleText": "预约记录" - } - }, - { - "path": "pages/card/card_bind", - "style": { - "navigationStyle": "custom" - } - }, - - // 扫码进入 - { - "path": "pages/card/card_bind2", - "style": { - "navigationStyle": "custom" - } - }, { - "path": "pages/index/BindPhone", - "style": { - "navigationBarTitleText": "绑定账号", - "navigationStyle": "custom", - "app-plus": { - "scrollIndicator": false //禁用原生导航栏, - } - } - }, - { - "path": "pages/home/UserFragment", - "style": { - "navigationBarTitleText": "绑定账号", - "navigationStyle": "custom", - "app-plus": { - "scrollIndicator": false //禁用原生导航栏, - } - } - }, - { - "path": "pages/card/card_record_detail", - "style": { - "navigationBarTitleText": "预约详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/record/recordList", - "style": { - "navigationBarTitleText": "预约记录" - } - }, - { - "path": "pages/good/goodsDetail", - "style": { - "navigationBarTitleText": "商品详情", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/SelectAddressActivity", - "style": { - "navigationBarTitleText": "提货点列表", - "enablePullDownRefresh": false - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "white", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#FE9039", - "backgroundColor": "#FE9039" - }, - "tabBar": { - "color": "#7A7E83", - "selectedColor": "#191919", - "borderStyle": "black", - "backgroundColor": "#ffffff", - "list": [{ - "pagePath": "pages/card/card", - "text": "礼包", - "iconPath": "static/bomicon/bom_notPack.png", - "selectedIconPath": "static/bomicon/bom_pack.png" - }, { - "pagePath": "pages/record/recordList", - "text": "预约记录", - "iconPath": "static/bomicon/bom_notRecord.png", - "selectedIconPath": "static/bomicon/bom_record.png" - }] - }, - "uniIdRouter": {} -} \ No newline at end of file diff --git a/pages.json b/pages.json index 3707ddc..18fd272 100644 --- a/pages.json +++ b/pages.json @@ -97,6 +97,14 @@ "navigationBarTitleText": "提货点列表", "enablePullDownRefresh": false } + }, + { + "path" : "pages/enterprise/corporateCard", + "style" : + { + "navigationBarTitleText" : "企业卡", + "enablePullDownRefresh" : true + } } ], "globalStyle": { @@ -120,7 +128,14 @@ "text": "预约记录", "iconPath": "static/bomicon/bom_notRecord.png", "selectedIconPath": "static/bomicon/bom_record.png" - }] + } + , { + "pagePath": "pages/enterprise/corporateCard", + "text": "企业卡", + "iconPath": "static/bomicon/bom_notCard.png", + "selectedIconPath": "static/bomicon/bom_card.png" + } + ] }, "uniIdRouter": {} } \ No newline at end of file diff --git a/pages/SelectAddressActivity - 副本.vue b/pages/SelectAddressActivity - 副本.vue deleted file mode 100644 index f1767c8..0000000 --- a/pages/SelectAddressActivity - 副本.vue +++ /dev/null @@ -1,244 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/pages/card/card - 副本.vue b/pages/card/card - 副本.vue index 18c9c2c..befebf4 100644 --- a/pages/card/card - 副本.vue +++ b/pages/card/card - 副本.vue @@ -22,67 +22,54 @@ - + - + + - - - + + + + + - + - + - - 卡号: {{item.serialNumber}} - {{item.time}} + + 卡号: {{item.serialNumber}} + + {{item.time}} + 预约提货 - - - {{item.pname}} - - {{item.state}} - - - - - {{item.pname}} + {{item.pname}} + style="border: 1px #FED4B3 solid;margin-left: 10px;border-radius: 15px;padding: 3px 10px; font-size: 12px; color: #FF6000;flex-shrink: 0;"> {{item.state}} - --> - + - + @@ -151,16 +138,15 @@ }, detail(item) { - if (!item.showBtn) { - // 失效 不正常 - // 详情2 + if (item.showBtn) { + // 正常 uni.navigateTo({ - url: '/pages/card/card_detail2?sid=' + item.sid + url: '/pages/card/card_detail?sid=' + item.sid }) } else { - // 详情 + // 过期 已完成 uni.navigateTo({ - url: '/pages/card/card_detail?sid=' + item.sid + url: '/pages/card/card_detail2?sid=' + item.sid }) } @@ -182,6 +168,10 @@ \ No newline at end of file diff --git a/pages/card/card_detail.vue b/pages/card/card_detail.vue index d3c39c2..0b27670 100644 --- a/pages/card/card_detail.vue +++ b/pages/card/card_detail.vue @@ -209,7 +209,7 @@ 提货时间 + :start="data.start" :end="data.end" @showing='showing' :disabledDate="disabledDate" /> @@ -280,12 +280,16 @@ value: "", userName: "", userPhone: "", - } + }, + disabledDate:[ + // '2023-12-16' + ] } }, onLoad(options) { this.page.sid = options.sid this.request() + this.getSun() uni.$on("order2", (e) => { this.$nextTick(() => { this.$refs.pageView.setLoadState(0) @@ -367,7 +371,7 @@ uni.$emit('order', {}) uni.$emit('order2', {}) }).catch(e => { - _this.shortToast('发生异常') + _this.shortToast(e.msg) }) }, @@ -385,6 +389,20 @@ }) }) }, + + getSun(){ + let _this = this + _this.$api.isSaturAndSun(this.page.sid).then((resp) => { + + // console.log("aaa",resp) + + this.disabledDate = resp + + }).catch(e => { + + }) + }, + showRecord(sid) { uni.navigateTo({ url: '/pages/card/card_record?sid=' + sid diff --git a/pages/enterprise/corporateCard.vue b/pages/enterprise/corporateCard.vue new file mode 100644 index 0000000..321ec17 --- /dev/null +++ b/pages/enterprise/corporateCard.vue @@ -0,0 +1,54 @@ + + + + + \ No newline at end of file diff --git a/static/bomicon/bom_card.png b/static/bomicon/bom_card.png new file mode 100644 index 0000000..513ad87 Binary files /dev/null and b/static/bomicon/bom_card.png differ diff --git a/static/bomicon/bom_notCard.png b/static/bomicon/bom_notCard.png new file mode 100644 index 0000000..8e020cb Binary files /dev/null and b/static/bomicon/bom_notCard.png differ diff --git a/static/edit_bg.png b/static/edit_bg.png deleted file mode 100644 index 562f3f3..0000000 Binary files a/static/edit_bg.png and /dev/null differ diff --git a/static/gift.png b/static/gift.png deleted file mode 100644 index 0d8e861..0000000 Binary files a/static/gift.png and /dev/null differ diff --git a/static/gift2.png b/static/gift2.png deleted file mode 100644 index 336b04a..0000000 Binary files a/static/gift2.png and /dev/null differ diff --git a/static/gift3.png b/static/gift3.png deleted file mode 100644 index fe79652..0000000 Binary files a/static/gift3.png and /dev/null differ diff --git a/static/guige.png b/static/guige.png deleted file mode 100644 index 682a54b..0000000 Binary files a/static/guige.png and /dev/null differ diff --git a/static/mingxi.png b/static/mingxi.png deleted file mode 100644 index 7eda8b8..0000000 Binary files a/static/mingxi.png and /dev/null differ diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue index 5b9aa88..9776a6c 100644 --- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue +++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue @@ -6,16 +6,19 @@ 'uni-calendar-item--after-checked-x':weeks.afterMultiple, }" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)"> - {{weeks.date}} + {{weeks.date}} @@ -24,6 +27,11 @@ - + \ No newline at end of file diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue index 9d70973..5d63002 100644 --- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue +++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue @@ -59,8 +59,7 @@ + :selected="selected" :checkHover="range" @change="choiceDate" @handleMouse="handleMouse" :disabledDate="disabledDate"> @@ -101,13 +100,21 @@ - + \ No newline at end of file diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue index 0fbaa48..dc31aae 100644 --- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue +++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue @@ -108,7 +108,7 @@ :start-date="calendarRange.startDate" :end-date="calendarRange.endDate" :selectableTimes="mobSelectableTime" :startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder" :default-value="defaultValue" :pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :hasTime="hasTime" :insert="false" - :hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" /> + :hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" :disabledDate="disabledDate" />