Browse Source

fix some bugs

Leon 2 năm trước cách đây
mục cha
commit
892d7d290c

+ 6 - 0
config/index.ts

@@ -1,3 +1,4 @@
+const path = require('path');
 const config = {
 const config = {
   projectName: 'hola',
   projectName: 'hola',
   date: '2023-10-5',
   date: '2023-10-5',
@@ -23,6 +24,11 @@ const config = {
   cache: {
   cache: {
     enable: false // Webpack 持久化缓存配置,建议开启。默认配置请参考:https://docs.taro.zone/docs/config-detail#cache
     enable: false // Webpack 持久化缓存配置,建议开启。默认配置请参考:https://docs.taro.zone/docs/config-detail#cache
   },
   },
+  alias: {
+    '@components': path.resolve(__dirname, '..', 'src/components'),
+    '@assets': path.resolve(__dirname, '..', 'src/assets'),
+    '@utils': path.resolve(__dirname, '..', 'src/utils'),
+  },
   mini: {
   mini: {
     postcss: {
     postcss: {
       pxtransform: {
       pxtransform: {

+ 12 - 0
dist/app-origin.wxss

@@ -0,0 +1,12 @@
+/*!***********************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[4]!./src/app.scss ***!
+  \***********************************************************************************************************************************************************************************************************************************************************************************************************/
+page {
+  background-color: #000;
+}
+
+@media (prefers-color-scheme: dark) {
+  page {
+    background-color: #000;
+  }
+}

+ 9 - 74
dist/app.js

@@ -24,10 +24,10 @@ require("./runtime");
   \*****************************************************************************************/
   \*****************************************************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 
-/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/classCallCheck.js */ "./node_modules/@babel/runtime/helpers/esm/classCallCheck.js");
-/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/createClass.js */ "./node_modules/@babel/runtime/helpers/esm/createClass.js");
-/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/inherits.js */ "./node_modules/@babel/runtime/helpers/esm/inherits.js");
-/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/createSuper.js */ "./node_modules/@babel/runtime/helpers/esm/createSuper.js");
+/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/classCallCheck.js */ "./node_modules/@babel/runtime/helpers/esm/classCallCheck.js");
+/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/createClass.js */ "./node_modules/@babel/runtime/helpers/esm/createClass.js");
+/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/inherits.js */ "./node_modules/@babel/runtime/helpers/esm/inherits.js");
+/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/createSuper.js */ "./node_modules/@babel/runtime/helpers/esm/createSuper.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 
 
@@ -37,13 +37,13 @@ require("./runtime");
 
 
 
 
 var App = /*#__PURE__*/function (_Component) {
 var App = /*#__PURE__*/function (_Component) {
-  (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__["default"])(App, _Component);
-  var _super = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__["default"])(App);
+  (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_1__["default"])(App, _Component);
+  var _super = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_createSuper_js__WEBPACK_IMPORTED_MODULE_2__["default"])(App);
   function App() {
   function App() {
-    (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__["default"])(this, App);
+    (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_classCallCheck_js__WEBPACK_IMPORTED_MODULE_3__["default"])(this, App);
     return _super.apply(this, arguments);
     return _super.apply(this, arguments);
   }
   }
-  (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_4__["default"])(App, [{
+  (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_createClass_js__WEBPACK_IMPORTED_MODULE_4__["default"])(App, [{
     key: "componentDidMount",
     key: "componentDidMount",
     value: function componentDidMount() {}
     value: function componentDidMount() {}
   }, {
   }, {
@@ -321,77 +321,12 @@ function _setPrototypeOf(o, p) {
   return _setPrototypeOf(o, p);
   return _setPrototypeOf(o, p);
 }
 }
 
 
-/***/ }),
-
-/***/ "./node_modules/@babel/runtime/helpers/esm/toPrimitive.js":
-/*!****************************************************************!*\
-  !*** ./node_modules/@babel/runtime/helpers/esm/toPrimitive.js ***!
-  \****************************************************************/
-/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "default": function() { return /* binding */ _toPrimitive; }
-/* harmony export */ });
-/* harmony import */ var _typeof_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./typeof.js */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
-
-function _toPrimitive(input, hint) {
-  if ((0,_typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(input) !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if ((0,_typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(res) !== "object") return res;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (hint === "string" ? String : Number)(input);
-}
-
-/***/ }),
-
-/***/ "./node_modules/@babel/runtime/helpers/esm/toPropertyKey.js":
-/*!******************************************************************!*\
-  !*** ./node_modules/@babel/runtime/helpers/esm/toPropertyKey.js ***!
-  \******************************************************************/
-/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "default": function() { return /* binding */ _toPropertyKey; }
-/* harmony export */ });
-/* harmony import */ var _typeof_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./typeof.js */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
-/* harmony import */ var _toPrimitive_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./toPrimitive.js */ "./node_modules/@babel/runtime/helpers/esm/toPrimitive.js");
-
-
-function _toPropertyKey(arg) {
-  var key = (0,_toPrimitive_js__WEBPACK_IMPORTED_MODULE_0__["default"])(arg, "string");
-  return (0,_typeof_js__WEBPACK_IMPORTED_MODULE_1__["default"])(key) === "symbol" ? key : String(key);
-}
-
-/***/ }),
-
-/***/ "./node_modules/@babel/runtime/helpers/esm/typeof.js":
-/*!***********************************************************!*\
-  !*** ./node_modules/@babel/runtime/helpers/esm/typeof.js ***!
-  \***********************************************************/
-/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "default": function() { return /* binding */ _typeof; }
-/* harmony export */ });
-function _typeof(o) {
-  "@babel/helpers - typeof";
-
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-    return typeof o;
-  } : function (o) {
-    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-  }, _typeof(o);
-}
-
 /***/ })
 /***/ })
 
 
 },
 },
 /******/ function(__webpack_require__) { // webpackRuntimeModules
 /******/ function(__webpack_require__) { // webpackRuntimeModules
 /******/ var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId); }
 /******/ var __webpack_exec__ = function(moduleId) { return __webpack_require__(__webpack_require__.s = moduleId); }
