diff --git a/components/banner/banner.vue b/components/banner/banner.vue index 0a27dfd..647397b 100644 --- a/components/banner/banner.vue +++ b/components/banner/banner.vue @@ -76,7 +76,7 @@ export default { // 点击轮播图跳转 navTo(item) { - this.$c.navTo(item); + this.$common.navTo(item); } diff --git a/components/buy-notice/buy-notice.vue b/components/buy-notice/buy-notice.vue index be9237a..70432a6 100644 --- a/components/buy-notice/buy-notice.vue +++ b/components/buy-notice/buy-notice.vue @@ -154,7 +154,7 @@ export default { */ async getRule(id, title = "") { try { - const res = await this.$c.getRule(id, true); + const res = await this.$common.getRule(id, true); if (res && res.status === 1) { this.open({ title: title || "平台消费规则", diff --git a/components/coupon-pop/coupon-pop.vue b/components/coupon-pop/coupon-pop.vue index d875366..5b1e787 100644 --- a/components/coupon-pop/coupon-pop.vue +++ b/components/coupon-pop/coupon-pop.vue @@ -92,7 +92,7 @@ title: `快来领取${userInfo.nickname}分享的${this.ruleData.num}赏币的${this.ruleData.title}`, imageUrl: this.ruleData.level_img, path: '/pages/users/index' + - this.$c.qs({ + this.$common.qs({ ou_coupon_id: this.ruleData.id }) } @@ -105,7 +105,7 @@ } var data = this.getData(); console.log(data); - this.$c.$fenxiang(data.title, '', data.path, data.imageUrl); + this.$common.$fenxiang(data.title, '', data.path, data.imageUrl); }, open(opt) { this.ruleData = opt diff --git a/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue b/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue index 701c6a9..74998d0 100644 --- a/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue +++ b/components/detail-wuxian-lingzhu/detail-wuxian-lingzhu.vue @@ -248,7 +248,7 @@ export default { // 如果是玩法规则弹窗,需要获取规则数据 if (popName === 'playPop') { - this.$c.getRule(14).then(res => { + this.$common.getRule(14).then(res => { if (res.status == 1) { this.playRuleData = res.data; } diff --git a/components/float-ball/FloatBall.vue b/components/float-ball/FloatBall.vue index a53ea72..0f55beb 100644 --- a/components/float-ball/FloatBall.vue +++ b/components/float-ball/FloatBall.vue @@ -77,7 +77,7 @@ export default { methods: { BallClick(item) { if (item.type == 2) { - this.$c.nav(item.link_url); + this.$common.nav(item.link_url); return; } if (item.type == 1) { diff --git a/components/order-confirm-popup/order-confirm-popup-flw.vue b/components/order-confirm-popup/order-confirm-popup-flw.vue index d36deeb..720aa6d 100644 --- a/components/order-confirm-popup/order-confirm-popup-flw.vue +++ b/components/order-confirm-popup/order-confirm-popup-flw.vue @@ -82,11 +82,11 @@ 我已满18岁,阅读并同意 - + 《用户协议》 - + 《隐私政策》 diff --git a/components/order-confirm-popup/order-confirm-popup.vue b/components/order-confirm-popup/order-confirm-popup.vue index 3b079eb..48c12c9 100644 --- a/components/order-confirm-popup/order-confirm-popup.vue +++ b/components/order-confirm-popup/order-confirm-popup.vue @@ -135,10 +135,10 @@ 我已满18岁,阅读并同意 - + 《用户协议》 - + 《隐私政策》 @@ -252,7 +252,7 @@ export default { if (this.pageData != null && this.pageData.limitInfo != null) { let limitInfo = this.pageData.limitInfo; if (this.pageData.limitInfo.coupon_limit > 0 && limitInfo.user_coupon_remaining <= 0) { - this.$c.msg("今日使用优惠卷已达到上限") + this.$common.msg("今日使用优惠卷已达到上限") return; } } diff --git a/components/order-confirm-popup/order-confirm-popup.vue.bak b/components/order-confirm-popup/order-confirm-popup.vue.bak index 1f7e35a..1a480aa 100644 Binary files a/components/order-confirm-popup/order-confirm-popup.vue.bak and b/components/order-confirm-popup/order-confirm-popup.vue.bak differ diff --git a/components/priv-pop/priv-pop.vue b/components/priv-pop/priv-pop.vue index 5cf0706..3fb5ba4 100644 --- a/components/priv-pop/priv-pop.vue +++ b/components/priv-pop/priv-pop.vue @@ -10,7 +10,7 @@ 隐私保护指引 感谢选择我们的产品,我们非常重视您的个人信息安全和隐私保护.根据最新法律要求,使用我们的产品前,请仔细阅读 - + 《{{ $config.getAppSetting("app_name") }}隐私保护指引》 ,以便我们向您提供更优质的服务! diff --git a/components/rule-pop/rule-pop.vue b/components/rule-pop/rule-pop.vue index a5828eb..05be13a 100644 --- a/components/rule-pop/rule-pop.vue +++ b/components/rule-pop/rule-pop.vue @@ -58,7 +58,7 @@ export default { }) { if (!show) { if (this.todayHide) { - uni.setStorageSync('_last_notice_date', this.$c.getDateTime()) + uni.setStorageSync('_last_notice_date', this.$common.getDateTime()) } } }, @@ -76,7 +76,7 @@ export default { async getRule(id, title = '') { this.is_image_optimizer = false; this.images = []; - let { status, data, msg, is_image_optimizer } = await this.$c.getRule(id, true) + let { status, data, msg, is_image_optimizer } = await this.$common.getRule(id, true) if (status) { if (is_image_optimizer != null && is_image_optimizer == 1) { console.log('开启图片优化'); @@ -96,7 +96,7 @@ export default { content: data }) } else { - this.$c.toast(msg) + this.$common.toast(msg) } } } diff --git a/main.js b/main.js index b586873..866f51f 100644 --- a/main.js +++ b/main.js @@ -25,8 +25,6 @@ Vue.prototype.$z_img2 = EnvConfig.imageUrl + '/zcq/' Vue.prototype.$img = url => EnvConfig.imageBaseUrl + url Vue.prototype.$img1 = url => EnvConfig.iconBaseUrl + url Vue.prototype.$sys = () => uni.getSystemInfoSync() -Vue.prototype.$loginPage = EnvConfig.loginPage -Vue.prototype.$wxloginPage = EnvConfig.wxLoginUrl Vue.prototype.$platform = platform; // 公共方法 Vue.prototype.gotoPage = gotopage @@ -34,7 +32,7 @@ Vue.prototype.gotoPage = gotopage Vue.prototype.$customRouter = router Vue.prototype.$navigateTo = router.navigateTo Vue.prototype.$noMultipleClicks = common.noMultipleClicks -Vue.prototype.$c = common +Vue.prototype.$common = common; // 全局配置管理器 Vue.prototype.$config = ConfigManager // 全局请求方法 @@ -66,11 +64,5 @@ app.globalData = { siteBaseUrl: EnvConfig.apiBaseUrl } -// // 应用启动时加载全局配置 -// ConfigManager.init().then(config => { -// console.log('全局配置加载完成') -// }).catch(err => { -// console.error('全局配置加载失败', err) -// }) app.$mount() \ No newline at end of file diff --git a/manifest.json b/manifest.json index 8034b15..677b2c6 100644 --- a/manifest.json +++ b/manifest.json @@ -1,207 +1,207 @@ { - "name" : "友达赏王者", - "appid" : "__UNI__2E6CB39", - "description" : "", - "versionName" : "1.0.2", - "versionCode" : 102, - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "optimization" : { - "js" : { - "obfuscation" : true, // 开启代码混淆 - "compress" : true // 开启代码压缩 - } - }, - "compatible" : { - "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 - }, - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : { - "Payment" : {}, - "Camera" : {} - }, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "schemes" : "youdas" - }, - /* ios打包配置 */ - "ios" : { - "dSYMs" : false, - "urltypes" : "youdas", - "idfa" : false, - "privacyDescription" : { - "NSPhotoLibraryUsageDescription" : "为了设置您的个人头像,我们需要访问您的照片图库。这将允许您从相册中选择现有照片作为头像。我们只会在您主动选择更换头像时访问照片,未经您的许可绝不会查看您的其他照片。", - "NSPhotoLibraryAddUsageDescription" : "我们需要访问权限以便将生成的海报保存到您的相册中。这样您就可以方便地在照片应用中查看和分享这些海报。我们只会在您明确选择保存时才将图片存入相册。" - } - }, - /* SDK配置 */ - "sdkConfigs" : { - "ad" : {}, - "oauth" : { - "weixin" : { - "appid" : "wx3dcc897ef3f95446", - "appsecret" : "57b0a56910bc0a1625ddf3210585de1a", - "UniversalLinks" : "https://help.wechat.com/tq/" - }, - "apple" : {} - }, - "payment" : { - "alipay" : { - "__platform__" : [ "ios", "android" ] - } - }, - "share" : { - "weixin" : { - "appid" : "wx3dcc897ef3f95446", - "UniversalLinks" : "https://help.wechat.com/tq/" - } - }, - "push" : {} - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - }, - "splashscreen" : { - "androidStyle" : "common", - "android" : { - "hdpi" : "C:/Users/Administrator/Desktop/imgs/dealer_bg.png", - "xhdpi" : "C:/Users/Administrator/Desktop/imgs/dealer_bg.png", - "xxhdpi" : "C:/Users/Administrator/Desktop/imgs/dealer_bg.png" - }, - "useOriginalMsgbox" : true - } - }, - "uniStatistics" : { - "enable" : false - }, - "nvueCompiler" : "uni-app" - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wx683d8a8a499d7ec6", - "setting" : { - "urlCheck" : false, - "es6" : false, - "postcss" : true, - "minified" : true - }, - "usingComponents" : true, - "uniStatistics" : { - "enable" : false - }, - "requiredPrivateInfos" : [ "chooseAddress" ] - }, - "mp-alipay" : { - "usingComponents" : true, - "uniStatistics" : { - "enable" : false - } - }, - "mp-baidu" : { - "usingComponents" : true, - "uniStatistics" : { - "enable" : false - } - }, - "mp-toutiao" : { - "usingComponents" : true, - "uniStatistics" : { - "enable" : false - }, - "setting" : { - "es6" : true, - "urlCheck" : false - }, - "appid" : "tta5ead3573ad6d9d601" - }, - "uniStatistics" : { - "enable" : false - }, - "h5" : { - "router" : { - "mode" : "history", - "base" : "" - }, - "uniStatistics" : { - "enable" : false - }, - "devServer" : { - "https" : false - }, - "template" : "index.html" - }, - "vueVersion" : "2", - "mp-kuaishou" : { - "uniStatistics" : { - "enable" : false - } - }, - "mp-qq" : { - "uniStatistics" : { - "enable" : false - } - }, - "fallbackLocale" : "zh-Hans" -} + "name": "友达赏王者", + "appid": "__UNI__2E6CB39", + "description": "", + "versionName": "1.0.2", + "versionCode": 102, + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "optimization": { + "js": { + "obfuscation": true, // 开启代码混淆 + "compress": true // 开启代码压缩 + } + }, + "compatible": { + "ignoreVersion": true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 + }, + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": { + "Payment": {}, + "Camera": {} + }, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "schemes": "youdas" + }, + /* ios打包配置 */ + "ios": { + "dSYMs": false, + "urltypes": "youdas", + "idfa": false, + "privacyDescription": { + "NSPhotoLibraryUsageDescription": "为了设置您的个人头像,我们需要访问您的照片图库。这将允许您从相册中选择现有照片作为头像。我们只会在您主动选择更换头像时访问照片,未经您的许可绝不会查看您的其他照片。", + "NSPhotoLibraryAddUsageDescription": "我们需要访问权限以便将生成的海报保存到您的相册中。这样您就可以方便地在照片应用中查看和分享这些海报。我们只会在您明确选择保存时才将图片存入相册。" + } + }, + /* SDK配置 */ + "sdkConfigs": { + "ad": {}, + "oauth": { + "weixin": { + "appid": "wx3dcc897ef3f95446", + "appsecret": "57b0a56910bc0a1625ddf3210585de1a", + "UniversalLinks": "https://help.wechat.com/tq/" + }, + "apple": {} + }, + "payment": { + "alipay": { + "__platform__": ["ios", "android"] + } + }, + "share": { + "weixin": { + "appid": "wx3dcc897ef3f95446", + "UniversalLinks": "https://help.wechat.com/tq/" + } + }, + "push": {} + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + }, + "splashscreen": { + "androidStyle": "common", + "android": { + "hdpi": "C:/Users/Administrator/Desktop/imgs/dealer_bg.png", + "xhdpi": "C:/Users/Administrator/Desktop/imgs/dealer_bg.png", + "xxhdpi": "C:/Users/Administrator/Desktop/imgs/dealer_bg.png" + }, + "useOriginalMsgbox": true + } + }, + "uniStatistics": { + "enable": false + }, + "nvueCompiler": "uni-app" + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wx683d8a8a499d7ec6", + "setting": { + "urlCheck": false, + "es6": false, + "postcss": true, + "minified": true + }, + "usingComponents": true, + "uniStatistics": { + "enable": false + }, + "requiredPrivateInfos": ["chooseAddress"] + }, + "mp-alipay": { + "usingComponents": true, + "uniStatistics": { + "enable": false + } + }, + "mp-baidu": { + "usingComponents": true, + "uniStatistics": { + "enable": false + } + }, + "mp-toutiao": { + "usingComponents": true, + "uniStatistics": { + "enable": false + }, + "setting": { + "es6": true, + "urlCheck": false + }, + "appid": "tta5ead3573ad6d9d601" + }, + "uniStatistics": { + "enable": false + }, + "h5": { + "router": { + "mode": "history", + "base": "" + }, + "uniStatistics": { + "enable": false + }, + "devServer": { + "https": false + }, + "template": "index.html" + }, + "vueVersion": "2", + "mp-kuaishou": { + "uniStatistics": { + "enable": false + } + }, + "mp-qq": { + "uniStatistics": { + "enable": false + } + }, + "fallbackLocale": "zh-Hans" +} \ No newline at end of file diff --git a/pages.json b/pages.json index 8743861..010338f 100644 --- a/pages.json +++ b/pages.json @@ -405,14 +405,14 @@ "list": [ { "pagePath": "pages/main/index", - "iconPath": "static/tab/n1.png", - "selectedIconPath": "static/tab/c1.png", + "iconPath": "static/tab/home-n.png", + "selectedIconPath": "static/tab/home.png", "text": "首页" }, { "pagePath": "pages/shangcheng/index", - "iconPath": "static/tab/n5.png", - "selectedIconPath": "static/tab/c5.png", + "iconPath": "static/tab/ch-n.png", + "selectedIconPath": "static/tab/ch.png", "text": "商城" }, { diff --git a/pages/infinite/benefit.vue b/pages/infinite/benefit.vue index 9c77f9b..39a311d 100644 --- a/pages/infinite/benefit.vue +++ b/pages/infinite/benefit.vue @@ -3,7 +3,7 @@