Browse Source

Signed-off-by: zhaobao <528046418@qq.com>

zhaobao 1 year ago
parent
commit
1dedcdd928

+ 2 - 1
App.vue

@@ -1,6 +1,7 @@
 <script>
 	export default {
-		onLaunch: function() {
+		onLaunch: function(e) {
+			// console.log(e)
 			console.log('App Launch')
 		},
 		onShow: function() {

+ 12 - 5
pages/index/index.vue

@@ -29,6 +29,7 @@
 <script>
 	import defAvatar from '@/static/avatar.png'
 	import {getByQr} from '@/api/openApi.js'
+	import {getQueryParams} from '@/utils/index.js'
 	export default {
 		data() {
 			return {
@@ -43,19 +44,25 @@
 		},
 		methods: {
 			init(options){
-				this.getData(options)
 				this.initUser()
+				if(options.query && options.query.hasOwnProperty('q') ){				
+				  let URL = decodeURIComponent(options.query.q);						
+				  options=getQueryParams(URL)			
+				}
+				this.getData(options)
 			},
 			initUser(){
 				let userInfo=uni.getStorageSync('accountInfo')
-				if(userInfo){this.user=userInfo}
+				if(userInfo){this.user=userInfo}else{
+					uni.redirectTo({
+						url:'/pages/login/index'
+					})
+				}
 			},
 			getData({ocId, code}){
 				if(!ocId){
 					let qrcode=uni.getStorageSync('qrcode')
-					if(!qrcode){
-					   return
-					}
+					if(!qrcode){return}
 					ocId=qrcode.ocId
 					code=qrcode.code
 				}

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


+ 2 - 1
unpackage/dist/dev/mp-weixin/common/main.js

@@ -99,7 +99,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _default = {
-  onLaunch: function onLaunch() {
+  onLaunch: function onLaunch(e) {
+    // console.log(e)
     console.log('App Launch');
   },
   onShow: function onShow() {

+ 31 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -20841,6 +20841,37 @@ function getChecklistByQr(ocId, targetId, checklistId) {
 
 /***/ }),
 
+/***/ 418:
+/*!**************************************************************!*\
+  !*** E:/work/Project_newGit/hptwxMiniProgram/utils/index.js ***!
+  \**************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getQueryParams = getQueryParams;
+var _slicedToArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ 5));
+function getQueryParams(url) {
+  var paramArr = url.slice(url.indexOf("?") + 1).split("&");
+  var params = {};
+  paramArr.map(function (param) {
+    var _param$split = param.split("="),
+      _param$split2 = (0, _slicedToArray2.default)(_param$split, 2),
+      key = _param$split2[0],
+      val = _param$split2[1];
+    params[key] = decodeURIComponent(val);
+  });
+  return params;
+}
+
+/***/ }),
+
 /***/ 42:
 /*!****************************************************************!*\
   !*** E:/work/Project_newGit/hptwxMiniProgram/utils/request.js ***!

+ 10 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -145,6 +145,7 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _avatar = _interopRequireDefault(__webpack_require__(/*! @/static/avatar.png */ 40));
 var _openApi = __webpack_require__(/*! @/api/openApi.js */ 41);
+var _index = __webpack_require__(/*! @/utils/index.js */ 418);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _default = {
@@ -161,13 +162,21 @@ var _default = {
   },
   methods: {
     init: function init(options) {
-      this.getData(options);
       this.initUser();
+      if (options.query && options.query.hasOwnProperty('q')) {
+        var URL = decodeURIComponent(options.query.q);
+        options = (0, _index.getQueryParams)(URL);
+      }
+      this.getData(options);
     },
     initUser: function initUser() {
       var userInfo = uni.getStorageSync('accountInfo');
       if (userInfo) {
         this.user = userInfo;
+      } else {
+        uni.redirectTo({
+          url: '/pages/login/index'
+        });
       }
     },
     getData: function getData(_ref) {

+ 9 - 0
utils/index.js

@@ -0,0 +1,9 @@
+export function getQueryParams(url) {
+    const paramArr = url.slice(url.indexOf("?") + 1).split("&");
+    const params = {};
+    paramArr.map((param) => {
+        const [key, val] = param.split("=");
+        params[key] = decodeURIComponent(val);
+    });
+    return params;
+}

Some files were not shown because too many files changed in this diff