-/******/ __webpack_require__.O(0, ["common"], function() { return __webpack_exec__("./src/app.ts"); });
+/******/ __webpack_require__.O(0, ["vendors","common"], function() { return __webpack_exec__("./src/app.ts"); });
 /******/ var __webpack_exports__ = __webpack_require__.O();
 /******/ var __webpack_exports__ = __webpack_require__.O();
 /******/ }
 /******/ }
 ]);;;
 ]);;;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/app.js.map


+ 2 - 4
dist/app.wxss

@@ -1,4 +1,2 @@
-/*!***********************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[4]!./src/app.scss ***!
-  \***********************************************************************************************************************************************************************************************************************************************************************************************************/
-
+@import "./app-origin.wxss";
+@import "./common.wxss";

+ 45 - 0
dist/common.js

@@ -1,6 +1,41 @@
 "use strict";
 "use strict";
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([["common"],{
 (wx["webpackJsonp"] = wx["webpackJsonp"] || []).push([["common"],{
 
 
+/***/ "./src/components/Buttons.tsx":
+/*!************************************!*\
+  !*** ./src/components/Buttons.tsx ***!
+  \************************************/
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": function() { return /* binding */ Buttons; }
+/* harmony export */ });
+/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js */ "./node_modules/@babel/runtime/helpers/esm/objectSpread2.js");
+/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
+/* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/types */ "./src/utils/types.ts");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__);
+
+
+
+
+
+function Buttons(props) {
+  var myStyle = props.status == _utils_types__WEBPACK_IMPORTED_MODULE_0__.ComponentStatus.disable ? {
+    opacity: 0.4
+  } : {};
+  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.View, {
+    style: (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__["default"])((0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_3__["default"])({}, myStyle), props.style),
+    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Button, {
+      className: props.type == _utils_types__WEBPACK_IMPORTED_MODULE_0__.ButtonType.outline ? 'outline_btn' : 'btn',
+      onClick: props.onClick,
+      children: props.title
+    })
+  });
+}
+
+/***/ }),
+
 /***/ "./src/components/Rings.weapp.tsx":
 /***/ "./src/components/Rings.weapp.tsx":
 /*!****************************************!*\
 /*!****************************************!*\
   !*** ./src/components/Rings.weapp.tsx ***!
   !*** ./src/components/Rings.weapp.tsx ***!
@@ -95,6 +130,16 @@ var ComponentStatus = /*#__PURE__*/function (ComponentStatus) {
   return ComponentStatus;
   return ComponentStatus;
 }({});
 }({});
 
 
+/***/ }),
+
+/***/ "./src/assets/svg/check.svg":
+/*!**********************************!*\
+  !*** ./src/assets/svg/check.svg ***!
+  \**********************************/
+/***/ (function(module) {
+
+module.exports = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBmaWxsPSJub25lIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxOCIgaGVpZ2h0PSIxMyIgdmlld0JveD0iMCAwIDE4IDEzIj48Zz48cGF0aCBkPSJNMTcuNzA3MSwwLjI5Mjg5M0MxOC4wOTc2LDAuNjgzNDE3LDE4LjA5NzYsMS4zMTY1OCwxNy43MDcxLDEuNzA3MTFDMTcuNzA3MSwxLjcwNzExLDYuNzA3MTEsMTIuNzA3MSw2LjcwNzExLDEyLjcwNzFDNi4zMTY1OCwxMy4wOTc2LDUuNjgzNDIsMTMuMDk3Niw1LjI5Mjg5LDEyLjcwNzFDNS4yOTI4OSwxMi43MDcxLDAuMjkyODkzLDcuNzA3MTEsMC4yOTI4OTMsNy43MDcxMUMtMC4wOTc2MzExLDcuMzE2NTgsLTAuMDk3NjMxMSw2LjY4MzQyLDAuMjkyODkzLDYuMjkyODlDMC42ODM0MTcsNS45MDIzNywxLjMxNjU4LDUuOTAyMzcsMS43MDcxMSw2LjI5Mjg5QzEuNzA3MTEsNi4yOTI4OSw2LDEwLjU4NTgsNiwxMC41ODU4QzYsMTAuNTg1OCwxNi4yOTI5LDAuMjkyODkzLDE2LjI5MjksMC4yOTI4OTNDMTYuNjgzNCwtMC4wOTc2MzExLDE3LjMxNjYsLTAuMDk3NjMxMSwxNy43MDcxLDAuMjkyODkzQzE3LjcwNzEsMC4yOTI4OTMsMTcuNzA3MSwwLjI5Mjg5MywxNy43MDcxLDAuMjkyODkzWiIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsPSIjQUFGRjAwIiBmaWxsLW9wYWNpdHk9IjEiLz48L2c+PC9zdmc+";
+
 /***/ })
 /***/ })
 
 
 }]);
 }]);

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/common.js.map


+ 27 - 0
dist/common.wxss

@@ -0,0 +1,27 @@
+/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[4]!./src/components/Buttons.scss ***!
+  \**************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/* #ifdef weapp */
+.btn {
+  background-color: #AAFF00;
+  border: none;
+  height: 90rpx;
+  border-radius: 45rpx;
+}
+.outline_btn {
+  border: solid 4rpx #AAFF00 !important;
+  background-color: transparent;
+  color: #AAFF00;
+  border: none;
+  height: 90rpx !important;
+  border-radius: 45rpx !important;
+}
+/* #endif */
+/* #ifdef rn */
+/* #endif */
+.btn::after {
+  border: 0;
+}
+.outline_btn::after {
+  border: none;
+}

+ 55 - 19
dist/pages/Auth.js

@@ -26,8 +26,7 @@ function Page() {
   });
   });
   return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.View, {
   return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.View, {
     style: {
     style: {
-      backgroundColor: '#000',
-      height: '100vh'
+      backgroundColor: '#000'
     },
     },
     children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_features_auth_components_Auth__WEBPACK_IMPORTED_MODULE_1__["default"], {})
     children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_features_auth_components_Auth__WEBPACK_IMPORTED_MODULE_1__["default"], {})
   });
   });
