diff --git a/yudao-ui-admin/src/router/index.js b/yudao-ui-admin/src/router/index.js
index af9c8d102..05a23465c 100644
--- a/yudao-ui-admin/src/router/index.js
+++ b/yudao-ui-admin/src/router/index.js
@@ -64,18 +64,18 @@ export const constantRoutes = [
component: (resolve) => require(['@/views/error/401'], resolve),
hidden: true
},
- {
- path: '',
- component: Layout,
- redirect: 'index',
- children: [{
- path: 'index',
- component: (resolve) => require(['@/views/index'], resolve),
- name: '首页',
- meta: {title: '首页', icon: 'dashboard', affix: true}
- }
- ]
- },
+ // {
+ // path: '',
+ // component: Layout,
+ // redirect: 'index',
+ // children: [{
+ // path: 'index',
+ // component: (resolve) => require(['@/views/index'], resolve),
+ // name: '首页',
+ // meta: {title: '首页', icon: 'dashboard', affix: true}
+ // }
+ // ]
+ // },
{
path: '/user',
component: Layout,
diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
index 9a1761ef2..7b6dcf338 100644
--- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
+++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
@@ -158,7 +158,7 @@
diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue
index 49b94e9aa..2c14b42a6 100644
--- a/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue
+++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue
@@ -11,7 +11,7 @@
- 添加运费模板
+ 添加运费模板
- 修改
- 删除
+ 修改
+ 删除
diff --git a/yudao-ui-admin/src/views/mall/product/property/index.vue b/yudao-ui-admin/src/views/mall/product/property/index.vue
index 2f1a42af7..8169f14d6 100644
--- a/yudao-ui-admin/src/views/mall/product/property/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/property/index.vue
@@ -12,8 +12,8 @@
- 添加商品规格
- 批量删除
+ 添加商品规格
+ 批量删除
- 编辑
- 删除
+ 编辑
+ 删除
diff --git a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
index 271ecd269..c4447b861 100644
--- a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
+++ b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
@@ -37,7 +37,7 @@
:picker-options="datePickerOptions" :default-time="['00:00:00', '23:59:59']" />
- 搜索
+ 搜索
重置
diff --git a/yudao-ui-admin/src/views/member/promoter/index.vue b/yudao-ui-admin/src/views/member/promoter/index.vue
index 333d1e5f1..403cc91e9 100644
--- a/yudao-ui-admin/src/views/member/promoter/index.vue
+++ b/yudao-ui-admin/src/views/member/promoter/index.vue
@@ -21,7 +21,7 @@
- 搜索
+ 搜索
重置
@@ -35,7 +35,7 @@
导入
+ v-hasPermi="['member:promoter:export']">导入
diff --git a/yudao-ui-admin/src/views/member/user/index.vue b/yudao-ui-admin/src/views/member/user/index.vue
index 771c43762..a25b53587 100644
--- a/yudao-ui-admin/src/views/member/user/index.vue
+++ b/yudao-ui-admin/src/views/member/user/index.vue
@@ -17,7 +17,7 @@
- 搜索
+ 搜索
重置
diff --git a/yudao-ui-admin/src/views/shop/phoneRecord/index.vue b/yudao-ui-admin/src/views/shop/phoneRecord/index.vue
index 9a708d5d3..3200c199e 100644
--- a/yudao-ui-admin/src/views/shop/phoneRecord/index.vue
+++ b/yudao-ui-admin/src/views/shop/phoneRecord/index.vue
@@ -9,7 +9,7 @@
- 搜索
+ 搜索
重置
diff --git a/yudao-ui-admin/src/views/shop/rechargeGear/index.vue b/yudao-ui-admin/src/views/shop/rechargeGear/index.vue
index 37f70a36c..1e2691128 100644
--- a/yudao-ui-admin/src/views/shop/rechargeGear/index.vue
+++ b/yudao-ui-admin/src/views/shop/rechargeGear/index.vue
@@ -7,7 +7,7 @@
- 搜索
+ 搜索
重置
diff --git a/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue b/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue
index 76df141a8..601f66e57 100644
--- a/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue
+++ b/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue
@@ -28,7 +28,7 @@
- 搜索
+ 搜索
重置
@@ -90,12 +90,12 @@
同意退款
+ v-hasPermi="['shop:recharge-order:refund']">同意退款
拒绝退款
+ v-hasPermi="['shop:recharge-order:refund']">拒绝退款
发起退款
+ v-hasPermi="['shop:recharge-order:refund']">发起退款
diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue
index 8d3bbc918..3985d9038 100644
--- a/yudao-ui-app/App.vue
+++ b/yudao-ui-app/App.vue
@@ -219,7 +219,6 @@
// 获取推广员ID
setSpreadId() {
const spreadId = this.$route.query.spreadId || ''
- console.log('spreadId', spreadId)
if (spreadId) {
this.$store.commit("SET_SPREADID", spreadId);
}
diff --git a/yudao-ui-app/libs/pay.js b/yudao-ui-app/libs/pay.js
index 1f09568a4..0fcc8b728 100644
--- a/yudao-ui-app/libs/pay.js
+++ b/yudao-ui-app/libs/pay.js
@@ -42,9 +42,9 @@ const unityPay = (options) => {
}
_options.payInfo.openid = openId
if (_options.payType === 'WXPAY') {
- _options.payInfo.payChannel = '微信支付'
+ _options.payInfo.payChannel = 'public'
} else if (_options.payType === 'ALIPAY') {
- _options.payInfo.payChannel = '支付宝'
+ _options.payInfo.payChannel = 'appAliPay'
}
uni.showLoading({
title: '支付中',
diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue
index edfed8233..554554211 100644
--- a/yudao-ui-app/pages/goods_cashier/index.vue
+++ b/yudao-ui-app/pages/goods_cashier/index.vue
@@ -198,7 +198,6 @@
payType: that.paytype,
createOrderFun: wechatOrderPay,
payResultHandle: (res) => {
- console.log(res)
return {
jsapiResult: res.jsapiConfig,
body: res.body
diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue
index 18246ba30..1e66621ad 100644
--- a/yudao-ui-app/pages/index/index.vue
+++ b/yudao-ui-app/pages/index/index.vue
@@ -208,7 +208,7 @@
followHid: true,
followCode: false,
logoUrl: "",
- bannerList: {},
+ bannerList: [],
imgUrls: [],
itemNew: [],
menus: [],
diff --git a/yudao-ui-app/utils/request.js b/yudao-ui-app/utils/request.js
index dcd6a5386..152718363 100644
--- a/yudao-ui-app/utils/request.js
+++ b/yudao-ui-app/utils/request.js
@@ -26,7 +26,6 @@ function baseRequest(url, method, data, {
if (!noAuth) {
//登录过期自动登录
if (!store.state.app.token && !checkLogin()) {
- console.log(store.state.app.token,checkLogin(),123123)
toLogin();
return Promise.reject({
msg: '未登录'