diff --git a/commons/utils/dict.js b/commons/utils/dict.js index 4b7a97c..db30a84 100644 --- a/commons/utils/dict.js +++ b/commons/utils/dict.js @@ -69,7 +69,6 @@ export default { ], getDiceName(val,key){ let item = this[key].find(v => v.type == val) - console.log(item) return item ? item.label : '' } } \ No newline at end of file diff --git a/components/my-components/my-radio.vue b/components/my-components/my-radio.vue index 61c23fb..5aec8f2 100644 --- a/components/my-components/my-radio.vue +++ b/components/my-components/my-radio.vue @@ -47,7 +47,7 @@ width:${props.size}px; height:${props.size}px; border-color:${props.borderColor}; - border-color:${props.modelValue?color.ColorMain:props.borderColor}; + border-color:${props.modelValue?uni.$utils.ColorMain:props.borderColor}; ` } const emits = defineEmits(['update:modelValue', 'change']) diff --git a/pageGoodsGroup/edit-group-goods/edit-group-goods.vue b/pageGoodsGroup/edit-group-goods/edit-group-goods.vue index e36df0d..8884984 100644 --- a/pageGoodsGroup/edit-group-goods/edit-group-goods.vue +++ b/pageGoodsGroup/edit-group-goods/edit-group-goods.vue @@ -181,7 +181,6 @@ */ async function getGroupBindGoods() { let res = await getProdGroupDetail(option.id) - console.log(res) pageData.bindGoodsList = res.productList.filter(v=>{ return pageData.query.categoryId === '' ? true : (v.categoryId==pageData.query.categoryId)&&(v.name.includes(pageData.query.name)) }) @@ -209,7 +208,6 @@ */ function setCategory(category) { pageData.query.categoryId = category.id - console.log(pageData.query.categoryId ); pageData.categoryName = category.name } @@ -221,7 +219,6 @@ if (!res) { return } - console.log(pageData.goodsList); await updateProdGroup({ ...option, productIds: [...pageData.bindGoodsList.map(v => v.id), ...pageData.goodsList.filter(v => v.checked) diff --git a/pages/shopSetUp/index.vue b/pages/shopSetUp/index.vue index b69a5e7..c0bc75d 100644 --- a/pages/shopSetUp/index.vue +++ b/pages/shopSetUp/index.vue @@ -128,6 +128,7 @@ const vdata = reactive({ shopInfo: { status: 2, isAccountPay: 0, + isMemberPrice: 0, }, extendList: [], registerTypeList: [ diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue index a92a6ea..d862bc4 100644 --- a/pagesCreateOrder/index/index.vue +++ b/pagesCreateOrder/index/index.vue @@ -325,7 +325,7 @@ let msg = JSON.parse(res); let cartItem; let cartArr = []; - console.log("onMessage===",msg) + // console.log("onMessage===",msg) if( msg.msg_id ){ websocketUtil.send(JSON.stringify({ type: 'receipt', @@ -347,7 +347,7 @@ switch (msg.operate_type) { case 'onboc_init': cars.length = 0 - console.log("购物车信息onboc_init===",msg) + // console.log("购物车信息onboc_init===",msg) if( !data.table.tableCode ){ data.table.tableCode = msg.table_code uni.setStorageSync("table_code",msg.table_code) diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue index e87dcd0..7be65fd 100644 --- a/pagesOrder/detail/components/list.vue +++ b/pagesOrder/detail/components/list.vue @@ -559,7 +559,6 @@ function tuikuan(item, index) { hasPermission('允许退款').then(res => { if (res) { - console.log(item) if (Array.isArray(item)) { let arr = []; item.map(v=>{ diff --git a/pagesOrder/detail/components/user.vue b/pagesOrder/detail/components/user.vue index 4de69a0..4905901 100644 --- a/pagesOrder/detail/components/user.vue +++ b/pagesOrder/detail/components/user.vue @@ -66,10 +66,9 @@ } } }) - function toOrder(){ go.to('PAGES_ORDER_INDEX',{ - userId:props.user.id||'', + userId:props.user.userId||'', type:'user' }) } diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue index 423ab43..0875bce 100644 --- a/pagesOrder/detail/detail.vue +++ b/pagesOrder/detail/detail.vue @@ -76,7 +76,7 @@ // 监听选择用户事件 let user = ref({ headImg:'', - telephone:'', + phone:'', amount:'0.00', accountPoints:'0.00' }) diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue index 5a1c9b4..643a4d7 100644 --- a/pagesOrder/pay-order/pay-order.vue +++ b/pagesOrder/pay-order/pay-order.vue @@ -928,7 +928,6 @@ async function pay(par) { const payType = pays.payTypes.list[pays.payTypes.selIndex].payType let pars = getPayParam() - console.log(pars) payStatus = 'paying' let params = { shopId: uni.getStorageSync("shopInfo").id, @@ -945,9 +944,6 @@ params.creditBuyerId = pageData.buyer.id } - - - console.log(params) try { if (payType == 'scanCode') { await microPay(params)