@@ -68,7 +67,7 @@ function Component(props) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": function() { return /* binding */ Component; }
 /* harmony export */   "default": function() { return /* binding */ Component; }
 /* harmony export */ });
 /* harmony export */ });
-/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
+/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
 /* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
@@ -81,7 +80,7 @@ function Component(props) {
 
 
 function Component(props) {
 function Component(props) {
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
-    _useState2 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState, 2),
+    _useState2 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__["default"])(_useState, 2),
     isFocus = _useState2[0],
     isFocus = _useState2[0],
     setIsFocus = _useState2[1];
     setIsFocus = _useState2[1];
   return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.View, {
   return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.View, {
@@ -150,13 +149,18 @@ function Component(props) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": function() { return /* binding */ Auth; }
 /* harmony export */   "default": function() { return /* binding */ Auth; }
 /* harmony export */ });
 /* harmony export */ });
-/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
-/* harmony import */ var _components_Texts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../../components/Texts */ "./src/components/Texts.tsx");
+/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
+/* harmony import */ var _components_Texts__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @components/Texts */ "./src/components/Texts.tsx");
 /* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../utils/types */ "./src/utils/types.ts");
 /* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../utils/types */ "./src/utils/types.ts");
-/* harmony import */ var _components_Box__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../components/Box */ "./src/components/Box.tsx");
-/* harmony import */ var _components_Inputs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../components/Inputs */ "./src/components/Inputs.tsx");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _components_Box__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @components/Box */ "./src/components/Box.tsx");
+/* harmony import */ var _components_Inputs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @components/Inputs */ "./src/components/Inputs.tsx");
+/* harmony import */ var _components_Buttons__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @components/Buttons */ "./src/components/Buttons.tsx");
+/* harmony import */ var _assets_svg_check_svg__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @assets/svg/check.svg */ "./src/assets/svg/check.svg");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
+/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__);
+
+
+
 
 
 
 
 
 
@@ -166,34 +170,66 @@ function Component(props) {
 
 
 function Auth() {
 function Auth() {
   function loginComponent() {
   function loginComponent() {
-    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_5__.View, {
-      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
+    return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
         placeholder: "Username"
         placeholder: "Username"
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_5__.View, {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
         style: {
         style: {
           height: 20
           height: 20
         }
         }
-      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_components_Inputs__WEBPACK_IMPORTED_MODULE_3__["default"], {
         placeholder: "Password"
         placeholder: "Password"
       })]
       })]
     });
     });
   }
   }
   function register() {}
   function register() {}
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_5__.View, {
+  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
     style: {
     style: {
       backgroundColor: '#000',
       backgroundColor: '#000',
       flex: 1,
       flex: 1,
       flexDirection: 'column',
       flexDirection: 'column',
-      display: 'flex'
+      display: 'flex',
+      height: '100vh'
     },
     },
-    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_0__["default"], {
+    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_0__["default"], {
       text: "Create account",
       text: "Create account",
       type: _utils_types__WEBPACK_IMPORTED_MODULE_1__.TextType.primary
       type: _utils_types__WEBPACK_IMPORTED_MODULE_1__.TextType.primary
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_0__["default"], {
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_components_Texts__WEBPACK_IMPORTED_MODULE_0__["default"], {
       text: "Claim your username now!",
       text: "Claim your username now!",
       type: _utils_types__WEBPACK_IMPORTED_MODULE_1__.TextType.secondary
       type: _utils_types__WEBPACK_IMPORTED_MODULE_1__.TextType.secondary
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_components_Box__WEBPACK_IMPORTED_MODULE_2__["default"], {
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_components_Box__WEBPACK_IMPORTED_MODULE_2__["default"], {
       child: loginComponent()
       child: loginComponent()
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_components_Buttons__WEBPACK_IMPORTED_MODULE_4__["default"], {
+      title: "Next",
+      style: {
+        marginLeft: 23,
+        marginRight: 23,
+        marginTop: 20,
+        marginBottom: 20
+      },
+      status: _utils_types__WEBPACK_IMPORTED_MODULE_1__.ComponentStatus.disable
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      className: "agree_view",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Image, {
+        style: "width:12px;height:12px;",
+        src: _assets_svg_check_svg__WEBPACK_IMPORTED_MODULE_5__
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+        className: "agree_text",
+        children: "I agree to the Terms of Service and Privacy Policy."
+      })]
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      style: {
+        flex: 1
+      }
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.View, {
+      className: "footer",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+        className: "have_account",
+        children: "Already have an account?"
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_7__.Text, {
+        className: "login",
+        children: "Login"
+      })]
     })]
     })]
   });
   });
 }
 }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/pages/Auth.js.map


+ 52 - 0
dist/pages/Auth.wxss

@@ -55,3 +55,55 @@
 .input_focus {
 .input_focus {
   border: solid 4rpx #AAFF00;
   border: solid 4rpx #AAFF00;
 }
 }
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[4]!./src/features/auth/components/Auth.scss ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.agree_view {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+          flex-direction: row;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  width: 100%;
+  opacity: 0.4;
+}
+
+.agree_text {
+  font-size: 24rpx;
+  color: #fff;
+}
+
+.footer {
+  margin-bottom: 120rpx;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: row;
+      -ms-flex-direction: row;
+          flex-direction: row;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  width: 100%;
+}
+
+.have_account {
+  font-size: 28rpx;
+  color: #fff;
+  opacity: 0.4;
+}
+
+.login {
+  font-size: 28rpx;
+  color: #AAFF00;
+}

+ 10 - 49
dist/pages/Login.js

