diff --git a/App.vue b/App.vue index 246e9c3..c031d80 100644 --- a/App.vue +++ b/App.vue @@ -5,6 +5,15 @@ export default { onLaunch: function() { + + var Gid = window.location.href.split("=")[1]; + if (typeof(Gid) == 'undefined') { + Gid = 1; + } + store.commit('$tStore', { + name: 'Gid', + value: Gid + }) uni.getSystemInfo({ success: function(e) { // #ifndef H5 @@ -27,6 +36,7 @@ // 获取设备的状态栏信息和自定义顶栏信息 // store.dispatch('updateCustomBarInfo') updateCustomBarInfo().then((res) => { + console.log(res); store.commit('$tStore', { name: 'vuex_status_bar_height', value: res.statusBarHeight diff --git a/index.html b/index.html index c3ff205..dbde560 100644 --- a/index.html +++ b/index.html @@ -1,20 +1,21 @@ - - - - - - - - - -
- - - + + + + + + + + + +
+ + + + \ No newline at end of file diff --git a/main.js b/main.js index d080027..56802cb 100644 --- a/main.js +++ b/main.js @@ -17,6 +17,11 @@ Vue.mixin(vuexStore) let mpShare = require('tuniao-ui/libs/mixin/mpShare.js') Vue.mixin(mpShare) +import { + wxshare +} from "util/jwexin.js" +Vue.prototype.$wxshare = wxshare; + const app = new Vue({ store, ...App diff --git a/manifest.json b/manifest.json index bf6e065..2076943 100644 --- a/manifest.json +++ b/manifest.json @@ -1,72 +1,97 @@ { - "name" : "云商会", - "appid" : "__UNI__F702B81", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : {} - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "", - "setting" : { - "urlCheck" : false - }, - "usingComponents" : true - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "2" -} + "name": "智慧云商协", + "appid": "__UNI__F702B81", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": { + "share": {} + } + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wxabc0f954cce7fe56", + "setting": { + "urlCheck": false, + "minified": true, + "postcss": true + }, + "usingComponents": true + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "2", + "h5": { + "router": { + "base": "" + }, + "template": "", + "devServer": { + "port": 80, + "https": false, + "disableHostCheck": true, + "proxy": { + "/api": { + "target": "http://192.168.3.130", //域名 + "changeOrigin": true, + "secure": false, + "pathRewrite": { + "^/api": "/api" + } + } + } + } + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index 898f873..a6a42a7 100644 --- a/pages.json +++ b/pages.json @@ -6,119 +6,216 @@ { "path": "pages/index/index", "style": { - "navigationBarTitleText": "首页" + "navigationBarTitleText": "智慧云商协" } }, { - "path" : "pages/index/home", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/home", + "style": { + "navigationBarTitleText": "智慧云商协" } }, { - "path" : "pages/index/service", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/service", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/pizz", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/pizz", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/user", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/user", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/discovery", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/discovery", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/directory", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/directory", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/user_info", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/user_info", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/new_info", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/new_info", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/events_list", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/events_list", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/knowledge_list", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/knowledge_list", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/goods_info", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/goods_info", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/events_info", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/events_info", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/goods_list", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/goods_list", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } }, { - "path" : "pages/index/search/search", - "style" : - { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "path": "pages/index/search/search", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/pizz_info/pizz_info", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/apply_in", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/enter_in", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/goods_my", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/events_my", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_card", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_pizz", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_apply", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_msg", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_assist", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_idea", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_settings", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_edit", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/tissue", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/my_desc", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/index/event_info", + "style": { + "navigationBarTitleText": "智慧云商协", + "enablePullDownRefresh": false } } ], diff --git a/pages/index/directory.vue b/pages/index/directory.vue index aa70252..bfe8e55 100644 --- a/pages/index/directory.vue +++ b/pages/index/directory.vue @@ -73,7 +73,7 @@ - 申请入会 diff --git a/pages/index/discovery.vue b/pages/index/discovery.vue index 4035d51..25775fe 100644 --- a/pages/index/discovery.vue +++ b/pages/index/discovery.vue @@ -45,7 +45,7 @@ - + - + 会员名录 - 申请入会 @@ -93,7 +93,8 @@ }, { name: '入会须知', }], - current: 0 + current: 0, + cardCur: 0 } }, methods: { diff --git a/pages/index/events_list.vue b/pages/index/events_list.vue index c5da229..7c25276 100644 --- a/pages/index/events_list.vue +++ b/pages/index/events_list.vue @@ -14,7 +14,7 @@ - diff --git a/pages/index/home.vue b/pages/index/home.vue index c274c68..9e4fcba 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -1,183 +1,331 @@ \ No newline at end of file + diff --git a/pages/index/index.vue b/pages/index/index.vue index 42bbdac..4fdc42e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,5 +1,5 @@