diff --git a/README.md b/README.md index 76ee819..32fccb6 100644 --- a/README.md +++ b/README.md @@ -207,4 +207,10 @@ update update - 修复 查询支付结果异常的问题 - 增加 激活成功返回校园号首页 -- 取消 从接口获取套餐数据 \ No newline at end of file +- 取消 从接口获取套餐数据 + + +## v1.0.23 +`2023.2.26` +update +- 增加 激活成功显示页面 diff --git a/package-lock.json b/package-lock.json index db15661..c273b21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,9 @@ "@vant/area-data": "^1.2.2", "amfe-flexible": "^2.2.1", "axios": "^0.26.0", + "clipboard": "^2.0.11", "core-js": "^3.6.5", + "dayjs": "^1.11.7", "html2canvas": "^1.4.1", "nprogress": "^0.2.0", "rxjs": "^7.8.0", @@ -5391,6 +5393,16 @@ "node": ">= 10" } }, + "node_modules/clipboard": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", + "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", + "dependencies": { + "good-listener": "^1.2.2", + "select": "^1.1.2", + "tiny-emitter": "^2.0.0" + } + }, "node_modules/clipboardy": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", @@ -6556,6 +6568,11 @@ "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==", "dev": true }, + "node_modules/dayjs": { + "version": "1.11.7", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", + "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" + }, "node_modules/de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -6884,6 +6901,11 @@ "node": ">=0.4.0" } }, + "node_modules/delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" + }, "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -8838,6 +8860,14 @@ "node": ">=6" } }, + "node_modules/good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", + "dependencies": { + "delegate": "^3.1.2" + } + }, "node_modules/graceful-fs": { "version": "4.2.9", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", @@ -16159,6 +16189,11 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/select": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", + "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" + }, "node_modules/select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -17873,6 +17908,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "node_modules/tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" + }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -24225,6 +24265,16 @@ "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true }, + "clipboard": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", + "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", + "requires": { + "good-listener": "^1.2.2", + "select": "^1.1.2", + "tiny-emitter": "^2.0.0" + } + }, "clipboardy": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", @@ -25169,6 +25219,11 @@ "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==", "dev": true }, + "dayjs": { + "version": "1.11.7", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz", + "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==" + }, "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -25418,6 +25473,11 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -26966,6 +27026,14 @@ "slash": "^2.0.0" } }, + "good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", + "requires": { + "delegate": "^3.1.2" + } + }, "graceful-fs": { "version": "4.2.9", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", @@ -32814,6 +32882,11 @@ "ajv-keywords": "^3.5.2" } }, + "select": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", + "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", @@ -34250,6 +34323,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", diff --git a/package.json b/package.json index 444e6d4..2949606 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,11 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { - "amfe-flexible": "^2.2.1", "@vant/area-data": "^1.2.2", + "amfe-flexible": "^2.2.1", "axios": "^0.26.0", "core-js": "^3.6.5", + "dayjs": "^1.11.7", "html2canvas": "^1.4.1", "nprogress": "^0.2.0", "rxjs": "^7.8.0", @@ -23,7 +24,8 @@ "vue": "^2.6.11", "vue-router": "^3.2.0", "vuex": "^3.4.0", - "weixin-js-sdk": "^1.6.0" + "weixin-js-sdk": "^1.6.0", + "clipboard": "^2.0.11" }, "devDependencies": { "@vue/cli-plugin-babel": "^4.5.0", @@ -34,16 +36,16 @@ "@vue/test-utils": "^1.0.3", "babel-eslint": "^10.1.0", "babel-plugin-import": "^1.13.3", + "compression-webpack-plugin": "^5.0.0", "eslint": "^6.7.2", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^6.2.2", "lint-staged": "^9.5.0", + "postcss-pxtorem": "^5.1.1", "prettier": "^2.2.1", "sass": "^1.26.5", "sass-loader": "^8.0.2", - "vue-template-compiler": "^2.6.11", - "postcss-pxtorem": "^5.1.1", - "compression-webpack-plugin": "^5.0.0" + "vue-template-compiler": "^2.6.11" }, "gitHooks": { "pre-commit": "lint-staged" diff --git a/src/api/wx.js b/src/api/wx.js index 3927232..b64e253 100644 --- a/src/api/wx.js +++ b/src/api/wx.js @@ -13,6 +13,8 @@ const APIWx = { checkIsNewCustomer, //获取微信用户是否首次关注,即是否是新用户 ocr, //ocr识别 Effective, //激活接口 + GetCardInfo, + LckjGetOrderPackageShow } export default APIWx; function createJSSDK({ userId, sUrl, appId }) { @@ -46,4 +48,20 @@ function Effective(params) { method: 'post', data: params, }); +} +//获取物联网卡信息 +function GetCardInfo(params) { + return request({ + url: '/api/Command/GetCardInfo', + method: 'post', + data: params, + }); +} +// 随手精灵(查询零川物联卡加油包已订购套餐) +function LckjGetOrderPackageShow({ iccid, imei }){ + return request({ + url: '/api/IOTCard/LckjGetOrderPackageShow', + method: 'get', + params: { iccid, imei} + }) } \ No newline at end of file diff --git a/src/assets/img/news-noData.png b/src/assets/img/news-noData.png new file mode 100644 index 0000000..21cc7e9 Binary files /dev/null and b/src/assets/img/news-noData.png differ diff --git a/src/assets/img/unicom.png b/src/assets/img/unicom.png new file mode 100644 index 0000000..d1bf18b Binary files /dev/null and b/src/assets/img/unicom.png differ diff --git a/src/assets/img/yidong_logo.png b/src/assets/img/yidong_logo.png new file mode 100644 index 0000000..6b49efe Binary files /dev/null and b/src/assets/img/yidong_logo.png differ diff --git a/src/config/models.js b/src/config/models.js index d0ab05a..3c1ea02 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -1,11 +1,11 @@ /* * @Date: 2021-11-20 10:26:39 * @LastEditors: JinxChen - * @LastEditTime: 2022-07-21 16:41:11 - * @FilePath: \AntpayFrontEnd\src\config\models.js + * @LastEditTime: 2023-02-26 16:07:34 + * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.22F'; //版本号 +export const VERSION_MODEL = '1.0.23F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/main.js b/src/main.js index dc847fa..46e0df2 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ /* * @Date: 2022-01-19 10:08:26 * @LastEditors: JinxChen - * @LastEditTime: 2023-02-26 10:11:02 + * @LastEditTime: 2023-02-26 14:40:46 * @FilePath: \TelpoH5FrontendWeb\src\main.js * @description: */ @@ -11,6 +11,7 @@ import App from "./App.vue"; import router from "./router"; import store from "./store"; import '@/assets/css/reset.scss'; +import dayjs from 'dayjs'; // ui库按需引入 import 'vant/lib/index.css'; import { @@ -110,6 +111,7 @@ Dialog.setDefaultOptions({ showCancelButton: false, }); Vue.config.productionTip = false; +Vue.prototype.$dayjs = dayjs; Vue.prototype.$bus = new Vue(); new Vue({ router, diff --git a/src/router/index.js b/src/router/index.js index 4b192a8..ad8fefb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,3 +1,10 @@ +/* + * @Date: 2023-02-25 16:34:35 + * @LastEditors: JinxChen + * @LastEditTime: 2023-02-26 15:30:31 + * @FilePath: \TelpoH5FrontendWeb\src\router\index.js + * @description: + */ /* * @Date: 2022-01-19 10:08:26 * @LastEditors: JinxChen @@ -17,6 +24,10 @@ const routes = [ { path: '/packageHome', name: 'packageHome', component: resolve => require(['@/views/package-home'], resolve) }, { path: '/packageList', name: 'packageList', component: resolve => require(['@/views/package-list'], resolve) }, { path: '/payResult', name: 'payResult', component: resolve => require(['@/views/pay-result'], resolve) }, + { path: '/cardInfo', name: 'cardInfo', component: resolve => require(['@/views/card-info'], resolve) }, + { path: '/buyRecord', name: 'buyRecord', component: resolve => require(['@/views/buy-record'], resolve) }, + { path: '/activeStatus', name: 'activeStatus', component: resolve => require(['@/views/active-status'], resolve) }, + ]; diff --git a/src/views/active-status/index.vue b/src/views/active-status/index.vue new file mode 100644 index 0000000..e708b9f --- /dev/null +++ b/src/views/active-status/index.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/views/buy-record/index.vue b/src/views/buy-record/index.vue new file mode 100644 index 0000000..d69706d --- /dev/null +++ b/src/views/buy-record/index.vue @@ -0,0 +1,195 @@ + + + + + + diff --git a/src/views/card-info/index.vue b/src/views/card-info/index.vue new file mode 100644 index 0000000..45e309d --- /dev/null +++ b/src/views/card-info/index.vue @@ -0,0 +1,316 @@ + + + + + + diff --git a/src/views/package-list/index.vue b/src/views/package-list/index.vue index 5083e90..334eae4 100644 --- a/src/views/package-list/index.vue +++ b/src/views/package-list/index.vue @@ -1,7 +1,7 @@ @@ -149,6 +149,7 @@ export default { } }, created() { + this.getAuth(); this.getParams(); this.getWxAutograph(); /* this.getLiveBasePackage(); */ diff --git a/src/views/pay-result/index.vue b/src/views/pay-result/index.vue index 8fc469f..1775f60 100644 --- a/src/views/pay-result/index.vue +++ b/src/views/pay-result/index.vue @@ -1,7 +1,7 @@ @@ -44,6 +44,9 @@

激活电话卡

+
+

返回首页

+