@@ -11,9 +11,9 @@
 /* harmony export */   "default": function() { return /* binding */ Login; }
 /* harmony export */   "default": function() { return /* binding */ Login; }
 /* harmony export */ });
 /* harmony export */ });
 /* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
-/* harmony import */ var _components_Buttons__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../components/Buttons */ "./src/components/Buttons.tsx");
-/* harmony import */ var _components_SingleSelect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../components/SingleSelect */ "./src/components/SingleSelect.tsx");
-/* harmony import */ var _components_Rings_weapp__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../components/Rings.weapp */ "./src/components/Rings.weapp.tsx");
+/* harmony import */ var _components_Buttons__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @components/Buttons */ "./src/components/Buttons.tsx");
+/* harmony import */ var _components_SingleSelect__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @components/SingleSelect */ "./src/components/SingleSelect.tsx");
+/* harmony import */ var _components_Rings__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @components/Rings */ "./src/components/Rings.weapp.tsx");
 /* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/types */ "./src/utils/types.ts");
 /* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils/types */ "./src/utils/types.ts");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_4__);
@@ -33,7 +33,7 @@ function Login() {
   array.push( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
   array.push( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.Text, {
     children: "ffff"
     children: "ffff"
   }));
   }));
-  array.push( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_components_Rings_weapp__WEBPACK_IMPORTED_MODULE_2__["default"], {
+  array.push( /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_components_Rings__WEBPACK_IMPORTED_MODULE_2__["default"], {
     radius: 50,
     radius: 50,
     strokeWidth: 5,
     strokeWidth: 5,
     color: "pink"
     color: "pink"
@@ -41,7 +41,7 @@ function Login() {
   function goAuth() {
   function goAuth() {
     // console.log('goAuth')
     // console.log('goAuth')
     _tarojs_taro__WEBPACK_IMPORTED_MODULE_4___default().navigateTo({
     _tarojs_taro__WEBPACK_IMPORTED_MODULE_4___default().navigateTo({
-      url: './Auth'
+      url: '/pages/Auth'
     });
     });
   }
   }
   return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
   return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_6__.View, {
@@ -83,38 +83,6 @@ function Login() {
 
 
 /***/ }),
 /***/ }),
 
 
-/***/ "./src/components/Buttons.tsx":
-/*!************************************!*\
-  !*** ./src/components/Buttons.tsx ***!
-  \************************************/
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "default": function() { return /* binding */ Buttons; }
-/* harmony export */ });
-/* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
-/* harmony import */ var _utils_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../utils/types */ "./src/utils/types.ts");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__);
-
-
-
-
-function Buttons(props) {
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.View, {
-    style: props.status == _utils_types__WEBPACK_IMPORTED_MODULE_0__.ComponentStatus.disable ? {
-      opacity: 0.4
-    } : {},
-    children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_2__.Button, {
-      className: props.type == _utils_types__WEBPACK_IMPORTED_MODULE_0__.ButtonType.outline ? 'outline_btn' : 'btn',
-      onClick: props.onClick,
-      children: props.title
-    })
-  });
-}
-
-/***/ }),
-
 /***/ "./src/components/SingleSelect.tsx":
 /***/ "./src/components/SingleSelect.tsx":
 /*!*****************************************!*\
 /*!*****************************************!*\
   !*** ./src/components/SingleSelect.tsx ***!
   !*** ./src/components/SingleSelect.tsx ***!
@@ -124,7 +92,7 @@ function Buttons(props) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": function() { return /* binding */ Component; }
 /* harmony export */   "default": function() { return /* binding */ Component; }
 /* harmony export */ });
 /* harmony export */ });
-/* harmony import */ var _Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
+/* harmony import */ var _Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js */ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js");
 /* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "webpack/container/remote/react");
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
@@ -140,7 +108,7 @@ function Buttons(props) {
 
 
 function Component(props) {
 function Component(props) {
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(-1),
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(-1),
-    _useState2 = (0,_Users_Work_taro_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__["default"])(_useState, 2),
+    _useState2 = (0,_Users_Work_hola2_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_3__["default"])(_useState, 2),
     selIndex = _useState2[0],
     selIndex = _useState2[0],
     setSelIndex = _useState2[1];
     setSelIndex = _useState2[1];
   function isString(variable) {
   function isString(variable) {
@@ -154,6 +122,9 @@ function Component(props) {
           return setSelIndex(index);
           return setSelIndex(index);
         },
         },
         children: [isString(item) ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
         children: [isString(item) ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Text, {
+          style: {
+            color: '#fff'
+          },
           children: item
           children: item
         }) : item, selIndex == index ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Image, {
         }) : item, selIndex == index ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_4__.Image, {
           style: "width:12px;height:12px;",
           style: "width:12px;height:12px;",
@@ -186,16 +157,6 @@ var inst = Page((0,_tarojs_runtime__WEBPACK_IMPORTED_MODULE_0__.createPageConfig
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = (_node_modules_babel_loader_lib_index_js_ruleSet_1_rules_5_use_0_Login_tsx__WEBPACK_IMPORTED_MODULE_1__["default"]);
 /* unused harmony default export */ var __WEBPACK_DEFAULT_EXPORT__ = (_node_modules_babel_loader_lib_index_js_ruleSet_1_rules_5_use_0_Login_tsx__WEBPACK_IMPORTED_MODULE_1__["default"]);
 
 
 
 
