diff --git a/pages/goods/goodsAuth.vue b/pages/goods/goodsAuth.vue index 1611a3f..f048955 100644 --- a/pages/goods/goodsAuth.vue +++ b/pages/goods/goodsAuth.vue @@ -97,6 +97,7 @@ methods: { // picker选择 pickerChange(e, key){ + console.log(key,e.detail.value) this[key] = e.detail.value }, // 图片预览 @@ -126,7 +127,7 @@ uni.showToast({ title: err.message, icon : 'none' - }) + }) }) } }) diff --git a/pages/index/index.vue b/pages/index/index.vue index 53c1cec..ea96376 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,615 +1,720 @@ - - - - - - - + + diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue index c445bd3..93414fe 100644 --- a/pages/vip/vip.vue +++ b/pages/vip/vip.vue @@ -111,7 +111,7 @@ {{voucher.status.value === 1?'申请审核中':''}}{{voucher.status.value === 3?'申请被驳回查看原因':''}} - 已开通 + @@ -177,7 +177,12 @@ }); this.identitie = res.identities if (type === 'cre') { - this.tabsIndex = res.identities.findIndex(val => val.identity_id == this.$Route.query.identity_id) + let Index = res.identities.findIndex(val => val.identity_id == this.$Route.query.identity_id) + if(Index+1 === res.identities){ + this.tabsIndex = Index + }else{ + this.tabsIndex = Index+1 + } } this.openCondition = res.identities[this.tabsIndex].obj_condition this.rights = res.identities[this.tabsIndex].rights diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js index cfa320e..124897c 100644 --- a/unpackage/dist/dev/app-plus/app-service.js +++ b/unpackage/dist/dev/app-plus/app-service.js @@ -2130,6 +2130,30 @@ __webpack_require__.r(__webpack_exports__); + + + + + + + + + + + + + + + + + + + + + + + + @@ -2152,6 +2176,10 @@ __webpack_require__.r(__webpack_exports__); var _chain = __webpack_require__(/*! @/apis/interfaces/chain */ 25); + + + + var _f2Min = _interopRequireDefault(__webpack_require__(/*! @/uni_modules/lime-f2/components/lime-f2/f2.min.js */ 31)); var _limeF = _interopRequireDefault(__webpack_require__(/*! @/uni_modules/lime-f2/components/lime-f2/ */ 33));function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };} // // @@ -2251,6 +2279,30 @@ var _limeF = _interopRequireDefault(__webpack_require__(/*! @/uni_modules/lime-f // // // +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// var _default = { components: { lF2: _limeF.default }, data: function data() {return { isAuth: false, chains: { // 区块链统计 balance: 0, height: 0, number: 0, score: 0, up: 0, stone: 0 }, account: { // 账户 coin: 0, crystal: 0 }, crystalArr: [], // 待领取 @@ -2260,23 +2312,17 @@ var _default = { components: { lF2: _limeF.default }, data: function data() {ret userAuth: { // 用户认证状态 certification: false, company: false, vip: false } };}, onShow: function onShow() {this.isAuth = this.$store.state.token != '';this.getIndex();}, methods: { // 求助信息 showHelp: function showHelp(key) {uni.showModal({ title: '提示', content: this.help[key], showCancel: false, confirmColor: '#8b64fd' });}, // 查看钱包账户 - navAccount: function navAccount(pathName) {__f__("log", 1111, " at pages/index/index.vue:150");if (!this.isAuth) {this.$Router.push({ name: 'Login' });return;}this.$Router.push({ name: pathName });}, // 发权证 - issueGoosd: function issueGoosd() {var _this = this;var typeAuth = '',pathName = '';if (this.userAuth.certification && this.userAuth.company && this.userAuth.vip) {this.$Router.push({ name: 'goodsManagement' });return;}if (!this.userAuth.certification) {typeAuth = '暂未完成个人认证,无法发布商品权证';pathName = 'Personal';}if (!this.userAuth.company) {typeAuth = '暂未开通平台会员节点,无法发布商品权证';pathName = 'vipIndex';}if (!this.userAuth.vip) {typeAuth = '企业未认证或企业认证审核中,无法发布商品权证';pathName = 'User';}uni.showModal({ title: '提示', content: typeAuth, cancelColor: '#555', cancelText: '稍后', confirmText: pathName === 'vipIndex' ? '去开通' : '去认证', confirmColor: '#8b64fd', success: function success(res) {__f__("log", pathName, " at pages/index/index.vue:187");if (res.confirm) {if (pathName === 'User') {_this.$Router.pushTab({ name: pathName });return;}_this.$Router.push({ name: pathName });}} });}, // 领取能量碎片 + navAccount: function navAccount(pathName) {__f__("log", 1111, " at pages/index/index.vue:178");if (!this.isAuth) {this.$Router.push({ name: 'Login' });return;}this.$Router.push({ name: pathName });}, // 发权证 + issueGoosd: function issueGoosd() {var _this = this;var typeAuth = '',pathName = '';if (this.userAuth.certification && this.userAuth.company && this.userAuth.vip) {this.$Router.push({ name: 'goodsManagement' });return;} else if (!this.userAuth.certification) {typeAuth = '暂未完成个人认证,无法发布商品权证';pathName = 'Personal';} else if (!this.userAuth.vip) {typeAuth = '暂未开通平台VIP会员节点,无法发布商品权证';pathName = 'vipIndex';} else if (!this.userAuth.company) {typeAuth = '企业未认证或企业认证审核中,无法发布商品权证';pathName = 'setting';}uni.showModal({ title: '提示', content: typeAuth, cancelColor: '#555', cancelText: '稍后', confirmText: pathName === 'vipIndex' ? '去开通' : '去认证', confirmColor: '#8b64fd', success: function success(res) {__f__("log", pathName, " at pages/index/index.vue:218");if (res.confirm) {// if (pathName === 'setting') { + // this.$Router.pushTab({ + // name: pathName + // }) + // return + // } + if (pathName === 'vipIndex') {__f__("log", _this.userAuth.identity, " at pages/index/index.vue:227");_this.$Router.push({ name: 'vipIndex', params: { identity_id: _this.userAuth.identity } });return;}_this.$Router.push({ name: pathName });}} });}, // 领取能量碎片 ledCrystal: function ledCrystal(index) {var _this2 = this; // 播放音频 var innerAudioContext = uni.createInnerAudioContext();innerAudioContext.autoplay = true;innerAudioContext.src = __webpack_require__(/*! @/static/mp3/crystal.mp3 */ 43); // 请求接口 - (0, _chain.thawlog)({ thaw_id: this.crystalArr[index].log_id, all_ids: this.allIds }).then(function (res) {uni.showToast({ image: __webpack_require__(/*! @/static/icons/crystal-icon.png */ 44), title: '+' + _this2.crystalArr[index].amount, duration: 2000 }); - _this2.$set(_this2.account, 'crystal', res.crystal); - _this2.ids = res.all_ids; - if (JSON.stringify(res.last) === '[]') { - _this2.$set(_this2.crystalArr, index, { - amount: null }); - - return; - } - _this2.$set(_this2.crystalArr, index, res.last); - }).catch(function (err) { - uni.showToast({ - icon: 'none', + (0, _chain.thawlog)({ thaw_id: this.crystalArr[index].log_id, all_ids: this.allIds }).then(function (res) {uni.showToast({ image: __webpack_require__(/*! @/static/icons/crystal-icon.png */ 44), title: '+' + _this2.crystalArr[index].amount, duration: 2000 });_this2.$set(_this2.account, 'crystal', res.crystal);_this2.ids = res.all_ids;if (JSON.stringify(res.last) === '[]') {_this2.$set(_this2.crystalArr, index, { amount: null });return;}_this2.$set(_this2.crystalArr, index, res.last);}).catch(function (err) {uni.showToast({ icon: 'none', title: err }); }); @@ -2294,7 +2340,8 @@ var _default = { components: { lF2: _limeF.default }, data: function data() {ret _this3.userAuth = { certification: crystalsData.is_certification, company: crystalsData.is_company, - vip: crystalsData.is_vip }; + vip: crystalsData.is_vip, + identity: crystalsData.identity }; _this3.crystalArr = crystalsData.crystal_array; _this3.allIds = crystalsData.all_ids; @@ -2356,13 +2403,17 @@ var _default = { components: { lF2: _limeF.default }, data: function data() {ret var type = open.openType; switch (type) { case 'switchTab': - this.$Router.pushTab({ name: open.path }); + this.$Router.pushTab({ + name: open.path }); + break; case 'web': window.location.href = open.path; break; case 'navigateTo': - this.$Router.push({ name: open.path }); + this.$Router.push({ + name: open.path }); + break;} } } };exports.default = _default; @@ -14523,20 +14574,9 @@ var render = function() { ] ) : _vm._e(), - _vm._$s( - 58, - "i", - !_vm.identitie[_vm.tabsIndex].can.show_button && - _vm.voucher === "" - ) - ? _c("view", { - staticClass: _vm._$s(58, "sc", "current-btn-sh"), - attrs: { _i: 58 } - }) - : _vm._e(), _c("view", { - staticClass: _vm._$s(59, "sc", "ios-bottom"), - attrs: { _i: 59 } + staticClass: _vm._$s(58, "sc", "ios-bottom"), + attrs: { _i: 58 } }) ] ) @@ -14773,7 +14813,12 @@ var _uploading = __webpack_require__(/*! @/apis/interfaces/uploading */ 97);func }); _this.identitie = res.identities; if (type === 'cre') { - _this.tabsIndex = res.identities.findIndex(function (val) {return val.identity_id == _this.$Route.query.identity_id;}); + var Index = res.identities.findIndex(function (val) {return val.identity_id == _this.$Route.query.identity_id;}); + if (Index + 1 === res.identities) { + _this.tabsIndex = Index; + } else { + _this.tabsIndex = Index + 1; + } } _this.openCondition = res.identities[_this.tabsIndex].obj_condition; _this.rights = res.identities[_this.tabsIndex].rights; @@ -20934,6 +20979,7 @@ var _uploading = __webpack_require__(/*! @/apis/interfaces/uploading */ 97);func methods: { // picker选择 pickerChange: function pickerChange(e, key) { + __f__("log", key, e.detail.value, " at pages/goods/goodsAuth.vue:100"); this[key] = e.detail.value; }, // 图片预览 diff --git a/unpackage/dist/dev/app-plus/app-view.js b/unpackage/dist/dev/app-plus/app-view.js index 869e7b2..d8f3960 100644 --- a/unpackage/dist/dev/app-plus/app-view.js +++ b/unpackage/dist/dev/app-plus/app-view.js @@ -2401,7 +2401,7 @@ var ___CSS_LOADER_URL_IMPORT_0___ = __webpack_require__(/*! @/static/background/ exports = ___CSS_LOADER_API_IMPORT___(false); var ___CSS_LOADER_URL_REPLACEMENT_0___ = ___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___); // Module -exports.push([module.i, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/* 星球旋转 */\n.ball[data-v-2be84a3c]{\n\tposition: absolute;\n\theight: 480rpx;\n\twidth: 480rpx;\n\ttop: 50%;\n\tleft: 50%;\n\tmargin-top: -240rpx;\n\tmargin-left: -240rpx;\n\tborder-radius: 50%;\n\t-webkit-transform-style: preserve-3d;\n\tbackground: url(" + ___CSS_LOADER_URL_REPLACEMENT_0___ + ") repeat-x;\n\t/* background-size: auto 100%; */\n\tbackground-size: 1616rpx;\n\t-webkit-animation: move-map-data-v-2be84a3c 60s infinite linear;\n\tanimation: move-map-data-v-2be84a3c 60s infinite linear;\n\tbox-shadow: 0 0 50rpx 50rpx rgba(31,25,34, .2);\n}\n.shadow[data-v-2be84a3c]{\n\tposition: absolute;\n\ttop: 1%;\n\tleft: 5%;\n\twidth: 90%;\n\theight: 90%;\n\tborder-radius: 50%;\n\t-webkit-filter: blur(5px);\n\t filter: blur(5px);\n\tz-index: 3;\n\tbackground: radial-gradient(circle at 50% 0, rgba(255,255,255, .6) , rgba(255, 255, 255, .0) 58%);\n}\n.ball[data-v-2be84a3c]:before,\n.ball[data-v-2be84a3c]::after{\n\tposition: absolute;\n\ttop: 0;\n\tleft: 0;\n\tcontent: \"\";\n\twidth: 100%;\n\theight: 100%;\n\tborder-radius: 50%;\n\t-webkit-filter: blur(5px);\n\t filter: blur(5px);\n\tz-index: 2;\n}\n.ball[data-v-2be84a3c]:before {\n\tbackground: radial-gradient(circle at 100% 50%, #5881d3 , rgba(255, 255, 255, .0) 45%);\n}\n.ball[data-v-2be84a3c]::after {\n\tbackground: radial-gradient(circle at 0 50%, #ca66e0 , rgba(255, 255, 255, .0) 45%);\n}\n@-webkit-keyframes move-map-data-v-2be84a3c {\n0% {background-position: -1616rpx 0;\n}\n100% {background-position: 0 0;}\n}\n@keyframes move-map-data-v-2be84a3c {\n0% {background-position: -1616rpx 0;\n}\n100% {background-position: 0 0;}\n}\n/* 水晶漂浮动画 */\n.oct-float[data-v-2be84a3c] {\n\t-webkit-animation: 4s octfloat-data-v-2be84a3c infinite;\n\t animation: 4s octfloat-data-v-2be84a3c infinite;\n}\n@-webkit-keyframes octfloat-data-v-2be84a3c {\n0% {\n\t\tmargin-top: 0;\n}\n50% {\n\t\tmargin-top: 10rpx;\n}\n100% {\n\t\tmargin-top: 0;\n}\n}\n@keyframes octfloat-data-v-2be84a3c {\n0% {\n\t\tmargin-top: 0;\n}\n50% {\n\t\tmargin-top: 10rpx;\n}\n100% {\n\t\tmargin-top: 0;\n}\n}\n", ""]); +exports.push([module.i, "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n/* 星球旋转 */\n.ball[data-v-2be84a3c] {\n\tposition: absolute;\n\theight: 480rpx;\n\twidth: 480rpx;\n\ttop: 50%;\n\tleft: 50%;\n\tmargin-top: -240rpx;\n\tmargin-left: -240rpx;\n\tborder-radius: 50%;\n\t-webkit-transform-style: preserve-3d;\n\tbackground: url(" + ___CSS_LOADER_URL_REPLACEMENT_0___ + ") repeat-x;\n\t/* background-size: auto 100%; */\n\tbackground-size: 1616rpx;\n\t-webkit-animation: move-map-data-v-2be84a3c 60s infinite linear;\n\tanimation: move-map-data-v-2be84a3c 60s infinite linear;\n\tbox-shadow: 0 0 50rpx 50rpx rgba(31, 25, 34, .2);\n}\n.shadow[data-v-2be84a3c] {\n\tposition: absolute;\n\ttop: 1%;\n\tleft: 5%;\n\twidth: 90%;\n\theight: 90%;\n\tborder-radius: 50%;\n\t-webkit-filter: blur(5px);\n\t filter: blur(5px);\n\tz-index: 3;\n\tbackground: radial-gradient(circle at 50% 0, rgba(255, 255, 255, .6), rgba(255, 255, 255, .0) 58%);\n}\n.ball[data-v-2be84a3c]:before,\n.ball[data-v-2be84a3c]::after {\n\tposition: absolute;\n\ttop: 0;\n\tleft: 0;\n\tcontent: \"\";\n\twidth: 100%;\n\theight: 100%;\n\tborder-radius: 50%;\n\t-webkit-filter: blur(5px);\n\t filter: blur(5px);\n\tz-index: 2;\n}\n.ball[data-v-2be84a3c]:before {\n\tbackground: radial-gradient(circle at 100% 50%, #5881d3, rgba(255, 255, 255, .0) 45%);\n}\n.ball[data-v-2be84a3c]::after {\n\tbackground: radial-gradient(circle at 0 50%, #ca66e0, rgba(255, 255, 255, .0) 45%);\n}\n@-webkit-keyframes move-map-data-v-2be84a3c {\n0% {\n\t\tbackground-position: -1616rpx 0;\n}\n100% {\n\t\tbackground-position: 0 0;\n}\n}\n@keyframes move-map-data-v-2be84a3c {\n0% {\n\t\tbackground-position: -1616rpx 0;\n}\n100% {\n\t\tbackground-position: 0 0;\n}\n}\n/* 水晶漂浮动画 */\n.oct-float[data-v-2be84a3c] {\n\t-webkit-animation: 4s octfloat-data-v-2be84a3c infinite;\n\t animation: 4s octfloat-data-v-2be84a3c infinite;\n}\n@-webkit-keyframes octfloat-data-v-2be84a3c {\n0% {\n\t\tmargin-top: 0;\n}\n50% {\n\t\tmargin-top: 10rpx;\n}\n100% {\n\t\tmargin-top: 0;\n}\n}\n@keyframes octfloat-data-v-2be84a3c {\n0% {\n\t\tmargin-top: 0;\n}\n50% {\n\t\tmargin-top: 10rpx;\n}\n100% {\n\t\tmargin-top: 0;\n}\n}\n", ""]); // Exports module.exports = exports; @@ -6381,16 +6381,9 @@ var render = function() { [_vm._v(_vm._$g(57, "t0-0") + _vm._$g(57, "t0-1"))] ) : _vm._e(), - _vm._$g(58, "i") - ? _c( - "v-uni-view", - { staticClass: _vm._$g(58, "sc"), attrs: { _i: 58 } }, - [_vm._v("已开通")] - ) - : _vm._e(), _c("v-uni-view", { - staticClass: _vm._$g(59, "sc"), - attrs: { _i: 59 } + staticClass: _vm._$g(58, "sc"), + attrs: { _i: 58 } }) ], 1