xuhaolan 3 years ago
parent
commit
ba07a0595e

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "喜嗨购",
     "appid" : "__UNI__F0D4DD1",
     "description" : "",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "1.0.8",
+    "versionCode" : 108,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

+ 8 - 3
pages/public/login.vue

@@ -22,9 +22,9 @@
 			<view><button type="green" class="uni-button uni-button-green" @click="toLogin">登录</button></view>
 			<view><button type="green" class="uni-button uni-button-green uni-button-green-plain" plain="true"
 					hover-class="none" @click="register">注册</button></view>
-			<navigator url="./forget">
-				<view class="forget">忘记密码</view>
-			</navigator>
+		
+				<view class="forget" @click="navTog">忘记密码</view>
+		
 			<view class="flex other">
 				<view class="fenge"></view>
 				<view class="qita">其他方式登录</view>
@@ -112,6 +112,11 @@
 			// #endif
 		},
 		methods: {
+			navTog(){
+				uni.navigateTo({
+					url:'../set/password'
+				})
+			},
 			...mapMutations('user', ['setUserInfo', 'login']),
 			// 微信登录
 			wecahtLogin(type) {

File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0D4DD1/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0D4DD1/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0D4DD1/manifest.json


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/manifest.json


File diff suppressed because it is too large
+ 31 - 32
unpackage/dist/dev/app-plus/app-service.js


+ 34 - 33
unpackage/dist/dev/app-plus/app-view.js

@@ -6650,44 +6650,45 @@ var render = function() {
             1
           ),
           _c(
-            "v-uni-navigator",
-            { attrs: { url: "./forget", _i: 20 } },
-            [
-              _c(
-                "v-uni-view",
-                { staticClass: _vm._$g(21, "sc"), attrs: { _i: 21 } },
-                [_vm._v("忘记密码")]
-              )
-            ],
-            1
+            "v-uni-view",
+            {
+              staticClass: _vm._$g(20, "sc"),
+              attrs: { _i: 20 },
+              on: {
+                click: function($event) {
+                  return _vm.$handleViewEvent($event)
+                }
+              }
+            },
+            [_vm._v("忘记密码")]
           ),
           _c(
             "v-uni-view",
-            { staticClass: _vm._$g(22, "sc"), attrs: { _i: 22 } },
+            { staticClass: _vm._$g(21, "sc"), attrs: { _i: 21 } },
             [
               _c("v-uni-view", {
-                staticClass: _vm._$g(23, "sc"),
-                attrs: { _i: 23 }
+                staticClass: _vm._$g(22, "sc"),
+                attrs: { _i: 22 }
               }),
               _c(
                 "v-uni-view",
-                { staticClass: _vm._$g(24, "sc"), attrs: { _i: 24 } },
+                { staticClass: _vm._$g(23, "sc"), attrs: { _i: 23 } },
                 [_vm._v("其他方式登录")]
               ),
               _c("v-uni-view", {
-                staticClass: _vm._$g(25, "sc"),
-                attrs: { _i: 25 }
+                staticClass: _vm._$g(24, "sc"),
+                attrs: { _i: 24 }
               })
             ],
             1
           ),
-          _vm._$g(26, "i")
+          _vm._$g(25, "i")
             ? [
                 _c(
                   "v-uni-view",
                   {
-                    staticClass: _vm._$g(27, "sc"),
-                    attrs: { _i: 27 },
+                    staticClass: _vm._$g(26, "sc"),
+                    attrs: { _i: 26 },
                     on: {
                       click: function($event) {
                         return _vm.$handleViewEvent($event)
@@ -6699,7 +6700,7 @@ var render = function() {
                       attrs: {
                         src: "/static/img/img05.png",
                         mode: "scaleToFill",
-                        _i: 28
+                        _i: 27
                       }
                     })
                   ],
@@ -6708,8 +6709,8 @@ var render = function() {
                 _c(
                   "v-uni-view",
                   {
-                    staticClass: _vm._$g(29, "sc"),
-                    attrs: { _i: 29 },
+                    staticClass: _vm._$g(28, "sc"),
+                    attrs: { _i: 28 },
                     on: {
                       click: function($event) {
                         return _vm.$handleViewEvent($event)
@@ -6723,8 +6724,8 @@ var render = function() {
                 _c(
                   "v-uni-view",
                   {
-                    staticClass: _vm._$g(31, "sc"),
-                    attrs: { _i: 31 },
+                    staticClass: _vm._$g(30, "sc"),
+                    attrs: { _i: 30 },
                     on: {
                       click: function($event) {
                         return _vm.$handleViewEvent($event)
@@ -6733,23 +6734,23 @@ var render = function() {
                   },
                   [
                     _c("v-uni-text", {
-                      staticClass: _vm._$g(32, "sc"),
-                      attrs: { _i: 32 }
+                      staticClass: _vm._$g(31, "sc"),
+                      attrs: { _i: 31 }
                     }),
                     _c(
                       "v-uni-text",
-                      { staticClass: _vm._$g(33, "sc"), attrs: { _i: 33 } },
+                      { staticClass: _vm._$g(32, "sc"), attrs: { _i: 32 } },
                       [_vm._v("微信登录")]
                     )
                   ],
                   1
                 ),
-                _vm._$g(34, "i")
+                _vm._$g(33, "i")
                   ? _c(
                       "v-uni-view",
                       {
-                        staticClass: _vm._$g(34, "sc"),
-                        attrs: { _i: 34 },
+                        staticClass: _vm._$g(33, "sc"),
+                        attrs: { _i: 33 },
                         on: {
                           click: function($event) {
                             return _vm.$handleViewEvent($event)
@@ -6758,16 +6759,16 @@ var render = function() {
                       },
                       [
                         _c("v-uni-image", {
-                          staticClass: _vm._$g(35, "sc"),
+                          staticClass: _vm._$g(34, "sc"),
                           attrs: {
                             src: "/static/icon/appleIcon.png",
                             mode: " scaleToFill",
-                            _i: 35
+                            _i: 34
                           }
                         }),
                         _c(
                           "v-uni-text",
-                          { staticClass: _vm._$g(36, "sc"), attrs: { _i: 36 } },
+                          { staticClass: _vm._$g(35, "sc"), attrs: { _i: 35 } },
                           [_vm._v("通过Apple登录")]
                         )
                       ],

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


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