-/***/ }),
-
-/***/ "./src/assets/svg/check.svg":
-/*!**********************************!*\
-  !*** ./src/assets/svg/check.svg ***!
-  \**********************************/
-/***/ (function(module) {
-
-module.exports = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBmaWxsPSJub25lIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxOCIgaGVpZ2h0PSIxMyIgdmlld0JveD0iMCAwIDE4IDEzIj48Zz48cGF0aCBkPSJNMTcuNzA3MSwwLjI5Mjg5M0MxOC4wOTc2LDAuNjgzNDE3LDE4LjA5NzYsMS4zMTY1OCwxNy43MDcxLDEuNzA3MTFDMTcuNzA3MSwxLjcwNzExLDYuNzA3MTEsMTIuNzA3MSw2LjcwNzExLDEyLjcwNzFDNi4zMTY1OCwxMy4wOTc2LDUuNjgzNDIsMTMuMDk3Niw1LjI5Mjg5LDEyLjcwNzFDNS4yOTI4OSwxMi43MDcxLDAuMjkyODkzLDcuNzA3MTEsMC4yOTI4OTMsNy43MDcxMUMtMC4wOTc2MzExLDcuMzE2NTgsLTAuMDk3NjMxMSw2LjY4MzQyLDAuMjkyODkzLDYuMjkyODlDMC42ODM0MTcsNS45MDIzNywxLjMxNjU4LDUuOTAyMzcsMS43MDcxMSw2LjI5Mjg5QzEuNzA3MTEsNi4yOTI4OSw2LDEwLjU4NTgsNiwxMC41ODU4QzYsMTAuNTg1OCwxNi4yOTI5LDAuMjkyODkzLDE2LjI5MjksMC4yOTI4OTNDMTYuNjgzNCwtMC4wOTc2MzExLDE3LjMxNjYsLTAuMDk3NjMxMSwxNy43MDcxLDAuMjkyODkzQzE3LjcwNzEsMC4yOTI4OTMsMTcuNzA3MSwwLjI5Mjg5MywxNy43MDcxLDAuMjkyODkzWiIgZmlsbC1ydWxlPSJldmVub2RkIiBmaWxsPSIjQUFGRjAwIiBmaWxsLW9wYWNpdHk9IjEiLz48L2c+PC9zdmc+";
-
 /***/ })
 /***/ })
 
 
 },
 },

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/pages/Login.js.map


+ 0 - 26
dist/pages/Login.wxss

@@ -1,29 +1,3 @@
-/*!**************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[4]!./src/components/Buttons.scss ***!
-  \**************************************************************************************************************************************************************************************************************************************************************************************************************************/
-.btn {
-  background-color: #AAFF00;
-  border: none;
-  height: 90rpx;
-  border-radius: 45rpx;
-}
-
-.btn::after {
-  border: 0;
-}
-
-.outline_btn {
-  border: solid 4rpx #AAFF00 !important;
-  background-color: transparent;
-  color: #AAFF00;
-  border: none;
-  height: 90rpx !important;
-  border-radius: 45rpx !important;
-}
-
-.outline_btn::after {
-  border: none;
-}
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
 /*!*******************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[4]!./src/components/SingleSelect.scss ***!
   !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[2]!./node_modules/resolve-url-loader/index.js!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].oneOf[0].use[4]!./src/components/SingleSelect.scss ***!
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************/
   \*******************************************************************************************************************************************************************************************************************************************************************************************************************************/

+ 6 - 2
dist/pages/index/index.js

@@ -13,7 +13,7 @@
 /* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var _tarojs_components__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @tarojs/components */ "./node_modules/@tarojs/plugin-platform-weapp/dist/components-react.js");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @tarojs/taro */ "webpack/container/remote/@tarojs/taro");
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_tarojs_taro__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _components_Rings__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../components/Rings */ "./src/components/Rings.weapp.tsx");
+/* harmony import */ var _components_Rings__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @components/Rings */ "./src/components/Rings.weapp.tsx");
 /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
 /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react/jsx-runtime */ "webpack/container/remote/react/jsx-runtime");
 /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__);
 
 
@@ -41,10 +41,14 @@ function IndexPage() {
   }
   }
   function login() {
   function login() {
     _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
     _tarojs_taro__WEBPACK_IMPORTED_MODULE_0___default().navigateTo({
-      url: '../Login'
+      url: '/pages/Login'
     });
     });
   }
   }
   return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.View, {
   return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsxs)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.View, {
+    style: {
+      backgroundColor: '#fff',
+      flex: 1
+    },
     children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.Text, {
     children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.Text, {
       children: "homepage12234"
       children: "homepage12234"
     }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.Button, {
     }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_2__.jsx)(_tarojs_components__WEBPACK_IMPORTED_MODULE_3__.Button, {

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/pages/index/index.js.map


+ 1 - 1
dist/project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "",
   "miniprogramRoot": "",
   "projectname": "hola",
   "projectname": "hola",
   "description": "",
   "description": "",
-  "appid": "wxe1396d16d519e16b",
+  "appid": "wx6b1ab4701b77c50d",
   "setting": {
   "setting": {
     "urlCheck": true,
     "urlCheck": true,
     "es6": false,
     "es6": false,

+ 128 - 0
dist/vendors.js

@@ -33,6 +33,34 @@ function _arrayWithHoles(arr) {
 
 
 /***/ }),
 /***/ }),
 
 
+/***/ "./node_modules/@babel/runtime/helpers/esm/defineProperty.js":
+/*!*******************************************************************!*\
+  !*** ./node_modules/@babel/runtime/helpers/esm/defineProperty.js ***!
+  \*******************************************************************/
+/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": function() { return /* binding */ _defineProperty; }
+/* harmony export */ });
+/* harmony import */ var _toPropertyKey_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./toPropertyKey.js */ "./node_modules/@babel/runtime/helpers/esm/toPropertyKey.js");
+
+function _defineProperty(obj, key, value) {
+  key = (0,_toPropertyKey_js__WEBPACK_IMPORTED_MODULE_0__["default"])(key);
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+
+/***/ }),
+
 /***/ "./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js":
 /***/ "./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js":
 /*!*************************************************************************!*\
 /*!*************************************************************************!*\
   !*** ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js ***!
   !*** ./node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js ***!
@@ -87,6 +115,41 @@ function _nonIterableRest() {
 
 
 /***/ }),
 /***/ }),
 
 
