邓雄飞 4 years ago
parent
commit
0982c18bbe
7 changed files with 73 additions and 6 deletions
  1. 3
      pages.json
  2. 2
      pages/cart/index.vue
  3. 2
      pages/order-list/index.vue
  4. 31
      pages/paper-details/index.vue
  5. 2
      pages/store/index.vue
  6. 2
      utils/hook.js
  7. 37
      utils/index.js

3
pages.json

@ -160,7 +160,8 @@
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
"backgroundColor": "#F8F8F8",
"app-plus": { "titleNView": false }
},
"tabBar": {
"color": "#888",

2
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,

2
pages/order-list/index.vue

@ -39,7 +39,7 @@
<view class="order-footer">
<view class="left">
<text style="font-size: 26rpx; color: #888888; margin-right: 8rpx">交货时间:</text>
<text style="font-size: 26rpx; color: #333333">{{ item.deliveryLeadtime || '-' }}</text>
<text style="font-size: 26rpx; color: #333333">{{ item.deliveryLeadtime || '-' }}</text>
</view>
<view class="right">
<text style="font-size: 30rpx; color: #ff5368"> {{ item.totalOfferPrice }}</text>

31
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 = {

2
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() {

2
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)
}
})
})

37
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
}
}
Loading…
Cancel
Save