diff --git a/pages.json b/pages.json index cb52117..fe422e2 100644 --- a/pages.json +++ b/pages.json @@ -160,7 +160,8 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-app", "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" + "backgroundColor": "#F8F8F8", + "app-plus": { "titleNView": false } }, "tabBar": { "color": "#888", diff --git a/pages/cart/index.vue b/pages/cart/index.vue index 2f531dc..58d90cd 100644 --- a/pages/cart/index.vue +++ b/pages/cart/index.vue @@ -189,7 +189,7 @@ export default { if (good.checked) { let obj = { buyTon: good.weight, - gramWeight: good.weight, + gramWeight: good.gramWeight, length: good.length, mallSupplierId: el.supplierId, pieceQuantity: good.quantity, diff --git a/pages/order-list/index.vue b/pages/order-list/index.vue index 63029ee..987a719 100644 --- a/pages/order-list/index.vue +++ b/pages/order-list/index.vue @@ -39,7 +39,7 @@ 交货时间: - {{ item.deliveryLeadtime || '-' }}天 + {{ item.deliveryLeadtime || '-' }} ¥ {{ item.totalOfferPrice }} diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue index da287f2..33d7d43 100644 --- a/pages/paper-details/index.vue +++ b/pages/paper-details/index.vue @@ -145,6 +145,24 @@ import qnInputNumber from '@/components/qn-input-number/qn-input-number.vue' import { go2, back } from '@/utils/hook.js' import { getPaperDetail, createGoodsReserve, createShoppingCar } from '@/apis/paperDetailsApi.js' import { round } from '@/utils/index.js' +const validateFields = [ + { + value: 'length', + label: '纸品长度' + }, + { + value: 'width', + label: '纸品宽度' + }, + { + value: 'gramWeight', + label: '纸品克重' + }, + { + value: 'pieceQuantity', + label: '购买数量' + } +] export default { components: { uGap, qnFooter, qnInputNumber }, data() { @@ -209,7 +227,7 @@ export default { } }, onLoad(option) { - this.params.productId = option.id + this.params.productId = option.paperId this.queryData() }, computed: { @@ -296,6 +314,17 @@ export default { }, // 确定 confirm() { + // 校验 + for (let i = 0; i < validateFields.length; i++) { + let item = validateFields[i] + if (!this.buyPaperDto[item.value]) { + uni.showToast({ + title: item.label + '必须大于0', + icon: 'none' + }) + return + } + } // 加入购物车 if (this.shoppingCarType == 1) { const params = { diff --git a/pages/store/index.vue b/pages/store/index.vue index f020ae0..42dab85 100644 --- a/pages/store/index.vue +++ b/pages/store/index.vue @@ -99,7 +99,7 @@ export default { }, methods: { seeDetailsTap(item) { - loginGo2('paper-details', { id: item.id }) + loginGo2('paper-details', { paperId: item.id }) }, // 获取店铺信息 getCustomer() { diff --git a/utils/hook.js b/utils/hook.js index 12c3219..db0757e 100644 --- a/utils/hook.js +++ b/utils/hook.js @@ -118,7 +118,7 @@ export function uploadImage(sourceType = ['album', 'camera'], count = 1) { }, fail: (err) => { console.error('chooseImage error:', err) - reject(err) + resolve(null) } }) }) diff --git a/utils/index.js b/utils/index.js index 70fc59d..21174d0 100644 --- a/utils/index.js +++ b/utils/index.js @@ -124,3 +124,40 @@ export const makeSocket = async ({ pageInfo = '', retry = false }) => { export function round(number, precision) { return Math.round(+number + 'e' + precision) / Math.pow(10, precision) } + +/** + * {beyond:是否超出目标时间,day:天,hours:小时,minutes:分钟,seconds:秒钟} + * @param time 计算时间 + * @param target 对照时间 + * @returns 时间差对象 + */ +export const difTime = (time, target) => { + let begin = new Date(time).getTime() + // 兼容ios时间 + let end = new Date(target.replace(/-/g, '/')).getTime() + let beyond = begin < end ? false : true + let diff = Math.abs(begin - end) + // 计算天数 + let day = Math.floor(diff / (24 * 3600 * 1000)) + day != day ? (day = 0) : '' + diff = diff % (24 * 3600 * 1000) + // 计算小时数 + let hours = Math.floor(diff / (3600 * 1000)) + hours != hours ? (hours = 0) : '' + diff = diff % (3600 * 1000) + // 计算分钟数 + let minutes = Math.floor(diff / (60 * 1000)) + minutes != minutes ? (minutes = 0) : '' + diff = diff % (60 * 1000) + // 计算秒数 + let seconds = Math.floor(diff / 1000) + seconds != seconds ? (seconds = 0) : '' + diff = diff % 1000 + return { + beyond, + day, + hours, + minutes, + seconds + } +}