+/***/ "./node_modules/@babel/runtime/helpers/esm/objectSpread2.js":
+/*!******************************************************************!*\
+  !*** ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js ***!
+  \******************************************************************/
+/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": function() { return /* binding */ _objectSpread2; }
+/* harmony export */ });
+/* harmony import */ var _defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./defineProperty.js */ "./node_modules/@babel/runtime/helpers/esm/defineProperty.js");
+
+function ownKeys(e, r) {
+  var t = Object.keys(e);
+  if (Object.getOwnPropertySymbols) {
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
+  }
+  return t;
+}
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      (0,_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__["default"])(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
+    });
+  }
+  return e;
+}
+
+/***/ }),
+
 /***/ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js":
 /***/ "./node_modules/@babel/runtime/helpers/esm/slicedToArray.js":
 /*!******************************************************************!*\
 /*!******************************************************************!*\
   !*** ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js ***!
   !*** ./node_modules/@babel/runtime/helpers/esm/slicedToArray.js ***!
@@ -110,6 +173,71 @@ function _slicedToArray(arr, i) {
 
 
 /***/ }),
 /***/ }),
 
 
+/***/ "./node_modules/@babel/runtime/helpers/esm/toPrimitive.js":
+/*!****************************************************************!*\
+  !*** ./node_modules/@babel/runtime/helpers/esm/toPrimitive.js ***!
+  \****************************************************************/
+/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": function() { return /* binding */ _toPrimitive; }
+/* harmony export */ });
+/* harmony import */ var _typeof_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./typeof.js */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
+
+function _toPrimitive(input, hint) {
+  if ((0,_typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(input) !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if ((0,_typeof_js__WEBPACK_IMPORTED_MODULE_0__["default"])(res) !== "object") return res;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return (hint === "string" ? String : Number)(input);
+}
+
+/***/ }),
+
+/***/ "./node_modules/@babel/runtime/helpers/esm/toPropertyKey.js":
+/*!******************************************************************!*\
+  !*** ./node_modules/@babel/runtime/helpers/esm/toPropertyKey.js ***!
+  \******************************************************************/
+/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": function() { return /* binding */ _toPropertyKey; }
+/* harmony export */ });
+/* harmony import */ var _typeof_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./typeof.js */ "./node_modules/@babel/runtime/helpers/esm/typeof.js");
+/* harmony import */ var _toPrimitive_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./toPrimitive.js */ "./node_modules/@babel/runtime/helpers/esm/toPrimitive.js");
+
+
+function _toPropertyKey(arg) {
+  var key = (0,_toPrimitive_js__WEBPACK_IMPORTED_MODULE_0__["default"])(arg, "string");
+  return (0,_typeof_js__WEBPACK_IMPORTED_MODULE_1__["default"])(key) === "symbol" ? key : String(key);
+}
+
+/***/ }),
+
+/***/ "./node_modules/@babel/runtime/helpers/esm/typeof.js":
+/*!***********************************************************!*\
+  !*** ./node_modules/@babel/runtime/helpers/esm/typeof.js ***!
+  \***********************************************************/
+/***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": function() { return /* binding */ _typeof; }
+/* harmony export */ });
+function _typeof(o) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, _typeof(o);
+}
+
+/***/ }),
+
 /***/ "./node_modules/@babel/runtime/helpers/esm/unsupportedIterableToArray.js":
 /***/ "./node_modules/@babel/runtime/helpers/esm/unsupportedIterableToArray.js":
 /*!*******************************************************************************!*\
 /*!*******************************************************************************!*\
   !*** ./node_modules/@babel/runtime/helpers/esm/unsupportedIterableToArray.js ***!
   !*** ./node_modules/@babel/runtime/helpers/esm/unsupportedIterableToArray.js ***!

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/vendors.js.map


+ 1 - 7
ios/Podfile.lock

@@ -18,8 +18,6 @@ PODS:
     - ExpoModulesCore
     - ExpoModulesCore
   - EXConstants (14.0.2):
   - EXConstants (14.0.2):
     - ExpoModulesCore
     - ExpoModulesCore
-  - EXErrorRecovery (4.0.1):
-    - ExpoModulesCore
   - EXFileSystem (15.1.1):
   - EXFileSystem (15.1.1):
     - ExpoModulesCore
     - ExpoModulesCore
   - EXFont (11.0.1):
   - EXFont (11.0.1):
@@ -470,7 +468,6 @@ DEPENDENCIES:
   - EXBrightness (from `../node_modules/expo-brightness/ios`)
   - EXBrightness (from `../node_modules/expo-brightness/ios`)
   - EXCamera (from `../node_modules/expo-camera/ios`)
   - EXCamera (from `../node_modules/expo-camera/ios`)
   - EXConstants (from `../node_modules/expo-constants/ios`)
   - EXConstants (from `../node_modules/expo-constants/ios`)
-  - EXErrorRecovery (from `../node_modules/expo-error-recovery/ios`)
   - EXFileSystem (from `../node_modules/expo-file-system/ios`)
   - EXFileSystem (from `../node_modules/expo-file-system/ios`)
   - EXFont (from `../node_modules/expo-font/ios`)
   - EXFont (from `../node_modules/expo-font/ios`)
   - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
   - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
@@ -592,8 +589,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-camera/ios"
     :path: "../node_modules/expo-camera/ios"
   EXConstants:
   EXConstants:
     :path: "../node_modules/expo-constants/ios"
     :path: "../node_modules/expo-constants/ios"
-  EXErrorRecovery:
-    :path: "../node_modules/expo-error-recovery/ios"
   EXFileSystem:
   EXFileSystem:
     :path: "../node_modules/expo-file-system/ios"
     :path: "../node_modules/expo-file-system/ios"
   EXFont:
   EXFont:
@@ -721,7 +716,6 @@ SPEC CHECKSUMS:
   EXBrightness: 1725afacfdaeb4724bb949c44384cff0ef0d7d18
   EXBrightness: 1725afacfdaeb4724bb949c44384cff0ef0d7d18
   EXCamera: d7e91d5857faee493ca3cf8dafd42572db61849e
   EXCamera: d7e91d5857faee493ca3cf8dafd42572db61849e
   EXConstants: 3c86653c422dd77e40d10cbbabb3025003977415
   EXConstants: 3c86653c422dd77e40d10cbbabb3025003977415
-  EXErrorRecovery: ae43433feb0608a64dc5b1c8363b3e7769a9ea24
   EXFileSystem: 60602b6eefa6873f97172c684b7537c9760b50d6
   EXFileSystem: 60602b6eefa6873f97172c684b7537c9760b50d6
   EXFont: 319606bfe48c33b5b5063fb0994afdc496befe80
   EXFont: 319606bfe48c33b5b5063fb0994afdc496befe80
   EXImageLoader: 84b65e6bd9d3345d6fbb3ab936a546c54496a64d
   EXImageLoader: 84b65e6bd9d3345d6fbb3ab936a546c54496a64d
@@ -799,4 +793,4 @@ SPEC CHECKSUMS:
 
 
 PODFILE CHECKSUM: c500841d0cd00b84fdb1d6b4c1b8833eab606c22
 PODFILE CHECKSUM: c500841d0cd00b84fdb1d6b4c1b8833eab606c22
 
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

+ 9 - 0
src/app.scss

@@ -0,0 +1,9 @@
+page {
+    background-color: #000;
+}
+
+@media (prefers-color-scheme:dark) {
+    page {
+        background-color: #000;
+    }
+}

+ 1 - 1
src/components/Box.scss

@@ -3,7 +3,7 @@
     border-radius: 56px;
     border-radius: 56px;
     padding: 80px 40px 80px 40px;
     padding: 80px 40px 80px 40px;
     margin-left: 46px;
     margin-left: 46px;
-    margin-right: 46rpx;
+    margin-right: 46px;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
     position: relative;
     position: relative;

+ 29 - 7
src/components/Buttons.scss

@@ -1,16 +1,11 @@
 @import '../utils/common.scss';
 @import '../utils/common.scss';
+
+/* #ifdef weapp */ 
 .btn{
 .btn{
     background-color: $themeColor;
     background-color: $themeColor;
     border: none;
     border: none;
     height: 90px;
     height: 90px;
     border-radius: 45px;
     border-radius: 45px;
-    // width: 600px;
-}
-
-
-
-.btn::after{
-    border: 0;
 }
 }
 
 
 .outline_btn{
 .outline_btn{
@@ -21,6 +16,33 @@
     height: 90px !important;
     height: 90px !important;
     border-radius: 45px !important;
     border-radius: 45px !important;
 }
 }
