diff --git a/App.vue b/App.vue index 18ea07b..381caaa 100644 --- a/App.vue +++ b/App.vue @@ -2,33 +2,53 @@ export default { onLaunch() { //#ifdef H5 - if (typeof WeixinJSBridge == 'object' && typeof WeixinJSBridge.invoke == 'function') { - handleFontSize() - } else { - document.addEventListener('WeixinJSBridgeReady', handleFontSize, false); - } - function handleFontSize() { - // 设置网页字体为默认大小 + if (typeof WeixinJSBridge == 'object' && typeof WeixinJSBridge.invoke == 'function') { + handleFontSize() + } else { + document.addEventListener('WeixinJSBridgeReady', handleFontSize, false); + } + function handleFontSize() { + // 设置网页字体为默认大小 + WeixinJSBridge.invoke('setFontSizeCallback', { + fontSize: 0 + }) + // 重写设置网页字体大小的事件 + WeixinJSBridge.on('menu:setfont', function() { WeixinJSBridge.invoke('setFontSizeCallback', { fontSize: 0 }) - // 重写设置网页字体大小的事件 - WeixinJSBridge.on('menu:setfont', function() { - WeixinJSBridge.invoke('setFontSizeCallback', { - fontSize: 0 - }) - }) - } - //#endif + }) + } + //#endif + + //#ifdef APP-PLUS + + console.log('检查更新') + //#endif }, onShow() { - console.log('App Show'); + uni.getClipboardData({ + success: res=> { + if(res.data.indexOf('$InviTaTiOn$CoDe/$-?') === 2){ + let parentId = res.data.replace('$InviTaTiOn$CoDe/$-?', '') + this.globalData.parentId = parentId.substr(0, 10) + if(res.data.indexOf('&GoodsId/$-?') === 30){ + let goodsId = res.data.substr(42, res.data.length - 1) + setTimeout(() => { + if(this.$Route.name === 'goodsDetails' && this.$Route.query.id === goodsId) return + this.$Router.push({name: 'goodsDetails', params: {id: goodsId}}) + }, 1000) + } + } + } + }) }, onHide() { console.log('App Hide'); }, globalData: { - mainColor: 'white' + mainColor: 'white', + parentId:'' } }; diff --git a/pages.json b/pages.json index adbffc6..7b2f80b 100644 --- a/pages.json +++ b/pages.json @@ -20,7 +20,6 @@ }, { "path": "pages/equity/index", "name": "equity", - "auth": true, "style": { "navigationBarTitleText": "通证商城", "navigationStyle": "custom", diff --git a/pages/login/login.vue b/pages/login/login.vue index eb4ab51..6df40bf 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -57,6 +57,8 @@ }, onShow(){ this.parentId = getApp().globalData.parentId + + }, methods: { // 用户登录 diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index 79c226b..cc0fcae 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -3861,7 +3861,7 @@ var router = (0, _uniSimpleRouter.createRouter)({ paramsToQuery: true }, platform: "app-plus", - routes: [].concat(_toConsumableArray([{"path":"/pages/index/index","name":"Index","aliasPath":"/"},{"path":"/pages/found/index","name":"Found","auth":true},{"path":"/pages/equity/index","name":"equity","auth":true},{"path":"/pages/equity/search","name":"Search","auth":true},{"path":"/pages/goods/goodsClassify","name":"goodsClassify"},{"path":"/pages/goods/lists","name":"goodsList"},{"path":"/pages/goods/confirmOrder","name":"ConfirmOrder"},{"path":"/pages/goods/payStatus","name":"PayStatus"},{"path":"/pages/goods/chain","name":"GoodsChain"},{"path":"/pages/goods/attestation","name":"GoodsAttestation"},{"path":"/pages/goods/tracedTo","name":"GoodstracedTo"},{"path":"/pages/user/index","name":"User","auth":true},{"path":"/pages/user/order/numberWeight","name":"NumberWeight"},{"path":"/pages/user/order/numberWeightInfo","name":"NumberWeightInfo"},{"path":"/pages/user/order/servicesOrder","name":"ServicesOrder"},{"path":"/pages/user/order/servicesOrderInfo","name":"ServicesOrderInfo"},{"path":"/pages/user/order/mallShipments","name":"MallShipments"},{"path":"/pages/user/order/logistics","name":"Orderlogistics"},{"path":"/pages/user/order/mallShipmentsInfo","name":"MallShipmentsInfo"},{"path":"/pages/user/address/list","name":"AddressList"},{"path":"/pages/user/address/create","name":"AddressCreate"},{"path":"/pages/user/code","name":"userCode","auth":false},{"path":"/pages/user/help","name":"userHelp","auth":true},{"path":"/pages/user/partner","name":"userPartner","auth":true},{"path":"/pages/user/clause","name":"userClause","auth":true},{"path":"/pages/user/followOfficial","name":"Official","auth":true},{"path":"/pages/vip/vip","name":"vipIndex"},{"path":"/pages/vip/agree","name":"vipAgree"},{"path":"/pages/vip/examine","name":"Examine"},{"path":"/pages/setting/setting","name":"setting","auth":true},{"path":"/pages/goods/management","name":"goodsManagement"},{"path":"/pages/goods/addClassify","name":"goodsaddClassify"},{"path":"/pages/goods/details","name":"goodsDetails"},{"path":"/pages/goods/add","name":"goodsAdd"},{"path":"/pages/goods/goodsAuth","name":"goodsAddAuth"},{"path":"/pages/coupons/management","name":"couponsManagement"},{"path":"/pages/coupons/add","name":"couponsAdd"},{"path":"/pages/coupons/magDetails","name":"couponsDetails"},{"path":"/pages/coupons/selectGoods","name":"couponsSelectGoods"},{"path":"/pages/login/login","name":"Login"},{"path":"/pages/login/guide","name":"loginGuide"},{"path":"/pages/login/agreement","name":"agreement"},{"path":"/pages/certification/personal","name":"Personal","auth":true},{"path":"/pages/setting/aboutUs","name":"aboutUs","auth":true},{"path":"/pages/company/approve","name":"companyApprove","auth":true},{"path":"/pages/news/index","name":"news","auth":true},{"path":"/pages/news/detail","name":"newsDetail","auth":true},{"path":"/pages/wallet/property","name":"walletProperty"},{"path":"/pages/wallet/redProperty","name":"walletRedProperty"},{"path":"/pages/wallet/extract","name":"Extract"},{"path":"/pages/wallet/extractRed","name":"ExtractRed"},{"path":"/pages/verification/index","name":"verificationIndex","auth":true},{"path":"/pages/verification/history","name":"verificationHistory","auth":true},{"path":"/pages/shop/lists","name":"shopLists","auth":true},{"path":"/pages/shop/create","name":"shopCreate","auth":true},{"path":"/pages/employees/list","name":"employeesList","auth":true},{"path":"/pages/employees/add","name":"employeesAdd","auth":true},{"path":"/pages/instrument/Spread","name":"instrumentSpread","auth":true},{"path":"/pages/instrument/basics","name":"instrumentBasics","auth":true},{"path":"/pages/wallet/fragment","name":"Fragment"},{"path":"/pages/wallet/addBank","name":"addBank"},{"path":"/pages/wallet/bankList","name":"bankList"},{"path":"/pages/wallet/withdrawList","name":"withdrawList"},{"path":"/pages/wxAuth/wxAuth","name":"wxAuth"},{"path":"/pages/clearOpen/clearOpen","name":"clearOpen"}]), [{ + routes: [].concat(_toConsumableArray([{"path":"/pages/index/index","name":"Index","aliasPath":"/"},{"path":"/pages/found/index","name":"Found","auth":true},{"path":"/pages/equity/index","name":"equity"},{"path":"/pages/equity/search","name":"Search","auth":true},{"path":"/pages/goods/goodsClassify","name":"goodsClassify"},{"path":"/pages/goods/lists","name":"goodsList"},{"path":"/pages/goods/confirmOrder","name":"ConfirmOrder"},{"path":"/pages/goods/payStatus","name":"PayStatus"},{"path":"/pages/goods/chain","name":"GoodsChain"},{"path":"/pages/goods/attestation","name":"GoodsAttestation"},{"path":"/pages/goods/tracedTo","name":"GoodstracedTo"},{"path":"/pages/user/index","name":"User","auth":true},{"path":"/pages/user/order/numberWeight","name":"NumberWeight"},{"path":"/pages/user/order/numberWeightInfo","name":"NumberWeightInfo"},{"path":"/pages/user/order/servicesOrder","name":"ServicesOrder"},{"path":"/pages/user/order/servicesOrderInfo","name":"ServicesOrderInfo"},{"path":"/pages/user/order/mallShipments","name":"MallShipments"},{"path":"/pages/user/order/logistics","name":"Orderlogistics"},{"path":"/pages/user/order/mallShipmentsInfo","name":"MallShipmentsInfo"},{"path":"/pages/user/address/list","name":"AddressList"},{"path":"/pages/user/address/create","name":"AddressCreate"},{"path":"/pages/user/code","name":"userCode","auth":false},{"path":"/pages/user/help","name":"userHelp","auth":true},{"path":"/pages/user/partner","name":"userPartner","auth":true},{"path":"/pages/user/clause","name":"userClause","auth":true},{"path":"/pages/user/followOfficial","name":"Official","auth":true},{"path":"/pages/vip/vip","name":"vipIndex"},{"path":"/pages/vip/agree","name":"vipAgree"},{"path":"/pages/vip/examine","name":"Examine"},{"path":"/pages/setting/setting","name":"setting","auth":true},{"path":"/pages/goods/management","name":"goodsManagement"},{"path":"/pages/goods/addClassify","name":"goodsaddClassify"},{"path":"/pages/goods/details","name":"goodsDetails"},{"path":"/pages/goods/add","name":"goodsAdd"},{"path":"/pages/goods/goodsAuth","name":"goodsAddAuth"},{"path":"/pages/coupons/management","name":"couponsManagement"},{"path":"/pages/coupons/add","name":"couponsAdd"},{"path":"/pages/coupons/magDetails","name":"couponsDetails"},{"path":"/pages/coupons/selectGoods","name":"couponsSelectGoods"},{"path":"/pages/login/login","name":"Login"},{"path":"/pages/login/guide","name":"loginGuide"},{"path":"/pages/login/agreement","name":"agreement"},{"path":"/pages/certification/personal","name":"Personal","auth":true},{"path":"/pages/setting/aboutUs","name":"aboutUs","auth":true},{"path":"/pages/company/approve","name":"companyApprove","auth":true},{"path":"/pages/news/index","name":"news","auth":true},{"path":"/pages/news/detail","name":"newsDetail","auth":true},{"path":"/pages/wallet/property","name":"walletProperty"},{"path":"/pages/wallet/redProperty","name":"walletRedProperty"},{"path":"/pages/wallet/extract","name":"Extract"},{"path":"/pages/wallet/extractRed","name":"ExtractRed"},{"path":"/pages/verification/index","name":"verificationIndex","auth":true},{"path":"/pages/verification/history","name":"verificationHistory","auth":true},{"path":"/pages/shop/lists","name":"shopLists","auth":true},{"path":"/pages/shop/create","name":"shopCreate","auth":true},{"path":"/pages/employees/list","name":"employeesList","auth":true},{"path":"/pages/employees/add","name":"employeesAdd","auth":true},{"path":"/pages/instrument/Spread","name":"instrumentSpread","auth":true},{"path":"/pages/instrument/basics","name":"instrumentBasics","auth":true},{"path":"/pages/wallet/fragment","name":"Fragment"},{"path":"/pages/wallet/addBank","name":"addBank"},{"path":"/pages/wallet/bankList","name":"bankList"},{"path":"/pages/wallet/withdrawList","name":"withdrawList"},{"path":"/pages/wxAuth/wxAuth","name":"wxAuth"},{"path":"/pages/clearOpen/clearOpen","name":"clearOpen"}]), [{ path: '*', name: '404', component: function component() {return Promise.resolve().then(function () {return _interopRequireWildcard(__webpack_require__(/*! @/pages/404/404 */ 32));});} }]) }); @@ -49396,7 +49396,9 @@ var _userAuth = _interopRequireDefault(__webpack_require__(/*! @/public/userAuth // var _default = { data: function data() {return { phone: "18245180131", code: "", parentId: "", smsTime: 60, getSms: false };}, onShow: function onShow() {this.parentId = getApp().globalData.parentId;}, methods: { // 用户登录 login: function login() {var _this = this;(0, _auth.smsAuth)({ mobileNo: this.phone, code: this.code, parent_id: this.parentId }).then(function (res) {_this.$store.commit('setToken', res.token_type + ' ' + res.access_token);if (_this.$Route.toName) {_this.$Router.back();} else {_this.$Router.replaceAll({ name: 'Index' });}}).catch(function (err) {uni.showToast({ title: err.message, icon: "none" });});}, // 获取验证码 - getPhoneCode: function getPhoneCode() {var _this2 = this;var outTime;(0, _auth.getSms)({ mobileNo: this.phone }).then(function (res) {uni.showToast({ title: res, icon: "none" }); + getPhoneCode: function getPhoneCode() {var _this2 = this;var outTime;(0, _auth.getSms)({ mobileNo: this.phone }).then(function (res) {uni.showToast({ + title: res, + icon: "none" }); _this2.getSms = true; outTime = setInterval(function () { @@ -70377,15 +70379,35 @@ __webpack_require__.r(__webpack_exports__); + + + + __f__("log", '检查更新', " at App.vue:26"); + }, - onShow: function onShow() { - __f__("log", 'App Show', " at App.vue:25"); + onShow: function onShow() {var _this = this; + uni.getClipboardData({ + success: function success(res) { + if (res.data.indexOf('$InviTaTiOn$CoDe/$-?') === 2) { + var parentId = res.data.replace('$InviTaTiOn$CoDe/$-?', ''); + _this.globalData.parentId = parentId.substr(0, 10); + if (res.data.indexOf('&GoodsId/$-?') === 30) { + var goodsId = res.data.substr(42, res.data.length - 1); + setTimeout(function () { + if (_this.$Route.name === 'goodsDetails' && _this.$Route.query.id === goodsId) return; + _this.$Router.push({ name: 'goodsDetails', params: { id: goodsId } }); + }, 1000); + } + } + } }); + }, onHide: function onHide() { - __f__("log", 'App Hide', " at App.vue:28"); + __f__("log", 'App Hide', " at App.vue:47"); }, globalData: { - mainColor: 'white' } };exports.default = _default; + mainColor: 'white', + parentId: '' } };exports.default = _default; /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/lib/format-log.js */ 39)["default"])) /***/ }),