submit

main.js

@@ -9,6 +9,8 @@ Vue.config.productionTip = false;
 App.mpType = "app";
 import uView from "./uview-ui";
 Vue.use(uView);
+import tmVuetify from "./tm-vuetify";
+Vue.use(tmVuetify)
 Vue.prototype.$api = api;
 Vue.prototype.$common = common;
 const app = new Vue({
@@ -16,7 +18,6 @@ const app = new Vue({
 });
 app.$mount();
 // #endif
-
 // #ifdef VUE3
 import { createSSRApp } from "vue";
 export function createApp() {

pages.json

@@ -64,8 +64,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
-
+		{
-
+			"path": "pages/order-goods/order-details",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/mine/index",
 			"style": {

unpackage/dist/dev/mp-weixin/app.json

@@ -1,10 +1,13 @@
 {
   "pages": [
+    "pages/login/login",
+    "pages/register/register",
+    "pages/realName/realName",
+    "pages/cameraContext/cameraContext",
     "pages/home/index",
     "pages/contract/index",
     "pages/order-goods/index",
     "pages/order-goods/order-details",
-    "pages/login/login",
     "pages/mine/index"
   ],
   "subPackages": [],

unpackage/dist/dev/mp-weixin/common/main.js

@@ -15,17 +15,21 @@ var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/run
 __webpack_require__(/*! uni-pages */ 26);
 var _App = _interopRequireDefault(__webpack_require__(/*! ./App */ 27));
 var _vue = _interopRequireDefault(__webpack_require__(/*! vue */ 25));
+var _http = _interopRequireDefault(__webpack_require__(/*! @/http/ */ 248));
+var _index = _interopRequireDefault(__webpack_require__(/*! ./common/index.js */ 251));
 __webpack_require__(/*! ./uni.promisify.adaptor */ 34);
 var _uviewUi = _interopRequireDefault(__webpack_require__(/*! ./uview-ui */ 35));
-var _tmVuetify = _interopRequireDefault(__webpack_require__(/*! ./tm-vuetify */ 248));
+var _tmVuetify = _interopRequireDefault(__webpack_require__(/*! ./tm-vuetify */ 421));
 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; }
 // @ts-ignore
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 _vue.default.config.productionTip = false;
-_App.default.mpType = 'app';
+_App.default.mpType = "app";
 _vue.default.use(_uviewUi.default);
 _vue.default.use(_tmVuetify.default);
+_vue.default.prototype.$api = _http.default;
+_vue.default.prototype.$common = _index.default;
 var app = new _vue.default(_objectSpread({}, _App.default));
 createApp(app).$mount();
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["createApp"]))

unpackage/dist/dev/mp-weixin/common/runtime.js

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/uiq-tabbar/uiq-tabbar":1,"tm-vuetify/components/tm-menu/tm-menu":1,"uview-ui/components/u-tabbar-item/u-tabbar-item":1,"uview-ui/components/u-tabbar/u-tabbar":1,"uview-ui/components/u-image/u-image":1,"tm-vuetify/components/tm-listitem/tm-listitem":1,"tm-vuetify/components/tm-maskFlow/tm-maskFlow":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-safe-bottom/u-safe-bottom":1,"uview-ui/components/u-transition/u-transition":1,"tm-vuetify/components/tm-icons/tm-icons":1,"tm-vuetify/components/tm-translate/tm-translate":1};
+/******/ 		var cssChunks = {"uview-ui/components/u-button/u-button":1,"uview-ui/components/u-icon/u-icon":1,"uview-ui/components/u-checkbox-group/u-checkbox-group":1,"uview-ui/components/u-checkbox/u-checkbox":1,"uview-ui/components/u-upload/u-upload":1,"components/uiq-tabbar/uiq-tabbar":1,"tm-vuetify/components/tm-menu/tm-menu":1,"uview-ui/components/u-input/u-input":1,"uview-ui/components/u-loading-icon/u-loading-icon":1,"uview-ui/components/u-tabbar-item/u-tabbar-item":1,"uview-ui/components/u-tabbar/u-tabbar":1,"uview-ui/components/u-image/u-image":1,"tm-vuetify/components/tm-listitem/tm-listitem":1,"tm-vuetify/components/tm-maskFlow/tm-maskFlow":1,"uview-ui/components/u-badge/u-badge":1,"uview-ui/components/u-safe-bottom/u-safe-bottom":1,"uview-ui/components/u-transition/u-transition":1,"tm-vuetify/components/tm-icons/tm-icons":1,"tm-vuetify/components/tm-translate/tm-translate":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/uiq-tabbar/uiq-tabbar":"components/uiq-tabbar/uiq-tabbar","uview-ui/components/u--image/u--image":"uview-ui/components/u--image/u--image","tm-vuetify/components/tm-menu/tm-menu":"tm-vuetify/components/tm-menu/tm-menu","uview-ui/components/u-tabbar-item/u-tabbar-item":"uview-ui/components/u-tabbar-item/u-tabbar-item","uview-ui/components/u-tabbar/u-tabbar":"uview-ui/components/u-tabbar/u-tabbar","uview-ui/components/u-image/u-image":"uview-ui/components/u-image/u-image","tm-vuetify/components/tm-grouplist/tm-grouplist":"tm-vuetify/components/tm-grouplist/tm-grouplist","tm-vuetify/components/tm-listitem/tm-listitem":"tm-vuetify/components/tm-listitem/tm-listitem","tm-vuetify/components/tm-maskFlow/tm-maskFlow":"tm-vuetify/components/tm-maskFlow/tm-maskFlow","uview-ui/components/u-badge/u-badge":"uview-ui/components/u-badge/u-badge","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","uview-ui/components/u-safe-bottom/u-safe-bottom":"uview-ui/components/u-safe-bottom/u-safe-bottom","uview-ui/components/u-transition/u-transition":"uview-ui/components/u-transition/u-transition","tm-vuetify/components/tm-icons/tm-icons":"tm-vuetify/components/tm-icons/tm-icons","tm-vuetify/components/tm-translate/tm-translate":"tm-vuetify/components/tm-translate/tm-translate"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"uview-ui/components/u--input/u--input":"uview-ui/components/u--input/u--input","uview-ui/components/u-button/u-button":"uview-ui/components/u-button/u-button","uview-ui/components/u-icon/u-icon":"uview-ui/components/u-icon/u-icon","uview-ui/components/u-checkbox-group/u-checkbox-group":"uview-ui/components/u-checkbox-group/u-checkbox-group","uview-ui/components/u-checkbox/u-checkbox":"uview-ui/components/u-checkbox/u-checkbox","uview-ui/components/u-upload/u-upload":"uview-ui/components/u-upload/u-upload","components/uiq-tabbar/uiq-tabbar":"components/uiq-tabbar/uiq-tabbar","uview-ui/components/u--image/u--image":"uview-ui/components/u--image/u--image","tm-vuetify/components/tm-menu/tm-menu":"tm-vuetify/components/tm-menu/tm-menu","uview-ui/components/u-input/u-input":"uview-ui/components/u-input/u-input","uview-ui/components/u-loading-icon/u-loading-icon":"uview-ui/components/u-loading-icon/u-loading-icon","uview-ui/components/u-tabbar-item/u-tabbar-item":"uview-ui/components/u-tabbar-item/u-tabbar-item","uview-ui/components/u-tabbar/u-tabbar":"uview-ui/components/u-tabbar/u-tabbar","uview-ui/components/u-image/u-image":"uview-ui/components/u-image/u-image","tm-vuetify/components/tm-grouplist/tm-grouplist":"tm-vuetify/components/tm-grouplist/tm-grouplist","tm-vuetify/components/tm-listitem/tm-listitem":"tm-vuetify/components/tm-listitem/tm-listitem","tm-vuetify/components/tm-maskFlow/tm-maskFlow":"tm-vuetify/components/tm-maskFlow/tm-maskFlow","uview-ui/components/u-badge/u-badge":"uview-ui/components/u-badge/u-badge","uview-ui/components/u-safe-bottom/u-safe-bottom":"uview-ui/components/u-safe-bottom/u-safe-bottom","uview-ui/components/u-transition/u-transition":"uview-ui/components/u-transition/u-transition","tm-vuetify/components/tm-icons/tm-icons":"tm-vuetify/components/tm-icons/tm-icons","tm-vuetify/components/tm-translate/tm-translate":"tm-vuetify/components/tm-translate/tm-translate"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -188,9 +188,9 @@ var _default = {
                 res = _context.sent;
                 if (res.status == 0) {
                   uni.setStorageSync("token", res.data.token);
-                  //   uni.redirectTo({
+                  uni.redirectTo({
-                  //     url: "../home/index"
+                    url: "/pages/register/register"
-                  //   });
+                  });
                 }
                 _context.next = 8;
                 break;
@@ -203,6 +203,113 @@ var _default = {
           }
         }, _callee);
       }))();