+/* #endif */ 
+
+
+/* #ifdef rn */ 
+.btn{
+    background-color: $themeColor;
+    height: 90px;
+    border-radius: 45px;
+}
+
+.outline_btn{
+    border-style: solid;
+    border-width: 4px;
+    border-color: $themeColor;
+    background-color: transparent;
+    color: $themeColor;
+    // border: none;
+    height: 90px;
+    border-radius: 45px;
+}
+/* #endif */ 
+
+.btn::after{
+    border: 0;
+}
+
+
 
 
 .outline_btn::after{
 .outline_btn::after{
     border: none;
     border: none;

+ 6 - 2
src/components/Buttons.tsx

@@ -2,11 +2,15 @@ import { Button, View } from "@tarojs/components";
 import './Buttons.scss'
 import './Buttons.scss'
 import { ButtonType, ComponentStatus } from "../utils/types";
 import { ButtonType, ComponentStatus } from "../utils/types";
 
 
+import {Button as RNButton} from 'react-native' ;
 
 
 
 
-export default function Buttons(props: { title: string, type?: ButtonType, status?: ComponentStatus,onClick?:()=>void }) {
+
+export default function Buttons(props: { title: string, type?: ButtonType, status?: ComponentStatus,onClick?:()=>void,style?:any }) {
+    
+    const myStyle = props.status == ComponentStatus.disable ? { opacity: 0.4 } : {}
     return (
     return (
-        <View style={props.status == ComponentStatus.disable ? { opacity: 0.4 } : {}}>
+        <View style={{...myStyle,...props.style}}>
             <Button className={props.type == ButtonType.outline ? 'outline_btn' : 'btn'} onClick={props.onClick}>{props.title}</Button>
             <Button className={props.type == ButtonType.outline ? 'outline_btn' : 'btn'} onClick={props.onClick}>{props.title}</Button>
         </View>
         </View>
 
 

+ 1 - 1
src/components/SingleSelect.tsx

@@ -16,7 +16,7 @@ export default function Component(props: { items: any[] }) {
                 return <View className={selIndex == index ? 'item item_select' : 'item'} key={index} onClick={() => setSelIndex(index)}>
                 return <View className={selIndex == index ? 'item item_select' : 'item'} key={index} onClick={() => setSelIndex(index)}>
                     {/* <Text>{item}</Text> */}
                     {/* <Text>{item}</Text> */}
                     {
                     {
-                        isString(item) ? <Text>{item}</Text> : item
+                        isString(item) ? <Text style={{color:'#fff'}}>{item}</Text> : item
                     }
                     }
                     {
                     {
                         selIndex == index ? <Image style='width:12px;height:12px;' src={check} /> : null
                         selIndex == index ? <Image style='width:12px;height:12px;' src={check} /> : null

+ 34 - 0
src/features/auth/components/Auth.scss

@@ -0,0 +1,34 @@
+@import '@utils/common.scss';
+.agree_view{
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    opacity: 0.4;
+}
+
+.agree_text{
+    font-size: 24px;
+    color: #fff;
+}
+
+.footer{
+    margin-bottom: 120px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+}
+
+.have_account{
+    font-size: 28px;
+    color: #fff;
+    opacity: 0.4;
+}
+
+.login{
+    font-size: 28px;
+    color: $themeColor;
+}

+ 23 - 10
src/features/auth/components/Auth.tsx

@@ -1,26 +1,39 @@
-import { View,Text } from "@tarojs/components";
-import Texts from "../../../components/Texts";
-import { TextType } from "../../../utils/types";
-import Box from "../../../components/Box";
-import Inputs from "../../../components/Inputs";
+import { View, Text,Image } from "@tarojs/components";
+import Texts from "@components/Texts";
+import { ComponentStatus, TextType } from "../../../utils/types";
+import Box from "@components/Box";
+import Inputs from "@components/Inputs";
+import Buttons from '@components/Buttons'
+import check from '@assets/svg/check.svg'
+import './Auth.scss'
 
 
-export default function Auth(){
+export default function Auth() {
 
 
-    function loginComponent(){
+    function loginComponent() {
         return <View>
         return <View>
             <Inputs placeholder="Username"></Inputs>
             <Inputs placeholder="Username"></Inputs>
-            <View style={{height:20}}/>
+            <View style={{ height: 20 }} />
             <Inputs placeholder="Password"></Inputs>
             <Inputs placeholder="Password"></Inputs>
         </View>
         </View>
     }
     }
 
 
-    function register(){
+    function register() {
 
 
     }
     }
 
 
-    return <View  style={{backgroundColor:'#000',flex:1,flexDirection:'column',display:'flex'}}>
+    return <View style={{ backgroundColor: '#000', flex: 1, flexDirection: 'column', display: 'flex',height:'100vh' }}>
         <Texts text="Create account" type={TextType.primary}></Texts>
         <Texts text="Create account" type={TextType.primary}></Texts>
         <Texts text="Claim your username now!" type={TextType.secondary}></Texts>
         <Texts text="Claim your username now!" type={TextType.secondary}></Texts>
         <Box child={loginComponent()}></Box>
         <Box child={loginComponent()}></Box>
+        <Buttons title="Next" style={{ marginLeft: 23, marginRight: 23, marginTop: 20, marginBottom: 20 }} status={ComponentStatus.disable}></Buttons>
+        <View className="agree_view">
+            <Image style='width:12px;height:12px;' src={check} />
+            <Text className='agree_text'>I agree to the Terms of Service and Privacy Policy.</Text>
+        </View>
+        <View style={{flex:1}}/>
+        <View className="footer">
+            <Text className="have_account">Already have an account?</Text>
+            <Text className="login">Login</Text>
+        </View>
     </View>
     </View>
 }
 }

+ 1 - 1
src/pages/Auth.tsx

@@ -7,5 +7,5 @@ export default function Page() {
     Taro.setBackgroundColor({
     Taro.setBackgroundColor({
         backgroundColor:'#000000'
         backgroundColor:'#000000'
     });
     });
-    return <View  style={{backgroundColor:'#000',height:'100vh'}}><Auth /></View>
+    return <View  style={{backgroundColor:'#000'}}><Auth /></View>
 }
 }

+ 4 - 4
src/pages/Login.tsx

@@ -1,7 +1,7 @@
 import { View,Text } from "@tarojs/components";
 import { View,Text } from "@tarojs/components";
-import Buttons from "../components/Buttons";
-import SingleSelect from "../components/SingleSelect";
-import Rings from '../components/Rings.weapp';
+import Buttons from "@components/Buttons";
+import SingleSelect from "@components/SingleSelect";
+import Rings from '@components/Rings';
 import { ButtonType,ComponentStatus } from "../utils/types";
 import { ButtonType,ComponentStatus } from "../utils/types";
 import Taro from "@tarojs/taro";
 import Taro from "@tarojs/taro";
 
 
@@ -14,7 +14,7 @@ export default function Login(){
     function goAuth(){
     function goAuth(){
         // console.log('goAuth')
         // console.log('goAuth')
         Taro.navigateTo({
         Taro.navigateTo({
-            url:'./Auth'
+            url:'/pages/Auth'
         })
         })
     }
     }
 
 

+ 15 - 15
src/pages/index/index.tsx

@@ -3,37 +3,37 @@ import { View, Text, Button, Input } from '@tarojs/components'
 import './index.scss'
 import './index.scss'
 import Taro from '@tarojs/taro'
 import Taro from '@tarojs/taro'
 // import ComponentA from './component'
 // import ComponentA from './component'
-import Rings from '../../components/Rings';
-import SingleSelect from '../../components/SingleSelect';
+import Rings from '@components/Rings';
+import SingleSelect from '@components/SingleSelect';
 // import TabBar from '../../components/Tabbar';
 // import TabBar from '../../components/Tabbar';
 
 
 export default function IndexPage() {
 export default function IndexPage() {
-  const  array:any[] = []
-    array.push('ffff');
-    array.push(<Text>ffff</Text>)
-    // array.push(<Rings radius={50}/>)
-  function goDetail(){
+  const array: any[] = []
+  array.push('ffff');
+  array.push(<Text>ffff</Text>)
+  // array.push(<Rings radius={50}/>)
+  function goDetail() {
     Taro.navigateTo({
     Taro.navigateTo({
       // url: '/pages/index/detail'
       // url: '/pages/index/detail'
       //src/moduleA/pages/third.tsx
       //src/moduleA/pages/third.tsx
-      url:'../../moduleA/pages/third'
+      url: '../../moduleA/pages/third'
     })
     })
   }
   }
 
 
-  function login(){
+  function login() {
     Taro.navigateTo({
     Taro.navigateTo({
-      url:'../Login'
+      url: '/pages/Login'
     })
     })
   }
   }
   return (
   return (
-    <View>
+    <View style={{ backgroundColor: '#fff', flex: 1 }}>
       <Text>homepage12234</Text>
       <Text>homepage12234</Text>
       {/* <ComponentA value="ABBBB" /> */}
       {/* <ComponentA value="ABBBB" /> */}
-      <Button onClick={()=>goDetail()}>go detail</Button>
+      <Button onClick={() => goDetail()}>go detail</Button>
       {/* <SingleSelect items={array}></SingleSelect> */}
       {/* <SingleSelect items={array}></SingleSelect> */}
-      <Rings radius={50}/>
-      <Input placeholder="请输入用户名" style={{textAlign:'left',backgroundColor:'pink'}}/>
-      <Text className='login' onClick={()=>login()}>sss</Text>
+      <Rings radius={50} />
+      <Input placeholder="请输入用户名" style={{ textAlign: 'left', backgroundColor: 'pink' }} />
+      <Text className='login' onClick={() => login()}>sss</Text>
       {/* <TabBar /> */}
       {/* <TabBar /> */}
     </View>
     </View>
   )
   )

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác