diff --git a/b/baiduc/baidu_confirm_refund_order.dspy b/b/baiduc/baidu_confirm_refund_order.dspy index 46245ca..fb13695 100644 --- a/b/baiduc/baidu_confirm_refund_order.dspy +++ b/b/baiduc/baidu_confirm_refund_order.dspy @@ -51,9 +51,9 @@ async def affirmbz_order(ns={}): count = await getCustomerBalance(sor, orgid[0]['customerid']) if count == None: count = 0 - if count - float(orgid[0]['amount']) < 0: - pricedifference = count - round(orgid[0]['amount'],2) - return {'status': False, 'msg': '账户余额不足','pricedifference': round(pricedifference,2)} + #if count - float(orgid[0]['amount']) < 0: + #pricedifference = count - round(orgid[0]['amount'],2) + #return {'status': False, 'msg': '账户余额不足, count: %s' % str(count),'pricedifference': round(pricedifference,2)} await order2bill(ns['orderid'], sor) bills = await sor.R('bill', {'orderid': ns['orderid'], 'del_flg': '0'}) try: @@ -902,15 +902,17 @@ async def baidu_confirm_refund_order(ns={}): await sor.U('user_action', {'id': ns_record_id, 'ordertype': 'REFUND', 'reason': '远程退款成功, 本地客户退款成功'}) continue else: - ns_err_log = { - 'id': uuid(), - 'log_level': 'ERROR', - 'log_content': '远程退款成功,本地退款失败 %s' % str(local_refund_status), - 'user_id': ns.get('userid'), - 'request_url': '/baiduc//baidu_confirm_refund_order.dspy', - 'request_params': json.dumps({'order_id': order_id, 'baidu_id': ns.get('baidu_id')}), - } - await sor.C('warn_error_log', ns_err_log) + db = DBPools() + async with db.sqlorContext('kboss') as sor: + ns_err_log = { + 'id': uuid(), + 'log_level': 'ERROR', + 'log_content': '远程退款成功,本地退款失败 %s' % str(local_refund_status), + 'user_id': ns.get('userid'), + 'request_url': '/baiduc//baidu_confirm_refund_order.dspy', + 'request_params': json.dumps({'order_id': order_id, 'baidu_id': ns.get('baidu_id')}), + } + await sor.C('warn_error_log', ns_err_log) ns_record = { 'orderid': order_id, diff --git a/f/web-kboss/src/api/H5/index.js b/f/web-kboss/src/api/H5/index.js index 6704d81..a9e3cb7 100644 --- a/f/web-kboss/src/api/H5/index.js +++ b/f/web-kboss/src/api/H5/index.js @@ -1,9 +1,31 @@ import request from "@/utils/request"; - +// 获取首页产品 export const reqHotProduct = () => { return request({ url: '/product/get_firstpage_jizuonet.dspy', method: 'post', }) } +// 获取云,算,网,用数据 +export const reqNavList = (data) => { + return request({ + url: '/product/get_firstpage_product_tree.dspy', + method: 'post', + headers: { + 'Content-Type': 'application/json' + }, + data + }) +} +//立即咨询 +export const reqNewHomeConsult = (data) => { + return request({ + url: '/product/add_user_inquiry.dspy', + method: 'post', + headers: { + 'Content-Type': 'application/json' + }, + data + }) +} diff --git a/f/web-kboss/src/router/index.js b/f/web-kboss/src/router/index.js index d155c42..398473d 100644 --- a/f/web-kboss/src/router/index.js +++ b/f/web-kboss/src/router/index.js @@ -85,7 +85,7 @@ export const constantRoutes = [ path: '/h5HomePage', name: 'H5HomePage', title: 'H5首页', - component: () => import('@/views/H5/indexPage/index.vue'), + component: () => import('@/views/H5/calculate/index.vue'), hidden: true, }, diff --git a/f/web-kboss/src/styles/index.scss b/f/web-kboss/src/styles/index.scss index cb3b455..e3a72eb 100644 --- a/f/web-kboss/src/styles/index.scss +++ b/f/web-kboss/src/styles/index.scss @@ -12,7 +12,7 @@ body{ text-rendering: optimizeLegibility; font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; overflow-y:hidden; - + } label { font-weight: 700; diff --git a/f/web-kboss/src/views/H5/calculate/index.vue b/f/web-kboss/src/views/H5/calculate/index.vue new file mode 100644 index 0000000..d845802 --- /dev/null +++ b/f/web-kboss/src/views/H5/calculate/index.vue @@ -0,0 +1,151 @@ + + + + + + diff --git a/f/web-kboss/src/views/H5/cloud/index.vue b/f/web-kboss/src/views/H5/cloud/index.vue new file mode 100644 index 0000000..789d3c3 --- /dev/null +++ b/f/web-kboss/src/views/H5/cloud/index.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/f/web-kboss/src/views/H5/images/tabBar/calculate.png b/f/web-kboss/src/views/H5/images/tabBar/calculate.png new file mode 100644 index 0000000..2d85206 Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/calculate.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/calculateColor.png b/f/web-kboss/src/views/H5/images/tabBar/calculateColor.png new file mode 100644 index 0000000..09ca9fa Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/calculateColor.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/cloud.png b/f/web-kboss/src/views/H5/images/tabBar/cloud.png new file mode 100644 index 0000000..d452a89 Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/cloud.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/cloudColor.png b/f/web-kboss/src/views/H5/images/tabBar/cloudColor.png new file mode 100644 index 0000000..d158c7a Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/cloudColor.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/home.png b/f/web-kboss/src/views/H5/images/tabBar/home.png new file mode 100644 index 0000000..134d588 Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/home.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/homeColor.png b/f/web-kboss/src/views/H5/images/tabBar/homeColor.png new file mode 100644 index 0000000..34d2b36 Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/homeColor.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/net.png b/f/web-kboss/src/views/H5/images/tabBar/net.png new file mode 100644 index 0000000..8b41bf5 Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/net.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/netColor.png b/f/web-kboss/src/views/H5/images/tabBar/netColor.png new file mode 100644 index 0000000..dd348ad Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/netColor.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/user.png b/f/web-kboss/src/views/H5/images/tabBar/user.png new file mode 100644 index 0000000..c4f9066 Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/user.png differ diff --git a/f/web-kboss/src/views/H5/images/tabBar/userColor.png b/f/web-kboss/src/views/H5/images/tabBar/userColor.png new file mode 100644 index 0000000..51aa648 Binary files /dev/null and b/f/web-kboss/src/views/H5/images/tabBar/userColor.png differ diff --git a/f/web-kboss/src/views/H5/index.vue b/f/web-kboss/src/views/H5/index.vue new file mode 100644 index 0000000..f84269d --- /dev/null +++ b/f/web-kboss/src/views/H5/index.vue @@ -0,0 +1,101 @@ + + + + + diff --git a/f/web-kboss/src/views/H5/indexPage/index.vue b/f/web-kboss/src/views/H5/indexPage/index.vue deleted file mode 100644 index d5cbe75..0000000 --- a/f/web-kboss/src/views/H5/indexPage/index.vue +++ /dev/null @@ -1,392 +0,0 @@ - - - - - diff --git a/f/web-kboss/src/views/H5/media.js b/f/web-kboss/src/views/H5/media.js new file mode 100644 index 0000000..4f55b34 --- /dev/null +++ b/f/web-kboss/src/views/H5/media.js @@ -0,0 +1,10 @@ +function adapter() { + //获取布局视口宽度,因为开启了理想视口,布局视口=设备横向独立像素值 + const dpWidth = document.documentElement.clientWidth + //计算根字体大小 + const rootFonstSize = (dpWidth * 100) / 750 + //设置根字体大小 + document.documentElement.style.fontSize = rootFonstSize + 'px' +} +adapter() +window.onresize = adapter() diff --git a/f/web-kboss/src/views/H5/net/index.vue b/f/web-kboss/src/views/H5/net/index.vue new file mode 100644 index 0000000..020eabc --- /dev/null +++ b/f/web-kboss/src/views/H5/net/index.vue @@ -0,0 +1,151 @@ + + + + + + diff --git a/f/web-kboss/src/views/H5/official/index.vue b/f/web-kboss/src/views/H5/official/index.vue new file mode 100644 index 0000000..7b04fe7 --- /dev/null +++ b/f/web-kboss/src/views/H5/official/index.vue @@ -0,0 +1,677 @@ +让图标始终是对其的状态 让布局规整些 + + + + + + + + diff --git a/f/web-kboss/src/views/H5/use/index.vue b/f/web-kboss/src/views/H5/use/index.vue new file mode 100644 index 0000000..adbd236 --- /dev/null +++ b/f/web-kboss/src/views/H5/use/index.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/f/web-kboss/src/views/homePage/mainPage/qqq.vue b/f/web-kboss/src/views/homePage/mainPage/qqq.vue deleted file mode 100644 index e69de29..0000000 diff --git a/f/web-kboss/src/views/product/mainPage/index.vue b/f/web-kboss/src/views/product/mainPage/index.vue index 8386db7..1477331 100644 --- a/f/web-kboss/src/views/product/mainPage/index.vue +++ b/f/web-kboss/src/views/product/mainPage/index.vue @@ -57,7 +57,7 @@ 续费 - + @@ -205,9 +205,8 @@ export default Vue.extend({ async initMybalance() { const res = await editReachargelogAPI() - if (res.status) { - // 注意:根据您的 user 模块,这里需要使用 'SETMYBANLANCE' 而不是 'user/setMybalance' - this.$store.commit('SETMYBANLANCE', res.data) + if (res.status==true) { + this.mybalance = res.data } }, async getUnreadMsgCount() { @@ -282,11 +281,7 @@ export default Vue.extend({ } } }, - computed: { - ...mapState({ - mybalance: state => state.user.mybalance, - }) - }, + })