From efa9bfe98ba906e4c9b8f49c89f5da162a46bb0f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 13 一月 2025 10:21:24 +0800
Subject: [PATCH] 1.微信一键登录：新增“同意用户协议”之后才可登录
---
main.js | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/main.js b/main.js
index 216615a..8133322 100644
--- a/main.js
+++ b/main.js
@@ -1,4 +1,4 @@
-// #ifndef VUE3
+
import Vue from 'vue'
import App from './App'
import store from './store'
@@ -13,11 +13,14 @@
Vue.prototype.$storage = storage
import util from './plugins/util'
Vue.prototype.$util = util
-import self_base from './common/self_base.js'
-Vue.use(self_base);
+// import self_base from './common/self_base.js'
+// Vue.use(self_base);
import mixinsCommon from './mixin/mixin.js'
Vue.mixin(mixinsCommon)
+
+import hasPermission from './common/authorize.js'
+Vue.prototype.$hasPermission = hasPermission;
// main.js
import uView from 'uview-ui'
@@ -40,6 +43,10 @@
},
picker:{
confirmColor:'#20613D'
+ },
+ steps:{
+ size:32,
+ fontSize:32
}
// 其他组件属性配置
// ......
@@ -48,8 +55,16 @@
+// #ifdef PUB_CUSTOMER
+import customerFooter from '@/components/footer/customer-footer'
+Vue.component('common-footer', customerFooter)
+// #endif
+
+// #ifndef PUB_CUSTOMER
import supplierfooter from '@/components/footer/supplier-footer'
-Vue.component('supplier-footer', supplierfooter)
+Vue.component('common-footer', supplierfooter)
+// #endif
+
import nodata from '@/components/no-data'
Vue.component('no-data', nodata)
// import bfooter from '@/components/footer/bussincess-footer'
@@ -58,18 +73,14 @@
import footerMsg from '@/components/footer/footer-msg'
Vue.component('footer-msg', footerMsg)
-import buttonShop from '@/components/button-shop/button-shop'
-Vue.component('common-button-shop', buttonShop)
-import cardListItem from '@/components/card-list-item/card-list-item'
-Vue.component('card-list-item', cardListItem)
-
-
+// #ifdef PUB_CUSTOMER
import selectItems from '@/components/common-select-items'
Vue.component('common-select-items', selectItems)
import addressSelect from '@/components/common-address-select/common-address-select'
Vue.component('common-address-select', addressSelect)
+// #endif
import topTabs from '@/components/top-tabs.vue'
Vue.component('top-tabs', topTabs)
@@ -84,17 +95,3 @@
...App
})
app.$mount()
-// #endif
-
-// #ifdef VUE3
-import {
- createSSRApp
-} from 'vue'
-import App from './App.vue'
-export function createApp() {
- const app = createSSRApp(App)
- return {
- app
- }
-}
-// #endif
\ No newline at end of file
--
Gitblit v1.9.3