+    },
+    login: function login() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                // 获取code
+                uni.login({
+                  provider: "weixin",
+                  success: function () {
+                    var _success = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(res) {
+                      var res1;
+                      return _regenerator.default.wrap(function _callee2$(_context2) {
+                        while (1) {
+                          switch (_context2.prev = _context2.next) {
+                            case 0:
+                              _this2.code = res.code;
+                              _context2.next = 3;
+                              return _this2.$api.user.loginToken({
+                                wxLoginCode: res.code
+                              });
+                            case 3:
+                              res1 = _context2.sent;
+                              if (res1.status == 0) {
+                                if (res1.data.code == 2) {
+                                  _this2.isShow = true;
+                                  _this2.openId = res1.data.openid;
+                                } else {
+                                  uni.setStorageSync("token", res1.data.token);
+                                  uni.redirectTo({
+                                    url: "/pages/register/register"
+                                  });
+                                }
+                              } else {
+                                _this2.$common.msgToast(res1.msg);
+                              }
+                            case 5:
+                            case "end":
+                              return _context2.stop();
+                          }
+                        }
+                      }, _callee2);
+                    }));
+                    function success(_x) {
+                      return _success.apply(this, arguments);
+                    }
+                    return success;
+                  }()
+                });
+              case 1:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }))();
+    }
+  },
+  onLoad: function onLoad() {
+    var _this3 = this;
+    this.isLogoutShow = true;
+    if (!this.isLogoutShow) {
+      // 获取code
+      uni.login({
+        provider: "weixin",
+        success: function () {
+          var _success2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(res) {
+            var res1;
+            return _regenerator.default.wrap(function _callee4$(_context4) {
+              while (1) {
+                switch (_context4.prev = _context4.next) {
+                  case 0:
+                    _this3.code = res.code;
+                    _context4.next = 3;
+                    return _this3.$api.user.loginToken({
+                      wxLoginCode: res.code
+                    });
+                  case 3:
+                    res1 = _context4.sent;
+                    if (res1.status == 0) {
+                      if (res1.data.code == 2) {
+                        _this3.isShow = true;
+                        _this3.openId = res1.data.openid;
+                      } else {
+                        uni.setStorageSync("token", res1.data.token);
+                        uni.redirectTo({
+                          url: "/pages/register/register"
+                        });
+                      }
+                    } else {
+                      _this3.$common.msgToast(res1.msg);
+                    }
+                  case 5:
+                  case "end":
+                    return _context4.stop();
+                }
+              }
+            }, _callee4);
+          }));
+          function success(_x2) {
+            return _success2.apply(this, arguments);
+          }
+          return success;
+        }()
+      });
     }
   }
 };