Commit e570659709febf8c01190391613d529d4dddf0f9
1 parent
59177fd9
最新日报
Showing
6 changed files
with
84 additions
and
70 deletions
绿纤uni-app/unpackage/dist/dev/mp-weixin/common/vendor.js
| @@ -10058,8 +10058,8 @@ var ENV_CONFIG = { | @@ -10058,8 +10058,8 @@ var ENV_CONFIG = { | ||
| 10058 | // 正式环境 | 10058 | // 正式环境 |
| 10059 | production: { | 10059 | production: { |
| 10060 | name: '正式环境', | 10060 | name: '正式环境', |
| 10061 | - apiBaseUrl: 'http://erp_test.lvqianmeiye.com', | ||
| 10062 | - // apiBaseUrl: 'https://erp.lvqianmeiye.com', | 10061 | + // apiBaseUrl: 'http://erp_test.lvqianmeiye.com', |
| 10062 | + apiBaseUrl: 'https://erp.lvqianmeiye.com', | ||
| 10063 | // apiBaseUrl: 'http://lvqian.antissoft.com', | 10063 | // apiBaseUrl: 'http://lvqian.antissoft.com', |
| 10064 | description: '生产环境服务器' | 10064 | description: '生产环境服务器' |
| 10065 | } | 10065 | } |
绿纤uni-app/unpackage/dist/dev/mp-weixin/components/SignaturePad.wxml
| 1 | -<view class="signature-container data-v-1a71c3d4"><block wx:if="{{currentStage==='info'}}"><view class="signature-px-info data-v-1a71c3d4"><view class="px-info-title data-v-1a71c3d4">{{infoTitle}}</view><view class="px-info-list data-v-1a71c3d4"><block wx:for="{{pxInfoList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="px-info-row data-v-1a71c3d4"><text class="px-name data-v-1a71c3d4">{{item.name}}</text><view class="px-info-right data-v-1a71c3d4"><block wx:if="{{item.type}}"><text class="px-type data-v-1a71c3d4">{{item.type}}</text></block><text class="px-count data-v-1a71c3d4">{{"数量："+item.count}}</text></view></view></block></view><view class="px-info-total data-v-1a71c3d4"><text class="total-label data-v-1a71c3d4">{{amountLabel+"："}}</text><text class="total-value data-v-1a71c3d4">{{"¥"+(pxInfo.actualPrice||'0.00')}}</text></view><view class="px-info-action data-v-1a71c3d4"><button data-event-opts="{{[['tap',[['startSign',['$event']]]]]}}" class="btn-start-sign data-v-1a71c3d4" bindtap="__e">开始签字</button></view></view></block><block wx:if="{{currentStage==='sign'}}"><view class="signature-header data-v-1a71c3d4"><text class="signature-title data-v-1a71c3d4">会员签字</text><view class="signature-actions data-v-1a71c3d4"><button data-event-opts="{{[['tap',[['clearSignature',['$event']]]]]}}" class="btn-clear data-v-1a71c3d4" bindtap="__e">清除</button><button data-event-opts="{{[['tap',[['confirmSignature',['$event']]]]]}}" class="btn-confirm data-v-1a71c3d4" bindtap="__e">确认</button></view></view></block><block wx:if="{{currentStage==='confirm'}}"><view class="signature-confirm-tips data-v-1a71c3d4"><text class="confirm-tips-text data-v-1a71c3d4">离店前，请检查一下是否带好了：手机、钥匙、钱包和那份美丽的心情。</text></view></block><view class="signature-pad data-v-1a71c3d4" id="signaturePad"><canvas class="signature-canvas data-v-1a71c3d4" style="width:100%;height:100%;" canvas-id="signature-canvas" data-event-opts="{{[['touchstart',[['startDrawing',['$event']]]],['touchmove',[['draw',['$event']]]],['touchend',[['stopDrawing',['$event']]]]]}}" bindtouchstart="__e" bindtouchmove="__e" bindtouchend="__e"></canvas></view><block wx:if="{{currentStage==='sign'}}"><view class="signature-tips data-v-1a71c3d4"><text class="tips-text data-v-1a71c3d4">请在上方区域进行签字</text></view></block></view> | ||
| 2 | \ No newline at end of file | 1 | \ No newline at end of file |
| 2 | +<view class="signature-container data-v-1a71c3d4"><block wx:if="{{currentStage==='info'}}"><view class="signature-px-info data-v-1a71c3d4"><view class="px-info-title data-v-1a71c3d4">{{infoTitle}}</view><view class="px-info-list data-v-1a71c3d4"><block wx:for="{{pxInfoList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="px-info-row data-v-1a71c3d4"><text class="px-name data-v-1a71c3d4">{{item.name}}</text><view class="px-info-right data-v-1a71c3d4"><block wx:if="{{item.type}}"><text class="px-type data-v-1a71c3d4">{{item.type}}</text></block><text class="px-count data-v-1a71c3d4">{{"数量："+item.count}}</text></view></view></block></view><block wx:if="{{infoTitle!='耗卡信息'}}"><view class="px-info-total data-v-1a71c3d4"><text class="total-label data-v-1a71c3d4">{{amountLabel+"："}}</text><text class="total-value data-v-1a71c3d4">{{"¥"+(pxInfo.actualPrice||'0.00')}}</text></view></block><view class="px-info-action data-v-1a71c3d4"><button data-event-opts="{{[['tap',[['startSign',['$event']]]]]}}" class="btn-start-sign data-v-1a71c3d4" bindtap="__e">开始签字</button></view></view></block><block wx:if="{{currentStage==='sign'}}"><view class="signature-header data-v-1a71c3d4"><text class="signature-title data-v-1a71c3d4">会员签字</text><view class="signature-actions data-v-1a71c3d4"><button data-event-opts="{{[['tap',[['clearSignature',['$event']]]]]}}" class="btn-clear data-v-1a71c3d4" bindtap="__e">清除</button><button data-event-opts="{{[['tap',[['confirmSignature',['$event']]]]]}}" class="btn-confirm data-v-1a71c3d4" bindtap="__e">确认</button></view></view></block><block wx:if="{{currentStage==='confirm'}}"><view class="signature-confirm-tips data-v-1a71c3d4"><text class="confirm-tips-text data-v-1a71c3d4">离店前，请检查一下是否带好了：手机、钥匙、钱包和那份美丽的心情。</text></view></block><view class="signature-pad data-v-1a71c3d4" id="signaturePad"><canvas class="signature-canvas data-v-1a71c3d4" style="width:100%;height:100%;" canvas-id="signature-canvas" data-event-opts="{{[['touchstart',[['startDrawing',['$event']]]],['touchmove',[['draw',['$event']]]],['touchend',[['stopDrawing',['$event']]]]]}}" bindtouchstart="__e" bindtouchmove="__e" bindtouchend="__e"></canvas></view><block wx:if="{{currentStage==='sign'}}"><view class="signature-tips data-v-1a71c3d4"><text class="tips-text data-v-1a71c3d4">请在上方区域进行签字</text></view></block></view> | ||
| 3 | \ No newline at end of file | 3 | \ No newline at end of file |
绿纤uni-app/unpackage/dist/dev/mp-weixin/pages/purchase-list/purchase-list.js
| @@ -453,9 +453,14 @@ var _default = { | @@ -453,9 +453,14 @@ var _default = { | ||
| 453 | params = { | 453 | params = { |
| 454 | currentPage: _this2.currentPage, | 454 | currentPage: _this2.currentPage, |
| 455 | pageSize: _this2.pageSize | 455 | pageSize: _this2.pageSize |
| 456 | - }; // 添加门店过滤（默认当前登录人的门店） | ||
| 457 | - // params.createUserStoreId = this.newuserInfo&&this.newuserInfo.mdid?this.newuserInfo.mdid:'暂无' | ||
| 458 | - params.createUser = _this2.newuserInfo && _this2.newuserInfo.id ? _this2.newuserInfo.id : '暂无'; | 456 | + }; |
| 457 | + if (_this2.newuserInfo.gw == '店助' || _this2.newuserInfo.gw == '店长') { | ||
| 458 | + params.createUserStoreId = _this2.newuserInfo && _this2.newuserInfo.mdid ? _this2.newuserInfo.mdid : '暂无'; | ||
| 459 | + } else { | ||
| 460 | + if (_this2.userInfo && _this2.userInfo.userId) { | ||
| 461 | + params.createUser = _this2.newuserInfo && _this2.newuserInfo.id ? _this2.newuserInfo.id : '暂无'; | ||
| 462 | + } | ||
| 463 | + } | ||
| 459 | 464 | ||
| 460 | // 添加购买时间范围参数 | 465 | // 添加购买时间范围参数 |
| 461 | if (_this2.dateRange && _this2.dateRange.length === 2) { | 466 | if (_this2.dateRange && _this2.dateRange.length === 2) { |
绿纤uni-app/unpackage/dist/dev/mp-weixin/pagesA/lx/lx.js
| @@ -2422,14 +2422,14 @@ var _default = { | @@ -2422,14 +2422,14 @@ var _default = { | ||
| 2422 | submitOrder: function submitOrder() { | 2422 | submitOrder: function submitOrder() { |
| 2423 | var _this22 = this; | 2423 | var _this22 = this; |
| 2424 | return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() { | 2424 | return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee22() { |
| 2425 | - var totalPxPrice, i, px, orderData, syamount, supplementinfo, result, jsj, _totalPxPrice, _i4, _px3, hyqz, memberinfo, kdrqValue, _orderData, _result; | 2425 | + var totalPxPrice, i, px, zdyjRounded, totalPxPriceRounded, orderData, syamount, supplementinfo, result, jsj, _totalPxPrice, _i4, _px3, _zdyjRounded, _totalPxPriceRounded, hyqz, memberinfo, kdrqValue, _orderData, _result; |
| 2426 | return _regenerator.default.wrap(function _callee22$(_context22) { | 2426 | return _regenerator.default.wrap(function _callee22$(_context22) { |
| 2427 | while (1) { | 2427 | while (1) { |
| 2428 | switch (_context22.prev = _context22.next) { | 2428 | switch (_context22.prev = _context22.next) { |
| 2429 | case 0: | 2429 | case 0: |
| 2430 | _context22.prev = 0; | 2430 | _context22.prev = 0; |
| 2431 | if (!_this22.removeid) { | 2431 | if (!_this22.removeid) { |
| 2432 | - _context22.next = 40; | 2432 | + _context22.next = 41; |
| 2433 | break; | 2433 | break; |
| 2434 | } | 2434 | } |
| 2435 | console.log(_objectSpread({}, _this22.formData)); | 2435 | console.log(_objectSpread({}, _this22.formData)); |
| @@ -2456,19 +2456,22 @@ var _default = { | @@ -2456,19 +2456,22 @@ var _default = { | ||
| 2456 | px = _this22.pxList[i]; | 2456 | px = _this22.pxList[i]; |
| 2457 | totalPxPrice += parseFloat(px.actualPrice) || 0; | 2457 | totalPxPrice += parseFloat(px.actualPrice) || 0; |
| 2458 | } | 2458 | } |
| 2459 | - console.error(totalPxPrice, _this22.formData.zdyj); | ||
| 2460 | - if (!(Number(_this22.formData.zdyj) < totalPxPrice)) { | ||
| 2461 | - _context22.next = 15; | 2459 | + // 将两个值都四舍五入到两位小数后再比较，避免浮点数精度问题 |
| 2460 | + zdyjRounded = Math.round(Number(_this22.formData.zdyj) * 100) / 100; | ||
| 2461 | + totalPxPriceRounded = Math.round(totalPxPrice * 100) / 100; | ||
| 2462 | + if (!(zdyjRounded < totalPxPriceRounded)) { | ||
| 2463 | + _context22.next = 16; | ||
| 2462 | break; | 2464 | break; |
| 2463 | } | 2465 | } |
| 2464 | uni.showToast({ | 2466 | uni.showToast({ |
| 2465 | - title: '整单业绩要大于等于品项之和的总价', | ||
| 2466 | - icon: 'none' | 2467 | + title: "\u6574\u5355\u4E1A\u7EE9(".concat(_this22.formData.zdyj, ")\u8981\u5927\u4E8E\u7B49\u4E8E\u54C1\u9879\u4E4B\u548C\u7684\u603B\u4EF7(").concat(totalPxPriceRounded.toFixed(2), ")"), |
| 2468 | + icon: 'none', | ||
| 2469 | + duration: 3000 | ||
| 2467 | }); | 2470 | }); |
| 2468 | return _context22.abrupt("return"); | 2471 | return _context22.abrupt("return"); |
| 2469 | - case 15: | 2472 | + case 16: |
| 2470 | if (_this22.formData.fkfs) { | 2473 | if (_this22.formData.fkfs) { |
| 2471 | - _context22.next = 18; | 2474 | + _context22.next = 19; |
| 2472 | break; | 2475 | break; |
| 2473 | } | 2476 | } |
| 2474 | uni.showToast({ | 2477 | uni.showToast({ |
| @@ -2476,7 +2479,7 @@ var _default = { | @@ -2476,7 +2479,7 @@ var _default = { | ||
| 2476 | icon: 'none' | 2479 | icon: 'none' |
| 2477 | }); | 2480 | }); |
| 2478 | return _context22.abrupt("return"); | 2481 | return _context22.abrupt("return"); |
| 2479 | - case 18: | 2482 | + case 19: |
| 2480 | orderData = _objectSpread(_objectSpread({}, _this22.removeinfo), {}, { | 2483 | orderData = _objectSpread(_objectSpread({}, _this22.removeinfo), {}, { |
| 2481 | zdyj: _this22.formData.zdyj, | 2484 | zdyj: _this22.formData.zdyj, |
| 2482 | sfyj: _this22.formData.sfyj, | 2485 | sfyj: _this22.formData.sfyj, |
| @@ -2493,14 +2496,14 @@ var _default = { | @@ -2493,14 +2496,14 @@ var _default = { | ||
| 2493 | lqKdKdjlbDeductList: _this22.deductList | 2496 | lqKdKdjlbDeductList: _this22.deductList |
| 2494 | }); | 2497 | }); |
| 2495 | if (!(_this22.removeinfo && _this22.removeinfo.supplementBillingId)) { | 2498 | if (!(_this22.removeinfo && _this22.removeinfo.supplementBillingId)) { |
| 2496 | - _context22.next = 29; | 2499 | + _context22.next = 30; |
| 2497 | break; | 2500 | break; |
| 2498 | } | 2501 | } |
| 2499 | syamount = 0; | 2502 | syamount = 0; |
| 2500 | console.error(_this22.removeinfo); | 2503 | console.error(_this22.removeinfo); |
| 2501 | - _context22.next = 24; | 2504 | + _context22.next = 25; |
| 2502 | return _lx.default.GetBillingDebtInfo(_this22.removeinfo.supplementBillingId); | 2505 | return _lx.default.GetBillingDebtInfo(_this22.removeinfo.supplementBillingId); |
| 2503 | - case 24: | 2506 | + case 25: |
| 2504 | supplementinfo = _context22.sent; | 2507 | supplementinfo = _context22.sent; |
| 2505 | console.error(supplementinfo); | 2508 | console.error(supplementinfo); |
| 2506 | if (supplementinfo.code == 200) { | 2509 | if (supplementinfo.code == 200) { |
| @@ -2508,16 +2511,16 @@ var _default = { | @@ -2508,16 +2511,16 @@ var _default = { | ||
| 2508 | } | 2511 | } |
| 2509 | orderData.supplementAmount = Number(_this22.formData.sfyj) > Number(syamount) ? syamount : _this22.formData.sfyj; | 2512 | orderData.supplementAmount = Number(_this22.formData.sfyj) > Number(syamount) ? syamount : _this22.formData.sfyj; |
| 2510 | console.error(orderData.supplementAmount); | 2513 | console.error(orderData.supplementAmount); |
| 2511 | - case 29: | 2514 | + case 30: |
| 2512 | // return | 2515 | // return |
| 2513 | console.error(_objectSpread({}, orderData)); | 2516 | console.error(_objectSpread({}, orderData)); |
| 2514 | _this22.issubmitOrder = false; | 2517 | _this22.issubmitOrder = false; |
| 2515 | uni.showLoading({ | 2518 | uni.showLoading({ |
| 2516 | title: '正在提交...' | 2519 | title: '正在提交...' |
| 2517 | }); | 2520 | }); |
| 2518 | - _context22.next = 34; | 2521 | + _context22.next = 35; |
| 2519 | return _lx.default.UpdateForNoDelete(orderData); | 2522 | return _lx.default.UpdateForNoDelete(orderData); |
| 2520 | - case 34: | 2523 | + case 35: |
| 2521 | result = _context22.sent; | 2524 | result = _context22.sent; |
| 2522 | uni.hideLoading(); | 2525 | uni.hideLoading(); |
| 2523 | if (result.code == 200) { | 2526 | if (result.code == 200) { |
| @@ -2539,17 +2542,17 @@ var _default = { | @@ -2539,17 +2542,17 @@ var _default = { | ||
| 2539 | }); | 2542 | }); |
| 2540 | } | 2543 | } |
| 2541 | _this22.issubmitOrder = true; | 2544 | _this22.issubmitOrder = true; |
| 2542 | - _context22.next = 82; | 2545 | + _context22.next = 85; |
| 2543 | break; | 2546 | break; |
| 2544 | - case 40: | 2547 | + case 41: |
| 2545 | // 提取金三角名称 | 2548 | // 提取金三角名称 |
| 2546 | jsj = _this22.extractJsjNames(); // 验证表单 | 2549 | jsj = _this22.extractJsjNames(); // 验证表单 |
| 2547 | if (!_this22.isactivity) { | 2550 | if (!_this22.isactivity) { |
| 2548 | - _context22.next = 45; | 2551 | + _context22.next = 46; |
| 2549 | break; | 2552 | break; |
| 2550 | } | 2553 | } |
| 2551 | if (_this22.selectedValues.activityId) { | 2554 | if (_this22.selectedValues.activityId) { |
| 2552 | - _context22.next = 45; | 2555 | + _context22.next = 46; |
| 2553 | break; | 2556 | break; |
| 2554 | } | 2557 | } |
| 2555 | uni.showToast({ | 2558 | uni.showToast({ |
| @@ -2557,9 +2560,9 @@ var _default = { | @@ -2557,9 +2560,9 @@ var _default = { | ||
| 2557 | icon: 'none' | 2560 | icon: 'none' |
| 2558 | }); | 2561 | }); |
| 2559 | return _context22.abrupt("return"); | 2562 | return _context22.abrupt("return"); |
| 2560 | - case 45: | 2563 | + case 46: |
| 2561 | if (_this22.selectedValues.kdhy) { | 2564 | if (_this22.selectedValues.kdhy) { |
| 2562 | - _context22.next = 48; | 2565 | + _context22.next = 49; |
| 2563 | break; | 2566 | break; |
| 2564 | } | 2567 | } |
| 2565 | uni.showToast({ | 2568 | uni.showToast({ |
| @@ -2567,9 +2570,9 @@ var _default = { | @@ -2567,9 +2570,9 @@ var _default = { | ||
| 2567 | icon: 'none' | 2570 | icon: 'none' |
| 2568 | }); | 2571 | }); |
| 2569 | return _context22.abrupt("return"); | 2572 | return _context22.abrupt("return"); |
| 2570 | - case 48: | 2573 | + case 49: |
| 2571 | if (toString(_this22.formData.zdyj)) { | 2574 | if (toString(_this22.formData.zdyj)) { |
| 2572 | - _context22.next = 51; | 2575 | + _context22.next = 52; |
| 2573 | break; | 2576 | break; |
| 2574 | } | 2577 | } |
| 2575 | uni.showToast({ | 2578 | uni.showToast({ |
| @@ -2577,31 +2580,35 @@ var _default = { | @@ -2577,31 +2580,35 @@ var _default = { | ||
| 2577 | icon: 'none' | 2580 | icon: 'none' |
| 2578 | }); | 2581 | }); |
| 2579 | return _context22.abrupt("return"); | 2582 | return _context22.abrupt("return"); |
| 2580 | - case 51: | 2583 | + case 52: |
| 2581 | if (_this22.validatePxList()) { | 2584 | if (_this22.validatePxList()) { |
| 2582 | - _context22.next = 53; | 2585 | + _context22.next = 54; |
| 2583 | break; | 2586 | break; |
| 2584 | } | 2587 | } |
| 2585 | return _context22.abrupt("return"); | 2588 | return _context22.abrupt("return"); |
| 2586 | - case 53: | 2589 | + case 54: |
| 2587 | // 整单业绩要大于等于品项之和的总价 | 2590 | // 整单业绩要大于等于品项之和的总价 |
| 2588 | _totalPxPrice = 0; | 2591 | _totalPxPrice = 0; |
| 2589 | for (_i4 = 0; _i4 < _this22.pxList.length; _i4++) { | 2592 | for (_i4 = 0; _i4 < _this22.pxList.length; _i4++) { |
| 2590 | _px3 = _this22.pxList[_i4]; | 2593 | _px3 = _this22.pxList[_i4]; |
| 2591 | _totalPxPrice += parseFloat(_px3.actualPrice) || 0; | 2594 | _totalPxPrice += parseFloat(_px3.actualPrice) || 0; |
| 2592 | } | 2595 | } |
| 2593 | - if (!(Number(_this22.formData.zdyj) < _totalPxPrice)) { | ||
| 2594 | - _context22.next = 58; | 2596 | + // 将两个值都四舍五入到两位小数后再比较，避免浮点数精度问题 |
| 2597 | + _zdyjRounded = Math.round(Number(_this22.formData.zdyj) * 100) / 100; | ||
| 2598 | + _totalPxPriceRounded = Math.round(_totalPxPrice * 100) / 100; | ||
| 2599 | + if (!(_zdyjRounded < _totalPxPriceRounded)) { | ||
| 2600 | + _context22.next = 61; | ||
| 2595 | break; | 2601 | break; |
| 2596 | } | 2602 | } |
| 2597 | uni.showToast({ | 2603 | uni.showToast({ |
| 2598 | - title: '整单业绩要大于等于品项之和的总价', | ||
| 2599 | - icon: 'none' | 2604 | + title: "\u6574\u5355\u4E1A\u7EE9(".concat(_this22.formData.zdyj, ")\u8981\u5927\u4E8E\u7B49\u4E8E\u54C1\u9879\u4E4B\u548C\u7684\u603B\u4EF7(").concat(_totalPxPriceRounded.toFixed(2), ")"), |
| 2605 | + icon: 'none', | ||
| 2606 | + duration: 3000 | ||
| 2600 | }); | 2607 | }); |
| 2601 | return _context22.abrupt("return"); | 2608 | return _context22.abrupt("return"); |
| 2602 | - case 58: | 2609 | + case 61: |
| 2603 | if (_this22.formData.fkfs) { | 2610 | if (_this22.formData.fkfs) { |
| 2604 | - _context22.next = 61; | 2611 | + _context22.next = 64; |
| 2605 | break; | 2612 | break; |
| 2606 | } | 2613 | } |
| 2607 | uni.showToast({ | 2614 | uni.showToast({ |
| @@ -2609,7 +2616,7 @@ var _default = { | @@ -2609,7 +2616,7 @@ var _default = { | ||
| 2609 | icon: 'none' | 2616 | icon: 'none' |
| 2610 | }); | 2617 | }); |
| 2611 | return _context22.abrupt("return"); | 2618 | return _context22.abrupt("return"); |
| 2612 | - case 61: | 2619 | + case 64: |
| 2613 | // 验证会员签字 | 2620 | // 验证会员签字 |
| 2614 | // if (!this.memberSignature) { | 2621 | // if (!this.memberSignature) { |
| 2615 | // uni.showToast({ | 2622 | // uni.showToast({ |
| @@ -2620,12 +2627,12 @@ var _default = { | @@ -2620,12 +2627,12 @@ var _default = { | ||
| 2620 | // } | 2627 | // } |
| 2621 | hyqz = []; | 2628 | hyqz = []; |
| 2622 | if (!_this22.memberSignature) { | 2629 | if (!_this22.memberSignature) { |
| 2623 | - _context22.next = 68; | 2630 | + _context22.next = 71; |
| 2624 | break; | 2631 | break; |
| 2625 | } | 2632 | } |
| 2626 | - _context22.next = 65; | 2633 | + _context22.next = 68; |
| 2627 | return _this22.newUploadBase64Image(); | 2634 | return _this22.newUploadBase64Image(); |
| 2628 | - case 65: | 2635 | + case 68: |
| 2629 | memberinfo = _context22.sent; | 2636 | memberinfo = _context22.sent; |
| 2630 | console.error(memberinfo); | 2637 | console.error(memberinfo); |
| 2631 | if (memberinfo) { | 2638 | if (memberinfo) { |
| @@ -2635,7 +2642,7 @@ var _default = { | @@ -2635,7 +2642,7 @@ var _default = { | ||
| 2635 | url: memberinfo.url | 2642 | url: memberinfo.url |
| 2636 | }); | 2643 | }); |
| 2637 | } | 2644 | } |
| 2638 | - case 68: | 2645 | + case 71: |
| 2639 | // 收集表单数据 | 2646 | // 收集表单数据 |
| 2640 | // 处理开单日期：如果用户设置了日期则使用设置的日期，否则使用当前时间 | 2647 | // 处理开单日期：如果用户设置了日期则使用设置的日期，否则使用当前时间 |
| 2641 | kdrqValue = _this22.utils.gettime(); | 2648 | kdrqValue = _this22.utils.gettime(); |
| @@ -2684,9 +2691,9 @@ var _default = { | @@ -2684,9 +2691,9 @@ var _default = { | ||
| 2684 | }); | 2691 | }); |
| 2685 | 2692 | ||
| 2686 | // 这里需要根据实际API调整 | 2693 | // 这里需要根据实际API调整 |
| 2687 | - _context22.next = 78; | 2694 | + _context22.next = 81; |
| 2688 | return _lx.default.submitLqKdKdjlb(_orderData); | 2695 | return _lx.default.submitLqKdKdjlb(_orderData); |
| 2689 | - case 78: | 2696 | + case 81: |
| 2690 | _result = _context22.sent; | 2697 | _result = _context22.sent; |
| 2691 | uni.hideLoading(); | 2698 | uni.hideLoading(); |
| 2692 | if (_result.code == 200) { | 2699 | if (_result.code == 200) { |
| @@ -2704,11 +2711,11 @@ var _default = { | @@ -2704,11 +2711,11 @@ var _default = { | ||
| 2704 | }); | 2711 | }); |
| 2705 | } | 2712 | } |
| 2706 | _this22.issubmitOrder = true; | 2713 | _this22.issubmitOrder = true; |
| 2707 | - case 82: | ||
| 2708 | - _context22.next = 90; | 2714 | + case 85: |
| 2715 | + _context22.next = 93; | ||
| 2709 | break; | 2716 | break; |
| 2710 | - case 84: | ||
| 2711 | - _context22.prev = 84; | 2717 | + case 87: |
| 2718 | + _context22.prev = 87; | ||
| 2712 | _context22.t0 = _context22["catch"](0); | 2719 | _context22.t0 = _context22["catch"](0); |
| 2713 | uni.hideLoading(); | 2720 | uni.hideLoading(); |
| 2714 | console.error('提交失败:', _context22.t0); | 2721 | console.error('提交失败:', _context22.t0); |
| @@ -2717,12 +2724,12 @@ var _default = { | @@ -2717,12 +2724,12 @@ var _default = { | ||
| 2717 | icon: 'none' | 2724 | icon: 'none' |
| 2718 | }); | 2725 | }); |
| 2719 | _this22.issubmitOrder = true; | 2726 | _this22.issubmitOrder = true; |
| 2720 | - case 90: | 2727 | + case 93: |
| 2721 | case "end": | 2728 | case "end": |
| 2722 | return _context22.stop(); | 2729 | return _context22.stop(); |
| 2723 | } | 2730 | } |
| 2724 | } | 2731 | } |
| 2725 | - }, _callee22, null, [[0, 84]]); | 2732 | + }, _callee22, null, [[0, 87]]); |
| 2726 | }))(); | 2733 | }))(); |
| 2727 | }, | 2734 | }, |
| 2728 | // 清空表单 | 2735 | // 清空表单 |
绿纤uni-app/unpackage/dist/dev/mp-weixin/project.private.config.json
| @@ -11,6 +11,13 @@ | @@ -11,6 +11,13 @@ | ||
| 11 | "scene": null | 11 | "scene": null |
| 12 | }, | 12 | }, |
| 13 | { | 13 | { |
| 14 | + "name": "pages/web/web", | ||
| 15 | + "pathName": "pages/web/web", | ||
| 16 | + "query": "url=https%253A%252F%252Ferp.lvqianmeiye.com%252Fhtml%252FdailyReport.html", | ||
| 17 | + "launchMode": "default", | ||
| 18 | + "scene": null | ||
| 19 | + }, | ||
| 20 | + { | ||
| 14 | "name": "pagesA/reimbursement-form/reimbursement-form", | 21 | "name": "pagesA/reimbursement-form/reimbursement-form", |
| 15 | "pathName": "pagesA/reimbursement-form/reimbursement-form", | 22 | "pathName": "pagesA/reimbursement-form/reimbursement-form", |
| 16 | "query": "", | 23 | "query": "", |
绿纤日报/dailyReport.html
| @@ -101,22 +101,24 @@ | @@ -101,22 +101,24 @@ | ||
| 101 | padding: 16px 20px; | 101 | padding: 16px 20px; |
| 102 | box-shadow: 0 4px 16px 0 rgba(76, 175, 80, 0.08); | 102 | box-shadow: 0 4px 16px 0 rgba(76, 175, 80, 0.08); |
| 103 | border: 1px solid #e8f5e9; | 103 | border: 1px solid #e8f5e9; |
| 104 | - display: flex; | ||
| 105 | - align-items: flex-end; | ||
| 106 | - gap: 12px; | 104 | + /* display: flex; |
| 105 | + align-items: flex-end; */ | ||
| 106 | + /* gap: 12px; */ | ||
| 107 | /* min-width: 280px; */ | 107 | /* min-width: 280px; */ |
| 108 | width: 100%; | 108 | width: 100%; |
| 109 | box-sizing: border-box; | 109 | box-sizing: border-box; |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | .date-input-wrapper { | 112 | .date-input-wrapper { |
| 113 | - width: 47%; | 113 | + width: 100%; |
| 114 | position: relative; | 114 | position: relative; |
| 115 | - /* flex: 1; */ | 115 | + flex: 1; |
| 116 | + margin-top: 12px; | ||
| 116 | } | 117 | } |
| 117 | 118 | ||
| 118 | .query-button { | 119 | .query-button { |
| 119 | - margin-left: 16px; | 120 | + width: 100%; |
| 121 | + /* margin-left: 16px; */ | ||
| 120 | padding: 12px 32px; | 122 | padding: 12px 32px; |
| 121 | background: linear-gradient(120deg, #43e97b 0%, #38f9d7 100%); | 123 | background: linear-gradient(120deg, #43e97b 0%, #38f9d7 100%); |
| 122 | border: none; | 124 | border: none; |
| @@ -636,17 +638,7 @@ | @@ -636,17 +638,7 @@ | ||
| 636 | padding: 8px 4px; | 638 | padding: 8px 4px; |
| 637 | } | 639 | } |
| 638 | 640 | ||
| 639 | - .date-filter-card { | ||
| 640 | - min-width: auto; | ||
| 641 | - width: 100%; | ||
| 642 | - /* max-width: 320px; */ | ||
| 643 | - flex-wrap: wrap; | ||
| 644 | - } | ||
| 645 | - | ||
| 646 | - .date-input-wrapper { | ||
| 647 | - width: 100%; | ||
| 648 | - /* margin-bottom: 12px; */ | ||
| 649 | - } | 641 | + |
| 650 | 642 | ||
| 651 | .query-button { | 643 | .query-button { |
| 652 | width: 100%; | 644 | width: 100%; |
| @@ -696,8 +688,11 @@ | @@ -696,8 +688,11 @@ | ||
| 696 | </svg> | 688 | </svg> |
| 697 | </div> --> | 689 | </div> --> |
| 698 | </div> | 690 | </div> |
| 699 | - <button class="query-button" id="queryButton">查询</button> | 691 | + <div class="date-input-wrapper" > |
| 692 | + <button class="query-button" id="queryButton">查询</button> | ||
| 693 | + </div> | ||
| 700 | </div> | 694 | </div> |
| 695 | + | ||
| 701 | </div> | 696 | </div> |
| 702 | 697 | ||
| 703 | <!-- Tab 容器 --> | 698 | <!-- Tab 容器 --> |